lilei 4 vuotta sitten
vanhempi
commit
a48b12fa5d

+ 26 - 25
pages.json

@@ -111,22 +111,7 @@
                 "enablePullDownRefresh": false
             }
         }
-		,{
-		    "path" : "pages/toOrder/index",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "提交订单",
-		        "enablePullDownRefresh": false
-		    }
-		}
-		,{
-		    "path" : "pages/toOrder/editAddress",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "修改地址",
-		        "enablePullDownRefresh": false
-		    }
-		}
+		
         ,{
             "path" : "pages/goods/goods",
             "style" :                                                                                    
@@ -161,15 +146,6 @@
 		        "enablePullDownRefresh": false
 		    }
 		    
-		},
-		{
-		    "path" : "pages/toOrder/payFinish",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "支付完成",
-		        "enablePullDownRefresh": false
-		    }
-		    
 		},
 		{
 		    "path" : "pages/checkOut/checkFinish",
@@ -211,6 +187,31 @@
 					"navigationBarTitleText": "物流信息"
 				}
 			}, 
+			{
+			    "path" : "toOrder/index",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "提交订单",
+			        "enablePullDownRefresh": false
+			    }
+			}
+			,{
+			    "path" : "toOrder/editAddress",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "修改地址",
+			        "enablePullDownRefresh": false
+			    }
+			},
+			{
+			    "path" : "toOrder/payFinish",
+			    "style" :                                                                                    
+			    {
+			        "navigationBarTitleText": "支付完成",
+			        "enablePullDownRefresh": false
+			    }
+			    
+			},
 			{
 			    "path" : "luckDraw/luckDraw",
 			    "style" :                                                                                    

+ 1 - 1
pages/cart/cart.vue

@@ -350,7 +350,7 @@
 						if(a.length==0){
 							this.$u.vuex("vuex_toOrderList",goods)
 							uni.redirectTo({
-								url:"/pages/toOrder/index?orderForm=SHOPPING_CAR"
+								url:"/pagesA/toOrder/index?orderForm=SHOPPING_CAR"
 							})
 						}else{
 							this.showMsg = true

+ 1 - 1
pages/goods/goodsDetail.vue

@@ -152,7 +152,7 @@
 					if(this.goodContent.sellGold * this.nums >= this.goldLimit){
 						this.$u.vuex("vuex_toOrderList",[{id:this.id,buyQty:this.nums,goodsNo:this.goodContent.goodsNo,goods:this.goodContent}])
 						uni.redirectTo({
-							url:"/pages/toOrder/index?orderForm=ORDER_NOW"
+							url:"/pagesA/toOrder/index?orderForm=ORDER_NOW"
 						})
 					}else{
 						uni.showToast({

+ 1 - 1
pages/userCenter/userInfo/userInfo.vue

@@ -68,7 +68,7 @@
 			editAddress(index){
 				this.$u.vuex("vuex_OrderAddress",this.userInfo)
 				uni.navigateTo({
-					url:"/pages/toOrder/editAddress"
+					url:"/pagesA/toOrder/editAddress"
 				})
 			},
 			// 设置密码

+ 1 - 1
pagesA/order/order.vue

@@ -410,7 +410,7 @@
 						setTimeout(()=>{
 							// 跳转到支付完成界面
 							uni.navigateTo({
-								url:"/pages/toOrder/payFinish?id=" + this.orderId
+								url:"/pagesA/toOrder/payFinish?id=" + this.orderId
 							})
 						},500)
 						

+ 1 - 1
pagesA/order/orderDetail.vue

@@ -266,7 +266,7 @@
 						uni.$emit('refresh')
 						// 跳转到支付完成界面
 						uni.navigateTo({
-							url:"/pages/toOrder/payFinish?id=" + id
+							url:"/pagesA/toOrder/payFinish?id=" + id
 						})
 					} else{
 						this.password = ''

+ 0 - 0
pages/toOrder/editAddress.vue → pagesA/toOrder/editAddress.vue


+ 2 - 2
pages/toOrder/index.vue → pagesA/toOrder/index.vue

@@ -172,7 +172,7 @@
 			editAddress(){
 				this.$u.vuex("vuex_OrderAddress",this.userInfo)
 				uni.navigateTo({
-					url:"/pages/toOrder/editAddress"
+					url:"/pagesA/toOrder/editAddress"
 				})
 			},
 			// 跳转到设置支付密码页
@@ -292,7 +292,7 @@
 					if(res.status == 200) {
 						// 跳转到支付完成界面
 						uni.redirectTo({
-							url:"/pages/toOrder/payFinish?id=" + this.orderId
+							url:"/pagesA/toOrder/payFinish?id=" + this.orderId
 						})
 					} else{
 						this.password = ''

+ 0 - 0
pages/toOrder/payFinish.vue → pagesA/toOrder/payFinish.vue