Commit 8baa4f22 by Jianli Ou

境外码查询问题处理

parent 513ebadf
......@@ -98,9 +98,9 @@
<p v-else><span>品牌:</span><span>未知</span></p>
<p v-if="GtinResultData.productDescription"><span>产品描述:</span><span>({{GtinResultData.productDescription[0].language}}){{GtinResultData.productDescription[0].value}}</span></p>
<p v-else><span>产品描述:</span><span>未知</span></p>
<p v-if="GtinResultData.productImageUrl"><span>图片URL:</span><span>({{GtinResultData.productImageUrl[0].language}}){{GtinResultData.productImageUrl[0].value}}</span></p>
<p v-if="GtinResultData.productImageUrl"><span>图片URL:</span><span @click="openUrl(GtinResultData.productImageUrl[0].value)" style="cursor: pointer;">({{GtinResultData.productImageUrl[0].language}}){{GtinResultData.productImageUrl[0].value}}</span></p>
<p v-else><span>图片URL:</span><span>未知</span></p>
<p><span>产品类别:</span><span>{{GtinResultData.gpcCategoryCode || '--'}}<br/>{{GtinResultData.gpcCategoryCodeEnName || '--'}}</span></p>
<p><span>产品类别:</span><span>{{GtinResultData.gpcCategoryCode || '未知'}}<br/>{{GtinResultData.gpcCategoryCodeEnName || '未知'}}</span></p>
<p v-if="GtinResultData.netContent"><span>净含量:</span><span>{{GtinResultData.netContent[0].value}}{{GtinResultData.netContent[0].unitCode}}</span></p>
<p v-else><span>净含量:</span><span>未知</span></p>
<p v-if="GtinResultData.netContent"><span>目标市场:</span><span>{{GtinResultData.countryOfSaleCode[0].countrySale}}</span></p>
......@@ -179,7 +179,8 @@
<div class="col-lg-12 result-info hrefInfo2">
<p><span>企业名称:</span><span>{{GtinResultData.gs1Licence.licenseeName}}</span></p>
<p><span>地址:</span><span v-html="addressInfo(GtinResultData.gs1Licence.address)"></span></p>
<p><span>网址:</span><span>{{GtinResultData.gs1Licence.contactPoint ? GtinResultData.gs1Licence.contactPoint[0].website : '--'}}</span></p>
<p v-if="GtinResultData.gs1Licence.contactPoint"><span>网址:</span><span @click="openUrl(GtinResultData.gs1Licence.contactPoint[0].website)" style="cursor: pointer;">{{GtinResultData.gs1Licence.contactPoint[0].website}}</span></p>
<p v-else><span>网址:</span><span>未知</span></p>
<p><span>License类型:</span><span>{{GtinResultData.gs1Licence.licenceType}}</span></p>
<p><span>License Key:</span><span>{{GtinResultData.gs1Licence.licenceKey}}</span></p>
<p><span>发码MO:</span><span>{{GtinResultData.gs1Licence.licensingMO.moName}}</span></p>
......@@ -264,20 +265,26 @@
<p style="font-size:16px;color:#002C6C;margin-top:15px">联系方式</p>
<ul>
<li>
<p><span>邮箱</span><span>{{glnResultData.LEGAL_ENTITY.contactPoint[0].email}}</span></p>
<p v-if="glnResultData.LEGAL_ENTITY.contactPoint[0].email"><span>邮箱</span><span>
<a :href="`mailto:${glnResultData.LEGAL_ENTITY.contactPoint[0].email}`">
{{glnResultData.LEGAL_ENTITY.contactPoint[0].email}}
</a>
</span></p>
<p v-else><span>邮箱</span><span>未知</span></p>
</li>
<li>
<p><span>电话</span><span>{{glnResultData.LEGAL_ENTITY.contactPoint[0].telephone}}</span></p>
</li>
<li>
<p><span>网址</span><span>{{glnResultData.LEGAL_ENTITY.contactPoint[0].website}}</span></p>
<p v-if="glnResultData.LEGAL_ENTITY.contactPoint"><span>网址</span><span @click="openUrl(glnResultData.LEGAL_ENTITY.contactPoint[0].website)">{{glnResultData.LEGAL_ENTITY.contactPoint[0].website}}</span></p>
<p v-else><span>网址</span><span>未知</span></p>
</li>
<li>
<!-- <p><span>可获取语言</span><span>Unknown</span></p>-->
<p><span>可获取语言</span><span>未知</span></p>
</li>
</ul>
<p style="font-size:13px;color:#696D73;margin-top:15px">该数据由Active Test Account企业提供,并于2023年5月2日最新更新</p>
<p style="font-size:13px;color:#696D73;margin-top:15px">该数据由{{glnResultData.gs1Licence.licenseeName}}企业提供,并于{{dateFormat(glnResultData.gs1Licence.dateUpdated)}}最新更新</p>
</el-collapse-item>
<el-collapse-item v-if="glnResultData.FIXED_PHYSICAL_LOCATION" title="固定物理位置" name="2">
<p style="font-size:16px;color:#002C6C;">{{glnResultData.FIXED_PHYSICAL_LOCATION.physicalLocationName[0].value}}</p>
......@@ -331,20 +338,24 @@
<p style="font-size:16px;color:#002C6C;margin-top:15px">联系方式</p>
<ul>
<li>
<p><span>邮箱</span><span>{{glnResultData.FIXED_PHYSICAL_LOCATION.contactPoint[0].email}}</span></p>
<p><span>邮箱</span><span>
<a :href="`mailto:${glnResultData.FIXED_PHYSICAL_LOCATION.contactPoint[0].email}`">
{{glnResultData.FIXED_PHYSICAL_LOCATION.contactPoint[0].email}}
</a>
</span></p>
</li>
<li>
<p><span>电话</span><span>{{glnResultData.FIXED_PHYSICAL_LOCATION.contactPoint[0].telephone}}</span></p>
</li>
<li>
<p><span>网址</span><span>{{glnResultData.FIXED_PHYSICAL_LOCATION.contactPoint[0].website}}</span></p>
<p><span>网址</span><span @click="openUrl(glnResultData.FIXED_PHYSICAL_LOCATION.contactPoint[0].website)">{{glnResultData.FIXED_PHYSICAL_LOCATION.contactPoint[0].website}}</span></p>
</li>
<li>
<!-- <p><span>可获取语言</span><span>Unknown</span></p>-->
<p><span>可获取语言</span><span>未知</span></p>
</li>
</ul>
<p style="font-size:13px;color:#696D73;margin-top:15px">该数据由GS1 Demo Account企业提供,并于2023年5月2日最新更新</p>
<p style="font-size:13px;color:#696D73;margin-top:15px">该数据由{{glnResultData.gs1Licence.licenseeName}}企业提供,并于{{dateFormat(glnResultData.gs1Licence.dateUpdated)}}最新更新</p>
</el-collapse-item>
<el-collapse-item v-if="glnResultData.DIGITAL_LOCATION" title="数字位置" name="3">
<p style="font-size:16px;color:#002C6C;">{{glnResultData.DIGITAL_LOCATION.digitalLocationName[0].value}}</p>
......@@ -386,7 +397,11 @@
<p style="font-size:16px;color:#002C6C;margin-top:15px">联系方式</p>
<ul>
<li>
<p v-if="glnResultData.DIGITAL_LOCATION.contactPoint"><span>邮箱</span><span>{{glnResultData.DIGITAL_LOCATION.contactPoint[0].email || '未知'}}</span></p>
<p v-if="glnResultData.DIGITAL_LOCATION.contactPoint"><span>邮箱</span><span>
<a :href="`mailto:${glnResultData.DIGITAL_LOCATION.contactPoint[0].email}`">
{{glnResultData.DIGITAL_LOCATION.contactPoint[0].email || '未知'}}
</a>
</span></p>
<p v-else><span>邮箱</span><span>未知</span></p>
</li>
<li>
......@@ -394,14 +409,14 @@
<p v-else><span>电话</span><span>未知</span></p>
</li>
<li>
<p v-if="glnResultData.DIGITAL_LOCATION.contactPoint"><span>网址</span><span>{{glnResultData.DIGITAL_LOCATION.contactPoint[0].website || '未知'}}</span></p>
<p v-if="glnResultData.DIGITAL_LOCATION.contactPoint"><span>网址</span><span @click="openUrl(glnResultData.DIGITAL_LOCATION.contactPoint[0].website)">{{glnResultData.DIGITAL_LOCATION.contactPoint[0].website || '未知'}}</span></p>
<p v-else><span>网址</span><span>未知</span></p>
</li>
<li>
<!-- <p><span>可获取语言</span><span>Unknown</span></p>-->
<p><span>可获取语言</span><span>未知</span></p>
</li>
<p style="font-size:13px;color:#696D73;margin-top:15px">该数据由GS1 Demo Account企业提供,并于2023年5月2日最新更新</p>
<p style="font-size:13px;color:#696D73;margin-top:15px">该数据由{{glnResultData.gs1Licence.licenseeName}}企业提供,并于{{dateFormat(glnResultData.gs1Licence.dateUpdated)}}最新更新</p>
</ul>
</el-collapse-item>
<el-collapse-item v-if="glnResultData.links.homepage || glnResultData.links.hasRetailers || glnResultData.links.sustainabilityInfo || glnResultData.links.productSustainabilityInfo || glnResultData.links.recipeInfo" title="链接至其他信息" name="4">
......@@ -450,7 +465,8 @@
<!-- <p><span>发码MO:</span><span>500(Gram)</span></p>-->
<p><span>企业名称:</span><span>{{glnResultData.gs1Licence.licenseeName}}</span></p>
<p><span>地址:</span><span v-html="addressInfo(glnResultData.gs1Licence.address)"></span></p>
<p><span>网址:</span><span>{{glnResultData.gs1Licence.contactPoint ? glnResultData.gs1Licence.contactPoint[0].website : '--'}}</span></p>
<p v-if="glnResultData.gs1Licence.contactPoint"><span>网址:</span><span @click="openUrl(glnResultData.gs1Licence.contactPoint[0].website)" style="cursor: pointer;">{{glnResultData.gs1Licence.contactPoint[0].website}}</span></p>
<p v-else><span>网址:</span><span>未知</span></p>
<p><span>License类型:</span><span>{{glnResultData.gs1Licence.licenceType}}</span></p>
<p><span>License Key:</span><span>{{glnResultData.gs1Licence.licenceKey}}</span></p>
<p><span>发码MO:</span><span>{{glnResultData.gs1Licence.licensingMO.moName}}</span></p>
......@@ -521,7 +537,8 @@
<!-- <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 : '--'}}</span></p>
<p v-if="gs1ResultData.gs1Licence.contactPoint"><span>网址:</span><span @click="openUrl(gs1ResultData.gs1Licence.contactPoint[0].website)" style="cursor: pointer;">{{gs1ResultData.gs1Licence.contactPoint[0].website}}</span></p>
<p v-else><span>网址:</span><span>未知</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>
......@@ -663,7 +680,8 @@
<div class="col-lg-12 result-info hrefInfo2">
<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 v-if="licenseeDetail.contactPoint"><span>网址:</span><span @click="openUrl(licenseeDetail.contactPoint[0].website)" style="cursor: pointer;">{{licenseeDetail.contactPoint[0].website}}</span></p>
<p v-else><span>网址:</span><span>未知</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>
......@@ -745,17 +763,19 @@ export default {
...mapState(["urls"]),
addressInfo: () => {
return (address) => {
const {postalName, addressLocality, addressRegion, addressSuburb, streetAddress, postalCode, countryCode} = {
const {postalName, addressLocality, addressRegion, addressSuburb, streetAddress, streetAddressLine2, postalCode, countryCode} = {
postalName: {language: '', value: ''},
addressLocality: {language: '', value: ''},
addressRegion: {language: '', value: ''},
addressSuburb: {language: '', value: ''},
streetAddress: {language: '', value: ''},
streetAddressLine2: {language: '', value: ''},
...address
}
const language = addressLocality.language || addressRegion.language || addressSuburb.language || streetAddress.language
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 || ''}`
// return `${postalName.value ? postalName.value+'<br/>' : ''}(${language || ''}) ${streetAddress.value || ''} ${addressLocality.value || ''} ${addressRegion.value || ''}<br/>${postalCode || ''}<br/>${countryCode || ''}`
return `${postalName.value ? postalName.value+'<br/>' : ''}${streetAddress.value || ''} ${streetAddressLine2.value || ''}<br/> ${addressLocality.value || ''} ${addressRegion.value || ''}<br/>${postalCode || ''}<br/>${countryCode || ''}`
} else {
return '未知'
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment