Merge branch 'subPackages' into 'dev'

Sub packages

See merge request quanshu/mp-ui-user!13

components/pay-popup/pay-popup.vue

@@ -73,19 +73,13 @@
 
 			toCoupon() {
 				uni.navigateTo({
-					url: `/pages/coupon/index?couponId=${ this.payInfo.couponId }&boxId=${ this.payInfo.boxId }&ticketId=${ this.payInfo.ticketId }`
-				})
-			},
-
-			toNotice() {
-				uni.navigateTo({
-					url: '/pages/about/notice'
+					url: `/packageGoods/coupon/index?couponId=${ this.payInfo.couponId }&boxId=${ this.payInfo.boxId }&ticketId=${ this.payInfo.ticketId }`
 				})
 			},
 
 			toRule() {
 				uni.navigateTo({
-					url: '/pages/about/rule'
+					url: '/packageOther/rule/index'
 				})
 			},
 

components/vear-carousel/vear-carousel.vue

@@ -1,93 +0,0 @@
-<template>
-	<swiper class="image-container" previous-margin="140rpx" next-margin="140rpx" circular :autoplay="false" @change="swiperChange">
-		<swiper-item :class="currentIndex == index ? 'swiper-item' : 'swiper-item-side'" v-for="(item, index) in imgList" :key="item[urlKey]">
-			<image @click="clickImg(item)" :class="currentIndex == index ? 'item-img' : 'item-img-side'" :src="item[urlKey]" lazy-load :style="dontFirstAnimation ? 'animation: none;' : ''" mode="aspectFill"></image>
-		</swiper-item>
-	</swiper>
-</template>
-<script>
-	export default {
-		props: {
-			imgList: {
-				type: Array,
-				default() {
-					return []
-				}
-			},
-			urlKey: {
-				type: String,
-				default() {
-					return ''
-				}
-			},
-		},
-		data() {
-			return {
-				currentIndex: 0,
-				dontFirstAnimation: true
-			}
-		},
-		methods: {
-			swiperChange(e) {
-				this.dontFirstAnimation = false
-				this.currentIndex = e.detail.current
-				this.$emit('changeTicket', this.currentIndex)
-			},
-			clickImg(item) {
-				this.$emit('selected', item, this.currentIndex)
-			}
-		}
-	}
-</script>
-<style scoped>
-	.image-container {
-		width: 750rpx;
-		height: 580rpx;
-	}
-
-	.item-img {
-		width: 360rpx;
-		height: 580rpx;
-		animation: to-big .3s;
-	}
-
-	.swiper-item {
-		width: 360rpx;
-		height: 580rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-	
-	.item-img-side {
-		width: 360rpx;
-		height: 550rpx;
-		animation: to-mini .3s;
-	}
-
-	.swiper-item-side {
-		width: 360rpx;
-		height: 550rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-	@keyframes to-mini
-	{
-		from {
-			height: 580rpx;
-		}
-		to {
-			height: 550rpx;
-		}
-	}
-	@keyframes to-big
-	{
-		from {
-			height: 550rpx;
-		}
-		to {
-			height: 580rpx;
-		}
-	}
-</style>

pages/coreRange/coreRange.vue → packageGoods/core/index.vue

@@ -36,7 +36,7 @@
 		</view>
 		<view class="core">
 			<view class="flex core-list">
-				<navigator :url="`/pages/goods/detail?id=${ item.goodsId }`" class="core-list-item"
+				<navigator :url="`/packageGoods/goods/detail?id=${ item.goodsId }`" class="core-list-item"
 					hover-class="navigator-hover" v-for="(item, index) in list" :key="index">
 					<view class="flex iamge-wrap">
 						<image :src="item.picUrl" mode=""></image>

pages/goods/detail.vue → packageGoods/goods/detail.vue

@@ -89,7 +89,7 @@
 				</view>
 				<view class="flex tip-show-btn">
 					<view class="close" @click="tipShow = false">关闭</view>
-					<navigator class="prize" :url="`/pages/prize/index`" hover-class="navigator-hover"
+					<navigator class="prize" :url="`/packagePrize/prize/index`" hover-class="navigator-hover"
 						@click="tipShow = false">前往查看</navigator>
 				</view>
 			</view>
@@ -262,7 +262,7 @@
 			
 			toCompanyData(){
 				uni.navigateTo({
-					url:`/pages/goods/company?goodsId=${ this.goodsId }`
+					url:`/packageGoods/goods/company?goodsId=${ this.goodsId }`
 				})
 			},
 

pages/order/detail.vue → packageGoods/order/detail.vue

@@ -291,7 +291,7 @@
 			// 查看物流
 			getLogistics() {
 				uni.navigateTo({
-					url: `/pages/order/logistics?id=${ this.orderId }`
+					url: `/packageGoods/order/logistics?id=${ this.orderId }`
 					// url:`/pages/order/logistics?id=96666733329055749370`
 				});
 			},

pages/order/index.vue → packageGoods/order/index.vue

@@ -26,7 +26,7 @@
 								<view class="success" v-if="item.status.value == 1">{{ item.status.desc }}</view>
 								<view v-else>{{ item.status.desc }}</view>
 							</view>
-							<navigator :url="`/pages/order/detail?id=${ item.orderId }`" hover-class="navigator-hover">
+							<navigator :url="`/packageGoods/order/detail?id=${ item.orderId }`" hover-class="navigator-hover">
 								<view class="flex order-list-data-item__info__detail"
 									v-for="(items, index) in item.items" :key="index">
 									<view class="order-list-data-item__info__detail__left">

pages/order/settlement.vue → packageGoods/order/settlement.vue

@@ -177,7 +177,7 @@
 											})
 											setTimeout(() => {
 												uni.redirectTo({
-													url: `/pages/order/index`
+													url: `/packageGoods/order/index`
 												})
 											}, 500)
 										},
