diff --git a/common/api/api.js b/common/api/api.js index 661392c..f18cd88 100644 --- a/common/api/api.js +++ b/common/api/api.js @@ -3,12 +3,15 @@ import request from '@/common/api/request.js' const url = '/account' //根据经纬度获取信息 export const APIgeocodelocation = (data) => { - return request({ - url: url + '/user/geo/geocode', - method: 'get', - data: data, - toast: false + return new Promise((resove, reject) => { + resove(null) }) + // return request({ + // url: url + '/user/geo/geocode', + // method: 'get', + // data: data, + // toast: false + // }) } //登录 diff --git a/common/api/market/distribution.js b/common/api/market/distribution.js index 7ad74cc..89f453f 100644 --- a/common/api/market/distribution.js +++ b/common/api/market/distribution.js @@ -14,11 +14,11 @@ export const pay = (data) => { // #ifdef MP-WEIXIN platformType = "WX"; platformType = "wechat"; - payType = "wechatPay"; + payType = "WECHAT"; // #endif // #ifdef MP-ALIPAY platformType = "alipay"; - payType = "aliPay"; + payType = "ALIPAY"; // #endif diff --git a/common/api/market/package.js b/common/api/market/package.js index df9d185..7c0a8ea 100644 --- a/common/api/market/package.js +++ b/common/api/market/package.js @@ -10,11 +10,11 @@ let platformType = ''; let payType = ''; // #ifdef MP-WEIXIN platformType = 'wechat' -payType = 'wechatPay' +payType = 'WECHAT' // #endif // #ifdef MP-ALIPAY platformType = 'alipay' -payType = 'aliPay' +payType = 'ALIPAY' // #endif export const getPackage = (data) => { diff --git a/common/api/order/gbOrder.js b/common/api/order/gbOrder.js index 16f2edc..1b27698 100644 --- a/common/api/order/gbOrder.js +++ b/common/api/order/gbOrder.js @@ -6,11 +6,11 @@ let platformType = ''; let payType=''; // #ifdef MP-WEIXIN platformType = 'wechat' -payType='wechatPay' +payType='WECHAT' // #endif // #ifdef MP-ALIPAY platformType = 'alipay' -payType='aliPay' +payType='ALIPAY' // #endif export const warePage = (data) => { diff --git a/common/api/order/index.js b/common/api/order/index.js index a500f17..c4018ae 100644 --- a/common/api/order/index.js +++ b/common/api/order/index.js @@ -6,11 +6,11 @@ let platformType = ''; let payType=''; // #ifdef MP-WEIXIN platformType = 'wechat' -payType='wechatPay' +payType='WECHAT' // #endif // #ifdef MP-ALIPAY platformType = 'alipay' -payType='aliPay' +payType='ALIPAY' // #endif //订单列表 diff --git a/common/api/order/pointGoods.js b/common/api/order/pointGoods.js index f5d9a5e..8dca627 100644 --- a/common/api/order/pointGoods.js +++ b/common/api/order/pointGoods.js @@ -6,11 +6,11 @@ let platformType = ''; let payType=''; // #ifdef MP-WEIXIN platformType = 'wechat' -payType='wechatPay' +payType='WECHAT' // #endif // #ifdef MP-ALIPAY platformType = 'alipay' -payType='aliPay' +payType='ALIPAY' // #endif export const pointGoodsPage = (data) => { diff --git a/common/config.js b/common/config.js index bc7c7ef..91fe54d 100644 --- a/common/config.js +++ b/common/config.js @@ -1,6 +1,6 @@ // const debug = process.env.NODE_ENV == 'development' ? true : false; // const debug = false; // false线上 true本地 -const debug = true; // false线上 true本地 +const debug = false; // false线上 true本地 let baseUrl = '' let baseUrlwws = '' diff --git a/components/goods-price.vue b/components/goods-price.vue index e7db243..c2ff6d7 100644 --- a/components/goods-price.vue +++ b/components/goods-price.vue @@ -15,7 +15,6 @@ {{ cart.memberPrice }} - {{ cart.salePrice }} diff --git a/components/paymentMethod.vue b/components/paymentMethod.vue index 2a26f9e..f25fa1e 100644 --- a/components/paymentMethod.vue +++ b/components/paymentMethod.vue @@ -97,7 +97,7 @@ const paymentMethodList = ref([ name: "微信支付", type: 2, url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png", - payType: "wechatPay", + payType: "WECHAT", }, // #endif // #ifdef MP-ALIPAY diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue index 1a41fe5..edb1e94 100644 --- a/pages/order/confirm-order.vue +++ b/pages/order/confirm-order.vue @@ -577,7 +577,7 @@ name: "微信支付", type: 2, url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/weChat.png", - payType: "wechatPay", + payType: "WECHAT", }; // #endif // #ifdef MP-ALIPAY diff --git a/pages/order/detail.vue b/pages/order/detail.vue index 617e81d..6448788 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -316,7 +316,7 @@ const paymentmethod = reactive({ radiovalue: 2, paymentBtnText: "微信支付", - payType: 'wechatPay' + payType: 'WECHAT' }) const groupChange = async (e) => { diff --git a/pages/product/components/goods-modal.vue b/pages/product/components/goods-modal.vue index 19873fd..f4a3beb 100644 --- a/pages/product/components/goods-modal.vue +++ b/pages/product/components/goods-modal.vue @@ -126,7 +126,7 @@ - + @@ -210,14 +210,47 @@ 「{{ goods.result.suitNum }}{{ goods.result.unitName }}起点」 - + + ￥ /{{ goods.unitName }} - 「{{ goods.suitNum }}{{ goods.unitName }}起点」 + 「{{ selSku.suitNum }}{{ selSku.unitName }}起点」 + + + + ￥ + + + + /{{ goods.unitName }} + 「{{ selSku.suitNum }}{{ selSku.unitName }}起点」 + + + + ￥ + + + + /{{ goods.unitName }} + 「{{ selSku.suitNum }}{{ selSku.unitName }}起点」 + + + + ￥ + + + + /{{ goods.unitName }} + 「{{ selSku.suitNum }}{{ selSku.unitName }}起点」 @@ -446,7 +479,12 @@ const swiperCurrent = ref(0); function returnFirstSku(product) { - return product.skuList[0] + console.log('returnFirstSku', product.skuList[0]); + return { + ...product.skuList[0], + sku_id: product.skuList[0].id, + id: product.id, + } } //返回是否是多规格商品 function returnIsSkuGoods(item) { diff --git a/pages/product/index.vue b/pages/product/index.vue index 08b30bb..65902cc 100644 --- a/pages/product/index.vue +++ b/pages/product/index.vue @@ -161,9 +161,8 @@ @tap.stop="$u.throttle(() => singleclick(item, '-'), 500)"> --> - {{ returnGoodsImCartNum(item1) < 99 ? returnGoodsImCartNum(item1) : '99+' }} + v-if="returnGoodsImCartNum(item)">{{ returnGoodsImCartNum(item) < 99 ? returnGoodsImCartNum(item) : '99+' }}