shish 5 лет назад
Родитель
Сommit
a98d17267a

+ 13 - 12
ghsApp/src/admin/home/workbench.vue

@@ -4,12 +4,6 @@
 		<div class="user-wrap">
 			<div class="user-top">
 				<div class="app-size-28">今日概况</div>
-				<view class="open-bt_bx">
-					<button @tap="getMyMall" class="admin-button-com">
-						<i class="iconfont icongouwuche"></i>
-						我的商城
-					</button>
-				</view>
 			</div>
 			<div class="income-amount">
 				<div>收入金额</div>
@@ -80,7 +74,7 @@
 			</view>
 			<div class="tabs-wrap">
 				<div class="tabs-list" v-for="(item, index) in tabsData" :key="index">
-					<div @click="pageTo(item)">
+					<div @click="goPage(item)">
 						<div class="tabs-img">
 							<img :src="item.img" alt mode="widthFix" />
 						</div>
@@ -182,6 +176,11 @@ export default {
 			],
 			// tab按钮
 			tabsData: [
+				{
+					name: "商城",
+					img: `${this.$constant.imgUrl}/ghs/home/shop.png`,
+					url: "/admin/my-mall"
+				},
 				{
 					name: "改价",
 					img: `${this.$constant.imgUrl}/ghs/home/gj.png`,
@@ -222,11 +221,6 @@ export default {
 					img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,
 					url: "/admin/staff/list"
 				},
-				{
-					name: "门店",
-					img: `${this.$constant.imgUrl}/ghs/home/shop.png`,
-					url: "/admin/shop/list"
-				},
 				{
 					name: "邀请开店",
 					img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,
@@ -343,6 +337,13 @@ export default {
 
 
 
+		},
+		goPage (item) {
+			if (item.url === '/admin/my-mall') {
+				this.getMyMall()
+				return
+			}
+			this.$util.pageTo(item)
 		},
 		// 跳转
 		pageToFn(item) {

+ 1 - 1
ghsApp/src/pagesClient/official/index.vue

@@ -27,7 +27,7 @@
       <app-swiper :height="{type: 'number',val: 400}" :list="swiper" :width="{type: 'string',val: '95%'}"/>
     </view>
     <view class="footer_bar">
-      <view class="relation">联系我们{{getLoginInfo.openShop}}</view>
+      <view class="relation">联系我们</view>
       <view class="free" @click="pageTo({url: '/pagesClient/official/pay'})" v-if="getLoginInfo.openShop == 1">免费试用</view>
       <div v-if="getLoginInfo.openShop != 1" class="free">已申请</div>
     </view>

+ 10 - 15
hdApp/src/admin/home/workbench.vue

@@ -4,15 +4,6 @@
     <div class="user-wrap" :style="{ backgroundImage: `url(${constant.imgUrl}/home/bg_hd_home.png)` }">
       <div class="user-top">
         <div class="app-size-28">今日概况</div>
-        <view class="open-bt_bx">
-          <button
-            @tap="goToMallPt('pages/home/index')"
-            class="admin-button-com"
-          >
-            <i class="iconfont icongouwuche"></i>
-            我的商城
-          </button>
-        </view>
       </div>
       <div class="income-amount">
         <div>收入金额</div>
@@ -201,6 +192,11 @@ export default {
       ],
       // tab按钮
       tabsData: [
+        {
+          name: "商城",
+          img: `${this.$constant.imgUrl}/ghs/home/shop.png`,
+          url: "/admin/my-mall"
+        },
         {
           name: "收款",
           img: `${this.$constant.imgUrl}/ghs/home/icon_sk.png`,
@@ -226,11 +222,6 @@ export default {
           img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,
           url: "/admin/staff/list"
         },
-        {
-          name: "库存",
-          img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,
-          url: "/pagesStorehouse/stockWarn/manage"
-        },
         {
           name: "邀请开店",
           img: `${this.$constant.imgUrl}/ghs/home/yqyl.png`,
@@ -297,7 +288,11 @@ export default {
     goPage (item) {
       if (item.url === '/admin/billing/priceChange') {
         this.goToMallPt('pages/pay/index')
-        return
+        return true
+      }
+      if(item.url === '/admin/my-mall'){
+        this.goToMallPt('pages/home/index')
+        return true
       }
       this.$util.pageTo(item)
     },