diff --git a/entryManager/add/add.vue b/entryManager/add/add.vue index 83998b9..22cfcd2 100644 --- a/entryManager/add/add.vue +++ b/entryManager/add/add.vue @@ -292,7 +292,7 @@ }, 'contactIdCardBackPic.url': { required: true, - errorMsg: '请上传联系人身份证正面照片', + errorMsg: '请上传联系人身份证反面照片', }, contactName: { required: true, diff --git a/entryManager/add/components/basic-info.vue b/entryManager/add/components/basic-info.vue index b0a8a2a..f3d5df3 100644 --- a/entryManager/add/components/basic-info.vue +++ b/entryManager/add/components/basic-info.vue @@ -48,13 +48,13 @@ @@ -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 {}