我的钱包

releaselog.md

@@ -1,5 +1,9 @@
 
 
+# 0.5.1 (21.03.18 18:00) 
+### 我的钱包
+
+
 # 0.5.0 (21.03.13 12:00) 
 ### 完成开店
 

src/common/store/common.js

@@ -19,6 +19,7 @@ const module = {
         cashierRefundData:false, //manage/cashier/Refund 收银退货临时保存
         groupData:null, //assistant/setting/xxx 临时保存
         platformData:null,//assistant/setting2/xxx 临时保存
+        withdrawalData:null,//wallet/detail/ 临时保存
         tabList:[{
             id: 1,
             name: "订单",

src/pages.json

@@ -456,7 +456,8 @@
         {
             "path": "pages/wallet/bill",
             "style": {
-                "navigationBarTitleText": "账单记录"
+                "navigationBarTitleText": "账单记录",
+                "enablePullDownRefresh": true
             }
         }
     ]

src/pages/manage/index.vue

@@ -57,13 +57,13 @@
                         ></my-image>
                         <span class="text">我的钱包</span>
                     </li> -->
-                    <li class="item" @click="jump('/pages/wallet/index')">
+                    <!-- <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>  -->
                 <li class="item" @click="jump('/pages/manage/user/index')">
                     <my-image
                         class="img"
@@ -76,7 +76,7 @@
 
         <!-- <button class="btn" @click="layout">退出登录</button> -->
 
-        <div class="ver">0.5.02</div>
+        <div class="ver">0.5.1</div>
         <wyg-bottom-tab
             ref="tabbar"
             :tabIndex="2"

src/pages/wallet/bill.vue

@@ -1,16 +1,31 @@
 <template>
     <div class="page">
         <ul class="list">
-            <li class="item" @click="jump('/pages/wallet/detail')">
-                <div class="name">2021/03/09</div>
+            <li class="item" v-for="item of list" :key="item.id" @click="goDetail(item)">
+                <div class="name">
+                    {{ item.applyTime | dateFormat("yyy/MM/dd") }}
+                    <span class="status">{{ item.status | status }}</span>
+                </div>
                 <div class="right">
-                    ￥400
+                    ￥{{ item.amount / 100 }}
                     <my-image
                         class="arrow"
                         src="/static/common/arrows_left.png"
                     ></my-image>
                 </div>
             </li>
+            <!-- <li class="item">
+                <div class="name">
+                    yyy/MM/dd <span class="status">审核中</span>
+                </div>
+                <div class="right">
+                    ￥100
+                    <my-image
+                        class="arrow"
+                        src="/static/common/arrows_left.png"
+                    ></my-image>
+                </div>
+            </li> -->
         </ul>
     </div>
 </template>
@@ -24,14 +39,71 @@ export default {
     // 数据
     data() {
         return {
-            curShop: {},
+            pageIndex: 1,
+            list: [],
         };
     },
+    filters: {
+        status(v) {
+            let obj = {
+                0: "审核中",
+                1: "待打款",
+                2: "已完成",
+                3: "未通过",
+                4: "打款失败",
+            };
+            let str = obj[v];
+            return str || "";
+        },
+    },
 
-    onLoad() {},
+    onLoad() {
+        this.getList();
+    },
     async onShow() {},
+    onPullDownRefresh() {
+        this.getList();
+    },
+    onReachBottom() {
+        this.getMoreList();
+    },
     // 函数
-    methods: {},
+    methods: {
+        getList() {
+            this.pageIndex = 1;
+            uni.showLoading({
+                title: "加载中...",
+            });
+            this.api
+                .get("/User/GetWithdrawalList", {
+                    pageIndex: this.pageIndex++,
+                })
+                .then((res) => {
+                    uni.hideLoading();
+                    this.list = res.data.data;
+                });
+        },
+        getMoreList() {
+            this.api
+                .get("/User/GetWithdrawalList", {
+                    pageIndex: this.pageIndex,
+                })
+                .then((res) => {
+                    if (res.data.data.length) {
+                        this.pageIndex++;
+                    }
+                    this.list = [...this.list, ...res.data.data];
+                });
+        },
+
+        goDetail(val){
+            
+            this.$store.commit("common/update", {
+                withdrawalData: val,
+            });
+            this.router.push('/pages/wallet/detail');
+        }
+    },
 
     // 数据计算
     computed: {
@@ -72,11 +144,14 @@ export default {
             height: px(40);
         }
     }
-    .right{
+    .right {
         display: flex;
         align-items: center;
         font-size: px(44);
         color: #666;
     }
+    .status {
+        margin-left: px(30);
+    }
 }
 </style>

src/pages/wallet/bind.vue

@@ -4,7 +4,7 @@
             <section class="form-item">
                 <div class="label"><span class="required">*</span>姓名：</div>
                 <div class="box">
-                    <input type="text" v-model="form.name" placeholder=" " />
+                    <input type="text" v-model="form.name" placeholder="请输入" />
                 </div>
             </section>
             <section class="form-item">
@@ -35,7 +35,7 @@
                         <input
                             type="text"
                             :disabled="true"
-                            :value="pickerView"
+                            :value="form.bank"
                             placeholder="请选择"
                         />
                     </picker>
@@ -78,7 +78,7 @@
                         v-model="form.code"
                         placeholder="请输入"
                     />
-                    <span class="get-code">{{ codeStr }}</span>
+                    <span class="get-code" @click="getCode">{{ codeStr }}</span>
                 </div>
             </section>
             <p class="tel">
@@ -99,6 +99,9 @@ export default {
     components: { MyImage },
     filters: {
         hideTel(v) {
+            if(!v){
+                return '';
+            }
             return v.replace(/(\d{3})(\d{4})(\d{4})/, "$1****$3") || "";
         },
     },
@@ -154,23 +157,17 @@ export default {
             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("手机号格式不正确");
+            if(!this.shopInfo.managerTelephone){
+                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,
+                    type:1
                 })
                 .then((res) => {});
         },
@@ -191,6 +188,7 @@ export default {
         },
         pickerChange(e) {
             let val = this.opts[e.detail.value];
+            console.log(e,val)
             this.form.bank = val.value;
         },
         saveOk() {
@@ -251,15 +249,14 @@ export default {
 
     // 数据计算
     computed: {
-        pickerView() {
-            let str = "";
-            for (let item of this.opts) {
-                if (item.value === this.form.yinhang) {
-                    return item.key;
-                }
-            }
-            return "";
-        },
+        // pickerView() {
+        //     for (let item of this.opts) {
+        //         if (item.value === this.form.bank) {
+        //             return item.key;
+        //         }
+        //     }
+        //     return "";
+        // },
         user() {
             return this.$store.state.user.user;
         },

src/pages/wallet/detail.vue

@@ -1,7 +1,33 @@
 <template>
     <div class="page">
         <div class="card">
-            <uni-steps :options="data" direction="column" :active="2"></uni-steps>
+            <!-- <uni-steps :options="data" direction="column" :active="2"></uni-steps> -->
+            <ul class="list">
+                <li>
+                    <span class="key">提现金额：</span>
+                    <span class="value">{{withdrawalData.amount}}</span>
+                </li>
+                <li>
+                    <span class="key">状态：</span>
+                    <span class="value">{{withdrawalData.status | status}}</span>
+                </li>
+                <li>
+                    <span class="key">申请时间：</span>
+                    <span class="value">{{withdrawalData.applyTime || ''}}</span>
+                </li>
+                <li>
+                    <span class="key">备注：</span>
+                    <span class="value remark">{{withdrawalData.remark || ''}}</span>
+                </li>
+                <li>
+                    <span class="key">处理时间：</span>
+                    <span class="value">{{withdrawalData.auditTime || ''}}</span>
+                </li>
+                <li>
+                    <span class="key">打款时间：</span>
+                    <span class="value">{{withdrawalData.payTime || ''}}</span>
+                </li>
+            </ul>
         </div>
     </div>
 </template>
@@ -13,9 +39,23 @@ import uSteps from "../../components/uni-steps/uni-steps";
 export default {
     name: "",
     components: { MyImage, uSteps },
+    filters:{
+        status(v) {
+            let obj = {
+                0: "审核中",
+                1: "待打款",
+                2: "已完成",
+                3: "未通过",
+                4: "打款失败",
+            };
+            let str = obj[v];
+            return str || "";
+        },
+    },
     // 数据
     data() {
         return {
+            withdrawalData: {},
             data: [
                 { title: "发起提现", desc: "2018-11-11" },
                 { title: "审核通过", desc: "2018-11-12" },
@@ -24,8 +64,9 @@ export default {
             ],
         };
     },
-    filters: {},
-    onLoad() {},
+    onLoad() {
+        this.withdrawalData = this.$store.state.common.withdrawalData || {};
+    },
     async onShow() {},
 
     // onPullDownRefresh() {
@@ -49,7 +90,7 @@ export default {
 
 
 <style lang="scss" scoped>
-.page{
+.page {
     height: 100vh;
     background-color: #fff;
 }
@@ -65,9 +106,24 @@ export default {
     }
 }
 
-.card /deep/ uni-steps{
-    .uni-steps__column-text{
+.card /deep/ uni-steps {
+    .uni-steps__column-text {
         padding: px(40) 0;
     }
 }
+.list {
+    border-bottom: 1px solid #f1f1f1;
+    li {
+        height: px(120);
+        line-height: 1.5;
+        display: flex;
+        align-items: center;
+        border-top: 1px solid #f1f1f1;
+        .key {
+            width: px(220);
+            color: #666;
+            flex-shrink: 0;
+        }
+    }
+}
 </style>

src/pages/wallet/index.vue

@@ -1,72 +1,86 @@
 <template>
     <div class="page">
-        <div class="info card">
-            <h1 class="tit">账号信息</h1>
-            <ul class="info-list">
-                <li class="item">
-                    <div class="key">姓名:</div>
-                    <div class="value">cr</div>
-                </li>
-                <li class="item">
-                    <div class="key">微信号:</div>
-                    <div class="value">wx1503213</div>
-                </li>
-                <li class="item">
-                    <div class="key">银行:</div>
-                    <div class="value">招商银行</div>
-                </li>
-                <li class="item">
-                    <div class="key">开户行:</div>
-                    <div class="value">北京市xxx</div>
-                </li>
-                <li class="item">
-                    <div class="key">卡号:</div>
-                    <div class="value">6225845254521545215</div>
-                </li>
-            </ul>
+        <div
+            v-if="!loading && !account"
+            class="go-bind"
+            @click="jump('/pages/wallet/bind')"
+        >
+            您还未绑定账号,请先绑定绑定账号
         </div>
-        <div class="money card">
-            <h1 class="tit">可提现金额</h1>
-            <div class="money-num">
-                <div class="num">￥960.00</div>
-                <div class="view" @click="jump('/pages/wallet/bill')">
-                    查看账单
+        <block v-if="!loading && account">
+            <!-- <block> -->
+            <div class="info card">
+                <h1 class="tit">账号信息</h1>
+                <ul class="info-list">
+                    <li class="item">
+                        <div class="key">姓名:</div>
+                        <div class="value">{{ account.name }}</div>
+                    </li>
+                    <li class="item">
+                        <div class="key">微信号:</div>
+                        <div class="value">{{ account.wechat }}</div>
+                    </li>
+                    <li class="item">
+                        <div class="key">银行:</div>
+                        <div class="value">{{ account.bank }}</div>
+                    </li>
+                    <li class="item">
+                        <div class="key">开户行:</div>
+                        <div class="value">{{ account.bankBranch }}</div>
+                    </li>
+                    <li class="item">
+                        <div class="key">卡号:</div>
+                        <div class="value">{{ account.bankAccount }}</div>
+                    </li>
+                </ul>
+            </div>
+            <div class="money card">
+                <h1 class="tit">可提现金额</h1>
+                <div class="money-num">
+                    <div class="num">￥{{ balance / 100 }}</div>
+                    <div class="view" @click="jump('/pages/wallet/bill')">
+                        查看账单
+                    </div>
                 </div>
+                <p class="tip">最低提现2元，单日上线20000元</p>
+                <div class="input">
+                    <input type="digit" v-model="formVal" placeholder="￥0" />
+                </div>
+                <p class="tip tip-color">提现金额超出总金额，请重新填写</p>
+                <button type="button" class="btn" @click="withdrawal">
+                    申请提现
+                </button>
             </div>
-            <p class="tip">最低提现2元，单日上线20000元</p>
-            <div class="input">
-                <input type="digit" v-model="formVal" placeholder="￥0" />
+            <div class="card record">
+                <h1 class="tit">提现记录</h1>
+                <ul class="table">
+                    <li class="row">
+                        <div class="item">申请时间</div>
+                        <div class="item">备注</div>
+                        <div class="item">金额</div>
+                        <div class="item">状态</div>
+                    </li>
+                    <li
+                        class="row"
+                        v-for="item of withdrawalList"
+                        :key="item.id"
+                    >
+                        <div class="item">
+                            {{ item.applyTime | dateFormat("yyyy/MM/dd") }}
+                        </div>
+                        <div class="item">
+                            {{ item.remark }}
+                        </div>
+                        <div class="item">
+                            {{ item.amount / 100 }}
+                        </div>
+                        <div class="item">
+                            {{ item.status | status }}
+                        </div>
+                    </li>
+                </ul>
             </div>
-            <p class="tip tip-color">提现金额超出总金额，请重新填写</p>
-            <button type="button" class="btn" @click="withdrawal">
-                申请提现
-            </button>
-        </div>
-        <div class="card record">
-            <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>
-                </li>
-                <li class="row" v-for="item of withdrawalList" :key="item.id">
-                    <div class="item">
-                        {{ item.applyTime | dateFormat("yyyy/MM/dd") }}
-                    </div>
-                    <div class="item">
-                        <!-- {{item.status}} -->
-                    </div>
-                    <div class="item">
-                        {{ item.amount / 100 }}
-                    </div>
-                    <div class="item">
-                        {{ item.status }}
-                    </div>
-                </li>
-            </ul>
-        </div>
+        </block>
 
         <uni-popup ref="popup" type="dialog">
             <uni-popup-dialog
@@ -95,14 +109,29 @@ export default {
             formVal: "",
             withdrawalPageIndex: 1,
             withdrawalList: [],
-            withdrawalTotal: 0,
+            withdrawalTotal: "",
+            account: null,
+            balance: 0,
+            loading: false,
         };
     },
-    filters: {},
-    onLoad() {
-        this.getWithdrawalList();
+    filters: {
+        status(v) {
+            let obj = {
+                0: "审核中",
+                1: "待打款",
+                2: "已完成",
+                3: "未通过",
+                4: "打款失败",
+            };
+            let str = obj[v];
+            return str || "";
+        },
+    },
+    onLoad() {},
+    async onShow() {
+        this.getWithdrawalInfo();
     },
-    async onShow() {},
 
     // onPullDownRefresh() {
     //     this.getList();
@@ -110,21 +139,33 @@ 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;
-                });
+        getWithdrawalInfo() {
+            uni.showLoading({
+                title: "加载中...",
+            });
+            this.loading = true;
+            this.api.get("/User/GetWithdrawalInfo").then((res) => {
+                uni.hideLoading();
+                this.loading = false;
+                if (!res.data.account) {
+                    // this.router.push('/pages/wallet/bind');
+                    // return;
+                }
+                this.account = res.data.account;
+                this.balance = res.data.balance;
+                this.withdrawalList = res.data.withdrawalList.data;
+            });
         },
 
         withdrawal() {
             if (!this.formVal) {
                 return this.fn.showToast("请输入提现金额");
             }
+            if (this.formVal * 100 > this.balance) {
+                return this.fn.showToast(
+                    "提现金额不能大于" + this.balance / 100 + "元"
+                );
+            }
             this.$refs.popup.open({
                 type: "dialog",
             });
@@ -137,23 +178,27 @@ export default {
             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,
-                    });
-                }
-            });
+            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) {
+                        // 刷新页面数据
+                        this.formVal = "";
+                        this.getWithdrawalInfo();
+                        this.fn.showToast("提现成功");
+                    } else {
+                        this.fn.showModal({
+                            content: "错误信息：" + res.message,
+                            showCancel: false,
+                        });
+                    }
+                });
             done();
         },
     },
@@ -256,7 +301,31 @@ export default {
             font-size: px(42);
             // text-align: center;
             padding: px(20);
+            @include omits(4);
+            &:nth-child(1){
+                width: 30%;
+            }
+            &:nth-child(2){
+                width: 30%;
+            }
+            &:nth-child(3){
+                width: 20%;
+            }
+            &:nth-child(4){
+                width: 20%;
+            }
         }
     }
 }
+.go-bind {
+    margin: px(40);
+    border: 1px solid #f1f1f1;
+    border-radius: px(10);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: #fff;
+    min-height: px(300);
+    font-size: px(46);
+}
 </style>