Merge branch 'dev' into 'test'

Dev See merge request !147

Merge branch 'dev' into 'test'
Dev See merge request !147
后端研发-苏明海
2 parents 3467ae1a 8a43dd64
Showing 6 changed files with 47 additions and 31 deletions
components/diy_nav/diy_nav.wxml
components/nav_box_card/nav_box.wxss
pages/goods/goodsInfo/goodsInfo.js
pages/user/Change_phone/Change_phone.js
pages/user/address_list/address_list.wxml
pages/user/cardinfo/cardinfo.wxss
@@ -5,7 +5,7 @@
                 <view style='width:{{100/nav_list.length}}%'
                     class="{{object.seticon==1?'big_view_one':object.seticon==2?'big_view_two':'bicder_picture'}}">
                     <block wx:if="{{item.navicon==null}}">
-                        <image style='width:{{object.sliderExample+100}}rpx;height:{{object.sliderExample+100}}rpx;'
+                        <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
                                class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}"
                                src="{{imghost}}/miniapp/images/nav-icon.png"></image>
                         <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}">
@@ -13,7 +13,7 @@
                         </view>
                     </block>
                     <block wx:if="{{item.navicon!=null}}">
-                        <image style='width:{{object.sliderExample+100}}rpx;height:{{object.sliderExample+100}}rpx;'
+                        <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
                                class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}"
                                src="{{item.navicon}}"></image>
                         <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}">
@@ -34,13 +34,13 @@
                 <view class="one_div">
                     <view class="picture_one">
                         <block wx:if="{{item.navicon!=null}}">
-                            <image style='width:{{object.sliderExample+100}}rpx;height:{{object.sliderExample+100}}rpx;'
+                            <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
                                    src="{{item.navicon}}">
                             </image>
                         </block>
                         <block wx:if="{{item.navicon==null}}">
-                            <image style='width:{{object.sliderExample+100}}rpx;height:{{object.sliderExample+100}}rpx;'
+                            <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;'
                                  src="{{imghost}}/miniapp/images/nav-icon.png">
                             </image>
                         </block>
@@ -26,14 +26,16 @@ height: 50rpx;
 color: #ffff;
 font-size: 50rpx;
 background: none;
+line-height: 78rpx;
+
 }
 .box_main .dian image{
   width: 60rpx;
 height: 20rpx;
-margin: 0rpx 0 0 10rpx;
-margin-bottom: 7rpx;
+
+
 }
@@ -2496,7 +2496,18 @@ Page({
     var cid = e.currentTarget.dataset.cid;
     var index = e.currentTarget.dataset.ind;
     var item = this.data.quan_list[index];
-
+	
+	
+	//--先判断会员状态--
+	var user_info = getApp().globalData.userInfo;
+	if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+	  wx.navigateTo({
+		url: '/pages/getphone/getphone',
+	  })
+	  return false;
+	}
+	
+	
     //如果券还在领取中，不能再点  
     if (item.linging == 1) {
       getApp().my_warnning('领取中..', 0, this);
@@ -12,10 +12,10 @@ Page({
   data: {
     iurl: r.imghost,
     inputxphone: 0,
-    mobile: 17359580658, //旧手机号码
+    mobile: null, //旧手机号码
     currentTime: "", //验证码发送倒计时
     getvcode: "获取验证码",
-    wxopenid: "2",
+    wxopenid: null,
     isver: 0, //是否有发送验证码
     code: "", //验证码
     url: "", //确认更换手机号码跳转路径
@@ -26,8 +26,8 @@ Page({
    */
   onLoad: function(options) {
     this.setData({
-      // mobile: options.mobile,
-      //wxOpneId: options.openid
+      mobile: options.mobile,
+      wxopenid: options.openid
     })
   },
   //获取手机验证码
@@ -37,7 +37,6 @@ Page({
     var wxopenid = th.data.wxopenid;
     var change_phone = th.data.change_phone;
     var isver = th.data.isver;
-    console.log("iiiiiiiiiiiiii" + change_phone + mobile);
     var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/;
     if (mobile.length < 11) {
       getApp().my_warnning("请输入11位的手机号码", 0, th);
@@ -103,21 +102,25 @@ Page({
     var th = this;
     var code = th.data.code;
     var mobile = th.data.mobile;
-    if (th.ver_code() == false) return false;
-    getApp().request.put("/api/weshop/users/updateMobile/" + r.stoid + '/' + o.user_id + '/' + code + '/' + mobile, {
-      success: function(res) {
-        if (res.data.code == 0) {
-          getApp().my_warnning("更换成功", 0, th);
-          // th.setData({
-          //   url: "/pages/user/userinfo/userinfo?change_phone" + change_phone
-          // })
-        } else {
-          getApp().my_warnning("更换失败", 0, th);
-          return false;
-        }
-      }
-    })
+    var change_phone = th.data.change_phone;
+    if (change_phone.length > 1) {
+      mobile = change_phone
+    }
+      getApp().request.put("/api/weshop/users/updateMobile/" + r.stoid + '/' + o.user_id + '/' + code + '/' + mobile, {
+        success: function(res) {
+          if (res.data.code == 0) {
+            getApp().my_warnning("更换成功", 0, th);
+            // th.setData({
+            //   url: "/pages/user/userinfo/userinfo?change_phone" + change_phone
+            // })
+          } else {
+            getApp().my_warnning("更换失败", 0, th);
+            return false;
+          }
+        }
+      })
+    
   },
   //判断验证码是否正确
   ver_code: function(e) {
@@ -130,10 +133,10 @@ Page({
     if (code.length < 3 && code == "") {
       getApp().my_warnning("请输入正确的验证码", 0, th);
       return false;
-    } else if (getvcode.length<3){
+    } else if (getvcode.length < 3) {
       getApp().my_warnning("验证超时", 0, th);
       return false;
-    }else {
+    } else {
       getApp().request.put("/api/weshop/users/updateMobileFirst/" + r.stoid + '/' + o.user_id + '/' + code, {
         success: function(res) {
           if (res.data.code == 0) {
@@ -63,7 +63,7 @@
       <!-- 编辑地址图片 -->
       <view class="edit" bindtap="editAddress" data-id="{{item.address_id}}">
-        <image src="../../../images/dpr.png"></image>
+        <image src="{{iurl}}/miniapp/images/dpr.png"></image>
       </view>
     </view>
@@ -6,9 +6,9 @@
   height: 100%;
 }
 .box--box_main .box--dian wx-image {
-  margin: 0px 0 0 4px;
+  margin: 0px 0 0 10rpx;
-  margin-bottom: 4px;
+  margin-bottom: 10rpx;
 }
 .MemberPlus {