fix(code): 修正代码错误及不严谨的地方

components/diy-components/diy-article.vue

@@ -11,7 +11,7 @@
 					:interval="swiperConfig.interval || 3000"
 					:duration="swiperConfig.duration || 500"
 					:display-multiple-items="swiperConfig.displayMultipleItems || 3">
-					<swiper-item v-for="(item, index) in list" :key="index" @click="toDetail(item)">
+					<swiper-item v-for="(item, index) in list" :key="item.article_id || index" @click="toDetail(item)">
 						<view class="swiper-item-content">
 							<view :class="['item', value.ornament.type]" :style="itemCss">
 								<view class="article-img">

components/diy-components/diy-audio.vue

@@ -206,7 +206,7 @@
 	};
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 	
 	.fui-audio {
 	    width: 100%;

components/diy-components/diy-bargain.vue

@@ -17,7 +17,7 @@
 
 			<!-- 商品列表 -->
 			<template v-if="value.template == 'row1-of1'">
-				<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+				<view class="item" v-for="(item, index) in list" :key="item.bargain_id || index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 					<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 						<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)"/>
 					</view>
@@ -67,7 +67,7 @@
 
 			<template v-if="value.template == 'horizontal-slide'">
 				<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
-					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+					<view class="item" v-for="(item, index) in list" :key="item.bargain_id || index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)" :lazy-load="true"/>
 							<image class="bg" v-if="value.saleStyle.control && value.template == 'horizontal-slide' && value.style != 'style-2'" :src="$util.img('public/uniapp/bargain/bg.png')" mode="widthFix"/>

components/diy-components/diy-category.vue

@@ -68,7 +68,7 @@
 			<block v-if="categoryTree.length">
 				<scroll-view scroll-y="true" class="tree-wrap">
 					<view class="category-item-wrap">
-						<view class="category-item" v-for="(item, index) in categoryTree" :key="index" :class="[
+						<view class="category-item" v-for="(item, index) in categoryTree" :key="item.category_id || index" :class="[
 								{ select: select == index },
 								{ 'border-bottom': value.template == 4 && select + 1 === index },
 								{ 'border-top': value.template == 4 && select - 1 === index }
@@ -84,7 +84,7 @@
 						@scroll="listenScroll" @touchstart="touchStart" :refresher-enabled="true"
 						refresher-default-style="none" :refresher-triggered="triggered" @refresherrefresh="onRefresh"
 						@refresherrestore="onRestore">
-						<view class="child-category" v-for="(item, index) in categoryTree" :key="index" :id="'category-' + index">
+						<view class="child-category" v-for="(item, index) in categoryTree" :key="item.category_id || index" :id="'category-' + index">
 							<diy-category-item :category="item" :value="value" ref="categoryItem" :index="index"
 								:select="select" :oneCategorySelect="oneCategorySelect" :isList="isList" @tologin="toLogin"
 								@selectsku="selectSku($event, index)" @addCart="addCartPoint"
@@ -95,7 +95,7 @@
 
 					<view class="content-wrap"
 						v-if="(value.template == 2 || value.template == 3 || value.template == 4) && loadType == 'part'">
-						<view class="child-category-wrap" v-for="(item, index) in categoryTree" :key="index"
+						<view class="child-category-wrap" v-for="(item, index) in categoryTree" :key="item.category_id || index"
 							:id="'category-' + index" :style="{ display: select == index ? 'block' : 'none' }">
 							<diy-category-item :category="item" :value="value" ref="categoryItem" :index="index"
 								:last="index == categoryTree.length - 1 ? true : false" :select="select"

components/diy-components/diy-comp-extend.vue

@@ -20,4 +20,4 @@ export default {
 };
 </script>
 
-<style></style>
+<style lang="scss"></style>

components/diy-components/diy-coupon.vue

@@ -9,7 +9,7 @@
 				<swiper class="coupon-style-one" circular>
 					<swiper-item v-for="(numItem, numIndex) in Math.ceil(computedCouponList.length / 3)" :key="numIndex" class="coupon-item-box">
 
-						<view v-for="(item, index) in computedCouponList" class="coupon-item"
+						<view v-for="(item, index) in computedCouponList" class="coupon-item" :key="item.coupon_id || index"
 							v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
 							color: value.moneyColor,
 							backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style1-bg.png') + ')',
