diff --git a/src/api/goods.ts b/src/api/goods.ts index 7adcd51..9d5c5ad 100644 --- a/src/api/goods.ts +++ b/src/api/goods.ts @@ -90,3 +90,6 @@ export const checkTradePwd = (data: object) => // 获取活动商品或者活动积分商品 export const getHdOrJfGoods = (data: object) => request('/activity/goods', data, 'POST'); + +// 获取支付列表 +export const getPayList = (data: object) => request('/payType', data, 'POST'); diff --git a/src/pages/goods/pay/index.vue b/src/pages/goods/pay/index.vue index b02141e..66d7a36 100644 --- a/src/pages/goods/pay/index.vue +++ b/src/pages/goods/pay/index.vue @@ -8,21 +8,25 @@ + {{ payVal }} + :title="item.name" + :desc="item.number > 0 ? item.number : ''" + @click="cellClick(item.ID)"> - - + --> @@ -99,7 +103,7 @@ import Taro from '@tarojs/taro'; import {IconFont} from '@nutui/icons-vue-taro'; import {onUnmounted, ref} from 'vue'; -import {getActiveOrderDetail, checkTradePwd} from '@/api/goods'; +import {getActiveOrderDetail, checkTradePwd, getPayList} from '@/api/goods'; import {getUserPoint} from '@/api/admin'; import {payOrder} from '@/api/order'; import {isCheckTradePwd} from '@/api/user'; @@ -130,12 +134,21 @@ const opt = ref({}); Taro.useLoad(e => { const {oid, bid, OrderType} = e; opt.value = e; + get_pay_list(); getData(oid, bid, OrderType); }); const a = ref(0); const b = ref(0); +const payList = ref([]); + +const get_pay_list = async () => { + const res = await getPayList({}); + // console.log(res); + payList.value = res.data.data || []; +}; + const getData = async (oid: string, bid: string, OrderType: number) => { const user_info = Taro.getStorageSync('userInfo'); const data = await getUserPoint({ @@ -163,7 +176,7 @@ const getData = async (oid: string, bid: string, OrderType: number) => { b.value += item.exchange; }); - console.log(orderData.value); + // console.log(orderData.value); if (!orderData.value.oid) return Taro.showToast({ title: '未获取到订单信息~', @@ -290,16 +303,8 @@ const shortClose = (isMsg: boolean = true) => { if (isMsg) Taro.showToast({title: '支付取消', icon: 'none'}); }; -const cellClick = (val: number, isTrue: boolean) => { - if (isTrue) { - Taro.showToast({ - title: '该支付暂不可用!', - icon: 'none', - }); - payVal.value = undefined; - } else { - payVal.value = val; - } +const cellClick = (val: number) => { + payVal.value = val; }; const countdownTime = () => {