@@ -262,7 +265,7 @@ export default {
},
{
title: '实际支付',
- key: 'pay_price',
+ slot: 'pay_price',
align: 'center',
width: 100,
},
diff --git a/template/uni-app/App.vue b/template/uni-app/App.vue
index bb19b2424..9ac4667c4 100644
--- a/template/uni-app/App.vue
+++ b/template/uni-app/App.vue
@@ -123,6 +123,13 @@
async onLaunch(option) {
uni.hideTabBar()
let that = this;
+ // #ifdef H5
+ if (option.query.hasOwnProperty('type') && option.query.type == "iframeWindow") {
+ this.globalData.isIframe = true;
+ } else {
+ this.globalData.isIframe = false;
+ }
+ // #endif
colorChange('color_change').then(res => {
uni.setStorageSync('is_diy', res.data.is_diy)
uni.$emit('is_diy', res.data.is_diy)
@@ -245,13 +252,7 @@
}
// #endif
- // #ifdef H5
- if (option.query.hasOwnProperty('type') && option.query.type == "iframeWindow") {
- this.globalData.isIframe = true;
- } else {
- this.globalData.isIframe = false;
- }
- // #endif
+
// #ifdef MP
// 小程序静默授权
// if (!this.$store.getters.isLogin) {
diff --git a/template/uni-app/pages/goods/cashier/index.vue b/template/uni-app/pages/goods/cashier/index.vue
index 3c2dfc22f..7f63528e3 100644
--- a/template/uni-app/pages/goods/cashier/index.vue
+++ b/template/uni-app/pages/goods/cashier/index.vue
@@ -178,7 +178,7 @@
getBasicConfig() {
basicConfig().then(res => {
//微信支付是否开启
- this.cartArr[0].payStatus = res.data.wechat_pay_status || 0
+ this.cartArr[0].payStatus = res.data.pay_weixin_open || 0
//支付宝是否开启
this.cartArr[1].payStatus = res.data.ali_pay_status || 0;
//#ifdef MP