修改bug

.env

@@ -7,13 +7,13 @@ NODE_ENV = 'production'
 VUE_APP_ENV = develop
 
 # 接口请求基地址
-VUE_APP_API_BASE_URL = http://localhost:8096
+VUE_APP_API_BASE_URL = https://delivery.dev.ixiaokejia.com
 
 # 接口请求基地址
 VUE_APP_WEBSOCKET_BASE_URL = 
 
 # 图片基地址
-VUE_APP_IMAGE_BASE_URL = http://localhost:8096
+VUE_APP_IMAGE_BASE_URL = https://delivery.dev.ixiaokejia.com
 VUE_APP_IMAGE_RESOURCE_URL = https://oss.ixiaokejia.com
 
 # 微信小程序appId

src/components/wyg-bottom-tab/wyg-bottom-tab.vue

@@ -79,33 +79,33 @@ export default {
             //     }
             // }
 
-            let page = getCurrentPages();
-            let curPage = page[page.length - 1];
+            // let page = getCurrentPages();
+            // let curPage = page[page.length - 1];
             let tabList = this.$store.state.common.tabList;
-            let user = this.$store.state.user.user;
+            // let user = this.$store.state.user.user;
 
-            if (
-                curPage.route === "pages/index/index" ||
-                curPage.route === "pages/manage/index"
-            ) {
-                if (user.roleId && user.bundleId !== 0) {
-                } else {
-                    this.router.push({
-                        path: "/pages/guide/index",
-                        isTabBar: true,
-                    });
-                }
-            }
+            // if (
+            //     curPage.route === "pages/index/index" ||
+            //     curPage.route === "pages/manage/index"
+            // ) {
+            //     if (user.roleId && user.bundleId !== 0) {
+            //     } else {
+            //         this.router.push({
+            //             path: "/pages/guide/index",
+            //             isTabBar: true,
+            //         });
+            //     }
+            // }
 
-            if (user.roleId && user.bundleId !== 0) {
-            } else {
-                tabList = JSON.parse(JSON.stringify(tabList));
-                for (let item of tabList) {
-                    if (item.id === 1 || item.id === 2) {
-                        item.url = "/pages/guide/index";
-                    }
-                }
-            }
+            // if (user.roleId && user.bundleId !== 0) {
+            // } else {
+            //     tabList = JSON.parse(JSON.stringify(tabList));
+            //     for (let item of tabList) {
+            //         if (item.id === 1 || item.id === 2) {
+            //             item.url = "/pages/guide/index";
+            //         }
+            //     }
+            // }
             return tabList;
         },
         itemShowNum() {
@@ -139,6 +139,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     z-index: 3000;
+    border-top: 1px solid #f1f1f1;
     .bottom-tab-item {
         width: 33%;
         display: flex;

src/pages.json

@@ -35,12 +35,6 @@
                 "pagePath": "pages/index/login",
                 "iconPath": "static/tabBar/icon_green_4.png",
                 "selectedIconPath": "static/tabBar/icon_green_4_select.png"
-            },
-            {
-                "text": "开通店铺",
-                "pagePath": "pages/guide/index",
-                "iconPath": "static/tabBar/icon_green_4.png",
-                "selectedIconPath": "static/tabBar/icon_green_4_select.png"
             }
         ]
     },
@@ -377,6 +371,12 @@
             "style": {
                 "navigationBarTitleText": "申请店铺"
             }
+        },
+        {
+            "path": "pages/assistant/add",
+            "style": {
+                "navigationBarTitleText": "添加群"
+            }
         }
     ]
 }

src/pages/assistant/add.vue

