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

pages.json

@@ -116,7 +116,8 @@
 		}, {
 			"path": "entrustForm",
 			"style": {
-				"navigationBarTitleText": "发布委托"
+				"navigationBarTitleText": "发布委托",
+				"backgroundColor": "#f7f7f7"
 			}
 		}, {
 			"path": "addressList",

pages/index/login.vue

@@ -14,7 +14,8 @@
 			</button>
 			<view class="authorize-info">{{wxPhoneData? '****************' : ''}}</view> -->
 			<view class="authorize-login" @click="getUserInfo">登录</view>
-		</view>{{tipxx}}
+			<view class="authorize-tip">点击登录默认同意<text style="text-decoration: underline;">平台服务协议</text></view>
+		</view>
 		<u-top-tips ref="uTips"></u-top-tips>
 	</view>
 </template>
@@ -28,7 +29,7 @@
 				wxLoginData: null,
 				wxPhoneData: null,
 				userNmae: '',
-				tipxx: '',
+				tip: '点击登录默认同意平台服务协议',
 			}
 		},
 		onReady() {
@@ -232,6 +233,17 @@
 				line-height: 36px;
 				text-align: center;
 			}
+			.authorize-tip {
+				width: 220px;
+				height: 20px;
+				float: left;
+				margin: 10px 5px;
+				font-size: 12px;
+				font-family: PingFang SC;
+				color: #FFFFFF;
+				line-height: 20px;
+				text-align: center;
+			}
 		}
 	}
 </style>

pagesGood/goodDetails.vue

@@ -495,7 +495,7 @@
 			.tab-col-active {
 				font-size: 15px;
 				color: #343434;
-				border-bottom: 1px solid #52A63A;
+				border-bottom: 2px solid #52A63A;
 			}
 		}
 

pagesMain/entrustForm.vue

@@ -60,7 +60,6 @@
 			this.entrustForm.productName = options.productName
 			this.entrustForm.tenantCode = options.tenantCode
 			this.entrustForm.areaSize = options.areaSize
-			debugger
 			this.getPrice()
 		},
 		methods: {
@@ -86,7 +85,6 @@
 			},
 			//  支付
 			toPay() {
-				debugger
 				if (!this.entrustForm.remarks) {
 					this.$refs.uTips.show({
 						title: '请填写备注信息',
@@ -157,6 +155,11 @@
 	}
 </script>
 
+<style>
+	page {
+		background-color: #f7f7f7;
+	}
+</style>
 <style lang="less" scoped>
 	page {
 		width: 100%;
@@ -206,7 +209,15 @@
 			left: 15px;
 
 			.handle-custom {
-				background-color: #51A539;
+				background-color: #56a83a;
+				
+				/deep/button {
+					background-color: #56a83a;
+				}
+
+				/deep/.u-btn--success--disabled {
+					background-color: #74bd60 !important;
+				}
 			}
 		}
 	}

pagesMain/entrustList.vue

@@ -1,5 +1,5 @@
 <template>
-	<scroll-view class="container" :style="{backgroundColor: entrustTotle ? '#f7f7f7' : '#FFFFFF'}" scroll-y="true" @scrolltolower="handleLoadMore()">
+	<scroll-view class="container" :style="{backgroundColor: entrustTotle ? '#f7f7f7' : '#f7f7f7'}" scroll-y="true" @scrolltolower="handleLoadMore()">
 		<view class="entrust-info">
 			<view class="entrust-info-text">共{{entrustTotle}}个委托订单</view>
 		</view>

pagesMain/orderItem.vue

@@ -24,20 +24,20 @@
 		</view>
 		<view class="pay-info">总价￥{{getAllPrice()}}，实付￥{{orderData.paySum}}</view>
 		<view class="handle-box" v-if="tabIndex > 1">
-			<view size="medium" class="handle-button"
-			 v-if="tabIndex == 2" @click.stop="handleOrder(1)">取消订单</view>
-			<view size="medium" class="handle-button"
-			 v-if="tabIndex == 2" @click.stop="handleOrder(2)">立即支付</view>
+			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
+			 v-if="tabIndex == 2" @click.stop="handleOrder(1)">取消订单</u-button>
+			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
+			 v-if="tabIndex == 2" @click.stop="handleOrder(2)">立即支付</u-button>
 			<!-- <u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
 			 v-if="tabIndex != 1 && tabIndex != 2" @click.stop="handleOrder(3)">申请售后</u-button> -->
-			<view size="medium" class="handle-button"
-			 v-if="tabIndex == 3 && pickHandle" @click.stop="handleOrder(4)">自助采摘</view>
-			<view size="medium" class="handle-button"
-			 v-if="tabIndex == 4" @click.stop="handleOrder(5)">确认收货</view>
-			<view size="medium" class="handle-button"
-			 v-if="tabIndex == 4" @click.stop="handleOrder(6)">追踪物流</view>
-			<view size="medium" class="handle-button"
-			 v-if="tabIndex == 5 && orderData.evaluateStatus == 1" @click.stop="handleOrder(7)">评价</view>
+			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
+			 v-if="tabIndex == 3 && pickHandle" @click.stop="handleOrder(4)">自助采摘</u-button>
+			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
+			 v-if="tabIndex == 4" @click.stop="handleOrder(5)">确认收货</u-button>
+			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
+			 v-if="tabIndex == 4" @click.stop="handleOrder(6)">追踪物流</u-button>
+			<u-button size="medium" :plain="true" type="success" shape="circle" :ripple="true" :hair-line="false" class="handle-button"
+			 v-if="tabIndex == 5 && orderData.evaluateStatus == 1" @click.stop="handleOrder(7)">评价</u-button>
 		</view>
 		<u-modal v-model="modalShow" :content="modalContent" @confirm="submitHandle" :async-close="true" :show-cancel-button="true"></u-modal>
 		<u-top-tips ref="uTips"></u-top-tips>
@@ -86,7 +86,7 @@
 			}
 		},
 		onReady() {
-			this.pickHandle = this.orderData.products.filter(site=> site.productType == 3).length > 0
+			this.pickHandle = this.orderData.products.filter(site => site.productType == 3).length > 0
 		},
 		methods: {
 			//  跳转商铺
@@ -411,11 +411,6 @@
 
 			.handle-button {
 				height: 30px;
-				width: 75px;
-				color: #333333 !important;
-				border: 1px solid #BFBFBF !important;
-				background-color: #FFFFFF !important;
-				padding: 0 10px;
 				margin-left: 8px;
 				margin-bottom: 10px;
 				line-height: 28px;
@@ -423,6 +418,13 @@
 				box-sizing: border-box;
 				display: inline-block;
 				border-radius: 15px;
+
+				/deep/button {
+					padding: 0 12px;
+					border: 1px solid #BFBFBF !important;
+					background-color: #FFFFFF!important;
+					color: #333333 !important;
+				}
 			}
 		}
 	}