@@ -185,7 +185,7 @@
 											payIng = false
 											setTimeout(() => {
 												uni.redirectTo({
-													url: `/pages/order/index`
+													url: `/packageGoods/order/index`
 												})
 											}, 500)
 										}
@@ -195,7 +195,7 @@
 									uni.$u.toast('支付失败!');
 									setTimeout(() => {
 										uni.redirectTo({
-											url: `/pages/order/index`
+											url: `/packageGoods/order/index`
 										})
 									}, 500)
 								}
@@ -204,7 +204,7 @@
 								uni.$u.toast('支付失败!');
 								setTimeout(() => {
 									uni.redirectTo({
-										url: `/pages/order/index`
+										url: `/packageGoods/order/index`
 									})
 								}, 500)
 							})
@@ -216,7 +216,7 @@
 							})
 							setTimeout(() => {
 								uni.redirectTo({
-									url: `/pages/order/index`
+									url: `/packageGoods/order/index`
 								})
 							}, 500)
 						}
@@ -275,7 +275,7 @@
 			toAddress() {
 				this.toAddressShow = true
 				uni.navigateTo({
-					url: "/pages/address/index"
+					url: "/packageOperate/address/index"
 				})
 			},
 

pages/ticketBox/detail.vue → packageGoods/ticket/detail.vue

@@ -34,7 +34,7 @@
 			<view class="detail-goods">
 				<view class="detail-goods-title">可获得奖品</view>
 				<view class="detail-goods-list">
-					<!-- <navigator :url="`/pages/prizeGoods/detail?id=${ item.prizeId }`" class="detail-goods-list-item"
+					<!-- <navigator :url="`/packagePrize/goods/detail?id=${ item.prizeId }`" class="detail-goods-list-item"
 						hover-class="navigator-hover" v-for="(item, index) in prizeList" :key="index"> -->
 					<view class="detail-goods-list-item" v-for="(item, index) in prizeList" :key="index"
 						@click="toPrizeGoods(item)">
@@ -160,7 +160,7 @@
 			toProcess(id) {
 				this.payShow = false
 				uni.navigateTo({
-					url: `/pages/process/index?id=${ id }`
+					url: `/packageOperate/process/index?id=${ id }`
 				})
 			},
 
@@ -196,7 +196,7 @@
 					return
 				}
 				uni.navigateTo({
-					url: `/pages/share/index?boxId=${ this.info.boxId }`
+					url: `/packageOperate/share/index?boxId=${ this.info.boxId }`
 				})
 			},
 
