Merge remote-tracking branch 'origin/master'

src/views/Business/Notice.vue

@@ -101,9 +101,9 @@ export default {
     },
     setLogoutFlag(currentTab) {
       if (currentTab === "zhuce") {
-        this.logoutFlag = "1";
+        this.logoutFlag = 0;
       } else {
-        this.logoutFlag = "0";
+        this.logoutFlag = 1;
       }
       this.businessGetEanUpcByCondition();
     },
@@ -122,17 +122,17 @@ export default {
         console.log(businessGetEanUpcByConditionRes, "条码注册/注销公告");
         this.pageParams.total = data.totalCount;
         let key;
-        if (this.logoutFlag === "1") {
-          key = 0;
-        } else {
+        if (this.logoutFlag === 1) {
           key = 1;
+        } else {
+          key = 0;
         }
         data.list.forEach((el) => {
           el.name = el.firmName;
-          if (this.logoutFlag === "1") {
-            el.time = this.$moment(el.loginDate).format("YYYY-MM-DD");
-          } else {
+          if (this.logoutFlag === 1) {
             el.time = this.$moment(el.logoutDate).format("YYYY-MM-DD");
+          } else {
+            el.time = this.$moment(el.loginDate).format("YYYY-MM-DD");
           }
         });
         this.list[key].data = data.list;

src/views/News/ECommerce.vue

@@ -14,7 +14,7 @@
         <div class="col-lg-6 lunbo ">
             <div class="lunbo-cnt">
                 <p class="lunbo-title">
-                    <span>商品二维码在零售领域的应用</span>
+                    <span>采用GS1统一物品编码的好处</span>
                     <span class="more" @click="goList">更多>></span>
                 </p>
                <div class="list-style li-style">