f1

app.js

@@ -3,15 +3,31 @@ var appInstance = getApp()
 // console.log(appInstance.onShow())
 App({
   data:{
-    a: 0
+  },
+  globalData: {
+    userInfo: null,
+    HOST: 'https://chaoshi.henhaojie.com',
+    platform: 0
   },
   // 在这个app里面this就是app实例
   // 监听小程序初始化
   onLaunch: function (){
+      var system = '', app = this;
+      wx.getSystemInfo({
+        success: function(res) {
+          system = res.system
+          console.log(system)
+          if (system.indexOf('iOS') == -1) {
+            app.globalData.platform = 1;
+          }else{
+            app.globalData.platform = 2;
+          }
+          console.log(app.globalData.platform);
+        }
+      })
   },
   // 监听小程序显示
   onShow: function (options) {
-    // console.log(0)
   },
   // 监听小程序隐藏
   onHide: function () {
@@ -20,10 +36,6 @@ App({
   onError: function (msg) {
     console.log(msg)
   },
-  globalData: {
-    userInfo: null,
-    HOST: 'https://chaoshi.henhaojie.com'
-  },
   login: function (func) {
     let obj = {}, app = this, user = '';
     wx.login({

app.json

@@ -2,18 +2,14 @@
   "pages": [
     "pages/index/index",
     "pages/find/find",
-    "pages/calculate/calculate",
     "pages/mine/mine",
     "pages/details/details",
-    "pages/list/list",
-    "pages/login/login",
     "pages/card/card",
     "pages/questions/questions",
     "pages/feedback/feedback",
     "pages/application/application",
     "pages/getPhone/getPhone",
     "pages/getIt/getIt",
-    "pages/register_phon/register_phon",
     "pages/signup/signup"
   ],
   "window": {

app.wxss

@@ -58,7 +58,11 @@ page{
 
 .weui-cells::after{border-bottom:0 none;}
 
-.slide{height: 5px; border-top:1rpx solid #d9d9d9; background-color: #f5f4f9; }
+.slide{
+  height: 6px;
+  /*border-top:1rpx solid #d9d9d9; */
+  background-color: #f5f4f9;
+}
 
 /*成功率 星星*/
 .icon.icon-star {
@@ -131,15 +135,21 @@ page{
   width: 100%;
   height: 100%;
 }
+.template .weui-cell{
+  padding: 10px 12px;
+}
 .template .weui-cell__bd{
   margin-left: 10px;
 }
+.template .weui-cell__bd .title{
+    font-size: 16px;
+}
 .template .desc{
   font-size: 14px;
   color: #999;
 }
 .template .desc .emphasize{
-  color: #ff5100;
+  color: #E94D4D;
 }
 .template .contact-btn{
   /*display: none;*/
@@ -150,7 +160,21 @@ page{
   height: 100%;
   background: transparent;
 }
-.template .contact-btn::after{
+.template .notice-btn{
+    position: absolute;
+    top: 50%;
+    right: 16px;
+    width: 146rpx;
+    height: 40rpx;
+    font-size: 10px;
+    background: #E94D4D;
+    color: #fff;
+    line-height: 40rpx;
+    border-radius: 3px;
+    transform: translateY(-50%);
+    letter-spacing: 1rpx;
+}
+.template .contact-btn::after, .template .notice-btn::after{
   border: 0 none;
 }
 .template .weui-badge.other{
@@ -168,4 +192,13 @@ page{
   border-radius: 5px;
   margin-top:-3px;
   margin-left: 6px;
-}
+  padding: 2px 4px;
+}
+
+/*@media (-webkit-min-device-pixel-ratio: 1.5),(min-device-pixel-ratio: 1.5){
+
+}
+
+@media (-webkit-min-device-pixel-ratio: 2),(min-device-pixel-ratio: 2){
+
+}*/

pages/application/application.js

@@ -6,7 +6,7 @@ Page({
     page: 0,
     dataList: [],
     cardList: [],
-    tabs: ["选项一", "选项二"],
+    tabs: ["借款申请", "信用卡申请"],
     activeIndex: 0,
     hidden: false
   },

pages/application/application.json

@@ -1,3 +1,4 @@
 {
-    "enablePullDownRefresh": true
+    "enablePullDownRefresh": true,
+    "navigationBarTitleText": "我的申请"
 }

pages/card/card.js

@@ -18,16 +18,18 @@ Page({
     this.initBanner();
     this.initCardList();
     app.login();
-    this.initConcact(false);
+    this.initConcact(null, true);
   },
-  initConcact (flag, event) {
-    var that = this, event = event || null, flag = flag || true;
+  initConcact (event, flag) {
+    var that = this, event = event || null, flag = flag || false;
     var tel = wx.getStorageSync('tel') || '0', user_id = wx.getStorageSync('user').user_id || '0', id = 0;
     if (user_id != '0' || tel != '0') {
       that.setData({hasPhone: true})
     }else{
       that.setData({hasPhone: false});
-      if (flag) {
+      console.log(flag);
+      if (!flag) {
+        console.log('test');
         id = event.currentTarget.dataset.id
         wx.navigateTo({
           url: "/pages/getPhone/getPhone?from=card&preid=" + id
@@ -36,7 +38,7 @@ Page({
     }
   },
   initCardList: function () {
-    var data = {}, list = [], that = this;
+    var data = {}, list = [], that = this, hasNext = true;
     if (that.data.page === 0) {
       list = []
     }else{
@@ -45,12 +47,14 @@ Page({
     wx.request({
       url: app.globalData.HOST + '/user/CreditCard/list',
       method: "POST",
-      data: {page: ++this.data.page},
+      data: {pageId: ++this.data.page},
       success: function (res) {
         if (res.data.errno == '0') {
-          data = res.data.rst.list;
+          // data = res.data.rst.list;
+          list = list.concat(res.data.rst.list)
+          hasNext = res.data.rst.pageInfo.hasNext
         }
-        that.setData({ cardList: data});
+        that.setData({ cardList: list, hasNext: hasNext});
       },
       complete: function () {
         // that.setData({ hidden:true});//加载成功
@@ -59,7 +63,6 @@ Page({
     });
   },
   initBanner () {
-    // https://chaoshi.henhaojie.com/user/CreditCard/bannerlist
     var data = [], that = this;
     wx.request({
       url: app.globalData.HOST + '/user/CreditCard/bannerlist',
@@ -76,32 +79,6 @@ Page({
       }
     });
   },
-  checkPhone () {
-    /*var token = wx.getStorage({
-        key: 'token',
-        success: function(res) {
-            // console.log(res.data)
-        },
-        fail: function (res){
-          app.login();
-        }
-    })*/
-    /*wx.request({
-      url: app.globalData.HOST + '/user/wx/personalCenter',
-      method: "POST",
-      success: function (res) {
-        console.log(res);
-        if (res.data.errno == '0') {
-          // data = res.data.rst.data;
-        }
-        // that.setData({ bannerList: data});
-      },
-      complete: function () {
-        // that.setData({ hidden:true});//加载成功
-        wx.stopPullDownRefresh() //停止下拉刷新
-      }
-    });*/
-  },
   onPullDownRefresh: function () {
     //下拉
     this.data.page = 0;
@@ -109,6 +86,8 @@ Page({
   },
   onReachBottom: function () {
     //上拉
-    this.initCardList()
+    if (this.data.hasNext) {
+        this.initCardList()
+    }
   }
 })

pages/card/card.json

@@ -1,3 +1,4 @@
 {
-    "enablePullDownRefresh": true
+    "enablePullDownRefresh": true,
+    "navigationBarTitleText": "信用卡"
 }

pages/card/card.wxml

@@ -6,10 +6,11 @@
        interval="{{interval}}" duration="{{duration}}"indicator-color="#E4E4E4" indicator-active-color="#8FA5FF">
         <block wx:for="{{bannerList}}" wx:key="id">
           <swiper-item class="item">
-            <view class="item-imglist" wx:for="{{item}}" wx:key="void" wx:for-item="imglist" bindtap="initConcact" data-id="{{imglist.id}}"  hover-class="navigator-hover">
+            <view class="item-imglist" wx:for="{{item}}" wx:key="void" wx:for-item="imglist" data-id="{{item.id}}" bindtap="initConcact" data-id="{{imglist.id}}"  hover-class="navigator-hover">
               <image src="{{imglist.card_icon}}" class="slide-image"/>
               <view class="elli title">{{imglist.name}}</view>
               <view class="elli desc">{{imglist.desc}}</view>
+              <button class="contact-btn" open-type="contact"  session-from="id=X_{{imglist.id}}" wx-if="{{hasPhone}}"/>
             </view>
           </swiper-item>
         </block>

pages/card/card.wxss

@@ -20,6 +20,7 @@
     justify-content: center;
 }
 .card-swiper-container .item-imglist{
+    position: relative;
     display: inline-block;
     flex: 1;
     width: 33%;
@@ -45,6 +46,17 @@
 }
 .card .split{
     width: 100%;
-    height: 10px;
+    height: 8px;
     background: #F3F3F3;
+}
+.item-imglist .contact-btn{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: transparent;
+}
+.item-imglist .contact-btn::after{
+    border: 0 none;
 }

pages/details/details.js

@@ -2,13 +2,11 @@
 var app = getApp();
 Page({
   data: {
-     array: ['美国', '中国', '巴西', '日本','美国', '中国', '巴西', '日本'],
      info: null,
      id: 129,
      remmondList: [],
      isShow: false,
      initPerid: null,
-     flag: 0,
      loanMoney: 0,
      money: 0,
      time: 0,
@@ -23,7 +21,7 @@ Page({
     }
     this.initDetails();
     this.getRemmondList();
-    this.showConcact(false);
+    this.showConcact(null, true);
     // console.log(this.data.remmondList);
   },
   bindPickerChange: function(e) {
@@ -60,7 +58,7 @@ Page({
       wx.request({
         url: app.globalData.HOST + '/user/product/getSameAmountByProductId',
         method: "POST",
-        data: {id: that.data.id},
+        data: {id: that.data.id, platform: app.globalData.platform},
         success: function (res) {
           if (res.data.errno == '0') {
             list = res.data.rst.data;
@@ -107,40 +105,30 @@ Page({
     that.setData({money: money})
     that.caculateMoney();
   },
-  showConcact (flag, event) {
-    var that = this, event = event || null, flag = flag || true;
+  showConcact (event, flag) {
+    var that = this, event = event || null, flag = flag || false;
     var tel = wx.getStorageSync('tel') || '0', user_id = wx.getStorageSync('user').user_id || '0', id = 0;
     if (user_id != '0' || tel != '0') {
+      console.log('test');
       that.setData({hasPhone: true})
     }else{
+      console.log(flag);
       that.setData({hasPhone: false});
-      if (flag) {
+      if (!flag) {
         id = event.currentTarget.dataset.id
+        console.log(id);
         wx.navigateTo({
           url: "/pages/getPhone/getPhone?from=details&preid=" + id
         })
       }
     }
   },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
   onReady: function () {
-
   },
-  /**
-   * 生命周期函数--监听页面显示
-   */
   onShow: function () {
-
   },
-  /** 生命周期函数--监听页面隐藏*/
   onHide: function () {
-
   },
-  /** 生命周期函数--监听页面卸载 */
   onUnload: function () {
-
-  },
-
+  }
 })

pages/details/details.wxml

@@ -33,13 +33,14 @@
             </view>
         </view>
     </view>
-    <view class='slide'></view>
+    <!-- <view class='slide'></view> -->
     <view class="details-info">
+      <view class="title">产品详情</view>
       <view class="intro">
         <view class="title">申请条件</view>
         <view class="content">{{info.requirements}}</view>
       </view>
-      <view class="intro">
+      <view class="intro {{isShow ? 'block' : 'none'}}">
         <view class="title">所需资料</view>
         <view class="content">{{info.document}}</view>
       </view>

pages/details/details.wxss

@@ -35,11 +35,9 @@ page{
 .details .loan-limit{
     width: 100%;
     background: #fff;
-    height: 56px;
     box-sizing: border-box;
-    padding: 10px 0;
+    padding: 8px 0;
     border-bottom: 1px solid #E5E5E5;
-    line-height: 30px;
     font-size: 0px;
 }
 .details .loan-limit .text{
@@ -101,10 +99,10 @@ page{
     margin-top: 10px;
 }
 .details-info{
-    background: #fff;
     border-top: #e5e5e5 solid 1px;
 }
 .details-info .intro {
+    background: #fff;
     padding: 10px 12px;
     border-bottom: #e5e5e5 solid 1px;
 }
@@ -112,7 +110,7 @@ page{
     line-height: 12px;
     margin: 5px 0;
     padding-left: 5px;
-    border-left: #4997ff solid 2px;
+    border-left: #ffe100 solid 2px;
     color: #999;
 }
 .details-info .intro .content{
@@ -135,9 +133,9 @@ page{
 .recommend-wrapper{
     width: 100%;
 }
-.recommend-wrapper>.title{
+.recommend-wrapper>.title, .details-info .title{
     font-size: 14px;
-    line-height: 30px;
+    line-height: 32px;
     padding-left: 10px;
     color: #666;
 }
@@ -188,6 +186,7 @@ page{
     background-color: #ffe100;
     font-size: 15px;
     line-height: 40px;
+    border-radius: 3px;
 }
 .button-wrapper .contact-btn::after{
     border: 0 none;

pages/feedback/feedback.js

@@ -27,9 +27,13 @@ Page({
         token: token,
         content: value
       },
-      success: function (res) {        
-        console.log(res)
-        console.log(111)
+      success: function (res) {
+        if (res.data.errno == 0) {
+            app.noticeModal('我们会及时处理，感谢您的反馈～')
+            wx.switchTab({
+              url: '/pages/mine/mine'
+            })
+        }
       }
     });
   },

pages/feedback/feedback.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "查看启动日志"
+  "navigationBarTitleText": "意见反馈"
 }

pages/find/find.js

@@ -2,17 +2,14 @@
 var utils = require('../../utils/util.js');
 var  app = getApp();
 Page({
-  /**
-   * 页面的初始数据
-   */
   data: {
     tabArr: {
       curHdIndex: 0,
       curBdIndex: 0
     },
-    jobArr: ['不限','上班族','个体户','企业主'],
-    moneyArr: ['不限', '1000元~5000元', '5000元~1万元','1万~~10万元','10万以上', '10万以上'],
-    timeArr: ['不限', '1个月', '3个月', '6个月', '12个月'],
+    jobArr: [],
+    moneyArr: [],
+    timeArr: [],
     obj:{ amount: 0, is_hot: 0, is_new: 0, search: 1, term: 0, user_title: "不限" },
     hasNext: false,
     page: 1,
@@ -103,7 +100,7 @@ Page({
     var that = this;
     that.data.page = 1;
     utils.initList(that, that.data.obj, 'top', that.data.page);
-    utils.initList(that, that.data.obj, that.data.page);
+    // utils.initList(that, that.data.obj, that.data.page);
   },
   onReachBottom: function () {
     //上拉
@@ -113,18 +110,11 @@ Page({
     }
   },
   onReady: function () {
-
   },
   onShow: function () {
-
   },
   onHide: function () {
-
   },
   onUnload: function () {
-
-  },
-  onShareAppMessage: function () {
-
   }
 })

pages/find/find.json

@@ -1,3 +1,4 @@
 {
-    "enablePullDownRefresh": true
+    "enablePullDownRefresh": true,
+    "navigationBarTitleText": "发现"
 }

pages/getIt/getIt.js

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

pages/getIt/getIt.wxml

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

pages/getPhone/getPhone.js

@@ -6,10 +6,10 @@ Page({
     preid: ''
   },
   onLoad: function (options) {
-    // console.log(options.from);
+    console.log(options.from);
     var that = this;
     that.setData({from: options.from, preid: options.preid});
-    console.log(that.data.preid);
+    // console.log(that.data.preid);
   },
   getPhoneNumber: function(e) {
     var that = this;
@@ -21,6 +21,13 @@ Page({
       that.telHost(token, e.detail.iv, e.detail.encryptedData)
     }
   },
+  goSignup () {
+    var that = this;
+    var id = that.data.preid;
+    wx.redirectTo({
+      url: '/pages/signup/signup?from='+that.data.from+'&preid='+ that.data.preid
+    })
+  },
   telHost (token, iv, encryptedData) {
     var that = this;
     wx.request({
@@ -34,12 +41,16 @@ Page({
           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
-            })
+              wx.redirectTo({
+                url: '/pages/application/application?tel=' + tel
+              })
+          }else if(that.data.from === 'mineFeedback'){
+              wx.redirectTo({
+                url: '/pages/feedback/feedback?tel=' + tel
+              })
           }else{
             //  if(that.data.from === 'card' && that.data.preid)
-            wx.navigateTo({
+            wx.redirectTo({
               url: '/pages/getIt/getIt?from='+that.data.from+'&preid='+ that.data.preid +'&tel=' + tel
             })
           }
@@ -60,14 +71,5 @@ Page({
   },
   onUnload: function () {
 
-  },
-  onPullDownRefresh: function () {
-
-  },
-  onReachBottom: function () {
-
-  },
-  onShareAppMessage: function () {
-
   }
 })

pages/getPhone/getPhone.wxml

@@ -1,5 +1,7 @@
 <view class='pd64'>
-  <button type="btn" class='wx_login_btn' open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber"> <image src='../resource/image/wx_login.png'></image>微信快速登录</button>
-  <button type="btn" class='zfb_login_btn'> <image src='../resource/image/zfb_login.png'></image>手机验证码注册 </button>
+    <button type="btn" class='wx_login_btn' open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber"> <image src='../resource/image/wx_login.png'></image>微信快速登录</button>
+    <!-- <navigator url="/pages/signup/signup?id={{preid}}"  hover-class="navigator-hover"> -->
+    <button type="btn" class='zfb_login_btn' bindtap="goSignup"> <image src='../resource/image/zfb_login.png'></image>手机验证码注册 </button>
+    <!-- </navigator> -->
 </view>
 <view class='details'>同时申请<text>3</text>款以上产品，成功率提升<text>90%</text></view>

pages/index/index.js

@@ -13,16 +13,21 @@ Page({
     dataList: [
     ],
     hidden: true,
-    listId:0
+    listId:0,
+    title: '',
+    img: ''
   },
   onLoad: function () {
     var that = this;
     app.login();
     wx.request({
       url: app.globalData.HOST + '/user/product/homeact',
+      method: 'POST',
+      data: {version: 2, platform: app.globalData.platform},
       success: function (res) {
         if (res.data.errno == '0'){
           that.setData({ imgUrls: res.data.rst.homeact});
+          that.initShare();
         }
       }
     });
@@ -37,5 +42,33 @@ Page({
     //上拉
     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);
+  },
+  initShare () {
+    var that = this;
+    var title='', img = '';
+    wx.request({
+      url: app.globalData.HOST + '/user/wx/share',
+      method: 'POST',
+      success: function (res) {
+        if (res.data.errno == '0'){
+          title = res.data.rst.title;
+          img = res.data.rst.pic;
+        }
+        that.setData({title: title, img: img})
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: this.data.title,
+      imageUrl: this.data.img,
+      path: '/pages/index/index',
+      success: function(res) {
+        app.noticeModal('分享成功')
+      },
+      fail: function(res) {
+        app.noticeModal('您取消了分享')
+      }
+    }
   }
 })

pages/index/index.wxml

@@ -11,6 +11,7 @@
     </block>
   </swiper>
 </view>
+<view class="slide"></view>
 <view class="content-wrapper">
   <block wx:for="{{dataList}}" wx:key="void">
      <!-- 使用热门推荐模板，传入当前循环对象item  -->

pages/list/list.js

@@ -1,126 +0,0 @@
-// pages/list/list.js
-var utils = require('../../utils/util.js');    
-Page({
-  data: {
-    id:0,
-    page: 1,
-    dataList:[],
-    hidden: true,
-  },
-  onLoad: function (options) {
-    var that = this;
-    that.setData({ id: options.id});
-    if(that.data.id == 0){
-      var obj = { 'is_hot': 0, 'is_new': 1 };
-      utils.initList(that, obj, '', that.data.page);
-    }else{
-      initCate(that, '', that.data.page);
-    }  
-  },
-  onPullDownRefresh: function () {
-    //下拉  
-    console.log(123)
-    var that = this;
-    if (that.data.id == 0) {
-      var obj = { 'is_hot': 0, 'is_new': 1 };
-      utils.initList(that, obj, 'top', that.data.page);
-    } else {
-      initCate(that, 'top', ++that.data.page);
-    }  
-  },
-  onReachBottom: function () {
-    //上拉  
-    console.log('text')
-    var that = this;
-    if (that.data.id == 0) {
-      var obj = { 'is_hot': 0, 'is_new': 1 };
-      utils.initList(that, obj, '', that.data.page);
-    } else {
-      initCate(that, '', ++that.data.page);
-    }  
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-  
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-  
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-  
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-  
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-  
-  }
-})
-
-// 请求列表数据
-var initCate = function (that, orient, page) {
-  that.setData({ hidden: false });
-  var list = [];
-  if (page == 1) {
-    list = [];
-  } else {
-    list = that.data.dataList
-  }
-  wx.request({
-    url: 'http://m.henhaojie.com/user/product/getInfoByCat',
-    method: "POST",
-    data: { id: that.data.id, page: page},
-    success: function (res) {
-      var data = res.data.rst.data;
-      if (res.data.errno == '0') {
-        that.data.hasNext = res.data.rst.pageinfo.hasNext
-        console.log(that.data.hasNext)
-        for (var i = 0; i < data.length; i++) {
-          if (orient == 'top') {
-            list.unshift(data[i]);
-          } else {
-            list.push(data[i]);
-          }
-        }
-        that.setData({ dataList: list });
-      }
-    },
-    complete: function () {
-      // complete
-      that.setData({ hidden: true });//加载成功
-      wx.stopPullDownRefresh() //停止下拉刷新  
-    }
-  });
-}

pages/list/list.json

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

pages/list/list.wxml

@@ -1,12 +0,0 @@
-<import src="../template/template.wxml" />
-<view class="content-wrapper">
-  <block wx:for="{{dataList}}" wx:key="void">
-     <!-- 使用热门推荐模板，传入当前循环对象item  -->
-    <template is="jiefItem1" data="{{...item}}"/>
-  </block>
-</view> 
-<view class="body-view">
-  <loading hidden="{{hidden}}" bindchange="loadingChange">
-    加载中...
-  </loading>
-</view>

pages/list/list.wxss

@@ -1,3 +0,0 @@
-/* pages/list/list.wxss */
-@import "../template/template.wxss";
-.content-wrapper{border-bottom:1rpx solid #d9d9d9;}

pages/login/login.js

@@ -1,25 +0,0 @@
-// pages/eg/eg.js
-// require "../../util/";
-var app = getApp();
-Page({
-  onLaunch: function() {
-  },
-  setDisabled: function(){
-    app.login();
-   /* wx.login({
-      success: function(res) {
-        if (res.code) {
-          //发起网络请求
-          wx.request({
-            url: 'https://chaoshi.henhaojie.com/user/wx/login',
-            data: {
-              code: res.code
-            }
-          })
-        } else {
-          console.log('登录失败！' + res.errMsg)
-        }
-      }
-    });*/
-  }
-})

pages/login/login.json

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

pages/login/login.wxml

@@ -1 +0,0 @@
-<button bindtap="setDisabled">点击设置以上按钮disabled属性</button>

pages/logs/logs.js

@@ -1,15 +0,0 @@
-//logs.js
-const util = require('../../utils/util.js')
-
-Page({
-  data: {
-    logs: []
-  },
-  onLoad: function () {
-    this.setData({
-      logs: (wx.getStorageSync('logs') || []).map(log => {
-        return util.formatTime(new Date(log))
-      })
-    })
-  }
-})

pages/logs/logs.json

@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "查看启动日志"
-}

pages/logs/logs.wxml

@@ -1,6 +0,0 @@
-<!--logs.wxml-->
-<view class="container log-list">
-  <block wx:for="{{logs}}" wx:for-item="log">
-    <text class="log-item">{{index + 1}}. {{log}}</text>
-  </block>
-</view>

pages/logs/logs.wxss

@@ -1,8 +0,0 @@
-.log-list {
-  display: flex;
-  flex-direction: column;
-  padding: 40rpx;
-}
-.log-item {
-  margin: 10rpx;
-}

pages/logs_to/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/logs_to/logs_to.json

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

pages/logs_to/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/logs_to/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/mine/mine.js

@@ -55,7 +55,7 @@ Page({
       })
     } else {
       wx.navigateTo({
-        url: "/pages/getPhone/getPhone?from=feedback"
+        url: "/pages/getPhone/getPhone?from=mineFeedback"
       })
     }
   }

pages/mine/mine.wxml

@@ -24,11 +24,9 @@
         <view class='my_list_text'>常见问题</view>
       </navigator>
     </view>
-    <view class='my_applisation border_top_hr'>
-      <navigator  hover-class="navigator-hover"  bindtap='goFeedback'>
+    <view class='my_applisation border_top_hr' bindtap='goFeedback'>
         <icon class='icon my_list_03'></icon>
         <view class='my_list_text'>意见反馈</view>
-      </navigator>
     </view>
 
   </view>

pages/questions/questions.wxss

@@ -6,7 +6,7 @@
 
 .accordion-item {
   border-bottom: #e5e5e5 solid 1px;
-  padding: 0px 16px;
+  padding: 0px 0 0 16px;
   height: 44px;
   line-height: 44px;
 }

pages/register_phon/register_phon.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/register_phon/register_phon.json

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

pages/register_phon/register_phon.wxml

@@ -1,22 +0,0 @@
-<view class='register_logo'>
-  <image src='http://m.henhaojie.com/images/KX0004.png' class='logo_img'></image>
-</view>
-
-<view class='item'>
-<!-- 手机号 -->
-  <view class="item-inner">
-     <view class="item-title">手机号</view>
-     <view class="item-input">
-    <input maxlength="10" placeholder="请输入手机号码" />
-    </view>
-  </view>
-   <!-- 验证码 -->
-  <view class="item-inner">
-     <view class="item-title">验证码</view>
-     <view class="item-input label">
-    <input maxlength="10" placeholder="请输入验证码" />
-    </view>
-    <view class='get_code'>获取验证码</view>
-  </view>
-</view>
-   <button form-type="submit" class='item_btn'> 提交 </button>

pages/register_phon/register_phon.wxss

@@ -1,78 +0,0 @@
-page {
-  font-family: "PingFangSC-Regular, 微软雅黑, sans-serif";
-  background: #f5f4f9;
-}
-
-view {
-  /* border-top: 1px solid#f5f4f9; */
-  background: #fff;
-}
-
-.register_logo {
-  background: #f5f4f9;
-  width: 100%;
-  height: 124px;
-}
-
-.register_logo image {
-  display: block;
-  width: 70px;
-  height: 70px;
-  margin: auto;
-  margin-top: 24px;
-}
-
-.item {
-  display: block;
-  width: 100%;
-}
-
-.item .item-inner {
-  display: block;
-  border-bottom: #e5e5e5 solid 1px;
-  box-sizing: border-box;
-  position: relative;
-  color: #333;
-  height: 56px;
-  width: 100%;
-}
-
-.item .item-inner .item-title {
-  display: block;
-  float: left;
-  width: 60px;
-  height: 55px;
-  /* background: #f00;   */
-  font-size: 14px;
-  color: #333;
-  padding-left: 13px;
-  line-height: 56px;
-}
-
-.item .item-inner .item-input  input {
-  display: block;
-  float: left;
-  height: 55px;
-  line-height: 56px;
-  vertical-align: middle;
-  font-size: 14px;
-  color: #999;
-}
-
-.item .item-inner .get_code {
-  float: right;
-  display: block;
-  width: 110px;
-  height: 40px;
-  font-size: 12px;
-  text-align: center;
-  line-height: 40px;
-  margin-top: 6px;
-  border-left: 1px solid#e5e5e5;
-}
-.item_btn{
- background-color: #ffe100;
-  font-size: 16px;
-  color: #333;
-  margin: 90px 15px 0 15px;
-}

pages/signup/signup.js

@@ -1,82 +1,35 @@
 const app = getApp()
-// pages/logs_to/logs_to.js
 Page({
-
-  /**
-   * 页面的初始数据
-   */
   data: {
     counting: false,
     get_code: '获取验证码',
     count: '0',
-    placeholder_number: '请输入手机号码',
     searchinput: '',
     showicon: false,
     hideyzm: false,
-    showView: false
+    showView: false,
+    from: '',
+    preid: 0
   },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
   onLoad: function (options) {
-
+    var from = options.from, preid = options.preid || 0
+    this.setData({from: from, preid: preid})
+    console.log(from, preid);
   },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
   onReady: function () {
 
   },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
   onShow: function () {
 
   },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
   onHide: function () {
 
   },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
   onUnload: function () {
 
   },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
-
   bindTextAreaBlur: function (e) {
     var that = this, value = e.detail.value;
-    // that.setData({
-    //   mobile: e.detail.value,
-    // })
-    console.log(value)
     if (value != '') {
       that.setData({
         mobile: e.detail.value,
@@ -88,10 +41,8 @@ Page({
         showicon: false
       })
     }
-    console.log(e.detail.value)
   },
-
-  codename: function (e) {
+  codeName: function (e) {
     this.setData({
       code: e.detail.value
     })
@@ -118,7 +69,7 @@ Page({
     }, 1000);
   },
   // 获取验证码
-  get_code: function (e) {
+  getCode: function (e) {
     var that = this, token = wx.getStorageSync('user').token, value = this.data.mobile, get_code = this.data.get_code;
     console.log(value)
     if (token) {
@@ -168,8 +119,10 @@ Page({
     }
   },
   // 提交登录
-  go_Login: function (e) {
-    var that = this, token = wx.getStorageSync('user').token, value = this.data.mobile, code = this.data.code;
+  goLogin: function (e) {
+    var that = this;
+    var token = wx.getStorageSync('user').token, value = that.data.mobile, code = that.data.code,
+          from = that.data.from, preid = that.data.preid
     wx.request({
       url: app.globalData.HOST + '/user/wx/bindMobile',
       method: 'POST',
@@ -179,12 +132,25 @@ Page({
         code: code
       },
       success: function (errno) {
-        console.log(errno)
+        // console.log(errno)
         if (errno.data.errno == '0') {
-         
-          wx.switchTab({
-            url: "/pages/index/index"
-          })
+          wx.setStorage({key:"tel", data: value})
+          if (from === 'mine') {
+            // console.log('/pages/application/application?tel=' + value);
+            wx.redirectTo({
+              url: '/pages/application/application?tel=' + value
+            })
+          }else if(from === 'mineFeedback'){
+            // console.log('/pages/feedback/feedback?tel=' + value);
+              wx.redirectTo({
+                url: '/pages/feedback/feedback?tel=' + value
+              })
+          }else{
+              // console.log( '/pages/getIt/getIt?from='+ from +'&preid='+ preid +'&tel=' + value);
+              wx.redirectTo({
+                url: '/pages/getIt/getIt?from='+ from +'&preid='+ preid +'&tel=' + value
+              })
+          }
         }else{
           that.setData({
             hideyzm: true
@@ -199,7 +165,7 @@ Page({
       showView: false
     })
   },
-  hideyzm:function(){
+  hideCode: function(){
     this.setData({
       hideyzm: false
     })

pages/signup/signup.wxml

@@ -6,20 +6,19 @@
   <view class="item-inner">
     <view class="item-title">手机号</view>
     <view class="item-input">
-      <!-- bindblur="mobileInputEvent" -->
-      <input type="number" maxlength="11" placeholder="{{placeholder_number}}" confirm-type="done" name='phonename' value="{{searchinput}}" bindinput='bindTextAreaBlur' />
+      <input type="number" maxlength="11" placeholder="请输入手机号码" confirm-type="done" name='phonename' value="" bindinput='bindTextAreaBlur' />
       <icon class="input_btn_icon {{showicon?'icon_show':'icon_hide'}}" bindtap='clear_phon'></icon>
-      <view class="{{showView?'bright789_view_show':'bright789_view_hide'}} phone_hide" bindtap="hideView">手机号码错误</view>
+      <view class="{{showView?'block':'none'}} phone_hide" bindtap="hideView">手机号码错误</view>
     </view>
   </view>
   <!-- 验证码 -->
   <view class="item-inner">
     <view class="item-title">验证码</view>
     <view class="item-input label">
-      <input maxlength="4" placeholder="请输入验证码" bindinput="codename" name='codename' />
-      <view class="{{hideyzm?'bright789_view_show':'bright789_view_hide'}} yzm_hide" bindtap="hideyzm">验证码错误</view>
+      <input maxlength="4" placeholder="请输入验证码" bindinput="codeName" name='codename' />
+      <view class="{{hideyzm?'block':'none'}} yzm_hide" bindtap="hideCode">验证码错误</view>
     </view>
-    <view bindtap='get_code' class="{{sendmsg}} get_code" style="background-color:{{pageBackgroundColor}}">{{get_code}}</view>
+    <view bindtap='getCode' class="{{sendmsg}} get_code" style="background-color:{{pageBackgroundColor}}">{{get_code}}</view>
   </view>
 </view>
-<button form-type="submit" class='item_btn' bindtap="go_Login"> 提交 </button>
+<button form-type="submit" class='item_btn' bindtap="goLogin"> 提交 </button>

pages/signup/signup.wxss

@@ -51,6 +51,7 @@ view {
 
 .item .item-inner .item-input  input {
   display: block;
+  width: 520rpx;
   float: left;
   height: 55px;
   line-height: 56px;
@@ -60,7 +61,7 @@ view {
 }
 
 .item .item-inner .label  input {
-  width: 100px;
+  width: 260rpx;
 }
 
 .phone_hide {
@@ -113,14 +114,6 @@ view {
   color: #f00;
 }
 
-.bright789_view_hide {
-  display: none;
-}
-
-.bright789_view_show {
-  display: block;
-}
-
 .icon_hide {
   display: none;
 }

pages/template/template.wxml

@@ -6,7 +6,7 @@
           <image class="icon" src="{{icon}}"/>
       </view>
       <view class="weui-cell__bd">
-          <view>{{name}}<view class="weui-badge" wx-if="{{prod_title != null}}">{{prod_title}}</view></view>
+          <view class="title">{{name}}<view class="weui-badge" wx-if="{{prod_title != null}}">{{prod_title}}</view></view>
           <view class="desc elli">{{description}}</view>
           <view class="desc elli" >申请人数<text class="emphasize">{{applicants}}</text> <text>{{show_day}}</text> <text class="emphasize" wx-if="{{show_day=='日利率'}}">{{day_rate}}%</text><text class="emphasize" wx:if="{{show_day!='日利率'}}">{{monthly_rate}}%</text></view>
       </view>
@@ -25,7 +25,7 @@
       </view>
       <view class="weui-cell__bd">
           <button class="contact-btn" open-type="contact"  session-from="id=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="title">{{item.name}}<view wx:for="{{item.keywords}}" wx:for-item="word" wx:key="void" wx-if="{{word == '礼' && item.keywords.length > 0}}" class="weui-badge">{{word}}</view><view wx:for="{{item.keywords}}" wx:for-item="word" wx:key="void" wx-if="{{word !== '礼' && item.keywords.length > 0}}" 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>
@@ -39,12 +39,13 @@
   <block wx:for="{{dataList}}" wx:key="void">
   <view class="weui-cells weui-cells_after-title template">
     <view class="weui-cell borrow-list-temp">
+      <button class="notice-btn">我要还款</button>
       <view class="weui-cell__hd">
           <image class="icon" src="{{item.product_icon}}"/>
       </view>
       <view class="weui-cell__bd">
-          <button class="contact-btn" open-type="contact"  session-from="id=Y_{{item.id}}"/>
-          <view>{{item.product_name}}<view class="weui-badge" wx-if="{{item.prod_title != null}}">{{item.prod_title}}</view></view>
+          <button class="contact-btn" open-type="contact"  session-from="id=Y_{{item.product_id}}"/>
+          <view class="title">{{item.product_name}}<view class="weui-badge" wx-if="{{item.prod_title != null}}">{{item.prod_title}}</view></view>
           <view class="desc elli">{{item.create_time}}</view>
           <view class="desc elli" >贷款金额<text class="emphasize">{{item.money}}</text>贷款期数<text class="emphasize">{{item.periods}}</text></view>
       </view>
@@ -56,19 +57,17 @@
 
 <template name="jiefItem4">
 <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-cells weui-cells_after-title template" data-id="{{item.product_id}}" bindtap="initConcact">
     <view class="weui-cell card-list-temp">
       <view class="weui-cell__hd">
           <image class="icon" src="{{item.icon}}"/>
       </view>
       <view class="weui-cell__bd">
-          <!-- <button class="contact-btn" open-type="contact"  session-from="id=X_{{item.id}}"/> -->
-          <view>{{item.product_name}}</view>
+          <view class="title">{{item.product_name}}</view>
           <view class="desc elli">{{item.desc}}</view>
-          <view class="desc elli" >申请人数{{item.create_time}}</view>
+          <view class="desc elli" >申请时间: {{item.create_time}}</view>
       </view>
     </view>
-    <!-- <view class="weui-cell__ft weui-cell__ft_in-access"></view> -->
   </view>
 </block>
 </template>

project.config.json

@@ -24,7 +24,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 16,
+			"current": -1,
 			"list": [
 				{
 					"id": -1,

utils/util.js

@@ -5,6 +5,7 @@ var initList = function (that, obj, orient, page) {
   orient = orient || '';
   var obj = obj || { amount: 0, is_hot: 1, is_new: 0, search: 0, term: 0, user_title: "不限" };
   obj['page'] = page || 1;
+  obj['platform'] = app.globalData.platform
   var list = [];
   if (obj['page'] == 1){
     list = [];