群 平台设置完成

src/common/js/plugin.js

@@ -390,4 +390,40 @@ export default {
     openSetting() {
         uni.openSetting()
     },
+
+
+    /**
+     * 转化为指定格式日期
+     * @param date
+     * @param format
+     * @returns {string}
+     */
+    dateFormat(date, format = 'yyyy-MM-dd') {
+        if (date) {
+            date = date.replace(/-/g, '/')
+            date = new Date(Date.parse(date))
+
+            let o = {
+                'M+': date.getMonth() + 1, //月份
+                'd+': date.getDate(), //日
+                'h+': date.getHours(), //小时
+                'm+': date.getMinutes(), //分
+                's+': date.getSeconds(), //秒
+                'S': date.getMilliseconds(), //毫秒
+                'q+': Math.floor((date.getMonth() + 3) / 3), //季度
+            }
+
+            if (/(y+)/.test(format)) {
+                format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
+            }
+            for (let k in o) {
+                if (new RegExp('(' + k + ')').test(format)) {
+                    format = format.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+                }
+            }
+            return format
+        } else {
+            return ''
+        }
+    }
 }

src/pages.json

@@ -459,6 +459,30 @@
                 "navigationBarTitleText": "账单记录",
                 "enablePullDownRefresh": true
             }
+        },
+        {
+            "path": "pages/assistant/set-platform",
+            "style": {
+                "navigationBarTitleText": "关联群平台"
+            }
+        },
+        {
+            "path": "pages/assistant/set-time",
+            "style": {
+                "navigationBarTitleText": "助理禁言时间"
+            }
+        },
+        {
+            "path": "pages/assistant/set-welcome",
+            "style": {
+                "navigationBarTitleText": "群欢迎设置"
+            }
+        },
+        {
+            "path": "pages/assistant/add-platform",
+            "style": {
+                "navigationBarTitleText": "添加平台"
+            }
         }
     ]
 }

src/pages/assistant/add-platform.vue

