Browse Source

Merge branch 'temp0819' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_xsth

lilei 2 years ago
parent
commit
89932896a2
2 changed files with 5 additions and 4 deletions
  1. 4 3
      src/views/numsGoodsShelves/approveStore/list.vue
  2. 1 1
      vue.config.js

+ 4 - 3
src/views/numsGoodsShelves/approveStore/list.vue

@@ -65,10 +65,11 @@
         </template>
         </template>
         <!-- 地址 -->
         <!-- 地址 -->
         <template slot="addr" slot-scope="text, record">
         <template slot="addr" slot-scope="text, record">
-          <div>
-            {{ record.addrProvinceName +'-'+ record.addrCityName +'-'+ record.addrDistrictName }}
-            <div style="word-wrap: wrap;">{{ record.addrDetail }}</div>
+          <div style="word-break:break-all;" v-if="record.addrProvinceName||record.addrDetail">
+            <div v-if="record.addrProvinceName">{{ record.addrProvinceName +'-'+ record.addrCityName +'-'+ record.addrDistrictName }}</div>
+            <div v-if="record.addrDetail">{{ record.addrDetail }}</div>
           </div>
           </div>
+          <div v-else>--</div>
         </template>
         </template>
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">

+ 1 - 1
vue.config.js

@@ -211,7 +211,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
     proxy: {
       '/api': {
       '/api': {
-        target: 'http://192.168.0.182/qpls-md',
+        target: 'http://192.168.0.182:8503/qpls-md',
         // target: 'http://p.iscm.360arrow.com/qpls-md',
         // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         // ws: false,
         ws: true,
         ws: true,