Browse Source

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

YaolongHan 4 years ago
parent
commit
45f044a1ba
2 changed files with 30 additions and 25 deletions
  1. 28 24
      public/index.html
  2. 2 1
      src/views/equipment/table/djspTable.vue

File diff suppressed because it is too large
+ 28 - 24
public/index.html


+ 2 - 1
src/views/equipment/table/djspTable.vue

@@ -41,7 +41,8 @@
                         <i v-for='(info,infoIndex) in row.brandList' :key='infoIndex'>
                             {{ info.brandname || 'xxx' }}
                             -
-                            {{ info.shopsnumList ? info.shopsnumList.replaceAll(',','、') : 'xxx' }}
+                            <!-- {{ info.shopsnumList ? info.shopsnumList.replaceAll(',','、') : 'xxx' }} -->
+                            {{ info.shopsnumList ? info.shopsnumList.replace(/,/g,'、') : 'xxx' }}
                             {{ infoIndex === row.brandList.length - 1 ? '' : ',' }}
                         </i>
                     </div>