@@ -43,7 +43,7 @@
 			<template v-if="value.style == '2'">
 				<swiper class="coupon-style-two" circular>
 					<swiper-item v-for="(numItem, numIndex) in Math.ceil(computedCouponList.length / 3)" :key="numIndex" class="coupon-item-box">
-						<view class="coupon-item" v-for="(item, index) in computedCouponList" :key="index"
+						<view class="coupon-item" v-for="(item, index) in computedCouponList" :key="item.coupon_id || index"
 							v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
 							color: value.moneyColor,
 							backgroundImage: 'url(' + $util.img('public/uniapp/coupon/coupon_bg1.png') + ')',
@@ -76,7 +76,7 @@
 			<template v-if="value.style == '3'">
 				<swiper class="coupon-style-three" circular>
 					<swiper-item v-for="(numItem, numIndex) in Math.ceil(computedCouponList.length / 3)" :key="numIndex" class="coupon-item-box">
-						<view class="coupon-item" v-for="(item, index) in computedCouponList" :key="index"
+						<view class="coupon-item" v-for="(item, index) in computedCouponList" :key="item.coupon_id || index"
 							v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
 							color: value.moneyColor,
 							backgroundImage: 'url(' + $util.img('public/uniapp/coupon/coupon_shu.png') + ')',
@@ -110,7 +110,7 @@
 			<template v-if="value.style == '4'">
 				<swiper class="coupon-style-four" circular>
 					<swiper-item v-for="(numItem, numIndex) in Math.ceil(computedCouponList.length / 3)" :key="numIndex" class="coupon-item-box">
-						<view class="coupon-item" v-for="(item, index) in computedCouponList" :key="index"
+						<view class="coupon-item" v-for="(item, index) in computedCouponList" :key="item.coupon_id || index"
 							v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
 							color: value.moneyColor,
 							backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style4_bg.png') + ')',
@@ -143,7 +143,7 @@
 				<view class="coupon-style-five">
 					<view class="coupon-all">
 						<view class="coupon-box">
-							<view class="coupon-list" v-for="(item, index) in computedCouponList" :key="index" @click="couponAction(item, index)">
+							<view class="coupon-list" v-for="(item, index) in computedCouponList" :key="item.coupon_id || index" @click="couponAction(item, index)">
 								<image :src="$util.img('public/uniapp/coupon/style5_bg.png')"></image>
 								<view class="coupon">
 									<view class="coupon-info">
@@ -176,7 +176,7 @@
 			<template v-if="value.style == '6'">
 				<swiper class="coupon-style-six" circular>
 					<swiper-item class="style-six-wrap" v-for="(numItem, numIndex) in Math.ceil(computedCouponList.length / 3)" :key="numIndex">
-						<view class="coupon" v-for="(item, index) in computedCouponList" :key="index"
+						<view class="coupon" v-for="(item, index) in computedCouponList" :key="item.coupon_id || index"
 							v-if="index >= [numIndex * 3] && index < [(numIndex + 1) * 3]" :style="{
 							color: value.moneyColor,
 							backgroundImage: 'url(' + $util.img('public/uniapp/coupon/style6-bg-1.png') + ')',
@@ -230,7 +230,7 @@
 			<template v-if="value.style == '7'">
 				<scroll-view class="coupon-style-seven" scroll-x="true">
 					<view class="wrap">
-						<view class="coupon-list" v-for="(item, index) in computedCouponList" :key="index" @click="couponAction(item, index)">
+						<view class="coupon-list" v-for="(item, index) in computedCouponList" :key="item.coupon_id || index" @click="couponAction(item, index)">
 							<image :src="$util.img('public/uniapp/coupon/style7_bg.png')"></image>
 							<view class="coupon">
 								<view class="coupon-info">
@@ -1067,7 +1067,7 @@
 		background: transparent;
 	}
 </style>
-<style scoped>
+<style lang="scss" scoped>
 	.coupon-all>>>.uni-scroll-view::-webkit-scrollbar {
 		display: none;
 	}

components/diy-components/diy-fenxiao-goods-list.vue

@@ -1,6 +1,6 @@
 <template>
 	<view data-component-name="diy-fenxiao-goods-list" class="diy-fenxiao" v-if="list.length" :class="['goods-list', value.template, value.style]" :style="goodsListWarpCss">
