Explorar o código

订单追踪和设置

wt123 hai 1 ano
pai
achega
9d2e9e05f0

+ 2 - 2
.env.development

@@ -1,6 +1,6 @@
 NODE_ENV = 'development'
-VUE_APP_BASE_URL = 'http://153.37.175.42:8086/'
-WEBPACK_DEV_SERVER_URL = 'http://pctest.liebaoai.cn:88/#/login'
+VUE_APP_BASE_URL = 'http://39.98.117.115:8086/'
+WEBPACK_DEV_SERVER_URL = 'http://pctest.liebaoai.cn/#/login'
 ELECTRON_NODE_INTEGRATION = true
 VUE_APP_APPID = 'u9m5aIE4oNjsb02iK'
 VUE_APP_APPSECRET = 'IO6zzY2TU3uswXbXWmwuSPFXxBri7NsY'

+ 2 - 2
.env.test

@@ -1,6 +1,6 @@
 NODE_ENV = 'test'
-VUE_APP_BASE_URL = 'http://153.37.175.42:8086/'
-WEBPACK_DEV_SERVER_URL = 'http://pctest.liebaoai.cn:88/#/login'
+VUE_APP_BASE_URL = 'http://39.98.117.115:8086/'
+WEBPACK_DEV_SERVER_URL = 'http://pctest.liebaoai.cn/#/login'
 ELECTRON_NODE_INTEGRATION = true
 VUE_APP_APPID = 'u9m5aIE4oNjsb02iK'
 VUE_APP_APPSECRET = 'IO6zzY2TU3uswXbXWmwuSPFXxBri7NsY'

+ 1 - 3
src/components/orderComponents/orderTrack.vue

@@ -115,9 +115,7 @@ export default {
   computed: {
     list() {
       return (
-        this.trackOrder &&
-        this.trackOrder.list &&
-        this.$tool.deepClone(this.trackOrder.list).reverse()
+        this.trackOrder.list 
       );
     },
   },

+ 11 - 8
src/components/settingComponents/systemSetting.vue

@@ -380,6 +380,7 @@ export default {
     },
     getConfig() {
       getConfig().then((res) => {
+        console.log("配置获取***************",res)
         if (res.code === 200) {
           this.list[1].time = res.data.autodeliveryOrderTime / 60;
           this.list[2].time = res.data.bookingAutodeliveryOrderTime / 60;
@@ -392,14 +393,16 @@ export default {
             return v;
           });
           this.list3[1].time = res.data.selfDeliveryAutoFinishMinute;
-          let littleMoneyTime = res.data.littleMoneyTime.split(",");
-          this.littleMoneyTime = Number(littleMoneyTime[0]);
-          this.littleMoneyTime1 = Number(littleMoneyTime[1]);
-          this.list3[2].time = this.littleMoneyTime;
-          this.list3 = this.list3.map((v) => {
-            v.value = res.data[v.field];
-            return v;
-          });
+          if(res.data.littleMoneyTime!=null){
+            let littleMoneyTime = res.data.littleMoneyTime.split(",");
+            this.littleMoneyTime = Number(littleMoneyTime[0]);
+            this.littleMoneyTime1 = Number(littleMoneyTime[1]);
+            this.list3[2].time = this.littleMoneyTime;
+            this.list3 = this.list3.map((v) => {
+              v.value = res.data[v.field];
+              return v;
+            });
+          }
           this.tipAmount = res.data.tipAmount;
           this.addPriceTime = res.data.addPriceTime;
           this.tipRemark = Number(res.data.tipRemark);