首页面链接修改

pages/combination/distributionCombiChoose/distributionCombiChoose.vue

@@ -61,7 +61,7 @@
 					<!-- enhanced和bounces是处理ios系统橡皮筋回弹bug -->
 					<scroll-view class="scroll-right" @scroll="scrollRight" :style="{height:middleHeight+'px'}" :scroll-into-view="toViewRight" scroll-y enhanced :bounces="false">
 						<view class="middle-right">
-							<checkbox-group @change="checkboxChange" class="checkbox-box">
+							<checkbox-group @change="checkboxChange" class="checkbox-box" >
 								<view class="merchantlist-wrap" :id="'merchant'+index" v-for="(item, index) in scenicList" :key="index">
 									<view class="merchantlist">
 										<view class="merchantlist-title" @click="clikDetail(item.id)">
@@ -175,7 +175,7 @@
 		<!-- 商户详情 -->
 		<merchantDetail :detailData='detailData' ref='merchantDetail'></merchantDetail>
 		<!-- 模态框1，用于是否更改产品 -->
-		<u-modal :show="showModal1" @confirm="chooseConfirm" @cancel="chooseCancel" title="提示" content="是否更改产品" show-cancel-button="true">
+		<u-modal :show="showModal1" @confirm="chooseConfirm" @cancel="chooseCancel" title="提示" content="是否更改产品" :showCancelButton="true">
 		</u-modal>
 		<!-- 模态框2，用于联票不能组合购买 -->
 		<u-modal :show="showModal2" @confirm="notBuyConfirm" title="提示" content="联票产品不能进行多产品购买" >
@@ -312,8 +312,6 @@ export default {
               return val
             })
           }
-					
-          
         }
       },
       deep: true,
@@ -751,6 +749,7 @@ export default {
       value.forEach(item => {
         arr.push(JSON.parse(item))
       })
+      console.log(arr)
       this.chooseProduct = arr
       //判断是否选中产品，选中产品的背景颜色需要变化
       this.scenicList.forEach(item => {
@@ -764,7 +763,6 @@ export default {
               //由于支付宝小程序会出现bug,所以只在微信小程序里面执行该代码
               item2.ifChecked = true
               //#endif
-          		
           	}
           })
         })
@@ -824,10 +822,7 @@ export default {
 			    }
 			  })
       })
-      delete this.chooseProduct[this.chooseProduct.length-1]
-      this.chooseProduct = this.chooseProduct.filter(function (val) {
-			  return val
-      })
+      this.chooseProduct.splice(this.chooseProduct.length-1,1)
       this.showModal2=false
     },
     //---跳转填写订单页面

pages/indexs/index/index.vue

@@ -82,32 +82,11 @@ export default {
 			    url: 'http://lx.pangdly.com/img/home3.df60ec3.jpg'
 			  }
       ],
-      productList:[//产品列表
-        {
-          merchantName:'长江索道',
-          pageUrl:'/pages/combination/distributionCombiChoose/distributionCombiChoose?channelId=1&merchantId=z0015605022691a5945bbe463141668c&groupId=z0016038113016708b8ad38c637b2f26&groupChannelId=z00160423712018998e6260ffcaf3369',
-          imgUrl:'http://lx.pangdly.com/img/sodao.1cdf287.jpg',
-          price:20
-        },
-        {
-          merchantName:'云端之眼',
-          pageUrl:'/pages/scenic/scenicProduct/scenicProduct?merchantId=z00160128940329482da6bd94d443a91&channelType=1',
-          imgUrl:'http://lx.pangdly.com/img/yunduan.331a774.jpg',
-          price:68
-        },
-        {
-          merchantName:'两江游金碧系列',
-          pageUrl:'/pages/scenic/scenicProduct/scenicProduct?merchantId=z001578652229233acd0134cf825fdbe',
-          imgUrl:'http://lx.pangdly.com/img/liangjiang.097258e.jpg',
-          price:138
-        },
-        {
-          merchantName:'重庆湖广会馆',
-          pageUrl:'/pages/scenic/scenicProduct/scenicProduct?merchantId=cdd4da5d154a4512bd5f3bec2797557b',
-          imgUrl:'http://lx.pangdly.com/img/huiguan.c00da69.jpg',
-          price:23
-        },
-      ],
+      suodaoUrl:'/pages/combination/distributionCombiChoose/distributionCombiChoose?channelId=1&merchantId=z0015605022691a5945bbe463141668c&groupId=z0016038113016708b8ad38c637b2f26&groupChannelId=z00160423712018998e6260ffcaf3369&companyId=6da527f930be4aa1904fe17fcb41874f',//长江索道
+      yunduanUrl:'/pages/scenic/scenicProduct/scenicProduct?merchantId=z00160128940329482da6bd94d443a91',//云端之眼
+      liangjiangUrl:'/pages/scenic/scenicProduct/scenicProduct?merchantId=z001578652229233acd0134cf825fdbe',//两江游
+      huguangUrl:'/pages/scenic/scenicProduct/scenicProduct?merchantId=cdd4da5d154a4512bd5f3bec2797557b',//湖广会馆
+      
       iconList:[//图标列表
         {
           merchantExtendProjectName:'景区名称',
@@ -144,8 +123,10 @@ export default {
           projectImgUrl:'/static/img/index/classify7.png',
           projectLinkUrl:'/pages/my/travelList/travelList/travelList',
           projectStatus:0
-        }
+        },
+				
       ],
+      productList:[]
     }
   },
   onLoad(option){
@@ -154,6 +135,32 @@ export default {
     if(!companyId){
       this.getCompanyId()
     }
+    this.productList=[//产品列表
+		  {
+		    merchantName:'长江索道',
+		    pageUrl:this.suodaoUrl,
+		    imgUrl:'http://lx.pangdly.com/img/sodao.1cdf287.jpg',
+		    price:20
+		  },
+		  {
+		    merchantName:'云端之眼',
+		    pageUrl:this.yunduanUrl,
+		    imgUrl:'http://lx.pangdly.com/img/yunduan.331a774.jpg',
+		    price:68
+		  },
+		  {
+		    merchantName:'两江游金碧系列',
+		    pageUrl:this.liangjiangUrl,
+		    imgUrl:'http://lx.pangdly.com/img/liangjiang.097258e.jpg',
+		    price:138
+		  },
+		  {
+		    merchantName:'重庆湖广会馆',
+		    pageUrl:this.huguangUrl,
+		    imgUrl:'http://lx.pangdly.com/img/huiguan.c00da69.jpg',
+		    price:23
+		  },
+    ]
   },
   onShow() {
     // 首次进入、后台切入前台时会执行
@@ -177,19 +184,19 @@ export default {
       //长江索道
       if(index==0){
 			 uni.navigateTo({
-				 url:'/pages/combination/distributionCombiChoose/distributionCombiChoose?channelId=1&merchantId=z0015605022691a5945bbe463141668c&groupId=z0016038113016708b8ad38c637b2f26&groupChannelId=z00160423712018998e6260ffcaf3369'
+				 url:this.suodaoUrl
 			 })
       }
       //湖广会馆
       if(index==1){
 			 uni.navigateTo({
-				 url:'/pages/scenic/scenicProduct/scenicProduct?merchantId=cdd4da5d154a4512bd5f3bec2797557b'
+				 url:this.huguangUrl
 			 })
       }
-      //联合国际
+      //云端之眼
       if(index==2){
 			 uni.navigateTo({
-				 url:'/pages/scenic/scenicProduct/scenicProduct?merchantId=z00160128940329482da6bd94d443a91&channelType=1'
+				 url:this.yunduanUrl
 			 })
       }
     },