Merge branch 'master' of http://git.huaml.com/zhh/front-end

hdApp/src/admin/goods/list.vue

@@ -25,8 +25,11 @@
               <view class="goods-list" v-for="(goodsItem, idx) in list.data" :key="idx">
                 <view class="goods-list-top" @click="edit(goodsItem.id)">
                   <view class="img-blo">
-                    <view v-if="goodsItem.stock <= 0" class="sold-out">
-                      <view class="sold-out-xj">已下架</view>
+                    <view v-if="goodsItem.stock <= 0 || goodsItem.status == 0" class="sold-out">
+                      <view class="sold-out-xj">
+                        已下架
+                        <view v-if="goodsItem.stock != 0 && goodsItem.status == 0">(商城隐藏)</view>
+                      </view>
                     </view>
                     <img :src="goodsItem.smallCover" mode="aspectFit" />
                   </view>
@@ -432,7 +435,10 @@ page {
           color:white;
           text-align:center;
           .sold-out-xj{
-            line-height:130upx;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            height: 130upx;
             font-size:24upx;
           }
         }