Merge branch 'dev/v1.1.70_wmh' of jianyu/jy-mobile into feature/v1.1.70

src/views/invoice/Invoicing.vue

@@ -67,9 +67,9 @@
         <van-field v-model.trim="infoMap.desc" label="开票备注"  @focus="infoCheckMap.desc = ''" :required="requireds.desc"  :errorMessage="infoCheckMap.desc" placeholder="请输入开票备注" v-if="showModule.desc" type="textarea" rows="1" autosize></van-field> 
       </div>
       <div class="j-content">
-        <van-field v-model.trim="infoMap.name" label="联系人"  @focus="infoCheckMap.name = ''"
+        <van-field v-model.trim="infoMap.name" label="收件人"  @focus="infoCheckMap.name = ''"
           @blur="getCheckMap('name')" :errorMessage="infoCheckMap.name" :required="requireds.name"
-          placeholder="请输入联系人" v-if="showModule.name" ></van-field> 
+          placeholder="请输入收件人" v-if="showModule.name" ></van-field> 
 
 
         <van-field v-model.trim="infoMap.phone" label="联系电话"  @focus="infoCheckMap.phone = ''"
@@ -297,9 +297,9 @@ export default {
     getCheckMap(type) {
       switch (type) {
         case 'name': {
-          this.infoCheckMap.name = this.infoMap.name === '' ? '联系人为必填项' : ''
+          this.infoCheckMap.name = this.infoMap.name === '' ? '收件人为必填项' : ''
           if (this.infoCheckMap.name === '' && !this.checkName) {
-            this.infoCheckMap.name = '请输入正确格式的联系人'
+            this.infoCheckMap.name = '请输入正确格式的收件人'
           }
           break
         }

src/views/invoice/viewInvoice.vue

@@ -37,7 +37,7 @@
           type="textarea" rows="1" autosize readonly></van-field>
       </div>
       <div class="j-content">
-        <van-field v-model.trim="infoMap.name" label="联系人：" :required="requireds.name" v-if="showModule.name"
+        <van-field v-model.trim="infoMap.name" label="收件人：" :required="requireds.name" v-if="showModule.name"
           readonly></van-field>
 
         <van-field v-model.trim="infoMap.phone" label="联系电话：" :required="requireds.phone" readonly></van-field>
@@ -239,7 +239,7 @@ export default {
             this.infoMap.tel = res.data.invoice.company_phone || '--'
             this.infoMap.bank = res.data.invoice.bank_name || '--'
             this.infoMap.bankCode = res.data.invoice.bank_account || '--'
-            this.infoMap.desc = res.data.invoice.remark
+            this.infoMap.desc = res.data.invoice.remark || '--'
             this.infoMap.name = res.data.invoice.recipient || '--'
             this.infoMap.phone = res.data.invoice.phone || '--'
             this.infoMap.email = res.data.invoice.mail || '--'