@@ -0,0 +1,317 @@
+<template>
+    <div class="page">
+        <div v-if="step === 1">
+            <radio-group @change="radioChange">
+                <div class="list">
+                    <label
+                        class="item"
+                        v-for="item of list"
+                        :key="item.platform"
+                    >
+                        <radio
+                            :value="item.platform"
+                            :checked="false"
+                            :disabled="item.enabled"
+                        />
+                        <div class="name">
+                            {{ item.platformName }}
+                            <span class="enabled" v-if="item.enabled"
+                                >(已关联)</span
+                            >
+                        </div>
+                    </label>
+                </div>
+            </radio-group>
+            <button class="btn" @click="next()">下一步</button>
+        </div>
+
+        <div v-if="step === 2">
+            <div class="form-card">
+                <section class="form-item">
+                    <div class="label">
+                        <span class="required">*</span>
+                        团长id：
+                    </div>
+                    <div class="box">
+                        <div class="con">
+                            <input
+                                type="text"
+                                v-model="pid"
+                                placeholder="90000*****"
+                            />
+                        </div>
+                    </div>
+                </section>
+            </div>
+            <button class="btn" @click="save()">保存</button>
+        </div>
+    </div>
+</template>
+
+<script>
+import MyImage from "../../components/image/index";
+export default {
+    name: "",
+    components: { MyImage },
+
+    // 数据
+    data() {
+        return {
+            switchChecked: false,
+            groupData: {},
+            activeValue: "",
+            pid: "",
+            step: 1,
+            list: [],
+        };
+    },
+
+    onLoad(opts) {
+        this.getAvailablePlatforms();
+    },
+    async onShow() {},
+    // 函数
+    methods: {
+        getAvailablePlatforms() {
+            this.api
+                .get("/Group/GetAvailablePlatforms", {}, { pass: true })
+                .then((res) => {
+                    this.list = res.data;
+                });
+        },
+
+        radioChange: function (v) {
+            this.activeValue = v.detail.value;
+        },
+
+        next() {
+            if (!this.activeValue) {
+                return this.fn.showModal({
+                    content: "请先选择平台",
+                    showCancel: false,
+                });
+            }
+            this.step = 2;
+        },
+
+        save() {
+            if (!this.pid) {
+                return this.fn.showToast(`请输入团长id`);
+            }
+            uni.showLoading({
+                title: "提交中",
+            });
+            let sendData = {
+                pid: this.pid,
+                platform: this.activeValue,
+            };
+            this.api
+                .get("/Group/GetGroupInfo", sendData, { pass: true })
+                .then((res) => {
+                    uni.hideLoading();
+                    if (res.success) {
+                        if (res.data) {
+                            this.fn
+                                .showModal({
+                                    title: "团长信息",
+                                    content: `当前团店铺名称为：${res.data.shopName},是否确认提交`,
+                                })
+                                .then((res) => {
+                                    if (res.confirm) {
+                                        this.commitPid(sendData);
+                                    } else {
+                                    }
+                                });
+                        } else {
+                            this.fn.showModal({
+                                title: "获取团长信息失败",
+                                content: "当前团长号未获取到团长信息",
+                                showCancel: false,
+                            });
+                        }
+                    } else {
+                        this.fn.showModal({
+                            title: "获取团长信息失败",
+                            content: res.message,
+                            showCancel: false,
+                        });
+                    }
+                });
+        },
+
+        commitPid(sendData) {
+            let pName = "";
+            for (let item of this.list) {
+                if (item.platform === this.activeValue) {
+                    pName = item.platformName;
+                }
+            }
+            this.api
+                .post("/Group/AddJDPlatform", sendData, { pass: true })
+                .then((res) => {
+                    if (!res.success) {
+                        this.fn.showModal({
+                            title: "添加平台成功",
+                            content: `你已成功添加${1},如果需要在群内关联平台，请在群详情下关联平台，获取点击“一键关联群”，现在一键关联`,
+                            confirmText: "一键关联",
+                            cancelText: "稍后关联",
+                            confirmColor: "#42b983",
+                            success: (res2) => {
+                                if (res2.confirm) {
+                                    this.enableShopJDPlatform();
+                                } else {
+                                    this.router.back();
+                                }
+                            },
+                        });
+                    } else {
+                        this.fn.showModal({
+                            title: "团长号提交失败",
+                            content: res.message,
+                            showCancel: false,
+                        });
+                    }
+                });
+        },
+
+        enableShopJDPlatform() {
+            this.api
+                .get("/Group/enableShopJDPlatform", {}, { pass: true })
+                .then((res) => {
+                    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 {
+    min-height: 100vh;
+    background-color: #fff;
+    padding-bottom: 4rem;
+}
+.list {
+    border-top: 1px solid #f1f1f1;
+    .item {
+        height: px(130);
+        padding: 0 px(35);
+        font-size: px(44);
+        display: flex;
+        // justify-content: space-between;
+        align-items: center;
+        border-bottom: 1px solid #f1f1f1;
+    }
+    .arrow {
+        width: px(40);
+        height: px(40);
+        flex-shrink: 0;
+        transform: rotate(180deg);
+        /deep/ img {
+            width: px(40);
+            height: px(40);
+        }
+    }
+}
+switch {
+    transform: scale(0.7);
+}
+.btn {
+    position: fixed;
+    bottom: 1rem;
+    left: px(30);
+    right: px(30);
+    z-index: 10;
+    color: #fff;
+    background-color: rgb(0, 188, 38);
+    font-size: px(44);
+}
+.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-bottom: 1px solid #f1f1f1;
+    &.dis-item {
+        color: #999;
+        background: #f9f9f9;
+    }
+    .label {
+        width: px(240);
+        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);
+    }
+    .tip {
+        font-size: px(36);
+        color: #e6a23c;
+        margin-top: px(5);
+    }
+    textarea,
+    input {
+        max-width: 100%;
+        width: 100%;
+    }
+}
+.required {
+    color: #f00;
+    font-size: px(44);
+    &.hide {
+        visibility: hidden;
+    }
+}
+.enabled {
+    color: #999;
+    margin-left: px(30);
+}
+</style>

src/pages/assistant/index.vue

@@ -13,47 +13,62 @@
                 </ul>
             </div>
             <!-- 群 -->
-            <ul class="group-list" v-if="tabIndex === 0">
-                <block v-for="data of dataList" :key="data._id">
-                    <li class="item" @click="jumpGroup(data)">
+            <div v-if="tabIndex === 0">
+                <ul class="group-list">
+                    <block v-for="data of dataList" :key="data._id">
+                        <li class="item" @click="jumpGroup(data)">
+                            <div class="name">
+                                {{ data.name | maxTit }}
+                            </div>
+                            <my-image
+                                class="arrow"
+                                src="/static/common/arrows_left.png"
+                            ></my-image>
+                        </li>
+                    </block>
+                </ul>
+                <button
+                    class="btn"
+                    @click="
+                        jump({
+                            path: '/pages/assistant/add',
+                        })
+                    "
+                >
+                    添加群
+                </button>
+            </div>
+
+            <!-- 平台 -->
+            <div v-if="tabIndex === 1">
+                <ul class="group-list">
+                    <li
+                        class="item"
+                        v-for="item of platformList"
+                        :key="item.name"
+                        @click="jumpPlatform(item)"
+                    >
                         <div class="name">
-                            {{ data.name | maxTit }}
+                            {{ item.name | maxTit }}
                         </div>
                         <my-image
                             class="arrow"
                             src="/static/common/arrows_left.png"
                         ></my-image>
                     </li>
-                </block>
+                </ul>
+
                 <button
                     class="btn"
                     @click="
                         jump({
-                            path: '/pages/assistant/add',
+                            path: '/pages/assistant/add-platform',
                         })
                     "
                 >
-                    添加群
+                    添加平台
                 </button>
-            </ul>
-
-            <!-- 平台 -->
-            <ul class="group-list" v-if="tabIndex === 1">
-                <li
-                    class="item"
-                    v-for="item of platformList"
-                    :key="item.name"
-                    @click="jumpPlatform(item)"
-                >
-                    <div class="name">
-                        {{ item.name | maxTit }}
-                    </div>
-                    <my-image
-                        class="arrow"
-                        src="/static/common/arrows_left.png"
-                    ></my-image>
-                </li>
-            </ul>
+            </div>
         </div>
 
         <!-- <div class="layout" @click="layout">退出登录</div> -->
@@ -72,7 +87,7 @@ import ManageNav from "../../components/layout/manage-nav";
 
 export default {
     name: "",
-    components: { MyImage, wygBottomTab,ManageNav },
+    components: { MyImage, wygBottomTab, ManageNav },
     // 数据
     data() {
         return {
@@ -81,7 +96,7 @@ export default {
             dataList: [],
             dataEnd: false,
             platformList: [],
-            shopId:'',
+            shopId: "",
         };
     },
     filters: {

src/pages/assistant/set-platform.vue

@@ -0,0 +1,116 @@
+<template>
+    <div class="page">
+        <ul class="list">
+            <li class="item" v-for="item of list" :key="item.platform">
+                <div class="name">{{item.platformName}}</div>
+                <!-- <my-image
+                    class="arrow"
+                    src="/static/common/arrows_left.png"
+                ></my-image> -->
+                <switch
+                    :checked="item.enabled"
+                    @change="switchChange($event,item)"
+                ></switch>
+            </li>
+        </ul>
+    </div>
+</template>
+
+<script>
+import MyImage from "../../components/image/index";
+export default {
+    name: "",
+    components: { MyImage },
+
+    // 数据
+    data() {
+        return {
+            groupData: {},
+            list:[]
+        };
+    },
+
+    onLoad(opts) {
+        this.groupData = this.$store.state.common.groupData;
+        this.getGroupPlatform();
+    },
+    async onShow() {},
+    // 函数
+    methods: {
+
+        // 获取群平台
+        getGroupPlatform(){
+            this.api.get('/Group/GetGroupPlatform',{gid:this.groupData._id},{pass:true})
+                .then(res=>{
+                    this.list = res.data;
+                })
+        },
+
+        switchChange(e,item) {
+            let detail = e.detail.value;
+            let data = {
+                gid: this.groupData._id,
+                isDisable: detail ? false : true,
+            };
+
+            this.api
+                .get("/Group/EnableGroupJdPlatform", data, { pass: true })
+                .then((res) => {
+                    uni.hideLoading();
+                    if (res.success) {
+                        this.fn.showToast("设置成功");
+                    } else {
+                        item.switchChecked = !item.switchChecked;
+                        this.fn.showModal({
+                            title: "设置失败",
+                            content: "错误信息:" + res.message,
+                            showCancel: false,
+                        });
+                    }
+                });
+        },
+    },
+
+    // 数据计算
+    computed: {
+        user() {
+            return this.$store.state.user.user;
+        },
+    },
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.page {
+    min-height: 100vh;
+    background-color: #fff;
+}
+.list {
+    border-top: 1px solid #f1f1f1;
+    .item {
+        height: px(120);
+        padding: 0 px(35);
+        font-size: px(44);
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        border-bottom: 1px solid #f1f1f1;
+    }
+    .arrow {
+        width: px(40);
+        height: px(40);
+        flex-shrink: 0;
+        transform: rotate(180deg);
+        /deep/ img {
+            width: px(40);
+            height: px(40);
+        }
+    }
+}
+switch {
+    transform: scale(0.7);
+}
+</style>

src/pages/assistant/set-time.vue

@@ -0,0 +1,347 @@
+<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">
+                    <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>
+        </div>
+        <div class="btn" @click="saveOk">保存</div>
+    </div>
+</template>
+
+<script>
+import MyImage from "../../components/image/index";
+
+export default {
+    name: "",
+    components: { MyImage },
+    // 数据
+    data() {
+        return {
+            submitLoading: false,
+            form: {
+                startTime: "",
+                endTime: "",
+            },
+            groupData: {},
+        };
+    },
+
+    onLoad() {
+        this.groupData = this.$store.state.common.groupData;
+        this.form.startTime = this.fn.dateFormat(
+            this.groupData.startMute,
+            "hh:mm"
+        );
+        this.form.endTime = this.fn.dateFormat(this.groupData.endMute, "hh:mm");
+        console.log(this.groupData);
+    },
+
+    onShow() {},
+
+    // 函数
+    methods: {
+        timeChange(e, name) {
+            let time = e.detail.value;
+            this.form[name] = time;
+            // console.log(e,name);
+        },
+        saveOk() {
+            if (this.submitLoading) {
+                return;
+            }
+            if (!this.form.startTime) {
+                return this.fn.showToast("请选择开始时间");
+            }
+            if (!this.form.startTime) {
+                return this.fn.showToast("请选择结束时间");
+            }
+            uni.showLoading({
+                title: "提交中...",
+                mask: true,
+            });
+            let data = {
+                startMute: this.form.startTime,
+                endMute: this.form.endTime,
+                groupId: this.groupData._id,
+            };
+
+            console.log(data);
+            this.submitLoading = true;
+            this.api
+                .post("/Group/SetMuteTime", 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: {},
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+
+<style lang="scss" scoped>
+.page {
+    padding-bottom: px(120);
+    min-height: 100vh;
+}
+.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);
+    &.dis-item {
+        color: #999;
+        background: #f9f9f9;
+    }
+    & ~ .form-item {
+        border-top: 1px solid #f1f1f1;
+    }
+    .label {
+        width: px(240);
+        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);
+    }
+    .tip {
+        font-size: px(36);
+        color: #e6a23c;
+        margin-top: px(5);
+    }
+    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 {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    width: 100%;
+    height: px(120);
+    background-color: rgb(0, 188, 38);
+    color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 100;
+}
+.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;
+}
+</style>

src/pages/assistant/setting.vue

@@ -1,6 +1,27 @@
 <template>
     <div class="page">
         <ul class="list">
+            <li class="item" @click="jump('/pages/assistant/set-welcome')">
+                <div class="name">群欢迎设置</div>
+                <my-image
+                    class="arrow"
+                    src="/static/common/arrows_left.png"
+                ></my-image>
+            </li>
+            <li class="item" @click="jump('/pages/assistant/set-time')">
+                <div class="name">助理禁言时间</div>
+                <my-image
+                    class="arrow"
+                    src="/static/common/arrows_left.png"
+                ></my-image>
+            </li>
+            <li class="item" @click="jump('/pages/assistant/set-platform')">
+                <div class="name">群关联平台</div>
+                <my-image
+                    class="arrow"
+                    src="/static/common/arrows_left.png"
+                ></my-image>
+            </li>
             <li class="item">
                 <div class="name">暂停本群助理</div>
                 <!-- <my-image
@@ -34,7 +55,17 @@ export default {
         this.groupData = this.$store.state.common.groupData;
         this.switchChecked = this.groupData.status === 1 ? true : false;
     },
-    async onShow() {},
+    async onShow() {
+        this.api
+            .get("/Group/GetGroup", { gid: this.groupData._id }, { pass: true })
+            .then((res) => {
+                this.$store.commit("common/update", {
+                    groupData: res.data,
+                });
+                this.groupData = res.data;
+            });
+    },
+
     // 函数
     methods: {
         switchChange(e) {

src/pages/index/register.vue

@@ -388,19 +388,27 @@ export default {
             this.api
                 .get("/Group/GetGroupInfo", sendData, { pass: true })
                 .then((res) => {
-                    if (res.success) {
                     uni.hideLoading();
-                        this.fn
-                            .showModal({
-                                title: "团长信息",
-                                content: `当前团店铺名称为：${res.data.shopName},是否确认提交`,
-                            })
-                            .then((res) => {
-                                if (res.confirm) {
-                                    this.commitPid(sendData);
-                                } else {
-                                }
+                    if (res.success) {
+                        if (res.data) {
+                            this.fn
+                                .showModal({
+                                    title: "团长信息",
+                                    content: `当前团店铺名称为：${res.data.shopName},是否确认提交`,
+                                })
+                                .then((res) => {
+                                    if (res.confirm) {
+                                        this.commitPid(sendData);
+                                    } else {
+                                    }
+                                });
+                        } else {
+                            this.fn.showModal({
+                                title: "获取团长信息失败",
+                                content: "当前团长号未获取到团长信息",
+                                showCancel: false,
                             });
+                        }
                     } else {
                         this.fn.showModal({
                             title: "获取团长信息失败",
@@ -412,8 +420,6 @@ export default {
         },
 
         commitPid(sendData) {
-
-
             this.api
                 .post("/Group/CommitPid", sendData, { pass: true })
                 .then((res) => {

src/pages/manage/index.vue

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

src/pages/manage/shop/set-shop.vue

@@ -23,7 +23,6 @@
                 <div class="box">
                     <input
                         type="number"
-                        :disabled="true"
                         v-model="form.managerTelephone"
                         placeholder=" "
                     />
@@ -35,13 +34,16 @@
                     营业开始时间：
                 </div>
                 <div class="box">
-                    <picker mode="time" @change="timeChange($event,'startTime')">
-                    <input
-                        type="text"
-                        :disabled="true"
-                        v-model="form.startTime"
-                        placeholder="请选择"
-                    />
+                    <picker
+                        mode="time"
+                        @change="timeChange($event, 'startTime')"
+                    >
+                        <input
+                            type="text"
+                            :disabled="true"
+                            v-model="form.startTime"
+                            placeholder="请选择"
+                        />
                     </picker>
                 </div>
             </section>
@@ -51,13 +53,13 @@
                     营业结束时间：
                 </div>
                 <div class="box">
-                    <picker mode="time" @change="timeChange($event,'endTime')">
-                    <input
-                        type="text"
-                        :disabled="true"
-                        v-model="form.endTime"
-                        placeholder="请选择"
-                    />
+                    <picker mode="time" @change="timeChange($event, 'endTime')">
+                        <input
+                            type="text"
+                            :disabled="true"
+                            v-model="form.endTime"
+                            placeholder="请选择"
+                        />
                     </picker>
                 </div>
             </section>
@@ -91,17 +93,18 @@
                 </div>
             </section>
             <section class="form-item">
-                <div class="label">
-                    
-                    店铺通知：
-                </div>
+                <div class="label">店铺通知：</div>
                 <div class="box">
                     <!-- <input
                         type="text"
                         
                     /> -->
-                    <textarea v-model="form.shopNotice" :maxlength="2048" :auto-height="true"
-                        placeholder="请填写店铺通知"></textarea>
+                    <textarea
+                        v-model="form.shopNotice"
+                        :maxlength="2048"
+                        :auto-height="true"
+                        placeholder="请填写店铺通知"
+                    ></textarea>
                 </div>
             </section>
         </div>
@@ -123,13 +126,13 @@ export default {
     data() {
         return {
             form: {
-                appName:'',
-                managerTelephone:'',
-                startTime:'',
-                endTime:'',
-                logo:'',
-                shopBanner:'',
-                shopNotice:'',
+                appName: "",
+                managerTelephone: "",
+                startTime: "",
+                endTime: "",
+                logo: "",
+                shopBanner: "",
+                shopNotice: "",
             },
             mainImage: [],
             mainImage2: [],
@@ -145,39 +148,42 @@ export default {
 
     // 函数
     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,
+        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){
+                        })
+                        .then((res) => {
+                            if (res.confirm) {
                                 this.router.back();
                             }
-                        })
-                    }
-                })
+                        });
+                }
+            });
         },
 
         minImgChange(e) {
-            this.form.logo = e[0] || '';
+            this.form.logo = e[0] || "";
         },
         minImgChange2(e) {
             this.form.shopBanner = e[0] || "";
         },
-        timeChange(e,name){
+        timeChange(e, name) {
             let time = e.detail.value;
             this.form[name] = time;
             // console.log(e,name);
@@ -211,7 +217,7 @@ export default {
             // if (this.form.iDCard.length !== 2) {
             //     return this.fn.showToast("请分别上传身份证照正反面");
             // }
-            if(this.user.parentInviteCode){
+            if (this.user.parentInviteCode) {
                 this.form.invitedCode = this.user.parentInviteCode;
             }
             console.log(this.form);
@@ -220,22 +226,20 @@ export default {
                 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,
-                        });
-                    }
-                });
+            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,
+                    });
+                }
+            });
         },
     },
 
@@ -474,7 +478,7 @@ export default {
         height: px(60);
     }
 }
-.dis{
+.dis {
     background-color: #f6f6f6;
 }
 </style>