Merge branch 'master' of http://git.jihengcc.cn/liubaiyan/qjd-user-uniapp

pages.json

@@ -111,7 +111,8 @@
 			"path": "entrustList",
 			"style": {
 				"navigationBarTitleText": "委托列表",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true,
+				"backgroundColor": "#f7f7f7"
 			}
 		}, {
 			"path": "entrustForm",
@@ -128,7 +129,8 @@
 		}, {
 			"path": "addressForm",
 			"style": {
-				"navigationBarTitleText": "新增地址"
+				"navigationBarTitleText": "新增地址",
+				"backgroundColor": "#f7f7f7"
 			}
 		}, {
 			"path": "couponList",

pagesMain/addressForm.vue

@@ -134,6 +134,11 @@
 	}
 </script>
 
+<style>
+	page {
+		background-color: #f7f7f7;
+	}
+</style>
 <style lang="less" scoped>
 	page {
 		width: 100%;

pagesMain/couponList.vue

@@ -6,6 +6,7 @@
 		</view>
 		<view class="coupon-box" v-if="tabIndex == 0">
 			<view class="coupon-row" v-for="(site, index2) in couponList1" :key="index2">
+				<view class="coupon-mask" v-if="site.status == 0"></view>
 				<view class="coupon-left">
 					<view class="coupon-left-price"><text style="font-size: 16px;">￥</text>{{site.discountAmount}}</view>
 					<view class="coupon-left-text">满减金额</view>

pagesMain/entrustForm.vue

@@ -157,15 +157,12 @@
 
 <style>
 	page {
+		width: 100%;
+		height: 100%;
 		background-color: #f7f7f7;
 	}
 </style>
 <style lang="less" scoped>
-	page {
-		width: 100%;
-		height: 100%;
-	}
-
 	.container {
 		width: 100%;
 		height: 100%;
@@ -175,7 +172,7 @@
 		padding-bottom: 70px;
 		overflow-y: auto;
 
-		.address-form {
+		.entrust-form {
 			width: 100%;
 			float: left;
 			box-sizing: border-box;

pagesMain/evaluateForm.vue

@@ -162,6 +162,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMain/messageForm.vue

@@ -131,6 +131,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMain/messageList.vue

@@ -188,6 +188,14 @@
 
 			.handle-custom {
 				background-color: #51A539;
+
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}