Merge branch 'zhongqi-hdAppModify' of git.huaml.com:zhh/front-end into zhongqi-hdAppModify

hdApp/src/admin/home/workbench.vue

@@ -287,41 +287,50 @@
             </view>
           </view>
 
-          <view class="function-grid function-grid--overlay">
-            <view class="function-item function-item--overlay" @click="pageTo({url:'/admin/shop/myShop'})">
-              <view class="function-icon">
-                <zui-svg-icon icon="home-shop" :width="32" :height="32" color="#FFFFFF" />
+          <view class="function-grid function-grid--overlay" style="padding: 25upx 0upx 30upx 0upx; display: flex; justify-content: space-around; gap: 12upx;">
+            <view class="function-item function-item--overlay" style="flex: 1; text-align: center; border: 1upx solid rgba(255,255,255,0.5); border-radius: 16upx; padding: 15upx 0;" @click="pageTo({url:'/admin/shop/myShop'})">
+              <view class="function-icon" style="font-size: 38upx; margin-bottom: 8upx;">
+                🏪
               </view>
-              <text class="function-text function-text--overlay">我的门店</text>
+              <text class="function-text function-text--overlay" style="font-size: 22upx;">店铺管理</text>
             </view>
-            <view class="function-item function-item--overlay" @click="pageTo({url:'/admin/staff/list'})">
-              <view class="function-icon">
-                <zui-svg-icon icon="home-staffs" :width="32" :height="32" color="#FFFFFF" />
+            <view class="function-item function-item--overlay" style="flex: 1; text-align: center; border: 1upx solid rgba(255,255,255,0.5); border-radius: 16upx; padding: 15upx 0;" @click="pageTo({url:'/admin/staff/list'})">
+              <view class="function-icon" style="font-size: 38upx; margin-bottom: 8upx;">
+                👥
               </view>
-              <text class="function-text function-text--overlay">我的员工</text>
+              <text class="function-text function-text--overlay" style="font-size: 22upx;">我的员工</text>
             </view>
-            <view class="function-item function-item--overlay" @click="pageTo({url:'/admin/shop/add?id='+loginInfo.shopId})">
-              <view class="function-icon">
-                <zui-svg-icon icon="home-address" :width="32" :height="32" color="#FFFFFF" />
+            <view class="function-item function-item--overlay" style="flex: 1; text-align: center; border: 1upx solid rgba(255,255,255,0.5); border-radius: 16upx; padding: 15upx 0;" @click="pageTo({url:'/admin/shop/add?id='+loginInfo.shopId})">
+              <view class="function-icon" style="font-size: 38upx; margin-bottom: 8upx;">
+                📍
               </view>
-              <text class="function-text function-text--overlay">我的地址</text>
+              <text class="function-text function-text--overlay" style="font-size: 22upx;">我的地址</text>
             </view>
-            <view class="function-item function-item--overlay" @click="pageTo({url:'/admin/stat/cgItem'})">
-              <view class="function-icon">
-                <zui-svg-icon icon="home-statistics" :width="32" :height="32" color="#FFFFFF" />
+            <view class="function-item function-item--overlay" style="flex: 1; text-align: center; border: 1upx solid rgba(255,255,255,0.5); border-radius: 16upx; padding: 15upx 0;" @click="pageTo({url:'/admin/stat/cgItem'})">
+              <view class="function-icon" style="font-size: 38upx; margin-bottom: 8upx;">
+                📊
               </view>
-              <text class="function-text function-text--overlay">采购统计</text>
+              <text class="function-text function-text--overlay" style="font-size: 22upx;">采购统计</text>
             </view>
-            <view class="function-item function-item--overlay" @click="goMore()">
-              <view class="function-icon">
-                <zui-svg-icon icon="home-more-2" :width="30" :height="30" color="#FFFFFF" />
+            <view class="function-item function-item--overlay" style="flex: 1; text-align: center; border: 1upx solid rgba(255,255,255,0.5); border-radius: 16upx; padding: 15upx 0;" @click="goMore()">
+              <view class="function-icon" style="font-size: 38upx; margin-bottom: 8upx;">
+                ⋯
               </view>
