绑定文版通账号及处理设置支付密码展示位置

apis/interfaces/account.js

@@ -95,6 +95,29 @@ const paymentpre = () => {
 	})
 }
 
+// 我的版通账户信息
+const wbtInfo = () => {
+    return request({
+        url: 'wallet/wbt/info'
+    })
+}
+
+// 是否绑定了文版通账户
+const wbtCheck = () => {
+    return request({
+        url: 'wallet/wbt/check'
+    })
+}
+
+// 绑定账户版通账户
+const wbtBind = (data) => {
+    return request({
+        url: 'wallet/wbt/bind',
+        data:data,
+        method:'POST',
+    })
+}
+
 export {
 	dt,
 	recharge,
@@ -106,6 +129,9 @@ export {
 	getSms,
 	submitTransfer,
 	integral,
-	paymentpre
+	paymentpre,
+    wbtInfo,
+    wbtCheck,
+    wbtBind
 }
 

pages/account/dt.vue

@@ -13,17 +13,17 @@
                     DT积分冻结
                     <image src="/static/rank/help.png" style="width: 30rpx;" mode="widthFix" />
                 </view>
-                <view class="num">{{frozenScore}}</view>
+                <view class="num">{{frozenScore || '0.0000'}}</view>
             </view>
-            <button class="transfer" size="mini" @click="onTransfer('AccountRecharge')">充值</button>
+            <button class="transfer" size="mini" @click="dtShow = true">充值</button>
             <button class="transfer" size="mini" @click="onTransfer('AccountTransfer')">转账</button>
         </view>
         <block v-if="logs.length > 0">
             <view class="logs-title">账户记录</view>
             <view class="logs-item" v-for="(item,index) in logs" :key="index" @click="frozenInfo(item.description)">
-                <view class="logs-item-title">
+                <view class="logs-item-title">
-                    {{item.remark}}
+                    {{item.remark}}
-                    <image v-if ="item.description!== ''" src="/static/rank/help3.png" mode="widthFix" />
+                    <image v-if="item.description!== ''" src="/static/rank/help3.png" mode="widthFix" />
                 </view>
                 <view class="logs-item-time">{{item.created_at}}</view>
                 <view class="logs-item-price" :class="item.amount > 0 ? 'add': 'remove'">
@@ -38,12 +38,25 @@
                 </u-empty>
             </view>
         </block>
+
+        <u-popup :show="dtShow" mode="bottom" @close="dtShow = false " :round="10">
+            <view class="dt-type">
+                <view class="dt-item" @click="dtSelect('wbt')">
+                    <image src="/static/icon/pay_wbt.png" mode="widthFix" />
+                    文版通充值
+                </view>
+                <view class="dt-item"  @click="dtSelect('wchat')">
+                    <image src="/static/icon/pay_wechat.png" mode="widthFix" />
+                     微信充值
+                </view>
+            </view>
+        </u-popup>
     </view>
 </template>
 
 <script>
     import {
-        dt
+        dt,wbtCheck
     } from '@/apis/interfaces/account.js'
     export default {
         data() {
@@ -52,8 +65,9 @@
                 frozenScore: '0.00',
                 logs: [],
                 page: 1,
-                has_more: true,
+                has_more: true,
-                description:'',
+                description: '',
+                dtShow: false, // 是否显示重置弹窗
             };
         },
         onShow() {
@@ -69,7 +83,35 @@
             this.page = 1;
             this.getDt();
         },
-        methods: {
+        methods: {
+            dtSelect(type){
+                switch(type){
+                    case 'wchat':
+                        this.onTransfer('AccountRecharge');
+                        break;
+                    case 'wbt':
+                    wbtCheck().then(res=>{
+                        if(res){
+                            uni.showToast({
+                                title:' 跳转文版通APP, 努力开发中~',
+                                icon:"none",
+                                mask:true,
+                                duration:3000
+                            })
+                        }else{
+                            this.$Router.push({name:'WbtBind'})
+                        }
+                        this.dtShow = false;
+                    }).catch(err=>{
+                        uni.showToast({
+                            title:err.message,
+                            icon:"none",
+                            mask:true
+                        })
+                    })
+                        break;
+                }
+            },
             getDt() {
                 dt({
                     page: this.page
@@ -79,7 +121,7 @@
                     }
                     this.score = res.score;
                     this.frozenScore = res.frozenScore;
-                    this.logs = this.logs.concat(res.lists.data);
+                    this.logs = this.logs.concat(res.lists.data);
                     this.description = res.description;
                     this.has_more = res.lists.page.has_more;
                     uni.stopPullDownRefresh();
@@ -95,19 +137,19 @@
                 this.$Router.push({
                     name
                 })
-            },
+            },
-            frozenInfo(description){
+            frozenInfo(description) {
-                if(description!== ''){
+                if (description !== '') {
-                    uni.showModal({
+                    uni.showModal({
-                        title:'温馨提示',
+                        title: '温馨提示',
-                        content:description,
+                        content: description,
-                        showCancel:false,
+                        showCancel: false,
-                        confirmColor:"#34ce98",
+                        confirmColor: "#34ce98",
-                        confirmText:' 知道了'
+                        confirmText: ' 知道了'
-                    })
+                    })
-                }
+                }
-            },
+            },
-            
+
         },
         onNavigationBarButtonTap() {
             this.$Router.push({
@@ -188,9 +230,10 @@
                     flex-direction: row;
                     align-items: center;
                     justify-content: flex-start;
-                    box-sizing: border-box;
+                    box-sizing: border-box;
-                    image{
+
-                        padding-left: 4rpx;
+                    image {
+                        padding-left: 4rpx;
                     }
                 }
 
@@ -203,14 +246,14 @@
             }
 
             .transfer[size="mini"] {
-                width: 160rpx;
+                width: 150rpx;
-                height: 70rpx;
+                height: 66rpx;
                 border-radius: 40rpx;
-                line-height: 70rpx;
+                line-height: 66rpx;
                 background: white;
                 font-size: 30rpx;
                 color: $main-color;
-                margin: 0;
+                margin: 4rpx;
                 font-weight: bold;
 
                 &::after {
@@ -240,15 +283,16 @@
             .logs-item-title {
                 font-weight: bold;
                 font-size: 30rpx;
-                line-height: 50rpx;
+                line-height: 50rpx;
-                display: flex;
+                display: flex;
-                flex-direction: row;
+                flex-direction: row;
-                align-items: center;
+                align-items: center;
-                justify-content: flex-start;
+                justify-content: flex-start;
-                box-sizing: border-box;
+                box-sizing: border-box;
-                image{
+
-                    width: 30rpx;
+                image {
-                    padding-left: 4rpx;
+                    width: 30rpx;
+                    padding-left: 4rpx;
                 }
             }
 
@@ -288,4 +332,27 @@
             }
         }
     }
+
+    .dt-type {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        box-sizing: border-box;
+        padding: $padding *2 $padding;
+        .dt-item{
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+            font-size: 28rpx;
+            color:grey;
+            image{
+                width: 80rpx;
+                margin-bottom: $margin;
+            }
+        }
+    }
 </style>

pages/account/resetPassword.vue

@@ -3,7 +3,7 @@
 		<!-- 设置支付密码 -->
 		<view class="password">
 			<view class="prompt">
-				<view class="prompt-code">验证码已发送至{{phone}} 
+				<view class="prompt-code">验证码发送至{{phone}} 
                  <!-- <button size="mini" :disabled="getCodeState" @click="getCode">{{sendCode}}</button> -->
                 </view>
 				<view>请设置6位数字密码。建议不要使用连续的数字。</view>

pages/account/wbtBind.vue

@@ -0,0 +1,200 @@
+<template>
+    <view class="wbtBind">
+        
+        <view class="input">
+            <view class="title">文版通编号</view>
+            <input type="number" maxlength="13" v-model="account" placeholder-class="placeholderClass" placeholder="请输入13位数字的文版通账号" />
+        </view>
+        
+        <view class="input">
+            <view class="title">文版通姓名</view>
+            <input type="text" v-model="name" placeholder-class="placeholderClass" placeholder="请输入您的文版通姓名" />
+        </view>
+        
+        <view class="group">
+            <u-radio-group>
+                <u-radio :checked='true' activeColor="#34ce98" labelColor="#999" labelSize="13" label="我有文版通账号" />
+            </u-radio-group>
+            <view class="created" >创建账号</view>
+        </view>
+
+        <view class="sure" @click="wbtBind"> 确认绑定文版通 </view>
+        
+        <navigator hover-class="none" url="/pages/vip/agreement?id=9">
+            <view class="agree"> 同意
+                <span>《文版通使用协议》</span>
+            </view>
+        </navigator>
+
+        <view class="help">
+            <view class="title"> 温馨提示 </view>
+            <view class="help_1" v-for="item in 4" :key='item'>
+                {{item}}.文版通使用注意事项，文版通使用注意事项，文版通使用注意事项，文版通使用注意事项，文版通使用注意事项，文版通使用注意事项。
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import { wbtBind } from '@/apis/interfaces/account'
+    export default {
+        data() {
+            return {
+                account: '',
+                name: ''
+            };
+        },
+        methods:{
+            wbtBind(){
+                let data = {
+                    account: this.account,
+                    name: this.name
+                }
+                if(data.account === '' && data.account.length !== 13){
+                    uni.showToast({
+                        title:'请核对账号',
+                        icon:"none",
+                        mask:true
+                    })
+                    return ;
+                }
+                if(data.name === ''){
+                    uni.showToast({
+                        title:'请核对姓名',
+                        icon:"none",
+                        mask:true
+                    })
+                    return ;
+                }
+                uni.showModal({
+                    title:'温馨提示',
+                    content:'确认绑定该文版通账号,绑定后无法撤回！',
+                    success:(res)=> {
+                        if(res.confirm){
+                            wbtBind(data).then(res=>{
+                                uni.showToast({
+                                    title:'文版通账号绑定成功',
+                                    icon:"none",
+                                    mask:true,
+                                    duration:1500
+                                })
+                                setTimeout(()=>{
+                                    uni.navigateBack({})
+                                },2000)
+                            }).catch(err=>{
+                                uni.showToast({
+                                    title:err.message,
+                                    icon:"none",
+                                    mask:true
+                                })
+                            })
+                        }
+                    }
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    .wbtBind {
+        min-height: 100vh;
+        background-color: #f9f9f9;
+        width: 100%;
+        box-sizing: border-box;
+        padding-top: 20rpx;
+
+        .input {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: space-between;
+            box-sizing: border-box;
+            padding: $padding + 20 $padding;
+            background-color: #fff;
+            border-bottom: solid 1rpx #f9f9f9;
+
+            input {
+                flex: 1;
+                text-align: left;
+                font-size: 30rpx;
+            }
+
+            .title {
+                font-size: 32rpx;
+                color: #333;
+                width: 200rpx;
+                margin-right: $margin;
+                font-weight: 600;
+            }
+
+            .placeholderClass {
+                color: #cacaca;
+                font-size: 30rpx;
+            }
+        }
+
+        .group {
+            font-size: 28rpx;
+            padding: $padding;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: space-between;
+            box-sizing: border-box;
+            margin-top: 10rpx;
+
+            .created {
+                color: #34CE98;
+            }
+        }
+
+        .sure {
+            background-color: $main-color;
+            color: #FFFFFF;
+            font-size: 34rpx;
+            font-weight: bold;
+            margin: 0 $margin $margin $margin;
+            border-radius: 10rpx;
+            text-align: center;
+            padding: $padding;
+            font-weight: bold;
+        }
+
+        .agree {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: flex-start;
+            box-sizing: border-box;
+            padding-left: $padding;
+            font-size: 28rpx;
+            color: #999;
+
+            span {
+                color: #1482D1;
+                margin-left: 10rpx;
+            }
+        }
+
+        .help {
+            padding: $padding;
+            color: #666;
+            font-size: 30rpx;
+            margin-top: $margin;
+
+            .title {
+                font-size: 34rpx;
+                font-weight: bold;
+                padding-bottom: 20rpx;
+                padding-top: 20rpx;
+                color: #333;
+            }
+
+            .help_1 {
+                padding-top: 10rpx;
+                line-height: 1.5;
+            }
+        }
+    }
+</style>

pages/user/index.vue

@@ -94,6 +94,11 @@
                 <image class="icon" src="@/static/user/userIcon_02.png" mode="widthFix" />
                 导出助记词
                 <uni-icons class="forward" type="forward" color="#999" />
+            </view>
+            <view class="btns-box-item" @click="resetPassword">
+                <image class="icon" src="@/static/user/userIcon_13.png" mode="widthFix" />
+                {{hasPassword ? '修改' : '设置'}}支付密码
+                <uni-icons class="forward" type="forward" color="#999" />
             </view>
             <block v-if="canSeeData">
                 <view class="btns-box-item" @click="onBtn('DataBoard', {})">
@@ -119,11 +124,6 @@
                 供应商入驻
                 <uni-icons class="forward" type="forward" color="#999" />
             </view>
-            <view class="btns-box-item" @click="resetPassword">
-                <image class="icon" src="@/static/user/userIcon_13.png" mode="widthFix" />
-                {{hasPassword ? '修改' : '设置'}}支付密码
-                <uni-icons class="forward" type="forward" color="#999" />
-            </view>
         </view>
         <view class="btns-box">
             <view class="btns-box-item" @click="onBtn('Feedback', {})">
@@ -486,7 +486,6 @@
             right: 0;
             width: 100%;
             height: 100%;
-            z-index: 1;
         }
 
         .user-flex {