修改bug

src/App.vue

@@ -32,44 +32,22 @@ export default {
         });
 
         let user = this.$store.state.user.user;
-        // for (let item of tabList) {
-        //     if (!item.hide) {
+        console.log(user)
+   
+        // if (user.roleId && user.bundleId !== 0) {
+        // } else {
+        //     if (!user.storeId) {
         //         this.router.push({
         //             path: "/pages/assistant/index",
         //             isTabBar: true,
         //         });
+        //     } else {
+        //         this.router.push({
+        //             path: "/pages/index/index",
+        //             isTabBar: true,
+        //         });
         //     }
         // }
-        if (user.roleId && user.bundleId !== 0) {
-        } else {
-            if (!user.storeId) {
-                this.router.push({
-                    path: "/pages/assistant/index",
-                    isTabBar: true,
-                });
-            } else {
-                this.router.push({
-                    path: "/pages/index/index",
-                    isTabBar: true,
-                });
-            }
-        }
-
-        // 测试
-        //   uni.getLocation({
-        //         type: "gcj02",
-        //         success: function (res) {
-        //             // let query = {
-        //             //     location: res.longitude + "," + res.latitude,
-        //             //     wechatMinaAppId: appConfig.appId,
-        //             // };
-        //             // self.api.get("/Home/GetShopList", query).then((res) => {
-        //             //     uni.hideLoading();
-        //             //     self.shopList = self.initData(res.data);
-        //             // });
-        //             console.log(res);
-        //         },
-        //     });
     },
 
     onShow: async function (option) {

src/common/api/ajax.js

@@ -206,12 +206,12 @@ const http = {
                     }
                 }
             } else if (response.statusCode === 401) {
-                // await plugin.getToken()
-                // data = await self.ajax(request[0], request[1], request[2], request[3])
-                router.push({
-                    path:'/pages/index/login',
-                    isTabBar:true
-                });
+                await plugin.getToken()
+                data = await self.ajax(request[0], request[1], request[2], request[3])
+                // router.push({
+                //     path:'/pages/index/login',
+                //     isTabBar:true
+                // });
             } else {
                 console.error(response.data)
             }

src/common/js/plugin.js

@@ -243,10 +243,6 @@ export default {
         }
     },
 
-    setTabBar() {
-          
-    },
-
 
 
     // 获取token
@@ -261,7 +257,6 @@ export default {
                     }, { pass: true }).then(res => {
                         if (res.success) {
                             store.commit("user/login", res.data);
-                            this.setTabbar();
                         } else {
                             router.push({
                                 path: '/pages/index/login',
@@ -276,6 +271,22 @@ export default {
         })
     },
 
+    setTabBar(arr){
+        console.log(arr)
+        let tabList = store.state.common.tabList;
+        tabList = JSON.parse(JSON.stringify(tabList));
+        for(let item of tabList){
+            if(arr.indexOf(item.id)!==-1){
+                item.hide = false;
+            }else{
+                item.hide = true;
+            }
+        }
+        store.commit('common/update', {
+            tabList
+        })
+    },
+
     // 修改配置
     setConfig() {
         api.get('/Shop/GetConfig').then(res => {

src/common/store/common.js

@@ -21,7 +21,7 @@ const module = {
         platformData:null,//assistant/setting2/xxx 临时保存
         tabList:[{
             id: 1,
-            name: "首页",
+            name: "订单",
             imgOff: "../../static/tabBar/icon_green_1.png",
             imgOn: "../../static/tabBar/icon_green_1_select.png",
             "url": "/pages/index/index",

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

@@ -38,42 +38,16 @@ export default {
             //图片的尺寸
             type: String,
             default: "1",
-        },
-        tabListParent: {
-            type: Array,
-            default: [],
-        },
+        }
     },
     data() {
         return {
-            curTab: 1,
-            tabList: [
-                // {id:1,name:"首页",imgOff:"../../static/img/bottom-tab-img/icon_01.png",imgOn:"../../static/img/bottom-tab-img/icon_01_f.png","url":"/pages/heritagemall/heritagemall"},
-                // {id:2,name:"分类",imgOff:"../../static/img/bottom-tab-img/icon_02.png",imgOn:"../../static/img/bottom-tab-img/icon_02_f.png","url":"/pages/heritagemall/cate"},
-                // {id:3,name:"购物车",imgOff:"../../static/img/bottom-tab-img/icon_03.png",imgOn:"../../static/img/bottom-tab-img/icon_03_f.png","url":"/pages/heritagemall/cart"},
-                // {id:4,name:"个人中心",imgOff:"../../static/img/bottom-tab-img/icon_04.png",imgOn:"../../static/img/bottom-tab-img/icon_04_f.png","url":"/pages/heritagemall/user"}
-            ],
+            curTab: 1
         };
     },
     created() {
         this.curTab = new Number(this.tabIndex);
 
-        let user = this.$store.state.user.user;
-        let tabList = this.tabListParent;
-        if (!user.storeId) {
-            for (let item of tabList) {
-                if (item.id !== 3) {
-                    item.hide = true;
-                } else {
-                    item.hide = false;
-                }
-            }
-        }
-        this.tabList = tabList;
-
-        // if (this.tabListParent.length > 0) {
-        //     this.tabList = this.tabListParent;
-        // }
     },
     methods: {
         $redirect(_url) {
@@ -89,29 +63,25 @@ export default {
         },
         setIndex(v) {
             this.curTab = new Number(v);
-            let user = this.$store.state.user.user;
-            let tabList = this.tabListParent;
-            if (!user.storeId) {
-                for (let item of tabList) {
-                    if (item.id !== 3) {
-                        item.hide = true;
-                    } else {
-                        item.hide = false;
-                    }
-                }
-            } else {
-                for (let item of tabList) {
-                    if (item.id === 3) {
-                        item.hide = true;
-                    } else {
-                        item.hide = false;
+        },
+    },
+    computed: {
+        tabList(){
+            let page = getCurrentPages();
+            let curPage = page[page.length-1];
+            console.log(curPage.route,this.$store.state.common.tabList,234)
+            if(curPage.route === 'pages/index/index'){
+                for(let item of this.$store.state.common.tabList){
+                    if(item.url === '/pages/index/index' && item.hide){
+                        this.router.push({
+                            path:'/pages/assistant/index',
+                            isTabBar:true
+                        })
                     }
                 }
             }
-            this.tabList = tabList;
+            return this.$store.state.common.tabList;
         },
-    },
-    computed: {
         itemShowNum() {
             let i = 0;
             for (let item of this.tabList) {
@@ -119,7 +89,6 @@ export default {
                     i++;
                 }
             }
-            console.log(i, 111111);
             return i;
         },
     },

src/pages/assistant/index.vue

@@ -24,9 +24,6 @@
                 </li>
             </block>
         </ul>
-        <!-- <button class="add-group" v-if="tabIndex === 0" @click="addGroup">
-            添加群
-        </button> -->
 
         <!-- 平台 -->
         <ul class="group-list" v-if="tabIndex === 1">
@@ -45,6 +42,10 @@
                 ></my-image>
             </li>
         </ul>
+        
+        <div class="layout"  @click="layout">
+            退出登录
+        </div>
         <wyg-bottom-tab
             ref="tabbar"
             :tabIndex="3"
@@ -162,7 +163,15 @@ export default {
             this.router.push({
                 path: "/pages/assistant/setting2",
             });
-        }
+        },
+
+        layout() {
+            this.$store.commit("user/logout", null);
+            this.router.push({
+                path: "/pages/index/login",
+                isTabBar: true,
+            });
+        },
     },
 
     // 数据计算
@@ -238,6 +247,18 @@ export default {
     background-color: rgb(0, 188, 38);
     font-size: px(44);
 }
+.layout{
+    color: #666;
+    position: fixed;
+    bottom: 3.5rem;
+    left: px(30);
+    right: px(30);
+    z-index: 10;
+    font-size: px(44);
+    text-align: center;
+    height: px(80);
+
+}
 .page {
     padding-bottom: 6rem;
 }

src/pages/assistant/re-pid.vue

@@ -4,11 +4,11 @@
             <section class="form-item">
                 <div class="label">
                     <span class="required">*</span>
-                    团长号：
+                    团长id：
                 </div>
                 <div class="box">
                     <div class="con">
-                        <input type="text" v-model="pid" placeholder="请输入团长号" />
+                        <input type="text" v-model="pid" placeholder="90000*****" />
                     </div>
                 </div>
             </section>

src/pages/assistant/setting.vue

@@ -1,19 +1,16 @@
 <template>
     <div class="page">
         <ul class="list">
-            <li
-                class="item"
-                @click="
-                    jump({
-                        path: '/pages/assistant/re-status',
-                    })
-                "
-            >
-                <div class="name">群状态设置</div>
-                <my-image
+            <li class="item">
+                <div class="name">暂停本群助理</div>
+                <!-- <my-image
                     class="arrow"
                     src="/static/common/arrows_left.png"
-                ></my-image>
+                ></my-image> -->
+                <switch
+                    :checked="switchChecked"
+                    @change="switchChange"
+                ></switch>
             </li>
         </ul>
     </div>
@@ -28,15 +25,51 @@ export default {
     // 数据
     data() {
         return {
-            id: "",
+            switchChecked: false,
+            groupData: {},
         };
     },
 
     onLoad(opts) {
+        this.groupData = this.$store.state.common.groupData;
+        this.switchChecked = this.groupData.status === 2 ? true : false;
     },
     async onShow() {},
     // 函数
-    methods: {},
+    methods: {
+        switchChange(e) {
+            let detail = e.detail.value;
+
+            let data = {
+                id: this.groupData._id,
+                status: detail ? 2 : 1,
+            };
+
+            this.api
+                .post("/Group/SetStatus", data, { pass: true })
+                .then((res) => {
+                    uni.hideLoading();
+                    if (res.success) {
+                        this.fn.showToast("设置成功");
+                        this.groupData.status = this.curStatus;
+
+                        this.$store.commit("common/update", {
+                            groupData: this.groupData,
+                        });
+                    } else {
+                        this.fn.showModal({
+                            title: "设置失败",
+                            content:
+                                "错误码:" +
+                                res.code +
+                                ",错误信息:" +
+                                res.message,
+                            showCancel: false,
+                        });
+                    }
+                });
+        },
+    },
 
     // 数据计算
     computed: {
@@ -77,4 +110,7 @@ export default {
         }
     }
 }
+switch{
+    transform: scale(0.7);
+}
 </style>

src/pages/index/find-password.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="page">
-        <div class="main" >
+        <div class="main">
             <!-- <div class="tit">找回密码</div> -->
             <div class="inp-box">
                 <input
@@ -87,11 +87,13 @@ export default {
             if (!phoneReg.test(this.form.phone)) {
                 return this.fn.showToast("手机号格式不正确");
             }
-            // this.sendCode();
+            this.sendCode();
             this.downTime();
         },
         sendCode() {
-            this.api.get("").then((res) => {});
+            this.api
+                .get("/Login/SendSms", { mobile: this.form.phone })
+                .then((res) => {});
         },
         downTime() {
             this.timeing = true;
@@ -110,7 +112,6 @@ export default {
         },
 
         submit() {
-            console.log(this.mobile);
             if (!this.form.phone) {
                 this.fn.showToast(`请输入手机号码`);
                 return;
@@ -140,13 +141,33 @@ export default {
                 return;
             }
 
-            // uni.showLoading({
-            //     title: "提交中",
-            // });
-            this.step = 2;
+            uni.showLoading({
+                title: "提交中",
+            });
+            let sendData = {
+                mobile: this.form.phone,
+                smsCode: this.form.code,
+                password: this.form.password,
+            };
             console.log(this.form);
+            this.api.post("/Login/FindPwd", sendData).then((res) => {
+                uni.hideLoading();
+                if (res.success) {
+                    this.fn.showToast(`密码修改成功`);
+                    this.$store.commit("user/logout", null);
+                    this.router.push({
+                        path: "/pages/index/login",
+                        isTabBar: true,
+                    });
+                } else {
+                    this.fn.showModal({
+                        title: "密码修改失败",
+                        content: res.message,
+                        showCancel: false,
+                    });
+                }
+            });
         },
-
     },
 
     // 数据计算
@@ -224,5 +245,4 @@ export default {
         }
     }
 }
-
 </style>

src/pages/index/login.vue

@@ -83,23 +83,38 @@ export default {
                 .get("/Group/CheckCode", data, { pass: true })
                 .then((res) => {
                     if (res.success) {
-                        if (res.data) {
+                        if (res.data.verified) {
                             if (!res.data.storeId) {
                                 this.router.push({
                                     isTabBar: true,
                                     path: "/pages/assistant/index",
                                 });
+                                this.fn.setTabBar([3]);
                             } else {
                                 this.router.push({
                                     isTabBar: true,
                                     path: "/pages/index/index",
                                 });
+                                this.fn.setTabBar([1,2]);
                             }
                         } else {
-                            this.router.push("/pages/index/register?step=3");
+                            this.router.push({
+                                path:"/pages/index/register",
+                                query:{
+                                    pidCode:res.data.code,
+                                    step:3
+                                }
+                            });
+                                this.fn.setTabBar([3]);
                         }
                     } else {
-                        this.router.push("/pages/index/register?step=2");
+                        this.router.push({
+                             path:"/pages/index/register",
+                                query:{
+                                    step:2
+                                }
+                        });
+                                this.fn.setTabBar([3]);
                     }
                 });
         },
@@ -139,14 +154,15 @@ export default {
                                     isTabBar: true,
                                     path: "/pages/assistant/index",
                                 });
+                                this.fn.setTabBar([3]);
                             } else {
                                 this.router.push({
                                     isTabBar: true,
                                     path: "/pages/index/index",
                                 });
+                                this.fn.setTabBar([1,2]);
                             }
                             this.fn.roleHandle();
-                            this.fn.setTabBar();
                             return;
                         } else {
                             // 正常用户
@@ -154,7 +170,6 @@ export default {
                             this.$store.commit("common/update", {
                                 curShop: {},
                             });
-                            this.fn.setTabBar();
 
                             this.checkcode(
                                 {

src/pages/index/register.vue

@@ -100,7 +100,7 @@
         <div class="main" v-if="step === 3">
             <div class="tit">添加助理微信</div>
             <ul class="add-assistant">
-                <li @click="copy('xxx')">
+                <li @click="copy(kefu._id)">
                     <div class="step">第一步：</div>
                     <div class="con">
                         <div>
@@ -118,11 +118,17 @@
                 <li>
                     <div class="step">第二步：</div>
                     <div class="con">
-                        <div>在群里发一条@群助理消息</div>
+                        <div>将助理拉入群</div>
                     </div>
                 </li>
-                <li @click="copy(pidCode)">
+                <li>
                     <div class="step">第三步：</div>
+                    <div class="con">
+                        <div>在群里@群助理</div>
+                    </div>
+                </li>
+                <li @click="copy(pidCode)">
+                    <div class="step">第四步：</div>
                     <div class="con">
                         <div>
                             发送
@@ -146,7 +152,7 @@ export default {
     // 数据
     data() {
         return {
-            step: 3,
+            step: 1,
             form: {
                 mobile: "",
                 smsCode: "",
@@ -165,10 +171,13 @@ export default {
     onLoad(opts) {
         if (opts.step) {
             this.step = Number(opts.step);
-            if (this.step !== 1) {
-                this.getAvailableWechat();
+            if(this.step !==1){
+            this.getAvailableWechat();
             }
         }
+        if (opts.pidCode) {
+            this.pidCode = opts.pidCode;
+        }
         if (opts.fromPlatform) {
             this.form.fromPlatform = Number(opts.fromPlatform);
         }
@@ -180,9 +189,12 @@ export default {
     // 函数
     methods: {
         getAvailableWechat() {
-            this.api.get("/Group/GetAvailableWechat").then((res) => {
-                this.kefu = res.data[0] ? res.data[0] : {};
-            });
+            this.api
+                .get("/Group/GetAvailableWechat", {}, { pass: true })
+                .then((res) => {
+                    this.kefu = res.data[0] ? res.data[0] : {};
+                    console.log(this.kefu);
+                });
         },
 
         getCode() {
@@ -275,7 +287,6 @@ export default {
                             this.$store.commit("common/update", {
                                 curShop: {},
                             });
-                            this.fn.setTabBar();
                             this.step = 2;
                             this.getAvailableWechat();
                         } else {
@@ -339,16 +350,16 @@ export default {
         },
 
         saveOk() {
-                        // this.router.push("/pages/index/register?step=2");
-                        // return;
-            self.fn.showToast("注册成功");  
+            // this.router.push("/pages/index/register?step=2");
+            // return;
+            // self.fn.showToast("注册成功");
             this.api
                 .get("/Group/CheckCode", {
                     platform: this.form.fromPlatform,
                 })
                 .then((res) => {
                     if (res.success) {
-                        if (res.data) {
+                        if (res.data.verified) {
                             this.router.push({
                                 path: "/page/assistant/index",
                                 isTabBar: true,

src/pages/manage/index.vue

@@ -86,7 +86,7 @@ export default {
     },
 
     onLoad() {
-        this.getUserMenu();
+        // this.getUserMenu();
     },
     async onShow() {
         if (this.isAdmin) {
@@ -108,6 +108,7 @@ export default {
                 // this.getShopList();
             }
         }
+        this.getUserMenu();
         this.$refs.tabbar.setIndex(2);
     },
     // 函数