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 | 6 | |
| 7 | 7 | Page({ |
| 8 | 8 | data: { |
| 9 | - url: t.globalData.setting.url, | |
| 9 | + url: t.globalData.setting.url, | |
| 10 | 10 | resourceUrl: t.globalData.setting.resourceUrl, |
| 11 | 11 | imgUrl: t.globalData.setting.imghost, |
| 12 | 12 | goods: null, |
| ... | ... | @@ -997,9 +997,10 @@ Page({ |
| 997 | 997 | // order_sn: data.data, |
| 998 | 998 | //}, 1); |
| 999 | 999 | util_pay.pay(data.data, function() { |
| 1000 | + app.my_warnning("支付成功",1,th); | |
| 1000 | 1001 | setTimeout(function () { |
| 1001 | 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 | 1005 | },1000) |
| 1005 | 1006 | ... | ... |
pages/cart/cart2/cart2.wxml
| ... | ... | @@ -3,21 +3,23 @@ |
| 3 | 3 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> |
| 4 | 4 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> |
| 5 | 5 | <form bindsubmit="submitForm"> |
| 6 | - <view class="container"> | |
| 6 | + <view class="container"> | |
| 7 | 7 | <!--要进行判断地址是否显示----> |
| 8 | 8 | <view bindtap="enterAddressPage" class="user-mes" |
| 9 | 9 | hidden='{{(bn_exp_type==1 && is_b_now==1) || (is_all_zt==1 && is_b_now==0)}}'> |
| 10 | 10 | <!---默认地址显示------> |
| 11 | 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 | 15 | <view class="location"> |
| 14 | 16 | <view class="address">{{user_addr.more_address}}{{' '}}{{user_addr.address}}</view> |
| 15 | 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 | 19 | </view> |
| 18 | 20 | </view> |
| 19 | 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 | 23 | </view> |
| 22 | 24 | </block> |
| 23 | 25 | <!---先增地址------> |
| ... | ... | @@ -32,7 +34,8 @@ |
| 32 | 34 | <!---------------------购物车进来，有可能多单----------------------> |
| 33 | 35 | <block wx:if="{{is_b_now==0}}"> |
| 34 | 36 | <view wx:for="{{cartlist}}" wx:for-index="pidx"> |
| 35 | - <view class="use-item bfff"> | |
| 37 | + <view class="use-item bfff"> | |
| 38 | + | |
| 36 | 39 | <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店：{{item.pname}}</view></view> |
| 37 | 40 | <view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items"> |
| 38 | 41 | <!----商品图片-----> |
| ... | ... | @@ -47,12 +50,17 @@ |
| 47 | 50 | <text wx:if="{{items.goods_spec!='' && items.goods_spec!=null }}">{{items.goods_spec}}/</text> |
| 48 | 51 | {{items.goods_color==null?"":items.goods_color}} |
| 49 | 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 | 60 | <view class="goods-num">x{{items.goods_num}}</view> |
| 55 | 61 | </view> |
| 62 | + </navigator> | |
| 63 | + | |
| 56 | 64 | </view> |
| 57 | 65 | |
| 58 | 66 | <!-----使用优惠券------> |
| ... | ... | @@ -90,11 +98,11 @@ |
| 90 | 98 | </picker> --> |
| 91 | 99 | </view> |
| 92 | 100 | </view> |
| 93 | - <view class="coupon-mes"> | |
| 94 | - <view>用户备注（50字）</view> | |
| 101 | + <view class="coupon-mes flex-vertical"> | |
| 102 | + <view>留言</view> | |
| 95 | 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 | 106 | </view> |
| 99 | 107 | </view> |
| 100 | 108 | </view> |
| ... | ... | @@ -109,7 +117,9 @@ |
| 109 | 117 | |
| 110 | 118 | <!------立即购买--------> |
| 111 | 119 | <block wx:if="{{is_b_now==1}}"> |
| 120 | + <view class="xc-border"></view> | |
| 112 | 121 | <view class="use-item bfff"> |
| 122 | + | |
| 113 | 123 | <image class="dp" src='{{imgUrl}}/miniapp/images/dianpu.png'> </image> <view>门店：{{bn_pickname}}</view></view> |
| 114 | 124 | <view class="order-detail"> |
| 115 | 125 | <view class="goods-img"> |
| ... | ... | @@ -120,11 +130,18 @@ |
| 120 | 130 | <view class="goods-color"> |
| 121 | 131 | <text wx:if="{{bn_goods.goods_spec!=''}}">{{bn_goods.goods_spec}}/</text>{{bn_goods.goods_color}} |
| 122 | 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 | 141 | <view class="goods-num">x{{bn_goods.buynum}}</view> |
| 127 | 142 | </view> |
| 143 | + </navigator> | |
| 144 | + | |
| 128 | 145 | </view> |
| 129 | 146 | <view class="set-mes"> |
| 130 | 147 | <view wx:if="{{order.store_prom}}"><icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}} |
| ... | ... | @@ -134,34 +151,40 @@ |
| 134 | 151 | wx:if="{{selected_quan_list && selected_quan_list.length>0}}"> |
| 135 | 152 | <view class="work-frame flex-space-between"> |
| 136 | 153 | <view class="work"> |
| 137 | - 使用优惠券 | |
| 154 | + 优惠券 | |
| 138 | 155 | </view> |
| 139 | 156 | <view class="xc-right-frame"> |
| 140 | 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 | 159 | <view class="xc-right"></view> |
| 143 | 160 | </view> |
| 144 | 161 | </view> |
| 145 | 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 | 167 | <icon color="{{bn_exp_type==1?'red':'gray'}}" size="16" type="success"></icon> |
| 150 | 168 | <view class="yu_er">自提</view> |
| 151 | 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 | 171 | <icon color="{{bn_exp_type==0?'red':'gray'}}" size="16" type="success"></icon> |
| 154 | 172 | <view class="yu_er">物流</view> |
| 155 | 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 | 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 | 182 | <view>使用物流：</view> |
| 160 | - <view >{{wu_arr[index].name}}</view> | |
| 183 | + <view >{{wu_arr[index].name}}</view> --> | |
| 161 | 184 | <!-- <picker bindchange="bindPickerChange" value="{{index}}" range="{{wu_arr}}" range-key="name"> |
| 162 | 185 | |
| 163 | 186 | </picker> --> |
| 164 | - </view> | |
| 187 | + <!-- </view> --> | |
| 165 | 188 | |
| 166 | 189 | <!-- <view class="use-item"> |
| 167 | 190 | <view>使用积分 : </view> |
| ... | ... | @@ -187,11 +210,11 @@ |
| 187 | 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 | 211 | </view> |
| 189 | 212 | </view> |
| 190 | - <view class="coupon-mes"> | |
| 191 | - <view>用户备注（50字）</view> | |
| 213 | + <view class="coupon-mes flex-vertical"> | |
| 214 | + <view>留言</view> | |
| 192 | 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 | 218 | </view> |
| 196 | 219 | </view> |
| 197 | 220 | </block> | ... | ... |
pages/cart/cart2/cart2.wxss
| ... | ... | @@ -6,6 +6,9 @@ |
| 6 | 6 | } |
| 7 | 7 | .user-contact { |
| 8 | 8 | padding: 24rpx 80rpx; |
| 9 | + font-weight: 600; | |
| 10 | + | |
| 11 | + | |
| 9 | 12 | } |
| 10 | 13 | |
| 11 | 14 | .location { |
| ... | ... | @@ -59,14 +62,14 @@ |
| 59 | 62 | |
| 60 | 63 | .goods-img { |
| 61 | 64 | float: left; |
| 62 | - width: 100rpx; | |
| 63 | - height: 100rpx; | |
| 65 | + width: 191rpx; | |
| 66 | + height: 191rpx; | |
| 64 | 67 | margin: 0 20rpx; |
| 65 | 68 | } |
| 66 | 69 | |
| 67 | 70 | .order-cont { |
| 68 | 71 | float: left; |
| 69 | - width: 400rpx; | |
| 72 | + width: 438rpx; | |
| 70 | 73 | } |
| 71 | 74 | |
| 72 | 75 | .goods-name { |
| ... | ... | @@ -82,26 +85,25 @@ |
| 82 | 85 | } |
| 83 | 86 | |
| 84 | 87 | .order-num { |
| 85 | - float: right; | |
| 88 | + margin-top: 25rpx; | |
| 86 | 89 | font-size: 24rpx; |
| 87 | - margin-top: 10rpx; | |
| 88 | - margin-right: 20rpx; | |
| 89 | - text-align: right; | |
| 90 | 90 | line-height: 42rpx; |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | -.set-mes{background-color: #fff; margin-bottom: 20rpx;} | |
| 93 | +.set-mes{background-color: #fff; } | |
| 94 | 94 | .use-item{ |
| 95 | 95 | display: flex; |
| 96 | 96 | align-items: center; |
| 97 | - height: 92rpx; | |
| 97 | + height: 80rpx; | |
| 98 | 98 | border-bottom: 1px solid #ddd; |
| 99 | 99 | font-size: 30rpx; |
| 100 | - padding-left: 20rpx; | |
| 100 | + width:95%; | |
| 101 | +margin:auto; | |
| 102 | + | |
| 101 | 103 | |
| 102 | 104 | } |
| 103 | 105 | .use-item>view{ |
| 104 | - display: flex;margin-right: 20rpx; | |
| 106 | + display: flex;margin-right: 10rpx; | |
| 105 | 107 | } |
| 106 | 108 | .use-item.bfff{ background-color: #fff;} |
| 107 | 109 | .use-item .dp{width: 56rpx; height: 56rpx;} |
| ... | ... | @@ -134,11 +136,14 @@ |
| 134 | 136 | } |
| 135 | 137 | |
| 136 | 138 | .coupon-mes { |
| 137 | - margin-bottom: 20rpx; | |
| 139 | + height:80rpx; | |
| 138 | 140 | padding: 0 20rpx; |
| 139 | 141 | background-color: #fff; |
| 140 | 142 | font-size: 30rpx; |
| 141 | 143 | color: #444; |
| 144 | + width: 100%; | |
| 145 | +border-bottom: 10rpx solid #eee; | |
| 146 | + | |
| 142 | 147 | } |
| 143 | 148 | |
| 144 | 149 | .coupon-title { |
| ... | ... | @@ -165,15 +170,17 @@ |
| 165 | 170 | |
| 166 | 171 | .leave-word { |
| 167 | 172 | position: relative; |
| 168 | - margin: 20rpx 0; | |
| 173 | + | |
| 169 | 174 | font-size: 24rpx; |
| 175 | + margin-left: 20rpx; | |
| 176 | + | |
| 170 | 177 | } |
| 171 | 178 | |
| 172 | 179 | .word-box { |
| 173 | - border: 1px solid #ddd; | |
| 174 | - width: 690rpx; | |
| 180 | + | |
| 181 | + width: 600rpx; | |
| 175 | 182 | padding: 10rpx; |
| 176 | - height: 120rpx; | |
| 183 | + height: 28rpx; | |
| 177 | 184 | line-height: 40rpx; |
| 178 | 185 | } |
| 179 | 186 | |
| ... | ... | @@ -279,8 +286,10 @@ |
| 279 | 286 | |
| 280 | 287 | } |
| 281 | 288 | .xc-coupon-frame .work-frame{ |
| 282 | - width: 94%; | |
| 289 | + width: 100%; | |
| 283 | 290 | height: 100%; |
| 291 | + border-bottom:3rpx solid #eee; | |
| 292 | + | |
| 284 | 293 | |
| 285 | 294 | } |
| 286 | 295 | .xc-right{ |
| ... | ... | @@ -290,10 +299,10 @@ |
| 290 | 299 | border-right:2rpx solid #000; |
| 291 | 300 | transform:rotate(45deg); |
| 292 | 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 | 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 | 554 | } |
| 546 | 555 | |
| 547 | 556 | .xc-rmb-symbol{ |
| 548 | - font-size:48rpx; | |
| 549 | - font-weight: bold | |
| 557 | + font-size:40rpx; | |
| 558 | + | |
| 550 | 559 | } |
| 551 | 560 | |
| 552 | 561 | .xc-rmb-val{ |
| 553 | - font-size:78rpx; | |
| 554 | - font-weight: bolder | |
| 562 | + font-size:60rpx; | |
| 563 | + | |
| 555 | 564 | } |
| 556 | 565 | .coupon-explain{ |
| 557 | 566 | font-size:25rpx; |
| ... | ... | @@ -673,7 +682,14 @@ height:auto; |
| 673 | 682 | line-height:40rpx; |
| 674 | 683 | border-left:1rpx solid #eee; |
| 675 | 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 | 694 | .explain-coupon{ |
| 679 | 695 | |
| ... | ... | @@ -737,4 +753,13 @@ margin: 0 auto; |
| 737 | 753 | .click-buttem{ |
| 738 | 754 | width: 90%; |
| 739 | 755 | margin: auto; |
| 740 | -} | |
| 741 | 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 | 28 | is_country:1, |
| 29 | 29 | //品牌的控制属性 |
| 30 | 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 | 33 | select_classify_on:223, |
| 35 | 34 | index:223, |
| ... | ... | @@ -37,7 +36,7 @@ Page({ |
| 37 | 36 | brand_list:null,//品牌列表 |
| 38 | 37 | |
| 39 | 38 | one_level_classify:[],// 新的版本左边的边分类1级 |
| 40 | - ishaf_three:0//判断有没有3级 | |
| 39 | + is_level_three:0//判断有没有3级 | |
| 41 | 40 | }, |
| 42 | 41 | onLoad: function(tt) { |
| 43 | 42 | const res = wx.getSystemInfoSync(), |
| ... | ... | @@ -143,22 +142,23 @@ Page({ |
| 143 | 142 | } |
| 144 | 143 | t.setData({ catelist: arr}); |
| 145 | 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 | 149 | var need_to_insert=dda[i]; |
| 152 | - | |
| 153 | 150 | if (parseInt(need_to_insert.level) == 1) { |
| 154 | 151 | var item = { items: need_to_insert, array: new Array() }//判断数组的长度看看有没有2级菜单 |
| 155 | 152 | arr.push(item); |
| 156 | 153 | } else if (parseInt(need_to_insert.level) == 2) { |
| 154 | + | |
| 157 | 155 | for (var j = 0; j < arr.length; j++) { |
| 156 | + | |
| 157 | + | |
| 158 | 158 | if (parseInt(need_to_insert.parent_id) == parseInt(arr[j].items.id)) { |
| 159 | 159 | |
| 160 | 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 | 164 | } else if (parseInt(need_to_insert.level) == 3) {//判断有3级的时候在二级里添加一个数组 |
| ... | ... | @@ -294,6 +294,7 @@ Page({ |
| 294 | 294 | go_cate:function(t){ |
| 295 | 295 | var cid= t.currentTarget.dataset.cid; |
| 296 | 296 | var pid = t.currentTarget.dataset.pid; |
| 297 | + console.log("是这个吗", pid); | |
| 297 | 298 | var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid + "&pid=" + pid; |
| 298 | 299 | wx.navigateTo({ url: lurl}); |
| 299 | 300 | }, |
| ... | ... | @@ -311,10 +312,6 @@ Page({ |
| 311 | 312 | var lurl = "/pages/goods/goodsList/goodsList?nation_id=" + cid; |
| 312 | 313 | wx.navigateTo({ url: lurl }); |
| 313 | 314 | }, |
| 314 | - | |
| 315 | - | |
| 316 | - | |
| 317 | - | |
| 318 | 315 | //获取国别 |
| 319 | 316 | get_nation:function(){ |
| 320 | 317 | var s = this; |
| ... | ... | @@ -326,8 +323,7 @@ Page({ |
| 326 | 323 | }, |
| 327 | 324 | success: function (e) { |
| 328 | 325 | var dda = e.data.data.pageData; |
| 329 | - | |
| 330 | - | |
| 326 | + console.log("国家的数据", dda); | |
| 331 | 327 | s.setData({ nationlist:dda}) |
| 332 | 328 | } |
| 333 | 329 | }); |
| ... | ... | @@ -395,7 +391,6 @@ Page({ |
| 395 | 391 | //图片失败，默认图片 |
| 396 | 392 | bind_bnerr: function (e) { |
| 397 | 393 | var _errImg = e.target.dataset.errorimg; |
| 398 | - console.log(_errImg, "品牌的图片来吗"); | |
| 399 | 394 | var _errObj = {}; |
| 400 | 395 | _errObj[_errImg] = this.data.iurl+"/miniapp/images/default_g_img.gif"; |
| 401 | 396 | this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; |
| ... | ... | @@ -432,7 +427,7 @@ Page({ |
| 432 | 427 | var cid = e.currentTarget.dataset.cid; |
| 433 | 428 | var pid = e.currentTarget.dataset.pid; |
| 434 | 429 | var arr = e.currentTarget.dataset.arr; |
| 435 | - | |
| 430 | + console.log("数据是什么",arr); | |
| 436 | 431 | if (indexs==220){ |
| 437 | 432 | this.get_brand(); |
| 438 | 433 | } |
| ... | ... | @@ -446,25 +441,22 @@ Page({ |
| 446 | 441 | if (arr.length != 0){ |
| 447 | 442 | |
| 448 | 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 | 488 | // 允许从相机和相册扫码 |
| 497 | 489 | wx.scanCode({ |
| 498 | 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 | data-current="1" bindtap="clickTab">国家</view> |
| 8 | 8 | <view wx:if="{{is_show_pp}}" class="swiper-tab-item {{currentTab==2?'active':''}}" |
| 9 | 9 | data-current="2" bindtap="clickTab">品牌</view> |
| 10 | - </view> | |
| 10 | + </view> | |
| 11 | 11 | </view> |
| 12 | 12 | |
| 13 | 13 | <view class="search-box " bindtap="goseach"> |
| ... | ... | @@ -52,7 +52,7 @@ |
| 52 | 52 | <view><image class='n_img' src='{{iurl}}{{bitem.logo}}'></image> |
| 53 | 53 | <view class='nation_box'> |
| 54 | 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 | 56 | </view> |
| 57 | 57 | </view> |
| 58 | 58 | </view> |
| ... | ... | @@ -125,11 +125,7 @@ |
| 125 | 125 | <view wx:if="{{is_show_gb}}"> |
| 126 | 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 | 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 | 129 | </view> |
| 134 | 130 | </view> |
| 135 | 131 | <view wx:if="{{is_show_pp}}"> |
| ... | ... | @@ -171,10 +167,7 @@ |
| 171 | 167 | <block wx:if="{{select_classify_on==223}}"> |
| 172 | 168 | <view class="classify_name fs32 flex-space-between"> |
| 173 | 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 | 171 | </view> |
| 179 | 172 | <view class=" classify_content-frame flex-space-between" > |
| 180 | 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 | 176 | <view class='nt_1 t-c line-height'> |
| 184 | 177 | <text class="nt_1_t height fs24">{{bitem.name}}</text> |
| 185 | 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 | 180 | </view> |
| 188 | 181 | </view> |
| 189 | 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 | 183 | </block> |
| 199 | 184 | <!-- 品牌 --> |
| 200 | 185 | <block wx:if="{{select_classify_on==220}}"> |
| 201 | 186 | |
| 202 | 187 | <view class="classify_name fs32 flex-space-between"> |
| 203 | 188 | <view>{{classify_name}}</view> |
| 204 | -<!-- <view class="flex select_more" > | |
| 205 | - | |
| 206 | - <view class="bg_right width_height"></view> | |
| 207 | -</view> --> | |
| 189 | + | |
| 208 | 190 | </view> |
| 209 | 191 | |
| 210 | 192 | <view class="classify_content-frame flex flex-wrap"> |
| ... | ... | @@ -222,11 +204,31 @@ |
| 222 | 204 | </block> |
| 223 | 205 | </view> |
| 224 | 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 | 232 | <block wx:for="{{goodslist}}"wx:for-item="goods"wx:for-index="inds"> |
| 231 | 233 | <view> |
| 232 | 234 | |
| ... | ... | @@ -242,7 +244,7 @@ |
| 242 | 244 | |
| 243 | 245 | <block wx:if="{{goods.arrays.length>0}}"> |
| 244 | 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 | 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 | 249 | <view class="brand_img_name fs24">{{item.name}}</view> |
| 248 | 250 | </view> | ... | ... |
pages/goods/categoryList/categoryList.wxss
| ... | ... | @@ -204,12 +204,14 @@ margin-top: 8rpx; |
| 204 | 204 | height: 100%; |
| 205 | 205 | border-right: 1rpx solid #eee; |
| 206 | 206 | white-space: nowrap; |
| 207 | +overflow: hidden; | |
| 208 | +overflow-y: scroll; | |
| 207 | 209 | |
| 208 | 210 | } |
| 209 | 211 | .share_type{ |
| 210 | 212 | margin: auto; |
| 211 | 213 | width: 58%; |
| 212 | - margin-top: 35rpx; | |
| 214 | + margin-top: 40rpx; | |
| 213 | 215 | overflow: hidden; |
| 214 | 216 | |
| 215 | 217 | } |
| ... | ... | @@ -218,7 +220,7 @@ padding-left: 29rpx; |
| 218 | 220 | padding-right: 29rpx; |
| 219 | 221 | width: 51%; |
| 220 | 222 | margin: auto; |
| 221 | -margin-top: 35rpx; | |
| 223 | +margin-top: 40rpx; | |
| 222 | 224 | |
| 223 | 225 | |
| 224 | 226 | } |
| ... | ... | @@ -291,6 +293,7 @@ width: 60%; |
| 291 | 293 | width:80%; |
| 292 | 294 | height:70%; |
| 293 | 295 | left: 70.5%; |
| 296 | +overflow: hidden; | |
| 294 | 297 | |
| 295 | 298 | } |
| 296 | 299 | .nt_1.line-height{ |
| ... | ... | @@ -323,12 +326,15 @@ line-height: 65rpx; |
| 323 | 326 | margin-top: 18rpx; |
| 324 | 327 | margin-right: 15rpx; |
| 325 | 328 | |
| 329 | + | |
| 326 | 330 | } |
| 327 | 331 | |
| 328 | 332 | .brand_img{ |
| 329 | 333 | width:100%; |
| 330 | 334 | height: 61.5%; |
| 331 | - margin-bottom: 10rpx | |
| 335 | + margin-bottom: 10rpx; | |
| 336 | + margin-top: 10rpx; | |
| 337 | + | |
| 332 | 338 | } |
| 333 | 339 | .brand_img-name{ |
| 334 | 340 | width: 100%; | ... | ... |