1 participants
-
Status changed to merged
-
mentioned in commit 61a8f29ff71a46051f5981af6c3733558bafde25
Showing
4 changed files
pages/cart/cart2/cart2.wxml
| @@ -51,8 +51,11 @@ | @@ -51,8 +51,11 @@ | ||
| 51 | <!-- 商品属性 --> | 51 | <!-- 商品属性 --> |
| 52 | <view class="flex-vertical fs28 color-gray n_guige"> | 52 | <view class="flex-vertical fs28 color-gray n_guige"> |
| 53 | <view class="goods-color"> | 53 | <view class="goods-color"> |
| 54 | - <text wx:if="{{items.goods_spec!='' && items.goods_spec!=null }}"> {{items.goods_spec}}</text> | ||
| 55 | - {{items.goods_color==null || items.goods_color=='' ?"":"/"+items.goods_color}} | 54 | + <block wx:if="{{!items.goods_spec && !items.goods_color}}"><text>规格1</text></block> |
| 55 | + <block wx:else> | ||
| 56 | + <text wx:if="{{items.goods_spec!=''}}">{{items.goods_spec}}<text wx:if="{{items.goods_color}}">/</text></text> | ||
| 57 | + <text wx:if="{{items.goods_color}}">{{items.goods_color}}</text> | ||
| 58 | + </block> | ||
| 56 | </view> | 59 | </view> |
| 57 | </view> | 60 | </view> |
| 58 | 61 | ||
| @@ -167,10 +170,16 @@ | @@ -167,10 +170,16 @@ | ||
| 167 | </view> | 170 | </view> |
| 168 | <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}"> | 171 | <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}"> |
| 169 | <view class="goods-name">{{bn_goods.goods_name}}</view> | 172 | <view class="goods-name">{{bn_goods.goods_name}}</view> |
| 170 | - | ||
| 171 | <!-- 商品属性 --> | 173 | <!-- 商品属性 --> |
| 172 | - <view class="flex-vertical fs28 xc-ash">商品属性: <view class="goods-color"> | ||
| 173 | - <text wx:if="{{bn_goods.goods_spec!=''}}"> {{bn_goods.goods_spec}}/</text>{{bn_goods.goods_color}}</view></view> | 174 | + <view class="flex-vertical fs28 xc-ash color-gray n_guige"> |
| 175 | + <view class="goods-color"> | ||
| 176 | + <block wx:if="{{!bn_goods.goods_spec && !bn_goods.goods_color}}"><text>规格1</text></block> | ||
| 177 | + <block wx:else> | ||
| 178 | + <text wx:if="{{bn_goods.goods_spec!=''}}">{{bn_goods.goods_spec}}<text wx:if="{{bn_goods.goods_color}}">/</text></text> | ||
| 179 | + <text wx:if="{{bn_goods.goods_color}}">{{bn_goods.goods_color}}</text> | ||
| 180 | + </block> | ||
| 181 | + </view> | ||
| 182 | + </view> | ||
| 174 | 183 | ||
| 175 | <!-----商品名称规格------> | 184 | <!-----商品名称规格------> |
| 176 | <view class="order-num flex-space-between"> | 185 | <view class="order-num flex-space-between"> |
pages/cart/cart2_pt/cart2_pt.wxml
| @@ -114,7 +114,7 @@ | @@ -114,7 +114,7 @@ | ||
| 114 | <view class="coupon-mes flex-vertical"> | 114 | <view class="coupon-mes flex-vertical"> |
| 115 | <view>留言</view> | 115 | <view>留言</view> |
| 116 | <view class="leave-word"> | 116 | <view class="leave-word"> |
| 117 | - <textarea placeholder-class="fs28" placeholder='给商家留言，最多100字'bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note"></textarea> | 117 | + <input placeholder-class="fs28" placeholder='给商家留言，最多100字'bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note"></input> |
| 118 | 118 | ||
| 119 | </view> | 119 | </view> |
| 120 | </view> | 120 | </view> |
pages/index/index/index.js
| @@ -165,7 +165,7 @@ Page({ | @@ -165,7 +165,7 @@ Page({ | ||
| 165 | //----广告---- | 165 | //----广告---- |
| 166 | var e = this; | 166 | var e = this; |
| 167 | await getApp().request.promiseGet("/api/weshop/ad/list?pid=2&store_id=" + o.stoid, { | 167 | await getApp().request.promiseGet("/api/weshop/ad/list?pid=2&store_id=" + o.stoid, { |
| 168 | - 1:1 | 168 | + data:{enabled:1} |
| 169 | }).then(res=>{ | 169 | }).then(res=>{ |
| 170 | var a = res.data.data; | 170 | var a = res.data.data; |
| 171 | var arr = new Array(); | 171 | var arr = new Array(); |
pages/user/collect_list/collect_list.wxss
| @@ -185,8 +185,8 @@ page { | @@ -185,8 +185,8 @@ page { | ||
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | .commodity .collects_max .collect .collect_image image { | 187 | .commodity .collects_max .collect .collect_image image { |
| 188 | - width: 100%; | ||
| 189 | - height: 100%; | 188 | + width: 183rpx; |
| 189 | + height: 183rpx; | ||
| 190 | } | 190 | } |
| 191 | 191 | ||
| 192 | .commodity .collects_max .collect .attribute { | 192 | .commodity .collects_max .collect .attribute { |
| @@ -198,7 +198,6 @@ page { | @@ -198,7 +198,6 @@ page { | ||
| 198 | .commodity .collects_max .collect .attribute .attribute_name { | 198 | .commodity .collects_max .collect .attribute .attribute_name { |
| 199 | height: 68rpx; | 199 | height: 68rpx; |
| 200 | align-items: center; | 200 | align-items: center; |
| 201 | - width: 474rpx; | ||
| 202 | } | 201 | } |
| 203 | 202 | ||
| 204 | .commodity .collects_max .collect .attribute .attribute_name .name { | 203 | .commodity .collects_max .collect .attribute .attribute_name .name { |