店铺主页UI及部分调整

ghs/src/admin/home/apply.vue

@@ -0,0 +1,15 @@
+<template>
+    <div>
+
+    </div>
+</template>
+
+<script>
+    export default { // 应用页面
+        name:'Apply'
+    }
+</script>
+
+<style lang="scss" scoped>
+
+</style>

ghs/src/admin/home/me.vue

@@ -0,0 +1,15 @@
+<template>
+    <div>
+
+    </div>
+</template>
+
+<script>
+    export default { // 我的
+        name:"Me"
+    }
+</script>
+
+<style lang="scss" scoped>
+
+</style>

ghs/src/admin/home/workbench.vue

@@ -4,9 +4,16 @@
     <div class="user-wrap">
       <div class="user-top">
         <div class="app-size-28">今日概况</div>
-        <div @click="pageTo('/admin/setting/password')">
-          <app-avatar-module :src="avatarImg | default_avatar" :width="80" />
-        </div>
+        <view class="open-bt_bx">
+            <view class="">
+                <i class="iconfont iconfenxiang"></i>
+                商城分享
+            </view>
+            <view>
+              <i class="iconfont iconshoukuanma"></i>
+              收款
+            </view>
+        </view>
       </div>
       <div class="income-amount" @click="pageTo('/admin/assets/list')">
         <div>收入金额</div>
@@ -82,7 +89,11 @@
     </div>
     <!-- <fab-module /> -->
     <!-- 续费遮罩层 -->
-    <modal-module :show="renewMask" :custom="true" :maskClosable="true" padding="30rpx 30rpx">
+    <modal-module 
+      :show="renewMask" 
+      :custom="true" 
+      :maskClosable="true" 
+      padding="30rpx 30rpx">
       <template>
         <div class="renew-wrap">
           <div class="renew-wrap-text">你的账号已到期</div>
