Skip to content

U
uni-pdtravel
Commit 2bc226eb authored by 潘永坪's avatar 潘永坪
Browse files
Options

Merge branch 'uview2.0' into develop 

# Conflicts:
#	pages/scenic/scenicOrder/scenicOrder.vue
#	uni_modules/uview-ui/index.scss
parents 7e4aedc6 89885296
Hide whitespace changes
Inline Side-by-side
Showing with 634 additions and 430 deletions
App.vue
View file @ 2bc226eb
...@@ -145,4 +145,18 @@ export default { ...@@ -145,4 +145,18 @@ export default {
checkbox.round .wx-checkbox-input { checkbox.round .wx-checkbox-input {
border-radius: 50% !important; border-radius: 50% !important;
} }
// swiper轮播图
.indicator-num {
padding: 2px 0;
background-color: rgba(0, 0, 0, 0.35);
border-radius: 100px;
width: 35px;
@include flex;
justify-content: center;
&__text {
color: #FFFFFF;
font-size: 12px;
}
}
</style> </style>
components/buyKnow.vue
View file @ 2bc226eb
<template> <template>
<u-popup v-model="showPop" mode="bottom" border-radius="14" closeable height="85%"> <u-popup :show="showPop" :round="20" @close="showPop=false">
<view class="son-wrap"> <view class="son-wrap">
<view class="head"> <view class="head">
<view class="head1"> <view class="head1">
购买须知 <view style="flex: 1;text-align: center;">
购买须知
</view>
<u-icon name="close" @click="showPop=false"></u-icon>
</view> </view>
<view class="head2"> <view class="head2">
{{buyKnowData.name}} {{buyKnowData.name}}
...@@ -12,39 +15,43 @@ ...@@ -12,39 +15,43 @@
<view class="head3"> <view class="head3">
挂牌价：￥{{buyKnowData.originalPrice}} 挂牌价：￥{{buyKnowData.originalPrice}}
</view> </view>
</view> </view>
<view class="middle"> <view style="flex: 1;overflow-y: scroll;">
<view class="middle-list" v-for="(item,a) of buyKnowData.productTitleResVos" :key="a"> <view class="middle">
<view class="middle-title"> <view class="middle-list" v-for="(item,a) of buyKnowData.productTitleResVos" :key="a">
{{item.title}} <view class="middle-title">
</view> {{item.title}}
<view class="middle-content" v-for="(items,b) of item.productChildTitleData" :key="b"> </view>
<text> <view class="middle-content" v-for="(items,b) of item.productChildTitleData" :key="b">
{{items.title}} <text>
</text> {{items.title}}
<view>
<!--<text>随买随用</text>-->
<text v-for="(itemss,c) of items.contentList" :key="c" class="content-child">
{{itemss.content}}
</text> </text>
<view>
<!--<text>随买随用</text>-->
<text v-for="(itemss,c) of items.contentList" :key="c" class="content-child">
{{itemss.content}}
</text>
</view>
</view> </view>
</view> </view>
</view> </view>
</view>
<view class="bottom">
<view class="bottom"> <text class="bottom-left">
<text class="bottom-left"> ¥ <text>{{buyKnowData.sellingPrice}}</text>
¥ <text>{{buyKnowData.sellingPrice}}</text>
</text>
<view class="bottom-right">
<text class="btn" @click="showPop=false">
去预订
</text> </text>
<view class="bottom-right">
<text class="btn" @click="showPop=false">
去预订
</text>
</view>
</view> </view>
</view> </view>
</view> </view>
</u-popup> </u-popup>
</template> </template>
...@@ -63,102 +70,99 @@ export default { ...@@ -63,102 +70,99 @@ export default {
</script> </script>
<style scoped="scoped"> <style scoped="scoped">
.son-wrap{ .son-wrap{
font-size: 24rpx; position: relative;
position: relative; height:85vh;
} display: flex;
.head { flex-direction:column;
padding: 100rpx 24rpx 0 24rpx; }
} .head{
.head1{ padding: 0 24rpx;
text-align: center; }
font-size: 32rpx; .head1{
font-weight: bold; display: flex;
text-align: center; font-size: 32rpx;
padding: 30rpx 0; font-weight: bold;
position:fixed; padding: 30rpx 0;
top: 0; border-radius: 20rpx 20rpx 0 0;
width: 100%; }
background: #fff; .head2{
z-index: 1; font-weight: bolder;
} font-size: 32rpx;
.head2{ line-height: 40rpx;
font-weight: bolder; }
font-size: 32rpx; .head3{
line-height: 40rpx; font-size: 28rpx;
} margin-top: 20rpx;
.head3{ color: #666666;
font-size: 28rpx; border-bottom: 1px solid #e6e6e6;
margin-top: 20rpx; padding-bottom: 30rpx;
color: #666666; }
border-bottom: 1px solid #e6e6e6; .middle {
padding-bottom: 30rpx; padding-bottom: 100rpx;
} font-size: 28rpx;
.middle { }
padding-bottom: 100rpx; .middle-list {
font-size: 28rpx; margin: 30rpx 24rpx;
} padding-bottom: 24rpx;
.middle-list { border-bottom: 1px solid #E6E6E6;
margin: 30rpx 24rpx; }
padding-bottom: 24rpx; .middle-title{
border-bottom: 1px solid #E6E6E6; font-size: 32rpx;
} font-weight: bold;
.middle-title{ }
font-size: 32rpx; .middle-content {
font-weight: bold; display: flex;
} margin-top: 30rpx;
.middle-content { position: relative;
display: flex; }
margin-top: 30rpx; .middle-content>text {
position: relative; color: #666666;
} margin-right: 30rpx;
.middle-content>text { width: 120rpx;
color: #666666; display: inline-block;
margin-right: 30rpx; white-space: nowrap;
width: 120rpx; text-overflow: ellipsis;
display: inline-block; overflow: hidden;
white-space: nowrap; flex-shrink: 0;
text-overflow: ellipsis; font-size: 26rpx;
overflow: hidden; position: relative;
flex-shrink: 0; }
font-size: 26rpx; .middle-content view {
position: relative; display: flex;
} flex-direction: column;
.middle-content view { justify-content: center;
display: flex; }
flex-direction: column; .bottom {
justify-content: center; display: flex;
} justify-content: space-between;
.bottom { padding: 0 24rpx;
display: flex; height: 100rpx;
justify-content: space-between; align-items: center;
padding: 0 24rpx; position: fixed;
height: 100rpx; bottom: 0;
align-items: center; width: 100%;
position: fixed; z-index: 9;
bottom: 0; background: #FFFFFF;
width: 100%; box-sizing: border-box;
z-index: 9; }
background: #FFFFFF;
box-sizing: border-box;
}
.bottom-left{ .bottom-left{
color: #f9690e; color: #f9690e;
} }
.bottom-left text { .bottom-left text {
font-size: 36rpx; font-size: 36rpx;
font-weight: bolder; font-weight: bolder;
} }
.bottom view { .bottom view {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.btn{ .btn{
padding: 16rpx 48rpx; padding: 16rpx 48rpx;
border-radius: 20rpx; border-radius: 20rpx;
font-size: 32rpx; font-size: 32rpx;
} }
</style> </style>
components/customer.vue
View file @ 2bc226eb
<template> <template>
<!-- 客服 --> <!-- 客服 -->
<u-popup v-model="showPop" mode="bottom" border-radius="14" closeable height="75%"> <u-popup :show="showPop" :round="20" @close="showPop = false">
<view class="son-wrap"> <view class="son-wrap">
<view class="title"> <view class="title">
客服电话 <view style="flex: 1; text-align: center"> 客服电话 </view>
<u-icon name="close" @click="showPop = false"></u-icon>
</view> </view>
<view class="middle"> <view class="middle">
<view class="list" v-for="(item,index) in scenicList" :key='index' @click="makePhone(item.phone)"> <view class="list" v-for="(item, index) in scenicList" :key="index" @click="makePhone(item.phone)">
<text> {{ item.name }}: </text>
<text> <text>
{{item.name}}: {{ item.phone }}
</text>
<text>
{{item.phone}}
</text> </text>
</view> </view>
</view> </view>
...@@ -20,50 +19,49 @@ ...@@ -20,50 +19,49 @@
</template> </template>
<script> <script>
export default{ export default {
props:['scenicList'], props: ['scenicList'],
data(){ data() {
return{ return {
showPop:false,//控制弹窗显示隐藏 showPop: false //控制弹窗显示隐藏
} }
}, },
methods:{ methods: {
//---拨打电话 //---拨打电话
makePhone(phoneNumber){ makePhone(phoneNumber) {
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber phoneNumber
}) })
} }
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.son-wrap{ .son-wrap {
position: relative; position: relative;
} height: 65vh;
.title{ display: flex;
text-align: center; flex-direction: column;
font-size: 32rpx; }
font-weight: bold; .title {
padding: 30rpx 0; display: flex;
position:fixed; font-size: 32rpx;
top: 0; font-weight: bold;
width: 100%; padding: 30rpx;
background: #fff; background: #fff;
z-index: 1; border-radius: 20rpx 20rpx 0 0;
} }
.middle{ .middle {
padding-top: 100rpx; flex: 1;
} overflow-y: scroll;
.list{ }
height:100rpx; .list {
border-bottom: 1px solid #E6E6E6; height: 100rpx;
padding: 0 24rpx; border-bottom: 1px solid #e6e6e6;
display: flex; padding: 0 24rpx;
align-items: center; display: flex;
justify-content: space-between; align-items: center;
} justify-content: space-between;
}
</style> </style>
\ No newline at end of file
components/merchantDetail.vue
View file @ 2bc226eb
<template> <template>
<!-- 商家详情弹窗 --> <!-- 商家详情弹窗 -->
<u-popup v-model="showPop" mode="bottom" border-radius="14" closeable height="85%"> <u-popup :show="showPop" :round="20" @close="showPop=false">
<view class="son-wrap"> <view class="son-wrap">
<view class="head"> <view class="head">
{{detailData.name}} <view class="head-name">
</view> {{detailData.name}}
<view style="padding-top: 100rpx;">
<u-swiper :list="detailData.imgList" mode="number" height="350" name="url"></u-swiper>
</view>
<view class="middle">
<!-- 景区介绍 -->
<view class="introduce">
<view class="middle-title">
介绍
</view>
<view v-html="detailData.introduce">
</view>
<view class="middle-title" style="margin-top: 20rpx;">
用时参考
</view>
<view>
建议游玩时长：{{detailData.timeSpent}}
</view>
</view> </view>
<!-- 开放时间 --> <u-icon name="close" @click="showPop=false"></u-icon>
<view class="opentime"> </view>
<view class="middle-title">开放时间</view> <view style="flex: 1;overflow-y: scroll;">
<u-table border-color="#04a7f4" > <view v-if="detailData.imgList&&detailData.imgList.length>0">
<u-tr v-if="!times"> <u-swiper :list="detailData.imgList" @change="e => currentNum = e.current" indicatorStyle="right: 20px;bottom:25px" height="400">
<u-td>每天</u-td> <view slot="indicator" class="indicator-num">
</u-tr> <text class="indicator-num__text">{{ currentNum + 1 }}/{{ detailData.imgList.length }}</text>
<u-tr v-if="!times"> </view>
<u-td> </u-swiper>
{{detailData.businessStart?detailData.businessStart.substr(0,5):""}}
~{{detailData.businessEnd?detailData.businessEnd.substr(0,5):""}}
</u-td>
</u-tr>
<u-tr v-if="times">
<u-td colspan="2">开放时间</u-td>
</u-tr>
<u-tr v-for="(item,index) of times" :key="index" v-if="times">
<u-td v-for="(items,b) of item" :key="b" v-if="items!=''">
{{items}}
</u-td>
</u-tr>
</u-table>
</view> </view>
<!-- 优待政策 --> <view class="middle">
<view class="policy" v-if="policy"> <!-- 景区介绍 -->
<view class="middle-title" style="padding-bottom: 4rpx;"> <view class="introduce">
{{policy.childTitle}} <view class="middle-title">
介绍
</view>
<view v-html="detailData.introduce">
</view>
<view class="middle-title" style="margin-top: 20rpx;">
用时参考
</view>
<view>
建议游玩时长：{{detailData.timeSpent}}
</view>
</view> </view>
<view v-for="(item,index) of policy.contentList" :key="index" style="margin-top: 20rpx;"> <!-- 开放时间 -->
{{item.content}} <view class="opentime">
<view class="middle-title">开放时间</view>
<u-table>
<u-tr v-if="!times">
<u-td>每天</u-td>
</u-tr>
<u-tr v-if="!times">
<u-td>
{{detailData.businessStart?detailData.businessStart.substr(0,5):""}}
~{{detailData.businessEnd?detailData.businessEnd.substr(0,5):""}}
</u-td>
</u-tr>
<u-tr v-if="times">
<u-td colspan="2">开放时间</u-td>
</u-tr>
<u-tr v-for="(item,index) of times" :key="index" v-if="times">
<u-td v-for="(items,b) of item" :key="b" v-if="items">
{{items}}
</u-td>
</u-tr>
</u-table>
</view> </view>
</view> <!-- 优待政策 -->
<!--景区设施 --> <view class="policy" v-if="policy">
<view class="facilities" v-if="facilities"> <view class="middle-title" style="padding-bottom: 4rpx;">
<view class="middle-title" style="padding-bottom: 4rpx;"> {{policy.childTitle}}
{{facilities.title}} </view>
<view v-for="(item,index) of policy.contentList" :key="index" style="margin-top: 20rpx;">
{{item.content}}
</view>
</view> </view>
<view class="fac-content" v-for="(item,a) of facilities.merchantChildTitleData" :key="a"> <!--景区设施 -->
<text class="fac-left"> <view class="facilities" v-if="facilities">
{{item.childTitle}} <view class="middle-title" style="padding-bottom: 4rpx;">
</text> {{facilities.title}}
</view>
<view class="fac-right"> <view class="fac-content" v-for="(item,a) of facilities.merchantChildTitleData" :key="a">
<text v-for="(items,b) of item.contentList" :key="b"> <text class="fac-left">
{{items.content}} {{item.childTitle}}
</text> </text>
<view class="fac-right">
<text v-for="(items,b) of item.contentList" :key="b">
{{items.content}}
</text>
</view>
</view> </view>
</view> </view>
</view> <!-- 出行贴士 -->
<!-- 出行贴士 --> <view class="travelTips" v-if="travelTips">
<view class="travelTips" v-if="travelTips"> <view class="middle-title" style="padding-bottom: 4rpx;">
<view class="middle-title" style="padding-bottom: 4rpx;"> {{travelTips.title}}
{{travelTips.title}} </view>
</view> <view class="travel-content" v-for="(item,a) of travelTips.merchantChildTitleData" :key="a">
<view class="travel-content" v-for="(item,a) of travelTips.merchantChildTitleData" :key="a"> <text class="travel-left">
<text class="travel-left"> {{item.childTitle}}
{{item.childTitle}}
</text>
<view class="travel-right">
<text v-for="(items,b) of item.contentList" :key="b">
{{items.content}}
</text> </text>
<view class="travel-right">
<text v-for="(items,b) of item.contentList" :key="b">
{{items.content}}
</text>
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</u-popup> </u-popup>
</template> </template>
...@@ -99,6 +109,7 @@ export default { ...@@ -99,6 +109,7 @@ export default {
props: ['detailData'], props: ['detailData'],
data() { data() {
return { return {
currentNum:0,//轮播图下标
showPop: false, //控制弹窗显示隐藏 showPop: false, //控制弹窗显示隐藏
times: '', //时间数组 times: '', //时间数组
policy:'', //优待政策列表 policy:'', //优待政策列表
...@@ -158,17 +169,22 @@ export default { ...@@ -158,17 +169,22 @@ export default {
<style scoped="scoped" lang="scss"> <style scoped="scoped" lang="scss">
.son-wrap{ .son-wrap{
position: relative; position: relative;
height:80vh;
display: flex;
flex-direction:column;
} }
.head{ .head{
text-align: center; display: flex;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
padding: 30rpx 0; padding: 30rpx;
position:fixed;
top: 0;
width: 100%;
background: #fff; background: #fff;
z-index: 1; border-radius: 20rpx 20rpx 0 0;
border-bottom: 1px solid #f5f5f5;
}
.head-name{
flex: 1;
text-align: center;
} }
.middle{ .middle{
padding: 24rpx 24rpx 80rpx 24rpx; padding: 24rpx 24rpx 80rpx 24rpx;
......
components/orderCoupon.vue
View file @ 2bc226eb
<template> <template>
<!----------------适用于订单选择券的时候展示券列表--------------------------> <!----------------适用于订单选择券的时候展示券列表-------------------------->
<u-popup v-model="show" mode="bottom"> <u-popup :show="show" :round="20" closeable @close="show=false">
<view class="title"> <view class="title">
<view class="titleContent" v-for="(item,index) of navTitle" :key="index" :class="{on:active==index}" @click="navClick(index)"> <view class="titleContent" v-for="(item,index) of navTitle" :key="index" :class="{on:active==index}" @click="navClick(index)">
<view style="position: relative;top:15rpx;">{{item}}</view> <view style="position: relative;top:15rpx;">{{item}}</view>
......
main.js
View file @ 2bc226eb
...@@ -10,6 +10,7 @@ Vue.prototype.$commonjs = commonjs ...@@ -10,6 +10,7 @@ Vue.prototype.$commonjs = commonjs
Vue.prototype.$request = request Vue.prototype.$request = request
Vue.prototype.imageError ='@/static/img/common/pangdingLogo.png' Vue.prototype.imageError ='@/static/img/common/pangdingLogo.png'
Vue.use(uView) Vue.use(uView)
uni.$u.config.unit = 'rpx'
Vue.config.productionTip = false Vue.config.productionTip = false
App.mpType = 'app' App.mpType = 'app'
......
pages/album/albumIndex.vue
View file @ 2bc226eb
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</text> </text>
</view> </view>
<u-mask :show="couponTip || showUseRule"> <!-- <u-mask :show="couponTip || showUseRule"> -->
<view class="mask"> <view class="mask">
<view class="img-box"> <view class="img-box">
<image class="bg" src="@/static/img/my/backgroundIcon01.png" mode="aspectFit"></image> <image class="bg" src="@/static/img/my/backgroundIcon01.png" mode="aspectFit"></image>
...@@ -110,21 +110,21 @@ ...@@ -110,21 +110,21 @@
</view> </view>
<u-button type="primary" shape="circle" @click="closeMask">知道了</u-button> <u-button type="primary" shape="circle" @click="closeMask">知道了</u-button>
</view> </view>
</u-mask> <!-- </u-mask> -->
</view> </view>
</template> </template>
<script> <script>
import UWaterfall from '@/uview-ui/components/u-waterfall/u-waterfall.vue' // import UWaterfall from '@/uview-ui/components/u-waterfall/u-waterfall.vue'
import ULazyLoad from '@/uview-ui/components/u-lazy-load/u-lazy-load.vue' // import ULazyLoad from '@/uview-ui/components/u-lazy-load/u-lazy-load.vue'
import UMask from '@/uview-ui/components/u-mask/u-mask.vue' // import UMask from '@/uview-ui/components/u-mask/u-mask.vue'
export default { export default {
components: { components: {
UWaterfall, // UWaterfall,
ULazyLoad, // ULazyLoad,
UMask // UMask
}, },
data() { data() {
return { return {
......
pages/album/chooseFavorite.vue
View file @ 2bc226eb
...@@ -25,13 +25,13 @@ ...@@ -25,13 +25,13 @@
</template> </template>
<script> <script>
import UCheckboxGroup from '@/uview-ui/components/u-checkbox-group/u-checkbox-group.vue' // import UCheckboxGroup from '@/uview-ui/components/u-checkbox-group/u-checkbox-group.vue'
import UCheckbox from '@/uview-ui/components/u-checkbox/u-checkbox.vue' // import UCheckbox from '@/uview-ui/components/u-checkbox/u-checkbox.vue'
export default { export default {
components: { components: {
UCheckboxGroup, // UCheckboxGroup,
UCheckbox, // UCheckbox,
}, },
data() { data() {
return { return {
......
pages/album/getPortrait.vue
View file @ 2bc226eb
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</view> </view>
</view> </view>
<text class="tip">获取照片需先在拍摄点摄影</text> <text class="tip">获取照片需先在拍摄点摄影</text>
<u-mask :show="maskShow" @click="closeClick"> <!-- <u-mask :show="maskShow" @click="closeClick"> -->
<view class="mask"> <view class="mask">
<text class="countdown" :class="{'hidden': maskCount <= 0}">{{maskCount}}s</text> <text class="countdown" :class="{'hidden': maskCount <= 0}">{{maskCount}}s</text>
<view class="tip"> <view class="tip">
...@@ -34,15 +34,15 @@ ...@@ -34,15 +34,15 @@
</view> </view>
<u-button type="info" size="mini" shape="circle" @click="returnClick">返回</u-button> <u-button type="info" size="mini" shape="circle" @click="returnClick">返回</u-button>
</view> </view>
</u-mask> <!-- </u-mask> -->
</view> </view>
</template> </template>
<script> <script>
import UMask from '@/uview-ui/components/u-mask/u-mask.vue' // import UMask from '@/uview-ui/components/u-mask/u-mask.vue'
export default { export default {
components: { components: {
UMask // UMask
}, },
data() { data() {
return { return {
......
pages/album/myPhotoAlbum/myPhotoAlbum.vue
View file @ 2bc226eb
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<i>{{cityName}}</i> <i>{{cityName}}</i>
<image src="../static/album/myPhoto01.png"></image> <image src="../static/album/myPhoto01.png"></image>
</view> </view>
<u-picker mode="selector" v-model="orderShow" :default-selector="[orderType]" :range="option" range-key="areaName" @confirm="industrysTypeConfirm($event)" @cancel="cancel"></u-picker> <u-picker mode="selector" :show="orderShow" :default-selector="[orderType]" :columns="option" keyName="areaName" @confirm="industrysTypeConfirm($event)" @cancel="cancel"></u-picker>
<template v-for="(item,index) in merchantList"> <template v-for="(item,index) in merchantList">
<view :key="index" v-if="index<2" class="left-project" :class="[projectCheck==0?'left-projectDe':'']" @click="projectClick(index,item.id)"> <view :key="index" v-if="index<2" class="left-project" :class="[projectCheck==0?'left-projectDe':'']" @click="projectClick(index,item.id)">
{{item.name}} {{item.name}}
...@@ -26,14 +26,21 @@ ...@@ -26,14 +26,21 @@
</view> </view>
<!--全选按钮--> <!--全选按钮-->
<view class="album-checkAll"> <view class="album-checkAll">
<u-checkbox v-model="checkProjectAll" @change="checkProjectAllFun()">全选</u-checkbox> <!-- <u-checkbox v-model="checkProjectAll" @change="checkProjectAllFun()">全选</u-checkbox> -->
<view class="checkAll-all" @click="checkProjectAllFun()">
<checkbox value="val" :checked="checkProjectAll" style="transform:scale(0.7)" :class="checkProjectAll==true?'checkAll-allAct':''" />全选
</view>
<view class="checkAll-tips">未下载影像保留15天</view> <view class="checkAll-tips">未下载影像保留15天</view>
</view> </view>
<!--主体循环--> <!--主体循环-->
<view class="album-subject"> <view class="album-subject">
<view class="subject-List" v-for="(item,index) in previewData" :key="index" > <view class="subject-List" v-for="(item,index) in previewData" :key="index" >
<image class="list-image" :src="item.faceSourceUrl||item.faceAiUrl" @click="stopPhoto(index)"></image> <image class="list-image" :src="item.faceSourceUrl||item.faceAiUrl" @click="stopPhoto(index)"></image>
<u-checkbox v-model="item.checkType" v-if="checkTypeFun==true" shape="circle" class="list-uCheck" @click.stop.native="()=>{}" @change="stopPhoto(index)"></u-checkbox> <!-- <u-checkbox v-model="item.checkType" v-if="checkTypeFun==true" shape="circle" class="list-uCheck" @click.stop.native="()=>{}" @change="stopPhoto(index)"></u-checkbox> -->
<checkbox-group @click.stop.native="()=>{}" @change="stopPhoto(index)">
<checkbox value="val" :checked="item.checkType" style="transform:scale(0.7)" class="list-uCheck" :class="item.checkType==true?'list-uCheckAct':''" />
</checkbox-group>
<view class="list-mask" @click.stop.native="()=>{}" @click="projectCheckPhoto(index)" >预览</view> <view class="list-mask" @click.stop.native="()=>{}" @click="projectCheckPhoto(index)" >预览</view>
</view> </view>
<view class="subject-noMore" v-if="previewDataType==true">暂无更多数据</view> <view class="subject-noMore" v-if="previewDataType==true">暂无更多数据</view>
...@@ -66,23 +73,12 @@ ...@@ -66,23 +73,12 @@
<!--预览--> <!--预览-->
<view class="album-maskPreview" v-if="maskPreviewType==true" @click="maskPreviewType=false"> <view class="album-maskPreview" v-if="maskPreviewType==true" @click="maskPreviewType=false">
<view class="maskPreview-Num">{{previewNum+1}}/{{previewData.length}}</view> <view class="maskPreview-Num">{{previewNum+1}}/{{previewData.length}}</view>
<!-- <view class="maskPreview-img" @touchstart="start" @touchend="end" @touchmove="move"> <u-swiper1 class="maskPreview-swiper" height="794" :list="previewData" :effect3d="true" :autoplay="false" :mode="none" :current ="previewNum" @change="projectNumFun" ></u-swiper1>
<template v-if="previewData.length==1">
<image class="img-center" :src="previewData[previewNum].faceSourceUrl"></image>
</template>
<template v-else>
<image class="img-left" :style="{left:touchLeft0 +'rpx'}" v-if="previewNum==0" :src="previewData[previewData.length-1].faceSourceUrl||previewData[previewData.length-1].faceAiUrl"></image>
<image class="img-left" :style="{left:touchLeft0 +'rpx'}" v-else :src="previewData[previewNum-1].faceSourceUrl||previewData[previewNum-1].faceAiUrl"></image>
<image class="img-center" :style="{right:touchRight +'rpx',left:touchLeft +'rpx'}" :src="previewData[previewNum].faceSourceUrl||previewData[previewNum].faceAiUrl"></image>
<image class="img-right" :style="{right:touchRight2 +'rpx'}" v-if="previewNum==previewData.length-1" :src="previewData[0].faceSourceUrl||previewData[0].faceAiUrl"></image>
<image class="img-right" :style="{right:touchRight2 +'rpx'}" v-else :src="previewData[previewNum+1].faceSourceUrl||previewData[previewNum+1].faceAiUrl"></image>
</template>
</view> -->
<u-swiper class="maskPreview-swiper" height="794" :list="previewData" :effect3d="true" :autoplay="false" :mode="none" :current ="previewNum" @change="projectNumFun" ></u-swiper>
<view class="maskPreview-check" v-if="checkTypeFun==true"> <view class="maskPreview-check" v-if="checkTypeFun==true">
<u-checkbox v-model="previewData[previewNum].checkType" @click.stop.native="()=>{}" @change="stopPhoto(previewNum)" shape="circle" class="maskPreview-Check"></u-checkbox> <!-- <u-checkbox v-model="previewData[previewNum].checkType" shape="circle" class="maskPreview-Check"></u-checkbox> -->
<checkbox-group @click.stop.native="()=>{}" @change="stopPhoto(previewNum)">
<checkbox value="val" :checked="previewData[previewNum].checkType" style="transform:scale(0.7)" class="maskPreview-CheckBox" :class="previewData[previewNum].checkType==true?'maskPreview-CheckBoxAct':''" />
</checkbox-group>
</view> </view>
</view> </view>
...@@ -104,23 +100,23 @@ ...@@ -104,23 +100,23 @@
</view> </view>
</view> </view>
</view> </view>
<u-toast ref="uToast" /> <!-- <u-toast ref="uToast" /> -->
</view> </view>
</template> </template>
<script> <script>
import uPicker from '@/uview-ui/components/u-picker/u-picker.vue' // import uPicker from '@/uview-ui/components/u-picker/u-picker.vue'
import uCheckboxGroup from '@/uview-ui/components/u-checkbox-group/u-checkbox-group.vue' // import uCheckboxGroup from '@/uview-ui/components/u-checkbox-group/u-checkbox-group.vue'
import uCheckbox from '@/uview-ui/components/u-checkbox/u-checkbox' // import uCheckbox from '@/uview-ui/components/u-checkbox/u-checkbox'
import uToast from '@/uview-ui/components/u-toast/u-toast.vue' // import uToast from '@/uview-ui/components/u-toast/u-toast.vue'
import Uswiper from '@/uview-ui/components/u-toast/u-toast.vue' // import Uswiper from '@/uview-ui/components/u-toast/u-toast.vue'
export default { export default {
components: { components: {
uPicker, // uPicker,
uCheckboxGroup, // uCheckboxGroup,
uCheckbox, // uCheckbox,
uToast, // uToast,
Uswiper // Uswiper
}, },
data() { data() {
return { return {
...@@ -209,9 +205,9 @@ export default { ...@@ -209,9 +205,9 @@ export default {
this.merchantMessage = res.data this.merchantMessage = res.data
this.checkMonkey() this.checkMonkey()
}else{ }else{
this.$refs.uToast.show({ uni.showToast({
title: res.message, title: res.message,
type: 'error', icon: 'none'
}) })
} }
}) })
...@@ -222,11 +218,13 @@ export default { ...@@ -222,11 +218,13 @@ export default {
inChina:0 inChina:0
}).then((res)=>{ }).then((res)=>{
if(res.code=='00'){ if(res.code=='00'){
this.option = res.data var opTionList = []
opTionList.push(res.data)
this.option = opTionList
}else{ }else{
this.$refs.uToast.show({ uni.showToast({
title: res.message, title: res.message,
type: 'error', icon: 'none'
}) })
} }
}) })
...@@ -244,9 +242,9 @@ export default { ...@@ -244,9 +242,9 @@ export default {
if(res.code=='00'){ if(res.code=='00'){
this.merchantList = res.data this.merchantList = res.data
}else{ }else{
this.$refs.uToast.show({ uni.showToast({
title: res.message, title: res.message,
type: 'error', icon: 'none'
}) })
} }
}) })
...@@ -283,17 +281,18 @@ export default { ...@@ -283,17 +281,18 @@ export default {
//隐藏加载框 //隐藏加载框
uni.hideLoading() uni.hideLoading()
}else{ }else{
this.$refs.uToast.show({ uni.showToast({
title: res.message, title: res.message,
type: 'error', icon: 'none'
}) })
} }
}) })
}, },
industrysTypeConfirm(e) { //单列----分类 点击确定 城市 industrysTypeConfirm(e) { //单列----分类 点击确定 城市
this.cityName = this.option[e].areaName this.cityName = e.value[0].areaName
this.areaId = this.option[e].areaId this.areaId = e.value[0].areaId
this.inquireMerchant() this.inquireMerchant()
this.cancel()
}, },
cancel() { //单列 点击取消 cancel() { //单列 点击取消
this.orderShow = false this.orderShow = false
...@@ -308,6 +307,7 @@ export default { ...@@ -308,6 +307,7 @@ export default {
this.maskPreviewType = true this.maskPreviewType = true
}, },
projectNumFun(e){//当前滑动到第几张 projectNumFun(e){//当前滑动到第几张
console.log(e)
this.previewNum = e this.previewNum = e
}, },
stopPhoto(index){//刷新显示 stopPhoto(index){//刷新显示
...@@ -380,9 +380,9 @@ export default { ...@@ -380,9 +380,9 @@ export default {
this.originalPrices=0 this.originalPrices=0
} }
}else{ }else{
this.$refs.uToast.show({ uni.showToast({
title: res.message, title: res.message,
type: 'error', icon: 'none'
}) })
} }
}) })
...@@ -465,9 +465,9 @@ export default { ...@@ -465,9 +465,9 @@ export default {
url:'../../payment/orderPayment/orderPayment?orderId='+res.data.id+'&albumOrderdetail=1' url:'../../payment/orderPayment/orderPayment?orderId='+res.data.id+'&albumOrderdetail=1'
}) })
}else{ }else{
this.$refs.uToast.show({ uni.showToast({
title: res.message, title: res.message,
type: 'error', icon: 'none'
}) })
} }
}) })
...@@ -510,6 +510,7 @@ export default { ...@@ -510,6 +510,7 @@ export default {
display: flex; display: flex;
flex: 1; flex: 1;
box-shadow: inset -16px 0px 8px 0px rgba(255, 255, 255, 0.2); box-shadow: inset -16px 0px 8px 0px rgba(255, 255, 255, 0.2);
position: relative;
overflow-x: auto; overflow-x: auto;
.left-name { .left-name {
...@@ -535,7 +536,11 @@ export default { ...@@ -535,7 +536,11 @@ export default {
margin-left: 8rpx; margin-left: 8rpx;
} }
} }
/deep/ .u-popup{
position: absolute;
left: 0;
top: 0;
}
.left-project { .left-project {
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
...@@ -596,21 +601,25 @@ export default { ...@@ -596,21 +601,25 @@ export default {
display: flex; display: flex;
width: 100%; width: 100%;
height: 98rpx; height: 98rpx;
padding: 32rpx 24rpx 0 24rpx; padding: 32rpx 24rpx 20rpx 24rpx;
overflow: hidden; overflow: hidden;
position: fixed; position: fixed;
top: 76rpx; top: 76rpx;
left: 0; left: 0;
z-index: 20; z-index: 20;
/deep/ .u-checkbox { .checkAll-all{
line-height: 34rpx !important; font-size: 24rpx;
line-height: 46rpx;
} }
.checkAll-allAct{
/deep/ .u-checkbox__label { /deep/ .wx-checkbox-input,
font-size: 24rpx !important; /deep/ .uni-checkbox-input{
background-color: #3688FF !important;
border-color: #3688FF !important;
color: #ffffff !important;
}
} }
.checkAll-tips { .checkAll-tips {
font-size: 24rpx; font-size: 24rpx;
color: #999999; color: #999999;
...@@ -669,7 +678,18 @@ export default { ...@@ -669,7 +678,18 @@ export default {
position: absolute; position: absolute;
right: 0; right: 0;
top: 24rpx; top: 24rpx;
/deep/ .wx-checkbox-input,
/deep/ .uni-checkbox-input{
border-radius: 100rpx;
}
}
.list-uCheckAct{
/deep/ .wx-checkbox-input,
/deep/ .uni-checkbox-input{
background-color: #3688FF !important;
border-color: #3688FF !important;
color: #ffffff !important;
}
} }
/deep/ .u-checkbox__icon-wrap{ /deep/ .u-checkbox__icon-wrap{
color: #fff !important; color: #fff !important;
...@@ -965,6 +985,12 @@ export default { ...@@ -965,6 +985,12 @@ export default {
top: 152rpx; top: 152rpx;
left: 0; left: 0;
} }
/deep/ .u-swiper{
width: 100%;
position: fixed;
top: 152rpx;
left: 0;
}
/deep/ swiper{ /deep/ swiper{
background-color: rgba(0, 0, 0, 0) !important; background-color: rgba(0, 0, 0, 0) !important;
} }
...@@ -976,13 +1002,27 @@ export default { ...@@ -976,13 +1002,27 @@ export default {
top: 998rpx; top: 998rpx;
left: 0; left: 0;
right: 0; right: 0;
.maskPreview-CheckBox{
/deep/ .u-checkbox__icon-wrap { /deep/ .wx-checkbox-input,
width: 50rpx !important; /deep/ .uni-checkbox-input{
height: 50rpx !important; border-radius: 100rpx;
color: #fff !important; }
border: solid 2px #fff; }
.maskPreview-CheckBoxAct{
/deep/ .wx-checkbox-input,
/deep/ .uni-checkbox-input{
background-color: #3688FF !important;
border-color: #3688FF !important;
color: #ffffff !important;
}
} }
// /deep/ .u-checkbox__icon-wrap {
// width: 50rpx !important;
// height: 50rpx !important;
// color: #fff !important;
// border: solid 2px #fff;
// }
} }
/deep/ .u-swiper-image::after { /deep/ .u-swiper-image::after {
content: ""; content: "";
......
pages/album/purchasedPhotoAlbum/purchasedPhotoAlbum.vue
View file @ 2bc226eb
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
<i>{{cityName}}</i> <i>{{cityName}}</i>
<image src="../static/album/myPhoto01.png"></image> <image src="../static/album/myPhoto01.png"></image>
</view> </view>
<u-picker mode="selector" v-model="orderShow" :default-selector="[orderType]" :range="option" range-key="areaName" @confirm="industrysTypeConfirm($event)" @cancel="cancel"></u-picker> <u-picker mode="selector" :show="orderShow" :default-selector="[orderType]" :columns="option" keyName="areaName" @confirm="industrysTypeConfirm($event)" @cancel="cancel"></u-picker>
<view class="left-picker" @click="merchantShow=true"> <view class="left-picker" @click="merchantShow=true">
<i>{{merchantName}}</i> <i>{{merchantName}}</i>
<image src="../static/album/myPhoto01.png"></image> <image src="../static/album/myPhoto01.png"></image>
</view> </view>
<u-picker mode="selector" v-model="merchantShow" :default-selector="[orderType]" :range="option" range-key="name" @confirm="industrysTypeConfirm2($event)" @cancel="cancel2"></u-picker> <u-picker mode="selector" :show="merchantShow" :default-selector="[orderType]" :columns="merchantList" keyName="merchantName" @confirm="industrysTypeConfirm2($event)" @cancel="cancel2"></u-picker>
</view> </view>
</view> </view>
...@@ -26,7 +26,10 @@ ...@@ -26,7 +26,10 @@
<view class="album-subject"> <view class="album-subject">
<view class="subject-List" v-for="(item2,index2) in item.photoOrderImgResVoList" :key="index2"> <view class="subject-List" v-for="(item2,index2) in item.photoOrderImgResVoList" :key="index2">
<image class="list-image" :src="item2.imgUrl" @click="stopPhoto(index,index2)"></image> <image class="list-image" :src="item2.imgUrl" @click="stopPhoto(index,index2)"></image>
<u-checkbox v-model="item2.checkType" v-if="checkTypeFun==true" @click.stop.native="()=>{}" @change="stopPhoto(index,index2)" shape="circle" class="list-uCheck"></u-checkbox> <!-- <u-checkbox v-model="item2.checkType" v-if="checkTypeFun==true" @click.stop.native="()=>{}" @change="stopPhoto(index,index2)" shape="circle" class="list-uCheck"></u-checkbox> -->
<checkbox-group @click.stop.native="()=>{}" @change="stopPhoto(index,index2)">
<checkbox value="val" :checked="item2.checkType" style="transform:scale(0.7)" class="list-uCheck" :class="item2.checkType==true?'list-uCheckAct':''" />
</checkbox-group>
</view> </view>
</view> </view>
</view> </view>
...@@ -35,8 +38,9 @@ ...@@ -35,8 +38,9 @@
<view class="album-bottom"> <view class="album-bottom">
<view class="bottom-left" v-if="maskDetail==false"> <view class="bottom-left" v-if="maskDetail==false">
<!--全选按钮--> <!--全选按钮-->
<view class="album-checkAll"> <view class="album-checkAll" @click="checkProjectAllFun()">
<u-checkbox v-model="checkProjectAll" @change="checkProjectAllFun()">全选</u-checkbox> <!-- <u-checkbox v-model="checkProjectAll" @change="checkProjectAllFun()">全选</u-checkbox> -->
<checkbox value="val" :checked="checkProjectAll" style="transform:scale(0.7)" :class="checkProjectAll==true?'checkAll-allAct':''" />
<view class="checkAll-tips">未下载影像保留15天</view> <view class="checkAll-tips">未下载影像保留15天</view>
</view> </view>
</view> </view>
...@@ -47,16 +51,16 @@ ...@@ -47,16 +51,16 @@
</template> </template>
<script> <script>
import uPicker from '@/uview-ui/components/u-picker/u-picker.vue' // import uPicker from '@/uview-ui/components/u-picker/u-picker.vue'
import uCheckboxGroup from '@/uview-ui/components/u-checkbox-group/u-checkbox-group.vue' // import uCheckboxGroup from '@/uview-ui/components/u-checkbox-group/u-checkbox-group.vue'
import uCheckbox from '@/uview-ui/components/u-checkbox/u-checkbox' // import uCheckbox from '@/uview-ui/components/u-checkbox/u-checkbox'
import uToast from '@/uview-ui/components/u-toast/u-toast.vue' // import uToast from '@/uview-ui/components/u-toast/u-toast.vue'
export default { export default {
components: { components: {
uPicker, // uPicker,
uCheckboxGroup, // uCheckboxGroup,
uCheckbox, // uCheckbox,
uToast // uToast
}, },
data() { data() {
return { return {
...@@ -122,7 +126,9 @@ export default { ...@@ -122,7 +126,9 @@ export default {
inChina:0 inChina:0
}).then((res)=>{ }).then((res)=>{
if(res.code=='00'){ if(res.code=='00'){
this.option = res.data var opTionList = []
opTionList.push(res.data)
this.option = opTionList
}else{ }else{
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.message, title: res.message,
...@@ -137,7 +143,9 @@ export default { ...@@ -137,7 +143,9 @@ export default {
} }
this.$request('scenic/albumConfig/getSurveyConfig',data).then((res)=>{ this.$request('scenic/albumConfig/getSurveyConfig',data).then((res)=>{
if(res.code=='00'){ if(res.code=='00'){
this.merchantList = res.data var merchantListList = []
merchantListList.push(res.data)
this.merchantList = merchantListList
}else{ }else{
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.message, title: res.message,
...@@ -168,14 +176,16 @@ export default { ...@@ -168,14 +176,16 @@ export default {
}) })
}, },
industrysTypeConfirm(e) { //单列----分类 点击确定 城市 industrysTypeConfirm(e) { //单列----分类 点击确定 城市
this.cityName = this.option[e].areaName this.cityName = e.value[0].areaName
this.areaId = this.option[e].areaId this.areaId = e.value[0].areaId
this.inquireMerchant() this.inquireMerchant()
this.cancel()
}, },
industrysTypeConfirm2(e) { //单列----分类 点击确定 项目 industrysTypeConfirm2(e) { //单列----分类 点击确定 项目
this.merchantId = this.merchantList[e].merchantId this.merchantId = e.value[0].merchantId
this.merchantName = this.merchantList[e].merchantName this.merchantName = e.value[0].merchantName
this.getPhotos() this.getPhotos()
this.cancel2()
}, },
cancel() { //单列 点击取消 cancel() { //单列 点击取消
this.orderShow = false this.orderShow = false
...@@ -352,6 +362,11 @@ export default { ...@@ -352,6 +362,11 @@ export default {
margin-left: 8rpx; margin-left: 8rpx;
} }
} }
/deep/ .u-popup{
position: absolute;
left: 0;
top: 0;
}
} }
} }
...@@ -417,6 +432,18 @@ export default { ...@@ -417,6 +432,18 @@ export default {
position: absolute; position: absolute;
right: 0; right: 0;
top: 24rpx; top: 24rpx;
/deep/ .wx-checkbox-input,
/deep/ .uni-checkbox-input{
border-radius: 100rpx;
}
}
.list-uCheckAct{
/deep/ .wx-checkbox-input,
/deep/ .uni-checkbox-input{
background-color: #3688FF !important;
border-color: #3688FF !important;
color: #ffffff !important;
}
} }
} }
} }
...@@ -450,6 +477,14 @@ export default { ...@@ -450,6 +477,14 @@ export default {
/deep/ .u-checkbox__label { /deep/ .u-checkbox__label {
font-size: 24rpx !important; font-size: 24rpx !important;
} }
.checkAll-allAct{
/deep/ .wx-checkbox-input,
/deep/ .uni-checkbox-input{
background-color: #3688FF !important;
border-color: #3688FF !important;
color: #ffffff !important;
}
}
.checkAll-tips { .checkAll-tips {
font-size: 24rpx; font-size: 24rpx;
......
pages/indexs/center/center.vue
View file @ 2bc226eb
...@@ -52,10 +52,9 @@ ...@@ -52,10 +52,9 @@
<view> <view>
我的订单 我的订单
</view> </view>
<view style="font-size: 24rpx;color: #999999;"> <view style="font-size: 24rpx;color: #999999;display: flex;">
全部订单 全部订单
<u-icon name='arrow-right'></u-icon> <u-icon name='arrow-right'></u-icon>
</view> </view>
</view> </view>
......
pages/indexs/index/index.vue
View file @ 2bc226eb
...@@ -20,7 +20,10 @@ ...@@ -20,7 +20,10 @@
</view> </view>
<view class="banner"> <view class="banner">
<u-swiper :list="list" mode="number" height="300" indicator-pos="bottomRight" @click="swiperClick"> <u-swiper :list="list" @change="e => currentNum = e.current" indicatorStyle="right: 20px" height="300">
<view slot="indicator" class="indicator-num">
<text class="indicator-num__text">{{ currentNum + 1 }}/{{ list.length }}</text>
</view>
</u-swiper> </u-swiper>
</view> </view>
</view> </view>
...@@ -32,7 +35,7 @@ ...@@ -32,7 +35,7 @@
</image> </image>
<view class="address"> <view class="address">
<u-icon name="map"></u-icon> <u-icon name="map" color="#ffffff" size="24"></u-icon>
重庆 重庆
</view> </view>
</view> </view>
...@@ -66,7 +69,7 @@ ...@@ -66,7 +69,7 @@
</image> </image>
<view class="address"> <view class="address">
<u-icon name="map"></u-icon> <u-icon name="map" color="#ffffff" size="24"></u-icon>
重庆 重庆
</view> </view>
</view> </view>
...@@ -100,7 +103,7 @@ ...@@ -100,7 +103,7 @@
</image> </image>
<view class="address"> <view class="address">
<u-icon name="map"></u-icon> <u-icon name="map" color="#ffffff" size="24"></u-icon>
重庆 重庆
</view> </view>
</view> </view>
...@@ -135,7 +138,7 @@ ...@@ -135,7 +138,7 @@
</image> </image>
<view class="address"> <view class="address">
<u-icon name="map"></u-icon> <u-icon name="map" color="#ffffff" size="24"></u-icon>
重庆 重庆
</view> </view>
</view> </view>
...@@ -170,15 +173,16 @@ ...@@ -170,15 +173,16 @@
export default { export default {
data() { data() {
return { return {
list: [ currentNum:0,//轮播图下标
list: [//轮播图图片
{ {
image: 'http://wx.pangdly.com/static/img/home1.69efcf8.jpg' url: 'http://wx.pangdly.com/static/img/home1.69efcf8.jpg'
}, },
{ {
image: 'http://wx.pangdly.com/static/img/home2.2ec1a04.jpg' url: 'http://wx.pangdly.com/static/img/home2.2ec1a04.jpg'
}, },
{ {
image: 'http://wx.pangdly.com/static/img/home3.df60ec3.jpg' url: 'http://wx.pangdly.com/static/img/home3.df60ec3.jpg'
} }
], ],
iconList:[//图标列表 iconList:[//图标列表
...@@ -222,10 +226,14 @@ export default { ...@@ -222,10 +226,14 @@ export default {
} }
}, },
onLoad(option){ onLoad(option){
// 首次进入时执行
let companyId=this.$commonjs.getCompanyId(option) let companyId=this.$commonjs.getCompanyId(option)
if(!companyId){ if(!companyId){
this.getCompanyId() this.getCompanyId()
} }
},
onShow() {
// 首次进入、后台切入前台时会执行
this.loadIcon() this.loadIcon()
}, },
methods: { methods: {
...@@ -371,7 +379,7 @@ export default { ...@@ -371,7 +379,7 @@ export default {
position: absolute; position: absolute;
left: 20rpx; left: 20rpx;
bottom: 20rpx; bottom: 20rpx;
display: inline-block; display: flex;
background: rgba(0,0,0,0.5); background: rgba(0,0,0,0.5);
padding: 8rpx 20rpx 12rpx 10rpx; padding: 8rpx 20rpx 12rpx 10rpx;
border-radius: 24rpx; border-radius: 24rpx;
......
pages/indexs/merchantListIndex/merchantListIndex.vue
View file @ 2bc226eb
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
<!-- 商户列表首页 --> <!-- 商户列表首页 -->
<view class="wrap"> <view class="wrap">
<view class="banner"> <view class="banner">
<u-swiper :list="list" mode="number" height="350" indicator-pos="topRight"></u-swiper> <u-swiper :list="list" @change="e => currentNum = e.current" indicatorStyle="right: 20px;bottom:25px" height="350">
<view slot="indicator" class="indicator-num">
<text class="indicator-num__text">{{ currentNum + 1 }}/{{ list.length }}</text>
</view>
</u-swiper>
</view> </view>
<view class="search"> <view class="search">
...@@ -21,7 +25,7 @@ ...@@ -21,7 +25,7 @@
<view class="merchant-wrap"> <view class="merchant-wrap">
<view> <view>
<u-tabs-swiper ref="uTabs" :list="tabList" :current="current" @change="tabsChange" :is-scroll="false" swiperWidth="750"></u-tabs-swiper> <!-- <u-tabs-swiper ref="uTabs" :list="tabList" :current="current" @change="tabsChange" :is-scroll="false" swiperWidth="750"></u-tabs-swiper> -->
</view> </view>
<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" class="swiper-box"> <swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" class="swiper-box">
<swiper-item class="swiper-item"> <swiper-item class="swiper-item">
...@@ -142,15 +146,16 @@ export default { ...@@ -142,15 +146,16 @@ export default {
showCoupon2:false,//是否显示券2 showCoupon2:false,//是否显示券2
detailData:'',//详情数据 detailData:'',//详情数据
scenicList:[],//景区数据 scenicList:[],//景区数据
list: [ currentNum:0,//轮播图下标
list: [//轮播图图片
{ {
image: 'http://wx.pangdly.com/static/img/home1.69efcf8.jpg' url: 'http://wx.pangdly.com/static/img/home1.69efcf8.jpg'
}, },
{ {
image: 'http://wx.pangdly.com/static/img/home2.2ec1a04.jpg' url: 'http://wx.pangdly.com/static/img/home2.2ec1a04.jpg'
}, },
{ {
image: 'http://wx.pangdly.com/static/img/home3.df60ec3.jpg' url: 'http://wx.pangdly.com/static/img/home3.df60ec3.jpg'
} }
], ],
tabList: [{ tabList: [{
...@@ -397,6 +402,7 @@ export default { ...@@ -397,6 +402,7 @@ export default {
} }
.right3{ .right3{
margin-top: 16rpx; margin-top: 16rpx;
display: flex;
} }
.right3-text::after{ .right3-text::after{
display: inline-block; display: inline-block;
......
pages/my/order/afterSale/applyAfterSale/applyAfterSale.vue
View file @ 2bc226eb
<template> <template>
<view class="apply-box"> <view class="apply-box">
<!--提示--> <!--提示-->
<view class="apply-tips"> <view class="apply-tips" v-if="merchantId=='z0015605022691a5945bbe463141668c'">
同一身份证退票当日仅再购1次，同一身份证一个月累计可购3次 同一身份证退票当日仅再购1次，同一身份证一个月累计可购3次
</view> </view>
<view class="apply-ticket general-Box"> <view class="apply-ticket general-Box" :class="merchantId!='z0015605022691a5945bbe463141668c'?'apply-ticketAct':''">
<view class="ticket-title"> <view class="ticket-title">
<view class="title-name">{{orderInfo.merchantName}}（{{orderInfo.productName}}）</view> <view class="title-name">{{orderInfo.merchantName}}（{{orderInfo.productName}}）</view>
<view class="title-num">x{{orderInfo.orderNum}}</view> <view class="title-num">x{{orderInfo.orderNum}}</view>
</view> </view>
<view class="ticket-timer">游玩当日{{orderInfo.orderRefundRuleList[0].refundTime}}之前未使用可退</view> <view class="ticket-timer">游玩当日{{orderRefundRuleTimer}}之前未使用可退</view>
</view> </view>
<!-- <view class="apply-user general-Box"> <!-- <view class="apply-user general-Box">
<view class="user-title"> <view class="user-title">
...@@ -53,7 +53,13 @@ ...@@ -53,7 +53,13 @@
退款提交 退款提交
</view> </view>
<view class="apply-toButton" v-else> <view class="apply-toButton" v-else>
退款时间为08:00:00-{{orderInfo.orderRefundRuleList[0].refundTime}} 退款时间为08:00:00-{{orderRefundRuleTimer}}
</view>
<view class="apply-mask" v-if="orderRefundRuleTimerType==true">
<view class="mask-box">
<view class="box-text">请在{{orderRefundRuleTimer}}前退票</view>
<view class="box-btn" @click="orderRefundRuleTimerBack()">返回</view>
</view>
</view> </view>
</view> </view>
</template> </template>
...@@ -62,6 +68,7 @@ ...@@ -62,6 +68,7 @@
export default { export default {
data() { data() {
return { return {
merchantId:'',//景区ID
applyClickAll:false,//是否全选 applyClickAll:false,//是否全选
applyUserList:[ applyUserList:[
{ {
...@@ -102,15 +109,23 @@ export default { ...@@ -102,15 +109,23 @@ export default {
openId:'',//用户ID openId:'',//用户ID
orderInfo:{},//订单信息 orderInfo:{},//订单信息
isRefund:false,//是否可以退单 isRefund:false,//是否可以退单
orderRefundRuleTimer:'',//退款时间
orderRefundRuleTimerType:false,
} }
}, },
onLoad(option) { onLoad(option) {
this.id = option.orderId||'' this.id = option.orderId||''
this.openId = uni.getStorageSync('openid') //openid oroHZ5FaUQ_SOOC_uQQP92fJpBRE oh2UV1lyYABHMZ1rMlgjhVHyyYDQ this.openId = uni.getStorageSync('openid') //openid oroHZ5FaUQ_SOOC_uQQP92fJpBRE oh2UV1lyYABHMZ1rMlgjhVHyyYDQ
//this.openId = 'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ' //this.openId = 'oroHZ5FaUQ_SOOC_uQQP92fJpBRE'//oh2UV1lyYABHMZ1rMlgjhVHyyYDQ oroHZ5FaUQ_SOOC_uQQP92fJpBRE
this.getDetail() this.getDetail()
}, },
methods: { methods: {
orderRefundRuleTimerBack(){//返回前一个页面
console.log('123')
uni.navigateBack({
delta: 1
})
},
confirm(){//提交退订申请 confirm(){//提交退订申请
if(this.causeNum==5&&this.causeInput==''){ if(this.causeNum==5&&this.causeInput==''){
uni.showToast({ uni.showToast({
...@@ -173,10 +188,20 @@ export default { ...@@ -173,10 +188,20 @@ export default {
this.$request('order/userOrder/findOrderDetail',data).then((res)=>{ this.$request('order/userOrder/findOrderDetail',data).then((res)=>{
if(res.code == '00'){ if(res.code == '00'){
this.orderInfo = res.data this.orderInfo = res.data
if(this.getNowTime()>'08:00:00'&&this.getNowTime()<this.orderInfo.orderRefundRuleList[0].refundTime){ var refundTimer= '23:59:59'
if(this.orderInfo.orderRefundRuleList!=undefined&&this.orderInfo.orderRefundRuleList.length>0){
refundTimer = this.orderInfo.orderRefundRuleList[0].refundTime
}
if(this.getNowTime()>'08:00:00'&&this.getNowTime()<refundTimer){
this.isRefund = true this.isRefund = true
}else{ }else{
this.isRefund = false this.isRefund = false
}
this.merchantId = res.data.merchantId
this.orderRefundRuleTimer = refundTimer
if(this.getNowTime()>this.orderRefundRuleTimer){
this.orderRefundRuleTimerType = true
} }
}else{ }else{
uni.showToast({ uni.showToast({
...@@ -296,6 +321,9 @@ export default { ...@@ -296,6 +321,9 @@ export default {
line-height: 40rpx; line-height: 40rpx;
} }
} }
.apply-ticketAct{
margin-top: 20rpx;
}
.apply-user{ .apply-user{
padding: 24rpx 24rpx 30rpx 24rpx; padding: 24rpx 24rpx 30rpx 24rpx;
.user-title{ .user-title{
...@@ -397,4 +425,46 @@ export default { ...@@ -397,4 +425,46 @@ export default {
bottom: 0; bottom: 0;
left: 0; left: 0;
} }
.apply-mask{
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 998;
background-color: rgba(0,0,0,.3);
.mask-box{
width: 500rpx;
height: 200rpx;
padding: 24rpx;
background-color: #fff;
border-radius: 10px;
margin: auto;
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 998;
.box-text{
font-size: 28rpx;
text-align: center;
line-height: 42rpx;
margin-top: 10rpx;
margin-bottom: 35rpx;
}
.box-btn{
width: 300rpx;
height: 60rpx;
border-radius: 10rpx;
background-color: #3688FF;
font-size: 28rpx;
text-align: center;
line-height: 60rpx;
margin: 0 auto 0 auto;
color: #fff;
font-weight: bold;
}
}
}
</style> </style>
pages/my/order/electronicTicket/electronicTicket-副本.vue
View file @ 2bc226eb
...@@ -355,10 +355,10 @@ import uQRCodeS from '@/common/js/uqrcode.js' ...@@ -355,10 +355,10 @@ import uQRCodeS from '@/common/js/uqrcode.js'
//#ifdef MP-ALIPAY //#ifdef MP-ALIPAY
import uQRCode from '@/common/uqrcode4.js' import uQRCode from '@/common/uqrcode4.js'
//#endif //#endif
import UMask from '@/uview-ui/components/u-mask/u-mask.vue' // import UMask from '@/uview-ui/components/u-mask/u-mask.vue'
export default { export default {
components: { components: {
UMask // UMask
}, },
filters:{ filters:{
orderStatus1(i){//景区订单状态 orderStatus1(i){//景区订单状态
......
pages/my/order/electronicTicket/electronicTicket.vue
View file @ 2bc226eb
...@@ -372,10 +372,8 @@ ...@@ -372,10 +372,8 @@
<script> <script>
// import uQRCode from '@/common/uqrcode4.js' // import uQRCode from '@/common/uqrcode4.js'
import QRCode from '@/common/weapp-qrcode.js' import QRCode from '@/common/weapp-qrcode.js'
import UMask from '@/uview-ui/components/u-mask/u-mask.vue'
export default { export default {
components: { components: {
UMask
}, },
filters:{ filters:{
orderStatus1(i){//景区订单状态 orderStatus1(i){//景区订单状态
...@@ -637,7 +635,7 @@ export default { ...@@ -637,7 +635,7 @@ export default {
this.ifyukuaiCode = option.ifyukuaiCode||'' this.ifyukuaiCode = option.ifyukuaiCode||''
//this.id = "z00167956572219584dc15634b62cf75" //this.id = "z00167956572219584dc15634b62cf75"
this.openId = uni.getStorageSync('openid') //openid oroHZ5FaUQ_SOOC_uQQP92fJpBRE oh2UV1lyYABHMZ1rMlgjhVHyyYDQ this.openId = uni.getStorageSync('openid') //openid oroHZ5FaUQ_SOOC_uQQP92fJpBRE oh2UV1lyYABHMZ1rMlgjhVHyyYDQ
//this.openId = 'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ' //this.openId = 'oroHZ5FaUQ_SOOC_uQQP92fJpBRE'//'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ' oroHZ5FaUQ_SOOC_uQQP92fJpBRE
this.getDetail() this.getDetail()
}, },
onUnload() { onUnload() {
...@@ -1137,7 +1135,7 @@ export default { ...@@ -1137,7 +1135,7 @@ export default {
},1000) },1000)
}, },
refundJump(id){//-------------------景区跳转 refundJump(id){//-------------------景区跳转
uni.reLaunch({ uni.navigateTo({
url: '/pages/my/order/afterSale/applyAfterSale/applyAfterSale?orderId='+id+'&ifyukuaiCode='+this.ifyukuaiCode url: '/pages/my/order/afterSale/applyAfterSale/applyAfterSale?orderId='+id+'&ifyukuaiCode='+this.ifyukuaiCode
}) })
}, },
......
pages/my/order/orderList/orderList.vue
View file @ 2bc226eb
...@@ -38,16 +38,16 @@ ...@@ -38,16 +38,16 @@
<view class="product-searchBt"> <view class="product-searchBt">
<view class="searchBt-left" @click="orderShow=true"> <view class="searchBt-left" @click="orderShow=true">
<text>{{orderName}}</text> <text>{{orderName}}</text>
<u-icon v-if="orderShow==false" name="arrow-down" color="#333333" size="28"></u-icon> <u-icon v-if="orderShow==false" name="arrow-down" color="#333333" size="20"></u-icon>
<u-icon v-else name="arrow-up" color="#333333" size="28"></u-icon> <u-icon v-else name="arrow-up" color="#333333" size="20"></u-icon>
<u-picker mode="selector" v-model="orderShow" :default-selector="[orderType]" :range="option" range-key="cateName" @confirm="industrysTypeConfirm($event)" @cancel="cancel"></u-picker> <u-picker mode="selector" :show="orderShow" :default-selector="[orderType]" :columns="option" keyName="cateName" @confirm="industrysTypeConfirm($event)" @cancel="cancel"></u-picker>
</view> </view>
<text @click="showQueryPhone()">手机查询</text> <text @click="showQueryPhone()">手机查询</text>
</view> </view>
</view> </view>
<!--手机查询遮罩--> <!--手机查询遮罩-->
<u-popup mode="bottom" v-model="phoneQuery"> <u-popup mode="bottom" :show="phoneQuery">
<view class="content"> <view class="content">
<view class="content-title"> <view class="content-title">
订单查询 订单查询
...@@ -159,16 +159,16 @@ ...@@ -159,16 +159,16 @@
<view class="product-goods" v-else> <view class="product-goods" v-else>
<view class="order-No">暂无订单信息</view> <view class="order-No">暂无订单信息</view>
</view> </view>
<u-toast ref="uToast" /> <!-- <u-toast ref="uToast" /> -->
<u-modal v-model="configShow" show-cancel-button="true" :content="configTitle" @confirm="operationEnter()" @cancel="operationClose()"></u-modal> <u-modal v-model="configShow" show-cancel-button="true" :content="configTitle" @confirm="operationEnter()" @cancel="operationClose()"></u-modal>
</view> </view>
</template> </template>
<script> <script>
import uPicker from '@/uview-ui/components/u-picker/u-picker.vue' // import uPicker from '@/uview-ui/components/u-picker/u-picker.vue'
import uPopup from '@/uview-ui/components/u-popup/u-popup.vue' // import uPopup from '@/uview-ui/components/u-popup/u-popup.vue'
import uToast from '@/uview-ui/components/u-toast/u-toast.vue' // import uToast from '@/uview-ui/components/u-toast/u-toast.vue'
import uModal from '@/uview-ui/components/u-modal/u-modal.vue' // import uModal from '@/uview-ui/components/u-modal/u-modal.vue'
export default { export default {
filters:{ filters:{
orderType(i){//订单类型 orderType(i){//订单类型
...@@ -398,10 +398,10 @@ export default { ...@@ -398,10 +398,10 @@ export default {
} }
}, },
components: { components: {
uPicker, // uPicker,
uPopup, // uPopup,
uToast, // uToast,
uModal // uModal
}, },
data() { data() {
return { return {
...@@ -415,7 +415,7 @@ export default { ...@@ -415,7 +415,7 @@ export default {
orderType:0,//筛选 //1景区，2酒店，3餐饮，4特产，5运营车，10组合订单 orderType:0,//筛选 //1景区，2酒店，3餐饮，4特产，5运营车，10组合订单
orderName:'全部',//筛选 //1景区，2酒店，3餐饮，4特产，5运营车，10组合订单 orderName:'全部',//筛选 //1景区，2酒店，3餐饮，4特产，5运营车，10组合订单
orderShow:false, orderShow:false,
option: [ option: [[
{ cateName: '全部', id: 0 }, { cateName: '全部', id: 0 },
{ cateName: '景区', id: 1 }, { cateName: '景区', id: 1 },
{ cateName: '酒店', id: 2 }, { cateName: '酒店', id: 2 },
...@@ -423,7 +423,7 @@ export default { ...@@ -423,7 +423,7 @@ export default {
{ cateName: '特产', id: 4 }, { cateName: '特产', id: 4 },
// { cateName: '运营车', id: 5 }, // { cateName: '运营车', id: 5 },
// { cateName: '组合订单', id: 10 }, // { cateName: '组合订单', id: 10 },
], ]],
isTrue:true,//截留 防止重复加载 isTrue:true,//截留 防止重复加载
pageIndex:1,//当前页 pageIndex:1,//当前页
pageTotal:0,//总条数 pageTotal:0,//总条数
...@@ -440,7 +440,7 @@ export default { ...@@ -440,7 +440,7 @@ export default {
}, },
onLoad(option) { onLoad(option) {
this.openId = uni.getStorageSync('openid') this.openId = uni.getStorageSync('openid')
//this.openId = 'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ' //this.openId = 'oroHZ5FaUQ_SOOC_uQQP92fJpBRE'//oh2UV1lyYABHMZ1rMlgjhVHyyYDQ oroHZ5FaUQ_SOOC_uQQP92fJpBRE
this.orderStatus = option.orderStatus||'' this.orderStatus = option.orderStatus||''
this.ifyukuaiCode = option.ifyukuaiCode||'' this.ifyukuaiCode = option.ifyukuaiCode||''
this.getData(1) this.getData(1)
...@@ -459,8 +459,9 @@ export default { ...@@ -459,8 +459,9 @@ export default {
this.getData(1) this.getData(1)
}, },
industrysTypeConfirm(e) {//单列----分类 点击确定 industrysTypeConfirm(e) {//单列----分类 点击确定
this.orderType = this.option[e].id console.log('confirm', e)
this.orderName = this.option[e].cateName this.orderType = e.value[0].id
this.orderName = e.value[0].cateName
this.pageIndex = 1 this.pageIndex = 1
this.pageTotal = 0 this.pageTotal = 0
this.isTrue = true this.isTrue = true
...@@ -479,16 +480,16 @@ export default { ...@@ -479,16 +480,16 @@ export default {
queryPhoneOrder(){//通过手机号查看订单 queryPhoneOrder(){//通过手机号查看订单
if(!(/^1[34578]\d{9}$/.test(this.touristPhone))){ if(!(/^1[34578]\d{9}$/.test(this.touristPhone))){
this.$refs.uToast.show({ uni.showToast({
title: '请填写正确的手机号码', title: '请填写正确的手机号码',
type: 'error', icon: 'none'
}) })
return return
} }
if(this.touristName==''){ if(this.touristName==''){
this.$refs.uToast.show({ uni.showToast({
title: '姓名不可为空', title: '姓名不可为空',
type: 'error', icon: 'none'
}) })
return return
} }
...@@ -508,9 +509,9 @@ export default { ...@@ -508,9 +509,9 @@ export default {
this.pageIndex = 1 this.pageIndex = 1
this.getData(1) this.getData(1)
}else{ }else{
this.$refs.uToast.show({ uni.showToast({
title: res.message, title: res.message,
type: 'error', icon: 'none'
}) })
} }
...@@ -600,9 +601,9 @@ export default { ...@@ -600,9 +601,9 @@ export default {
//隐藏加载框 //隐藏加载框
uni.hideLoading() uni.hideLoading()
}else{ }else{
this.$refs.uToast.show({ uni.showToast({
title: '暂无订单信息', title: '暂无订单信息',
type: 'error', icon: 'none'
}) })
} }
}) })
...@@ -633,9 +634,9 @@ export default { ...@@ -633,9 +634,9 @@ export default {
.then((res)=>{ .then((res)=>{
var ret = res var ret = res
if(ret.code=='00'){ if(ret.code=='00'){
this.$refs.uToast.show({ uni.showToast({
title: '订单取消成功', title: '订单取消成功',
type: 'success', icon: 'none'
}) })
//this.$store.commit('showLoading') //this.$store.commit('showLoading')
this.pageIndex = 1 this.pageIndex = 1
...@@ -646,9 +647,9 @@ export default { ...@@ -646,9 +647,9 @@ export default {
// this.getData(1) // this.getData(1)
this.configShow = false this.configShow = false
}else{ }else{
this.$refs.uToast.show({ uni.showToast({
title: ret.message, title: res.message,
type: 'error', icon: 'none'
}) })
} }
}) })
...@@ -660,9 +661,9 @@ export default { ...@@ -660,9 +661,9 @@ export default {
.then((res)=>{ .then((res)=>{
var ret = res var ret = res
if(ret.code=='00'){ if(ret.code=='00'){
this.$refs.uToast.show({ uni.showToast({
title: '订单删除成功', title: '订单删除成功',
type: 'success', icon: 'none'
}) })
//this.$store.commit('showLoading') //this.$store.commit('showLoading')
this.pageIndex = 1 this.pageIndex = 1
...@@ -673,9 +674,9 @@ export default { ...@@ -673,9 +674,9 @@ export default {
// this.getData(1) // this.getData(1)
this.configShow = false this.configShow = false
}else{ }else{
this.$refs.uToast.show({ uni.showToast({
title: ret.message, title: res.message,
type: 'error', icon: 'none'
}) })
} }
}) })
...@@ -697,7 +698,7 @@ export default { ...@@ -697,7 +698,7 @@ export default {
}, },
refundJump(id){//-------------------退款 refundJump(id){//-------------------退款
uni.reLaunch({ uni.navigateTo({
url: '/pages/my/order/afterSale/applyAfterSale/applyAfterSale?orderId='+id+'&ifyukuaiCode='+this.ifyukuaiCode url: '/pages/my/order/afterSale/applyAfterSale/applyAfterSale?orderId='+id+'&ifyukuaiCode='+this.ifyukuaiCode
}) })
}, },
...@@ -805,7 +806,7 @@ page{ ...@@ -805,7 +806,7 @@ page{
position: relative; position: relative;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
u-icon{ /deep/ .u-icon{
color: #c8c9cc; color: #c8c9cc;
position: absolute; position: absolute;
right: 16rpx; right: 16rpx;
...@@ -837,7 +838,7 @@ page{ ...@@ -837,7 +838,7 @@ page{
} }
.confrim-btn{ .confrim-btn{
margin: 64rpx 24rpx 40rpx 24rpx; margin: 64rpx 24rpx 40rpx 24rpx;
/deep/ .u-size-default{ /deep/ .u-reset-button{
height: 80rpx; height: 80rpx;
line-height: 80rpx; line-height: 80rpx;
border-radius: 15rpx; border-radius: 15rpx;
......
pages/scenic/combinationProduct/combinationProduct.vue
View file @ 2bc226eb
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
<view class="wrap"> <view class="wrap">
<scroll-view @scroll="scroll" style="height: 100%;" scroll-y> <scroll-view @scroll="scroll" style="height: 100%;" scroll-y>
<view class="banner"> <view class="banner">
<u-swiper :list="imgList" name="url" mode="number" height="400" indicator-pos="topRight"></u-swiper> <u-swiper :list="imgList" @change="e => currentNum = e.current" indicatorStyle="right: 20px;bottom:25px" height="400">
<view slot="indicator" class="indicator-num">
<text class="indicator-num__text">{{ currentNum + 1 }}/{{ imgList.length }}</text>
</view>
</u-swiper>
</view> </view>
<view class="middle"> <view class="middle">
<view class="tabbar" :style="tabbarObj"> <view class="tabbar" :style="tabbarObj">
...@@ -48,7 +52,7 @@ ...@@ -48,7 +52,7 @@
</view> </view>
<view class="product-price"> <view class="product-price">
<view style="font-size: 24rpx"> <view style="font-size: 24rpx;display: flex;">
<text class="product-rule" v-if="items.productRefundRuleVo"> <text class="product-rule" v-if="items.productRefundRuleVo">
<text v-if="items.productRefundRuleVo.refundType == 0">不可退</text> <text v-if="items.productRefundRuleVo.refundType == 0">不可退</text>
<text v-if="items.productRefundRuleVo.refundType == 1">规定时间退</text> <text v-if="items.productRefundRuleVo.refundType == 1">规定时间退</text>
...@@ -69,12 +73,12 @@ ...@@ -69,12 +73,12 @@
</label> </label>
<view class="product-more" v-if="index > 0 && item.productList.length > 2"> <view class="product-more" v-if="index > 0 && item.productList.length > 2">
<view v-if="item.productListCopy.length != item.productList.length" @click="showMoreProduct(item)"> <view style="display: flex;justify-content: center;" v-if="item.productListCopy.length != item.productList.length" @click="showMoreProduct(item)">
更多 更多
<u-icon name="arrow-down"></u-icon> <u-icon name="arrow-down"></u-icon>
</view> </view>
<view v-else @click="retractProduct(item)"> <view style="display: flex;justify-content: center;" v-else @click="retractProduct(item)">
收起 收起
<u-icon name="arrow-up"></u-icon> <u-icon name="arrow-up"></u-icon>
</view> </view>
...@@ -167,7 +171,7 @@ ...@@ -167,7 +171,7 @@
<!-- 商户详情 --> <!-- 商户详情 -->
<merchantDetail :detailData='detailData' ref='merchantDetail'></merchantDetail> <merchantDetail :detailData='detailData' ref='merchantDetail'></merchantDetail>
<!-- 模态框 --> <!-- 模态框 -->
<u-modal v-model="showModal" @confirm="chooseConfirm" @cancel="chooseCancel" title="提示" content="该产品不支持多选" show-cancel-button="true"> <u-modal :show="showModal" @confirm="chooseConfirm" @cancel="chooseCancel" title="提示" content="该产品不支持多选" show-cancel-button="true">
</u-modal> </u-modal>
</scroll-view> </scroll-view>
</view> </view>
...@@ -195,6 +199,7 @@ export default { ...@@ -195,6 +199,7 @@ export default {
// tabbar:['热门景点','一日游','摄影/旅拍','文创DIY'],//tabbar标题列表 // tabbar:['热门景点','一日游','摄影/旅拍','文创DIY'],//tabbar标题列表
tabbar: ['热门景点', '摄影/旅拍', '一日游'], //tabbar标题列表 tabbar: ['热门景点', '摄影/旅拍', '一日游'], //tabbar标题列表
active: 0, //导航栏下标 active: 0, //导航栏下标
currentNum:0,//轮播图下标
imgList: [], //图片列表 imgList: [], //图片列表
scenicList: [], //景区数据 scenicList: [], //景区数据
showDistance: false, //定位成功显示距离 showDistance: false, //定位成功显示距离
...@@ -701,6 +706,7 @@ export default { ...@@ -701,6 +706,7 @@ export default {
.title-right { .title-right {
color: $grey; color: $grey;
font-size: 24rpx; font-size: 24rpx;
display: flex;
} }
.product { .product {
padding: 10rpx 16rpx; padding: 10rpx 16rpx;
...@@ -810,6 +816,7 @@ export default { ...@@ -810,6 +816,7 @@ export default {
.bottom-detail { .bottom-detail {
position: relative; position: relative;
text-align: center; text-align: center;
display: flex;
} }
.bottom-number { .bottom-number {
display: inline-block; display: inline-block;
...@@ -856,15 +863,16 @@ export default { ...@@ -856,15 +863,16 @@ export default {
} }
} }
.album-btn{ .album-btn{
display: inline-block; display: flex;
width: 160rpx; width: 160rpx;
height: 44rpx; height: 44rpx;
background: #E1E1D9; background: #E1E1D9;
border-radius: 20rpx 20rpx 20rpx 20rpx; border-radius: 20rpx 20rpx 20rpx 20rpx;
font-size: 22rpx; font-size: 22rpx;
color: #333333; color: #333333;
text-align: center; align-items: center;
line-height: 44rpx; justify-content: center;
padding-left: 8rpx;
} }
.swiper-item /deep/ .u-waterfall{ .swiper-item /deep/ .u-waterfall{
padding-top:8rpx; padding-top:8rpx;
......
pages/vlog/myVlogPhotos/myVlogPhotos.vue
View file @ 2bc226eb
<template> <template>
<view class="content"> <view class="content">
<view class="" style="display: flex;padding: 40rpx 20rpx 0 20rpx;"> <view class="" style="display: flex;padding: 40rpx 20rpx 0 20rpx;">
<u-section title="精彩瞬间" :right="false" color="#303133"></u-section> <view style="color: #303133;font-weight: bold;font-size: 32rpx;">
精彩瞬间
</view>
<text style="font-size: 24rpx;color: #ccc;margin-left: 30rpx;">MOMENT</text> <text style="font-size: 24rpx;color: #ccc;margin-left: 30rpx;">MOMENT</text>
</view> </view>
<image src="../static/vlog/icon/fengexian.png" mode="" style="width: 100%;height: 15rpx;"></image> <image src="../static/vlog/icon/fengexian.png" mode="" style="width: 100%;height: 15rpx;"></image>
......
pages/vlog/orderPay/orderPay.vue
View file @ 2bc226eb
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
</view> </view>
</view> </view>
<u-cell-group> <u-cell-group>
<u-cell-item title="商品金额" :value="'￥'+ price" :arrow="false"></u-cell-item> <u-cell title="商品金额" :value="'￥'+ price" :arrow="false"></u-cell>
<u-cell-item title="运费" :value="Freight.defaultCost==0?'包邮':'￥'+Freight.defaultCost" :arrow="false"></u-cell-item> <u-cell title="运费" :value="Freight.defaultCost==0?'包邮':'￥'+Freight.defaultCost" :arrow="false"></u-cell>
</u-cell-group> </u-cell-group>
<view class="bottom"> <view class="bottom">
<view class="price"> <view class="price">
......
pages/vlog/productDetails/productDetails.vue
View file @ 2bc226eb
...@@ -13,7 +13,9 @@ ...@@ -13,7 +13,9 @@
</view> </view>
</view> </view>
<view class="" style="display: flex;"> <view class="" style="display: flex;">
<u-section title="模板选择" :right="false" color="#303133"></u-section> <view style="color: #303133;font-weight: bold;font-size: 32rpx;">
模板选择
</view>
<text style="font-size: 24rpx;color: #ccc;margin-left: 30rpx;">Template Selection</text> <text style="font-size: 24rpx;color: #ccc;margin-left: 30rpx;">Template Selection</text>
</view> </view>
<image src="../static/vlog/icon/fengexian.png" style="width: 100%;height: 5rpx;"></image> <image src="../static/vlog/icon/fengexian.png" style="width: 100%;height: 5rpx;"></image>
...@@ -40,7 +42,9 @@ ...@@ -40,7 +42,9 @@
</view> </view>
</view> </view>
<view style="display: flex;margin-top: 30rpx;"> <view style="display: flex;margin-top: 30rpx;">
<u-section title="详细参数" :right="false" color="#303133"></u-section> <view style="color: #303133;font-weight: bold;font-size: 32rpx;">
详细参数
</view>
<text style="font-size: 24rpx;color: #ccc;margin-left: 30rpx;">Parameters</text> <text style="font-size: 24rpx;color: #ccc;margin-left: 30rpx;">Parameters</text>
</view> </view>
<image src="../static/vlog/icon/fengexian.png" mode="" style="width: 100%;height: 5rpx;"></image> <image src="../static/vlog/icon/fengexian.png" mode="" style="width: 100%;height: 5rpx;"></image>
......
uni.scss
View file @ 2bc226eb
@import "uview-ui/theme.scss"; @import 'uview-ui/theme.scss';
/** /**
* 这里是uni-app内置的常用样式变量 * 这里是uni-app内置的常用样式变量
* *
......
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