路径修改

pages.json

@@ -263,7 +263,7 @@
 					}
 
 				}
-      ]
+			]
 		},
 		{
 			"root": "pages/scenic", //景区分包
@@ -294,31 +294,22 @@
 						"enablePullDownRefresh": false
 					}
 
-				}, {
+				}, 
+				{
 					"path": "scenicIndex/scenicIndex",
 					"style": {
 						"navigationBarTitleText": "景区",
 						"enablePullDownRefresh": false
 					}
+				}, 
+				{
+					"path": "scenicCombiOrder/scenicCombiOrder",
+					"style": {
+						"navigationBarTitleText": "订单填写",
+						"enablePullDownRefresh": false
+					}
 				}
-			    ,{
-                    "path" : "scenicOrder/scenicOrder",
-                    "style" :                                                                                    
-                {
-                    "navigationBarTitleText": "",
-                    "enablePullDownRefresh": false
-                }
-                
-                },
-                {
-                	"path" : "scenicCombiOrder/scenicCombiOrder",
-                	"style" : 
-                	{
-                		"navigationBarTitleText" : "",
-                		"enablePullDownRefresh" : false
-                	}
-                }
-            ]
+			]
 		},
 		{
 			"root": "pages/vlog", //vlogo分包
@@ -468,7 +459,7 @@
 						"enablePullDownRefresh": false,
 						"navigationStyle": "custom"
 					}
-				}, 
+				},
 				{
 					"path": "myPhotoAlbum/myPhotoAlbum",
 					"style": {
@@ -476,7 +467,7 @@
 						"enablePullDownRefresh": false
 					}
 
-				}, 
+				},
 				{
 					"path": "albumOrderdetail/albumOrderdetail",
 					"style": {
@@ -484,7 +475,7 @@
 						"enablePullDownRefresh": false
 					}
 
-				}, 
+				},
 				{
 					"path": "purchasedPhotoAlbum/purchasedPhotoAlbum",
 					"style": {
@@ -492,7 +483,7 @@
 						"enablePullDownRefresh": false
 					}
 
-				}, 
+				},
 				{
 					"path": "DIYPurchase/DIYPurchase",
 					"style": {
@@ -500,7 +491,7 @@
 						"enablePullDownRefresh": false
 					}
 
-				}, 
+				},
 				{
 					"path": "DIYDetails/DIYDetails",
 					"style": {

pages/combination/distributionCombiChoose/distributionCombiChoose.vue

@@ -504,55 +504,54 @@ export default {
       uni.showLoading({
         title: '加载中'
       })
-      this.$request('/scenic/groupGood/getGroupProducts', data)
-        .then(res => {
-          uni.hideLoading()
-          if (res.code == '00') {
-            this.scenicList = res.data.merchantList || []
-            this.groupId = res.data.groupId || ''
-            this.groupChannelId = res.data.groupChannelId || ''
-            this.scenicList.forEach((item, index) => {
-              //获取当前景区图片,把当前景区放在第一位
-              if (item.id == this.merchantId) {
-                this.imgList = item.imgList
-                this.scenicList.splice(index, 1)
-                this.scenicList.unshift(item)
-                item.productListCopy = item.productList
-              } else {
-                item.productListCopy = item.productList.slice(0, 2)
-              }
-              //预订时间为当天时，当前时间大于最早预订时间显示未开售，当前时间大于最晚预订时间显示已售罄
-              let times = new Date().Format('hh:mm:ss')
-              let timeNumber = parseInt(this.$commonjs.changeTime(times)) //将当前时间转化为数字
-              item.productList.forEach(item2 => {
-                item2.timeNumber1 = parseInt(this.$commonjs.changeTime(item2.earlyBookTime))
-                item2.timeNumber2 = parseInt(this.$commonjs.changeTime(item2.bookTime))
-                if (item2.aheadBookDays == 0) {
-                  if (item2.status == 2) {
+      this.$request('/scenic/groupGood/getGroupProducts', data).then(res => {
+        uni.hideLoading()
+        if (res.code == '00') {
+          this.scenicList = res.data.merchantList || []
+          this.groupId = res.data.groupId || ''
+          this.groupChannelId = res.data.groupChannelId || ''
+          this.scenicList.forEach((item, index) => {
+            //获取当前景区图片,把当前景区放在第一位
+            if (item.id == this.merchantId) {
+              this.imgList = item.imgList
+              this.scenicList.splice(index, 1)
+              this.scenicList.unshift(item)
+              item.productListCopy = item.productList
+            } else {
+              item.productListCopy = item.productList.slice(0, 2)
+            }
+            //预订时间为当天时，当前时间大于最早预订时间显示未开售，当前时间大于最晚预订时间显示已售罄
+            let times = new Date().Format('hh:mm:ss')
+            let timeNumber = parseInt(this.$commonjs.changeTime(times)) //将当前时间转化为数字
+            item.productList.forEach(item2 => {
+              item2.timeNumber1 = parseInt(this.$commonjs.changeTime(item2.earlyBookTime))
+              item2.timeNumber2 = parseInt(this.$commonjs.changeTime(item2.bookTime))
+              if (item2.aheadBookDays == 0) {
+                if (item2.status == 2) {
+                  item2.statusName = '已售罄'
+                } else {
+                  if (timeNumber < item2.timeNumber1) {
+                    item2.status = 2
+                    item2.statusName = '未开售'
+                  }
+                  if (timeNumber > item2.timeNumber2) {
+                    item2.status = 2
                     item2.statusName = '已售罄'
-                  } else {
-                    if (timeNumber < item2.timeNumber1) {
-                      item2.status = 2
-                      item2.statusName = '未开售'
-                    }
-                    if (timeNumber > item2.timeNumber2) {
-                      item2.status = 2
-                      item2.statusName = '已售罄'
-                    }
                   }
                 }
-              })
-            })
-            this.$nextTick(() => {
-              this.countSwiper()
-            })
-          } else {
-            uni.showToast({
-              title: res.message,
-              icon: 'none'
+              }
             })
-          }
-        })
+          })
+          this.$nextTick(() => {
+            this.countSwiper()
+          })
+        } else {
+          uni.showToast({
+            title: res.message,
+            icon: 'none'
+          })
+        }
+      })
         .catch(err => {
           uni.hideLoading()
         })

pages/indexs/index/index.vue

@@ -284,7 +284,7 @@ export default {
     //---跳转索道
     goSuodao(){
       uni.navigateTo({
-        url:'/pages/scenic/combinationProduct/combinationProduct?merchantId=z0015605022691a5945bbe463141668c'
+        url:'/pages/combination/distributionCombiChoose/distributionCombiChoose?merchantId=z0015605022691a5945bbe463141668c'
       })
     },
     //---跳转联合国际

pages/indexs/merchantListIndex/merchantListIndex.vue

@@ -215,7 +215,7 @@ export default {
     //---跳转产品页面
     goProduct(merchantId){
       uni.navigateTo({
-        url:'/pages/scenic/combinationProduct/combinationProduct?merchantId='+merchantId
+        url:'/pages/combination/distributionCombiChoose/distributionCombiChoose?merchantId='+merchantId
       })
     },
     //---加载数据