服务订单

pages/login/index.vue

@@ -14,16 +14,16 @@
 				<text @click="getCode" v-if="!showCountDown">获取验证码</text>
 				<text v-if="showCountDown">{{countdown}}</text>
 			</view>
-			<view class="c">
-				查看并同意<text @click="toTextPage(1)">《用户服务协议》</text>和<text @click="toTextPage(2)">《隐私政策》</text>
+			<view class="c" style="display: flex;align-items: center;">
+				<u-checkbox active-color="#FF343C" v-model="isCheckout" style="margin-right: -20rpx;"></u-checkbox>同意<text @click="toTextPage(1)">《用户服务协议》</text>和<text @click="toTextPage(2)">《隐私政策》</text>
 			</view>
 		</view>
 		<view class="login-fd login-fd-on" @click="login">登录</view>
 		<view class="" v-if="isCheckout">
 			<mpWeiXinMobile :refereeId="refereeId"></mpWeiXinMobile>
 		</view>
-		<view class="" v-else>
-			<mpWeiXinMobile :refereeId="refereeId"></mpWeiXinMobile>
+		<view class="" v-else style="font-size: 28rpx;color: #666;text-align: center;margin-top: 50rpx;" @click="login">
+			手机号快捷登录
 		</view>
 	</view>
 </template>
@@ -114,6 +114,10 @@
 				})
 			},
 			login() {
+				if(this.isCheckout == false){
+					this.$toast('请勾选用户协议')
+					return ;
+				}
 				// 登录
 				if (!this.validatePhoneNumber(this.phoneNum)) {
 					this.$toast('请输入正确的手机号')

pages/news/recycling/orderDetail.vue

@@ -123,13 +123,11 @@
 				isShow: false,
 				currentIndex: 0,
 				background: {
-					background: `url(${this.$picUrl}/static/news/refund-bg.png) center -10px no-repeat`,
-					// background: 'url('+	img+') center -10px no-repeat',
+					background: `url(${this.$picUrl}/static/news/refund-bg.png) center top no-repeat`,
 					backgroundSize: '100%',
 				},
 				background1: {
-					background: `url(${this.$picUrl}/static/news/login-bg.png) center -10px no-repeat`,
-					// background: 'url('+	img1+') center -10px no-repeat',
+					background: `url(${this.$picUrl}/static/news/login-bg.png) center top no-repeat`,
 					backgroundSize: '100%',
 				},
 				info: {},

pages/user/index.vue

@@ -213,12 +213,20 @@
 					<u-icon style="margin-left: 5rpx; color: #909090; margin-top: -5rpx;" name="arrow-right"></u-icon>
 				</view>
 				<view class="grounding goodsOrder">
+					<view class="image-text_21" @click="toFuwu(1)">
+						<image :src="$picUrl+'/static/user/untake.png'" class="label_11"></image>
+						<view class="text-group_21">
+							<text class="text_71"
+								v-if="orderTodoInfo.service_order.payment_number">{{orderTodoInfo.service_order.payment_number}}</text>
+							<text class="text_81">待支付</text>
+						</view>
+					</view>
 					<view class="image-text_21" @click="toFuwu(3)">
 						<image :src="$picUrl+'/static/user/unpay.png'" class="label_11"></image>
 						<view class="text-group_21">
 							<text class="text_71"
 								v-if="orderTodoInfo.service_order.confirm_number">{{orderTodoInfo.service_order.confirm_number}}</text>
-							<text class="text_81">待确认</text>
+							<text class="text_81">待服务</text>
 						</view>
 					</view>
 					<view class="image-text_21" @click="toFuwu(2)">
@@ -226,15 +234,7 @@
 						<view class="text-group_21">
 							<text class="text_71"
 								v-if="orderTodoInfo.service_order.service_number">{{orderTodoInfo.service_order.service_number}}</text>
-							<text class="text_81">待服务</text>
-						</view>
-					</view>
-					<view class="image-text_21" @click="toFuwu(1)">
-						<image :src="$picUrl+'/static/user/untake.png'" class="label_11"></image>
-						<view class="text-group_21">
-							<text class="text_71"
-								v-if="orderTodoInfo.service_order.payment_number">{{orderTodoInfo.service_order.payment_number}}</text>
-							<text class="text_81">待支付</text>
+							<text class="text_81">待派单</text>
 						</view>
 					</view>
 					<view class="image-text_21" @click="toFuwu(4)">