From 97f76849ba2f129602a11c294c4a49584565283d Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Sat, 19 Oct 2019 17:22:20 +0800
Subject: [PATCH] 提交订单的规格的显示

---
 pages/cart/cart2/cart2.wxml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index ff692e0..e281251 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -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,11 +170,14 @@
                       </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 color-gray n_guige">
                               <view class="goods-color">
-                                <text wx:if="{{bn_goods.goods_spec!=''}}"> {{bn_goods.goods_spec}}</text><text wx:if="{{bn_goods.goods_color}}">/</text>{{bn_goods.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>
 
--
libgit2 0.21.4