出租车页面bug修复

components/customer.vue

 <template>
 	<!-- 客服 -->
-	<u-popup v-model="showPop" mode="bottom" border-radius="14" closeable height="85%">
+	<u-popup v-model="showPop" mode="bottom" border-radius="14" closeable height="75%">
 		<view class="son-wrap">
 			<view class="title">
 				客服电话

pages/indexs/merchantListIndex/merchantListIndex.vue

@@ -210,7 +210,7 @@ export default {
     //---跳转产品页面
     goProduct(merchantId){
       uni.navigateTo({
-        url:'/pages/scenic/scenicChooseProduct/scenicChooseProduct?merchantId='+merchantId
+        url:'/pages/scenic/combinationProduct/combinationProduct?merchantId='+merchantId
       })
     },
     //---加载数据
@@ -226,7 +226,11 @@ export default {
         //如果是点击进行搜索
         data.search=this.searchData
       }
+      uni.showLoading({
+			  title: '加载中'
+      })
       this.$request('scenic/user/merchant/findMerchantList', data).then(res => {
+        uni.hideLoading()
 			  if (res.code == '00') {
 			    this.scenicList=res.data.list||[]
           this.scenicList.forEach((item, index) => {
@@ -238,6 +242,8 @@ export default {
 			      icon: 'none'
 			    })
 			  }
+      }).catch(err=>{
+        uni.hideLoading()
       })
     },
     //---送券