chore(组件): 更新依赖

components-diy/diy-category.vue

@@ -161,15 +161,11 @@ let menuButtonInfo = {};
 menuButtonInfo = uni.getMenuButtonBoundingClientRect();
 // #endif
 
-import nsGoodsSkuCategory from '@/components/ns-goods-sku/ns-goods-sku-category.vue';
 import DiyMinx from './minx.js'
 var contentWrapHeight, query, cartPosition;
 
 // 商品分类
 export default {
-	components: {
-		nsGoodsSkuCategory
-	},
 	name: 'diy-category',
 	props: {
 		value: {

components/ns-goods-sku/ns-goods-sku-category.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="goods-sku" @touchmove.prevent.stop>
-		<uni-popup ref="skuPopup" :type="popupType">
+		<uni-popup-sku-category ref="skuPopup" :type="popupType">
 			<view class="sku-layer">
 				<view class="sku-content">
 					<view class="sku-info" :style="{ height: systemInfo.windowHeight * 2 + 'rpx' }">
@@ -9,19 +9,21 @@
 								<image :src="$util.img(goodsDetail.sku_image, { size: 'mid' })" @error="imageError()" />
 							</view>
 							<view class="main">
-								<view class="goodname">{{ goodsDetail.sku_name ? goodsDetail.sku_name : (isEnEnv ? goodsDetail.en_goods_name : goodsDetail.goods_name) }}</view>
+								<view class="goodname">{{ goodsDetail.sku_name ? goodsDetail.sku_name : (isEnEnv ?
+									goodsDetail.en_goods_name : goodsDetail.goods_name) }}</view>
 								<view class="other-info">
 									<view class="stock color-tip" v-if="goodsDetail.stock_show">
 										库存{{ goodsDetail.stock }}{{ goodsDetail.unit }}</view>
 									<view class="starting-num" v-if="parseFloat(goodsDetail.min_buy)">
-										起售{{goodsDetail.min_buy}}件
+										起售{{ goodsDetail.min_buy }}件
 									</view>
 								</view>
 							</view>
 						</view>
 						<view class="body-item">
 							<scroll-view scroll-y class="wrap">
-								<view class="sku-list-wrap" v-for="(item, index) in goodsDetail.goods_spec_format" :key="index">
+								<view class="sku-list-wrap" v-for="(item, index) in goodsDetail.goods_spec_format"
+									:key="index">
 									<text class="title font-size-tag">{{ item.spec_name }}</text>
 									<view class="sku-list_item">
 										<view v-for="(item_value, index_value) in item.value" :key="index_value" :class="{
@@ -29,7 +31,9 @@
 											disabled: item_value['disabled'] || (!item_value['selected'] && disabled)
 										}" class="items color-line-border font-size-tag"
 											@click="change(item_value.sku_id, item_value.spec_id)">
-											<image v-if="item_value.image" :src="$util.img(item_value.image, { size: 'small' })" @error="valueImageError(index, index_value)" />
+											<image v-if="item_value.image"
+												:src="$util.img(item_value.image, { size: 'small' })"
+												@error="valueImageError(index, index_value)" />
 											<text>{{ item_value.spec_value_name }}</text>
 										</view>
 									</view>
@@ -40,7 +44,8 @@
 							<view class="sku-name font-size-goods-tag">
 								<template v-if="goodsDetail.sku_spec_format" class="color-tip">
 									已选择：
-									<text class="color-tip" v-for="(item, index) in goodsDetail.sku_spec_format" :key="index">{{ item.spec_value_name }}</text>
+									<text class="color-tip" v-for="(item, index) in goodsDetail.sku_spec_format"
+										:key="index">{{ item.spec_value_name }}</text>
 								</template>
 							</view>
 							<view class="footer-bottom">
@@ -55,15 +60,19 @@
 											<text class="desc iconfont icon-jianshao color-base-text"></text>
 											<view class="click-event"></view>
 										</view>
-										<input type="number" class="uni-input" @blur="blur" v-model="number" placeholder="0" @input="keyInput(false)" />
+										<input type="number" class="uni-input" @blur="blur" v-model="number"
-										<view class="num-action" :id="'select-sku-num-' + goodsDetail.goods_id" @click="changeNum('+', $event)">
+											placeholder="0" @input="keyInput(false)" />
-											<text class="add iconfont icon-add-fill color-base-text change_hover"></text>
+										<view class="num-action" :id="'select-sku-num-' + goodsDetail.goods_id"
+											@click="changeNum('+', $event)">
+											<text
+												class="add iconfont icon-add-fill color-base-text change_hover"></text>
 											<view class="click-event"></view>
 										</view>
 									</view>
 									<view v-else-if="number == 0 && isLoad">
 										<view class="num-action">
-											<button type="primary" v-if="goodsDetail.stock && goodsDetail.stock != 0" @click="confirm($event)">加入购物车</button>
+											<button type="primary" v-if="goodsDetail.stock && goodsDetail.stock != 0"
+												@click="confirm($event)">加入购物车</button>
 											<button type="primary" disabled="true" v-else>确定</button>
 											<view class="click-event"></view>
 										</view>
@@ -75,20 +84,16 @@
 				</view>
 			</view>
 			<view class="sku-close iconfont icon-close-guanbi" @click="closeSkuPopup()"></view>
-		</uni-popup>
+		</uni-popup-sku-category>
 
 		<ns-login ref="login"></ns-login>
 	</view>
 </template>
 
 <script>
-	import uniPopup from '@/uni_modules/uni-popup/components/uni-popup/uni-popup-sku-new.vue';
+// 商品SKU
-	// 商品SKU
+export default {
-	export default {
 	name: 'ns-goods-sku-category',
-		components: {
-			uniPopup
-		},
 	props: {
 		disabled: {
 			type: Boolean,
@@ -147,7 +152,7 @@
 			this.$refs.skuPopup.open();
 		},
 		hide() {
-				if(this.$refs.skuPopup) this.$refs.skuPopup.close();
+			if (this.$refs.skuPopup) this.$refs.skuPopup.close();
 		},
 		change(skuId, spec_id) {
 			if (this.disabled) return;
@@ -457,14 +462,14 @@
 						this.btnSwitch = false;
 					},
 					fail: res => {
-							if(this.$refs.skuPopup) this.$refs.skuPopup.close();
+						if (this.$refs.skuPopup) this.$refs.skuPopup.close();
 						this.btnSwitch = false;
 					}
 				});
 			});
 		},
 		closeSkuPopup() {
-				if(this.$refs.skuPopup) this.$refs.skuPopup.close();
+			if (this.$refs.skuPopup) this.$refs.skuPopup.close();
 		},
 		imageError() {
 			this.goodsDetail.sku_image = this.$util.getDefaultImage().goods;
@@ -532,31 +537,31 @@
 			return cart;
 		}
 	}
