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
Expand all Show whitespace changes
Inline Side-by-side
Showing with 634 additions and 430 deletions
App.vue
View file @ 2bc226eb
......@@ -145,4 +145,18 @@ export default {
checkbox.round .wx-checkbox-input {
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>
components/buyKnow.vue
View file @ 2bc226eb
<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="head">
<view class="head1">
<view style="flex: 1;text-align: center;">
购买须知
</view>
<u-icon name="close" @click="showPop=false"></u-icon>
</view>
<view class="head2">
{{buyKnowData.name}}
</view>
......@@ -12,8 +15,10 @@
<view class="head3">
挂牌价：￥{{buyKnowData.originalPrice}}
</view>
</view>
<view style="flex: 1;overflow-y: scroll;">
<view class="middle">
<view class="middle-list" v-for="(item,a) of buyKnowData.productTitleResVos" :key="a">
<view class="middle-title">
......@@ -46,6 +51,8 @@
</view>
</view>
</view>
</view>
</u-popup>
</template>
......@@ -63,56 +70,53 @@ export default {
</script>
<style scoped="scoped">
.son-wrap{
font-size: 24rpx;
.son-wrap{
position: relative;
}
.head {
padding: 100rpx 24rpx 0 24rpx;
}
.head1{
text-align: center;
height:85vh;
display: flex;
flex-direction:column;
}
.head{
padding: 0 24rpx;
}
.head1{
display: flex;
font-size: 32rpx;
font-weight: bold;
text-align: center;
padding: 30rpx 0;
position:fixed;
top: 0;
width: 100%;
background: #fff;
z-index: 1;
}
.head2{
border-radius: 20rpx 20rpx 0 0;
}
.head2{
font-weight: bolder;
font-size: 32rpx;
line-height: 40rpx;
}
.head3{
}
.head3{
font-size: 28rpx;
margin-top: 20rpx;
color: #666666;
border-bottom: 1px solid #e6e6e6;
padding-bottom: 30rpx;
}
.middle {
}
.middle {
padding-bottom: 100rpx;
font-size: 28rpx;
}
.middle-list {
}
.middle-list {
margin: 30rpx 24rpx;
padding-bottom: 24rpx;
border-bottom: 1px solid #E6E6E6;
}
.middle-title{
}
.middle-title{
font-size: 32rpx;
font-weight: bold;
}
.middle-content {
}
.middle-content {
display: flex;
margin-top: 30rpx;
position: relative;
}
.middle-content>text {
}
.middle-content>text {
color: #666666;
margin-right: 30rpx;
width: 120rpx;
......@@ -123,13 +127,13 @@ export default {
flex-shrink: 0;
font-size: 26rpx;
position: relative;
}
.middle-content view {
}
.middle-content view {
display: flex;
flex-direction: column;
justify-content: center;
}
.bottom {
}
.bottom {
display: flex;
justify-content: space-between;
padding: 0 24rpx;
......@@ -141,24 +145,24 @@ export default {
z-index: 9;
background: #FFFFFF;
box-sizing: border-box;
}
}
.bottom-left{
.bottom-left{
color: #f9690e;
}
}
.bottom-left text {
.bottom-left text {
font-size: 36rpx;
font-weight: bolder;
}
}
.bottom view {
.bottom view {
display: flex;
align-items: center;
}
.btn{
}
.btn{
padding: 16rpx 48rpx;
border-radius: 20rpx;
font-size: 32rpx;
}
}
</style>
components/customer.vue
View file @ 2bc226eb
<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="title">
客服电话
<view style="flex: 1; text-align: center"> 客服电话 </view>
<u-icon name="close" @click="showPop = false"></u-icon>
</view>
<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>
{{item.name}}:
</text>
<text>
{{item.phone}}
{{ item.phone }}
</text>
</view>
</view>
......@@ -20,50 +19,49 @@
</template>
<script>
export default{
props:['scenicList'],
data(){
return{
showPop:false,//控制弹窗显示隐藏
export default {
props: ['scenicList'],
data() {
return {
showPop: false //控制弹窗显示隐藏
}
},
methods:{
methods: {
//---拨打电话
makePhone(phoneNumber){
makePhone(phoneNumber) {
uni.makePhoneCall({
phoneNumber
})
}
}
}
</script>
<style scoped lang="scss">
.son-wrap{
.son-wrap {
position: relative;
}
.title{
text-align: center;
height: 65vh;
display: flex;
flex-direction: column;
}
.title {
display: flex;
font-size: 32rpx;
font-weight: bold;
padding: 30rpx 0;
position:fixed;
top: 0;
width: 100%;
padding: 30rpx;
background: #fff;
z-index: 1;
}
.middle{
padding-top: 100rpx;
}
.list{
height:100rpx;
border-bottom: 1px solid #E6E6E6;
border-radius: 20rpx 20rpx 0 0;
}
.middle {
flex: 1;
overflow-y: scroll;
}
.list {
height: 100rpx;
border-bottom: 1px solid #e6e6e6;
padding: 0 24rpx;
display: flex;
align-items: center;
justify-content: space-between;
}
}
</style>
components/merchantDetail.vue
View file @ 2bc226eb
<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="head">
<view class="head-name">
{{detailData.name}}
</view>
<view style="padding-top: 100rpx;">
<u-swiper :list="detailData.imgList" mode="number" height="350" name="url"></u-swiper>
<u-icon name="close" @click="showPop=false"></u-icon>
</view>
<view style="flex: 1;overflow-y: scroll;">
<view v-if="detailData.imgList&&detailData.imgList.length>0">
<u-swiper :list="detailData.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 }}/{{ detailData.imgList.length }}</text>
</view>
</u-swiper>
</view>
<view class="middle">
<!-- 景区介绍 -->
......@@ -26,7 +34,7 @@
<!-- 开放时间 -->
<view class="opentime">
<view class="middle-title">开放时间</view>
<u-table border-color="#04a7f4" >
<u-table>
<u-tr v-if="!times">
<u-td>每天</u-td>
</u-tr>
......@@ -40,7 +48,7 @@
<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!=''">
<u-td v-for="(items,b) of item" :key="b" v-if="items">
{{items}}
</u-td>
</u-tr>
......@@ -91,6 +99,8 @@
</view>
</view>
</view>
</view>
</u-popup>
</template>
......@@ -99,6 +109,7 @@ export default {
props: ['detailData'],
data() {
return {
currentNum:0,//轮播图下标
showPop: false, //控制弹窗显示隐藏
times: '', //时间数组
policy:'', //优待政策列表
......@@ -158,17 +169,22 @@ export default {
<style scoped="scoped" lang="scss">
.son-wrap{
position: relative;
height:80vh;
display: flex;
flex-direction:column;
}
.head{
text-align: center;
display: flex;
font-size: 32rpx;
font-weight: bold;
padding: 30rpx 0;
position:fixed;
top: 0;
width: 100%;
padding: 30rpx;
background: #fff;
z-index: 1;
border-radius: 20rpx 20rpx 0 0;
border-bottom: 1px solid #f5f5f5;
}
.head-name{
flex: 1;
text-align: center;
}
.middle{
padding: 24rpx 24rpx 80rpx 24rpx;
......
components/orderCoupon.vue
View file @ 2bc226eb
<template>
<!----------------适用于订单选择券的时候展示券列表-------------------------->
<u-popup v-model="show" mode="bottom">
<u-popup :show="show" :round="20" closeable @close="show=false">
<view class="title">
<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>
......
main.js
View file @ 2bc226eb
......@@ -10,6 +10,7 @@ Vue.prototype.$commonjs = commonjs
Vue.prototype.$request = request
Vue.prototype.imageError ='@/static/img/common/pangdingLogo.png'
Vue.use(uView)
uni.$u.config.unit = 'rpx'
Vue.config.productionTip = false
App.mpType = 'app'
......
pages/album/albumIndex.vue
View file @ 2bc226eb
......@@ -78,7 +78,7 @@
</text>
</view>
<u-mask :show="couponTip || showUseRule">
<!-- <u-mask :show="couponTip || showUseRule"> -->
<view class="mask">
<view class="img-box">
<image class="bg" src="@/static/img/my/backgroundIcon01.png" mode="aspectFit"></image>
......@@ -110,21 +110,21 @@
</view>
<u-button type="primary" shape="circle" @click="closeMask">知道了</u-button>
</view>
</u-mask>
<!-- </u-mask> -->
</view>
</template>
<script>
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 UMask from '@/uview-ui/components/u-mask/u-mask.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 UMask from '@/uview-ui/components/u-mask/u-mask.vue'
export default {
components: {
UWaterfall,
ULazyLoad,
UMask
// UWaterfall,
// ULazyLoad,
// UMask
},
data() {
return {
......
pages/album/chooseFavorite.vue
View file @ 2bc226eb
......@@ -25,13 +25,13 @@
</template>
<script>
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 UCheckboxGroup from '@/uview-ui/components/u-checkbox-group/u-checkbox-group.vue'
// import UCheckbox from '@/uview-ui/components/u-checkbox/u-checkbox.vue'
export default {
components: {
UCheckboxGroup,
UCheckbox,
// UCheckboxGroup,
// UCheckbox,
},
data() {
return {
......
pages/album/getPortrait.vue
View file @ 2bc226eb
......@@ -25,7 +25,7 @@
</view>
</view>
<text class="tip">获取照片需先在拍摄点摄影</text>
<u-mask :show="maskShow" @click="closeClick">
<!-- <u-mask :show="maskShow" @click="closeClick"> -->
<view class="mask">
<text class="countdown" :class="{'hidden': maskCount <= 0}">{{maskCount}}s</text>
<view class="tip">
......@@ -34,15 +34,15 @@
</view>
<u-button type="info" size="mini" shape="circle" @click="returnClick">返回</u-button>
</view>
</u-mask>
<!-- </u-mask> -->
</view>
</template>
<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 {
components: {
UMask
// UMask
},
data() {
return {
......
pages/album/myPhotoAlbum/myPhotoAlbum.vue
View file @ 2bc226eb
This diff is collapsed.
pages/album/purchasedPhotoAlbum/purchasedPhotoAlbum.vue
View file @ 2bc226eb
......@@ -7,13 +7,13 @@
<i>{{cityName}}</i>
<image src="../static/album/myPhoto01.png"></image>
</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">
<i>{{merchantName}}</i>
<image src="../static/album/myPhoto01.png"></image>
</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>
......@@ -26,7 +26,10 @@
<view class="album-subject">
<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>
<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>
......@@ -35,8 +38,9 @@
<view class="album-bottom">
<view class="bottom-left" v-if="maskDetail==false">
<!--全选按钮-->
<view class="album-checkAll">
<u-checkbox v-model="checkProjectAll" @change="checkProjectAllFun()">全选</u-checkbox>
<view class="album-checkAll" @click="checkProjectAllFun()">
<!-- <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>
</view>
......@@ -47,16 +51,16 @@
</template>
<script>
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 uCheckbox from '@/uview-ui/components/u-checkbox/u-checkbox'
import uToast from '@/uview-ui/components/u-toast/u-toast.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 uCheckbox from '@/uview-ui/components/u-checkbox/u-checkbox'
// import uToast from '@/uview-ui/components/u-toast/u-toast.vue'
export default {
components: {
uPicker,
uCheckboxGroup,
uCheckbox,
uToast
// uPicker,
// uCheckboxGroup,
// uCheckbox,
// uToast
},
data() {
return {
......@@ -122,7 +126,9 @@ export default {
inChina:0
}).then((res)=>{
if(res.code=='00'){
this.option = res.data
var opTionList = []
opTionList.push(res.data)
this.option = opTionList
}else{
this.$refs.uToast.show({
title: res.message,
......@@ -137,7 +143,9 @@ export default {
}
this.$request('scenic/albumConfig/getSurveyConfig',data).then((res)=>{
if(res.code=='00'){
this.merchantList = res.data
var merchantListList = []
merchantListList.push(res.data)
this.merchantList = merchantListList
}else{
this.$refs.uToast.show({
title: res.message,
......@@ -168,14 +176,16 @@ export default {
})
},
industrysTypeConfirm(e) { //单列----分类 点击确定 城市
this.cityName = this.option[e].areaName
this.areaId = this.option[e].areaId
this.cityName = e.value[0].areaName
this.areaId = e.value[0].areaId
this.inquireMerchant()
this.cancel()
},
industrysTypeConfirm2(e) { //单列----分类 点击确定 项目
this.merchantId = this.merchantList[e].merchantId
this.merchantName = this.merchantList[e].merchantName
this.merchantId = e.value[0].merchantId
this.merchantName = e.value[0].merchantName
this.getPhotos()
this.cancel2()
},
cancel() { //单列 点击取消
this.orderShow = false
......@@ -352,6 +362,11 @@ export default {
margin-left: 8rpx;
}
}
/deep/ .u-popup{
position: absolute;
left: 0;
top: 0;
}
}
}
......@@ -417,6 +432,18 @@ export default {
position: absolute;
right: 0;
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 {
/deep/ .u-checkbox__label {
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 {
font-size: 24rpx;
......
pages/indexs/center/center.vue
View file @ 2bc226eb
......@@ -52,10 +52,9 @@
<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>
</view>
</view>
......
pages/indexs/index/index.vue
View file @ 2bc226eb
......@@ -20,7 +20,10 @@
</view>
<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>
</view>
</view>
......@@ -32,7 +35,7 @@
</image>
<view class="address">
<u-icon name="map"></u-icon>
<u-icon name="map" color="#ffffff" size="24"></u-icon>
重庆
</view>
</view>
......@@ -66,7 +69,7 @@
</image>
<view class="address">
<u-icon name="map"></u-icon>
<u-icon name="map" color="#ffffff" size="24"></u-icon>
重庆
</view>
</view>
......@@ -100,7 +103,7 @@
</image>
<view class="address">
<u-icon name="map"></u-icon>
<u-icon name="map" color="#ffffff" size="24"></u-icon>
重庆
</view>
</view>
......@@ -135,7 +138,7 @@
</image>
<view class="address">
<u-icon name="map"></u-icon>
<u-icon name="map" color="#ffffff" size="24"></u-icon>
重庆
</view>
</view>
......@@ -170,15 +173,16 @@
export default {
data() {
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:[//图标列表
......@@ -222,10 +226,14 @@ export default {
}
},
onLoad(option){
// 首次进入时执行
let companyId=this.$commonjs.getCompanyId(option)
if(!companyId){
this.getCompanyId()
}
},
onShow() {
// 首次进入、后台切入前台时会执行
this.loadIcon()
},
methods: {
......@@ -371,7 +379,7 @@ export default {
position: absolute;
left: 20rpx;
bottom: 20rpx;
display: inline-block;
display: flex;
background: rgba(0,0,0,0.5);
padding: 8rpx 20rpx 12rpx 10rpx;
border-radius: 24rpx;
......
pages/indexs/merchantListIndex/merchantListIndex.vue
View file @ 2bc226eb
......@@ -2,7 +2,11 @@
<!-- 商户列表首页 -->
<view class="wrap">
<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 class="search">
......@@ -21,7 +25,7 @@
<view class="merchant-wrap">
<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>
<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" class="swiper-box">
<swiper-item class="swiper-item">
......@@ -142,15 +146,16 @@ export default {
showCoupon2:false,//是否显示券2
detailData:'',//详情数据
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: [{
......@@ -397,6 +402,7 @@ export default {
}
.right3{
margin-top: 16rpx;
display: flex;
}
.right3-text::after{
display: inline-block;
......
pages/my/order/afterSale/applyAfterSale/applyAfterSale.vue
View file @ 2bc226eb
<template>
<view class="apply-box">
<!--提示-->
<view class="apply-tips">
<view class="apply-tips" v-if="merchantId=='z0015605022691a5945bbe463141668c'">
同一身份证退票当日仅再购1次，同一身份证一个月累计可购3次
</view>
<view class="apply-ticket general-Box">
<view class="apply-ticket general-Box" :class="merchantId!='z0015605022691a5945bbe463141668c'?'apply-ticketAct':''">
<view class="ticket-title">
<view class="title-name">{{orderInfo.merchantName}}（{{orderInfo.productName}}）</view>
<view class="title-num">x{{orderInfo.orderNum}}</view>
</view>
<view class="ticket-timer">游玩当日{{orderInfo.orderRefundRuleList[0].refundTime}}之前未使用可退</view>
<view class="ticket-timer">游玩当日{{orderRefundRuleTimer}}之前未使用可退</view>
</view>
<!-- <view class="apply-user general-Box">
<view class="user-title">
......@@ -53,7 +53,13 @@
退款提交
</view>
<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>
</template>
......@@ -62,6 +68,7 @@
export default {
data() {
return {
merchantId:'',//景区ID
applyClickAll:false,//是否全选
applyUserList:[
{
......@@ -102,15 +109,23 @@ export default {
openId:'',//用户ID
orderInfo:{},//订单信息
isRefund:false,//是否可以退单
orderRefundRuleTimer:'',//退款时间
orderRefundRuleTimerType:false,
}
},
onLoad(option) {
this.id = option.orderId||''
this.openId = uni.getStorageSync('openid') //openid oroHZ5FaUQ_SOOC_uQQP92fJpBRE oh2UV1lyYABHMZ1rMlgjhVHyyYDQ
//this.openId = 'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ'
//this.openId = 'oroHZ5FaUQ_SOOC_uQQP92fJpBRE'//oh2UV1lyYABHMZ1rMlgjhVHyyYDQ oroHZ5FaUQ_SOOC_uQQP92fJpBRE
this.getDetail()
},
methods: {
orderRefundRuleTimerBack(){//返回前一个页面
console.log('123')
uni.navigateBack({
delta: 1
})
},
confirm(){//提交退订申请
if(this.causeNum==5&&this.causeInput==''){
uni.showToast({
......@@ -173,10 +188,20 @@ export default {
this.$request('order/userOrder/findOrderDetail',data).then((res)=>{
if(res.code == '00'){
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
}else{
this.isRefund = false
}
this.merchantId = res.data.merchantId
this.orderRefundRuleTimer = refundTimer
if(this.getNowTime()>this.orderRefundRuleTimer){
this.orderRefundRuleTimerType = true
}
}else{
uni.showToast({
......@@ -296,6 +321,9 @@ export default {
line-height: 40rpx;
}
}
.apply-ticketAct{
margin-top: 20rpx;
}
.apply-user{
padding: 24rpx 24rpx 30rpx 24rpx;
.user-title{
......@@ -397,4 +425,46 @@ export default {
bottom: 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>
pages/my/order/electronicTicket/electronicTicket-副本.vue
View file @ 2bc226eb
......@@ -355,10 +355,10 @@ import uQRCodeS from '@/common/js/uqrcode.js'
//#ifdef MP-ALIPAY
import uQRCode from '@/common/uqrcode4.js'
//#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 {
components: {
UMask
// UMask
},
filters:{
orderStatus1(i){//景区订单状态
......
pages/my/order/electronicTicket/electronicTicket.vue
View file @ 2bc226eb
......@@ -372,10 +372,8 @@
<script>
// import uQRCode from '@/common/uqrcode4.js'
import QRCode from '@/common/weapp-qrcode.js'
import UMask from '@/uview-ui/components/u-mask/u-mask.vue'
export default {
components: {
UMask
},
filters:{
orderStatus1(i){//景区订单状态
......@@ -637,7 +635,7 @@ export default {
this.ifyukuaiCode = option.ifyukuaiCode||''
//this.id = "z00167956572219584dc15634b62cf75"
this.openId = uni.getStorageSync('openid') //openid oroHZ5FaUQ_SOOC_uQQP92fJpBRE oh2UV1lyYABHMZ1rMlgjhVHyyYDQ
//this.openId = 'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ'
//this.openId = 'oroHZ5FaUQ_SOOC_uQQP92fJpBRE'//'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ' oroHZ5FaUQ_SOOC_uQQP92fJpBRE
this.getDetail()
},
onUnload() {
......@@ -1137,7 +1135,7 @@ export default {
},1000)
},
refundJump(id){//-------------------景区跳转
uni.reLaunch({
uni.navigateTo({
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 @@
<view class="product-searchBt">
<view class="searchBt-left" @click="orderShow=true">
<text>{{orderName}}</text>
<u-icon v-if="orderShow==false" name="arrow-down" color="#333333" size="28"></u-icon>
<u-icon v-else name="arrow-up" color="#333333" size="28"></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-icon v-if="orderShow==false" name="arrow-down" color="#333333" size="20"></u-icon>
<u-icon v-else name="arrow-up" color="#333333" size="20"></u-icon>
<u-picker mode="selector" :show="orderShow" :default-selector="[orderType]" :columns="option" keyName="cateName" @confirm="industrysTypeConfirm($event)" @cancel="cancel"></u-picker>
</view>
<text @click="showQueryPhone()">手机查询</text>
</view>
</view>
<!--手机查询遮罩-->
<u-popup mode="bottom" v-model="phoneQuery">
<u-popup mode="bottom" :show="phoneQuery">
<view class="content">
<view class="content-title">
订单查询
......@@ -159,16 +159,16 @@
<view class="product-goods" v-else>
<view class="order-No">暂无订单信息</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>
</view>
</template>
<script>
import uPicker from '@/uview-ui/components/u-picker/u-picker.vue'
import uPopup from '@/uview-ui/components/u-popup/u-popup.vue'
import uToast from '@/uview-ui/components/u-toast/u-toast.vue'
import uModal from '@/uview-ui/components/u-modal/u-modal.vue'
// import uPicker from '@/uview-ui/components/u-picker/u-picker.vue'
// import uPopup from '@/uview-ui/components/u-popup/u-popup.vue'
// import uToast from '@/uview-ui/components/u-toast/u-toast.vue'
// import uModal from '@/uview-ui/components/u-modal/u-modal.vue'
export default {
filters:{
orderType(i){//订单类型
......@@ -398,10 +398,10 @@ export default {
}
},
components: {
uPicker,
uPopup,
uToast,
uModal
// uPicker,
// uPopup,
// uToast,
// uModal
},
data() {
return {
......@@ -415,7 +415,7 @@ export default {
orderType:0,//筛选 //1景区，2酒店，3餐饮，4特产，5运营车，10组合订单
orderName:'全部',//筛选 //1景区，2酒店，3餐饮，4特产，5运营车，10组合订单
orderShow:false,
option: [
option: [[
{ cateName: '全部', id: 0 },
{ cateName: '景区', id: 1 },
{ cateName: '酒店', id: 2 },
......@@ -423,7 +423,7 @@ export default {
{ cateName: '特产', id: 4 },
// { cateName: '运营车', id: 5 },
// { cateName: '组合订单', id: 10 },
],
]],
isTrue:true,//截留 防止重复加载
pageIndex:1,//当前页
pageTotal:0,//总条数
......@@ -440,7 +440,7 @@ export default {
},
onLoad(option) {
this.openId = uni.getStorageSync('openid')
//this.openId = 'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ'
//this.openId = 'oroHZ5FaUQ_SOOC_uQQP92fJpBRE'//oh2UV1lyYABHMZ1rMlgjhVHyyYDQ oroHZ5FaUQ_SOOC_uQQP92fJpBRE
this.orderStatus = option.orderStatus||''
this.ifyukuaiCode = option.ifyukuaiCode||''
this.getData(1)
......@@ -459,8 +459,9 @@ export default {
this.getData(1)
},
industrysTypeConfirm(e) {//单列----分类 点击确定
this.orderType = this.option[e].id
this.orderName = this.option[e].cateName
console.log('confirm', e)
this.orderType = e.value[0].id
this.orderName = e.value[0].cateName
this.pageIndex = 1
this.pageTotal = 0
this.isTrue = true
......@@ -479,16 +480,16 @@ export default {
queryPhoneOrder(){//通过手机号查看订单
if(!(/^1[34578]\d{9}$/.test(this.touristPhone))){
this.$refs.uToast.show({
uni.showToast({
title: '请填写正确的手机号码',
type: 'error',
icon: 'none'
})
return
}
if(this.touristName==''){
this.$refs.uToast.show({
uni.showToast({
title: '姓名不可为空',
type: 'error',
icon: 'none'
})
return
}
......@@ -508,9 +509,9 @@ export default {
this.pageIndex = 1
this.getData(1)
}else{
this.$refs.uToast.show({
uni.showToast({
title: res.message,
type: 'error',
icon: 'none'
})
}
......@@ -600,9 +601,9 @@ export default {
//隐藏加载框
uni.hideLoading()
}else{
this.$refs.uToast.show({
uni.showToast({
title: '暂无订单信息',
type: 'error',
icon: 'none'
})
}
})
......@@ -633,9 +634,9 @@ export default {
.then((res)=>{
var ret = res
if(ret.code=='00'){
this.$refs.uToast.show({
uni.showToast({
title: '订单取消成功',
type: 'success',
icon: 'none'
})
//this.$store.commit('showLoading')
this.pageIndex = 1
......@@ -646,9 +647,9 @@ export default {
// this.getData(1)
this.configShow = false
}else{
this.$refs.uToast.show({
title: ret.message,
type: 'error',
uni.showToast({
title: res.message,
icon: 'none'
})
}
})
......@@ -660,9 +661,9 @@ export default {
.then((res)=>{
var ret = res
if(ret.code=='00'){
this.$refs.uToast.show({
uni.showToast({
title: '订单删除成功',
type: 'success',
icon: 'none'
})
//this.$store.commit('showLoading')
this.pageIndex = 1
......@@ -673,9 +674,9 @@ export default {
// this.getData(1)
this.configShow = false
}else{
this.$refs.uToast.show({
title: ret.message,
type: 'error',
uni.showToast({
title: res.message,
icon: 'none'
})
}
})
......@@ -697,7 +698,7 @@ export default {
},
refundJump(id){//-------------------退款
uni.reLaunch({
uni.navigateTo({
url: '/pages/my/order/afterSale/applyAfterSale/applyAfterSale?orderId='+id+'&ifyukuaiCode='+this.ifyukuaiCode
})
},
......@@ -805,7 +806,7 @@ page{
position: relative;
font-size: 32rpx;
font-weight: bold;
u-icon{
/deep/ .u-icon{
color: #c8c9cc;
position: absolute;
right: 16rpx;
......@@ -837,7 +838,7 @@ page{
}
.confrim-btn{
margin: 64rpx 24rpx 40rpx 24rpx;
/deep/ .u-size-default{
/deep/ .u-reset-button{
height: 80rpx;
line-height: 80rpx;
border-radius: 15rpx;
......
pages/scenic/combinationProduct/combinationProduct.vue
View file @ 2bc226eb
......@@ -2,7 +2,11 @@
<view class="wrap">
<scroll-view @scroll="scroll" style="height: 100%;" scroll-y>
<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 class="middle">
<view class="tabbar" :style="tabbarObj">
......@@ -48,7 +52,7 @@
</view>
<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 v-if="items.productRefundRuleVo.refundType == 0">不可退</text>
<text v-if="items.productRefundRuleVo.refundType == 1">规定时间退</text>
......@@ -69,12 +73,12 @@
</label>
<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>
</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>
</view>
......@@ -167,7 +171,7 @@
<!-- 商户详情 -->
<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>
</scroll-view>
</view>
......@@ -195,6 +199,7 @@ export default {
// tabbar:['热门景点','一日游','摄影/旅拍','文创DIY'],//tabbar标题列表
tabbar: ['热门景点', '摄影/旅拍', '一日游'], //tabbar标题列表
active: 0, //导航栏下标
currentNum:0,//轮播图下标
imgList: [], //图片列表
scenicList: [], //景区数据
showDistance: false, //定位成功显示距离
......@@ -701,6 +706,7 @@ export default {
.title-right {
color: $grey;
font-size: 24rpx;
display: flex;
}
.product {
padding: 10rpx 16rpx;
......@@ -810,6 +816,7 @@ export default {
.bottom-detail {
position: relative;
text-align: center;
display: flex;
}
.bottom-number {
display: inline-block;
......@@ -856,15 +863,16 @@ export default {
}
}
.album-btn{
display: inline-block;
display: flex;
width: 160rpx;
height: 44rpx;
background: #E1E1D9;
border-radius: 20rpx 20rpx 20rpx 20rpx;
font-size: 22rpx;
color: #333333;
text-align: center;
line-height: 44rpx;
align-items: center;
justify-content: center;
padding-left: 8rpx;
}
.swiper-item /deep/ .u-waterfall{
padding-top:8rpx;
......
pages/vlog/myVlogPhotos/myVlogPhotos.vue
View file @ 2bc226eb
<template>
<view class="content">
<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>
</view>
<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 @@
</view>
</view>
<u-cell-group>
<u-cell-item title="商品金额" :value="'￥'+ price" :arrow="false"></u-cell-item>
<u-cell-item title="运费" :value="Freight.defaultCost==0?'包邮':'￥'+Freight.defaultCost" :arrow="false"></u-cell-item>
<u-cell title="商品金额" :value="'￥'+ price" :arrow="false"></u-cell>
<u-cell title="运费" :value="Freight.defaultCost==0?'包邮':'￥'+Freight.defaultCost" :arrow="false"></u-cell>
</u-cell-group>
<view class="bottom">
<view class="price">
......
pages/vlog/productDetails/productDetails.vue
View file @ 2bc226eb
......@@ -13,7 +13,9 @@
</view>
</view>
<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>
</view>
<image src="../static/vlog/icon/fengexian.png" style="width: 100%;height: 5rpx;"></image>
......@@ -40,7 +42,9 @@
</view>
</view>
<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>
</view>
<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内置的常用样式变量
*
......
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