getphone

app.js

@@ -25,7 +25,7 @@ App({
     HOST: 'https://chaoshi.henhaojie.com'
   },
   login: function (func) {
-    let obj = {}, app = this, token = '';
+    let obj = {}, app = this, user = '';
     wx.login({
       success: function(res) {
         if (res.code) {
@@ -42,8 +42,9 @@ App({
                 },
                 success: function (resLogin) {
                   if (resLogin.data.errno == 0) {
-                    token = resLogin.data.rst.token;
-                    wx.setStorage({key:"token", data: token})
+                    user = resLogin.data.rst;
+                    // user_id = resLogin.data.rst.user_id;
+                    wx.setStorage({key:"user", data: user})
                     if (func) {
                       func();
                     }

pages/application/application.js

@@ -10,7 +10,7 @@ Page({
     this.initApplication();
   },
   initApplication () {
-      var that = this, token = wx.getStorageSync('token'), list = [];
+      var that = this, token = wx.getStorageSync('user').token, list = [];
       if (that.data.page) {
         list = that.data.dataList
       }else{

pages/card/card.js

@@ -12,11 +12,28 @@ Page({
     cardList: [],
     hasNext: true,
     page: 0,
-    hasPhone: true
+    hasPhone: false
   },
   onLoad: function () {
     this.initBanner();
     this.initCardList();
+    app.login();
+    // this.initConcact();
+  },
+  initConcact (event) {
+    var that = this, tel = wx.getStorageSync('tel') || '0', user_id = wx.getStorageSync('user').user_id || '0',
+          id = event.currentTarget.dataset.id;
+      // console.log(id);
+      // console.log(tel);
+    if (user_id != '0' || tel != '0') {
+      console.log('test');
+      that.setData({hasPhone: true})
+    }else{
+      that.setData({hasPhone: false});
+      wx.navigateTo({
+        url: "/pages/getPhone/getPhone?from=card&preid=" + id
+      })
+    }
   },
   initCardList: function () {
     var data = {}, list = [], that = this;

pages/card/card.wxml

@@ -18,9 +18,7 @@
     <view class="split"></view>
     <view class="card-list">
         <view class="card-list-title">热门信用卡</view>
-      <block wx:for="{{cardList}}" wx:key="void">
          <!-- 使用热门推荐模板，传入当前循环对象item  -->
-        <template is="jiefItem2" data="{{...item}}"/>
-      </block>
+        <template is="jiefItem2" data="{{cardList, hasPhone}}"/>
     </view>
 </view>

pages/getIt/getIt.js

@@ -5,15 +5,19 @@ Page({
    * 页面的初始数据
    */
   data: {
-    phone_number:'18888888888'
+    phone_number:'18888888888',
+    from: '',
+    preid: ''
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    var that = this, tel = options.tel;
-    that.setData({phone_number: tel})
+    var that = this, tel = options.tel, preid = options.preid || 0, from = options.from;
+    console.log(tel);
+    console.log(preid);
+    that.setData({phone_number: tel, preid: preid, from: from})
   },
 
   /**

pages/getIt/getIt.wxml

@@ -1,5 +1,10 @@
- <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> 
+
+<view class="getIt">
+    <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>
+    <button class="contact-btn" open-type="contact"  session-from="X_{{preid}}" wx-if="{{from == 'card' && preid != 0}}">立即申请</button>
+    <button class="contact-btn" open-type="contact"  session-from="Y_{{preid}}" wx-if="{{from != 'card' && preid != 0}}">立即申请</button>
+</view>

pages/getIt/getIt.wxss

@@ -4,13 +4,10 @@ page {
   background: #f5f4f9;
 }
 
-view {
-  background: #fff;
-}
-
 .pd64 {
+    background: #fff;
     border-top: 1px solid#f5f4f9;
-  padding-bottom: 46px;
+    padding-bottom: 46px;
     text-align: center;
 }
 .phone_number{
@@ -37,6 +34,7 @@ view {
   display: block;
   height: 84px;
   width: 100%;
+  background: #fff;
   font-size: 14px;
   margin: auto;
   text-align: center;
@@ -48,3 +46,19 @@ view {
 .details  text {
   color: #db3232;
 }
+
+.getIt .contact-btn{
+    /*position: fixed;*/
+    /*left: 0;*/
+    /*bottom: 0;*/
+    width: 90%;
+    height: 40px;
+    line-height: 40px;
+    font-size: 15px;
+    background: #FFE100;
+    margin-top: 20px;
+}
+
+.getIt .contact-btn::after{
+    border: 0 none;
+}

pages/getPhone/getPhone.js

@@ -2,12 +2,14 @@
 var app = getApp();
 Page({
   data: {
-    from: ''
+    from: '',
+    preid: ''
   },
   onLoad: function (options) {
-    console.log(options.from);
+    // console.log(options.from);
     var that = this;
-   that.setData({from: options.from});
+    that.setData({from: options.from, preid: options.preid});
+    // console.log(that.data.preid);
   },
   getPhoneNumber: function(e) {
     var that = this;
@@ -15,9 +17,7 @@ Page({
       console.log(e.detail.errMsg === 'getPhoneNumber:fail user deny');
       app.noticeModal('不绑定手机号的话就不能申请了哦');
     }else{
-      let token = wx.getStorageSync('token');
-      // console.log(e.detail.iv)
-      // console.log(e.detail.encryptedData)
+      let token = wx.getStorageSync('user').token;
       that.telHost(token, e.detail.iv, e.detail.encryptedData)
     }
   },
@@ -31,15 +31,15 @@ Page({
         var data = res.data
         // console.log(data);
         if (data.errno == '0'){
-          var tel = data.rst.phone_number
+          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{
+          }else if(that.data.from === 'card' && that.data.preid){
             wx.navigateTo({
-              url: '/pages/getIt/getIt?tel=' + tel
+              url: '/pages/getIt/getIt?from='+that.data.from+'&preid='+ that.data.preid +'&tel=' + tel
             })
           }
 

pages/mine/mine.js

@@ -10,17 +10,17 @@ Page({
     this.initInfo();
   },
   initInfo () {
-    var token = wx.getStorageSync('token'), data = {}, that = this;
+    var token = wx.getStorageSync('user').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;
+    var that = this, token = token || wx.getStorageSync('user').token, data = null;
+    console.log(token);
     wx.request({
       url: app.globalData.HOST + '/user/wx/personalCenter',
       method: 'POST',
@@ -35,8 +35,10 @@ Page({
     });
   },
   goApplication () {
-    var tel = wx.getStorageSync('tel');
-    if (tel) {
+    var tel = wx.getStorageSync('tel') || '0', user_id = wx.getStorageSync('user').user_id || '0';
+    console.log(user_id);
+    console.log(tel);
+    if (tel != '0' || user_id != '0') {
       wx.navigateTo({
         url: "/pages/application/application"
       })

pages/template/template.wxml

@@ -17,22 +17,22 @@
 </template>
 
 <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">  -->
+<block wx:for="{{cardList}}" wx:key="void">
+  <view class="weui-cells weui-cells_after-title template" data-id="{{item.id}}" bindtap="initConcact">
     <view class="weui-cell card-list-temp">
       <view class="weui-cell__hd">
-          <image class="icon" src="{{card_icon}}"/>
+          <image class="icon" src="{{item.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>
+          <button class="contact-btn" open-type="contact"  session-from="X_{{item.id}}" wx-if="{{hasPhone}}"/>
+          <view>{{item.name}}<view wx:for="{{item.keywords}}" wx:for-item="word" wx:key="void" wx-if="{{word == '礼'}}" class="weui-badge">{{word}}</view><view wx:for="{{item.keywords}}" wx:for-item="word" wx:key="void" wx-if="{{word !== '礼'}}" class="weui-badge other">{{word}}</view></view>
+          <view class="desc elli">{{item.desc}}</view>
+          <view class="desc elli" >申请人数<text class="emphasize">{{item.apply_num}}</text></view>
       </view>
     </view>
     <view class="weui-cell__ft weui-cell__ft_in-access"></view>
-    <!-- </navigator> -->
   </view>
+</block>
 </template>
 
 <template name="jiefItem3">

project.config.json

@@ -1,7 +1,7 @@
 {
 	"description": "项目配置文件。",
 	"setting": {
-		"urlCheck": false,
+		"urlCheck": true,
 		"es6": true,
 		"postcss": true,
 		"minified": true,
@@ -24,7 +24,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 4,
+			"current": 9,
 			"list": [
 				{
 					"id": -1,