Commit 722c132e25e657e5e6f4906f0e6dd70845a00f02
1 parent
a20a0a44
商品分类修改级商品结算
Showing
6 changed files
with
171 additions
and
127 deletions
pages/cart/cart2/cart2.js
| @@ -6,7 +6,7 @@ var util_pay = require("../../../utils/pay.js"); | @@ -6,7 +6,7 @@ var util_pay = require("../../../utils/pay.js"); | ||
| 6 | 6 | ||
| 7 | Page({ | 7 | Page({ | 
| 8 | data: { | 8 | data: { | 
| 9 | - url: t.globalData.setting.url, | 9 | + url: t.globalData.setting.url, | 
| 10 | resourceUrl: t.globalData.setting.resourceUrl, | 10 | resourceUrl: t.globalData.setting.resourceUrl, | 
| 11 | imgUrl: t.globalData.setting.imghost, | 11 | imgUrl: t.globalData.setting.imghost, | 
| 12 | goods: null, | 12 | goods: null, | 
| @@ -997,9 +997,10 @@ Page({ | @@ -997,9 +997,10 @@ Page({ | ||
| 997 | // order_sn: data.data, | 997 | // order_sn: data.data, | 
| 998 | //}, 1); | 998 | //}, 1); | 
| 999 | util_pay.pay(data.data, function() { | 999 | util_pay.pay(data.data, function() { | 
| 1000 | + app.my_warnning("支付成功",1,th); | ||
| 1000 | setTimeout(function () { | 1001 | setTimeout(function () { | 
| 1001 | wx.navigateTo({ | 1002 | wx.navigateTo({ | 
| 1002 | - url: "/pages/payment/pay_success/pay_success?type="+2+"&order_sn="+data.data, | 1003 | + url: "/pages/user/order_list/order_list" | 
| 1003 | }) | 1004 | }) | 
| 1004 | },1000) | 1005 | },1000) | 
| 1005 | 1006 | 
pages/cart/cart2/cart2.wxml
| @@ -3,21 +3,23 @@ | @@ -3,21 +3,23 @@ | ||
| 3 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> | 3 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> | 
| 4 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> | 4 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> | 
| 5 | <form bindsubmit="submitForm"> | 5 | <form bindsubmit="submitForm"> | 
| 6 | - <view class="container"> | 6 | + <view class="container"> | 
| 7 | <!--要进行判断地址是否显示----> | 7 | <!--要进行判断地址是否显示----> | 
| 8 | <view bindtap="enterAddressPage" class="user-mes" | 8 | <view bindtap="enterAddressPage" class="user-mes" | 
| 9 | hidden='{{(bn_exp_type==1 && is_b_now==1) || (is_all_zt==1 && is_b_now==0)}}'> | 9 | hidden='{{(bn_exp_type==1 && is_b_now==1) || (is_all_zt==1 && is_b_now==0)}}'> | 
| 10 | <!---默认地址显示------> | 10 | <!---默认地址显示------> | 
| 11 | <block wx:if="{{user_addr!=null}}"> | 11 | <block wx:if="{{user_addr!=null}}"> | 
| 12 | - <view class="user-contact">{{user_addr.consignee}}{{' '}}{{user_addr.mobile}}</view> | 12 | + | 
| 13 | + <view class="user-contact"> | ||
| 14 | + <text>收货人:</text>{{user_addr.consignee}}{{' '}}{{user_addr.mobile}}</view> | ||
| 13 | <view class="location"> | 15 | <view class="location"> | 
| 14 | <view class="address">{{user_addr.more_address}}{{' '}}{{user_addr.address}}</view> | 16 | <view class="address">{{user_addr.more_address}}{{' '}}{{user_addr.address}}</view> | 
| 15 | <view class="pos-icon"> | 17 | <view class="pos-icon"> | 
| 16 | - <image class="wh100" src="{{imgUrl}}/miniapp/images/iconfont-address.png"></image> | 18 | + <image class="wh100" src="{{imgUrl}}/miniapp/images/goodscategory/new_position.png"></image> | 
| 17 | </view> | 19 | </view> | 
| 18 | </view> | 20 | </view> | 
| 19 | <view class="update-logistics"> | 21 | <view class="update-logistics"> | 
| 20 | - <image class="arrow-rigth" src="{{imgUrl}}/miniapp/images/icon-arrowdown.png"></image> | 22 | + <image class="arrow-rigth" src="{{imgUrl}}/miniapp/images/new_position.png"></image> | 
| 21 | </view> | 23 | </view> | 
| 22 | </block> | 24 | </block> | 
| 23 | <!---先增地址------> | 25 | <!---先增地址------> | 
| @@ -32,7 +34,8 @@ | @@ -32,7 +34,8 @@ | ||
| 32 | <!---------------------购物车进来,有可能多单----------------------> | 34 | <!---------------------购物车进来,有可能多单----------------------> | 
| 33 | <block wx:if="{{is_b_now==0}}"> | 35 | <block wx:if="{{is_b_now==0}}"> | 
| 34 | <view wx:for="{{cartlist}}" wx:for-index="pidx"> | 36 | <view wx:for="{{cartlist}}" wx:for-index="pidx"> | 
| 35 | - <view class="use-item bfff"> | 37 | + <view class="use-item bfff"> | 
| 38 | + | ||
| 36 | <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店:{{item.pname}}</view></view> | 39 | <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店:{{item.pname}}</view></view> | 
| 37 | <view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items"> | 40 | <view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items"> | 
| 38 | <!----商品图片-----> | 41 | <!----商品图片-----> | 
| @@ -47,12 +50,17 @@ | @@ -47,12 +50,17 @@ | ||
| 47 | <text wx:if="{{items.goods_spec!='' && items.goods_spec!=null }}">{{items.goods_spec}}/</text> | 50 | <text wx:if="{{items.goods_spec!='' && items.goods_spec!=null }}">{{items.goods_spec}}/</text> | 
| 48 | {{items.goods_color==null?"":items.goods_color}} | 51 | {{items.goods_color==null?"":items.goods_color}} | 
| 49 | </view> | 52 | </view> | 
| 50 | - </navigator> | ||
| 51 | - <!-----商品名称规格------> | ||
| 52 | - <view class="order-num"> | ||
| 53 | - <view class="co-red">¥{{items.goods_price}}</view> | 53 | + <!-- 商品属性 --> | 
| 54 | + <view class="flex fs28 xc-ash">商品属性: <view></view></view> | ||
| 55 | + | ||
| 56 | + | ||
| 57 | + <!-----商品名称规格------> | ||
| 58 | + <view class="order-num flex-space-between"> | ||
| 59 | + <view class="co-red">¥<text class="fs36">{{filters.toFix(items.goods_price,2)}}</text></view> | ||
| 54 | <view class="goods-num">x{{items.goods_num}}</view> | 60 | <view class="goods-num">x{{items.goods_num}}</view> | 
| 55 | </view> | 61 | </view> | 
| 62 | + </navigator> | ||
| 63 | + | ||
| 56 | </view> | 64 | </view> | 
| 57 | 65 | ||
| 58 | <!-----使用优惠券------> | 66 | <!-----使用优惠券------> | 
| @@ -90,11 +98,11 @@ | @@ -90,11 +98,11 @@ | ||
| 90 | </picker> --> | 98 | </picker> --> | 
| 91 | </view> | 99 | </view> | 
| 92 | </view> | 100 | </view> | 
| 93 | - <view class="coupon-mes"> | ||
| 94 | - <view>用户备注(50字)</view> | 101 | + <view class="coupon-mes flex-vertical"> | 
| 102 | + <view>留言</view> | ||
| 95 | <view class="leave-word"> | 103 | <view class="leave-word"> | 
| 96 | - <textarea bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="50" name="user_note_{{item.pickup_id}}"></textarea> | ||
| 97 | - <view class="max-word">{{maxWord}}/50</view> | 104 | + <textarea placeholder='给商家留言,最多100字'bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note_{{item.pickup_id}}"></textarea> | 
| 105 | + | ||
| 98 | </view> | 106 | </view> | 
| 99 | </view> | 107 | </view> | 
| 100 | </view> | 108 | </view> | 
| @@ -109,7 +117,9 @@ | @@ -109,7 +117,9 @@ | ||
| 109 | 117 | ||
| 110 | <!------立即购买--------> | 118 | <!------立即购买--------> | 
| 111 | <block wx:if="{{is_b_now==1}}"> | 119 | <block wx:if="{{is_b_now==1}}"> | 
| 120 | + <view class="xc-border"></view> | ||
| 112 | <view class="use-item bfff"> | 121 | <view class="use-item bfff"> | 
| 122 | + | ||
| 113 | <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店:{{bn_pickname}}</view></view> | 123 | <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店:{{bn_pickname}}</view></view> | 
| 114 | <view class="order-detail"> | 124 | <view class="order-detail"> | 
| 115 | <view class="goods-img"> | 125 | <view class="goods-img"> | 
| @@ -120,11 +130,18 @@ | @@ -120,11 +130,18 @@ | ||
| 120 | <view class="goods-color"> | 130 | <view class="goods-color"> | 
| 121 | <text wx:if="{{bn_goods.goods_spec!=''}}">{{bn_goods.goods_spec}}/</text>{{bn_goods.goods_color}} | 131 | <text wx:if="{{bn_goods.goods_spec!=''}}">{{bn_goods.goods_spec}}/</text>{{bn_goods.goods_color}} | 
| 122 | </view> | 132 | </view> | 
| 123 | - </navigator> | ||
| 124 | - <view class="order-num"> | ||
| 125 | - <view class="co-red">¥{{bn_goods.shop_price}}</view> | 133 | + <!-- 商品属性 --> | 
| 134 | + <view class="flex fs28 xc-ash">商品属性: <view></view></view> | ||
| 135 | + | ||
| 136 | + | ||
| 137 | + <!-----商品名称规格------> | ||
| 138 | + | ||
| 139 | + <view class="order-num flex-space-between"> | ||
| 140 | + <view class="co-red">¥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view> | ||
| 126 | <view class="goods-num">x{{bn_goods.buynum}}</view> | 141 | <view class="goods-num">x{{bn_goods.buynum}}</view> | 
| 127 | </view> | 142 | </view> | 
| 143 | + </navigator> | ||
| 144 | + | ||
| 128 | </view> | 145 | </view> | 
| 129 | <view class="set-mes"> | 146 | <view class="set-mes"> | 
| 130 | <view wx:if="{{order.store_prom}}"><icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}} | 147 | <view wx:if="{{order.store_prom}}"><icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}} | 
| @@ -134,34 +151,40 @@ | @@ -134,34 +151,40 @@ | ||
| 134 | wx:if="{{selected_quan_list && selected_quan_list.length>0}}"> | 151 | wx:if="{{selected_quan_list && selected_quan_list.length>0}}"> | 
| 135 | <view class="work-frame flex-space-between"> | 152 | <view class="work-frame flex-space-between"> | 
| 136 | <view class="work"> | 153 | <view class="work"> | 
| 137 | - 使用优惠券 | 154 | + 优惠券 | 
| 138 | </view> | 155 | </view> | 
| 139 | <view class="xc-right-frame"> | 156 | <view class="xc-right-frame"> | 
| 140 | <text wx:if="{{using_quan[bn_pick].is_nouse}}">不使用</text> | 157 | <text wx:if="{{using_quan[bn_pick].is_nouse}}">不使用</text> | 
| 141 | - <text wx:if="{{using_quan[bn_pick].money}}">{{using_quan[bn_pick].money}}元优惠券</text> | 158 | + <text wx:if="{{using_quan[bn_pick].money}}">¥{{using_quan[bn_pick].money}}元优惠券</text> | 
| 142 | <view class="xc-right"></view> | 159 | <view class="xc-right"></view> | 
| 143 | </view> | 160 | </view> | 
| 144 | </view> | 161 | </view> | 
| 145 | </view> | 162 | </view> | 
| 146 | 163 | ||
| 147 | - <view class="use-item"> | ||
| 148 | - <view bindtap='setexptype' data-t='1' style="display:{{bn_t_exp_t==2?'none':'flex'}};"> | 164 | + <view class="use-item flex-space-between"> | 
| 165 | + <view class="flex"> | ||
| 166 | + <view bindtap='setexptype' data-t='1' style="display:{{bn_t_exp_t==2?'none':'flex;align-items:center;'}};"> | ||
| 149 | <icon color="{{bn_exp_type==1?'red':'gray'}}" size="16" type="success"></icon> | 167 | <icon color="{{bn_exp_type==1?'red':'gray'}}" size="16" type="success"></icon> | 
| 150 | <view class="yu_er">自提</view> | 168 | <view class="yu_er">自提</view> | 
| 151 | </view> | 169 | </view> | 
| 152 | - <view bindtap='setexptype' data-t='0' style="display:{{bn_t_exp_t==1?'none':'flex'}};"> | 170 | + <view bindtap='setexptype' data-t='0' style="display:{{bn_t_exp_t==1?'none':'flex;align-items:center;'}};"> | 
| 153 | <icon color="{{bn_exp_type==0?'red':'gray'}}" size="16" type="success"></icon> | 171 | <icon color="{{bn_exp_type==0?'red':'gray'}}" size="16" type="success"></icon> | 
| 154 | <view class="yu_er">物流</view> | 172 | <view class="yu_er">物流</view> | 
| 155 | </view> | 173 | </view> | 
| 174 | +</view> | ||
| 175 | + <view class="flex-vertical"> | ||
| 176 | + <view class="logistics-name">{{wu_arr[index].name}}</view> | ||
| 177 | + <view class="xc-right"></view> | ||
| 178 | + </view> | ||
| 156 | </view> | 179 | </view> | 
| 157 | 180 | ||
| 158 | - <view class="use-item" hidden='{{bn_exp_type==1}}'> | 181 | + <!-- <view class="use-item" hidden='{{bn_exp_type==1}}'> | 
| 159 | <view>使用物流:</view> | 182 | <view>使用物流:</view> | 
| 160 | - <view >{{wu_arr[index].name}}</view> | 183 | + <view >{{wu_arr[index].name}}</view> --> | 
| 161 | <!-- <picker bindchange="bindPickerChange" value="{{index}}" range="{{wu_arr}}" range-key="name"> | 184 | <!-- <picker bindchange="bindPickerChange" value="{{index}}" range="{{wu_arr}}" range-key="name"> | 
| 162 | 185 | ||
| 163 | </picker> --> | 186 | </picker> --> | 
| 164 | - </view> | 187 | + <!-- </view> --> | 
| 165 | 188 | ||
| 166 | <!-- <view class="use-item"> | 189 | <!-- <view class="use-item"> | 
| 167 | <view>使用积分 : </view> | 190 | <view>使用积分 : </view> | 
| @@ -187,11 +210,11 @@ | @@ -187,11 +210,11 @@ | ||
| 187 | <!-- <input bindblur="keyUpChangePay1" maxlength="20" name="user_money" placeholder="可用余额:{{order.userInfo.user_money}}" type="digit"></input> <button class="use-btn" formType="submit">使用</button>--> | 210 | <!-- <input bindblur="keyUpChangePay1" maxlength="20" name="user_money" placeholder="可用余额:{{order.userInfo.user_money}}" type="digit"></input> <button class="use-btn" formType="submit">使用</button>--> | 
| 188 | </view> | 211 | </view> | 
| 189 | </view> | 212 | </view> | 
| 190 | - <view class="coupon-mes"> | ||
| 191 | - <view>用户备注(50字)</view> | 213 | + <view class="coupon-mes flex-vertical"> | 
| 214 | + <view>留言</view> | ||
| 192 | <view class="leave-word"> | 215 | <view class="leave-word"> | 
| 193 | - <textarea bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="50" name="user_note"></textarea> | ||
| 194 | - <view class="max-word">{{maxWord}}/50</view> | 216 | + <textarea placeholder-class="fs28" placeholder='给商家留言,最多100字' bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note"></textarea> | 
| 217 | + | ||
| 195 | </view> | 218 | </view> | 
| 196 | </view> | 219 | </view> | 
| 197 | </block> | 220 | </block> | 
pages/cart/cart2/cart2.wxss
| @@ -6,6 +6,9 @@ | @@ -6,6 +6,9 @@ | ||
| 6 | } | 6 | } | 
| 7 | .user-contact { | 7 | .user-contact { | 
| 8 | padding: 24rpx 80rpx; | 8 | padding: 24rpx 80rpx; | 
| 9 | + font-weight: 600; | ||
| 10 | + | ||
| 11 | + | ||
| 9 | } | 12 | } | 
| 10 | 13 | ||
| 11 | .location { | 14 | .location { | 
| @@ -59,14 +62,14 @@ | @@ -59,14 +62,14 @@ | ||
| 59 | 62 | ||
| 60 | .goods-img { | 63 | .goods-img { | 
| 61 | float: left; | 64 | float: left; | 
| 62 | - width: 100rpx; | ||
| 63 | - height: 100rpx; | 65 | + width: 191rpx; | 
| 66 | + height: 191rpx; | ||
| 64 | margin: 0 20rpx; | 67 | margin: 0 20rpx; | 
| 65 | } | 68 | } | 
| 66 | 69 | ||
| 67 | .order-cont { | 70 | .order-cont { | 
| 68 | float: left; | 71 | float: left; | 
| 69 | - width: 400rpx; | 72 | + width: 438rpx; | 
| 70 | } | 73 | } | 
| 71 | 74 | ||
| 72 | .goods-name { | 75 | .goods-name { | 
| @@ -82,26 +85,25 @@ | @@ -82,26 +85,25 @@ | ||
| 82 | } | 85 | } | 
| 83 | 86 | ||
| 84 | .order-num { | 87 | .order-num { | 
| 85 | - float: right; | 88 | + margin-top: 25rpx; | 
| 86 | font-size: 24rpx; | 89 | font-size: 24rpx; | 
| 87 | - margin-top: 10rpx; | ||
| 88 | - margin-right: 20rpx; | ||
| 89 | - text-align: right; | ||
| 90 | line-height: 42rpx; | 90 | line-height: 42rpx; | 
| 91 | } | 91 | } | 
| 92 | 92 | ||
| 93 | -.set-mes{background-color: #fff; margin-bottom: 20rpx;} | 93 | +.set-mes{background-color: #fff; } | 
| 94 | .use-item{ | 94 | .use-item{ | 
| 95 | display: flex; | 95 | display: flex; | 
| 96 | align-items: center; | 96 | align-items: center; | 
| 97 | - height: 92rpx; | 97 | + height: 80rpx; | 
| 98 | border-bottom: 1px solid #ddd; | 98 | border-bottom: 1px solid #ddd; | 
| 99 | font-size: 30rpx; | 99 | font-size: 30rpx; | 
| 100 | - padding-left: 20rpx; | 100 | + width:95%; | 
| 101 | +margin:auto; | ||
| 102 | + | ||
| 101 | 103 | ||
| 102 | } | 104 | } | 
| 103 | .use-item>view{ | 105 | .use-item>view{ | 
| 104 | - display: flex;margin-right: 20rpx; | 106 | + display: flex;margin-right: 10rpx; | 
| 105 | } | 107 | } | 
| 106 | .use-item.bfff{ background-color: #fff;} | 108 | .use-item.bfff{ background-color: #fff;} | 
| 107 | .use-item .dp{width: 56rpx; height: 56rpx;} | 109 | .use-item .dp{width: 56rpx; height: 56rpx;} | 
| @@ -134,11 +136,14 @@ | @@ -134,11 +136,14 @@ | ||
| 134 | } | 136 | } | 
| 135 | 137 | ||
| 136 | .coupon-mes { | 138 | .coupon-mes { | 
| 137 | - margin-bottom: 20rpx; | 139 | + height:80rpx; | 
| 138 | padding: 0 20rpx; | 140 | padding: 0 20rpx; | 
| 139 | background-color: #fff; | 141 | background-color: #fff; | 
| 140 | font-size: 30rpx; | 142 | font-size: 30rpx; | 
| 141 | color: #444; | 143 | color: #444; | 
| 144 | + width: 100%; | ||
| 145 | +border-bottom: 10rpx solid #eee; | ||
| 146 | + | ||
| 142 | } | 147 | } | 
| 143 | 148 | ||
| 144 | .coupon-title { | 149 | .coupon-title { | 
| @@ -165,15 +170,17 @@ | @@ -165,15 +170,17 @@ | ||
| 165 | 170 | ||
| 166 | .leave-word { | 171 | .leave-word { | 
| 167 | position: relative; | 172 | position: relative; | 
| 168 | - margin: 20rpx 0; | 173 | + | 
| 169 | font-size: 24rpx; | 174 | font-size: 24rpx; | 
| 175 | + margin-left: 20rpx; | ||
| 176 | + | ||
| 170 | } | 177 | } | 
| 171 | 178 | ||
| 172 | .word-box { | 179 | .word-box { | 
| 173 | - border: 1px solid #ddd; | ||
| 174 | - width: 690rpx; | 180 | + | 
| 181 | + width: 600rpx; | ||
| 175 | padding: 10rpx; | 182 | padding: 10rpx; | 
| 176 | - height: 120rpx; | 183 | + height: 28rpx; | 
| 177 | line-height: 40rpx; | 184 | line-height: 40rpx; | 
| 178 | } | 185 | } | 
| 179 | 186 | ||
| @@ -279,8 +286,10 @@ | @@ -279,8 +286,10 @@ | ||
| 279 | 286 | ||
| 280 | } | 287 | } | 
| 281 | .xc-coupon-frame .work-frame{ | 288 | .xc-coupon-frame .work-frame{ | 
| 282 | - width: 94%; | 289 | + width: 100%; | 
| 283 | height: 100%; | 290 | height: 100%; | 
| 291 | + border-bottom:3rpx solid #eee; | ||
| 292 | + | ||
| 284 | 293 | ||
| 285 | } | 294 | } | 
| 286 | .xc-right{ | 295 | .xc-right{ | 
| @@ -290,10 +299,10 @@ | @@ -290,10 +299,10 @@ | ||
| 290 | border-right:2rpx solid #000; | 299 | border-right:2rpx solid #000; | 
| 291 | transform:rotate(45deg); | 300 | transform:rotate(45deg); | 
| 292 | display:inline-block; | 301 | display:inline-block; | 
| 293 | - margin-top:30rpx; | 302 | + | 
| 294 | } | 303 | } | 
| 295 | 304 | ||
| 296 | -.xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; color: #d81e06;} | 305 | +.xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; } | 
| 297 | .xc-right-frame{font-size: 30rpx;line-height: 92rpx; margin-right: 10rpx } | 306 | .xc-right-frame{font-size: 30rpx;line-height: 92rpx; margin-right: 10rpx } | 
| 298 | 307 | ||
| 299 | /* 自定义弹出窗口 */ | 308 | /* 自定义弹出窗口 */ | 
| @@ -545,13 +554,13 @@ border-bottom: 1rpx solid #eee; | @@ -545,13 +554,13 @@ border-bottom: 1rpx solid #eee; | ||
| 545 | } | 554 | } | 
| 546 | 555 | ||
| 547 | .xc-rmb-symbol{ | 556 | .xc-rmb-symbol{ | 
| 548 | - font-size:48rpx; | ||
| 549 | - font-weight: bold | 557 | + font-size:40rpx; | 
| 558 | + | ||
| 550 | } | 559 | } | 
| 551 | 560 | ||
| 552 | .xc-rmb-val{ | 561 | .xc-rmb-val{ | 
| 553 | - font-size:78rpx; | ||
| 554 | - font-weight: bolder | 562 | + font-size:60rpx; | 
| 563 | + | ||
| 555 | } | 564 | } | 
| 556 | .coupon-explain{ | 565 | .coupon-explain{ | 
| 557 | font-size:25rpx; | 566 | font-size:25rpx; | 
| @@ -673,7 +682,14 @@ height:auto; | @@ -673,7 +682,14 @@ height:auto; | ||
| 673 | line-height:40rpx; | 682 | line-height:40rpx; | 
| 674 | border-left:1rpx solid #eee; | 683 | border-left:1rpx solid #eee; | 
| 675 | border-right:1rpx solid #eee; | 684 | border-right:1rpx solid #eee; | 
| 676 | -border-bottom:1rpx solid #eee; | 685 | +border-bottom:1rpx solid #eee; | 
| 686 | +margin-left: 6rpx; | ||
| 687 | + | ||
| 688 | +} | ||
| 689 | +.goods-num{ | ||
| 690 | + font-size: 28rpx; | ||
| 691 | +color: #333; | ||
| 692 | + | ||
| 677 | } | 693 | } | 
| 678 | .explain-coupon{ | 694 | .explain-coupon{ | 
| 679 | 695 | ||
| @@ -737,4 +753,13 @@ margin: 0 auto; | @@ -737,4 +753,13 @@ margin: 0 auto; | ||
| 737 | .click-buttem{ | 753 | .click-buttem{ | 
| 738 | width: 90%; | 754 | width: 90%; | 
| 739 | margin: auto; | 755 | margin: auto; | 
| 740 | -} | ||
| 741 | \ No newline at end of file | 756 | \ No newline at end of file | 
| 757 | +} | ||
| 758 | +.logistics-name{ | ||
| 759 | + margin-right:20rpx; | ||
| 760 | +} | ||
| 761 | +.xc-border{ | ||
| 762 | + border-top:5rpx solid #eee; | ||
| 763 | +margin-top:20rpx; | ||
| 764 | +width: 100% | ||
| 765 | + | ||
| 766 | +} | 
pages/goods/categoryList/categoryList.js
| @@ -28,8 +28,7 @@ Page({ | @@ -28,8 +28,7 @@ Page({ | ||
| 28 | is_country:1, | 28 | is_country:1, | 
| 29 | //品牌的控制属性 | 29 | //品牌的控制属性 | 
| 30 | is_brand:1, | 30 | is_brand:1, | 
| 31 | - goodslist: [{ good_name: "你号", logo: "../../ggg.png" }, { good_name: "你号", logo: "../../ggg.png" }, { good_name: "你号", logo: "../../ggg.png" }, { good_name: "海泥面膜", logo: "../../ggg.png" }, { good_name: "男孩女孩", logo: "../../ggg.png" }, { good_name: "你间距", logo: "../../ggg.png" }, { good_name: "你号", logo: "../../ggg.png" }, { good_name: "谢谢谢谢下", logo: "../../ggg.png" }, { good_name: "你号", logo: "../../ggg.png"}], | ||
| 32 | - name: [{ names: "洗护用品" }, { names: "天天护理" }, { names: "共顺利" },{ names: "个人洗护" }, { names: "轻奢" }, { names: "路虎" }, { names: "身体护理" }, { names: "品牌" }, { names: "面部护理" }], | 31 | + | 
| 33 | //选择分类的控制属性 | 32 | //选择分类的控制属性 | 
| 34 | select_classify_on:223, | 33 | select_classify_on:223, | 
| 35 | index:223, | 34 | index:223, | 
| @@ -37,7 +36,7 @@ Page({ | @@ -37,7 +36,7 @@ Page({ | ||
| 37 | brand_list:null,//品牌列表 | 36 | brand_list:null,//品牌列表 | 
| 38 | 37 | ||
| 39 | one_level_classify:[],// 新的版本左边的边分类1级 | 38 | one_level_classify:[],// 新的版本左边的边分类1级 | 
| 40 | - ishaf_three:0//判断有没有3级 | 39 | + is_level_three:0//判断有没有3级 | 
| 41 | }, | 40 | }, | 
| 42 | onLoad: function(tt) { | 41 | onLoad: function(tt) { | 
| 43 | const res = wx.getSystemInfoSync(), | 42 | const res = wx.getSystemInfoSync(), | 
| @@ -143,22 +142,23 @@ Page({ | @@ -143,22 +142,23 @@ Page({ | ||
| 143 | } | 142 | } | 
| 144 | t.setData({ catelist: arr}); | 143 | t.setData({ catelist: arr}); | 
| 145 | }else{ | 144 | }else{ | 
| 146 | - //新的版本 | ||
| 147 | - for (var i = 0; i < dda.length; i++) { | ||
| 148 | - | ||
| 149 | - | 145 | + | 
| 146 | + //---------新的版本---------------- | ||
| 147 | + for (var i = 0; i < dda.length; i++) { | ||
| 150 | //--要排队的元素--- | 148 | //--要排队的元素--- | 
| 151 | var need_to_insert=dda[i]; | 149 | var need_to_insert=dda[i]; | 
| 152 | - | ||
| 153 | if (parseInt(need_to_insert.level) == 1) { | 150 | if (parseInt(need_to_insert.level) == 1) { | 
| 154 | var item = { items: need_to_insert, array: new Array() }//判断数组的长度看看有没有2级菜单 | 151 | var item = { items: need_to_insert, array: new Array() }//判断数组的长度看看有没有2级菜单 | 
| 155 | arr.push(item); | 152 | arr.push(item); | 
| 156 | } else if (parseInt(need_to_insert.level) == 2) { | 153 | } else if (parseInt(need_to_insert.level) == 2) { | 
| 154 | + | ||
| 157 | for (var j = 0; j < arr.length; j++) { | 155 | for (var j = 0; j < arr.length; j++) { | 
| 156 | + | ||
| 157 | + | ||
| 158 | if (parseInt(need_to_insert.parent_id) == parseInt(arr[j].items.id)) { | 158 | if (parseInt(need_to_insert.parent_id) == parseInt(arr[j].items.id)) { | 
| 159 | 159 | ||
| 160 | var ishaf_two = { items: need_to_insert, arrays: new Array() }; | 160 | var ishaf_two = { items: need_to_insert, arrays: new Array() }; | 
| 161 | - arr[j].array.push(ishaf_two); arr.ishaf_two = 0; break; | 161 | + arr[j].array.push(ishaf_two); arr.ishaf_two = 0; | 
| 162 | } | 162 | } | 
| 163 | } | 163 | } | 
| 164 | } else if (parseInt(need_to_insert.level) == 3) {//判断有3级的时候在二级里添加一个数组 | 164 | } else if (parseInt(need_to_insert.level) == 3) {//判断有3级的时候在二级里添加一个数组 | 
| @@ -294,6 +294,7 @@ Page({ | @@ -294,6 +294,7 @@ Page({ | ||
| 294 | go_cate:function(t){ | 294 | go_cate:function(t){ | 
| 295 | var cid= t.currentTarget.dataset.cid; | 295 | var cid= t.currentTarget.dataset.cid; | 
| 296 | var pid = t.currentTarget.dataset.pid; | 296 | var pid = t.currentTarget.dataset.pid; | 
| 297 | + console.log("是这个吗", pid); | ||
| 297 | var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid + "&pid=" + pid; | 298 | var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid + "&pid=" + pid; | 
| 298 | wx.navigateTo({ url: lurl}); | 299 | wx.navigateTo({ url: lurl}); | 
| 299 | }, | 300 | }, | 
| @@ -311,10 +312,6 @@ Page({ | @@ -311,10 +312,6 @@ Page({ | ||
| 311 | var lurl = "/pages/goods/goodsList/goodsList?nation_id=" + cid; | 312 | var lurl = "/pages/goods/goodsList/goodsList?nation_id=" + cid; | 
| 312 | wx.navigateTo({ url: lurl }); | 313 | wx.navigateTo({ url: lurl }); | 
| 313 | }, | 314 | }, | 
| 314 | - | ||
| 315 | - | ||
| 316 | - | ||
| 317 | - | ||
| 318 | //获取国别 | 315 | //获取国别 | 
| 319 | get_nation:function(){ | 316 | get_nation:function(){ | 
| 320 | var s = this; | 317 | var s = this; | 
| @@ -326,8 +323,7 @@ Page({ | @@ -326,8 +323,7 @@ Page({ | ||
| 326 | }, | 323 | }, | 
| 327 | success: function (e) { | 324 | success: function (e) { | 
| 328 | var dda = e.data.data.pageData; | 325 | var dda = e.data.data.pageData; | 
| 329 | - | ||
| 330 | - | 326 | + console.log("国家的数据", dda); | 
| 331 | s.setData({ nationlist:dda}) | 327 | s.setData({ nationlist:dda}) | 
| 332 | } | 328 | } | 
| 333 | }); | 329 | }); | 
| @@ -395,7 +391,6 @@ Page({ | @@ -395,7 +391,6 @@ Page({ | ||
| 395 | //图片失败,默认图片 | 391 | //图片失败,默认图片 | 
| 396 | bind_bnerr: function (e) { | 392 | bind_bnerr: function (e) { | 
| 397 | var _errImg = e.target.dataset.errorimg; | 393 | var _errImg = e.target.dataset.errorimg; | 
| 398 | - console.log(_errImg, "品牌的图片来吗"); | ||
| 399 | var _errObj = {}; | 394 | var _errObj = {}; | 
| 400 | _errObj[_errImg] = this.data.iurl+"/miniapp/images/default_g_img.gif"; | 395 | _errObj[_errImg] = this.data.iurl+"/miniapp/images/default_g_img.gif"; | 
| 401 | this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; | 396 | this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; | 
| @@ -432,7 +427,7 @@ Page({ | @@ -432,7 +427,7 @@ Page({ | ||
| 432 | var cid = e.currentTarget.dataset.cid; | 427 | var cid = e.currentTarget.dataset.cid; | 
| 433 | var pid = e.currentTarget.dataset.pid; | 428 | var pid = e.currentTarget.dataset.pid; | 
| 434 | var arr = e.currentTarget.dataset.arr; | 429 | var arr = e.currentTarget.dataset.arr; | 
| 435 | - | 430 | + console.log("数据是什么",arr); | 
| 436 | if (indexs==220){ | 431 | if (indexs==220){ | 
| 437 | this.get_brand(); | 432 | this.get_brand(); | 
| 438 | } | 433 | } | 
| @@ -446,25 +441,22 @@ Page({ | @@ -446,25 +441,22 @@ Page({ | ||
| 446 | if (arr.length != 0){ | 441 | if (arr.length != 0){ | 
| 447 | 442 | ||
| 448 | for(var i=0;i<arr.length;i++){ | 443 | for(var i=0;i<arr.length;i++){ | 
| 449 | - if(arr[i].arrays.length<0){ | ||
| 450 | - console.log(arr,"二级数据"); | ||
| 451 | - this.setData({select_classify_on: indexs, index: indexs, classify_name: name, goodslist:arr}); | ||
| 452 | - | ||
| 453 | - }else{ | ||
| 454 | - | ||
| 455 | - console.log("aaaaaaaaaaaaaaaaa", arr[i].length); | ||
| 456 | - this.setData({ select_classify_on: indexs, index: indexs, goodslist: arr }); | ||
| 457 | - // if (arr[i].length>0){ | ||
| 458 | - console.log("000000"); | ||
| 459 | - // for (var z = 0;z<arr[i].length;z++){ | ||
| 460 | - // var arr = arr[i]; | ||
| 461 | - // console.log(z,"三级的数据", arr); | ||
| 462 | - // this.setData({ select_classify_on: indexs, index: indexs,goodslist: arr}); | ||
| 463 | - // } | ||
| 464 | - console.log("这是什么东西", this.data.goodslist); | ||
| 465 | - // } | ||
| 466 | - } | ||
| 467 | - // } | 444 | + if (arr[i].arrays.length>0) { | 
| 445 | + console.log("有进来吗5555", ); | ||
| 446 | + this.setData({ is_level_three: 1 }); | ||
| 447 | + break; | ||
| 448 | + } | ||
| 449 | + this.setData({ is_level_three: 0 }); | ||
| 450 | + } | ||
| 451 | + if (this.data.is_level_three!=1) { | ||
| 452 | + console.log("2级"); | ||
| 453 | + this.setData({ select_classify_on: indexs, index: indexs, classify_name: name, goodslist: arr }); | ||
| 454 | + | ||
| 455 | + | ||
| 456 | + } else { | ||
| 457 | + this.setData({ select_classify_on: indexs, index: indexs, goodslist: arr }); | ||
| 458 | + console.log("3级这是什么东西", this.data.goodslist); | ||
| 459 | + | ||
| 468 | } | 460 | } | 
| 469 | } | 461 | } | 
| 470 | } | 462 | } | 
| @@ -496,12 +488,7 @@ Page({ | @@ -496,12 +488,7 @@ Page({ | ||
| 496 | // 允许从相机和相册扫码 | 488 | // 允许从相机和相册扫码 | 
| 497 | wx.scanCode({ | 489 | wx.scanCode({ | 
| 498 | success: (res) => { | 490 | success: (res) => { | 
| 499 | - // var result = res.result; | ||
| 500 | - // console.log("扫一扫返回",result); | ||
| 501 | - // wx.navigateTo({ | ||
| 502 | - | ||
| 503 | - // url: "/pages/goods/search/search?s_key=" + result, | ||
| 504 | - // }); | 491 | + | 
| 505 | } | 492 | } | 
| 506 | }) | 493 | }) | 
| 507 | }, | 494 | }, | 
pages/goods/categoryList/categoryList.wxml
| @@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
| 7 | data-current="1" bindtap="clickTab">国家</view> | 7 | data-current="1" bindtap="clickTab">国家</view> | 
| 8 | <view wx:if="{{is_show_pp}}" class="swiper-tab-item {{currentTab==2?'active':''}}" | 8 | <view wx:if="{{is_show_pp}}" class="swiper-tab-item {{currentTab==2?'active':''}}" | 
| 9 | data-current="2" bindtap="clickTab">品牌</view> | 9 | data-current="2" bindtap="clickTab">品牌</view> | 
| 10 | - </view> | 10 | + </view> | 
| 11 | </view> | 11 | </view> | 
| 12 | 12 | ||
| 13 | <view class="search-box " bindtap="goseach"> | 13 | <view class="search-box " bindtap="goseach"> | 
| @@ -52,7 +52,7 @@ | @@ -52,7 +52,7 @@ | ||
| 52 | <view><image class='n_img' src='{{iurl}}{{bitem.logo}}'></image> | 52 | <view><image class='n_img' src='{{iurl}}{{bitem.logo}}'></image> | 
| 53 | <view class='nation_box'> | 53 | <view class='nation_box'> | 
| 54 | <view class='nt_1'><text class="nt_1_t">{{bitem.name}}</text></view> | 54 | <view class='nt_1'><text class="nt_1_t">{{bitem.name}}</text></view> | 
| 55 | - <view class='nt_2'>enname</view> | 55 | + <view class='nt_2'>{{bitem.enname}}</view> | 
| 56 | </view> | 56 | </view> | 
| 57 | </view> | 57 | </view> | 
| 58 | </view> | 58 | </view> | 
| @@ -125,11 +125,7 @@ | @@ -125,11 +125,7 @@ | ||
| 125 | <view wx:if="{{is_show_gb}}"> | 125 | <view wx:if="{{is_show_gb}}"> | 
| 126 | <view bindtap="click_classify" class="share_type fs32 flex-space-between xc-letter-spacing {{select_classify_on==223?'select_classify':''}}"data-index="223"data-name="国家" wx:if="{{is_country}}"> | 126 | <view bindtap="click_classify" class="share_type fs32 flex-space-between xc-letter-spacing {{select_classify_on==223?'select_classify':''}}"data-index="223"data-name="国家" wx:if="{{is_country}}"> | 
| 127 | <text>国</text><text>家</text> | 127 | <text>国</text><text>家</text> | 
| 128 | - <!-- <view wx:for="{{classify_name}}" wx:for-item="name"wx:for-index="index"> | ||
| 129 | - <view> | ||
| 130 | - {{name}} | ||
| 131 | - </view> | ||
| 132 | - </view> --> | 128 | + | 
| 133 | </view> | 129 | </view> | 
| 134 | </view> | 130 | </view> | 
| 135 | <view wx:if="{{is_show_pp}}"> | 131 | <view wx:if="{{is_show_pp}}"> | 
| @@ -171,10 +167,7 @@ | @@ -171,10 +167,7 @@ | ||
| 171 | <block wx:if="{{select_classify_on==223}}"> | 167 | <block wx:if="{{select_classify_on==223}}"> | 
| 172 | <view class="classify_name fs32 flex-space-between"> | 168 | <view class="classify_name fs32 flex-space-between"> | 
| 173 | <view>{{ishaf_three==1?good_list.name:classify_name}}</view> | 169 | <view>{{ishaf_three==1?good_list.name:classify_name}}</view> | 
| 174 | -<!-- <view class="flex select_more" > | ||
| 175 | - | ||
| 176 | - <view class="bg_right width_height"></view> | ||
| 177 | -</view> --> | 170 | + | 
| 178 | </view> | 171 | </view> | 
| 179 | <view class=" classify_content-frame flex-space-between" > | 172 | <view class=" classify_content-frame flex-space-between" > | 
| 180 | <view bindtap="go_nation" class="country_img-frame rel outer_location"wx:for="{{nationlist}}" wx:for-item="bitem" wx:for-index="pidx" data-nid="{{bitem.id}}" > | 173 | <view bindtap="go_nation" class="country_img-frame rel outer_location"wx:for="{{nationlist}}" wx:for-item="bitem" wx:for-index="pidx" data-nid="{{bitem.id}}" > | 
| @@ -183,28 +176,17 @@ | @@ -183,28 +176,17 @@ | ||
| 183 | <view class='nt_1 t-c line-height'> | 176 | <view class='nt_1 t-c line-height'> | 
| 184 | <text class="nt_1_t height fs24">{{bitem.name}}</text> | 177 | <text class="nt_1_t height fs24">{{bitem.name}}</text> | 
| 185 | </view> | 178 | </view> | 
| 186 | - <view class='nt_2 t-c line-height fs24'>enname</view> | 179 | + <view class='nt_2 t-c line-height fs24'>{{bitem.enname}}</view> | 
| 187 | </view> | 180 | </view> | 
| 188 | </view> | 181 | </view> | 
| 189 | </view> | 182 | </view> | 
| 190 | - | ||
| 191 | -<!-- <view class="classify_content-frame flex-wrap"> | ||
| 192 | - <view class="brand_img_frame t-c ib" data-cid="{{item.items.id}}" data-pid="0"wx:for="{{ishaf_three==1?goodslist.arrays:goodslist}}" wx:for-index="index" wx:for-item="item" bindtap="go_cate"> | ||
| 193 | - <image class="brand_img"src="{{ishaf_three==1?(item.items.icoimg==null?iurl+'/miniapp/images/no_cate_def.png':item.items.icoimg):(item.image==null?iurl+'/miniapp/images/no_cate_def.png':item.image)}}"binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image> | ||
| 194 | - <view class="brand_img_name fs24">{{ishaf_three==1?item.name:item.items.name}}</view> | ||
| 195 | - </view> | ||
| 196 | -</view> --> | ||
| 197 | - | ||
| 198 | </block> | 183 | </block> | 
| 199 | <!-- 品牌 --> | 184 | <!-- 品牌 --> | 
| 200 | <block wx:if="{{select_classify_on==220}}"> | 185 | <block wx:if="{{select_classify_on==220}}"> | 
| 201 | 186 | ||
| 202 | <view class="classify_name fs32 flex-space-between"> | 187 | <view class="classify_name fs32 flex-space-between"> | 
| 203 | <view>{{classify_name}}</view> | 188 | <view>{{classify_name}}</view> | 
| 204 | -<!-- <view class="flex select_more" > | ||
| 205 | - | ||
| 206 | - <view class="bg_right width_height"></view> | ||
| 207 | -</view> --> | 189 | + | 
| 208 | </view> | 190 | </view> | 
| 209 | 191 | ||
| 210 | <view class="classify_content-frame flex flex-wrap"> | 192 | <view class="classify_content-frame flex flex-wrap"> | 
| @@ -222,11 +204,31 @@ | @@ -222,11 +204,31 @@ | ||
| 222 | </block> | 204 | </block> | 
| 223 | </view> | 205 | </view> | 
| 224 | </block> | 206 | </block> | 
| 207 | +<!-- 只是2级的 --> | ||
| 208 | +<block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}"> | ||
| 209 | +<view> | ||
| 210 | +<view class="classify_name fs32 flex-space-between"data-pid="0"data-cid="{{goods.items.id}}" bindtap='select_more'> | ||
| 211 | +<view>{{classify_name}}</view> | ||
| 212 | + <view class="flex select_more" > | ||
| 213 | + <view class="red-co fs32" >选择更多</view> | ||
| 214 | + <view class="bg_right width_height"></view> | ||
| 215 | + </view> | ||
| 216 | +</view> | ||
| 217 | +<view class="classify_content-frame flex-wrap"> | ||
| 218 | +<block wx:for="{{goodslist}}"wx:for-item="goods"wx:for-index="indx"> | ||
| 225 | 219 | ||
| 220 | + <view class="brand_img_frame t-c ib" data-cid="{{goods.items.id}}" data-pid="1" bindtap="go_cate"> | ||
| 221 | + <image class="brand_img"src="{{goods.items.image==null||goods.items.image==''?iurl+'/miniapp/images/no_cate_def.png':goods.items.image}}"binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image> | ||
| 222 | + <view class="brand_img_name fs24">{{goods.items.name}}</view> | ||
| 223 | + </view> | ||
| 226 | 224 | ||
| 225 | +</block> | ||
| 226 | + </view> | ||
| 227 | +</view> | ||
| 227 | 228 | ||
| 228 | -<!-- 商品 --> | ||
| 229 | -<block wx:if="{{select_classify_on!=220&&select_classify_on!=223}}"> | 229 | +</block> | 
| 230 | +<!-- 商品 含有3级的--> | ||
| 231 | +<block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three==1}}"> | ||
| 230 | <block wx:for="{{goodslist}}"wx:for-item="goods"wx:for-index="inds"> | 232 | <block wx:for="{{goodslist}}"wx:for-item="goods"wx:for-index="inds"> | 
| 231 | <view> | 233 | <view> | 
| 232 | 234 | ||
| @@ -242,7 +244,7 @@ | @@ -242,7 +244,7 @@ | ||
| 242 | 244 | ||
| 243 | <block wx:if="{{goods.arrays.length>0}}"> | 245 | <block wx:if="{{goods.arrays.length>0}}"> | 
| 244 | <view class="classify_content-frame flex-wrap"> | 246 | <view class="classify_content-frame flex-wrap"> | 
| 245 | - <view class="brand_img_frame t-c ib" data-cid="{{item.items.id}}" data-pid="0"wx:for="{{goods.arrays}}" wx:for-index="index" wx:for-item="item" bindtap="go_cate"> | 247 | + <view class="brand_img_frame t-c ib" data-cid="{{item.items.id}}" data-pid="2"wx:for="{{goods.arrays}}" wx:for-index="index" wx:for-item="item" bindtap="go_cate"> | 
| 246 | <image class="brand_img"src="{{item.items.icoimg==null?iurl+'/miniapp/images/no_cate_def.png':item.items.icoimg}}"binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image> | 248 | <image class="brand_img"src="{{item.items.icoimg==null?iurl+'/miniapp/images/no_cate_def.png':item.items.icoimg}}"binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image> | 
| 247 | <view class="brand_img_name fs24">{{item.name}}</view> | 249 | <view class="brand_img_name fs24">{{item.name}}</view> | 
| 248 | </view> | 250 | </view> | 
pages/goods/categoryList/categoryList.wxss
| @@ -204,12 +204,14 @@ margin-top: 8rpx; | @@ -204,12 +204,14 @@ margin-top: 8rpx; | ||
| 204 | height: 100%; | 204 | height: 100%; | 
| 205 | border-right: 1rpx solid #eee; | 205 | border-right: 1rpx solid #eee; | 
| 206 | white-space: nowrap; | 206 | white-space: nowrap; | 
| 207 | +overflow: hidden; | ||
| 208 | +overflow-y: scroll; | ||
| 207 | 209 | ||
| 208 | } | 210 | } | 
| 209 | .share_type{ | 211 | .share_type{ | 
| 210 | margin: auto; | 212 | margin: auto; | 
| 211 | width: 58%; | 213 | width: 58%; | 
| 212 | - margin-top: 35rpx; | 214 | + margin-top: 40rpx; | 
| 213 | overflow: hidden; | 215 | overflow: hidden; | 
| 214 | 216 | ||
| 215 | } | 217 | } | 
| @@ -218,7 +220,7 @@ padding-left: 29rpx; | @@ -218,7 +220,7 @@ padding-left: 29rpx; | ||
| 218 | padding-right: 29rpx; | 220 | padding-right: 29rpx; | 
| 219 | width: 51%; | 221 | width: 51%; | 
| 220 | margin: auto; | 222 | margin: auto; | 
| 221 | -margin-top: 35rpx; | 223 | +margin-top: 40rpx; | 
| 222 | 224 | ||
| 223 | 225 | ||
| 224 | } | 226 | } | 
| @@ -291,6 +293,7 @@ width: 60%; | @@ -291,6 +293,7 @@ width: 60%; | ||
| 291 | width:80%; | 293 | width:80%; | 
| 292 | height:70%; | 294 | height:70%; | 
| 293 | left: 70.5%; | 295 | left: 70.5%; | 
| 296 | +overflow: hidden; | ||
| 294 | 297 | ||
| 295 | } | 298 | } | 
| 296 | .nt_1.line-height{ | 299 | .nt_1.line-height{ | 
| @@ -323,12 +326,15 @@ line-height: 65rpx; | @@ -323,12 +326,15 @@ line-height: 65rpx; | ||
| 323 | margin-top: 18rpx; | 326 | margin-top: 18rpx; | 
| 324 | margin-right: 15rpx; | 327 | margin-right: 15rpx; | 
| 325 | 328 | ||
| 329 | + | ||
| 326 | } | 330 | } | 
| 327 | 331 | ||
| 328 | .brand_img{ | 332 | .brand_img{ | 
| 329 | width:100%; | 333 | width:100%; | 
| 330 | height: 61.5%; | 334 | height: 61.5%; | 
| 331 | - margin-bottom: 10rpx | 335 | + margin-bottom: 10rpx; | 
| 336 | + margin-top: 10rpx; | ||
| 337 | + | ||
| 332 | } | 338 | } | 
| 333 | .brand_img-name{ | 339 | .brand_img-name{ | 
| 334 | width: 100%; | 340 | width: 100%; | 
