登陆等页面部分优化

wangyu
app.js
app.json
pages/login/login.js
pages/login/login.wxml
pages/login/login.wxss
pages/main/home/home.js
pages/main/home/home.wxml
--- a/app.js
查看文件 @46d5cfe
+++ b/app.js
查看文件 @46d5cfe
@@ -61,8 +61,7 @@ App({
         } else if (user && user.type == "1") {//注册用户
           if (relaunch) {
             wx.reLaunch({ //重新加载
-              // url: '../home/home'
-              url: '../../getPhone/getPhone'
+              url: '../home/home'
             })
           }
         }
--- a/app.json
查看文件 @46d5cfe
+++ b/app.json
查看文件 @46d5cfe
 {
   "pages": [
-    "pages/main/home/home",
+    "pages/main/home/home",    
+    "pages/getPhone/getPhone",
     "pages/main/editinfo/editinfo",
     "pages/main/idinfo/idinfo",
-    "pages/login/login",
-    "pages/getPhone/getPhone"
-    
+    "pages/login/login"
   ],
   "window": {
     "backgroundTextStyle": "light",
--- a/pages/login/login.js
查看文件 @46d5cfe
+++ b/pages/login/login.js
查看文件 @46d5cfe
@@ -72,7 +72,7 @@ Page({
       data: {
         "mobile": mobile,
         "type": "bindmobile",
-        "scope": "global_access:expert"
+        "scope": "global_access:end_user"
       },
       header: {
         'content-type': 'application/json', // 默认值
@@ -98,7 +98,7 @@ Page({
         "wx_open_id": that.data.wx_open_id,  //可选，如果传了，绑定到对应的微信号
         "tenant_id": that.data.tenant_id,
         "source": "wx_app",
-        "scope": "expert"
+        "scope": "end_user"
       },
       method: "POST",
       header: {
@@ -117,7 +117,7 @@ Page({
           app.globalData.wx_open_id = user.wx_open_id;
           wx.reLaunch({
-            url: '../tabbar/home/home'
+            url: '../main/home/home'
           })
         } else {
           wx.showToast({
@@ -130,7 +130,7 @@ Page({
       },
        complete: function (res) {
         wx.reLaunch({
-          url: '../tabbar/home/home'
+          url: '../main/home/home'
         })
       }
     })
--- a/pages/login/login.wxml
查看文件 @46d5cfe
+++ b/pages/login/login.wxml
查看文件 @46d5cfe
@@ -13,7 +13,7 @@
       <view class="divide_line"></view>
       <view class='input-wrap' style='height:100rpx;right:0'>
-        <input class="text-area float_left" bindinput="mobileInputEvent" name="mobile" type="number" placeholder='短信验证码' placeholder-class='text-area' style='width:320rpx'></input>
+        <input class="text-area float_left" bindinput="verifyInputEvent" name="verify_code"  placeholder='短信验证码' placeholder-class='text-area' style='width:320rpx'></input>
         <button class="code-btn float_right" bindtap="verifyCodeEvent" disabled="{{buttonDisable}}">{{verifyCodeTime}}</button>
       </view>
       <view class="divide_line"></view>
--- a/pages/login/login.wxss
查看文件 @46d5cfe
+++ b/pages/login/login.wxss
查看文件 @46d5cfe
@@ -22,22 +22,6 @@
   letter-spacing: 0;
 }
-/* .btn_bg {
-  margin-top: 16rpx;
-  background: #7fbefc;
-  box-shadow: 0 4px 14px 0 rgba(127, 190, 252, 0.30);
-  border-radius: 100px;
-}
-
-.btn {
-  opacity: 0.8;
-  font-family: PingFang-SC-Medium;
-  font-size: 14px;
-  color: #fff;
-  letter-spacing: 0;
-  text-align: center;
-} */
-
 .code-btn {
   relative:absolute;
   float: right;
@@ -45,7 +29,7 @@
   color: #fff;
   font-size: 24rpx;
   height: 64rpx;
-  margin-top: 16rpx;
+  margin-top: 20rpx;
   background: #7fbefc;
   box-shadow: 0 4px 14px 0 rgba(127, 190, 252, 0.30);
   border-radius: 100px;
--- a/pages/main/home/home.js
查看文件 @46d5cfe
+++ b/pages/main/home/home.js
查看文件 @46d5cfe
 // pages/home/home.js
+var app = getApp();
+var baseUrl = app.globalData.baseUrl;
 Page({
   /**
    * 页面的初始数据
    */
   data: {
-    list:["",""]
+    taxlist:["",""]
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-  
+    
   },
   /**
@@ -26,10 +28,33 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-  
+    this.getTaxList()
+  },
+
+  getTaxList:function(){
+    var that = this;
+    var Authorization = app.globalData.Authorization;
+    wx.request({
+      url: baseUrl + 'payroll/v1/personal-taxes',
+      method: "GET",
+      header: {
+        'content-type': 'application/json', // 默认值
+        "Authorization": Authorization
+      },
+      success: function (res) {
+        console.log(res.data)
+        that.setData({
+          taxlist:res.data.items
+        })
+      },
+      fail(res) {
+        console.log(res.data)
+      }
+    })
   },
   goadd:function(){
+    console.log("goadd")
     wx.navigateTo({
       url: '../editinfo/editinfo',
     })
--- a/pages/main/home/home.wxml
查看文件 @46d5cfe
+++ b/pages/main/home/home.wxml
查看文件 @46d5cfe
 <view class='page'>
-  <view wx:if="{{list.length>0}}">
-    <block wx:for="{{list}}" wx:key="">
-      <view class='rectangle_solid_bg'>
+  <view wx:if="{{taxlist.length>0}}">
+    <block wx:for="{{taxlist}}" wx:key="">
+      <view class='rectangle_solid_bg' bindtap='goadd'>
         <view style='padding:12rpx 22rpx'>
-          <text class='text_black_28'>小爱同学</text>
+          <text class='text_black_28'>{{item.name}}</text>
           <text class='rectangle_orange_bg text_red_20' hidden="true">子女</text>
           <image class='arrow_wrap' src='/images/arrow_right.png'> </image>
           <text class='text_light_blue_28' style='float:right'>去完善</text>
@@ -12,10 +12,10 @@
         </view>
         <view style='padding:12rpx 22rpx'>
           <image class='phone_image_wrap' src='/images/phone.png'></image>
-          <text class='text_999_22'>130****8888</text>
+          <text class='text_999_22'>{{item.mobile}}</text>
           <text style='margin:0rpx 20rpx;color:#999;height:16rpx'>|</text>
           <image class='id_image_wrap' src='/images/id.png'></image>
-          <text class='text_999_22'>152000********0000</text>
+          <text class='text_999_22'>{{item.id_card_no}}</text>
         </view>
       </view>
     </block>