bug处理

common/request.js

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

main.js

@@ -8,6 +8,7 @@ import commonjs from 'common/common.js'
 
 Vue.prototype.$commonjs = commonjs
 Vue.prototype.$request = request
+Vue.prototype.imageError ='@/static/img/common/pangdingLogo.png' //餐饮类型
 Vue.use(uView)
 
 Vue.config.productionTip = false

pages/indexs/merchantListIndex/merchantListIndex.vue

@@ -13,7 +13,7 @@
 				</view>
 
 				<view class="search-right">
-					<input class="search-input" placeholder="景区/商品/关键词搜索" v-model="searchData" />
+					<input class="search-input" placeholder="景区关键词搜索" v-model="searchData" />
 					<text class="search-btn" @click="initList('','',true)">搜索</text>
 				</view>
 			</view>
@@ -144,16 +144,13 @@ export default {
       scenicList:[],//景区数据
       list: [
         {
-          image: 'http://wx.pangdly.com/static/img/test7.6d14c2d.jpg',
-          title: '昨夜星辰昨夜风，画楼西畔桂堂东'
+          image: 'http://wx.pangdly.com/static/img/test7.6d14c2d.jpg'
         },
         {
-          image: 'http://wx.pangdly.com/static/img/test8.1cf812b.jpg',
-          title: '身无彩凤双飞翼，心有灵犀一点通'
+          image: 'http://wx.pangdly.com/static/img/test8.1cf812b.jpg'
         },
         {
-          image: 'http://wx.pangdly.com/static/img/test9.b3dd44c.jpg',
-          title: '谁念西风独自凉，萧萧黄叶闭疏窗，沉思往事立残阳'
+          image: 'http://wx.pangdly.com/static/img/test9.b3dd44c.jpg'
         }
       ],
       tabList: [{
@@ -250,10 +247,9 @@ export default {
 		    openid:uni.getStorageSync('openid')||''
 		  }
 		  this.$request('scenic/market/findPageMarket',data).then((res)=>{
-		    if(res.data.length>0){
         let list=res.data||[]
+		    if(list.length>0){
           list.forEach(item=>{
-						
             if(item.couponType==1){
               //抵用券
               this.showCoupon1=true

pages/scenic/scenicChooseProduct/components/detail.vue

 <template>
 	<!-- 详情 -->
-	<u-popup  v-model="showPop" mode="bottom" border-radius="14" closeable height="65%">
+	<u-popup  v-model="showPop" mode="bottom" border-radius="14" closeable height="75%">
 		<view class="son-wrap">
 			<view class="title">
 				明细
@@ -105,7 +105,7 @@ export default {
 	z-index: 1;	
 }
 .middle {
-	padding: 100rpx 24rpx 0 24rpx;
+	padding: 100rpx 24rpx;
 }
 .merchantlist{
 	border-bottom:2rpx solid #ececec;

pages/scenic/scenicChooseProduct/scenicChooseProduct.vue

@@ -32,7 +32,7 @@
 							</view>
 							
 								<label v-for="(items,a) in item.productListCopy" :key='a' :class="{'off':items.status==2}">
-									<view class="product" :class="{'on':items.ifChoose}">
+									<view class="product" :class="{'on':items.ifChangeBg}">
 										<view class="product-left">
 											<checkbox class="blue" :disabled="items.status==2" :value="JSON.stringify(items)" :checked="items.ifChecked" />
 										</view>
@@ -207,7 +207,7 @@ export default {
 								  item2.productList.forEach(item3=>{
 								    if(item.id==item3.id){
 								      item3.ifChecked=false
-								      item3.ifChoose=false
+								      item3.ifChangeBg=false
 								    }
 								  })
                 })
@@ -289,10 +289,12 @@ export default {
       //判断是否选中产品，选中产品的背景颜色需要变化
       this.scenicList.forEach(item=>{
         item.productList.forEach(item2=>{
-          item2.ifChoose=false
+          item2.ifChangeBg=false
           this.chooseProduct.forEach(item3=>{
             if(item2.id==item3.id){
-              item2.ifChoose=true
+              item2.ifChangeBg=true
+              //解决是否支持多产品购买弹窗2次之后，选中状态错误bug,需要在选中时修改状态
+              item2.ifChecked=true
             }
           })
         })
@@ -308,7 +310,7 @@ export default {
             item2.productList.forEach(item3=>{
               if(item.id==item3.id){
                 item3.ifChecked=false
-                item3.ifChoose=false
+                item3.ifChangeBg=false
               }
             })
           })
@@ -330,7 +332,7 @@ export default {
 					  item2.productList.forEach(item3=>{
 					    if(item.id==item3.id){
 					      item3.ifChecked=false
-					      item3.ifChoose=false
+					      item3.ifChangeBg=false
 					    }
 					  })
           })