-		<view class="goods-item" v-for="(item, index) in list" :key="index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
+		<view class="goods-item" v-for="(item, index) in list" :key="item.goods_id || index" @click="toDetail(item)" :class="[value.ornament.type]" :style="goodsItemCss">
 			<view class="goods-img" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 				<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imgError(index)"/>
 			</view>

components/diy-components/diy-follow-official-account.vue

@@ -26,4 +26,4 @@
 	};
 </script>
 
-<style></style>
+<style lang="scss"></style>

components/diy-components/diy-goods-brand.vue

@@ -5,7 +5,7 @@
 				<view class="title-wrap" v-show="value.title" :style="{ color: value.textColor, fontWeight: value.fontWeight ? 'bold' : '' }">{{ value.title }}
 				</view>
 				<view class="ul-wrap">
-					<view class="li-item" v-for="(item, index) in list" :key="index">
+					<view class="li-item" v-for="(item, index) in list" :key="item.brand_id || index">
 						<image class="brand-pic" :src="$util.img(item.image_url)" mode="aspectFit" @click="handlerClick(item)" @tap="handlerClick(item)" @error="imgError(index)" :style="itemCss"/>
 					</view>
 				</view>

components/diy-components/diy-graphic-nav.vue

@@ -9,13 +9,13 @@
                         :key="index"
                         v-if="index >= [(numItem) * (value.pageCount * value.rowCount)] && index < [(numItem+1) * (value.pageCount * value.rowCount)]"
                         :style="{ width: 100 / value.rowCount + '%' }" @click="redirectTo(item.link)">
-                        <!-- #endif -->
-                        <!-- #ifdef H5 -->
-                        <view class="graphic-nav-item" :class="[value.mode]" v-for="(item, index) in value.list"
-                            :key="index"
-                            v-if="index >= [(numItem - 1) * (value.pageCount * value.rowCount)] && index < [numItem * (value.pageCount * value.rowCount)]"
-                            :style="{ width: 100 / value.rowCount + '%' }" @click="redirectTo(item.link)">
-                            <!-- #endif -->
+                    <!-- #endif -->
+                    <!-- #ifdef H5 -->
+                    <view class="graphic-nav-item" :class="[value.mode]" v-for="(item, index) in value.list"
+                        :key="index"
+                        v-if="index >= [(numItem - 1) * (value.pageCount * value.rowCount)] && index < [numItem * (value.pageCount * value.rowCount)]"
+                        :style="{ width: 100 / value.rowCount + '%' }" @click="redirectTo(item.link)">
+                    <!-- #endif -->
                             <view class="graphic-img" v-if="value.mode != 'text'"
                                 :style="{ fontSize: value.imageSize * 2 + 'rpx', width: value.imageSize * 2 + 'rpx', height: value.imageSize * 2 + 'rpx' }">
                                 <image v-if="item.iconType == 'img'"
@@ -37,7 +37,12 @@
                                 :style="{ fontSize: value.font.size * 2 + 'rpx', fontWeight: value.font.weight, color: value.font.color }">
                                 {{ item.title }}
                             </text>
-                        </view>
+                    <!-- #ifdef H5 -->
+                    </view>
+                    <!-- #endif -->
+                    <!-- #ifdef MP -->
+                    </view>
+                    <!-- #endif -->                     
                 </swiper-item>
             </swiper>
 
@@ -159,7 +164,7 @@
         }
     };
 </script>
-<style>
+<style lang="scss">
     /* 固定显示 */
     .graphic-nav.fixed-layout>>>.uni-scroll-view-content {
         display: flex;

components/diy-components/diy-horz-blank.vue

@@ -37,4 +37,4 @@ export default {
 };
 </script>
 
-<style></style>
+<style lang="scss"></style>

components/diy-components/diy-horz-line.vue

@@ -22,4 +22,4 @@ export default {
 };
 </script>
 
-<style></style>
+<style lang="scss"></style>

components/diy-components/diy-live.vue

@@ -242,7 +242,7 @@
 		}
 	}
 </style>
-<style scoped>
+<style lang="scss" scoped>
 	.coupon-all>>>.uni-scroll-view::-webkit-scrollbar {
 		display: none;
 	}

components/diy-components/diy-member-info.vue

@@ -1457,7 +1457,7 @@
 		}
 	}
 </style>
-<style scoped>
+<style lang="scss" scoped>
 	.member-complete-info-popup /deep/ .uni-popup__wrapper.bottom,
 	.member-complete-info-popup /deep/ .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
 		border-top-left-radius: 30rpx !important;

