开店修改

.env

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

src/App.vue

@@ -35,53 +35,53 @@ export default {
         console.log(user);
 
         // 判断用户是否验证团长号
-        if (user.roleId && user.bundleId !== 0) {
-        } else {
-            this.api
-                .get(
-                    "/Group/CheckCode",
-                    {
-                        platform: user.fromPlatform,
-                    },
-                    { pass: true }
-                )
-                .then((res) => {
-                    if (res.success) {
-                        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({
-                                path: "/pages/index/register",
-                                query: {
-                                    pidCode: res.data.code,
-                                    step: 3,
-                                },
-                            });
-                            this.fn.setTabBar([3]);
-                        }
-                    } else {
-                        this.router.push({
-                            path: "/pages/index/register",
-                            query: {
-                                step: 2,
-                            },
-                        });
-                        this.fn.setTabBar([3]);
-                    }
-                });
-        }
+        // if (user.roleId && user.bundleId !== 0) {
+        // } else {
+        //     this.api
+        //         .get(
+        //             "/Group/CheckCode",
+        //             {
+        //                 platform: user.fromPlatform,
+        //             },
+        //             { pass: true }
+        //         )
+        //         .then((res) => {
+        //             if (res.success) {
+        //                 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({
+        //                         path: "/pages/index/register",
+        //                         query: {
+        //                             pidCode: res.data.code,
+        //                             step: 3,
+        //                         },
+        //                     });
+        //                     this.fn.setTabBar([3]);
+        //                 }
+        //             } else {
+        //                 this.router.push({
+        //                     path: "/pages/index/register",
+        //                     query: {
+        //                         step: 2,
+        //                     },
+        //                 });
+        //                 this.fn.setTabBar([3]);
+        //             }
+        //         });
+        // }
     },
 
     onShow: async function (option) {

src/common/js/plugin.js

@@ -199,8 +199,8 @@ export default {
         })
     },
 
