Tuzki
/
CjyTravel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

音频视频接口对接

Browse Source
lu_quan_dev
han 11 months ago
parent c8713d2842
commit f38abca2f7
9 changed files with 100 additions and 82 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      components/dc-calendar/dc-calendar.vue
  2. 19
      components/mescroll-diy/mescroll-xinlang.vue
  3. 27
      pages/index/index.vue
  4. 4
      static/css/common.scss
  5. 27
      subPageB/Homestay/homestaydetail/homestaydetail.vue
  6. 10
      subPageC/bookHomestay/bookHomestay.vue
  7. 4
      subPageC/orderHomestay/orderCancel.vue
  8. 12
      subPageC/orderHomestay/orderDetail.vue
  9. 46
      subPageC/orderHomestay/orderList.vue

5
components/dc-calendar/dc-calendar.vue
Unescape View File

@ -1170,13 +1170,14 @@
// 周容器 周日-周六 // 周容器 周日-周六
.week { .week {
margin-top: -50rpx;
display: flex; display: flex;
align-items: center; align-items: center;
border-bottom: 1rpx solid #ededed; border-bottom: 1rpx solid #ededed;
padding-bottom: 20rpx; padding-bottom: 20rpx;
margin-bottom: 30rpx; margin-bottom: 30rpx;
color: #cecece; color: #cecece;
font-size: 28rpx;
view { view {
width: 14.2857%; width: 14.2857%;
@ -1193,7 +1194,7 @@
// 日期视口容器 // 日期视口容器
.dateView { .dateView {
position: absolute; //绝对定位 position: absolute; //绝对定位
top: 120rpx; //头部操作区域以及想要的margin-bottomm top: 240rpx; //头部操作区域以及想要的margin-bottomm
bottom: 112rpx; //底部操作区域高度 bottom: 112rpx; //底部操作区域高度
left: 32rpx; left: 32rpx;
right: 32rpx; right: 32rpx;

19
components/mescroll-diy/mescroll-xinlang.vue
Unescape View File

@ -369,22 +369,5 @@
-webkit-animation: progressRotate .6s steps(6,start) infinite; -webkit-animation: progressRotate .6s steps(6,start) infinite;
animation: progressRotate .6s steps(6,start) infinite; animation: progressRotate .6s steps(6,start) infinite;
} }
@-webkit-keyframes progressRotate {
0% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress1.png)}
16% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress2.png)}
32% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress3.png)}
48% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress4.png)}
64% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress5.png)}
80% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress6.png)}
100% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress1.png)}
}
@keyframes progressRotate {
0% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress1.png)}
16% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress2.png)}
32% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress3.png)}
48% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress4.png)}
64% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress5.png)}
80% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress6.png)}
100% {background-image: url(http://www.mescroll.com/img/xinlang/mescroll-progress1.png)}
}
</style> </style>

27
pages/index/index.vue
Unescape View File

@ -72,11 +72,17 @@
</view> </view>
</view> </view>
<view class="w_20" hover-class="checkActive"> <view class="w_20" hover-class="checkActive">
<view class="kua_nav" @click="goToPages('youji')"> <view class="kua_nav" @click="goQuanyi">
<image src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-nav-12.png" class="at_size_2"></image> <image src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-nav-12.png" class="at_size_2"></image>
<view class="at_t">文旅攻略</view> <view class="at_t">文旅攻略</view>
</view> </view>
</view> </view>
<!-- <view class="w_20" hover-class="checkActive">
<view class="kua_nav" @click="goToPages('youji')">
<image src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-nav-12.png" class="at_size_2"></image>
<view class="at_t">文旅攻略</view>
</view>
</view> -->
<view class="w_20" hover-class="checkActive"> <view class="w_20" hover-class="checkActive">
<view class="kua_nav" @click="goQuanyi"> <view class="kua_nav" @click="goQuanyi">
<image src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-nav-13.png" class="at_size_2"></image> <image src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-nav-13.png" class="at_size_2"></image>
@ -90,11 +96,17 @@
</view> </view>
</view> </view>
<view class="w_20" hover-class="checkActive"> <view class="w_20" hover-class="checkActive">
<view class="kua_nav" @click="goToPages('Audiovisual')"> <view class="kua_nav" @click="goQuanyi">
<image src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-nav-15.png" class="at_size_2"></image> <image src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-nav-15.png" class="at_size_2"></image>
<view class="at_t">影音世界</view> <view class="at_t">影音世界</view>
</view> </view>
</view> </view>
<!-- <view class="w_20" hover-class="checkActive">
<view class="kua_nav" @click="goToPages('Audiovisual')">
<image src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-nav-15.png" class="at_size_2"></image>
<view class="at_t">影音世界</view>
</view>
</view> -->
</view> </view>
</view> </view>
@ -389,11 +401,14 @@
}, },
methods: { methods: {
clickSwiper(e) { clickSwiper(e) {
uni.showToast({ uni.navigateTo({
title: "功能正在开发中~", url: "/subPageB/Homestay/homestaylist/homestaylist",
icon: "none",
duration: 2000,
}); });
// uni.showToast({
// title: "功能正在开发中~",
// icon: "none",
// duration: 2000,
// });
}, },
goQuanyi() { goQuanyi() {
uni.showToast({ uni.showToast({

4
static/css/common.scss
Unescape View File

@ -1012,3 +1012,7 @@ page {
.p-r-24 { .p-r-24 {
padding-right: 24rpx !important; padding-right: 24rpx !important;
} }
.v-detail-content{
img{width: 100%;}
}

27
subPageB/Homestay/homestaydetail/homestaydetail.vue
Unescape View File

@ -69,25 +69,25 @@
</view> </view>
</view> --> </view> -->
<view class="v-card detail small container-fluid m-t-24" v-if="info.hotelBedInfoVos.length>0"> <view class="v-card detail small container-fluid m-t-24" v-if="info&&info.hotelBedInfoVos.length>0">
<view class="v-pages-list"> <view class="v-pages-list">
<view class="list_item row"> <view class="list_item row" v-for="(item,index) in info.hotelBedInfoVos" :key="item.id">
<view class="item_image hotel"> <view class="item_image hotel">
<image class="img" :src="info.hotelBedInfoVos[0].hotelPhoto" mode="aspectFill"></image> <image class="img" :src="item.hotelPhoto" mode="aspectFill"></image>
</view> </view>
<view class="item_content col"> <view class="item_content col">
<view class="content-name">{{info.hotelBedInfoVos[0].houseName}}</view> <view class="content-name">{{item.houseName}}</view>
<view class="v-order-tip"> <view class="v-order-tip">
<text v-if="info.hotelBedInfoVos[0].guest">{{info.hotelBedInfoVos[0].guest}}人入住</text> <text v-if="item.guest">{{item.guest}}人入住</text>
<text class="m-l-10" <text class="m-l-10"
v-if="info.hotelBedInfoVos[0].houseArea">{{info.hotelBedInfoVos[0].houseArea}}㎡</text> v-if="item.houseArea">{{item.houseArea}}㎡</text>
</view> </view>
<view class="content-wait m-t-12">需等待商家确认</view> <view class="content-wait m-t-12">需等待商家确认</view>
</view> </view>
<view class="item-price row flex-align-center"> <view class="item-price row flex-align-center">
<text class="num_pr">¥</text><text class="num_jd">{{info.hotelBedInfoVos[0].housePrice}}</text> <text class="num_pr">¥</text><text class="num_jd">{{item.housePrice}}</text>
<text class="num_qi">起</text> <text class="num_qi">起</text>
<view class="btn m-l-24" @click="bookIt(info.hotelBedInfoVos[0])">预定</view> <view class="btn m-l-24" @click="bookIt(item)">预定</view>
</view> </view>
</view> </view>
</view> </view>
@ -105,15 +105,16 @@
<view class="v-detail-title"> <view class="v-detail-title">
<view class="text"><text>民宿介绍</text></view> <view class="text"><text>民宿介绍</text></view>
</view> </view>
<view class="v-detail-content m-t-24" v-html="info.hcontent"></view> <view class="v-detail-content m-t-24">
<u-parse :content="info.hcontent" v-if="info"/>
</view>
</view> </view>
<f-login></f-login> <f-login></f-login>
</view> </view>
</template> </template>
<script> <script>
import uParse from '@/components/gaoyia-parse/parse.vue' import uParse from '@/uni_modules/uview-ui/components/u-parse/u-parse.vue'
import calendar from '@/components/dc-calendar/dc-calendar.vue' import calendar from '@/components/dc-calendar/dc-calendar.vue'
import { import {
mapState, mapState,
@ -240,8 +241,6 @@
bookIt(val) { bookIt(val) {
this.judgeLogin((resa) => { this.judgeLogin((resa) => {
console.log('asdfasdf====', this.userInfo)
var data = { var data = {
mobile: this.userInfo.phone, mobile: this.userInfo.phone,
@ -252,7 +251,7 @@
}; };
const parame = { const parame = {
...this.info.hotelBedInfoVos[0], //民宿整套 ...val, //民宿整套
...data, ...data,
...this.infoData ...this.infoData
} }

10
subPageC/bookHomestay/bookHomestay.vue
Unescape View File

@ -214,11 +214,11 @@
title: '支付成功', title: '支付成功',
icon: 'none' icon: 'none'
}); });
this.isPayPopup = false
setTimeout(() => { setTimeout(() => {
uni.navigateTo({ uni.redirectTo({
url: "/subPageC/orderHomestay/orderList" url: "/subPageC/orderHomestay/orderList"
}); });
this.isPayPopup = false
}, 1000) }, 1000)
} else { } else {
uni.showToast({ uni.showToast({
@ -226,9 +226,10 @@
icon: 'none' icon: 'none'
}); });
setTimeout(() => { setTimeout(() => {
uni.navigateTo({ uni.redirectTo({
url: "/subPageC/orderHomestay/orderList" url: "/subPageC/orderHomestay/orderList"
}); });
this.isPayPopup = false
}, 1000) }, 1000)
} }
//uni.showToast({title: data.detail.errMsg,icon:'none'}); //uni.showToast({title: data.detail.errMsg,icon:'none'});
@ -243,14 +244,15 @@
showCancel: true, showCancel: true,
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
that.isPayPopup = false
setTimeout(() => { setTimeout(() => {
uni.redirectTo({ uni.redirectTo({
url: "/subPageC/orderHomestay/orderList" url: "/subPageC/orderHomestay/orderList"
}); });
that.isPayPopup = false
}, 500) }, 500)
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消'); console.log('用户点击取消');
that.isPayPopup = false
} }
} }
}) })

4
subPageC/orderHomestay/orderCancel.vue
Unescape View File

@ -66,8 +66,8 @@
icon: 'none' icon: 'none'
}); });
setTimeout(() => { setTimeout(() => {
uni.navigateTo({ uni.navigateBack({
url: "/subPageC/orderHomestay/orderList" delta: 2
}); });
}, 1000) }, 1000)
} else { } else {

12
subPageC/orderHomestay/orderDetail.vue
Unescape View File

@ -187,11 +187,7 @@
} }
} }
}, },
onUnload: function() {
uni.navigateBack({
delta: 1
});
},
onLoad(options) { onLoad(options) {
this.getHomestayOrderDetail(options.id) this.getHomestayOrderDetail(options.id)
}, },
@ -326,8 +322,8 @@
}); });
this.isPayPopup = false this.isPayPopup = false
setTimeout(() => { setTimeout(() => {
uni.navigateTo({ uni.navigateBack({
url: "/subPageC/orderHomestay/orderList" delta: 1
}); });
}, 1000) }, 1000)
} else { } else {
@ -335,6 +331,7 @@
title: '支付失败', title: '支付失败',
icon: 'none' icon: 'none'
}); });
this.isPayPopup=false
} }
//uni.showToast({title: data.detail.errMsg,icon:'none'}); //uni.showToast({title: data.detail.errMsg,icon:'none'});
}, },
@ -351,6 +348,7 @@
that.isPayPopup = false that.isPayPopup = false
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消'); console.log('用户点击取消');
this.isPayPopup=false
} }
} }
}) })

