Merge branch 'feature/trippest'

webht/third_party/trippestOrderSync/views/order_report_precheck.php

@@ -282,7 +282,7 @@
                                 ?>
                             </td>
                             <td <?php echo abs($ep['HT_receipt_err']) <= 1 ? "" : 'class=bgred'; ?>>
-                                <?php echo $ep['HT_receipt_err']; ?>
+                                <?php echo "<p>" . $ep['HT_receipt_err'] . "</p>"; ?>
                                 <?php if ($ep['HT_receipt_err']==$ep['refund']) {
                                     echo "<p>地接账单未更新退款: " . $ep['refund'] . "</p>";
                                     echo "<p class=\"text-left\">" . $ep["COLI_Memo"] . "</p>";
@@ -294,7 +294,7 @@
                                 } elseif ($ep['HT_receipt_err'] > 0) {
                                     echo "<p class=\"text-left\">" . $ep["refund_memo"] . "</p>";
                                 } elseif ($ep['other_price'] !== NULL) {
-                                    echo "<p>其他供应商接待的报价</p><p>或综费结算部分</p><p>" . $ep['COLI_Currency'] . " " . $ep['other_price'] . "</p>";
+                                    echo "<p>其他供应商接待的报价<br>或综费结算部分<br>" . $ep['COLI_Currency'] . " " . $ep['other_price'] . "</p>";
                                 } elseif ($ep['vendor_order'] !== null) {
                                     // echo "<p>数据未更新, 请到HT中操作.</p>";
                                 }