Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

components/goods/style1.vue

@@ -34,8 +34,8 @@
 				:src="item.picUrl"
 			/>
 			<div class="good-info">
-				<div class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }} 1</div>
-				<view class="good-sub-name">{{item.subname}}</view>
+				<div class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</div>
+				<view class="good-sub-name" v-if="item.subname">{{item.subname}}</view>
 				<div class="good-price-info">
 					<span class="price" :style="{ color: mainColor }">{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}
 						<!-- <span style='text-decoration: line-through;margin-left: 10px;font-size: 10px;color: gray;font-family: aa;'>原价:{{goodsInfo.showGoodsPrice ? getPrice(item.OriginalPrice) : ''}}</span> -->

components/goods/style2.vue

@@ -32,8 +32,8 @@
 						</view>
 					</view>
 					<view class="good-info">
-						<view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }} 2</view>
-						<view class="good-sub-name">{{item.subname}}</view>
+						<view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</view>
+						<view class="good-sub-name" v-if="item.subname">{{item.subname}}</view>
 						<view class="good-price-info">
 							<view class="price">
 								{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}

components/goods/style3.vue

@@ -32,7 +32,7 @@
 						</div>
 					</div>
 					<div class="good-info">
-						<div class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }} 3</div>
+						<div class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</div>
 						<div class="good-price-info">
 							<view class="price" :style="{ color: mainColor }">
 								<span>{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}</span>

components/goods/style4.vue

@@ -20,7 +20,7 @@
 			<view class="tips" v-if="goodsInfo.showGoodsTag"><image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width: 100%;" /></view>
 			<view class="img-box"><image style="width: 100%; height: 100%;" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :src="item.picUrl" /></view>
 			<view class="good-info">
-				<view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }} 4</view>
+				<view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</view>
 				<view class="good-price-info">
 					<view class="price" :style="{ color: mainColor }">{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}</view>
 					<view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">

components/goods/style5.vue

@@ -24,8 +24,8 @@
 				</view>
 			</view>
 			<view class="good-info">
-				<view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }} 5</view>
-				<view class="good-sub-name">{{item.subname}}</view>
+				<view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</view>
+				<view class="good-sub-name" v-if="item.subname">{{item.subname}}</view>
 				<view class="good-price-info">
 					<view class="price" :style="{ color: mainColor }">
 						<view class="good-sub-name" style="flex:1;">{{item.thirdname}}</view>

components/goods/style6.vue

@@ -15,8 +15,8 @@
 				<image style="width: 100%; height: 100%;" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :src="item.picUrl" />
 			</view>
 			<view class="good-info">
-				<view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }} 6</view>
-				<view class="good-sub-name">{{item.subname}}</view>
+				<view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</view>
+				<view class="good-sub-name" v-if="item.subname">{{item.subname}}</view>
 				<view class="good-price-info">
 					<view class="price" :style="{ color: mainColor }">{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}
 						<!-- <span style='text-decoration: line-through;margin-left: 10px;font-size: 10px;color: gray;font-family: aa;'>原价:{{goodsInfo.showGoodsPrice ? getPrice(item.OriginalPrice) : ''}}</span> -->

components/goods/style7.vue

@@ -24,8 +24,8 @@
 				<image class="img-2" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :src="item.picUrl" />
 			</view>
 			<view class="good-info">
-				<view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }} 7</view>
-				<view class="sencond-title">{{item.subname}}</view>
+				<view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }} </view>
+				<view class="sencond-title" v-if="item.subname">{{item.subname}}</view>
 				<view class="good-price-info">
 					<view>
 					  <u-rate

pages/guidecar/index.vue

@@ -7,7 +7,7 @@
 					<view class="arrow" @click="redirectPrev">
 						<u-icon name="arrow-left" size="48" color="#fff"></u-icon>
 					</view>
-					<view class="title">司导专区</view>
+					<view class="title">租车</view>
 					<view class="arrow"></view>
 				</view>
 			</view>
