瀏覽代碼

样式修改

lilei 4 年之前
父節點
當前提交
3d70d1108c

+ 22 - 18
pages/index/index.vue

@@ -4,8 +4,7 @@
 		<swiper class="top-ad-swiper" :indicator-dots="false" :autoplay="true" :interval="5000" :duration="600" :circular="true">
 			<swiper-item v-for="(item,index) in imageTopList" :key="index">
 				<div class="swiper-item uni-bg-red">
-					<!-- <image class="swiper-item-imgse" :fade-show='true' :src="item.photo"></image> -->
-					<u-image mode="scaleToFill" width="750upx" height="400upx" :src="item.photo"></u-image>
+					<u-image mode="scaleToFill" width="750upx" height="400upx" :src="item.photoPath"></u-image>
 				</div>
 			</swiper-item>
 		</swiper>
@@ -24,10 +23,10 @@
 			</div>
 			<div class="panel-body">
 				<div class="order-list">
-					<div v-for="item in toDoData" :key="item.id">
+					<div v-for="item in toDoData" :key="item.id" @click="viewToDo(item)">
 						<span>{{item.createDate.split(' ')[0]}}</span>
 						<span>{{item.sourceTypeDictValue}}</span>
-						<span>{{item.statusDictValue}}</span>
+						<span :class="item.status">{{item.statusDictValue}}</span>
 					</div>
 				</div>
 				<div class="nodata" v-if="toDoData.length==0">{{notoDoDataText}}</div>
