1 participants
-
Status changed to merged
-
mentioned in commit b9f14922cb15f69709f9068c521a8a342644b567
Showing
6 changed files
components/diy_nav/diy_nav.wxml
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | <view style='width:{{100/nav_list.length}}%' | 5 | <view style='width:{{100/nav_list.length}}%' |
| 6 | class="{{object.seticon==1?'big_view_one':object.seticon==2?'big_view_two':'bicder_picture'}}"> | 6 | class="{{object.seticon==1?'big_view_one':object.seticon==2?'big_view_two':'bicder_picture'}}"> |
| 7 | <block wx:if="{{item.navicon==null}}"> | 7 | <block wx:if="{{item.navicon==null}}"> |
| 8 | - <image style='width:{{object.sliderExample+100}}rpx;height:{{object.sliderExample+100}}rpx;' | 8 | + <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;' |
| 9 | class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}" | 9 | class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}" |
| 10 | src="{{imghost}}/miniapp/images/nav-icon.png"></image> | 10 | src="{{imghost}}/miniapp/images/nav-icon.png"></image> |
| 11 | <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}"> | 11 | <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}"> |
| @@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
| 13 | </view> | 13 | </view> |
| 14 | </block> | 14 | </block> |
| 15 | <block wx:if="{{item.navicon!=null}}"> | 15 | <block wx:if="{{item.navicon!=null}}"> |
| 16 | - <image style='width:{{object.sliderExample+100}}rpx;height:{{object.sliderExample+100}}rpx;' | 16 | + <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;' |
| 17 | class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}" | 17 | class="{{object.seticon==1?'print_one':object.seticon==2?'print_two':'image_none'}}" |
| 18 | src="{{item.navicon}}"></image> | 18 | src="{{item.navicon}}"></image> |
| 19 | <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}"> | 19 | <view class="{{object.seticon==1?'font_one':object.seticon==2?'font_bicder_two':'font_three'}}"> |
| @@ -34,13 +34,13 @@ | @@ -34,13 +34,13 @@ | ||
| 34 | <view class="one_div"> | 34 | <view class="one_div"> |
| 35 | <view class="picture_one"> | 35 | <view class="picture_one"> |
| 36 | <block wx:if="{{item.navicon!=null}}"> | 36 | <block wx:if="{{item.navicon!=null}}"> |
| 37 | - <image style='width:{{object.sliderExample+100}}rpx;height:{{object.sliderExample+100}}rpx;' | 37 | + <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;' |
| 38 | src="{{item.navicon}}"> | 38 | src="{{item.navicon}}"> |
| 39 | </image> | 39 | </image> |
| 40 | </block> | 40 | </block> |
| 41 | 41 | ||
| 42 | <block wx:if="{{item.navicon==null}}"> | 42 | <block wx:if="{{item.navicon==null}}"> |
| 43 | - <image style='width:{{object.sliderExample+100}}rpx;height:{{object.sliderExample+100}}rpx;' | 43 | + <image style='width:{{object.sliderExample*2}}rpx;height:{{object.sliderExample*2}}rpx;' |
| 44 | src="{{imghost}}/miniapp/images/nav-icon.png"> | 44 | src="{{imghost}}/miniapp/images/nav-icon.png"> |
| 45 | </image> | 45 | </image> |
| 46 | </block> | 46 | </block> |
components/nav_box_card/nav_box.wxss
| @@ -26,14 +26,16 @@ height: 50rpx; | @@ -26,14 +26,16 @@ height: 50rpx; | ||
| 26 | color: #ffff; | 26 | color: #ffff; |
| 27 | font-size: 50rpx; | 27 | font-size: 50rpx; |
| 28 | background: none; | 28 | background: none; |
| 29 | +line-height: 78rpx; | ||
| 30 | + | ||
| 29 | 31 | ||
| 30 | } | 32 | } |
| 31 | 33 | ||
| 32 | .box_main .dian image{ | 34 | .box_main .dian image{ |
| 33 | width: 60rpx; | 35 | width: 60rpx; |
| 34 | height: 20rpx; | 36 | height: 20rpx; |
| 35 | -margin: 0rpx 0 0 10rpx; | ||
| 36 | -margin-bottom: 7rpx; | 37 | + |
| 38 | + | ||
| 37 | 39 | ||
| 38 | } | 40 | } |
| 39 | 41 |
pages/goods/goodsInfo/goodsInfo.js
| @@ -2496,7 +2496,18 @@ Page({ | @@ -2496,7 +2496,18 @@ Page({ | ||
| 2496 | var cid = e.currentTarget.dataset.cid; | 2496 | var cid = e.currentTarget.dataset.cid; |
| 2497 | var index = e.currentTarget.dataset.ind; | 2497 | var index = e.currentTarget.dataset.ind; |
| 2498 | var item = this.data.quan_list[index]; | 2498 | var item = this.data.quan_list[index]; |
| 2499 | - | 2499 | + |
| 2500 | + | ||
| 2501 | + //--先判断会员状态-- | ||
| 2502 | + var user_info = getApp().globalData.userInfo; | ||
| 2503 | + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { | ||
| 2504 | + wx.navigateTo({ | ||
| 2505 | + url: '/pages/getphone/getphone', | ||
| 2506 | + }) | ||
| 2507 | + return false; | ||
| 2508 | + } | ||
| 2509 | + | ||
| 2510 | + | ||
| 2500 | //如果券还在领取中，不能再点 | 2511 | //如果券还在领取中，不能再点 |
| 2501 | if (item.linging == 1) { | 2512 | if (item.linging == 1) { |
| 2502 | getApp().my_warnning('领取中..', 0, this); | 2513 | getApp().my_warnning('领取中..', 0, this); |
pages/user/Change_phone/Change_phone.js
| @@ -12,10 +12,10 @@ Page({ | @@ -12,10 +12,10 @@ Page({ | ||
| 12 | data: { | 12 | data: { |
| 13 | iurl: r.imghost, | 13 | iurl: r.imghost, |
| 14 | inputxphone: 0, | 14 | inputxphone: 0, |
| 15 | - mobile: 17359580658, //旧手机号码 | 15 | + mobile: null, //旧手机号码 |
| 16 | currentTime: "", //验证码发送倒计时 | 16 | currentTime: "", //验证码发送倒计时 |
| 17 | getvcode: "获取验证码", | 17 | getvcode: "获取验证码", |
| 18 | - wxopenid: "2", | 18 | + wxopenid: null, |
| 19 | isver: 0, //是否有发送验证码 | 19 | isver: 0, //是否有发送验证码 |
| 20 | code: "", //验证码 | 20 | code: "", //验证码 |
| 21 | url: "", //确认更换手机号码跳转路径 | 21 | url: "", //确认更换手机号码跳转路径 |
| @@ -26,8 +26,8 @@ Page({ | @@ -26,8 +26,8 @@ Page({ | ||
| 26 | */ | 26 | */ |
| 27 | onLoad: function(options) { | 27 | onLoad: function(options) { |
| 28 | this.setData({ | 28 | this.setData({ |
| 29 | - // mobile: options.mobile, | ||
| 30 | - //wxOpneId: options.openid | 29 | + mobile: options.mobile, |
| 30 | + wxopenid: options.openid | ||
| 31 | }) | 31 | }) |
| 32 | }, | 32 | }, |
| 33 | //获取手机验证码 | 33 | //获取手机验证码 |
| @@ -37,7 +37,6 @@ Page({ | @@ -37,7 +37,6 @@ Page({ | ||
| 37 | var wxopenid = th.data.wxopenid; | 37 | var wxopenid = th.data.wxopenid; |
| 38 | var change_phone = th.data.change_phone; | 38 | var change_phone = th.data.change_phone; |
| 39 | var isver = th.data.isver; | 39 | var isver = th.data.isver; |
| 40 | - console.log("iiiiiiiiiiiiii" + change_phone + mobile); | ||
| 41 | var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/; | 40 | var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/; |
| 42 | if (mobile.length < 11) { | 41 | if (mobile.length < 11) { |
| 43 | getApp().my_warnning("请输入11位的手机号码", 0, th); | 42 | getApp().my_warnning("请输入11位的手机号码", 0, th); |
| @@ -103,21 +102,25 @@ Page({ | @@ -103,21 +102,25 @@ Page({ | ||
| 103 | var th = this; | 102 | var th = this; |
| 104 | var code = th.data.code; | 103 | var code = th.data.code; |
| 105 | var mobile = th.data.mobile; | 104 | var mobile = th.data.mobile; |
| 106 | - if (th.ver_code() == false) return false; | ||
| 107 | - getApp().request.put("/api/weshop/users/updateMobile/" + r.stoid + '/' + o.user_id + '/' + code + '/' + mobile, { | ||
| 108 | - success: function(res) { | ||
| 109 | - if (res.data.code == 0) { | ||
| 110 | - getApp().my_warnning("更换成功", 0, th); | ||
| 111 | - // th.setData({ | ||
| 112 | - // url: "/pages/user/userinfo/userinfo?change_phone" + change_phone | ||
| 113 | - // }) | ||
| 114 | - } else { | ||
| 115 | - getApp().my_warnning("更换失败", 0, th); | ||
| 116 | - return false; | ||
| 117 | - } | ||
| 118 | - } | ||
| 119 | - }) | 105 | + var change_phone = th.data.change_phone; |
| 106 | + if (change_phone.length > 1) { | ||
| 107 | + mobile = change_phone | ||
| 108 | + } | ||
| 109 | + getApp().request.put("/api/weshop/users/updateMobile/" + r.stoid + '/' + o.user_id + '/' + code + '/' + mobile, { | ||
| 110 | + success: function(res) { | ||
| 111 | + if (res.data.code == 0) { | ||
| 112 | + getApp().my_warnning("更换成功", 0, th); | ||
| 113 | + // th.setData({ | ||
| 114 | + // url: "/pages/user/userinfo/userinfo?change_phone" + change_phone | ||
| 115 | + // }) | ||
| 116 | + } else { | ||
| 117 | + getApp().my_warnning("更换失败", 0, th); | ||
| 118 | + return false; | ||
| 119 | + } | ||
| 120 | 120 | ||
| 121 | + } | ||
| 122 | + }) | ||
| 123 | + | ||
| 121 | }, | 124 | }, |
| 122 | //判断验证码是否正确 | 125 | //判断验证码是否正确 |
| 123 | ver_code: function(e) { | 126 | ver_code: function(e) { |
| @@ -130,10 +133,10 @@ Page({ | @@ -130,10 +133,10 @@ Page({ | ||
| 130 | if (code.length < 3 && code == "") { | 133 | if (code.length < 3 && code == "") { |
| 131 | getApp().my_warnning("请输入正确的验证码", 0, th); | 134 | getApp().my_warnning("请输入正确的验证码", 0, th); |
| 132 | return false; | 135 | return false; |
| 133 | - } else if (getvcode.length<3){ | 136 | + } else if (getvcode.length < 3) { |
| 134 | getApp().my_warnning("验证超时", 0, th); | 137 | getApp().my_warnning("验证超时", 0, th); |
| 135 | return false; | 138 | return false; |
| 136 | - }else { | 139 | + } else { |
| 137 | getApp().request.put("/api/weshop/users/updateMobileFirst/" + r.stoid + '/' + o.user_id + '/' + code, { | 140 | getApp().request.put("/api/weshop/users/updateMobileFirst/" + r.stoid + '/' + o.user_id + '/' + code, { |
| 138 | success: function(res) { | 141 | success: function(res) { |
| 139 | if (res.data.code == 0) { | 142 | if (res.data.code == 0) { |
pages/user/address_list/address_list.wxml
| @@ -63,7 +63,7 @@ | @@ -63,7 +63,7 @@ | ||
| 63 | 63 | ||
| 64 | <!-- 编辑地址图片 --> | 64 | <!-- 编辑地址图片 --> |
| 65 | <view class="edit" bindtap="editAddress" data-id="{{item.address_id}}"> | 65 | <view class="edit" bindtap="editAddress" data-id="{{item.address_id}}"> |
| 66 | - <image src="../../../images/dpr.png"></image> | 66 | + <image src="{{iurl}}/miniapp/images/dpr.png"></image> |
| 67 | </view> | 67 | </view> |
| 68 | </view> | 68 | </view> |
| 69 | 69 |
pages/user/cardinfo/cardinfo.wxss
| @@ -6,9 +6,9 @@ | @@ -6,9 +6,9 @@ | ||
| 6 | height: 100%; | 6 | height: 100%; |
| 7 | } | 7 | } |
| 8 | .box--box_main .box--dian wx-image { | 8 | .box--box_main .box--dian wx-image { |
| 9 | - margin: 0px 0 0 4px; | 9 | + margin: 0px 0 0 10rpx; |
| 10 | 10 | ||
| 11 | - margin-bottom: 4px; | 11 | + margin-bottom: 10rpx; |
| 12 | 12 | ||
| 13 | } | 13 | } |
| 14 | .MemberPlus { | 14 | .MemberPlus { |