@@ -209,29 +209,29 @@
 			toPrizeGoods(item) {
 				if (item.prizeType == "goods") {
 					uni.navigateTo({
-						url: `/pages/prizeGoods/detail?id=${ item.refId }`
+						url: `/packagePrize/goods/detail?id=${ item.refId }`
 					})
 				}
 				//门店优惠券
 				if (item.prizeType == "coupon" || item.prizeType == "coupon_pkg") {
 					// if (item.couponType == "1") {
 					// 	uni.navigateTo({
-					// 		url: `/pages/prizeGoods/detail?id=426`
+					// 		url: `/packagePrize/goods/detail?id=426`
 					// 	})
 					// }
 					// if (item.couponType == "2") {
 					// 	uni.navigateTo({
-					// 		url: `/pages/prizeGoods/detail?id=425`
+					// 		url: `/packagePrize/goods/detail?id=425`
 					// 	})
 					// }
 					uni.navigateTo({
-						url: `/pages/prizeGoods/detail?id=425`
+						url: `/packagePrize/goods/detail?id=425`
 					})
 				}
 				// 盲豆
 				if (item.prizeType == "coin") {
 					uni.navigateTo({
-						url: `/pages/prizeGoods/detail?id=424`
+						url: `/packagePrize/goods/detail?id=424`
 					})
 				}
 			}

pages/ticketBox/index.vue → packageGoods/ticket/index.vue

@@ -3,7 +3,7 @@
 		<u-navbar :placeholder="true" bgColor="#fff" :autoBack="true" :border="true" title="盲票列表"></u-navbar>
 		<view class="ticket-box">
 			<view class="flex ticket-box-list">
-				<navigator :url="`/pages/ticketBox/detail?boxId=${ item.boxId }`" class="flex ticket-box-list-item"
+				<navigator :url="`/packageGoods/ticket/detail?boxId=${ item.boxId }`" class="flex ticket-box-list-item"
 					hover-class="navigator-hover" v-for="(item, index) in list" :key="index">
 					<image :src="item.picUrl" mode="aspectFill"></image>
 					<view class="info">

pages/address/index.vue → packageOperate/address/index.vue

@@ -118,14 +118,14 @@
 			// 添加地址
 			handleCreate() {
 				uni.navigateTo({
-					url: "/pages/address/create"
+					url: "/packageOperate/address/create"
 				})
 			},
 
 			// 编辑地址
 			handleUpdate(addressId) {
 				uni.navigateTo({
-					url: `/pages/address/create?addrId=${ addressId }`
+					url: `/packageOperate/address/create?addrId=${ addressId }`
 				})
 			},
 

pages/lucky/index.vue → packageOperate/lucky/index.vue

@@ -23,7 +23,7 @@
 			<view class="detail-goods">
 				<view class="detail-goods-title">可获得奖品</view>
 				<view class="detail-goods-list">
-					<!-- <navigator :url="`/pages/prizeGoods/detail?id=${ item.prizeId }`" class="detail-goods-list-item"
+					<!-- <navigator :url="`/packagePrize/goods/detail?id=${ item.prizeId }`" class="detail-goods-list-item"
 						hover-class="navigator-hover" v-for="(item, index) in prizeList" :key="index"> -->
 					<view class="detail-goods-list-item" v-for="(item, index) in prizeList" :key="index">
 						<view class="detail-goods-list-item__value">
