wgl пре 4 година
родитељ
комит
13123d1cc5

+ 2 - 2
src/projects/business/views/Master/Activity/Add.vue

@@ -23,7 +23,7 @@
 				</form>
 			</div>
 
-			<draggable element="div" v-model="subForm.contentList" :options="{animation:200}">
+			<!-- <draggable element="div" v-model="subForm.contentList" :options="{animation:200}"> -->
 				<div v-for="(item,index) in subForm.contentList" class="vongi-cashier margin10">
 					<div @click="chooseImage(index)" class="vongi-fqhd-addimg">
 						<img v-if="item.picture" :src="item.picture">
@@ -38,7 +38,7 @@
 						<a><span class="mui-icon iconfont icon-jiantou1"></span></a>
 					</div>
 				</div>
-			</draggable>
+			<!-- </draggable> -->
 
 			<div class="vongi-fqhd-add margin10">
 				<a @click="addShow=true"><span class="mui-icon mui-icon-plus"></span></a>

+ 11 - 2
src/projects/business/views/Master/Activity/ExamineList.vue

@@ -27,7 +27,9 @@
 										<router-link :to="{name:'MasterActivityExamineInfo',query:{id:item.id}}">
 											<div class="mui-media-body flew-sp">
 												<div class="mui-col-xs-9" v-text="item.title"></div>
-												<div class="mui-col-xs-3"><button type="button" class="mui-btn mui-btn-primary mui-btn-outlined" v-text="getStatusName(item.verify)"></button></div>
+												<div class="mui-col-xs-3">
+													<button type="button" :style="getStatusStyle(item.verify)" class="mui-btn mui-btn-greye mui-btn-outlined" v-text="getStatusName(item.verify)"></button>
+												</div>
 											</div>
 											<p class="flew-items flew-sp">
 												发 起 人:{{item.applicant}} {{item.roomNumber}}
@@ -47,7 +49,9 @@
 										<router-link :to="{name:'MasterActivityExamineInfo',query:{id:item.id}}">
 											<div class="mui-media-body flew-sp">
 												<div class="mui-col-xs-9" v-text="item.title"></div>
-												<div class="mui-col-xs-3"><button type="button" class="mui-btn mui-btn-primary mui-btn-outlined" v-text="getStatusName(item.verify)"></button></div>
+												<div class="mui-col-xs-3">
+													<button type="button" :style="getStatusStyle(item.verify)" class="mui-btn mui-btn-greye mui-btn-outlined" v-text="getStatusName(item.verify)"></button>
+												</div>
 											</div>
 											<p class="flew-items flew-sp">
 												发 起 人:{{item.applicant}} {{item.roomNumber}}
@@ -149,6 +153,11 @@
 				let statusArr = ['待审核', '已批准', '未批准'];
 				return statusArr[status];
 			},
+			//获取审核状态
+			getStatusStyle(status) {
+				let statusArr = ['color:#3385FF;border-color:#3385FF', 'color:#389E0D;border-color:#389E0D', 'color:#FF6666;border-color:#FF6666'];
+				return statusArr[status];
+			},
 			goToAdd() {
 				this.$router.push({
 					name: 'MasterActivityAdd'

+ 1 - 1
src/projects/business/views/Master/Activity/List.vue

@@ -5,7 +5,7 @@
 
 		<div class="mui-content">
 			<div v-for="(item,index) in recordList" class="vongi-sqhd-list">
-				<p class="vongi-center" v-text="item.startTime"></p>
+				<p class="vongi-center" v-text="item.startTime.substr(0,10)"></p>
 				<router-link :to="{name:'MasterActivityInfo',query:{id:item.id}}" class="mui-card">
 					<div class="mui-card-content">
 						<div class="mui-card-content-inner">

+ 8 - 1
src/projects/business/views/Master/Activity/MyList.vue

@@ -10,7 +10,9 @@
 						<router-link :to="{name:'MasterActivityMyInfo',query:{id:item.id}}">
 							<div class="mui-media-body flew-sp">
 								<div class="mui-col-xs-9" v-text="item.title"></div>
-								<div class="mui-col-xs-3"><button type="button" class="mui-btn mui-btn-greye mui-btn-outlined" v-text="getStatusName(item.verify)"></button></div>
+								<div class="mui-col-xs-3">
+									<button type="button" :style="getStatusStyle(item.verify)" class="mui-btn mui-btn-greye mui-btn-outlined" v-text="getStatusName(item.verify)"></button>
+								</div>
 							</div>
 							<p class="flew-items flew-sp">
 								活动时间:{{item.startTime.substr(0,10)}}至{{item.endTime.substr(0,10)}}
@@ -106,6 +108,11 @@
 				let statusArr = ['待审核', '已批准', '未批准'];
 				return statusArr[status];
 			},
+			//获取审核状态
+			getStatusStyle(status) {
+				let statusArr = ['color:#3385FF;border-color:#3385FF', 'color:#389E0D;border-color:#389E0D', 'color:#FF6666;border-color:#FF6666'];
+				return statusArr[status];
+			},
 			goToAdd() {
 				this.$router.push({
 					name: 'MasterActivityAdd'