chore(分包): 目录结构调整

common/js/goods_detail_base.js

@@ -183,7 +183,7 @@ export default {
 			};
 			if (this.$refs.goodsPromotion) this.$refs.goodsPromotion.refresh(this.goodsSkuDetail.goods_promotion);
 
-			if (this.goodsRoute != '/pages/goods/detail') this.setPublicShare();
+			if (this.goodsRoute != '/pages_goods/detail') this.setPublicShare();
 
 			// this.getBarrageData();
 			if (this.addonIsExist.form) {
@@ -244,7 +244,7 @@ export default {
 		},
 		goCart() {
 			if (this.preview) return; // 开启预览，禁止任何操作和跳转
-			this.$util.redirectTo('/pages/goods/cart');
+			this.$util.redirectTo('/pages_goods/cart');
 		},
 		//-------------------------------------关注-------------------------------------
 		//更新商品信息

common/js/lang.js

@@ -19,9 +19,36 @@ export default {
 			var lang = require('../../lang/' + locale + '/common.js').lang;
 		
 			//当前页面语言包
-			let route = _this.route.split("/");
+			let route = _this.route;
-			newRoute = route.slice(1, route.length);
+			let routeParts = route.split("/");
-			let currentPageLang = require('../../lang/' + locale + '/' + newRoute.join("/") + '.js').lang;
+			
+			// 映射新的页面目录到原来的语言文件目录
+			if (routeParts[0] === 'pages_goods') {
+				routeParts[0] = 'goods';
+			} else if (routeParts[0] === 'pages_order') {
+				routeParts[0] = 'order';
+			} else if (routeParts[0] === 'pages_promotion' && routeParts[1] === 'point') {
+				// 处理积分相关的推广页面，映射到point语言文件目录
+				routeParts = ['point', routeParts[2]];
+			} else if (routeParts[0] === 'pages' && routeParts[1] === 'member') {
+				// 处理主包中的会员中心页面，映射到member目录
+				routeParts = ['member', routeParts[2]];
+			} else if (routeParts[0] === 'pages_tool') {
+				// 处理工具页面目录，根据子目录映射到对应的语言文件目录
+				if (routeParts[1] === 'member') {
+					routeParts = ['member', routeParts[2]];
+				} else if (routeParts[1] === 'order') {
+					routeParts = ['order', routeParts[2]];
+				} else if (routeParts[1] === 'goods') {
+					routeParts = ['goods', routeParts[2]];
+				} else if (routeParts[1] === 'help' || routeParts[1] === 'notice' || routeParts[1] === 'article') {
+					// 处理CMS相关页面
+					routeParts = [routeParts[1], routeParts[2]];
+				}
+			}
+			
+			let langPath = routeParts.join("/");
+			let currentPageLang = require('../../lang/' + locale + '/' + langPath + '.js').lang;
 
 			for (let f in currentPageLang) {
 				lang[f] = currentPageLang[f];
@@ -29,15 +56,20 @@ export default {
 
 			var arr = field.split(".");
 			if (arr.length > 1) {
-				for (let i in arr) {
+				// 处理嵌套属性，如 common.currencySymbol
-					var next = parseInt(i) + 1;
+				let temp = lang;
-					if (next < arr.length) {
+				let found = true;
-						value = lang[arr[i]][arr[next]];
+				for (let key of arr) {
+					if (temp[key] !== undefined) {
+						temp = temp[key];
+					} else {
+						found = false;
+						break;
 					}
 				}
-				
+				value = found ? temp : field;
 			} else {
-				value = lang[field];
+				value = lang[field] !== undefined ? lang[field] : field;
 			}
 			
 		} catch (e) {

components/common-payment/common-payment.vue

@@ -169,12 +169,12 @@
 						<!-- 商品 -->
 						<view class="goods-item" v-for="(goodsItem, goodsIndex) in goodsSpecFormat(calculateGoodsData.goods_list)" :key="goodsIndex">
 							<view class="goods-wrap">
-								<view class="goods-img" @click="$util.redirectTo('/pages/goods/detail', { goods_id: goodsItem.goods_id })">
+								<view class="goods-img" @click="$util.redirectTo('/pages_goods/detail', { goods_id: goodsItem.goods_id })">
 									<image :src="$util.img(goodsItem.sku_image, { size: 'mid' })" @error="imageError(goodsIndex)" mode="aspectFill"/>
 								</view>
 								<view class="goods-info">
 									<view class="top-wrap">
-										<view @click="$util.redirectTo('/pages/goods/detail', { goods_id: goodsItem.goods_id })" class="goods-name">{{ goodsItem.sku_name }}</view>
+										<view @click="$util.redirectTo('/pages_goods/detail', { goods_id: goodsItem.goods_id })" class="goods-name">{{ goodsItem.sku_name }}</view>
 										<view class="sku" v-if="goodsItem.sku_spec_format">
 											<view class="goods-spec">
 												<block v-for="(x, i) in goodsItem.sku_spec_format" :key="i">

components/common-payment/payment.js

@@ -922,7 +922,7 @@ export default {
 		payClose() {
 			// 更新购物车数量
 			this.$store.dispatch('getCartNumber');
-			this.$util.redirectTo('/pages/order/detail', {
+			this.$util.redirectTo('/pages_order/detail', {
 				order_id: this.$refs.choosePaymentPopup.payInfo.order_id
 			}, 'redirectTo');
 		},

components/diy-components/diy-bottom-nav.vue

@@ -4,7 +4,7 @@
 			<view class="tabbar-border"></view>
 			<view class="item" v-for="(item, index) in tabBarList.list" :key="item.id" @click="redirectTo(item.link)">
 				<view class="bd">
-					<block v-if="item.link.wap_url == '/pages/goods/cart'">
+					<block v-if="item.link.wap_url == '/pages_goods/cart'">
 						<view class="icon" v-if="tabBarList.type == 1 || tabBarList.type == 2" :animation="cartAnimation" id="tabbarCart">
 							<block v-if="verify(item.link)">
 								<image v-if="item.selected_icon_type == 'img'" :src="$util.img(item.selectedIconPath)" />
@@ -15,7 +15,7 @@
 								<diy-icon v-if="item.icon_type == 'icon'" :icon="item.iconPath" :value="item.style ? item.style : null"></diy-icon>
 							</block>
 							<view class="cart-count-mark font-size-activity-tag"
-								:class="{ max: item.link.wap_url == '/pages/goods/cart' && cartNumber > 99 }"
+								:class="{ max: item.link.wap_url == '/pages_goods/cart' && cartNumber > 99 }"
 								:style="{ background: 'var(--price-color)' }" v-if="cartNumber > 0">
 								{{ cartNumber > 99 ? '99+' : cartNumber }}
 							</view>

components/diy-components/diy-category-item.vue

@@ -8,7 +8,7 @@
 			<block v-if="value.level == 2">
 				<view class="category-title">{{ category.category_name }}</view>
 				<view class="category-list">
-					<view class="category-item" v-for="(one, oneIndex) in category.child_list" :key="oneIndex" @click="$util.redirectTo('/pages/goods/list', { category_id: one.category_id })">
+					<view class="category-item" v-for="(one, oneIndex) in category.child_list" :key="oneIndex" @click="$util.redirectTo('/pages_goods/list', { category_id: one.category_id })">
 						<view class="img-box">
 							<image :src="$util.img(one.image)" mode="widthFix"/>
 						</view>
@@ -21,7 +21,7 @@
 				<block v-for="(one, oneIndex) in category.child_list" :key="oneIndex">
 					<view class="category-title">{{ one.category_name }}</view>
 					<view class="category-list">
-						<view class="category-item" v-for="(two, twoIndex) in one.child_list" :key="twoIndex" @click="$util.redirectTo('/pages/goods/list', { category_id: two.category_id })">
+						<view class="category-item" v-for="(two, twoIndex) in one.child_list" :key="twoIndex" @click="$util.redirectTo('/pages_goods/list', { category_id: two.category_id })">
 							<view class="img-box">
 								<image :src="$util.img(two.image)" mode="widthFix" :lazy-load="true"/>
 							</view>
@@ -447,7 +447,7 @@
 			 * @param {Object} item
 			 */
 			toDetail(item) {
-				this.$util.redirectTo('/pages/goods/detail', {
+				this.$util.redirectTo('/pages_goods/detail', {
 					goods_id: item.goods_id
 				});
 			},

components/diy-components/diy-category.vue

@@ -5,7 +5,7 @@
 		<!-- <block v-if="value.template == 4">
 			<view class="search-box" v-if="value.search" @click="$util.redirectTo('/pages_tool/goods/search')" :style="navbarInnerStyle">
 				<view class="search-content">
-					<input type="text" class="uni-input font-size-tag" maxlength="50" :placeholder="$lang('search')" confirm-type="search" disabled="true" />
+					<input type="text" class="uni-input font-size-tag" maxlength="50" :placeholder="$lang('search')" confirm-type="search" @click.stop="onClickSearch()" @tap.stop="onClickSearch()" disabled="true" />
 					<text class="iconfont icon-sousuo3"></text>
 				</view>
 			</view>
@@ -13,9 +13,9 @@
 		</block> -->
 		<block v-if="value.template != 4">
 <!-- 			<view :style="navbarInnerStyle">商品分类</view> -->
-			<view class="search-box" v-if="value.search" @click="$util.redirectTo('/pages_tool/goods/search')" :style="wxSearchHeight">
+			<view class="search-box" v-if="value.search" @click="onClickSearch()" @tap.stop="onClickSearch()" :style="wxSearchHeight">
 				<view class="search-content">
-					<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')" confirm-type="search" disabled="true" />
+					<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')" confirm-type="search" @click.stop="onClickSearch()" @tap.stop="onClickSearch()" disabled="true" />
 					<text class="iconfont icon-sousuo3"></text>
 				</view>
 				<view class="iconfont" :class="{ 'icon-apps': !isList, 'icon-list': isList }" @click.stop.prevent="changeListStyle()" ></view>
@@ -23,9 +23,9 @@
 		</block>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->
-		<view class="search-box" v-if="value.search" @click="$util.redirectTo('/pages_tool/goods/search')">
+		<view class="search-box" v-if="value.search" @click="onClickSearch()" @tap.stop="onClickSearch()">
 			<view class="search-content">
-				<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')" confirm-type="search" disabled="true" />
+				<input type="text" class="uni-input" maxlength="50" :placeholder="$lang('search')" confirm-type="search" @click.stop="onClickSearch()" @tap.stop="onClickSearch()" disabled="true" />
 				<text class="iconfont icon-sousuo3"></text>
 			</view>
 			<view class="iconfont" :class="{ 'icon-apps': !isList, 'icon-list': isList }" @click.stop.prevent="changeListStyle()"></view>
@@ -118,7 +118,7 @@
 
 	<!-- 	<view class="cart-box" v-if="(value.template == 2 || value.template == 4) && value.quickBuy && storeToken && categoryTree && categoryTree.length">
 			<view class="left-wrap">
-				<view class="cart-icon" ref="cartIcon" :animation="cartAnimation" @click="$util.redirectTo('/pages/goods/cart')">
+				<view class="cart-icon" ref="cartIcon" :animation="cartAnimation" @click="$util.redirectTo('/pages_goods/cart')">
 					<text class="iconfont icon-ziyuan1"></text>
 					<view class="num" v-if="cartNumber">{{ cartNumber < 99 ? cartNumber : '99+' }}</view>
 				</view>
@@ -446,7 +446,7 @@
 						cart_ids: this.cartIds.toString()
 					},
 					success: () => {
-						this.$util.redirectTo('/pages/order/payment');
+						this.$util.redirectTo('/pages_order/payment');
 						this.isSub = false;
 					}
 				});
@@ -528,6 +528,9 @@
 			changeListStyle() {
 				this.isList = !this.isList;
 			},
+			onClickSearch() {
+				this.$util.redirectTo('/pages_tool/goods/search');
+			}
 		}
 	};
 </script>

components/diy-components/diy-coupon.vue

@@ -436,11 +436,11 @@
 			//去使用
 			toGoodsList(item) {
 				if (item.goods_type != 1) {
-					this.$util.redirectTo('/pages/goods/list', {
+					this.$util.redirectTo('/pages_goods/list', {
 						coupon: item.coupon_type_id
 					});
 				} else {
-					this.$util.redirectTo('/pages/goods/list', {});
+					this.$util.redirectTo('/pages_goods/list', {});
 				}
 			}
 		},

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

@@ -118,7 +118,7 @@ export default {
 	methods: {
 		//页面跳转
 		toDetail(e) {
-			this.$util.redirectTo('/pages/goods/detail', { goods_id: e.goods_id });
+			this.$util.redirectTo('/pages_goods/detail', { goods_id: e.goods_id });
 		},
 		//关注
 		followGoods(e, index) {

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

@@ -110,7 +110,7 @@
 				});
 			},
 			toDetail(item) {
-				this.$util.redirectTo('/pages/goods/list', {
+				this.$util.redirectTo('/pages_goods/list', {
 					brand_id: item.brand_id
 				});
 			},

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

@@ -414,7 +414,7 @@
 				});
 			},
 			toDetail(item) {
-				this.$util.redirectTo('/pages/goods/detail', {
+				this.$util.redirectTo('/pages_goods/detail', {
 					goods_id: item.goods_id
 				});
 			},

components/diy-components/diy-goods-recommend.vue

@@ -198,7 +198,7 @@
 				});
 			},
 			toDetail(item) {
-				this.$util.redirectTo('/pages/goods/detail', {
+				this.$util.redirectTo('/pages_goods/detail', {
 					goods_id: item.goods_id
 				});
 			},

components/diy-components/diy-index-page.vue

@@ -336,7 +336,7 @@
 			},
 
 			toDetail(item) {
-				this.$util.redirectTo('/pages/goods/detail', {
+				this.$util.redirectTo('/pages_goods/detail', {
 					goods_id: item.goods_id
 				});
 			},
@@ -375,7 +375,7 @@
 				});
 			},
 			toCateGoodsList(e, f) {
-				this.$util.redirectTo('/pages/goods/list', {
+				this.$util.redirectTo('/pages_goods/list', {
 					category_id: e,
 					category_level: f
 				});

components/diy-components/diy-member-my-order.vue

@@ -2,7 +2,7 @@
 	<view data-component-name="diy-member-my-order" class="common-wrap" :style="warpCss">
 		<view class="order-wrap">
 			<view class="status-wrap">
-				<view class="item-wrap" @click="redirect('/pages/order/list?status=waitpay')" style="margin-right: 10rpx;">
+				<view class="item-wrap" @click="redirect('/pages_order/list?status=waitpay')" style="margin-right: 10rpx;">
 					<view class="icon-block">
 						<template v-if="value.style == 3">
 							<image :src="$util.img('public/uniapp/member/order/wait_pay.png')" mode="widthFix"/>
@@ -15,7 +15,7 @@
 					</view>
 					<view class="title">{{ $lang('waitpay') }}</view>
 				</view>
-				<view class="item-wrap" @click="redirect('/pages/order/list?status=waitsend')" style="margin-right: 10rpx;">
+				<view class="item-wrap" @click="redirect('/pages_order/list?status=waitsend')" style="margin-right: 10rpx;">
 					<view class="icon-block">
 						<template v-if="value.style == 3">
 							<image :src="$util.img('public/uniapp/member/order/wait_send.png')" mode="widthFix"></image>
@@ -28,7 +28,7 @@
 					</view>
 					<view class="title">{{ $lang('waitsend') }}</view>
 				</view>
-				<view class="item-wrap" @click="redirect('/pages/order/list?status=waitconfirm')" style="margin-right: 10rpx;">
+				<view class="item-wrap" @click="redirect('/pages_order/list?status=waitconfirm')" style="margin-right: 10rpx;">
 					<view class="icon-block">
 						<template v-if="value.style == 3">
 							<image :src="$util.img('public/uniapp/member/order/wait_confirm.png')" mode="widthFix"/>
@@ -41,7 +41,7 @@
 					</view>
 					<view class="title">{{ $lang('waitconfirm') }}</view>
 				</view>
-				<view class="item-wrap" @click="redirect('/pages/order/list?status=waitrate')" style="margin-right: 10rpx;">
+				<view class="item-wrap" @click="redirect('/pages_order/list?status=waitrate')" style="margin-right: 10rpx;">
 					<view class="icon-block">
 						<template v-if="value.style == 3">
 							<image :src="$util.img('public/uniapp/member/order/wait_use.png')" mode="widthFix"/>

components/hover-nav/hover-nav.vue

@@ -72,7 +72,7 @@ export default {
 		uni.getStorage({
 			key: 'shopInfo',
 			success: (e) => {
-				// console.log(`获取到的shopInfo:${JSON.stringify(e.data)}`)
+				console.log(`获取到的shopInfo:${JSON.stringify(e.data)}`)
 				this.shopInfo = e.data;
 
 				// 从店铺信息中获取手机号

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

@@ -2,7 +2,7 @@
 	<!-- 当前商品参与的营销活动入口 -->
 	<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 })">
+			<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>

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

@@ -87,7 +87,7 @@
 				let data = {
 					goods_id: e.goods_id
 				};
-				this.$util.redirectTo('/pages/goods/detail', data);
+				this.$util.redirectTo('/pages_goods/detail', data);
 			},
 			getLikeList(size) {
 				let that = this;

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

@@ -34,7 +34,7 @@
 					return;
 				}
 				if (config == "detail" || data.is_virtual) {
-					this.$util.redirectTo('/pages/goods/detail', {
+					this.$util.redirectTo('/pages_goods/detail', {
 						goods_id: data.goods_id
 					});
 					return false;

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

@@ -1109,7 +1109,7 @@
 							key: 'orderCreateData',
 							data: data,
 							success: () => {
-								this.$util.redirectTo('/pages/order/payment');
+								this.$util.redirectTo('/pages_order/payment');
 								this.btnSwitch = false;
 							}
 						});

pages.json

@@ -1,5 +1,6 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+	"pages": [ 
+		// pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -7,7 +8,6 @@
 				"enablePullDownRefresh": true
 			}
 		},
-		
 		{
 			"path": "pages/contact/contact",
 			"style": {
@@ -15,15 +15,6 @@
 			}
 		},
 		//******************商品模块（11）******************
-		{
-			"path": "pages/goods/cart",
-			"style": {
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom",
-				// #endif
-				"navigationBarTitleText": "购物车"
-			}
-		},
 		{
 			"path": "pages/goods/category",
 			"style": {
@@ -32,93 +23,110 @@
 				"enablePullDownRefresh": true
 			}
 		},
-
-		// 商品详情
-		{
-			"path": "pages/goods/detail",
-			"style": {
-				"navigationBarTitleText": "商品详情"
-			}
-		},
-		{
-			"path": "pages/goods/list",
-			"style": {
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom",
-				// #endif
-				"navigationBarTitleText": "商品列表"
-			}
-		},
-
 		//******************会员模块（20）******************
 		{
 			"path": "pages/member/index",
 			"style": {
 				"enablePullDownRefresh": true
 			}
-		},
-		//******************订单模块（12）******************
-		{
-			"path": "pages/order/payment",
-			"style": {
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/order/list",
-			"style": {
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom"
-				// #endif
-			}
-		},
-		{
-			"path": "pages/order/detail",
-			"style": {
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom"
-				// #endif
-			}
-		},
-		{
-			"path": "pages/order/detail_local_delivery",
-			"style": {
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom"
-				// #endif
-			}
-		},
-		{
-			"path": "pages/order/detail_pickup",
-			"style": {
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom"
-				// #endif
-			}
-		},
-		//积分订单详情
-		{
-			"path": "pages/order/detail_point",
-			"style": {
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom"
-				// #endif
-			}
 		}
 	],
-	"subPackages": [{
+	"subPackages": [
-
+		{
+			//******************商品模块分包******************
+			"root": "pages_goods",
+			"pages": [
+				{
+					"path": "cart",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "购物车"
+					}
+				},
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "商品详情"
+					}
+				},
+				{
+					"path": "list",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom",
+						// #endif
+						"navigationBarTitleText": "商品列表"
+					}
+				}
+			]
+		},
+		{
+			//******************订单模块分包******************
+			"root": "pages_order",
+			"pages": [
+				{
+					"path": "payment",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "list",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "detail",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "detail_local_delivery",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				{
+					"path": "detail_pickup",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				},
+				//积分订单详情
+				{
+					"path": "detail_point",
+					"style": {
+						// #ifdef APP-PLUS
+						"navigationStyle": "custom"
+						// #endif
+					}
+				}
+			]
+		},
+		{
 			//******************营销活动模块（26）******************
 			"root": "pages_promotion",
 			"pages": [
-			
 				//----------积分模块（2）----------
 				{
 					"path": "point/list",
 					"style": {
 						"navigationStyle": "custom"
 					}
-				}, {
+				},
+				{
 					"path": "point/goods_list",
 					"style": {
 						// #ifdef APP-PLUS
@@ -156,7 +164,6 @@
 						// #endif
 					}
 				},
-				
 				//****************** 商户 ******************
 				{
 					"path": "merch/merchcategory",
@@ -337,7 +344,7 @@
 					"path": "index/diy",
 					"style": {
 						// #ifdef  MP-WEIXIN
-						 // "navigationStyle": "custom",
+						// "navigationStyle": "custom",
 						// #endif
 						"enablePullDownRefresh": true
 					}
@@ -581,7 +588,6 @@
 						// #endif
 					}
 				},
-
 				//******************商品模块******************
 				{
 					"path": "goods/coupon",
@@ -631,8 +637,6 @@
 						// #endif
 					}
 				},
-
-
 				//******************CMS模块（6）******************
 				{
 					"path": "help/list",
@@ -918,7 +922,8 @@
 		"selectedColor": "#FF0036",
 		"backgroundColor": "#fff",
 		"borderStyle": "white",
-		"list": [{
+		"list": [
+			{
 				"pagePath": "pages/index/index",
 				"text": ""
 			},
@@ -942,7 +947,9 @@
 	"preloadRule": {
 		"pages/index/index": {
 			"network": "all",
-			"packages": ["pages_tool"]
+			"packages": [
+				"pages_tool"
+			]
 		}
 	}
 }

pages_goods/detail.vue

@@ -140,7 +140,7 @@
 					<view class="card-content" :style="{ height: [cardOff ? 'auto' : '198rpx'] }">
 						<view class="card-item"
 							v-for="(item, index) in goodsSkuDetail.card_info.relation_goods"
-							@click="$util.redirectTo('/pages/goods/detail', { goods_id: item.goods_id })"
+							@click="$util.redirectTo('/pages_goods/detail', { goods_id: item.goods_id })"
 						>
 							<image :src="$util.img(item.sku_image)" mode="aspectFill"/>
 							<view class="content">

pages_goods/public/js/cart.js

@@ -367,7 +367,7 @@ export default {
 						cart_ids: cart_ids.toString()
 					},
 					success: () => {
-						this.$util.redirectTo('/pages/order/payment');
+						this.$util.redirectTo('/pages_order/payment');
 						this.isSub = false;
 					}
 				});
@@ -413,7 +413,7 @@ export default {
 			this.$forceUpdate();
 		},
 		toGoodsDetail(item) {
-			this.$util.redirectTo('/pages/goods/detail', {
+			this.$util.redirectTo('/pages_goods/detail', {
 				sku_id: item.sku_id
 			});
 		},

pages_goods/public/js/detail.js

@@ -1,7 +1,7 @@
 export default {
 	data() {
 		return {
-			goodsRoute: '/pages/goods/detail',
+			goodsRoute: '/pages_goods/detail',
 			couponList: [], //优惠券列表
 			couponBtnSwitch: false, //获取优惠券防止重复提交
 			

pages_goods/public/js/list.js

@@ -305,7 +305,7 @@ export default {
 		},
 		//商品详情
 		toDetail(item) {
-			this.$util.redirectTo('/pages/goods/detail', {
+			this.$util.redirectTo('/pages_goods/detail', {
 				goods_id: item.goods_id
 			});
 		},

pages_order/detail.vue

@@ -654,13 +654,13 @@
 				this.getOrderData();
 			} else {
 				this.$util.redirectTo('/pages_tool/login/login', {
-					back: '/pages/order/detail?order_id=' + this.orderId + '&merchant_trade_no=' + this.merchantTradeNo
+					back: '/pages_order/detail?order_id=' + this.orderId + '&merchant_trade_no=' + this.merchantTradeNo
 				});
 			}
 		},
 		methods: {
 			goDetail(e) {
-				this.$util.redirectTo('/pages/goods/detail', {
+				this.$util.redirectTo('/pages_goods/detail', {
 					goods_id: e.goods_id
 				});
 			},
@@ -721,7 +721,7 @@
 								title: '未获取到订单信息！'
 							});
 							setTimeout(() => {
-								this.$util.redirectTo('/pages/order/list');
+								this.$util.redirectTo('/pages_order/list');
 							}, 1500);
 						}
 					},

pages_order/detail_local_delivery.vue

@@ -12,7 +12,7 @@ export default {
 	},
 	onLoad(option) {
 		if (option.order_id) {
-			this.$util.redirectTo('/pages/order/detail', {order_id: option.order_id}, 'redirectTo');
+			this.$util.redirectTo('/pages_order/detail', {order_id: option.order_id}, 'redirectTo');
 		}
 	}
 };

pages_order/detail_pickup.vue

@@ -12,7 +12,7 @@ export default {
 	},
 	onLoad(option) {
 		if (option.order_id) {
-			this.$util.redirectTo('/pages/order/detail', {order_id: option.order_id}, 'redirectTo');
+			this.$util.redirectTo('/pages_order/detail', {order_id: option.order_id}, 'redirectTo');
 		}
 	}
 };

pages_order/detail_point.vue

@@ -164,7 +164,7 @@
 				this.getOrderData();
 			} else {
 				this.$util.redirectTo('/pages_tool/login/login', {
-					back: '/pages/order/detail_point?order_id=' + this.orderId
+					back: '/pages_order/detail_point?order_id=' + this.orderId
 				});
 			}
 		},
@@ -205,7 +205,7 @@
 								title: '未获取到订单信息！'
 							});
 							setTimeout(() => {
-								this.$util.redirectTo('/pages/order/list');
+								this.$util.redirectTo('/pages_order/list');
 							}, 1500);
 						}
 					},

pages_order/list.vue

@@ -3,8 +3,8 @@
 	<view class="order-container">
 		<view class="cate-search">
 			<view class="search-box">
-				<input class="uni-input" maxlength="50" v-model="searchText" confirm-type="search" placeholder="请输入商品名称/订单编号" @confirm="search()" />
+				<input class="uni-input" maxlength="50" v-model="searchText" confirm-type="search" placeholder="请输入商品名称/订单编号" @confirm="search()" @click.stop="search()" @tap.stop="search()" />
-				<text class="iconfont icon-sousuo3" @click="search()"></text>
+				<text class="iconfont icon-sousuo3" @click.stop="search()" @tap.stop="search()"></text>
 			</view>
 		</view>
 		<view class="order-nav" v-if="storeToken">
@@ -192,7 +192,7 @@
 				if (this.$refs.mescroll) this.$refs.mescroll.refresh();
 			} else {
 				this.$nextTick(() => {
-					this.$refs.login.open('/pages/order/list?status=' + this.orderStatus);
+					this.$refs.login.open('/pages_order/list?status=' + this.orderStatus);
 				})
 			}
 		},
@@ -345,13 +345,13 @@
 				switch (parseInt(data.order_type)) {
 					case 2:
 						// 自提订单
-						this.$util.redirectTo('/pages/order/detail_pickup', {
+						this.$util.redirectTo('/pages_order/detail_pickup', {
 							order_id: data.order_id
 						});
 						break;
 					case 3:
 						// 本地配送订单
-						this.$util.redirectTo('/pages/order/detail_local_delivery', {
+						this.$util.redirectTo('/pages_order/detail_local_delivery', {
 							order_id: data.order_id
 						});
 						break;
@@ -362,7 +362,7 @@
 						});
 						break;
 					default:
-						this.$util.redirectTo('/pages/order/detail', {
+						this.$util.redirectTo('/pages_order/detail', {
 							order_id: data.order_id
 						});
 						break;

pages_promotion/fenxiao/apply.vue

@@ -253,7 +253,7 @@
 			},
 			//商品详情
 			toDetail(item) {
-				this.$util.redirectTo('/pages/goods/detail', {
+				this.$util.redirectTo('/pages_goods/detail', {
 					goods_id: item.goods_id
 				});
 			},

pages_promotion/fenxiao/public/js/goods_list.js

@@ -86,7 +86,7 @@ export default {
 		},
 		//商品详情
 		navToDetailPage(item) {
-			this.$util.redirectTo('/pages/goods/detail', {
+			this.$util.redirectTo('/pages_goods/detail', {
 				goods_id: item.goods_id
 			});
 		},
@@ -165,7 +165,7 @@ export default {
 			let data = {};
 			if (this.shareType == "goods") {
 				url = "/api/goods/poster";
-				data.page = "/pages/goods/detail";
+				data.page = "/pages_goods/detail";
 				data.qrcode_param = JSON.stringify({
 					goods_id: this.goodsList[this.currIndex].goods_id,
 					source_member: this.memberInfo.member_id
@@ -229,7 +229,7 @@ export default {
 			this.$refs.sharePopup.close();
 		},
 		copyUrl() {
-			let text = this.$config.h5Domain + '/pages/goods/detail?goods_id=' + this.goodsList[this.currIndex].goods_id + '&source_member=' + this.memberInfo.member_id;
+			let text = this.$config.h5Domain + '/pages_goods/detail?goods_id=' + this.goodsList[this.currIndex].goods_id + '&source_member=' + this.memberInfo.member_id;
 			this.$util.copy(text, () => {
 				this.closeSharePopup();
 			});
@@ -247,7 +247,7 @@ export default {
 		var path = this.shareUrl;
 
 		if (this.shareType == "goods") {
-			path = `/pages/goods/detail?goods_id=${this.goodsList[this.currIndex].goods_id}&sku_id=${this.goodsList[this.currIndex].sku_id}&source_member=${this.memberInfo.member_id}`;
+			path = `/pages_goods/detail?goods_id=${this.goodsList[this.currIndex].goods_id}&sku_id=${this.goodsList[this.currIndex].sku_id}&source_member=${this.memberInfo.member_id}`;
 		}
 
 		return {

pages_promotion/merch/public/edit.js

@@ -173,12 +173,12 @@ export default {
 							title: '商品不存在',
 						});
 						setTimeout(() => {
-							this.$util.redirectTo('/pages/goods/list', {}, 'redirectTo');
+							this.$util.redirectTo('/pages_goods/list', {}, 'redirectTo');
 						}, 1000);
 					}
 					// if (res.status == 0) {
 					// 	setTimeout(() => {
-					// 		this.$util.redirectTo('/pages/goods/list', {}, 'redirectTo');
+					// 		this.$util.redirectTo('/pages_goods/list', {}, 'redirectTo');
 					// 	}, 1000);
 					// }
 				}
@@ -271,7 +271,7 @@ export default {
 					title: '商品不存在',
 				});
 				setTimeout(() => {
-					this.$util.redirectTo('/pages/goods/list', {}, 'redirectTo');
+					this.$util.redirectTo('/pages_goods/list', {}, 'redirectTo');
 				}, 1000);
 			}*/
 		},
@@ -728,7 +728,7 @@ export default {
 					});
 					if (res.status == 1) {
 						setTimeout(() => {
-							this.$util.redirectTo('/pages/goods/list', {}, 'redirectTo');
+							this.$util.redirectTo('/pages_goods/list', {}, 'redirectTo');
 						}, 1000);
 					} else {
 						this.repeatFlag = false;
@@ -824,7 +824,7 @@ export default {
 				if (res.code == 0) {
 					this.clearStoreage();
 					setTimeout(() => {
-						this.$util.redirectTo('/pages/goods/list', {}, 'tabbar');
+						this.$util.redirectTo('/pages_goods/list', {}, 'tabbar');
 					}, 1000);
 				} else {
 					this.repeatFlag = false;

pages_promotion/merch/public/js/list.js

@@ -313,7 +313,7 @@ export default {
 		},
 		//商品详情
 		toDetail(item) {
-			this.$util.redirectTo('/pages/goods/detail', {
+			this.$util.redirectTo('/pages_goods/detail', {
 				goods_id: item.goods_id
 			});
 		},

pages_promotion/point/goods_list.vue

@@ -4,9 +4,9 @@
 		<view class="head-wrap">
 			<!-- 搜索区域 -->
 			<view class="search-wrap uni-flex uni-row">
-				<view class="flex-item input-wrap">
+				<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()" placeholder="请输入商品关键词" />
+					<input class="uni-input" maxlength="50" v-model="keyword" confirm-type="search" @confirm="search()" @click.stop="search()" @tap.stop="search()" placeholder="请输入商品关键词" />
-					<text class="iconfont icon-sousuo3" @click.stop="search()"></text>
+					<text class="iconfont icon-sousuo3" @click.stop="search()" @tap.stop="search()"></text>
 				</view>
 			</view>
 

pages_promotion/point/order_list.vue

@@ -206,17 +206,17 @@
 				if (item.type == 1 && item.relate_order_id) {
 					switch (item.delivery_type) {
 						case 'store':
-							this.$util.redirectTo('/pages/order/detail_pickup', {
+							this.$util.redirectTo('/pages_order/detail_pickup', {
 								order_id: item.relate_order_id
 							});
 							break;
 						case 'local':
-							this.$util.redirectTo('/pages/order/detail_local_delivery', {
+							this.$util.redirectTo('/pages_order/detail_local_delivery', {
 								order_id: item.relate_order_id
 							});
 							break;
 						case 'express':
-							this.$util.redirectTo('/pages/order/detail', {
+							this.$util.redirectTo('/pages_order/detail', {
 								order_id: item.relate_order_id
 							});
 							break;
@@ -226,7 +226,7 @@
 							});
 					}
 				} else {
-					this.$util.redirectTo('/pages/order/detail_point', {
+					this.$util.redirectTo('/pages_order/detail_point', {
 						order_id: item.order_id
 					});
 				}

pages_promotion/point/public/js/payment.js

@@ -472,7 +472,7 @@ export default {
 			this.timeInfo.week = weeks[week];
 		},
 		navigateTo(sku_id) {
-			this.$util.redirectTo('/pages/goods/detail', {
+			this.$util.redirectTo('/pages_goods/detail', {
 				sku_id
 			});
 		},

pages_tool/components/ns-chat/ns-chat-receiveGoods.vue

@@ -56,7 +56,7 @@
 				});
 			},
 			go_shop() {
-				this.$util.redirectTo('/pages/goods/detail?goods_id=' + this.goodsInfo.goods_id);
+				this.$util.redirectTo('/pages_goods/detail?goods_id=' + this.goodsInfo.goods_id);
 			}
 		}
 	};

pages_tool/goods/brand.vue

@@ -45,7 +45,7 @@
 		onShow() {},
 		methods: {
 			change(e) {
-				this.$util.redirectTo('/pages/goods/list', {
+				this.$util.redirectTo('/pages_goods/list', {
 					brand_id: this.brandList[e.detail.index].brand_id
 				});
 			},

pages_tool/goods/coupon.vue

@@ -240,11 +240,11 @@
 			},
 			toGoodsList(item) {
 				if (item.goods_type != 1) {
-					this.$util.redirectTo('/pages/goods/list', {
+					this.$util.redirectTo('/pages_goods/list', {
 						coupon: item.coupon_type_id
 					});
 				} else {
-					this.$util.redirectTo('/pages/goods/list', {});
+					this.$util.redirectTo('/pages_goods/list', {});
 				}
 			}
 		}

pages_tool/goods/search.vue

@@ -3,8 +3,8 @@
 	<view>
 		<view class="content">
 			<view class="cate-search">
-				<view class="search-box">
+				<view class="search-box" @click="search()" @tap.stop="search()">
-					<input class="uni-input" maxlength="50" v-model="inputValue" confirm-type="search" @focus="inputFocus" focus @confirm="search()" :placeholder="searchWords ? searchWords : ''" />
+					<input class="uni-input" maxlength="50" v-model="inputValue" confirm-type="search" @focus="inputFocus" focus @confirm="search()" @click="search()" @tap="search()" :placeholder="searchWords ? searchWords : ''" />
 					<text class="iconfont icon-sousuo3" @click="search()"></text>
 				</view>
 			</view>
@@ -153,7 +153,7 @@
 					}
 					uni.setStorageSync('search', array);
 
-					this.$util.redirectTo('/pages/goods/list', {
+					this.$util.redirectTo('/pages_goods/list', {
 						keyword: this.inputValue.trim()
 					});
 				} else {
@@ -162,7 +162,7 @@
 							title: '搜索内容不能为空哦'
 						});
 					} else {
-						this.$util.redirectTo('/pages/goods/list', {
+						this.$util.redirectTo('/pages_goods/list', {
 							//keyword: this.searchWords
 						});
 					}

pages_tool/member/balance_detail.vue

@@ -189,11 +189,11 @@
 			},
 			toFromDetail(item) {
 				if (item.from_type == 'order' && !isNaN(parseInt(item.type_tag))) {
-					this.$util.redirectTo('/pages/order/detail', {
+					this.$util.redirectTo('/pages_order/detail', {
 						order_id: item.type_tag
 					});
 				} else if (item.from_type == 'refund' && parseInt(item.type_tag) != 0) {
-					this.$util.redirectTo('/pages/order/detail', {
+					this.$util.redirectTo('/pages_order/detail', {
 						order_id: item.type_tag
 					});
 				}

pages_tool/member/coupon.vue

@@ -169,7 +169,7 @@
 			},
 			toGoodsList(item) {
 				if (item.state == 1) {
-					this.$util.redirectTo('/pages/goods/list', {
+					this.$util.redirectTo('/pages_goods/list', {
 						coupon: item.coupon_type_id
 					});
 				}

pages_tool/member/footprint.vue

@@ -229,7 +229,7 @@ export default {
 			dateList = [];
 		},
 		toDetail(e) {
-			this.$util.redirectTo('/pages/goods/detail', {
+			this.$util.redirectTo('/pages_goods/detail', {
 				goods_id: e.goods_id
 			});
 		}

pages_tool/member/point_detail.vue

@@ -150,22 +150,22 @@ export default {
 							if (data.type == 1 && data.relate_order_id) {
 								switch (data.delivery_type) {
 									case 'store':
-										this.$util.redirectTo('/pages/order/detail_pickup', {
+										this.$util.redirectTo('/pages_order/detail_pickup', {
 											order_id: data.relate_order_id
 										});
 										break;
 									case 'local':
-										this.$util.redirectTo('/pages/order/detail_local_delivery', {
+										this.$util.redirectTo('/pages_order/detail_local_delivery', {
 											order_id: data.relate_order_id
 										});
 										break;
 									default:
-										this.$util.redirectTo('/pages/order/detail', {
+										this.$util.redirectTo('/pages_order/detail', {
 											order_id: data.relate_order_id
 										});
 								}
 							} else {
-								this.$util.redirectTo('/pages/order/detail_point', {
+								this.$util.redirectTo('/pages_order/detail_point', {
 									order_id: data.order_id
 								});
 							}
@@ -173,19 +173,19 @@ export default {
 					}
 				});
 			} else if (item.from_type == 'pointcash') {
-				this.$util.redirectTo('/pages/order/detail', {
+				this.$util.redirectTo('/pages_order/detail', {
 					order_id: item.type_tag
 				});
 			} else if (item.from_type == 'memberconsume') {
-				// this.$util.redirectTo('/pages/order/detail', {
+				// this.$util.redirectTo('/pages_order/detail', {
 				// 	order_id: item.type_tag
 				// });
 			} else if (item.from_type == 'pointexchangerefund' && parseInt(item.type_tag) != 0) {
-				this.$util.redirectTo('/pages/order/detail_point', {
+				this.$util.redirectTo('/pages_order/detail_point', {
 					order_id: item.type_tag
 				});
 			} else if (item.from_type == 'refund' && parseInt(item.type_tag) != 0) {
-				this.$util.redirectTo('/pages/order/detail', {
+				this.$util.redirectTo('/pages_order/detail', {
 					order_id: item.type_tag
 				});
 			}

pages_tool/member/public/js/collection.js

@@ -8,7 +8,7 @@ export default {
 	methods: {
 		//跳转至详情页
 		toDetail(e) {
-			this.$util.redirectTo("/pages/goods/detail", {
+			this.$util.redirectTo("/pages_goods/detail", {
 				goods_id: e.goods_id
 			});
 		},

pages_tool/order/detail_virtual.vue

@@ -13,7 +13,7 @@ export default {
 	},
 	onLoad(option) {
 		if (option.order_id) {
-			this.$util.redirectTo('/pages/order/detail', {order_id: option.order_id}, 'redirectTo');
+			this.$util.redirectTo('/pages_order/detail', {order_id: option.order_id}, 'redirectTo');
 		}
 	}
 };

pages_tool/order/logistics.vue

@@ -128,7 +128,7 @@ export default {
 							title: '未获取到订单信息！'
 						});
 						setTimeout(() => {
-							this.$util.redirectTo('/pages/order/list');
+							this.$util.redirectTo('/pages_order/list');
 						}, 1500);
 					}
 				},
@@ -138,7 +138,7 @@ export default {
 			});
 		},
 		toGoodsDetail(e) {
-			this.$util.redirectTo('/pages/goods/detail', { sku_id: e });
+			this.$util.redirectTo('/pages_goods/detail', { sku_id: e });
 		},
 		imageError(packageIndex, goodsIndex) {
 			this.packageList[packageIndex].goods_list[goodsIndex].sku_image = this.$util.getDefaultImage().goods;

pages_tool/order/public/js/evaluate.js

@@ -23,7 +23,7 @@ export default {
 	},
 	onLoad(options) {
 		//接收订单号，订单是否是追评等信息
-		options.order_id ? (this.orderId = options.order_id) : this.$util.redirectTo('/pages/order/list');
+		options.order_id ? (this.orderId = options.order_id) : this.$util.redirectTo('/pages_order/list');
 
 		this.isIphoneX = this.$util.uniappIsIPhoneX();
 		if (!this.storeToken) {
@@ -90,7 +90,7 @@ export default {
 							title: "未获取到订单数据"
 						})
 						setTimeout(() => {
-							this.$util.redirectTo('/pages/order/list', {}, "redirectTo");
+							this.$util.redirectTo('/pages_order/list', {}, "redirectTo");
 						}, 1000)
 					}
 					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
@@ -200,7 +200,7 @@ export default {
 							title: "评价成功"
 						});
 						setTimeout(() => {
-							this.$util.redirectTo('/pages/order/list', {}, "redirectTo");
+							this.$util.redirectTo('/pages_order/list', {}, "redirectTo");
 						}, 1000);
 					} else {
 						this.$util.showToast({

pages_tool/order/refund.vue

@@ -179,7 +179,7 @@ export default {
 					} else {
 						this.$util.showToast({ title: '未获取到该订单项退款信息' });
 						setTimeout(() => {
-							this.$util.redirectTo('/pages/order/list');
+							this.$util.redirectTo('/pages_order/list');
 						}, 1000);
 					}
 				},

pages_tool/order/refund_batch.vue

@@ -171,7 +171,7 @@ export default {
 					} else {
 						this.$util.showToast({ title: '未获取到该订单项退款信息' });
 						setTimeout(() => {
-							this.$util.redirectTo('/pages/order/list');
+							this.$util.redirectTo('/pages_order/list');
 						}, 1000);
 					}
 				},

pages_tool/order/refund_detail.vue

@@ -197,7 +197,7 @@ export default {
 					} else {
 						this.$util.showToast({ title: '未获取到该订单项退款信息' });
 						setTimeout(() => {
-							this.$util.redirectTo('/pages/order/list');
+							this.$util.redirectTo('/pages_order/list');
 						}, 1000);
 					}
 				},
@@ -213,7 +213,7 @@ export default {
 						if (res.code >= 0) {
 							this.$util.showToast({ title: '撤销成功' });
 							setTimeout(() => {
-								this.$util.redirectTo('/pages/order/list');
+								this.$util.redirectTo('/pages_order/list');
 							}, 1000);
 						}
 					});
@@ -264,7 +264,7 @@ export default {
 			this.$forceUpdate();
 		},
 		refundDetail(e) {
-			this.$util.redirectTo('/pages/goods/detail', {
+			this.$util.redirectTo('/pages_goods/detail', {
 				goods_id: e.goods_id
 			});
 		}

pages_tool/order/refund_goods_select.vue

@@ -55,7 +55,7 @@
 					icon:'none'
 				})
 				setTimeout(()=>{
-					this.$util.redirectTo('/pages/order/list');
+					this.$util.redirectTo('/pages_order/list');
 				},1000)
 			}
 		},

pages_tool/order/refund_type_select.vue

@@ -83,7 +83,7 @@
 								title: '未获取到该订单项退款信息'
 							});
 							setTimeout(() => {
-								this.$util.redirectTo('/pages/order/list');
+								this.$util.redirectTo('/pages_order/list');
 							}, 1000);
 						}
 					},

pages_tool/pay/result.vue

@@ -148,11 +148,11 @@
 			},
 			toOrderDetail(id) {
 				if (this.payInfo.order_type == 2) {
-					this.$util.redirectTo('/pages/order/detail_pickup', {
+					this.$util.redirectTo('/pages_order/detail_pickup', {
 						order_id: id
 					}, 'redirectTo');
 				} else if (this.payInfo.order_type == 3) {
-					this.$util.redirectTo('/pages/order/detail_local_delivery', {
+					this.$util.redirectTo('/pages_order/detail_local_delivery', {
 						order_id: id
 					}, 'redirectTo');
 				} else if (this.payInfo.order_type == 4) {
@@ -160,7 +160,7 @@
 						order_id: id
 					}, 'redirectTo');
 				} else {
-					this.$util.redirectTo('/pages/order/detail', {
+					this.$util.redirectTo('/pages_order/detail', {
 						order_id: id
 					}, 'redirectTo');
 				}

store/index.js

@@ -80,7 +80,7 @@ const store = new Vuex.Store({
 		},
 		copyright: null,
 		initStatus:false,
-		offlineWhiteList:['pages/order/payment','pages/order/list','pages/order/detail'],//线下支付白名单
+		offlineWhiteList:['pages_order/payment','pages_order/list','pages_order/detail'],//线下支付白名单
 		canReceiveRegistergiftInfo: {
 			status: false,
 			path: ''