diff --git a/.env b/.env index 81e1c0e..eb69854 100644 --- a/.env +++ b/.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 \ No newline at end of file +VUE_APP_API_BASE_URL=http://60.209.125.238:25805 +# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api \ No newline at end of file diff --git a/.env.development b/.env.development index 54b5db6..0fc3239 100644 --- a/.env.development +++ b/.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 -VUE_APP_SOCKET_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/api //VUE_APP_API_BASE_URL=http://127.0.0.1:5000 //VUE_APP_SOCKET_BASE_URL=http://127.0.0.1:5000 diff --git a/.env.preview b/.env.preview index 9e6b6b7..029fbe5 100644 --- a/.env.preview +++ b/.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 -VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 \ No newline at end of file +# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api +# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api \ No newline at end of file diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue index fc18c64..93f51e7 100644 --- a/src/views/main/BookingLedger/list/index.vue +++ b/src/views/main/BookingLedger/list/index.vue @@ -300,9 +300,13 @@ >

{{ item.fieldName }}:

{{ item.reqVal }}

-

{{ item.msg }}

+

+ +

+

{{ item.fieldName }}:

-

+

+

{{ item.targetVal }}

@@ -325,10 +329,10 @@ >

{{ item.fieldName }}:

{{ item.reqVal }}

-

- {{ item.msg }} +

+

-

+

{{ item.fieldName }}:

{{ item.targetVal }}

@@ -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) { - flex: 2; - margin: 0 1rem; - padding-left: 0.5rem; - &.TaskShippingOrderCompareMainThird { - background: #facd91; - border: 1px solid red; - } - } + // &:nth-child(3) { + // flex: 2; + // margin: 0 1rem; + // padding-left: 0.5rem; + // &.TaskShippingOrderCompareMainThird { + // background: #facd91; + // border: 1px solid red; + // } + // } // &.TaskShippingOrderCompareMainThird { // flex: 2; // background: #facd91;