4/13

.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://60.209.125.238:25805
-VUE_APP_API_BASE_URL=http://47.104.85.216:12345
+# 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_API_BASE_URL=http://60.209.125.238:25805
-# VUE_APP_SOCKET_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
+# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
-VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
+# 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_API_BASE_URL=http://60.209.125.238:25805
-# VUE_APP_SOCKET_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
+# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
-VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
+# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api

src/views/main/BookingLedger/list/index.vue

@@ -300,9 +300,13 @@
             >
               <p>{{ item.fieldName }}:</p>
               <p>{{ item.reqVal }}</p>
-              <p>{{ item.msg }}</p>
+              <p v-if="item.msg">
+                <a-icon type="close" :style="{ color: 'red' }" />
+              </p>
+              <p v-else><a-icon type="check" :style="{ color: 'green' }" /></p>
               <p>{{ item.fieldName }}:</p>
-              <p v-html="item.mergeHtml"></p>
+              <p v-if="isDiff" v-html="item.mergeHtml"></p>
+              <p v-else>{{ item.targetVal }}</p>
             </div>
           </div>
           <div class="TaskShippingOrderCompareMain">
@@ -325,10 +329,10 @@
             >
               <p>{{ item.fieldName }}:</p>
               <p>{{ item.reqVal }}</p>
-              <p v-if="item.msg" class="TaskShippingOrderCompareMainThird">
+              <p v-if="item.msg">
-                <a-icon type="close" :style="{ color: 'red', marginRight: '.2rem' }" />{{ item.msg }}
+                <a-icon type="close" :style="{ color: 'red' }" />
               </p>
-              <p v-else><a-icon type="check" :style="{ color: 'green', marginRight: '.2rem' }" /></p>
+              <p v-else><a-icon type="check" :style="{ color: 'green' }" /></p>
               <p>{{ item.fieldName }}:</p>
               <p v-if="isDiff" v-html="item.mergeHtml"></p>
               <p v-else>{{ item.targetVal }}</p>
@@ -2654,7 +2658,8 @@ export default {
 }
 .TaskShippingOrderCompareP {
   border-bottom: 1px solid #000;
-  padding-bottom: 5px;
+  padding: 5px;
+  background: #0000000e;
   .TaskShippingOrderCompareSpan {
     font-weight: bolder;
     color: red;
@@ -2690,15 +2695,15 @@ export default {
       margin-bottom: 0.5rem;
       > p {
         flex: 1;
-        &:nth-child(3) {
+        // &:nth-child(3) {
-          flex: 2;
+        //   flex: 2;
-          margin: 0 1rem;
+        //   margin: 0 1rem;
-          padding-left: 0.5rem;
+        //   padding-left: 0.5rem;
-          &.TaskShippingOrderCompareMainThird {
+        //   &.TaskShippingOrderCompareMainThird {
-            background: #facd91;
+        //     background: #facd91;
-            border: 1px solid red;
+        //     border: 1px solid red;
-          }
+        //   }
-        }
+        // }
         // &.TaskShippingOrderCompareMainThird {
         //   flex: 2;
         //   background: #facd91;