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

iceling
2 parents a8d5817a d1b09054
Showing 5 changed files with 23 additions and 10 deletions
components/diy_nav/diy_nav.wxml
components/nav_box_card/nav_box.wxss
pages/goods/goodsInfo/goodsInfo.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);
@@ -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 {