@@ -66,7 +65,7 @@ export default {
 				{
 					id: 'DJZX',
 					icon: 'dianjian',
-					color: '#ff5500',
+					color: '#ff8b3e',
 					name: '点检中心',
 					url:'/pages/spotCheckCenter/spotChecking',
 					target: 'page',
@@ -75,7 +74,7 @@ export default {
 				{
 					id: 'XCXD',
 					icon: 'xianchangjiancha',
-					color: '#00aa00',
+					color: '#00aa7f',
 					name: '现场巡店',
 					url:'/pages/siteInspection/siteInspection',
 					target: 'page',
@@ -84,7 +83,7 @@ export default {
 				{
 					id: 'XDJL',
 					icon: 'tubiaokuwenjian-gengxin-',
-					color: '#d0527e',
+					color: '#55aaff',
 					name: '巡店记录',
 					url:'/pages/shopTourRecord/shopTourRecord',
 					target: 'page',
@@ -107,6 +106,7 @@ export default {
 		// 或某一项字典列表,参数code
 		getLookUpList(code, vuexKey) {
 			getLookUpDatas({ type: code }).then(res => {
+				console.log(res)
 				if (res.status == 200) {
 					this.$store.state[vuexKey] = res.data || [];
 				}
@@ -170,7 +170,13 @@ export default {
 			uni.navigateTo({
 				url: '/pages/toDoList/toDoList'
 			})
-		}
+		},
+		// 详细页
+		viewToDo(item){
+			uni.navigateTo({
+				url: "/pages/toDoList/backlogDetail?id="+item.id
+			})
+		},
 	}
 };
 </script>
@@ -188,14 +194,12 @@ export default {
 		.panel-title{
 			display: flex;
 			align-items: center;
-			padding:20upx 15upx;
+			padding:20upx 25upx;
 			border-bottom: 2upx solid #eee;
 			.texts{
 				font-size: 28upx;
 				flex-grow: 1;
 				padding-left: 15upx;
-				background: url(/static/pt.png) no-repeat left center;
-				background-size: auto 80%;
 			}
 			.btns{
 				font-size: 24upx;
@@ -218,21 +222,21 @@ export default {
 			display: flex;
 			align-items: center;
 			font-size: 30upx;
-			padding: 14upx 0;
+			padding: 15upx 0;
 			span{
 				flex-grow: 1;
 				text-align: center;
 				color: #666;
 				width: 33.3%;
 			}
-			span.daiJs{
-				color: #ff0000;
+			span.PENDING{
+				color: #ff736e;
 			}
-			span.daiWg{
-				color: #ffaa00;
+			span.EXPIRED{
+				color: #999;
 			}
-			span.yiJs{
-				color: #5fbe00;
+			span.FINISHED{
+				color: #bbec82;
 			}
 		}
 	}

+ 7 - 8
pages/myShopTour/myShopTour.vue

@@ -9,7 +9,7 @@
 						<view class="record-con" :style="{'paddingTop': searchForm.beginDate ? '74upx' : ''}">
 							<!-- 筛选日期,近7天 -->
 							<view v-show="searchForm.beginDate" class="alert-tips">
-								<text>{{searchForm.beginDate}} ~ {{searchForm.endDate}}</text>
+								<text>创建时间:{{searchForm.beginDate}} 至 {{searchForm.endDate}}</text>
 							</view>
 							<view class="record-item" v-if="index==current" v-for="(item,sindex) in list" :key="item.id" @click="getDetails(item)">
 								<view class="item-head">
@@ -270,14 +270,14 @@
 <style lang="scss">
 page {
 	background-color: #f8f8f8;
-	height: calc(100vh - 44px);
+	height: 100vh;
 }
 .myShopTour-wrap {
 	height: 100%;
 	// 内容
 	.myShopTour-con{
 		.data-list{
-			height: calc(100vh - 84px);
+			height: calc(100vh - 50px);
 			.swiper-item{
 				height: 100%;
 				width: 100%;
@@ -296,21 +296,20 @@ page {
 							width: 100%;
 							z-index: 3;
 							padding: 20upx 30upx 10upx;
-							background-color: #fff;
+							background-color: #F8F8F8;
+							border-bottom: 1px solid #EEEEEE;
 							text{
 								display: block;
 								font-size: 24upx;
 								padding: 4upx 10upx;
-								border: 1upx solid #fcbd71;
-								background-color: #fdf6ec;
-								border-radius: 6upx;
 							}
 						}
 						.record-item{
 							background-color: #fff;
 							margin: 20upx 30upx 20upx;
 							padding: 14upx 30upx 20upx;
-							border-radius: 12upx;
+							border-radius: 6upx;
+							box-shadow: 1px 1px 3px #EEEEEE;
 							.item-head{
 								display: flex;
 								justify-content: space-between;

+ 2 - 1
pages/myShopTour/searchModal.vue

@@ -203,8 +203,9 @@ export default {
 			width: 30%;
 			text-align: center;
 			line-height: 60upx;
-			background-color: #e2e2e2;
+			background-color: #F8F8F8;
 			color: #333;
+			border-radius: 6upx;
 			font-size: 24upx;
 			margin: 0 10upx;
 		}

+ 2 - 1
pages/toDoList/searchModal.vue

@@ -197,8 +197,9 @@
 				width: 30%;
 				text-align: center;
 				line-height: 60upx;
-				background-color: #e2e2e2;
+				background-color: #F8F8F8;
 				color: #333;
+				border-radius: 6upx;
 				font-size: 24upx;
 				margin: 0 10upx;
 			}

+ 6 - 26
pages/toDoList/toDoList.vue

@@ -295,35 +295,16 @@
 <style lang="scss" scoped>
 	page{
 		height: 100%;
-	}
-	/* 自定义导航栏样式 */
-	.slot-wrap {
-		display: flex;
-		align-items: center;
-		/* 如果您想让slot内容占满整个导航栏的宽度 */
-		flex: 1;
-		/* 如果您想让slot内容与导航栏左右有空隙 */
-		padding: 0 30rpx 0 0;
-		color: #fff;
-		font-size: 28upx;
-		.left-icon{
-			flex-grow: 1;
-			font-size: 32upx;
-		}
-		.right-icon{
-			padding-left:50upx;
-		}
-		.uni-icons{
-			margin-right: 10upx;
-		}
-	}
-	.text-right {
-		text-align: right;
+		background: #F8F8F8;
 	}
 	.pagesCons{
 		height: 100%;
+		background: #F8F8F8;
 		display: flex;
 		flex-direction: column;
+		.text-right {
+			text-align: right;
+		}
 		.tab-body{
 			flex: 1;
 			display: flex;
@@ -353,7 +334,6 @@
 				.filter-icon{
 					display: flex;
 					flex-direction: column;
-					// margin-left: 10upx;
 					padding: 20upx;
 				}
 			}
@@ -376,7 +356,7 @@
 					&:first-child{
 						border-bottom: 1px dashed #F8F8F8;
 						.createDate{
-							// color: #666;
+							color: #666;
 							font-size: 26upx;
 							margin-left: 10upx;
 						}