Merge branch 'qa' into 'master'

Qa See merge request !126

Merge branch 'qa' into 'master'
Qa See merge request !126
后端研发-苏明海
2 parents 3a5e4577 71844ecc
Showing 6 changed files with 31 additions and 21 deletions
pages/cart/cart2/cart2.wxml
pages/cart/cart2_pt/cart2_pt.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/user/order_detail/order_detail.wxml
pages/user/order_list/order_list.wxml
utils/filter.wxs
 <wxs module="filter" src="c_filter.wxs"></wxs>
 <wxs src="filter.wxs" module="util"></wxs>
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
-<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
+
 <form bindsubmit="submitForm">
     <view class="container">  
          <!--要进行判断地址是否显示----> 
@@ -51,11 +51,12 @@
                           <!-- 商品属性 -->
                           <view class="flex-vertical fs28 color-gray n_guige">
                               <view class="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>
+                                  <block><text>{{filters.show_gui_ge(items.goods_spec,items.goods_color)}}</text></block>
+                                  <!--<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>
@@ -173,11 +174,12 @@
                           <!-- 商品属性 -->
                           <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>
+                                  <block><text>{{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}}</text></block>
+                                  <!--<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>
@@ -40,11 +40,9 @@
                           <view class="goods-name">{{bn_goods.goods_name}}</view>
                                <!-- 商品属性 -->
                           <view class="flex-vertical fs28 color-gray n_guige">
-                                 <view class="goods-color">
-                                   <text wx:if="{{bn_goods.goods_spec!=''}}">  {{bn_goods.goods_spec}}/</text>{{bn_goods.goods_color}}
+                                 <view class="goods-color"><text>{{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}}</text>
                           </view></view>
-
                              <!-----商品名称规格------>
                     <view class="order-num flex-space-between">
                         <view class="co-red">￥<text class="fs36">{{filters.toFix(bn_goods.shop_price,2)}}</text></view>
@@ -540,6 +540,10 @@ Page({
           else {
             var gg = "",
               item = t.data.data;
+
+            if(item.goods_spec=="null") item.goods_spec="";
+            if(item.goods_color=="null") item.goods_color="";
+
             if (item.goods_spec != "" && item.goods_color != "") {
               gg = item.goods_spec + "/" + item.goods_color;
             } else if (item.goods_spec != "" || item.goods_color != "") {
@@ -1168,6 +1172,10 @@ Page({
         for (var i = 0; i < arrdata.length; i++) {
           var item = arrdata[i],
             gg = "";
+
+          if(item.goods_spec=="null") item.goods_spec="";
+          if(item.goods_color=="null") item.goods_color="";
+
           if (item.goods_spec != "" && item.goods_color != "") {
             gg = item.goods_spec + "/" + item.goods_color;
           } else if (item.goods_spec != "" || item.goods_color != "") {
@@ -26,7 +26,8 @@
             <navigator class="order-cont" openType="navigate" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
                 <view class="goods-name">{{item.goods_name}}</view>
-                <view class="goods-color">{{item.goods_spec}} {{item.goods_color}}</view>
+                <!--<view class="goods-color">{{item.goods_spec}} {{item.goods_color}}</view>-->
+                <view class="goods-color">{{filters.show_gui_ge(item.goods_spec,item.goods_color)}}</view>
             </navigator>
             <view class="order-num">
@@ -56,9 +56,10 @@
             <view class="flex-space-between">
               <!-- 商品规格 -->
               <view class="Commodity_spec fs28 flex-center">
-                <text class="ellipsis-1" wx:if="{{goods.goods_color.length>1 && goods.goods_spec.length>1}}">{{goods.goods_color+"/"+goods.goods_spec}}</text>
-                <text class="ellipsis-1" wx:elif="{{goods.goods_color.length>1 || goods.goods_spec.length>1}}">{{goods.goods_color==undefined?"":goods.goods_color}}{{goods.goods_spec==undefined?"":goods.goods_spec}}</text>
-                <text class="ellipsis-1" wx:else>规格1</text>
+                <!--<text class="ellipsis-1" wx:if="{{goods.goods_color.length>1 && goods.goods_spec.length>1}}">{{goods.goods_color+"/"+goods.goods_spec}}</text>-->
+                <!--<text class="ellipsis-1" wx:elif="{{goods.goods_color.length>1 || goods.goods_spec.length>1}}">{{goods.goods_color==undefined?"":goods.goods_color}}{{goods.goods_spec==undefined?"":goods.goods_spec}}</text>-->
+                <!--<text class="ellipsis-1" wx:else>规格1</text>-->
+                  <text class="ellipsis-1">{{filters.show_gui_ge(goods.goods_spec, goods.goods_color)}}</text>
               </view>
               <view class="flex-level-right fs26 refund">
                 <!-- 不是整单退的时候 -->
@@ -25,11 +25,11 @@ var filters = {
         },
         show_gui_ge:function(spec,color){
-            if((spec=="" || spec==null)){
-               if((color=="" || color==null)){ return "规格1";
+            if((spec=="" || spec==null || spec=="null")){
+               if((color=="" || color==null || color=="null")){ return "规格1";
                }else{return color; }
             }else{
-               if((color=="" || color==null)){ return spec;
+               if((color=="" || color==null || color=="null")){ return spec;
                }else{ return  spec+"/"+color; }
             }
         }