Skip to content

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

1

parent 702483d7
Show whitespace changes
Inline Side-by-side
Showing with 734 additions and 561 deletions
components/educationteacher/style1.vue
View file @ 9b151619
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
:style="{ :style="{
'background-color': goodsInfo.backgroundColor, 'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl, 'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : '' 'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : '',
}" }"
> >
<view <view
...@@ -14,55 +14,85 @@ ...@@ -14,55 +14,85 @@
:key="gli" :key="gli"
:style="{ :style="{
border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '', border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : '' background:
goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : '',
}" }"
> >
<view class="list-box" > <view class="list-box">
<view class="img-box"> <view class="img-box">
<image style="width: 100%; height: 100%; border-radius: 50%;" mode="aspectFill" :src="item.picUrl" /> <image
style="width: 100%; height: 100%; border-radius: 50%"
mode="aspectFill"
:src="item.picUrl"
/>
</view> </view>
<view class="textone" style="font-size: 14px;font-weight: bold;margin: 5px 0;">{{item.name}}</view> <view
<view style="display: flex;align-items: center;margin-top: 5px;margin-bottom: 14px;"> class="textone"
<image style="width: 23px; height: 15px;margin-right: 5px;" mode="aspectFill" :src="item.foreignersUrl" /> style="font-size: 14px; font-weight: bold; margin: 5px 0"
<text >{{item.nationality}}</text> >{{ item.name }}</view
>
<view
style="
display: flex;
align-items: center;
margin-top: 5px;
margin-bottom: 14px;
"
>
<image
style="width: 23px; height: 15px; margin-right: 5px"
mode="aspectFill"
:src="item.foreignersUrl"
/>
<text>{{ item.nationality }}</text>
</view> </view>
<view class="textone"> <view class="textone">
<text v-for="(x, y) in item.lableNameList" :key="y" v-if="item.lableNameList!=null && item.lableNameList.length>0"> <text
{{x}}{{item.lableNameList.length==y+1?'':'、'}} v-for="(x, y) in item.lableNameList"
:key="y"
v-if="item.lableNameList != null && item.lableNameList.length > 0"
>
{{ x }}{{ item.lableNameList.length == y + 1 ? "" : "、" }}
</text> </text>
<text v-if="item.lableNameList==null || item.lableNameList.length==0"> <text
v-if="item.lableNameList == null || item.lableNameList.length == 0"
>
教育 教育
</text> </text>
</view> </view>
</view> </view>
</view> </view>
<good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku> <good-sku
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth> v-if="showSku"
:option-type="2"
borderRadius="20"
v-model="showSku"
:good="sku"
></good-sku>
<auth
v-if="showAuth"
@changeuserinfo="reloadUserinfo"
@gbAuth="gbAuth"
></auth>
</view> </view>
</template> </template>
<script> <script>
import goodSku from '../goods/goodsku'; import goodSku from "../goods/goodsku";
import auth from '@/components/auth/index.vue'; import auth from "@/components/auth/index.vue";
export default { export default {
components: { components: {
goodSku, goodSku,
auth auth,
}, },
props: ['goodList', 'goodsInfo'], props: ["goodList", "goodsInfo"],
data() { data() {
return { return {
mainColor: '', mainColor: "",
activeKey: 0, activeKey: 0,
showSku: false, showSku: false,
sku: {}, sku: {},
showAuth: false, showAuth: false,
u: {} u: {},
}; };
}, },
created() { created() {
...@@ -70,14 +100,13 @@ export default { ...@@ -70,14 +100,13 @@ export default {
}, },
methods: { methods: {
openGood(item) { openGood(item) {
uni.navigateTo({ url: '/pages/school/teacherDetails?ID=' + item.id }); uni.navigateTo({ url: "/pages/school/teacherDetails?ID=" + item.id });
},
}, },
}
}; };
</script> </script>
<style> <style scoped>
.her-scoller { .her-scoller {
overflow-x: auto !important; overflow-x: auto !important;
padding: 12px; padding: 12px;
...@@ -96,25 +125,29 @@ export default { ...@@ -96,25 +125,29 @@ export default {
border: 1rpx solid transparent; border: 1rpx solid transparent;
border-radius: 10rpx; border-radius: 10rpx;
padding: 10px; padding: 10px;
display:inline-block; display: inline-block;
box-shadow: 0 5px 10upx rgba(0, 0, 0, 0.1); box-shadow: 0 5px 10upx rgba(0, 0, 0, 0.1);
background: #FFF; background: #fff;
/* float: left; */ /* float: left; */
} }
.her-scoller .good-five .img-box { .her-scoller .good-five .img-box {
width: 40px; width: 40px;
height: 40px; height: 40px;
border-radius: 50%; border-radius: 50%;
} }
.list-box{ .list-box {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
font-size: 12px;color: #333F53; font-size: 12px;
color: #333f53;
} }
.textone{ .textone {
width: 100%;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;text-align: center; width: 100%;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
text-align: center;
} }
</style> </style>
components/goods/style2.vue
View file @ 9b151619
<template> <template>
<view <view
style="padding: 12px; padding-bottom: 0;" style="padding: 12px; padding-bottom: 0"
:style="{ :style="{
'background-color': goodsInfo.backgroundColor, 'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl, 'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : '' 'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : '',
}" }"
> >
<u-row gutter="24"> <u-row gutter="24">
...@@ -13,11 +13,20 @@ ...@@ -13,11 +13,20 @@
class="good-two" class="good-two"
@click="openGood(item)" @click="openGood(item)"
:style="{ :style="{
border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '', border:
background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : '' goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background:
goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2
? '#FFF'
: '',
}" }"
> >
<view class="tips" v-if="goodsInfo.showGoodsTag"><image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width:100%" /></view> <view class="tips" v-if="goodsInfo.showGoodsTag"
><image
:src="goodsInfo.goodsTagPicUrl"
mode="widthFix"
style="width: 100%"
/></view>
<view class="img-box"> <view class="img-box">
<view class="img-show"> <view class="img-show">
<image <image
...@@ -32,30 +41,58 @@ ...@@ -32,30 +41,58 @@
</view> </view>
</view> </view>
<view class="good-info"> <view class="good-info">
<view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</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-sub-name" v-if="item.subname">{{item.subname}}</view> -->
<view class="good-sub-name" style="height:30rpx;"> <view class="good-sub-name" style="height: 30rpx">
<template v-if="item.subname">{{item.subname}}</template> <template v-if="item.subname">{{ item.subname }}</template>
</view> </view>
<view class="good-price-info"> <view class="good-price-info">
<view class="price"> <view class="price">
{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }} {{ 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> --> <!-- <span style='text-decoration: line-through;margin-left: 10px;font-size: 10px;color: gray;font-family: aa;'>原价:{{goodsInfo.showGoodsPrice ? getPrice(item.OriginalPrice) : ''}}</span> -->
</view> </view>
<view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)"> <view
<u-icon name="cart-o" size="40" :color="mainColor" v-if="goodsInfo.buyBtn == 'cart'" /> class="buy"
<u-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" /> v-if="goodsInfo.showBuyBtn"
@click.stop="showSkuHandler(item)"
>
<u-icon
name="cart-o"
size="40"
:color="mainColor"
v-if="goodsInfo.buyBtn == 'cart'"
/>
<u-icon
name="add-o"
size="40"
:color="mainColor"
v-else-if="goodsInfo.buyBtn == 'add'"
/>
<u-button <u-button
type="primary" type="primary"
size="mini" size="mini"
:ripple="true" :ripple="true"
:color="goodsInfo.buttonColor" :color="goodsInfo.buttonColor"
:custom-style="{ :custom-style="{
'backgroundColor':goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ?'#FFF' : goodsInfo.buttonColor , backgroundColor:
'color':goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF' goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4
? '#FFF'
: goodsInfo.buttonColor,
color:
goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4
? goodsInfo.buttonColor
: '#FFF',
}" }"
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4" :plain="
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'" goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4
"
:shape="
goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4
? 'circle'
: 'square'
"
v-else v-else
> >
{{ goodsInfo.buyBtnText }} {{ goodsInfo.buyBtnText }}
...@@ -67,27 +104,37 @@ ...@@ -67,27 +104,37 @@
</u-col> </u-col>
</u-row> </u-row>
<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku> <good-sku
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth> v-if="showSku"
borderRadius="20"
v-model="showSku"
:good="sku"
:option-type="2"
></good-sku>
<auth
v-if="showAuth"
@changeuserinfo="reloadUserinfo"
@gbAuth="gbAuth"
></auth>
</view> </view>
</template> </template>
<script> <script>
import goodSku from '../goods/goodsku'; import goodSku from "../goods/goodsku";
import auth from '@/components/auth/index.vue'; import auth from "@/components/auth/index.vue";
export default { export default {
components: { components: {
goodSku, goodSku,
auth auth,
}, },
props: ['goodList', 'goodsInfo'], props: ["goodList", "goodsInfo"],
data() { data() {
return { return {
mainColor: '', mainColor: "",
activeKey: 0, activeKey: 0,
showSku: false, showSku: false,
sku: {}, sku: {},
showAuth: false, showAuth: false,
u: {} u: {},
}; };
}, },
created() { created() {
...@@ -97,38 +144,42 @@ export default { ...@@ -97,38 +144,42 @@ export default {
openGood(item) { openGood(item) {
//线路 //线路
if (item.goodType == 4) { if (item.goodType == 4) {
var url="/pages/jiuzhai/jz_LineDetail?tcid=" + item.id + '&configId=' + item.subid; var url =
console.log("url2",url) "/pages/jiuzhai/jz_LineDetail?tcid=" +
item.id +
"&configId=" +
item.subid;
console.log("url2", url);
uni.navigateTo({ uni.navigateTo({
url: url url: url,
}); });
} }
//酒店 //酒店
else if (item.goodType == 1) { else if (item.goodType == 1) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/hotel/detail?id=" + item.id url: "/pages/hotel/detail?id=" + item.id,
}); });
} }
//餐食 //餐食
else if (item.goodType == 2) { else if (item.goodType == 2) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/restaurant/detail?id=' + item.id url: "/pages/restaurant/detail?id=" + item.id,
}); });
} }
//景点 //景点
else if (item.goodType == 3) { else if (item.goodType == 3) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/ticketCoupons/detail?id=' + item.id url: "/pages/ticketCoupons/detail?id=" + item.id,
}); });
} }
}, },
showSkuHandler(g) { showSkuHandler(g) {
this.sku = g; this.sku = g;
this.u = uni.getStorageSync('mall_UserInfo'); this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) { if (!this.u) {
this.u = { this.u = {
nickName: '未登录', nickName: "未登录",
avatarUrl: '' avatarUrl: "",
}; };
this.showAuth = true; this.showAuth = true;
} else { } else {
...@@ -136,18 +187,18 @@ export default { ...@@ -136,18 +187,18 @@ export default {
} }
}, },
reloadUserinfo() { reloadUserinfo() {
this.u = uni.getStorageSync('mall_UserInfo'); this.u = uni.getStorageSync("mall_UserInfo");
// this.showAuth = false; // this.showAuth = false;
}, },
//关闭登录窗口 //关闭登录窗口
gbAuth() { gbAuth() {
this.showAuth = false; this.showAuth = false;
} },
} },
}; };
</script> </script>
<style> <style scoped>
.good-two { .good-two {
position: relative; position: relative;
margin-bottom: 12px; margin-bottom: 12px;
...@@ -228,7 +279,7 @@ export default { ...@@ -228,7 +279,7 @@ export default {
flex-direction: row-reverse; flex-direction: row-reverse;
} }
.good-two .good-info .good-price-info .price { .good-two .good-info .good-price-info .price {
color: #FF3166; color: #ff3166;
/* flex: 1; */ /* flex: 1; */
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
......
components/goods/style5.vue
View file @ 9b151619
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
:style="{ :style="{
'background-color': goodsInfo.backgroundColor, 'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl, 'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : '' 'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : '',
}" }"
> >
<view <view
...@@ -14,39 +14,75 @@ ...@@ -14,39 +14,75 @@
:key="gli" :key="gli"
:style="{ :style="{
border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '', border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : '' background:
goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : '',
}" }"
> >
<view class="tips" v-if="goodsInfo.showGoodsTag"><image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width:100%" /></view> <view class="tips" v-if="goodsInfo.showGoodsTag"
><image
:src="goodsInfo.goodsTagPicUrl"
mode="widthFix"
style="width: 100%"
/></view>
<view class="img-box"> <view class="img-box">
<view class="img-show"> <view class="img-show">
<image style="width: 100%; height: 100%; border-radius: 10rpx 10rpx 0 0;" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :src="item.picUrl" /> <image
style="width: 100%; height: 100%; border-radius: 10rpx 10rpx 0 0"
:mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'"
:src="item.picUrl"
/>
</view> </view>
</view> </view>
<view class="good-info"> <view class="good-info">
<view class="good-name" v-if="goodsInfo.showGoodsName">{{ item.name }}</view> <view class="good-name" v-if="goodsInfo.showGoodsName">{{
<view class="good-sub-name" v-if="item.subname">{{item.subname}}</view> item.name
}}</view>
<view class="good-sub-name" v-if="item.subname">{{
item.subname
}}</view>
<view class="good-price-info"> <view class="good-price-info">
<view class="price" :style="{ color: mainColor }"> <view class="price" :style="{ color: mainColor }">
<view class="good-sub-name" style="flex:1;">{{item.thirdname}}</view> <view class="good-sub-name" style="flex: 1">{{
<span style="color: #111;"> item.thirdname
{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }} }}</view>
<span style="color: #111">
{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : "" }}
</span> </span>
<!-- <span style='text-decoration: line-through;font-size: 10px;color: gray;font-family: aa;'>原价:{{goodsInfo.showGoodsPrice ? getPrice(item.OriginalPrice) : ''}}</span> --> <!-- <span style='text-decoration: line-through;font-size: 10px;color: gray;font-family: aa;'>原价:{{goodsInfo.showGoodsPrice ? getPrice(item.OriginalPrice) : ''}}</span> -->
</view> </view>
<view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)"> <view
<u-icon name="cart-o" size="40" :color="mainColor" v-if="goodsInfo.buyBtn == 'cart'" /> class="buy"
<u-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" /> v-if="goodsInfo.showBuyBtn"
@click.stop="showSkuHandler(item)"
>
<u-icon
name="cart-o"
size="40"
:color="mainColor"
v-if="goodsInfo.buyBtn == 'cart'"
/>
<u-icon
name="add-o"
size="40"
:color="mainColor"
v-else-if="goodsInfo.buyBtn == 'add'"
/>
<u-button <u-button
type="primary" type="primary"
size="mini" size="mini"
:ripple="true" :ripple="true"
:color="goodsInfo.buttonColor" :color="goodsInfo.buttonColor"
:custom-style=" :custom-style="`backgroundColor:${goodsInfo.buttonColor},color:${
`backgroundColor:${goodsInfo.buttonColor},color:${goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'}` goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4
" ? goodsInfo.buttonColor
: '#FFF'
}`"
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4" :plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4"
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'" :shape="
goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4
? 'circle'
: 'square'
"
v-else v-else
> >
{{ goodsInfo.buyBtnText }} {{ goodsInfo.buyBtnText }}
...@@ -55,27 +91,37 @@ ...@@ -55,27 +91,37 @@
</view> </view>
</view> </view>
</view> </view>
<good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku> <good-sku
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth> v-if="showSku"
:option-type="2"
borderRadius="20"
v-model="showSku"
:good="sku"
></good-sku>
<auth
v-if="showAuth"
@changeuserinfo="reloadUserinfo"
@gbAuth="gbAuth"
></auth>
</view> </view>
</template> </template>
<script> <script>
import goodSku from '../goods/goodsku'; import goodSku from "../goods/goodsku";
import auth from '@/components/auth/index.vue'; import auth from "@/components/auth/index.vue";
export default { export default {
components: { components: {
goodSku, goodSku,
auth auth,
}, },
props: ['goodList', 'goodsInfo'], props: ["goodList", "goodsInfo"],
data() { data() {
return { return {
mainColor: '', mainColor: "",
activeKey: 0, activeKey: 0,
showSku: false, showSku: false,
sku: {}, sku: {},
showAuth: false, showAuth: false,
u: {} u: {},
}; };
}, },
created() { created() {
...@@ -85,38 +131,42 @@ export default { ...@@ -85,38 +131,42 @@ export default {
openGood(item) { openGood(item) {
//线路 //线路
if (item.goodType == 4) { if (item.goodType == 4) {
var url="/pages/jiuzhai/jz_LineDetail?tcid=" + item.id + '&configId=' + item.subid; var url =
console.log("url5",url) "/pages/jiuzhai/jz_LineDetail?tcid=" +
item.id +
"&configId=" +
item.subid;
console.log("url5", url);
uni.navigateTo({ uni.navigateTo({
url: url url: url,
}); });
} }
//酒店 //酒店
else if (item.goodType == 1) { else if (item.goodType == 1) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/hotel/detail?id=" + item.id url: "/pages/hotel/detail?id=" + item.id,
}); });
} }
//餐食 //餐食
else if (item.goodType == 2) { else if (item.goodType == 2) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/restaurant/detail?id=' + item.id url: "/pages/restaurant/detail?id=" + item.id,
}); });
} }
//景点 //景点
else if (item.goodType == 3) { else if (item.goodType == 3) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/ticketCoupons/detail?id=' + item.id url: "/pages/ticketCoupons/detail?id=" + item.id,
}); });
} }
}, },
showSkuHandler(g) { showSkuHandler(g) {
this.sku = g; this.sku = g;
this.u = uni.getStorageSync('mall_UserInfo'); this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) { if (!this.u) {
this.u = { this.u = {
nickName: '未登录', nickName: "未登录",
avatarUrl: '' avatarUrl: "",
}; };
this.showAuth = true; this.showAuth = true;
} else { } else {
...@@ -124,18 +174,18 @@ export default { ...@@ -124,18 +174,18 @@ export default {
} }
}, },
reloadUserinfo() { reloadUserinfo() {
this.u = uni.getStorageSync('mall_UserInfo'); this.u = uni.getStorageSync("mall_UserInfo");
// this.showAuth = false; // this.showAuth = false;
}, },
//关闭登录窗口 //关闭登录窗口
gbAuth() { gbAuth() {
this.showAuth = false; this.showAuth = false;
} },
} },
}; };
</script> </script>
<style> <style scoped>
.her-scoller { .her-scoller {
overflow-x: auto !important; overflow-x: auto !important;
padding: 12px; padding: 12px;
...@@ -150,16 +200,11 @@ export default { ...@@ -150,16 +200,11 @@ export default {
.her-scoller .good-five { .her-scoller .good-five {
position: relative; position: relative;
margin-right: 30rpx; margin-right: 30rpx;
/* width: 30%; */ display: inline-block;
/* border: 1rpx solid transparent;
border-radius: 10rpx;
padding-bottom: 10rpx; */
display:inline-block;
width: 560rpx; width: 560rpx;
height: 368rpx;
box-shadow: 0px 10px 30px 0px rgba(36, 36, 36, 0.2); box-shadow: 0px 10px 30px 0px rgba(36, 36, 36, 0.2);
border-radius: 20rpx; border-radius: 20rpx;
/* float: left; */
} }
.her-scoller .good-five .tips { .her-scoller .good-five .tips {
width: 64rpx; width: 64rpx;
...@@ -185,7 +230,7 @@ export default { ...@@ -185,7 +230,7 @@ export default {
bottom: 0; bottom: 0;
right: 0; right: 0;
width: 100%; width: 100%;
height: 100%; height: 224rpx;
overflow: hidden; overflow: hidden;
z-index: 2; z-index: 2;
} }
...@@ -214,7 +259,7 @@ export default { ...@@ -214,7 +259,7 @@ export default {
width: 100%; width: 100%;
font-weight: 600; font-weight: 600;
} }
.her-scoller .good-five .good-info .good-sub-name{ .her-scoller .good-five .good-info .good-sub-name {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: block; display: block;
......
pages/jiuzhai/jz_LineDetail.vue
View file @ 9b151619
...@@ -42,21 +42,20 @@ ...@@ -42,21 +42,20 @@
</view> </view>
</view> </view>
</view> </view>
<!-- #ifdef MP-WEIXIN -->
<view <view
@click="goback" @click="goback"
:style="[titleStyle, { opacity: '100% !important' }]" :style="[titleStyle, { opacity: '100% !important' }]"
style="position: fixed; top: 0; left: 0; padding-left: 6rpx" style="position: fixed; top: 0; left: 0; padding-left: 6rpx"
> >
<!-- #ifdef MP-WEIXIN -->
<u-icon <u-icon
name="arrow-left" name="arrow-left"
size="44" size="44"
color="#FFF" color="#FFF"
style="margin-top: 22rpx" style="margin-top: 22rpx"
></u-icon> ></u-icon>
<!-- #endif -->
</view> </view>
<!-- #endif -->
</view> </view>
<view class="top-title" :style="[titleStyle]"> <view class="top-title" :style="[titleStyle]">
<view @click="goback"> <view @click="goback">
...@@ -892,12 +891,11 @@ ...@@ -892,12 +891,11 @@
<view class="jz_OrderDiv"> <view class="jz_OrderDiv">
<view style="color: #ff3166; font-weight: bold"> <view style="color: #ff3166; font-weight: bold">
<text style="font-size: 22rpx">¥</text> <text style="font-size: 22rpx">¥</text>
<text style="font-size: 40rpx">{{ <text style="font-size: 40rpx"
$utils.getretailer() == true >{{ $utils.getretailer() == true
<!-- b2b --> <!-- b2b -->
? currentPrice.b2CPrice ? currentPrice.b2CPrice : currentPrice.b2CPrice }}</text
: currentPrice.b2CPrice >
}}</text>
<text style="font-size: 22rpx">/起</text> <text style="font-size: 22rpx">/起</text>
</view> </view>
<view style="display: flex; align-items: center"> <view style="display: flex; align-items: center">
...@@ -984,53 +982,73 @@ export default { ...@@ -984,53 +982,73 @@ export default {
that.titleStyle = { that.titleStyle = {
height: "45px", height: "45px",
paddingTop: `${res.statusBarHeight}px`, paddingTop: `${res.statusBarHeight}px`,
opacity: "0", opacity: 0,
}; };
}, },
}); });
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
}, },
methods: { methods: {
downloadFile(){ downloadFile() {
let msg={ let msg = {
"configId":"7274","cityId":"0","tcid":"11409","orderId":"0","FileName":"2021-10-11飞猪平台九寨沟3天2晚3日游","isShowBase":1,"isShowFlight":1,"isShowFeature":1,"isShowFee":1,"isShowShop":1,"isShowTip":1,"isShowB2B":1,"isShowTrip":1,"isShowTitle":0,"isShowGuest":0,"isShowMan":1,"isShowTCNUM":1,"isShowTripImage":1,"isShowVisa":1,"isShowVideoImg":1,"isPc":2,"templateId":3,"UId":615 configId: "7274",
} cityId: "0",
this.apipostDownload( tcid: "11409",
"GetWebHtmlTwo_V2", orderId: "0",
msg, FileName: "2021-10-11飞猪平台九寨沟3天2晚3日游",
(res) => { isShowBase: 1,
console.log(res) isShowFlight: 1,
let url="https://reborn.oytour.com"+res.data isShowFeature: 1,
isShowFee: 1,
isShowShop: 1,
isShowTip: 1,
isShowB2B: 1,
isShowTrip: 1,
isShowTitle: 0,
isShowGuest: 0,
isShowMan: 1,
isShowTCNUM: 1,
isShowTripImage: 1,
isShowVisa: 1,
isShowVideoImg: 1,
isPc: 2,
templateId: 3,
UId: 615,
};
this.apipostDownload("GetWebHtmlTwo_V2", msg, (res) => {
console.log(res);
let url = "https://reborn.oytour.com" + res.data;
uni.downloadFile({ uni.downloadFile({
url: url, url: url,
success: (res) => { success: (res) => {
if (res.statusCode === 200) { if (res.statusCode === 200) {
console.log('下载成功'); console.log("下载成功");
}
} }
},
});
}); });
}) },
} , downloadFile2() {
downloadFile2(){ let url =
let url="https://reborn.oytour.com/Upload/Temporary/C7274_T11409_CTY0_OD0_MMDD637695432017412893_1_1.pdf" "https://reborn.oytour.com/Upload/Temporary/C7274_T11409_CTY0_OD0_MMDD637695432017412893_1_1.pdf";
uni.downloadFile({ uni.downloadFile({
url: url, url: url,
success: (res) => { success: (res) => {
console.log('suc',res); console.log("suc", res);
if (res.statusCode === 200) { if (res.statusCode === 200) {
console.log('下载成功'); console.log("下载成功");
const tempFilePath = res.tempFilePath//返回的文件临时地址，用于后面打开本地预览所用 const tempFilePath = res.tempFilePath; //返回的文件临时地址，用于后面打开本地预览所用
wx.openDocument({ wx.openDocument({
filePath: tempFilePath, filePath: tempFilePath,
showMenu: true, showMenu: true,
fileType: "pdf", fileType: "pdf",
success: function (res) {} success: function (res) {},
}) });
} }
}, },
fail(err){ fail(err) {
console.log('err',err); console.log("err", err);
} },
}); });
}, },
openOrderPreview() { openOrderPreview() {
......
pages/jiuzhai/jz_Reserve.vue
View file @ 9b151619
...@@ -869,8 +869,30 @@ export default { ...@@ -869,8 +869,30 @@ export default {
} }
); );
}, },
PayAli(OrderId) { PayAli(tradeNO) {
let that = this; let that = this;
my.tradePay({
tradeNO: tradeNO,
success: function (res) {
console.log("success", res);
uni.showToast({
title: "支付成功",
});
setTimeout(() => {
uni.redirectTo({
url: "/pages/jiuzhai/paysuccess?PreferPrice=" + price,
});
}, 100);
},
fail: function (err) {
console.log("fail:", err);
uni.showToast({
title: "支付失败",
icon: "none",
});
},
});
return;
uni.requestPayment({ uni.requestPayment({
provider: "wxpay", provider: "wxpay",
timeStamp: this.orderInfo.timeStamp, timeStamp: this.orderInfo.timeStamp,
......
pages/ticketCoupons/detail.vue
View file @ 9b151619
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
:class="{ 'last-item': index == TicketList.length - 1 }" :class="{ 'last-item': index == TicketList.length - 1 }"
v-if="TicketList.length > 0" v-if="TicketList.length > 0"
> >
<view class="ticket-key"> <view class="ticket-key" v-if="item.Key">
{{ item.Key }} {{ item.Key }}
</view> </view>
<view class="ticket-list"> <view class="ticket-list">
...@@ -553,7 +553,7 @@ export default { ...@@ -553,7 +553,7 @@ export default {
that.titleStyle = { that.titleStyle = {
height: "45px", height: "45px",
paddingTop: `${res.statusBarHeight}px`, paddingTop: `${res.statusBarHeight}px`,
opacity: "0", opacity: 0,
}; };
}, },
}); });
...@@ -1197,6 +1197,10 @@ export default { ...@@ -1197,6 +1197,10 @@ export default {
position: relative; position: relative;
.TicketName { .TicketName {
max-width: 450rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
......
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