1

10 months ago · 995d2abcfd
12 changed files with 33 additions and 32 deletions
--- a/pages/verification/index.vue
+++ b/pages/verification/index.vue
@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="common-box">
 			<view class="common-types">
-				<view @click="setType(0)" :class="['common-type',type==0?'active':'']">扫码核销</view>
+				<view @click="setType(0)" :class="['common-type',type==0?'active':'']">扫码核销1</view>
 				<view @click="setType(1)" :class="['common-type',type==1?'active':'']">核销码核销</view>
 				<view @click="setType(2)" :class="['common-type',type==2?'active':'']">手机号核销</view>
 			</view>
@ -46,7 +46,7 @@
 							</view>
 							<view class="flex">
 								<view class="label">订单号:</view>
-								<view class="text">{{item.order_id}}</view>
+								<view class="text">{{item.child_id}}</view>
 							</view>
 							<view class="flex">
 								<view class="label">订单名称:</view>
@ -77,7 +77,7 @@
 								<view class="text">{{item.id_number}}</view>
 							</view>
 						
-						<view class="hexiao-btn" @click="verifyByPhone">核销</view>
+						<view class="hexiao-btn" @click="confirmVerify(item)">核销</view>
 					</view>
 				</view>
 			</view>
@ -121,6 +121,8 @@
 				
 				if (res) {
 					let param = {child_id: res}
+					this.HXCode = res
+					this.HXPhone = ""
 					this.getOrderList(param)
 				}
 				
@ -146,7 +148,7 @@
 					if (res && res.code == 1 && res.data) {
 						this.orderList = res.data || []
 						
-						if (this.orderList.length<=0) {
+						if (this.orderList.length<=0 && !param.noNeedDataTip) {
 							uni.showToast({
 								title:'未查询到需核销的订单',
 								icon:"none"
@ -155,6 +157,7 @@
 					}
 				})
 			},
+			
 			// 核销搜索
 			verifyByCode () {
 				if (this.HXCode.trim() == '') {
@ -162,22 +165,10 @@
 					return
 				}
 				let param = {child_id: this.HXCode.trim()}
+				this.HXPhone = ""
 				this.getOrderList(param)
 			},
-			// 确认核销
-			confirmVerify () {
-				this.Post({code: this.HXCode}, '/api/').then(res=>{
-					uni.showToast({
-						title:'核销成功',
-						icon:'none'
-					})
-					this.HXCode = ""
-					this.$refs.popup.close()
-					this.orderList = []
-				})
-			},

-			// 手机搜索核销单
 			searchByPhone () {
 				if (this.HXPhone.trim() == '') {
 					uni.showToast({title:'请输入手机号',icon:"none"})
@ -187,10 +178,11 @@
 					return
 				}
 				let param = {mobile: this.HXPhone.trim()}
+				this.HXCode = ""
 				this.getOrderList(param)
 			},
-			// 手机号核销
-			verifyByPhone () {
+			// 核销
+			confirmVerify (item) {
 				let _this = this
 				uni.showModal({
 					title: '',
@ -199,8 +191,11 @@
 					success: function (res) {
 						if (res.confirm) {
 							// todo
-							uni.showToast({title:'核销成功'})
-							_this.orderList = []
+							_this.Post({code: item.child_id}, '/api/Merchants/dispose').then(res=>{
+								uni.showToast({title:'核销成功',icon:'success'})
+								let param = {child_id: _this.HXCode, mobile: _this.HXPhone, noNeedDataTip: true}
+								_this.getOrderList(param)
+							})
 						}
 					}
 				});
--- a/static/css/base.css
+++ b/static/css/base.css
@ -52,6 +52,9 @@ view {
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
+.text-overflow::-webkit-scrollbar{
+	display: none;
+}

 /* 两行隐藏 */
 .text-overflowRows {
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/index.html
@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>daoyou</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.2c1f3bb5.js></script><script src=/static/js/index.3f0db60f.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.2c1f3bb5.js></script><script src=/static/js/index.af53bc33.js></script></body></html>
--- a/unpackage/dist/build/web/static/css/base.css
+++ b/unpackage/dist/build/web/static/css/base.css
@ -52,6 +52,9 @@ view {
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
+.text-overflow::-webkit-scrollbar{
+	display: none;
+}

 /* 两行隐藏 */
 .text-overflowRows {
--- a/unpackage/dist/build/web/static/js/index.3f0db60f.js
+++ b/unpackage/dist/build/web/static/js/index.3f0db60f.js
--- a/unpackage/dist/build/web/static/js/index.af53bc33.js
+++ b/unpackage/dist/build/web/static/js/index.af53bc33.js
--- a/unpackage/dist/build/web/static/js/pages-verification-index.2933a640.js
+++ b/unpackage/dist/build/web/static/js/pages-verification-index.2933a640.js
--- a/unpackage/dist/build/web/static/js/pages-verification-index.fbad225c.js
+++ b/unpackage/dist/build/web/static/js/pages-verification-index.fbad225c.js
--- a/unpackage/dist/build/web/static/js/subPackages-user-infoFilling.2c0f82db.js
+++ b/unpackage/dist/build/web/static/js/subPackages-user-infoFilling.2c0f82db.js
--- a/unpackage/dist/build/web/static/js/subPackages-user-infoFilling.4a590c92.js
+++ b/unpackage/dist/build/web/static/js/subPackages-user-infoFilling.4a590c92.js
--- a/unpackage/dist/build/web/static/js/subPackages-user-userInfo.36dc0838.js
+++ b/unpackage/dist/build/web/static/js/subPackages-user-userInfo.36dc0838.js
--- a/unpackage/dist/build/web/static/js/subPackages-user-userInfo.da456c9f.js
+++ b/unpackage/dist/build/web/static/js/subPackages-user-userInfo.da456c9f.js