diff --git a/common/login.js b/common/login.js index a34820a..bc67f38 100644 --- a/common/login.js +++ b/common/login.js @@ -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() } -} \ No newline at end of file +} diff --git a/pages.json b/pages.json index c53d5b0..4a4721b 100644 --- a/pages.json +++ b/pages.json @@ -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 //开启下拉刷新 } }, { diff --git a/pages/index/index.vue b/pages/index/index.vue index 67084cf..15f90ea 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -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' }); } }, diff --git a/pages/personcenter/personcenter.vue b/pages/personcenter/personcenter.vue index 30687f1..1b639d3 100644 --- a/pages/personcenter/personcenter.vue +++ b/pages/personcenter/personcenter.vue @@ -1,187 +1,194 @@ - + \ No newline at end of file diff --git a/subPageB/Homestay/homestaydetail/homestaydetail.vue b/subPageB/Homestay/homestaydetail/homestaydetail.vue index 10bfeb3..d878f67 100644 --- a/subPageB/Homestay/homestaydetail/homestaydetail.vue +++ b/subPageB/Homestay/homestaydetail/homestaydetail.vue @@ -106,7 +106,7 @@ 民宿介绍 - + @@ -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; } - \ No newline at end of file + diff --git a/subPageB/Homestay/homestaylist/homestaylist.vue b/subPageB/Homestay/homestaylist/homestaylist.vue index b19b68f..cfba47c 100644 --- a/subPageB/Homestay/homestaylist/homestaylist.vue +++ b/subPageB/Homestay/homestaylist/homestaylist.vue @@ -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; } - \ No newline at end of file + diff --git a/subPageC/flower/index.vue b/subPageC/flower/index.vue index b91431b..fdc3c7a 100644 --- a/subPageC/flower/index.vue +++ b/subPageC/flower/index.vue @@ -111,6 +111,8 @@ .v-pages-flower { position: relative; height: 70vh; + width: 100vw; + overflow: hidden; &:after { diff --git a/subPageC/orderHomestay/orderDetail.vue b/subPageC/orderHomestay/orderDetail.vue index 63b2b53..2f264dd 100644 --- a/subPageC/orderHomestay/orderDetail.vue +++ b/subPageC/orderHomestay/orderDetail.vue @@ -17,7 +17,7 @@ - + 去支付 @@ -31,7 +31,7 @@ 再次预订 - + @@ -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; } } - \ No newline at end of file + diff --git a/subPageC/orderHomestay/orderList.vue b/subPageC/orderHomestay/orderList.vue index 4651c93..2e829d3 100644 --- a/subPageC/orderHomestay/orderList.vue +++ b/subPageC/orderHomestay/orderList.vue @@ -17,7 +17,7 @@ {{item.checkOutTime}} 总价：¥{{item.orderAmount}} - + @@ -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 @@ } } - \ No newline at end of file + diff --git a/subPageC/weather/index.vue b/subPageC/weather/index.vue index d9f687e..30c3128 100644 --- a/subPageC/weather/index.vue +++ b/subPageC/weather/index.vue @@ -1,6 +1,6 @@