Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

.env

@@ -2,5 +2,5 @@ NODE_ENV=production
 VUE_APP_PREVIEW=true
 //VUE_APP_API_BASE_URL=http://192.168.1.205:25800
 //VUE_APP_API_BASE_URL=http://127.0.0.1:5000
-# VUE_APP_API_BASE_URL=http://60.209.125.238:25805
-VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
+VUE_APP_API_BASE_URL=http://60.209.125.238:25805
+# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api

.env.development

@@ -1,12 +1,12 @@
 NODE_ENV=development
 VUE_APP_PREVIEW=true
-# VUE_APP_API_BASE_URL=http://60.209.125.238:25805
-# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:25805
+VUE_APP_API_BASE_URL=http://60.209.125.238:25805
+VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:25805
 
 # process.env.VUE_APP_API_BASE_URL
 
-VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
-VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api
+# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
+# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api
 
 //VUE_APP_API_BASE_URL=http://127.0.0.1:5000
 //VUE_APP_SOCKET_BASE_URL=http://127.0.0.1:5000

.env.preview

@@ -1,7 +1,7 @@
 NODE_ENV=production
 VUE_APP_PREVIEW=true
-# VUE_APP_API_BASE_URL=http://60.209.125.238:25805
-# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:25805
+VUE_APP_API_BASE_URL=http://60.209.125.238:25805
+VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:25805
 
-VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
-VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api
+# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
+# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api

src/views/main/BookingLedger/detail/modules/preOrder.vue

@@ -2153,17 +2153,17 @@ export default {
       if ($details.shipper) {
         const newArr = $details.shipper.split('\n')
         $data.shippername = newArr[0]
-        $data.shipperaddR1 = newArr[0]
+        $data.shipperaddR1 = newArr[1]
       }
       if ($details.consignee) {
         const newArr = $details.consignee.split('\n')
         $data.consigneename = newArr[0]
-        $data.consigneeaddR1 = newArr[0]
+        $data.consigneeaddR1 = newArr[1]
       }
       if ($details.notifyparty) {
         const newArr = $details.notifyparty.split('\n')
         $data.notifypartyname = newArr[0]
-        $data.notifypartyaddR1 = newArr[0]
+        $data.notifypartyaddR1 = newArr[1]
       }
 
       // if ($data.placedeliveryid) {