Merge branch 'dev_20191114' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev_20191114

iceling
2 parents e7c21e05 6428c9c0
Showing 4 changed files with 250 additions and 74 deletions
pages/user/userinfo/userinfo.js
pages/user/userinfo/userinfo.json
pages/user/userinfo/userinfo.wxml
pages/user/userinfo/userinfo.wxss
@@ -5,7 +5,7 @@ function e(e, a, r) {
     configurable: !0,
     writable: !0
   }) : e[a] = r, e;
-}
+} 
  
 var a = getApp(),
   r = a.globalData.setting,
@@ -50,6 +50,13 @@ Page({
     isstcsp:1,//是否启动密码消费
     isGender:1,//什么性别
     iscalendar:1,//是否是农历
+    consumption:"",//消费密码
+    identity_card:"",//身份证值
+    address:"",//地址
+    openid:"",//openid
+    pulscardname:"",//puls会员的卡
+    gradename:"",//会员权益的卡
+    isBool:"",
   },
   //是否启动密码消费
   isstcsp:function(){
@@ -80,24 +87,21 @@ Page({
     }
   },
   //性别
-  isGender:function(){
+  isGender:function(e){
     var th = this;
-    
-    var isGender = th.data.isGender;
-    if (isGender == 2) {
+    var sex = e.currentTarget.dataset.sex;
+    console.log("点击选择性别",sex);
       th.setData({
-        isGender: 1
+        isGender:sex
       })
-    } else {
-      th.setData({
-        isGender: 2
-      })
-    }
+
+  
   },
   //密码是否隐藏显示
   ispwhid:function(){
     var th = this;
     var ispwhid = th.data.ispwhid;
+   
     if (ispwhid == 0) {
       th.setData({
         ispwhid: 1
@@ -139,7 +143,6 @@ Page({
     var th = this;
     var item = null;
     var openindstore = th.data.open_ind_store;
-
     if (th.data.choice_sort_store == 0) {
       var index = th.data.fir_pick_index;
       if (th.data.is_show_sto_cat == 1) {
@@ -156,6 +159,7 @@ Page({
     console.log("选择门店刷新", "def_pick_store", item);
     th.setData({
       def_pick_store: item,
+      stoname: item.pickup_name,
       sto_sele_name: item.pickup_name,
       sto_sele_id: item.pickup_id,
       sto_sele_distr: item.distr_type,
@@ -173,14 +177,12 @@ Page({
       th.setData({
         openSpecModal: !0,
         openSpecModal_ind: openindstore,
-
         openSpecModal_pt: 1
       });
     }
   },
   choose_for_store_fir: function(e) {
     var index_c = e.currentTarget.dataset.ind;
-
     this.setData({
       fir_pick_index: index_c
     })
@@ -202,13 +204,11 @@ Page({
           if (th.data.is_gps == 0) {
             getApp().confirmBox("请开启GPS定位", null, 10000, !1);
           }
-
         } else {
           th.setData({
             is_gps: "3"
           });
         }
-
         th.data.is_get_local_ok = 1;
       }
     })
@@ -502,10 +502,57 @@ Page({
   },
   //------初始化加载----------
   onLoad: function(t) {
-          var th = this;
-          th.setData({
-            isGender:th.data.user.sex
-          })//设置性别
+    this.puls_user();
+    this.equity_user();
+    this.initial_user();
+  },
+ //-----------会员是否初始化---------------------
+ initial_user: function () {
+ 
+    var th = this;
+    getApp().request.get("/api/weshop/users/grade/vip/init/get", {
+      data: {
+        storeId: r.stoid,
+      },
+      success: function (su) {
+        var isBool = su.data.data.isBool;
+        console.log("会员是否初始化", isBool);
+        th.setData({isBool:isBool});
+      }
+    });
+  },
+  //-----会员等级卡获取---------------
+  equity_user:function(){
+    var th = this;
+    getApp().request.get("/api/weshop/users/grade/aftervipinfo/get", {
+      data: {
+        storeId: r.stoid,
+        userId: getApp().globalData.user_id,
+      },
+      success: function (su) {
+      var gradename=su.data.data.GradeName;
+        th.setData({gradename: gradename});
+     
+      }
+    });
+  },
+
+  //-----Plus会员获取-----------
+  puls_user:function(){
+    var  th=this;
+    getApp().request.get("/api/weshop/plus/vip/mem/list", {
+      data: {
+        storeId: r.stoid,
+        userId: getApp().globalData.user_id, },
+      success: function (su) {
+
+        if (su.data.code == 0) {
+        var cardname=su.data.data[0].MemCardName;
+          console.log("卡的名字", cardname);
+         th.setData({pulscardname:cardname});
+        }
+      }
+    });
   },
   onShow: function() {
  
@@ -522,8 +569,7 @@ Page({
       if (a.pickup_id!=null) {
         req.get("/api/weshop/pickup/get/" + r.stoid + "/" + a.pickup_id, {
           success: function(da) {
-            console.log('getsto');
-            console.log(da);
+           
             //设置门店
             e.setData({
               stoname: da.data.data.pickup_name
@@ -531,13 +577,18 @@ Page({
           }
         })
       }
-      var phone = "";
-      phone+=a.mobile.substr(0, 3)+"****";
-      phone += a.mobile.substr(7, 12);
+      // var phone = "";
+      // phone+=a.mobile.substr(0, 3)+"****";
+      // phone += a.mobile.substr(7, 12);
+    
+     
       e.setData({
-        phone:phone,
-        user: a
+        phone: a.mobile,
+        user: a,
+        openid: a.openid,
+        consumption: a.paypwd,
       });
+     
       e.setData({
         isGender:e.data.user.sex
       })
@@ -585,4 +636,118 @@ Page({
       tc_hide: true,
     });
   },
+  //消费密码输入框失去焦点事件
+  lose_focus:function(e){
+    var  th=this;
+    var val=e.detail.value;
+    console.log("是什么东西",val);
+    if (val.length > 6 || val!=""){
+    
+      this.setData({ consumption: val });
+    }
+   
+   
+  },
+  
+//地址
+  address:function(e){
+    var val = e.detail;
+    console.log("地址55555555", val.value);
+    this.setData({ address: val.value });
+  },
+
+  //身份证验证
+  identity_card:function(e){
+    var val = e.detail;
+ 
+      this.setData({ identity_card: val.value });
+ 
+  },
+  //用户名字
+  user_name:function(e){
+    var name = e.detail.value;
+    if (name !=""||name!=null){
+      
+      this.setData({ user_name: name });
+  
+    }
+  
+  },
+
+  //点击确认修改信息
+   confirm_revision:function(){
+      var th=this;
+     var phone=th.data.phone;//手机号码
+     if (phone == "" || phone==null){
+       getApp().my_warnning("手机不能为空", 0, th); 
+    
+       return false;
+     }
+     var consumption = th.data.consumption;//消费密码    
+     var isstcsp = th.data.isstcsp;
+     if(isstcsp==1){
+     if (consumption.length < 6 && consumption==""){
+       getApp().my_warnning("消费密码不能为空及小于6位数", 0, th); 
+       return false;
+     }
+     }
+     var sex = th.data.isGender;//性别
+     console.log(sex,"性别");
+     if (sex!="1"&&sex!="2" ) {
+       getApp().my_warnning("请选择性别", 0, th);
+       return false;
+     }
+     var user_name = th.data.user.vipname;//用户姓名
+     if (user_name == ""&& user_name!= null) {
+       getApp().my_warnning("请输入名字", 0, th);
+       return false;
+     }
+     var identity_card = th.data.identity_card;//身份证
+     console.log("身份证",identity_card);
+     
+     if (identity_card == "" && identity_card != null  ) {
+       getApp().my_warnning("请输入身份证", 0, th);
+       return false;
+     } else if (!(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(identity_card))){
+       getApp().my_warnning("身份证号码错误",0, th);
+       return false;
+     }
+     var address = th.data.address;//地址
+     console.log("地址1010101", address)
+     if (address == "" && address != null) {
+       getApp().my_warnning("请输入地址", 0, th);
+       return false;
+     }
+     //保存所属门店的id
+     var sto_sele_id=th.data.sto_sele_id;
+     console.log("请输入所属门店的id", sto_sele_id);
+     if (sto_sele_id == null && sto_sele_id==""){
+       getApp().my_warnning("请输入所属门店", 0, th);
+     }
+     console.log("要保存的数据", sex, consumption, identity_card, address, user_name);
+     var datas = {
+       mobile: phone,//手机号码
+       store_id: r.stoid,
+       user_id: getApp().globalData.user_id,
+       openid: th.data.openid,
+       paypwd: consumption,//消费密码
+       sex: sex,//性别
+       nickname:user_name,//昵称
+       idcard:identity_card,//身份证
+       address:address,
+     }
+     getApp().request.put("/api/weshop/users/update", {
+       data: datas,
+       success: function (res) {
+       
+         if (res.data.code==0){
+           getApp().showWarning("修改成功");
+       }else{
+           getApp().showWarning("修改失败");
+       }
+
+       }
+     })
+   } 
+  
 });
 \ No newline at end of file
 {
     "navigationBarTitleText": "个人资料",
-    "enablePullDownRefresh": false
+    "enablePullDownRefresh": false,
+    "usingComponents": {
+      "warn": "/components/long_warn/long_warn"
+    }
 }
 \ No newline at end of file
@@ -3,7 +3,7 @@
  
   <!-- 头像,昵称,多个卡 -->
   <view class="head flex-space-between">
-    <view class="flex-center">
+    <view class="flex-center"> 
  
       <view class="flex-center">
         <image class="Headportrait" src="{{user.head_pic}}"></image>
@@ -16,18 +16,22 @@
           </view>
  
           <view class="flex-center fs22 vip">
+             <block wx:if="{{isBool&&gradename}}">
             <navigator url="">
               <view class="flex-center AncrownMax">
                 <image class="Ancrown" src="{{iurl}}/miniapp/images/userqy/user_userqy_huang.png"></image>
-                <view>黑卡会员</view>
+                <view>{{gradename}}</view>
               </view>
             </navigator>
+             </block>
+             <block wx:if="{{user.card_field!=''&& user.card_field!=null && user.card_expiredate!=null&&user.card_expiredate!=null}}">
             <navigator url="/pages/user/plus/plus">
               <view class="flex-center plusMax">
                 <image class="fuls" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
-                <view>PULS会员</view>
+                <view>{{pulscardname}}</view>
               </view>
             </navigator>
+                </block>
           </view>
         </view>
       </view>
@@ -67,46 +71,37 @@
             消费密码
         </view>
         <view class="flex">
-          <block wx:if="{{ispwhid}}">
-            <input class="fs28 hion user-txt-right" maxlength="6" value="{{user.paypwd.length>0?user.paypwd:'******'}}" type="number" password="true"/>
-          </block>
-          <block wx:else>
-            <input class="fs20 hion user-txt-right" maxlength="6" value="{{user.paypwd.length>0?user.paypwd:'未设置'}}" type="number"/>
-          </block>
+       <block wx:if="{{ispwhid}}">
+            <input bindblur="lose_focus"  class="fs28 hion user-txt-right"value="{{consumption}}"                      password="true"/>
+      </block>
+      <block wx:else>
+            <input bindblur="lose_focus"  class="fs28 hion user-txt-right"value="{{consumption}}"/>
+         </block>
+       
           <block wx:if="{{ispwhid}}">
             <image class="eye" src="{{iurl}}/miniapp/images/userinfo/userinfo/Eye.png" bindtap="ispwhid"></image>
           </block>
           <block wx:else>
-            <image class="eye" src="../../../images/open_eye.png" bindtap="ispwhid"></image>
+            <image class="eye" src="{{iurl}}/miniapp/images/userinfo/open_eye.png" bindtap="ispwhid"></image>
           </block>
-
-          </view>
+        
+</view>
         </view>
  
  
-
-
-
-
-
-
-
-
-
-
       <view bindtap="editUserInfo1" class="user-name flex-vertical-between" data-type="sex">
         <view>性别</view>
-        <view class="flex" wx:if="{{isGender!=0}}">
-          <view class="flex-center {{isGender==1?'Gendercheck':'Gender'}}" bindtap="isGender">
+        <view class="flex">
+          <view class="flex-center {{isGender==1?'Gendercheck':'Gender'}}" data-sex="1" bindtap="isGender">
             <block wx:if="{{isGender==1}}">
               <image class="GenderImage" src="{{iurl}}/miniapp/images/userinfo/userinfo/malealready.png"></image>
             </block>
             <block wx:else>
-              <image class="GenderImage" src="../../../images/userinfo/malenot.png"></image>
+              <image class="GenderImage" src="{{iurl}}/miniapp/images/userinfo/userinfo/malenot.png"></image>
             </block>
             <view class="fs24">男</view>
           </view>
-          <view class="flex-center {{isGender==2?'Gendercheck':'Gender'}}" bindtap="isGender">
+          <view class="flex-center {{isGender==2?'Gendercheck':'Gender'}}" data-sex="2"bindtap="isGender" >
             <block wx:if="{{isGender==2}}">
               <image class="GenderImage" src="{{iurl}}/miniapp/images/userinfo/userinfo/femalealready.png"></image>
             </block>
@@ -116,16 +111,14 @@
             <view class="fs26">女</view>
           </view>
         </view>
-         <view class="user-txt-right" wx:if="{{isGender==0}}" bindtap="isGender">保密</view>
+     
       </view>
  
       <view bindtap="editUserInfo1" class="user-name flex-vertical-between" data-type="sex">
         <view>出生日期</view>
-
-
         <view class="flex flex-vertical-between fs28 Birth">
           <view class="flex" bindtap="iscalendar">
-            <block wx:if="{{iscalendar}}">
+            <block wx:if="{{iscalendar&&user.birthday==null&&user.birthday==''}}">
               <view class="flex-center">
                 <icon size="20" type="success" color="rgb(212,2,31)"></icon>
               </view>
@@ -139,10 +132,15 @@
           </view>
           <view class="user-txt-right">
             <!-- 填充数据的时候要判断是否已经有出生日期，有值的话就不可修改 -->
+            <block wx:if="{{user.birthday==''||user.birthday==null}}">
             <picker bindchange='bindChange' value="{{datet}}" mode="date" 
             start="{{year-70}}-1-1" end="{{year}}-12-31">
+              </picker>
+            </block>
+            <block wx:else>
               <view>{{datet==""?user.birthday:datet}}</view>
-            </picker>
+              </block>
+          
           </view>
         </view>
       </view>
@@ -150,17 +148,18 @@
     <view class="Bbottom">
       <view bindtap="editUserInfo1" class="user-name mt flex-vertical-between" data-type="nickname">
         <view class="user-name-txt">姓名</view>
-        <input class="user-txt-right" style="text-indent:300rpx;" placeholder="{{user.vipname.length>0?user.vipname:'*姓名'}}"/>
+        <input bindblur="user_name" class="user-txt-right t-r" placeholder="*姓名" value='{{user.vipname}}'/>
       </view>
  
       <view bindtap="editUserInfo1" class="user-name flex-vertical-between" data-type="nickname">
         <view class="user-name-txt">身份证</view>
-        <block wx:if="{{user.idcard.length>0}}">
-          <view class="user-txt-right">{{user.idcard}}</view>
-        </block>
-        <block wx:else>
+      
+        <input bindblur="identity_card"  class="user-txt-right t-r" value="{{user.idcard}}" placeholder="*身份证"></input>
+         
+      
+        <!-- <block wx:else>
           <input class="user-txt-right" bindblur="IdentityIDCard" value="" type="idcard" maxlength="18" placeholder="*身份证" />
-        </block>
+        </block> -->
       </view>
       <navigator url="/pages/user/Change_phone/Change_phone?mobile={{user.mobile}}" class="user-name flex-vertical-between" data-type="mobile">
         <view class="user-name-txt">更换手机</view>
@@ -175,14 +174,16 @@
           <view>{{user.address}}</view>
         </block>
         <block wx:else>
-          <input maxlength="30" class="user-txt-right" placeholder="*地址" style=" text-indent: 370rpx;" />
+          <input bindblur="address" maxlength="30" class="user-txt-right" placeholder="*地址" style="text-align:right" />
         </block>
       </view>
  
       <view bindtap="onclickstore" class="user-name flex-vertical-between" data-type="email">
         <view class="user-name-txt">所属门店</view>
         <view class="flex-center user-txt-right">
-          <view class="one-line">{{def_pick_store.pickup_name}}</view>
+          <view class="one-line">{{stoname}}
+          </view>
+        
           <view class="angle">∟</view>
         </view>
       </view>
@@ -190,7 +191,7 @@
     <navigator class="user-name mt flex-vertical-between" url="/pages/user/address_list/address_list">
       <view class="user-name-txt">收货地址</view>
       <view class="flex-center user-txt-right">
-        <view class="flex">{{user.address_id}}</view>
+        <!-- <view class="flex">{{user.address_id}}</view> -->
         <view class="angle">∟</view>
       </view>
     </navigator>
@@ -202,7 +203,7 @@
 </view>
 <!-- 确认修改按钮 -->
 <view class="flex-center confirm">
-  <view class="flex-center fs30 confirmtext">
+  <view class="flex-center fs30 confirmtext"bindtap="confirm_revision">
     <view>确认修改</view>
   </view>
 </view>
@@ -368,4 +369,5 @@
       </view>
     </block>
   </view>
-</block>
 \ No newline at end of file
+</block>
+<warn id="warn"></warn>
 \ No newline at end of file
@@ -2,7 +2,7 @@
   padding-bottom:165rpx;
 }
 .user-container {
-  font-size: 30rpx;
+  font-size: 30rpx;  
 }
 input{
   width: 450rpx;
@@ -32,11 +32,14 @@ input{
  
 .AncrownMax {
   background-color: rgb(57, 57, 57);
-  width: 150rpx;
+
   height: 36rpx;
   border-radius: 20rpx;
   margin-right: 20rpx;
   line-height: 36rpx;
+  padding-right: 14rpx;
+padding-left: 10rpx;
+
 }
 .Nickname{
   max-width:170rpx;
@@ -49,10 +52,12 @@ input{
  
 .plusMax {
   background-color: rgb(212, 58, 30);
-  width: 150rpx;
   height: 36rpx;
   border-radius: 20rpx;
   line-height: 36rpx;
+  padding-left: 10rpx;
+padding-right: 14rpx;
+
 }
  
 .fuls {
@@ -118,7 +123,8 @@ input{
 }
  
 .hion {
-  width:85rpx;
+  width: 97%;
+text-align: right;
   margin-top: 3rpx;
   margin-right: 5rpx;
 }