Skip to content

J
jz_Travel
Commit c1d679a8 authored by 罗超's avatar 罗超
Browse files
Options

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

parents 93823e4a eb76a067
Show whitespace changes
Inline Side-by-side
Showing with 77 additions and 35 deletions
components/goods/style1.vue
View file @ c1d679a8
......@@ -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/style4.vue
View file @ c1d679a8
......@@ -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
View file @ c1d679a8
......@@ -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
View file @ c1d679a8
......@@ -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
View file @ c1d679a8
......@@ -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
View file @ c1d679a8
......@@ -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
View file @ c1d679a8
......@@ -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/near-good.vue
View file @ c1d679a8
......@@ -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/detail.vue
View file @ c1d679a8
......@@ -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
View file @ c1d679a8
......@@ -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
View file @ c1d679a8
......@@ -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>
......
pages/jiuzhai/jz_Line.vue
View file @ c1d679a8
......@@ -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
View file @ c1d679a8
......@@ -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;">
......
plugin/api.js
View file @ c1d679a8
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) {
//网络请求
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment