chore(组件): 全部使用easycom来处理组件问题

.local.config.js

@@ -0,0 +1,39 @@
+// 本地调试配置示例文件
+// 复制此文件并重命名为 local.config.js 以使用自定义本地配置
+
+const localDevConfig = ({
+    '460': { // 制氧设备平台
+        uniacid: 460,
+        domain: 'https://xcx30.5g-quickapp.com/',
+    },
+    '2285': { // 数码喷墨墨水
+        uniacid: 2285,
+        domain: 'https://xcx.aigc-quickapp.com/',
+    },
+    '2811': { // POCT检测分析平台
+        uniacid: 2811,
+        domain: 'https://xcx.aigc-quickapp.com/',
+    },  
+    '2724': { // 生物菌肥
+        uniacid: 2724,
+        domain: 'https://xcx.aigc-quickapp.com/',
+    },     
+    '2505': { // 煤矿钻机
+        uniacid: 2505,
+        domain: 'https://xcx.aigc-quickapp.com/',
+    },   
+    '2777': { // 养老服务
+        uniacid: 2777,
+        domain: 'https://xcx.aigc-quickapp.com/',
+    },         
+    '1': { // 开发平台
+        uniacid: 1,
+        domain: 'https://dev.aigc-quickapp.com',
+    },
+    '1-test': { // 测试平台
+        uniacid: 1,
+        domain: 'https://test.aigc-quickapp.com',
+    },
+})['2285']; // 选择要使用的环境配置
+
+export default localDevConfig;

components-diy/diy-digit.vue

@@ -38,16 +38,10 @@
 </template>
 
 <script>
