Merge branch 'dev_wm' into 'master'

防伪码优化

See merge request !169

H5/src/views/blockChain.vue

@@ -76,6 +76,7 @@
                     scanCode(params).then(res => {
                         if (res.code == 0) {
                             localStorage.setItem("shaValue", res.data);
+                            localStorage.setItem("qrCode", this.shaValue);
                             this.$router.push("/certification");
                         } else {
                             this.$toast.fail(res.message);

H5/src/views/certification.vue

@@ -25,8 +25,8 @@
                <p class="countries">企业名称
                    <span class="countries-class">{{companyName}}</span>
                </p>
-               <p class="countries" style="height: 37px">企业地址
-                   <span class="countries-class">{{companyAddress}}</span>
+               <p class="countries" style="height: 60px">企业地址
+                   <span class="countries-class" style="display:block;overflow-wrap:break-word;">{{companyAddress}}</span>
                </p>
                <p class="countries">企业网址
                    <span class="countries-class">{{companyUrl}}</span>
@@ -34,8 +34,8 @@
                <p class="countries">货运单号
                    <span class="countries-class">{{trackingNumber}}</span>
                </p>
-               <p class="countries" style="height: 53px">物流轨迹查询平台
-                   <span class="countries-class">{{logisticsUrl}}</span>
+               <p class="countries" style="height: 70px">物流轨迹查询平台
+                   <span class="countries-class" style="display:block;overflow-wrap:break-word;">{{logisticsUrl}}</span>
                </p>
                <p class="countries">海关进境备案编号
                    <span class="countries-class">{{recordNumber}}</span>
@@ -47,6 +47,8 @@
             <p class="sum-form"><span>{{shaValue1}}</span></p>
             <p class="sha-name" v-if="shaName == '非正品'" style="color: #ee0a24">{{shaName}}</p>
             <p class="sha-name" v-else style="color: #2bee16">{{shaName}}</p>
+            <p class="sha-time" >{{shaTime}}</p>
+            <p class="sha-sum" >{{shaSum}}</p>
         </van-popup>
     </div>
 </template>
@@ -56,22 +58,25 @@
     export default {
         data() {
             return {
-                brand:'西田森NMN 1300mg',
-                specification:'60粒/瓶',
-                productCountry:'加拿大',
-                produceTime:'2021/1/1',
-                validTime:'2021/1/1',
-                companyName:'日本西田森制药株式会社',
-                companyAddress:'东京都千代田区东神田2丁目6番7号608',
-                trackingNumber:'741741741741',
-                logisticsUrl:'随意随意随意随意随意随意随意随意随意随意随意随意随意随意随意随意随',
-                recordNumber:'4646135146813',
+                brand:'',
+                specification:'',
+                productCountry:'',
+                produceTime:'',
+                validTime:'',
+                companyName:'',
+                companyAddress:'',
+                trackingNumber:'',
+                logisticsUrl:'',
+                recordNumber:'',
                 sheetShow: false,
-                popupName:'本产品采用区块链技术验证防伪链上数据显示',
+                popupName:'',
                 companyUrl:'',
                 shaValue:"",
                 shaValue1:"",
                 shaName:"",
+                shaTime:'',
+                shaSum:'',
+
             };
         },
         created() {
@@ -83,20 +88,24 @@
             //         this.$bridgeToAppFun.navigateBack();
             //     } catch {
             //         this.$router.go(-1);
-            //     }
+            //     }'
             // },
             stCertList(){
                 this.shaValue = localStorage.getItem("shaValue")
                 this.sheetShow = true
-                if(this.shaValue.indexOf("非")){
-                    this.shaValue1 = this.shaValue.substring(0,this.shaValue.length-4);
+                if(!this.shaValue.indexOf("非")){
+                    this.shaValue1 = this.shaValue.substring(0,this.shaValue.length-39);
                     this.shaName = "非正品";
+                    this.shaTime = this.shaValue.split(",")[1]
+                    this.shaSum = this.shaValue.split(",")[2]
                 }else {
-                    this.shaValue1 = this.shaValue.substring(0,this.shaValue.length-3);
+                    this.shaValue1 = this.shaValue.substring(0,this.shaValue.length-39);
                     this.shaName = "正品";
+                    this.shaTime = this.shaValue.split(",")[1]
+                    this.shaSum = this.shaValue.split(",")[2]
                 }
                 const params = {
-                    shaValue: this.shaValue,
+                    shaValue: localStorage.getItem("qrCode"),
                 };
                 productInfo(params).then(res => {
                     if (res.code == 0) {
@@ -211,6 +220,16 @@
                 font-size: 30px;
                 padding-top: 45px;
             }
+            .sha-time{
+                color: #666666;
+                font-size: 13px;
+                padding-left: 40px;
+            }
+            .sha-sum{
+                color: #666666;
+                font-size: 13px;
+                padding-left: 106px;
+            }
         }
     }
 </style>