m

app.js

@@ -24,7 +24,7 @@ App({
     userInfo: null,
     HOST: 'https://chaoshi.henhaojie.com'
   },
-  login: function () {
+  login: function (func) {
     let obj = {}, app = this, token = '';
     wx.login({
       success: function(res) {
@@ -44,9 +44,47 @@ App({
                   if (resLogin.data.errno == 0) {
                     token = resLogin.data.rst.token;
                     wx.setStorage({key:"token", data: token})
+                    if (func) {
+                      func();
+                    }
                   }
                 }
               })
+            },
+            fail: function () {
+              // 用户拒绝授权后再次确认
+              app.confirmModal('必须授权登录之后才正常使用，是否重新授权', function(){
+                if (wx.openSetting) {
+                    wx.openSetting({
+                        success: (ress) => {
+                            if (ress.authSetting["scope.userInfo"]) {
+                              wx.getUserInfo({
+                                success: function(resInfo) {
+                                  wx.request({
+                                    url: app.globalData.HOST + '/user/wx/login',
+                                    method: "POST",
+                                    data: {
+                                      code: res.code,
+                                      iv: resInfo.iv,
+                                      encryptedData: resInfo.encryptedData
+                                    },
+                                    success: function (resLogin) {
+                                      if (resLogin.data.errno == 0) {
+                                        token = resLogin.data.rst.token;
+                                        wx.setStorage({key:"token", data: token})
+                                        if (func) {
+                                          func();
+                                        }
+                                      }
+                                    }
+                                  })
+                                }
+                              })
+                            }
+                        }
+                    })
+                }
+              });
             }
           })
         } else {

app.json

@@ -12,7 +12,7 @@
     "pages/feedback/feedback",
     "pages/application/application",
     "pages/getPhone/getPhone",
-    "pages/getPhone_to/getPhone_to",
+    "pages/getIt/getIt",
     "pages/register_phon/register_phon"
   ],
   "window": {

app.wxss

@@ -85,6 +85,9 @@
   width: 100%;
   height: 100%;
 }
+.card-list-temp{
+  position: relative;
+}
 .card-list-temp .weui-cell__hd{
   width: 200rpx;
   height: 124rpx;
@@ -109,6 +112,18 @@
   font-size: 14px;
   color: #999;
 }
+.template .contact-btn{
+  /*display: none;*/
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: transparent;
+}
+.template .contact-btn::after{
+  border: 0 none;
+}
 .template .weui-badge.other{
   background: #2893E9;
 }

pages/application/application.js

@@ -10,7 +10,12 @@ Page({
     this.initApplication();
   },
   initApplication () {
-      var that = this, token = wx.getStorageSync('token');
+      var that = this, token = wx.getStorageSync('token'), list = [];
+      if (that.data.page) {
+        list = that.data.dataList
+      }else{
+        list = [];
+      }
       wx.request({
         url: app.globalData.HOST + '/user/wx/myapply',
         method: "POST",
@@ -19,11 +24,10 @@ Page({
           var data = res.data;
             // console.log(data);
           if (data.errno == '0') {
-            /*that.setData({
-              jobArr: data.userlist,
-              moneyArr: data.list,
-              timeArr: data.month
-            })*/
+            list = list.concat(data.rst.list)
+            that.setData({
+              dataList: list
+            })
           }else if(data.errno == '90001'){
             console.log('go');
             // wx.navigateTo({
@@ -39,12 +43,11 @@ Page({
   },
   onPullDownRefresh: function () {
     //下拉
-    var that = this, obj = { amount: 0, is_hot: 1, is_new: 0, search: 0, term: 0, user_title: "不限" };
-    utils.initList(that, obj, 'top', ++that.data.page);
+    this.data.page = 0;
+    this.initApplication();
   },
   onReachBottom: function () {
     //上拉
-    var that = this, obj = { amount: 0, is_hot: 1, is_new: 0, search: 0, term: 0, user_title: "不限" };
-    utils.initList(that, obj, 'bottom', ++that.data.page);
+    this.initApplication();
   }
 })

pages/application/application.wxml

@@ -2,7 +2,7 @@
 <view class="content-wrapper">
   <block wx:for="{{dataList}}" wx:key="void">
      <!-- 使用热门推荐模板，传入当前循环对象item  -->
-    <template is="jiefItem1" data="{{...item}}"/>
+    <template is="jiefItem3" data="{{...item}}"/>
   </block>
 </view>
 <view class="body-view">

pages/card/card.js

@@ -11,7 +11,8 @@ Page({
     duration: 1000,
     cardList: [],
     hasNext: true,
-    page: 0
+    page: 0,
+    hasPhone: true
   },
   onLoad: function () {
     this.initBanner();

pages/details/details.wxml

@@ -14,8 +14,42 @@
     </view>
     <view class='slide'></view>
     <view class="cal-container">
-        <view class="loan-limit"><text class="fl">贷款额度（10000-500000元）</text><text class="fr">元</text><input class="fr" type="number"/></view>
+        <view class="loan-limit"><text class="fl">贷款额度（10000-500000元）</text><input class="fr" type="number"/><text class="fr">元</text></view>
+        <view class="loan-limit">
+          <text class="fl">贷款期限（10000-500000元）</text>
+          <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
+              <button type="default">单列选择器</button>
+          </picker>
+        </view>
+        <view class="cal-result">
+            <view class="result-item">
+              <view class="title">预计还款总额</view>
+              <view class="notice">10006元</view>
+            </view>
+            <view class="result-item">
+              <view class="title">参考月利率</view>
+              <view class="notice">0.01%</view>
+            </view>
+            <view class="result-item">
+              <view class="title">最快放款时间</view>
+              <view class="notice">1小时</view>
+            </view>
+        </view>
     </view>
     <view class="details-info">
+      <view class="intro">
+        <view class="title">申请条件</view>
+        <view class="content">1.年龄18（含）周岁-70（含）周岁2.名下有车且未抵押给其他个人及公司，法院未对该车辆执行过冻结、查封操作3.车辆购入时间大于1个月且小于10年，可贷额度大于1万4.身份证、行驶证、驾驶证、车辆登记证书、车辆保单、车辆备用钥匙等资料齐全</view>
+      </view>
+      <view class="more">查看更多</view>
+    </view>
+    <view class="recommend-wrapper">
+      <view class="recommend-app">
+        <view class="app-item">
+          <image></image>
+          <view class="title">筋斗快贷</view>
+        </view>
+      </view>
     </view>
+    <view class="button-wrapper"><button></button></view>
 </view>

pages/getIt/logs_to.js

@@ -1,66 +0,0 @@
-// pages/logs_to/logs_to.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-  
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-  
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-  
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-  
-  }
-})

pages/getIt/logs_to.json

@@ -1 +0,0 @@
-{}

pages/getIt/logs_to.wxml

@@ -1,5 +0,0 @@
-<view class='pd64'>
-  <button type="btn" class='wx_login_btn'> <image src='../img/wx_login.png'></image>微信快速登录</button>
-  <button type="btn" class='zfb_login_btn'> <image src='../img/zfb_login.png'></image>手机验证码注册 </button>
-</view>
-<view class='details'>同时申请<text>3</text>款以上产品，成功率提升90%</view>

pages/getIt/logs_to.wxss

@@ -1,72 +0,0 @@
-page {
-  /* font-size: 100px; */
-  font-family: "PingFangSC-Regular, 微软雅黑, sans-serif";
-  background: #f5f4f9;
-}
-
-view {
-  /* font-size: 100px; */
-  border-top: 1px solid#f5f4f9;
-  background: #fff;
-}
-
-.pd64 {
-  padding-bottom: 64px;
-}
-
-.wx_login_btn {
-  width: 90%;
-  height: 45px;
-  /* margin: auto; */
-  display: block;
-  border-radius: 0;
-  margin-top: 34px;
-  background-color: #52a939;
-  font-size: 18px;
-  color: #fff;
-  line-height: 45px;
-}
-
-.wx_login_btn image {
-  width: 25px;
-  height: 25px;
-  line-height: 45px;
-  position: relative;
-  top: 5px;
-  margin-right: 8px;
-}
-
-.zfb_login_btn {
-  height: 45px;
-  width: 90%;
-  display: block;
-  border-radius: 0;
-  margin-top: 20px;
-  background-color: #6082f9;
-  font-size: 18px;
-  color: #fff;
-}
-
-.zfb_login_btn image {
-  width: 25px;
-  height: 25px;
-  position: relative;
-  top: 5px;
-  margin-right: 8px;
-}
-
-.details {
-  display: block;
-  height: 84px;
-  width: 100%;
-  font-size: 14px;
-  margin: auto;
-  text-align: center;
-  line-height: 84px;
-  margin-top: 10px;
-  color: #8c8c8c;
-}
-
-.details  text {
-  color: #db3232;
-}

pages/getPhone/getPhone.js

@@ -2,10 +2,12 @@
 var app = getApp();
 Page({
   data: {
-
+    from: ''
   },
   onLoad: function (options) {
-
+    console.log(options.from);
+    var that = this;
+   that.setData({from: options.from});
   },
   getPhoneNumber: function(e) {
     var that = this;
@@ -20,15 +22,29 @@ Page({
     }
   },
   telHost (token, iv, encryptedData) {
+    var that = this;
     wx.request({
       url: app.globalData.HOST + '/user/wx/getUserPhone',
       method: 'POST',
       data: {token: token, iv: iv, encryptedData: encryptedData},
       success: function (res) {
         var data = res.data
-        console.log(data);
-        if (res.data.errno == '0'){
+        // console.log(data);
+        if (data.errno == '0'){
+          var tel = data.rst.phone_number
+          wx.setStorage({key:"tel", data: tel})
+          if (that.data.from === 'mine') {
+            wx.navigateTo({
+              url: '/pages/application/application?tel=' + tel
+            })
+          }else{
+            wx.navigateTo({
+              url: '/pages/getIt/getIt?tel=' + tel
+            })
+          }
+
         }else{
+          app.noticeModal(data.err);
         }
       }
     });

pages/getPhone_to/getPhone.wxml

@@ -1,5 +0,0 @@
-<view class='pd64'>
-  <button type="btn" class='wx_login_btn'> <image src='../img/wx_login.png'></image>微信快速登录</button>
-  <button type="btn" class='zfb_login_btn'> <image src='../img/zfb_login.png'></image>手机验证码注册 </button>
-</view>
-<view class='details'>同时申请<text>3</text>款以上产品，成功率提升90%</view>

pages/getPhone_to/getPhone_to.js

@@ -1,66 +0,0 @@
-// pages/logs_to/logs_to.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    phone_number:'18888888888'
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-  
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-  
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-  
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-  
-  }
-})

pages/getPhone_to/getPhone_to.json

@@ -1 +0,0 @@
-{}

pages/getPhone_to/getPhone_to.wxml

@@ -1,5 +0,0 @@
- <view class='pd64'> 
-  <image src='../resource/image/login_logo.png' class='logo_img'></image>
-  <view class='phone_number'>手机：<text>{{phone_number}}</text></view>
- </view> 
- <view class='details'>同时申请<text>3</text>款以上产品，成功率提升<text>90%</text></view> 

pages/getPhone_to/getPhone_to.wxss

@@ -1,50 +0,0 @@
-page {
-  /* font-size: 100px; */
-  font-family: "PingFangSC-Regular, 微软雅黑, sans-serif";
-  background: #f5f4f9;
-}
-
-view {
-  background: #fff;
-}
-
-.pd64 {
-    border-top: 1px solid#f5f4f9;
-  padding-bottom: 46px;
-    text-align: center;
-}
-.phone_number{
-  display: block;
-  margin-top: 12px;
-  font-size: 18px;
-  color: #333;
-  text-align: center;
-}
-/* .phone_number text{
-  font-size: 18px;
-  color: #333;
-  text-align: center;
-} */
-.logo_img {
-  width: 68px;
-  height: 88px;
-  display: block;
-  margin: auto;
-  margin-top: 32px;
-}
-
-.details {
-  display: block;
-  height: 84px;
-  width: 100%;
-  font-size: 14px;
-  margin: auto;
-  text-align: center;
-  line-height: 84px;
-  margin-top: 10px;
-  color: #8c8c8c;
-}
-
-.details  text {
-  color: #db3232;
-}

pages/mine/mine.js

@@ -4,13 +4,23 @@ const app = getApp()
 
 Page({
   data: {
-    userInfo: {}
+    userInfo: {},
   },
   onLoad: function () {
     this.initInfo();
   },
   initInfo () {
     var token = wx.getStorageSync('token'), data = {}, that = this;
+    console.log(token);
+    if (token) {
+      that.getInfo(token)
+    }else{
+
+      app.login(that.getInfo);
+    }
+  },
+  getInfo (token) {
+    var that = this, token = token || wx.getStorageSync('token'), data = null;
     wx.request({
       url: app.globalData.HOST + '/user/wx/personalCenter',
       method: 'POST',
@@ -28,11 +38,11 @@ Page({
     var tel = wx.getStorageSync('tel');
     if (tel) {
       wx.navigateTo({
-        url: '/pages/application/application'
+        url: "/pages/application/application"
       })
     }else{
       wx.navigateTo({
-        url: '/pages/getPhone/getPhone'
+        url: "/pages/getPhone/getPhone?from=mine"
       })
     }
   }

pages/template/template.wxml

@@ -18,12 +18,13 @@
 
 <template name="jiefItem2">
   <view class="weui-cells weui-cells_after-title template" bindtap="checkPhone">
-    <!-- <navigator url="/pages/details/details?id={{id}}" id="{{id}}"  hover-class="navigator-hover"> -->
+    <!-- <navigator url="/pages/details/details?id={{id}}" id="{{id}}"  hover-class="navigator-hover">  -->
     <view class="weui-cell card-list-temp">
       <view class="weui-cell__hd">
           <image class="icon" src="{{card_icon}}"/>
       </view>
       <view class="weui-cell__bd">
+          <button class="contact-btn" open-type="contact" wx-if="{{hasPhone}}"/>
           <view>{{name}}<view wx:for="{{keywords}}" wx:for-item="word" wx:key="void" wx-if="{{word == '礼'}}" class="weui-badge">{{word}}</view><view wx:for="{{keywords}}" wx:for-item="word" wx:key="void" wx-if="{{word !== '礼'}}" class="weui-badge other">{{word}}</view></view>
           <view class="desc elli">{{desc}}</view>
           <view class="desc elli" >申请人数<text class="emphasize">{{apply_num}}</text></view>
@@ -33,3 +34,21 @@
     <!-- </navigator> -->
   </view>
 </template>
+
+<template name="jiefItem3">
+  <view class="weui-cells weui-cells_after-title template">
+    <!-- <navigator url="/pages/details/details?id={{id}}" id="{{id}}"  hover-class="navigator-hover"> -->
+    <view class="weui-cell borrow-list-temp">
+      <view class="weui-cell__hd">
+          <image class="icon" src="{{product_icon}}"/>
+      </view>
+      <view class="weui-cell__bd">
+          <view>{{name}}<view class="weui-badge" wx-if="{{prod_title != null}}">{{prod_title}}</view></view>
+          <view class="desc elli">{{create_time}}</view>
+          <view class="desc elli" >贷款金额<text class="emphasize">{{money}}</text>贷款期数<text class="emphasize">{{periods}}</text></view>
+      </view>
+    </view>
+    <!-- <view class="weui-cell__ft weui-cell__ft_in-access"></view> -->
+    <!-- </navigator> -->
+  </view>
+</template>

project.config.json

@@ -24,7 +24,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 4,
+			"current": -1,
 			"list": [
 				{
 					"id": -1,
@@ -105,9 +105,9 @@
 					"query": ""
 				},
 				{
-					"id": -1,
-					"name": "getPhone_to",
-					"pathName": "pages/getPhone_to/getPhone_to",
+					"id": 13,
+					"name": "getIt",
+					"pathName": "pages/getIt/getIt",
 					"query": ""
 				},
 				{