4.1号修改登录流程

@@ -24,12 +24,12 @@
     </picker>
     <view class="list_textarea">
         <view class="list_left">详细地址</view>
-        <view class="list_right">
-            <textarea placeholder="道路、门牌号、小区、楼栋号等"  value="{{address}}" placeholder-class="inut_plclass" bindinput="getAddressFun"></textarea>
+        <view class="list_right areabox">
+            <textarea placeholder="道路、门牌号、小区、楼栋号等"  value="{{address}}" placeholder-class="inut_plclass" bindinput="getAddressFun" maxlength='-1'></textarea>
         </view>
     </view>
     <view class="list">
-        <view class="list_left">设为默认地址</view>
+        <view class="list_left shezhimo">设为默认地址</view>
         <view class="list_right">
             <switch checked="{{mo}}" type="switch" color="rgba(242, 0, 0, 1)" bindchange="switchChange"/>
         </view>

@@ -30,7 +30,8 @@ page {
 }
 
 .list_left {
-    min-width: 166rpx;
+    width: 166rpx;
+    font-size: 30rpx
 }
 
 
@@ -98,8 +99,12 @@ page {
     font-size: 30rpx;
     color: rgba(255, 255, 255, 1);
 }
-
-
+.areabox{
+  margin-top:2rpx;
+}
+.shezhimo{
+  width:175rpx;
+}
 
 
 

