lu_quan_dev
han 11 months ago
parent 2af2de8533
commit 2baf1f4254
  1. 5
      common/login.js
  2. 37
      pages.json
  3. 4
      pages/index/index.vue
  4. 320
      pages/personcenter/personcenter.vue
  5. 8
      subPageB/Homestay/homestaydetail/homestaydetail.vue
  6. 8
      subPageB/Homestay/homestaylist/homestaylist.vue
  7. 2
      subPageC/flower/index.vue
  8. 14
      subPageC/orderHomestay/orderDetail.vue
  9. 19
      subPageC/orderHomestay/orderList.vue
  10. 70
      subPageC/weather/index.vue

@ -171,9 +171,8 @@ var throttleLogin = true
export const judgeLogin = (callback) => {
console.log('judgeLogindddd', store)
const storeUserInfo = uni.getStorageSync('userInfo')
console.log("asdfasdfafasdf",storeUserInfo)
if (!storeUserInfo) {
if (throttleLogin) {
throttleLogin = false
setTimeout(() => {
@ -202,4 +201,4 @@ export const judgeLogin = (callback) => {
} else {
callback && callback()
}
}
}

@ -540,13 +540,36 @@
"navigationBarTitleText": "取消订单"
}
},
{
"path": "orderShop/orderList",
"style": {
"navigationBarTitleText": "订单列表"
}
},
{
"path": "orderShop/orderDetail",
"style": {
"navigationBarTitleText": "订单详情"
}
},
{
"path": "orderShop/cancelStep",
"style": {
"navigationBarTitleText": "退款详情"
}
},
{
"path": "orderShop/orderCancel",
"style": {
"navigationBarTitleText": "取消订单"
}
},
{
"path": "Ai/index",
"style": {
"navigationBarTitleText": "AI管家",
"navigationBarBackgroundColor": "#f5f6fa"
"navigationBarBackgroundColor": "#f5f6fa"
}
},
{
@ -554,8 +577,8 @@
"style": {
"navigationBarTitleText": "拍照识花",
"navigationBarBackgroundColor": "#0983ff",
"navigationBarTextStyle":"white",
"enablePullDownRefresh":false//
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false //
}
},
{
@ -563,8 +586,8 @@
"style": {
"navigationBarTitleText": "拍照翻译",
"navigationBarBackgroundColor": "#0983ff",
"navigationBarTextStyle":"white",
"enablePullDownRefresh":false//
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false //
}
},
{

@ -729,9 +729,9 @@
uni.navigateTo({
url: "/subPageA/Audiovisual/AudiovisualList/AudiovisualList",
});
}else if (type == "Ai") {
} else if (type == "Ai") {
uni.navigateTo({
url: '/subPageC/Ai/index'
url: '/subPageC/Ai/index'
});
}
},