46
subPageC/orderHomestay/orderList.vue
Unescape View File

@ -2,9 +2,9 @@
<view class="v-order-list"> <view class="v-order-list">
<mescroll-uni :up="upOption" @down="downCallback" @up="upCallback" :fixed="false"> <mescroll-uni :up="upOption" @down="downCallback" @up="upCallback" :fixed="false">
<view class="list_item container-fluid m-b-24" v-for="(item,index) in orderList" <view class="list_item container-fluid m-b-24" v-for="(item,index) in orderList"
@click="toHomeStayDetailPage(item.id)"> >
<view class="item_title">{{item.hotelName}}</view> <view class="item_title">{{item.hotelName}}</view>
<view class="row"> <view class="row" @click="toHomeStayDetailPage(item.id)">
<view class="item_image"> <view class="item_image">
<image class="img" :src="item.hotelLogo" mode="widthFix"></image> <image class="img" :src="item.hotelLogo" mode="widthFix"></image>
</view> </view>
@ -17,6 +17,9 @@
{{item.checkOutTime}} {{item.checkOutTime}}
</view> </view>
<view class="content-price">总价：¥{{item.orderAmount}}</view> <view class="content-price">总价：¥{{item.orderAmount}}</view>
</view>
</view>
<view class="item_content">
<view class="content-bottom"> <view class="content-bottom">
<view class="btn" v-if="item.orderStatus=='0'" @click="payOrder(item)">去支付</view> <view class="btn" v-if="item.orderStatus=='0'" @click="payOrder(item)">去支付</view>
<view class="btn" v-if="item.orderStatus !='0' && item.orderStatus !='1'" <view class="btn" v-if="item.orderStatus !='0' && item.orderStatus !='1'"
@ -24,13 +27,12 @@
<view class="btn" v-if="item.refundDisplay =='1'" @click="toRefundPage(item.id)">退款进度</view> <view class="btn" v-if="item.refundDisplay =='1'" @click="toRefundPage(item.id)">退款进度</view>
</view> </view>
</view> </view>
</view>
<view class="tip-bage"></view> <view class="tip-bage"></view>
<view class="tip-state m-t-12" v-if="item.orderStatus=='1'">等待商家确认中，请及时关注订单状态</view> <view class="tip-state m-t-12" v-if="item.orderStatus=='1'">等待商家确认中，请及时关注订单状态</view>
<view class="state" :class="'type'+item.orderStatus">{{stateMessage(item.orderStatus)}}</view> <view class="state" :class="'type'+item.orderStatus">{{stateMessage(item.orderStatus)}}</view>
</view> </view>
</mescroll-uni> </mescroll-uni>
<u-popup :show="isPayPopup" mode="bottom" @close="isPayPopup = false" round="10"> <u-popup :show="isPayPopup" mode="bottom" @close="closePay" round="10">
<f-pay :show-title="false" :show="isPayPopup" :order="orderInfo" :payMoney="orderInfo.orderAmount" <f-pay :show-title="false" :show="isPayPopup" :order="orderInfo" :payMoney="orderInfo.orderAmount"
:tradeNo="orderInfo.orderNumber" @payResult="payResult"></f-pay> :tradeNo="orderInfo.orderNumber" @payResult="payResult"></f-pay>
</u-popup> </u-popup>
@ -80,10 +82,9 @@
//TODO: //TODO:
this.judgeLogin() this.judgeLogin()
}, },
onUnload: function() { onShow() {
uni.navigateTo({ this.param.pageNo = 1
url: '/pages/personcenter/personcenter' this.loadData()
});
}, },
methods: { methods: {
stateMessage: function(val) { stateMessage: function(val) {
@ -146,17 +147,17 @@
title: '支付成功', title: '支付成功',
icon: 'none' icon: 'none'
}); });
this.isPayPopup = false
setTimeout(() => { setTimeout(() => {
uni.navigateTo({ this.isPayPopup = false
url: "/subPageC/orderHomestay/orderList" this.param.pageNo = 1
}); this.loadData()
}, 1000) }, 1000)
} else { } else {
uni.showToast({ uni.showToast({
title: '支付失败', title: '支付失败',
icon: 'none' icon: 'none'
}); });
this.isPayPopup = false
} }
//uni.showToast({title: data.detail.errMsg,icon:'none'}); //uni.showToast({title: data.detail.errMsg,icon:'none'});
}, },
@ -165,14 +166,12 @@
// TODO: 需从缓存获取appId openId // TODO: 需从缓存获取appId openId
const userInfo = uni.getStorageSync("userInfo"); const userInfo = uni.getStorageSync("userInfo");
const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {}; const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
console.log(uni.getExtConfigSync(), 'extConfigextConfigextConfig')
let appId = extConfig.app_id let appId = extConfig.app_id
this.param.openid = userInfo.openid this.param.openid = userInfo.openid
this.param.appid = appId this.param.appid = appId
this.$Request.get(this.$config.getHomestayOrderList, this.param, null, null, false, true).then((res) => { this.$Request.get(this.$config.getHomestayOrderList, this.param, null, null, false, true).then((res) => {
console.log("bbbbb")
const curPageData = res.data.list || [] // 当前页数据 const curPageData = res.data.list || [] // 当前页数据
if (this.mescroll.num == 1) this.orderList = []; // 第一页需手动制空列表 if (this.mescroll.num == 1) this.orderList = []; // 第一页需手动制空列表
curPageData.forEach((item, index) => { curPageData.forEach((item, index) => {
@ -192,6 +191,23 @@
console.log("订单==========", this.orderInfo) console.log("订单==========", this.orderInfo)
this.isPayPopup = true this.isPayPopup = true
}, },
closePay() {
let that = this
uni.showModal({
title: '提示',
content: '确定取消支付？',
cancelText: '再想想',
showCancel: true,
success: function(res) {
if (res.confirm) {
that.isPayPopup = false
} else if (res.cancel) {
console.log('用户点击取消');
this.isPayPopup=false
}
}
})
},
// 跳转民宿订单详情页 // 跳转民宿订单详情页
toHomeStayDetailPage(id) { toHomeStayDetailPage(id) {
uni.navigateTo({ uni.navigateTo({
@ -241,7 +257,7 @@
.item_image { .item_image {
width: 180rpx; width: 180rpx;
height: 200rpx; height: 150rpx;
margin-right: 20rpx; margin-right: 20rpx;
overflow: hidden; overflow: hidden;

Write Preview
Loading…
Cancel
Save