境外条码查询数据不一致问题处理

src/views/Search/external.vue

@@ -661,22 +661,14 @@
               <div class="commodityInfo">
                 <div class="commodityInfo-cnt row">
                   <div class="col-lg-12 result-info hrefInfo2">
-                    <p><span>企业名称：</span><span>09506000140445</span></p>
-                    <p><span>地址：</span><span>(en)Sticky's</span></p>
-                    <p><span>网址：</span><span>(en)Sticky's Traditional Strawberry Jam Low Sugar 500 Gram</span></p>
-                    <p><span>License类型：</span><span>(en)http://www.gs1.org/docs/09506000140445_A1C1.jpg</span></p>
-                    <p><span>License Key：</span><span>10000217（Jams/Marmalades(Shelf Stable))</span></p>
-                    <p><span>发码MO：</span><span>500（Gram）</span></p>
-    <!--              <p><span>企业名称：</span><span>{{gs1ResultData.gs1Licence.licenseeName}}</span></p>-->
-    <!--              <p><span>地址：</span><span v-html="addressInfo(gs1ResultData.gs1Licence.address)"></span></p>-->
-    <!--              <p><span>网址：</span><span>{{gs1ResultData.gs1Licence.contactPoint ? gs1ResultData.gs1Licence.contactPoint[0].website : '&#45;&#45;'}}</span></p>-->
-    <!--              <p><span>License类型：</span><span>{{gs1ResultData.gs1Licence.licenceType}}</span></p>-->
-    <!--              <p><span>License Key：</span><span>{{gs1ResultData.gs1Licence.licenceKey}}</span></p>-->
-    <!--              <p><span>发码MO：</span><span>{{gs1ResultData.gs1Licence.licensingMO.moName}}</span></p>-->
-    <!--              </div>-->
+                    <p><span>企业名称：</span><span>{{licenseeDetail.licenseeName || '未知'}}</span></p>
+                    <p><span>地址：</span><span v-html="addressInfo(licenseeDetail.address)"></span></p>
+                    <p><span>网址：</span><span>{{licenseeDetail.contactPoint ? licenseeDetail.contactPoin[0].website : '未知'}}</span></p>
+                    <p><span>License类型：</span><span>{{licenseeDetail.licenceType || '未知'}}</span></p>
+                    <p><span>License Key：</span><span>{{licenseeDetail.licenceKey || '未知'}}</span></p>
+                    <p><span>发码MO：</span><span>{{licenseeDetail.licensingMO.moName || '未知'}}</span></p>
                 </div>
-                <p style="font-size:13px;margin:15px 0 0 0 ;">该License数据由 gs1ResultData moName 提供，并于2023年12月13日最新更新</p>
-    <!--          <p style="font-size:13px;margin:15px 0 0 0 ;">该License数据由{{gs1ResultData.gs1Licence.licensingMO.moName}}提供，并于{{dateFormat(gs1ResultData.gs1Licence.dateUpdated)}}最新更新</p>-->
+                <p style="font-size:13px;margin:15px 0 0 0 ;">该License数据由 {{licenseeDetail.licensingMO.moName}} 提供，并于{{dateFormat(licenseeDetail.dateUpdated)}}最新更新</p>
                 </div>
               </div>
             </el-tab-pane>
@@ -736,7 +728,9 @@ export default {
       addressLocality: '',	// 城市名称
       otherFiled: false,
       qyResultData: '',
-      licenseeDetail: {},
+      licenseeDetail: {
+        licensingMO: {}
+      },
       licenseeDetailDialog: false,
       // countryList: countryListFunc()
       countryList: []
@@ -751,7 +745,7 @@ export default {
     ...mapState(["urls"]),
     addressInfo: () => {
       return (address) => {
-        const {postalName, addressLocality, addressRegion, addressSuburb, streetAddress, postalCode} = {
+        const {postalName, addressLocality, addressRegion, addressSuburb, streetAddress, postalCode, countryCode} = {
           postalName: {language: '', value: ''},
           addressLocality: {language: '', value: ''},
           addressRegion: {language: '', value: ''},
@@ -760,8 +754,11 @@ export default {
           ...address
         }
         const language = addressLocality.language || addressRegion.language || addressSuburb.language || streetAddress.language
-        // return `(${language}) ${streetAddress.value} ${ addressLocality.value} ${addressRegion.value}`
-        return `${postalName.value}<br/>(${language}) ${streetAddress.value} ${ addressLocality.value} ${addressRegion.value}<br/>${postalCode}`
+        if (postalName.value || language || streetAddress.value || addressLocality.value || addressRegion.value || postalCode) {
+          return `${postalName.value ? postalName.value+'<br/>' : ''}(${language || ''}) ${streetAddress.value || ''} ${addressLocality.value || ''} ${addressRegion.value || ''}<br/>${postalCode || ''}<br/>${countryCode || ''}`
+        } else {
+          return '未知'
+        }
       }
     },
     dateFormat: () => {
@@ -989,6 +986,7 @@ export default {
     },
     async searchQY() {
       this.qyResultData = ''
+      this.currPage = 1
       this.errorMsg ='正在查询……'
       const params = {
         countryCode: this.countryCode,
@@ -1021,6 +1019,7 @@ export default {
     },
     licenseeDialogShow(licenseeInfo) {
       console.log('企业基本信息', licenseeInfo)
+      this.licenseeDetail = licenseeInfo
       this.licenseeDetailDialog = true
     },
     async handleSearch() {