cyy-vue-material 1.0.50 → 1.0.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyy-vue-material",
-  "version": "1.0.50",
+  "version": "1.0.52",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/package/cyy-ArsenalActivity/cyy-ArsenalActivity.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="secKill" v-if="lowCode">
+    <div class="secKill" v-if="lowCode" :style="{ backgroundColor: props.backgroundColor, marginTop: props.marginTop, marginBottom: props.marginBottom }">
       <!-- secKill--tit -->
       <div class="secKill--tit">
         <div class="title">
@@ -36,7 +36,7 @@
         </div>
       </div>
     </div>
-    <div v-else class="secKill">
+    <div v-else class="secKill" :style="{ backgroundColor: props.backgroundColor, marginTop: props.marginTop, marginBottom: props.marginBottom }">
       <!-- secKill--tit -->
       <div class="secKill--tit">
         <div class="title">
@@ -60,7 +60,7 @@
             class="goodsDetail"
             v-for="(good, indexG) in item.rsSkuReDomainList"
             :key="indexG"
-            @click="gosecGoodsDetail(good.skuNo, item.gmtModified, item.promotionCode, item.promotionFrequency, item.inventory, 26)"
+            @click="gosecGoodsDetail(good.skuNo, item.gmtModified, item.promotionCode, item.promotionFrequency, item.inventory)"
           >
             <div class="bigimg">
               <img :lazy-load="true" :src="good.dataPic | urlFilter" mode="" style="width: 54px; height: 54px; margin: 0 3px" />
@@ -108,10 +108,12 @@ export default {
   mounted() {
     this.getIsLc();
   },
-  methods: {
+  computed: {
     imgfn(val) {
       return process.env.REACT_APP_BASE_URL + val;
     },
+  },
+  methods: {
     getIsLc() {
       let that = this;
       if (isLc) {
@@ -241,6 +243,19 @@ export default {
           });
       }
     },
+    goSecList() {
+      this.$emit("goSecList", this.props);
+    },
+    gosecGoodsDetail(event, time, promotionCode, promotionFrequency, inventory) {
+      let goodsType;
+      if (this.props.activityType === 0) {
+        goodsType = 26;
+      }
+      if (this.props.activityType === 1) {
+        goodsType = 24;
+      }
+      this.$emit("gosecGoodsDetail", event, time, promotionCode, promotionFrequency, inventory, goodsType);
+    },
   },
 };
 </script>
@@ -248,8 +263,7 @@ export default {
 <style lang="less" scoped>
 .secKill {
   margin: 0 auto;
-  width: 350px;
-  background: #fee9ec;
+  width: 100%;
   box-shadow: 0px 5px 10px 0px rgba(0, 0, 0, 0.1);
   border-radius: 7px;
   padding: 13.5px 10px 0;
@@ -298,6 +312,7 @@ export default {
   .secKill-all {
     height: 126px;
     display: flex;
+    justify-content: space-between;
     background: #fee9ec;
     .secKill--center {
       width: 76px;

package/src/package/cyy-collocation/cyy-collocation.vue

@@ -22,6 +22,7 @@
         </div>
         <div
           class="more"
+          @click="goMoreGoods()"
           v-if="props.more === 1 && [1, 2, 3].includes(props.arrange)"
         >
           更多<img src="../../static/arrow.png" />
@@ -51,7 +52,10 @@
 
       <div
         class="goodsList"
-        :class="`arrange-${props.arrange} spacingStyle-${props.spacingStyle}`"
+        :class="[
+          `arrange-${props.arrange}`,
+          `spacingStyle-${props.spacingStyle}`,
+        ]"
       >
         <div
           class="goodsBox"
@@ -77,11 +81,11 @@
                   props.goodsTag.length > 0 && [2, 4].includes(props.arrange)
                 "
               >
-                <template v-for="tag in props.goodsTag" :key="tag.id">
+                <div v-for="tag in props.goodsTag" :key="tag.id">
                   <span class="tag">
                     {{ tag.value }}
                   </span>
-                </template>
+                </div>
               </div>
               <div class="goodsPrice">
                 <span class="priceUnit">￥</span>{{ item.pricesetNprice }}
@@ -89,8 +93,12 @@
                   ￥{{ item.pricesetMakeprice }}
                 </div>
               </div>
-              <div class="goodsBuy" v-if="props.purchaseIcon === 1">
-                <button @click="handleBuyGoods(item.skuNo)">立即购买</button>
+              <div
+                class="goodsBuy"
+                @click="handleBuyGoods(item.skuNo)"
+                v-if="props.purchaseIcon === 1"
+              >
+                立即购买
               </div>
             </section>
           </div>
@@ -137,6 +145,7 @@ export default {
         textAlign: "center",
       },
       goodsList: [],
+      completeGoodsList: [],
       imgUrl: "",
     };
   },
@@ -160,15 +169,14 @@ export default {
       const skuCode = goods.toString();
       const paramObj = { skuCode };
       const res = await fetchGoodImpl(this, paramObj);
-      let list = get(res, "list", []);
-
+      this.completeGoodsList = get(res, "list", []);
       // 具有[更多>]的样式只展示部分商品
       if ([1, 3].includes(this.props.arrange)) {
-        this.goodsList = list.slice(0, 3);
+        this.goodsList = this.completeGoodsList.slice(0, 3);
       } else if (this.props.arrange === 2) {
-        this.goodsList = list.slice(0, 2);
+        this.goodsList = this.completeGoodsList.slice(0, 2);
       } else {
-        this.goodsList = list;
+        this.goodsList = this.completeGoodsList;
       }
     },
 
@@ -183,6 +191,13 @@ export default {
       };
       this.$routers.push("detail", params);
     },
+    goMoreGoods() {
+      if (isLc) {
+        return;
+      }
+      this.$storage.set("goodsList", this.completeGoodsList);
+      this.$routers.push("goodsList/main");
+    },
   },
 };
 </script>
