diff --git a/jiuyi2/components/index/appVerUpdate.vue b/jiuyi2/components/index/appVerUpdate.vue index 08cae14a..4337d514 100644 --- a/jiuyi2/components/index/appVerUpdate.vue +++ b/jiuyi2/components/index/appVerUpdate.vue @@ -60,11 +60,9 @@ }) } - // 取消 - function handleCancel() { - // 判断是否强制更新 - if (versionCloud.value.isForce == 1) plus.runtime.quit() - else close() + // 关闭 + function handleQuit() { + plus.runtime.quit() } defineExpose({ @@ -97,8 +95,12 @@ 更新 - - 取消 + + 关闭 + + + + 取消 diff --git a/jiuyi2/pages.json b/jiuyi2/pages.json index b0563858..0943851f 100644 --- a/jiuyi2/pages.json +++ b/jiuyi2/pages.json @@ -793,6 +793,13 @@ { "navigationBarTitleText" : "聊天信息" } + }, + { + "path" : "pages/shop/gift", + "style" : + { + "navigationBarTitleText" : "礼包专区" + } } ], diff --git a/jiuyi2/pages/index/wallet/topUp.vue b/jiuyi2/pages/index/wallet/topUp.vue index 39cb57b0..718e3b86 100644 --- a/jiuyi2/pages/index/wallet/topUp.vue +++ b/jiuyi2/pages/index/wallet/topUp.vue @@ -30,14 +30,14 @@ return handleAlipayPay(event) } }, - { - img: '/static/shop-weixin-pay.png', - name: '微信支付', - provider: 'wxpay', - apiRequest: (event) => { - return handleWeChat(event) - } - }, + // { + // img: '/static/shop-weixin-pay.png', + // name: '微信支付', + // provider: 'wxpay', + // apiRequest: (event) => { + // return handleWeChat(event) + // } + // }, ]) // 支付列表下标 const paymentIndex = ref(0) diff --git a/jiuyi2/pages/shop/gift.vue b/jiuyi2/pages/shop/gift.vue new file mode 100644 index 00000000..07fde9c6 --- /dev/null +++ b/jiuyi2/pages/shop/gift.vue @@ -0,0 +1,107 @@ + + + + + \ No newline at end of file diff --git a/jiuyi2/pages/shop/shop.vue b/jiuyi2/pages/shop/shop.vue index 2385fc20..1456da97 100644 --- a/jiuyi2/pages/shop/shop.vue +++ b/jiuyi2/pages/shop/shop.vue @@ -2,7 +2,6 @@ /** * 商城 */ - // 底部菜单 import { ref, reactive, @@ -106,7 +105,7 @@