合并master

buyer/src/App.vue

@@ -9,27 +9,54 @@ import storage from "@/plugins/storage";
 import { getBaseSite } from "@/api/common.js";
 export default {
   name: "App",
-
   mounted() {
+    this.init();
+  },
+  methods:{
+    init(){
+      if(!localStorage.getItem("siteName")||!localStorage.getItem("logoImg")||!localStorage.getItem("sitelogo_expiration_time")) {
+        this.getSite();
+      }else{
+        // 如果缓存过期，则获取最新的信息
+        if (new Date() > localStorage.getItem("sitelogo_expiration_time")) {
+          this.getSite();
+          return;
+        }else{
+          window.document.title = localStorage.getItem("siteName");
+          //动态获取icon
+          let link =document.querySelector("link[rel*='icon']") ||document.createElement("link");
+            link.type = "image/x-icon";
+            link.href = localStorage.getItem("logoImg");
+            link.rel = "shortcut icon";
+            document.getElementsByTagName("head")[0].appendChild(link);
+        }
+      }
+      
+    },
+    getSite(){
       //获取基本站点信息
       getBaseSite().then((res) => {
         if (res.success && res.result.settingValue) {
           let data = JSON.parse(res.result.settingValue);
-        this.$store.commit("SET_LOGOIMG", data.buyerSideLogo);
+          // 过期时间
-        this.$store.commit("SET_SITENAME", data.siteName);
+          var expirationTime = new Date().setHours(new Date().getHours() + 1);
-        storage.setItem("siteName", data.siteName);
+          // 存放过期时间
+          localStorage.setItem("sitelogo_expiration_time", expirationTime);
+          // 存放信息
+          localStorage.setItem('siteName', data.siteName);
+          localStorage.setItem('logoImg', data.buyerSideLogo);
+
           window.document.title = data.siteName;
           //动态获取icon
-        let link =
+          let link =document.querySelector("link[rel*='icon']") ||document.createElement("link");
-          document.querySelector("link[rel*='icon']") ||
-          document.createElement("link");
           link.type = "image/x-icon";
           link.href = data.buyerSideLogo;
           link.rel = "shortcut icon";
           document.getElementsByTagName("head")[0].appendChild(link);
         }
       });
-  },
+    }
+  }
 };
 </script>
 <style lang="scss">

buyer/src/pages/Cart.vue

@@ -122,7 +122,16 @@
                   "
                 />
                 <div>
-                  <p>{{ goods.goodsSku.goodsName }}</p>
+                  <p>
+                    {{ goods.goodsSku.goodsName }}
+                  </p>
+                  <p><Tag
+                    v-if="goods.goodsSku.salesModel === 'WHOLESALE'"
+                    class="goods-show-tag"
+                    color="purple"
+                  >
+                    批发商品
+                  </Tag></p>
                   <template
                     v-for="(promotion, promotionIndex) in goods.promotions"
                   >

buyer/src/pages/GoodsList.vue

@@ -62,6 +62,13 @@
                 </span>
               </div>
               <div class="goods-show-detail">
+                <Tag
+                  v-if="item.content.salesModel === 'WHOLESALE'"
+                  class="goods-show-tag"
+                  color="purple"
+                  >
+                  批发
+                </Tag>
                 <span>{{ item.content.goodsName }}</span>
               </div>
               <div class="goods-show-num">
@@ -85,7 +92,9 @@
                   </div>
                   <div
                     class="goods-show-middle"
-                    v-else-if="goodsListType.content.goodsType == 'PHYSICAL_GOODS'"
+                    v-else-if="
+                      goodsListType.content.goodsType == 'PHYSICAL_GOODS'
+                    "
                   >
                     实物
                   </div>
@@ -203,6 +212,7 @@ export default {
       this.params.pageSize = val;
       this.getGoodsList();
     },
