注册

src/pages/assistant/index.vue

@@ -12,21 +12,25 @@
         </div>
         <ul class="group-list" v-if="tabIndex === 0">
             <li class="item" @click="jump('')">
-                <div class="name">{{'群名称' | maxTit}}</div>
+                <div class="name">{{ "群名称" | maxTit }}</div>
                 <my-image
                     class="arrow"
                     src="/static/common/arrows_left.png"
                 ></my-image>
             </li>
-            <li class="item" @click="jump('')">
-                <div class="name">{{'群名称最多16字，大于16字隐藏.123456798' | maxTit}}</div>
+            <li class="item" @click="jump('')" v-for="item of dataList" :key="item.id">
+                <div class="name">
+                    {{ item.name | maxTit }}
+                </div>
                 <my-image
                     class="arrow"
                     src="/static/common/arrows_left.png"
                 ></my-image>
             </li>
         </ul>
-        <button class="add-group"  v-if="tabIndex === 0" @click="addGroup">添加群</button>
+        <button class="add-group" v-if="tabIndex === 0" @click="addGroup">
+            添加群
+        </button>
         <wyg-bottom-tab
             ref="tabbar"
             :tabIndex="3"
@@ -48,20 +52,24 @@ export default {
         return {
             tabList: TAB_LIST,
             tabIndex: 0, // 0 1
+            pageIndex: 1,
+            dataList: [],
+            dataEnd:false,
         };
     },
     filters: {
-        maxTit(v){
-            if(v && v.length>16){
-                return v.substr(0,16)+'...';
-            }else{
+        maxTit(v) {
+            if (v && v.length > 16) {
+                return v.substr(0, 16) + "...";
+            } else {
                 return v;
             }
-        }
+        },
     },
     onLoad() {},
     async onShow() {
         this.$refs.tabbar.setIndex(3);
+        this.getList();
     },
 
     // onPullDownRefresh() {
@@ -70,12 +78,43 @@ export default {
 
     // 函数
     methods: {
+        getList() {
+            this.pageIndex = 1;
+            let sendData = {
+                pageIndex: this.pageIndex,
+                pageSize: 20,
+            };
+            uni.showLoading({
+                title: "加载中...",
+            });
+            this.api.get("/Group/GetList", sendData).then((res) => {
+                uni.hideLoading();
+                this.dataList = res.data.data;
+            });
+        },
+
+        getListMore() {
+            if (this.dataEnd) {
+                return;
+            }
+            this.pageIndex++;
+            let sendData = {
+                pageIndex: this.pageIndex,
+                pageSize: 20,
+            };
+            this.api.get("/Group/GetList", sendData).then((res) => {
+                uni.hideLoading();
+                this.dataList = [...this.dataList, ...res.data.data];
+                if (res.data.data.length === 0) {
+                    this.dataEnd = true;
+                }
+            });
+        },
+
         tabClick(index) {
             this.tabIndex = index;
         },
-        addGroup(){
-
-        }
+        addGroup() {},
     },
 
     // 数据计算
@@ -94,12 +133,12 @@ export default {
 .date-list {
     display: flex;
     justify-content: space-between;
-    font-size: px(44);
+    font-size: px(46);
     text-align: center;
     background-color: #fff;
     li {
         border: 1px solid #f1f1f1;
-        padding: px(20) 0;
+        padding: px(25) 0;
         width: 50%;
         flex-shrink: 0;
         &.on {
@@ -147,7 +186,7 @@ export default {
     background-color: rgb(0, 188, 38);
     font-size: px(44);
 }
-.page{
+.page {
     padding-bottom: 6rem;
 }
 </style>

src/pages/index/login.vue

@@ -20,7 +20,9 @@
             </div>
             <button class="btn" @click="submit">确定</button>
             <div class="login-other">
-                <a class="go-register" @click="jump('/pages/index/register')">去注册</a>
+                <a class="go-register" @click="jump('/pages/index/register')"
+                    >去注册</a
+                >
                 <a
                     class="find-password"
                     @click="jump('/pages/index/find-password')"
@@ -70,16 +72,42 @@ export default {
             uni.login({
                 provider: "weixin",
                 success: (result) => {
-                    this.api
-                        .post("/Login/LoginByAccount", {
-                            userName: this.userName,
-                            password: this.password,
-                            code: result.code,
-                        })
-                        .then((res) => {
-                            uni.hideLoading();
+                    // 判断团长号 验证
+                    this.login(result.code);
+                },
+            });
+        },
 
-                            if (res.success) {
+        checkcode(data, callback) {
+            this.api.get("/Group/CheckCode", data).then((res) => {
+                if (res.success) {
+                    if (res.data) {
+                        callback();
+                    } else {
+                        this.router.push("/index/register?step=3");
+                    }
+                } else {
+                    this.router.push("/index/register?step=2");
+                }
+            });
+        },
+
+        login(code) {
+            this.api
+                .post("/Login/LoginByAccount", {
+                    userName: this.userName,
+                    password: this.password,
+                    code: code,
+                })
+                .then((res) => {
+                    uni.hideLoading();
+                    if (res.success) {
+                        this.checkcode(
+                            {
+                                code: "hht2120201",
+                                platform: res.fromPlatform,
+                            },
+                            () => {
                                 // 判断权限
                                 if (res.data.authStatus === 0) {
                                     // 未注册
@@ -103,16 +131,16 @@ export default {
                                     });
                                     this.fn.roleHandle();
                                 }
-                            } else {
-                                this.fn.showModal({
-                                    title: "提交失败",
-                                    content: res.message,
-                                    showCancel: false,
-                                });
                             }
+                        );
+                    } else {
+                        this.fn.showModal({
+                            title: "提交失败",
+                            content: res.message,
+                            showCancel: false,
                         });
-                },
-            });
+                    }
+                });
         },
     },
 
@@ -178,13 +206,13 @@ export default {
 .find-password {
     color: #666;
 }
-.login-other{
+.login-other {
     margin-top: px(50);
     font-size: px(40);
     display: flex;
     justify-content: space-between;
     align-items: center;
-    .go-register{
+    .go-register {
         color: #4395ff;
     }
 }

src/pages/index/register copy.vue

@@ -1,394 +0,0 @@
-<template>
-    <div class="page">
-        <div class="main" v-if="step === 1">
-            <div class="tit">注册</div>
-            <div class="inp-box">
-                <input
-                    type="text"
-                    name="mobile"
-                    v-model="form.mobile"
-                    placeholder="手机号码"
-                />
-            </div>
-
-            <div class="inp-box code-box">
-                <input
-                    type="text"
-                    name="smsCode"
-                    v-model="form.smsCode"
-                    placeholder="验证码"
-                />
-                <span
-                    class="code-btn"
-                    :class="{ dis: timeing }"
-                    @click="getCode()"
-                    >{{ codeStr }}</span
-                >
-            </div>
-
-            <div class="inp-box">
-                <input
-                    type="password"
-                    name="password"
-                    v-model="form.password"
-                    placeholder="请输入密码"
-                />
-            </div>
-            <div class="inp-box">
-                <input
-                    type="password"
-                    name="password2"
-                    v-model="form.password2"
-                    placeholder="确认密码"
-                />
-            </div>
-            <button class="btn" @click="submit">注册</button>
-        </div>
-        <div class="main" v-if="step === 2">
-            <div class="tit">填写区区团购团长号</div>
-            <div class="inp-box">
-                <input
-                    type="text"
-                    name="teamNum"
-                    v-model="form.teamNum"
-                    placeholder="团长号：9000xxxxxx"
-                />
-            </div>
-            <button class="btn" @click="saveTeamNum">下一步</button>
-            <div class="team-num-des">
-                <h1 class="tit">在哪里看京东团长号？</h1>
-                <p class="text">
-                    在京东店长版后台，个人中心，点击头像进去就可以看到
-                </p>
-                <div class="video">
-                    <video src="" poster=""></video>
-                </div>
-
-                <p class="text">
-                    如有问题，添加客服微信：jingzhunwlyx，或长按下方二维码添加客服咨询
-                </p>
-                <div class="img">
-                    <my-image
-                        mode="widthFix"
-                        @click="viewImg('/static/icon/select2.png')"
-                        src="/static/icon/select2.png"
-                    ></my-image>
-                </div>
-            </div>
-        </div>
-        <div class="main" v-if="step === 3">
-            <div class="tit">添加助理微信</div>
-            <ul class="add-assistant">
-                <li>
-                    <div class="step">第一步：</div>
-                    <div class="con">
-                        <div>
-                            助理微信：<span class="wechat">wx150123156</span>
-                            <span class="copy" @click="copy('xxx')"
-                                >点击复制</span
-                            >
-                        </div>
-                        <my-image
-                            class="wechat-img"
-                            mode="widthFix"
-                            @click="viewImg('/static/icon/select2.png')"
-                            src="/static/icon/select2.png"
-                        ></my-image>
-                    </div>
-                </li>
-                <li>
-                    <div class="step">第二步：</div>
-                    <div class="con">
-                        <div>在群里发一条消息@群主里消息</div>
-                    </div>
-                </li>
-                <li>
-                    <div class="step">第三步：</div>
-                    <div class="con">
-                        <div>发送团长好到群内</div>
-                    </div>
-                </li>
-            </ul>
-            <button class="btn" @click="saveOk">完成</button>
-        </div>
-    </div>
-</template>
-
-<script>
-import MyImage from "../../components/image/index";
-
-export default {
-    name: "",
-    components: { MyImage },
-    // 数据
-    data() {
-        return {
-            step: 1,
-            form: {
-                mobile: "",
-                smsCode: "",
-                password: "",
-                password2: "",
-                teamNum: "",
-                fromPlatform:0
-            },
-            timeing: false,
-            codeStr: "发送验证码",
-        };
-    },
-
-    onLoad() {
-        uni.hideLoading();
-    },
-
-    onShow() {},
-
-    // 函数
-    methods: {
-        getCode() {
-            if (this.timeing) {
-                return;
-            }
-            let phoneReg = /^[1][1-9][0-9]{9}$/;
-            if (!this.form.mobile) {
-                return this.fn.showToast("请输入手机号");
-            }
-            if (!phoneReg.test(this.form.mobile)) {
-                return this.fn.showToast("手机号格式不正确");
-            }
-            // this.sendCode();
-            this.downTime();
-        },
-        sendCode() {
-            this.api.get("").then((res) => {});
-        },
-        downTime() {
-            this.timeing = true;
-            let t = 60;
-            this.codeStr = t + "s重新获取";
-            let timer = setInterval(() => {
-                t--;
-                if (t === 0) {
-                    clearInterval(timer);
-                    this.codeStr = "发送验证码";
-                    this.timeing = false;
-                } else {
-                    this.codeStr = t + "s重新获取";
-                }
-            }, 1000);
-        },
-
-        submit() {
-            console.log(this.mobile);
-            if (!this.form.mobile) {
-                this.fn.showToast(`请输入手机号码`);
-                return;
-            }
-            if (!this.form.code) {
-                this.fn.showToast(`请输入验证码`);
-                return;
-            }
-
-            if (!this.form.password) {
-                this.fn.showToast(`请输入密码`);
-                return;
-            }
-
-            if (this.form.password.length < 6) {
-                this.fn.showToast(`密码最少6位`);
-                return;
-            }
-
-            if (!this.form.password2) {
-                this.fn.showToast(`请输入确认密码`);
-                return;
-            }
-
-            if (this.form.password2 !== this.form.password) {
-                this.fn.showToast(`两次密码不一致`);
-                return;
-            }
-
-            // uni.showLoading({
-            //     title: "提交中",
-            // });
-            this.step = 2;
-            console.log(this.form);
-        },
-
-        saveTeamNum() {
-            if (!this.form.teamNum) {
-                return this.fn.showToast(`请输入团长号`);
-            }
-            this.step = 3;
-        },
-
-        viewImg(url) {
-            uni.previewImage({
-                urls: [url],
-            });
-        },
-
-        copy(val) {
-            const self = this;
-
-            uni.setClipboardData({
-                data: val,
-                success: () => {
-                    self.fn.showToast("复制成功");
-                },
-            });
-        },
-
-        saveOk() {
-            // self.fn.showToast("注册成功");
-            this.fn.showModal({
-                title: "失败",
-                content:
-                    "助理没有收到您发送在群里的团长号，请确认1、2、3步全部完成后再试",
-                showCancel: false,
-            });
-        },
-    },
-
-    // 数据计算
-    computed: {},
-
-    // 数据监听
-    watch: {},
-};
-</script>
-
-
-<style lang="scss" scoped>
-.page {
-    height: 100%;
-    background-color: #fff;
-}
-.main {
-    padding-top: px(120);
-    padding-left: px(40);
-    padding-right: px(40);
-}
-.tit {
-    font-size: px(50);
-    padding-bottom: px(100);
-    text-align: center;
-    padding-bottom: px(60);
-}
-.inp-box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    border-bottom: 1px solid #c3c1c2;
-    padding: px(30) 0;
-    margin-bottom: px(30);
-}
-.inp-box span {
-    font-size: px(32);
-    color: rgb(0, 188, 38);
-    border-radius: px(15);
-    border: 1px solid rgb(0, 188, 38);
-    width: px(230);
-    height: px(80);
-    text-align: center;
-    line-height: px(80);
-    flex-shrink: 0;
-    margin-left: px(30);
-}
-.inp-box input {
-    width: 100%;
-}
-.inp-box .dis {
-    color: #999;
-    border-color: #999;
-    pointer-events: none;
-}
-.btn {
-    margin-top: px(120);
-    color: #fff;
-    background-color: rgb(0, 188, 38);
-    font-size: px(44);
-}
-.code-box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    .code-btn {
-        width: px(220);
-        flex-shrink: 0;
-        font-size: px(40);
-        padding: 0 px(10);
-        border: none;
-        &.dis {
-            border-color: #f1f1f1;
-            color: #999;
-        }
-    }
-}
-.team-num-des {
-    padding: px(80) px(30);
-    text-align: center;
-    line-height: 1.5;
-    .tit {
-        font-size: px(48);
-        padding: px(10) 0;
-    }
-    .text {
-        font-size: px(44);
-        padding: px(15) 0;
-    }
-    video {
-        width: 80%;
-        display: block;
-        margin: 0 auto;
-    }
-    .img,
-    .video {
-        padding: px(20) 0;
-    }
-    /deep/ img {
-        width: 80%;
-        display: block;
-        margin: 0 auto;
-    }
-}
-.add-assistant {
-    border-top: 1px solid #f1f1f1;
-    li {
-        display: flex;
-        justify-content: space-between;
-        font-size: px(44);
-        padding: px(30);
-        border-bottom: 1px solid #f1f1f1;
-        .step {
-            width: px(200);
-            flex-shrink: 0;
-        }
-        .con {
-            width: 100%;
-        }
-        .wechat-img {
-            padding: px(10);
-            /deep/ img {
-                width: px(600);
-            }
-        }
-    }
-}
-.copy {
-    display: inline-block;
-    font-size: px(32);
-    line-height: px(44);
-    padding: 0 px(10);
-    border: 1px solid #d9d9d9;
-    color: #333;
-    background-color: #fafafa;
-    margin-left: px(20);
-    border-radius: px(5);
-    transform: translate(0, -1px);
-}
-.wechat {
-    color: #4395ff;
-}
-</style>

src/pages/index/register.vue

@@ -4,7 +4,7 @@
             <div class="tit">注册</div>
             <div class="inp-box">
                 <input
-                    type="text"
+                    type="number"
                     name="mobile"
                     v-model="form.mobile"
                     placeholder="手机号码"
@@ -13,7 +13,7 @@
 
             <div class="inp-box code-box">
                 <input
-                    type="text"
+                    type="number"
                     name="smsCode"
                     v-model="form.smsCode"
                     placeholder="验证码"
@@ -61,7 +61,10 @@
                     在京东店长版后台，个人中心，点击头像进去就可以看到
                 </p>
                 <div class="video">
-                    <video src="" poster=""></video>
+                    <video
+                        src="https://oss.ixiaokejia.com/videos/get-pid.mp4"
+                        poster=""
+                    ></video>
                 </div>
 
                 <p class="text">
@@ -137,7 +140,13 @@ export default {
         };
     },
 
-    onLoad() {
+    onLoad(opts) {
+        if (opts.step) {
+            this.step = opts.step;
+        }
+        if (opts.fromPlatform) {
+            this.form.fromPlatform = opts.fromPlatform;
+        }
         uni.hideLoading();
     },
 
@@ -181,7 +190,6 @@ export default {
         },
 
         submit() {
-            console.log(this.mobile);
             if (!this.form.mobile) {
                 this.fn.showToast(`请输入手机号码`);
                 return;
@@ -220,7 +228,7 @@ export default {
                 mobile: this.form.mobile,
                 smsCode: this.form.smsCode,
                 password: this.form.password,
-                fromPlatform: null,
+                fromPlatform: 0,
             };
             uni.login({
                 provider: "weixin",
@@ -250,7 +258,26 @@ export default {
             uni.showLoading({
                 title: "提交中",
             });
-            this.step = 3;
+            // this.step = 2;
+            let sendData = {
+                pid: this.form.teamNum,
+                fromPlatform: 0,
+            };
+            this.api
+                .post("/Group/CommitPid", sendData, { pass: true })
+                .then((res) => {
+                    uni.hideLoading();
+                    if (res.success) {
+                        this.fn.showToast(`团长号提交成功`);
+                        this.step = 3;
+                    } else {
+                        this.fn.showModal({
+                            title: "团长号提交失败",
+                            content: res.message,
+                            showCancel: false,
+                        });
+                    }
+                });
         },
 
         viewImg(url) {
@@ -272,11 +299,26 @@ export default {
 
         saveOk() {
             // self.fn.showToast("注册成功");
-            this.fn.showModal({
-                title: "失败",
-                content:
-                    "助理没有收到您发送在群里的团长号，请确认1、2、3步全部完成后再试",
-                showCancel: false,
+            this.api.get("/Group/CheckCode", {
+                platform:this.form.fromPlatform
+            }).then((res) => {
+                if (res.success) {
+                    if (res.data) {
+                        this.router.push({
+                            path:'/page/assistant',
+                            isTabBer:true
+                        })
+                    } else {
+                        this.fn.showModal({
+                            title: "失败",
+                            content:
+                                "助理没有收到您发送在群里的团长号，请确认1、2、3步全部完成后再试",
+                            showCancel: false,
+                        });
+                    }
+                } else {
+                    this.router.push("/index/register?step=2");
+                }
             });
         },
     },
@@ -369,7 +411,8 @@ export default {
         padding: px(15) 0;
     }
     video {
-        width: 80%;
+        width: 80vw;
+        height: calc(80vw / 0.466666);
         display: block;
         margin: 0 auto;
     }