@@ -177,7 +177,7 @@
 			return {
 				info: {},
 				contentHeight: 0,
-				navs:[{Name:'城际专车'},{Name:'定制专车'}],
+				navs:[{Name:'司导专车'},{Name:'景区专车'}],
 				active:0,
 				mainColor: '',
 				scrollTop: 0,

pages/guidecar/pickcarcity2.vue

@@ -124,6 +124,7 @@
 						}
 						this.indexList.push(obj)
 					})
+					this.indexList = this.unique(this.indexList)
 					this.indexList.forEach(x=>{
 						x.children=[];
 						this.cityList.forEach(j=>{
@@ -135,11 +136,22 @@
 						
 					})
 					
+					
 					 uni.hideLoading();
 				  }
 				);
 			},
-		
+			 unique(arr){//数组去重
+			     var res = [];
+			     var obj = {};
+			     for(var i=0; i<arr.length; i++){
+			        if( !obj[arr[i]] ){
+			             obj[arr[i]] = 1;
+			             res.push(arr[i]);
+			         }
+			     } 
+			  return res;
+			 },
 			onPageScroll(e) {
 				this.scrollTop = e.scrollTop;
 			},

pages/hotel/components/hotel-good.vue

@@ -28,7 +28,7 @@
 				</view>
 				<view class="price">
 					<text>￥</text>
-					<text class="money">{{item.B2BPrice}}</text>
+					<text class="money">{{$utils.getretailer()==true? item.B2BPrice:item.SalesPrice}}</text>
 					<text>起</text>
 				</view>
 			</view>

pages/hotel/components/near-good.vue

@@ -26,10 +26,18 @@
 		methods: {
 			//页面跳转
 			goDetail() {
-				// let myDayObj = JSON.stringify(this.dayObj);
-				// uni.navigateTo({
-				// 	url: "/pages/hotel/detail?id=" + id + '&dayObj=' + myDayObj
-				// });
+				//3 景点
+				if(this.goodType==3){
+					uni.navigateTo({
+						url: "/pages/ticketCoupons/detail?id="+this.goodItem.ID,
+					});
+				}
+				//2 美食
+				if(this.goodType==2){
+					uni.navigateTo({
+						url:"/pages/restaurant/detail?id="+this.goodItem.ID
+					});
+				}
 			}
 		}
 	}

pages/hotel/components/recommed-hotel.vue

@@ -27,7 +27,7 @@
 				</view>
 				<view class="price">
 					<text>￥</text>
-					<text class="money">{{item.B2BPrice}}</text>
+					<text class="money">{{$utils.getretailer()==true? item.B2BPrice:item.SalesPrice}}</text>
 					<text>起</text>
 				</view>
 			</view>

pages/hotel/components/room-good.vue

@@ -24,7 +24,7 @@
 				<view class="f11 king" style="margin-top:15rpx;">{{item.IsCancelStr}}</view>
 				<view class="price">
 					<text class="f11" style="margin-right: 10rpx;">￥</text>
-					<text>{{item.B2BPrice}}</text>
+					<text>{{$utils.getretailer()==true? item.B2BPrice:item.SalesPrice}}</text>
 				</view>
 			</view>
 			<view class="rm-opera" v-if="item.Inventory>0&&item.Inventory<5">

pages/hotel/detail.vue

@@ -97,12 +97,12 @@
 					<view class="date-box flex" @click="showTimePopup=true">
 						<view class="date">
 							<text>{{startDay}}</text>
-							<text class="date-week">{{getWeek(roomMsg.StartDate)}}</text>
+							<text class="date-week">{{dayObj.startWeek}}</text>
 						</view>
 						<view class="hr-line"></view>
 						<view class="date">
 							<text>{{endDay}}</text>
-							<text class="date-week">{{getWeek(roomMsg.EndDate)}}</text>
+							<text class="date-week">{{dayObj.endWeek}}</text>
 						</view>
 						<view class="ver-line"></view>
 						<view class="date">
@@ -303,6 +303,27 @@
 				this.endDay = tempDay.endDay;
 				this.day = tempDay.day;
 				this.dayObj = tempDay;
