wangyu / naturalPersonTax · 提交

提交 c06365200633b0e473741c4332e4d0b407885089

作者 wangyu
1 个父辈 a0651a2a
构建： 未知

完善页面逻辑及UI

内嵌 并排对比
正在显示 12 个修改的文件 包含 51 行增加 和 22 行删除
1 <!--pages/main/rewardpoint/bindcard/bindcard.wxml--> 1 <!--pages/main/rewardpoint/bindcard/bindcard.wxml-->
2 <view> 2 <view>
3 3
4 -<view>  
5 - <view style="margin:30rpx;color:#333;font-size:44rpx;display:flex;font-family: PingFangSC-Medium, PingFang SC;">添加银行卡</view> 4 +<view style="background: #fff;">
  5 + <view style="padding:30rpx;color:#333;font-size:44rpx;display:flex;font-family: PingFangSC-Medium, PingFang SC;">添加银行卡</view>
6 <view class="light_yellow_bg"> 6 <view class="light_yellow_bg">
7 <image style="width:28rpx;height:28rpx;margin-left:20rpx" src="/images/warn_yellow.png"></image> 7 <image style="width:28rpx;height:28rpx;margin-left:20rpx" src="/images/warn_yellow.png"></image>
8 <text style="margin-left:12rpx;color:#faad14;font-size:28rpx;">请绑定持卡人本人的银行卡</text> 8 <text style="margin-left:12rpx;color:#faad14;font-size:28rpx;">请绑定持卡人本人的银行卡</text>
1 /* pages/main/rewardpoint/bindcard/bindcard.wxss */ 1 /* pages/main/rewardpoint/bindcard/bindcard.wxss */
  2 +page{
  3 + background:#f5f5f5
  4 +}
  5 +
