样式修改

pages/indexs/index/index.vue

@@ -62,8 +62,7 @@
 			</view>
 			
 			<view class="banner">
-				<u-swiper :list="list" mode="number" height="300" indicator-pos="bottomRight" @click="swiperClick">
-					
+				<u-swiper :list="list" mode="number" height="300" indicator-pos="bottomRight" @click="swiperClick">			
 				</u-swiper>
 			</view>
 		</view>

pages/indexs/merchantListIndex/merchantListIndex.vue

@@ -271,7 +271,7 @@ export default {
 		    }
 		  })
     },
-    //---点击购买须知
+    //---点击详情
     clikDetail(merchantId){
       this.$refs.merchantDetail.showPop=true
 		  this.initDetail(merchantId)

pages/scenic/combinationProduct/combinationProduct.vue

@@ -14,7 +14,7 @@
 					<swiper-item class="swiper-item">
 						<checkbox-group @change="checkboxChange" class="checkbox-box">
 							<view class="merchant" v-for="(item, index) in scenicList" :key="index">
-								<view class="merchant-title">
+								<view class="merchant-title" @click="clikDetail(item.id)">
 									<view class="title-left">
 										<text>{{ item.name }}</text>
 										<template v-if="item.couponVoList && item.couponVoList.length > 0">
@@ -23,7 +23,10 @@
 										</template>
 									</view>
 
-									<view v-if="showDistance" class="title-right"> 距您{{ item.distance ? parseFloat((item.distance / 1000).toFixed(2)) : 0 }}km </view>
+									<view v-if="showDistance" class="title-right">
+										距您{{ item.distance ? parseFloat((item.distance / 1000).toFixed(2)) : 0 }}km
+										<u-icon name="arrow-right" style="margin-left: 4rpx;"></u-icon>
+									</view>
 								</view>
 
 								<label v-for="(items, a) in item.productListCopy" :key="a" :class="{ off: items.status == 2 }">
@@ -159,8 +162,10 @@
 			<customer :scenicList="scenicList" ref="customer"></customer>
 			<!-- 购买须知 -->
 			<buyKnow :buyKnowData="buyKnowData" ref="buyKnow"></buyKnow>
-			<!-- 详情明细 -->
+			<!-- 产品明细 -->
 			<detail :chooseProduct="chooseProduct" ref="detail"></detail>
+			<!-- 商户详情 -->
+			<merchantDetail :detailData='detailData' ref='merchantDetail'></merchantDetail>
 			<!-- 模态框 -->
 			<u-modal v-model="showModal" @confirm="chooseConfirm" @cancel="chooseCancel" title="提示" content="该产品不支持多选" show-cancel-button="true">
 			</u-modal>
@@ -173,15 +178,18 @@ import customer from '@/components/customer.vue' //客服
 import buyKnow from '@/components/buyKnow.vue' //购买须知
 import detail from './components/detail.vue' //购买须知
 import UWaterfall from '@/uview-ui/components/u-waterfall/u-waterfall.vue'
+import merchantDetail from '@/components/merchantDetail' //详情弹窗
 export default {
   components: {
     customer,
     buyKnow,
     detail,
-    UWaterfall
+    UWaterfall,
+    merchantDetail
   },
   data() {
     return {
+      detailData:'',//详情数据
       companyId:'',//公司Id
       merchantId: '', //商户Id
       // tabbar:['热门景点','一日游','摄影/旅拍','文创DIY'],//tabbar标题列表
@@ -345,6 +353,31 @@ export default {
       this.buyKnowData = data
       this.$refs.buyKnow.showPop = true
     },
+    //---点击详情
+    clikDetail(merchantId){
+		  this.$refs.merchantDetail.showPop=true
+		  this.initDetail(merchantId)
+    },
+    //---初始化详情
+    initDetail(merchantId){
+		  let data={
+		    userId:uni.getStorageSync('userId')||'',
+		    openid:uni.getStorageSync('openid')||'',
+		    id:merchantId,//商户id
+		    isDetail:1,//商户详情
+		  }
+		  this.detailData=''
+		  this.$request('scenic/user/merchant/findDetailInfo',data).then((res)=>{
+		    if(res.code=='00'){
+		      this.detailData=res.data
+		    }else{
+		      uni.showToast({
+		        title: res.message,
+		        icon: 'none'
+		      })
+		    }
+		  })
+    },
     //---展示明细弹窗
     showDetail() {
       this.$refs.detail.showPop = true