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

This commit is contained in:
yangtao 2024-03-26 15:07:02 +08:00
commit 1381ffe774
1 changed files with 15 additions and 2 deletions

View File

@ -73,6 +73,7 @@
import customTab from '@/components/customTab'; import customTab from '@/components/customTab';
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import {shopInit,shopNearby} from '@/api/shop.js' import {shopInit,shopNearby} from '@/api/shop.js'
import {getOrderOfflinePay} from '@/api/admin.js'
export default { export default {
components:{ components:{
customTab, customTab,
@ -201,8 +202,20 @@
// #ifdef APP-PLUS // #ifdef APP-PLUS
uni.scanCode({ uni.scanCode({
scanType:['qrCode'], 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 // #endif