774078984@qq.com 3 mesi fa
parent
commit
4ab2d63246
1 ha cambiato i file con 0 aggiunte e 8 eliminazioni
  1. 0 8
      src/views/home/index.vue

+ 0 - 8
src/views/home/index.vue

@@ -92,11 +92,7 @@
       </div>
 
       <div class="cardModel">
-<<<<<<< HEAD
-        <div class="modelTitle">账户信息</div>
-=======
         <div class="modelTitle">客户账户信息汇总</div>
->>>>>>> dev
         <div class="accountList">
           <div class="item">
             <div class="txt">账户余额</div>
@@ -120,11 +116,7 @@
             <div class="txt">已充值客户</div>
             <div class="val">0</div>
           </div>
-<<<<<<< HEAD
-          <div class="item">
-=======
           <div class="item" v-if="userType==2">
->>>>>>> dev
             <a-link href="link" :hoverable="false">查看接入密钥</a-link>
           </div>
         </div>