This commit is contained in:
parent
de27c2770d
commit
0962120ab4
|
|
@ -1 +1,2 @@
|
||||||
|
#!/usr/bin/env sh
|
||||||
npx lint-staged
|
npx lint-staged
|
||||||
|
|
|
||||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
|
@ -28,6 +28,8 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"eslint": "^8.56.0",
|
||||||
|
"eslint-plugin-vue": "^9.33.0",
|
||||||
"husky": "^9.1.7",
|
"husky": "^9.1.7",
|
||||||
"lint-staged": "^16.4.0"
|
"lint-staged": "^16.4.0"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -352,7 +352,6 @@ const data = reactive({
|
||||||
active_id: 0,
|
active_id: 0,
|
||||||
active_ids: 0,
|
active_ids: 0,
|
||||||
activeitems: {},
|
activeitems: {},
|
||||||
coupon: true,
|
|
||||||
currentUrl: '',
|
currentUrl: '',
|
||||||
background: ['color1', 'color2', 'color3'],
|
background: ['color1', 'color2', 'color3'],
|
||||||
indicatorDots: false,
|
indicatorDots: false,
|
||||||
|
|
@ -488,7 +487,7 @@ onBackPress((e) => {
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
onLoad(async () => {
|
onLoad(async (option) => {
|
||||||
if (option.source) {
|
if (option.source) {
|
||||||
data.source = option.source
|
data.source = option.source
|
||||||
}
|
}
|
||||||
|
|
@ -503,7 +502,8 @@ onLoad(async () => {
|
||||||
} else if (themeConfig?.theme == '0405') {
|
} else if (themeConfig?.theme == '0405') {
|
||||||
data.banner = '/static/image/recharge/qmj/bannar.png'
|
data.banner = '/static/image/recharge/qmj/bannar.png'
|
||||||
data.benefitList.forEach(item => {
|
data.benefitList.forEach(item => {
|
||||||
item.url = item.url.replace('/static/image/recharge/', '/static/image/recharge/qmj/')
|
item.url = item.url.replace('/static/image/recharge/',
|
||||||
|
'/static/image/recharge/qmj/')
|
||||||
})
|
})
|
||||||
} else if (themeConfig?.theme == '0401') {
|
} else if (themeConfig?.theme == '0401') {
|
||||||
data.banner = '/static/image/recharge/yrj/bannar.png'
|
data.banner = '/static/image/recharge/yrj/bannar.png'
|
||||||
|
|
@ -1172,7 +1172,8 @@ async function activateVip(type = '') {
|
||||||
let paymentRes = await postJson('a', 'api/order', {
|
let paymentRes = await postJson('a', 'api/order', {
|
||||||
goods_id: data.goods.goods_id,
|
goods_id: data.goods.goods_id,
|
||||||
coupon: data.active_id ? data.active_id : '',
|
coupon: data.active_id ? data.active_id : '',
|
||||||
pay_type: paymentMethod.value == "wxpay" ? (data.goods.weixinMpOriId && isComBo ? 'combo' : 'weixin') : "alipay",
|
pay_type: paymentMethod.value == "wxpay" ? (data.goods.weixinMpOriId && isComBo ? 'combo' :
|
||||||
|
'weixin') : "alipay",
|
||||||
"pay_source": "app",
|
"pay_source": "app",
|
||||||
// source: "uni_alipay",
|
// source: "uni_alipay",
|
||||||
source: data.source,
|
source: data.source,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue