Merge branch 'dev/v1.0.40_wmh' of jianyu/web into feature/v1.0.40

apps/mobile/src/views/invoice/Invoicing.vue

@@ -601,6 +601,7 @@ export default {
             this.infoMap.price = data.invoice_money
               ? data.invoice_money / 100
               : 0
+            this.infoMap.code = data.order_code
           }
           this.infoMap.type = this.DigitstoChinese_type(data.invoice_variety)
           this.infoMap.content = data.invoice_content

apps/mobile/src/views/invoice/viewInvoice.vue

@@ -173,7 +173,7 @@
       <p class="b-desc" v-if="desc">{{ desc }}</p>
       <div class="j-button-group">
         <button
-           v-if="!(!this.url && btntext === '查看发票')"
+          v-if="!(!this.url && btntext === '查看发票')"
           :class="{ 'j-button-confirm': true }"
           @click="confirm_ok"
           :disabled="btntext === '开票中'"
@@ -513,7 +513,6 @@ export default {
           }
         })
       } else {
-        this.infoMap.code = this.order_code
         ajaxInvoiceShowList({ ...this.urlparms }).then((res) => {
           loading.clear()
           this.invoiceList = res.invoiceData || []
@@ -546,6 +545,9 @@ export default {
       this.invoiceId = this.chooseInvoice.id
       this.changed = this.chooseInvoice.changed
       this.create_time = this.chooseInvoice.create_time
+      this.infoMap.code = this.chooseInvoice.invoice_order_code
+        ? this.chooseInvoice.invoice_order_code
+        : this.chooseInvoice.order_code
       this.infoMap.type = this.DigitstoChinese_type(
         this.chooseInvoice.invoice_variety
       )