@@ -0,0 +1,363 @@
+<template>
+    <div class="page">
+        <div class="main">
+
+            <div class="tit">添加助理微信</div>
+            <ul class="add-assistant">
+                <li @click="copy(kefu._id, '复制群助理微信成功')">
+                    <div class="step">第一步：</div>
+                    <div class="con">
+                        <div>
+                            助理微信：<span class="wechat">{{ kefu._id }}</span>
+                            <span class="copy">点击复制</span>
+                        </div>
+                        <my-image
+                            class="wechat-img"
+                            mode="widthFix"
+                            @click="viewImg(kefu.qrCode)"
+                            :src="kefu.qrCode"
+                        ></my-image>
+                    </div>
+                </li>
+                <li>
+                    <div class="step">第二步：</div>
+                    <div class="con">
+                        <div class="font-blod">将助理拉入群</div>
+                    </div>
+                </li>
+                <li>
+                    <div class="step">第三步：</div>
+                    <div class="con">
+                        <div>在群里@群助理</div>
+                    </div>
+                </li>
+                <li
+                    @click="
+                        copy(
+                            pidCode,
+                            '已复制群验证码，请粘贴发送到要开通助理的群内'
+                        )
+                    "
+                >
+                    <div class="step">第四步：</div>
+                    <div class="con">
+                        <div>
+                            发送
+                            <span class="wechat red">{{ pidCode }}</span> 到群内
+                            <span class="copy">点击复制</span>
+                        </div>
+                    </div>
+                </li>
+            </ul>
+            <button class="btn" @click="saveOk">已完成</button>
+        </div>
+    </div>
+</template>
+
+<script>
+import MyImage from "../../components/image/index";
+
+export default {
+    name: "",
+    components: { MyImage },
+    // 数据
+    data() {
+        return {
+            pidCode: "",
+            kefu: {},
+            share: {
+                title: "开通群助理",
+                path: "/pages/index/register",
+                imageUrl:
+                    "https://oss.ixiaokejia.com/images/common/share_register.jpg",
+            },
+
+            inviteCode: "",
+        };
+    },
+
+    onLoad(opts) {
+        this.getAvailableWechat();
+        this.getGenCode();
+    },
+
+    onShow() {},
+
+    // 函数
+    methods: {
+        getGenCode() {
+            this.api
+                .get(
+                    "/Group/GetGenCode",
+                    { platform: this.user.platform },
+                    { pass: true }
+                )
+                .then((res) => {
+                    this.pidCode = res.data;
+                });
+        },
+
+        getAvailableWechat(pid) {
+            let sendData = {};
+            if (pid) {
+                sendData.pid = pid;
+            }
+            this.api
+                .get("/Group/GetAvailableWechat", sendData, { pass: true })
+                .then((res) => {
+                    if (res.data.length === 0) {
+                        this.fn.showModal({
+                            title: "提示",
+                            content:
+                                "暂时所有群助理都已经排满，请您联系客服或稍后再试。客服微信：jingzhunwlyx",
+                            showCancel: false,
+                        });
+                    } else {
+                        this.kefu = res.data[0] ? res.data[0] : {};
+                        console.log(this.kefu);
+                    }
+                });
+        },
+
+        viewImg(url) {
+            uni.previewImage({
+                urls: [url],
+            });
+        },
+
+        copy(val, str) {
+            const self = this;
+
+            uni.setClipboardData({
+                data: val,
+                success: () => {
+                    self.fn.showToast(str || "复制成功");
+                },
+            });
+        },
+
+        saveOk() {
+            // this.router.push("/pages/index/register?step=2");
+            // return;
+            // self.fn.showToast("注册成功");
+            let sendData = {
+                platform: this.form.fromPlatform,
+            };
+            if (this.hideReturn) {
+                sendData.code = this.pidCode;
+            }
+            this.api.get("/Group/CheckCode", sendData).then((res) => {
+                if (res.success) {
+                    if (res.data.verified) {
+                        this.router.push({
+                            path: "/pages/assistant/index",
+                            isTabBar: true,
+                        });
+                    } else {
+                        this.fn.showModal({
+                            title: "失败",
+                            content:
+                                "助理没有收到您发送在群里的团长号，请确认1、2、3步全部完成后再试",
+                            showCancel: false,
+                        });
+                    }
+                } else {
+                    this.fn
+                        .showModal({
+                            title: "未填写团长号",
+                            content: "确认返回团长号填写",
+                            showCancel: false,
+                        })
+                        .then((res) => {
+                            if (res.confirm) {
+                                this.step = 2;
+                            }
+                        });
+                    // this.router.push("/index/register?step=2");
+                }
+            });
+        },
+    },
+
+    // 数据计算
+    computed: {
+        user() {
+            return this.$store.state.user.user;
+        },
+    },
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+
+<style lang="scss" scoped>
+.page {
+    height: 100vh;
+    background-color: #fff;
+}
+.main {
+    padding-top: px(120);
+    padding-left: px(40);
+    padding-right: px(40);
+}
+.tit {
+    font-size: px(50);
+    padding-bottom: px(100);
+    text-align: center;
+    padding-bottom: px(100);
+}
+.inp-box {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 1px solid #c3c1c2;
+    padding: px(30) 0;
+    margin-bottom: px(30);
+}
+.inp-box span {
+    font-size: px(32);
+    color: rgb(0, 188, 38);
+    border-radius: px(15);
+    border: 1px solid rgb(0, 188, 38);
+    width: px(230);
+    height: px(80);
+    text-align: center;
+    line-height: px(80);
+    flex-shrink: 0;
+    margin-left: px(30);
+}
+.inp-box input {
+    width: 100%;
+}
+.inp-box .dis {
+    color: #999;
+    border-color: #999;
+    pointer-events: none;
+}
+.btn {
+    margin-top: px(120);
+    color: #fff;
+    background-color: rgb(0, 188, 38);
+    font-size: px(44);
+    margin-bottom: px(50);
+}
+.code-box {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .code-btn {
+        width: px(250);
+        flex-shrink: 0;
+        font-size: px(40);
+        padding: 0 px(10);
+        border: none;
+        &.dis {
+            border-color: #f1f1f1;
+            color: #999;
+        }
+    }
+}
+.team-num-des {
+    padding: px(80) px(30);
+    text-align: center;
+    line-height: 1.5;
+    .tit {
+        font-size: px(48);
+        padding: px(10) 0;
+    }
+    .text {
+        font-size: px(44);
+        padding: px(15) 0;
+    }
+    video {
+        width: 80vw;
+        height: calc(80vw / 0.466666);
+        display: block;
+        margin: 0 auto;
+    }
+    .img,
+    .video {
+        padding: px(20) 0;
+    }
+    /deep/ img {
+        width: 80%;
+        display: block;
+        margin: 0 auto;
+    }
+}
+.add-assistant {
+    border-top: 1px solid #f1f1f1;
+    li {
+        display: flex;
+        justify-content: space-between;
+        font-size: px(44);
+        padding: px(30);
+        border-bottom: 1px solid #f1f1f1;
+        .step {
+            width: px(200);
+            flex-shrink: 0;
+            font-weight: bold;
+        }
+        .con {
+            width: 100%;
+        }
+        .wechat-img {
+            padding: px(10);
+            /deep/ img {
+                width: px(600);
+            }
+        }
+    }
+}
+.copy {
+    display: inline-block;
+    font-size: px(32);
+    line-height: px(44);
+    padding: 0 px(10);
+    border: 1px solid #4395ff;
+    color: #4395ff;
+    background-color: #fff;
+    margin-left: px(20);
+    border-radius: px(5);
+    transform: translate(0, -1px);
+}
+.wechat {
+    color: #4395ff;
+    &.red {
+        color: red;
+        font-weight: bold;
+    }
+}
+.go-login {
+    text-align: center;
+    padding-top: px(60);
+    .text {
+        display: inline-block;
+        color: #4395ff;
+    }
+}
+.font-blod {
+    font-weight: bold;
+}
+.return-page {
+    font-size: px(40);
+    color: #333;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    transform: translate(0, px(-80));
+    color: #666;
+    .arrow {
+        width: px(40);
+        height: px(40);
+        flex-shrink: 0;
+        margin-right: px(20);
+        /deep/ img {
+            width: px(40);
+            height: px(40);
+        }
+    }
+}
+</style>

src/pages/assistant/index.vue

@@ -24,7 +24,16 @@
                         ></my-image>
                     </li>
                 </block>
-                <button class="btn" @click="jump({path:'/pages/index/register',query:{step:3,add:'add'}})">添加群</button>
+                <button
+                    class="btn"
+                    @click="
+                        jump({
+                            path: '/pages/assistant/add',
+                        })
+                    "
+                >
+                    添加群
+                </button>
             </ul>
 
             <!-- 平台 -->
@@ -46,7 +55,7 @@
             </ul>
         </div>
 
-        <div class="layout" @click="layout">退出登录</div>
+        <!-- <div class="layout" @click="layout">退出登录</div> -->
         <wyg-bottom-tab
             ref="tabbar"
             :tabIndex="3"
@@ -191,7 +200,7 @@ export default {
 .tabbar-page {
     height: 100vh;
 }
-.page-main{
+.page-main {
     overflow: auto;
     max-height: 100%;
 }
@@ -257,7 +266,7 @@ export default {
 .layout {
     color: #666;
     position: fixed;
-    bottom: 3.5rem;
+    bottom: 3.6rem;
     left: px(30);
     right: px(30);
     z-index: 10;
@@ -270,7 +279,7 @@ export default {
 }
 .btn {
     position: fixed;
-    bottom: 6rem;
+    bottom: 3.5rem;
     left: px(30);
     right: px(30);
     z-index: 10;

src/pages/assistant/setting.vue

@@ -32,17 +32,17 @@ export default {
 
     onLoad(opts) {
         this.groupData = this.$store.state.common.groupData;
-        this.switchChecked = this.groupData.status === 2 ? true : false;
+        this.switchChecked = this.groupData.status === 1 ? true : false;
     },
     async onShow() {},
     // 函数
     methods: {
         switchChange(e) {
             let detail = e.detail.value;
-
+            this.switchChecked = detail;
             let data = {
                 id: this.groupData._id,
-                status: detail ? 2 : 1,
+                status: detail ? 1 : 2,
             };
 
             this.api
@@ -57,13 +57,10 @@ export default {
                             groupData: this.groupData,
                         });
                     } else {
+                        this.switchChecked = !this.switchChecked;
                         this.fn.showModal({
                             title: "设置失败",
-                            content:
-                                "错误码:" +
-                                res.code +
-                                ",错误信息:" +
-                                res.message,
+                            content: "错误信息:" + res.message,
                             showCancel: false,
                         });
                     }
@@ -110,7 +107,7 @@ export default {
         }
     }
 }
-switch{
+switch {
     transform: scale(0.7);
 }
 </style>

src/pages/guide/form.vue

@@ -111,9 +111,8 @@
                     ></easy-upload>
                 </div>
             </section> -->
-            <section class="form-item">
+            <!-- <section class="form-item">
                 <div class="label">
-                    <!-- <span class="required">*</span> -->
                     推荐人：
                 </div>
                 <div class="box">
@@ -122,13 +121,12 @@
             </section>
             <section class="form-item">
                 <div class="label">
-                    <!-- <span class="required">*</span> -->
                     邀请码：
                 </div>
                 <div class="box">
                     <input type="text" v-model="form.invitedCode" />
                 </div>
-            </section>
+            </section> -->
         </div>
         <div class="btns">
             <div class="btn" @click="saveOk">保存</div>
@@ -158,6 +156,11 @@ export default {
                 iDCard: "",
                 recommendName: "",
                 invitedCode: "",
+                latitude:'',
+                longitude:'',
+                province:'',
+                city:'',
+                county:'',
             },
             mainImage: [],
             mainImage2: [],
@@ -166,12 +169,33 @@ export default {
         };
     },
 
-    onLoad(opts) {},
+    onLoad(opts) {
+        this.getGroupInfo();
+    },
 
     onShow() {},
 
     // 函数
     methods: {
+
+        getGroupInfo(){
+            this.api.get('/Group/getGroupInfo',{},{pass:true})
+                .then(res=>{
+                    if(res.success && res.data){
+                        this.form.appName = res.data.shopName || '';
+                        this.form.province = res.data.province || '';
+                        this.form.city = res.data.city || '';
+                        this.form.county = res.data.district || '';
+                        this.form.address = res.data.detialAddr || '';
+                        this.form.latitude = res.data.latitude || '';
+                        this.form.longitude = res.data.longitude || '';
+                        if(this.form.province){
+                            this.form.pickUpAddress = `${this.form.province}${this.form.city}${this.form.county}`
+                        }
+                    }
+                })
+        },
+
         mapClick() {
             let self = this;
             // 判断定位权限
@@ -200,6 +224,11 @@ export default {
                 type: "gcj02", //返回可以用于uni.openLocation的经纬度
                 success: function (res) {
                     self.form.pickUpAddress = res.address;
+                    self.form.province = '';
+                    self.form.city = '';
+                    self.form.county = '';
+                        this.form.latitude = res.latitude.toFixed(6) || '';
+                        this.form.longitude = res.longitude.toFixed(6) || '';
                     console.log("定位ok", res);
                 },
                 fail(e) {
@@ -242,6 +271,9 @@ export default {
             // if (this.form.iDCard.length !== 2) {
             //     return this.fn.showToast("请分别上传身份证照正反面");
             // }
+            if(this.user.parentInviteCode){
+                this.form.invitedCode = this.user.parentInviteCode;
+            }
             this.submitLoading = true;
             uni.showLoading({
                 title: "提交中...",
@@ -275,7 +307,11 @@ export default {
     },
 
     // 数据计算
-    computed: {},
+    computed: {
+        user() {
+            return this.$store.state.user.user;
+        },
+    },
 
     // 数据监听
     watch: {},

src/pages/index/login.vue

@@ -20,7 +20,7 @@
             </div>
             <button class="btn" @click="submit">确定</button>
             <div class="login-other">
-                <a class="go-register" @click="jump('/pages/index/register')"
+                <a class="go-register" @click="jumpRegister"
                     >去注册</a
                 >
                 <a
@@ -44,10 +44,12 @@ export default {
         return {
             userName: "",
             password: "",
+            urlQuery:{},
         };
     },
 
-    onLoad() {
+    onLoad(opts) {
+        this.urlQuery = opts;
         uni.hideLoading();
     },
 
@@ -55,6 +57,14 @@ export default {
 
     // 函数
     methods: {
+
+        jumpRegister(){
+            this.router.push({
+                path:'/pages/index/register',
+                query:this.urlQuery
+            })
+        },
+
         submit() {
             console.log(this.mobile);
             if (!this.userName) {

src/pages/index/register.vue

@@ -190,20 +190,25 @@ export default {
                 imageUrl:
                     "https://oss.ixiaokejia.com/images/common/share_register.jpg",
             },
+
             hideReturn: false,
+            inviteCode:''
         };
     },
 
     onLoad(opts) {
         if (opts.step) {
             this.step = Number(opts.step);
-            if (this.step !== 1) {
+            if (this.step === 3) {
                 this.getAvailableWechat();
             }
         }
         if (opts.pidCode) {
             this.pidCode = opts.pidCode;
         }
+        if (opts.inviteCode) {
+            this.inviteCode = opts.inviteCode;
+        }
         if (opts.fromPlatform) {
             this.form.fromPlatform = Number(opts.fromPlatform);
         }
@@ -231,9 +236,13 @@ export default {
                 });
         },
 
-        getAvailableWechat() {
+        getAvailableWechat(pid) {
+            let sendData = {};
+            if(pid){
+                sendData.pid = pid;
+            }
             this.api
-                .get("/Group/GetAvailableWechat", {}, { pass: true })
+                .get("/Group/GetAvailableWechat", sendData, { pass: true })
                 .then((res) => {
                     if (res.data.length === 0) {
                         this.fn.showModal({
@@ -325,6 +334,9 @@ export default {
                 password: this.form.password,
                 fromPlatform: this.form.fromPlatform,
             };
+            if(this.inviteCode){
+                sendData.parentInviteCode = this.inviteCode;
+            }
             uni.login({
                 provider: "weixin",
                 success: (result) => {
@@ -340,7 +352,6 @@ export default {
                                 curShop: {},
                             });
                             this.step = 2;
-                            this.getAvailableWechat();
                         } else {
                             this.fn.showModal({
                                 title: "注册失败",
@@ -378,6 +389,7 @@ export default {
                         this.fn.showToast(`团长号提交成功`);
                         this.pidCode = res.data;
                         this.step = 3;
+                            this.getAvailableWechat(this.form.teamNum);
                     } else {
                         this.fn.showModal({
                             title: "团长号提交失败",
@@ -409,10 +421,14 @@ export default {
             // this.router.push("/pages/index/register?step=2");
             // return;
             // self.fn.showToast("注册成功");
-            this.api
-                .get("/Group/CheckCode", {
+            let sendData = {
                     platform: this.form.fromPlatform,
-                })
+                };
+            if(this.hideReturn){
+                sendData.code = this.pidCode;
+            }
+            this.api
+                .get("/Group/CheckCode", sendData)
                 .then((res) => {
                     if (res.success) {
                         if (res.data.verified) {

src/pages/manage/index.vue

@@ -4,27 +4,29 @@
             当前店铺没有门店，请后台添加门店后重试
         </div>
         <div v-if="!shopErr">
-            <div class="page__top" v-if="isAdmin">
-                <div class="name">当前门店：</div>
-                <div class="shop" v-if="!hideShop" @click="goShopSelect">
-                    <div class="shop__name">
-                        <!-- 最多6字 -->
-                        {{ curShop.name ? curShop.name : "加载中..." }}
-                        <i class="iconfont iconyoujiantou shop__arrow"></i>
+            <block v-if="showShop">
+                <div class="page__top" v-if="isAdmin">
+                    <div class="name">当前门店：</div>
+                    <div class="shop" v-if="!hideShop" @click="goShopSelect">
+                        <div class="shop__name">
+                            <!-- 最多6字 -->
+                            {{ curShop.name ? curShop.name : "加载中..." }}
+                            <i class="iconfont iconyoujiantou shop__arrow"></i>
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div class="page__top" v-else>
-                <div class="name">当前门店：</div>
-                <div class="shop">
-                    <div class="shop__name">
-                        <!-- 最多6字 -->
+                <div class="page__top" v-else>
+                    <div class="name">当前门店：</div>
+                    <div class="shop">
+                        <div class="shop__name">
+                            <!-- 最多6字 -->
 
-                        {{ curShop.name ? curShop.name : "加载中..." }}
-                        <!-- <i class="iconfont iconyoujiantou shop__arrow"></i> -->
+                            {{ curShop.name ? curShop.name : "加载中..." }}
+                            <!-- <i class="iconfont iconyoujiantou shop__arrow"></i> -->
+                        </div>
                     </div>
                 </div>
-            </div>
+            </block>
             <ul class="menu" v-if="!menuLoading">
                 <li
                     class="item"
@@ -35,13 +37,13 @@
                     <my-image class="img" :src="item.icon"></my-image>
                     <span class="text">{{ item.name }}</span>
                 </li>
-                <!-- <li class="item" @click="jump('/pages/manage/user/index')">
+                <li class="item" @click="jump('/pages/manage/user/index')">
                     <my-image
                         class="img"
                         src="/static/icon/user.png"
                     ></my-image>
                     <span class="text">账号设置</span>
-                </li> -->
+                </li>
                 <!-- <li class="item" @click="jump('/pages/manage/cashier/index')">
                     <my-image
                         class="img"
@@ -56,24 +58,27 @@
                     ></my-image>
                     <span class="text">历史单据</span>
                 </li> -->
-              
             </ul>
         </div>
 
-        <button class="btn" @click="layout">退出登录</button>
+        <!-- <button class="btn" @click="layout">退出登录</button> -->
 
-        <div class="ver">0.4.7</div>
-        <wyg-bottom-tab ref="tabbar" :tabIndex="2" :tabListParent="tabList"></wyg-bottom-tab>
+        <div class="ver">0.4.72</div>
+        <wyg-bottom-tab
+            ref="tabbar"
+            :tabIndex="2"
+            :tabListParent="tabList"
+        ></wyg-bottom-tab>
     </div>
 </template>
 
 <script>
 import MyImage from "../../components/image/index";
-import wygBottomTab  from "../../components/wyg-bottom-tab/wyg-bottom-tab";
+import wygBottomTab from "../../components/wyg-bottom-tab/wyg-bottom-tab";
 
 export default {
     name: "",
-    components: { MyImage,wygBottomTab },
+    components: { MyImage, wygBottomTab },
 
     // 数据
     data() {
@@ -82,7 +87,8 @@ export default {
             shopErr: false,
             menuList: [],
             menuLoading: true,
-            loading:false,
+            loading: false,
+            showShop: true,
         };
     },
 
@@ -90,6 +96,7 @@ export default {
         // this.getUserMenu();
     },
     async onShow() {
+        this.showShop = true;
         if (this.isAdmin) {
             this.curShop = {
                 name: this.user.storeName,
@@ -103,10 +110,11 @@ export default {
                     id: this.user.storeId,
                 };
             } else {
-                this.fn.showModal({
-                    content: "当前用户无门店设置，请前往后台设置所属店铺",
-                });
+                // this.fn.showModal({
+                //     content: "当前用户无门店设置，请前往后台设置所属店铺",
+                // });
                 // this.getShopList();
+                this.showShop = false;
             }
         }
         this.getUserMenu();
@@ -114,7 +122,6 @@ export default {
     },
     // 函数
     methods: {
-
         getUserMenu() {
             uni.showLoading({
                 title: "加载中...",
@@ -162,7 +169,13 @@ export default {
             this.$store.commit("user/update", {
                 menuList: arr,
             });
-            this.menuList = arr;
+            let arr2 = [];
+            for(let item of arr){
+                if(item.id !=='mobile_setting'){
+                    arr2.push(item);
+                }
+            }
+            this.menuList = arr2;
         },
 
         getShopList() {
@@ -208,9 +221,8 @@ export default {
 
     // 数据计算
     computed: {
-        
-        tabList(){
-            return this.$store.state.common.tabList ;
+        tabList() {
+            return this.$store.state.common.tabList;
         },
         user() {
             return this.$store.state.user.user;
@@ -314,7 +326,7 @@ export default {
 }
 .btn {
     position: fixed;
-    bottom: 3.5rem;
+    bottom: 3.6rem;
     left: px(30);
     right: px(30);
     z-index: 10;

src/pages/manage/user/index.vue

@@ -30,6 +30,7 @@
                 ></my-image>
             </li>
         </ul>
+        <button class="btn" @click="layout">退出登录</button>
     </div>
 </template>
 
@@ -57,7 +58,16 @@ export default {
     },
     async onShow() {},
     // 函数
-    methods: {},
+    methods: {
+
+        layout() {
+            this.$store.commit("user/logout", null);
+            this.router.push({
+                path: "/pages/index/login",
+                isTabBar: true,
+            });
+        },
+    },
 
     // 数据计算
     computed: {
@@ -98,4 +108,14 @@ export default {
         }
     }
 }
+.btn {
+    position: fixed;
+    bottom: 2rem;
+    left: px(30);
+    right: px(30);
+    z-index: 10;
+    color: #333;
+    background-color: #f3f3f3;
+    font-size: px(44);
+}
 </style>