|
@@ -5,7 +5,7 @@
|
|
<view>
|
|
<view>
|
|
<view class="item ctt">订单确认</view>
|
|
<view class="item ctt">订单确认</view>
|
|
</view>
|
|
</view>
|
|
- <view class="expand" :style="{height:expand?'auto':'300px'}">
|
|
|
|
|
|
+ <view class="expand" :style="{ height: expand ? 'auto' : '300px' }">
|
|
<view class="item">
|
|
<view class="item">
|
|
<text class="label">订单编号</text>
|
|
<text class="label">订单编号</text>
|
|
<text class="desc omit">{{ item.tradeNo }}</text>
|
|
<text class="desc omit">{{ item.tradeNo }}</text>
|
|
@@ -50,7 +50,7 @@
|
|
<text class="label">商户名称</text>
|
|
<text class="label">商户名称</text>
|
|
<text class="desc">{{ item.enterpriseName }}</text>
|
|
<text class="desc">{{ item.enterpriseName }}</text>
|
|
</view>
|
|
</view>
|
|
- <!-- <view class="item">
|
|
|
|
|
|
+ <!-- <view class="item">
|
|
<text class="label">边民额度序号</text>
|
|
<text class="label">边民额度序号</text>
|
|
<text class="desc">{{ item.limitNo }}</text>
|
|
<text class="desc">{{ item.limitNo }}</text>
|
|
</view> -->
|
|
</view> -->
|
|
@@ -77,7 +77,7 @@
|
|
</view>
|
|
</view>
|
|
<view class="more" @click="expand = !expand">
|
|
<view class="more" @click="expand = !expand">
|
|
<text class="icon"></text>
|
|
<text class="icon"></text>
|
|
- <text>{{expand?'收起':'更多信息'}}</text>
|
|
|
|
|
|
+ <text>{{ expand ? '收起' : '更多信息' }}</text>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
@@ -105,6 +105,20 @@ export default {
|
|
this.orderId = e.orderId;
|
|
this.orderId = e.orderId;
|
|
this.getData();
|
|
this.getData();
|
|
}
|
|
}
|
|
|
|
+ //人脸认证回调
|
|
|
|
+ uni.$on('face', res => {
|
|
|
|
+ this.http.request({
|
|
|
|
+ url: '/level-one-server/app/TbOrder/confirmOrder',
|
|
|
|
+ method: 'POST',
|
|
|
|
+ data: { orderId: this.item.id },
|
|
|
|
+ success: res => {
|
|
|
|
+ uni.showToast({ title: '订单确认成功' });
|
|
|
|
+ setTimeout(() => {
|
|
|
|
+ uni.switchTab({ url: '/pages/index/index' });
|
|
|
|
+ }, 1000);
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ });
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
getData() {
|
|
getData() {
|
|
@@ -122,21 +136,15 @@ export default {
|
|
content: '我已核对信息无误',
|
|
content: '我已核对信息无误',
|
|
success: res => {
|
|
success: res => {
|
|
if (res.confirm) {
|
|
if (res.confirm) {
|
|
- this.http.request({
|
|
|
|
- url: '/level-one-server/app/TbOrder/confirmOrder',
|
|
|
|
- method: 'POST',
|
|
|
|
- data: { orderId: this.item.id },
|
|
|
|
- success: res => {
|
|
|
|
- uni.showToast({ title: '订单确认成功' });
|
|
|
|
- setTimeout(() => {
|
|
|
|
- uni.switchTab({ url: '/pages/index/index' });
|
|
|
|
- }, 1000);
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
|
|
+ //跳转到人脸认证
|
|
|
|
+ uni.navigateTo({url:'/pages/face/faceRegister?type=2'})
|
|
}
|
|
}
|
|
}
|
|
}
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
+ },
|
|
|
|
+ destroyed() {
|
|
|
|
+ uni.$off('face');
|
|
}
|
|
}
|
|
};
|
|
};
|
|
</script>
|
|
</script>
|
|
@@ -145,7 +153,7 @@ export default {
|
|
page {
|
|
page {
|
|
background-color: $pg;
|
|
background-color: $pg;
|
|
}
|
|
}
|
|
-.cmain{
|
|
|
|
|
|
+.cmain {
|
|
padding-bottom: 100px;
|
|
padding-bottom: 100px;
|
|
}
|
|
}
|
|
.expand {
|
|
.expand {
|