shish 4 месяцев назад
Родитель
Сommit
b2d6f81215

+ 1 - 1
hdApp/src/admin/home/mall.vue

@@ -255,7 +255,7 @@
     </view>
   </uni-popup>
   <NotLogin></NotLogin>
-  <custom-tab-bar :current="2" />
+  <custom-tab-bar :current="1" />
 
 </view>
 </template>

+ 1 - 1
hdApp/src/admin/home/me.vue

@@ -191,7 +191,7 @@
         </view>
       </view>
     </uni-popup>
-    <custom-tab-bar :current="5" />
+    <custom-tab-bar :current="4" />
   </view>
 </template>
 <script>

+ 1 - 1
hdApp/src/admin/home/member.vue

@@ -66,7 +66,7 @@
 
     <NotLogin></NotLogin>
 
-    <custom-tab-bar :current="4" />
+    <custom-tab-bar :current="3" />
   </view>
 </template>
 <script>

+ 1 - 1
hdApp/src/admin/home/order.vue

@@ -163,7 +163,7 @@
       </view>
     </view>
 
-    <custom-tab-bar :current="3" />
+    <custom-tab-bar :current="2" />
   </view>
 </template>
 <script>

+ 9 - 17
hdApp/src/admin/home/workbench.vue

@@ -31,10 +31,6 @@
               </view>
               <view class="user-info" @click="pageTo({url:'/admin/home/edit'})">
                 <text class="username">{{ (shopInfo && shopInfo.shopName == '首店') ? (shopInfo.merchantName || '') : (((shopInfo && shopInfo.merchantName) ? shopInfo.merchantName : '') + (shopInfo && shopInfo.shopName ? (' ' + shopInfo.shopName) : '')) }}</text>
-                <text class="user-id">ID {{ shopInfo && shopInfo.id ? shopInfo.id : '' }}</text>
-              </view>
-              <view class="more-icon" @click="pageTo({url:'/admin/home/edit'})">
-                <zui-svg-icon icon="home-more" :width="26" color="#FFFFFF" />
               </view>
             </view>
   
@@ -493,10 +489,6 @@
       showShopName(){
         currentShop().then(res => {
           if(res.code == 1){
-            let sjName = res.data.merchantName ? res.data.merchantName : ''
-            let shopName = res.data.shopName ? res.data.shopName : ''
-            let title = shopName == '首店' ? sjName : sjName+' '+shopName
-            uni.setNavigationBarTitle({ title: title })
             this.shopInfo = res.data?res.data:[]
             if(this.shopInfo.avatar) {
               uni.setStorageSync('shopAvatar', this.shopInfo.avatar);
@@ -1079,9 +1071,9 @@
         display: flex;
         align-items: center;
         .avatar-container {
-          width: 120upx;
-          height: 120upx;
-          border-radius: 60upx;
+          width: 50upx;
+          height: 50upx;
+          border-radius: 50upx;
           overflow: hidden;
           background-color: rgba(255,255,255,0.2);
           border: 1upx solid #ffffff;
@@ -1092,15 +1084,15 @@
             margin: 0 !important;
             line-height: 1;
             display: block;
-            width: 120upx;
-            height: 120upx;
+            width: 50upx;
+            height: 50upx;
             color: transparent !important;
             &::after { border: none !important; }
           }
           .avatar {
-            width: 120upx;
-            height: 120upx;
-            border-radius: 60upx;
+            width: 50upx;
+            height: 50upx;
+            border-radius: 50upx;
           }
         }
         .user-info {
@@ -1108,7 +1100,7 @@
           margin-left: 24upx;
           .username {
             display: block;
-            font-size: 36upx;
+            font-size: 40upx;
             font-weight: bold;
             color: #ffffff;
           }