diff --git a/components/goods-sku-popup/index.vue b/components/goods-sku-popup/index.vue index e931ea7..3618495 100644 --- a/components/goods-sku-popup/index.vue +++ b/components/goods-sku-popup/index.vue @@ -923,7 +923,7 @@ if (that.amountType === 0) { return n.toFixed(2); } else { - return (n / 100).toFixed(2); + return (n).toFixed(2); } }, pushGoodsCache(goodsInfo) { diff --git a/pages/checkout/cashier/index.vue b/pages/checkout/cashier/index.vue index 2cd99f7..d6ed912 100644 --- a/pages/checkout/cashier/index.vue +++ b/pages/checkout/cashier/index.vue @@ -3,10 +3,10 @@ - + diff --git a/pages/checkout/index.vue b/pages/checkout/index.vue index 0e2f1ff..c7641af 100644 --- a/pages/checkout/index.vue +++ b/pages/checkout/index.vue @@ -361,8 +361,16 @@ import storage from '@/utils/storage' app.showToast(result.message, 1500) setTimeout(() => app.$goPageByToken('pages/order/index', {}, 'redirectTo'), 1500) } else { - // 订单未支付: 跳转到订单支付页 - setTimeout(() => app.$goPageByToken('pages/checkout/cashier/index', res.data, 'redirectTo'), 100) + uni.requestPayment({ + ...res.data, + success: (res) => { + setTimeout(() => app.$goPageByToken('pages/order/index', {}, 'redirectTo'), 1500) + resolve(res); + }, + fail: (err) => { + reject(err); + }, + }); } }).finally(() => setTimeout(() => app.disabled = false, 1600)) }, diff --git a/pages/goods/components/SkuPopup.vue b/pages/goods/components/SkuPopup.vue index 5d3252f..fd975ef 100644 --- a/pages/goods/components/SkuPopup.vue +++ b/pages/goods/components/SkuPopup.vue @@ -80,7 +80,7 @@ goods_id: id, goods_name: title, image: item.imageUrl ? item.imageUrl : mainImageUrl, - price: item.promotionPrice * 100, + price: item.promotionPrice, stock: item.stock, spec_value_ids: item.vvSkuPropertyValueList.map(item => item.id).join('_'), sku_name_arr: item.vvSkuPropertyValueList.map(item => item.productPropertyValue) diff --git a/pages/index/index.vue b/pages/index/index.vue index 87306bc..f304b27 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -47,7 +47,7 @@ export default { app.items = await this.handleGetHomeData().finally(() => callback && callback()); }, async handleGetHomeData() { - const res = await apiGetCommodityList({}); + const res = await apiGetCommodityList({ page: 1, pageSize: 1000 }); return mockData.map(item => { if (item.type === 'goods') { item.data = res.data.rows