pic bug

app.js

@@ -15,7 +15,7 @@ App({
   // 在这个app里面this就是app实例
   // 监听小程序初始化
   onLaunch: function (){
-      var system = '', app = this;
+      let system = '', app = this;
       wx.getSystemInfo({
         success: function(res) {
           system = res.system
@@ -35,6 +35,9 @@ App({
   // 监听小程序隐藏
   onHide: function () {
   },
+  onUnload () {
+      wx.clearStorage();
+  },
   // 错误监听函数
   onError: function (msg) {
     console.log(msg)
@@ -47,68 +50,28 @@ App({
     wx.login({
       success: function(res) {
         if (res.code) {
-          wx.getUserInfo({
-            success: function(resInfo) {
-              // console.log(resInfo);
-              wx.request({
+            wx.request({
                 url: app.globalData.HOST + '/user/wx/login',
                 method: "POST",
                 data: {
                   code: res.code,
-                  iv: resInfo.iv,
-                  encryptedData: resInfo.encryptedData,
+                  iv: app.globalData.userInfo.iv,
+                  encryptedData: app.globalData.userInfo.encryptedData,
                   source: source
                 },
                 success: function (resLogin) {
-                  if (resLogin.data.errno == 0) {
-                    user = resLogin.data.rst;
-                    wx.setStorageSync("user", user)
-                    app.globalData.common['token'] = user.token
-                    if (func) {
-                      func();
-                    }
-                    app.initShare();
-                  }
-                }
-              })
-            },
-            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) {
-                                        user = resLogin.data.rst;
-                                        wx.setStorageSync("user", user)
-                                        app.globalData.common['token'] = user.token
-                                        if (func) {
-                                          func();
-                                        }
-                                      }
-                                    }
-                                  })
-                                }
-                              })
-                            }
+                    if (resLogin.data.errno == 0) {
+                        user = resLogin.data.rst;
+                        wx.setStorageSync("user", user)
+                        app.globalData.common['token'] = user.token
+                        wx.switchTab({'url': '/pages/index/index'})
+                        if (func) {
+                          func();
                         }
-                    })
+                        app.initShare();
+                    }
                 }
-              });
-            }
-          })
+            })
         } else {
           console.log('登录失败！' + res.errMsg)
         }

app.json

@@ -9,7 +9,8 @@
     "pages/application/application",
     "pages/getPhone/getPhone",
     "pages/getIt/getIt",
