chore(组件): privacyPopup 组件全部使用注册机制

components-diy/diy-index-page.vue

@@ -169,8 +169,6 @@
 </template>
 
 <script>
-
-import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
 import DiyMinx from './minx.js'
 export default {
 	name: 'diy-index-page',
@@ -190,9 +188,6 @@ export default {
 		}
 	},
 	mixins: [DiyMinx],
-	components: {
-		MescrollUni
-	},
 	data() {
 		return {
 			pageIndex: 0, //当前选中分类id

components/ns-login/ns-login.vue

@@ -103,9 +103,7 @@
 </template>
 
 <script>
-// #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';
@@ -113,11 +111,6 @@ import validate from '@/common/js/validate.js';
 export default {
 	mixins: [auth],
 	name: 'ns-login',
-	components: {
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},
 	data() {
 		return {
 			url: '',

components/privacy-popup/privacy-popup.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- #ifdef MP -->
 	<view v-if="showPop">
 		<view class="privacy-mask">
 			<view class="privacy-wrap">
@@ -15,6 +16,10 @@
 			</view>
 		</view>
 	</view>
+	<!-- #endif -->
+	<!-- #ifdef WEB || H5 -->
+	<view v-if="showPop"></view>
+	<!-- #endif -->
 </template>
 
 <script>

package-lock.json

@@ -1,11 +1,15 @@
 {
-  "name": "uniappsaas",
+  "name": "frontend",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
+      "dependencies": {
+        "jweixin-module": "^1.6.0"
+      },
       "devDependencies": {
-        "terser-webpack-plugin": "^5.3.10"
+        "terser-webpack-plugin": "^5.3.10",
+        "zion-uniapp-mp-load-package": "^1.0.13"
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
@@ -619,6 +623,25 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==",
+      "license": "ISC"
+    },
     "node_modules/loader-runner": {
       "version": "4.3.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -981,6 +1004,16 @@
       "engines": {
         "node": ">=10.13.0"
       }
+    },
+    "node_modules/zion-uniapp-mp-load-package": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npmmirror.com/zion-uniapp-mp-load-package/-/zion-uniapp-mp-load-package-1.0.13.tgz",
+      "integrity": "sha512-QKJ6azXsJh9dVpjVS/48bGQELSI3FFtQ3QZic/Gs5z6v77BVjY7uGCXKxGuCwNwijtJnm8FRzlFGTVcQYU+wXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "json5": "^2.2.3"
+      }
     }
   },
   "dependencies": {
@@ -1456,6 +1489,17 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
+    "json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true
+    },
+    "jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmmirror.com/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
+    },
     "loader-runner": {
       "version": "4.3.0",
       "resolved": "https://repo.huaweicloud.com/repository/npm/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -1681,6 +1725,15 @@
       "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
       "dev": true,
       "peer": true
+    },
+    "zion-uniapp-mp-load-package": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npmmirror.com/zion-uniapp-mp-load-package/-/zion-uniapp-mp-load-package-1.0.13.tgz",
+      "integrity": "sha512-QKJ6azXsJh9dVpjVS/48bGQELSI3FFtQ3QZic/Gs5z6v77BVjY7uGCXKxGuCwNwijtJnm8FRzlFGTVcQYU+wXA==",
+      "dev": true,
+      "requires": {
+        "json5": "^2.2.3"
+      }
     }
   }
 }

package.json

@@ -3,7 +3,8 @@
     "mp-weixin": "node scripts/mp-weixin.patch.js"
   },
   "devDependencies": {
-    "terser-webpack-plugin": "^5.3.10"
+    "terser-webpack-plugin": "^5.3.10",
+    "zion-uniapp-mp-load-package": "^1.0.13"
   },
   "dependencies": {
     "jweixin-module": "^1.6.0"

pages.json

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

pages/index/index.vue

@@ -149,22 +149,12 @@
 
 <script>
 
-// #ifdef MP-WEIXIN
+
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif
 import diyJs from '@/common/js/diy.js';
-
 import scroll from '@/common/js/scroll-view.js';
-
 import indexJs from './public/js/index.js';
 
 export default {
-	components: {
-
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},
 	mixins: [diyJs, scroll, indexJs]
 };
 </script>

pages_goods/cart.vue

@@ -366,19 +366,10 @@
 </template>
 
 <script>
-
 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: {
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},
 	mixins: [scroll, cart]
 };
 </script>

pages_goods/category.vue

