店铺修改

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

@@ -200,16 +200,16 @@ export default {
     },
 
     // 开店申请订阅
-    applyShopsubscribe(orderId, type) {
+    applyShopsubscribe(objId) {
         api.get('/Subscription/GetMsgTpls', {
-            type: type,
+            type: 7,
         }).then(res => {
             uni.requestSubscribeMessage({
                 tmplIds: res.data,
                 success: () => {
                     api.post('/Subscription/Subscribe', {
-                        type: 4,
-                        objectId: orderId.toString(),
+                        type: 7,
+                        objectId: objId.toString(),
                     }).then(() => {
                         console.log('订阅成功')
                     })

src/pages.json

@@ -360,16 +360,10 @@
                 "navigationBarTitleText": "找回密码"
             }
         },
-        {
-            "path": "pages/guide/index",
-            "style": {
-                "navigationBarTitleText": "申请店铺"
-            }
-        },
         {
             "path": "pages/guide/form",
             "style": {
-                "navigationBarTitleText": "申请店铺"
+                "navigationBarTitleText": "开通店铺"
             }
         },
         {
@@ -395,6 +389,18 @@
             "style": {
                 "navigationBarTitleText": ""
             }
+        },
+        {
+            "path": "pages/manage/points",
+            "style": {
+                "navigationBarTitleText": "设置积分"
+            }
+        },
+        {
+            "path": "pages/manage/set-shop",
+            "style": {
+                "navigationBarTitleText": "店铺设置"
+            }
         }
     ]
 }

src/pages/custom/webview.vue

@@ -2,7 +2,7 @@
     <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'"
+            :src="'https://delivery.ixiaokejia.com/open_shop_agreement.html'"
         ></web-view>
         <button class="btn" @click="jump('/pages/guide/success')">确定</button>
     </div>

src/pages/guide/apply.vue

@@ -14,29 +14,163 @@
                     />
                 </div>
             </section>
+            <section class="form-item">
+                <div class="label">
+                    <span class="required">*</span>
+                    联系方式：
+                </div>
+                <div class="box">
+                    <input
+                        type="text"
+                        v-model="form.mobile"
+                        placeholder="请填写联系方式"
+                    />
+                </div>
+            </section>
+            <section class="form-item">
+                <div class="label">
+                    <span class="required">*</span>
+                    姓名：
+                </div>
+                <div class="box">
+                    <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="请选择地址"
+                    />
+                </div>
+                <div class="tool" @click="mapClick">
+                    <my-image
+                        class="address-icon"
+                        src="/static/common/address.png"
+                    ></my-image>
+                </div>
+            </section>
+            <section class="form-item">
+                <div class="label">
+                    <span class="required">*</span>
+                    详细地址：
+                </div>
+                <div class="box">
+                    <input
+                        type="text"
+                        v-model="form.address"
+                        placeholder="请填写详细地址"
+                    />
+                </div>
+            </section>
+            <!-- <section class="form-item">
+                <div class="label">
+                    <span class="required">*</span>
+                    身份证照 （正反面）：
+                </div>
+                <div class="box">
+                    <easy-upload
+                        :types="'image'"
+                        v-model="mainImage"
+                        :uploadCount="2"
+                        @change="minImgChange"
+                    ></easy-upload>
+                </div>
+            </section>
+            <section class="form-item">
+                <div class="label">
+                    店铺营业执照：
+                </div>
+                <div class="box">
+                    <easy-upload
+                        :types="'image'"
+                        v-model="mainImage2"
+                        :uploadCount="1"
+                        @change="minImgChange2"
+                    ></easy-upload>
+                </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" />
+                </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>
+            <div class="btn" @click="saveOk">保存</div>
         </div>
     </div>
 </template>
 
 <script>
 import MyImage from "../../components/image/index";
+import DateTimePicker from "../../components/biaofun-datetime-picker/biaofun-datetime-picker";
+import easyUpload from "../../components/easy-upload/easy-upload";
+
 export default {
     name: "",
-    components: { MyImage,  },
-    // 
+    components: { MyImage, DateTimePicker, easyUpload },
+    // 数据
     data() {
         return {
             form: {
                 appName: "",
+                mobile: "",
+                name: "",
+                pickUpAddress: "",
+                address: "",
+                foodLicense: "",
+                businessLicense: "",
+                iDCard: "",
+                recommendName: "",
+                invitedCode: "",
+                latitude:'',
+                longitude:'',
+                province:'',
+                city:'',
+                county:'',
             },
+            mainImage: [],
+            mainImage2: [],
+            mainImage3: [],
             submitLoading: false,
         };
     },
 
     onLoad(opts) {
+        this.getGroupInfo();
     },
 
     onShow() {},
@@ -44,7 +178,74 @@ export default {
     // 函数
     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;
+            // 判断定位权限
+            uni.getSetting({
+                success: function (res) {
+                    if (res.authSetting["scope.userLocation"] === false) {
+                        self.fn
+                            .showModal({
+                                content: "请授权位置信息后使用",
+                                showCancel: false,
+                            })
+                            .then((res) => {
+                                uni.openSetting({});
+                            });
+                    } else {
+                        self.userLocation = true;
+                        self.chooseLocation();
+                    }
+                },
+            });
+        },
+
+        chooseLocation() {
+            let self = this;
+            uni.chooseLocation({
+                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) {
+                    console.log("定位no", e);
+                },
+            });
+        },
+
+        minImgChange(e) {
+            this.form.iDCard = e;
+        },
+        minImgChange2(e) {
+            this.form.businessLicense = e[0] || "";
+        },
+        minImgChange3(e) {
+            this.form.foodLicense = e[0] || "";
+        },
         saveOk() {
             if (this.submitLoading) {
                 return;
@@ -52,28 +253,47 @@ export default {
             if (!this.form.appName) {
                 return this.fn.showToast("请输入店铺名称");
             }
+            if (!this.form.mobile) {
+                return this.fn.showToast("请输入联系方式");
+            }
+            if (!this.form.name) {
+                return this.fn.showToast("请输入姓名");
+            }
+            if (!this.form.pickUpAddress) {
+                return this.fn.showToast("请选择提货地址");
+            }
+            if (!this.form.address) {
+                return this.fn.showToast("请输入详细地址");
+            }
+            // if (!this.form.iDCard) {
+            //     return this.fn.showToast("请上传身份证照");
+            // }
+            // 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: "提交中...",
             });
-            // let data = { ...this.form };
+            let data = { ...this.form };
             this.api
-                .post("/Shop/Apply", {query:{name:this.form.appName}}, { pass: true })
+                .post("/Shop/SubmitApply", data, { 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.fn.showToast("保存成功");
+                        this.fn.applyShopsubscribe(res.data);
                         this.router.back();
                     } else {
                         this.fn.showModal({
                             content:
-                                "申请错误:" +
+                                "错误码:" +
+                                res.code +
+                                ",错误信息:" +
                                 res.message,
                             showCancel: false,
                         });
@@ -133,7 +353,6 @@ export default {
     align-items: center;
     font-size: px(44);
     border-top: 1px solid #f1f1f1;
-    border-bottom: 1px solid #f1f1f1;
     &.dis-item {
         color: #999;
         background: #f9f9f9;

src/pages/guide/form.vue

@@ -1,29 +1,31 @@
 <template>
     <div class="page" :class="{ 'page--iphoneX': iphoneX }">
         <div class="form-card">
-            <!-- <section class="form-item">
+            <section class="form-item dis">
                 <div class="label">
-                    <span class="required">*</span>
+                    <!-- <span class="required">*</span> -->
                     店铺名称：
                 </div>
                 <div class="box">
                     <input
                         type="text"
+                        :disabled="true"
                         v-model="form.appName"
-                        placeholder="请填写店铺名称"
+                        placeholder=" "
                     />
                 </div>
-            </section> -->
-            <section class="form-item">
+            </section>
+            <section class="form-item dis">
                 <div class="label">
-                    <span class="required">*</span>
+                    <!-- <span class="required">*</span> -->
                     店长电话：
                 </div>
                 <div class="box">
                     <input
                         type="text"
+                        :disabled="true"
                         v-model="form.managerTelephone"
-                        placeholder="请填写店长电话"
+                        placeholder=" "
                     />
                 </div>
             </section>
@@ -93,11 +95,12 @@
                     店铺通知：
                 </div>
                 <div class="box">
-                    <input
+                    <!-- <input
                         type="text"
-                        v-model="form.shopNotice"
-                        placeholder="请填写店铺通知"
-                    />
+                        
+                    /> -->
+                    <textarea v-model="form.shopNotice" :maxlength="2048" :auto-height="true"
+                        placeholder="请填写店铺通知"></textarea>
                 </div>
             </section>
         </div>
@@ -119,26 +122,13 @@ export default {
     data() {
         return {
             form: {
-                appName: "",
-                managerTelephone: "",
-                name: "",
-                pickUpAddress: "",
-                address: "",
-                foodLicense: "",
-                businessLicense: "",
-                iDCard: "",
-                recommendName: "",
-                invitedCode: "",
-                latitude:'',
-                longitude:'',
-                province:'',
-                city:'',
-                county:'',
+                appNmae:'',
+                managerTelephone:'',
+                startTime:'',
+                endTime:'',
                 logo:'',
                 shopBanner:'',
                 shopNotice:'',
-                startTime:'',
-                endTime:''
             },
             mainImage: [],
             mainImage2: [],
@@ -148,7 +138,7 @@ export default {
     },
 
     onLoad(opts) {
-        this.getGroupInfo();
+        this.getData();
     },
 
     onShow() {},
@@ -156,74 +146,31 @@ export default {
     // 函数
     methods: {
 
-        getGroupInfo(){
-            this.api.get('/Group/getGroupInfo',{},{pass:true})
+        getData(){
+            this.api.get('/Shop/GetInfo',{},{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}`
-                        }
+                        this.form.appName = res.data.name;
+                        this.form.managerTelephone = res.data.managerTelephone;
+                    }else{
+                          this.fn.showModal({
+                            content:res.message,
+                            showCancel: false,
+                        }).then(res=>{
+                            if(res.confirm){
+                                this.router.back();
+                            }
+                        })
                     }
                 })
         },
 
-        mapClick() {
-            let self = this;
-            // 判断定位权限
-            uni.getSetting({
-                success: function (res) {
-                    if (res.authSetting["scope.userLocation"] === false) {
-                        self.fn
-                            .showModal({
-                                content: "请授权位置信息后使用",
-                                showCancel: false,
-                            })
-                            .then((res) => {
-                                uni.openSetting({});
-                            });
-                    } else {
-                        self.userLocation = true;
-                        self.chooseLocation();
-                    }
-                },
-            });
-        },
-
-        chooseLocation() {
-            let self = this;
-            uni.chooseLocation({
-                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) {
-                    console.log("定位no", e);
-                },
-            });
-        },
-
         minImgChange(e) {
             this.form.logo = e[0] || '';
         },
         minImgChange2(e) {
             this.form.shopBanner = e[0] || "";
         },
-        minImgChange3(e) {
-            this.form.foodLicense = e[0] || "";
-        },
         timeChange(e,name){
             let time = e.detail.value;
             this.form[name] = time;
@@ -269,13 +216,17 @@ export default {
                     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();
+                        this.fn.showModal({
+                            title:'开通成功',
+                            content:`恭喜！您的店铺${''}已开通成功。现在设置积分规则后立即使用`,
+                            confirmText:'设置积分',
+                            showCancel:false,
+                            confirmColor:'#02bb00'
+                        }).then(res=>{
+                            if (res.confirm) {
+                                this.router.replace('/pages/manage/points')
+                            }
+                        })
                     } else {
                         this.fn.showModal({
                             content:
@@ -346,7 +297,7 @@ export default {
         background: #f9f9f9;
     }
     .label {
-        width: px(300);
+        width: px(340);
         flex-shrink: 0;
         color: #999;
         margin-right: px(10);
@@ -525,4 +476,7 @@ export default {
         height: px(60);
     }
 }
+.dis{
+    background-color: #f6f6f6;
+}
 </style>

src/pages/guide/index.vue

@@ -1,144 +0,0 @@
-<template>
-    <div class="page tabbar-page">
-        <div v-if="!loading">
-            <h2 class="tit1">您还没有开通店铺，无法使用该模块</h2>
-            <h1 class="tit2">开通店铺您可以</h1>
-            <div class="box">
-                <ul class="list">
-                    <li>
-                        <span class="index">1、</span>
-                        在店铺和群内销售您自己的门店的商品
-                    </li>
-                    <li><span class="index">2、</span> 在群内开启签到送积分</li>
-                    <li>
-                        <span class="index">3、</span>
-                        在群内开启邀请好友入群送积分
-                    </li>
-                    <li>
-                        <span class="index">4、</span>
-                        用户群内获取的积分可以在店铺使用
-                    </li>
-                </ul>
-            </div>
-            <button class="btn" @click="jump('/pages/guide/form')">
-                立即申请
-            </button>
-        </div>
-        <div class="load" v-if="loading">
-            <!-- 待审核 -->
-            <block v-if="user.storeStatus === 2">
-                <h1 class="tit2">提交成功</h1>
-                <div class="text">
-                    您的店铺开通申请提交成功，在审核通过后，我们将为您开通店铺并通知
-                </div>
-            </block>
-        </div>
-        <wyg-bottom-tab ref="tabbar"></wyg-bottom-tab>
-    </div>
-</template>
-
-<script>
-import MyImage from "../../components/image/index";
-import wygBottomTab from "../../components/wyg-bottom-tab/wyg-bottom-tab";
-
-export default {
-    name: "",
-    components: { MyImage, wygBottomTab },
-    // 数据
-    data() {
-        return {
-            loading: false,
-        };
-    },
-    filters: {},
-    onLoad() {},
-    async onShow() {
-        if (this.user.storeStatus ===2) {
-            this.loading = true;
-        } else {
-            this.loading = false;
-        }
-        this.$refs.tabbar.setIndex(2);
-    },
-
-    // onPullDownRefresh() {
-    //     this.getList();
-    // },
-
-    // 函数
-    methods: {},
-
-    // 数据计算
-    computed: {
-        user() {
-            return this.$store.state.user.user;
-        },
-    },
-
-    // 数据监听
-    watch: {},
-};
-</script>
-
-
-<style lang="scss" scoped>
-.page {
-    padding-bottom: 2rem;
-    padding-top: px(250);
-    min-height: 100vh;
-    background-color: #fff;
-}
-.btn {
-    position: fixed;
-    bottom: 3rem;
-    left: 0;
-    right: 0;
-    z-index: 10;
-    color: #fff;
-    background-color: rgb(0, 188, 38);
-    font-size: px(44);
-    border-radius: 0;
-}
-.tit1 {
-    font-size: px(48);
-    font-weight: bold;
-    // color: rgb(0, 188, 38);
-    padding-bottom: px(40);
-    text-align: center;
-}
-.tit2 {
-    font-size: px(54);
-    font-weight: bold;
-    // color: rgb(0, 188, 38);
-    padding-bottom: px(120);
-    text-align: center;
-}
-.box {
-    border: 1px solid rgb(0, 188, 38);
-    padding: px(60) px(40);
-    margin: 0 px(80);
-    li {
-        font-size: px(44);
-        .index {
-            color: red;
-        }
-    }
-    li ~ li {
-        padding-top: px(50);
-    }
-}
-.load {
-    height: 100%;
-    padding-top: px(300);
-    .text {
-        width: px(700);
-        margin: 0 auto;
-        line-height: 1.6;
-        text-align: center;
-        font-size: px(44);
-    }
-}
-.link {
-    color: #409eff;
-}
-</style>

src/pages/index/index.vue

@@ -520,7 +520,7 @@
         </block>
 
         <div class="guide" v-if="showGuide">
-            <div v-if="!user.storeStatus">
+            <div v-if="storeStatus === -1">
                 <h2 class="tit1">您还没有开通店铺，无法使用该模块</h2>
                 <h1 class="tit2">开通店铺您可以</h1>
                 <div class="box">
@@ -546,14 +546,14 @@
                     立即申请
                 </button>
             </div>
-            <div class="load" v-if="user.storeStatus === 2">
+            <div class="load" v-if="storeStatus === 2">
                 <!-- 待审核 -->
                 <h1 class="tit2">提交成功</h1>
                 <div class="text">
                     您的店铺开通申请提交成功，在审核通过后，我们将为您开通店铺并通知
                 </div>
             </div>
-            <div class="load" v-if="user.storeStatus === 4">
+            <div class="load" v-if="storeStatus === 4">
                 <!-- 未通过 -->
                 <h1 class="tit2">审核未通过</h1>
                 <div class="text">
@@ -563,7 +563,7 @@
                     重新提交
                 </button>
             </div>
-            <div class="load" v-if="user.storeStatus === 3">
+            <div class="load" v-if="storeStatus === 3">
                 <!-- 审核通过 -->
                 <div class="success-main">
                     <h2 class="success-tit1">恭喜您！</h2>
@@ -683,6 +683,7 @@ export default {
 
             showGuide: false,
             agreement:false,
+            storeStatus:-1
         };
     },
     filters: {
@@ -790,21 +791,33 @@ export default {
         self.tab = this.$store.state.common.tabIndex;
         this.getList();
         this.$refs.tabbar.setIndex(1);
-
-        // 判断页面显示
-        if (
-            this.user.storeStatus === 2 ||
-            this.user.storeStatus === 3 ||
-            this.user.storeStatus === 4
-        ) {
-            this.showGuide = true;
-        } else {
-            this.showGuide = false;
-        }
+        this.checkStatus();
     },
 
     // 函数
     methods: {
+        checkStatus(){
+            /* 
+                闭店中 = 0,  // 已开通，店铺未营业
+                营业中 = 1,  // 店铺营业中
+                待审核 = 2,  // 通过审核后，状态改为闭店中
+                待开通 = 3,  // 通过审核，等待开通
+                未通过审核 = 4  // 未通过审核
+            */
+            this.api.get('/Shop/checkStatus')
+                .then(res=>{
+                    this.storeStatus = res.data;
+                            // 判断页面显示
+                    if (
+                        this.storeStatus === 0 ||
+                        this.storeStatus === 1
+                    ) {
+                        this.showGuide = false;
+                    } else {
+                        this.showGuide = true;
+                    }
+                })
+        },
         // 切换导航
         setTab(index) {
             const self = this;
@@ -1289,9 +1302,6 @@ export default {
         },
         user() {
             return this.$store.state.user.user;
-            // return {
-            //     storeStatus:4
-            // }
         },
         orderList() {
             return this.list[this.tab].list;

src/pages/manage/index.vue

@@ -45,6 +45,25 @@
                         ></my-image>
                         <span class="text">账号设置</span>
                     </li>
+                    <block v-if="storeStatus === 0 || storeStatus === 1">
+                        <li class="item" @click="jump('/pages/manage/points')">
+                            <my-image
+                                class="img"
+                                src="/static/icon/points.png"
+                            ></my-image>
+                            <span class="text">积分设置</span>
+                        </li>
+                        <li
+                            class="item"
+                            @click="jump('/pages/manage/set-shop')"
+                        >
+                            <my-image
+                                class="img"
+                                src="/static/icon/shop.png"
+                            ></my-image>
+                            <span class="text">店铺设置</span>
+                        </li>
+                    </block>
                 </ul>
             </block>
             <ul class="menu" v-if="!showMenu">
@@ -55,6 +74,22 @@
                     ></my-image>
                     <span class="text">账号设置</span>
                 </li>
+                <block v-if="storeStatus === 0 || storeStatus === 1">
+                    <li class="item" @click="jump('/pages/manage/points')">
+                        <my-image
+                            class="img"
+                            src="/static/icon/points.png"
+                        ></my-image>
+                        <span class="text">积分设置</span>
+                    </li>
+                    <li class="item" @click="jump('/pages/manage/set-shop')">
+                        <my-image
+                            class="img"
+                            src="/static/icon/shop.png"
+                        ></my-image>
+                        <span class="text">店铺设置</span>
+                    </li>
+                </block>
             </ul>
         </div>
 
@@ -87,6 +122,7 @@ export default {
             loading: false,
             showShop: true,
             showMenu: true,
+            storeStatus: -1,
         };
     },
 
@@ -123,9 +159,22 @@ export default {
         }
         this.getUserMenu();
         this.$refs.tabbar.setIndex(2);
+        this.checkStatus();
     },
     // 函数
     methods: {
+        checkStatus() {
+            /* 
+                闭店中 = 0,  // 已开通，店铺未营业
+                营业中 = 1,  // 店铺营业中
+                待审核 = 2,  // 通过审核后，状态改为闭店中
+                待开通 = 3,  // 通过审核，等待开通
+                未通过审核 = 4  // 未通过审核
+            */
+            this.api.get("/Shop/checkStatus").then((res) => {
+                this.storeStatus = res.data;
+            });
+        },
         getUserMenu() {
             uni.showLoading({
                 title: "加载中...",

src/pages/manage/points.vue

@@ -0,0 +1,399 @@
+<template>
+    <div class="page" :class="{ 'page--iphoneX': iphoneX }">
+        <div class="form-card">
+            <section class="form-item">
+                <div class="label">开启积分：</div>
+                <div class="box">
+                    <switch
+                        :value="true"
+                        :checked="form.enablePoints"
+                        @change="switchChange($event, 'enablePoints')"
+                    ></switch>
+                    <span class="tip">积分现金比：100积分=1元</span>
+                </div>
+            </section>
+            <block v-if="form.enablePoints">
+                <section class="form-item">
+                    <div class="label">每单最高抵扣比例：</div>
+                    <div class="box">
+                        <input
+                            type="number"
+                            v-model="form.pointsMaxProportion"
+                            placeholder="数值范围0~100"
+                        />
+                    </div>
+                    <div class="tool">%</div>
+                </section>
+                <section class="form-item">
+                    <div class="label">
+                        <!-- <span class="required">*</span> -->
+                        群内签到赠积分：
+                    </div>
+                    <div class="box">
+                        <input
+                            type="number"
+                            v-model="form.groupSignInRewardPoints"
+                        />
+                    </div>
+                </section>
+                <section class="form-item">
+                    <div class="label">
+                        <!-- <span class="required">*</span> -->
+                        邀请好友入群赠送积分：
+                    </div>
+                    <div class="box">
+                        <input
+                            type="number"
+                            v-model="form.inviteFriendRewardPoints"
+                        />
+                    </div>
+                </section>
+                <section class="form-item">
+                    <div class="label">
+                        <!-- <span class="required">*</span> -->
+                        下单付款赠积分：
+                    </div>
+                    <div class="box">
+                        <switch
+                            :value="true"
+                            :checked="form.enabledOrderPayRewardPoints"
+                            @change="
+                                switchChange(
+                                    $event,
+                                    'enabledOrderPayRewardPoints'
+                                )
+                            "
+                        ></switch>
+                    </div>
+                </section>
+            </block>
+        </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: {
+                enablePoints: true,
+                pointsMaxProportion: "",
+                groupSignInRewardPoints: "",
+                inviteFriendRewardPoints: "",
+                enabledOrderPayRewardPoints: false,
+            },
+            submitLoading: false,
+        };
+    },
+
+    onLoad(opts) {
+        this.getData();
+    },
+
+    onShow() {},
+
+    // 函数
+    methods: {
+        getData() {
+            this.api.get("/Shop/GetPoints", {}, { pass: true }).then((res) => {
+                if (res.success && res.data) {
+                    this.form = { ...res.data };
+                    this.form.enablePoints = res.data.enbaled;
+                    this.form.pointsMaxProportion =
+                        res.data.maxDeductionProportion;
+                }
+            });
+        },
+        switchChange(e, name) {
+            let v = e.detail.value;
+            this.form[name] = v ? true : false;
+            this.form = { ...this.form };
+        },
+        saveOk() {
+            if (this.submitLoading) {
+                return;
+            }
+            if (
+                (this.form.pointsMaxProportion &&
+                    this.form.pointsMaxProportion > 100) ||
+                this.form.pointsMaxProportion < 0
+            ) {
+                this.fn.showToast("每单最高抵扣比例范围为0~100");
+                return;
+            }
+            console.log(this.form);
+            this.submitLoading = true;
+            uni.showLoading({
+                title: "提交中...",
+            });
+            let data = { ...this.form };
+            this.api
+                .post("/Shop/SetPoints", data, { pass: true })
+                .then((res) => {
+                    this.submitLoading = false;
+                    uni.hideLoading();
+                    if (res.success) {
+                        this.fn.showToast("设置成功");
+                        this.router.back();
+                    } else {
+                        this.fn.showModal({
+                            title: "设置错误",
+                            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;
+    &.dis-item {
+        color: #999;
+        background: #f9f9f9;
+    }
+    .label {
+        // width: px(400);
+        flex-shrink: 0;
+        color: #666;
+        margin-right: px(20);
+    }
+    .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);
+    }
+}
+.dis {
+    background-color: #f6f6f6;
+}
+.tip {
+    color: #999;
+    margin-left: px(10);
+}
+</style>

src/pages/manage/set-shop.vue

@@ -0,0 +1,475 @@
+<template>
+    <div class="page" :class="{ 'page--iphoneX': iphoneX }">
+        <div class="form-card">
+            <section class="form-item dis">
+                <div class="label">
+                    <!-- <span class="required">*</span> -->
+                    店铺名称：
+                </div>
+                <div class="box">
+                    <input
+                        type="text"
+                        :disabled="true"
+                        v-model="form.appName"
+                        placeholder=" "
+                    />
+                </div>
+            </section>
+            <section class="form-item dis">
+                <div class="label">
+                    <!-- <span class="required">*</span> -->
+                    店长电话：
+                </div>
+                <div class="box">
+                    <input
+                        type="text"
+                        :disabled="true"
+                        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"
+                        :disabled="true"
+                        v-model="form.startTime"
+                        placeholder="请选择"
+                    />
+                    </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"
+                        :disabled="true"
+                        v-model="form.endTime"
+                        placeholder="请选择"
+                    />
+                    </picker>
+                </div>
+            </section>
+            <section class="form-item">
+                <div class="label">
+                    <span class="required">*</span>
+                    Logo：
+                </div>
+                <div class="box">
+                    <easy-upload
+                        :types="'image'"
+                        v-model="mainImage"
+                        :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
+                        :types="'image'"
+                        v-model="mainImage2"
+                        :uploadCount="1"
+                        @change="minImgChange2"
+                    ></easy-upload>
+                </div>
+            </section>
+            <section class="form-item">
+                <div class="label">
+                    
+                    店铺通知：
+                </div>
+                <div class="box">
+                    <!-- <input
+                        type="text"
+                        
+                    /> -->
+                    <textarea v-model="form.shopNotice" :maxlength="2048" :auto-height="true"
+                        placeholder="请填写店铺通知"></textarea>
+                </div>
+            </section>
+        </div>
+        <div class="btns">
+            <div class="btn" @click="saveOk">保存</div>
+        </div>
+    </div>
+</template>
+
+<script>
+import MyImage from "../../components/image/index";
+import DateTimePicker from "../../components/biaofun-datetime-picker/biaofun-datetime-picker";
+import easyUpload from "../../components/easy-upload/easy-upload";
+
+export default {
+    name: "",
+    components: { MyImage, DateTimePicker, easyUpload },
+    // 数据
+    data() {
+        return {
+            form: {
+                appName:'',
+                managerTelephone:'',
+                startTime:'',
+                endTime:'',
+                logo:'',
+                shopBanner:'',
+                shopNotice:'',
+            },
+            mainImage: [],
+            mainImage2: [],
+            submitLoading: false,
+        };
+    },
+
+    onLoad(opts) {
+        this.getData();
+    },
+
+    onShow() {},
+
+    // 函数
+    methods: {
+        getData(){
+            this.api.get('/Shop/GetInfo',{},{pass:true})
+                .then(res=>{
+                    if(res.success && res.data){
+                        this.form.appName = res.data.name;
+                        this.form.managerTelephone = res.data.managerTelephone;
+                        this.form.startTime = res.data.startTime;
+                        this.form.endTime = res.data.endTime;
+                        this.form.logo = res.data.logo;
+                        this.form.shopBanner = res.data.shopBanner;
+                        this.form.shopNotice = res.data.shopNotice;
+                        this.mainImage = this.form.logo?[this.form.logo]:[];
+                        this.mainImage2 = this.form.shopBanner?[this.form.shopBanner]:[];
+                    }else{
+                           this.fn.showModal({
+                            content:res.message,
+                            showCancel: false,
+                        }).then(res=>{
+                            if(res.confirm){
+                                this.router.back();
+                            }
+                        })
+                    }
+                })
+        },
+
+        minImgChange(e) {
+            this.form.logo = e[0] || '';
+        },
+        minImgChange2(e) {
+            this.form.shopBanner = 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.managerTelephone) {
+                return this.fn.showToast("请输入店长电话");
+            }
+            if (!this.form.startTime) {
+                return this.fn.showToast("请选择营业开始时间");
+            }
+            if (!this.form.endTime) {
+                return this.fn.showToast("请选择营业结束时间");
+            }
+            if (!this.form.logo) {
+                return this.fn.showToast("请上传logo");
+            }
+            if (!this.form.shopBanner) {
+                return this.fn.showToast("请上传店铺背景");
+            }
+            // if (!this.form.iDCard) {
+            //     return this.fn.showToast("请上传身份证照");
+            // }
+            // if (this.form.iDCard.length !== 2) {
+            //     return this.fn.showToast("请分别上传身份证照正反面");
+            // }
+            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/Set", data, { pass: true })
+                .then((res) => {
+                    this.submitLoading = false;
+                    uni.hideLoading();
+                    if (res.success) {
+                        this.fn.showToast("设置成功");
+                        this.router.back();
+                    } else {
+                        this.fn.showModal({
+                            title:'设置失败',
+                            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;
+    &.dis-item {
+        color: #999;
+        background: #f9f9f9;
+    }
+    .label {
+        width: px(340);
+        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);
+    }
+}
+.dis{
+    background-color: #f6f6f6;
+}
+</style>