-    "pages/signup/signup"
+    "pages/signup/signup",
+    "pages/login/login"
   ],
   "window": {
     "backgroundTextStyle": "dark",

pages/feedback/feedback.wxml

@@ -1,7 +1,7 @@
 
 <view class="section">
   <form bindsubmit="bindFormSubmit">
-    <textarea placeholder="请您留下最宝贵的意见，以便更好的为您服务" name="textarea"  bindinput	="bindTextAreaBlur" value='{{userInput}}'/>
+    <textarea placeholder="请您留下最宝贵的意见，以便更好的为您服务" name="textarea"  bindinput="bindTextAreaBlur" value='{{userInput}}'/>
      <text class='text_number'>还可输入<text>{{int_number}}</text>字</text>
     <button form-type="submit"> 提交 </button>
   </form>

pages/find/find.js

@@ -95,7 +95,6 @@ Page({
     var that = this;
     utils.initList(that, that.data.obj);
     that.ajaxFilter();
-    app.login(that);
   },
   onShow () {
     wx.stopPullDownRefresh()
@@ -138,7 +137,7 @@ Page({
   formSubmit(e) {
     var formId = e.detail.formId;
     var id = e.target.dataset.id;
-    this.getFromid(formId, id); 
+    this.getFromid(formId, id);
     console.log(formId + "formID发现")
   },
   getFromid(formId, ids) {

pages/index/index.js

@@ -17,10 +17,15 @@ Page({
   },
   onLoad: function (options) {
     var that = this, source = '';
+    const userInfo = wx.getStorageSync('userInfo') || null;
+    if (userInfo) {
+        app.globalData.userInfo = userInfo;
+    }else{
+      wx.redirectTo({url: '/pages/login/login'})
+    }
     if (options.source) {
       that.setData({source: options.source})
     }
-    app.login(that);
     const dataParam =  Object.assign({}, app.globalData.common, {version: 2, platform: app.globalData.platform});
     wx.request({
       url: app.globalData.HOST + '/user/product/homeact',
@@ -72,10 +77,13 @@ Page({
   },
   //FormId
   formSubmit(e) {
-    var formId = e.detail.formId;
-    var id = e.target.dataset.id;
+    const formId = e.detail.formId, id = e.target.dataset.id;
+    const userInfo = app.globalData.userInfo;
     this.getFromid(formId,id);
-    console.log(formId + "formID首页")
+    wx.navigateTo({
+        url: '/pages/details/details?id='+id
+    })
+    // console.log(formId + "formID首页")
   },
   getFromid(formId,ids) {
     wx.request({
@@ -83,9 +91,6 @@ Page({
       method: "POST",
       data: Object.assign({}, app.globalData.common, { from_id: formId }),
       success: function (res) {
-        wx.navigateTo({
-          url: '/pages/details/details?id='+ids
-        })
       },
       complete: function () {
       }

pages/login/login.js

@@ -0,0 +1,37 @@
+const app = getApp()
+Page({
+  data: {
+  },
+  onLoad: function () {
+      if (app.globalData.userInfo) {
+        return;
+      } else if (this.data.canIUse){
+        // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
+        // 所以此处加入 callback 以防止这种情况
+        app.userInfoReadyCallback = res => {
+          this.setData({
+            userInfo: res.userInfo,
+            hasUserInfo: true
+          })
+        }
+      } else {
+        // 在没有 open-type=getUserInfo 版本的兼容处理
+        wx.getUserInfo({
+          success: res => {
+            wx.setStorageSync('userInfo', res.userInfo);
+            app.globalData.userInfo = res.userInfo
+          }
+        })
+      }
+  },
+  getUserInfo: function(e) {
+      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);
+  },
+})

pages/login/login.json

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

pages/login/login.wxml

@@ -0,0 +1,24 @@
+<view class="login-wrapper">
+    <view class="bg-wrapper">
+        <view class="title">贷款难？20万等你拿</view>
+        <view class="content"></view>
+        <view class="flow-wrapper">
+          <view class="flow">
+            <icon class="icon icon-login"></icon>
+            <text>利率低</text>
+          </view>
+          <view class="flow">
+            <icon class="icon icon-login"></icon>
+            <text>门槛低无抵押</text>
+          </view>
+          <view class="flow">
+            <icon class="icon icon-login"></icon>
+            <text>放款快</text>
+          </view>
+        </view>
+
+    </view>
+    <view class="btn-wrapper">
+        <button class="login-btn" open-type="getUserInfo" bindgetuserinfo="getUserInfo">去拿钱</button>
+    </view>
+</view>

pages/login/login.wxss

@@ -0,0 +1,62 @@
+page{
+    width: 100%;
+    height: 100%;
+}
+.login-wrapper{
+    width: 100%;
+    height: 100%;
+    background: #f5f5f5;
+}
+.login-wrapper .bg-wrapper{
+    width: 100%;
+    height: calc(100% - 288rpx);
+    background: -webkit-linear-gradient(#FFCF09 , #FFC323);
+    background: linear-gradient(#FFCF09 , #FFC323);
+    overflow: hidden;
+}
+.login-wrapper .bg-wrapper .title{
+    font-size: 28px;
+    text-align: center;
+    color: #fff;
+    margin: 100rpx auto 80rpx;
+}
+.login-wrapper .bg-wrapper .content{
+    width: 696rpx;
+    height: 348rpx;
+    margin: 0 auto;
+    background: url('https://chaoshi.henhaojie.com/icon/bg2.png') no-repeat 0 0;
+    -webkit-background-size: 100% 100%;
+    background-size: 100% 100%;
+}
+.flow-wrapper{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 126rpx;
+}
+.flow{
+    flex: 1;
+    text-align: center;
+    font-size: 10px;
+    color: #fff;
+}
+.flow .icon.icon-login{
+    width: 28rpx;
+    height: 28rpx;
+    background: url('https://chaoshi.henhaojie.com/icon/icon-2.png') no-repeat;
+    -webkit-background-size: 100% 100%;
+    background-size: 100% 100%;
+    margin: -2px 4px 0 0;
+}
+.btn-wrapper .login-btn{
+    width: 560rpx;
+    height: 88rpx;
+    border-radius: 50rpx;
+    background: -webkit-linear-gradient(left, #FFCF09 , #FFC323);
+    background: linear-gradient(left, #FFCF09 , #FFC323);
+    margin-top: 88rpx;
+    color: #fff;
+}
+.btn-wrapper .login-btn:after{
+    border: none;
+}

pages/mine/mine.js

@@ -4,11 +4,59 @@ const app = getApp()
 Page({
   data: {
     userInfo: {},
+    hasUserInfo: false,
+    canIUse: wx.canIUse('button.open-type.getUserInfo'),
     avatar_url: 'http://m.henhaojie.com/images/KX0004.png',
     nick_name: '点击授权登录'
   },
   onLoad: function () {
-    this.initInfo();
+      if (app.globalData.userInfo) {
+        this.setData({
+          userInfo: app.globalData.userInfo,
+          hasUserInfo: true,
+          avatar_url: app.globalData.userInfo.avatar_url,
+          nick_name: app.globalData.userInfo.nick_name
+        })
+      } else if (this.data.canIUse){
+        // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
+        // 所以此处加入 callback 以防止这种情况
+        app.userInfoReadyCallback = res => {
+          this.setData({
+            userInfo: res.userInfo,
+            hasUserInfo: true
+          })
+        }
+      } else {
+        // 在没有 open-type=getUserInfo 版本的兼容处理
+        wx.getUserInfo({
+          success: res => {
+            wx.setStorageSync('userInfo', res.userInfo);
+            app.globalData.userInfo = res.userInfo
+            this.setData({
+              userInfo: res.userInfo,
+              hasUserInfo: true
+            })
+          }
+        })
+      }
+  },
+  getUserInfo: function(e) {
+      const that = this, userInfo = {};
+      console.log();
+      userInfo.encryptedData = e.detail.encryptedData;
+      userInfo.iv = e.detail.iv;
+      // console.log(e.detail.userInfo);
+      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);
+      this.setData({
+          userInfo: e.detail.userInfo,
+          hasUserInfo: true,
+          avatar_url: e.detail.userInfo.avatarUrl,
+          nick_name: e.detail.userInfo.nickName
+      })
   },
   initInfo() {
     var token = wx.getStorageSync('user').token, data = {}, that = this;

pages/mine/mine.wxml

@@ -5,7 +5,8 @@
     <!-- <view class='title'>{{title}}</view> -->
     <view class='top'></view>
     <view class='ellipse_border'>
-      <image src="{{avatar_url}}" class="logo_img" bindtap="initInfo"/>
+      <button wx:if="{{!hasUserInfo && canIUse}}" class="userinfo-btn" open-type="getUserInfo" bindgetuserinfo="getUserInfo"></button>
+      <image wx:else src="{{avatar_url}}" class="logo_img" />
     </view>
     <text class="user_id">{{nick_name}}</text>
     <!--内容列表部分-->

pages/mine/mine.wxss

@@ -4,7 +4,7 @@
   width: 100%;
 }
 
-.logo_img {
+.logo_img, .ellipse_border .userinfo-btn{
   width: 60px;
   height: 60px;
   margin: auto;
@@ -14,6 +14,13 @@
   border-radius: 50%;
   top: 18px;
 }
+.ellipse_border .userinfo-btn{
+    padding: 0px;
+    box-sizing: content-box;
+    background: url('http://m.henhaojie.com/images/KX0004.png') no-repeat;
+    -webkit-background-size: 100% 100%;
+    background-size: 100% 100%;
+}
 
 .backfff {
   background-color: #fff;

pages/template/template.wxml

@@ -1,6 +1,7 @@
 <template name="jiefItem1">
   <view class="weui-cells weui-cells_after-title template">
-    <form bindsubmit="formSubmit" report-submit="{{true}}" style='width:100%;height:100%;display:block;' data-id="{{id}}">
+    <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%;" >
         <view class="weui-cell borrow-list-temp">
@@ -14,7 +15,7 @@
           </view>
         </view>
           <view class="weui-cell__ft weui-cell__ft_in-access"></view>
-        </button> 
+        </button>
        <!-- </navigator>  -->
     </form>
   </view>

project.config.json

@@ -8,7 +8,7 @@
 		"newFeature": true
 	},
 	"compileType": "miniprogram",
-	"libVersion": "1.5.2",
+	"libVersion": "1.9.98",
 	"appid": "wx9950d3ab42ae0af4",
 	"projectname": "bwspp",
 	"condition": {
@@ -28,7 +28,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 1,
+			"current": -1,
 			"list": [
 				{
 					"id": -1,
@@ -155,6 +155,12 @@
 					"name": "app",
 					"pathName": "pages/getPhone/getPhone",
 					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "login",
+					"pathName": "pages/login/login",
+					"query": ""
 				}
 			]
 		}