@@ -152,35 +163,40 @@ export default {
       ],
       // tab按钮
       tabsData: [
+        // {
+        //   name: "商品",
+        //   img: `${this.$constant.imgUrl}/retail/admin/tab-icon-1.png`,
+        //   url: "/admin/goodsManage/list"
+        // },
+        // {
+        //   name: "老带新",
+        //   img: `${this.$constant.imgUrl}/retail/admin/tab-icon-2.png`,
+        //   url: "/admin/interest/invite"
+        // },
+        // {
+        //   name: "优惠券",
+        //   img: `${this.$constant.imgUrl}/retail/admin/tab-icon-3.png`,
+        //   url: "/admin/coupon/list"
+        // },
+        // {
+        //   name: "广告",
+        //   img: `${this.$constant.imgUrl}/retail/admin/tab-icon-4.png`,
+        //   url: "/admin/ad/list"
+        // },
+        // {
+        //   name: "图库",
+        //   img: `${this.$constant.imgUrl}/retail/admin/tab-icon-1.png`,
+        //   url: "/admin/goodsManage/img-store"
+        // },
+        // {
+        //   name: "数据统计",
+        //   img: `${this.$constant.imgUrl}/retail/admin/tab-icon-5.png`,
+        //   url: "/admin/statistics/demo"
+        // },
         {
-          name: "商品",
-          img: `${this.$constant.imgUrl}/retail/admin/tab-icon-1.png`,
-          url: "/admin/goodsManage/list"
-        },
-        {
-          name: "老带新",
-          img: `${this.$constant.imgUrl}/retail/admin/tab-icon-2.png`,
-          url: "/admin/interest/invite"
-        },
-        {
-          name: "优惠券",
-          img: `${this.$constant.imgUrl}/retail/admin/tab-icon-3.png`,
-          url: "/admin/coupon/list"
-        },
-        {
-          name: "广告",
-          img: `${this.$constant.imgUrl}/retail/admin/tab-icon-4.png`,
-          url: "/admin/ad/list"
-        },
-        {
-          name: "图库",
-          img: `${this.$constant.imgUrl}/retail/admin/tab-icon-1.png`,
-          url: "/admin/goodsManage/img-store"
-        },
-        {
-          name: "数据统计",
-          img: `${this.$constant.imgUrl}/retail/admin/tab-icon-5.png`,
-          url: "/admin/statistics/demo"
+          name: "库存预警",
+          img: `${this.$constant.imgUrl}/ghs/home/mds.png`,
+          url: "/admin/staff/list"
         },
         {
           name: "员工",
@@ -197,16 +213,16 @@ export default {
           img: `${this.$constant.imgUrl}/retail/admin/tab-icon-511.png`,
           url: "/admin/interest/my-invite"
         },
-        {
-          name: "进货",
-          img: `${this.$constant.imgUrl}/retail/admin/tab-icon-7.png`,
-          url: "/admin/shop/list"
-        },
-        {
-          name: "设置",
-          img: `${this.$constant.imgUrl}/retail/admin/tab-icon-8.png`,
-          url: "/admin/setting/list"
-        }
+        // {
+        //   name: "进货",
+        //   img: `${this.$constant.imgUrl}/retail/admin/tab-icon-7.png`,
+        //   url: "/admin/shop/list"
+        // },
+        // {
+        //   name: "设置",
+        //   img: `${this.$constant.imgUrl}/retail/admin/tab-icon-8.png`,
+        //   url: "/admin/setting/list"
+        // }
       ],
       // 总览
       totalData: [
@@ -240,9 +256,9 @@ export default {
   computed: {
     ...mapGetters({ userInfo: "getUser" }),
     ...mapGetters({ loginInfo: "getLoginInfo" }),
-    avatarImg() {
-      return this.$util.isEmpty(this.loginInfo) ? "" : this.loginInfo.avatar;
-    }
+    // avatarImg() {
+    //   return this.$util.isEmpty(this.loginInfo) ? "" : this.loginInfo.avatar;
+    // }
   },
   onLoad(option) {
   },
@@ -334,9 +350,27 @@ export default {
   .user-top {
     // padding-top: 20px;
     @include disFlex(center, space-between);
+    .open-bt_bx {
+      display: flex;
+      align-items: center;
+      & > view {
+        border: 1px solid #FFFFFF;
+        border-radius: 22px;
+        padding: 10px 17px;
+        font-size: 24px;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: #FFFFFF;
+        margin: 0 10px;
+        & > .iconfont {
+          font-size: 26px;
+          padding-right: 10px;
+        }
+      }
+    }
   }
   .income-amount {
-    margin-top: 14px;
+    margin-top: 39px;
     margin-bottom: 40px;
     .price {
       font-size: 50px;
@@ -454,4 +488,5 @@ export default {
     font-size: 34px;
   }
 }
+
 </style>

ghs/src/admin/shop/list.vue

@@ -139,8 +139,8 @@
 			},
 			// 删除弹窗
 			delModalFn(item) {
-				this.$msg('即将开通...')
-				return false
+				// this.$msg('即将开通...')
+				// return false
 				this.delModalText = this.tabIndex == 0 ? '确定删除该吗？' : '确定删除该角色吗？'
 				this.operateData = item
 				this.delModal = true

ghs/src/pages.json

@@ -27,6 +27,20 @@
 				"enablePullDownRefresh": true
 			}
 		},
+		{
+			"path": "admin/home/apply",
+			"style": {
+				"navigationBarTitleText": "应用",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "admin/home/me",
+			"style": {
+				"navigationBarTitleText": "应用",
+				"enablePullDownRefresh": true
+			}
+		},
 		{
 			"path": "common/redirect",
 			"style": {
@@ -383,23 +397,36 @@
 		"selectedColor": "#3385FF",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
-		"list": [{
+		"list": [
+			{
 				"pagePath": "admin/home/workbench",
-				"iconPath": "static/images/admin/workbench-no.png",
-				"selectedIconPath": "static/images/admin/workbench-is.png",
-				"text": "工作台"
+				"iconPath": "static/images/common/shop-tab_no.png",
+				"selectedIconPath": "static/images/common/shop-tab.png",
+				"text": "店铺"
 			},
 			{
 				"pagePath": "admin/home/order",
-				"iconPath": "static/images/admin/order-no.png",
-				"selectedIconPath": "static/images/admin/order-is.png",
+				"iconPath": "static/images/common/order-no.png",
+				"selectedIconPath": "static/images/common/order-is.png",
 				"text": "订单"
 			},
 			{
 				"pagePath": "admin/home/member",
-				"iconPath": "static/images/admin/member-no.png",
-				"selectedIconPath": "static/images/admin/member-is.png",
+				"iconPath": "static/images/common/member-no.png",
+				"selectedIconPath": "static/images/common/member-is.png",
 				"text": "客户"
+			},
+			{
+				"pagePath": "admin/home/apply",
+				"iconPath": "static/images/common/category-no.png",
+				"selectedIconPath": "static/images/common/shop-apply.png",
+				"text": "应用"
+			},
+			{
+				"pagePath": "admin/home/me",
+				"iconPath": "static/images/common/user-no.png",
+				"selectedIconPath": "static/images/common/shop-me.png",
+				"text": "我的"
 			}
 		]
 	}

ghs/src/static/iconfont/iconfont.css

@@ -1,26 +1,95 @@
 @font-face {
-  /* font-family: 'iconfont'; */
-  /* src: url('https://at.alicdn.com/t/font_1525256_6243f1wxe9f.eot');
-  src: url('https://at.alicdn.com/t/font_1525256_6243f1wxe9f.eot?#iefix') format('embedded-opentype'),
-  url('https://at.alicdn.com/t/font_1525256_6243f1wxe9f.woff2') format('woff2'),
-  url('https://at.alicdn.com/t/font_1525256_6243f1wxe9f.woff') format('woff'),
-  url('https://at.alicdn.com/t/font_1525256_6243f1wxe9f.ttf') format('truetype'),
-  url('https://at.alicdn.com/t/font_1525256_6243f1wxe9f.svg#iconfont') format('svg'); */
+  // font-family: 'iconfont';  /* project id 1525256 */
+  // src: url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.eot');
+  // src: url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.eot?#iefix') format('embedded-opentype'),
+  // url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.woff2') format('woff2'),
+  // url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.woff') format('woff'),
+  // url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.ttf') format('truetype'),
+  // url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.svg#iconfont') format('svg');
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.eot');
-  src: url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.eot?#iefix') format('embedded-opentype'),
-  url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.woff2') format('woff2'),
-  url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.woff') format('woff'),
-  url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.ttf') format('truetype'),
-  url('https://at.alicdn.com/t/font_1525256_wlfxtfn2lio.svg#iconfont') format('svg');
+  src: url('https://at.alicdn.com/t/font_1525256_o1jlicqqmi.eot');
+  src: url('https://at.alicdn.com/t/font_1525256_o1jlicqqmi.eot?#iefix') format('embedded-opentype'),
+  url('https://at.alicdn.com/t/font_1525256_o1jlicqqmi.woff2') format('woff2'),
+  url('https://at.alicdn.com/t/font_1525256_o1jlicqqmi.woff') format('woff'),
+  url('https://at.alicdn.com/t/font_1525256_o1jlicqqmi.ttf') format('truetype'),
+  url('https://at.alicdn.com/t/font_1525256_o1jlicqqmi.svg#iconfont') format('svg');
 }
 .iconfont {
   font-family: "iconfont" !important;
-  font-size: 32px;
+  font-size: 16px;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
+
+.iconshoukuanma:before {
+  content: "\e600";
+}
+
+.icongouwuche:before {
+  content: "\e7d5";
+}
+
+.iconjianqu:before {
+  content: "\e7d3";
+}
+
+.icontianjia:before {
+  content: "\e7d4";
+}
+
+.iconsearch1:before {
+  content: "\e7d6";
+}
+
+.icondingdanweixuanzhong1:before {
+  content: "\e7c9";
+}
+
+.icondianpuweixuanzhong:before {
+  content: "\e7ca";
+}
+
+.iconwodeweixuanzhong:before {
+  content: "\e7cb";
+}
+
+.iconyingyongweixuanzhong:before {
+  content: "\e7cc";
+}
+
+.icondianpuxuanzhong:before {
+  content: "\e7cd";
+}
+
+.icondingdanxuanzhong1:before {
+  content: "\e7ce";
+}
+
+.iconwodexuanzhong:before {
+  content: "\e7cf";
+}
+
+.iconkehuweixuanzhong1:before {
+  content: "\e7d0";
+}
+
+.iconyingyongxuanzhong:before {
+  content: "\e7d1";
+}
+
+.iconkehuxuanzhong1:before {
+  content: "\e7d2";
+}
+
+.iconxiaochengxu2:before {
+  content: "\e78d";
+}
+
+.iconmeituan:before {
+  content: "\e78e";
+}
+
 .iconzhangshangcaifuyemianshoujiban344:before {
   content: "\e632";
 }
@@ -33,9 +102,6 @@
   content: "\e619";
 }
 
-.iconjiantouxia:before {
-  content: "\e61a";
-}
 .iconjiantouxia:before {
   content: "\e61a";
 }
@@ -306,5 +372,4 @@
 
 .iconyishiyong:before {
   content: "\e73c";
-}
-
+}