From 7a081306c9367d97aa807fe50d87fca0d5173fff Mon Sep 17 00:00:00 2001
From: jianweie code <jianweie@live.com>
Date: Mon, 27 May 2024 22:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91=E4=BB=A3?=
 =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD=E7=A7=BB=E9=99=A4=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=8F=90=E4=BA=A4=E7=94=B3=E8=AF=B7=E3=80=82?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=A0=B8=E8=A2=AB=E6=8B=92=E7=BB=9D?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/member/agent/apply/apply.vue        | 139 +++++-------------
 1 file changed, 39 insertions(+), 100 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/apply/apply.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/apply/apply.vue
index c0d2015f..5232524e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/apply/apply.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/apply/apply.vue
@@ -18,33 +18,20 @@
         </view>
         <!-- 表单 -->
         <view class="coreshop-bg-white coreshop-border-radius-10 coreshop-padding-15 coreshop-margin-10">
-            <u--form :model="form" :rules="rules" ref="uForm" errorType="message" labelPosition="left" labelWidth="80">
-                <u-form-item label="姓名" prop="name" borderBottom>
-                    <u--input type="text" placeholder='请填您的姓名' v-model="form.name" />
-                </u-form-item>
-                <u-form-item label="微信" prop="weixin" borderBottom>
-                    <u--input type="text" placeholder='请填您的微信' v-model="form.weixin" />
-                </u-form-item>
-                <u-form-item label="QQ" prop="qq" borderBottom>
-                    <u--input type="number" placeholder='请填您的QQ' v-model="form.qq" />
-                </u-form-item>
-                <u-form-item label="手机" prop="mobile" borderBottom>
-                    <u--input type="number" placeholder='请填写您的手机号码' v-model="form.mobile" />
-                </u-form-item>
-                <view class="coreshop-padding-15 flex coreshop-flex-nowrap">
-                    <u-checkbox-group>
-                        <u-checkbox v-model="form.checked" @change="checkboxChange">我已经阅读并接受</u-checkbox>
-                        <text class="coreshop-text-orange coreshop-padding-left-10  coreshop-padding-right-10 coreshop-font-15 coreshop-vertical-align-sub" @click="goAgreement()">"代理协议"</text>
-                    </u-checkbox-group>
-                </view>
-            </u--form>
-            <view class="coreshop-padding-15">
-                <u-button type="primary" size="normal" @click="submit()">申请成为代理商</u-button>
+            <view class="u-content">
+                <u-parse :content="agentAgreement" :selectable="true"></u-parse>
             </view>
+
         </view>
+
+        <view class="coreshop-bg-white coreshop-footer-fixed coreshop-foot-padding-bottom">
+            <u-button type="primary" size="normal" @click="submit()">申请成为代理商</u-button>
+        </view>
+
     </view>
 </template>
 <script>
+    import { mapState } from 'vuex';
     export default {
         data() {
             return {
@@ -53,92 +40,44 @@
                     weixin: '',
                     qq: '',
                     mobile: '',
-                    checked: false,
-                    isAgreement: 'off'
-                },
-                rules: {
-                    name: [
-                        {
-                            required: true,
-                            message: '请输入姓名',
-                            trigger: ['blur', 'change']
-                        },
-                        {
-                            min: 2,
-                            max: 4,
-                            message: '长度在2-4个字符之间'
-                        }
-                    ],
-                    weixin: [
-                        {
-                            required: true,
-                            message: '请输入微信',
-                            trigger: ['blur', 'change']
-                        }
-                    ],
-                    qq: [
-                        {
-                            required: true,
-                            message: '请输入QQ',
-                            trigger: ['blur', 'change']
-                        },
-                        {
-                            type: "number",
-                            message: 'QQ必须为数字',
-                            trigger: ['change', 'blur']
-                        },
-                    ],
-                    mobile: [
-                        {
-                            required: true,
-                            message: '请输入手机号码',
-                            trigger: ['blur', 'change']
-                        },
-                        {
-                            validator: (rule, value, callback) => {
-                                return this.$u.test.mobile(value);
-                            },
-                            message: '手机号码不正确',
-                            trigger: ['change', 'blur'],
-                        }
-                    ]
                 }
             }
         },
-        onReady() {
-            this.$refs.uForm.setRules(this.rules);
+        computed: {
+            ...mapState({
+                hasLogin: state => state.hasLogin,
+                userInfo: state => state.userInfo,
+            }),
+            agentAgreement() {
+                return this.$store.state.config.agentAgreement
+            },
+            userInfo: {
+                get() {
+                    return this.$store.state.userInfo;
+                },
+                set(val) {
+                    this.$store.commit('userInfo', val);
+                }
+            },
         },
         methods: {
-            checkboxChange(n) {
-                this.form.checked = n;
-                console.log('change', n);
-            },
             submit() {
-                this.$refs.uForm.validate().then(res => {
-                    if (this.form.checked == false) {
-                        this.$u.toast('请勾选代理协议')
-                        return false;
+                // 提交审核
+                let data = {
+                    name: this.userInfo.nickName,
+                    weixin: this.userInfo.mobile,
+                    qq: this.userInfo.mobile,
+                    mobile: this.userInfo.mobile,
+                    agreement: "on",
+                }
+                this.$u.api.applyAgent(data).then(res => {
+                    if (res.status) {
+                        this.$refs.uToast.show({ message: res.msg, type: 'success', url: '/pages/member/agent/applyState/applyState' })
+                    } else {
+                        this.$u.toast(res.msg);
                     }
-                    this.form.isAgreement = "on";
+                });
 
-                    // 提交审核
-                    let data = {
-                        name: this.form.name,
-                        weixin: this.form.weixin,
-                        qq: this.form.qq,
-                        mobile: this.form.mobile,
-                        agreement: this.form.isAgreement,
-                    }
-                    this.$u.api.applyAgent(data).then(res => {
-                        if (res.status) {
-                            this.$refs.uToast.show({ message: res.msg, type: 'success', url: '/pages/member/agent/applyState/applyState' })
-                        } else {
-                            this.$u.toast(res.msg);
-                        }
-                    });
-                }).catch(errors => {
-                    uni.$u.toast('提交的数据校验失败，请输入合法信息！')
-                })
             },
             goAgreement() {
                 uni.navigateTo({