Merge branch 'dev' into 'test'

Dev See merge request !106

Merge branch 'dev' into 'test'
Dev See merge request !106
后端研发-苏明海
2 parents 66f0c2da 829b355b
Showing 4 changed files with 18 additions and 10 deletions
pages/cart/cart2/cart2.wxml
pages/cart/cart2_pt/cart2_pt.wxml
pages/index/index/index.js
pages/user/collect_list/collect_list.wxss
@@ -51,8 +51,11 @@
                           <!-- 商品属性 -->
                           <view class="flex-vertical fs28 color-gray n_guige">
                               <view class="goods-color">
-                                  <text wx:if="{{items.goods_spec!='' && items.goods_spec!=null }}"> {{items.goods_spec}}</text>
-                                  {{items.goods_color==null || items.goods_color=='' ?"":"/"+items.goods_color}}
+                                  <block wx:if="{{!items.goods_spec && !items.goods_color}}"><text>规格1</text></block>
+                                  <block wx:else>
+                                      <text wx:if="{{items.goods_spec!=''}}">{{items.goods_spec}}<text wx:if="{{items.goods_color}}">/</text></text>
+                                      <text wx:if="{{items.goods_color}}">{{items.goods_color}}</text>
+                                  </block>
                               </view>
                           </view>
@@ -167,10 +170,16 @@
                       </view>
                       <navigator class="order-cont" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{bn_goods.goods_id}}">
                           <view class="goods-name">{{bn_goods.goods_name}}</view>
-                        
                           <!-- 商品属性 -->
-                          <view class="flex-vertical fs28 xc-ash">商品属性:   <view class="goods-color"> 
-                                <text wx:if="{{bn_goods.goods_spec!=''}}"> {{bn_goods.goods_spec}}/</text>{{bn_goods.goods_color}}</view></view>
+                          <view class="flex-vertical fs28 xc-ash color-gray n_guige">
+                              <view class="goods-color">
+                                  <block wx:if="{{!bn_goods.goods_spec && !bn_goods.goods_color}}"><text>规格1</text></block>
+                                  <block wx:else>
+                                     <text wx:if="{{bn_goods.goods_spec!=''}}">{{bn_goods.goods_spec}}<text wx:if="{{bn_goods.goods_color}}">/</text></text>
+                                     <text wx:if="{{bn_goods.goods_color}}">{{bn_goods.goods_color}}</text>
+                                  </block>
+                              </view>
+                          </view>
                           <!-----商品名称规格------>
                           <view class="order-num  flex-space-between">
@@ -114,7 +114,7 @@
                 <view class="coupon-mes flex-vertical">
                     <view>留言</view>
                     <view class="leave-word">
-                        <textarea placeholder-class="fs28" placeholder='给商家留言，最多100字'bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note"></textarea>
+                        <input placeholder-class="fs28" placeholder='给商家留言，最多100字'bindinput="keyUpChangeNum" disabled="{{disabled}}" class="word-box" maxlength="100" name="user_note"></input>
                     </view>
                 </view>
@@ -165,7 +165,7 @@ Page({
     //----广告----
     var e = this;
     await getApp().request.promiseGet("/api/weshop/ad/list?pid=2&store_id=" + o.stoid, {
-      1:1
+      data:{enabled:1}
     }).then(res=>{
       var a = res.data.data;
       var arr = new Array();
@@ -185,8 +185,8 @@ page {
 }
 .commodity .collects_max .collect .collect_image image {
-  width: 100%;
-  height: 100%;
+  width: 183rpx;
+  height: 183rpx;
 }
 .commodity .collects_max .collect .attribute {
@@ -198,7 +198,6 @@ page {
 .commodity .collects_max .collect .attribute .attribute_name {
   height: 68rpx;
   align-items: center;
-  width: 474rpx;
 }
 .commodity .collects_max .collect .attribute .attribute_name .name {