diff --git a/pages/verification/index.vue b/pages/verification/index.vue
index 8ebbe6f..7314877 100644
--- a/pages/verification/index.vue
+++ b/pages/verification/index.vue
@@ -2,7 +2,7 @@
- 扫码核销
+ 扫码核销1
核销码核销
手机号核销
@@ -46,7 +46,7 @@
订单号:
- {{item.order_id}}
+ {{item.child_id}}
订单名称:
@@ -77,7 +77,7 @@
{{item.id_number}}
- 核销
+ 核销
@@ -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)
+ })
}
}
});
diff --git a/static/css/base.css b/static/css/base.css
index dd1dc8b..0c597e7 100644
--- 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 {
diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html
index 6622f33..ae12402 100644
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/index.html
@@ -1,2 +1,2 @@
daoyou
\ No newline at end of file
+ document.write('')