-	};
+};
 </script>
 <style lang="scss" scoped>
-	.sku-content {
+.sku-content {
 	background: #ffffff;
 	border-radius: 20rpx;
-	}
+}
 
-	.sku-close {
+.sku-close {
 	color: #fff;
 	width: 50rpx;
 	text-align: center;
 	font-size: 60rpx;
 	border-radius: 50%;
 	margin: 40rpx auto 0;
-	}
+}
 
-	.sku-layer .sku-info {
+.sku-layer .sku-info {
 	width: 600rpx;
 	height: 60vh !important;
 	position: relative;
 	z-index: 999;
-	}
+}
 
-	.sku-layer .sku-info .header {
+.sku-layer .sku-info .header {
 	// padding: 30rpx 0 30rpx 300rpx;
 	/* #ifdef MP-ALIPAY */
 	// padding: 50rpx 0 50rpx 300rpx;
@@ -566,9 +571,9 @@
 	position: relative;
 	border-bottom: 2rpx solid rgba(0, 0, 0, 0.1);
 	z-index: 2;
-	}
+}
 
-	.sku-layer .sku-info .header .img-wrap {
+.sku-layer .sku-info .header .img-wrap {
 	width: 114rpx;
 	height: 114rpx;
 	margin-right: 20rpx;
@@ -584,21 +589,21 @@
 	padding: 2rpx;
 	background-color: #fff;
 	line-height: 208rpx;
-	}
+}
 
-	.sku-layer .sku-info .header .img-wrap image {
+.sku-layer .sku-info .header .img-wrap image {
 	width: 100%;
 	height: 100%;
-	}
+}
 
-	.sku-layer .sku-info .main {
+.sku-layer .sku-info .main {
 	font-size: 24rpx;
 	line-height: 40rpx;
 	flex: 1;
 	width: 0;
-	}
+}
 
-	.sku-layer .sku-info .main .goodname {
+.sku-layer .sku-info .main .goodname {
 	word-wrap: break-word;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -606,78 +611,78 @@
 	-webkit-box-orient: vertical;
 	-webkit-line-clamp: 2;
 	line-height: 1.3;
-	}
+}
 
-	.sku-layer .sku-info .main .other-info {
+.sku-layer .sku-info .main .other-info {
 	margin-top: 20rpx;
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
-	}
+}
 
-	.sku-layer .sku-info .main .starting-num {
+.sku-layer .sku-info .main .starting-num {
 	color: $color-tip;
 	font-size: $font-size-tag;
-	}
+}
 