@@ -178,7 +178,7 @@
 							this.info = res.data
 							if (uni.getStorageSync('token')) {
 								uni.redirectTo({
-									url: `/pages/choice/index?id=${ res.data.ticketId }&type=offLine`
+									url: `/packagePrize/choice/index?id=${ res.data.ticketId }&type=offLine`
 								})
 							} else {
 								uni.showModal({

pages/process/index.vue → packageOperate/process/index.vue

@@ -82,7 +82,7 @@
 
 			toChoice() {
 				uni.redirectTo({
-					url: `/pages/choice/index?id=${ this.info.ticketId }&type=onLine`
+					url: `/packagePrize/choice/index?id=${ this.info.ticketId }&type=onLine`
 				})
 			},
 		}

pages/share/index.vue → packageOperate/share/index.vue

@@ -125,7 +125,7 @@
 		onShareAppMessage(res) {
 			return {
 				title: '分享盲票',
-				path: `/pages/ticketBox/detail?boxId=${ this.boxId }&userId=${ this.userInfo.userId }&type=1`,
+				path: `/packageGoods/ticket/detail?boxId=${ this.boxId }&userId=${ this.userInfo.userId }&type=1`,
 				type: 2,
 			}
 		}

pages/about/index.vue → packageOther/about/index.vue

@@ -8,8 +8,8 @@
 			</view>
 			<view class="about-action">
 				<u-cell-group :border="false">
-					<u-cell title="隐私保护声明" :isLink="true" :url="'/pages/about/conceal'"></u-cell>
-					<u-cell title="用户使用协议" :isLink="true" :url="'/pages/about/protect'">
+					<u-cell title="隐私保护声明" :isLink="true" :url="'/packageOther/about/conceal'"></u-cell>
+					<u-cell title="用户使用协议" :isLink="true" :url="'/packageOther/about/protect'">
 					</u-cell>
 				</u-cell-group>
 			</view>

pages/choice/index.vue → packagePrize/choice/index.vue

@@ -180,17 +180,17 @@
 			toPrize(data) {
 				if (data.value == 'goods') {
 					uni.redirectTo({
-						url: '/pages/prize/index'
+						url: '/packagePrize/prize/index'
 					})
 				}
 				if (data.value == 'coupon') {
 					uni.redirectTo({
-						url: '/pages/prize/index?coupon=1'
+						url: '/packagePrize/prize/index?coupon=1'
 					})
 				}
 				if (data.value == 'coupon_pkg') {
 					uni.redirectTo({
-						url: '/pages/prize/index?coupon=1'
+						url: '/packagePrize/prize/index?coupon=1'
 					})
 				}
 				if (data == 'coin') {
@@ -214,7 +214,7 @@
 							const url = res.result
 							let serialNo = url.substring(url.length - 21, url.length)
 							uni.redirectTo({
-								url: `/pages/lucky/index?id=${ serialNo }&type=offLine`
+								url: `/packageOperate/lucky/index?id=${ serialNo }&type=offLine`
 							})
 						},
 						fail() {

pages/prizeGoods/detail.vue → packagePrize/goods/detail.vue

@@ -100,7 +100,7 @@
 			
 			toCompanyData(){
 				uni.navigateTo({
-					url:`/pages/goods/company?goodsId=${ this.goodsId }`
+					url:`/packageGoods/goods/company?goodsId=${ this.goodsId }`
 				})
 			},
 			

pages/prize/index.vue → packagePrize/prize/index.vue

@@ -230,7 +230,7 @@
 			// 查看优惠券使用记录
 			toCoupon() {
 				uni.navigateTo({
-					url: '/pages/prize/coupon'
+					url: '/packagePrize/coupon/use'
 				})
 			},
 
@@ -252,7 +252,7 @@
 				let ids = JSON.stringify(arr.map(item => item.storageId))
 				uni.hideLoading();
 				uni.navigateTo({
-					url: `/pages/order/settlement?ids=${ ids }`
+					url: `/packageGoods/order/settlement?ids=${ ids }`
 				})
 			},
 
@@ -286,7 +286,7 @@
 
 			toPrizeGoods(item) {
 				uni.navigateTo({
-					url: `/pages/prizeGoods/detail?id=${ item.goodsId }`
+					url: `/packagePrize/goods/detail?id=${ item.goodsId }`
 				})
 			},
 
@@ -297,27 +297,27 @@
 				if (type.value == 2) {
 					// data.value 2为指定优惠券 0为通用优惠券
 					uni.navigateTo({
-						url: `/pages/prize/detail?id=${ item.id }`
+						url: `/packagePrize/coupon/detail?id=${ item.id }`
 					})
 				} else {
 					// 3为线上票使用
 					if (data.value == 3) {
 						uni.navigateTo({
-							url: `/pages/ticketBox/index`
+							url: `/packageGoods/ticket/index`
 						})
 					}
 
 					//0为通用优惠券
 					if (data.value == 0) {
 						uni.navigateTo({
-							url: `/pages/ticketBox/index`
+							url: `/packageGoods/ticket/index`
 						})
 					}
 
 					// 4为线下票使用
 					if (data.value == 4) {
 						uni.navigateTo({
-							url: `/pages/prize/detail?id=${ item.id }`
+							url: `/packagePrize/coupon/detail?id=${ item.id }`
 						})
 					}
 				}

pages/ticket/index.vue → packagePrize/ticket/index.vue

@@ -92,7 +92,7 @@
 
 			toChoice(item) {
 				uni.navigateTo({
-					url: `/pages/choice/index?id=${ item.ticketId }&type=onLine`
+					url: `/packagePrize/choice/index?id=${ item.ticketId }&type=onLine`
 				})
 			},
 

pages.json

@@ -1,71 +1,135 @@
 {
 	"pages": [{
-		"path": "pages/index/index"
-	}, {
-		"path": "pages/core/index"
-	}, {
-		"path": "pages/user/index"
-	}, {
-		"path": "pages/order/index"
-	}, {
-		"path": "pages/order/detail"
-	}, {
-		"path": "pages/address/index"
-	}, {
-		"path": "pages/address/create"
-	}, {
-		"path": "pages/goods/detail"
-	}, {
-		"path": "pages/order/settlement"
-	}, {
-		"path": "pages/login/index"
-	}, {
-		"path": "pages/login/code"
-	}, {
-		"path": "pages/about/index"
-	}, {
-		"path": "pages/prize/index"
-	}, {
-		"path": "pages/ticket/index"
-	}, {
-		"path": "pages/bean/index"
-	}, {
-		"path": "pages/prize/coupon"
-	}, {
-		"path": "pages/prize/detail"
-	}, {
-		"path": "pages/coupon/index"
-	}, {
-		"path": "pages/ticketBox/index"
-	}, {
-		"path": "pages/ticketBox/detail"
-	}, {
-		"path": "pages/lucky/index"
-	}, {
-		"path": "pages/prizeGoods/detail"
-	}, {
-		"path": "pages/process/index"
-	}, {
-		"path": "pages/choice/index"
-	}, {
-		"path": "pages/about/conceal"
-	}, {
-		"path": "pages/about/protect"
-	}, {
-		"path": "pages/about/notice"
-	}, {
-		"path": "pages/about/rule"
-	}, {
-		"path": "pages/share/index"
-	}, {
-		"path": "pages/coreRange/coreRange"
-	}, {
-		"path": "pages/webview/index"
-	}, {
-		"path": "pages/goods/company"
-	}, {
-		"path": "pages/order/logistics"
-	}],
+			"path": "pages/index/index"
+		},
+		{
+			"path": "pages/core/index"
+		},
+		{
+			"path": "pages/user/index"
+		},
+		{
+			"path": "pages/login/index"
+		},
+		{
+			"path": "pages/login/code"
+		}
+	],
+	"subPackages": [{
+			"root": "packageGoods",
+			"pages": [{
+					"path": "core/index"
+				},
+				{
+					"path": "coupon/index"
+				},
+				{
+					"path": "goods/company"
+				},
+				{
+					"path": "goods/detail"
+				},
+				{
+					"path": "order/index"
+				},
+				{
+					"path": "order/detail"
+				},
+				{
+					"path": "order/logistics"
+				},
+				{
+					"path": "order/settlement"
+				},
+				{
+					"path": "ticket/index"
+				},
+				{
+					"path": "ticket/detail"
+				}
+			]
+		},
+		{
+			"root": "packagePrize",
+			"pages": [
+				{
+					"path": "bean/index"
+				},
+				{
+					"path": "choice/index"
+				},
+				{
+					"path": "coupon/use"
+				},
+				{
+					"path": "coupon/detail"
+				},
+				{
+					"path": "goods/detail"
+				},
+				{
+					"path": "prize/index"
+				},
+				{
+					"path": "ticket/index"
+				}
+			]
+		},
+		{
+			"root": "packageOperate",
+			"pages": [
+				{
+					"path": "address/index"
+				},
+				{
+					"path": "address/create"
+				},
+				{
+					"path": "lucky/index"
+				},
+				{
+					"path": "process/index"
+				},
+				{
+					"path": "share/index"
+				},
+				{
+					"path": "webview/index"
+				}
+			]
+		},
+		{
+			"root": "packageOther",
+			"pages": [
+				{
+					"path": "about/index"
+				},
+				{
+					"path": "about/conceal"
+				},
+				{
+					"path": "about/protect"
+				},
+				{
+					"path": "rule/index"
+				}
+			]
+		}
+	],
+	"preloadRule": {
+		"pages/index/index": {
+			"network": "all",
+			"packages": ["packageGoods", "packagePrize", "packageOperate", "packageOther"]
+		},
+		"packageOperate/lucky/index": {
+			"network": "all",
+			"packages": ["packageOperate", "packageGoods", "packagePrize", "packageOther"]
+		},
+		"packageGoods/ticket/detail": {
+			"network": "all",
+			"packages": ["packageGoods", "packagePrize", "packageOperate", "packageOther"]
+		}
+	},
 	"tabBar": {
 		"custom": true,
 		"color": "black",

pages/core/index.vue

@@ -43,7 +43,7 @@
 			</view>
 			<view class="sticky-content-wrap">
 				<view class="flex sticky-content-list">
-					<navigator :url="`/pages/goods/detail?id=${ itemExc.goodsId }`" class="sticky-content-list-item"
+					<navigator :url="`/packageGoods/goods/detail?id=${ itemExc.goodsId }`" class="sticky-content-list-item"
 						hover-class="navigator-hover" v-for="(itemExc, indexNum) in item.data" :key="indexNum">
 						<view class="flex iamge-wrap">
 							<image :src="itemExc.picUrl" mode=""></image>
@@ -102,7 +102,7 @@
 		<!-- 精选商品列表 -->
 		<view class="core">
 			<view class="flex core-list">
-				<navigator :url="`/pages/goods/detail?id=${ item.goodsId }`" class="core-list-item"
+				<navigator :url="`/packageGoods/goods/detail?id=${ item.goodsId }`" class="core-list-item"
 					hover-class="navigator-hover" v-for="(item, index) in list" :key="index">
 					<view class="flex iamge-wrap">
 						<image :src="item.picUrl" mode=""></image>
@@ -254,11 +254,11 @@
 			toCoreRange(type, data, name) {
 				if (type == "link") {
 					uni.navigateTo({
-						url: `/pages/webview/index?url=${ data }`,
+						url: `/packageOperate/webview/index?url=${ data }`,
 					})
 				} else {
 					uni.navigateTo({
-						url: `/pages/coreRange/coreRange?type=${ type }&data=${ data }&name=${ name }`,
+						url: `/packageGoods/core/index?type=${ type }&data=${ data }&name=${ name }`,
 					})
 				}
 			},

pages/index/index.vue

@@ -21,10 +21,10 @@
 					</view>
 				</view>
 				<!-- 弹幕 -->
-				<view class="box-top-news">
+				<!-- <view class="box-top-news">
 					<prize-news :list="prizeNewsListOne" duration="20" v-if="prizeNewsListOne.length" />
 					<prize-news :list="prizeNewsListTwo" duration="15" v-if="prizeNewsListTwo.length" />
-				</view>
+				</view> -->
 			</view>
 			<view class="box-ticket">
 				<!-- 盲票 -->
@@ -85,15 +85,13 @@
 	import env from '../../config/env.js'
 	import $http from '@/utils/request.js'
 	import CustomTabBar from '../../components/custom-tab-bar/custom-tab-bar.vue'
-	import Carousel from '../../components/vear-carousel/vear-carousel'
 	import PayPopup from '../../components/pay-popup/pay-popup.vue'
-	import PrizeNews from '../../components/prize-news/prize-news.vue'
+	// import PrizeNews from '../../components/prize-news/prize-news.vue'
 	export default {
 		components: {
 			CustomTabBar,
-			Carousel,
 			PayPopup,
-			PrizeNews,
+			// PrizeNews,
 		},
 		data() {
 			return {
@@ -283,7 +281,7 @@
 			toProcess(id) {
 				this.payShow = false
 				uni.navigateTo({
-					url: `/pages/process/index?id=${ id }`
+					url: `/packageOperate/process/index?id=${ id }`
 				})
 			},
 
@@ -291,7 +289,7 @@
 			toTicketBox() {
 				let item = this.ticketList[this.currentIndex]
 				uni.navigateTo({
-					url: `/pages/ticketBox/detail?boxId=${ item.boxId }`
+					url: `/packageGoods/ticket/detail?boxId=${ item.boxId }`
 				})
 			},
 
@@ -299,29 +297,29 @@
 			toPrizeGoods(item) {
 				if (item.prizeType == "goods") {
 					uni.navigateTo({
-						url: `/pages/prizeGoods/detail?id=${ item.refId }`
+						url: `/packagePrize/goods/detail?id=${ item.refId }`
 					})
 				}
 				//门店优惠券
 				if (item.prizeType == "coupon") {
 					// if (item.couponType == "1") {
 					// 	uni.navigateTo({
-					// 		url: `/pages/prizeGoods/detail?id=426`
+					// 		url: `/packagePrize/goods/detail?id=426`
 					// 	})
 					// }
 					// if (item.couponType == "2") {
 					// uni.navigateTo({
-					// 	url: `/pages/prizeGoods/detail?id=425`
+					// 	url: `/packagePrize/goods/detail?id=425`
 					// })
 					// }
 					uni.navigateTo({
-						url: `/pages/prizeGoods/detail?id=425`
+						url: `/packagePrize/goods/detail?id=425`
 					})
 				}
 				// 盲豆
 				if (item.prizeType == "coin") {
 					uni.navigateTo({
-						url: `/pages/prizeGoods/detail?id=424`
+						url: `/packagePrize/goods/detail?id=424`
 					})
 				}
 			},
@@ -329,7 +327,7 @@
 			// 点击所有盲票
 			toTicket() {
 				uni.navigateTo({
-					url: '/pages/ticketBox/index'
+					url: '/packageGoods/ticket/index'
 				})
 			},
 
@@ -342,14 +340,14 @@
 					return
 				}
 				uni.navigateTo({
-					url: '/pages/prize/index'
+					url: '/packagePrize/prize/index'
 				})
 			},
 
 			// 点击规则说明
 			toRule() {
 				uni.navigateTo({
-					url: '/pages/about/rule'
+					url: '/packageOther/rule/index'
 				})
 			}
 		},

pages/login/index.vue

@@ -22,8 +22,8 @@
 					</u-checkbox-group>
 				</view>
 				<view class="txt">登录代表您已同意</view>
-				<navigator hover-class="none" class="txt-about" url="/pages/about/protect">《用户使用协议》</navigator>
-				<navigator hover-class="none" class="txt-about" url="/pages/about/conceal">、《隐私保护声明》</navigator>
+				<navigator hover-class="none" class="txt-about" url="/packageOther/about/protect">《用户使用协议》</navigator>
+				<navigator hover-class="none" class="txt-about" url="/packageOther/about/conceal">、《隐私保护声明》</navigator>
 			</view>
 		</view>
 

pages/user/index.vue

@@ -13,15 +13,15 @@
 				<view class="account-ava-no" @click="toLogin" v-else>登录</view>
 			</view>
 			<view class="flex account-info" v-if="loginState">
-				<navigator url="/pages/prize/index" class="flex account-info-item" hover-class="navigator-hover">
+				<navigator url="/packagePrize/prize/index" class="flex account-info-item" hover-class="navigator-hover">
 					<view>{{ initData.prizeNum }}</view>
 					<view>我的奖品库</view>
 				</navigator>
-				<navigator url="/pages/ticket/index" class="flex account-info-item" hover-class="navigator-hover">
+				<navigator url="/packagePrize/ticket/index" class="flex account-info-item" hover-class="navigator-hover">
 					<view>{{ initData.ticketNum }}</view>
 					<view>我的盲票</view>
 				</navigator>
-				<navigator url="/pages/bean/index" class="flex account-info-item" hover-class="navigator-hover">
+				<navigator url="/packagePrize/bean/index" class="flex account-info-item" hover-class="navigator-hover">
 					<view>{{ initData.coinNum }}</view>
 					<view>我的盲豆</view>
 				</navigator>
@@ -47,7 +47,7 @@
 				<u-cell icon="order" title="提货订单" :isLink="true" @click="toOrder"></u-cell>
 				<u-cell icon="map" title="我的地址" :isLink="true" @click="toAddress"></u-cell>
 				<u-cell icon="kefu-ermai" title="联系我们" :isLink="true" @click="contactService"></u-cell>
-				<u-cell icon="info-circle" title="关于我们" :border="false" :isLink="true" :url="'/pages/about/index'">
+				<u-cell icon="info-circle" title="关于我们" :border="false" :isLink="true" :url="'/packageOther/about/index'">
 				</u-cell>
 			</u-cell-group>
 		</view>
@@ -130,7 +130,7 @@
 					return
 				}
 				uni.navigateTo({
-					url: '/pages/order/index'
+					url: '/packageGoods/order/index'
 				})
 			},
 
@@ -141,7 +141,7 @@
 					return
 				}
 				uni.navigateTo({
-					url: '/pages/address/index'
+					url: '/packageOperate/address/index'
 				})
 			},