cyy-vue-material 1.0.33 → 1.0.35

package/package.json

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

package/src/package/cyy-ArsenalCarousel/cyy-ArsenalCarousel.vue

@@ -0,0 +1,107 @@
+<template>
+  <div>
+    <div v-if="!props.selectImg.length" class="holder">请上传图片</div>
+    <template v-else>
+      轮播图
+      <!-- <div
+        v-if="props.showStyle === 0"
+        class="golds"
+        :style="{ backgroundColor: props.backgroundColor, paddingTop: props.paddingTop + 'px', paddingBottom: props.paddingBottom + 'px' }"
+      >
+        <div class="golds-item" v-for="(item, index) in resultArr" :key="index" @click="linkClick(item)">
+          <img
+            :class="[props.photoSize === 1 ? 'photoSizeBig' : 'photoSizeSmall']"
+            :style="{ borderRadius: props.photoCorner + '%' }"
+            :lazy-load="true"
+            :src="item['imgUrl']"
+          />
+          <div :style="{ color: props.fontColor }">{{ item.name }}</div>
+        </div>
+      </div>
+      <div v-if="props.showStyle === 1">
+        <div class="classify-list" :style="{ paddingTop: props.paddingTop + 'px', paddingBottom: props.paddingBottom + 'px' }">
+          <div
+            class="classify-item"
+            :class="[props.photoSize === 1 ? 'classifyItemBig' : 'classifyItemSmall']"
+            :style="{ backgroundColor: props.backgroundColor }"
+            v-for="item in resultArr"
+            :key="index"
+            @click="linkClick(item)"
+          >
+            <div :class="[props.photoSize === 1 ? 'classifyFontBig' : 'classifyFontSmall']" :style="{ color: props.fontColor }">{{ item.name }}</div>
+            <img
+              :class="[props.photoSize === 1 ? 'classifyImgBig' : 'classifyImgSmall']"
+              :style="{ borderRadius: classifyPhotoCorner(props.photoCorner) + 'px' }"
+              :lazy-load="true"
+              :src="item['imgUrl']"
+            />
+          </div>
+        </div>
+      </div> -->
+    </template>
+  </div>
+</template>
+
+<script>
+import { isEmpty, isUndefined } from "lodash-es";
+export default {
+  name: "cyy-ArsenalPicture",
+  data() {
+    return {
+      imgStyle: {
+        width: "100%",
+        boxSizing: "border-box",
+      },
+    };
+  },
+  props: {
+    props: {
+      photoCorner: Number, //图片边角
+      autoPlay: Number, //自动播放
+      autoplayInterval: Number, //轮播间隔
+      direction: Number, //方向
+      loop: Number, //循环播放
+      paddingTop: Number, //上边距
+      paddingBottom: Number, //下边距
+      selectImg: Array, //添加图片
+    },
+  },
+  mounted() {
+    console.log(this.props, 2023);
+  },
+  computed: {
+    resultArr() {
+      const { selectImg, defaultValue } = this.props;
+      const computedArr = selectImg.filter((item) => !isUndefined(item)).filter((item) => !Object.values(item).every((citem) => isUndefined(citem)));
+      let arr = defaultValue;
+      if (!isEmpty(computedArr)) {
+        arr = computedArr;
+      }
+      console.log(52, arr);
+      return arr;
+    },
+  },
+  methods: {
+    classifyPhotoCorner(item) {
+      if (item === 20) {
+        return 8;
+      }
+      if (item === 50) {
+        return 16;
+      }
+      return item;
+    },
+    linkClick(item) {
+      this.$emit("linkClick", item);
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.holder {
+  width: 100%;
+  padding: 10px 0;
+  height: 60px;
+  background-color: rgb(80, 431, 73);
+}
+</style>

package/src/package/cyy-goods/cyy-goods.vue

@@ -10,12 +10,7 @@
           gap: `${props.margin}px`,
         }"
       >
-        <div
-          v-for="(item, index) in listArr"
-          class="cube-item"
-          :key="cyy"
-          @click="goGoodsDetail(item)"
-        >
+        <div v-for="(item, index) in listArr" class="cube-item" :key="cyy" @click="goGoodsDetail(item)">
           <img
             :src="imgUrl + item.dataPic"
             mode="widthFix"
@@ -29,13 +24,9 @@
             <section class="footerContent">
               <div class="goodsPrice">
                 ￥{{ item.pricesetNprice }}
-                <div class="scribing" v-if="props.markedPrice === 1">
-                  ￥{{ item.pricesetMakeprice }}
-                </div>
+                <div class="scribing" v-if="props.markedPrice === 1">￥{{ item.pricesetMakeprice }}</div>
               </div>
-              <button @click="handleBuyGoods(item.skuNo)" class="goodsBuy">
-                立即购买
-              </button>
+              <button @click="handleBuyGoods(item.skuNo)" class="goodsBuy">立即购买</button>
             </section>
           </div>
         </div>
@@ -73,7 +64,7 @@ export default {
         color: "#aaa",
         textAlign: "center",
       },
-      imgUrl: getUrl()
+      imgUrl: "",
     };
   },
   mounted() {
@@ -81,12 +72,14 @@ export default {
   },
   methods: {
     async init() {
+      this.imgUrl = getUrl(this);
+      console.log("this.imgUrl", this.imgUrl);
       const { goods = [] } = this.props;
-      const goodsCode = goods.toString();
-      const paramObj = { goodsCode };
+      const skuCode = goods.toString();
+      const paramObj = { skuCodeStr: skuCode };
       const res = await fetchGoodImpl(this, paramObj);
       this.listArr = get(res, "list", []);
-      console.log("🐽🐽🐽🐽🐽🐽🐽🐽", this.listArr);
+      console.log("🐽🐽🐽🐽🐽🐽🐽🐽w", this.listArr);
     },
 
     goGoodsDetail(item) {
@@ -215,11 +208,10 @@ button {
           border-radius: 5px;
           background-color: red;
           color: white;
-          min-width: 74px;
-          height: calc(2em - 0.5em);
-          padding: 0 calc(1em - 0.25em);
+          // min-width: 74px;
           margin: 0.5em 0.25em 0;
           align-self: flex-end;
+          font-size: 12px;
         }
       }
     }

package/src/package/index.js

@@ -6,3 +6,4 @@ export { default as Slider } from "./cyy-slider/cyy-slider.vue";
 export { default as GoodsOne } from "./cyy-goodsOne/cyy-goodsOne.vue";
 export { default as ArsenalPicture } from "./cyy-ArsenalPicture/cyy-ArsenalPicture.vue";
 export { default as ArsenalNavigation } from "./cyy-ArsenalNavigation/cyy-ArsenalNavigation.vue";
+export { default as ArsenalCarousel } from "./cyy-ArsenalCarousel/cyy-ArsenalCarousel.vue";

package/src/utils/checkEnv.js

@@ -1,16 +1,16 @@
-export const isLc = process.env.NODE_ENV !== 'production' || process.env.VUE_APP_PLATFORM === 'low-code';
+export const isLc = process.env.NODE_ENV === "dev" || process.env.VUE_APP_PLATFORM === "low-code";
 
 export const handlePlat = (params) => {
-	let result = {};
-	for (let key in params) {
-		result[key] = sumPix(params[key]);
-	}
-	return result;
+  let result = {};
+  for (let key in params) {
+    result[key] = sumPix(params[key]);
+  }
+  return result;
 };
 
 const sumPix = (param) => {
-	if (isLc) {
-		return param + 'px';
-	}
-	return param * 2 + 'rpx';
+  if (isLc) {
+    return param + "px";
+  }
+  return param * 2 + "rpx";
 };