wxd / MShopWeApp

Merged
Merge Request #106 · created by 后端研发-苏明海

Dev

From dev into test

Merged by 后端研发-苏明海

1 participants
Inline Side-by-side
Showing 4 changed files
pages/cart/cart2/cart2.wxml
  View file @829b355
... ... @@ -51,8 +51,11 @@
51 51 <!-- 商品属性 -->
52 52 <view class="flex-vertical fs28 color-gray n_guige">
53 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 59 </view>
57 60 </view>
58 61  
... ... @@ -167,10 +170,16 @@
167 170 </view>
168 171 <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}">
169 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 185 <view class="order-num flex-space-between">
... ...
pages/cart/cart2_pt/cart2_pt.wxml
  View file @829b355
... ... @@ -114,7 +114,7 @@
114 114 <view class="coupon-mes flex-vertical">
115 115 <view>留言</view>
116 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 119 </view>
120 120 </view>
... ...
pages/index/index/index.js
  Edit  View file @829b355
... ... @@ -165,7 +165,7 @@ Page({
165 165 //----广告----
166 166 var e = this;
167 167 await getApp().request.promiseGet("/api/weshop/ad/list?pid=2&store_id=" + o.stoid, {
168   - 1:1
  168 + data:{enabled:1}
169 169 }).then(res=>{
170 170 var a = res.data.data;
171 171 var arr = new Array();
... ...
pages/user/collect_list/collect_list.wxss
  View file @829b355
... ... @@ -185,8 +185,8 @@ page {
185 185 }
186 186  
187 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 192 .commodity .collects_max .collect .attribute {
... ... @@ -198,7 +198,6 @@ page {
198 198 .commodity .collects_max .collect .attribute .attribute_name {
199 199 height: 68rpx;
200 200 align-items: center;
201   - width: 474rpx;
202 201 }
203 202  
204 203 .commodity .collects_max .collect .attribute .attribute_name .name {
... ...