|
@@ -111,7 +111,6 @@ import { ref, computed } from 'vue'
|
|
|
import { getUserAvatar } from '@/utils/avatar'
|
|
|
import { userStore } from '@/store/user'
|
|
|
import { getMembershipPackageList } from '@/api/vip'
|
|
|
-// import { orderCreated, getOrder, payOrderSubmit } from '@/api/common'
|
|
|
import { orderCreated, getOrder, getSocialUser, socialUserBind, payOrderSubmit } from '@/api/common'
|
|
|
const useUserStore = userStore()
|
|
|
|
|
@@ -162,12 +161,6 @@ const payType = ref([
|
|
|
icon: 'icon-weixinzhifu',
|
|
|
color: '#1AAD19'
|
|
|
}
|
|
|
- // {
|
|
|
- // name: '银行卡支付',
|
|
|
- // value: 'alipay',
|
|
|
- // icon: 'icon-alipay',
|
|
|
- // color: '#1296db'
|
|
|
- // }
|
|
|
])
|
|
|
|
|
|
const payTypeCurrent = ref(0)
|
|
@@ -264,7 +257,6 @@ const prepay = async (channel, orderData) => {
|
|
|
res.msg.indexOf('无效的openid') >= 0 || // 获取的 openid 不正确时,或者随便输入了个 openid
|
|
|
res.msg.indexOf('下单账号与支付账号不一致') >= 0
|
|
|
) {
|
|
|
- // https://developers.weixin.qq.com/community/develop/doc/00008c53c347804beec82aed051c00
|
|
|
bindWeiXin()
|
|
|
}
|
|
|
}
|
|
@@ -308,7 +300,6 @@ const weChatMiniProgramPay = async (orderData) => {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
-// uni.showToast({ title: '支付升级中', icon: 'none'})
|
|
|
// 支付
|
|
|
const handlePay = async () => {
|
|
|
const val = chooseItem.value
|
|
@@ -371,10 +362,7 @@ const getMemberList = async () => {
|
|
|
// 低于当前套餐的(套餐)不展示
|
|
|
memberList.value = vipFlagIndex ? list.slice(vipFlagIndex) : list
|
|
|
if ((!userInfo.value?.vipFlag || userInfo.value?.vipExpireDate - new Date().getTime() > 0 ) && typeof recommend.value === 'number') {
|
|
|
- // current.value = parseInt(recommend.value / 2)
|
|
|
current.value = vipFlagIndex === 0 ? 0 : parseInt((vipFlagIndex || recommend.value) / 2)
|
|
|
- // chooseId.value = memberList.value[recommend.value]?.id
|
|
|
- // chooseItem.value = memberList.value[recommend.value]
|
|
|
}
|
|
|
// 设置选中项
|
|
|
const chooseIndex = vipFlagIndex !== null ? vipFlagIndex : recommend.value
|