+
     // 获取商品列表
     getGoodsList() {
       this.loading = true;
@@ -255,6 +265,17 @@ export default {
   padding: 0 3px;
   background-color: #e23a3a;
 }
+
+.goods-show-tag {
+  height: 18px;
+  width: 32px;
+  line-height: 14px;
+  white-space: nowrap;
+  text-align: center;
+  align-items: center;
+  padding: 0 3px;
+}
+
 .goods-show-seller {
   // padding:3px 0;
   vertical-align: middle;

manager/src/views/Main.vue

@@ -129,24 +129,27 @@ export default {
       if (currWidth <= 1200) {
         this.sliceNum = 2;
       }
-      //获取domainLogo
-      getBaseSite().then((res) => {
-        const { domainLogo, siteName } = JSON.parse(res.result.settingValue);
 
-        this.domainLogo = domainLogo;
+      if(!localStorage.getItem("icon")||!localStorage.getItem("title")||!localStorage.getItem("icontitle_expiration_time")) {
-        //动态获取icon
+        this.getSite();
-        this.setStore("icon", this.domainLogo);
+      }else{
+        // 如果缓存过期，则获取最新的信息
+        if (new Date() > localStorage.getItem("icontitle_expiration_time")) {
+          this.getSite();
+          return;
+        }else{
+          this.domainLogo = localStorage.getItem("icon");
           let link =
             document.querySelector("link[rel*='icon']") ||
             document.createElement("link");
           link.type = "image/x-icon";
-        link.href = this.domainLogo;
+          link.href = localStorage.getItem("icon");
           link.rel = "shortcut icon";
           document.getElementsByTagName("head")[0].appendChild(link);
-        //动态获取siteName
+          window.document.title = localStorage.getItem("title") + " - 运营后台";
-        this.setStore("title", siteName);
+
-        window.document.title = siteName + " - 运营后台";
+        }
-      }),
+      }
 
       // 读取未读消息数
       getNoticePage({}).then((res) => {
@@ -157,6 +160,28 @@ export default {
         }
       });
     },
+    getSite(){
+      //获取domainLogo
+      getBaseSite().then((res) => {
+        const { domainLogo, siteName } = JSON.parse(res.result.settingValue);
+        this.domainLogo = domainLogo;
+        // 过期时间
+        var expirationTime = new Date().setHours(new Date().getHours() + 1);
+        // 存放过期时间
+        localStorage.setItem("icontitle_expiration_time", expirationTime);
+        // 存放信息
+        localStorage.setItem('icon', domainLogo);
+        localStorage.setItem('title', siteName);
+        let link =
+          document.querySelector("link[rel*='icon']") ||
+          document.createElement("link");
+        link.type = "image/x-icon";
+        link.href = domainLogo;
+        link.rel = "shortcut icon";
+        document.getElementsByTagName("head")[0].appendChild(link);
+        window.document.title = siteName + " - 运营后台";
+      })
+    },
     //用户头像下方抽屉点击
     handleClickUserDropdown(name) {
       //个人中心

seller/src/views/goods/goods-seller/goodsOperationSec.vue

@@ -984,7 +984,8 @@ export default {
       if (this.wholesaleData.length < 3) {
         this.wholesaleData.push({
           price:
-            Number(this.wholesaleData[this.wholesaleData.length - 1].price) - 0.01,
+            Number(this.wholesaleData[this.wholesaleData.length - 1].price) -
+            0.01,
           num:
             Number(this.wholesaleData[this.wholesaleData.length - 1].num) + 1,
           goodsId: this.goodsId,
@@ -1459,7 +1460,7 @@ export default {
               cost: skus[index].cost,
               price: skus[index].price,
               [cloneTemp[0].name]: specItem.value,
-              images: this.baseInfoForm.goodsGalleryFiles || [],
+              images: skus[index].images || this.baseInfoForm.goodsGalleryFiles || [],
             };
             if (specItem.value !== "") {
               obj.id = skus[index].id;