Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-sp

pages/order/components/order-list-item-new.vue

@@ -73,7 +73,8 @@
 					<view v-if="item.orderSource == 'WECHAT' && item.orderStep=='WAITING_RECEIVE' && item.shippingStatus=='WAIT_RECEIVING'"
 						class="btn btn-primary" @click.stop="gotoConfirmReceipt(item)">确认收货</view>
 					<view v-if="item.orderSource == 'WECHAT' && (item.orderStep=='WAITING_AUDIT' || item.orderStep=='WAITING_SEND') && item.shippingStatus=='WAIT_SHIPPING'" class="btn btn-primary" @click.stop="gotoEditAddressNew(item)">修改地址</view>
-					<view v-if="item.orderSource == 'WECHAT' && item.canEvaluate== true" class="btn btn-primary" @click.stop="gotoEvaluateProduct(item)">去评价产品</view>
+					<!--评价暂不上线
+					<view v-if="item.orderSource == 'WECHAT' && item.canEvaluate== true" class="btn btn-primary" @click.stop="gotoEvaluateProduct(item)">去评价产品</view>-->
 					<view v-if="item.orderStep=='ORDER_PAID'" class="btn btn-primary" @click.stop="gotoOrderSign(item)">签约
 					</view>
 					<view

subpackage/after-sale/activation-once-again/vehicle-details.vue

@@ -32,10 +32,10 @@
         <text class="label">车辆所有人电话</text>
         <text class="value">{{ vehicleInfo.ownerTel }}</text>
       </view>
-      <view class="info-item">
+      <!-- <view class="info-item">
         <text class="label">车辆号码</text>
         <text class="value">{{ vehicleInfo.vehicleId }}</text>
-      </view>
+      </view> -->
       <view class="info-item">
         <text class="label">行驶证车辆类型</text>
         <text class="value">{{ vehicleInfo.vehicleType }}</text>
@@ -391,13 +391,13 @@ const changeVehicleInfo = () => {
     .label {
       font-size: 28rpx;
       color: #666;
-      flex: 1;
+      // flex: 0;
     }
 
     .value {
       font-size: 28rpx;
       color: #333;
-      flex: 2;
+      // flex: 1;
       text-align: right;
     }
   }

subpackage/orders/car-release.vue

@@ -309,7 +309,7 @@
 									:style="{'--bgimg':`url(${$imgUrl}issuance/bg-border.png`}"></image>
 							</view>
 						</view>
-						<view class="picture-wrapper" @click="cardFileImageUpdate(10)">
+						<view class="picture-wrapper" v-if="state.userType == 'PERSONAL_USER'" @click="cardFileImageUpdate(10)">
 							<view class="bg">
 								<view class="">
 									<view class="name"> 委托书 </view>
@@ -375,6 +375,22 @@
 									:style="{'--bgimg':`url(${$imgUrl}issuance/bg-border.png)`}"></image>
 							</view>
 						</view>
+						<view class="picture-wrapper" v-if="state.userType == 'PERSONAL_USER'" @click="cardFileImageUpdate(10)">
+							<view class="bg">
+								<view class="">
+									<view class="name"> 委托书 </view>
+									<view class="value"> 上传文字清晰的委托书 </view>
+									<view class="tip">
+										<view class="tip-value"> 拍摄规范 </view>
+									</view>
+								</view>
+								<image v-if="!state.form.proxyUrl" class="icon" :src="`${$imgUrl}issuance/weituo.png`"
+									:style="{'--bgimg':`url(${$imgUrl}issuance/bg-border.png`}">
+								</image>
+								<image v-else class="icon" :src="imgPathMontage(state.form.proxyUrlName)"
+									:style="{'--bgimg':`url(${$imgUrl}issuance/bg-border.png`}"></image>
+							</view>
+						</view>
 					</view>
 					<view class="shibie-wrapper">
 						<view class="title"> 识别内容如下 </view>
