PC显示发票信息问题处理，结算页面商品宽度调整，后台发票开具条件增加已发货可以开具发票的按钮

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">
         未开发票

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);

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",