Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui

buyer/src/components/invoiceModal/index.vue

@@ -92,6 +92,7 @@ import { mobile, email } from '@/plugins/RegExp.js';
 
 export default {
   name: 'invoiceModal',
+  emits: ['change'],
   data () {
     return {
       invoice: 1, // 1 电子普通发票 2 增值税专用发票

buyer/src/pages/Cart.vue

@@ -193,7 +193,7 @@
                 </div>
               </div>
               <div class="error-goods" v-if="goods.errorMessage">
-                <div style="margin-top: 20px">{{ goods.errorMessage }}</div>
+                <div>{{ goods.errorMessage }}</div>
                 <el-button type="primary" @click="delGoods(goods.goodsSku.id)"
                   >删除</el-button
                 >
@@ -785,20 +785,18 @@ export default {
           outline-color: $theme_color;
         }
       }
-    }
-    .error-goods {
-      position: absolute;
-      width: 100%;
-      height: 100%;
-      margin-left: -20px;
-      background-color: rgba($color: #999, $alpha: 0.5);
-      z-index: 10;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding-left: 150px;
-      color: #000;
-      padding-right: 30px;
+      .error-goods {
+        position: absolute;
+        inset: 0;
+        background-color: rgba($color: #999, $alpha: 0.5);
+        z-index: 10;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 0 30px 0 150px;
+        box-sizing: border-box;
+        color: #000;
+      }
     }
   }
   &-footer {

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

@@ -55,7 +55,7 @@
                 <div>
                   <div class="hover-color" @click="goodsDetail(goods.skuId, goods.goodsId)">{{ goods.name }}</div>
                   <div class="mt_10">
-                    <span class="global_color">{{ $filters.unitPrice(goods.goodsPrice, "￥") }} </span>x {{ goods.num }}
+                    <span class="global_color">{{ $filters.unitPrice(goods.goodsPrice, "￥") }} </span> x {{ goods.num }}
                     <span style="margin-left: 10px;color: #ff9900;">{{refundPriceList(goods.isRefund)}}</span>
                   </div>
                   <el-button v-if="goods.commentStatus == 'UNFINISHED'" @click="comment(order.sn, goodsIndex)" size="small" type="success" class="fontsize_12" style="position:relative;top:-22px;left:190px;margin-right:10px">评价</el-button>