diff --git a/frontend/app-user/api/member.js b/frontend/app-user/api/member.js
index 04e8a90..46256bc 100644
--- a/frontend/app-user/api/member.js
+++ b/frontend/app-user/api/member.js
@@ -75,7 +75,7 @@ export function getwDdDetail(params) {
//创建订单
export function savewDd(data) {
return request({
- url: '/user/order/payment/add',
+ url: '/user/order/add',
method: 'post',
data: data
})
diff --git a/frontend/app-user/common/config.js b/frontend/app-user/common/config.js
index 7d45ead..ec77a93 100644
--- a/frontend/app-user/common/config.js
+++ b/frontend/app-user/common/config.js
@@ -1,16 +1,17 @@
module.exports = {
// baseUrl: 'http://192.168.0.48:60011/api', //lst本地
- // baseUrl: 'http://123.60.140.65:60011/api',// 会员端ip
- baseUrl: 'https://lpg.ip-server.cn/api', //会员端线上
+ baseUrl: 'http://m8wgk2.natappfree.cc/api', // 会员端ip
+ // baseUrl: 'https://lpg.ip-server.cn/api', //会员端线上
gaodeMapKey: "ec36eed040d5dad959e19711b83905d6", //高德逆地址解析key
// 超时
timeout: 30000,
// 禁用 Cookie 等信息
withCredentials: false,
isOpenTokenExpiration: false, //token过期弹窗
- appid:'wxb619394476ca1888',
+ appid: 'wxb619394476ca1888',
header: {
//租户ID
'tenant-id': 1
- }
-}
\ No newline at end of file
+ },
+
+}
diff --git a/frontend/app-user/pages/home/placeOrder.vue b/frontend/app-user/pages/home/placeOrder.vue
index 0a8f36e..19a1475 100644
--- a/frontend/app-user/pages/home/placeOrder.vue
+++ b/frontend/app-user/pages/home/placeOrder.vue
@@ -106,13 +106,10 @@
\ No newline at end of file
+ .psSty {
+ font-family: "苹方 中等", 苹方, sans-serif;
+ font-weight: 400;
+ font-style: normal;
+ color: rgb(255, 165, 0);
+ background-color: #fff6e6;
+ }
+}
+
diff --git a/frontend/app-user/pages/order/orderDetail.vue b/frontend/app-user/pages/order/orderDetail.vue
index df9a4aa..173daff 100644
--- a/frontend/app-user/pages/order/orderDetail.vue
+++ b/frontend/app-user/pages/order/orderDetail.vue
@@ -3,10 +3,10 @@
- {{detailForm.fDdzt}}
+ {{ddDdzt.get(detailForm.fDdzt)}}
- 订单完成时间:{{ detailForm.fSjwcsj?detailForm.fSjwcsj:detailForm.fDdzt==='待配送'? "等待配送中":detailForm==='已取消'?'已取消':detailForm.fDdzt }}
+ 订单完成时间:{{ detailForm.fSjwcsj?detailForm.fSjwcsj:detailForm.fDdzt==='203'? "等待配送中":detailForm==='207'?'已取消':ddDdzt.get(detailForm.fDdzt) }}
@@ -138,7 +138,7 @@
提取方式
- {{detailForm.fPsfs}}
+ {{ ddPsfs.get(detailForm.fPsfs) }}
@@ -147,6 +147,8 @@