@@ -644,6 +660,7 @@
 				if (resIn.flag == 1) {
 					// 车辆信息与用户信息不符，上传车主信息
 					state.showOwner = true;
+					state.userType = resIn.userType;
 					state.form.ownerIdType = "101";
 				} else if (resIn.flag == 2) {
 					if (resIn.approvalStatus == 2) {
@@ -837,6 +854,7 @@
 		showImg: true,
 		images: '',
 		showOwner: false,
+		userType: null,
 		data: {
 			transferLogs: [],
 		},

subpackage/orders/order-details-new.vue

@@ -119,7 +119,8 @@
 						<view v-if="state.orderInfo.orderSource == 'WECHAT' && state.orderInfo.orderStep=='WAITING_RECEIVE' && state.orderInfo.shippingStatus=='WAIT_RECEIVING'"
 							class="btn btn-primary" @click.stop="gotoConfirmReceipt(state.orderInfo)">确认收货</view>
 							<view v-if="state.orderInfo.orderSource == 'WECHAT' && (state.orderInfo.orderStep=='WAITING_AUDIT' || state.orderInfo.orderStep=='WAITING_SEND') && state.orderInfo.shippingStatus=='WAIT_SHIPPING'" class="btn btn-primary" @click.stop="gotoEditAddressNew(state.orderInfo)">修改地址</view>
-						<view v-if="state.orderInfo.orderSource == 'WECHAT' && state.orderInfo.canEvaluate== true" class="btn btn-primary" @click.stop="gotoEvaluateProduct(state.orderInfo)">去评价产品</view>
+							<!--//评价暂不上线
+						<view v-if="state.orderInfo.orderSource == 'WECHAT' && state.orderInfo.canEvaluate== true" class="btn btn-primary" @click.stop="gotoEvaluateProduct(state.orderInfo)">去评价产品</view>-->
 						<view v-if="state.orderInfo.orderStep=='ORDER_PAID'" class="btn btn-primary" @click.stop="gotoOrderSign(state.orderInfo)">签约
 						</view>
 						<view

subpackage/orders/order_payment.vue

@@ -558,6 +558,17 @@
 					// 	const params = encodeURIComponent(JSON.stringify(res.qdSignUrl))
 					// 	tools.toUrl(`/subpackage/personal-center/webview?url=` + params);
 					// }
+				}else{
+					uni.showModal({
+						content: "订单待审核，可在ETC订单查看",
+						showCancel: false,
+						confirmText: "我知道了",
+						success() {
+							uni.redirectTo({
+								url: `/pages/order/order`
+							});
+						}
+					});
 				}
 			});
 			

subpackage/orders/product-detail.vue

@@ -65,6 +65,8 @@
 	import {
 		msg, navTo
 	} from "@/utils/utils";
+	
+	let signFlag = "NO";//触发按钮标识
 
 	const savaHandle = () => {
 		console.log("state.productId.length", state.productId.length, "111", state.typeScanCode)
@@ -236,6 +238,7 @@
 	});
 	// 查协议
 	const queryAgreement = () => {
+		if(signFlag === "NO") return;
 		const options = {
 			type: 2,
 			data: {
@@ -383,6 +386,7 @@
 			} else {
 				state.isSign = false
 			}
+			signFlag = "YES"
 			console.log("查询是否签署协议", res)
 
 			let data = res;

subpackage/orders/release-products.vue

@@ -224,6 +224,17 @@
 						const params = encodeURIComponent(JSON.stringify(res.qdSignUrl))
 						tools.toUrl(`/subpackage/personal-center/webview?url=` + params);
 					}
+				}else{
+					uni.showModal({
+						content: "订单待审核，可在ETC订单查看",
+						showCancel: false,
+						confirmText: "我知道了",
+						success() {
+							uni.redirectTo({
+								url: `/pages/order/order`
+							});
+						}
+					});
 				}
 			});
 	}