联合丽格V1.0.2

src/main/resources/templates/supplier-center/order/detail.html

@@ -99,18 +99,16 @@
                             <div class="title-name">
                                 <p>{{  orderInvoice | setInvoiceText }}</p>
                             </div>
-                            <template v-if="orderInvoice && (orderInvoice.type === 2 || orderInvoice.headingType === 1)">
-                                <div class="order-item">
-                                    <p>发票抬头：<span class="none">{{ orderInvoice.invoiceTitle ? orderInvoice.invoiceTitle : '无' }}</span></p>
-                                    <p>单位税号：<span class="none">{{ orderInvoice.corporationTaxNum ? orderInvoice.corporationTaxNum : '无' }}</span> </p>
-                                    <p>注册地址：<span class="none">{{ orderInvoice.registeredAddress ? orderInvoice.registeredAddress : '无' }}</span> </p>
-                                </div>
-                                <div class="order-item">
-                                    <p>注册电话：<span class="none">{{ orderInvoice.registeredPhone ? orderInvoice.registeredPhone : '无' }}</span></p>
-                                    <p>开户银行：<span class="none">{{ orderInvoice.openBank ? orderInvoice.openBank : '无' }}</span></p>
-                                    <p>银行账号：<span class="none">{{ orderInvoice.bankAccountNo ? orderInvoice.bankAccountNo : '无' }}</span></p>
-                                </div>
-                            </template>
+                            <div class="order-item">
+                                <p>发票抬头：<span class="none" v-if="orderInvoice.type > 0">{{ orderInvoice.invoiceTitle ? orderInvoice.invoiceTitle : '无' }}</span></p>
+                                <p>单位税号：<span class="none" v-if="orderInvoice.type === 2 || orderInvoice.headingType === 1">{{ orderInvoice.corporationTaxNum ? orderInvoice.corporationTaxNum : '无' }}</span> </p>
+                                <p>注册地址：<span class="none" v-if="orderInvoice.type === 2 || orderInvoice.headingType === 1">{{ orderInvoice.registeredAddress ? orderInvoice.registeredAddress : '无' }}</span> </p>
+                            </div>
+                            <div class="order-item" v-if="orderInvoice.type === 2 || orderInvoice.headingType === 1">
+                                <p>注册电话：<span class="none">{{ orderInvoice.registeredPhone ? orderInvoice.registeredPhone : '无' }}</span></p>
+                                <p>开户银行：<span class="none">{{ orderInvoice.openBank ? orderInvoice.openBank : '无' }}</span></p>
+                                <p>银行账号：<span class="none">{{ orderInvoice.bankAccountNo ? orderInvoice.bankAccountNo : '无' }}</span></p>
+                            </div>
                         </div>
                     </div>
                     <div class="order-info" v-if="voucher.length > 0">

src/main/resources/templates/supplier-center/order/settlement.html

@@ -132,7 +132,8 @@
                         <el-table-column label="退款状态" align="center" prop="refundType" width="120">
                             <template slot-scope="{row}">
                                 <el-tag v-if="row.refundStatus*1===1" type="info" size="small">无退款</el-tag>
-                                <el-tag v-else-if="row.refundStatus*1===2" type="info" size="small">有退款</el-tag>
+                                <el-tag v-else-if="row.refundStatus*1===2" type="warning" size="small">部分退款</el-tag>
+                                <el-tag v-else-if="row.refundStatus*1===3" type="success" size="small">已退款</el-tag>
                             </template>
                         </el-table-column>
                         <el-table-column label="退款金额" align="center" prop="payTotalFee" width="200">

src/main/resources/templates/user-center/order/detail.html

@@ -157,18 +157,16 @@
                                 <div class="order-item">
                                     <p>{{  orderInvoice | setInvoiceText }}</p>
                                 </div>
-                                <template v-if="orderInvoice && (orderInvoice.type === 2 || orderInvoice.headingType === 1)">
-                                    <div class="order-item">
-                                        <p>发票抬头：<span class="none">{{ orderInvoice.invoiceTitle ? orderInvoice.invoiceTitle : '无' }}</span></p>
-                                        <p>单位税号：<span class="none">{{ orderInvoice.corporationTaxNum ? orderInvoice.corporationTaxNum : '无' }}</span> </p>
-                                        <p>注册地址：<span class="none">{{ orderInvoice.registeredAddress ? orderInvoice.registeredAddress : '无' }}</span> </p>
-                                    </div>
-                                    <div class="order-item">
-                                        <p>注册电话：<span class="none">{{ orderInvoice.registeredPhone ? orderInvoice.registeredPhone : '无' }}</span></p>
-                                        <p>开户银行：<span class="none">{{ orderInvoice.openBank ? orderInvoice.openBank : '无' }}</span></p>
-                                        <p>银行账号：<span class="none">{{ orderInvoice.bankAccountNo ? orderInvoice.bankAccountNo : '无' }}</span></p>
-                                    </div>
-                                </template>
+                                <div class="order-item">
+                                    <p>发票抬头：<span class="none" v-if="orderInvoice.type > 0">{{ orderInvoice.invoiceTitle ? orderInvoice.invoiceTitle : '无' }}</span></p>
+                                    <p>单位税号：<span class="none" v-if="orderInvoice.type === 2 || orderInvoice.headingType === 1">{{ orderInvoice.corporationTaxNum ? orderInvoice.corporationTaxNum : '无' }}</span> </p>
+                                    <p>注册地址：<span class="none" v-if="orderInvoice.type === 2 || orderInvoice.headingType === 1">{{ orderInvoice.registeredAddress ? orderInvoice.registeredAddress : '无' }}</span> </p>
+                                </div>
+                                <div class="order-item" v-if="orderInvoice.type === 2 || orderInvoice.headingType === 1">
+                                    <p>注册电话：<span class="none">{{ orderInvoice.registeredPhone ? orderInvoice.registeredPhone : '无' }}</span></p>
+                                    <p>开户银行：<span class="none">{{ orderInvoice.openBank ? orderInvoice.openBank : '无' }}</span></p>
+                                    <p>银行账号：<span class="none">{{ orderInvoice.bankAccountNo ? orderInvoice.bankAccountNo : '无' }}</span></p>
+                                </div>
                             </div>
                         </div>
                         <div class="section-showInfo" v-if="voucherList.length > 0">