fix UI

README.md

@@ -1,5 +0,0 @@
-# smallApp2
-
-借钱借款助手
-
-贷款产品助手

app.js

@@ -5,7 +5,10 @@ App({
   data:{
   },
   globalData: {
-    common: {},
+    common: {
+      source: 0,
+      app_type: 2
+    },
     userInfo: null,
     HOST: 'https://chaoshi.henhaojie.com',
     platform: 0,

app.json

@@ -15,7 +15,7 @@
   "window": {
     "backgroundTextStyle": "dark",
     "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "帮你贷",
+    "navigationBarTitleText": "借钱借款助手",
     "navigationBarTextStyle": "black",
     "enablePullDownRefresh": false,
     "onReachBottomDistance": 10
@@ -36,7 +36,7 @@
         "selectedIconPath": "pages/resource/image/find-on.png",
         "iconPath": "pages/resource/image/find.png",
         "pagePath": "pages/find/find",
-        "text": "发现"
+        "text": "贷款大全"
       },
       {
         "selectedIconPath": "pages/resource/image/mine-on.png",

app.wxss

@@ -122,7 +122,7 @@ page{
 .template .weui-cell{
   display: flex;
   display: -webkit-flex;
-  padding: 10px 12px;
+  padding: 28rpx 24rpx;
 }
 .card-list-temp .weui-cell__hd{
   width: 200rpx;
@@ -150,14 +150,14 @@ page{
 }
 
 .template .weui-cell__bd .title{
+    line-height: 20px;
     font-size: 16px;
+    color: #333;
 }
 .template .desc{
-  font-size: 14px;
-  color: #999;
-}
-.template .desc .emphasize{
-  color: #E94D4D;
+    line-height: 18px;
+    font-size: 12px;
+    color: #535353;
 }
 .template .contact-btn{
   /*display: none;*/
@@ -212,9 +212,10 @@ page{
   width: 100%;
   height: 100%;
   background: rgba(0, 0, 0, .5);
+  z-index: 100;
 }
 .mask .content{
-  width: 83.2%;
+  width: 72%;
   padding: 10px 0px 0;
   background: #fff;
   position: absolute;
@@ -228,12 +229,17 @@ page{
   font-size: 32rpx;
   color: #000;
   font-weight: 600;
-  margin: 12px auto 20px;
+  padding: 8px 0 16px;
+  border-bottom: #D8D8D8 solid 1rpx;
 }
 .mask .content .text{
-  margin-bottom: 20px;
+  padding: 15px;
   font-size: 30rpx;
-  color: #999;
+  color: #333333;
+}
+.mask .content .notice{
+  width:472rpx;
+  height:348rpx;
 }
 .mask .content .text>text{
   color: #E94D4D;
@@ -245,10 +251,11 @@ page{
   line-height: 50px;
   margin-top: 10px;
   font-size: 32rpx;
-  color: #3cc51f;
+  color: #333333;
   background: #fff;
   border-top: 1rpx solid #d2d3d5;
   border-radius: 0px 0px 10px 10px;
+  font-weight:600;
 }
 
 /*@media (-webkit-min-device-pixel-ratio: 1.5),(min-device-pixel-ratio: 1.5){

pages/application/application.js

@@ -137,7 +137,7 @@ Page({
     wx.request({
       url: app.globalData.HOST + '/user/wx/getFromid',
       method: "POST",
-      data: Object.assign({}, app.globalData.common, { from_id: formId }),
+      data: Object.assign({}, app.globalData.common, { from_id: formId}),
       success: function (res) {
       },
       complete: function () {

pages/details/details.js

@@ -16,11 +16,11 @@ Page({
      appid: 0
   },
   onLoad: function (options) {
-    var id = options.id
+    var id = options.id, tmplmsg = options.tmplmsg || 0;
     if (id) {
       this.setData({id: id})
     }
-    this.initDetails();
+    this.initDetails(tmplmsg);
     this.getRemmondList();
     // this.showConcact(null, true);
     // console.log(this.data.remmondList);
@@ -35,12 +35,12 @@ Page({
       that.caculateMoney();
       // console.log(time);
   },
-  initDetails () {
+  initDetails (tmplmsg) {
       var that = this, data = null;
       wx.request({
         url: app.globalData.HOST + '/user/product/detail',
         method: "POST",
-        data: Object.assign({}, app.globalData.common, {id: that.data.id}),
+        data: Object.assign({}, app.globalData.common, {id: that.data.id, tmplmsg: tmplmsg}),
         success: function (res) {
           if (res.data.errno == '0') {
             data = res.data.rst;

pages/details/details.wxml

@@ -66,9 +66,9 @@
     </view>
     <view class="mask" hidden="{{hiddenThis}}">
       <view class="content">
-        <view class="title">小提示</view>
-        <view class="text">回复"<text>1</text>"，获取贷款资格</view>
-
+        <view class="title">申请提示</view>
+        <view class="text">因政策调整，请在客服对话框回复“1”获取申请链接哦~（如下图）</view>
+        <image class="notice" src="https://chaoshi.henhaojie.com/icon/kefu_r.png"></image>
         <form bindsubmit="formSubmit" report-submit="{{true}}" >
           <button class="contact-btn" open-type="contact"  session-from="id=Y_{{appid}}&period={{time}}&money={{money}}" formType="submit">我知道了</button>
         </form>

pages/details/details.wxss

@@ -180,10 +180,11 @@
     width: 80%;
     height: 40px;
     margin-top: 10px;
-    background-color: #ffe100;
+    background-color: #FF2323;
     font-size: 15px;
     line-height: 40px;
     border-radius: 3px;
+    color: #fff;
 }
 .button-wrapper .contact-btn::after{
     border: 0 none;

pages/find/find.json

@@ -1,4 +1,4 @@
 {
     "enablePullDownRefresh": true,
-    "navigationBarTitleText": "发现"
+    "navigationBarTitleText": "贷款大全"
 }

pages/find/find.wxss

@@ -75,7 +75,7 @@
 }
 
 .tab-flex .weui-flex__item.active {
-  border-bottom: #ffe100 solid 2px;
+  border-bottom: #FF2323 solid 2px;
   color: #000;
 }
 

pages/getPhone/getPhone.js

@@ -6,14 +6,6 @@ Page({
     preid: ''
   },
   onLoad: function (options) {
-    // console.log(options.from);
-    var that = this;
-    if (options.preid) {
-        that.setData({from: options.from, preid: options.preid});
-    }else{
-        that.setData({from: options.from});
-    }
-    // console.log(that.data.from, options.preid);
   },
   getPhoneNumber: function(e) {
     var that = this;
@@ -44,20 +36,10 @@ Page({
         if (data.errno == '0'){
           var tel = data.rst.phone_number;
           wx.setStorage({key:"tel", data: tel})
-          if (that.data.from === 'mine') {
-              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.redirectTo({
-              url: '/pages/getIt/getIt?from='+that.data.from+'&preid='+ that.data.preid +'&tel=' + tel
-            })
-          }
+
+          wx.switchTab({
+            url: '/pages/index/index'
+          })
         }else{
           // app.noticeModal(data.err);
         }

pages/getPhone/getPhone.wxml

@@ -1,5 +1,7 @@
-<view class='pd64'>
-    <button type="btn" class='wx_login_btn' open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber"> <image class="icon icon-wechat" src='https://chaoshi.henhaojie.com/icon/login@2x.png'></image>微信快速登录</button>
-    <button type="btn" class='zfb_login_btn' bindtap="goSignup"> <image class="icon icon-phone" src='https://chaoshi.henhaojie.com/icon/register@2x.png'></image>手机验证码注册 </button>
-</view>
-<view class='details'>同时申请<text>3</text>款以上产品，成功率提升<text>90%</text></view>
+<view class="get_phone">
+    <view class="title">Hi，请登录</view>
+    <view class="login">登录即可拿钱</view>
+    <view class="btn-wrapper">
+        <button class="btn" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">微信快捷登录</button>
+    </view>
+</view>

pages/getPhone/getPhone.wxss

@@ -1,57 +1,28 @@
-view {
-  border-top: 1rpx solid #E5E5E5;
-  background: #fff;
-}
-
-.pd64 {
-  padding-bottom: 64px;
-}
-
-.wx_login_btn, .zfb_login_btn{
-  display: block;
-  width: 90%;
-  height: 45px;
-  border-radius: 0;
-  margin-top: 34px;
-  background-color: #52a939;
-  font-size: 18px;
-  color: #fff;
-  line-height: 45px;
-  text-align: left;
-  padding-left: 160rpx;
-}
-
-.wx_login_btn .icon-wechat {
-  width: 68rpx;
-  height: 60rpx;
-  margin: -4px 16px 0px 0px;
-  vertical-align: middle;
-}
-
-.zfb_login_btn {
-  margin-top: 20px;
-  background-color: #6082f9;
-}
-
-.zfb_login_btn .icon-phone {
-  width: 60rpx;
-  height: 68rpx;
-  vertical-align: middle;
-  margin:-4px 18px 0 4rpx;
-}
-
-.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;
-}
+/*page{
+    background: #fff;
+}*/
+.get_phone{
+    padding: 0 20px;
+}
+.get_phone .title{
+    margin: 32rpx 0;
+    font-size: 56rpx;
+    line-height: 80rpx;
+    color: #262626;
+}
+.get_phone .login{
+    color: #666666;
+    font-size: 36rpx;
+    line-height: 50rpx;
+}
+.btn-wrapper{
+    width: 100%;
+    height: 92rpx;
+    margin-top: 118rpx;
+}
+.btn-wrapper .btn{
+    width: 100%;
+    height: 100%;
+    background: #19AD19;
+    color: #fff;
+}

pages/index/index.js

@@ -17,14 +17,19 @@ Page({
   },
   onLoad: function (options) {
     var that = this, source = '';
-    const userInfo = wx.getStorageSync('userInfo') || null;
+    const userInfo = wx.getStorageSync('userInfo');
+    let tel= wx.getStorageSync('tel'), user = wx.getStorageSync('user');
     if (userInfo) {
         app.globalData.userInfo = userInfo;
+        if (tel == 0 && user.user_id == 0) {
+          wx.redirectTo({url: '/pages/getPhone/getPhone'})
+        }
     }else{
       wx.redirectTo({url: '/pages/login/login'})
     }
     if (options.source) {
       that.setData({source: options.source})
+      app.globalData.common['source'] = options.source;
     }
     const dataParam =  Object.assign({}, app.globalData.common, {version: 2, platform: app.globalData.platform});
     wx.request({
@@ -95,5 +100,9 @@ Page({
       complete: function () {
       }
     });
+  },
+  test (e) {
+    wx.setStorageSync('flag', 1);
+    console.log(e);
   }
 })

pages/index/index.wxml

@@ -1,12 +1,16 @@
 <import src="../template/template.wxml" />
-<view class="swiper-container">
+<view class="swiper-container" >
   <swiper class='swiper' indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" circular="true"
    interval="{{interval}}" duration="{{duration}}"indicator-color="rgba(0,0,0,.5)" indicator-active-color="#fff">
     <block wx:for="{{imgUrls}}" wx:key="id">
       <swiper-item>
-        <navigator url="/pages/details/details?id={{item.product_id}}" id="{{item.product_id}}"  hover-class="navigator-hover">
-          <image src="{{item.photo}}" class="slide-image"/>
-        </navigator>
+        <form class="swiper-form" bindsubmit="formSubmit" report-submit="{{true}}" data-id="{{item.product_id}}">
+           <!-- <navigator url="/pages/details/details?id={{id}}" id="{{id}}"  hover-class="navigator-hover">  -->
+            <button class='suspendImg'  plain="ture" hover-class="none" data-name="help" formType="submit" style="border:none !important; width:100%;height:100%;" ></button>
+          </form>
+        <image src="{{item.photo}}" class="slide-image"/>
+        <!-- <navigator url="/pages/details/details?id={{item.product_id}}" id="{{item.product_id}}"  hover-class="navigator-hover">
+        </navigator> -->
       </swiper-item>
     </block>
   </swiper>

pages/index/index.wxss

@@ -43,3 +43,10 @@
   border-bottom: 0 none;
   font-size: 14px;
 }
+.swiper-form{
+  display: block;
+    position: absolute;
+    top: 0;
+    width: 100%;
+    height: 100%;
+}

pages/login/login.js

@@ -25,13 +25,18 @@ Page({
       }
   },
   getUserInfo: function(e) {
+      const errno = e.detail.errMsg;
       const that = this, userInfo = {};
-      userInfo.encryptedData = e.detail.encryptedData;
-      userInfo.iv = e.detail.iv;
-      userInfo.avatar_url = e.detail.userInfo.avatarUrl;
-      userInfo.nick_name = e.detail.userInfo.nickName;
-      app.globalData.userInfo = userInfo;
-      wx.setStorageSync('userInfo', userInfo);
-      app.login(that);
+      if (errno === "getUserInfo:fail auth deny") {
+          return;
+      }else{
+          userInfo.encryptedData = e.detail.encryptedData;
+          userInfo.iv = e.detail.iv;
+          userInfo.avatar_url = e.detail.userInfo.avatarUrl;
+          userInfo.nick_name = e.detail.userInfo.nickName;
+          app.globalData.userInfo = userInfo;
+          wx.setStorageSync('userInfo', userInfo);
+          app.login(that);
+      }
   },
 })

pages/login/login.json

@@ -1,5 +1,5 @@
 {
-    "navigationBarBackgroundColor": "#FFCF09",
+    "navigationBarBackgroundColor": "#FF6262",
     "navigationBarTextStyle": "#fff",
-    "backgroundColor": "#FFCF09"
+    "backgroundColor": "#FF2323"
 }

pages/login/login.wxss

@@ -10,8 +10,8 @@ page{
 .login-wrapper .bg-wrapper{
     width: 100%;
     height: calc(100% - 288rpx);
-    background: -webkit-linear-gradient(#FFCF09 , #FFC323);
-    background: linear-gradient(#FFCF09 , #FFC323);
+    background: -webkit-linear-gradient(#FF6262 , #FF2323);
+    background: linear-gradient(#FF6262 , #FF2323);
     overflow: hidden;
 }
 .login-wrapper .bg-wrapper .title{
@@ -52,8 +52,7 @@ page{
     width: 560rpx;
     height: 88rpx;
     border-radius: 50rpx;
-    background: -webkit-linear-gradient(left, #FFCF09 , #FFC323);
-    background: linear-gradient(left, #FFCF09 , #FFC323);
+    background: #FF2323;
     margin-top: 88rpx;
     color: #fff;
 }

pages/mine/mine.wxml

@@ -14,7 +14,7 @@
       <!--我的申请-->
       <view class='my_applisation' bindtap="goApplication" hover-class="navigator-hover">
         <icon class='icon my_list_01'></icon>
-        <view class='my_list_text'>我的申请</view>
+        <view class='my_list_text'>我的足迹</view>
       </view>
     </view>
   </view>

pages/mine/mine.wxss

@@ -29,14 +29,14 @@
 .top {
   width: 100%;
   height: 24px;
-  background-color: #ffcf00;
+  background-color: #ca000f;
 }
 
 .ellipse_border {
   display: block;
   width: 100%;
   height: auto;
-  background: url('https://chaoshi.henhaojie.com/icon/bg@2x.png') no-repeat;
+  background: url('https://chaoshi.henhaojie.com/icon/my_head_r.png') no-repeat;
   background-size: 100% 100%;
 }
 

pages/template/template.wxml

@@ -1,20 +1,24 @@
 <template name="jiefItem1">
-  <view class="weui-cells weui-cells_after-title template">
+  <view class="weui-cells weui-cells_after-title template" bindtap="test">
     <button wx:if="{{!hasUserInfo && canIUse}}" class="userinfo-btn" open-type="getUserInfo" bindgetuserinfo="getUserInfo"></button>
     <form wx:else bindsubmit="formSubmit" report-submit="{{true}}" style='width:100%;height:100%;display:block;' data-id="{{id}}">
        <!-- <navigator url="/pages/details/details?id={{id}}" id="{{id}}"  hover-class="navigator-hover">  -->
-        <button class='suspendImg'  plain="ture" hover-class="none" data-name="help" formType="submit" style="border:none !important; width:100%;height:100%;" >
+        <button class='suspendImg' data-id="{{id}}" plain="ture" hover-class="none" formType="submit" style="border:none !important; width:100%;height:100%;" >
         <view class="weui-cell borrow-list-temp">
           <view class="weui-cell__hd">
               <image class="icon" src="{{icon}}"/>
           </view>
           <view class="weui-cell__bd">
               <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 class="desc elli">{{applicants}}人申请</view>
+              <view class="desc elli" ><text class="emphasize">{{lend_time}}放款</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>
+          <view class="weui-cell__bd2">
+              <view class="emphasize count">{{upper_amount}}-{{lower_amount}}</view>
+              <view class="desc">额度范围（元）</view>
           </view>
         </view>
-          <view class="weui-cell__ft weui-cell__ft_in-access"></view>
+          <!-- <view class="weui-cell__ft weui-cell__ft_in-access"></view> -->
         </button>
        <!-- </navigator>  -->
     </form>
@@ -44,7 +48,7 @@
   <block wx:for="{{dataList}}" wx:key="void">
   <view class="weui-cells weui-cells_after-title template" data-id="Y_{{item.product_id}}" bindtap="showPanel">
     <view class="weui-cell borrow-list-temp">
-      <button class="notice-btn">我要还款</button>
+      <button class="notice-btn">我要申请</button>
       <view class="weui-cell__hd">
           <image class="icon" src="{{item.product_icon}}"/>
       </view>

pages/template/template.wxss

@@ -2,7 +2,6 @@
   border-bottom: 0 none;
 }
 .emphasize{
-  color: #ff5100;
   margin-right: 5px;
 }
 .weui-badge{
@@ -14,6 +13,14 @@
   height: 50px;
   border-radius: 10px;
 }
+.weui-cell__bd2{
+  text-align: center;
+}
+.weui-cell__bd2 .count{
+  font-size: 16px;
+  line-height: 18px;
+  color: #E42A2A;
+}
 .weui-cell:before{
     color: #e5e5e5;
     /*border-top: none;*/
@@ -24,5 +31,5 @@
   padding-left: 0 !important;
   padding-right: 0 !important;
   text-align: left !important;
-  line-height: 100% !important;  
+  line-height: 100% !important;
 }