单产品下单上线处理

common/request.js

 var baseUrl = ''
 if(process.env.NODE_ENV === 'development'){//开发环境
-  baseUrl= 'https://pay.tuyoyoo.com/'
+  baseUrl= 'http://pay.tuyoyoo.com/'
 }else{
   baseUrl= 'https://manager.pangdly.com/'
 }

pages/indexs/index/index.vue

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

pages/scenic/combinationProduct/combinationProduct.vue

@@ -151,8 +151,8 @@
 					</view>
 
 					<view class="bottom-detail" @click="showDetail()" :style="{ top: chooseProduct.length > 0 ? '-28rpx' : '0' }">
-						<text> 明细 </text>
-						<u-icon name="arrow-up" size="32" style="margin: 0 8rpx"></u-icon>
+						<text style="margin-right: 10rpx;"> 明细 </text>
+						<u-icon name="arrow-up" size="32"></u-icon>
 						<text class="bottom-number">
 							{{ chooseProduct.length }}
 						</text>
@@ -570,9 +570,9 @@ export default {
         let query = '?merchantId=' + this.chooseProduct[0].merchantId + '&productId=' + this.chooseProduct[0].id + '&orderSource=3'
         if (this.chooseProduct[0].ticketType == 2) {
           //联票
-          // uni.navigateTo({
-          //   url: '/pages/scenic/scenicJointOrder/scenicJointOrder' + query
-          // })
+          uni.navigateTo({
+            url: '/pages/scenic/scenicJointOrder/scenicJointOrder' + query
+          })
         } else {
           //普通票
           uni.navigateTo({
@@ -585,7 +585,7 @@ export default {
         })
         let query ='?productIdList=' + JSON.stringify(productIdList) + '&groupId=' + this.groupId + '&groupChannelId=' + this.groupChannelId + '&orderSource=3'
         uni.navigateTo({
-          url: '/pages/scenic/scenicCombiOrder/scenicCombiOrder' + query
+          url: '/pages/combination/combiOrder/combiOrder' + query
         })
       }
     },
@@ -826,6 +826,7 @@ export default {
 	position: relative;
 	text-align: center;
 	display: flex;
+	justify-content: center;
 }
 .bottom-number {
 	display: inline-block;
@@ -836,6 +837,7 @@ export default {
 	background: #f40000;
 	color: #ffffff;
 	font-weight: bold;
+	margin-left: 10rpx;
 }
 .btn {
 	font-size: 32rpx;

pages/scenic/scenicCombiOrder/scenicCombiOrder.vue

@@ -558,7 +558,7 @@ export default {
 			  this.$forceUpdate()
       }
     },
-    //---时间确认事件
+    //---时间确认事件---已改好
     timeConfig(index2) {
       let item=this.productList[this.moreTimeIndex]
       let item2=this.chooseTimeList[index2]
@@ -569,7 +569,6 @@ export default {
         width = data.width
       }).exec()
       item.timeScroll=(width+6)*index2      
-      
     },
     //---获取点击的编辑联系人信息，传给编辑联系人组件
     getEditContact(data) {

pages/scenic/scenicComponents/calendar.vue

@@ -71,11 +71,6 @@ export default {
 		 //---设置默认日期
     setDefaultDate(val) {
       this.defaultDate=val
-      // let dates = val.split('-')
-      // let year = parseInt(dates[0])
-      // let month = parseInt(dates[1]) - 1
-      // let day = parseInt(dates[2])
-      // this.defaultDate = new Date(year, month, day)
     },
   }
 }