@ -1,187 +1,194 @@
<template>
<view class="m-content" :style="{ 'background-image': `url(${haedBg})` }">
<view class="headBox">
<!-- #ifdef MP -->
<!-- 登录 -->
<view class="u-flex u-p-l-30 u-p-r-20 u-p-t-30 u-p-b-30 user-head-box">
<view class="user-head" v-if="userInfo.accessToken">
<view class="u-m-r-20">
<view class="avatar u-flex" style="justify-content: center">
<image class="head-head" src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/touxiang.png">
</image>
<view class="m-content" :style="{ 'background-image': `url(${haedBg})` }">
<view class="headBox">
<!-- #ifdef MP -->
<!-- 登录 -->
<view class="u-flex u-p-l-30 u-p-r-20 u-p-t-30 u-p-b-30 user-head-box">
<view class="user-head" v-if="userInfo.accessToken">
<view class="u-m-r-20">
<view class="avatar u-flex" style="justify-content: center">
<image class="head-head"
src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/touxiang.png">
</image>
</view>
</view>
</view>
<view class="u-flex-1">
<view class="nickName u-flex">
<view class="name u-m-r-10" v-if="userInfo.nickName">{{ userInfo.nickName }}</view>
<view class="name u-m-r-10" v-else>游客</view>
<view class="u-flex-1">
<view class="nickName u-flex">
<view class="name u-m-r-10" v-if="userInfo.nickName">{{ userInfo.nickName }}</view>
<view class="name u-m-r-10" v-else>游客</view>
</view>
<view class="detail" v-if="userInfo.phone">手机号{{ userInfo.phone | phone }}</view>
<view class="detail" v-else>手机号:未绑定</view>
</view>
<view class="detail" v-if="userInfo.phone">手机号{{ userInfo.phone | phone }}</view>
<view class="detail" v-else>手机号:未绑定</view>
</view>
</view>
<view class="user-head" v-else>
<view class="u-m-r-20">
<view class="avatar u-flex" style="justify-content: center">
<image class="head-head" src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/touxiang.png">
</image>
<view class="user-head" v-else>
<view class="u-m-r-20">
<view class="avatar u-flex" style="justify-content: center">
<image class="head-head"
src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/touxiang.png">
</image>
</view>
</view>
<view class="u-flex-1" @click="openLogin">
<view class="u-font-lg" style=" font-weight: bold">请点击登录</view>
<view class="detail">登录后享受更好的服务体验</view>
</view>
</view>
<view class="u-flex-1" @click="openLogin">
<view class="u-font-lg" style=" font-weight: bold">请点击登录</view>
<view class="detail">登录后享受更好的服务体验</view>
</view>
</view>
</view>
<!-- #endif -->
</view>
<view class="my-order">我的订单</view>
<view class="order-btn-box">
<view class="left" @click="goPage('ticketOrder')">
<image src="/static/animg/personCenter/senceDd.png"></image>
<view class="top">景区订单</view>
<view class="right"><u-icon name="arrow-right" size="13"></u-icon></view>
</view>
<!-- #endif -->
</view>
<view class="left rights" @click="goPage('homestayOrder')">
<image src="/static/animg/personCenter/hotelDd.png"></image>
<view class="top">住宿订单</view>
<view class="right"><u-icon name="arrow-right" size="13"></u-icon></view>
<view class="my-order">我的订单</view>
<view class="order-btn-box">
<view class="left" @click="goPage('ticketOrder')">
<image src="/static/animg/personCenter/senceDd.png"></image>
<view class="top">景区订单</view>
<view class="right"><u-icon name="arrow-right" size="13"></u-icon></view>
</view>
<view class="left rights" @click="goPage('homestayOrder')">
<image src="/static/animg/personCenter/hotelDd.png"></image>
</view>
</view>
<view class="share-box">
<image src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/share.png"></image>
<button class="btns" open-type="share" plain></button>
</view>
<view class="m-my-menu-list">
<view class="btn-item" hover-class="active-btn" @click="goPage('yijian')">
<view class="btn-img">
<image src="/static/animg/personCenter/jianyi.png" mode="widthFix"></image>
<view class="top">住宿订单</view>
<view class="right"><u-icon name="arrow-right" size="13"></u-icon></view>
</view>
<view class="btn-left">
<view class="btn-text">我的建议</view>
<view class="left rights m-t-24" @click="goPage('shopOrder')">
<image src="/static/animg/personCenter/hotelDd.png"></image>
<view class="top">商城订单</view>
<view class="right"><u-icon name="arrow-right" size="13"></u-icon></view>
</view>
<view class="right"><u-icon name="arrow-right" size="13"></u-icon></view>
</view>
<view class="btn-item" hover-class="active-btn" @click="goPage('tousu')">
<view class="btn-img">
<image src="/static/animg/personCenter/tousu.png" mode="widthFix"></image>
</view>
<view class="btn-left">
<view class="btn-text">我的投诉</view>
</view>
<view class="right"><u-icon name="arrow-right" size="13"></u-icon></view>
<view class="share-box">
<image src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/share.png"></image>
<button class="btns" open-type="share" plain></button>
</view>
<view class="btn-item" hover-class="active-btn" @click="makeCall">
<view class="btn-img">
<image src="/static/animg/personCenter/kefu.png" mode="widthFix"></image>
<view class="m-my-menu-list">
<view class="btn-item" hover-class="active-btn" @click="goPage('yijian')">
<view class="btn-img">
<image src="/static/animg/personCenter/jianyi.png" mode="widthFix"></image>
</view>
<view class="btn-left">
<view class="btn-text">我的建议</view>
</view>
<view class="right"><u-icon name="arrow-right" size="13"></u-icon></view>
</view>
<view class="btn-left">
<view class="btn-text">客服电话</view>
<view class="btn-item" hover-class="active-btn" @click="goPage('tousu')">
<view class="btn-img">
<image src="/static/animg/personCenter/tousu.png" mode="widthFix"></image>
</view>
<view class="btn-left">
<view class="btn-text">我的投诉</view>
</view>
<view class="right"><u-icon name="arrow-right" size="13"></u-icon></view>
</view>
<view class="right"><u-icon name="arrow-right" size="13"></u-icon></view>
</view>
<view class="btn-item" hover-class="active-btn">
<button class="btns" open-type="share" plain>
<view class="btn-item" hover-class="active-btn" @click="makeCall">
<view class="btn-img">
<image src="/static/animg/personCenter/fenxiang.png" mode="widthFix"></image>
<image src="/static/animg/personCenter/kefu.png" mode="widthFix"></image>
</view>
<view class="btn-left">
<view class="btn-text">分享推荐</view>
<view class="btn-text">客服电话</view>
</view>
<view class="right"><u-icon name="arrow-right" size="13"></u-icon></view>
</button>
</view>
<view class="btn-item" hover-class="active-btn" @click="goPage('about')">
<view class="btn-img">
<image src="/static/animg/personCenter/about.png" mode="widthFix"></image>
</view>
<view class="btn-left">
<view class="btn-text">关于E鹿悦游</view>
<view class="btn-item" hover-class="active-btn">
<button class="btns" open-type="share" plain>
<view class="btn-img">
<image src="/static/animg/personCenter/fenxiang.png" mode="widthFix"></image>
</view>
<view class="btn-left">
<view class="btn-text">分享推荐</view>
</view>
<view class="right"><u-icon name="arrow-right" size="13"></u-icon></view>
</button>
</view>
<view class="btn-item" hover-class="active-btn" @click="goPage('about')">
<view class="btn-img">
<image src="/static/animg/personCenter/about.png" mode="widthFix"></image>
</view>
<view class="btn-left">
<view class="btn-text">关于E鹿悦游</view>
</view>
<view class="right"><u-icon name="arrow-right" size="13"></u-icon></view>
</view>
<view class="right"><u-icon name="arrow-right" size="13"></u-icon></view>
</view>
<f-login></f-login>
<m-tabBar :activeIndex="3"></m-tabBar>
</view>
<f-login></f-login>
<m-tabBar :activeIndex="3"></m-tabBar>
</view>
</template>
<script>
import {
mapState,
mapMutations
} from 'vuex';
import mTabBar from "@/components/m-tabBar/mTabBar.vue";
export default {
components: {
mTabBar
},
data() {
return {
haedBg: this.$config.ROOTPATH + "/upload/image/2024/mapIcon/daolan/mybg.png"
};
},
onShareAppMessage(res) {
if (res.from === 'button') { //
console.log(res.target)
}
return {
title: 'E鹿悦游',
path: '/pages/index/index'
}
},
computed: {
...mapState(['PrimaryColor', 'userInfo']),
freeSpecsButtonBackground() {
return this.$u.colorToRgba(this.$u.rgbToHex(this.PrimaryColor), 0.75);
}
},
methods: {
...mapMutations(['setLoginPopupShow']),
openLogin() {
this.judgeLogin();
import {
mapState,
mapMutations
} from 'vuex';
import mTabBar from "@/components/m-tabBar/mTabBar.vue";
export default {
components: {
mTabBar
},
data() {
return {
haedBg: this.$config.ROOTPATH + "/upload/image/2024/mapIcon/daolan/mybg.png"
};
},
onShareAppMessage(res) {
if (res.from === 'button') { //
console.log(res.target)
}
return {
title: 'E鹿悦游',
path: '/pages/index/index'
}
},
makeCall() {
uni.makePhoneCall({
phoneNumber: '0311-83886677' //
});
computed: {
...mapState(['PrimaryColor', 'userInfo']),
freeSpecsButtonBackground() {
return this.$u.colorToRgba(this.$u.rgbToHex(this.PrimaryColor), 0.75);
}
},
goPage(val) {
switch (val) {
case 'ticketOrder':
this.onTokenJump('/subPageC/order/order', 'navigateTo')
break;
case 'homestayOrder':
this.onTokenJump('/subPageC/orderHomestay/orderList', 'navigateTo')
break;
case 'yijian':
this.onTokenJump('/subPageB/suggest/sug_list?type=2', 'navigateTo')
break;
case 'tousu':
this.onTokenJump('/subPageB/suggest/sug_list?type=1', 'navigateTo')
break;
case 'about':
uni.navigateTo({
url: '/subPageA/personcenter/aboutus'
});
break;
methods: {
...mapMutations(['setLoginPopupShow']),
openLogin() {
this.judgeLogin();
},
makeCall() {
uni.makePhoneCall({
phoneNumber: '0311-83886677' //
});
},
goPage(val) {
switch (val) {
case 'ticketOrder':
this.onTokenJump('/subPageC/order/order', 'navigateTo')
break;
case 'homestayOrder':
this.onTokenJump('/subPageC/orderHomestay/orderList', 'navigateTo')
break;
case 'shopOrder':
this.onTokenJump('/subPageC/orderShop/orderList', 'navigateTo')
break;
case 'yijian':
this.onTokenJump('/subPageB/suggest/sug_list?type=2', 'navigateTo')
break;
case 'tousu':
this.onTokenJump('/subPageB/suggest/sug_list?type=1', 'navigateTo')
break;
case 'about':
uni.navigateTo({
url: '/subPageA/personcenter/aboutus'
});
break;
}
}
}
}
};
};
</script>
<style lang="scss"
scoped>
<style lang="scss" scoped>
.myInfo {
// ---
min-height: 2000rpx;
@ -358,6 +365,7 @@ export default {
.order-btn-box {
position: relative;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
align-items: center;
margin: 20rpx;
@ -497,18 +505,18 @@ export default {
margin-bottom: 28rpx;
}
.share-box{
padding: 0 20rpx;
.share-box {
padding: 0 20rpx;
margin-bottom: 20rpx;
height: 120rpx;
position: relative;
image{
image {
width: 100%;
height: 100%;
}
.btns{
.btns {
width: 100%;
height: 100%;
position: absolute;
@ -519,4 +527,4 @@ export default {
border: none;
}
}
</style>
</style>

@ -106,7 +106,7 @@
<view class="text"><text>民宿介绍</text></view>
</view>
<view class="v-detail-content m-t-24">
<u-parse :content="info.hcontent" v-if="info"/>
<u-parse :content="info.hcontent" v-if="info"/>
</view>
</view>
<f-login></f-login>
@ -127,7 +127,7 @@
},
data() {
return {
rootPath: "https://eluyou.ailuquan.cn/",
rootPath: this.$config.ROOTPATH,
indicatorDots: false,
autoplay: true,
interval: 3000,
@ -196,7 +196,7 @@
var data = {
hotelId: id,
};
this.$Request.get(this.$config.getHomestayDetail, data, null, null, false, null).then((res) => {
this.$Request.get(this.$config.getHomestayDetail, data, null, null, false, true).then((res) => {
this.info = res.data
this.info.facilities = this.info.facilities.split(",")
this.pic_list = this.info.hotelPhoto.split(",")
@ -374,4 +374,4 @@
left: 0;
z-index: 999;
}
</style>
</style>

@ -98,7 +98,7 @@
},
listDatas: [],
topNum: 0,
rootPath: "https://eluyou.ailuquan.cn/",
rootPath: this.$config.ROOTPATH,
regionname: '区域',
regionList: [],
searchTitle: '',
@ -171,7 +171,7 @@
this.get_data();
},
confirm(e) {
this.searchTitle = e.detail.value;
this.searchTitle = e.detail.value;
this.initData();
this.get_data();
},
@ -219,7 +219,7 @@
userkey: this.$param.userkey,
hotelName: this.searchTitle
};
this.$Request.get(this.$config.getHomestayList, requestData, '', '', false, '').then(res => {
this.$Request.get(this.$config.getHomestayList, requestData, '', '', false, true).then(res => {
var list = res.data.list || [] //
if (this.mescroll.num == 1) this.listDatas = []; //
@ -270,4 +270,4 @@
width: 24rpx;
margin-right: 8rpx;
}
</style>
</style>

@ -111,6 +111,8 @@
.v-pages-flower {
position: relative;
height: 70vh;
width: 100vw;
overflow: hidden;
&:after {

@ -17,7 +17,7 @@
</view>
<!-- <view class="time" v-if="homestayOrderData.orderStatus == '0'">25:25</view> -->
</view>
</view>
<view class="order-top-btn m-t-40 row" v-if="homestayOrderData.orderStatus == '0'">
<view class=" col-12">
<view class="pay-btn" @click="payOrder">去支付</view>
@ -31,7 +31,7 @@
<view class="pay-btn" @click="toHomeStayBookingPage(homestayOrderData.hotelId)">再次预订</view>
</view>
</view>
<!-- <view v-if="homestayOrderData.orderStatus != '0' && homestayOrderData.orderStatus !='1'">
<view class="pay-btn">再次预订</view>
</view> -->
@ -155,7 +155,7 @@
return {
//
isPayPopup: false,
rootPath: "https://eluyou.ailuquan.cn",
rootPath: this.$config.ROOTPATH,
title: '订单详情',
homestayOrderData: {
'id': 1734877929,
@ -191,7 +191,7 @@
}
}
},
onLoad(options) {
this.getHomestayOrderDetail(options.id)
},
@ -201,7 +201,7 @@
let data = {
'id': orderId
}
this.$Request.get(this.$config.getHomestayOrderDetail, data, null, null, false, null).then((res) => {
this.$Request.get(this.$config.getHomestayOrderDetail, data, null, null, false, true).then((res) => {
if (res.code == 0) {
this.homestayOrderData = res.data
let checkTime = this.homestayOrderData.checkTime
@ -355,7 +355,7 @@
this.isPayPopup=false
}
}
})
})
},
stateImg: function(val) {
@ -744,4 +744,4 @@
font-weight: bold;
}
}
</style>
</style>

@ -17,7 +17,7 @@
{{item.checkOutTime}}
</view>
<view class="content-price">总价¥{{item.orderAmount}}</view>
</view>
</view>
</view>
<view class="item_content">
<view class="content-bottom">
@ -53,7 +53,7 @@
},
data() {
return {
rootPath: "https://eluyou.ailuquan.cn",
rootPath: this.$config.ROOTPATH,
//
isPayPopup: false,
//
@ -82,7 +82,7 @@
//TODO:
this.judgeLogin()
},
onShow() {
onShow() {
this.param.pageNo = 1
this.loadData()
},
@ -122,6 +122,7 @@
/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
/*下拉刷新的回调 */
downCallback(mescroll) {
this.mescroll = mescroll
this.param.pageNo = 1
this.loadData();
// #ifdef H5
@ -131,7 +132,7 @@
this.top = uni.upx2px(100) + 'px'; // H5
// #endif
setTimeout(() => {
mescroll.endSuccess();
this.mescroll.endSuccess();
this.top = 0;
}, 2500);
},
@ -146,7 +147,7 @@
uni.showToast({
title: '支付成功',
icon: 'none'
});
});
setTimeout(() => {
this.isPayPopup = false
this.param.pageNo = 1
@ -165,13 +166,13 @@
loadData() {
// TODO: appId openId
const userInfo = uni.getStorageSync("userInfo");
const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
const extConfig = uni.getExtConfigSync ? uni.getExtConfigSync() : {};
let appId = extConfig.app_id
this.param.openid = userInfo.openid
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) => {
const curPageData = res.data.list || [] //
if (this.mescroll.num == 1) this.orderList = []; //
curPageData.forEach((item, index) => {
@ -206,7 +207,7 @@
this.isPayPopup=false
}
}
})
})
},
// 宿
toHomeStayDetailPage(id) {
@ -366,4 +367,4 @@
}
}
</style>
</style>

@ -1,6 +1,6 @@
<template>
<view class="v-pages-bg" v-if="today_data" :class="getTodayClass(today_data.text)">
<view class="v-weather-bg" :class="getTodayClass(today_data.text)"></view>
<view class="v-pages-bg" v-if="today_data" :class="TodayClass">
<view class="v-weather-bg" :class="TodayClass"></view>
<view class="v-weather-bar row flex-align-center">
<image src="@/static/test/icon-back.png" class="img" mode="widthFix" @click="gotoBack()"></image>
<view class="col">鹿泉天气</view>
@ -60,6 +60,33 @@
tempTotal: undefined,
};
},
computed: {
TodayClass() {
switch (true) {
case this.today_data.text.includes("晴"):
return "sunny"
break;
case this.today_data.text.includes("阴"):
return "rainy"
break;
case this.today_data.text.includes("雨"):
return "rainy"
break;
case this.today_data.text.includes("雪"):
return "snowy"
break;
case this.today_data.text.includes("云"):
return "cloudy"
break;
case this.today_data.text.includes("雾"):
return "smog"
break;
default:
return "sunny"
break;
}
}
},
onLoad() {
this.initPages()
},
@ -78,15 +105,16 @@
this.tempTotal = this.tempMax - this.tempMin
data.data.forEach((item, index, arr) => {
let data = {
...item,
...{
week: this.getWeekday(item.fxDate[0] + '-' + item.fxDate[1] +
'-' +
item.fxDate[2])
}
week: this.getWeekday(item.fxDate[0] + '-' + item.fxDate[1] +
'-' +
item.fxDate[2]),
iconDay: item.iconDay,
tempMin:item.tempMin,
tempMax:item.tempMax,
}
this.days_data.push(data);
})
console.log("asdf",this.days_data)
}
});
@ -106,7 +134,7 @@
right: right + '%'
}
},
gotoBack() {
gotoBack() {
uni.navigateBack({
delta: 1 // 1
});
@ -122,28 +150,7 @@
return weekdays[weekday];
}
},
getTodayClass(val) {
switch (true) {
case val.includes("晴"):
return "sunny"
break;
case val.includes("雨"):
return "rainy"
break;
case val.includes("雪"):
return "snowy"
break;
case val.includes("云"):
return "cloudy"
break;
case val.includes("雾"):
return "smog"
break;
default:
return "sunny"
break;
}
}
}
}
</script>
@ -153,6 +160,7 @@
.v-weather-bar {
position: relative;
top:88rpx;
z-index: 9;
height: 88rpx;
line-height: 88rpx;

Loading…
Cancel
Save