components/diy-components/diy-merch-list.vue

@@ -179,7 +179,7 @@
 		}
 	};
 </script>
-<style>
+<style lang="scss">
 	/* 单行滑动 */
 	.merch-nav.singleSlide>>>.uni-scroll-view-content {
 	    display: flex;

components/diy-components/diy-notes.vue

@@ -7,7 +7,7 @@
 			</view>
 
 			<scroll-view class="diy-notes-box" scroll-x="true" show-scrollbar="true">
-				<view class="notes-box-item" v-for="(item, i) in dataList" :key="i" @click="handlerClick(item)" @tap="handlerClick(item)"
+				<view class="notes-box-item" v-for="(item, i) in dataList" :key="item.note_id || i" @click="handlerClick(item)" @tap="handlerClick(item)"
 					:style="notesItemStyle">
 					<view class="notes-item" v-if="item.status == 1">
 						<view class="notes-item-con">

components/diy-components/diy-quick-nav.vue

@@ -79,7 +79,7 @@
 		}
 	};
 </script>
-<style>
+<style lang="scss">
 .quick-nav >>> .uni-scroll-view-content {
 	display: flex;
 }

components/diy-components/diy-seckill.vue

@@ -27,7 +27,7 @@
 
 			<view class="content-wrap">
 				<template v-if="value.template == 'row1-of1'">
-					<view class="item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
+					<view class="item" v-for="(item, index) in dataList" :key="item.goods_id || index" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)"/>
 						</view>
@@ -82,7 +82,7 @@
 				</template>
 
 				<template v-if="value.template == 'row1-of2'">
-					<view class="item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
+					<view class="item" v-for="(item, index) in dataList" :key="item.goods_id || index" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
 						<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 							<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)"/>
 						</view>
@@ -119,7 +119,7 @@
 
 				<template v-if="value.template == 'horizontal-slide'">
 					<scroll-view v-if="value.slideMode == 'scroll'" class="scroll" :scroll-x="true" :show-scrollbar="false">
-						<view class="item" v-for="(item, index) in dataList" :key="index" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
+						<view class="item" v-for="(item, index) in dataList" :key="item.goods_id || index" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
 							<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 								<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(index)"/>
 							</view>
@@ -147,7 +147,7 @@
 					</scroll-view>
 					<swiper v-if="value.slideMode == 'slide'" :autoplay="false" class="swiper" :style="{ height: swiperHeight }">
 						<swiper-item v-for="(pageItem, pageIndex) in page" :key="pageIndex" :class="['swiper-item', dataList[pageIndex] && [dataList[pageIndex].length / 3].length >= 1 && 'flex-between']">
-							<view class="item" v-for="(item, dataIndex) in dataList[pageIndex]" :key="dataIndex" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
+							<view class="item" v-for="(item, dataIndex) in dataList[pageIndex]" :key="item.goods_id || dataIndex" @click="toDetail(item.id)" :class="[value.ornament.type]" :style="goodsItemCss">
 								<view class="img-wrap" :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }">
 									<image :style="{ borderRadius: value.imgAroundRadius * 2 + 'rpx' }" :src="$util.img(item.goods_image, { size: 'mid' })" mode="widthFix" @error="imageError(dataIndex, pageIndex)"/>
 								</view>

components/diy-components/diy-store-label.vue

@@ -3,7 +3,7 @@
 		<view class="diy-store-label">
 			<block v-if="businessConfig.store_business == 'store'">
 				<scroll-view scroll-x="true" :class="[value.contentStyle, { between: list.length == 3 }]" :style="storeLabelWrapCss" :enable-flex="true">
-					<view v-for="(item, index) in storeLabel" :class="['item']">
+					<view v-for="(item, index) in storeLabel" :key="item.label_id || index" :class="['item']">
 						<diy-icon v-if="value.icon" class="icon-box" :icon="value.icon" :value="value.style ? value.style : 'null'"></diy-icon>
 						<text class="label-name" :style="{ color: value.textColor, fontSize: value.fontSize * 2 + 'rpx', fontWeight: value.fontWeight }">{{ item }}</text>
 					</view>

components/diy-components/diy-video.vue

@@ -43,7 +43,7 @@
 	};
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 	video {
 		width: 100%;
 	}