Merge remote-tracking branch 'origin/dev_store' into dev-plus-max

pages/shop/index.vue

@@ -73,6 +73,7 @@
 	import customTab from '@/components/customTab';
 	import { mapGetters } from "vuex";
 	import {shopInit,shopNearby} from '@/api/shop.js'
+	import {getOrderOfflinePay} from '@/api/admin.js'
 	export default {
 		components:{
 			customTab,
@@ -201,8 +202,20 @@
 				// #ifdef APP-PLUS
 				uni.scanCode({
 					scanType:['qrCode'],
-					success: function (res) {
+					success: async (res)=> {
-						console.log('二维码信息：' + res);
+						let result = JSON.parse(res.result)
+						let val = await getOrderOfflinePay(result.sn)
+						if(val.status == 200){
+							this.$util.Tips({
+								title: '支付成功',
+								icon: 'success'
+							});
+							setTimeout(()=>{
+								uni.navigateTo({
+									url:'/pages/users/order_list/index?status=-1'
+								})
+							},1000)
+						}
 					}
 				});
 				// #endif