-import uvCountTo from '@/components/uv-count-to/uv-count-to.vue'
-import nsLogin from '@/components/ns-login/ns-login.vue'
 import DiyMinx from './minx.js'
 // 自定义数字展示
 export default {
 	name: 'diy-digit',
-	components: {
-		uvCountTo,
-		nsLogin
-	},
 	props: {
 		value: {
 			type: Object,

components-diy/diy-goods-brand.vue

@@ -19,8 +19,6 @@
 
 <script>
 // 商品品牌
-import uniGrid from '@/components/uni-grid/uni-grid.vue';
-import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue';
 
 import DiyMinx from './minx.js'
 // 自定义商品品牌展示	
@@ -31,10 +29,6 @@ export default {
 			type: Object
 		}
 	},
-	components: {
-		uniGrid,
-		uniGridItem
-	},
 	data() {
 		return {
 			list: [],

components-diy/diy-goods-list.vue

@@ -253,15 +253,11 @@
 </template>
 
 <script>
-import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
 import DiyMinx from './minx.js'
 
 // 自定义商品列表展示
 export default {
 	name: 'diy-goods-list',
-	components: {
-		nsGoodsSkuIndex
-	},
 	props: {
 		value: {
 			type: Object,

components-diy/diy-image-nav.vue

@@ -38,14 +38,11 @@
 </template>
 
 <script>
-import nsLogin from '@/components/ns-login/ns-login.vue'
+
 import DiyMinx from './minx.js'
 
 export default {
 	name: 'diy-image-nav',
-	components: {
-		nsLogin
-	},
 	props: {
 		value: {
 			type: Object,

components-diy/diy-index-page.vue

@@ -169,7 +169,7 @@
 </template>
 
 <script>
-import nsLoading from '@/components/ns-loading/ns-loading.vue';
+
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
 import DiyMinx from './minx.js'
 export default {
@@ -191,7 +191,6 @@ export default {
 	},
 	mixins: [DiyMinx],
 	components: {
-		nsLoading,
 		MescrollUni
 	},
 	data() {

components-diy/diy-member-info.vue

@@ -243,7 +243,7 @@ let menuButtonInfo = {};
 menuButtonInfo = uni.getMenuButtonBoundingClientRect();
 // #endif
 // 自定义会员中心——会员信息展示
-import nsContact from '@/components/ns-contact/ns-contact.vue';
+
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-member-info',
@@ -259,9 +259,6 @@ export default {
 		}
 	},
 	mixins: [DiyMinx],
-	components: {
-		nsContact
-	},
 	data() {
 		return {
 			info: null,

components-diy/diy-video-list.vue

@@ -62,13 +62,10 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue'
+
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-video-list',
-	components: {
-		uniPopup
-	},
 	props: {
 		value: {
 			type: Object,

components/ai-chat-message/ai-chat-message.vue

@@ -357,14 +357,10 @@
   </view>
 </template>
 <script>
-import nsLoading from '@/components/ns-loading/ns-loading.vue'
 import aiService from '@/common/js/ai-service.js'
 
 export default {
   name: 'ai-chat-message',
-  components: {
-    nsLoading
-  },
   props: {
     // 初始消息列表
     initialMessages: {

components/chat-message/chat-message.vue

@@ -71,11 +71,7 @@
 </template>
 
 <script>
-	import nsChatGoods from '@/pages_tool/components/ns-chat/ns-chat-goods.vue';
-	import nsChatOrder from '@/pages_tool/components/ns-chat/ns-chat-order.vue';
-	import nsChatReceiveGoods from '@/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue';
 	import htmlParser from '@/common/js/html-parser';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
 	import emjoy from '@/common/js/emjoy.js';
 
 	export default {
@@ -98,12 +94,6 @@
 				currImg: ''
 			};
 		},
-		components: {
-			nsChatGoods,
-			nsChatOrder,
-			uniPopup,
-			nsChatReceiveGoods
-		},
 		mounted() {
 			this.avatar = this.$util.img(this.siteInfo.logo_square);
 			this.myHeadImg = this.$util.img(this.memberInfo.headimg);

components/common-payment/common-payment.vue

@@ -636,30 +636,13 @@
 <script>
 	import payment from './payment.js';
 
-	import nsSelectTime from '@/components/ns-select-time/ns-select-time.vue';
-	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif	
+
 
 	export default {
 		name: 'common-payment',
 		data() {
 			return {};
 		},
-		components: {
-			nsSelectTime,
-			nsLogin,
-			MescrollUni,
-			loadingCover,
-			nsEmpty,
-			// #ifdef MP-WEIXIN
-			privacyPopup
-			// #endif
-		},
 		props: {
 			api: Object,
 			createDataKey: String

components/goods-detail-view/goods-detail-view.vue

@@ -420,12 +420,7 @@
 
 <script>
     // 商品详情视图
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
-    import pengpaiFadeinOut from '@/components/pengpai-fadein-out/pengpai-fadein-out.vue';
-    import xiaoStarComponent from '@/components/xiao-star-component/xiao-star-component.vue';
     import scroll from '@/common/js/scroll-view.js';
-    import toTop from '@/components/toTop/toTop.vue';
     import detail from './detail.js';
 
     export default {
@@ -438,13 +433,6 @@
                 }
             }
         },
-        components: {
-            uniPopup,
-            nsGoodsRecommend,
-            pengpaiFadeinOut,
-            toTop,
-            xiaoStarComponent
-        },
         mixins: [scroll, detail]
     };
 </script>

components/mescroll/mescroll-uni.vue

@@ -62,8 +62,6 @@
 	// 引入回到顶部组件
 	import MescrollTop from './components/mescroll-top.vue';
 
-	import nsLoading from '@/components/ns-loading/ns-loading.vue';
-
 	export default {
 		name: 'mescroll-uni',
 		components: {

components/ns-birthday-gift/ns-birthday-gift.vue

@@ -80,14 +80,10 @@
 </template>
 
 <script>
-	import uniPopup from '../uni-popup/uni-popup.vue';
 
 	// 注册奖励弹出层
 	export default {
 		name: 'ns-birthday-gift',
-		components: {
-			uniPopup
-		},
 		data() {
 			return {
 				birthday: {

components/ns-form/ns-form.vue

@@ -200,12 +200,8 @@
 </template>
 
 <script>
-    import pickRegions from '@/components/pick-regions/pick-regions.vue';
     export default {
         name: 'ns-form',
-        components: {
-            pickRegions
-        },
         props: {
             data: {
                 type: Array,

components/ns-goods-action-icon/ns-goods-action-icon.vue

@@ -20,7 +20,6 @@
 </template>
 
 <script>
-import nsContact from '@/components/ns-contact/ns-contact.vue';
 export default {
 	name: 'ns-goods-action-icon',
 	props: {
@@ -72,9 +71,6 @@ export default {
 			}
 		}
 	},
-	components:{
-		nsContact
-	},
 	methods: {
 		clickEvent() {
 			this.$emit('click');

components/ns-goods-recommend/ns-goods-recommend.vue

@@ -3,16 +3,9 @@
 </template>
 
 <script>
-	import nsLoading from '@/components/ns-loading/ns-loading.vue';
-	import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
-
 	// 商品推荐
 	export default {
 		name: 'ns-goods-recommend',
-		components: {
-			nsLoading,
-			nsGoodsSkuIndex
-		},
 		data() {
 			return {
 				list: [],

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

@@ -82,7 +82,7 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup-sku-new.vue';
+	import uniPopup from '@/uni_modules/uni-popup/components/uni-popup/uni-popup-sku-new.vue';
 	// 商品SKU
 	export default {
 		name: 'ns-goods-sku-category',

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

@@ -2,18 +2,16 @@
 	<view class="goods-sku">
 		<ns-login ref="login"></ns-login>
 		<!-- sku选择 -->
-		<ns-goods-sku v-if="goodsDetail.goods_id" ref="goodsSku" :goods-id="goodsDetail.goods_id" :goods-detail="goodsDetail" :max-buy="goodsDetail.max_buy" :min-buy="goodsDetail.min_buy" @refresh="refreshGoodsSkuDetail"></ns-goods-sku>
+		<ns-goods-sku v-if="goodsDetail.goods_id" ref="goodsSku" :goods-id="goodsDetail.goods_id"
+			:goods-detail="goodsDetail" :max-buy="goodsDetail.max_buy" :min-buy="goodsDetail.min_buy"
+			@refresh="refreshGoodsSkuDetail"></ns-goods-sku>
 	</view>
 </template>
 
 <script>
-	import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
-	// 商品SKU
-	export default {
+// 商品SKU
+export default {
 	name: 'ns-goods-sku-index',
-		components: {
-			nsGoodsSku
-		},
 	data() {
 		return {
 			timeout: {},
@@ -21,7 +19,7 @@
 			goodsDetail: {}
 		};
 	},
-		created() {},
+	created() { },
 	methods: {
 		/**
 		 * 添加购物车
@@ -63,7 +61,7 @@
 			let minBuy = data.min_buy > 0 ? data.min_buy : 1;
 			let num = cartNum >= minBuy ? cartNum : minBuy;
 			let _num = num;
-				if(cart && cart.cart_id){
+			if (cart && cart.cart_id) {
 				_num = _num + (data.min_buy > 0 ? data.min_buy : 1)
 			}
 			let cart_id = cart ? cart.cart_id : 0;
@@ -232,5 +230,5 @@
 			this.goodsDetail = Object.assign({}, this.goodsDetail, data);
 		}
 	}
-	};
+};
 </script>

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

@@ -214,7 +214,7 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup-sku.vue';
+	import uniPopup from '@/uni_modules/uni-popup/components/uni-popup/uni-popup-sku.vue';
 	// 商品SKU
 	export default {
 		name: 'ns-goods-sku',

components/ns-login/ns-login.vue

@@ -51,32 +51,38 @@
 					<view class="item-wrap">
 						<text class="label">头像</text>
 						<button open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
-							<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head" @error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill"/>
+							<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head"
+								@error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill" />
 							<text class="iconfont icon-right color-tip"></text>
 						</button>
 					</view>
 					<view class="item-wrap">
 						<text class="label">昵称</text>
-						<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName" maxlength="50" />
+						<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName"
+							maxlength="50" />
 					</view>
 					<!-- #endif  -->
 
 					<!-- #ifdef MP-ALIPAY -->
 					<view class="item-wrap">
 						<text class="label">头像</text>
-						<button open-type="getAuthorize" scope="userInfo" @getAuthorize="aliappGetUserinfo" :plain="true" class="border-0">
-							<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head" @error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill"/>
+						<button open-type="getAuthorize" scope="userInfo" @getAuthorize="aliappGetUserinfo"
+							:plain="true" class="border-0">
+							<image :src="avatarUrl ? avatarUrl : $util.getDefaultImage().head"
+								@error="avatarUrl = $util.getDefaultImage().head" mode="aspectFill" />
 							<text class="iconfont icon-right color-tip"></text>
 						</button>
 					</view>
 					<view class="item-wrap">
 						<text class="label">昵称</text>
-						<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName" maxlength="50" />
+						<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName"
+							maxlength="50" />
 					</view>
 					<!-- #endif  -->
 					<view class="item-wrap" v-if="forceBindingMobileControl">
 						<text class="label">手机号</text>
-						<button open-type="getPhoneNumber" :plain="true" class="auth-login border-0" @getphonenumber="getPhoneNumber">
+						<button open-type="getPhoneNumber" :plain="true" class="auth-login border-0"
+							@getphonenumber="getPhoneNumber">
 							<text class="mobile" v-if="formData.mobile">{{ formData.mobile }}</text>
 							<text class="color-base-text" v-else>获取手机号</text>
 						</button>
@@ -97,22 +103,17 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import registerReward from '@/components/register-reward/register-reward.vue';
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
 
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif
+import auth from '@/common/js/auth.js';
+import validate from '@/common/js/validate.js';
 
-	import auth from '@/common/js/auth.js';
-	import validate from '@/common/js/validate.js';
-
-	export default {
+export default {
 	mixins: [auth],
 	name: 'ns-login',
 	components: {
-			uniPopup,
-			registerReward,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
@@ -154,7 +155,7 @@
 	options: {
 		styleIsolation: 'shared'
 	},
-		mounted() {},
+	mounted() { },
 	watch: {
 		'dynacodeData.seconds': {
 			handler(newValue, oldValue) {
@@ -664,11 +665,11 @@
 			});
 		}
 	}
-	};
+};
 </script>
 
 <style lang="scss">
-	.complete-info-popup {
+.complete-info-popup {
 	.complete-info-wrap {
 		background: #fff;
 		padding: 50rpx 40rpx 40rpx;
@@ -779,19 +780,19 @@
 			margin: 40rpx auto 20rpx;
 		}
 	}
-	}
+}
 </style>
 <style scoped>
-	/deep/ .reward-popup .uni-popup__wrapper-box {
+/deep/ .reward-popup .uni-popup__wrapper-box {
 	background: none !important;
 	max-width: unset !important;
 	max-height: unset !important;
 	overflow: unset !important;
-	}
+}
 
-	.complete-info-popup /deep/ .uni-popup__wrapper.bottom,
-	.complete-info-popup /deep/ .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
+.complete-info-popup /deep/ .uni-popup__wrapper.bottom,
+.complete-info-popup /deep/ .uni-popup__wrapper.bottom .uni-popup__wrapper-box {
 	border-top-left-radius: 30rpx !important;
 	border-top-right-radius: 30rpx !important;
-	}
+}
 </style>

components/ns-new-gift/ns-new-gift.vue

@@ -75,12 +75,8 @@
 </template>
 
 <script>
-	import uniPopup from '../uni-popup/uni-popup.vue';
 
 	export default {
-		components: {
-			uniPopup
-		},
 		data() {
 			return {
 				newgift: {

components/ns-newform/ns-newform.vue

@@ -278,13 +278,8 @@
 </template>
 
 <script>
-import pickRegions from '@/components/pick-regions/pick-regions.vue'
-
 export default {
 	name: 'ns-form',
-	components: {
-		pickRegions
-	},
 	props: {
 		data: {
 			type: Array,

components/ns-payment/ns-payment.vue

@@ -22,10 +22,12 @@
                     </view>
                     <block v-if="payMoney > 0">
                         <block v-if="payTypeList.length">
-                            <view class="payment-item" v-for="(item, index) in payTypeList" :key="index" @click="payIndex = index">
+                            <view class="payment-item" v-for="(item, index) in payTypeList" :key="index"
+                                @click="payIndex = index">
                                 <view class="iconfont" :class="item.icon"></view>
                                 <text class="name">{{ item.name }}</text>
-                                <text class="iconfont" :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
+                                <text class="iconfont"
+                                    :class="payIndex == index ? 'icon-yuan_checked color-base-text' : 'icon-checkboxblank'"></text>
                             </view>
                         </block>
                         <block v-else>
@@ -43,19 +45,13 @@
 
 <!-- 旧版支付组件 订单表不为order表 的订单支付时使用该组件  -->
 <script>
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    import nsSwitch from '@/components/ns-switch/ns-switch.vue';
 
-    // #ifdef H5
-    import { Weixin } from 'common/js/wx-jssdk.js';
-    // #endif
+// #ifdef H5
+import { Weixin } from 'common/js/wx-jssdk.js';
+// #endif
 
-    export default {
+export default {
     name: 'ns-payment',
-        components: {
-            uniPopup,
-            nsSwitch
-        },
     props: {
         balanceDeduct: {
             type: [Number, String],
@@ -376,7 +372,7 @@
                                 paySign: payData.paySign,
                                 // orderInfo: payData.orderInfo,
                                 success: res => {
-                                        uni.removeStorage({key: 'is_test'})
+                                    uni.removeStorage({ key: 'is_test' })
                                     if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
                                         this.$util.redirectTo(
                                             '/pages_promotion/blindbox/index', {
@@ -396,7 +392,7 @@
                                 fail: res => {
                                     this.flag = false;
                                     if (res.errMsg == 'requestOrderPayment:fail cancel') {
-                                            this.$util.showToast({title: '您已取消支付'});
+                                        this.$util.showToast({ title: '您已取消支付' });
                                     } else {
                                         uni.showModal({
                                             content: '支付失败,失败原因: ' + res.errMsg,
@@ -404,7 +400,7 @@
                                         });
                                     }
                                     setTimeout(() => {
-                                            uni.removeStorage({key: 'is_test'})
+                                        uni.removeStorage({ key: 'is_test' })
                                         if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
                                             this.$util.redirectTo('/pages_promotion/blindbox/index', {
                                                 outTradeNo: this.payInfo.out_trade_no
@@ -432,7 +428,7 @@
                             fail: res => {
                                 this.flag = false;
                                 if (res.errMsg == 'requestPayment:fail cancel') {
-                                        this.$util.showToast({title: '您已取消支付'});
+                                    this.$util.showToast({ title: '您已取消支付' });
                                 } else {
                                     uni.showModal({
                                         content: '支付失败,失败原因: ' + res.errMsg,
@@ -470,11 +466,11 @@
         clearInterval(this.timer);
     },
     // #endif
-    };
+};
 </script>
 
 <style lang="scss">
-    .popup {
+.popup {
     width: 75vw;
     background: #fff;
     border-top-left-radius: $border-radius;
@@ -531,9 +527,9 @@
             padding-bottom: env(safe-area-inset-bottom);
         }
     }
-    }
+}
 
-    .choose-payment-popup {
+.choose-payment-popup {
     .payment-item {
         display: flex;
         align-items: center;
@@ -635,13 +631,13 @@
             font-size: $font-size-toolbar;
         }
     }
-    }
+}
 
-    .empty {
+.empty {
     width: 100%;
     text-align: center;
     padding: 40rpx 0;
     color: $color-sub;
     font-size: $font-size-tag;
-    }
+}
 </style>

components/ns-select-time/ns-select-time.vue

@@ -30,12 +30,8 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
 export default {
 	name: "nsSelectTime",
-	components: {
-		uniPopup
-	},
 	data() {
 		return {
 			//选中日期的键值

components/payment/payment.vue

@@ -43,9 +43,6 @@
 
 <!-- 新版支付组件 订单表为order表 的订单支付时使用该组件 -->
 <script>
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    import nsSwitch from '@/components/ns-switch/ns-switch.vue';
-
     // #ifdef H5
     import {
         Weixin
@@ -54,10 +51,6 @@
 
     export default {
         name: 'payment',
-        components: {
-            uniPopup,
-            nsSwitch
-        },
         props: {
             // 是否可用余额支付
             balanceUsable: {

components/register-reward/register-reward.vue

@@ -78,14 +78,9 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-
 	// 注册奖励弹出层
 	export default {
 		name: 'register-reward',
-		components: {
-			uniPopup
-		},
 		data() {
 			return {
 				reward: null,

pages.json

@@ -953,7 +953,8 @@
 	"easycom": {
 		"autoscan": true,
 		"custom": {
-			"diy-*(\\W.*)": "@/components-diy/diy$1.vue"
+			"diy-*(\\W.*)": "@/components-diy/diy$1.vue",
+			"uni-*(\\W.*)": "@/uni_modules/uni$1/components/uni$1/uni$1.vue"
 		}
 	},
 	"preloadRule": {

pages/index/index.vue

@@ -148,24 +148,19 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
-import nsLogin from '@/components/ns-login/ns-login.vue';
+
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif
 import diyJs from '@/common/js/diy.js';
-import toTop from '@/components/toTop/toTop.vue';
+
 import scroll from '@/common/js/scroll-view.js';
 
 import indexJs from './public/js/index.js';
 
 export default {
 	components: {
-		uniPopup,
-		nsNavbar,
-		toTop,
-		nsLogin,
+
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif

pages_goods/cart.vue

@@ -1,7 +1,8 @@
 <template>
 	<view :style="themeColor">
 		<view class="container">
-			<scroll-view class="scroll-view" :scroll-y="true" :show-scrollbar="false" :refresher-enabled="true" :refresher-triggered="refresherTriggered" @refresherrefresh="onRefresh">
+			<scroll-view class="scroll-view" :scroll-y="true" :show-scrollbar="false" :refresher-enabled="true"
+				:refresher-triggered="refresherTriggered" @refresherrefresh="onRefresh">
 				<block v-if="hasData">
 					<view class="cart-header" v-if="cartData.length">
 						<view class="num-wrap">共{{ cartData[0].cartList.length }}种商品</view>
@@ -20,51 +21,67 @@
 								<text class="iconfont icon-right"></text>
 							</view>
 						</view>
-						<view class="store-wrap" v-if="globalStoreConfig && globalStoreConfig.store_business == 'store' && globalStoreInfo">
+						<view class="store-wrap"
+							v-if="globalStoreConfig && globalStoreConfig.store_business == 'store' && globalStoreInfo">
 							<text class="iconfont icon-dianpu"></text>
-							<text class="name">{{globalStoreInfo.store_name}}</text>
+							<text class="name">{{ globalStoreInfo.store_name }}</text>
 						</view>
 						<block v-for="(item, cartIndex) in siteItem.cartList" :key="cartIndex">
 							<view class="cart-goods" @touchstart="touchS($event)" @touchend="touchE($event, item)">
 								<view class="goods-wrap" :class="{ edit: item.edit }">
-									<view class="iconfont" :class="item.checked ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'" @click="singleElection(siteIndex, cartIndex)"></view>
+									<view class="iconfont"
+										:class="item.checked ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"
+										@click="singleElection(siteIndex, cartIndex)"></view>
 									<view @click="toGoodsDetail(item)" class="goods-img">
-										<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(siteIndex, cartIndex)" mode="aspectFill"/>
+										<image :src="$util.img(item.sku_image, { size: 'mid' })"
+											@error="imageError(siteIndex, cartIndex)" mode="aspectFill" />
 									</view>
 									<view class="goods-info">
 										<view>
-											<view @click="toGoodsDetail(item)" class="goods-name">{{ isEnEnv ? item.en_goods_name : item.goods_name }}</view>
+											<view @click="toGoodsDetail(item)" class="goods-name">{{ isEnEnv ?
+												item.en_goods_name : item.goods_name }}</view>
 											<view class="sku-wrap">
 												<view class="sku">
-													<view class="goods-spec" v-if="item.sku_spec_format.length" @click="selectSku(item)">
+													<view class="goods-spec" v-if="item.sku_spec_format.length"
+														@click="selectSku(item)">
 														<block v-for="(x, i) in item.sku_spec_format" :key="i">
 															{{ x.spec_name }}:{{ x.spec_value_name }}
 															{{ i < item.sku_spec_format.length - 1 ? ';' : '' }}
 																</block>
 													</view>
-													<text class="iconfont icon-unfold" v-if="item.sku_spec_format.length"></text>
+													<text class="iconfont icon-unfold"
+														v-if="item.sku_spec_format.length"></text>
 												</view>
 											</view>
 										</view>
 										<view class="goods-sub-section">
 											<block v-if="item.promotion_type == 1">
-												<block v-if="Number(item.member_price) > 0 && Number(item.member_price) < Number(item.discount_price)">
+												<block
+													v-if="Number(item.member_price) > 0 && Number(item.member_price) < Number(item.discount_price)">
 													<view class="goods-price ">
 														<view class="bottom-price price-style large">
-															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															<text class="unit price-style small">{{
+																$lang('common.currencySymbol') }}</text>
 															{{ parseFloat(item.member_price).toFixed(2).split('.')[0] }}
-															<text class="unit price-style small">.{{ parseFloat(item.member_price).toFixed(2).split('.')[1] }}</text>
-															<image :src="$util.img('public/uniapp/index/VIP.png')"/>
+															<text class="unit price-style small">.{{
+																parseFloat(item.member_price).toFixed(2).split('.')[1]
+																}}</text>
+															<image :src="$util.img('public/uniapp/index/VIP.png')" />
 														</view>
 													</view>
 												</block>
 												<block v-else>
 													<view class="goods-price ">
 														<view class="bottom-price price-style large">
-															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-															{{ parseFloat(item.discount_price).toFixed(2).split('.')[0] }}
-															<text class="unit price-style small">.{{ parseFloat(item.discount_price).toFixed(2).split('.')[1] }}</text>
-															<image :src="$util.img('public/uniapp/index/discount.png')"/>
+															<text class="unit price-style small">{{
+																$lang('common.currencySymbol') }}</text>
+															{{ parseFloat(item.discount_price).toFixed(2).split('.')[0]
+															}}
+															<text class="unit price-style small">.{{
+																parseFloat(item.discount_price).toFixed(2).split('.')[1]
+																}}</text>
+															<image
+																:src="$util.img('public/uniapp/index/discount.png')" />
 														</view>
 													</view>
 												</block>
@@ -73,19 +90,25 @@
 												<block v-if="Number(item.member_price) > 0">
 													<view class="goods-price">
 														<view class="bottom-price price-style large">
-															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															<text class="unit price-style small">{{
+																$lang('common.currencySymbol') }}</text>
 															{{ parseFloat(item.member_price).toFixed(2).split('.')[0] }}
-															<text class="unit price-style small">.{{ parseFloat(item.member_price).toFixed(2).split('.')[1] }}</text>
-															<image :src="$util.img('public/uniapp/index/VIP.png')"/>
+															<text class="unit price-style small">.{{
+																parseFloat(item.member_price).toFixed(2).split('.')[1]
+																}}</text>
+															<image :src="$util.img('public/uniapp/index/VIP.png')" />
 														</view>
 													</view>
 												</block>
 												<block v-else>
 													<view class="goods-price">
 														<view class="bottom-price price-style large">
-															<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+															<text class="unit price-style small">{{
+																$lang('common.currencySymbol') }}</text>
 															{{ parseFloat(item.price).toFixed(2).split('.')[0] }}
-															<text class="unit price-style small">.{{ parseFloat(item.price).toFixed(2).split('.')[1] }}</text>
+															<text class="unit price-style small">.{{
+																parseFloat(item.price).toFixed(2).split('.')[1]
+																}}</text>
 														</view>
 													</view>
 												</block>
@@ -100,14 +123,16 @@
 											<text class="discount-tag">满减</text>
 											<scroll-view scroll-x="true" class="scroll-view">
 												<block v-for="(mitem, key) in manjian['sku_' + item.sku_id]" :key="key">
-													<text v-if="mitem.discount_money">{{ Number(mitem.limit) }}减{{ mitem.discount_money }}</text>
+													<text v-if="mitem.discount_money">{{ Number(mitem.limit) }}减{{
+														mitem.discount_money }}</text>
 													<text class="interval" v-if="mitem.discount_money"></text>
 												</block>
 											</scroll-view>
 										</view>
 									</view>
 								</view>
-								<view class="item-del color-base-bg" :class="{ show: item.edit }" @click="deleteCart('single', siteIndex, cartIndex)">{{ $lang('del') }}</view>
+								<view class="item-del color-base-bg" :class="{ show: item.edit }"
+									@click="deleteCart('single', siteIndex, cartIndex)">{{ $lang('del') }}</view>
 							</view>
 						</block>
 					</view>
@@ -124,7 +149,8 @@
 								<view class="goods-wrap">
 									<view class="iconfont icon-yuan_checked color-tip"></view>
 									<view class="goods-img">
-										<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" mode="aspectFill"/>
+										<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })"
+											mode="aspectFill" />
 									</view>
 									<view class="goods-info">
 										<view class="goods-name">{{ goodsItem.sku_name }}</view>
@@ -141,16 +167,25 @@
 										<view class="goods-sub-section">
 											<view class="goods-price">
 												<text class="bottom-price price-style large">
-													<template v-if="goodsItem.member_price > 0 && goodsItem.member_price < goodsItem.discount_price">
-														<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-														{{ parseFloat(goodsItem.member_price).toFixed(2).split('.')[0] }}
-														<text class="unit price-style small">.{{ parseFloat(goodsItem.member_price).toFixed(2).split('.')[1] }}</text>
-														<image :src="$util.img('public/uniapp/index/VIP.png')"/>
+													<template
+														v-if="goodsItem.member_price > 0 && goodsItem.member_price < goodsItem.discount_price">
+														<text class="unit price-style small">{{
+															$lang('common.currencySymbol') }}</text>
+														{{ parseFloat(goodsItem.member_price).toFixed(2).split('.')[0]
+														}}
+														<text class="unit price-style small">.{{
+															parseFloat(goodsItem.member_price).toFixed(2).split('.')[1]
+															}}</text>
+														<image :src="$util.img('public/uniapp/index/VIP.png')" />
 													</template>
 													<template v-else>
-														<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-														{{ parseFloat(goodsItem.discount_price).toFixed(2).split('.')[0] }}
-														<text class="unit price-style small">.{{ parseFloat(goodsItem.discount_price).toFixed(2).split('.')[1] }}</text>
+														<text class="unit price-style small">{{
+															$lang('common.currencySymbol') }}</text>
+														{{ parseFloat(goodsItem.discount_price).toFixed(2).split('.')[0]
+														}}
+														<text class="unit price-style small">.{{
+															parseFloat(goodsItem.discount_price).toFixed(2).split('.')[1]
+															}}</text>
 													</template>
 												</text>
 											</view>
@@ -165,7 +200,8 @@
 				<block v-else>
 					<view class="cart-empty">
 						<ns-empty text="购物车为空" subText="赶紧去逛逛, 购买心仪的商品吧" :isIndex="Boolean(storeToken)"></ns-empty>
-						<button type="primary" size="mini" class="button mini" v-if="!storeToken" @click="toLogin">去登录</button>
+						<button type="primary" size="mini" class="button mini" v-if="!storeToken"
+							@click="toLogin">去登录</button>
 					</view>
 				</block>
 				<ns-goods-recommend ref="goodrecommend" route="cart"></ns-goods-recommend>
@@ -201,7 +237,7 @@
 							<view class="money price-font ">￥{{ discount.order_money | moneyFormat }}</view>
 						</view>
 					</view>
-					<view :style="{height: tabBarHeight}"></view>
+					<view :style="{ height: tabBarHeight }"></view>
 				</view>
 			</uni-popup>
 
@@ -213,9 +249,11 @@
 					</view>
 					<view class="popup-body" :class="{ 'safe-area': isIphoneX }" @click="$refs.couponPopup.close()">
 						<view class="coupon-item">
-							<view class="coupon-info" :style="{ backgroundColor: discount.coupon_info.receive_type != 'wait' ? '#F2F2F2' : 'var(--main-color-shallow)' }">
+							<view class="coupon-info"
+								:style="{ backgroundColor: discount.coupon_info.receive_type != 'wait' ? '#F2F2F2' : 'var(--main-color-shallow)' }">
 								<view class="info-wrap">
-									<image class="coupon-line" mode="heightFix" :src="$util.img('public/uniapp/coupon/coupon_line.png')"/>
+									<image class="coupon-line" mode="heightFix"
+										:src="$util.img('public/uniapp/coupon/coupon_line.png')" />
 									<view class="coupon-money">
 										<template v-if="discount.coupon_info.type == 'reward'">
 											<text class="unit">{{ $lang('common.currencySymbol') }}</text>
@@ -237,24 +275,30 @@
 								</view>
 								<view class="desc-wrap">
 									<view class="coupon-name">{{ discount.coupon_info.coupon_name }}</view>
-									<view v-if="discount.coupon_info.type == 'discount' && discount.coupon_info.discount_limit > 0" class="limit">
+									<view
+										v-if="discount.coupon_info.type == 'discount' && discount.coupon_info.discount_limit > 0"
+										class="limit">
 										最多可抵￥{{ discount.coupon_info.discount_limit }}
 									</view>
-									<view class="time font-size-goods-tag" v-if="discount.coupon_info.validity_type == 0">
+									<view class="time font-size-goods-tag"
+										v-if="discount.coupon_info.validity_type == 0">
 										有效期：{{ $util.timeStampTurnTime(discount.coupon_info.end_time) }}
 									</view>
-									<view class="time font-size-goods-tag" v-else-if="discount.coupon_info.validity_type == 1">
+									<view class="time font-size-goods-tag"
+										v-else-if="discount.coupon_info.validity_type == 1">
 										有效期：领取之日起{{ discount.coupon_info.fixed_term }}天内有效
 									</view>
 									<view class="time font-size-goods-tag" v-else>有效期：长期有效</view>
 								</view>
 
-								<button type="primary" v-if="discount.coupon_info.receive_type != 'wait'" disabled>已领取</button>
-								<button type="primary" v-else @click.stop="receiveCoupon(discount.coupon_info.coupon_type_id)">领取</button>
+								<button type="primary" v-if="discount.coupon_info.receive_type != 'wait'"
+									disabled>已领取</button>
+								<button type="primary" v-else
+									@click.stop="receiveCoupon(discount.coupon_info.coupon_type_id)">领取</button>
 							</view>
 						</view>
 					</view>
-					<view :style="{height: tabBarHeight}"></view>
+					<view :style="{ height: tabBarHeight }"></view>
 					<view class="cart-bottom-block"></view>
 				</view>
 			</uni-popup>
@@ -262,7 +306,8 @@
 
 		<view class="cart-bottom" :style="{ bottom: tabBarHeight }" :class="{ active: isIphoneX }" v-if="hasData">
 			<view class="all-election" @click="allElection">
-				<view class="iconfont" :class="checkAll ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'"></view>
+				<view class="iconfont" :class="checkAll ? 'icon-yuan_checked color-base-text' : 'icon-yuan_checkbox'">
+				</view>
 				<text>{{ $lang('allElection') }}</text>
 			</view>
 			<view class="settlement-info" :style="{ visibility: isAction ? 'hidden' : 'visible' }">
@@ -270,8 +315,10 @@
 					{{ $lang('total') }}：
 					<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
 					<block v-if="Object.keys(discount).length">
-						<text class="value price-font">{{ parseFloat(discount.order_money).toFixed(2).split('.')[0] }}</text>
-						<text class="unit price-font">.{{ parseFloat(discount.order_money).toFixed(2).split('.')[1] }}</text>
+						<text class="value price-font">{{ parseFloat(discount.order_money).toFixed(2).split('.')[0]
+							}}</text>
+						<text class="unit price-font">.{{ parseFloat(discount.order_money).toFixed(2).split('.')[1]
+							}}</text>
 					</block>
 					<block v-else>
 						<text class="value price-font">{{ parseFloat(totalPrice).toFixed(2).split('.')[0] }}</text>
@@ -288,16 +335,20 @@
 			</view>
 			<view class="action-btn" v-else>
 				<button type="primary" size="mini" class="mini" @click="settlement" v-if="totalCount != 0">
-					{{ discount.coupon_info && discount.coupon_info.receive_type == 'wait' ? '领券' : '立即' }}结算({{ totalCount }})
+					{{ discount.coupon_info && discount.coupon_info.receive_type == 'wait' ? '领券' : '立即' }}结算({{
+						totalCount }})
 				</button>
-				<button type="primary" size="mini" class="mini" @click="settlement" disabled
-					v-else>{{ $lang('settlement') }}({{ totalCount }})</button>
+				<button type="primary" size="mini" class="mini" @click="settlement" disabled v-else>{{
+					$lang('settlement') }}({{
+						totalCount }})</button>
 			</view>
 		</view>
 
 		<diy-bottom-nav></diy-bottom-nav>
 
-		<ns-goods-sku ref="selectSku" v-if="goodsSkuDetail" :goods-detail="goodsSkuDetail" :goods-id="goodsSkuDetail.goods_id" :max-buy="goodsSkuDetail.max_buy" :min-buy="goodsSkuDetail.min_buy" @refresh="refreshSkuDetail"></ns-goods-sku>
+		<ns-goods-sku ref="selectSku" v-if="goodsSkuDetail" :goods-detail="goodsSkuDetail"
+			:goods-id="goodsSkuDetail.goods_id" :max-buy="goodsSkuDetail.max_buy" :min-buy="goodsSkuDetail.min_buy"
+			@refresh="refreshSkuDetail"></ns-goods-sku>
 
 		<!-- 加载动画 -->
 		<loading-cover ref="loadingCover"></loading-cover>
@@ -315,44 +366,33 @@
 </template>
 
 <script>
-	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
-	import uniNumberBox from '@/components/uni-number-box/uni-number-box.vue';
-	import toTop from '@/components/toTop/toTop.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import scroll from '@/common/js/scroll-view.js';
-	import cart from './public/js/cart.js';
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif
 
-	export default {
+import scroll from '@/common/js/scroll-view.js';
+import cart from './public/js/cart.js';
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
+
+export default {
 	components: {
-		nsGoodsRecommend,
-		uniNumberBox,
-		toTop,
-		nsEmpty,
-		nsLogin,
-		loadingCover,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
 	},
 	mixins: [scroll, cart]
-	};
+};
 </script>
 
 <style lang="scss">
-	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	background: none;
 	max-height: unset !important;
 	overflow-y: hidden !important;
-	}
+}
 
-	/deep/ .uni-popup__wrapper {
+/deep/ .uni-popup__wrapper {
 	border-radius: 20rpx 20rpx 0 0;
-	}
+}
 
-	@import './public/css/cart.scss';
+@import './public/css/cart.scss';
 </style>

pages_goods/category.vue

@@ -25,15 +25,11 @@
 </template>
 
 <script>
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif
 export default {
 	components: {
-		nsLogin,
-		loadingCover,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif

pages_goods/components/goods-detail-view/detail.js

@@ -1,465 +0,0 @@
-// 商品详情业务
-import {
-	Weixin
-} from '@/common/js/wx-jssdk.js';
-
-export default {
-	data() {
-		return {
-			skuId: 0,
-			goodsId: 0,
-			isIphoneX: false, //判断手机是否是iphoneX以上
-			whetherCollection: 0,
-
-			//是否开启预览，0：不开启，1：开启
-			preview: 0,
-			videoContext: '',
-
-			// 媒体,图片,视频
-
-			// 解决每个商品SKU图片数量不同时，无法切换到第一个，导致轮播图显示不出来
-			swiperInterval: 1,
-			swiperAutoplay: false,
-			swiperCurrent: 1,
-			switchMedia: 'img',
-
-			//评价
-			goodsEvaluate: [{
-				member_headimg: '',
-				member_name: '',
-				content: '',
-				images: [],
-				create_time: 0,
-				sku_name: ''
-			}],
-			evaluateConfig: {
-				evaluate_audit: 1,
-				evaluate_show: 0,
-				evaluate_status: 1
-			},
-
-			// 是否可分享到好物圈
-			goodsCircle: false,
-			service: null,
-			shareUrl: '', // 分享链接
-			source_member: 0, //分享人的id
-			isCommunity: false, //社群弹窗
-
-			poster: "-1", //海报
-			posterMsg: "", //海报错误信息
-			posterHeight: 0,
-			posterParams: {}, //海报所需参数
-			goodsRoute: '',
-			posterApi: '',
-			goodsAttrShow: false, // 商品属性是否展开
-
-			//门店列表
-			storeList: {
-				data: [],
-				page: 1,
-				page_size: 10
-			},
-			isShowStore: false,
-			latitude: null, // 纬度
-			longitude: null, // 经度
-			evaluateCount: 0, // 商品评论数量
-			deliveryType: null, // 配送方式
-			isVirtual: 0 //是否为虚拟商品
-		}
-	},
-	created() {
-		this.isIphoneX = this.$util.uniappIsIPhoneX();
-
-		if (this.location) {
-			this.latitude = this.location.latitude;
-			this.longitude = this.location.longitude;
-		} else {
-			this.$util.getLocation();
-		}
-		this.getStoreData();
-	},
-	watch: {
-		location: function (nVal) {
-			if (nVal) {
-				this.latitude = nVal.latitude;
-				this.longitude = nVal.longitude;
-				this.getStoreData();
-			}
-		}
-	},
-	methods: {
-		init(params) {
-			this.skuId = params.sku_id;
-			this.goodsId = params.goods_id;
-			this.preview = params.preview;
-			this.source_member = params.source_member;
-			this.whetherCollection = params.whetherCollection;
-			this.posterParams = params.posterParams;
-
-			this.shareUrl = params.shareUrl;
-			this.goodsRoute = params.goodsRoute;
-			this.posterApi = params.posterApi;
-			this.isVirtual = params.isVirtual;
-			this.deliveryType = params.deliveryType;
-			this.evaluateConfig = params.evaluateConfig;
-
-			if (this.evaluateConfig.evaluate_show == 1) {
-				//商品评论
-				this.getGoodsEvaluate(params.evaluateList);
-				this.evaluateCount = params.evaluateCount;
-			}
-
-			for (let k in this.deliveryType) {
-				if (k == 'store') {
-					this.isShowStore = true;
-				}
-			}
-
-			this.getService();
-
-			this.videoContext = uni.createVideoContext('goodsVideo');
-
-			// #ifdef MP-WEIXIN
-			this.goodsSyncToGoodsCircle();
-			// #endif
-
-		},
-		swiperChange(e) {
-			this.swiperCurrent = e.detail.current + 1;
-		},
-
-		//-------------------------------------服务-------------------------------------
-
-		openMerchantsServicePopup() {
-			this.$refs.merchantsServicePopup.open();
-		},
-		closeMerchantsServicePopup() {
-			this.$refs.merchantsServicePopup.close();
-		},
-
-		//-------------------------------------门店列表-------------------------------------
-		openStoreListPopup() {
-			this.$refs.storeListPopup.open();
-		},
-		closeStoreListPopup() {
-			this.$refs.storeListPopup.close();
-		},
-		getStoreData() {
-			//门店列表
-			let data = {
-				page: this.storeList.page,
-				page_size: this.storeList.page_size
-			};
-			if (this.latitude && this.longitude) {
-				data.latitude = this.latitude;
-				data.longitude = this.longitude;
-			}
-			this.$api.sendRequest({
-				url: '/api/store/page',
-				data: data,
-				success: res => {
-					if (this.storeList.page == 1) this.storeList.data == [];
-					if (res.code >= 0 && res.data) {
-						this.storeList.data = this.storeList.data.concat(res.data.list);
-					} else {
-						this.$util.showToast({
-							title: res.message
-						});
-					}
-				}
-			});
-		},
-		selectStore(item) {
-			this.$util.redirectTo('/pages_tool/store/detail', {
-				store_id: item.store_id
-			});
-			this.closeStoreListPopup();
-		},
-		//-------------------------------------属性-------------------------------------
-
-		switchGoodsAttr() {
-			this.goodsAttrShow = !this.goodsAttrShow;
-		},
-		//-------------------------------------评价-------------------------------------
-		//商品评论列表
-		getGoodsEvaluate(list) {
-			if (list) {
-				this.goodsEvaluate = list;
-				this.goodsEvaluate.forEach((item, index) => {
-					if (this.goodsEvaluate[index].images) this.goodsEvaluate[index].images = this.goodsEvaluate[index].images.split(",");
-					if (this.goodsEvaluate[index].is_anonymous == 1) this.goodsEvaluate[index].member_name = this.goodsEvaluate[index].member_name.replace(this.goodsEvaluate[index].member_name.substring(1, this.goodsEvaluate[index].member_name.length - 1), '***')
-				})
-				// if (this.goodsEvaluate.images) this.goodsEvaluate.images = this.goodsEvaluate.images.split(",");
-				// if (this.goodsEvaluate.is_anonymous == 1) this.goodsEvaluate.member_name = this.goodsEvaluate.member_name.replace(
-				// this.goodsEvaluate.member_name.substring(1, this.goodsEvaluate.member_name.length - 1), '***')
-			}
-		},
-		// 预览评价图片
-		previewEvaluate(index, img_index, field) {
-			var paths = [];
-			for (let i = 0; i < this.goodsEvaluate[index][field].length; i++) {
-				paths.push(this.$util.img(this.goodsEvaluate[index][field][i]));
-			}
-			uni.previewImage({
-				current: img_index,
-				urls: paths
-			});
-		},
-		//-------------------------------------关注-------------------------------------
-		async collection() {
-			if (this.preview) return; // 开启预览，禁止任何操作和跳转
-
-			if (this.storeToken) {
-
-				//未关注添加关注
-				if (this.whetherCollection == 0) {
-					let res = await this.$api.sendRequest({
-						url: "/api/goodscollect/add",
-						data: {
-							sku_id: this.skuId,
-							goods_id: this.goodsSkuDetail.goods_id,
-							sku_name: this.goodsSkuDetail.sku_name,
-							sku_price: this.goodsSkuDetail.show_price,
-							sku_image: this.goodsSkuDetail.sku_image
-						},
-						async: false,
-					});
-					var data = res.data;
-					if (data > 0) {
-						this.whetherCollection = 1;
-					}
-				} else {
-					//已关注取消关注
-					let res = await this.$api.sendRequest({
-						url: "/api/goodscollect/delete",
-						data: {
-							goods_id: this.goodsSkuDetail.goods_id
-						},
-						async: false,
-					});
-					var data = res.data;
-					if (data > 0) {
-						this.whetherCollection = 0;
-					}
-				}
-				return this.whetherCollection;
-			} else {
-				if (this.source_member) {
-					this.$refs.login.open(this.shareUrl + '&source_member=' + this.source_member);
-				} else {
-					this.$refs.login.open(this.shareUrl);
-				}
-			}
-		},
-		//-------------------------------------分享-------------------------------------
-		// 打开分享弹出层
-		openSharePopup() {
-			this.$refs.sharePopup.open();
-		},
-		// 关闭分享弹出层
-		closeSharePopup() {
-			this.$refs.sharePopup.close();
-		},
-		copyUrl() {
-			let text = this.$config.h5Domain + this.shareUrl;
-			if (this.memberInfo && this.memberInfo.member_id) text += '&source_member=' + this.memberInfo.member_id;
-			this.$util.copy(text, () => {
-				this.closeSharePopup();
-			});
-		},
-
-		//-------------------------------------海报-------------------------------------
-		// 打开海报弹出层
-		openPosterPopup() {
-			this.getGoodsPoster();
-			this.$refs.sharePopup.close();
-		},
-		// 关闭海报弹出层
-		closePosterPopup() {
-			this.$refs.posterPopup.close();
-			this.poster = ''
-		},
-		//生成海报
-		getGoodsPoster() {
-			uni.showLoading({
-				'title': '海报生成中...'
-			})
-			//活动海报信息
-			if (this.memberInfo && this.memberInfo.member_id) this.posterParams.source_member = this.memberInfo.member_id;
-
-			this.$api.sendRequest({
-				url: this.posterApi,
-				data: {
-					page: this.goodsRoute,
-					qrcode_param: JSON.stringify(this.posterParams)
-				},
-				success: res => {
-					if (res.code == 0) {
-						this.$refs.posterPopup.open();
-						this.poster = res.data.path + "?time=" + new Date().getTime();
-					} else {
-						this.posterMsg = res.message;
-						this.$util.showToast({
-							title: res.message
-						})
-					}
-					uni.hideLoading();
-				},
-				fail: err => {
-					uni.hideLoading();
-				}
-			});
-		},
-		// 预览图片
-		previewMedia(index) {
-			var paths = [];
-			for (let i = 0; i < this.goodsSkuDetail.sku_images.length; i++) {
-				paths.push(this.$util.img(this.goodsSkuDetail.sku_images[i], {
-					size: 'big'
-				}));
-			}
-			uni.previewImage({
-				current: index,
-				urls: paths,
-				// longPressActions: {
-				// 	itemList: ['发送给朋友', '保存图片', '关注'],
-				// 	success: function(data) {
-				// 		console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
-				// 	},
-				// 	fail: function(err) {
-				// 		console.log(err.errMsg);
-				// 	}
-				// }
-			});
-		},
-		swiperImageError(index) {
-			this.goodsSkuDetail.sku_images[index] = this.$util.getDefaultImage().goods;
-			this.$forceUpdate();
-		},
-		// #ifdef MP || APP-PLUS
-		//小程序中保存海报
-		saveGoodsPoster() {
-			let url = this.$util.img(this.poster);
-			uni.downloadFile({
-				url: url,
-				success: (res) => {
-					if (res.errMsg == "downloadFile:ok") {
-						uni.saveImageToPhotosAlbum({
-							filePath: res.tempFilePath,
-							success: () => {
-								this.$util.showToast({
-									title: "保存成功"
-								});
-							},
-							fail: (err) => {
-								this.$util.showToast({
-									title: "保存失败，请稍后重试"
-								});
-							}
-						});
-					}
-				},
-				fail: (err) => {
-					this.$util.showToast({
-						title: "保存失败，请稍后重试"
-					});
-				}
-			});
-		},
-		// #endif
-		//售后保障查询
-		getService() {
-			this.$api.sendRequest({
-				url: '/api/goods/aftersale',
-				success: res => {
-					if (res.code == 0 && res.data) {
-						this.service = res.data;
-					}
-				}
-			});
-		},
-
-		// #ifdef MP-WEIXIN
-		/**
-		 *    将商品同步到微信圈子
-		 */
-		goodsSyncToGoodsCircle() {
-			this.$api.sendRequest({
-				url: '/goodscircle/api/goods/sync',
-				data: {
-					goods_id: this.goodsSkuDetail.goods_id
-				},
-				success: res => {
-					if (res.code == 0) {
-						this.goodsCircle = true;
-					}
-				}
-			})
-		},
-		/**
-		 * 将商品推荐到微信圈子
-		 */
-		openBusinessView() {
-			if (wx.openBusinessView) {
-				wx.openBusinessView({
-					businessType: 'friendGoodsRecommend',
-					extraData: {
-						product: {
-							item_code: this.goodsSkuDetail.goods_id,
-							title: this.goodsSkuDetail.sku_name,
-							image_list: this.goodsSkuDetail.sku_images.map((ele) => {
-								return this.$util.img(ele);
-							})
-						}
-					},
-					success: function (res) {
-						console.log('success', res);
-					},
-					fail: function (res) {
-						console.log('fail', res);
-					}
-				})
-			}
-		},
-		// #endif
-		toEvaluateDetail(id) {
-			this.$util.redirectTo('/pages_tool/goods/evaluate', {
-				goods_id: id
-			});
-		},
-		showImg(e) {
-			//拿到图片的路径里面的内容放在我们数组中
-			let contentimg = e.target.dataset.nodes;
-			let arrImg = [];
-			for (var i = 0; i < contentimg.length; i++) {
-				var img = contentimg[i].children;
-				if (Array.isArray(img)) {
-					for (var j = 0; j < img.length; j++) {
-						if (img[j].attrs && img[j].name == "img") {
-							if (img[j].attrs.src) {
-								arrImg.push(img[j].attrs.src)
-							}
-						}
-					}
-				}
-			}
-			//最后一步就是把我们的所有图片放在预览的api中就可以了
-			uni.previewImage({
-				current: arrImg,
-				urls: arrImg,
-			})
-		},
-
-		//-------------------------------------社群-------------------------------------
-
-		//添加福利群
-		onCommunity() {
-			this.isCommunity = true
-		},
-		onCloseCommunity() {
-			this.isCommunity = false
-		},
-
-	}
-
-}

pages_goods/components/goods-detail-view/goods-detail-view.vue

@@ -1,455 +0,0 @@
-<template>
-    <view>
-        <view scroll-y="true" class="goods-detail" :class="isIphoneX ? 'active' : ''">
-            <view class="goods-container">
-                <!-- 弹幕 -->
-                <pengpai-fadein-out v-if="goodsSkuDetail.barrage_show && goodsSkuDetail.barrageData" ref="pengpai" :duration="1600" :wait="1900" :top="200" :left="0" :radius="60" :loop="true" :info="goodsSkuDetail.barrageData"/>
-
-                <!-- 商品媒体信息 -->
-                <view class="goods-media" :style="{height: goodsSkuDetail.swiperHeight}">
-                    <!-- 商品图片 -->
-                    <view class="goods-img" :class="{ show: switchMedia == 'img' }">
-                        <swiper class="swiper" @change="swiperChange" :interval="swiperInterval" :autoplay="swiperAutoplay" autoplay="true" interval="4000" circular="true">
-                            <swiper-item v-for="(item, index) in goodsSkuDetail.sku_images" :key="index" :item-id="'goods_id_' + index">
-                                <view class="item" @click="previewMedia(index)">
-                                    <image :src="$util.img(item, { size: 'big' })" @error="swiperImageError(index)" mode="aspectFit" />
-                                </view>
-                            </swiper-item>
-                        </swiper>
-                        <view class="img-indicator-dots">
-                            <text>{{ swiperCurrent }}</text>
-                            <text v-if="goodsSkuDetail.sku_images">/{{ goodsSkuDetail.sku_images.length }}</text>
-                        </view>
-                    </view>
-
-                    <!-- 商品视频 -->
-                    <view class="goods-video" :class="{ show: switchMedia == 'video' }">
-                        <video id="goodsVideo" :src="$util.img(goodsSkuDetail.video_url)" :poster="$util.img(goodsSkuDetail.sku_image, { size: 'big' })" objectFit="cover"></video>
-                    </view>
-
-                    <!-- 切换视频、图片 -->
-                    <view class="media-mode" v-if="goodsSkuDetail.video_url != ''">
-                        <text :class="{ 'color-base-bg': switchMedia == 'video' }" @click="switchMedia = 'video'">{{ $lang('video') }}</text>
-                        <text :class="{ 'color-base-bg': switchMedia == 'img' }" @click="(switchMedia = 'img'), videoContext.pause()">{{ $lang('image') }}</text>
-                    </view>
-                </view>
-
-                <!-- 价格区域 -->
-                <view class="goods-gression">
-                    <slot name="price"></slot>
-                </view>
-
-                <view class="newdetail margin-bottom" v-if="goodsSkuDetail.isinformation == 0">
-					
-                    <!-- 入口区域 -->
-                    <slot name="entrance"></slot>
-
-                    <!-- 配送 -->
-				<!-- 	@click="$refs.deliveryType.open()" -->
-                    <view class="item delivery-type" v-if="goodsSkuDetail.is_virtual == 0" >
-                        <view class="label">{{$lang('send')}}</view>
-                        <block v-if="deliveryType">
-                            <view class="box">
-                                <block v-for="(item, index) in deliveryType" :key="index">
-                                    <text v-if="goodsSkuDetail.support_trade_type.indexOf(index) != -1">{{$lang('express')}}</text>
-								<!-- 	{{ item.name }} -->
-                                </block>
-                            </view>
-                            <text class="iconfont icon-right"></text>
-                        </block>
-                        <block v-else>
-                            <view class="box">未配置</view>
-                        </block>
-                    </view>
-
-                    <!-- 门店 -->
-               <!--     <view class="item store-wrap" @click="openStoreListPopup()" v-if="addonIsExist.store && globalStoreInfo && isShowStore">
-                        <view class="label">门店</view>
-                        <view class="list-wrap">
-                            <view class="name-wrap">
-                                <text class="icondiy icon-system-shop"></text>
-                                <text class="name">{{globalStoreInfo.store_name}}</text>
-                            </view>
-                            <view class="other-wrap">
-                                <text class="distance" v-if="parseFloat(globalStoreInfo.distance)">距离{{ globalStoreInfo.distance > 1 ? globalStoreInfo.distance + 'km' : globalStoreInfo.distance * 1000 + 'm' }}</text>
-                                <text class="decorate" v-if="parseFloat(globalStoreInfo.distance)">.</text>
-                                <view class="address">{{ globalStoreInfo.full_address + globalStoreInfo.address }}
-                                </view>
-                            </view>
-                        </view>
-                        <text class="iconfont icon-right"></text>
-                    </view> -->
-
-                    <view class="item service" @click="openMerchantsServicePopup()" v-if="goodsSkuDetail.goods_service.length">
-                        <view class="label">服务</view>
-                        <view class="list-wrap">
-                            <view class="item-wrap" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index" v-if="index < 3">
-                                <view class="item-wrap-box">
-                                    <view class="item-wrap-icon">
-                                        <text class="iconfont icon-dui" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
-                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
-                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'" :icon="item.icon.icon" :value="item.icon.style ? item.icon.style : null"></diy-icon>
-                                    </view>
-                                    <text>{{ item.service_name }}</text>
-                                </view>
-                            </view>
-                        </view>
-                        <text class="iconfont icon-right"></text>
-                    </view>
-		
-                </view>
-				
-				<!--多规格区域-->
-				<view class="newdetail margin-bottom"  v-if="goodsSkuDetail.sku_spec_format">
-				    <!-- 入口区域 -->
-				  	<slot name="skuspec"></slot>
-				</view>
-			
-				 
-				 <view class="newdetail margin-bottom" v-if="goodsSkuDetail.merch_id > 0">
-                    <!-- 入口区域 -->
-                    <slot name="entrance"></slot>
-                    <!-- 商家 -->
-                   <view class="item store-wrap"  @click="$util.redirectTo('/pages_promotion/merch/detail', { merch_id: goodsSkuDetail.merch_id })">
-                        <view class="list-wrap" style="display: flex;">
-                            <view class="name-wrap">
-								<image :src="$util.img(goodsSkuDetail.merchinfo.merch_image)" mode="widthFix" style="width: 100rpx;height: 100rpx;border-radius: 50rpx;"></image>
-                            </view>
-                           <view class="other-wrap">
-                               <view class="address" style="margin-left: 30rpx;">
-								   <view>{{goodsSkuDetail.merchinfo.merch_name}}</view>
-								   <view style="font-size: 24rpx;color: #888;">官方认证商家，值得信赖！</view>
-							   </view>
-                            </view>
-                        </view>
-                        <text class="iconfont icon-right"></text>
-                    </view>
-                </view>
-
-                <!-- 配送方式 -->
-                <view @touchmove.prevent.stop>
-                    <uni-popup ref="deliveryType" type="bottom">
-                        <view class="deliverytype-popup-layer popup-layer">
-                            <view class="head-wrap" @click="$refs.deliveryType.close()">
-                                <text>配送</text>
-                                <text class="iconfont icon-close"></text>
-                            </view>
-                            <scroll-view scroll-y class="type-body">
-                                <block v-for="(item, index) in deliveryType" :key="index">
-                                    <view class="type-item" :class="{ 'not-support': goodsSkuDetail.support_trade_type.indexOf(index) == -1 }">
-                                        <text class="iconfont" :class="item.icon"></text>
-                                        <view class="content">
-                                            <view class="title">{{ item.name }}</view>
-                                            <view class="desc">{{ item.desc }}</view>
-                                        </view>
-                                    </view>
-                                </block>
-                            </scroll-view>
-                        </view>
-                    </uni-popup>
-                </view>
-
-                <!-- 商品服务 -->
-                <view @touchmove.prevent.stop>
-                    <uni-popup ref="merchantsServicePopup" type="bottom">
-                        <view class="goods-merchants-service-popup-layer popup-layer">
-                            <view class="head-wrap" @click="closeMerchantsServicePopup()">
-                                <text>商品服务</text>
-                                <text class="iconfont icon-close"></text>
-                            </view>
-                            <scroll-view scroll-y>
-                                <view class="item" :class="{ 'empty-desc': !item.desc }" v-for="(item, index) in goodsSkuDetail.goods_service" :key="index">
-                                    <view class="item-icon" :class="{'empty-desc':!item.desc}">
-                                        <text class="iconfont icon-dui color-base-text" v-if="!item.icon || (!item.icon.imageUrl && !item.icon.icon)"></text>
-                                        <image class="icon-img" v-else-if="item.icon.iconType == 'img'" :src=" $util.img(item.icon.imageUrl)" />
-                                        <diy-icon class="icon-box" v-else-if="item.icon.iconType == 'icon'" :icon="item.icon.icon" :value="item.icon.style ? item.icon.style : null"></diy-icon>
-                                    </view>
-                                    <view class="info-wrap">
-                                        <text class="title">{{ item.service_name }}</text>
-                                        <text class="describe" v-if="item.desc">{{ item.desc }}</text>
-                                    </view>
-                                </view>
-                            </scroll-view>
-                            <view class="button-box">
-                                <button type="primary" @click="closeMerchantsServicePopup()">确定</button>
-                            </view>
-                        </view>
-                    </uni-popup>
-                </view>
-
-                <!-- 门店列表 -->
-                <view @touchmove.prevent.stop>
-                    <uni-popup ref="storeListPopup" type="bottom">
-                        <view class="goods-merchants-service-popup-layer popup-layer store-list-wrap">
-                            <view class="head-wrap" @click="closeStoreListPopup()">
-                                <text>门店列表</text>
-                                <text class="iconfont icon-close"></text>
-                            </view>
-                            <scroll-view scroll-y>
-                                <view class="store-list-content">
-                                    <view class="list-item" v-for="(item, index) in storeList.data" :key="index" @click="selectStore(item)">
-                                        <view class="item-box">
-                                            <view class="item-image">
-                                                <image :src="$util.img(item.store_image)" v-if="item.store_image"/>
-                                                <image :src="$util.getDefaultImage().store" v-else/>
-                                            </view>
-                                            <view class="item-info">
-                                                <view class="item-title">
-                                                    <text class="title">{{ item.store_name }}</text>
-                                                    <text class="distance color-base-text" v-if="item.distance">
-                                                        距离{{ item.distance > 1 ? item.distance + 'km' : item.distance * 1000 + 'm' }}
-                                                    </text>
-                                                </view>
-                                                <view class="item-time" v-if="item.open_date">营业时间：{{ item.open_date }}
-                                                </view>
-                                                <view class="item-address">{{ item.full_address + item.address }}</view>
-                                            </view>
-                                            <view class="item-right"><text class="iconfont icon-right"></text></view>
-                                        </view>
-                                    </view>
-                                </view>
-                            </scroll-view>
-                        </view>
-                    </uni-popup>
-                </view>
-
-                <!-- 业务区域 -->
-                <slot name="business"></slot>
-
-                <view class="detail-community" v-if="goodsSkuDetail.qr_data && goodsSkuDetail.qr_data.qr_state == 1">
-                    <view class="community-box">
-                        <image :src="$util.img('public/uniapp/goods/detail_erweiImage.png')" mode="aspectFill"></image>
-                        <view class="community-content">
-                            <view class="community-title">{{ goodsSkuDetail.qr_data.qr_name }}</view>
-                            <view class="community-txt">{{ goodsSkuDetail.qr_data.community_describe }}</view>
-                        </view>
-                    </view>
-                    <view class="community-btn" @click="onCommunity()">添加</view>
-                </view>
-
-                <!-- 促销 -->
-            <!--    <view class="community-model" @touchmove.prevent.stop @click.stop="onCloseCommunity()" v-show="isCommunity">
-                    <view class="community-model-content" @click.stop>
-                        <view class="community-model-content-radius">
-                            <view>添加社群</view>
-                        </view>
-                        <view class="community-model-content-draw" v-if="goodsSkuDetail.qr_data && goodsSkuDetail.qr_data.qr_img">
-                            <image :src="goodsSkuDetail.qr_data.qr_img != '' && goodsSkuDetail.qr_data.qr_state == 1 ? $util.img(goodsSkuDetail.qr_data.qr_img) : $util.img('public/uniapp/goods/detail_erweiImage.png') " mode="aspectFill" show-menu-by-longpress="true"/>
-                        </view>
-                        <view class="community-model-content-text">长按识别二维码，添加社群</view>
-                    </view>
-                    <view class="community-model-close" @click.stop="onCloseCommunity()">
-                        <text class="iconfont icon-close"></text>
-                    </view>
-                </view> -->
-
-                <!-- 参与流程 -->
-                <slot name="articipation"></slot>
-
-                <!-- 商品评价 -->
-                <view class="group-wrap" v-if="evaluateConfig.evaluate_show == 1 && goodsSkuDetail.isinformation == 0" style="display: none;">
-                    <view class="goods-evaluate" @click="toEvaluateDetail(goodsSkuDetail.goods_id)">
-                        <view class="tit">
-                            <!-- <view class="tit" :class="{ active: goodsEvaluate.content }"> -->
-                            <view>
-                                <text class="color-title font-size-base">
-                                    评价
-                                    <text class="font-size-base">({{ evaluateCount }})</text>
-                                </text>
-                                <text class="evaluate-item-empty" v-if="!evaluateCount">暂无评价</text>
-                                <view class="evaluate-item-empty" v-else>
-                                    <text class="font-size-tag">查看全部</text>
-                                    <text class="iconfont icon-right font-size-tag"></text>
-                                </view>
-                            </view>
-                        </view>
-                        <view class="evaluate-item" v-for="(item, index) in goodsEvaluate" :key="index"
-                            v-if="item.content">
-                            <view class="evaluator">
-                                <view class="evaluator-info">
-                                    <view class="evaluator-face">
-                                        <image v-if="item.member_headimg" :src="$util.img(item.member_headimg)" @error="item.member_headimg = $util.getDefaultImage().head" mode="aspectFill" />
-                                        <image v-else :src="$util.getDefaultImage().head" @error="item.member_headimg = $util.getDefaultImage().head" mode="aspectFill" />
-                                    </view>
-                                    <view class="evaluator-name-wrap">
-                                        <text class="evaluator-name using-hidden" v-if="item.member_name.length > 2 && item.is_anonymous == 1">
-                                            {{ item.member_name[0] }}***{{ item.member_name[item.member_name.length - 1] }}
-                                        </text>
-                                        <text class="evaluator-name using-hidden" v-else>{{ item.member_name }}</text>
-                                        <view v-if="item.scores" class="evaluator-xing">
-                                            <xiaoStarComponent :starCount="item.scores * 2"></xiaoStarComponent>
-                                        </view>
-                                    </view>
-                                </view>
-                                <text class="time color-tip">{{ $util.timeStampTurnTime(item.create_time) }}</text>
-                            </view>
-                            <view class="cont margin-top">{{ item.content }}</view>
-                            <scroll-view scroll-x="true">
-                                <view class="evaluate-img" v-if="item.images">
-                                    <view class="img-box" v-for="(img, img_index) in item.images" :key="img_index" @click="previewEvaluate(index, img_index, 'images')">
-                                        <image :src="$util.img(img)" mode="aspectFill" />
-                                    </view>
-                                </view>
-                            </scroll-view>
-                        </view>
-                    </view>
-                </view>
-				
-                <view class="goods-attr" v-if="goodsSkuDetail.goods_attr_format && goodsSkuDetail.goods_attr_format.length > 0">
-                    <view class="title">规格属性</view>
-                    <view class="attr-wrap">
-                        <block v-for="(item, index) in goodsSkuDetail.goods_attr_format" :key="index">
-                            <view class="item" v-if="goodsAttrShow || (!goodsAttrShow && index < 4)">
-                                <text class="attr-name">{{ item.attr_name }}</text>
-                                <text class="value-name">{{ item.attr_value_name }}</text>
-                            </view>
-                        </block>
-                        <view class="attr-action" v-if="goodsSkuDetail.goods_attr_format.length > 4" @click="switchGoodsAttr">
-                            <block v-if="!goodsAttrShow">
-                                展开<text class="iconfont icon-iconangledown"></text>
-                            </block>
-                            <block v-else>
-                                收起<text class="iconfont icon-iconangledown-copy"></text>
-                            </block>
-                        </view>
-                    </view>
-                </view>
-
-				
-
-                <!-- 详情 -->
-                <view class="goods-detail-tab">
-                    <view class="detail-tab">
-                        <view class="tab-item">{{$lang('details')}}</view>
-                    </view>
-                    <view class="detail-content active">
-                        <view class="detail-content-item">
-                            <view class="goods-details" v-if="goodsSkuDetail.goods_content">
-                     <!--           <rich-text :nodes="goodsSkuDetail.goods_content" @click="showImg($event)" :data-nodes="goodsSkuDetail.goods_content"></rich-text> -->
-			<!-- 		 {{goodsSkuDetail.goods_content}} -->
-									<mp-html :content="goodsSkuDetail.goods_content" />
-									<!-- :loading="loading" @preview="preview" @navigate="navigate" -->
-                            </view>
-                            <view class="goods-details active" v-else></view>
-                            <view class="goods-details" v-if="service && service.is_display == 1 && service.content">
-                                <rich-text :nodes="service.content" @click="showImg($event)" :data-nodes="service.content"></rich-text>
-                            </view>
-                        </view>
-                    </view>
-                </view>
-
-                <!-- 商品推荐 -->
-                <ns-goods-recommend ref="goodrecommend" route="goods_detail"></ns-goods-recommend>
-
-                <ns-copyright></ns-copyright>
-
-                <!-- 海报 -->
-                <view @touchmove.prevent.stop class="poster-layer">
-                    <uni-popup ref="posterPopup" type="center">
-                        <template v-if="poster != '-1'">
-                            <view class="poster-wrap">
-                                <view class="image-wrap">
-                                    <image :src="$util.img(poster)" :show-menu-by-longpress="true" mode="widthFix" />
-                                    <view class="close iconfont icon-close" @click="closePosterPopup()"></view>
-                                </view>
-                                <!-- #ifdef MP || APP-PLUS  -->
-                                <view class="save-btn" @click="saveGoodsPoster()">保存图片</view>
-                                <!-- #endif -->
-                                <!-- #ifdef H5 -->
-                                <view class="save-btn">长按图片进行保存</view>
-                                <!-- #endif -->
-                            </view>
-                        </template>
-                    </uni-popup>
-                </view>
-
-                <!-- 分享弹窗 -->
-                <view @touchmove.prevent.stop>
-                    <uni-popup ref="sharePopup" type="bottom" class="share-popup">
-                        <view>
-                            <view class="share-title">分享</view>
-                            <view class="share-content">
-                                <!-- #ifdef MP -->
-                                <view class="share-box">
-                                    <button class="share-btn" :plain="true" open-type="share">
-                                        <view class="iconfont icon-share-friend"></view>
-                                        <text>分享给好友</text>
-                                    </button>
-                                </view>
-                                <!-- #endif -->
-
-                                <!-- #ifdef MP-WEIXIN -->
-                                <view class="share-box" v-if="goodsCircle">
-                                    <button class="share-btn" :plain="true" @click="openBusinessView">
-                                        <view class="iconfont icon-haowuquan"></view>
-                                        <text>分享到好物圈</text>
-                                    </button>
-                                </view>
-                                <!-- #endif -->
-
-                                <view class="share-box" @click="openPosterPopup">
-                                    <button class="share-btn" :plain="true">
-                                        <view class="iconfont icon-pengyouquan"></view>
-                                        <text>生成分享海报</text>
-                                    </button>
-                                </view>
-                                <!-- #ifdef H5 -->
-                                <view class="share-box" @click="copyUrl">
-                                    <button class="share-btn" :plain="true">
-                                        <view class="iconfont icon-fuzhilianjie"></view>
-                                        <text>复制链接</text>
-                                    </button>
-                                </view>
-                                <!-- #endif -->
-                            </view>
-                            <view class="share-footer" @click="closeSharePopup"><text>取消分享</text></view>
-                        </view>
-                    </uni-popup>
-                </view>
-
-                <slot name="fixedbtn"></slot>
-            </view>
-        </view>
-
-        <!-- 操作区域 -->
-        <slot name="action"></slot>
-        <to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
-        <ns-login ref="login"></ns-login>
-    </view>
-</template>
-
-<script>
-    // 商品详情视图
-    import uniPopup from '@/components/uni-popup/uni-popup.vue';
-    import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
-    import pengpaiFadeinOut from '@/components/pengpai-fadein-out/pengpai-fadein-out.vue';
-    import xiaoStarComponent from '@/components/xiao-star-component/xiao-star-component.vue';
-    import scroll from '@/common/js/scroll-view.js';
-    import toTop from '@/components/toTop/toTop.vue';
-    import detail from './detail.js';
-
-    export default {
-        name: 'goods-detail-view',
-        props: {
-            goodsSkuDetail: {
-                type: Object,
-                default: () => {
-                    return {};
-                }
-            }
-        },
-        components: {
-            uniPopup,
-            nsGoodsRecommend,
-            pengpaiFadeinOut,
-            toTop,
-            xiaoStarComponent
-        },
-        mixins: [scroll, detail]
-    };
-</script>
-
-<style lang="scss">
-    @import '@/common/css/goods_detail.scss';
-</style>
-<style scoped></style>

pages_goods/components/ns-goods-action-button/ns-goods-action-button.vue

@@ -1,96 +0,0 @@
-<template>
-    <view class="action-buttom-wrap disabled" v-if="disabled" @click="clickEvent">{{ disabledText }}</view>
-    <view class="action-buttom-wrap"
-        :class="[backgroundClass, textPrice ? 'has-second' : '', background ? 'color-join-cart' : 'color-base-bg']"
-        :style="{background:backgroundColor+'!important', 'color':textColor ? textColor : '#ffffff'}" v-else
-        @click="clickEvent">
-        <text class="price-font">{{ textPrice }}</text>
-        <text>{{ text }}</text>
-    </view>
-</template>
-
-<script>
-    export default {
-        name: 'ns-goods-action-button',
-        props: {
-            // 商品底部按钮文字
-            text: {
-                type: String,
-                default: ''
-            },
-            // 商品底部按钮价格文字
-            textPrice: {
-                type: String,
-                default: ''
-            },
-            // 背景色
-            background: {
-                type: String,
-                default: ''
-            },
-            // 背景色样式
-            backgroundClass: {
-                type: String,
-                default: ''
-            },
-            // 
-            backgroundColor: {
-                type: String,
-                default: ''
-            },
-            // 是否禁用
-            disabled: {
-                type: Boolean,
-                default: false
-            },
-            // 禁用文字提示
-            disabledText: {
-                type: String,
-                default: ''
-            },
-            // 文字颜色
-            textColor: {
-                type: String,
-                default: ''
-            },
-        },
-        computed: {},
-        methods: {
-            clickEvent() {
-                this.$emit('click');
-            }
-        }
-    };
-</script>
-
-<style lang="scss">
-    .action-buttom-wrap {
-        flex: 1;
-        height: 70rpx;
-        font-weight: 600;
-        font-size: 30rpx;
-        line-height: 70rpx;
-        border: none;
-        color: #fff;
-        text-align: center;
-        border-radius: 10rpx;
-        margin-right: 20rpx;
-    }
-
-    .action-buttom-wrap.has-second {
-        line-height: 50rpx;
-    }
-
-    .action-buttom-wrap.has-second text {
-        display: block;
-        line-height: 1.2;
-    }
-
-    .action-buttom-wrap:active {
-        opacity: 0.8;
-    }
-
-    .action-buttom-wrap.disabled {
-        background: $color-disabled;
-    }
-</style>

pages_goods/components/ns-goods-action-icon/ns-goods-action-icon.vue

@@ -1,146 +0,0 @@
-<template>
-	<view>
-		<block v-if="text == '客服' || text == 'Contact'">
-		<!-- 	<ns-contact :niushop="chatParam" :send-message-title="sendData.title" :send-message-path="sendData.path" :send-message-img="sendData.img"> -->
-				<button hoverClass="none" openType="contact" sessionFrom="weapp" showMessageCard="true" class="action-icon-wrap" style="background: transparent;padding: 0;margin: 0;">
-					<view class="iconfont color-title" :class="icon"></view>
-					<text>{{ text }}</text>
-					<view class="corner-mark color-base-bg" v-if="cornerMark.length" :style="{ background: cornerMarkBg+'!important', color: cornerMarkColor }">{{ cornerMark }}</view>
-				</button>
-			<!-- </ns-contact> -->
-		</block>
-		<block v-else>
-			<view class="action-icon-wrap" @click="clickEvent">
-				<view class="iconfont " :class="icon"></view>
-				<text>{{ text }}</text>
-				<view class="corner-mark color-base-bg" :class="{'max' : parseInt(cornerMark)>99}" v-if="cornerMark.length" :style="{ background: cornerMarkBg+'!important', color: cornerMarkColor }">{{ cornerMark > 99 ? '99+' : cornerMark }}</view>
-			</view>
-		</block>
-	</view>
-</template>
-
-<script>
-import nsContact from '@/components/ns-contact/ns-contact.vue';
-export default {
-	name: 'ns-goods-action-icon',
-	props: {
-		// 商品底部icon导航icon图标
-		icon: {
-			type: String,
-			default: ''
-		},
-		// 商品底部icon导航文字
-		text: {
-			type: String,
-			default: ''
-		},
-		// 角标文字
-		cornerMark: {
-			type: String,
-			default: ''
-		},
-		// 角标背景色
-		cornerMarkBg: {
-			type: String,
-			default: ''
-		},
-		// 角标文字颜色
-		cornerMarkColor: {
-			type: String,
-			default: '#fff'
-		},
-		// 开放能力
-		openType: {
-			type: String,
-			default: ''
-		},
-		// 发送内容 openType="contact"时有效
-		sendData: {
-			type: Object,
-			default: function() {
-				return {
-					title: '',
-					path: '',
-					img: ''
-				};
-			}
-		},
-		chatParam: {
-			type: Object,
-			default: function(){
-				return {}
-			}
-		}
-	},
-	components:{
-		nsContact
-	},
-	methods: {
-		clickEvent() {
-			this.$emit('click');
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.action-icon-wrap {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	height: 100rpx;
-	min-width: 90rpx;
-	text-align: center;
-	position: relative;
-	margin-right: 6rpx;
-}
-.action-icon-wrap button {
-	width: 100%;
-	height: 100%;
-	position: absolute;
-	border: none;
-	z-index: 1;
-	padding: 0;
-	margin: 0;
-	background: none;
-	top: 0;
-	left: 0;
-	opacity: 0;
-}
-
-.action-icon-wrap button::after {
-	border: none !important;
-}
-
-.action-icon-wrap .iconfont {
-	margin: 0 auto 10rpx;
-	line-height: 1;
-	font-size: 40rpx;
-}
-
-.action-icon-wrap .corner-mark {
-	position: absolute;
-	z-index: 99;
-	font-size: $font-size-activity-tag;
-	top: 4rpx;
-	right: 12rpx;
-	color: #fff;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	width: 24rpx;
-	height: 24rpx;
-	padding: 6rpx;
-	border-radius: 50%;
-	&.max{
-		right:-4rpx;
-		width: 40rpx;
-		border-radius: 24rpx;
-	}
-}
-
-.action-icon-wrap text {
-	font-size: $font-size-tag;
-	line-height: 1;
-}
-</style>

pages_goods/components/ns-goods-action/ns-goods-action.vue

@@ -1,33 +0,0 @@
-<template>
-	<view class="ns-goods-action bottom-safe-area" :class="{ 'bottom-safe-area': safeArea }"><slot></slot></view>
-</template>
-
-<script>
-export default {
-	name: 'ns-goods-action',
-	props: {
-		safeArea: {
-			type: Boolean,
-			default: false
-		}
-	}
-};
-</script>
-
-<style>
-.ns-goods-action {
-	position: fixed;
-	right: 0;
-	bottom: 0;
-	left: 0;
-	display: flex;
-	align-items: center;
-	background-color: #fff;
-	z-index: 9;
-}
-.ns-goods-action.bottom-safe-area {
-	padding-bottom: 0;
-	padding-bottom: constant(safe-area-inset-bottom);
-	padding-bottom: env(safe-area-inset-bottom);
-}
-</style>

pages_goods/components/ns-goods-promotion/ns-goods-promotion.vue

@@ -1,125 +0,0 @@
-<template>
-	<!-- 当前商品参与的营销活动入口 -->
-	<view class="ns-goods-promotion" v-if="goodsPromotion.length">
-		<view v-for="(item, index) in goodsPromotion" v-if="promotion != item.promotion_type" :key="index">
-			<view v-if="item.promotion_type == 'discount'" class="item" @click="redirectTo('/pages_goods/detail', { goods_id: item.goods_id })">
-				<text class="promotion-mark ">限时折扣</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'groupbuy'" class="item" @click="redirectTo('/pages_promotion/groupbuy/detail', { groupbuy_id: item.groupbuy_id })">
-				<!-- <view v-else-if="item.promotion_type == 'groupbuy'" class="item" @click="redirectTo('/pages_promotion/groupbuy/detail', { id: item.groupbuy_id })"> -->
-				<text class="promotion-mark ">团购</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'pintuan'" class="item" @click="redirectTo('/pages_promotion/pintuan/detail', { pintuan_id: item.pintuan_id })">
-				<text class="promotion-mark ">拼团</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'seckill'" class="item" @click="redirectTo('/pages_promotion/seckill/detail', { seckill_id: item.id })">
-				<text class="promotion-mark ">秒杀</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'topic'" class="item" @click="redirectTo('/pages_promotion/topics/goods_detail', { id: item.id })">
-				<text class="promotion-mark ">专题活动</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'bargain'" class="item" @click="redirectTo('/pages_promotion/bargain/detail', { b_id: item.bargain_id })">
-				<text class="promotion-mark ">砍价</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-				<!-- <view class="img-wrap"><image :src="$util.img('public/uniapp/goods/detail_more.png')" mode="aspectFit" /></view> -->
-			</view>
-			<view v-else-if="item.promotion_type == 'pinfan'" class="item" @click="redirectTo('/pages_promotion/pinfan/detail', { pinfan_id: item.pintuan_id })">
-				<text class="promotion-mark ">拼团返利</text>
-				<text class="title">当前商品正在参加{{ item.promotion_name }}</text>
-				<text class="iconfont icon-right"></text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	name: 'ns-goods-promotion',
-	props: {
-		promotion: {
-			type: String,
-			default: ''
-		}
-	},
-	data() {
-		return {
-			goodsPromotion: {
-				type: Array
-			}
-		};
-	},
-	created() {},
-	methods: {
-		refresh(goodsPromotion) {
-			this.goodsPromotion = goodsPromotion;
-		},
-		redirectTo(path, param) {
-			this.$util.redirectTo(path, param);
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.ns-goods-promotion {
-	background-color: #fff;
-	& > view {
-	}
-	.item {
-		display: flex;
-		font-size: $font-size-base;
-		align-items: center;
-		padding: 20rpx 0;
-		border-bottom: 2rpx solid $color-line;
-		&:last-child {
-			border-bottom: none;
-		}
-
-		.promotion-mark {
-			padding: 12rpx 14rpx;
-			margin-right: 16rpx;
-			line-height: 1;
-			color: var(--main-color);
-			border-radius: 6rpx;
-			font-size: $font-size-tag;
-			font-weight: bold;
-			background-color: var(--main-color-shallow);
-		}
-
-		.title {
-			flex: 1;
-			line-height: 1;
-		}
-
-		.iconfont {
-			color: $color-tip;
-			font-size: $font-size-base;
-		}
-
-		.img-wrap {
-			width: 38rpx;
-			height: 38rpx;
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-}
-</style>

pages_goods/detail.vue

@@ -521,38 +521,16 @@
 </template>
 
 <script>
-import nsGoodsAction from '@/pages_goods/components/ns-goods-action/ns-goods-action.vue';
-	import nsGoodsActionIcon from '@/pages_goods/components/ns-goods-action-icon/ns-goods-action-icon.vue';
-	import nsGoodsActionButton from '@/pages_goods/components/ns-goods-action-button/ns-goods-action-button.vue';
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
-import uniCountDown from '@/components/uni-count-down/uni-count-down.vue';
 import detail from './public/js/detail.js';
 import scroll from '@/common/js/scroll-view.js';
-import toTop from '@/components/toTop/toTop.vue';
-import nsGoodsPromotion from '@/pages_goods/components/ns-goods-promotion/ns-goods-promotion.vue';
 import goodsDetailBase from '@/common/js/goods_detail_base.js';
-import goodsDetailView from '@/pages_goods/components/goods-detail-view/goods-detail-view.vue';
 // 按需引入全局组件
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif
 
 export default {
 	components: {
-			nsGoodsAction,
-			nsGoodsActionIcon,
-			nsGoodsActionButton,
-			uniPopup,
-			nsGoodsSku,
-			uniCountDown,
-			nsGoodsPromotion,
-			goodsDetailView,
-			toTop,
-			nsLogin,
-			loadingCover,
 			// #ifdef MP-WEIXIN
 			privacyPopup,
 			// #endif

pages_goods/list.vue

@@ -4,31 +4,40 @@
 			<!-- 搜索区域 -->
 			<view class="search-wrap uni-flex uni-row">
 				<view class="flex-item input-wrap">
-					<input class="uni-input" maxlength="50" v-model="keyword" @confirm="search()" :placeholder="langstatus?$lang('Search'):'请输入您要搜索的商品'" />
+					<input class="uni-input" maxlength="50" v-model="keyword" @confirm="search()"
+						:placeholder="langstatus ? $lang('Search') : '请输入您要搜索的商品'" />
 					<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
 				</view>
-				<view class="iconfont" :class="{ 'icon-apps': isList, 'icon-list': !isList }" @click="changeListStyle()"></view>
+				<view class="iconfont" :class="{ 'icon-apps': isList, 'icon-list': !isList }"
+					@click="changeListStyle()"></view>
 			</view>
 
 			<!-- 排序 -->
 			<view class="sort-wrap">
-				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }" @click="sortTabClick('')">
-					<text :class="{ 'color-base-text': orderType === '' }">{{langstatus?$lang('Random'):'综合'}}</text>
+				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }"
+					@click="sortTabClick('')">
+					<text :class="{ 'color-base-text': orderType === '' }">{{ langstatus ? $lang('Random') : '综合' }}</text>
 				</view>
 
-				<view :class="{ 'color-base-text': orderType === 'sale_num' }" @click="sortTabClick('sale_num')">{{langstatus?$lang('Sales'):'销量'}}
+				<view :class="{ 'color-base-text': orderType === 'sale_num' }" @click="sortTabClick('sale_num')">
+					{{ langstatus ? $lang('Sales') : '销量' }}
 				</view>
 
 				<view class="price-wrap" @click="sortTabClick('discount_price')">
-					<text :class="{ 'color-base-text': orderType === 'discount_price' }">{{langstatus?$lang('Price'):'价格'}}</text>
+					<text
+						:class="{ 'color-base-text': orderType === 'discount_price' }">{{ langstatus ? $lang('Price') : '价格' }}</text>
 					<view class="iconfont-wrap">
-						<view class="iconfont icon-iconangledown-copy asc" :class="{ 'color-base-text': priceOrder === 'asc' && orderType === 'discount_price' }"></view>
-						<view class="iconfont icon-iconangledown desc" :class="{ 'color-base-text': priceOrder === 'desc' && orderType === 'discount_price' }"></view>
+						<view class="iconfont icon-iconangledown-copy asc"
+							:class="{ 'color-base-text': priceOrder === 'asc' && orderType === 'discount_price' }">
+						</view>
+						<view class="iconfont icon-iconangledown desc"
+							:class="{ 'color-base-text': priceOrder === 'desc' && orderType === 'discount_price' }">
+						</view>
 					</view>
 				</view>
 
 				<view :class="{ 'color-base-text': orderType === 'screen' }" class="screen-wrap">
-					<text @click="sortTabClick('screen')">{{langstatus?$lang('Filter'):'筛选'}}</text>
+					<text @click="sortTabClick('screen')">{{ langstatus ? $lang('Filter') : '筛选' }}</text>
 					<view @click="sortTabClick('screen')" class="iconfont-wrap">
 						<view class="iconfont icon-shaixuan color-tip"></view>
 					</view>
@@ -39,17 +48,20 @@
 		<mescroll-uni top="180" ref="mescroll" @getData="getGoodsList">
 			<block slot="list">
 				<view class="goods-list single-column" :class="{ show: isList }">
-					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index" @click="toDetail(item)">
+					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index"
+						@click="toDetail(item)">
 						<view class="goods-img">
 							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
-							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}
+							</view>
 							<view class="sell-out" v-if="item.goods_stock <= 0">
 								<text class="iconfont icon-shuqing"></text>
 							</view>
 						</view>
 						<view class="info-wrap">
 							<view class="name-wrap">
-								<view class="goods-name" :class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
+								<view class="goods-name"
+									:class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
 
 									{{ isEnEnv ? item.en_goods_name : item.goods_name }}
 								</view>
@@ -58,15 +70,18 @@
 							<view class="lineheight-clear">
 								<view class="discount-price" v-if="item.isinformation == 0">
 									<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price price-style large">{{ parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
-									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+									<text class="price price-style large">{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{langstatus?$lang('Make'):'询底价'}}</text>
+									<text class="price price-style large">{{ langstatus ? $lang('Make') : '询底价' }}</text>
 								</view>
 
 
-								<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
+								<view class="member-price-tag"
+									v-if="item.member_price && item.member_price == showPrice(item)">
 									<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
 								</view>
 								<view class="member-price-tag" v-else-if="item.promotion_type == 1">
@@ -79,7 +94,8 @@
 									<text>{{ showMarketPrice(item) }}</text>
 								</view>
 								<view class="block-wrap">
-									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit
+										? item.unit : '件' }}</view>
 								</view>
 								<view class="cart-action-wrap" v-if="config.control && item.is_virtual == 0">
 									<!-- 购物车图标 -->
@@ -118,7 +134,8 @@
 									}" class="icon-diy click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
-										<diy-icon :icon="config.iconDiy.icon" :value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
+										<diy-icon :icon="config.iconDiy.icon"
+											:value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
 									</view>
 								</view>
 							</view>
@@ -127,29 +144,35 @@
 				</view>
 				<view class="goods-list double-column" :class="{ show: !isList }">
 					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index"
-						@click="toDetail(item)" :style="{ left: listPosition[index] ? listPosition[index].left : '', top: listPosition[index] ? listPosition[index].top : '' }">
+						@click="toDetail(item)"
+						:style="{ left: listPosition[index] ? listPosition[index].left : '', top: listPosition[index] ? listPosition[index].top : '' }">
 						<view class="goods-img">
 							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
-							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}
+							</view>
 							<view class="sell-out" v-if="item.stock <= 0">
 								<text class="iconfont icon-shuqing"></text>
 							</view>
 						</view>
 						<view class="info-wrap">
-							<view class="goods-name" :class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
+							<view class="goods-name"
+								:class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
 								{{ isEnEnv ? item.en_goods_name : item.goods_name }}
 							</view>
 
 							<view class="lineheight-clear">
 								<view class="discount-price" v-if="item.isinformation == 0">
 									<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price price-style large">{{ parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
-									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+									<text class="price price-style large">{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{langstatus?$lang('Make'):'询底价'}}</text>
+									<text class="price price-style large">{{ langstatus ? $lang('Make') : '询底价' }}</text>
 								</view>
-								<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
+								<view class="member-price-tag"
+									v-if="item.member_price && item.member_price == showPrice(item)">
 									<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
 								</view>
 								<view class="member-price-tag" v-else-if="item.promotion_type == 1">
@@ -161,8 +184,9 @@
 								</view>
 							</view>
 							<view class="pro-info" v-if="item.isinformation == 0">
-								<view class="block-wrap" >
-									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+								<view class="block-wrap">
+									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit
+										? item.unit : '件' }}</view>
 								</view>
 								<view class="cart-action-wrap" v-if="config.control && item.is_virtual == 0">
 									<!-- 购物车图标 -->
@@ -201,7 +225,8 @@
 									}" class="icon-diy click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
-										<diy-icon :icon="config.iconDiy.icon" :value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
+										<diy-icon :icon="config.iconDiy.icon"
+											:value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
 									</view>
 								</view>
 							</view>
@@ -253,8 +278,11 @@
 						<view @click="selectedCategory('')" class="list-wrap">
 							<text :class="{ selected: !categoryId, 'color-base-text': !categoryId }">全部</text>
 						</view>
-						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList" :key="index" class="list-wrap">
-							<text :class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{ item.category_name }}</text>
+						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList"
+							:key="index" class="list-wrap">
+							<text
+								:class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{
+									item.category_name }}</text>
 						</view>
 					</view>
 				</view>
@@ -279,25 +307,15 @@
 </template>
 
 <script>
-	import uniDrawer from '@/components/uni-drawer/uni-drawer.vue';
-	import uniTag from '@/components/uni-tag/uni-tag.vue';
-	import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif
-	import list from './public/js/list.js';
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
+import list from './public/js/list.js';
 
-	export default {
+export default {
 	components: {
-		uniDrawer,
-		uniTag,
-		nsGoodsSkuIndex,
-		nsEmpty,
 		MescrollUni,
-		loadingCover,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
@@ -306,18 +324,18 @@
 		return {};
 	},
 	mixins: [list]
-	};
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/list.scss';
+@import './public/css/list.scss';
 </style>
 <style scoped>
-	>>>.uni-tag--primary.uni-tag--inverted {
+>>>.uni-tag--primary.uni-tag--inverted {
 	background-color: #f5f5f5 !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 {
 	max-height: unset !important;
-	}
+}
 </style>

pages_order/detail.vue

@@ -1,7 +1,8 @@
 <template>
 	<view class="detail-container" :class="{ 'safe-area': isIphoneX }" :style="themeColor">
 		<!-- 订单状态 -->
-		<view class="status-wrap color-base-bg" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/order/status-wrap-bg.png') + ')' }">
+		<view class="status-wrap color-base-bg"
+			:style="{ backgroundImage: 'url(' + $util.img('public/uniapp/order/status-wrap-bg.png') + ')' }">
 			<view class="order-status-left">
 				<image :src="$util.img(action.icon)"></image>
 				<view class="status-name">
@@ -108,8 +109,11 @@
 						<text class="copy" @click="$util.copy(orderData.delivery_code)">复制</text>
 					</view>
 					<view class="code">
-						<image :src="$util.img(orderData.pickup_barcode)" @click="previewMedia($util.img(orderData.pickup_barcode))" class="barcode" mode="widthFix"/>
-						<image :src="$util.img(orderData.pickup)" @click="previewMedia($util.img(orderData.pickup))" class="qrcode" mode="widthFix"/>
+						<image :src="$util.img(orderData.pickup_barcode)"
+							@click="previewMedia($util.img(orderData.pickup_barcode))" class="barcode"
+							mode="widthFix" />
+						<image :src="$util.img(orderData.pickup)" @click="previewMedia($util.img(orderData.pickup))"
+							class="qrcode" mode="widthFix" />
 					</view>
 				</view>
 			</view>
@@ -121,7 +125,8 @@
 				<view v-for="(goodsItem, goodsIndex) in orderData.order_goods" :key="goodsIndex" class="goods-item">
 					<view class="goods-wrap">
 						<view class="goods-img" @click="goDetail(goodsItem)">
-							<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" @error="imageError(goodsIndex)" mode="aspectFill"/>
+							<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })"
+								@error="imageError(goodsIndex)" mode="aspectFill" />
 						</view>
 						<view class="goods-info" @click="goDetail(goodsItem)">
 							<view class="goods-name">{{ goodsItem.sku_name }}</view>
@@ -129,16 +134,18 @@
 								<view class="goods-spec">
 									<block v-for="(x, i) in goodsItem.sku_spec_format" :key="i">
 										{{ x.spec_value_name }}
-										{{ i < goodsItem.sku_spec_format.length - 1 ? '; ' : '' }}
-									</block>
+										{{ i < goodsItem.sku_spec_format.length - 1 ? '; ' : '' }} </block>
 								</view>
 							</view>
 							<view class="goods-sub-section">
 								<view>
 									<text class="goods-price ">
 										<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-										<text class="price-style large">{{ parseFloat(goodsItem.price).toFixed(2).split('.')[0] }}</text>
-										<text class="unit price-style small">.{{ parseFloat(goodsItem.price).toFixed(2).split('.')[1] }}</text>
+										<text class="price-style large">{{
+											parseFloat(goodsItem.price).toFixed(2).split('.')[0]
+											}}</text>
+										<text class="unit price-style small">.{{
+											parseFloat(goodsItem.price).toFixed(2).split('.')[1] }}</text>
 									</text>
 								</view>
 								<view>
@@ -152,8 +159,10 @@
 								次卡抵扣
 								<text class="goods-price ">
 									<text class="unit price-style small">-{{ $lang('common.currencySymbol') }}</text>
-									<text class="price-style large">{{ parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[0] }}</text>
-									<text class="unit price-style small">.{{ parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[1] }}</text>
+									<text class="price-style large">{{
+										parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{
+										parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[1] }}</text>
 								</text>
 							</view>
 						</view>
@@ -164,7 +173,8 @@
 							<text class="tit">{{ item.value.title }}：</text>
 							<view class="box img-box" v-if="item.controller == 'Img'">
 								<view class="img" v-for="(img, imgIndex) in item.img_lists" :key="imgIndex">
-									<image :src="$util.img(img)" mode="widthFix" @click="previewMedia($util.img(img))"/>
+									<image :src="$util.img(img)" mode="widthFix"
+										@click="previewMedia($util.img(img))" />
 								</view>
 							</view>
 							<view class="box" v-else>
@@ -176,13 +186,15 @@
 
 					<view class="goods-action">
 						<block v-if="orderData.is_enable_refund">
-							<view @click="goRefund(goodsItem.order_goods_id)" v-if="orderData.order_scene == 'online' && (goodsItem.refund_status == 0 || goodsItem.refund_status == -1)">
+							<view @click="goRefund(goodsItem.order_goods_id)"
+								v-if="orderData.order_scene == 'online' && (goodsItem.refund_status == 0 || goodsItem.refund_status == -1)">
 								<view class="order-box-btn" v-if="orderData.promotion_type != 'blindbox'">
 									{{ orderData.order_status == 10 ? '申请售后' : '申请退款' }}
 								</view>
 							</view>
 						</block>
-						<view @click="goRefundDetail(goodsItem.order_goods_id)" v-if="goodsItem.refund_status != 0 && goodsItem.refund_status != -1">
+						<view @click="goRefundDetail(goodsItem.order_goods_id)"
+							v-if="goodsItem.refund_status != 0 && goodsItem.refund_status != -1">
 							<view class="order-box-btn">{{ orderData.order_status == 10 ? '查看售后' : '查看退款' }}</view>
 						</view>
 					</view>
@@ -315,7 +327,8 @@
 			<block v-if="orderData.goods_class == 5">
 				<view class="order-cell">
 					<text class="tit">我的卡包：</text>
-					<view class="box"><text class="color-base-text" @click="$util.redirectTo('/pages_promotion/cardservice/card/my_card')">查看</text></view>
+					<view class="box"><text class="color-base-text"
+							@click="$util.redirectTo('/pages_promotion/cardservice/card/my_card')">查看</text></view>
 				</view>
 			</block>
 			<!-- 联系客服 -->
@@ -349,14 +362,17 @@
 					<text class="tit">核销次数</text>
 					<view class="box align-right">
 						<text class="color-title">
-							剩余{{ orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num }}次/共{{ orderData.virtual_goods.verify_total_count }}次
+							剩余{{ orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num
+							}}次/共{{
+								orderData.virtual_goods.verify_total_count }}次
 						</text>
 					</view>
 				</view>
 				<view class="order-cell">
 					<text class="tit">有效期</text>
 					<view class="box align-right">
-						<text class="color-title" v-if="orderData.virtual_goods.expire_time > 0">{{ $util.timeStampTurnTime(orderData.virtual_goods.expire_time) }}</text>
+						<text class="color-title" v-if="orderData.virtual_goods.expire_time > 0">{{
+							$util.timeStampTurnTime(orderData.virtual_goods.expire_time) }}</text>
 						<text v-else>永久有效</text>
 					</view>
 				</view>
@@ -365,7 +381,8 @@
 			<view class="verify-info-wrap">
 				<view class="head">核销记录</view>
 				<view v-if="orderData.virtual_goods.verify_record.length">
-					<view v-for="(item, index) in orderData.virtual_goods.verify_record" :key="index" class="record-item">
+					<view v-for="(item, index) in orderData.virtual_goods.verify_record" :key="index"
+						class="record-item">
 						<view class="order-cell">
 							<text class="tit">核销人</text>
 							<view class="box align-right">
@@ -426,14 +443,17 @@
 					<text class="tit">核销次数</text>
 					<view class="box align-right">
 						<text class="color-title">
-							剩余{{ orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num }}次/共{{ orderData.virtual_goods.verify_total_count }}次
+							剩余{{ orderData.virtual_goods.verify_total_count - orderData.virtual_goods.verify_use_num
+							}}次/共{{
+								orderData.virtual_goods.verify_total_count }}次
 						</text>
 					</view>
 				</view>
 				<view class="order-cell">
 					<text class="tit">有效期</text>
 					<view class="box align-right">
-						<text class="color-title" v-if="orderData.virtual_goods.expire_time > 0">{{ $util.timeStampTurnTime(orderData.virtual_goods.expire_time) }}</text>
+						<text class="color-title" v-if="orderData.virtual_goods.expire_time > 0">{{
+							$util.timeStampTurnTime(orderData.virtual_goods.expire_time) }}</text>
 						<text v-else>永久有效</text>
 					</view>
 				</view>
@@ -442,7 +462,8 @@
 			<view class="verify-info-wrap">
 				<view class="head">核销记录</view>
 				<view v-if="orderData.virtual_goods.verify_record.length">
-					<view v-for="(item, index) in orderData.virtual_goods.verify_record" :key="index" class="record-item">
+					<view v-for="(item, index) in orderData.virtual_goods.verify_record" :key="index"
+						class="record-item">
 						<view class="order-cell">
 							<text class="tit">核销人</text>
 							<view class="box align-right">
@@ -574,7 +595,9 @@
 			</view>
 
 			<view class="order-action fixed-bottom bottom-safe-area" v-if="orderData.action.length > 0">
-				<view class="order-box-btn white" v-if="evaluateConfig.evaluate_status == 1 && orderData.is_evaluate == 1" @click="operation('memberOrderEvaluation')">
+				<view class="order-box-btn white"
+					v-if="evaluateConfig.evaluate_status == 1 && orderData.is_evaluate == 1"
+					@click="operation('memberOrderEvaluation')">
 					<text v-if="orderData.evaluate_status == 0">评价</text>
 					<text v-else-if="orderData.evaluate_status == 1">追评</text>
 				</view>
@@ -588,7 +611,8 @@
 				</block>
 			</view>
 
-			<view class="order-action fixed-bottom bottom-safe-area" v-else-if="orderData.action.length == 0 && orderData.is_evaluate == 1 && evaluateConfig.evaluate_status == 1">
+			<view class="order-action fixed-bottom bottom-safe-area"
+				v-else-if="orderData.action.length == 0 && orderData.is_evaluate == 1 && evaluateConfig.evaluate_status == 1">
 				<view class="order-box-btn white" @click="operation('memberOrderEvaluation')">
 					<text v-if="orderData.evaluate_status == 0">评价</text>
 					<text v-else-if="orderData.evaluate_status == 1">追评</text>
@@ -597,7 +621,8 @@
 		</view>
 
 		<!-- 订单 -->
-		<view class="fixed-bottom-box bottom-safe-area" v-if="orderData.action.length > 0 || (orderData.is_evaluate == 1 && evaluateConfig.evaluate_status == 1)">
+		<view class="fixed-bottom-box bottom-safe-area"
+			v-if="orderData.action.length > 0 || (orderData.is_evaluate == 1 && evaluateConfig.evaluate_status == 1)">
 		</view>
 
 		<ns-goods-recommend ref="goodrecommend" route="order_detail"></ns-goods-recommend>
@@ -608,11 +633,8 @@
 </template>
 
 <script>
-	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
-	import orderMethod from './public/js/orderMethod.js';
-	import nsPayment from '@/components/payment/payment.vue';
-	import nsContact from '@/components/ns-contact/ns-contact.vue';
-	export default {
+import orderMethod from './public/js/orderMethod.js';
+export default {
 	data() {
 		return {
 			isIphoneX: false,
@@ -636,11 +658,6 @@
 		};
 	},
 	mixins: [orderMethod],
-		components: {
-			nsGoodsRecommend,
-			nsPayment,
-			nsContact
-		},
 	onLoad(option) {
 		if (option.order_id) this.orderId = option.order_id;
 		if (option.merchant_trade_no) this.merchantTradeNo = option.merchant_trade_no;
@@ -807,17 +824,18 @@
 			return Math.abs(parseFloat(value)).toFixed(2);
 		}
 	}
-	};
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/detail.scss';
+@import './public/css/detail.scss';
 </style>
 <style scoped>
-	.pickup-code-info .code img:nth-child(1) {
+.pickup-code-info .code img:nth-child(1) {
 	margin-bottom: 30rpx;
-	}
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+}
+
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
-	}
+}
 </style>

pages_order/detail_point.vue

@@ -1,14 +1,18 @@
 <template>
 	<view class="detail-container" :class="{ 'safe-area': isIphoneX }" :style="themeColor">
 		<!-- 订单状态 -->
-		<view class="status-wrap color-base-bg" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/order/status-wrap-bg.png') + ')' }">
+		<view class="status-wrap color-base-bg"
+			:style="{ backgroundImage: 'url(' + $util.img('public/uniapp/order/status-wrap-bg.png') + ')' }">
 			<view class="order-status-left">
-				<image v-if="orderData.order_status == 0" :src="$util.img('public/uniapp/order/order-icon.png')"/>
-				<image v-if="orderData.order_status == 1" :src="$util.img('public/uniapp/order/order-icon-received.png')"/>
-				<image v-if="orderData.order_status == -1" :src="$util.img('public/uniapp/order/order-icon-close.png')"/>
+				<image v-if="orderData.order_status == 0" :src="$util.img('public/uniapp/order/order-icon.png')" />
+				<image v-if="orderData.order_status == 1"
+					:src="$util.img('public/uniapp/order/order-icon-received.png')" />
+				<image v-if="orderData.order_status == -1"
+					:src="$util.img('public/uniapp/order/order-icon-close.png')" />
 				<view class="status-name">
 					<view class="status-name">
-						{{ orderData.order_status == 0 ? '待支付' : orderData.order_status == 1 ? '已完成' : orderData.order_status == -1 ? '已关闭' : '' }}
+						{{ orderData.order_status == 0 ? '待支付' : orderData.order_status == 1 ? '已完成' :
+							orderData.order_status == -1 ? '已关闭' : '' }}
 					</view>
 				</view>
 			</view>
@@ -120,7 +124,8 @@
 
 			<view class="order-action" v-if="orderData.order_status == 0 && orderData.type == 1">
 				<view class="order-box-btn" @click="orderClose()">关闭</view>
-				<view class="order-box-btn color-base-bg color-base-border color-text-white" @click="openChoosePayment()">支付</view>
+				<view class="order-box-btn color-base-bg color-base-border color-text-white"
+					@click="openChoosePayment()">支付</view>
 			</view>
 		</view>
 
@@ -133,13 +138,7 @@
 </template>
 
 <script>
-	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
-	import nsContact from '@/components/ns-contact/ns-contact.vue';
-	export default {
-		components: {
-			nsGoodsRecommend,
-			nsContact
-		},
+export default {
 	data() {
 		return {
 			isIphoneX: false,
@@ -290,14 +289,14 @@
 			return Math.abs(parseFloat(value)).toFixed(2);
 		}
 	}
-	};
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/detail.scss';
+@import './public/css/detail.scss';
 </style>
 <style scoped>
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
-	}
+}
 </style>

pages_order/list.vue

@@ -166,19 +166,12 @@
 
 <script>
 import orderMethod from './public/js/orderMethod.js';
-import nsPayment from '@/components/payment/payment.vue';
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+
 
 export default {
 	components: {
-		nsPayment,
 		MescrollUni,
-		nsLogin,
-		loadingCover,
-		nsEmpty
 	},
 	data() {
 		return {

pages_promotion/fenxiao/apply.vue

@@ -152,9 +152,8 @@
 </template>
 
 <script>
-	import validate from 'common/js/validate.js';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import fenxiaoWords from 'common/js/fenxiao-words.js';
+	import validate from '@/common/js/validate.js';
+	import fenxiaoWords from '@/common/js/fenxiao-words.js';
 	import htmlParser from '@/common/js/html-parser';
 	export default {
 		data() {
@@ -187,9 +186,6 @@
 				isOpen: false
 			};
 		},
-		components: {
-			uniPopup
-		},
 		mixins: [fenxiaoWords],
 		onLoad(option) {
 			setTimeout( () => {

pages_promotion/fenxiao/bill.vue

@@ -23,9 +23,6 @@
 
 <script>
 	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
 	// #ifdef MP-WEIXIN
 	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 	// #endif
@@ -38,10 +35,7 @@ export default {
 		};
 	},
 	components: {
-		nsLogin,
 		MescrollUni,
-		loadingCover,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif

pages_promotion/fenxiao/child_fenxiao.vue

@@ -41,9 +41,6 @@
 
 <script>
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif
@@ -57,10 +54,7 @@ export default {
 		};
 	},
 	components: {
-		nsLogin,
 		MescrollUni,
-		loadingCover,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif

pages_promotion/fenxiao/goods_list.vue

@@ -2,28 +2,28 @@
 	<view class="content" :style="themeColor">
 		<mescroll-uni ref="mescroll" @getData="getGoodsList">
 			<block slot="list">
-				<view class="goods-list" :style="{ backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">
+				<view class="goods-list"
+					:style="{ backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">
 					<scroll-view class="quick-nav" scroll-x="true">
 						<!-- #ifdef MP -->
 						<view class="uni-scroll-view-content">
 							<!-- #endif -->
-							<view class="quick-nav-item" :class="{ selected: categoryId == 0 }" @click="changeCategory(0)">全部</view>
-							<view
-								class="quick-nav-item"
-								v-for="item in categoryList"
-								:key="item.category_id"
+							<view class="quick-nav-item" :class="{ selected: categoryId == 0 }"
+								@click="changeCategory(0)">全部</view>
+							<view class="quick-nav-item" v-for="item in categoryList" :key="item.category_id"
 								:class="{ selected: categoryId == item.category_id }"
-								@click="changeCategory(item.category_id)"
-							>
+								@click="changeCategory(item.category_id)">
 								{{ item.category_name }}
 							</view>
 							<!-- #ifdef MP -->
 						</view>
 						<!-- #endif -->
 					</scroll-view>
-					<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
+					<view v-for="(item, index) in goodsList" :key="index" class="goods-item"
+						@click="navToDetailPage(item)">
 						<view class="image-wrap">
-							<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)" mode="aspectFill" />
+							<image :src="$util.img(item.sku_image, { size: 'mid' })" @error="imageError(index)"
+								mode="aspectFill" />
 						</view>
 						<view class="goods-content">
 							<view class="goods-name">
@@ -132,22 +132,16 @@
 </template>
 
 <script>
-	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif		
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif		
 import list from './public/js/goods_list.js';
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
 	components: {
-		nsLogin,
 		MescrollUni,
-		loadingCover,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
@@ -157,7 +151,7 @@ export default {
 </script>
 
 <style>
-.quick-nav >>> .uni-scroll-view-content {
+.quick-nav>>>.uni-scroll-view-content {
 	display: flex;
 }
 </style>
@@ -165,8 +159,10 @@ export default {
 /deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
 }
+
 .quick-nav {
 	margin-bottom: 20rpx;
+
 	.quick-nav-item {
 		display: flex;
 		align-items: center;
@@ -190,6 +186,7 @@ export default {
 		}
 	}
 }
+
 .content {
 	overflow: hidden;
 	padding: 0 30rpx 160rpx;
@@ -202,12 +199,14 @@ export default {
 		background-size: 100%;
 		background-repeat: no-repeat;
 		box-sizing: border-box;
+
 		.goods-item {
 			margin-bottom: 20rpx;
 			background: #ffffff;
 			padding: $padding;
 			display: flex;
 			border-radius: 10rpx;
+
 			&:last-child {
 				margin-bottom: 0;
 			}
@@ -221,6 +220,7 @@ export default {
 			border-radius: 10rpx;
 			overflow: hidden;
 			flex-shrink: 0;
+
 			image {
 				width: 100%;
 				height: 100%;
@@ -241,6 +241,7 @@ export default {
 			.goods-name {
 				width: 100%;
 				line-height: 1.3;
+
 				.name {
 					line-height: 1.3;
 					word-break: break-all;
@@ -250,10 +251,12 @@ export default {
 					-webkit-line-clamp: 2;
 					-webkit-box-orient: vertical;
 				}
+
 				.label-list {
 					display: flex;
 					align-items: center;
 					margin-top: 6rpx;
+
 					.label-item {
 						padding: 4rpx 10rpx;
 						font-size: $font-size-tag;
@@ -285,6 +288,7 @@ export default {
 					padding: 0 $padding;
 					border-radius: 50rpx;
 					border: 2rpx solid $base-color;
+
 					text {
 						color: $base-color;
 						border-radius: 40rpx;
@@ -299,6 +303,7 @@ export default {
 			}
 		}
 	}
+
 	.active-btn {
 		position: fixed;
 		bottom: 40rpx;
@@ -312,10 +317,12 @@ export default {
 		border-radius: 50rpx;
 		background-color: $base-color;
 		color: #fff;
+
 		.btn {
 			flex: 1;
 			text-align: center;
 		}
+
 		.share-btn {
 			margin: 0;
 			padding: 0;
@@ -355,6 +362,7 @@ export default {
 					border: none;
 					line-height: 1;
 					height: auto;
+
 					text {
 						margin-top: 20rpx;
 						font-size: $font-size-tag;
@@ -367,6 +375,7 @@ export default {
 					font-size: 80rpx;
 					line-height: initial;
 				}
+
 				.icon-fuzhilianjie,
 				.icon-pengyouquan,
 				.icon-haowuquan,
@@ -383,39 +392,48 @@ export default {
 			text-align: center;
 		}
 	}
+
 	.poster-layer {
 		.generate-poster {
 			padding: 40rpx 0;
+
 			.iconfont {
 				font-size: 80rpx;
 				color: #07c160;
 				line-height: initial;
 			}
-			> view {
+
+			>view {
 				text-align: center;
+
 				&:last-child {
 					margin-top: 20rpx;
 				}
 			}
 		}
+
 		.image-wrap {
 			width: 64%;
 			height: 854rpx;
 			margin: 60rpx auto 40rpx auto;
 			box-shadow: 0 0 32rpx rgba(100, 100, 100, 0.3);
+
 			image {
 				width: 480rpx;
 				height: 854rpx;
 			}
 		}
+
 		.msg {
 			padding: 40rpx;
 		}
+
 		.save {
 			text-align: center;
 			height: 80rpx;
 			line-height: 80rpx;
 		}
+
 		.close {
 			position: absolute;
 			top: 0;

pages_promotion/fenxiao/index.vue

@@ -261,12 +261,8 @@
 
 <script>
 import fenxiaoWords from '@/common/js/fenxiao-words.js';
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
 
 export default {
-	components: {
-		uniPopup
-	},
 	data() {
 		return {
 			info: {

pages_promotion/fenxiao/order.vue

@@ -2,40 +2,51 @@
 	<view :style="themeColor">
 		<view class="withdraw-cate">
 			<block v-for="(item, index) in category" :key="index">
-				<view @click="selectCate(item.id)" class="cate-li" :class="{ 'active color-base-text color-base-bg-before': selectId == item.id }">{{ item.name }}</view>
+				<view @click="selectCate(item.id)" class="cate-li"
+					:class="{ 'active color-base-text color-base-bg-before': selectId == item.id }">{{ item.name }}
+				</view>
 			</block>
 		</view>
 		<mescroll-uni ref="mescroll" @getData="getData" top="90" class="member-point" :size="8" v-if="storeToken">
 			<view class="goods_list" slot="list">
 				<view class="order-list">
-					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex" @click="toDetail(orderItem.fenxiao_order_id)">
+					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex"
+						@click="toDetail(orderItem.fenxiao_order_id)">
 						<view class="order-header">
 							<text class="site-name font-size-base">{{ orderItem.order_no }}</text>
 							<text class="status-name color-base-text" v-if="orderItem.is_refund == 1">已退款</text>
-							<text class="status-name color-text-green" v-else-if="orderItem.is_settlement == 1">已结算</text>
+							<text class="status-name color-text-green"
+								v-else-if="orderItem.is_settlement == 1">已结算</text>
 							<text class="status-name color-text-orange" v-else>待结算</text>
 						</view>
 
 						<view class="order-body">
 							<view class="goods-wrap">
 								<view class="goods-img">
-									<image :src="$util.img(orderItem.sku_image, { size: 'mid' })" @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+									<image :src="$util.img(orderItem.sku_image, { size: 'mid' })"
+										@error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
 								</view>
 								<view class="goods-info">
 									<view class="top-wrap">
 										<view class="goods-name font-size-base">{{ orderItem.sku_name }}</view>
 										<view>
 											<text class="color-tip">返{{ fenxiaoWords.account }}</text>
-											<text class="price-color  price-style small">{{ $lang('common.currencySymbol') }}</text>
-											<text class="price-color price-style large" >{{ parseFloat(orderItem.commission).toFixed(2).split(".")[0] }}</text>
-											<text class="price-color price-style small">.{{ parseFloat(orderItem.commission).toFixed(2).split(".")[1] }}</text>
+											<text class="price-color  price-style small">{{
+												$lang('common.currencySymbol') }}</text>
+											<text class="price-color price-style large">{{
+												parseFloat(orderItem.commission).toFixed(2).split(".")[0] }}</text>
+											<text class="price-color price-style small">.{{
+												parseFloat(orderItem.commission).toFixed(2).split(".")[1] }}</text>
 										</view>
 									</view>
 									<view class="goods-sub-section">
 										<view class="goods-price">
-											<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-											<text class="price-color price-style large" >{{ parseFloat(orderItem.price).toFixed(2).split(".")[0] }}</text>
-										    <text class="unit price-style small">.{{ parseFloat(orderItem.price).toFixed(2).split(".")[1] }}</text>
+											<text class="unit price-style small">{{ $lang('common.currencySymbol')
+												}}</text>
+											<text class="price-color price-style large">{{
+												parseFloat(orderItem.price).toFixed(2).split(".")[0] }}</text>
+											<text class="unit price-style small">.{{
+												parseFloat(orderItem.price).toFixed(2).split(".")[1] }}</text>
 										</view>
 										<view>
 											<text>
@@ -57,18 +68,24 @@
 								<view class="total">
 									<text>合计：</text>
 									<text class="price-color">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price-color font-size-toolbar" >{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[0] }}</text>
-									<text class="price-color">.{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[1] }}</text>
+									<text class="price-color font-size-toolbar">{{
+										parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[0] }}</text>
+									<text class="price-color">.{{
+										parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[1] }}</text>
 								</view>
 							</view>
 						</view>
 					</view>
 				</view>
 				<view class="cart-empty">
-					<ns-empty text="暂无订单" :isIndex="false" v-if="selectId == 0 && orderList.length == 0 && emptyShow"></ns-empty>
-					<ns-empty text="暂无待结算订单" :isIndex="false" v-if="selectId == 1 && orderList.length == 0 && emptyShow"></ns-empty>
-					<ns-empty text="暂无已结算订单" :isIndex="false" v-if="selectId == 2 && orderList.length == 0 && emptyShow"></ns-empty>
-					<ns-empty text="暂无已退款订单" :isIndex="false" v-if="selectId == 3 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无订单" :isIndex="false"
+						v-if="selectId == 0 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无待结算订单" :isIndex="false"
+						v-if="selectId == 1 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无已结算订单" :isIndex="false"
+						v-if="selectId == 2 && orderList.length == 0 && emptyShow"></ns-empty>
+					<ns-empty text="暂无已退款订单" :isIndex="false"
+						v-if="selectId == 3 && orderList.length == 0 && emptyShow"></ns-empty>
 				</view>
 			</view>
 		</mescroll-uni>
@@ -79,20 +96,14 @@
 </template>
 
 <script>
-	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif		
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif		
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 export default {
 	components: {
-		nsLogin,
 		MescrollUni,
-		loadingCover,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
@@ -133,7 +144,7 @@ export default {
 		if (option.type != undefined) this.selectId = option.type;
 	},
 	onShow() {
-		setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -144,9 +155,9 @@ export default {
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-		},1000);
+		}, 1000);
 
-		if(this.fenxiaoWords && this.fenxiaoWords.concept)this.$langConfig.title(this.fenxiaoWords.concept + '订单');
+		if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + '订单');
 
 		if (!this.storeToken) {
 			this.$nextTick(() => {
@@ -204,7 +215,7 @@ export default {
 		}
 	},
 	watch: {
-		storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.$refs.mescroll.refresh();
 			}

pages_promotion/fenxiao/promote_code.vue

@@ -4,7 +4,7 @@
 			<swiper-item v-for="(item, index) in poster" :key="index">
 				<view class="swiper-item">
 					<view class="poster-wrap">
-						<image :src="$util.img(item)" mode="widthFix" :show-menu-by-longpress="true"/>
+						<image :src="$util.img(item)" mode="widthFix" :show-menu-by-longpress="true" />
 					</view>
 				</view>
 			</swiper-item>
@@ -25,7 +25,8 @@
 				<view class="action-wrap">
 					<view @click="closeDialog">取消</view>
 					<view>
-						<button type="default" open-type="openSetting" @opensetting="closeDialog" hover-class="none">立即授权</button>
+						<button type="default" open-type="openSetting" @opensetting="closeDialog"
+							hover-class="none">立即授权</button>
 					</view>
 				</view>
 			</view>
@@ -42,12 +43,11 @@
 </template>
 
 <script>
-	import {
+import {
 	Weixin
-	} from 'common/js/wx-jssdk.js';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+} from 'common/js/wx-jssdk.js';
 
-	export default {
+export default {
 	data() {
 		return {
 			poster: [],
@@ -58,9 +58,6 @@
 			mpShareData: null //小程序分享数据
 		};
 	},
-		components: {
-			uniPopup
-		},
 	methods: {
 		/**
 		 * 获取分销海报
@@ -151,7 +148,7 @@
 		}
 	},
 	onLoad(option) {
-			setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -162,19 +159,19 @@
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-			},1000);
+		}, 1000);
 
 		if (option.templateId) {
 			this.templateId = option.templateId.split(',');
 		}
 
 		if (this.storeToken) {
-				if(option.poster){
+			if (option.poster) {
 				this.poster = decodeURIComponent(option.poster).split(',')
 				setTimeout(() => {
 					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 				}, 500)
-				}else{
+			} else {
 				this.getFenxiaoDetail();
 			}
 
@@ -201,23 +198,23 @@
 		return this.mpShareData.timeLine;
 	},
 	watch: {
-			storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.getFenxiaoDetail();
 			}
 		}
 	}
-	};
+};
 </script>
 
 <style lang="scss">
-	.container {
+.container {
 	width: 100vw;
 	min-height: 100vh;
 	background-color: #f5f5f5;
-	}
+}
 
-	.poster-wrap {
+.poster-wrap {
 	padding: 40rpx 0;
 	width: calc(100vw - 80rpx);
 	margin: 0 40rpx;
@@ -228,13 +225,13 @@
 		overflow: hidden;
 		width: 100%;
 	}
-	}
+}
 
-	.swiper {
+.swiper {
 	height: 1240rpx;
-	}
+}
 
-	.btn {
+.btn {
 	margin: 0 80rpx;
 	margin-top: 30rpx;
 	height: 80rpx;
@@ -242,17 +239,17 @@
 	border-radius: $border-radius;
 	color: #fff;
 	text-align: center;
-	}
+}
 
-	.tips {
+.tips {
 	text-align: center;
 	font-size: $font-size-base;
 	color: #999;
 	font-weight: 600;
 	margin-top: 20rpx;
-	}
+}
 
-	.dialog-popup {
+.dialog-popup {
 	width: 580rpx;
 	background: #fff;
 	box-sizing: border-box;
@@ -302,5 +299,5 @@
 			}
 		}
 	}
-	}
+}
 </style>

pages_promotion/fenxiao/ranking_list.vue

@@ -3,17 +3,22 @@
 		<mescroll-uni ref="mescroll" @getData="getData" top="0" :size="10">
 			<view slot="list">
 				<block v-if="list.length != 0">
-					<view class="banner" :style="{background: 'url('+ $util.img('public/uniapp/fenxiao/index/header_bg.png') +') no-repeat top left / 100% 100%'}">
+					<view class="banner"
+						:style="{ background: 'url(' + $util.img('public/uniapp/fenxiao/index/header_bg.png') + ') no-repeat top left / 100% 100%' }">
 						<view class="info">
 							<view class="info-pic">
-								<image :src="info.headimg ? $util.img(info.headimg) : $util.getDefaultImage().head" @error="info.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
+								<image :src="info.headimg ? $util.img(info.headimg) : $util.getDefaultImage().head"
+									@error="info.headimg = $util.getDefaultImage().head" mode="aspectFill" />
 							</view>
 							<view class="member-info">
 								<view class="rank-info-box">
-									<text class="name">{{info.nickname}}</text>
+									<text class="name">{{ info.nickname }}</text>
 								</view>
-								<view class="withdrawal" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')" v-if="type == 'profit'">点击提现</view>
-								<view class="withdrawal" @click="$util.redirectTo('/pages_promotion/fenxiao/team')" v-if="type == 'invited_num'">我的团队</view>
+								<view class="withdrawal"
+									@click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')"
+									v-if="type == 'profit'">点击提现</view>
+								<view class="withdrawal" @click="$util.redirectTo('/pages_promotion/fenxiao/team')"
+									v-if="type == 'invited_num'">我的团队</view>
 							</view>
 						</view>
 					</view>
@@ -26,7 +31,7 @@
 								</view>
 								<view class="all-money-tit-wrap">
 									<text class="all-money-tit">分销佣金</text>
-									<text class="all-money-num">{{ info.today_commission}}元</text>
+									<text class="all-money-num">{{ info.today_commission }}元</text>
 								</view>
 							</view>
 						</view>
@@ -50,7 +55,7 @@
 								</view>
 								<view class="all-money-tit-wrap">
 									<text class="all-money-tit">推广人数</text>
-									<text class="all-money-num">{{ info.one_child_num}}人</text>
+									<text class="all-money-num">{{ info.one_child_num }}人</text>
 								</view>
 							</view>
 						</view>
@@ -75,12 +80,13 @@
 							<view class="ranking price-font">{{ index + 1 }}</view>
 							<view class="content">
 								<view class="head-img">
-									<image :src="item.headimg ? $util.img(item.headimg) : $util.getDefaultImage().head" @error="item.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
+									<image :src="item.headimg ? $util.img(item.headimg) : $util.getDefaultImage().head"
+										@error="item.headimg = $util.getDefaultImage().head" mode="aspectFill" />
 								</view>
 								<view class="nickname">{{ item.nickname }}</view>
 							</view>
 							<view class="price-font price-style" v-if="type == 'profit'">
-								￥{{ item.total_commission|moneyFormat }}</view>
+								￥{{ item.total_commission | moneyFormat }}</view>
 							<view class="price-font price-style" v-if="type == 'invited_num'">{{ item.child_num }}人
 							</view>
 						</view>
@@ -97,21 +103,15 @@
 </template>
 
 <script>
-	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif		
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif		
 
 
-	export default {
+export default {
 	components: {
-			nsLogin,
 		MescrollUni,
-			loadingCover,
-			nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
@@ -190,22 +190,22 @@
 			});
 		},
 	}
-	}
+}
 </script>
 
 <style lang="scss">
-	.container {
+.container {
 	width: 100vw;
 	height: 100vh;
-	}
+}
 
-	.banner {
+.banner {
 	width: 100%;
 	height: 200rpx;
 	// background: $base-color;
-	}
+}
 
-	.info {
+.info {
 	width: 100%;
 	display: flex;
 	justify-content: space-between;
@@ -259,9 +259,9 @@
 
 	}
 
-	}
+}
 
-	.fenxiao-team {
+.fenxiao-team {
 	display: flex;
 	width: 100%;
 	margin-top: 22rpx;
@@ -318,43 +318,43 @@
 			}
 		}
 	}
-	}
+}
 
-	.icon-wenxiao {
+.icon-wenxiao {
 	text-align: center;
 	font-size: 50rpx;
 	color: var(--base-color) !important;
-	}
+}
 
-	.number {
+.number {
 	font-weight: 600;
 	text-align: center;
-	}
+}
 
-	.info-text {
+.info-text {
 	font-size: 20rpx;
 	text-align: center;
-	}
+}
 
-	.info-title {
+.info-title {
 	font-size: 50rpx;
 	font-weight: 900;
 	color: #f5f5f5;
 	text-align: center;
-	}
+}
 
-	.info-rank {
+.info-rank {
 	color: #f5f5f5;
 	margin-top: 10rpx;
-	}
+}
 
-	.title-rakn-text {
+.title-rakn-text {
 	text-align: center;
 	font-size: 30rpx;
 	font-weight: 900;
-	}
+}
 
-	.ranking-list {
+.ranking-list {
 	transform: translateY(-120rpx);
 	margin: 200rpx 24rpx;
 	background: #fff;
@@ -429,5 +429,5 @@
 			}
 		}
 	}
-	}
+}
 </style>

pages_promotion/fenxiao/relation.vue

@@ -73,9 +73,6 @@
 
 <script>
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif		
@@ -83,10 +80,7 @@ import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
 	components: {
-		nsLogin,
 		MescrollUni,
-		loadingCover,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif

pages_promotion/fenxiao/team.vue

@@ -84,19 +84,13 @@
 
 <script>
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif		
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 export default {
 	components: {
-		nsLogin,
 		MescrollUni,
-		loadingCover,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif

pages_promotion/fenxiao/withdraw_list.vue

@@ -5,16 +5,20 @@
 				<block v-if="withdrawList.length">
 					<view class="detailed-wrap">
 						<view class="cont">
-							<view class="detailed-item" v-for="(item, index) in withdrawList" :key="index" @click="toDetail(item.id)">
+							<view class="detailed-item" v-for="(item, index) in withdrawList" :key="index"
+								@click="toDetail(item.id)">
 								<view class="info">
-									<view class="event">{{ item.transfer_type=='balance'&&'余额' || item.transfer_type=='alipay'&&'支付宝' || item.transfer_type=='bank'&&'银行卡' || item.transfer_type=='wechatpay'&&'微信' }}</view>
+									<view class="event">{{ item.transfer_type == 'balance' && '余额' ||
+										item.transfer_type == 'alipay' && '支付宝' || item.transfer_type == 'bank' && '银行卡' ||
+										item.transfer_type =='wechatpay'&&'微信' }}</view>
 									<view>
 										<text class="time">{{ $util.timeStampTurnTime(item.create_time) }}</text>
 									</view>
 								</view>
 								<view class="right-wrap">
 									<view class="num color-base-text">￥{{ item.money }}</view>
-									<view class="status-name" :style="withdrawState[item.status].color">{{ item.status_name }}</view>
+									<view class="status-name" :style="withdrawState[item.status].color">{{
+										item.status_name }}</view>
 								</view>
 							</view>
 						</view>
@@ -30,21 +34,15 @@
 	</view>
 </template>
 <script>
-	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif		
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif		
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
 	components: {
-		nsLogin,
 		MescrollUni,
-		loadingCover,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
@@ -74,7 +72,7 @@ export default {
 		};
 	},
 	onShow() {
-		setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -85,9 +83,9 @@ export default {
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-		},1000);
+		}, 1000);
 
-		if(this.fenxiaoWords && this.fenxiaoWords.withdraw)this.$langConfig.title(this.fenxiaoWords.withdraw + '明细');
+		if (this.fenxiaoWords && this.fenxiaoWords.withdraw) this.$langConfig.title(this.fenxiaoWords.withdraw + '明细');
 
 		if (!this.storeToken) {
 			this.$nextTick(() => {
@@ -173,7 +171,7 @@ export default {
 		display: flex;
 		height: 90rpx;
 
-		& > view {
+		&>view {
 			flex: 1;
 			text-align: left;
 			padding: 0 $padding;

pages_promotion/merch/detail.vue

@@ -15,7 +15,7 @@
 					<image :src="$util.img(merch.merch_image)" mode="widthFix" style="width: 100rpx;height: 100rpx;" />
 				</view>
 				<view style="margin-left: 20rpx;padding-top: 22rpx;">
-					<view style="line-height: 1;font-size: 32rpx;font-weight: 600;">{{merch.merch_name}}</view>
+					<view style="line-height: 1;font-size: 32rpx;font-weight: 600;">{{ merch.merch_name }}</view>
 					<view style="color:rgb(255 202 40)">
 						<text class="icox icox-xing"></text>
 						<text class="icox icox-xing"></text>
@@ -29,7 +29,8 @@
 
 			<!-- 排序 -->
 			<view class="sort-wrap">
-				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }" @click="sortTabClick('')">
+				<view class="comprehensive-wrap" :class="{ 'color-base-text': orderType === '' }"
+					@click="sortTabClick('')">
 					<text :class="{ 'color-base-text': orderType === '' }">综合</text>
 				</view>
 
@@ -39,8 +40,12 @@
 				<view class="price-wrap" @click="sortTabClick('discount_price')">
 					<text :class="{ 'color-base-text': orderType === 'discount_price' }">价格</text>
 					<view class="iconfont-wrap">
-						<view class="iconfont icon-iconangledown-copy asc" :class="{ 'color-base-text': priceOrder === 'asc' && orderType === 'discount_price' }"></view>
-						<view class="iconfont icon-iconangledown desc" :class="{ 'color-base-text': priceOrder === 'desc' && orderType === 'discount_price' }"></view>
+						<view class="iconfont icon-iconangledown-copy asc"
+							:class="{ 'color-base-text': priceOrder === 'asc' && orderType === 'discount_price' }">
+						</view>
+						<view class="iconfont icon-iconangledown desc"
+							:class="{ 'color-base-text': priceOrder === 'desc' && orderType === 'discount_price' }">
+						</view>
 					</view>
 				</view>
 
@@ -56,17 +61,20 @@
 		<mescroll-uni top="240" ref="mescroll" @getData="getGoodsList">
 			<block slot="list">
 				<view class="goods-list single-column" :class="{ show: isList }">
-					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index" @click="toDetail(item)">
+					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index"
+						@click="toDetail(item)">
 						<view class="goods-img">
 							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
-							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}
+							</view>
 							<view class="sell-out" v-if="item.stock <= 0">
 								<text class="iconfont icon-shuqing"></text>
 							</view>
 						</view>
 						<view class="info-wrap">
 							<view class="name-wrap">
-								<view class="goods-name" :class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
+								<view class="goods-name"
+									:class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
 									{{ isEnEnv ? item.en_goods_name : item.goods_name }}
 								</view>
 							</view>
@@ -74,15 +82,19 @@
 							<view class="lineheight-clear">
 								<view class="discount-price" v-if="item.isinformation == 0">
 									<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price price-style large">{{ parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
-									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+									<text class="price price-style large">{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{ $lang('Make') ? $lang('Make') : '询底价' }}</text>
+									<text class="price price-style large">{{ $lang('Make') ? $lang('Make') : '询底价'
+										}}</text>
 								</view>
 
 
-								<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
+								<view class="member-price-tag"
+									v-if="item.member_price && item.member_price == showPrice(item)">
 									<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
 								</view>
 								<view class="member-price-tag" v-else-if="item.promotion_type == 1">
@@ -95,7 +107,8 @@
 									<text>{{ showMarketPrice(item) }}</text>
 								</view>
 								<view class="block-wrap">
-									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit
+										? item.unit : '件' }}</view>
 								</view>
 								<view class="cart-action-wrap" v-if="config.control && item.is_virtual == 0">
 									<!-- 购物车图标 -->
@@ -134,7 +147,8 @@
 									}" class="icon-diy click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
-										<diy-icon :icon="config.iconDiy.icon" :value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
+										<diy-icon :icon="config.iconDiy.icon"
+											:value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
 									</view>
 								</view>
 							</view>
@@ -143,29 +157,36 @@
 				</view>
 				<view class="goods-list double-column" :class="{ show: !isList }">
 					<view class="goods-item margin-bottom" v-for="(item, index) in goodsList" :key="index"
-						@click="toDetail(item)" :style="{ left: listPosition[index] ? listPosition[index].left : '', top: listPosition[index] ? listPosition[index].top : '' }">
+						@click="toDetail(item)"
+						:style="{ left: listPosition[index] ? listPosition[index].left : '', top: listPosition[index] ? listPosition[index].top : '' }">
 						<view class="goods-img">
 							<image :src="goodsImg(item.goods_image)" mode="widthFix" @error="imgError(index)"></image>
-							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}</view>
+							<view class="color-base-bg goods-tag" v-if="goodsTag(item) != ''">{{ goodsTag(item) }}
+							</view>
 							<view class="sell-out" v-if="item.stock <= 0">
 								<text class="iconfont icon-shuqing"></text>
 							</view>
 						</view>
 						<view class="info-wrap">
-							<view class="goods-name" :class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
+							<view class="goods-name"
+								:class="[{ 'using-hidden': config.nameLineMode == 'single' }, { 'multi-hidden': config.nameLineMode == 'multiple' }]">
 								{{ isEnEnv ? item.en_goods_name : item.goods_name }}
 							</view>
 
 							<view class="lineheight-clear">
 								<view class="discount-price" v-if="item.isinformation == 0">
 									<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
-									<text class="price price-style large">{{ parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
-									<text class="unit price-style small">.{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
+									<text class="price price-style large">{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}</text>
+									<text class="unit price-style small">.{{
+										parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="discount-price" v-else>
-									<text class="price price-style large">{{ $lang('Make') ? $lang('Make') : '询底价' }}</text>
+									<text class="price price-style large">{{ $lang('Make') ? $lang('Make') : '询底价'
+										}}</text>
 								</view>
-								<view class="member-price-tag" v-if="item.member_price && item.member_price == showPrice(item)">
+								<view class="member-price-tag"
+									v-if="item.member_price && item.member_price == showPrice(item)">
 									<image :src="$util.img('public/uniapp/index/VIP.png')" mode="widthFix"></image>
 								</view>
 								<view class="member-price-tag" v-else-if="item.promotion_type == 1">
@@ -177,8 +198,9 @@
 								</view>
 							</view>
 							<view class="pro-info" v-if="item.isinformation == 0">
-								<view class="block-wrap" >
-									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}</view>
+								<view class="block-wrap">
+									<view class="sale color-tip" v-if="item.sale_show">已售{{ item.sale_num }}{{ item.unit
+										? item.unit : '件' }}</view>
 								</view>
 								<view class="cart-action-wrap" v-if="config.control && item.is_virtual == 0">
 									<!-- 购物车图标 -->
@@ -217,7 +239,8 @@
 									}" class="icon-diy click-wrap" :id="'goods-' + item.id"
 										@click.stop="$refs.goodsSkuIndex.addCart(config.cartEvent, item, $event)">
 										<view class="click-event"></view>
-										<diy-icon :icon="config.iconDiy.icon" :value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
+										<diy-icon :icon="config.iconDiy.icon"
+											:value="config.iconDiy.style ? config.iconDiy.style : null"></diy-icon>
 									</view>
 								</view>
 							</view>
@@ -269,8 +292,11 @@
 						<view @click="selectedCategory('')" class="list-wrap">
 							<text :class="{ selected: !categoryId, 'color-base-text': !categoryId }">全部</text>
 						</view>
-						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList" :key="index" class="list-wrap">
-							<text :class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{ item.category_name }}</text>
+						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList"
+							:key="index" class="list-wrap">
+							<text
+								:class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{
+									item.category_name }}</text>
 						</view>
 					</view>
 				</view>
@@ -290,27 +316,16 @@
 </template>
 
 <script>
-	import uniDrawer from '@/components/uni-drawer/uni-drawer.vue';
-	import uniTag from '@/components/uni-tag/uni-tag.vue';
-	import nsGoodsSkuIndex from '@/components/ns-goods-sku/ns-goods-sku-index.vue';
-	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif		
-	import list from './public/js/list.js';
 
-	export default {
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif		
+import list from './public/js/list.js';
+
+export default {
 	components: {
-			uniDrawer,
-			uniTag,
-			nsGoodsSkuIndex,
 		MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
@@ -319,18 +334,18 @@
 		return {};
 	},
 	mixins: [list]
-	};
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/list.scss';
+@import './public/css/list.scss';
 </style>
 <style scoped>
-	>>>.uni-tag--primary.uni-tag--inverted {
+>>>.uni-tag--primary.uni-tag--inverted {
 	background-color: #f5f5f5 !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 {
 	max-height: unset !important;
-	}
+}
 </style>

pages_promotion/point/detail.vue

@@ -5,7 +5,8 @@
 				<view class="goods-media">
 					<!-- #ifdef H5 -->
 					<cover-view class="share">
-						<view class="share_left"><text class="iconfont icon-back_light" @click="$util.goBack()"></text></view>
+						<view class="share_left"><text class="iconfont icon-back_light" @click="$util.goBack()"></text>
+						</view>
 					</cover-view>
 					<!-- #endif -->
 
@@ -13,12 +14,21 @@
 						<swiper class="swiper">
 							<swiper-item :item-id="'goods_id_' + pointInfo.type">
 								<view class="item" v-if="pointInfo.type == 2">
-									<image class="adv-pic" :src="pointInfo.image ? $util.img(pointInfo.image) : $util.img('public/uniapp/point/coupon.png')" @error="imageError($util.img('public/uniapp/point/coupon.png'))" mode="aspectFit"/>
+									<image class="adv-pic"
+										:src="pointInfo.image ? $util.img(pointInfo.image) : $util.img('public/uniapp/point/coupon.png')"
+										@error="imageError($util.img('public/uniapp/point/coupon.png'))"
+										mode="aspectFit" />
 								</view>
 								<view class="item" v-else-if="pointInfo.type == 3">
-									<image class="adv-pic" :src="pointInfo.image ? $util.img(pointInfo.image) : $util.img('public/uniapp/point/hongbao.png')" @error="imageError($util.img('public/uniapp/point/hongbao.png'))" mode="aspectFit"/>
+									<image class="adv-pic"
+										:src="pointInfo.image ? $util.img(pointInfo.image) : $util.img('public/uniapp/point/hongbao.png')"
+										@error="imageError($util.img('public/uniapp/point/hongbao.png'))"
+										mode="aspectFit" />
+								</view>
+								<view class="item" v-else>
+									<image class="adv-pic" :src="$util.img(pointInfo.image)" @error="imageError()"
+										mode="aspectFit"></image>
 								</view>
-								<view class="item" v-else><image class="adv-pic" :src="$util.img(pointInfo.image)" @error="imageError()" mode="aspectFit"></image></view>
 							</swiper-item>
 						</swiper>
 					</view>
@@ -27,7 +37,8 @@
 					<view class="goods-module-wrap">
 						<text class="price-symbol ">{{ pointInfo.point }}积分</text>
 						<template v-if="pointInfo.exchange_price != '0.00' && pointInfo.pay_type > 0">
-							<text class="price-symbol ">+{{ $lang('common.currencySymbol') }}{{ pointInfo.exchange_price }}</text>
+							<text class="price-symbol ">+{{ $lang('common.currencySymbol') }}{{ pointInfo.exchange_price
+								}}</text>
 						</template>
 
 						<view class="market-price-wrap" v-if="pointInfo.price">
@@ -35,26 +46,36 @@
 							<text class="money">{{ pointInfo.price }}</text>
 						</view>
 
-						<view class="follow-and-share" v-if="pointInfo.stock_show == 1 || pointInfo.stock_show == undefined">
-							<text class="color-tip" v-if="pointInfo.pointCoupon != 1">库存:{{ pointInfo.stock }}{{ pointInfo.stock >= 0 ? pointInfo.unit : '' }}</text>
+						<view class="follow-and-share"
+							v-if="pointInfo.stock_show == 1 || pointInfo.stock_show == undefined">
+							<text class="color-tip" v-if="pointInfo.pointCoupon != 1">库存:{{ pointInfo.stock }}{{
+								pointInfo.stock >= 0 ?
+									pointInfo.unit : '' }}</text>
 							<text class="color-tip" v-else>库存:无限{{ pointInfo.stock >= 0 ? pointInfo.unit : '' }}</text>
 						</view>
 					</view>
 					<view class="goods-module-wrap info">
-						<text class="sku-name-wrap" v-if="pointInfo.type == 1">{{ isEnEnv ? pointInfo.en_goods_name : pointInfo.goods_name }}</text>
+						<text class="sku-name-wrap" v-if="pointInfo.type == 1">{{ isEnEnv ? pointInfo.en_goods_name :
+							pointInfo.goods_name
+							}}</text>
 						<text class="sku-name-wrap" v-else>{{ pointInfo.name }}</text>
 					</view>
 					<view class="coupon-desc">
-						<view v-if="pointInfo.balance && pointInfo.balance > 0" class="color-tip">内含{{ pointInfo.balance }}元</view>
+						<view v-if="pointInfo.balance && pointInfo.balance > 0" class="color-tip">内含{{ pointInfo.balance
+							}}元</view>
 						<view v-if="pointInfo.coupon_type == 'random'" class="color-tip">无门槛优惠券</view>
-						<view v-if="pointInfo.coupon_type == 'reward'" class="color-tip">{{ '满' + pointInfo.at_least + '减' + pointInfo.money }}</view>
+						<view v-if="pointInfo.coupon_type == 'reward'" class="color-tip">{{ '满' + pointInfo.at_least +
+							'减' + pointInfo.money
+							}}</view>
 						<view v-if="pointInfo.coupon_type == 'discount'" class="color-tip">
 							满{{ pointInfo.at_least }}元
 							<text>{{ pointInfo.discount }}折</text>
 						</view>
-						<view v-if="pointInfo.coupon_type == 'discount'" class="color-tip">最多优惠{{ pointInfo.discount_limit }}元</view>
+						<view v-if="pointInfo.coupon_type == 'discount'" class="color-tip">最多优惠{{
+							pointInfo.discount_limit }}元</view>
 						<view class="time color-tip" v-if="pointInfo.coupon_type">
-							{{ pointInfo.validity_type == 1 ? '领取之日起' + pointInfo.fixed_term + '天内有效' : $util.timeStampTurnTime(pointInfo.end_time) + '到期' }}
+							{{ pointInfo.validity_type == 1 ? '领取之日起' + pointInfo.fixed_term + '天内有效' :
+								$util.timeStampTurnTime(pointInfo.end_time) + '到期' }}
 						</view>
 					</view>
 				</view>
@@ -71,22 +92,23 @@
 				</view>
 
 				<!-- 促销 -->
-				<view class="community-model" @touchmove.prevent.stop @click.stop="onCloseCommunity()" v-show="isCommunity">
+				<view class="community-model" @touchmove.prevent.stop @click.stop="onCloseCommunity()"
+					v-show="isCommunity">
 					<view class="community-model-content" @click.stop>
-						<view class="community-model-content-radius"><view>添加社群</view></view>
+						<view class="community-model-content-radius">
+							<view>添加社群</view>
+						</view>
 						<view class="community-model-content-draw" v-if="pointInfo.qr_data && pointInfo.qr_data.qr_img">
-							<image
-								:src="
-									pointInfo.qr_data.qr_img != '' && pointInfo.qr_data.qr_state == 1
+							<image :src="pointInfo.qr_data.qr_img != '' && pointInfo.qr_data.qr_state == 1
 									? $util.img(pointInfo.qr_data.qr_img)
 									: $util.img('public/uniapp/goods/detail_erweiImage.png')
-								"
-								mode="aspectFill"
-								show-menu-by-longpress="true"/>
+								" mode="aspectFill" show-menu-by-longpress="true" />
 						</view>
 						<view class="community-model-content-text">长按识别二维码，添加社群</view>
 					</view>
-					<view class="community-model-close" @click.stop="onCloseCommunity()"><text class="iconfont icon-close"></text></view>
+					<view class="community-model-close" @click.stop="onCloseCommunity()"><text
+							class="iconfont icon-close"></text>
+					</view>
 				</view>
 				<!-- 添加二维码 end -->
 				<block v-if="pointInfo.type == 1">
@@ -95,15 +117,20 @@
 						<view class="item selected-sku-spec" v-if="pointInfo.sku_spec_format" @click="exchange">
 							<view class="label">选择</view>
 							<view class="box">
-								<text v-for="(item, index) in pointInfo.sku_spec_format" :key="index">{{ item.spec_name }}/{{ item.spec_value_name }}</text>
+								<text v-for="(item, index) in pointInfo.sku_spec_format" :key="index">{{ item.spec_name
+									}}/{{
+										item.spec_value_name }}</text>
 							</view>
 							<text class="iconfont icon-right"></text>
 						</view>
 
-						<view class="item goods-attribute" @click="openAttributePopup()" v-if="pointInfo.goods_attr_format && pointInfo.goods_attr_format.length > 0">
+						<view class="item goods-attribute" @click="openAttributePopup()"
+							v-if="pointInfo.goods_attr_format && pointInfo.goods_attr_format.length > 0">
 							<view class="label">属性</view>
 							<view class="box">
-								<text v-for="(item, index) in pointInfo.goods_attr_format" :key="index" v-if="index < 2">{{ item.attr_name }}: {{ item.attr_value_name }}</text>
+								<text v-for="(item, index) in pointInfo.goods_attr_format" :key="index"
+									v-if="index < 2">{{
+										item.attr_name }}: {{ item.attr_value_name }}</text>
 							</view>
 							<text class="iconfont icon-right"></text>
 						</view>
@@ -118,12 +145,14 @@
 									<text class="iconfont icon-close"></text>
 								</view>
 								<scroll-view scroll-y class="goods-attribute-body">
-									<view class="item" v-for="(item, index) in pointInfo.goods_attr_format" :key="index">
+									<view class="item" v-for="(item, index) in pointInfo.goods_attr_format"
+										:key="index">
 										<text class="attr-name">{{ item.attr_name }}</text>
 										<text class="value-name">{{ item.attr_value_name }}</text>
 									</view>
 								</scroll-view>
-								<view class="button-box"><button type="primary" @click="closeAttributePopup()">确定</button></view>
+								<view class="button-box"><button type="primary"
+										@click="closeAttributePopup()">确定</button></view>
 							</view>
 						</uni-popup>
 					</view>
@@ -136,7 +165,8 @@
 									<text class="iconfont icon-close"></text>
 								</view>
 								<scroll-view scroll-y>
-									<view class="item" :class="{ 'empty-desc': !item.desc }" v-for="(item, index) in pointInfo.goods_service" :key="index">
+									<view class="item" :class="{ 'empty-desc': !item.desc }"
+										v-for="(item, index) in pointInfo.goods_service" :key="index">
 										<view class="iconfont icon-dui "></view>
 										<view class="info-wrap">
 											<text class="title">{{ item.service_name }}</text>
@@ -144,7 +174,8 @@
 										</view>
 									</view>
 								</scroll-view>
-								<view class="button-box"><button type="primary" @click="closeMerchantsServicePopup()">确定</button></view>
+								<view class="button-box"><button type="primary"
+										@click="closeMerchantsServicePopup()">确定</button></view>
 							</view>
 						</uni-popup>
 					</view>
@@ -152,35 +183,36 @@
 
 				<!-- 详情 -->
 				<view class="goods-detail-tab">
-					<view class="detail-tab"><view class="tab-item">兑换详情</view></view>
+					<view class="detail-tab">
+						<view class="tab-item">兑换详情</view>
+					</view>
 
 					<view class="detail-content">
 						<view class="detail-content-item">
-							<view class="goods-details" v-if="pointInfo.content"><rich-text :nodes="pointInfo.content"></rich-text></view>
+							<view class="goods-details" v-if="pointInfo.content"><rich-text
+									:nodes="pointInfo.content"></rich-text>
+							</view>
 							<view class="goods-details active" v-else>暂无兑换详情！</view>
 						</view>
 					</view>
 				</view>
 
 				<!-- SKU选择 -->
-				<ns-goods-sku
-					v-if="pointInfo.id"
-					ref="goodsSku"
-					@refresh="refreshGoodsSkuDetail"
-					:goods-detail="pointInfo"
-					:goods-id="pointInfo.goods_id"
-					:max-buy="pointInfo.max_buy"
-					:min-buy="pointInfo.min_buy"
-					source="point"
-				></ns-goods-sku>
+				<ns-goods-sku v-if="pointInfo.id" ref="goodsSku" @refresh="refreshGoodsSkuDetail"
+					:goods-detail="pointInfo" :goods-id="pointInfo.goods_id" :max-buy="pointInfo.max_buy"
+					:min-buy="pointInfo.min_buy" source="point"></ns-goods-sku>
 			</view>
 		</view>
 
-		<view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-if="!isLogin"><button type="primary" >登录之后方可兑换</button></view>
+		<view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-if="!isLogin"><button
+				type="primary">登录之后方可兑换</button></view>
 		<block v-else>
-			<view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-if="pointInfo.stock == 0"><button disabled>库存不足</button></view>
-			<view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-else-if="enough"><button disabled>积分不足</button></view>
-			<view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-else><button type="primary" hover-class="none">兑换</button></view>
+			<view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-if="pointInfo.stock == 0"><button
+					disabled>库存不足</button></view>
+			<view class="detail-swap" :class="{ 'position-bottom': isIphoneX }" v-else-if="enough"><button
+					disabled>积分不足</button></view>
+			<view class="detail-swap" @click="exchange()" :class="{ 'position-bottom': isIphoneX }" v-else><button
+					type="primary" hover-class="none">兑换</button></view>
 		</block>
 
 		<loading-cover ref="loadingCover"></loading-cover>
@@ -195,19 +227,10 @@
 	</view>
 </template>
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import uniNumberBox from '@/components/uni-number-box/uni-number-box.vue';
+
 import htmlParser from '@/common/js/html-parser';
-import nsGoodsSku from '@/components/ns-goods-sku/ns-goods-sku.vue';
-import toTop from '@/components/toTop/toTop.vue';
 import scroll from '@/common/js/scroll-view.js';
 export default {
-	components: {
-		uniPopup,
-		uniNumberBox,
-		nsGoodsSku,
-		toTop
-	},
 	data() {
 		return {
 			id: 0,
@@ -280,8 +303,8 @@ export default {
 			title: title,
 			path: path,
 			imageUrl: imageUrl,
-			success: res => {},
-			fail: res => {}
+			success: res => { },
+			fail: res => { }
 		};
 	},
 
@@ -318,7 +341,7 @@ export default {
 		}
 	},
 	watch: {
-		storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.isLogin = true;
 				this.getPointInfo();
@@ -470,9 +493,11 @@ export default {
 
 <style lang="scss">
 @import '@/common/css/goods_detail.scss';
+
 .group-wrap .goods-module-wrap.info {
 	padding-bottom: 10rpx;
 }
+
 .group-wrap {
 	padding-bottom: 20rpx;
 }
@@ -492,6 +517,7 @@ export default {
 		height: 80rpx;
 		line-height: 80rpx;
 		border-radius: 10rpx;
+
 		&[type='primary'] {
 			background-color: var(--goods-btn-color);
 		}

pages_promotion/point/goods_list.vue

@@ -116,21 +116,13 @@
 
 <script>
 	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
 	// #ifdef MP-WEIXIN
 	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 	// #endif		
-	import uniDrawer from '@/components/uni-drawer/uni-drawer.vue';
 
 	export default {
 		components: {
-			uniDrawer,
 			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
 			// #ifdef MP-WEIXIN
 			privacyPopup
 			// #endif

pages_promotion/point/list.vue

@@ -2,16 +2,19 @@
 	<view class="conteiner" :style="themeColor">
 		<!-- #ifdef MP-WEIXIN -->
 		<view class="point-navbar"
-			:style="{'padding-top': menuButtonBounding.top + 'px', height: menuButtonBounding.height + 'px' }">
-			<view class="nav-wrap" :style="{width: menuButtonBounding.left + 'px'}">
-				<view class="back" @click="back" :style="{width: menuButtonBounding.height + 'px', height: menuButtonBounding.height + 'px' }">
+			:style="{ 'padding-top': menuButtonBounding.top + 'px', height: menuButtonBounding.height + 'px' }">
+			<view class="nav-wrap" :style="{ width: menuButtonBounding.left + 'px' }">
+				<view class="back" @click="back"
+					:style="{ width: menuButtonBounding.height + 'px', height: menuButtonBounding.height + 'px' }">
 					<text class="iconfont icon-back_light"></text>
 				</view>
 				<view class="search" @click="$util.redirectTo('/pages_tool/goods/search')">
 					<text class="iconfont icon-sousuo3"></text>
 					<text class="tips">搜索商品</text>
 				</view>
-				<view class="sign" :style="{width: menuButtonBounding.height + 'px', height: menuButtonBounding.height + 'px' }" @click="redirect('/pages_tool/member/signin')">
+				<view class="sign"
+					:style="{ width: menuButtonBounding.height + 'px', height: menuButtonBounding.height + 'px' }"
+					@click="redirect('/pages_tool/member/signin')">
 					<image :src="$util.img('public/uniapp/point/navbar-sing-icon.png')" mode="widthFix"></image>
 				</view>
 			</view>
@@ -20,7 +23,7 @@
 		<!-- #endif -->
 
 		<scroll-view scroll-y="true" class="point-scroll-view" @scrolltolower="getData">
-			<view class="point-wrap" :style="{'background-position-y': -menuButtonBounding.bottom + 'px'}">
+			<view class="point-wrap" :style="{ 'background-position-y': -menuButtonBounding.bottom + 'px' }">
 				<view class="head-box">
 					<view class="account-content">
 						<view class="left">
@@ -28,7 +31,7 @@
 							<view>我的积分</view>
 						</view>
 						<view class="right">
-							<text class="point price-font">{{point}}</text>
+							<text class="point price-font">{{ point }}</text>
 							<text class="text">积分</text>
 							<!-- 		<text class="iconfont icon-right"></text> -->
 						</view>
@@ -65,7 +68,7 @@
 						</view>
 					</view>
 				</view> -->
-<!-- 
+				<!-- 
 				<view class="poster-wrap">
 					<view class="poster-item" @click="redirect('/pages_tool/recharge/list')">
 						<image :src="$util.img('/public/uniapp/point/recharge-poster.png')" mode="widthFix"></image>
@@ -75,7 +78,8 @@
 					</view>
 				</view> -->
 
-				<view class="recharge-list-wrap" @click="redirect('/pages_tool/recharge/list')" v-if="rechargeList.length">
+				<view class="recharge-list-wrap" @click="redirect('/pages_tool/recharge/list')"
+					v-if="rechargeList.length">
 					<view class="item-wrap" v-for="(item, index) in rechargeList.slice(0, 4)" :key="index">
 						<view class="recharge">储值{{ parseFloat(item.buy_price) }}元</view>
 						<view class="point">可得{{ item.point }}积分</view>
@@ -92,10 +96,13 @@
 						</view>
 
 						<view class="list-wrap">
-							<view class="list-wrap-scroll" :class="{'single-row': couponList.length < 3}">
-								<view class="list-wrap-item coupon-list-wrap-item" v-for="(couponItem, couponIndex) in couponList" :key="couponIndex" @click="toDetail(couponItem)">
+							<view class="list-wrap-scroll" :class="{ 'single-row': couponList.length < 3 }">
+								<view class="list-wrap-item coupon-list-wrap-item"
+									v-for="(couponItem, couponIndex) in couponList" :key="couponIndex"
+									@click="toDetail(couponItem)">
 									<view class="img-box">
-										<image :src="$util.img('public/uniapp/point/coupon_' + themeStyle.name + '_bg1.png')"/>
+										<image
+											:src="$util.img('public/uniapp/point/coupon_' + themeStyle.name + '_bg1.png')" />
 									</view>
 									<view class="content">
 										<view class="coupon"
@@ -114,10 +121,14 @@
 												</view>
 												<view class="coupon-info">
 													<view class="coupon_condition font-size-activity-tag">
-														{{ couponItem.at_least == 0 ? '无门槛优惠券' : '满' + parseFloat(couponItem.at_least).toFixed(0) + '可用' }}
+														{{ couponItem.at_least == 0 ? '无门槛优惠券' : '满' +
+															parseFloat(couponItem.at_least).toFixed(0) + '可用' }}
 													</view>
-													<view class="coupon_type font-size-activity-tag" v-if="couponItem.goods_type == 1">全场券</view>
-													<view class="coupon_type font-size-activity-tag" v-else-if="couponItem.goods_type == 2||couponItem.goods_type == 3">指定券</view>
+													<view class="coupon_type font-size-activity-tag"
+														v-if="couponItem.goods_type == 1">全场券</view>
+													<view class="coupon_type font-size-activity-tag"
+														v-else-if="couponItem.goods_type == 2 || couponItem.goods_type == 3">
+														指定券</view>
 												</view>
 											</view>
 											<view class="coupon_right">
@@ -139,7 +150,9 @@
 						</view>
 
 						<view class="list-wrap">
-							<view class="list-wrap-item hongbao-list-wrap-item" v-for="(hongbaoItem, hongbaoIndex) in hongbaoList" :key="hongbaoIndex" @click="toDetail(hongbaoItem)">
+							<view class="list-wrap-item hongbao-list-wrap-item"
+								v-for="(hongbaoItem, hongbaoIndex) in hongbaoList" :key="hongbaoIndex"
+								@click="toDetail(hongbaoItem)">
 								<view class="img-box">
 									<image :src="$util.img('public/uniapp/point/hongbao_bg.png')"></image>
 								</view>
@@ -188,17 +201,19 @@
 												<block v-if="item.price > 0 && item.pay_type > 0">
 													<text class="unit  font-size-tag">+</text>
 													<view>
-														<text class="font-size-tag">{{ parseFloat(item.price).toFixed(2).split(".")[0] }}</text>
-														<text class="unit  font-size-tag">.{{ parseFloat(item.price).toFixed(2).split(".")[1] }}元</text>
+														<text class="font-size-tag">{{
+															parseFloat(item.price).toFixed(2).split(".")[0] }}</text>
+														<text class="unit  font-size-tag">.{{
+															parseFloat(item.price).toFixed(2).split(".")[1] }}元</text>
 													</view>
 												</block>
 											</view>
 											<view class="btn" @click="toDetail(item)">兑换</view>
 										</view>
-										<view class="pro-info" v-if="item.stock_show || item.sale_show ">
-											<view class="font-size-activity-tag color-tip" v-if="item.stock_show ">
+										<view class="pro-info" v-if="item.stock_show || item.sale_show">
+											<view class="font-size-activity-tag color-tip" v-if="item.stock_show">
 												库存:{{ isNaN(parseInt(item.stock)) ? 0 : parseInt(item.stock) }}</view>
-											<view class="font-size-activity-tag color-tip sale" v-if="item.sale_show ">
+											<view class="font-size-activity-tag color-tip sale" v-if="item.sale_show">
 												已兑:{{ isNaN(parseInt(item.sale_num)) ? 0 : parseInt(item.sale_num) }}
 											</view>
 										</view>
@@ -216,19 +231,19 @@
 			<uni-popup ref="pointPopup" type="bottom">
 				<view class="tips-layer">
 					<view class="head" @click="closePointPopup()">
-						<view class="title">{{ isEnEnv ? 'Integral Description' : '积分说明'}}</view>
+						<view class="title">{{ isEnEnv ? 'Integral Description' : '积分说明' }}</view>
 						<text class="iconfont icon-close"></text>
 					</view>
 					<view class="body">
 						<view class="detail margin-bottom">
-							<view class="tip">{{ isEnEnv ? 'Integral Acquisition' : '积分的获取'}}</view>
+							<view class="tip">{{ isEnEnv ? 'Integral Acquisition' : '积分的获取' }}</view>
 							<view class="font-size-base">1、积分可在注册、签到、分享、消费、充值时获得。</view>
 							<view class="font-size-base">2、在购买部分商品时可获得积分。</view>
-							<view class="tip">{{ isEnEnv ? 'Integral Use' : '积分的使用'}}</view>
+							<view class="tip">{{ isEnEnv ? 'Integral Use' : '积分的使用' }}</view>
 							<view class="font-size-base">1、积分可用于兑换积分中心的商品。</view>
 							<view class="font-size-base">2、积分可在参与某些活动时使用。</view>
 							<view class="font-size-base">3、积分不得转让，出售，不设有效期。</view>
-							<view class="tip">{{ isEnEnv ? 'Integral Query' : '积分的查询'}}</view>
+							<view class="tip">{{ isEnEnv ? 'Integral Query' : '积分的查询' }}</view>
 							<view class="font-size-base">1、积分可在会员中心中查询具体数额以及明细。</view>
 						</view>
 					</view>
@@ -245,11 +260,7 @@
 	</view>
 </template>
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	export default {
-		components: {
-			uniPopup
-		},
+export default {
 	data() {
 		return {
 			mescroll: {
@@ -285,7 +296,7 @@
 		};
 	},
 	onLoad(option) {
-			setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.pointexchange) {
 				this.$util.showToast({
 					title: '商家未开启积分商城',
@@ -296,7 +307,7 @@
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-			},1000);
+		}, 1000);
 
 		// #ifdef MP-WEIXIN
 		this.menuButtonBounding = uni.getMenuButtonBoundingClientRect();
@@ -579,15 +590,15 @@
 	onShareTimeline() {
 		return this.mpShareData.timeLine;
 	}
-	};
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/list.scss';
+@import './public/css/list.scss';
 </style>
 <style>
-	.ns-adv>>>image {
+.ns-adv>>>image {
 	width: 100%;
 	border-radius: 0;
-	}
+}
 </style>

pages_promotion/point/order_list.vue

@@ -84,9 +84,6 @@
 
 <script>
 	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
 	// #ifdef MP-WEIXIN
 	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 	// #endif	
@@ -94,9 +91,6 @@
 	export default {
 		components: {
 			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
 			// #ifdef MP-WEIXIN
 			privacyPopup
 			// #endif

pages_promotion/point/payment.vue

@@ -278,24 +278,14 @@
 
 <script>
 	import payment from './public/js/payment.js';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import nsSelectTime from '@/components/ns-select-time/ns-select-time.vue';
 	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
 	// #ifdef MP-WEIXIN
 	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 	// #endif	
 
 	export default {
 		components: {
-			uniPopup,
-			nsSelectTime,
-			nsLogin,
 			MescrollUni,
-			loadingCover,
-			nsEmpty,
 			// #ifdef MP-WEIXIN
 			privacyPopup
 			// #endif

pages_tool/article/list.vue

@@ -33,11 +33,7 @@
 </template>
 
 <script>
-	import nsAdv from '@/pages_tool/components/ns-adv/ns-adv.vue';
 	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
 	// #ifdef MP-WEIXIN
 	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 	// #endif	
@@ -49,11 +45,7 @@
 			};
 		},
 		components: {
-			nsAdv,
 			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
 			// #ifdef MP-WEIXIN
 			privacyPopup
 			// #endif

pages_tool/cases/index.vue

@@ -86,7 +86,6 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
 export default {
   data() {
     return {
@@ -111,9 +110,6 @@ export default {
   onShareAppMessage() {
     // 分享功能
   },
-  components: {
-    uniPopup
-  },  
   methods: {
     init() {
       this.$api.sendRequest({

pages_tool/components/ns-adv/ns-adv.vue

@@ -1,120 +0,0 @@
-<template>
-	<view v-if="advList.length" :class="['container-box',className]">
-		<swiper :indicator-dots="advList.length > 1" indicator-active-color="#ffffff" :autoplay="true" :interval="3000" :duration="1000" v-if="advList.length > 1" @change="changeSwiper" :current="currentIndex" :style="{ height: swiperHeight + 'px' }" class="item-wrap">
-			<swiper-item v-for="(item, index) in advList" :key="index" @click="jumppage(item.adv_url)">
-				<view class="image-box">
-					<image :src="$util.img(item.adv_image)" mode="widthFix" :id="'content-wrap' + index"/>
-				</view>
-			</swiper-item>
-		</swiper>
-		<view v-else class="container-box item-wrap">
-			<image :src="$util.img(advList[0]['adv_image'])" mode="widthFix" lazy-load="true" @load="imageLoad" @click="jumppage(advList[0].adv_url)"/>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'ns-advert',
-		props: {
-			keyword: {
-				type: String
-			},
-			className: {
-				type: String
-			}
-		},
-		data() {
-			return {
-				advList: [],
-				isImage: false,
-				//滑块的高度(单位px)
-				swiperHeight: 150,
-				//当前索引
-				currentIndex: 0,
-			};
-		},
-		created() {
-			this.getAdvList();
-		},
-		methods: {
-			//获取广告位
-			getAdvList() {
-				var item = {
-					adv_image: '',
-					adv_url: ''
-				};
-				this.$api.sendRequest({
-					url: '/api/adv/detail',
-					data: {
-						keyword: this.keyword
-					},
-					success: res => {
-						if (res.code == 0) {
-							var data = res.data.adv_list;
-							for (var index in data) {
-								if (data[index].adv_url) data[index].adv_url = JSON.parse(data[index].adv_url);
-							}
-							this.advList = res.data.adv_list;
-
-							//动态设置swiper的高度
-							this.$nextTick(() => {
-								this.setSwiperHeight();
-							});
-						}
-					}
-				});
-			},
-			jumppage(e) {
-				this.$util.diyRedirectTo(e);
-			},
-			imageLoad(data) {
-				this.isImage = true;
-			},
-			//手动切换题目
-			changeSwiper(e) {
-				this.currentIndex = e.detail.current;
-				//动态设置swiper的高度，使用nextTick延时设置
-				this.$nextTick(() => {
-					this.setSwiperHeight();
-				});
-			},
-			//动态设置swiper的高度
-			setSwiperHeight() {
-				if (this.advList.length > 1) {
-					setTimeout(() => {
-						let element = "#content-wrap" + this.currentIndex;
-						let query = uni.createSelectorQuery().in(this);
-						query.select(element).boundingClientRect();
-						query.exec((res) => {
-							if (res && res[0]) {
-								this.swiperHeight = res[0].height;
-							}
-						});
-					}, 10);
-				}
-			},
-		}
-	};
-</script>
-
-<style lang="scss">
-	.container-box {
-		width: 100%;
-
-		.item-wrap {
-			border-radius: 10rpx;
-
-			.image-box {
-				border-radius: 10rpx;
-			}
-
-			image {
-				width: 100%;
-				height: auto;
-				border-radius: 10rpx;
-				will-change: transform;
-			}
-		}
-	}
-</style>

pages_tool/contact/contact.vue

@@ -143,13 +143,9 @@
 </template>
 
 <script>
-import toTop from '@/components/toTop/toTop.vue';
 import scroll from '@/common/js/scroll-view.js';
 
 export default {
-	components: {
-		toTop
-	},
 	mixins: [scroll],
 	data() {
 		return {

pages_tool/files/list.vue

@@ -58,7 +58,17 @@
 </template>
 
 <script>
+	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+	// #ifdef MP-WEIXIN
+	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+	// #endif  
   export default {
+    components: {
+      MescrollUni,
+      // #ifdef MP-WEIXIN
+      privacyPopup,
+      // #endif
+    },
     data() {
       return {
         category_id: '',
@@ -67,11 +77,6 @@
         keyword: ''
       }
     },
-    components: {
-      nsAdv: () => import('@/pages_tool/components/ns-adv/ns-adv.vue'),
-      nsEmpty: () => import('@/components/ns-empty/ns-empty.vue'),
-      loadingCover: () => import('@/components/loading-cover/loading-cover.vue')
-    },
     onLoad(options) {
       if (options.category_id > 0) {
         this.category_id = options.category_id

pages_tool/goods/brand.vue

@@ -24,25 +24,13 @@
 </template>
 
 <script>
-	import uniGrid from '@/components/uni-grid/uni-grid.vue';
-	import uniGridItem from '@/components/uni-grid-item/uni-grid-item.vue';
-	import nsAdv from '@/pages_tool/components/ns-adv/ns-adv.vue';
 	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
 	// #ifdef MP-WEIXIN
 	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 	// #endif		
 	export default {
 		components: {
-			uniGrid,
-			uniGridItem,
-			nsAdv,
 			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
 			// #ifdef MP-WEIXIN
 			privacyPopup
 			// #endif

pages_tool/goods/coupon.vue

@@ -71,18 +71,12 @@
 
 <script>
 	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
 	// #ifdef MP-WEIXIN
 	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 	// #endif		
 	export default {
 		components: {
 			MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
 			// #ifdef MP-WEIXIN
 			privacyPopup
 			// #endif

pages_tool/goods/evaluate.vue

@@ -75,21 +75,14 @@
 
 <script>
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
+
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif		
 
-import xiaoStarComponent from '@/components/xiao-star-component/xiao-star-component.vue';
 export default {
 	components: {
-		xiaoStarComponent,
 		MescrollUni,
-		nsLogin,
-		loadingCover,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif

pages_tool/index/diy.vue

@@ -56,16 +56,11 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
+
 import diyJs from '@/common/js/diy.js';
 import microPageJs from './public/js/diy.js';
 
 export default {
-	components: {
-		uniPopup,
-		nsNavbar
-	},
 	mixins: [diyJs, microPageJs]
 };
 </script>

pages_tool/login/find.vue

@@ -87,11 +87,7 @@
 
 <script>
 import validate from 'common/js/validate.js';
-import mypOne from '@/pages_tool/components/myp-one/myp-one.vue';
 export default {
-	components: {
-		mypOne
-	},
 	data() {
 		return {
 			findMode: 'mobile',

pages_tool/login/login.vue

@@ -66,7 +66,6 @@
 
 <script>
 import validate from 'common/js/validate.js';
-import registerReward from '@/components/register-reward/register-reward.vue';
 
 export default {
 	data() {
@@ -103,9 +102,6 @@ export default {
 			authInfo: null
 		};
 	},
-	components: {
-		registerReward
-	},
 	onLoad(option) {
 		if (option.back) this.back = option.back;
 		this.getRegisterConfig();

pages_tool/member/account.vue

@@ -3,7 +3,8 @@
 		<mescroll-uni ref="mescroll" @getData="getData" v-if="storeToken">
 			<block slot="list">
 				<view class="nc-info-list-content">
-					<view class="list-item balance-item" @click="setBalanceDefault()" v-if="type=='fenxiao' && payList && payList.balance">
+					<view class="list-item balance-item" @click="setBalanceDefault()"
+						v-if="type == 'fenxiao' && payList && payList.balance">
 						<view class="item-top">
 							<view class="item-left">
 								<view class="title-text">提现到余额</view>
@@ -32,9 +33,10 @@
 							</view>
 
 							<view class="item-bottom">
-								<view class="account-default" @click="setDefault(item.id,item.is_default)">
+								<view class="account-default" @click="setDefault(item.id, item.is_default)">
 									<text class="default">设为默认账户</text>
-									<switch v-if="item.is_default == 1" checked disabled style="transform:scale(0.7)" :color="themeStyle.main_color" />
+									<switch v-if="item.is_default == 1" checked disabled style="transform:scale(0.7)"
+										:color="themeStyle.main_color" />
 									<switch v-else style="transform:scale(0.7)" :color="themeStyle.main_color" />
 								</view>
 								<view class="account-btn">
@@ -46,10 +48,13 @@
 						</view>
 					</block>
 				</view>
-				<view v-if="dataList.length <= 0 && (type != 'fenxiao'  || (type == 'fenxiao' && payList && !payList.balance))" class="empty-box">
+				<view
+					v-if="dataList.length <= 0 && (type != 'fenxiao' || (type == 'fenxiao' && payList && !payList.balance))"
+					class="empty-box">
 					<image :src="$util.img('public/uniapp/member/account/empty.png')" mode="widthFix"></image>
 					<view class="tips">暂无账户信息，请添加</view>
-					<button type="primary" class="add-account" @click="editAccount('add')">{{ $lang('newAddAccount') }}</button>
+					<button type="primary" class="add-account" @click="editAccount('add')">{{ $lang('newAddAccount')
+						}}</button>
 				</view>
 			</block>
 		</mescroll-uni>
@@ -62,20 +67,14 @@
 </template>
 
 <script>
-	import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-	import nsLogin from '@/components/ns-login/ns-login.vue';
-	import loadingCover from '@/components/loading-cover/loading-cover.vue';
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';	
-	// #ifdef MP-WEIXIN
-	import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-	// #endif
+import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
+// #ifdef MP-WEIXIN
+import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
+// #endif
 
-	export default {
+export default {
 	components: {
 		MescrollUni,
-			nsLogin,
-			loadingCover,
-			nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif
@@ -224,17 +223,17 @@
 		}
 	},
 	watch: {
-			storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.$refs.mescroll.refresh();
 			}
 		}
 	}
-	};
+};
 </script>
 
 <style lang="scss">
-	.empty-box {
+.empty-box {
 	width: 100vw;
 	height: 100vh;
 	display: flex;
@@ -269,14 +268,14 @@
 		margin-top: 20rpx;
 		box-sizing: border-box;
 	}
-	}
+}
 
-	.mescroll-downwarp+.empty-box {
+.mescroll-downwarp+.empty-box {
 	height: calc(100vh - 260rpx);
-	}
+}
 
 
-	.btn-add {
+.btn-add {
 	margin-top: 60rpx;
 	bottom: 0;
 	width: 100%;
@@ -300,13 +299,13 @@
 			font-size: $font-size-base;
 		}
 	}
-	}
+}
 
-	.zw {
+.zw {
 	margin-top: 250rpx;
-	}
+}
 
-	.list-item {
+.list-item {
 	margin: 0 0;
 	padding: 24rpx $margin-both;
 	box-sizing: border-box;
@@ -439,27 +438,27 @@
 			}
 		}
 	}
-	}
+}
 </style>
 <style lang="scss">
-	/deep/ .mescroll-upwarp {
+/deep/ .mescroll-upwarp {
 	padding-bottom: 150rpx;
-	}
+}
 </style>
 <style>
-	.item-bottom>>>.uni-switch-wrapper .uni-switch-input {
+.item-bottom>>>.uni-switch-wrapper .uni-switch-input {
 	height: 48rpx !important;
 	width: 88rpx !important;
-	}
+}
 
-	.item-bottom>>>.uni-switch-wrapper .uni-switch-input:after {
+.item-bottom>>>.uni-switch-wrapper .uni-switch-input:after {
 	height: 44rpx !important;
 	width: 44rpx !important;
-	}
+}
 
-	.item-bottom>>>.uni-switch-wrapper .uni-switch-input:before {
+.item-bottom>>>.uni-switch-wrapper .uni-switch-input:before {
 	background-color: #EDEDED !important;
 	height: 44rpx !important;
 	width: 90rpx !important;
-	}
+}
 </style>

pages_tool/member/address.vue

@@ -101,10 +101,6 @@ import {
 	Weixin
 } from 'common/js/wx-jssdk.js';
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif
@@ -112,9 +108,6 @@ import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 export default {
 	components: {
 		MescrollUni,
-		nsLogin,
-		loadingCover,
-		nsEmpty,
 		// #ifdef MP-WEIXIN
 		privacyPopup
 		// #endif

pages_tool/member/address_edit.vue

@@ -79,14 +79,10 @@
 </template>
 
 <script>
-    import pickRegions from '@/components/pick-regions/pick-regions.vue';
     import validate from 'common/js/validate.js';
     import Config from '@/common/js/config.js';
 
     export default {
-        components: {
-            pickRegions
-        },
         data() {
             return {
                 formData: {

pages_tool/member/balance.vue

@@ -72,11 +72,8 @@
 </template>
 
 <script>
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
 
 export default {
-	components: { nsLogin, loadingCover },
 	data() {
 		return {
 			balanceInfo: {

pages_tool/member/balance_detail.vue

@@ -50,18 +50,13 @@
 </template>
 
 <script>
-	import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
+
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif
 export default {
 	components: {
-		nsEmpty,
-		nsLogin,
-		loadingCover,
 		MescrollUni,
 		// #ifdef MP-WEIXIN
 		privacyPopup

pages_tool/member/card.vue

@@ -5,8 +5,9 @@
 		</view>
 		<view class="banner-container">
 			<view class="memberInfo">
-				<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError" mode="aspectFill"/>
-				<image :src="$util.getDefaultImage().head" v-else mode="aspectFill"/>
+				<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError"
+					mode="aspectFill" />
+				<image :src="$util.getDefaultImage().head" v-else mode="aspectFill" />
 				<view class="member-desc">
 					<view class="font-size-toolbar">{{ memberInfo.nickname }}</view>
 					<view class="font-size-tag expire-time" v-if="memberInfo.level_expire_time > 0">
@@ -22,15 +23,18 @@
 						<view class="level-detail">{{ levelInfo.level_name }}</view>
 						<view class="growr-name">{{ levelInfo.level_name }}可享受消费折扣和</view>
 						<view class="growr-value">会员大礼包等权益</view>
-						<view class="growth-rules font-size-tag" @click="openExplainPopup" v-if="levelInfo.remark != ''">
+						<view class="growth-rules font-size-tag" @click="openExplainPopup"
+							v-if="levelInfo.remark != ''">
 							<text class="iconfont icon-wenhao font-size-tag"></text>
 						</view>
-						<button type="default" class="renew-btn" @click="$util.redirectTo('/pages_tool/member/card_buy')">立即续费</button>
+						<button type="default" class="renew-btn"
+							@click="$util.redirectTo('/pages_tool/member/card_buy')">立即续费</button>
 					</view>
 				</view>
 			</view>
 
-			<view class="card-content" v-if="levelInfo.is_free_shipping || levelInfo.consume_discount < 100 || levelInfo.point_feedback > 0">
+			<view class="card-content"
+				v-if="levelInfo.is_free_shipping || levelInfo.consume_discount < 100 || levelInfo.point_feedback > 0">
 				<view class="card-content-head">
 					<view class="line-box">
 						<view class="line right"></view>
@@ -118,17 +122,10 @@
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
-import scroll from '@/common/js/scroll-view.js';
-import nsLogin from '@/components/ns-login/ns-login.vue';
 
-	export default {
-		components: {
-			uniPopup,
-			nsGoodsRecommend,
-			nsLogin
-		},
+import scroll from '@/common/js/scroll-view.js';
+
+export default {
 	mixins: [scroll],
 	data() {
 		return {
@@ -164,7 +161,7 @@ import nsLogin from '@/components/ns-login/ns-login.vue';
 		});
 		this.levelInfo = levelInfo;
 	},
-		onShow() {},
+	onShow() { },
 	methods: {
 		headimgError() {
 			this.memberInfo.headimg = this.$util.getDefaultImage().head;
@@ -189,24 +186,24 @@ import nsLogin from '@/components/ns-login/ns-login.vue';
 		this.$util.redirectTo('/pages/member/index');
 		return true;
 	}
-	};
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/card.scss';
+@import './public/css/card.scss';
 
-	.banner-container .image-container .slide-image {
+.banner-container .image-container .slide-image {
 	width: calc(100% - 60rpx);
 	height: 360rpx;
 	background-size: 100% 100%;
 	background-repeat: no-repeat;
-	}
+}
 
-	.banner-container .image-container image {
+.banner-container .image-container image {
 	background-color: #e3b66b;
-	}
+}
 
-	.banner-container .slide-image .renew-btn {
+.banner-container .slide-image .renew-btn {
 	text-align: center;
 	line-height: 56rpx;
 	height: 56rpx;
@@ -220,11 +217,11 @@ import nsLogin from '@/components/ns-login/ns-login.vue';
 	bottom: 40rpx;
 	border: none;
 	z-index: 10;
-	}
+}
 </style>
 
 <style scoped>
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
-	}
+}
 </style>

pages_tool/member/card_buy.vue

@@ -6,7 +6,8 @@
 			</view>
 			<view class="banner-container">
 				<view class="memberInfo">
-					<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError" mode="aspectFill"/>
+					<image :src="$util.img(memberInfo.headimg)" v-if="memberInfo.headimg" @error="headimgError"
+						mode="aspectFill" />
 					<image :src="$util.getDefaultImage().head" v-else mode="aspectFill"></image>
 					<view class="member-desc">
 						<view class="font-size-toolbar">{{ memberInfo.nickname }}</view>
@@ -22,7 +23,8 @@
 					:circular="swiperConfig.circular" :previous-margin="swiperConfig.previousMargin"
 					:next-margin="swiperConfig.nextMargin" @change="swiperChange" @animationfinish="animationfinish"
 					:current="curIndex">
-					<swiper-item :class="levelList.length == 1 ? 'image-container-box' : ''" v-for="(item, i) in levelList" :key="i">
+					<swiper-item :class="levelList.length == 1 ? 'image-container-box' : ''"
+						v-for="(item, i) in levelList" :key="i">
 						<view class="image-container" :class="[
 							curIndex === 0
 								? i === listLen - 1
@@ -50,14 +52,19 @@
 								}">
 								<view class="bg-border"></view>
 
-								<image v-if="levelList[curIndex] && levelList[curIndex]['level_picture']" :src="$util.img(levelList[curIndex]['level_picture'])"/>
-								<image v-else :style="{backgroundColor:levelList[curIndex]['bg_color']}"/>
+								<image v-if="levelList[curIndex] && levelList[curIndex]['level_picture']"
+									:src="$util.img(levelList[curIndex]['level_picture'])" />
+								<image v-else :style="{ backgroundColor: levelList[curIndex]['bg_color'] }" />
 
 								<view class="info">
-									<view class="level-detail" :style="{color:levelList[curIndex]['level_text_color']}">{{ levelList[curIndex].level_name }}</view>
-									<view class="growr-name" :style="{color:levelList[curIndex]['level_text_color']}">{{ levelList[curIndex].level_name }}可享受消费折扣和</view>
-									<view class="growr-value" :style="{color:levelList[curIndex]['level_text_color']}">会员大礼包等权益</view>
-									<view class="growth-rules font-size-tag" @click="openExplainPopup" v-if="levelList[curIndex].remark != ''">
+									<view class="level-detail" :style="{ color: levelList[curIndex]['level_text_color'] }">
+										{{ levelList[curIndex].level_name }}</view>
+									<view class="growr-name" :style="{ color: levelList[curIndex]['level_text_color'] }">{{
+										levelList[curIndex].level_name }}可享受消费折扣和</view>
+									<view class="growr-value" :style="{ color: levelList[curIndex]['level_text_color'] }">
+										会员大礼包等权益</view>
+									<view class="growth-rules font-size-tag" @click="openExplainPopup"
+										v-if="levelList[curIndex].remark != ''">
 										<text class="iconfont icon-wenhao font-size-tag"></text>
 									</view>
 								</view>
@@ -78,8 +85,10 @@
 						<view class="clear"></view>
 					</view>
 					<view class="card-time-list">
-						<view class="card-item-box" :class="{ small: currCard.charge_rule_arr.length == 4 }" v-for="(item, index) in currCard.charge_rule_arr" :key="index">
-							<view class="card-time-item" :class="{ active: choiceIndex == index }" @click="choice(index)">
+						<view class="card-item-box" :class="{ small: currCard.charge_rule_arr.length == 4 }"
+							v-for="(item, index) in currCard.charge_rule_arr" :key="index">
+							<view class="card-time-item" :class="{ active: choiceIndex == index }"
+								@click="choice(index)">
 								<image :src="$util.img('public/uniapp/level/card-icon.png')" mode="widthFix"></image>
 								<view class="time-name">{{ cardType[item.key].name }}</view>
 								<view class="time-price">
@@ -172,7 +181,8 @@
 						</view>
 						<view class="agreement" v-if="agreement">
 							购买既视为同意
-							<text @click="$util.redirectTo('/pages_tool/member/card_agreement')">《{{ agreement.title }}》</text>
+							<text @click="$util.redirectTo('/pages_tool/member/card_agreement')">《{{ agreement.title
+								}}》</text>
 						</view>
 					</view>
 				</block>
@@ -198,7 +208,8 @@
 				</uni-popup>
 			</view>
 
-			<ns-payment ref="choosePaymentPopup" :payMoney="currCard.charge_rule_arr[choiceIndex].value" @confirm="toPay" v-if="currCard.charge_rule_arr.length"></ns-payment>
+			<ns-payment ref="choosePaymentPopup" :payMoney="currCard.charge_rule_arr[choiceIndex].value"
+				@confirm="toPay" v-if="currCard.charge_rule_arr.length"></ns-payment>
 		</block>
 		<block v-else><ns-empty text="暂无可开会员卡" :isIndex="false"></ns-empty></block>
 
@@ -209,21 +220,10 @@
 </template>
 
 <script>
-	import scroll from '@/common/js/scroll-view.js';
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
-import nsPayment from '@/components/ns-payment/ns-payment.vue';
+import scroll from '@/common/js/scroll-view.js';
 
-	export default {
-		components: {
-			uniPopup,
-			nsEmpty,
-			nsLogin,
-			loadingCover,
-			nsPayment
-		},
+
+export default {
 	mixins: [scroll],
 	data() {
 		return {
@@ -301,9 +301,9 @@ import nsPayment from '@/components/ns-payment/ns-payment.vue';
 		}
 		this.getAgreement();
 	},
-		onShow() {},
+	onShow() { },
 	watch: {
-			storeToken: function(nVal, oVal) {
+		storeToken: function (nVal, oVal) {
 			if (nVal) {
 				this.getCardList();
 			}
@@ -421,9 +421,9 @@ import nsPayment from '@/components/ns-payment/ns-payment.vue';
 		this.$util.redirectTo('/pages/member/index');
 		return true;
 	}
-	};
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/card.scss';
+@import './public/css/card.scss';
 </style>

pages_tool/member/collection.vue

@@ -35,10 +35,7 @@
 </template>
 
 <script>
-	import nsGoodsRecommend from '@/components/ns-goods-recommend/ns-goods-recommend.vue';
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
+
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
@@ -47,10 +44,6 @@ import collection from './public/js/collection.js';
 
 export default {
 	components: {
-		nsGoodsRecommend,
-		nsEmpty,
-		nsLogin,
-		loadingCover,
 		MescrollUni,
 		// #ifdef MP-WEIXIN
 		privacyPopup

pages_tool/member/coupon.vue

@@ -70,18 +70,12 @@
 </template>
 
 <script>
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 // #endif
 export default {
 	components: {
-		nsEmpty,
-		nsLogin,
-		loadingCover,
 		MescrollUni,
 		// #ifdef MP-WEIXIN
 		privacyPopup

pages_tool/member/footprint.vue

@@ -64,9 +64,7 @@
 
 <script>
 var dateList = [];
-import nsEmpty from '@/components/ns-empty/ns-empty.vue';
-import nsLogin from '@/components/ns-login/ns-login.vue';
-import loadingCover from '@/components/loading-cover/loading-cover.vue';
+
 import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
 // #ifdef MP-WEIXIN
 import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
@@ -74,9 +72,6 @@ import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
 
 export default {
 	components: {
-		nsEmpty,
-		nsLogin,
-		loadingCover,
 		MescrollUni,
 		// #ifdef MP-WEIXIN
 		privacyPopup

pages_tool/member/index.vue

@@ -74,16 +74,10 @@
 </template>
 
 <script>
-import uniPopup from '@/components/uni-popup/uni-popup.vue';
-import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
 import diyJs from '@/common/js/diy.js';
 import indexJs from './public/js/index.js';
 
 export default {
-	components: {
-		uniPopup,
-		nsNavbar
-	},
 	mixins: [diyJs, indexJs],
 	methods: {