进件增加查看签约码，增加查询

entryManager/add/add.vue

@@ -292,7 +292,7 @@
 				},
 				'contactIdCardBackPic.url': {
 					required: true,
-					errorMsg: '请上传联系人身份证正面照片',
+					errorMsg: '请上传联系人身份证反面照片',
 				},
 				contactName: {
 					required: true,

entryManager/add/components/basic-info.vue

@@ -48,13 +48,13 @@
 
 			<template v-if="form.contactPersonType=='SUPER'">
 				<view class="form-item required">
-					<view class="title"> 联系人身份证正面</view>
+					<view class="title"> 联系人身份证正面（国徽）</view>
 					<my-upload-img v-model="form.contactIdCardFrontPic.url" :size="200"
 						@uploadSuccess="uploadSuccess($event,'IdCard','contactIdCardFrontPic')"></my-upload-img>
+						
 				</view>
-
 				<view class="form-item required">
-					<view class="title"> 联系人身份证背面</view>
+					<view class="title"> 联系人身份证背面（头像）</view>
 					<my-upload-img v-model="form.contactIdCardBackPic.url" :size="200"
 						@uploadSuccess="uploadSuccess($event,'IdCard','contactIdCardBackPic')"></my-upload-img>
 				</view>
@@ -188,7 +188,7 @@
 			uni.hideLoading()
 			if (res) {
 				const data = res.subImages[0].kvInfo.data
-				if (key == 'contactIdCardBackPic') {
+				if (key == 'contactIdCardFrontPic') {
 					if (data.validPeriod) {
 						const [start, end] = data.validPeriod.split('-')
 						if (start) {
@@ -204,7 +204,7 @@
 						}
 					}
 				}
-				if (key == 'contactIdCardFrontPic') {
+				if (key == 'contactIdCardBackPic') {
 					form.contactName = data.name
 					form.contactPersonId = data.idNumber
 					form.contactAddr = data.address

entryManager/add/components/legalPerpole-info.vue

@@ -7,13 +7,13 @@
 
 
 			<view class="form-item required">
-				<view class="title"> 身份证正面</view>
+				<view class="title"> 身份证正面（国徽）</view>
 				<my-upload-img v-model="form.idCardFrontPic.url" :size="200" :maxSize="maxSize"
 				@uploadSuccess="uploadSuccess($event,'IdCard','idCardFrontPic')"
 				></my-upload-img>
 			</view>
 			<view class="form-item required">
-				<view class="title"> 身份证反面</view>
+				<view class="title"> 身份证反面（国徽）</view>
 				<my-upload-img v-model="form.idCardBackPic.url" :size="200" :maxSize="maxSize"
 				@uploadSuccess="uploadSuccess($event,'IdCard','idCardBackPic')"
 				></my-upload-img>
@@ -186,7 +186,7 @@ import { includes } from 'lodash';
 			uni.hideLoading()
 			if (res) {
 				const data = res.subImages[0].kvInfo.data
-				if (key == 'idCardBackPic') {
+				if (key == 'idCardFrontPic') {
 					if (data.validPeriod) {
 						const [start, end] = data.validPeriod.split('-')
 						if (start) {
@@ -202,7 +202,7 @@ import { includes } from 'lodash';
 						}
 					}
 				}
-				if (key == 'idCardFrontPic') {
+				if (key == 'idCardBackPic') {
 					form.legalPersonName = data.name
 					form.legalPersonId = data.idNumber
 					form.legalAddress = data.address

entryManager/index/index.vue

@@ -2,14 +2,15 @@
 	<view class="min-page bg-f7 u-font-28 color-333">
 		<up-sticky>
 			<view class="top u-flex">
-				<up-select  :options="statusList" @select="statusListSelect">
+				<up-select :options="statusList" @select="statusListSelect">
 					<template #text>
 						<text v-if="query.status">{{returnStatusLabel(query.status)}}</text>
 						<text v-else>状态</text>
 					</template>
 				</up-select>
 				<view class="u-flex-1 u-p-l-32">
-					<up-search placeholder="店铺名称" v-model="query.shopName" @search="search" @clear="search" @custom="search"></up-search>
+					<up-search placeholder="店铺名称" v-model="query.shopName" @search="search" @clear="search"
+						@custom="search"></up-search>
 				</view>
 			</view>
 		</up-sticky>
@@ -39,15 +40,23 @@
 								{{returnStatusLabel(item.alipayStatus)}}
 							</view>
 						</view>
+						<view v-if="item.alipayStatus==='SIGN'" class="u-m-t-16">
+							<my-button @click="showCode(item,'aliPay')">查看签约码</my-button>
+						</view>
 						<view class="u-m-t-14" v-if="item.alipayErrorMsg">
 							<up-alert title="拒绝原因" type="error" :description="item.alipayErrorMsg"></up-alert>
 						</view>
 					</view>
 					<view class="status">
-						<view class="u-flex u-row-between">
+						<view class="">
-							<text class="font-bold">微信进件状态</text>
+							<view class="u-flex u-row-between">
-							<view class="state" :class="returnStatusClass(item.wechatStatus)">
+								<text class="font-bold">微信进件状态</text>
-								{{returnStatusLabel(item.wechatStatus)}}
+								<view class="state" :class="returnStatusClass(item.wechatStatus)">
+									{{returnStatusLabel(item.wechatStatus)}}
+								</view>
+							</view>
+							<view v-if="item.wechatStatus==='SIGN'" class="u-m-t-16">
+								<my-button @click="showCode(item,'wx')">查看签约码</my-button>
 							</view>
 
 						</view>
@@ -64,10 +73,15 @@
 						<text class="color-666">创建时间：</text>
 						<view class=" font-bold">{{item.createTime}}</view>
 					</view>
-					
+
-					<view class="u-flex u-m-t-32  u-row-right">
+					<view class="u-flex u-m-t-32  u-row-right gap-20">
+						<view style="min-width: 160rpx;" v-if="
+						item.wechatStatus == 'INIT' || item.wechatStatus == 'AUDIT'||item.wechatStatus == 'SIGN'  || item.alipayStatus == 'INIT' || item.alipayStatus == 'AUDIT' ||item.alipayStatus == 'SIGN'
+						">
+							<my-button @click="queryStatus(item)">查询</my-button>
+						</view>
 						<view style="min-width: 160rpx;">
-							<my-button @click="toEdit(item)" >编辑</my-button>
+							<my-button @click="toEdit(item)">编辑</my-button>
 						</view>
 					</view>
 				</view>
@@ -89,6 +103,15 @@
 		</view>
 
 		<shopSelect v-model="showShopSelect" @confirm="toAdd"></shopSelect>
+		<up-popup :show="codeShow" mode="center" @close="codeShow=false"
+		 round="16rpx"
+		 :close-on-click-overlay="true">
+			<view style="border-radius: 16rpx;overflow: hidden;" class="u-p-b-30">
+				<up-image width="200" height="200" :src="code"></up-image>
+				<view class="u-m-t-0 text-center" v-if="codeType=='wx'">请打开微信扫码</view>
+				<view class="u-m-t-0 text-center" v-if="codeType=='aliPay'">请打开支付宝扫码</view>
+			</view>
+		</up-popup>
 	</view>
 </template>
 
@@ -97,6 +120,10 @@
 		userTypes
 	} from '../data.js'
 
+	const code = ref('')
+	const codeShow = ref(false)
+	const codeType=ref('')
+
 	function returnType(type) {
 		if (userTypes[type]) {
 			return userTypes[type]
@@ -110,10 +137,12 @@
 	} from 'vue';
 	import shopSelect from '../components/shop-select.vue'
 	import {
-		onReachBottom,onShow
+		onReachBottom,
+		onShow
 	} from '@dcloudio/uni-app'
 	import {
-		getList
+		getList,
+		queryEntry
 	} from '@/http/api/order/entryManager.js'
 
 	// WAIT 待提交
@@ -153,8 +182,9 @@
 			class: 'error'
 		},
 	]
-	function statusListSelect(e){
+
-		query.status=e.value
+	function statusListSelect(e) {
+		query.status = e.value
 	}
 	const statusLabelJson = {
 		'REJECTED': '已拒绝'
@@ -179,6 +209,17 @@
 		return ''
 	}
 
+	function showCode(item, type) {
+		if (type == 'wx') {
+			code.value = item.wechatSignUrl
+		}
+		if (type == 'aliPay') {
+			code.value = item.alipaySignUrl
+		}
+		codeType.value=type
+		codeShow.value = true
+
+	}
 
 	const showShopSelect = ref(false)
 
@@ -188,7 +229,7 @@
 		shopName: '',
 		status: ''
 	})
-	watch(()=>query.status,(newval)=>{
+	watch(() => query.status, (newval) => {
 		search()
 	})
 	const isEnd = ref(false)
@@ -206,12 +247,12 @@
 			url: '/entryManager/add/add?shopId=' + shop.shopId
 		})
 	}
-	
+
-	
+
-	function toEdit(shop){
+	function toEdit(shop) {
 		console.log(shop)
 		uni.navigateTo({
-			url: '/entryManager/add/add?shopId=' + shop.shopId+'&licenceNo='+shop.licenceNo
+			url: '/entryManager/add/add?shopId=' + shop.shopId + '&licenceNo=' + shop.licenceNo
 		})
 	}
 
@@ -225,6 +266,17 @@
 			}
 		})
 	}
+
+	function queryStatus(item) {
+		queryEntry({
+			licenceNo: item.licenceNo,
+			shopId: item.shopId
+		}).then(res => {
+			isEnd.value = false
+			query.page = 1;
+			getData()
+		})
+	}
 	onReachBottom(() => {
 		if (!isEnd.value) {
 			query.page++
@@ -256,7 +308,7 @@
 		background-color: #fff;
 		z-index: 100;
 		padding: 32rpx 28rpx;
-		padding-bottom:40rpx;
+		padding-bottom: 40rpx;
 	}
 
 	.types {}