Merge branch 'qa' into 'master'

Qa See merge request !313

Merge branch 'qa' into 'master'
Qa See merge request !313
后端研发-苏明海
2 parents 6c79dc53 2ec1e804
Showing 7 changed files with 204 additions and 6 deletions
pages/getphone/getphone.js
pages/getphone/getphone.json
pages/getphone/getphone.wxml
pages/getphone/getphone.wxss
pages/user/index/index.js
pages/user/userinfo/userinfo.js
pages/user/userinfo/userinfo.wxml
+var t = require("../../utils/common.js");var os=getApp().globalData.setting;
+Page({
+  data:{
+     store:null,
+     imghots: os.imghost,
+  },
+  
+  onLoad: function (options) {
+	   //--判断是否有接受到邀请人的ID--
+  	   if(options.first_leader){
+  		   this.setData({first_leader:options.first_leader});
+  	   } 
+  },
+  onShow:function(){
+    var th=this,app = getApp();
+    var sessionKey = getApp().globalData.sessionKey;
+    var openid = getApp().globalData.openid;
+       
+    if (openid == "" || openid == null) {
+		
+      if (getApp().globalData.userInfo)
+          openid = getApp().globalData.userInfo.weapp_openid;
+    }
+		var r = getApp().globalData.getu;
+
+		if (openid == "" || openid == null || r==null ){
+		      getApp().globalData.user_id=null;
+          getApp().globalData.userInfo=null;
+          console.log("openid");
+          wx.navigateTo({ url: '/pages/togoin/togoin', })
+          return false;
+    }
+    var user_info=getApp().globalData.userInfo;
+    console.log("getphone");
+
+    if(user_info!=null && user_info.mobile!=undefined && user_info.mobile!="" && user_info.mobile!=null){
+        wx.navigateBack({
+            delta: 1
+        })
+    }
+
+    app.getConfig(function(e){
+      th.setData({ store:e});
+    })
+  },
+
+  getphone: function(e) {
+      var that = this;
+      var app=getApp(),a=app;
+      //此处授权得到userInfo
+      console.log("getphone");
+
+      e=e.detail;
+      console.log(e);
+      //接下来写业务代码登录
+      //最后，记得返回刚才的页面
+      if (e.encryptedData==undefined){
+           /*---
+           wx.navigateTo({
+              url: '/pages/user/binding_info/binding_info',
+           })--*/
+          return app.my_warnning("登录需要授权手机号码！", 0, that);
+           return false;
+      }
+      var r=getApp().globalData.getu;
+      var sessionKey = getApp().globalData.sessionKey;
+      var openid = getApp().globalData.openid;
+
+      console.log(sessionKey,openid);  
+      that.save_the_data(r,e,sessionKey,openid)
+      
+   },
+
+   save_the_data:function (r,e,sessionKey,openid) {
+     var app=getApp(),a=app,th=this;
+     var dd = {
+       oauth: "miniapp",
+       nickname: r.nickName,
+       head_pic: r.avatarUrl,
+       sex: r.gender,
+       terminal: "miniapp",
+       sessionKey: sessionKey,
+       openid:openid,
+       encryptedData: e.encryptedData,
+       iv: e.iv,
+       store_id: getApp().globalData.setting.stoid,
+     };
+	 //--如果有邀请人的时候--
+	 if(th.data.first_leader){
+	 		 dd.first_leader=th.data.first_leader;
+	 }
+	 
+     console.log(dd);
+     app.request.get("/api/weshop/users/thirdLogin", {
+       data: dd,
+       success: function (e) {
+         console.log("thirdLogin");
+         console.log(e);
+         if (e.data.code == 0) {
+           app.globalData.user_id = e.data.data.user_id;
+         } else {
+           return app.showWarning("授权登入失败！"+e.data.msg);
+         }
+
+         wx.setStorageSync("userinfo",e.data.data);
+         wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic);
+         wx.navigateBack({ delta: 1})
+
+       },
+       failStatus: function (t) {
+         /*---
+         return "100" === t.data.result ? (i.goHome(), wx.navigateTo({
+           url: "/pages/user/binding_info/binding_info?nickName=" + r.nickName + "&userHeadPic=" + r.avatarUrl
+         }), !1) : (i.clearAuth(), i.alertLoginErrorAndGoHome(t.data.msg), a.request.post("/api/user/logout", {
+           isShowLoading: !1,
+           data: {
+             token: a.request.getToken()
+           },
+           failStatus: function () {
+             return !1;
+           }
+         }), !1);--*/       
+         return app.my_warnning("授权登入失败,请稍后再试!", 0, that);
+       },
+       fail: function (t) {
+         return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1;
+       }
+     });
+   },
+  
+  cancle_bind: function () {
+    getApp().goto('/pages/user/index/index');
+  }
+
+
+
+});
+{
+  "navigationBarTitleText": "绑定手机",
+  "usingComponents": {   
+    "warn": "/components/long_warn/long_warn"
+  }
+}
+<view class="all_page">
+  <view class="content">
+     <view><image class='logo' src="{{imghots+store.store_logo}}"> </image></view>
+     <view class="title">{{store.store_name}}</view>
+     <view>{{store.store_desc}}</view>
+     <button class="btn"  open-type="getPhoneNumber" bindgetphonenumber="getphone">绑定会员</button>
+     <text class="btn2" bindtap="cancle_bind">暂不绑定</text>
+  </view>
+</view>
+<warn id="warn"></warn>
 \ No newline at end of file