@@ -25,15 +25,7 @@
 </template>
 
 <script>
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif
 export default {
-	components: {
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},
 	data() {
 		return {
 			diyData: null

pages_goods/detail.vue

@@ -524,17 +524,8 @@
 import detail from './public/js/detail.js';
 import scroll from '@/common/js/scroll-view.js';
 import goodsDetailBase from '@/common/js/goods_detail_base.js';
-// 按需引入全局组件
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif
 
 export default {
-	components: {
-			// #ifdef MP-WEIXIN
-			privacyPopup,
-			// #endif
-		},
 	mixins: [goodsDetailBase, detail, scroll]
 };
 </script>

pages_goods/list.vue

@@ -307,19 +307,9 @@
 </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
 import list from './public/js/list.js';
 
 export default {
-	components: {
-		MescrollUni,
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},
 	data() {
 		return {};
 	},

pages_order/list.vue

@@ -166,13 +166,8 @@
 
 <script>
 import orderMethod from './public/js/orderMethod.js';
-import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-
 
 export default {
-	components: {
-		MescrollUni,
-	},
 	data() {
 		return {
 			scrollInto: '',

pages_promotion/fenxiao/bill.vue

@@ -3,7 +3,8 @@
 		<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8">
 			<block slot="list">
 				<view class="balances" v-if="accountList.length" v-for="item in accountList" :key="item.id">
-					<image v-if="item.type == 'order'" :src="$util.img('public/uniapp/fenxiao/bill/jiesuan.png')" mode="widthFix"></image>
+					<image v-if="item.type == 'order'" :src="$util.img('public/uniapp/fenxiao/bill/jiesuan.png')"
+						mode="widthFix"></image>
 					<image v-else :src="$util.img('public/uniapp/fenxiao/bill/withdraw.png')" mode="widthFix"></image>
 					<view class="balances-info">
 						<text>{{ item.type_name }}</text>
@@ -11,7 +12,8 @@
 						<text>{{ $util.timeStampTurnTime(item.create_time) }}</text>
 					</view>
 					<view class="balances-num">
-						<text :class="item.money > 0 ? 'color-base-text' : ''">{{ item.money > 0 ? '+' + item.money : item.money }}</text>
+						<text :class="item.money > 0 ? 'color-base-text' : ''">{{ item.money > 0 ? '+' + item.money :
+							item.money }}</text>
 					</view>
 				</view>
 				<ns-empty v-if="!accountList.length && showEmpty" text="暂无账单信息" :isIndex="false"></ns-empty>
@@ -22,11 +24,6 @@
 </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 {
 	data() {
 		return {
@@ -34,12 +31,6 @@ export default {
 			showEmpty: true
 		};
 	},
-	components: {
-		MescrollUni,
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},
 	onShow() {
 		setTimeout(() => {
 			if (!this.addonIsExist.fenxiao) {

pages_promotion/fenxiao/child_fenxiao.vue

@@ -40,10 +40,6 @@
 </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
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
@@ -53,12 +49,6 @@ export default {
 			emptyShow: false,
 		};
 	},
-	components: {
-		MescrollUni,
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},	
 	mixins: [fenxiaoWords],
 	onShow() {
 		setTimeout(() => {

pages_promotion/fenxiao/goods_list.vue

@@ -132,20 +132,10 @@
 </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		
 import list from './public/js/goods_list.js';
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
-	components: {
-		MescrollUni,
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},
 	mixins: [list, fenxiaoWords]
 };
 </script>

pages_promotion/fenxiao/order.vue

@@ -96,18 +96,8 @@
 </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		
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 export default {
-	components: {
-		MescrollUni,
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},
 	data() {
 		return {
 			category: [

pages_promotion/fenxiao/ranking_list.vue

@@ -103,19 +103,7 @@
 </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 {
 			list: [],

pages_promotion/fenxiao/relation.vue

@@ -72,19 +72,9 @@
 </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		
 		import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
-	components: {
-		MescrollUni,
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},
 	data() {
 		return {
 			orderList: [],

pages_promotion/fenxiao/team.vue

@@ -83,18 +83,8 @@
 </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		
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 export default {
-	components: {
-		MescrollUni,
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},
 	data() {
 		return {
 			levelList: [

pages_promotion/fenxiao/withdraw_list.vue

@@ -34,19 +34,9 @@
 	</view>
 </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		
 import fenxiaoWords from 'common/js/fenxiao-words.js';
 
 export default {
-	components: {
-		MescrollUni,
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},
 	data() {
 		return {
 			withdrawState: {

pages_promotion/merch/detail.vue

@@ -317,19 +317,9 @@
 
 <script>
 	
-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: {
-		MescrollUni,
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},
 	data() {
 		return {};
 	},

pages_promotion/point/goods_list.vue

@@ -4,7 +4,9 @@
 			<!-- 搜索区域 -->
 			<view class="search-wrap uni-flex uni-row">
 				<view class="flex-item input-wrap" @click.stop="search()" @tap.stop="search()">
-					<input class="uni-input" maxlength="50" v-model="keyword" confirm-type="search" @confirm="search()" @click.stop="search()" @tap.stop="search()" :placeholder="isEnEnv ? 'Please enter product keywords' : '请输入商品关键词'" />
+					<input class="uni-input" maxlength="50" v-model="keyword" confirm-type="search" @confirm="search()"
+						@click.stop="search()" @tap.stop="search()"
+						:placeholder="isEnEnv ? 'Please enter product keywords' : '请输入商品关键词'" />
 					<text class="iconfont icon-sousuo3" @click.stop="search()" @tap.stop="search()"></text>
 				</view>
 			</view>
@@ -17,15 +19,20 @@
 				<view class="price-wrap" @click="sortTabClick('point')">
 					<text :class="{ 'color-base-text': order === 'point' }">{{ isEnEnv ? 'Points' : '积分' }}</text>
 					<view class="iconfont-wrap">
-						<view class="iconfont icon-shangsanjiao-copy" :class="{ 'color-base-text': priceOrder === 'asc' && order === 'point' }"></view>
+						<view class="iconfont icon-shangsanjiao-copy"
-						<view class="iconfont icon-sanjiao" :class="{ 'color-base-text': priceOrder === 'desc' && order === 'point' }"></view>
+							:class="{ 'color-base-text': priceOrder === 'asc' && order === 'point' }"></view>
+						<view class="iconfont icon-sanjiao"
+							:class="{ 'color-base-text': priceOrder === 'desc' && order === 'point' }"></view>
 					</view>
 				</view>
 				<view class="price-wrap" @click="sortTabClick('create_time')">
-					<text :class="{ 'color-base-text': order === 'create_time' }">{{ isEnEnv ? 'New Arrival' : '上新时间' }}</text>
+					<text :class="{ 'color-base-text': order === 'create_time' }">{{ isEnEnv ? 'New Arrival' : '上新时间'
+						}}</text>
 					<view class="iconfont-wrap">
-						<view class="iconfont icon-shangsanjiao-copy" :class="{ 'color-base-text': priceOrder === 'asc' && order === 'create_time' }"></view>
+						<view class="iconfont icon-shangsanjiao-copy"
-						<view class="iconfont icon-sanjiao" :class="{ 'color-base-text': priceOrder === 'desc' && order === 'create_time' }"></view>
+							:class="{ 'color-base-text': priceOrder === 'asc' && order === 'create_time' }"></view>
+						<view class="iconfont icon-sanjiao"
+							:class="{ 'color-base-text': priceOrder === 'desc' && order === 'create_time' }"></view>
 					</view>
 				</view>
 				<view :class="{ 'color-base-text': order === 'screen' }" class="screen-wrap">
@@ -47,7 +54,8 @@
 							</view>
 							<view class="info-wrap">
 								<view class="name-wrap">
-									<view class="goods-name" @click="toDetail(item)">{{ isEnEnv ? item.en_goods_name : item.goods_name }}</view>
+									<view class="goods-name" @click="toDetail(item)">{{ isEnEnv ? item.en_goods_name :
+										item.goods_name }}</view>
 								</view>
 								<view class="lineheight-clear">
 									<view class="discount-price">
@@ -55,14 +63,18 @@
 										<text class="unit  font-size-tag">{{ isEnEnv ? 'Points' : '积分' }}</text>
 										<block v-if="item.price > 0 && item.pay_type > 0">
 											<text class="unit  font-size-tag">+</text>
-											<text class="unit  font-size-tag">{{ $lang('common.currencySymbol') }}</text>
+											<text class="unit  font-size-tag">{{ $lang('common.currencySymbol')
-											<text class="price  font-size-toolbar" >{{ parseFloat(item.price).toFixed(2).split(".")[0] }}</text>
+												}}</text>
-											<text class="unit  font-size-tag">.{{ parseFloat(item.price).toFixed(2).split(".")[1] }}</text>
+											<text class="price  font-size-toolbar">{{
+												parseFloat(item.price).toFixed(2).split(".")[0] }}</text>
+											<text class="unit  font-size-tag">.{{
+												parseFloat(item.price).toFixed(2).split(".")[1] }}</text>
 										</block>
 									</view>
 								</view>
 								<view class="pro-info" v-if="item.stock_show">
-									<view class="font-size-activity-tag color-tip">{{ isEnEnv ? 'Stock ' : '库存' }}{{ item.stock }}</view>
+									<view class="font-size-activity-tag color-tip">{{ isEnEnv ? 'Stock ' : '库存' }}{{
+										item.stock }}</view>
 									<view class="sale font-size-activity-tag color-tip" @click="toDetail(item)">
 										<!-- <button type="primary" size="mini">立即兑换</button> -->
 									</view>
@@ -71,7 +83,8 @@
 						</view>
 					</view>
 					<view class="empty" v-if="goodsList.length == 0">
-						<ns-empty :isIndex="false" :text="isEnEnv ? 'No point products available' : '暂无积分商品'"></ns-empty>
+						<ns-empty :isIndex="false"
+							:text="isEnEnv ? 'No point products available' : '暂无积分商品'"></ns-empty>
 					</view>
 				</view>
 			</block>
@@ -85,18 +98,25 @@
 				<view class="item-wrap">
 					<view class="label"><text>{{ isEnEnv ? 'Point Range' : '积分区间' }}</text></view>
 					<view class="price-wrap">
-						<input class="uni-input" type="digit" v-model="minPoint" :placeholder="isEnEnv ? 'Min' : '最低'" />
+						<input class="uni-input" type="digit" v-model="minPoint"
+							:placeholder="isEnEnv ? 'Min' : '最低'" />
 						<view class="h-line"></view>
-						<input class="uni-input" type="digit" v-model="maxPoint" :placeholder="isEnEnv ? 'Max' : '最高'" />
+						<input class="uni-input" type="digit" v-model="maxPoint"
+							:placeholder="isEnEnv ? 'Max' : '最高'" />
 					</view>
 				</view>
 				<!-- 分类筛选项 -->
 				<view class="category-list-wrap">
 					<text class="first">{{ isEnEnv ? 'All Categories' : '全部分类' }}</text>
 					<view class="class-box">
-						<view @click="selectedCategory('')" class="list-wrap"><text :class="{ selected: !categoryId, 'color-base-text': !categoryId }">{{ isEnEnv ? 'All' : '全部' }}</text></view>
+						<view @click="selectedCategory('')" class="list-wrap"><text
-						<view @click="selectedCategory(item.category_id)" v-for="(item, index) in categoryList" :key="index" class="list-wrap">
+								:class="{ selected: !categoryId, 'color-base-text': !categoryId }">{{ isEnEnv ? 'All' :
-							<text :class="{ selected: item.category_id == categoryId, 'color-base-text': item.category_id == categoryId }">{{ item.category_name }}</text>
+								'全部' }}</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>
 					</view>
 				</view>
@@ -115,18 +135,7 @@
 </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 {
 			listStyle: '',
@@ -727,6 +736,7 @@
 			line-height: 1;
 			margin-top: 16rpx;
 			color: var(--price-color);
+
 			.unit {
 				margin-right: 6rpx;
 			}
@@ -852,6 +862,7 @@
 			line-height: 1;
 			margin-top: 16rpx;
 			color: var(--price-color);
+
 			.unit {
 				margin-right: 6rpx;
 			}

pages_promotion/point/order_list.vue

@@ -1,8 +1,10 @@
 <template>
 	<view class="order-container" :style="themeColor">
 		<view class="order-nav" v-if="storeToken">
-			<view v-for="(statusItem, statusIndex) in statusList" :key="statusIndex" class="uni-tab-item" :id="statusItem.id" :data-current="statusIndex" @click="ontabtap">
+			<view v-for="(statusItem, statusIndex) in statusList" :key="statusIndex" class="uni-tab-item"
-				<text class="uni-tab-item-title" :class="statusItem.status == orderStatus ? 'uni-tab-item-title-active color-base-text' : ''">
+				:id="statusItem.id" :data-current="statusIndex" @click="ontabtap">
+				<text class="uni-tab-item-title"
+					:class="statusItem.status == orderStatus ? 'uni-tab-item-title-active color-base-text' : ''">
 					{{ statusItem.name }}
 				</text>
 			</view>
@@ -11,26 +13,31 @@
 		<mescroll-uni ref="mescroll" @getData="getListData" top="80rpx">
 			<block slot="list">
 				<block v-if="orderList.length">
-					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex" @click="detail(orderItem)">
+					<view class="order-item" v-for="(orderItem, orderIndex) in orderList" :key="orderIndex"
+						@click="detail(orderItem)">
 						<view class="order-header">
 							<text class="order-no">订单号：{{ orderItem.order_no }}</text>
 							<text class="status-name">
-								{{ orderItem.order_status == 0 ? '待支付' : orderItem.order_status == 1 ? '已完成' : orderItem.order_status == -1 ? '已关闭' : '' }}
+								{{ orderItem.order_status == 0 ? '待支付' : orderItem.order_status == 1 ? '已完成' :
+									orderItem.order_status == -1 ? '已关闭' : '' }}
 							</text>
 						</view>
 						<view class="order-body">
 							<view class="goods-wrap">
 								<view class="goods-img">
 									<block v-if="orderItem.type == 2">
-										<image :src="$util.img(orderItem.exchange_image) ? $util.img(orderItem.exchange_image) : $util.img('public/uniapp/point/coupon.png')"
+										<image
+											:src="$util.img(orderItem.exchange_image) ? $util.img(orderItem.exchange_image) : $util.img('public/uniapp/point/coupon.png')"
 											@error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
 									</block>
 									<block v-else-if="orderItem.type == 3">
-										<image :src="$util.img(orderItem.exchange_image) ? $util.img(orderItem.exchange_image) : $util.img('public/uniapp/point/hongbao.png')"
+										<image
+											:src="$util.img(orderItem.exchange_image) ? $util.img(orderItem.exchange_image) : $util.img('public/uniapp/point/hongbao.png')"
 											@error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
 									</block>
 									<block v-else>
-										<image :src="$util.img(orderItem.exchange_image)" @error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
+										<image :src="$util.img(orderItem.exchange_image)"
+											@error="imageError(orderIndex)" mode="aspectFill" :lazy-load="true"></image>
 									</block>
 								</view>
 								<view class="goods-info">
@@ -42,9 +49,12 @@
 												<text class="unit price-style small">积分</text>
 												<block v-if="orderItem.price > 0">
 													+
-													<text class="unit price-style small">{{ $lang('common.currencySymbol') }}</text>
+													<text class="unit price-style small">{{
-													<text class="price-style large">{{ parseFloat(orderItem.price).toFixed(2).split(".")[0] }}</text>
+														$lang('common.currencySymbol') }}</text>
-													<text class="unit price-style small">.{{ parseFloat(orderItem.price).toFixed(2).split(".")[1] }}</text>
+													<text class="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>
 												</block>
 											</text>
 											<text class="goods-num">
@@ -58,8 +68,10 @@
 						</view>
 						<view class="order-footer">
 							<view class="order-action" v-if="orderItem.order_status == 0 && orderItem.type == 1">
-								<view class="order-box-btn font-size-tag" @click.stop="orderClose(orderItem.order_id, orderIndex)">关闭</view>
+								<view class="order-box-btn font-size-tag"
-								<view class="order-box-btn color-base-bg color-base-border"  @click.stop="openChoosePayment(orderItem.out_trade_no, orderItem.price)">支付</view>
+									@click.stop="orderClose(orderItem.order_id, orderIndex)">关闭</view>
+								<view class="order-box-btn color-base-bg color-base-border"
+									@click.stop="openChoosePayment(orderItem.out_trade_no, orderItem.price)">支付</view>
 							</view>
 							<view class="order-action" v-else>
 								<view class="order-box-btn font-size-tag">查看详情</view>
@@ -69,7 +81,8 @@
 				</block>
 				<block v-if="showEmpty && !orderList.length">
 					<view class="cart-empty">
-						<ns-empty :isIndex="true" :emptyBtn ="{url: '/pages_promotion/point/list',text: '去逛逛'}" text="暂无积分兑换订单"></ns-empty>
+						<ns-empty :isIndex="true" :emptyBtn="{ url: '/pages_promotion/point/list', text: '去逛逛' }"
+							text="暂无积分兑换订单"></ns-empty>
 					</view>
 				</block>
 			</block>
@@ -83,18 +96,7 @@
 </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 {
 			orderList: [],
@@ -291,6 +293,7 @@
 				left: 20rpx;
 				transform: translateY(-50%);
 			}
+
 			.iconyuan_checkbox {
 				color: $color-tip;
 			}
@@ -370,6 +373,7 @@
 						flex: 1;
 						font-weight: bold;
 					}
+
 					.goods-num {
 						font-size: $font-size-tag;
 						color: $color-tip;
@@ -381,6 +385,7 @@
 							font-size: $font-size-tag;
 						}
 					}
+
 					.goods-type {
 						font-size: $font-size-tag;
 					}

pages_promotion/point/payment.vue

@@ -18,7 +18,8 @@
 			<!-- 选择地址 -->
 			<template v-if="orderPaymentData.exchange_info.type == 1 && orderPaymentData.is_virtual == 0">
 				<!-- 配送方式 -->
-				<view class="delivery-mode" v-if="orderCreateData.delivery &&orderPaymentData.delivery.express_type.length > 1">
+				<view class="delivery-mode"
+					v-if="orderCreateData.delivery && orderPaymentData.delivery.express_type.length > 1">
 					<view class="action">
 						<view v-for="(deliveryItem, deliveryIndex) in orderPaymentData.delivery.express_type"
 							:key="deliveryIndex"
@@ -31,10 +32,12 @@
 					</view>
 				</view>
 
-				<view class="address-box" :class="{'not-delivery-type': orderPaymentData.delivery.express_type.length <= 1}"
+				<view class="address-box"
+					:class="{ 'not-delivery-type': orderPaymentData.delivery.express_type.length <= 1 }"
 					v-if="orderPaymentData.delivery.delivery_type != 'store'">
 					<block v-if="storeInfo.storeList.length > 1 && orderPaymentData.delivery.delivery_type == 'local'">
-						<view class="local-delivery-store" v-if="Object.keys(storeInfo.currStore).length" @click="$refs.deliveryPopup.open()">
+						<view class="local-delivery-store" v-if="Object.keys(storeInfo.currStore).length"
+							@click="$refs.deliveryPopup.open()">
 							<view class="info">
 								由 <text class="store-name">{{ storeInfo.currStore.store_name }}</text> 提供配送
 							</view>
@@ -49,14 +52,19 @@
 							</view>
 						</view>
 					</block>
-					<view class="info-wrap" :class="{'local': orderPaymentData.delivery.delivery_type == 'local'}" v-if="orderCreateData.member_address" @click="selectAddress">
+					<view class="info-wrap" :class="{ 'local': orderPaymentData.delivery.delivery_type == 'local' }"
+						v-if="orderCreateData.member_address" @click="selectAddress">
 						<view class="content">
-							<text class="name font-size-base">{{ orderCreateData.member_address.name ? orderCreateData.member_address.name : '' }}</text>
+							<text class="name font-size-base">{{ orderCreateData.member_address.name ?
-							<text class="font-size-base mobile">{{ orderCreateData.member_address.mobile ? orderCreateData.member_address.mobile : '' }}</text>
+								orderCreateData.member_address.name : '' }}</text>
+							<text class="font-size-base mobile">{{ orderCreateData.member_address.mobile ?
+								orderCreateData.member_address.mobile : '' }}</text>
 							<text class="cell-more iconfont icon-right"></text>
 							<view class="desc-wrap">
-								{{ orderCreateData.member_address.full_address ? orderCreateData.member_address.full_address : '' }}
+								{{ orderCreateData.member_address.full_address ?
-								{{ orderCreateData.member_address.address ? orderCreateData.member_address.address : '' }}
+									orderCreateData.member_address.full_address : '' }}
+								{{ orderCreateData.member_address.address ? orderCreateData.member_address.address : ''
+								}}
 							</view>
 						</view>
 					</view>
@@ -69,11 +77,14 @@
 
 					<!-- 外卖配送 -->
 					<block v-if="orderPaymentData.delivery.delivery_type == 'local'">
-						<view class="local-box" v-if="orderPaymentData.config.local.is_use && orderPaymentData.delivery.local.info && orderPaymentData.delivery.local.info.time_is_open == 1">
+						<view class="local-box"
+							v-if="orderPaymentData.config.local.is_use && orderPaymentData.delivery.local.info && orderPaymentData.delivery.local.info.time_is_open == 1">
 							<view class="pick-block" @click="localtime">
 								<view class="font-size-base">送达时间</view>
 								<view class="time-picker">
-									<text :class="{'color-tip': !orderCreateData.buyer_ask_delivery_title}">{{ orderCreateData.buyer_ask_delivery_title ? orderCreateData.buyer_ask_delivery_title : '请选择送达时间' }}</text>
+									<text :class="{ 'color-tip': !orderCreateData.buyer_ask_delivery_title }">{{
+										orderCreateData.buyer_ask_delivery_title ?
+											orderCreateData.buyer_ask_delivery_title : '请选择送达时间' }}</text>
 									<text class="iconfont icon-right cell-more"></text>
 								</view>
 							</view>
@@ -82,7 +93,9 @@
 					<image class="address-line" :src="$util.img('public/uniapp/order/address-line.png')"></image>
 				</view>
 
-				<view class="store-box" :class="{'not-delivery-type': orderPaymentData.delivery.express_type.length <= 1}" v-if="orderPaymentData.delivery.delivery_type == 'store' && storeInfo.currStore">
+				<view class="store-box"
+					:class="{ 'not-delivery-type': orderPaymentData.delivery.express_type.length <= 1 }"
+					v-if="orderPaymentData.delivery.delivery_type == 'store' && storeInfo.currStore">
 					<block v-if="storeInfo.currStore">
 						<view @click="openSiteDelivery" class="store-info">
 							<view class="store-address-info">
@@ -104,14 +117,16 @@
 						<view class="mobile-wrap store-mobile">
 							<view class="form-group">
 								<text class="text">姓名</text>
-								<input type="text" placeholder-class="color-tip placeholder" class="input" v-model="member_address.name" disabled />
+								<input type="text" placeholder-class="color-tip placeholder" class="input"
+									v-model="member_address.name" disabled />
 							</view>
 						</view>
 						<view class="mobile-wrap store-mobile">
 							<view class="form-group">
 								<text class="text">预留手机</text>
 								<input type="number" maxlength="11" placeholder="请输入您的手机号码"
-									placeholder-class="color-tip placeholder" class="input" v-model="member_address.mobile" />
+									placeholder-class="color-tip placeholder" class="input"
+									v-model="member_address.mobile" />
 							</view>
 						</view>
 						<view class="store-time">
@@ -137,27 +152,35 @@
 				<view class="form-group">
 					<text class="iconfont icon-dianhua2"></text>
 					<text class="text">手机号码</text>
-					<input type="number" maxlength="11" placeholder="请输入您的手机号码" placeholder-class="color-tip placeholder" class="input" v-model="orderCreateData.member_address.mobile" />
+					<input type="number" maxlength="11" placeholder="请输入您的手机号码"
+						placeholder-class="color-tip placeholder" class="input"
+						v-model="orderCreateData.member_address.mobile" />
 				</view>
 			</view>
 
 			<!-- 店铺 -->
-			<view class="site-wrap" :class="orderPaymentData.exchange_info.type == 2 || orderPaymentData.exchange_info.type == 3 ? 'margin-top' : ''">
+			<view class="site-wrap"
+				:class="orderPaymentData.exchange_info.type == 2 || orderPaymentData.exchange_info.type == 3 ? 'margin-top' : ''">
 				<view class="site-body">
 					<view class="goods-wrap">
 						<block v-if="orderPaymentData.exchange_info.type == 2">
 							<view class="goods-img">
-								<image :src="orderPaymentData.exchange_info.image ? $util.img(orderPaymentData.exchange_info.image) : $util.img('public/uniapp/point/coupon.png')" @error="imageError()" mode="aspectFill"/>
+								<image
+									:src="orderPaymentData.exchange_info.image ? $util.img(orderPaymentData.exchange_info.image) : $util.img('public/uniapp/point/coupon.png')"
+									@error="imageError()" mode="aspectFill" />
 							</view>
 						</block>
 						<block v-else-if="orderPaymentData.exchange_info.type == 3">
 							<view class="goods-img">
-								<image :src="orderPaymentData.exchange_info.image ? $util.img(orderPaymentData.exchange_info.image) : $util.img('public/uniapp/point/hongbao.png')" @error="imageError()" mode="aspectFill"/>
+								<image
+									:src="orderPaymentData.exchange_info.image ? $util.img(orderPaymentData.exchange_info.image) : $util.img('public/uniapp/point/hongbao.png')"
+									@error="imageError()" mode="aspectFill" />
 							</view>
 						</block>
 						<block v-else>
 							<view class="goods-img">
-								<image :src="$util.img(orderPaymentData.exchange_info.image)" @error="imageError()" mode="aspectFill"/>
+								<image :src="$util.img(orderPaymentData.exchange_info.image)" @error="imageError()"
+									mode="aspectFill" />
 							</view>
 						</block>
 						<view class="goods-info">
@@ -182,7 +205,8 @@
 				<view class="site-footer">
 					<view class="order-cell">
 						<text class="tit">买家留言</text>
-						<view class="box"><input type="text" placeholder="留言前建议先与商家协调一致" placeholder-class="color-tip" v-model="orderCreateData.buyer_message" /></view>
+						<view class="box"><input type="text" placeholder="留言前建议先与商家协调一致" placeholder-class="color-tip"
+								v-model="orderCreateData.buyer_message" /></view>
 					</view>
 				</view>
 			</view>
@@ -196,7 +220,8 @@
 						<text class="unit">积分</text>
 					</view>
 				</view>
-				<view class="order-cell" v-if="orderPaymentData.exchange_info.type == 1 && orderPaymentData.delivery_money > 0">
+				<view class="order-cell"
+					v-if="orderPaymentData.exchange_info.type == 1 && orderPaymentData.delivery_money > 0">
 					<text class="tit">运费</text>
 					<view class="box">
 						<text class="unit">{{ $lang('common.currencySymbol') }}</text>
@@ -206,7 +231,8 @@
 
 			</view>
 
-			<view class="error-message" v-if="orderPaymentData.delivery && orderPaymentData.delivery.delivery_type == 'local' && orderPaymentData.delivery && orderPaymentData.delivery.error && orderPaymentData.delivery.error !== ''">
+			<view class="error-message"
+				v-if="orderPaymentData.delivery && orderPaymentData.delivery.delivery_type == 'local' && orderPaymentData.delivery && orderPaymentData.delivery.error && orderPaymentData.delivery.error !== ''">
 				{{ orderPaymentData.delivery.error_msg }}
 			</view>
 			<view class="order-submit" :class="{ 'bottom-safe-area': isIphoneX }">
@@ -221,9 +247,11 @@
 					</template>
 				</view>
 				<view class="submit-btn">
-					<button v-if="createBtn()" type="primary" class="mini" size="mini" @click="openChoosePayment()">提交订单</button>
+					<button v-if="createBtn()" type="primary" class="mini" size="mini"
+						@click="openChoosePayment()">提交订单</button>
 					<button v-else class="no-submit mini" size="mini">
-						<block v-if="orderPaymentData.delivery && orderPaymentData.delivery.delivery_type == 'local' && orderPaymentData.delivery && orderPaymentData.delivery.error && orderPaymentData.delivery.start_money > orderPaymentData.price">
+						<block
+							v-if="orderPaymentData.delivery && orderPaymentData.delivery.delivery_type == 'local' && orderPaymentData.delivery && orderPaymentData.delivery.error && orderPaymentData.delivery.start_money > orderPaymentData.price">
 							差{{ orderPaymentData.delivery.start_money - orderPaymentData.price | moneyFormat }}起送
 						</block>
 						<block v-else>提交订单</block>
@@ -241,22 +269,29 @@
 					</view>
 					<view class="popup-body store-popup" :class="{ 'safe-area': isIphoneX }">
 						<view class="delivery-content">
-							<view class="item-wrap" v-for="(item, index) in storeInfo.storeList" :key="index" @click="selectPickupPoint(item)">
+							<view class="item-wrap" v-for="(item, index) in storeInfo.storeList" :key="index"
+								@click="selectPickupPoint(item)">
 								<view class="detail">
-									<view class="name" :class="item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''">
+									<view class="name"
+										:class="item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''">
 										<text>{{ item.store_name }}</text>
 										<text v-if="item.distance">({{ item.distance }}km)</text>
 									</view>
 									<view class="info">
-										<view :class="item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''" class="font-size-goods-tag">
+										<view
+											:class="item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''"
+											class="font-size-goods-tag">
 											营业时间：{{ item.open_date }}
 										</view>
-										<view :class="item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''" class="font-size-goods-tag">
+										<view
+											:class="item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''"
+											class="font-size-goods-tag">
 											地址：{{ item.full_address }}{{ item.address }}
 										</view>
 									</view>
 								</view>
-								<view class="icon" v-if="item.store_id == orderPaymentData.delivery.store_id"><text class="iconfont icon-yuan_checked color-base-text"></text></view>
+								<view class="icon" v-if="item.store_id == orderPaymentData.delivery.store_id"><text
+										class="iconfont icon-yuan_checked color-base-text"></text></view>
 							</view>
 							<view v-if="!storeInfo.storeList" class="empty">所选择收货地址附近没有可以自提的门店</view>
 						</view>
@@ -267,7 +302,8 @@
 		</scroll-view>
 
 		<!-- 选择支付方式弹窗 -->
-		<ns-payment ref="choosePaymentPopup" :payMoney="orderPaymentData.order_money" @confirm="orderCreate"></ns-payment>
+		<ns-payment ref="choosePaymentPopup" :payMoney="orderPaymentData.order_money"
+			@confirm="orderCreate"></ns-payment>
 
 		<loading-cover ref="loadingCover"></loading-cover>
 
@@ -278,18 +314,8 @@
 
 <script>
 import payment from './public/js/payment.js';
-	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
-		},
 	mixins: [payment]
 };
 </script>

pages_tool/article/list.vue

@@ -6,7 +6,8 @@
 					<ns-adv keyword="NS_ARTICLE" class-name="adv-wrap"></ns-adv>
 					<view class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)">
 						<view class="article-img">
-							<image class="cover-img" :src="$util.img(item.cover_img)" mode="widthFix" @error="imgError(index)"/>
+							<image class="cover-img" :src="$util.img(item.cover_img)" mode="widthFix"
+								@error="imgError(index)" />
 						</view>
 						<view class="info-wrap">
 							<text class="title">{{ item.article_title }}</text>
@@ -33,23 +34,12 @@
 </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 {
 	data() {
 		return {
 			list: []
 		};
 	},
-		components: {
-			MescrollUni,
-			// #ifdef MP-WEIXIN
-			privacyPopup
-			// #endif
-		},
 	onShow() {
 		this.setPublicShare();
 	},

pages_tool/files/list.vue

@@ -2,38 +2,20 @@
   <view>
     <view class="search-wrap uni-flex uni-row">
       <view class="flex-item input-wrap">
-        <input 
+        <input class="uni-input" maxlength="50" placeholder="请输入您要搜索的文件名称" v-model="keyword" @confirm="search"
-          class="uni-input" 
+          @input="__set_model($event, 'keyword')" />
-          maxlength="50" 
-          placeholder="请输入您要搜索的文件名称" 
-          v-model="keyword" 
-          @confirm="search" 
-          @input="__set_model($event, 'keyword')"
-        />
         <text class="iconfont icon-sousuo3" @tap="search"></text>
       </view>
     </view>
-    <mescroll-uni 
+    <mescroll-uni ref="mescroll" top="100" @getData="getData">
-      ref="mescroll" 
-      top="100" 
-      @getData="getData"
-    >
       <view slot="list">
         <block v-if="list.length > 0">
           <view class="article-wrap">
-            <ns-adv 
+            <ns-adv keyword="NS_ARTICLE" class-name="adv-wrap"></ns-adv>
-              keyword="NS_ARTICLE" 
-              class-name="adv-wrap"
-            ></ns-adv>
             <block v-for="(item, index) in list" :key="index">
               <view class="item" @tap="toDetail(item.$orig)">
                 <view class="article-img">
-                  <image 
+                  <image class="cover-img" :src="item.g1" mode="widthFix" @error="imgError(index)"></image>
-                    class="cover-img" 
-                    :src="item.g1" 
-                    mode="widthFix" 
-                    @error="imgError(index)"
-                  ></image>
                 </view>
                 <view class="info-wrap">
                   <view class="title">{{ item.$orig.files_title }}</view>
@@ -58,17 +40,7 @@
 </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: '',
@@ -196,10 +168,12 @@
   display: flex;
   align-items: center;
 }
+
 .search-wrap .iconfont {
   margin-left: 16rpx;
   font-size: 36rpx;
 }
+
 .search-wrap .input-wrap {
   flex: 1;
   display: flex;
@@ -210,6 +184,7 @@
   padding-left: 10rpx;
   border-radius: 70rpx;
 }
+
 .search-wrap .input-wrap input {
   width: 90%;
   background: #fff;
@@ -219,6 +194,7 @@
   line-height: 50rpx;
   border-radius: 40rpx;
 }
+
 .search-wrap .input-wrap text {
   font-size: 32rpx;
   color: #909399;
@@ -226,16 +202,20 @@
   text-align: center;
   margin-right: 20rpx;
 }
+
 .empty-wrap {
   padding-top: 200rpx;
 }
+
 .article-wrap {
   background: #f8f8f8;
 }
+
 .article-wrap .adv-wrap {
   margin: 24rpx 24rpx 0 24rpx;
   width: auto;
 }
+
 .article-wrap .item {
   display: flex;
   padding: 20rpx;
@@ -243,6 +223,7 @@
   margin: 24rpx;
   border-radius: 16rpx;
 }
+
 .article-wrap .item .article-img {
   margin-right: 20rpx;
   width: 80rpx;
@@ -252,15 +233,18 @@
   align-items: center;
   justify-content: center;
 }
+
 .article-wrap .item .article-img image {
   width: 100%;
 }
+
 .article-wrap .item .info-wrap {
   flex: 1;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
 }
+
 .article-wrap .item .info-wrap .title {
   font-weight: 700;
   overflow: hidden;
@@ -270,6 +254,7 @@
   -webkit-box-orient: vertical;
   font-size: 24rpx;
 }
+
 .article-wrap .item .info-wrap .read-wrap {
   display: flex;
   color: #999ca7;
@@ -278,6 +263,7 @@
   margin-top: 10rpx;
   line-height: 1;
 }
+
 .article-wrap .item .info-wrap .read-wrap text {
   font-size: 24rpx;
 }

pages_tool/goods/brand.vue

@@ -24,17 +24,7 @@
 </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 {
 			brandList: [],

pages_tool/goods/coupon.vue

@@ -2,9 +2,12 @@
 	<view :style="themeColor">
 		<view class="cf-container color-line-border">
 			<view class="tab">
-				<view @click="changeSort(1)"><text :class="sort == 1 ? 'color-base-text active color-base-border-bottom' : ''">全部</text></view>
+				<view @click="changeSort(1)"><text
-				<view @click="changeSort(2, 'reward')"><text :class="sort == 2 ? 'color-base-text active color-base-border-bottom' : ''">满减券</text></view>
+						:class="sort == 1 ? 'color-base-text active color-base-border-bottom' : ''">全部</text></view>
-				<view @click="changeSort(3, 'discount')"><text :class="sort == 3 ? 'color-base-text active color-base-border-bottom' : ''">折扣券</text></view>
+				<view @click="changeSort(2, 'reward')"><text
+						:class="sort == 2 ? 'color-base-text active color-base-border-bottom' : ''">满减券</text></view>
+				<view @click="changeSort(3, 'discount')"><text
+						:class="sort == 3 ? 'color-base-text active color-base-border-bottom' : ''">折扣券</text></view>
 				<!-- 		<view @click="changeSort(4, 'no_threshold')"><text :class="sort == 4 ? 'color-base-text active color-base-border-bottom' : ''">无门槛券</text></view> -->
 			</view>
 		</view>
@@ -12,31 +15,39 @@
 		<mescroll-uni ref="mescroll" top="100" @getData="getMemberCouponList">
 			<block slot="list">
 				<view class="coupon-listone">
-					<view class="item" v-for="(item, index) in list" :key="index" @click="liClick(item, index)" :style="{ backgroundColor: item.useState == 2 ? '#F2F2F2' : 'var(--main-color-shallow)' }">
+					<view class="item" v-for="(item, index) in list" :key="index" @click="liClick(item, index)"
+						:style="{ backgroundColor: item.useState == 2 ? '#F2F2F2' : 'var(--main-color-shallow)' }">
 						<view class="item-base" :class="{ disabled: item.useState == 2 }">
-							<image class="coupon-line" mode="heightFix" :src="$util.img('public/uniapp/coupon/coupon_line.png')"></image>
+							<image class="coupon-line" mode="heightFix"
+								:src="$util.img('public/uniapp/coupon/coupon_line.png')"></image>
 							<view>
-								<view class="use_price price-font" v-if="item.type == 'reward'" :class="{ disabled: item.useState == 2 }">
+								<view class="use_price price-font" v-if="item.type == 'reward'"
+									:class="{ disabled: item.useState == 2 }">
 									<text>￥</text>
 									{{ parseFloat(item.money) }}
 								</view>
-								<view class="use_price price-font" v-else-if="item.type == 'discount'" :class="{ disabled: item.useState == 2 }">
+								<view class="use_price price-font" v-else-if="item.type == 'discount'"
+									:class="{ disabled: item.useState == 2 }">
 									{{ parseFloat(item.discount) }}
 									<text>折</text>
 								</view>
-								<view class="use_condition font-size-tag" v-if="item.at_least > 0" :class="{ disabled: item.useState == 2 }">满{{ item.at_least }}元可用</view>
+								<view class="use_condition font-size-tag" v-if="item.at_least > 0"
-								<view class="use_condition font-size-tag" v-else :class="{ disabled: item.useState == 2 }">无门槛优惠券</view>
+									:class="{ disabled: item.useState == 2 }">满{{ item.at_least }}元可用</view>
+								<view class="use_condition font-size-tag" v-else
+									:class="{ disabled: item.useState == 2 }">无门槛优惠券</view>
 							</view>
 						</view>
 						<view class="item-info">
 							<view class="use_title">
 								<view class="title">{{ item.coupon_name }}</view>
-								<view class="max_price" v-if="item.goods_type == 2 || item.goods_type == 3" :class="{ disabled: item.useState == 2 }">指定商品</view>
+								<view class="max_price" v-if="item.goods_type == 2 || item.goods_type == 3"
+									:class="{ disabled: item.useState == 2 }">指定商品</view>
 								<view class="max_price" v-else :class="{ disabled: item.useState == 2 }">全场商品</view>
 								<view class="max_price" v-if="item.discount_limit != '0.00'">
 									(最大优惠{{ item.discount_limit }}元)
 								</view>
-								<view class="max_price" :class="{ disabled: item.useState == 2 }">{{ item.use_channel_name }}</view>
+								<view class="max_price" :class="{ disabled: item.useState == 2 }">{{
+									item.use_channel_name }}</view>
 								<!-- 	<view class="max_price  truncate"  v-if="item.use_channel!='online'" :class="{ disabled: item.useState == 2 }">
 									{{ item.use_store==='all'?'适用门店：全部门店': '适用门店：'+item.use_store_name}}
 								</view> -->
@@ -70,17 +81,7 @@
 </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 {
 			list: [],
@@ -460,6 +461,7 @@
 .active {
 	border-bottom: 4rpx solid;
 }
+
 .truncate {
 	overflow: hidden;
 	-o-text-overflow: ellipsis;

pages_tool/goods/evaluate.vue

@@ -74,19 +74,7 @@
 </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 {
 			goodsId: 0,

pages_tool/member/account.vue

@@ -67,18 +67,7 @@
 </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 {
 			dataList: [], //账号列表

pages_tool/member/address.vue

@@ -100,18 +100,8 @@
 import {
 	Weixin
 } from 'common/js/wx-jssdk.js';
-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 {
 			addressList: [],

pages_tool/member/balance_detail.vue

@@ -27,15 +27,18 @@
 				<block v-if="dataList.length > 0">
 					<view class="detailed-wrap">
 						<view class="balances" v-for="(item, index) in dataList" :key="index">
-							<image :src="$util.img('public/uniapp/balance/recharge.png')" class="balances-img" v-if="item.account_data > 0"></image>
+							<image :src="$util.img('public/uniapp/balance/recharge.png')" class="balances-img"
-							<image v-else :src="$util.img('public/uniapp/balance/shopping.png')" mode="widthFix"></image>
+								v-if="item.account_data > 0"></image>
+							<image v-else :src="$util.img('public/uniapp/balance/shopping.png')" mode="widthFix">
+							</image>
 							<view class="balances-info" @click="toFromDetail(item)">
 								<text class="title">{{ item.remark }}</text>
 								<!-- 	<text>{{ item.remark }}</text> -->
 								<text>{{ $util.timeStampTurnTime(item.create_time) }}</text>
 							</view>
 							<view class="balances-num">
-								<text :class="item.account_data > 0 ? 'color-base-text' : ''">{{ item.account_data > 0 ? '+' + item.account_data : item.account_data }}元</text>
+								<text :class="item.account_data > 0 ? 'color-base-text' : ''">{{ item.account_data > 0 ?
+									'+' + item.account_data : item.account_data }}元</text>
 							</view>
 						</view>
 					</view>
@@ -51,17 +54,7 @@
 
 <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() {
 		const currentDate = this.getDate({
 			format: true
@@ -313,6 +306,7 @@ export default {
 	background: #fff;
 	margin-bottom: 20rpx;
 	border-radius: 24rpx;
+
 	image {
 		width: 54rpx;
 		height: 54rpx;

pages_tool/member/collection.vue

@@ -1,19 +1,24 @@
 <template>
 	<view :style="themeColor">
-		<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8" @listenRefresh="listenRefresh" v-if="storeToken">
+		<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8" @listenRefresh="listenRefresh"
+			v-if="storeToken">
 			<view class="goods_list" slot="list">
 				<block v-if="collectionList.length > 0">
-					<view class="goods_li margin-top" v-for="(item, index) in collectionList" :key="index" @click.stop="toDetail(item)">
+					<view class="goods_li margin-top" v-for="(item, index) in collectionList" :key="index"
+						@click.stop="toDetail(item)">
 						<view class="pic">
-							<image :src="$util.img(item.goods_image.split(',')[0], { size: 'mid' })" mode="aspectFill" @error="goodsImageError(index)"></image>
+							<image :src="$util.img(item.goods_image.split(',')[0], { size: 'mid' })" mode="aspectFill"
+								@error="goodsImageError(index)"></image>
 						</view>
 						<view class="goods_info">
 							<view class="goods_name font-size-base">{{ item.sku_name }}</view>
 							<view class="goods_opection">
 								<view class="left  lineheight-clear ">
 									<text class="symbol price-style small">￥</text>
-									<text class="price price-style large">{{ parseFloat(item.discount_price).toFixed(2).split('.')[0] }}</text>
+									<text class="price price-style large">{{
-									<text class="symbol price-style small">.{{ parseFloat(item.discount_price).toFixed(2).split('.')[1] }}</text>
+										parseFloat(item.discount_price).toFixed(2).split('.')[0] }}</text>
+									<text class="symbol price-style small">.{{
+										parseFloat(item.discount_price).toFixed(2).split('.')[1] }}</text>
 								</view>
 								<view class="right">
 									<view class="cars" @click.stop="deleteItem(item.goods_id)">
@@ -36,19 +41,9 @@
 
 <script>
 
-import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif
 import collection from './public/js/collection.js';
 
 export default {
-	components: {
-		MescrollUni,
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},
 	mixins: [collection],
 	data() {
 		return {};

pages_tool/member/coupon.vue

@@ -70,17 +70,8 @@
 </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 {
 				type: '',

pages_tool/member/footprint.vue

@@ -65,18 +65,7 @@
 <script>
 var dateList = [];
 
-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 {
 			goodsList: [],

pages_tool/member/point_detail.vue

@@ -45,17 +45,8 @@
 </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() {
 		const currentDate = this.getDate({
 			format: true

pages_tool/member/withdrawal.vue

@@ -30,17 +30,8 @@
 </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 {
 			dataList: []

pages_tool/notice/list.vue

@@ -28,17 +28,7 @@
 </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 {
 			dataList: []

pages_tool/order/activist.vue

@@ -56,13 +56,8 @@
 
 <script>
 import refundMethod from './public/js/refundMethod.js';
-import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-
 
 export default {
-	components: {
-		MescrollUni
-	},
 	data() {
 		return {
 			refundList: [],

pages_tool/recharge/order_list.vue

@@ -41,12 +41,7 @@
 
 <script>
 
-import MescrollUni from "@/components/mescroll/my-list-mescroll.vue";
-
 export default {
-    components: {
-		MescrollUni 
-	},
 	data() {
 		return {
 			orderList: []

pages_tool/webview/webview.vue

@@ -11,16 +11,7 @@
 </template>
 
 <script>
-// #ifdef MP-WEIXIN
-import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue';
-// #endif
-
 export default {
-	components: {
-		// #ifdef MP-WEIXIN
-		privacyPopup
-		// #endif
-	},
 	data() {
 		return {
 			src: ''

vue.config.js

@@ -1,8 +1,24 @@
+const { zionUniMpLoadPackagePlugin } = require('zion-uniapp-mp-load-package/webpack');
 module.exports = {
   productionSourceMap: false,
   configureWebpack: config => {
     console.log('开始尝试配置极限压缩');
 
+    // 配置zion-uniapp-mp-load-package插件
+    config.plugins.push(new zionUniMpLoadPackagePlugin({
+      optimization: {
+        minimize: true,
+        moduleIds: 'named'
+      },
+      packages: [
+        'pages',
+        'pages_tool',
+        'pages_goods',
+        'pages_order',
+        'pages_promotion'
+      ]
+    }));
+
     // 确保minimizer数组存在
     if (config.optimization && config.optimization.minimizer && Array.isArray(config.optimization.minimizer)) {
       // 查找TerserWebpackPlugin实例，而不是依赖索引
@@ -65,6 +81,8 @@ module.exports = {
           sourceMap: false             // 不生成source map
         };
 
+
+
         console.log('配置极限压缩完成');
       }
     }