修改bug

src/components/layout/manage-nav.vue

@@ -0,0 +1,162 @@
+<template>
+    <div class="c-nav" :style="'height:' + (statusBarHeight + height) + 'px;'">
+        <div
+            class="c-nav__status-bar"
+            :style="'height:' + statusBarHeight + 'px;'"
+        ></div>
+        <div
+            class="c-nav__fixed"
+            :style="'top:' + statusBarHeight + 'px; height:' + height + 'px;'"
+        >
+            <div class="c-nav__content">
+                <div class="c-nav__left" >
+                  <button type="button" v-if="shopId" @click="viewShop()" class="go-shop">去店铺</button>
+                </div>
+                <div v-if="title" class="c-nav__title">{{ title }}</div>
+                <div class="c-nav__slot">
+                    <slot></slot>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "MyNav",
+
+    props: {
+        // 左侧按钮
+        shopId: {
+            type: String,
+            default: "",
+        },
+
+        // 标题
+        title: {
+            type: String,
+            default: "",
+        },
+
+        // 标题
+        hideIcon: {
+            type: Boolean,
+            default: false,
+        },
+    },
+
+    // 数据
+    data() {
+        return {
+            statusBarHeight: uni.getSystemInfoSync().statusBarHeight, //状态栏高度,
+            height: 44,
+        };
+    },
+
+    // 初始化
+    created() {
+        const self = this;
+
+        // #ifdef MP-WEIXIN
+        let button = wx.getMenuButtonBoundingClientRect();
+        self.height = (button.top - self.statusBarHeight) * 2 + button.height;
+        // #endif
+    },
+
+    // 函数
+    methods: {
+        // 返回上一页
+        back() {
+            const self = this;
+            self.router.back();
+        },
+
+        viewShop(){
+            uni.navigateToMiniProgram({
+                appId:'wx7d16ba51271496b8',
+                path:'/pages/goods/index?shopId='+this.shopId,
+                extraData:{
+                    shopId:this.shopId
+                }
+            })
+        }
+    },
+
+    // 数据计算
+    computed: {},
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../common/scss/public";
+
+.c-nav {
+    background-color: #fff;
+
+    &__status-bar {
+        position: fixed;
+        top: 0;
+        left: 0;
+        z-index: 996;
+        width: 100%;
+        background-color: #fff;
+    }
+
+    &__fixed {
+        position: fixed;
+        top: 0;
+        left: 0;
+        z-index: 996;
+        width: 100%;
+        background-color: #fff;
+    }
+
+    &__content {
+        position: relative;
+        display: flex;
+        align-items: center;
+        width: 100%;
+        height: 100%;
+        padding: 0 px2(30);
+
+        /* #ifdef MP */
+        padding-right: px2(200);
+        /* #endif */
+    }
+
+    &__icon {
+        width: px2(60);
+        height: px2(60);
+        margin-right: px2(30);
+    }
+
+    &__title {
+        @include omit(px2(300));
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        z-index: 1;
+        width: px2(300);
+        transform: translate(-50%, -50%);
+        font-size: px2(36);
+        font-weight: 700;
+        text-align: center;
+        color: #000;
+    }
+
+    &__slot {
+        flex: 1;
+    }
+}
+.go-shop{
+    font-size: px2(34);
+    height: px(80);
+    border-radius: px(40);
+    line-height: px(80);
+
+    background-color: transparent;
+}
+</style>

src/pages.json

@@ -42,7 +42,8 @@
         {
             "path": "pages/index/index",
             "style": {
-                "navigationBarTitleText": "手机管理端"
+                "navigationBarTitleText": "手机管理端",
+                "navigationStyle":"custom"
             }
         },
         {
@@ -85,7 +86,8 @@
         {
             "path": "pages/manage/index",
             "style": {
-                "navigationBarTitleText": "菜单"
+                "navigationBarTitleText": "菜单",
+                "navigationStyle":"custom"
             }
         },
         {
@@ -320,7 +322,8 @@
         {
             "path": "pages/assistant/index",
             "style": {
-                "navigationBarTitleText": "群助理"
+                "navigationBarTitleText": "群助理",
+                "navigationStyle":"custom"
             }
         },
         {

src/pages/assistant/index.vue

@@ -1,5 +1,6 @@
 <template>
     <div class="page tabbar-page">
+        <manage-nav :shopId="shopId" :title="'群助理'"></manage-nav>
         <div class="page-main">
             <div class="filter">
                 <ul class="date-list">
@@ -67,10 +68,11 @@
 <script>
 import MyImage from "../../components/image/index";
 import wygBottomTab from "../../components/wyg-bottom-tab/wyg-bottom-tab";
+import ManageNav from "../../components/layout/manage-nav";
 
 export default {
     name: "",
-    components: { MyImage, wygBottomTab },
+    components: { MyImage, wygBottomTab,ManageNav },
     // 数据
     data() {
         return {
@@ -79,6 +81,7 @@ export default {
             dataList: [],
             dataEnd: false,
             platformList: [],
+            shopId:'',
         };
     },
     filters: {
@@ -94,6 +97,7 @@ export default {
     async onShow() {
         this.$refs.tabbar.setIndex(3);
         this.getList();
+        this.checkStatus();
     },
 
     // onPullDownRefresh() {
@@ -102,6 +106,24 @@ export default {
 
     // 函数
     methods: {
+        checkStatus() {
+            /* 
+                闭店中 = 0,  // 已开通，店铺未营业
+                营业中 = 1,  // 店铺营业中
+                待审核 = 2,  // 通过审核后，状态改为闭店中
+                待开通 = 3,  // 通过审核，等待开通
+                未通过审核 = 4  // 未通过审核
+            */
+            this.api.get("/Shop/checkStatus").then((res) => {
+                if (res.data === 1 || res.data === 0) {
+                    this.api
+                        .get("/Shop/GetInfo", {}, { pass: true })
+                        .then((infoRes) => {
+                            this.shopId = infoRes.data.id;
+                        });
+                }
+            });
+        },
         getPlatformList() {
             uni.showLoading({
                 title: "加载中...",

src/pages/index/index.vue

@@ -1,5 +1,6 @@
 <template>
     <div class="page tabbar-page">
+        <manage-nav :shopId="shopId" :title="'手机管理端'"></manage-nav>
         <block v-if="!showGuide">
             <div class="page__top">
                 <div class="shop-main" v-if="isAdmin">
@@ -568,7 +569,9 @@
                 <div class="success-main">
                     <h2 class="success-tit1">恭喜您！</h2>
                     <h2 class="success-tit1">店铺申请通过审核</h2>
-                    <h3 class="success-shop-name" v-if="shopName">店铺名称：{{shopName}}</h3>
+                    <h3 class="success-shop-name" v-if="shopName">
+                        店铺名称：{{ shopName }}
+                    </h3>
 
                     <div class="success-box">
                         <p class="success-text">
@@ -617,10 +620,11 @@ import fn from "../../common/js/function";
 import uniPopup from "../../components/uni-popup/uni-popup";
 import uniPopupDialog from "../../components/uni-popup/uni-popup-dialog";
 import wygBottomTab from "../../components/wyg-bottom-tab/wyg-bottom-tab";
+import ManageNav from "../../components/layout/manage-nav";
 
 export default {
     name: "",
-    components: { MyImage, uniPopup, uniPopupDialog, wygBottomTab },
+    components: { MyImage, uniPopup, uniPopupDialog, wygBottomTab,ManageNav },
     // 数据
     data() {
         return {
@@ -681,7 +685,8 @@ export default {
             showGuide: false,
             agreement: false,
             storeStatus: -1,
-            shopName:''
+            shopName: "",
+            shopId:null,
         };
     },
     filters: {
@@ -794,14 +799,12 @@ export default {
 
     // 函数
     methods: {
-
-        getShopInfo(){
-            this.api.get('/Shop/GetInfo',{},{pass:true})
-                .then(res=>{
-                    if(res.success && res.data){
-                        this.shopName = res.data.name;
-                    }
-                })
+        getShopInfo() {
+            this.api.get("/Shop/GetInfo", {}, { pass: true }).then((res) => {
+                if (res.success && res.data) {
+                    this.shopName = res.data.name;
+                }
+            });
         },
         checkStatus() {
             /* 
@@ -821,7 +824,7 @@ export default {
                 } else {
                     this.showGuide = true;
                 }
-                if(this.storeStatus === 3){
+                if (this.storeStatus === 3) {
                     this.getShopInfo();
                 }
                 if (this.storeStatus === 5) {
@@ -830,6 +833,13 @@ export default {
                 if (this.storeStatus === 6) {
                     this.router.replace("/pages/guide/points");
                 }
+                if (res.data === 1 || res.data === 0) {
+                    this.api
+                        .get("/Shop/GetInfo", {}, { pass: true })
+                        .then((infoRes) => {
+                            this.shopId = infoRes.data.id;
+                        });
+                }
             });
         },
         // 切换导航

src/pages/manage/index.vue

@@ -1,5 +1,6 @@
 <template>
     <div class="page tabbar-page">
+        <manage-nav :shopId="shopId" :title="'菜单'"></manage-nav>
         <div class="tips" v-if="shopErr">
             当前店铺没有门店，请后台添加门店后重试
         </div>
@@ -79,11 +80,12 @@
 
 <script>
 import MyImage from "../../components/image/index";
+import ManageNav from "../../components/layout/manage-nav";
 import wygBottomTab from "../../components/wyg-bottom-tab/wyg-bottom-tab";
 
 export default {
     name: "",
-    components: { MyImage, wygBottomTab },
+    components: { MyImage, wygBottomTab, ManageNav },
 
     // 数据
     data() {
@@ -96,6 +98,7 @@ export default {
             showShop: true,
             showMenu: true,
             storeStatus: -1,
+            shopId: null,
         };
     },
 
@@ -132,7 +135,7 @@ export default {
         // }
         this.getUserMenu();
         this.$refs.tabbar.setIndex(2);
-        // this.checkStatus();
+        this.checkStatus();
     },
     // 函数
     methods: {
@@ -145,7 +148,13 @@ export default {
                 未通过审核 = 4  // 未通过审核
             */
             this.api.get("/Shop/checkStatus").then((res) => {
-                this.storeStatus = res.data;
+                if (res.data === 1 || res.data === 0) {
+                    this.api
+                        .get("/Shop/GetInfo", {}, { pass: true })
+                        .then((infoRes) => {
+                            this.shopId = infoRes.data.id;
+                        });
+                }
             });
         },
         getUserMenu() {