-              <text class="function-text function-text--overlay">更多</text>
+              <text class="function-text function-text--overlay" style="font-size: 22upx;">更多</text>
+            </view>
+          </view>
+
+          </view>
+          <view style="text-align:center;font-size:28upx;color:#666;padding:16upx 30upx;margin:0 20upx;background: linear-gradient(to right, transparent, #f8f9fa, transparent);border-radius:30upx;">
+            <view style="display:inline-flex;align-items:center;background:#fff;padding:10upx 25upx;border-radius:20upx;box-shadow:0 2upx 8upx rgba(0,0,0,0.05);">
+              <text style="color:#09C567;margin-right:10upx;font-size:32upx;">👋</text>
+              <text style="color:#333;font-weight:500;font-size:28upx;">{{ loginInfo.admin && loginInfo.admin.name ? loginInfo.admin.name : '' }}</text>
+              <text style="margin:0 15upx;color:#eee;">|</text>
+              <text style="color:#666;font-size:28upx;">{{ loginInfo.admin && loginInfo.admin.mobile ? loginInfo.admin.mobile : '' }}</text>
             </view>
           </view>
-        </view>
-        <view style="text-align:center;font-size:29upx;">您好，{{ loginInfo.admin && loginInfo.admin.name ? loginInfo.admin.name : '' }} {{ loginInfo.admin && loginInfo.admin.mobile ? loginInfo.admin.mobile : '' }}</view>
-        <view v-if="!$util.isEmpty(data.warning)" style="color:red;font-size:36upx;font-weight:bold;text-align: center;margin-bottom:15upx;margin-top:20upx;">{{ data.warning }}</view>
+
+          <view v-if="!$util.isEmpty(data.warning)" style="color:red;font-size:36upx;font-weight:bold;text-align:center;margin-bottom:15upx;margin-top:20upx;">{{ data.warning }}</view>
 
         <template v-if="!$util.isEmpty(ad)">
           <block v-for="(adInfo, adIndex) in ad" :key="adIndex">
@@ -599,10 +608,9 @@ export default {
   methods: {
     onChooseAvatar(e){
       if(this.loginInfo && this.loginInfo.staff && this.loginInfo.staff.founder != 2){
-        this.$msg('无权修改头像')
+        this.$msg('门店LOGO请老板修改')
         return
       }
-
       if(e && e.detail && e.detail.avatarUrl){
         let avatarUrl = e.detail.avatarUrl
         this.updateShopAvatar(avatarUrl)
@@ -1482,7 +1490,7 @@ export default {
   overflow: hidden;
   .profile-section {
     background-color: #09C567;
-    padding: 24upx;
+    padding: 30upx 25upx 0upx 25upx;
     border-radius: 0;
     .profile-header {
       display: flex;
@@ -1540,40 +1548,13 @@ export default {
         // border: 1upx solid rgba(255,255,255,0.35);
       }
     }
-    .function-grid {
-      margin-top: 24upx;
-      display: flex;
-      flex-wrap: nowrap;
-      justify-content: space-between;
-      gap: 0;
-    }
     .function-grid--overlay {
       background: transparent;
-      padding: 12upx 0 0 0;
-    }
-    .function-item {
-      width: 20%;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      padding: 20upx 0;
-      border-radius: 16upx;
-      border: 1upx solid rgba(255,255,255,0.5);
-      background: rgba(255,255,255,0.12);
-      backdrop-filter: blur(8upx);
-      box-sizing: border-box;
     }
     .function-item--overlay {
       border-color: rgba(255,255,255,0.5);
       background: rgba(255,255,255,0.12);
     }
-    .function-icon {
-      margin-bottom: 10upx;
-    }
-    .function-text {
-      font-size: 26upx;
-      color: #ffffff;
-    }
     .function-text--overlay {
       color: #ffffff;
     }