钱包设置

src/pages/manage/index.vue

@@ -57,6 +57,13 @@
                         ></my-image>
                         <span class="text">我的钱包</span>
                     </li> -->
+                    <li class="item" @click="jump('/pages/wallet/index')">
+                        <my-image
+                            class="img"
+                            src="/static/icon/money.png"
+                        ></my-image>
+                        <span class="text">我的钱包</span>
+                    </li> 
                 <li class="item" @click="jump('/pages/manage/user/index')">
                     <my-image
                         class="img"

src/pages/wallet/bind.vue

@@ -2,14 +2,9 @@
     <div class="page" :class="{ 'page--iphoneX': iphoneX }">
         <div class="form-card">
             <section class="form-item">
-                <div class="label">姓名：</div>
+                <div class="label"><span class="required">*</span>姓名：</div>
                 <div class="box">
-                    <input
-                        type="text"
-                        :disabled="true"
-                        v-model="form.name"
-                        placeholder=" "
-                    />
+                    <input type="text" v-model="form.name" placeholder=" " />
                 </div>
             </section>
             <section class="form-item">
@@ -20,9 +15,8 @@
                 <div class="box">
                     <input
                         type="text"
-                        :disabled="true"
                         v-model="form.wechat"
-                        placeholder=" "
+                        placeholder="请输入"
                     />
                 </div>
             </section>
@@ -55,9 +49,8 @@
                 <div class="box">
                     <input
                         type="text"
-                        :disabled="true"
-                        v-model="form.zhihang"
-                        placeholder=" "
+                        v-model="form.bankBranch"
+                        placeholder="请输入"
                     />
                 </div>
             </section>
@@ -69,28 +62,28 @@
                 <div class="box">
                     <input
                         type="text"
-                        :disabled="true"
-                        v-model="form.kahao"
-                        placeholder=" "
+                        v-model="form.bankAccount"
+                        placeholder="请输入"
                     />
                 </div>
             </section>
             <section class="form-item">
                 <div class="label">
                     <span class="required">*</span>
-                    银行卡号：
+                    验证码：
                 </div>
                 <div class="box code-box">
                     <input
                         type="text"
-                        :disabled="true"
                         v-model="form.code"
-                        placeholder=" "
+                        placeholder="请输入"
                     />
                     <span class="get-code">{{ codeStr }}</span>
                 </div>
             </section>
-        <p class="tel">店长手机号：173****1879</p>
+            <p class="tel">
+                店长手机号：{{ shopInfo.managerTelephone | hideTel }}
+            </p>
         </div>
         <div class="btns">
             <div class="btn" @click="saveOk">保存</div>
@@ -104,97 +97,142 @@ import MyImage from "../../components/image/index";
 export default {
     name: "",
     components: { MyImage },
+    filters: {
+        hideTel(v) {
+            return v.replace(/(\d{3})(\d{4})(\d{4})/, "$1****$3") || "";
+        },
+    },
     // 数据
     data() {
         return {
             form: {
                 name: "",
                 wechat: "",
-                yinhang: "",
-                zhihang: "",
-                kahao: "",
+                bank: "",
+                bankBranch: "",
+                bankAccount: "",
                 code: "",
             },
             opts: [
-                // { key: "待关联", value: 0 },
-                { key: "招商", value: 1 },
-                { key: "工商", value: 2 },
+                { key: "工商银行", value: "工商银行" },
+                { key: "农业银行", value: "农业银行" },
+                { key: "建设银行", value: "建设银行" },
+                { key: "招商银行", value: "招商银行" },
+                { key: "中国银行", value: "中国银行" },
+                { key: "浦发银行", value: "浦发银行" },
+                { key: "广发银行", value: "广发银行" },
+                { key: "民生银行", value: "民生银行" },
+                { key: "平安银行", value: "平安银行" },
+                { key: "光大银行", value: "光大银行" },
+                { key: "兴业银行", value: "兴业银行" },
+                { key: "中信银行", value: "中信银行" },
+                { key: "上海银行", value: "上海银行" },
             ],
             submitLoading: false,
             timeing: false,
             codeStr: "发送验证码",
+            shopInfo: {},
         };
     },
 
     onLoad(opts) {
         this.getData();
     },
-    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("/Login/SendSms", { mobile: this.form.mobile })
-            .then((res) => {});
-    },
-    downTime() {
-        this.timeing = true;
-        let t = 60;
-        this.codeStr = t + "s重新获取";
-        this.timer = setInterval(() => {
-            t--;
-            if (t === 0) {
-                clearInterval(this.timer);
-                this.codeStr = "发送验证码";
-                this.timeing = false;
-            } else {
-                this.codeStr = t + "s重新获取";
-            }
-        }, 1000);
-    },
 
     onShow() {},
 
     // 函数
     methods: {
+        getData() {
+            this.api.get("/Shop/GetInfo", {}, { pass: true }).then((res) => {
+                if (res.success && res.data) {
+                    this.shopInfo = res.data;
+                }
+            });
+        },
+        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() {
+            if(!this.shopInfo.managerTelephone){
+                return this.fn.showToast('未获取到店长手机号');
+            }
+            this.api
+                .get("/Login/SendSms", {
+                    mobile: this.shopInfo.managerTelephone,
+                })
+                .then((res) => {});
+        },
+        downTime() {
+            this.timeing = true;
+            let t = 60;
+            this.codeStr = t + "s重新获取";
+            this.timer = setInterval(() => {
+                t--;
+                if (t === 0) {
+                    clearInterval(this.timer);
+                    this.codeStr = "发送验证码";
+                    this.timeing = false;
+                } else {
+                    this.codeStr = t + "s重新获取";
+                }
+            }, 1000);
+        },
         pickerChange(e) {
             let val = this.opts[e.detail.value];
-            this.form.yinhang = val.value;
+            this.form.bank = val.value;
         },
         saveOk() {
             if (this.submitLoading) {
                 return;
             }
-            if (!this.form.managerTelephone) {
-                return this.fn.showToast("请输入店长电话");
+            if (!this.form.name) {
+                return this.fn.showToast("请输入姓名");
+            }
+            if (!this.form.wechat) {
+                return this.fn.showToast("请输入微信号");
+            }
+            if (!this.form.bank) {
+                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;
+            if (!this.form.bankBranch) {
+                return this.fn.showToast("请输入开户支行");
+            }
+            if (!this.form.bankAccount) {
+                return this.fn.showToast("请输入银行卡号");
+            }
+            if (!this.form.code) {
+                return this.fn.showToast("请输入验证码");
             }
-            console.log(this.form);
             this.submitLoading = true;
             uni.showLoading({
                 title: "提交中...",
             });
-            let data = { ...this.form };
-            this.api.post("/Shop/Set", data, { pass: true }).then((res) => {
+            let data = {
+                mobile:this.shopInfo.managerTelephone,
+                smsCode:this.form.code,
+                account:{
+                    name:this.form.name,
+                    wechat:this.form.wechat,
+                    bank:this.form.bank,
+                    bankBranch:this.form.bankBranch,
+                    bankAccount:this.form.bankAccount,
+                    userId:this.user.id,
+                    appId:this.user.appId,
+                }
+             };
+            this.api.post("/User/BindAccount", data, { pass: true }).then((res) => {
                 this.submitLoading = false;
                 uni.hideLoading();
                 if (res.success) {
@@ -474,7 +512,7 @@ export default {
         }
     }
 }
-.tel{
+.tel {
     border-top: 1px solid #f1f1f1;
     padding-top: px(60);
     text-align: center;

src/pages/wallet/index.vue

@@ -29,66 +29,80 @@
             <h1 class="tit">可提现金额</h1>
             <div class="money-num">
                 <div class="num">￥960.00</div>
-                <div class="view" @click="jump('/pages/wallet/bill')">查看账单</div>
+                <div class="view" @click="jump('/pages/wallet/bill')">
+                    查看账单
+                </div>
             </div>
             <p class="tip">最低提现2元，单日上线20000元</p>
             <div class="input">
-                <input type="digit" placeholder="￥0">
+                <input type="digit" v-model="formVal" placeholder="￥0" />
             </div>
             <p class="tip tip-color">提现金额超出总金额，请重新填写</p>
-            <button type="button" class="btn">申请提现</button>
+            <button type="button" class="btn" @click="withdrawal">
+                申请提现
+            </button>
         </div>
         <div class="card record">
-            <h1 class="tit">提现记录  共2条</h1>
+            <h1 class="tit">提现记录 共{{ withdrawalTotal }}条</h1>
             <ul class="table">
                 <li class="row">
-                    <div class="item">
-                        申请时间
-                    </div>
-                    <div class="item">
-                        提现方式
-                    </div>
-                    <div class="item">
-                        金额
-                    </div>
-                    <div class="item">
-                        状态
-                    </div>
+                    <div class="item">申请时间</div>
+                    <div class="item">提现方式</div>
+                    <div class="item">金额</div>
+                    <div class="item">状态</div>
                 </li>
-                <li class="row">
+                <li class="row" v-for="item of withdrawalList" :key="item.id">
                     <div class="item">
-                        2021/01/01
+                        {{ item.applyTime | dateFormat("yyyy/MM/dd") }}
                     </div>
                     <div class="item">
-                        微信
+                        <!-- {{item.status}} -->
                     </div>
                     <div class="item">
-                        100
+                        {{ item.amount / 100 }}
                     </div>
                     <div class="item">
-                        已提交
+                        {{ item.status }}
                     </div>
                 </li>
             </ul>
         </div>
+
+        <uni-popup ref="popup" type="dialog">
+            <uni-popup-dialog
+                mode="input"
+                :title="'提现备注'"
+                :content="false"
+                :inputType="'text'"
+                placeholder="请输入备注"
+                @confirm="popupConfirm"
+            ></uni-popup-dialog>
+        </uni-popup>
     </div>
 </template>
 
 <script>
 import MyImage from "../../components/image/index";
+import uniPopupDialog from "../../components/uni-popup/uni-popup-dialog";
+import uniPopup from "../../components/uni-popup/uni-popup";
 
 export default {
     name: "",
-    components: { MyImage },
+    components: { MyImage, uniPopupDialog, uniPopup },
     // 数据
     data() {
         return {
+            formVal: "",
+            withdrawalPageIndex: 1,
+            withdrawalList: [],
+            withdrawalTotal: 0,
         };
     },
     filters: {},
-    onLoad() {},
-    async onShow() {
+    onLoad() {
+        this.getWithdrawalList();
     },
+    async onShow() {},
 
     // onPullDownRefresh() {
     //     this.getList();
@@ -96,7 +110,52 @@ export default {
 
     // 函数
     methods: {
+        getWithdrawalList() {
+            this.api
+                .get("/User/GetWithdrawalList", {
+                    pageIndex: this.withdrawalPageIndex,
+                })
+                .then((res) => {
+                    this.withdrawalList = res.data.data;
+                    this.withdrawalTotal = res.data.pager.totalItems;
+                });
+        },
 
+        withdrawal() {
+            if (!this.formVal) {
+                return this.fn.showToast("请输入提现金额");
+            }
+            this.$refs.popup.open({
+                type: "dialog",
+            });
+        },
+        popupConfirm(done, value) {
+            if (!value) {
+                return this.fn.showToast("请输入提现备注");
+            }
+            console.log(this.formVal, value);
+            uni.showLoading({
+                title: "提交中...",
+            });
+            let data = { 
+                amount:this.formVal/100,
+                remark:value
+             };
+            this.api.post("/User/Withdrawal", data, { pass: true }).then((res) => {
+                this.submitLoading = false;
+                uni.hideLoading();
+                if (res.success) {
+                    
+                    // 刷新页面数据
+                } else {
+                    this.fn.showModal({
+                        content:'错误信息：'+res.message,
+                        showCancel: false,
+                    });
+                }
+            });
+            done();
+        },
     },
 
     // 数据计算
@@ -113,42 +172,42 @@ export default {
 
 
 <style lang="scss" scoped>
-.card{
+.card {
     margin: px(40) px(40);
     border: 1px solid #efefef;
     padding: px(40);
     background-color: #fff;
-    .tit{
+    .tit {
         font-size: px(44);
         font-weight: bold;
         padding-bottom: px(20);
     }
 }
-.info{
-    .item{
+.info {
+    .item {
         margin-top: px(20);
         font-size: px(44);
         display: flex;
         align-items: start;
         line-height: px(60);
-        .key{
+        .key {
             margin-right: px(20);
             flex-shrink: 0;
             color: #666;
         }
     }
 }
-.money{
-    .money-num{
+.money {
+    .money-num {
         display: flex;
         align-items: center;
         justify-content: space-between;
         padding: px(20) 0;
-        .num{
+        .num {
             font-size: px(56);
             color: red;
         }
-        .view{
+        .view {
             width: px(340);
             height: px(88);
             border: 1px solid rgb(0, 188, 38);
@@ -159,37 +218,37 @@ export default {
             border-radius: px(10);
         }
     }
-    .input{
+    .input {
         margin: px(30) 0;
-        input{
+        input {
             height: px(100);
             padding: 0 px(20);
             border: 1px solid #ededed;
         }
     }
-    .tip{
+    .tip {
         font-size: px(40);
         color: #999;
-        &.top-color{
+        &.top-color {
             color: rgb(255, 173, 129);
         }
     }
-    .btn{
+    .btn {
         margin-top: px(40);
-        background-color:rgb(0, 188, 38);
+        background-color: rgb(0, 188, 38);
         color: #fff;
         border: none;
     }
 }
-.record{
-    .table{
+.record {
+    .table {
         margin-top: px(30);
-        .row{
+        .row {
             display: flex;
             border-right: 1px solid #efefef;
             border-bottom: 1px solid #efefef;
         }
-        .item{
+        .item {
             border-left: 1px solid #efefef;
             border-top: 1px solid #efefef;
             width: 25%;