diff --git a/env b/env index 3046544..c20e140 100644 --- a/env +++ b/env @@ -1,3 +1,6 @@ +# 版本号 +SHOPRO_VERSION = v1.8.1 + # 正式环境接口域名 SHOPRO_BASE_URL = https://api.shopro.sheepjs.com @@ -13,7 +16,5 @@ SHOPRO_API_PATH = /shop/api/ # 客户端静态资源地址 空=默认使用服务端指定的CDN资源地址前缀 | local=本地 | http(s)://xxx.xxx=自定义静态资源地址前缀 SHOPRO_STATIC_URL = https://file.sheepjs.com -SHOPRO_VERSION = v1.8.1 - -# 是否开启直播 1 开启直播 | 0 关闭直播 +# 是否开启直播 1 开启直播 | 0 关闭直播 (小程序官方后台未审核开通直播权限时请勿开启) SHOPRO_MPLIVE_ON = 0 \ No newline at end of file diff --git a/pages/order/aftersale/apply.vue b/pages/order/aftersale/apply.vue index b07407c..6c620df 100644 --- a/pages/order/aftersale/apply.vue +++ b/pages/order/aftersale/apply.vue @@ -3,13 +3,9 @@ - + @@ -18,17 +14,9 @@ 售后类型 - @@ -47,13 +35,8 @@ 联系方式 - + @@ -61,23 +44,11 @@ 相关描述 - + - + @@ -86,9 +57,7 @@ - + @@ -97,29 +66,17 @@ - 申请原因 + 申请原因 - - + @@ -127,232 +84,235 @@ diff --git a/pages/order/list.vue b/pages/order/list.vue index a51399e..da5a564 100644 --- a/pages/order/list.vue +++ b/pages/order/list.vue @@ -394,7 +394,7 @@ success: async function (res) { if (res.confirm) { // #ifdef MP - sheep.$platform.useProvider('wechat').subscribeMessage('order_apply_refund'); + sheep.$platform.useProvider('wechat').subscribeMessage('order_refund'); // #endif const { error, data } = await sheep.$api.order.applyRefund(orderId); if (error === 0) { diff --git a/pages/pay/recharge.vue b/pages/pay/recharge.vue index 08353bb..ccd8adf 100644 --- a/pages/pay/recharge.vue +++ b/pages/pay/recharge.vue @@ -1,53 +1,34 @@ diff --git a/sheep/platform/pay.js b/sheep/platform/pay.js index aa97e20..2912003 100644 --- a/sheep/platform/pay.js +++ b/sheep/platform/pay.js @@ -135,7 +135,7 @@ export default class SheepPay { const { error, data } = await this.prepay(); if (error === 0) { const redirect_url = `${getRootUrl()}pages/pay/result?orderSN=${this.orderSN}&payment=${this.payment - }`; + }&orderType=${this.orderType}`; location.href = `${data.pay_data.h5_url}&redirect_url=${encodeURIComponent(redirect_url)}`; } } @@ -145,7 +145,7 @@ export default class SheepPay { let { error, data } = await this.prepay(); if (error === 0) { const redirect_url = `${getRootUrl()}pages/pay/result?orderSN=${this.orderSN}&payment=${this.payment - }`; + }&orderType=${this.orderType}`; location.href = data.pay_data + encodeURIComponent(redirect_url); } }