2 .view_bottom { 6 .view_bottom {
3 background: #fff; 7 background: #fff;
4 width: 100%; 8 width: 100%;
@@ -7,7 +7,7 @@ Page({ @@ -7,7 +7,7 @@ Page({
7 data: { 7 data: {
8 taxpercent:25,//暂时固定为25% 8 taxpercent:25,//暂时固定为25%
9 showModal:false, 9 showModal:false,
10 - hasBind:true, 10 + hasBind:false,
11 hasPayPwd:false, 11 hasPayPwd:false,
12 rightNum:false, 12 rightNum:false,
13 cashNum:6989.88, 13 cashNum:6989.88,
1 -<view style="background:#f5f5f5;width:100%;height:1600rpx">  
2 - 1 +<view >
3 <view style="height:26rpx"></view> 2 <view style="height:26rpx"></view>
4 <view class='card_rectangle_bg_row' style='padding:26rpx;flex-direction:column'> 3 <view class='card_rectangle_bg_row' style='padding:26rpx;flex-direction:column'>
5 <view style="padding-top:10rpx"> 4 <view style="padding-top:10rpx">
6 <text style="font-size:28rpx;color:#333">到账银行卡：</text> 5 <text style="font-size:28rpx;color:#333">到账银行卡：</text>
7 <view wx:if="{{hasBind}}" style="display:flex;float:right"> 6 <view wx:if="{{hasBind}}" style="display:flex;float:right">
8 - <image src="/images/reward_point.png" style="width:64rpx;height:64rpx;margin:0 14rpx"></image> 7 + <image src="/images/bank_default.png" style="width:64rpx;height:64rpx;margin:0 14rpx"></image>
9 <view style="font-size:30rpx;color:#333;line-height:64rpx;margin:0 14rpx">招商银行(9214)</view> 8 <view style="font-size:30rpx;color:#333;line-height:64rpx;margin:0 14rpx">招商银行(9214)</view>
10 <image hidden="{{true}}" src="/images/arrow_right.png" style="width:64rpx;height:64rpx"></image> 9 <image hidden="{{true}}" src="/images/arrow_right.png" style="width:64rpx;height:64rpx"></image>
11 </view> 10 </view>
@@ -36,6 +35,8 @@ @@ -36,6 +35,8 @@
36 <button wx:else class="btn_gray_radius" style="margin:20rpx"> 提现</button> 35 <button wx:else class="btn_gray_radius" style="margin:20rpx"> 提现</button>
37 </view> 36 </view>
38 37
  38 +</view>
  39 +
39 <!-- 密码支付弹窗 --> 40 <!-- 密码支付弹窗 -->
40 <view wx:if="{{showModal}}" class="mask"></view> 41 <view wx:if="{{showModal}}" class="mask"></view>
41 <view wx:if="{{showModal}}" class="modal_lg" style="padding:30rpx"> 42 <view wx:if="{{showModal}}" class="modal_lg" style="padding:30rpx">
@@ -76,5 +77,4 @@ @@ -76,5 +77,4 @@
76 <!-- 隐藏input框 --> 77 <!-- 隐藏input框 -->
77 <input focus="{{isFocus}}" maxlength="6" type="number" style="position:fixed;color:#fff;font-size:8rpx;height: 96rpx;padding-left: 2rpx;" bindinput="handleSetData" bindfocus="handleUseFocus" bindblur="handleUseFocus" /> 78 <input focus="{{isFocus}}" maxlength="6" type="number" style="position:fixed;color:#fff;font-size:8rpx;height: 96rpx;padding-left: 2rpx;" bindinput="handleSetData" bindfocus="handleUseFocus" bindblur="handleUseFocus" />
78 </view> 79 </view>
79 - </view>  
80 -</view>  
  80 + </view>
1 /* pages/main/rewardpoint/cashout/cashout.wxss */ 1 /* pages/main/rewardpoint/cashout/cashout.wxss */
  2 +
  3 +page{
  4 + background: #f5f5f5;
  5 +}
  6 +
2 .view_bottom { 7 .view_bottom {
3 background: #fff; 8 background: #fff;
4 width: 100%; 9 width: 100%;
1 -/* pages/main/rewardpoint/exchange/exchange.wxss */  
  1 +/* pages/main/rewardpoint/exchange/exchange.wxss */
1 -<view style="background:#f5f5f5;width:100%;height:100%;margin-bottom:140rpx"> 1 +<view style="margin-bottom:140rpx">
2 2
3 <view style="position:relative;height: 240rpx;"> 3 <view style="position:relative;height: 240rpx;">
4 <image src="/images/reward_point_bg.png" style="width:100%;height:240rpx"></image> 4 <image src="/images/reward_point_bg.png" style="width:100%;height:240rpx"></image>
1 /* pages/main/rewardpoint/home.wxss */ 1 /* pages/main/rewardpoint/home.wxss */
2 - 2 +page{
  3 + background:#f5f5f5
  4 +}
3 5
4 .text_gray_32 { 6 .text_gray_32 {
5 font-size: 32rpx; 7 font-size: 32rpx;
1 // pages/main/rewardpoint/setpaypwd/setpaypwd.js 1 // pages/main/rewardpoint/setpaypwd/setpaypwd.js
  2 +var app = getApp();
  3 +var baseUrl = app.globalData.baseUrl;
2 Page({ 4 Page({
3 5
4 /** 6 /**
@@ -33,6 +35,8 @@ Page({ @@ -33,6 +35,8 @@ Page({
33 35
34 // 获取验证码 36 // 获取验证码
35 getVerifyCode:function(){ 37 getVerifyCode:function(){
  38 + if (this.data.buttonDisable) return;
  39 + var that = this;
36 var timelength = 60 40 var timelength = 60
37 41
38 var intervalId = setInterval(function () { 42 var intervalId = setInterval(function () {
@@ -76,6 +80,16 @@ Page({ @@ -76,6 +80,16 @@ Page({
76 }) 80 })
77 }, 81 },
78 82
  83 + cancel:function(){
  84 + wx.navigateBack({
  85 + delta: 1,
  86 + })
  87 + },
  88 +
  89 + confirm:function(){
  90 +
  91 + },
  92 +
79 /** 93 /**
80 * Lifecycle function--Called when page hide 94 * Lifecycle function--Called when page hide
81 */ 95 */
1 -<view> 1 +<view >
2 2
3 - <view style="margin:0 30rpx;background:#FFF"> 3 + <view style="padding:0 30rpx;background:#FFF">
4 <input class="input_wrap" placeholder-class="placeholder_input_wrap" placeholder="请设置提现密码"></input> 4 <input class="input_wrap" placeholder-class="placeholder_input_wrap" placeholder="请设置提现密码"></input>
5 <view style='background:#eee;height:1rpx;'></view> 5 <view style='background:#eee;height:1rpx;'></view>
6 6
7 <input class="input_wrap" placeholder-class="placeholder_input_wrap" placeholder="请再次输入提现密码"></input> 7 <input class="input_wrap" placeholder-class="placeholder_input_wrap" placeholder="请再次输入提现密码"></input>
8 - <view style='background:#eee;height:1rpx;'></view>  
9 - <view style="display:flex;align-items: center;">  
10 - <input class="input_wrap" style="width:492rpx" placeholder-class="placeholder_input_wrap" maxlength="8" type="number" placeholder="请输入验证码"></input>  
11 - <button class="btn_blue_radius" style="height:64rpx;float:right;font-size:28rpx;text-align:center" bindtap='getVerifyCode' disabled="{{buttonDisable}}">  
12 - {{verifyCodeTime}}</button>  
13 - <view style='background:#eee;height:1rpx;'></view>  
14 - </view> 8 + <view style='background:#eee;height:2rpx;'></view>
  9 +
  10 + <view style="display:flex;align-items: center;">
  11 + <input class="input_wrap" style="width:492rpx" placeholder-class="placeholder_input_wrap" maxlength="8" type="number" placeholder="请输入验证码"></input>
  12 + <button class="btn_blue_radius" style="height:64rpx;float:right;font-size:28rpx;text-align:center" bindtap='getVerifyCode' disabled="{{buttonDisable}}">
  13 + {{verifyCodeTime}}</button>
  14 + <view style='background:#eee;height:2rpx;'></view>
  15 + </view>
  16 +
15 </view> 17 </view>
16 <view class="view_bottom"> 18 <view class="view_bottom">
17 <button class="btn_blue_radius" style="margin:20rpx" bindtap='confirm'> 确定</button> 19 <button class="btn_blue_radius" style="margin:20rpx" bindtap='confirm'> 确定</button>
1 /* pages/main/rewardpoint/setpaypwd/setpaypwd.wxss */ 1 /* pages/main/rewardpoint/setpaypwd/setpaypwd.wxss */
  2 +page{
  3 + background:#f5f5f5
  4 +}
  5 +
2 .placeholder_input_wrap{ 6 .placeholder_input_wrap{
3 color:#ccc; 7 color:#ccc;
4 font-size:32rpx; 8 font-size:32rpx;
@@ -32,6 +36,4 @@ border: 1px solid #EEEEEE; @@ -32,6 +36,4 @@ border: 1px solid #EEEEEE;
32 width: 100%; 36 width: 100%;
33 position: fixed; 37 position: fixed;
34 bottom: 0; 38 bottom: 0;
35 - display: flex;  
36 - flex-direction: row;  
37 } 39 }
请 注册 或 登录 后发表评论