lilei 4 years ago
parent
commit
84bd865596

+ 56 - 45
pages.json

@@ -97,24 +97,6 @@
 				"navigationBarTitleText": "回收分类"
 			}
 		},
-		{
-			"path": "pages/order/order",
-			"style": {
-				"navigationBarTitleText": "我的订单",
-				"enablePullDownRefresh": true
-			}
-		}, {
-			"path": "pages/order/orderDetail",
-			"style": {
-				"navigationBarTitleText": "订单详情"
-			}
-		}, 
-		{
-			"path": "pages/order/LogList",
-			"style": {
-				"navigationBarTitleText": "物流信息"
-			}
-		}, 
 		{
 			"path": "pages/agreement/agreement",
 			"style": {
@@ -207,34 +189,63 @@
             }
             
         }
-        ,{
-            "path" : "pages/luckDraw/luckDraw",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "幸运大转盘",
-                "enablePullDownRefresh": false
-            }
-            
-        },
-		{
-		    "path" : "pages/luckDraw/paySuccess",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "支付完成",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},
-		{
-		    "path" : "pages/luckDraw/myJp",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "我的奖品",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
     ],
+	"subPackages": [{
+		"root": "pagesA",
+		"pages": [
+			{
+				"path": "order/order",
+				"style": {
+					"navigationBarTitleText": "我的订单",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "order/orderDetail",
+				"style": {
+					"navigationBarTitleText": "订单详情"
+				}
+			}, 
+			{
+				"path": "order/LogList",
+				"style": {
+					"navigationBarTitleText": "物流信息"
+				}
+			}, 
+			{
+			    "path" : "luckDraw/luckDraw",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "幸运大转盘",
+			        "enablePullDownRefresh": false
+			    }
+			    
+			},
+			{
+			    "path" : "luckDraw/paySuccess",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "支付完成",
+			        "enablePullDownRefresh": false
+			    }
+			    
+			},
+			{
+			    "path" : "luckDraw/myJp",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "我的奖品",
+			        "enablePullDownRefresh": false
+			    }
+			    
+			}
+		]
+	}],
+	"preloadRule": {
+		"pages/index/index": {
+			"network": "all",
+			"packages": ["pagesA"]
+		}
+	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

+ 1 - 1
pages/index/index.vue

@@ -368,7 +368,7 @@
 			// 去抽奖
 			toLuckDraw(){
 				uni.navigateTo({
-					url: '/pages/luckDraw/luckDraw'
+					url: '/pagesA/luckDraw/luckDraw'
 				})
 			}
 		}

+ 1 - 1
pages/toOrder/index.vue

@@ -198,7 +198,7 @@
 				this.password = ''
 				// 跳转到订单列表
 				uni.redirectTo({
-					url:"/pages/order/order"
+					url:"/pagesA/order/order"
 				})
 			},
 			// 继续支付

+ 1 - 1
pages/toOrder/payFinish.vue

@@ -26,7 +26,7 @@ export default {
 		// 查看订单详情
 		toOrderDetail() {
 			uni.redirectTo({
-			    url: '/pages/order/orderDetail?id=' + this.orderId
+			    url: '/pagesA/order/orderDetail?id=' + this.orderId
 			})
 		},
 		// 返回首页

+ 1 - 1
pages/userCenter/index.vue

@@ -80,7 +80,7 @@
 			toPage(index){
 				console.log(index)
 				let pageUrl=[
-					'/pages/order/order',
+					'/pagesA/order/order',
 					'/pages/userCenter/deliveryRecord',
 					'/pages/userCenter/question',
 					'/pages/agreement/agreement?fromPage=usercenter',

+ 3 - 3
pages/luckDraw/luckDraw.vue → pagesA/luckDraw/luckDraw.vue

@@ -359,7 +359,7 @@ export default {
 		toPaySubmit(){
 			this.showLottery = false
 			uni.navigateTo({
-				url: '/pages/luckDraw/paySuccess'
+				url: '/pagesA/luckDraw/paySuccess'
 			})
 		},
 		// 文字滚动
@@ -386,7 +386,7 @@ export default {
 		// 我的奖品
 		viewMyJp(){
 			uni.navigateTo({
-				url: '/pages/luckDraw/myJp'
+				url: '/pagesA/luckDraw/myJp'
 			})
 		}
 	},
@@ -417,7 +417,7 @@ export default {
 	onShareAppMessage() {
 		return {
 		      title: '[乐色管家]年末活动来袭,幸福大转盘, 精彩好礼等你来抽!',
-		      path: '/pages/luckDraw/luckDraw'
+		      path: '/pagesA/luckDraw/luckDraw'
 		    }
 	},
 	onShareTimeline() {

+ 0 - 0
pages/luckDraw/myJp.vue → pagesA/luckDraw/myJp.vue


+ 0 - 0
pages/luckDraw/paySuccess.vue → pagesA/luckDraw/paySuccess.vue


+ 0 - 0
pages/order/LogList.vue → pagesA/order/LogList.vue


+ 2 - 5
pages/order/order.vue → pagesA/order/order.vue

@@ -430,18 +430,15 @@
 			showLog(item) {
 				console.log(item, '111111')
 				uni.navigateTo({
-					url: "/pages/order/LogList?orderNo=" + item.orderNo
+					url: "/pagesA/order/LogList?orderNo=" + item.orderNo
 				})
 			},
 			// 详细页
 			viewRow(item) {
-				// if (!this.$hasPermissions('M_backlog_detail_mobile')) {
-				// 	return
-				// }
 				console.log(item, '111111')
 				// 已完成的
 				uni.navigateTo({
-					url: "/pages/order/orderDetail?id=" + item.id
+					url: "/pagesA/order/orderDetail?id=" + item.id
 				})
 			},
 		}

+ 0 - 0
pages/order/orderDetail.vue → pagesA/order/orderDetail.vue