Browse Source

Merge branch 'master' of http://36.137.93.232:3000/hf/byte-sailing-new

cz 1 year ago
parent
commit
0ec8948e2a

+ 2 - 2
src/components/headerBar/header-bar.vue

@@ -75,10 +75,10 @@
                   <div v-for="(i, index) in activeLeftData" :key="index">
                     <li v-if="i.isNone" class="menu-ul" style="cursor: auto"></li>
                     <li class="menu-title" v-else-if="i.isTitle">
-                      <i :class="'iconfont icon-' + i.icon"></i>{{ i.menuName }}
+                      <a v-if="i.icon && i.icon !== '#'" :class="'iconfont icon-' + i.icon" style="margin-right: 4px"></a><span>{{ i.menuName }}</span>
                     </li>
                     <li v-else class="menu-ul" @click="commonsBannerToRouter(i)" style="cursor: pointer">
-                      <i :class="'iconfont icon-' + i.icon" style="margin-right: 4px;"></i>{{ i.menuName }}
+                      <span>{{ i.menuName }}</span>
                     </li>
                   </div>
                 </ul>

+ 0 - 6
src/views/finance/fundManage/accountPayment/index.vue

@@ -359,12 +359,6 @@ let dictsData = reactive({
 });
 proxy.getDict(["payment_status", "account_currency"]).then((res) => {
   dictsData = res;
-  selectConfig.value[0].data = res.payment_status.map((item) => {
-    return {
-      label: item.dictValue,
-      value: item.dictKey,
-    };
-  });
   formConfig.value[11].data = res.account_currency.map((item) => {
     return {
       label: item.dictValue,