-	.footer-left .price {
+.footer-left .price {
 	word-wrap: break-word;
 	font-size: $font-size-toolbar;
 	color: var(--price-color);
-	}
+}
 
-	.sku-layer .sku-info .main .stock {
+.sku-layer .sku-info .main .stock {
 	line-height: 1;
 	font-size: $font-size-tag;
-	}
+}
 
-	.sku-layer .sku-info .main .sku-name {
+.sku-layer .sku-info .main .sku-name {
 	display: -webkit-box;
 	-webkit-line-clamp: 2;
 	-webkit-box-orient: vertical;
 	height: 90rpx;
 	overflow: hidden;
-	}
+}
 
-	.sku-layer .sku-info .main .sku-name text {
+.sku-layer .sku-info .main .sku-name text {
 	margin-right: 10rpx;
-	}
+}
 
-	.sku-layer .sku-info .sku-close {
+.sku-layer .sku-info .sku-close {
 	position: absolute;
 	top: 20rpx;
 	right: 20rpx;
 	width: 40rpx;
 	height: 80rpx;
 	font-size: 50rpx;
-	}
+}
 
-	.sku-layer .body-item {
+.sku-layer .body-item {
 	padding: 0 30rpx 30rpx 30rpx;
 	height: calc(100% - 282rpx);
 	box-sizing: border-box;
 	overflow: scroll;
-	}
+}
 
-	.sku-layer .body-item .wrap {
+.sku-layer .body-item .wrap {
 	height: calc(100% - 116rpx);
-	}
+}
 
-	.sku-layer .body-item .sku-list-wrap {}
+.sku-layer .body-item .sku-list-wrap {}
 
-	.sku-layer .body-item .sku-list-wrap .title {
+.sku-layer .body-item .sku-list-wrap .title {
 	font-weight: 400;
 	padding: 20rpx 0;
 	margin: 0;
 	display: block;
-	}
+}
 
-	.sku-layer .body-item .sku-list-wrap .sku-list_item {
+.sku-layer .body-item .sku-list-wrap .sku-list_item {
 	display: flex;
 	flex-wrap: wrap;
-	}
+}
 
-	.sku-layer .body-item .sku-list-wrap .items {
+.sku-layer .body-item .sku-list-wrap .items {
 	text-align: center;
 	position: relative;
 	display: inline-block;
@@ -686,39 +691,39 @@
 	border-radius: 8rpx;
 	margin: 0 20rpx 20rpx 0;
 	background-color: #fff !important;
-	}
+}
 
-	.sku-layer .body-item .sku-list-wrap .items.disabled {
+.sku-layer .body-item .sku-list-wrap .items.disabled {
 	border: 2rpx dashed;
-	}
+}
 
-	.sku-layer .body-item .sku-list-wrap .items image {
+.sku-layer .body-item .sku-list-wrap .items image {
 	height: 48rpx;
 	width: 48rpx;
 	border-radius: 4rpx;
 	margin-right: 10rpx;
 	display: inline-block;
 	vertical-align: middle;
-	}
+}
 
-	.sku-layer .body-item .number-wrap .number-line {
+.sku-layer .body-item .number-wrap .number-line {
 	padding: 20rpx 0;
 	line-height: 72rpx;
-	}
+}
 
-	.sku-layer .body-item .number-wrap .title {
+.sku-layer .body-item .number-wrap .title {
 	font-weight: 400;
-	}
+}
 
-	.sku-layer .body-item .number-wrap .limit-txt {}
+.sku-layer .body-item .number-wrap .limit-txt {}
 
-	.sku-layer .body-item .number-wrap .number {
+.sku-layer .body-item .number-wrap .number {
 	height: 72rpx;
 	border-radius: 6rpx;
 	float: right;
-	}
+}
 
-	.sku-layer .body-item .number-wrap .number button {
+.sku-layer .body-item .number-wrap .number button {
 	display: inline-block;
 	line-height: 64rpx;
 	height: 68rpx;
@@ -729,22 +734,22 @@
 	padding: 0;
 	margin: 0;
 	border-radius: 0;
-	}
+}
 
-	.sku-layer .body-item .number-wrap .number button.decrease {
+.sku-layer .body-item .number-wrap .number button.decrease {
 	border-right: 2rpx solid #fff !important;
-	}
+}
 
-	.sku-layer .body-item .number-wrap .number button.increase {
+.sku-layer .body-item .number-wrap .number button.increase {
 	border-left: 2rpx solid #fff !important;
-	}
+}
 
-	.sku-layer .body-item .number-wrap .number button:after {
+.sku-layer .body-item .number-wrap .number button:after {
 	border-radius: 0;
 	border: none;
-	}
+}
 