@@ -202,6 +217,7 @@ export default {
   &.left {
     display: flex;
     justify-content: space-between;
+    align-items: flex-end;
     .title {
       .subtitle {
         height: 17px;
@@ -220,6 +236,10 @@ export default {
       font-size: 12px;
       font-weight: 400;
       color: #81848c;
+      img {
+        width: 6px;
+        height: 8px;
+      }
     }
   }
   &.center {
@@ -299,127 +319,130 @@ export default {
           }
         }
         .goodsBuy {
-          button {
-            border: 0;
-            border-radius: 15px;
-            background-color: red;
-            color: white;
-            padding: 0.25em 0.5em;
-            font-size: 12px;
-          }
+          border: 0;
+          border-radius: 15px;
+          background-color: red;
+          color: white;
+          padding: 0.25em 0.5em;
+          font-size: 12px;
+          line-height: 22px;
+          width: 60px;
+          margin-left: auto;
+          margin-right: auto;
         }
       }
     }
   }
 }
-.goodsList {
-  &.arrange-1 {
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    grid-gap: 10px 20px;
-    .goodsBox {
-      width: 100px;
-    }
-    .goodsBuy {
-      text-align: center;
-      margin-bottom: 10px;
-    }
+.arrange-1 {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  grid-gap: 10px 20px;
+  .goodsBox {
+    width: 100px;
   }
-  &.arrange-2,
-  &.arrange-4 {
+  .goodsBuy {
+    text-align: center;
+    margin-bottom: 10px;
+  }
+}
+.arrange-2,
+.arrange-4 {
+  display: flex;
+  flex-direction: column;
+  margin: 8px auto;
+  .goodsBox {
     display: flex;
-    flex-direction: column;
-    margin: 8px auto;
-    .goodsBox {
-      display: flex;
-      margin-bottom: 10px;
-      padding: 10px;
-      .goodsDescription {
-        position: relative;
-        margin-left: 10px;
-        width: 100%;
-        .goodsName {
-          font-size: 14px;
+    margin-bottom: 10px;
+    padding: 10px;
+    .goodsDescription {
+      position: relative;
+      margin-left: 10px;
+      width: 220px;
+      .goodsName {
+        font-size: 14px;
+      }
+      .footerContent {
+        .goodsPrice {
+          display: inline;
+          position: absolute;
+          bottom: 0;
+          left: 0;
+          font-size: 16px;
         }
-        .footerContent {
-          .goodsPrice {
-            display: inline;
-            position: absolute;
-            bottom: 0;
-            left: 0;
-            font-size: 16px;
-          }
-          .goodsBuy {
-            display: inline;
-            position: absolute;
-            bottom: 0;
-            right: 0;
-            margin-bottom: 0;
-          }
+        .goodsBuy {
+          display: inline;
+          position: absolute;
+          bottom: 0;
+          right: 0;
+          margin-bottom: 0;
         }
       }
     }
   }
-  &.arrange-3 {
-    display: flex;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    .goodsBox {
-      margin-top: 10px;
+}
+.arrange-3 {
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  .goodsBox {
+    margin-top: 10px;
+    width: 170px;
+    height: 250px;
+    background: white;
+    .goodsImage {
       width: 170px;
-      height: 250px;
-      background: white;
-      .goodsImage {
-        width: 170px;
-        height: 170px;
+      height: 170px;
+    }
+    .goodsDescription {
+      .goodsName {
+        margin-top: 10px;
+        height: 2.5em;
       }
-      .goodsDescription {
-        .goodsName {
-          margin-top: 10px;
-          height: 2.5em;
-        }
-        .footerContent {
-          margin-top: 5px;
-          display: flex;
-          justify-content: space-between;
-          align-items: flex-end;
+      .footerContent {
+        margin-top: 5px;
+        display: flex;
+        justify-content: space-between;
+        align-items: flex-end;
+        .goodsBuy {
+          margin: 0;
         }
       }
     }
-    .goodsBox:nth-child(1) {
+  }
+  .goodsBox:nth-child(1) {
+    width: 100%;
+    height: 220px;
+    padding: 10px;
+    .goodsImage {
       width: 100%;
-      height: 220px;
-      padding: 10px;
-      .goodsImage {
-        width: 100%;
-        height: 130px;
-      }
+      height: 130px;
     }
   }
-  &.arrange-5 {
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    grid-gap: 10px 20px;
+}
+.arrange-5 {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  grid-gap: 10px 20px;
+  .goodsImage {
+    margin-top: 6px;
+  }
+  .goodsBox {
+    width: 100px;
+    background: white;
     .goodsImage {
-      margin-top: 6px;
-    }
-    .goodsBox {
       width: 100px;
-      background: white;
-      .goodsImage {
-        width: 100px;
-        height: 100px;
-      }
+      height: 100px;
     }
-    .goodsDescription {
-      .footerContent {
-        .goodsPrice {
-          text-align: center;
-        }
-        .goodsBuy {
-          text-align: center;
-          margin-bottom: 10px;
-        }
+  }
+  .goodsDescription {
+    .footerContent {
+      .goodsPrice {
+        text-align: center;
+      }
+      .goodsBuy {
+        text-align: center;
+        margin-bottom: 10px;
       }
     }
   }

package/src/package/cyy-live/cyy-live.vue

@@ -104,7 +104,7 @@ export default {
   },
   methods: {
     init() {
-      this.imgUrl = getUrl();
+      this.imgUrl = getUrl(this);
     },
     handleToLive() {
       if (isLc) {

package/src/package/cyy-notice/cyy-notice.vue

@@ -15,7 +15,7 @@
       <div class="notice-content">
         <swiper
           class="notice-list"
-          :vertical="props.notice.vertical"
+          :vertical="props.vertical"
           circular="true"
           autoplay="true"
           interval="5000"
@@ -71,7 +71,7 @@ export default {
       if (isLc) {
         return;
       }
-      $routers.push("noticeDedail", { id: item.noticeId });
+      this.$routers.push("noticeDedail", { id: item.noticeId });
     },
   },
 };
@@ -84,8 +84,10 @@ export default {
   height: 35px;
   padding: 0px 12.5px;
   box-sizing: border-box;
-  box-shadow: 0px 0px 7px 0px #f0f0f0;
+  box-shadow: 0px 5px 10px 0px rgba(0, 0, 0, 0.1);
   .notice-logo {
+    display: flex;
+    align-items: center;
     padding: 0.5px 10px;
     background: linear-gradient(270deg, #ff97bd 0%, #e50f41 100%);
     border-radius: 10px;