!7 优化楼层装修,修复结算页显示失效商品问题

Merge pull request !7 from OceansDeep/dev-gl

buyer/src/components/goodsDetail/ShowGoods.vue

@@ -101,7 +101,7 @@
                 >
                 <span
                   class="item-desc-pintuan"
-                  v-if="promotionMap['FULL_DISCOUNT'].fullRate"
+                  v-if="promotionMap['FULL_DISCOUNT'].fullRate && promotionMap['FULL_DISCOUNT'].fullRateFlag"
                   >满{{ promotionMap["FULL_DISCOUNT"].fullMoney }}元，立享{{
                     promotionMap["FULL_DISCOUNT"].fullRate
                   }}折</span

buyer/src/pages/home/orderCenter/MyOrder.vue

@@ -287,7 +287,7 @@ export default {
     },
     filterOrderStatus (status) { // 获取订单状态中文
       const ob = this.orderStatusList.filter(e => { return e.status === status });
-      return ob[0].name
+      return ob && ob[0] ? ob[0].name : status
     }
   }
 };

buyer/src/pages/payment/Pay.vue

@@ -92,7 +92,7 @@
           <div class="goods-list">
             <div
               class="goods-item"
-              v-for="(goods, goodsIndex) in shop.skuList"
+              v-for="(goods, goodsIndex) in shop.checkedSkuList"
               :key="goodsIndex"
             >
               <span