优化

hdApp/src/admin/cg/me.vue

@@ -2,7 +2,6 @@
   <view class="me-page app-content">
     <block v-if="isLoggedIn">
       <view class="page-hero">
-        <view class="status-space" :style="{ height: statusBarHeight + 'px' }"></view>
         <view class="hero-panel">
           <view class="profile-card">
             <view class="profile-header-row">
@@ -18,15 +17,12 @@
               </view>
 
               <view class="quick-actions">
-                <view class="quick-action" @click.stop="changeShop">
-                  <image class="quick-action-icon" :src="iconSrc('my-switch-shop')" mode="aspectFit" />
-                  <text class="quick-action-text">切换门店</text>
-                </view>
                 <view class="quick-action" @click.stop="suggest">
                   <image class="quick-action-icon" :src="iconSrc('my-service')" mode="aspectFit" />
                   <text class="quick-action-text">客服</text>
                 </view>
               </view>
+
             </view>
           </view>
 
@@ -35,6 +31,26 @@
 
       <view class="content-wrap">
 
+      <!-- 采购账号常用功能：由工作台头部迁入 -->
+      <view class="function-grid">
+        <view class="function-item" @click="pageTo({ url: '/admin/shop/myShop' })">
+          <image class="function-icon" :src="iconSrc('store')" mode="aspectFit" />
+          <text class="function-text">切换门店</text>
+        </view>
+        <view class="function-item" @click="pageTo({ url: '/admin/staff/list' })">
+          <image class="function-icon" :src="iconSrc('staff')" mode="aspectFit" />
+          <text class="function-text">我的员工</text>
+        </view>
+        <view class="function-item" @click="pageTo({ url: '/admin/shop/add?id=' + getLoginInfo.shopId })">
+          <image class="function-icon" :src="iconSrc('stock-my-address')" mode="aspectFit" />
+          <text class="function-text">我的地址</text>
+        </view>
+        <view class="function-item" @click="pageTo({ url: '/admin/stat/cgItem' })">
+          <image class="function-icon" :src="iconSrc('stock-purchase-stats')" mode="aspectFit" />
+          <text class="function-text">采购统计</text>
+        </view>
+      </view>
+
       <view class="menu-card">
         <view class="menu-row" v-for="item in menuList" :key="item.key" @click="handleMenuTap(item)">
           <view class="menu-left">
@@ -231,10 +247,10 @@ export default {
       menuList: [
         { key: "modifyName", name: "修改名称", icon: "modify_shop" },
         { key: "address", name: "修改门店", icon: "modify_shop" },
-        { key: "book", name: "使用教程", icon: "my-book" },
-        { key: "lakala", name: "收款账户管理", icon: "pay-code" },
+        { key: "deletedWholesaler", name: "已删批发店", icon: "store-delete" },
+        { key: "dimission", name: "申请离职", icon: "staff" },
         { key: "password", name: "密码修改", icon: "my-password" },
-        { key: "cashSet", name: "提现账号", icon: "my-bell" },
+        { key: "mall", name: "零售商城", icon: "store" },
         { key: "logout", name: "退出登录", icon: "my-logout" }
       ]
     };
@@ -330,6 +346,12 @@ export default {
         this.$util.pageTo({ url: "/admin/lakala/lakala" });
       } else if (item.key == "password") {
         this.$util.pageTo({ url: "/admin/shop/password" });
+      } else if (item.key == "mall") {
+        this.$util.pageTo({ url: "/pagesPurchase/open" });
+      } else if (item.key == "deletedWholesaler") {
+        this.$util.pageTo({ url: "/pagesPurchase/pb" });
+      } else if (item.key == "dimission") {
+        this.$util.pageTo({ url: "/admin/staff/dimission" });
       } else if (item.key == "cashSet") {
         this.$util.pageTo({ url: "/pagesStore/me/cashSet" });
       } else if (item.key == "logout") {
@@ -373,9 +395,6 @@ export default {
         });
       });
     },
-    changeShop () {
-      this.$util.pageTo({ url: "/admin/shop/myShop" });
-    },
     inAmountFn () {
       this.inAmountRemark = "";
       this.inAmountShow = true;
@@ -627,8 +646,9 @@ export default {
   flex-shrink: 0;
   padding: 0;
   background: transparent;
-  align-self: center;
-  margin-right:20upx;
+  align-self: flex-start;
+  margin-top: 14upx;
+  margin-right: 20upx;
 }
 
 .quick-action {
@@ -644,8 +664,8 @@ export default {
 }
 
 .quick-action-icon {
-  width: 48upx;
-  height: 48upx;
+  width: 64upx;
+  height: 64upx;
   display: block;
 }
 
@@ -663,7 +683,7 @@ export default {
 
 /* #ifdef MP-WEIXIN */
 .quick-action-icon {
-  transform: translateY(40upx);
+  transform: translateY(2upx);
 }
 
 .quick-action + .quick-action {
@@ -757,6 +777,43 @@ export default {
   padding: 4upx 24upx 28upx;
 }
 
+.function-grid {
+  margin-top: 0;
+  min-height: 166upx;
+  padding: 30upx 12upx 24upx;
+  border-radius: 26upx;
+  background: #fff;
+  box-shadow: 0 8upx 24upx rgba(24, 37, 30, 0.05);
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-around;
+  box-sizing: border-box;
+}
+
+.function-item {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.function-icon {
+  width: 58upx;
+  height: 58upx;
+  display: block;
+  flex-shrink: 0;
+}
+
+.function-text {
+  margin-top: 14upx;
+  color: #202325;
+  font-size: 24upx;
+  line-height: 32upx;
+  text-align: center;
+}
+
 .finance-stack {
   margin-top: 0;
 }

hdApp/src/admin/home/components/purchase-ghs-panel.vue

@@ -13,34 +13,9 @@
             >
               <text class="nav-back-label">返回</text>
             </view>
-            <view class="custom-nav" @click="pageTo({ url: '/admin/home/edit' })">
+            <view class="custom-nav">
               <text class="custom-nav-title">{{ workbenchTitle }}</text>
             </view>
-            <view class="function-grid function-grid--overlay">
-              <view class="function-item function-item--overlay" @click="pageTo({ url: '/admin/shop/myShop' })">
-                <image class="function-icon" :src="iconSrc('store')" mode="aspectFit" />
-                <text class="function-text function-text--overlay function-text--sm">切换门店</text>
-              </view>
-              <view class="function-item function-item--overlay"
-                @click="pageTo({ url: '/admin/staff/list'})">
-                <image class="function-icon" :src="iconSrc('staff')" mode="aspectFit" />
-                <text class="function-text function-text--overlay function-text--sm">我的员工</text>
-              </view>
-              <view class="function-item function-item--overlay"
-                @click="pageTo({ url: '/admin/shop/add?id=' + loginInfo.shopId })">
-                <image class="function-icon" :src="iconSrc('stock-my-address')" mode="aspectFit" />
-                <text class="function-text function-text--overlay function-text--sm">我的地址</text>
-              </view>
-              <view class="function-item function-item--overlay" @click="pageTo({ url: '/admin/stat/cgItem' })">
-                <image class="function-icon" :src="iconSrc('stock-purchase-stats')" mode="aspectFit" />
-                <text class="function-text function-text--overlay function-text--sm">采购统计</text>
-              </view>
-              <view class="function-item function-item--overlay" @click="openWorkbenchMore()">
-                <image class="function-icon" :src="iconSrc('stock-more-features')" mode="aspectFit" />
-                <text class="function-text function-text--overlay function-text--sm">更多操作</text>
-              </view>
-
-            </view>
           </view>
 
           <template v-if="!$util.isEmpty(ad)">
@@ -215,37 +190,6 @@
       </view>
     </uni-popup>
 
-    <!-- 工作台更多操作：零售商城、已删商家 -->
-    <uni-popup ref="workbenchMorePopup" background-color="transparent" type="center" :animation="true" class="ghs-more-popup">
-      <view class="ghs-more-card">
-        <view class="ghs-more-header">
-          <text class="ghs-more-title">更多操作</text>
-          <text class="ghs-more-subtitle">请选择功能</text>
-        </view>
-        <view class="ghs-more-body">
-          <view class="ghs-more-row" @click="goMallFromMore()">
-            <text class="ghs-more-row__label">零售商城</text>
-            <text class="ghs-more-row__arrow">›</text>
-          </view>
-          <view class="ghs-more-row" @click="goDeletedWholesaler()">
-            <text class="ghs-more-row__label">已删除商家</text>
-            <text class="ghs-more-row__arrow">›</text>
-          </view>
-          <view class="ghs-more-row" @click="goDimissionFromMore()">
-            <text class="ghs-more-row__label">申请离职</text>
-            <text class="ghs-more-row__arrow">›</text>
-          </view>
-          <view class="ghs-more-row" @click="goLogoutFromMore()">
-            <text class="ghs-more-row__label">退出登录</text>
-            <text class="ghs-more-row__arrow">›</text>
-          </view>
-        </view>
-        <view class="ghs-more-footer">
-          <view class="ghs-more-cancel" @click="closeWorkbenchMore()">取消</view>
-        </view>
-      </view>
-    </uni-popup>
-
     <!-- 多供货商提示弹框 -->
     <uni-popup ref="supplierNoticePopup" background-color="#fff" type="center" :animation="true"
       class="supplier-notice-popup">
@@ -471,34 +415,6 @@ export default {
         }
       })
     },
-    /** 打开工作台更多操作弹框 */
-    openWorkbenchMore() {
-      this.$refs.workbenchMorePopup.open('center')
-    },
-    /** 关闭工作台更多操作弹框 */
-    closeWorkbenchMore() {
-      this.$refs.workbenchMorePopup.close()
-    },
-    /** 更多操作：跳转已删商家 */
-    goDeletedWholesaler() {
-      this.closeWorkbenchMore()
-      this.$util.pageTo({ url: '/pagesPurchase/pb' })
-    },
-    /** 更多操作：跳转零售商城 */
-    goMallFromMore() {
-      this.closeWorkbenchMore()
-      this.getMall()
-    },
-    /** 更多操作：跳转申请离职 */
-    goDimissionFromMore() {
-      this.closeWorkbenchMore()
-      this.$util.pageTo({ url: '/admin/staff/dimission' })
-    },
-    /** 更多操作：退出登录 */
-    goLogoutFromMore() {
-      this.closeWorkbenchMore()
-      this.loginOut()
-    },
     /** 确认后清除登录态并重启或回到工作台 */
     loginOut() {
       this.$util.confirmModal({ content: '确认退出？' }, () => {
@@ -524,9 +440,6 @@ export default {
         })
       })
     },
-    getMall(){
-      this.$util.pageTo({ url: '/pagesPurchase/open' })
-    },
     goDebtChange(){
       this.closeToShow()
       this.pageTo({ url: '/admin/ghs/debtChange?ghsId=' + this.currentGhs.id })
@@ -981,8 +894,7 @@ export default {
 
 .status-safe-area,
 .custom-nav,
-.profile-header,
-.function-grid--overlay {
+.profile-header {
   position: relative;
   z-index: 2;
 }
@@ -1029,7 +941,7 @@ export default {
 .custom-nav-title {
   max-width: 560upx;
   color: #161819;
-  font-size: 50upx;
+  font-size: 32upx;
   font-weight: 700;
   line-height: 48upx;
   text-align: center;
@@ -1082,47 +994,6 @@ export default {
   text-overflow: ellipsis;
 }
 
-.purchase-ghs-panel .ghs_list_page .profile-section .function-grid--overlay {
-  margin-top: 10upx;
-  min-height: 166upx;
-  padding: 30upx 12upx 24upx;
-  border-radius: 26upx;
-  background: #f5f7f6;
-  box-shadow: 0 14upx 34upx rgba(42, 75, 55, 0.13);
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-  box-sizing: border-box;
-}
-
-.purchase-ghs-panel .ghs_list_page .profile-section .function-item--overlay {
-  flex: 1;
-  padding: 0;
-  border: 0;
-  background: transparent;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-
-.purchase-ghs-panel .ghs_list_page .profile-section .function-item--overlay+.function-item--overlay {
-  margin-left: 0;
-}
-
-.purchase-ghs-panel .ghs_list_page .profile-section .function-text--overlay {
-  margin-top: 14upx;
-  color: #202325;
-  font-size: 29upx;
-  line-height: 36upx;
-  background-color: transparent;
-}
-
-.purchase-ghs-panel .ghs_list_page .profile-section .function-text--sm {
-  font-size: 24upx;
-  line-height: 32upx;
-}
-
 .warning-banner {
   margin: 22upx 24upx 0;
   padding: 22upx 28upx;
@@ -1307,7 +1178,7 @@ export default {
 
 .purchase-ghs-panel .ghs_list_page .ghs_list_area .ghs_box .box_9 .tag_2 {
   width: 120upx;
-  height: 140upx;
+  height: 120upx;
   margin: 0;
   padding: 15upx 4upx;
   border: 1upx solid #dbeee3;
@@ -1519,11 +1390,6 @@ export default {
   flex-shrink: 0;
 }
 
-.function-icon {
-  width: 58upx;
-  height: 58upx;
-}
-
 .phone-icon {
   width: 28upx;
   height: 28upx;

hdApp/src/admin/home/me.vue

@@ -284,6 +284,7 @@ export default {
         { key: "lakala", name: "收款账户管理", icon: "pay-code" },
         { key: "password", name: "密码修改", icon: "my-password" },
         { key: "cashSet", name: "提现账号", icon: "my-bell" },
+        { key: "mall", name: "零售商城", icon: "store" },
         { key: "logout", name: "退出登录", icon: "my-logout" }
       ]
     };
@@ -370,15 +371,17 @@ export default {
           (this.getLoginInfo.admin && this.getLoginInfo.admin.currentShopId) ||
           this.getLoginInfo.shopId ||
           0;
-        this.$util.pageTo({ url: "/admin/shop/add?id=" + shopId });
+        this.$util.pageTo({ url: "/admin/shop/add?id=" + shopId })
       } else if (item.key == "book") {
-        this.$util.pageTo({ url: "/admin/book/index" });
+        this.$util.pageTo({ url: "/admin/book/index" })
       } else if (item.key == "lakala") {
-        this.$util.pageTo({ url: "/admin/lakala/lakala" });
+        this.$util.pageTo({ url: "/admin/lakala/lakala" })
       } else if (item.key == "password") {
-        this.$util.pageTo({ url: "/admin/shop/password" });
+        this.$util.pageTo({ url: "/admin/shop/password" })
       } else if (item.key == "cashSet") {
-        this.$util.pageTo({ url: "/pagesStore/me/cashSet" });
+        this.$util.pageTo({ url: "/pagesStore/me/cashSet" })
+      } else if (item.key == "mall") {
+        this.$util.pageTo({ url: "/pagesPurchase/open" })
       } else if (item.key == "logout") {
         this.loginOut();
       }

hdApp/src/pagesPurchase/contact.vue

@@ -2,7 +2,7 @@
   <view class="app-content">
     <view class="section-card guide-card">
       <view class="section-label">售后联系</view>
-      <view class="section-desc">花材的质量、价格和售后问题，请按图片位置联系商家</view>
+      <view class="section-desc">花材的质量、价格和售后问题，请按图片位置联系批发店</view>
       <view class="image-box">
         <image class="guide-image" :src="`${constant.imgUrl}/shop/contact_shop2.png`" mode="widthFix"></image>
       </view>
@@ -10,7 +10,7 @@
 
     <!-- 软件公司联系方式说明：避免用户误把花材售后问题发到软件客服 -->
     <view class="software-notice">
-      以下联系方式是软件公司，只提供软件使用咨询，没有处理商家花材质量和售后问题。
+      以下联系方式是软件公司，只提供软件使用咨询，没有处理花材质量和售后问题。
     </view>
 
     <view class="section-card contact-card">

hdApp/src/pagesPurchase/open.vue

@@ -2,23 +2,13 @@
   <view class="app-content">
     <view v-if="loaded" class="open-page">
       <block v-if="onlyCg == 1">
-        <view class="video-wrap">
-          <video
-            id="openVideo"
-            class="open-video"
-            :src="videoUrl"
-            object-fit="contain"
-            controls
-            show-center-play-btn
-          ></video>
-        </view>
-        <view class="tip-text">开通零售商城前，请先观看上面视频</view>
+        <view class="tip-text">点击按钮，开启零售商城</view>
         <view class="confirm-btn">
           <button class="admin-button-com big blue" @click="beginChangeCg(0)">开启</button>
         </view>
       </block>
       <block v-else>
-        <view class="tip-text tip-text--close">如需要停用商城，请点击关闭</view>
+        <view class="tip-text tip-text--close">点击按钮，停用零售商城</view>
         <view class="confirm-btn">
           <button class="admin-button-com big default" @click="beginChangeCg(1)">关闭</button>
         </view>
@@ -37,15 +27,13 @@ export default {
     return {
       constant: this.$constant,
       loaded: false,
-      onlyCg: 1,
-      videoUrl: ""
+      onlyCg: 1
     };
   },
   computed: {
     ...mapGetters({ loginInfo: "getLoginInfo" })
   },
   onLoad() {
-    this.videoUrl = `${this.constant.hostUrl}/open_shop.mp4`;
     this.loadShopDetail();
   },
   methods: {