-	.sku-layer .body-item .number-wrap .number input {
+.sku-layer .body-item .number-wrap .number input {
 	display: inline-block;
 	line-height: 64rpx;
 	height: 68rpx;
@@ -755,9 +760,9 @@
 	margin: 0;
 	padding: 0;
 	vertical-align: top;
-	}
+}
 
-	.sku-layer .footer {
+.sku-layer .footer {
 	width: calc(100% - 60rpx);
 	position: absolute;
 	bottom: 26rpx;
@@ -775,9 +780,9 @@
 			margin-right: 10rpx;
 		}
 	}
-	}
+}
 
-	.sku-layer .footer .footer-bottom {
+.sku-layer .footer .footer-bottom {
 	margin-top: 24rpx;
 	display: flex;
 	justify-content: be;
@@ -799,36 +804,36 @@
 		line-height: 60rpx;
 		font-size: 30rpx;
 	}
-	}
+}
 
-	.position-bottom {
+.position-bottom {
 	bottom: 98rpx !important;
-	}
+}
 
-	// 数量加减样式
+// 数量加减样式
-	.change_num {
+.change_num {
 	display: flex;
 	align-items: center;
 	justify-content: flex-end;
-	}
+}
 
-	.change_num>text,
+.change_num>text,
-	.change_num .iconfont {
+.change_num .iconfont {
 	font-size: 48rpx;
-	}
+}
 
-	.change_num input {
+.change_num input {
 	width: 70rpx;
 	height: 36rpx;
 	line-height: 36rpx;
 	text-align: center;
-	}
+}
 
-	.change_num .num-action {
+.change_num .num-action {
 	position: relative;
-	}
+}
 
-	.change_num .num-action .click-event {
+.change_num .num-action .click-event {
 	position: absolute;
 	width: 2rpx;
 	height: 2rpx;
@@ -836,17 +841,17 @@
 	top: 0;
 	transform: translate(-50%, -50%);
 	z-index: 5;
-	}
+}
 
-	/deep/ .uni-popup__wrapper {
+/deep/ .uni-popup__wrapper {
 	background: transparent !important;
-	}
+}
 
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: transparent !important;
-	}
+}
 
-	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: transparent !important;
-	}
+}
 </style>

components/ns-goods-sku/ns-goods-sku.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="goods-sku" @touchmove.prevent.stop>
-		<uni-popup ref="skuPopup" type="bottom" class="sku-layer" @change="popclose">
+		<uni-popup-sku ref="skuPopup" type="bottom" class="sku-layer" @change="popclose">
 			<view class="sku-info" :style="{ height: skuHeight }">
 				<view class="header">
 					<block v-if="type == 'point' && goodsDetail.type && goodsDetail.type != 1">
@@ -208,19 +208,15 @@
 					<button type="primary" v-else disabled="true">该商品已下架</button>
 				</view>
 			</view>
-		</uni-popup>
+		</uni-popup-sku>
 		<ns-login ref="login"></ns-login>
 	</view>
 </template>
 
 <script>
-	import uniPopup from '@/uni_modules/uni-popup/components/uni-popup/uni-popup-sku.vue';
 	// 商品SKU
 	export default {
 		name: 'ns-goods-sku',
-		components: {
-			uniPopup
-		},
 		props: {
 			goodsId: {
 				type: [Number, String],

pages.json

@@ -955,7 +955,15 @@
 		"custom": {
 			"diy-*(\\W.*)": "@/components-diy/diy$1.vue",
 			"uni-*(\\W.*)": "@/uni_modules/uni$1/components/uni$1/uni$1.vue",			
-			"MescrollUni": "@/components/mescroll/my-list-mescroll.vue"
+
+			"mescroll-uni": "@/components/mescroll/my-list-mescroll.vue",
+			"ns-goods-sku-index": "@/components/ns-goods-sku/ns-goods-sku-index.vue",
+			"ns-goods-sku-category": "@/components/ns-goods-sku/ns-goods-sku-category.vue",			
+
+			"x-skeleton": "@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue",
+			"mp-html": "@/uni_modules/mp-html/components/mp-html/mp-html.vue",
+			"uni-popup-sku": "@/uni_modules/uni-popup/components/uni-popup/uni-popup-sku.vue",
+			"uni-popup-sku-category": "@/uni_modules/uni-popup/components/uni-popup/uni-popup-sku-category.vue"
 		}
 	},
 	"preloadRule": {

pages_tool/agreement/contenr.vue

@@ -7,8 +7,6 @@
 <script>
 import htmlParser from '@/common/js/html-parser';
 export default {
-	 components: {
-	  },
     data() {
         return {
 			content:'',