+.all_page{
+  position: fixed;
+  height: 100%;
+  width: 100%;
+  background: #fff;
+  justify-content: center;/*水平居中*/
+}
+.all_page .content{
+  font-size: 30rpx;
+  text-align: center;
+  height: 400px;
+  width: 100%;
+  position: absolute; 
+  top: 50%;
+  margin-top:-200px;
+}
+.logo{width: 140rpx; height: 140rpx; border-radius:50% }
+.all_page .content .title{
+   font-size: 36rpx; margin: 20rpx 0
+}
+
+.all_page .btn{
+    height: 80rpx;
+    line-height: 80rpx;
+    width: 580rpx;
+    background: #fc661f;
+    color:#fff;
+    font-size: 32rpx;
+    margin-top: 100rpx;
+    border-radius: 5rpx;   
+}
+.all_page .btn2{
+    height: 80rpx;
+    line-height: 80rpx;
+    width: 580rpx;  
+    color:#999;
+    font-size: 32rpx;
+    border-radius: 5rpx;   
+     margin-top: 10rpx;
+}
 \ No newline at end of file
@@ -107,6 +107,7 @@ Page({
         rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, {
           success: function(su) {
             var data = su.data.data;
+			if(!data) data={};
             data.cashcount = parseInt(data.cashcount);
             s.setData({
               udata: data,
@@ -38,7 +38,7 @@ Page({
     sort_store: 0, //门店分类
     sec_sto: "",
     more_store: 0, //选择门店
-    choice_sort_store: 1, //选择分类门店
+    choice_sort_store: 0, //选择分类门店
     more_store: 0, //选择门店
     lat: null, //维度
     lon: null, //经度
@@ -280,7 +280,7 @@ Page({
       pageSize: 300
     }
     th.setData({
-      sort_store: 1
+      sort_store: 0
     });
     var i = getApp().request;
     //如果有距离的话
@@ -625,8 +625,12 @@ Page({
     req.get("/api/weshop/users/getAndUpdateUser/" + r.stoid + "/" + getApp().globalData.user_id, {
       success: function(src) {
         var a = src.data.data;
-        var time = util.formatTime(a.reg_time, "'Y/M/D");
-        var birthday = util.formatTime(a.birthday, "'Y/M/D");
+	
+		if(!a) a={};	
+        var time ="",birthday =""; 
+		 if(a && a.reg_time) util.formatTime(a.reg_time, "'Y/M/D");       
+		 if(a && a.birthday) util.formatTime(a.birthday, "'Y/M/D");
+		  
         a.reg_time = time;
         a.birthday = birthday
         e.setData({
@@ -274,9 +274,9 @@
       <!-- 门店列表，最外层的门店列表，一开始 -->
       <view class="store-list">
         <!--如果还没有点击更多门店的时候  -->
-        <block wx:if="{{choice_sort_store==0}}">
+        <block wx:if="{{choice_sort_store==0}}">			
           <!-- 需要for循环 -->
-          <block wx:if="is_show_sto_cat==1">
+          <block wx:if="{{is_show_sto_cat==1}}">
             <view class="store_choose flex" wx:for="{{def_pickpu_list}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
               <view class="store flex-vertical">
                 <!-- 需要点击事件 -->