@@ -67,7 +67,7 @@ Page({
       
     }else{
       wx.navigateTo({
-        url: '/pages/xianshi/xianshi',
+        url: '/pages/xianshi/xianshi?title2='+this.data.title2,
       })
     }
 
@@ -100,7 +100,7 @@ Page({
     let url = '/special/get_all';
     let data = {
       page: 1,
-      pageNum: 4
+      pageNum: 6
 
     }
     app.post(url, data, "POST").then((r) => {

@@ -456,12 +456,12 @@ image {
 .miaoshalist {
   display: flex;
   align-items: center;
-  flex-wrap: wrap;
+  justify-content: space-between;
   margin-top: 24rpx;
 }
 
 .miaoshalistitem {
-  width: 140rpx;
+  width: 82rpx;
   display: flex;
   flex-direction: column;
   justify-content: center;
@@ -469,6 +469,9 @@ image {
   margin-right: 32rpx;
   box-sizing: border-box;
 }
+.miaoshalistitem:last-child{
+  margin-right:0;
+}
 
 .goodimg {
   width:75rpx;

 // pages/startindex/startindex.js
-const app = getApp()
+const a = getApp()
 Page({
 
   /**
@@ -8,7 +8,10 @@ Page({
   data: {
     thumbnail: '',
     sec:'',
-    endTime:''
+    endTime:'',
+    code: '',
+    iv: '',
+    encryptedData: ''
   },
 
   /**
@@ -17,6 +20,87 @@ Page({
   onLoad: function (options) {
 
   },
+    // 进入页面获取code
+    getCodeFun() {
+      let that = this;
+      wx.login({
+        success: function(r) {
+          that.setData({
+            code: r.code
+          })
+          wx.getSetting({
+            success: res => {
+              console.log(res)
+              if (res.authSetting['scope.userInfo'] === true) {
+                wx.getUserInfo({
+                  success: reg => {
+                    that.setData({
+                      iv: reg.iv,
+                      encryptedData: reg.encryptedData
+                    })
+                    if(that.data.iv){
+                     that.get_token()
+                    }
+                  }
+                })
+              }else{
+                // console.log(347878347)
+                  wx.navigateTo({
+                    url: '/pages/register/register',
+                  })
+              }
+            }
+          })
+        }
+      })
+    },
+
+    // 获取登录注册信息
+  get_token(){
+    // wx.showLoading({
+    //   title: '加载中',
+    // })
+    let that = this
+    wx.checkSession({
+      success(res) {
+        let u = a.interface.openid;
+        let d = {
+          code: that.data.code,
+          iv: that.data.iv,
+          encryptedData: that.data.encryptedData
+        }
+        a.post(u, d).then((r) => {
+          console.log('778899',r)
+          wx.hideLoading()
+          if (r.code == 200) {
+            wx.setStorageSync('token', r.token);
+            wx.setStorageSync('login', r.new_login);
+            wx.setStorageSync('tel', r.tel);
+            // wx.reLaunch({
+            //   url: '/pages/index/index'
+            // })
+            if (r.new_login == 0) {
+              // 未绑定手机号
+              wx.redirectTo({
+                url: '/pages/login/login'
+              })
+            } else if (r.new_login == 1) {
+              wx.reLaunch({
+                url: '/pages/index/index'
+              })
+            }
+          }
+        }).catch((er) => { })
+      }
+      ,
+      fail(err) {
+        wx.hideLoading();
+        that.getCodeFun()
+      }
+    })
+
+    
+  },
 
   getpic() {
     let that = this;
@@ -24,7 +108,7 @@ Page({
     var params = {
 
     }
-    app.post(url, params).then((res) => {
+    a.post(url, params).then((res) => {
       console.log(res);
       that.setData({
         thumbnail: res.msg.image,
@@ -38,10 +122,11 @@ Page({
 
   },
   jump(){
-    wx.switchTab({
+    this.getCodeFun()
+    // wx.switchTab({
      
-      url: '/pages/index/index',
-    })
+    //   url: '/pages/index/index',
+    // })
   },
 
   // 倒计时
@@ -56,21 +141,35 @@ Page({
       let hou = parseInt(time % (60 * 60 * 24) / 3600);
       let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
       let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
+      console.log(sec)
 
       that.setData({
         // day: that.timeFormat(day),
         // hou: that.timeFormat(hou),
         // min: that.timeFormat(min),
-        sec: sec
+        sec: sec+'s'
       })
 
       time--;
-      if (time <= 0) {
+      if (time ==1) {
+       console.log(34643)
+        that.getCodeFun()
+        // let token=wx.getStorageSync('token')
+        // wx.navigateTo({
+        //   url: '/pages/register/register',
+        // })
+        // if(token==""){
+        //   wx.navigateTo({
+        //     url: '/pages/register/register',
+        //   })
+        // }else{
+        //    wx.navigateTo({
+        //          url: '/pages/index/index'
+        //      })
+        // }
+        
+      }else if (time<=0){
         clearInterval(interval);
-        wx.switchTab({
-          url: '/pages/index/index',
-        })
-
       }
     }.bind(this), 1000);
   },
@@ -92,12 +191,16 @@ Page({
   onShow: function () {
     let that = this;
     that.getpic()
-    setTimeout(function () {
-      wx.navigateTo({
+    // setTimeout(function () {
+    //   wx.navigateTo({
+
+    //     url: '/pages/homepage/homepage',
+    //   })
+    // }, 2500)
+
+    // this.getCodeFun()
+
     
-        url: '/pages/homepage/homepage',
-      })
-    }, 2500)
   },
 
   /**

@@ -21,9 +21,13 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log(options)
     let that=this;
     this.getxianshi();
     this.getxianshik()
+    wx.setNavigationBarTitle({
+      title: options.title2
+    })
 
     setTimeout(function(){
       that.setData({

@@ -18,7 +18,7 @@
 </template>
 
 <template name="wxParseImg">
-  <image class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}" data-idx="{{item.imgIndex}}" src="https://binhai.w.broing.cn/{{item.attr.src}}" mode="aspectFit" bindload="wxParseImgLoad"  mode="widthFix" style="width:{{item.width}}px;"
+  <image class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}" data-idx="{{item.imgIndex}}" src="{{item.attr.src}}" mode="aspectFit" bindload="wxParseImgLoad"  mode="widthFix" style="width:{{item.width}}px;"
   />
 </template>