diff --git a/buyer/public/config.js b/buyer/public/config.js index 39fb8a71..bcce08d3 100644 --- a/buyer/public/config.js +++ b/buyer/public/config.js @@ -3,8 +3,8 @@ var BASE = { * @description api请求基础路径 */ API_DEV: { - common: "https://common-api.pickmall.cn", - buyer: "https://buyer-api.pickmall.cn", + common: "http://192.168.0.113:8890", + buyer: "http://192.168.0.113:8898", seller: "https://store-api.pickmall.cn", manager: "https://admin-api.pickmall.cn" // common: "http://192.168.0.105:8890", diff --git a/buyer/src/api/cart.js b/buyer/src/api/cart.js index 57d99878..c8d13461 100644 --- a/buyer/src/api/cart.js +++ b/buyer/src/api/cart.js @@ -212,3 +212,52 @@ export function receiptSelect (params) { params }); } + +/** + * 获取全部配送方式 + */ + export function shippingMethodList(params) { + return request({ + url: `/buyer/trade/carts/shippingMethodList`, + method: Method.GET, + needToken: true, + params: params, + }); +} + +/** + * 获取全部配送方式 + */ + export function storeAddressList(params) { + return request({ + url: `/buyer/store/address/shippingMethodList`, + method: Method.GET, + needToken: true, + params: params, + }); +} + +/** + * 设置自提地址ID + * @param addressId + */ + export function setStoreAddressId(storeAddressId,way) { + return request({ + url: `/buyer/trade/carts/storeAddress?storeAddressId=${storeAddressId}&way=${way}`, + method: Method.GET, + needToken: true, + }); +} + +/** + * 提交配送方式 + * @param params + */ + export function setShipMethod(params) { + return request({ + url: "/buyer/trade/carts/shippingMethod", + method: Method.PUT, + needToken: true, + params, + }); +} diff --git a/buyer/src/api/shopentry.js b/buyer/src/api/shopentry.js index 96aa08f8..b1d178ae 100644 --- a/buyer/src/api/shopentry.js +++ b/buyer/src/api/shopentry.js @@ -75,3 +75,15 @@ export function applyStatus () { method: Method.GET }) } + +/** + * 获取自提点信息 + * @param storeId + */ + export function getStoreAddress(storeId,params) { + return request({ + url: `/buyer/store/address/page/${storeId}`, + method: Method.GET, + params + }); +} diff --git a/buyer/src/pages/GoodsDetail.vue b/buyer/src/pages/GoodsDetail.vue index da752845..14fdb13c 100644 --- a/buyer/src/pages/GoodsDetail.vue +++ b/buyer/src/pages/GoodsDetail.vue @@ -8,26 +8,18 @@
收货人:{{ order.order.consigneeName }}
手机号码:{{ order.order.consigneeMobile | secrecyMobile }}
@@ -62,6 +62,11 @@ {{ order.order.consigneeDetail }}自提点名称:{{ order.order.storeAddressPath }}
+联系方式:{{ order.order.storeAddressMobile }}
+支付方式:{{ order.paymentMethodValue }}
@@ -70,7 +75,7 @@配送方式:{{ order.deliveryMethodValue }}
-配送状态:{{ order.deliverStatusValue }}
+配送状态:{{ order.deliverStatusValue }}
物流信息:{{ logistics.shipper || "暂无物流信息" }}
@@ -270,6 +275,9 @@ export default { if (res.success) { this.order = res.result; this.progressList = res.result.orderLogs; + if (this.order.order.deliveryMethod === 'LOGISTICS') { + this.traces(); + } } }); }, @@ -336,7 +344,6 @@ export default { }, mounted() { this.getDetail(); - this.traces(); }, }; diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue index 35fbec7b..60cea477 100644 --- a/buyer/src/pages/payment/Pay.vue +++ b/buyer/src/pages/payment/Pay.vue @@ -9,42 +9,29 @@使用范围:{{ useScope(item.scopeType) }}
有效期:{{ item.endTime }}