cyy-vue-material 1.1.30 → 1.1.31

package/package.json

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

package/src/package/cyy-ArsenalNavigation/cyy-ArsenalNavigation.vue

@@ -14,7 +14,13 @@
         class="golds"
         :style="{ backgroundColor: props.backgroundColor, marginTop: props.marginTop + 'px', marginBottom: props.marginBottom + 'px' }"
       >
-        <div class="golds-item" v-for="(item, index) in resultArr" :key="index" @click="linkClick(item)">
+        <div
+          class="golds-item"
+          :class="[props.navigationNum === 5 ? 'navigationNum5' : 'navigationNum4']"
+          v-for="(item, index) in resultArr"
+          :key="index"
+          @click="linkClick(item)"
+        >
           <img
             :class="[props.photoSize === 1 ? 'photoSizeBig' : 'photoSizeSmall']"
             :style="{ borderRadius: props.photoCorner + '%' }"
@@ -71,10 +77,13 @@ export default {
       marginTop: Number, //上边距
       marginBottom: Number, //下边距
       selectImg: Array, //添加图片
+      navigationNum: Number, //导航数量
     },
   },
   mounted() {
-    console.log(this.props, 2023);
+    if (this.props.navigationNum === 5) {
+      this.skeleton = ["导航1", "导航2", "导航3", "导航4", "导航5"];
+    }
   },
   computed: {
     resultArr() {
@@ -140,7 +149,6 @@ export default {
   flex-wrap: wrap;
   .golds-item {
     margin: 10px 0;
-    width: 25%;
     display: flex;
     flex-direction: column;
     justify-content: center;
@@ -154,6 +162,12 @@ export default {
       text-align: center;
     }
   }
+  .navigationNum4 {
+    width: 25%;
+  }
+  .navigationNum5 {
+    width: 20%;
+  }
 }
 .photoSizeBig {
   width: 58px;

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

@@ -23,15 +23,14 @@
           <div class="line"></div>
         </div>
       </div>
-      <div v-if="selectImgRule('show')" class="mainImage">
+      <div v-if="props.selectImg" class="mainImage">
         <img
           :style="{
             borderTopLeftRadius: `${props.cornerStyle}px`,
             borderTopRightRadius: `${props.cornerStyle}px`,
           }"
-          :src="selectImgRule('url')"
+          :src="props.selectImg"
           alt="主图"
-          @click="linkClick(selectImgRule('link'))"
         />
       </div>
 
@@ -98,8 +97,9 @@ export default {
   props: {
     props: {
       arrange: Number,
-      selectImg: String,
-      selectImgs: Array,
+      selectImg: {
+        type: String,
+      },
       selectGoods: Array,
       markedPrice: Number,
       purchaseIcon: Number,
@@ -138,31 +138,6 @@ export default {
         mainTitleColor: this.props.arrange === 5,
       };
     },
-    selectImgRule() {
-      return (params) => {
-        if (params === "show") {
-          if (this.props.selectImg || this.props.selectImgs.length) {
-            return true;
-          }
-          return false;
-        }
-        if (params === "url") {
-          if (this.props.selectImg) {
-            return this.props.selectImg;
-          }
-          if (this.props.selectImgs.length) {
-            return this.props.selectImgs[0].imgUrl;
-          }
-          return "";
-        }
-        if (params === "link") {
-          if (this.props.selectImgs.length) {
-            return this.props.selectImgs[0];
-          }
-          return [{ link: "无操作" }];
-        }
-      };
-    },
   },
   components: {
     vopLabel,
@@ -217,7 +192,7 @@ export default {
       if (state === "1") {
         return "预售中";
       } else {
-        return "补货中";
+        return "无库存";
       }
     },
   },