Browse Source

合作伙伴更新,核销金额调整

qymljy 2 years ago
parent
commit
d289368986
2 changed files with 14 additions and 9 deletions
  1. 12 7
      src/HManagement/marketing2/agent/index.vue
  2. 2 2
      vue.config.js

+ 12 - 7
src/HManagement/marketing2/agent/index.vue

@@ -50,14 +50,19 @@
               {{`${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}`}}
             </p>
             <p v-else-if="scope.data.column.columnname === 'type'">
-              <span v-for="(item,index) in scope.data.column.data.type" :key="index">
-                <span v-if="scope.data.column.data.type.length - 1 === index">
-                  {{item}}
+              <span v-if="scope.data.column.data.type">
+               <span v-for="(item,index) in scope.data.column.data.type" :key="index">
+                  <span v-if="scope.data.column.data.type.length - 1 === index">
+                    {{item}}
+                  </span>
+                  <span v-else>
+                    {{item + ','}}
+                  </span>
                 </span>
-                <span v-else>
-                  {{item + ','}}
-                </span>
-              </span>
+             </span>
+             <span v-else>
+               --
+             </span>
             </p>
             <p v-else-if="scope.data.column.columnname === 'status'">
               <span style="color:#d90a0a" v-if="scope.data.column.data[[scope.data.column.columnname]] == '禁用'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>

+ 2 - 2
vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          // target: 'http://61.164.207.46:8000',  // target host*/
-          target: 'http://192.168.3.9:8090',  // target host*!
+          target: 'http://61.164.207.46:8000',  // target host*/
+          // target: 'http://192.168.3.9:8090',  // target host*!
           // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets