修改bug

releaselog.md

@@ -1,5 +1,8 @@
 
 
+# 0.5.3 (21.03.22 18:00) 
+### 添加平台  群设置修改bug
+
 # 0.5.2 (21.03.20 18:00) 
 ### 添加平台  群设置
 

src/common/js/plugin.js

@@ -299,13 +299,17 @@ export default {
                                     curShop: {},
                                 });
 
-                                this.checkcode(
-                                    {
-                                        // code: "hht2120201",
-                                        platform: res.data.fromPlatform,
-                                    },
-                                    res
-                                );
+                                // this.checkcode(
+                                //     {
+                                //         // code: "hht2120201",
+                                //         platform: res.data.fromPlatform,
+                                //     },
+                                //     res
+                                // );
+                                router.push({
+                                    isTabBar: true,
+                                    path: "/pages/index/index",
+                                });
                             }
                         } else {
                             router.push({

src/common/store/common.js

@@ -19,7 +19,7 @@ const module = {
         cashierRefundData:false, //manage/cashier/Refund 收银退货临时保存
         groupData:null, //assistant/setting/xxx 临时保存
         platformData:null,//assistant/setting2/xxx 临时保存
-        withdrawalData:null,//wallet/detail/ 临时保存
+        billData:null,//wallet/detail/ 临时保存
         welcomeData:null, // assistant/welcome-item 临时保存
         welcomeItemData:null,// assistant/welcome-item 临时保存
         tabList:[{

src/pages/assistant/add-platform.vue

@@ -149,7 +149,7 @@ export default {
             this.api
                 .post("/Group/AddJDPlatform", sendData, { pass: true })
                 .then((res) => {
-                    if (!res.success) {
+                    if (res.success) {
                         this.fn.showModal({
                             title: "添加平台成功",
                             content: `你已成功添加${1},如果需要在群内关联平台，请在群详情下关联平台，获取点击“一键关联群”，现在一键关联`,

src/pages/index/login.vue

@@ -22,9 +22,9 @@
             <div class="login-other">
                 <div class="register-box">
                     <a class="go-register" @click="jumpRegister">去注册</a>
-                    <a class="go-register register2" @click="jumpRegister2"
-                        >无团找号注册</a
-                    >
+                    <!-- <a class="go-register register2" @click="jumpRegister2"
+                        >无团长号注册</a
+                    > -->
                 </div>
                 <a
                     class="find-password"

src/pages/index/register.vue

@@ -65,6 +65,7 @@
                 />
             </div>
             <button class="btn" @click="saveTeamNum">下一步</button>
+            <button class="btn skip-btn" @click="skip">跳过</button>
             <div class="team-num-des">
                 <h1 class="tit">在哪里看京东区区购团长号？</h1>
                 <p class="text">
@@ -438,6 +439,13 @@ export default {
                 });
         },
 
+        skip() {
+            this.router.push({
+                path: "/pages/assistant/index",
+                isTabBar: true,
+            });
+        },
+
         viewImg(url) {
             uni.previewImage({
                 urls: [url],
@@ -678,4 +686,9 @@ export default {
         }
     }
 }
+.skip-btn{
+    margin-top: px(40);
+    background-color: #f1f1f1;
+    color: #333;
+}
 </style>

src/pages/manage/index.vue

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

src/pages/manage/user/index.vue

@@ -29,7 +29,7 @@
                     src="/static/common/arrows_left.png"
                 ></my-image>
             </li>
-            <button open-type="share" class="item" id="2">
+            <!-- <button open-type="share" class="item" id="2">
                 <div class="name">邀请团长</div>
                 <my-image
                     class="arrow"
@@ -42,7 +42,7 @@
                     class="arrow"
                     src="/static/common/arrows_left.png"
                 ></my-image>
-            </button>
+            </button> -->
         </ul>
         <button class="btn" @click="layout">退出登录</button>
     </div>

src/pages/wallet/bill.vue

@@ -3,7 +3,7 @@
         <ul class="list">
             <li class="item" v-for="item of list" :key="item.id" @click="goDetail(item)">
                 <div class="name">
-                    {{ item.applyTime | dateFormat("yyy/MM/dd") }}
+                    {{ item.createdTime | dateFormat("yyy/MM/dd") }}
                     <span class="status">{{ item.status | status }}</span>
                 </div>
                 <div class="right">
@@ -46,11 +46,8 @@ export default {
     filters: {
         status(v) {
             let obj = {
-                0: "审核中",
-                1: "待打款",
-                2: "已完成",
-                3: "未通过",
-                4: "打款失败",
+                0: "未结算",
+                1: "已结算",
             };
             let str = obj[v];
             return str || "";
@@ -62,30 +59,33 @@ export default {
     },
     async onShow() {},
     onPullDownRefresh() {
-        this.getList();
+        this.getList(true);
     },
     onReachBottom() {
         this.getMoreList();
     },
     // 函数
     methods: {
-        getList() {
+        getList(isPull) {
             this.pageIndex = 1;
             uni.showLoading({
                 title: "加载中...",
             });
             this.api
-                .get("/User/GetWithdrawalList", {
+                .get("/User/GetBillList", {
                     pageIndex: this.pageIndex++,
                 })
                 .then((res) => {
+                    if(isPull){
+                        uni.stopPullDownRefresh();
+                    }
                     uni.hideLoading();
                     this.list = res.data.data;
                 });
         },
         getMoreList() {
             this.api
-                .get("/User/GetWithdrawalList", {
+                .get("/User/GetBillList", {
                     pageIndex: this.pageIndex,
                 })
                 .then((res) => {
@@ -99,7 +99,7 @@ export default {
         goDetail(val){
             
             this.$store.commit("common/update", {
-                withdrawalData: val,
+                billData: val,
             });
             this.router.push('/pages/wallet/detail');
         }

src/pages/wallet/detail.vue

@@ -4,28 +4,28 @@
             <!-- <uni-steps :options="data" direction="column" :active="2"></uni-steps> -->
             <ul class="list">
                 <li>
-                    <span class="key">提现金额：</span>
-                    <span class="value">{{withdrawalData.amount}}</span>
+                    <span class="key">账单类型：</span>
+                    <span class="value">{{billData.type | type}}</span>
                 </li>
                 <li>
-                    <span class="key">状态：</span>
-                    <span class="value">{{withdrawalData.status | status}}</span>
+                    <span class="key">账单金额：</span>
+                    <span class="value">{{billData.amount / 100}}</span>
                 </li>
                 <li>
-                    <span class="key">申请时间：</span>
-                    <span class="value">{{withdrawalData.applyTime || ''}}</span>
+                    <span class="key">创建时间：</span>
+                    <span class="value">{{billData.createdTime || ''}}</span>
                 </li>
                 <li>
                     <span class="key">备注：</span>
-                    <span class="value remark">{{withdrawalData.remark || ''}}</span>
+                    <span class="value remark">{{billData.remark || ''}}</span>
                 </li>
                 <li>
-                    <span class="key">处理时间：</span>
-                    <span class="value">{{withdrawalData.auditTime || ''}}</span>
+                    <span class="key">状态：</span>
+                    <span class="value">{{billData.status || ''}}</span>
                 </li>
                 <li>
-                    <span class="key">打款时间：</span>
-                    <span class="value">{{withdrawalData.payTime || ''}}</span>
+                    <span class="key">结算时间：</span>
+                    <span class="value">{{billData.settlementTime || ''}}</span>
                 </li>
             </ul>
         </div>
@@ -51,21 +51,33 @@ export default {
             let str = obj[v];
             return str || "";
         },
+        type(v) {
+            let obj = {
+                1: "充值",
+                2: "消费",
+                3: "退款",
+                4: "收益",
+                5: "收益返还",
+                6: "提现",
+            };
+            let str = obj[v];
+            return str || "";
+        },
     },
     // 数据
     data() {
         return {
-            withdrawalData: {},
-            data: [
-                { title: "发起提现", desc: "2018-11-11" },
-                { title: "审核通过", desc: "2018-11-12" },
-                { title: "打款完成", desc: "2018-11-13" },
-                { title: "提现完成", desc: "2018-11-14" },
-            ],
+            billData: {},
+            // data: [
+            //     { title: "发起提现", desc: "2018-11-11" },
+            //     { title: "审核通过", desc: "2018-11-12" },
+            //     { title: "打款完成", desc: "2018-11-13" },
+            //     { title: "提现完成", desc: "2018-11-14" },
+            // ],
         };
     },
     onLoad() {
-        this.withdrawalData = this.$store.state.common.withdrawalData || {};
+        this.billData = this.$store.state.common.billData || {};
     },
     async onShow() {},
 

src/pages/wallet/index.vue

@@ -49,7 +49,7 @@
                 />
             </div>
             <p class="tip tip-color" v-if="showErr">
-                提现金额超出总金额，请重新填写
+                {{errStr}}
             </p>
             <button
                 v-if="!loading && account"
@@ -61,11 +61,11 @@
             </button>
         </div>
         <div class="card record">
-            <h1 class="tit">提现记录</h1>
+            <h1 class="tit">提现记录 共{{total}}条</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>
                 </li>
@@ -74,7 +74,7 @@
                         {{ item.applyTime | dateFormat("yyyy/MM/dd") }}
                     </div>
                     <div class="item">
-                        {{ item.remark }}
+                        {{ item.method | method }}
                     </div>
                     <div class="item">
                         {{ item.amount / 100 }}
@@ -116,8 +116,10 @@ export default {
             withdrawalTotal: "",
             account: null,
             balance: 0,
+            total:0,
             loading: false,
             showErr: false,
+            errStr:''
         };
     },
     filters: {
@@ -132,6 +134,13 @@ export default {
             let str = obj[v];
             return str || "";
         },
+        method(v){
+            let obj = {
+                1:'微信',
+                2:'银行卡'
+            }
+            return obj[v] || '';
+        }
     },
     onLoad() {},
     async onShow() {
@@ -154,6 +163,7 @@ export default {
                 this.loading = false;
                 this.account = res.data.account;
                 this.balance = res.data.balance;
+                this.total = res.data.total;
                 this.withdrawalList = res.data.withdrawalList.data;
             });
         },
@@ -167,21 +177,20 @@ export default {
                     "提现金额不能大于" + this.balance / 100 + "元"
                 );
             }
-            this.$refs.popup.open({
-                type: "dialog",
-            });
-        },
-        popupConfirm(done, value) {
-            if (!value) {
-                return this.fn.showToast("请输入提现备注");
+            if (this.formVal * 100 < 200) {
+                return this.fn.showToast(
+                    "提现金额不能小于2元"
+                );
             }
-            console.log(this.formVal, value);
+            // this.$refs.popup.open({
+            //     type: "dialog",
+            // });
             uni.showLoading({
                 title: "提交中...",
             });
             let data = {
                 amount: this.formVal * 100,
-                remark: value,
+                // remark: value,
             };
             this.api
                 .post("/User/Withdrawal", data, { pass: true })
@@ -200,14 +209,26 @@ export default {
                         });
                     }
                 });
+        },
+        popupConfirm(done, value) {
+            if (!value) {
+                return this.fn.showToast("请输入提现备注");
+            }
+            console.log(this.formVal, value);
             done();
         },
 
         valChange() {
             if (this.formVal) {
                 let val = Number(this.formVal);
-                if (val > this.balance/100) {
+                if (val > this.balance / 100) {
+                    this.showErr = true;
+                    this.errStr = '提现金额超出总金额，请重新填写'
+                    return;
+                }
+                if(val<2){
                     this.showErr = true;
+                    this.errStr = '提现金额不能小于2元，请重新填写'
                     return;
                 }
             }