+			}else{
+				let d1 = new Date();
+				let d = new Date();
+				let d2 = new Date(d.setDate(d.getDate() + 1))
+				let startWeek = "周" + "日一二三四五六".charAt(new Date().getDay());
+				let endWeek = "周" + "日一二三四五六".charAt(new Date().getDay()+1);
+				var obj = {
+					start: `${d1.getFullYear()}-${d1.getMonth()+1}-${d1.getDate()}`,
+					end: `${d2.getFullYear()}-${d2.getMonth()+1}-${d2.getDate()}`,
+					startDay: `${d1.getMonth()+1}-${d1.getDate()}`,
+					endDay: `${d2.getMonth()+1}-${d2.getDate()}`,
+					day: 1,
+					startWeek: startWeek,
+					endWeek: endWeek
+				}
+				this.roomMsg.StartDate = obj.start;
+				this.roomMsg.EndDate = obj.end;
+				this.startDay = obj.startDay;
+				this.endDay = obj.endDay;
+				this.day = obj.day;
+				this.dayObj = obj;
 			}
 			if (this.id > 0) {
 				this.getHotelDetail(this.id);

pages/hotel/list.vue

@@ -178,12 +178,16 @@
 			let d1 = new Date();
 			let d = new Date();
 			let d2 = new Date(d.setDate(d.getDate() + 1))
+			let startWeek = "周" + "日一二三四五六".charAt(new Date().getDay());
+			let endWeek = "周" + "日一二三四五六".charAt(new Date().getDay()+1);
 			var obj = {
 				start: `${d1.getFullYear()}-${d1.getMonth()+1}-${d1.getDate()}`,
 				end: `${d2.getFullYear()}-${d2.getMonth()+1}-${d2.getDate()}`,
 				startDay: `${d1.getMonth()+1}-${d1.getDate()}`,
 				endDay: `${d2.getMonth()+1}-${d2.getDate()}`,
-				day: 1
+				day: 1,
+				startWeek: startWeek,
+				endWeek: endWeek
 			}
 			this.dayObj = obj;
 			uni.setStorage({

pages/hotel/order.vue

@@ -3,12 +3,12 @@
 		<view class="hotel-order">
 			<view class="o-head">
 				<view class="o-timer flex">
-					<view class="time-item">{{getDate(dayObj.start)}} {{getWeek(dayObj.end)}}</view>
+					<view class="time-item">{{getDate(dayObj.start)}} {{dayObj.startWeek}}</view>
 					<view class="time-split">
 						<view>{{dayObj.day}}晚</view>
 						<image style="width: 66rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622098352000_930.png" mode="widthFix"></image>
 					</view>
-					<view class="time-item">{{getDate(dayObj.end)}} {{getWeek(dayObj.end)}}</view>
+					<view class="time-item">{{getDate(dayObj.end)}} {{dayObj.endWeek}}</view>
 				</view>
 				<view class="room-name">{{HotelInfo.HotelName}}</view>
 				<view class="room-remark">{{RoomInfo.BreakfastTypeStr}} | {{RoomInfo.BedTypeStr}} | {{RoomInfo.RoomSize}}㎡ |  {{RoomInfo.HasWindowStr}}</view>
@@ -75,7 +75,7 @@
 							<text style="margin-right: 30rpx;">{{item.DateStr}}</text>
 							<text v-if="index!=0">{{item.BreakfastTypeStr}}</text>
 						</view>
-						<view style="text-align: right;" v-if="index!=priceList.length-1">{{orderMsg.RoomNumber}}间 × ¥{{item.B2BPrice}}</view>
+						<view style="text-align: right;" v-if="index!=priceList.length-1">{{orderMsg.RoomNumber}}间 × ¥{{$utils.getretailer()==true? item.B2BPrice:item.SalesPrice}}</view>
 					</view>
 				</view>
 				
@@ -230,7 +230,11 @@
 			CalTotalPrice(){
 				this.orderMsg.Final_Price=0;
 				this.priceList.forEach(x=>{
+					if(this.$utils.getretailer){
 						this.orderMsg.Final_Price += parseInt(this.orderMsg.RoomNumber)*x.B2BPrice;
+					}else{
+						this.orderMsg.Final_Price += parseInt(this.orderMsg.RoomNumber)*x.SalesPrice;
+					}
 				})
 				console.log(this.orderMsg.Final_Price,'this.orderMsg.Final_Price');
 			},

pages/jiuzhai/allorderList.vue

@@ -183,6 +183,7 @@
 					</view>
 		 		</view>
 		 		<u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20" bg-color="#ECF1F4" />
+				<view style="width: 100%;height: 85px;"></view>
 		 	</scroll-view>
 		 </view>
 		 <u-popup v-model="showModal" mode="center" length="80%">
@@ -205,16 +206,17 @@
 		 	</view>
 		 </u-popup>
 		 <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth='goback'></auth>
+		 <tabbar v-if='barshow==1'></tabbar>
 	</view>
 </template>
 
 <script>
 	import auth from "@/components/auth/index.vue";
+	import tabbar from "@/components/tabbar/index";
 	export default{
 		components: {
-			
 			auth,
-			
+			tabbar
 		},
 		data(){
 			return{
@@ -251,10 +253,14 @@
 				index:0,
 				item:{},
 				payindex:0,//支付的索引
+				barshow:0,
 			}
 		},
 		onLoad(options){
 			this.current = options.status || 0;
+			if(options.barshow){
+				this.barshow=options.barshow
+			}
 			let currentPages = getCurrentPages();
 			let u = "/" + currentPages[currentPages.length - 1].route;
 			let pages = wx.getStorageSync("basedata") ?

pages/jiuzhai/jz_Line.vue

@@ -382,16 +382,16 @@
 										{{item.productRecommend}}
 									</view>
 									<view style="margin:10px 0;display: flex;align-items: center;">
-										<view class="start-city">
+										<view class="start-city" style="margin-right: 20rpx;" v-if="item.startCityName">
 											<text>{{item.startCityName}}出发</text>
 										</view>
-										<view style="margin-left: 20rpx;">
+										<view>
 											<u-tag mode="plain" border-color="#DFBE6E" color="#DFBE6E" :text="`${item.dayNum}天`" size="mini"></u-tag>
 										</view>
 									</view>
 									<view class="price">
 										<text>￥</text>
-										<text class="money">{{item.b2BPrice}}</text>
+										<text class="money">{{$utils.getretailer()==true? item.b2BPrice:item.b2CPrice}}</text>
 										<text>起</text>
 									</view>
 								</view>
@@ -544,6 +544,7 @@
 			changeBranch(val) {
 				this.msg.companyId = this.branchList[val].BId
 				this.currentBrachName = this.branchList[val].BName
+				this.research();
 			},
 			setDays(day) {
 				if (day == '<100') {

pages/jiuzhai/jz_LineDetail.vue

@@ -35,7 +35,7 @@
 		</view>
 		<view class="jz_TopPrice">
 			<view class="jz_LineTitle">
-				<text class="jz_renmin">¥</text><text class="jz_B2bPrice">{{dataList.currentPriceInfo.b2BPrice}}</text>
+				<text class="jz_renmin">¥</text><text class="jz_B2bPrice">{{$utils.getretailer()==true? dataList.currentPriceInfo.b2BPrice:dataList.currentPriceInfo.b2CPrice}}</text>
 				<text style="color:#999999;font-size:24rpx;font-weight: 400;"> /人起</text>
 				<text style="color:#999999;font-size:24rpx;font-weight: 400;margin-left: 30rpx;">2728人出游</text>
 			</view>
@@ -81,7 +81,7 @@
 							<text>余</text>
 							<text style="font-size: 28rpx;font-weight: 600;">{{item.remainNum}}</text>
 						</view>
-						<view style="color:#FF3166;font-size:26rpx;">￥{{item.b2BPrice}}</view>
+						<view style="color:#FF3166;font-size:26rpx;">￥{{$utils.getretailer()==true? item.b2BPrice:item.b2CPrice}}</view>
 					</view>
 				</template>
 				<view class="jz_StartList" :class="{'active':delMsg.tcid==customerDate.tcid}" @click="openDate">
@@ -266,7 +266,7 @@
 			<view class="jz_OrderDiv">
 				<view style="color:#FF3166;font-weight:bold;">
 					<text style="font-size:22rpx;">¥</text>
-					<text style="font-size:40rpx;">{{dataList.currentPriceInfo.b2BPrice}}</text>
+					<text style="font-size:40rpx;">{{$utils.getretailer()==true? dataList.currentPriceInfo.b2BPrice:dataList.currentPriceInfo.b2CPrice}}</text>
 					<text style="font-size:22rpx;">/起</text>
 				</view>
 				<view style="display:flex;align-items: center;">

pages/jiuzhai/jz_Reserve.vue

@@ -178,8 +178,12 @@
 			},
 			//计算价格
 			calcMoney() {
-				console.log("orderMsg", this.orderMsg)
-				var price = this.currentPriceInfo.b2BMemberPrice;
+				var price=0;
+				if(this.$utils.getretailer()){
+					price = this.currentPriceInfo.b2BMemberPrice;
+				}else{
+					price = this.currentPriceInfo.b2CMemberPrice;
+				}
 				this.orderMsg.ChirdNum = parseInt(this.orderMsg.ChirdNoBedNum) + parseInt(this.orderMsg.ChirdNeedBedNum);
 				//计算总人数
 				this.total = parseInt(this.orderMsg.ManNum) + parseInt(this.orderMsg.ChirdNum);
@@ -199,18 +203,33 @@
 			//去支付
 			goPay() {
 				this.userInfo = uni.getStorageSync('mall_UserInfo');
+				this.basedataObj = uni.getStorageSync('basedata').mall;
+				var CustomerId = 0;
+				var ContactName = '';
+				var ContactMobile = '';
+				var CustomerType = 3;
+				var price=0;
+				if(this.$utils.getretailer()){
+					CustomerId =  this.basedataObj.virtualB2BCustomerId;
+					CustomerType = 1;
+					price = this.currentPriceInfo.b2BMemberPrice;
+				}else{
+					ContactName =  this.basedataObj.virtualB2CCustomerName;
+					ContactMobile = this.basedataObj.virtualB2CCustomerTel;
+					price = this.currentPriceInfo.b2CMemberPrice;
+				}
 				let msg = {
 					OrderId: 0,
 					TCID: this.currentPriceInfo.tcid,
-					CustomerType: 1,
+					CustomerType: CustomerType,
 					GroupType: 1,
-					ContactName: '陕西中旅南二环分公司',
-					ContactMobile: '18602977416',
-					CustomerId: '49',
+					ContactName: ContactName,
+					ContactMobile: ContactMobile,
+					CustomerId: CustomerId,
 					DepartureCityId: 262,
 					IsIntermodal: 2,
-					Unit_Price: this.currentPriceInfo.b2BMemberPrice,
-					TC_Price: this.currentPriceInfo.b2BMemberPrice,
+					Unit_Price: price,
+					TC_Price: price,
 					ManNum: this.orderMsg.ManNum,
 					ChirdNum: this.orderMsg.ChirdNum,
 					ChirdNeedBedNum: this.orderMsg.ChirdNeedBedNum,

pages/restaurant/detail.vue

@@ -165,18 +165,19 @@
 	export default {
 		data() {
 			return {
-				imgsList: [{
-						picUrl: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622459632000_216.png"
-					},
-					{
-						picUrl: "https://ak-d.tripcdn.com/images/t1/hotel/533000/532930/3fcc6398b3c44c08bb1b57aef579793e_R_1080_808_R5_D.jpg"
-					},
-					{
-						picUrl: "https://ak-d.tripcdn.com/images/20010r000000hmqk32EF2_R_1080_808_R5_D.jpg"
-					},
-					{
-						picUrl: "https://ak-d.tripcdn.com/images/200v0f0000007d6wgBCD6_R_1080_808_R5_D.jpg"
-					}
+				imgsList: [
+					// {
+					// 	picUrl: "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622459632000_216.png"
+					// },
+					// {
+					// 	picUrl: "https://ak-d.tripcdn.com/images/t1/hotel/533000/532930/3fcc6398b3c44c08bb1b57aef579793e_R_1080_808_R5_D.jpg"
+					// },
+					// {
+					// 	picUrl: "https://ak-d.tripcdn.com/images/20010r000000hmqk32EF2_R_1080_808_R5_D.jpg"
+					// },
+					// {
+					// 	picUrl: "https://ak-d.tripcdn.com/images/200v0f0000007d6wgBCD6_R_1080_808_R5_D.jpg"
+					// }
 				],
 				ID: 0,
 				details: {},
@@ -329,6 +330,14 @@
 							res.data.FoodTag = res.data.FoodTag.split(',')
 							res.data.GeographicTag = res.data.GeographicTag.split(',')
 							this.details = res.data;
+							
+							this.imgsList=[]
+							res.data.AllPicList[0].TagPicList.map(i=>{
+								let obj={
+									picUrl:i.Path
+								}
+								this.imgsList.push(obj)
+							})
 						}
 					}
 				);

pages/restaurant/list.vue

@@ -11,7 +11,10 @@
 				<u-dropdown-item v-model="msg.OrderBy" :title="optionsTitle[0]" :options="options1" @change="getFoodList">
 				</u-dropdown-item>
 				
-				<u-dropdown-item v-model="msg.FoodTypeIds" :title="optionsTitle[1]" :options="classOptions" @change="getFoodList">
+				<u-dropdown-item v-model="msg.FoodTypeIds" :title="optionsTitle[1]"  @change="getFoodList">
+					<view class="slot-content">
+						<restaurant-type @sure-type="sureType" :current="currentTypeObj"></restaurant-type>
+					</view>
 				</u-dropdown-item>
 				<u-dropdown-item :title="optionsTitle[2]">
 					<view class="slot-content" style="padding: 30rpx;background-color: #FFF;">
@@ -301,13 +304,14 @@
 				this.getFoodList();
 				this.closeDropdown();
 			},
-			// sureType(item){
+			sureType(item){
+				console.log(item)
 				// this.searchObj.rtype=item.Id
 				// this.optionsTitle[1]=item.Id==-1?'菜系':item.Name
-			// 	this.closeDropdown();
+				this.closeDropdown();
 				// item.newTimespan=this.rand(1000,9999)
 				// this.currentTypeObj=item
-			// },
+			},
 			// rangechange4(e){
 			// 	if(e.minValue==0){
 			// 		if(e.maxValue==1000){

pages/ticketCoupons/components/buyNotice.vue

@@ -3,7 +3,7 @@
 		<scroll-view scroll-y="true" style="width: 100%;height: 100%; padding: 44rpx 0;" @scroll="scroll">
 			<view class="notice-box">
 				<view class="base-info">
-					<image class="left" :src="imgBaseUrl+coverImg" mode="aspectFit"></image>
+					<image class="left" :src="coverImg" mode="aspectFill"></image>
 					<view class="right">
 						<view class="name">
 							{{TicketData.TicketSubName}}({{TicketData.TicketName}})

pages/ticketCoupons/components/njzz-calendar/njzz-calendar.vue

@@ -25,7 +25,7 @@
 			<view class="day" v-for="(item,index) in space" v-bind:key="index"></view>
 			<view class="day" :class="[getDateStr(item.date)==getDateStr(dayActive.date)?'active':'']" v-for="(item,index) in dayList" v-bind:key="index" @tap="selectDate(item)">
 				<view :class="[isToday(item.date)?'today':'']">{{isToday(item.date) ? "今天" : item.date.getDate()}}</view>
-				<view class="calen-text-orange">{{item.price?'&yen;'+item.price:''}}</view>
+				<view class="calen-text-orange">{{item.price||item.price===0?'&yen;'+item.price:''}}</view>
 			</view>
 		</view>
 	</view>

pages/ticketCoupons/detail.vue

 <template>
 	<view style="height: 100vh; overflow: hidden;width:100vw;">
 		<scroll-view scroll-y="true" style="width: 100%;height: 100%;" @scroll="scroll">
-			<view style="height: 700rpx;position: relative;z-index: 1;" :style="{'opacity':(100-boxOption)+'%'}">
+			<view style="height: 500rpx;position: relative;z-index: 1;background-color: #E7E7E7;" :style="{'opacity':(100-boxOption)+'%'}">
 				<view @click="goback" :style="[titleStyle,{opacity:'100% !important'}]"
 					style="position: fixed;top: 0;left: 0;z-index: 9; padding-left: 6rpx;">
 					<u-icon name="arrow-left" size="44" color="#000" style="margin-top: 22rpx;"></u-icon>
 				</view>
-				<image class="banner-img" :src="details.AllPicList[0].TagPicList[0].Path" mode="aspectFit"
+				<image class="banner-img" :src="details.AllPicList[0].TagPicList[0].Path" mode="aspectFill"
 					@click="goUrl('/pages/ticketCoupons/imgList')"></image>
 			</view>
 			<view class="ticket-title" :style="[titleStyleFix]">
@@ -416,7 +416,7 @@
 <style lang="scss" scoped>
 	.banner-img {
 		width: 750rpx;
-		height: 700rpx;
+		height: 500rpx;
 	}
 
 	.ticket-title {
@@ -798,7 +798,8 @@
 
 					.tag {
 						display: flex;
-						height: 32rpx;
+						max-width: 70%;
+						// height: 32rpx;
 						margin-bottom: 20rpx;
 
 						.tag-img {

pages/ticketCoupons/imgList.vue

@@ -2,16 +2,16 @@
 	<view class="img-list">
 		<view class="img-navs">
 			<view v-for="(item,index) in navList" :key="index" class="nav-btn" :class="{'check-nav':index===curNavIndex,'last-nav':index===navList.length-1}" @click="changeNav(index)">
-				{{item.TagName}}
+				{{item.TagName||'其他'}}
 			</view>
 		</view>
 		  <view class="img-list-box">
-			<view v-for="(item,index) in dataList.TagPicList" :key="item.ID" class="img-list-item" @click="">
+			<view v-for="(item,index) in dataList.TagPicList" :key="item.ID" class="img-list-item" :style="{'margin-right':index%2 ==0?'20rpx':0}">
 				<view class="img-box" @click="previewImage(index,item.Path)" v-if="item.type==='image'">
-					<image :src="imgBaseUrl+item.Path" mode="aspectFit" :style="{'margin-right':index%2 ==0?'20rpx':0}"></image>
+					<image :src="item.Path" mode="aspectFill" ></image>
 				</view>	
 				<view class="img-box" style="position: relative" v-if="item.type==='video'">
-					<video id="myVideo" :src="imgBaseUrl+item.Path"
+					<video id="myVideo" :src="item.Path"
 					:controls='controls' 
 					:show-center-play-btn='false'
 					:show-fullscreen-btn='false' 
@@ -77,7 +77,7 @@
 							this.navList = res.data.AllPicList;
 							this.dataList=res.data.AllPicList[index]
 							this.dataList.TagPicList.forEach(item=>{
-								if(item.Path.indexOf('jpg')!==-1||item.Path.indexOf('png')!==-1||item.Path.indexOf('JPEG')!==-1){
+								if(item.Path.indexOf('jpg')!==-1||item.Path.indexOf('png')!==-1||item.Path.indexOf('jpeg')!==-1){
 									item.type='image'
 								}else if(item.Path.indexOf('mp4')!==-1){
 									item.type='video'
@@ -91,12 +91,20 @@
 		    },
 			changeNav(index){
 				this.curNavIndex=index
-				this.getDetail(index)
+				this.dataList=this.navList[index]
+				this.dataList.TagPicList.forEach(item=>{
+					if(item.Path.indexOf('jpg')!==-1||item.Path.indexOf('png')!==-1||item.Path.indexOf('jpeg')!==-1){
+						item.type='image'
+					}else if(item.Path.indexOf('mp4')!==-1){
+						item.type='video'
+					}
+					
+				})
 			},
 			//预览图片
 			previewImage(i,url) {
 				uni.previewImage({
-					urls: [this.imgBaseUrl+url],
+					urls: [url],
 					current: i,
 					longPressActions: {
 						itemList: ["发送给朋友", "保存图片", "收藏"],
@@ -118,13 +126,13 @@
 				
 			},
 			videoControl(e){
-				if(e.detail.fullScreen===false){
-					this.videoContext.stop()
-					this.controls=false
-				}else{
-					this.videoContext.play()
-					this.controls=true
-				}
+				// if(e.detail.fullScreen===false){
+				// 	this.videoContext.stop()
+				// 	this.controls=false
+				// }else{
+				// 	this.videoContext.play()
+				// 	this.controls=true
+				// }
 				console.log(e.detail)
 			},
 	    }
@@ -135,11 +143,12 @@
 	.img-list{
 		.img-navs{
 			display: flex;
-			padding: 20rpx 45rpx;
+			margin: 0 45rpx;
+			padding: 20rpx 0;
 			overflow-x: scroll;
 			overflow-y: hidden;
 			.nav-btn{
-				width: 230rpx;
+				// width: 230rpx;
 				height: 60rpx;
 				background-color: #FFFFFF;
 				border: 1rpx solid #111111;
@@ -147,8 +156,10 @@
 				font-family: PingFang SC;
 				font-weight: 500;
 				text-align: center;
-				line-height: 60rpx;
+				line-height: 58rpx;
+				padding: 0 20rpx;
 				margin-right: 30rpx;
+				white-space: nowrap;
 			}
 			.check-nav{
 				background-color: #111111;
@@ -160,20 +171,20 @@
 		}
 		.img-list-box{
 			padding: 0 45rpx;
+			display: flex;
+			flex-wrap: wrap;
 			.img-list-item{
+				width: 315rpx;
+				margin-bottom: 20rpx;
 				.img-box{
 					width: 315rpx;
 					height: 315rpx;
 					background-color: #E7E7E7;
 					border-radius: 20rpx;
 					overflow: hidden;
-					display: flex;
-					justify-content: space-between;
 					image{
 						width: 100%;
 						height: 100%;
-						// margin-right: 20rpx;
-						margin-bottom: 20rpx;
 					}
 					#myVideo{
 						width: 100%;

pages/ticketCoupons/list.vue

@@ -24,6 +24,7 @@
 					 <view class="slot-btn" :class="{'check-btn':msg.IsFree!=-1}" @click="changeScreen('IsFree')">是否免费</view>
 					 <view class="slot-btn" :class="{'check-btn':msg.IsSameDayBuy!=-1}" @click="changeScreen('IsSameDayBuy')">是否闪入园</view>
 					 <view class="slot-btn" :class="{'check-btn':msg.IsWorryFreeRefund!=-1}" @click="changeScreen('IsWorryFreeRefund')">是否无忧退款</view>					
+					 <view class="" style="display: flex;width: 100%;">
 					 	<view style="flex:1;margin-right: 30rpx;">
 					 		<u-button :custom-style="btnStyle" @click="resetPrice">重置</u-button>
 					 	</view>
@@ -32,6 +33,8 @@
 					 	</view>
 					 </view>
 					 
+				</view> 
+					 
 				</u-dropdown-item>
 			</u-dropdown>
 		</view>
@@ -48,7 +51,7 @@
 		  <view class="ticket-list">
 			<view v-for="(item,index) in dataList" :key="item.ID" class="ticket-list-item" @click="goDetail(item.ID)">
 				
-				<image class="left-box" :src="item.CoverImg" mode="aspectFit"></image>
+				<image class="left-box" :src="item.CoverImg" mode="aspectFill"></image>
 				
 				<view class="right-box">
 					<view class="ticket-name">

plugin/api.js

 export default {
 	install(Vue, options) {
 		Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
-		// Vue.prototype.host2 = "http://192.168.0.110:8200"
-		// Vue.prototype.host2 = "https://mallApi.oytour.com"	
-		// Vue.prototype.host2 = "http://192.168.1.5:8088"
-		// Vue.prototype.host2 = "http://192.168.20.17:8014"
-		Vue.prototype.host2 = "http://192.168.20.24:8400"
-		// Vue.prototype.host2 = "http://testmall.oytour.com/"
-		Vue.prototype.host3 = "http://reborn.oytour.com"
-		// Vue.prototype.host3 = "http://192.168.20.24"
 		
+		//Vue.prototype.host2 = "https://localhost:5001"
+		 Vue.prototype.host2 = "https://erpmallapi.oytour.com"
+		//Vue.prototype.host3 = "http://192.168.20.24"
+		Vue.prototype.host3 = "https://reborn.oytour.com"
 	    
 		Vue.prototype.request = function(param, success, failed) {
 			//网络请求