-    // 订单订阅
-    orderTake(orderId, type) {
+    // 开店申请订阅
+    applyShopsubscribe(orderId, type) {
         api.get('/Subscription/GetMsgTpls', {
             type: type,
         }).then(res => {

src/pages.json

@@ -377,6 +377,24 @@
             "style": {
                 "navigationBarTitleText": "添加群"
             }
+        },
+        {
+            "path": "pages/guide/apply",
+            "style": {
+                "navigationBarTitleText": "申请开通店铺"
+            }
+        },
+        {
+            "path": "pages/guide/success",
+            "style": {
+                "navigationBarTitleText": "开通店铺"
+            }
+        },
+        {
+            "path": "pages/custom/webview",
+            "style": {
+                "navigationBarTitleText": ""
+            }
         }
     ]
 }

src/pages/custom/webview.vue

@@ -0,0 +1,40 @@
+<template>
+    <div class="page">
+        <web-view
+        class="web-view"
+            :src="'https://baike.baidu.com/item/%E8%8A%B1%E7%B3%96/13207983?fromtitle=%E8%8A%B1%E3%81%9F%E3%82%93&fromid=17503011&fr=aladdin'"
+        ></web-view>
+        <button class="btn" @click="jump('/pages/guide/success')">确定</button>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "",
+
+    // 数据
+    data() {
+        return {
+            url: "",
+        };
+    },
+
+    onShow() {
+        const self = this;
+        self.url = decodeURIComponent(self.$mp.query.url);
+    },
+
+    // 函数
+    methods: {},
+
+    // 数据计算
+    computed: {},
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/pages/guide/apply.vue

@@ -0,0 +1,321 @@
+<template>
+    <div class="page" :class="{ 'page--iphoneX': iphoneX }">
+        <div class="form-card">
+            <section class="form-item">
+                <div class="label">
+                    <span class="required">*</span>
+                    店铺名称：
+                </div>
+                <div class="box">
+                    <input
+                        type="text"
+                        v-model="form.appName"
+                        placeholder="请填写店铺名称"
+                    />
+                </div>
+            </section>
+        </div>
+        <div class="btns">
+            <div class="btn" @click="saveOk">立即申请</div>
+        </div>
+    </div>
+</template>
+
+<script>
+import MyImage from "../../components/image/index";
+export default {
+    name: "",
+    components: { MyImage,  },
+    // 
+    data() {
+        return {
+            form: {
+                appName: "",
+            },
+            submitLoading: false,
+        };
+    },
+
+    onLoad(opts) {
+    },
+
+    onShow() {},
+
+    // 函数
+    methods: {
+
+ 
+        saveOk() {
+            if (this.submitLoading) {
+                return;
+            }
+            if (!this.form.appName) {
+                return this.fn.showToast("请输入店铺名称");
+            }
+            this.submitLoading = true;
+            uni.showLoading({
+                title: "提交中...",
+            });
+            // let data = { ...this.form };
+            this.api
+                .post("/Shop/Apply", {query:{name:this.form.appName}}, { pass: true })
+                .then((res) => {
+                    this.submitLoading = false;
+                    uni.hideLoading();
+                    if (res.success) {
+                        this.fn.showToast("申请成功");
+                        let user = this.$store.state.user.user;
+                        user.storeStatus = 2;
+                        this.$store.commit("user/update", {
+                            user,
+                        });
+                        this.router.back();
+                    } else {
+                        this.fn.showModal({
+                            content:
+                                "申请错误:" +
+                                res.message,
+                            showCancel: false,
+                        });
+                    }
+                });
+        },
+    },
+
+    // 数据计算
+    computed: {
+        user() {
+            return this.$store.state.user.user;
+        },
+    },
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+
+<style lang="scss" scoped>
+.page {
+    padding-bottom: px(120);
+    min-height: 100vh;
+    background-color: #fff;
+}
+.page--iphoneX {
+    padding-bottom: px(150);
+    .btn {
+        padding-bottom: px(30);
+        background-color: rgb(0, 188, 38);
+    }
+}
+.form-card {
+    background-color: #fff;
+    padding: 0 px(30);
+    & ~ .form-card {
+        margin-top: px(25);
+    }
+    .head {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: px(140);
+        background-color: #fbfbfb;
+        border-bottom: 1px solid #f1f1f1;
+        border-top: 1px solid #f1f1f1;
+        font-size: px(44);
+    }
+}
+.form-item {
+    display: flex;
+    min-height: px(140);
+    padding: px(30) 0;
+    box-sizing: border-box;
+    align-items: center;
+    font-size: px(44);
+    border-top: 1px solid #f1f1f1;
+    border-bottom: 1px solid #f1f1f1;
+    &.dis-item {
+        color: #999;
+        background: #f9f9f9;
+    }
+    .label {
+        width: px(280);
+        flex-shrink: 0;
+        color: #999;
+        margin-right: px(10);
+    }
+    .box {
+        width: 100%;
+        position: relative;
+        input {
+            width: 100%;
+        }
+    }
+    .tool {
+        flex-shrink: 0;
+        color: #999;
+        margin-left: px(10);
+    }
+    textarea,
+    input {
+        max-width: 100%;
+        width: 100%;
+    }
+}
+.list {
+    // min-height: 100vh;
+    // background-color: #fff;
+    // border-bottom: 1px solid #f1f1f1;
+    li {
+        padding: px(0) px(35);
+        height: px(140);
+        line-height: px(140);
+        font-size: px(44);
+        border-top: 1px solid #f1f1f1;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+    .tools {
+        display: flex;
+        align-items: center;
+        flex-shrink: 0;
+        span {
+            display: inline-block;
+            border: 1px solid #f1f1f1;
+            font-size: px(36);
+            height: px(80);
+            width: px(120);
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            & ~ span {
+                margin-left: px(30);
+            }
+        }
+        .remove {
+            color: #f00;
+        }
+    }
+}
+.btn {
+    width: 100%;
+    height: px(120);
+    background-color: rgb(0, 188, 38);
+    color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.btns {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 100;
+}
+.layout {
+    background-color: #eee;
+    color: #666;
+}
+.add-btn {
+    height: px(120);
+    color: #333;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin: px(50) px(35) 0;
+    border: 1px solid #ccc;
+    border-radius: px(10);
+}
+.code-tool {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    .scan-img {
+        flex-shrink: 0;
+        width: px(80);
+        height: px(80);
+        /deep/ img {
+            width: px(80);
+            height: px(80);
+        }
+    }
+    .generate {
+        color: #0097d1;
+        margin-right: px(30);
+        flex-shrink: 0;
+    }
+}
+.required {
+    color: #f00;
+    font-size: px(44);
+    &.hide {
+        visibility: hidden;
+    }
+}
+.inp-dis {
+    color: #999;
+}
+
+.img-card {
+    padding-top: px(30);
+    padding-bottom: px(30);
+}
+.form-img-item {
+    .tit {
+        padding: px(30);
+        font-size: px(44);
+    }
+}
+
+.spec-list {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    li {
+        width: 33.333333%;
+        font-size: px(40);
+        height: px(100);
+        border: 1px solid #f1f1f1;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #999;
+        & ~ li {
+            // border-left: none;
+        }
+        &.on {
+            color: rgb(0, 188, 38);
+            border-color: rgb(0, 188, 38);
+        }
+    }
+}
+.mo-date {
+    margin-top: px(20);
+    border-bottom: 1px solid #f1f1f1;
+    background: #fbfbfb;
+    font-size: px(40);
+    padding: px(10);
+}
+.n-date-box {
+    margin-top: px(20);
+    font-size: px(40);
+}
+.n-date {
+    border-bottom: 1px solid #f1f1f1;
+    background: #fbfbfb;
+    padding: 0 px(20);
+    display: inline-block;
+    width: px(200);
+    font-size: px(44);
+    vertical-align: bottom;
+}
+.address-icon {
+    /deep/ img {
+        width: px(60);
+        height: px(60);
+    }
+}
+</style>

src/pages/guide/form.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="page" :class="{ 'page--iphoneX': iphoneX }">
         <div class="form-card">
-            <section class="form-item">
+            <!-- <section class="form-item">
                 <div class="label">
                     <span class="required">*</span>
                     店铺名称：
@@ -13,83 +13,70 @@
                         placeholder="请填写店铺名称"
                     />
                 </div>
-            </section>
+            </section> -->
             <section class="form-item">
                 <div class="label">
                     <span class="required">*</span>
-                    联系方式：
+                    店长电话：
                 </div>
                 <div class="box">
                     <input
                         type="text"
-                        v-model="form.mobile"
-                        placeholder="请填写联系方式"
+                        v-model="form.managerTelephone"
+                        placeholder="请填写店长电话"
                     />
                 </div>
             </section>
             <section class="form-item">
                 <div class="label">
                     <span class="required">*</span>
-                    姓名：
+                    营业开始时间：
                 </div>
                 <div class="box">
+                    <picker mode="time" @change="timeChange($event,'startTime')">
                     <input
                         type="text"
-                        v-model="form.name"
-                        placeholder="请填写姓名"
-                    />
-                </div>
-            </section>
-            <section class="form-item">
-                <div class="label">
-                    <span class="required">*</span>
-                    提货点地址：
-                </div>
-                <div class="box" @click="mapClick">
-                    <input
-                        type="text"
-                        v-model="form.pickUpAddress"
                         :disabled="true"
-                        placeholder="请选择地址"
+                        v-model="form.startTime"
+                        placeholder="请选择"
                     />
-                </div>
-                <div class="tool" @click="mapClick">
-                    <my-image
-                        class="address-icon"
-                        src="/static/common/address.png"
-                    ></my-image>
+                    </picker>
                 </div>
             </section>
             <section class="form-item">
                 <div class="label">
                     <span class="required">*</span>
-                    详细地址：
+                    营业结束时间：
                 </div>
                 <div class="box">
+                    <picker mode="time" @change="timeChange($event,'endTime')">
                     <input
                         type="text"
-                        v-model="form.address"
-                        placeholder="请填写详细地址"
+                        :disabled="true"
+                        v-model="form.endTime"
+                        placeholder="请选择"
                     />
+                    </picker>
                 </div>
             </section>
-            <!-- <section class="form-item">
+            <section class="form-item">
                 <div class="label">
                     <span class="required">*</span>
-                    身份证照 （正反面）：
+                    Logo：
                 </div>
                 <div class="box">
                     <easy-upload
                         :types="'image'"
                         v-model="mainImage"
-                        :uploadCount="2"
+                        :uploadCount="1"
                         @change="minImgChange"
                     ></easy-upload>
                 </div>
             </section>
             <section class="form-item">
                 <div class="label">
-                    店铺营业执照：
+                    <span class="required">*</span>
+                    店铺背景：
                 </div>
                 <div class="box">
                     <easy-upload
@@ -101,32 +88,18 @@
                 </div>
             </section>
             <section class="form-item">
-                <div class="label">食品许可证：</div>
-                <div class="box">
-                    <easy-upload
-                        :types="'image'"
-                        v-model="mainImage3"
-                        :uploadCount="1"
-                        @change="minImgChange3"
-                    ></easy-upload>
-                </div>
-            </section> -->
-            <!-- <section class="form-item">
                 <div class="label">
-                    推荐人：
+                    
+                    店铺通知：
                 </div>
                 <div class="box">
-                    <input type="text" v-model="form.recommendName" />
+                    <input
+                        type="text"
+                        v-model="form.shopNotice"
+                        placeholder="请填写店铺通知"
+                    />
                 </div>
             </section>
-            <section class="form-item">
-                <div class="label">
-                    邀请码：
-                </div>
-                <div class="box">
-                    <input type="text" v-model="form.invitedCode" />
-                </div>
-            </section> -->
         </div>
         <div class="btns">
             <div class="btn" @click="saveOk">保存</div>
@@ -147,7 +120,7 @@ export default {
         return {
             form: {
                 appName: "",
-                mobile: "",
+                managerTelephone: "",
                 name: "",
                 pickUpAddress: "",
                 address: "",
@@ -161,6 +134,11 @@ export default {
                 province:'',
                 city:'',
                 county:'',
+                logo:'',
+                shopBanner:'',
+                shopNotice:'',
+                startTime:'',
+                endTime:''
             },
             mainImage: [],
             mainImage2: [],
@@ -238,32 +216,37 @@ export default {
         },
 
         minImgChange(e) {
-            this.form.iDCard = e;
+            this.form.logo = e[0] || '';
         },
         minImgChange2(e) {
-            this.form.businessLicense = e[0] || "";
+            this.form.shopBanner = e[0] || "";
         },
         minImgChange3(e) {
             this.form.foodLicense = e[0] || "";
         },
+        timeChange(e,name){
+            let time = e.detail.value;
+            this.form[name] = time;
+            // console.log(e,name);
+        },
         saveOk() {
             if (this.submitLoading) {
                 return;
             }
-            if (!this.form.appName) {
-                return this.fn.showToast("请输入店铺名称");
+            if (!this.form.managerTelephone) {
+                return this.fn.showToast("请输入店长电话");
             }
-            if (!this.form.mobile) {
-                return this.fn.showToast("请输入联系方式");
+            if (!this.form.startTime) {
+                return this.fn.showToast("请选择营业开始时间");
             }
-            if (!this.form.name) {
-                return this.fn.showToast("请输入姓名");
+            if (!this.form.endTime) {
+                return this.fn.showToast("请选择营业结束时间");
             }
-            if (!this.form.pickUpAddress) {
-                return this.fn.showToast("请选择提货地址");
+            if (!this.form.logo) {
+                return this.fn.showToast("请上传logo");
             }
-            if (!this.form.address) {
-                return this.fn.showToast("请输入详细地址");
+            if (!this.form.shopBanner) {
+                return this.fn.showToast("请上传店铺背景");
             }
             // if (!this.form.iDCard) {
             //     return this.fn.showToast("请上传身份证照");
@@ -274,13 +257,14 @@ export default {
             if(this.user.parentInviteCode){
                 this.form.invitedCode = this.user.parentInviteCode;
             }
+            console.log(this.form);
             this.submitLoading = true;
             uni.showLoading({
                 title: "提交中...",
             });
             let data = { ...this.form };
             this.api
-                .post("/Shop/SubmitApply", data, { pass: true })
+                .post("/Shop/Open", data, { pass: true })
                 .then((res) => {
                     this.submitLoading = false;
                     uni.hideLoading();
@@ -362,7 +346,7 @@ export default {
         background: #f9f9f9;
     }
     .label {
-        width: px(280);
+        width: px(300);
         flex-shrink: 0;
         color: #999;
         margin-right: px(10);

src/pages/guide/success.vue

@@ -0,0 +1,135 @@
+<template>
+    <div class="page tabbar-page">
+        <div v-if="!loading" class="success-main">
+            <h2 class="success-tit1">恭喜您！</h2>
+            <h2 class="success-tit1">店铺申请通过审核</h2>
+            <h3 class="success-shop-name">店铺名称：xxxx</h3>
+
+            <div class="success-box">
+                <p class="success-text">
+                    <checkbox-group @change="checkboxChange">
+                        <checkbox  class="success-checkbox"/>
+                    </checkbox-group>
+                    <a  @click="jump({path:'/pages/custom/webview'})">店铺使用协议</a>
+                </p>
+                <button class="success-btn" @click="jump('/pages/guide/form')">
+                    现在开通
+                </button> 
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import MyImage from "../../components/image/index";
+
+export default {
+    name: "",
+    components: { MyImage },
+    // 数据
+    data() {
+        return {
+            loading: false,
+        };
+    },
+    filters: {},
+    onLoad() {},
+    async onShow() {
+    },
+
+    // onPullDownRefresh() {
+    //     this.getList();
+    // },
+
+    // 函数
+    methods: {
+
+        checkboxChange(e){
+            console.log(e);
+        }
+    },
+
+    // 数据计算
+    computed: {
+        user() {
+            return this.$store.state.user.user;
+        },
+    },
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+
+<style lang="scss" scoped>
+.success-page {
+    min-height: 100vh;
+    background-color: #fff;
+}
+.success-main {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    height: 100%;
+    padding-bottom: 2rem;
+    padding-top: px(300);
+}
+.success-btn {
+    color: #fff;
+    background-color: rgb(0, 188, 38);
+    font-size: px(44);
+    width: 100%;
+}
+.success-tit1 {
+    font-size: px(56);
+    font-weight: bold;
+    // color: rgb(0, 188, 38);
+    padding-bottom: px(40);
+    text-align: center;
+}
+.success-tit2 {
+    font-size: px(54);
+    font-weight: bold;
+    // color: rgb(0, 188, 38);
+    padding-bottom: px(120);
+    text-align: center;
+}
+.success-shop-name {
+    font-size: px(44);
+    text-align: center;
+    margin-top: px(100);
+}
+.success-box {
+    padding: px(40);
+    width: 100%;
+    margin-top: px(300);
+    .success-text {
+        width: 100%;
+        text-align: center;
+        color: #409eff;
+        margin-bottom: px(50);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        .success-checkbox{
+            transform: scale(0.8);
+        }
+    }
+}
+.success-load {
+    height: 100%;
+    padding-top: px(300);
+    .success-text {
+        width: px(700);
+        margin: 0 auto;
+        line-height: 1.6;
+        text-align: center;
+        font-size: px(44);
+    }
+}
+.success-link {
+    color: #409eff;
+}
+</style>

src/pages/index/index-scan.vue

@@ -589,20 +589,20 @@ export default {
     },
     onLoad(opts) {
         this.vipCode = opts.vipcode;
-        // 判断权限
-        if (this.user.bundleId !== 0) {
-            if (this.user.authStatus === 0) {
-                // 未注册
-                this.router.replace({
-                    path: "/pages/manage/mina/register",
-                });
-            } else if (this.user.authStatus === 90) {
-                // 等待注册
-                this.router.replace({
-                    path: "/pages/manage/mina/query",
-                });
-            }
-        }
+        // // 判断权限
+        // if (this.user.bundleId !== 0) {
+        //     if (this.user.authStatus === 0) {
+        //         // 未注册
+        //         this.router.replace({
+        //             path: "/pages/manage/mina/register",
+        //         });
+        //     } else if (this.user.authStatus === 90) {
+        //         // 等待注册
+        //         this.router.replace({
+        //             path: "/pages/manage/mina/query",
+        //         });
+        //     }
+        // }
     },
     async onShow() {
         const self = this;

src/pages/index/index.vue

@@ -520,7 +520,7 @@
         </block>
 
         <div class="guide" v-if="showGuide">
-            <div v-if="!showGuideLoading">
+            <div v-if="!user.storeStatus">
                 <h2 class="tit1">您还没有开通店铺，无法使用该模块</h2>
                 <h1 class="tit2">开通店铺您可以</h1>
                 <div class="box">
@@ -542,18 +542,51 @@
                         </li>
                     </ul>
                 </div>
-                <button class="btn" @click="jump('/pages/guide/form')">
+                <button class="btn" @click="jump('/pages/guide/apply')">
                     立即申请
                 </button>
             </div>
-            <div class="load" v-if="showGuideLoading">
+            <div class="load" v-if="user.storeStatus === 2">
                 <!-- 待审核 -->
-                <block v-if="user.storeStatus === 2">
-                    <h1 class="tit2">提交成功</h1>
-                    <div class="text">
-                        您的店铺开通申请提交成功，在审核通过后，我们将为您开通店铺并通知
+                <h1 class="tit2">提交成功</h1>
+                <div class="text">
+                    您的店铺开通申请提交成功，在审核通过后，我们将为您开通店铺并通知
+                </div>
+            </div>
+            <div class="load" v-if="user.storeStatus === 4">
+                <!-- 未通过 -->
+                <h1 class="tit2">审核未通过</h1>
+                <div class="text">
+                    您的店铺开通申请未通过，请联系客服修改后重新提交
+                </div>
+                <button class="btn" @click="jump('/pages/guide/apply')">
+                    重新提交
+                </button>
+            </div>
+            <div class="load" v-if="user.storeStatus === 3">
+                <!-- 审核通过 -->
+                <div class="success-main">
+                    <h2 class="success-tit1">恭喜您！</h2>
+                    <h2 class="success-tit1">店铺申请通过审核</h2>
+                    <!-- <h3 class="success-shop-name">店铺名称：xxxx</h3> -->
+
+                    <div class="success-box">
+                        <p class="success-text">
+                            <checkbox-group @change="checkboxChange">
+                                <checkbox value="1" class="success-checkbox" />
+                            </checkbox-group>
+                            <a @click="jump({ path: '/pages/custom/webview' })"
+                                >店铺使用协议</a
+                            >
+                        </p>
+                        <button
+                            class="success-btn"
+                            @click="openShop"
+                        >
+                            现在开通
+                        </button>
                     </div>
-                </block>
+                </div>
             </div>
         </div>
 
@@ -649,7 +682,7 @@ export default {
             loading: false, // 是否加载完成
 
             showGuide: false,
-            showGuideLoading: false,
+            agreement:false,
         };
     },
     filters: {
@@ -735,21 +768,21 @@ export default {
     },
     onLoad() {
         // 判断权限
-        if (this.user) {
-            if (this.user.bundleId !== 0) {
-                if (this.user.authStatus === 0) {
-                    // 未注册
-                    this.router.replace({
-                        path: "/pages/manage/mina/register",
-                    });
-                } else if (this.user.authStatus === 90) {
-                    // 等待注册
-                    this.router.replace({
-                        path: "/pages/manage/mina/query",
-                    });
-                }
-            }
-        }
+        // if (this.user) {
+        //     if (this.user.bundleId !== 0) {
+        //         if (this.user.authStatus === 0) {
+        //             // 未注册
+        //             this.router.replace({
+        //                 path: "/pages/manage/mina/register",
+        //             });
+        //         } else if (this.user.authStatus === 90) {
+        //             // 等待注册
+        //             this.router.replace({
+        //                 path: "/pages/manage/mina/query",
+        //             });
+        //         }
+        //     }
+        // }
     },
     async onShow() {
         const self = this;
@@ -759,15 +792,14 @@ export default {
         this.$refs.tabbar.setIndex(1);
 
         // 判断页面显示
-        if (this.user.roleId && this.user.bundleId !== 0) {
-            this.showGuide = false;
-        } else {
+        if (
+            this.user.storeStatus === 2 ||
+            this.user.storeStatus === 3 ||
+            this.user.storeStatus === 4
+        ) {
             this.showGuide = true;
-            if (this.user.storeStatus === 2) {
-                this.showGuideLoading = true;
-            } else {
-                this.showGuideLoading = false;
-            }
+        } else {
+            this.showGuide = false;
         }
     },
 
@@ -1232,6 +1264,22 @@ export default {
                 },
             });
         },
+        checkboxChange(e){
+            if(e.detail.value[0]==='1'){
+                this.agreement = true;
+            }else{
+                this.agreement = false;
+            }
+            console.log(e);
+        },
+        openShop(){
+            if(!this.agreement){
+                return this.fn.showToast('请先同意使用协议');
+            }
+            this.router.push({
+                path:'/pages/guide/form'
+            })
+        }
     },
 
     // 数据计算
@@ -1241,6 +1289,9 @@ export default {
         },
         user() {
             return this.$store.state.user.user;
+            // return {
+            //     storeStatus:4
+            // }
         },
         orderList() {
             return this.list[this.tab].list;
@@ -1934,4 +1985,67 @@ page {
         color: #409eff;
     }
 }
+.success-main {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    padding-bottom: 2rem;
+}
+.success-btn {
+    color: #fff;
+    background-color: rgb(0, 188, 38);
+    font-size: px(44);
+    width: 100%;
+}
+.success-tit1 {
+    font-size: px(56);
+    font-weight: bold;
+    // color: rgb(0, 188, 38);
+    padding-bottom: px(40);
+    text-align: center;
+}
+.success-tit2 {
+    font-size: px(54);
+    font-weight: bold;
+    // color: rgb(0, 188, 38);
+    padding-bottom: px(120);
+    text-align: center;
+}
+.success-shop-name {
+    font-size: px(44);
+    text-align: center;
+    margin-top: px(100);
+}
+.success-box {
+    padding: px(40);
+    width: 100%;
+    margin-top: px(300);
+    .success-text {
+        width: 100%;
+        text-align: center;
+        color: #409eff;
+        margin-bottom: px(50);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        .success-checkbox {
+            transform: scale(0.8);
+        }
+    }
+}
+.success-load {
+    height: 100%;
+    padding-top: px(300);
+    .success-text {
+        width: px(700);
+        margin: 0 auto;
+        line-height: 1.6;
+        text-align: center;
+        font-size: px(44);
+    }
+}
+.success-link {
+    color: #409eff;
+}
 </style>

src/pages/index/login.vue

@@ -141,19 +141,19 @@ export default {
                     if (res.success) {
                         // 判断权限
                         if (res.data.roleId && res.data.bundleId !== 0) {
-                            if (res.data.authStatus === 0) {
-                                // 未注册
-                                this.router.replace({
-                                    path: "/pages/manage/mina/register",
-                                });
-                                return;
-                            } else if (res.data.authStatus === 90) {
-                                // 等待注册
-                                this.router.replace({
-                                    path: "/pages/manage/mina/query",
-                                });
-                                return;
-                            }
+                            // if (res.data.authStatus === 0) {
+                            //     // 未注册
+                            //     this.router.replace({
+                            //         path: "/pages/manage/mina/register",
+                            //     });
+                            //     return;
+                            // } else if (res.data.authStatus === 90) {
+                            //     // 等待注册
+                            //     this.router.replace({
+                            //         path: "/pages/manage/mina/query",
+                            //     });
+                            //     return;
+                            // }
                             // 正常用户
                             this.$store.commit("user/login", res.data);
                             this.$store.commit("common/update", {

src/pages/manage/index.vue

@@ -60,7 +60,7 @@
 
         <!-- <button class="btn" @click="layout">退出登录</button> -->
 
-        <div class="ver">0.4.721</div>
+        <div class="ver">0.4.8</div>
         <wyg-bottom-tab
             ref="tabbar"
             :tabIndex="2"