From f7f836f5fdcc248e9dc17d6c2f5dd682114126dc Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Tue, 26 Oct 2021 10:38:41 +0800
Subject: [PATCH] =?UTF-8?q?PC=E6=98=BE=E7=A4=BA=E5=8F=91=E7=A5=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=EF=BC=8C=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E9=A1=B5=E9=9D=A2=E5=95=86=E5=93=81=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=90=8E=E5=8F=B0=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E5=BC=80=E5=85=B7=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0=E5=B7=B2?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8F=AF=E4=BB=A5=E5=BC=80=E5=85=B7=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/home/orderCenter/OrderDetail.vue  |  8 ++++----
 buyer/src/pages/payment/Pay.vue                   | 11 ++++++++---
 seller/src/views/order/receiptManager/receipt.vue | 12 +++++++-----
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/buyer/src/pages/home/orderCenter/OrderDetail.vue b/buyer/src/pages/home/orderCenter/OrderDetail.vue
index 12732225..98ca4ead 100644
--- a/buyer/src/pages/home/orderCenter/OrderDetail.vue
+++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue
@@ -38,10 +38,10 @@
     </div>
     <div class="order-card">
       <h3>发票信息</h3>
-      <template v-if="order.order.receipt">
-        <p>发票抬头：{{order.order.receiptVO.receiptTitle}}</p>
-        <p>发票内容：{{order.order.receiptVO.receiptContent}}</p>
-        <p v-if="order.order.receiptVO.taxpayerId">纳税人识别号：{{order.order.receiptVO.taxpayerId}}</p>
+      <template v-if="order.receipt">
+        <p>发票抬头：{{order.receipt.receiptTitle}}</p>
+        <p>发票内容：{{order.receipt.receiptContent}}</p>
+        <p v-if="order.receipt.taxpayerId">纳税人识别号：{{order.receipt.taxpayerId}}</p>
       </template>
       <div v-else style="color:#999;margin-left:5px">
         未开发票
diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue
index 88fbb69a..2e9811ab 100644
--- a/buyer/src/pages/payment/Pay.vue
+++ b/buyer/src/pages/payment/Pay.vue
@@ -5,7 +5,7 @@
     <div class="width_1200 logo">
       <div>
         <router-link to="/"
-        ><img :src="$store.state.logoImg" 
+        ><img :src="$store.state.logoImg"
         /></router-link>
         <div>结算页</div>
       </div>
@@ -569,6 +569,9 @@ export default {
 
 <style scoped lang="scss">
 @import "../../assets/styles/coupon.scss";
+.goods-msg{
+  overflow: hidden;
+}
 /** logo start */
 .logo {
   height: 40px;
@@ -772,6 +775,7 @@ export default {
 }
 
 .goods-list {
+  width: 1150px;
   background-color: #f8f8f8;
   margin: 10px 0 20px 0;
 
@@ -800,14 +804,14 @@ export default {
 
     > span:nth-child(1) {
       font-size: 12px;
-     
+
       flex: 1;
       text-align: left;
       >span{
         margin-left: 10px;
       }
     }
-   
+
 
     > span:last-child {
       color: $theme_color;
@@ -897,6 +901,7 @@ export default {
 /** content end */
 /** 底部支付栏 */
 .order-footer {
+  z-index: 20;
   height: 50px;
   @include background_color($light_white_background_color);
   @include title_color($title_color);
diff --git a/seller/src/views/order/receiptManager/receipt.vue b/seller/src/views/order/receiptManager/receipt.vue
index 8d6d0958..6d471832 100644
--- a/seller/src/views/order/receiptManager/receipt.vue
+++ b/seller/src/views/order/receiptManager/receipt.vue
@@ -85,7 +85,7 @@ export default {
         {
           title: "发票内容",
           key: "receiptContent",
-          minWidth: 120,
+          minWidth: 90,
           tooltip: true,
           render: (h, params) => {
             return h("div", params.row.receiptContent || "暂未填写");
@@ -172,10 +172,12 @@ export default {
                   },
                   attrs: {
                     disabled:
-                      params.row.orderStatus == "COMPLETED" &&
-                      params.row.receiptStatus == 0
-                        ? false
-                        : true,
+                      !(
+                        (params.row.orderStatus === "COMPLETED"
+                          ||params.row.orderStatus === "DELIVERED")
+
+                        &&
+                        params.row.receiptStatus === 0),
                   },
                   style: {
                     marginRight: "5px",