diff --git a/common/http.interceptor.js b/common/http.interceptor.js index df97676..7c68f31 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -1,6 +1,6 @@ const install = (Vue, vm) => { Vue.prototype.$u.http.setConfig({ - baseUrl: 'http://124.221.246.124:2288/dev-api', + baseUrl: 'http://192.168.2.88:3100/dev-api', // baseUrl: 'https://znb.ccttiot.com', loadingText: '努力加载中~', loadingTime: 800, @@ -41,9 +41,9 @@ const install = (Vue, vm) => { }; vm.$u.post('/app/auth/wxLogin',data).then(res=>{ if (res.code == 10003) { - uni.navigateTo({ - url:'/pages/login/login' - }) + // uni.navigateTo({ + // url:'/pages/login/login' + // }) } else if (res.code == 200) { // console.log("老用户登录",res.data) diff --git a/page_user/ditu.vue b/page_user/ditu.vue index 99df8b1..d52d3e6 100644 --- a/page_user/ditu.vue +++ b/page_user/ditu.vue @@ -36,7 +36,7 @@ - 到这去 + 到这去 扫码充电 @@ -98,14 +98,13 @@ success: (res) => { this.covers = []; // 清空之前的覆盖物 if (res.scale <= 14) { - this.addMarkersWithoutLabels(); + this.addMarkersWithoutLabels() } else { - this.addMarkersWithLabels(); + this.addMarkersWithLabels() } }, fail: (error) => { - console.error('获取地图缩放级别失败：', error); - // 额外的错误处理逻辑... + // console.error('获取地图缩放级别失败：', error) }, }); }, @@ -119,7 +118,7 @@ height: 30, iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uI3B6yPwtiUBD3vafLtw', }; - this.covers.push(shopCover); + this.covers.push(shopCover) }); }, addMarkersWithLabels() { @@ -140,22 +139,21 @@ rotate:20 } } - this.covers.push(shopCover); + this.covers.push(shopCover) }); }, calculateAnchorX(name) { - let chineseLength = 0; - let englishLength = 0; + let chineseLength = 0 + let englishLength = 0 for (let i = 0; i < name.length; i++) { - const charCode = name.charCodeAt(i); + const charCode = name.charCodeAt(i) if (charCode >= 0x4e00 && charCode <= 0x9fa5) { chineseLength++; } else if (/[a-zA-Z]/.test(name[i])) { - englishLength = englishLength+0.3; - // console.log(englishLength); + englishLength = englishLength+0.3 } } - const totalLength = chineseLength + englishLength * 2; + const totalLength = chineseLength + englishLength * 2 return -totalLength * 6.5 }, @@ -171,13 +169,13 @@ }) }, fail: err => { - console.error('扫描失败：', err); + console.error('扫描失败：', err) uni.showToast({ title: '扫描失败', icon: 'none' - }); + }) } - }); + }) }, getxq(){ @@ -202,10 +200,9 @@ uni.getLocation({ type: 'wgs84', success: (res) => { - console.log('我的位置：', res); - this.latitude = res.latitude; - this.longitude = res.longitude; - this.jinweidu = this.longitude + ',' + this.latitude; + this.jinweidu = res.longitude + ',' + res.latitude + this.latitude = Number(res.latitude.toFixed(5)) - 0.004 + this.longitude = Number(res.longitude.toFixed(5)) + 0.004 // 请求附近的店铺 this.$u.get("/app/store/listNearBy?center=" + this.jinweidu + '&radius=' + 1000).then(res => { if (res.code == 200) { @@ -217,7 +214,7 @@ longitude: item.lng, width: 25, height: 30, - iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uI3B6yPwtiUBD3vafLtw', // 你可以为每个店铺指定不同的图标 + iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uI3B6yPwtiUBD3vafLtw', label: { content: item.name, anchorX: (() => { @@ -233,8 +230,7 @@ return -35 } else if (item.name.length <= 8) { return -40 - } else if (item.name.length <= - 10) { + } else if (item.name.length <= 10) { return -45 } else { return -item.name.length * 5 @@ -245,13 +241,13 @@ textShadow: '2px 2px 0px white, -2px -2px 0px white, 2px -2px 0px white, -2px 2px 0px white', } }; - this.covers.push(shopCover); - }); + this.covers.push(shopCover) + }) } }); }, fail: (err) => { - console.error('获取位置失败：', err); + console.error('获取位置失败：', err) } }); }, @@ -300,7 +296,6 @@ height: 100%; } page { - // background-color: ; background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%); border-radius: 0rpx 0rpx 0rpx 0rpx; } @@ -333,8 +328,6 @@ border-radius: 8rpx 8rpx 8rpx 8rpx; .wz{ font-size: 20rpx; - // width: 96rpx; - // height: 34rpx; background: #B7FFE1; border-radius: 16rpx 16rpx 16rpx 16rpx; padding: 4rpx 16rpx; @@ -360,14 +353,11 @@ } .list{ display: flex; - // margin-top: 44rpx; padding-bottom: 16rpx; .pic{ width: 150rpx; height: 134rpx; - // background-color: #D9D8FF; border-radius: 10rpx; - // margin-right: 28rpx; image{ width: 100%; height: 100%; @@ -377,7 +367,6 @@ } } .cen{ - // margin-right: 140rpx; margin-left: 20rpx; .cena{ font-weight: 500; @@ -402,7 +391,6 @@ display: inline-block; padding: 4rpx 18rpx; box-sizing: border-box; - // border: 1px solid #ccc; border-radius: 20rpx; } .bu{ diff --git a/page_user/hezuo/index.vue b/page_user/hezuo/index.vue index 9284489..7c03320 100644 --- a/page_user/hezuo/index.vue +++ b/page_user/hezuo/index.vue @@ -81,6 +81,10 @@ icon: 'none', duration: 2000 }) + }else if(res.code == 401){ + uni.navigateTo({ + url:'/pages/login/login' + }) } }) }, @@ -201,7 +205,7 @@ color: #3D3D3D; .one { - width: 154rpx; + width: 165rpx; } .hq { @@ -216,7 +220,7 @@ box-sizing: border-box; position: absolute; top: 14rpx; - right: 68rpx; + right: 64rpx; z-index: 99; } diff --git a/page_user/listshu/index.vue b/page_user/listshu/index.vue index b10e9d0..6d123df 100644 --- a/page_user/listshu/index.vue +++ b/page_user/listshu/index.vue @@ -96,9 +96,9 @@ this.pagenum++ } else { // 没有更多数据 - this.noMoreData = true; + this.noMoreData = true } - this.isLoading = false; + this.isLoading = false } }) }, @@ -130,7 +130,7 @@ padding-bottom: 22rpx; } page { - // background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%); + background: #F4F5F7; } .page { diff --git a/page_user/order/detailshop.vue b/page_user/order/detailshop.vue index 1edac48..f53845e 100644 --- a/page_user/order/detailshop.vue +++ b/page_user/order/detailshop.vue @@ -71,6 +71,13 @@ + + + 暂无更多代理人员... + + @@ -261,7 +268,9 @@ padding-bottom: 22rpx; } - page {} + page { + background-color:#F4F5F7; + } .page { width: 750rpx; diff --git a/page_user/yajin/index.vue b/page_user/yajin/index.vue index 5fa3e95..41972b8 100644 --- a/page_user/yajin/index.vue +++ b/page_user/yajin/index.vue @@ -33,7 +33,7 @@ 点击即同意《委托扣款授权书》 - + @@ -57,7 +57,7 @@ 请仔细阅读《微信支付分押金规则》，同意协议请 点击按钮 - + 确认并支付 @@ -102,15 +102,24 @@ sn:'', fee:{}, sum:0, - wxf:'' + wxf:'', + imgad:'' } }, onLoad(option) { this.sn = option.sn this.getemi() + this.getad() this.getwxf() }, methods: { + getad() { + this.$u.get("/app/ad").then((res) => { + if (res.code == 200) { + this.imgad = res.data.picture + } + }) + }, btnzu() { if(this.wxf > 550){ this.deposittrue = true @@ -118,6 +127,11 @@ this.depositfalse = true } }, + btnweiyj(){ + uni.navigateTo({ + url:'/pages/deposit/index' + }) + }, btnyc() { this.depositfalse = false this.deposittrue = false diff --git a/pages.json b/pages.json index 92dc566..4db85ba 100644 --- a/pages.json +++ b/pages.json @@ -69,6 +69,13 @@ "enablePullDownRefresh": false, "navigationStyle": "custom" } + },{ + "path": "pages/deposit/czyj", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } }, { "path": "pages/abbr/index", diff --git a/pages/abbr/index.vue b/pages/abbr/index.vue index f7cd08a..042b2ab 100644 --- a/pages/abbr/index.vue +++ b/pages/abbr/index.vue @@ -86,7 +86,6 @@ // } this.getlists() } - }, btnxq(id) { uni.navigateTo({ @@ -96,22 +95,19 @@ change(index) { if (index == 0) { this.classifyId = this.list[index + 1].classifyId - this.current = index; + this.current = index this.getlists() } else { this.classifyId = this.list[index].classifyId - this.current = index; + this.current = index this.getlists() } - }, getlists() { this.$u.get('/app/article/list?classifyId=' + this.classifyId + '&pageNum=' + 1 + '&pageSize=' + 6).then( res => { if (res.code == 200) { - this.listitem = res.rows - // console.log(this.listitem); } }) } diff --git a/pages/agentpages/devicemanagement/chargepallist/index.vue b/pages/agentpages/devicemanagement/chargepallist/index.vue index 62512aa..4adac5f 100644 --- a/pages/agentpages/devicemanagement/chargepallist/index.vue +++ b/pages/agentpages/devicemanagement/chargepallist/index.vue @@ -2,7 +2,7 @@ - + {{zhuangt}} - + {{zhuangt}} 账户余额（元） 提现明细 - {{txobj.totalAmount}} 立即提现 + {{txobj.totalAmount == null ? 0 : txobj.totalAmount}} 立即提现 收益提升技巧：加强关注，尽快为缺宝的设备补充充电宝 @@ -271,7 +271,6 @@ } page { - // background-color: ; background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%); border-radius: 0rpx 0rpx 0rpx 0rpx; } @@ -321,16 +320,13 @@ padding: 0 40rpx; box-sizing: border-box; margin-top: 24rpx; - .ddje { text-align: center; - .shu { font-weight: 500; font-size: 40rpx; color: #3D3D3D; } - .sb { margin-top: 20rpx; font-weight: 500; @@ -347,7 +343,6 @@ display: flex; justify-content: space-between; margin-top: 26rpx; - text { padding: 6rpx 18rpx; box-sizing: border-box; @@ -364,7 +359,6 @@ width: 100%; padding: 10rpx 12rpx; box-sizing: border-box; - text { margin-right: 10rpx; border-radius: 20rpx; @@ -372,20 +366,17 @@ display: inline-block; width: 148rpx; height: 84rpx; - // background: #E1F3ED; text-align: center; line-height: 84rpx; } } } - .dttitle { margin: 36rpx 0; font-weight: 500; font-size: 36rpx; color: #3D3D3D; } - .zhanghu { margin-top: 32rpx; width: 680rpx; @@ -394,11 +385,9 @@ border-radius: 24rpx 24rpx 24rpx 24rpx; padding: 36rpx 38rpx; box-sizing: border-box; - .zhtitle { display: flex; justify-content: space-between; - .sj { display: flex; justify-content: space-between; @@ -512,7 +501,6 @@ .dtxs { width: 642rpx; height: 812rpx; - // background-color: red; margin: auto; } diff --git a/pages/agentpages/shopguanli/discipleshop/index.vue b/pages/agentpages/shopguanli/discipleshop/index.vue index 77028ff..14773a2 100644 --- a/pages/agentpages/shopguanli/discipleshop/index.vue +++ b/pages/agentpages/shopguanli/discipleshop/index.vue @@ -171,6 +171,7 @@ page { // background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%); + background-color: #F4F5F7; } .page { diff --git a/pages/deposit/index.vue b/pages/deposit/index.vue index 7c9b7f1..b6ba698 100644 --- a/pages/deposit/index.vue +++ b/pages/deposit/index.vue @@ -7,7 +7,7 @@ ￥ 0 - + 充值 @@ -65,7 +65,11 @@ }, methods: { - + btncz(){ + uni.navigateTo({ + url:'/pages/deposit/czyj' + }) + } } } diff --git a/pages/detail/detailed/index.vue b/pages/detail/detailed/index.vue index bb659fc..67120f4 100644 --- a/pages/detail/detailed/index.vue +++ b/pages/detail/detailed/index.vue @@ -82,16 +82,16 @@ 审核状态: - + 待审核 - + 审核通过 - + 驳回 - + 已打款 diff --git a/pages/detail/index.vue b/pages/detail/index.vue index 5480096..308a385 100644 --- a/pages/detail/index.vue +++ b/pages/detail/index.vue @@ -36,7 +36,7 @@ 线下 - ￥{{item.totalAmount}} + ￥{{item.amount}} diff --git a/pages/index/index.vue b/pages/index/index.vue index 634b30c..7f07286 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -11,6 +11,11 @@ + + + + @@ -35,7 +40,7 @@ - + @@ -68,7 +73,6 @@ 订单金额 {{zujiemoney > zujieobj.priceStandard.feeMaxPrice ? zujieobj.priceStandard.feeMaxPrice : zujiemoney}}元 - {{zujieobj.priceStandard.feePrice}}元/小时 {{zujieobj.priceStandard.feePrice}}元/半小时 ，前{{zujieobj.priceStandard.feeFreeTime}}分钟免费， @@ -139,16 +143,17 @@ zujieobj: {}, zujiemoney: '', timer: null, + imgad:'' }; }, onReady() { - this.mapContext = uni.createMapContext('map', this); - this.mapScaleInterval = setInterval(this.updateMarkers, 1000); + this.mapContext = uni.createMapContext('map', this) + this.mapScaleInterval = setInterval(this.updateMarkers, 1000) }, beforeDestroy() { if (this.mapScaleInterval) { - clearInterval(this.mapScaleInterval); - this.mapScaleInterval = null; + clearInterval(this.mapScaleInterval) + this.mapScaleInterval = null } }, onShow() { @@ -158,6 +163,7 @@ this.getorder() },1000) this.startTimer() + this.getad() }, onHide() { // 在页面隐藏时清除定时器 @@ -167,6 +173,13 @@ this.clearTimer() }, methods: { + getad() { + this.$u.get("/app/ad").then((res) => { + if (res.code == 200) { + this.imgad = res.data.picture + } + }) + }, btnsale(orderId){ this.$u.put(`/app/order/rent/${orderId}/toSale`).then(res => { if(res.code == 200){ @@ -230,7 +243,7 @@ clearTimer() { // 清除定时器 if (this.timer) { - clearInterval(this.timer); + clearInterval(this.timer) this.timer = null; } }, @@ -242,14 +255,14 @@ this.zujieflag = true this.zujieobj = res.data if (this.zujieobj.endRentTime == null) { - var targetDate = new Date(this.zujieobj.startRentTime); - var currentDate = new Date(); - var diff = targetDate - currentDate; - var absDiff = Math.abs(diff); - var hours = Math.floor(absDiff / (1000 * 60 * 60)); - var minutes = Math.floor((absDiff % (1000 * 60 * 60)) / (1000 * 60)); - let formattedMinutes = minutes < 10 ? '0' + minutes : minutes; - this.zujieobj.remainingTime = hours + '小时' + formattedMinutes + '分钟'; + var targetDate = new Date(this.zujieobj.startRentTime) + var currentDate = new Date() + var diff = targetDate - currentDate + var absDiff = Math.abs(diff) + var hours = Math.floor(absDiff / (1000 * 60 * 60)) + var minutes = Math.floor((absDiff % (1000 * 60 * 60)) / (1000 * 60)) + let formattedMinutes = minutes < 10 ? '0' + minutes : minutes + this.zujieobj.remainingTime = hours + '小时' + formattedMinutes + '分钟' if (this.zujieobj.priceStandard.feeMode == 2) { if (minutes >= this.zujieobj.priceStandard.feeFreeTime) { this.zujiemoney = (hours + 1) * this.zujieobj.priceStandard.feePrice @@ -267,14 +280,14 @@ } } } else { - var targetDate = new Date(this.zujieobj.endRentTime); - var currentDate = new Date(); - var diff = targetDate - currentDate; - var absDiff = Math.abs(diff); - var hours = Math.floor(absDiff / (1000 * 60 * 60)); - var minutes = Math.floor((absDiff % (1000 * 60 * 60)) / (1000 * 60)); - let formattedMinutes = minutes < 10 ? '0' + minutes : minutes; - this.zujieobj.remainingTime = hours + '小时' + formattedMinutes + '分钟'; + var targetDate = new Date(this.zujieobj.endRentTime) + var currentDate = new Date() + var diff = targetDate - currentDate + var absDiff = Math.abs(diff) + var hours = Math.floor(absDiff / (1000 * 60 * 60)) + var minutes = Math.floor((absDiff % (1000 * 60 * 60)) / (1000 * 60)) + let formattedMinutes = minutes < 10 ? '0' + minutes : minutes + this.zujieobj.remainingTime = hours + '小时' + formattedMinutes + '分钟' if (this.zujieobj.priceStandard.feeMode == 2) { if (minutes >= this.zujieobj.priceStandard.feeFreeTime) { this.zujiemoney = (hours + 1) * this.zujieobj.priceStandard.feePrice @@ -298,20 +311,41 @@ } }) }, - + onControltap(control) { + this.setMapScale() + }, + async setMapScale(e, val) { + let mapContext = uni.createMapContext('map', this); + let setScale = () => { + return new Promise((resolve, reject) => { + mapContext.getScale({ + success: r => { + resolve() + } + }) + }) + }; + await setScale(); + mapContext.moveToLocation({ + success: (res) => { + const timer = setTimeout(() => { + clearTimeout(timer); + }, 500); + } + }) + }, updateMarkers() { this.mapContext.getScale({ success: (res) => { this.covers = [] if (res.scale <= 14) { - this.addMarkersWithoutLabels(); + this.addMarkersWithoutLabels() } else { - this.addMarkersWithLabels(); + this.addMarkersWithLabels() } }, fail: (error) => { - console.error('获取地图缩放级别失败：', error); - // 额外的错误处理逻辑... + // console.error('获取地图缩放级别失败：', error); }, }); }, @@ -325,7 +359,7 @@ height: 30, iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uI3B6yPwtiUBD3vafLtw', }; - this.covers.push(shopCover); + this.covers.push(shopCover) }); }, addMarkersWithLabels() { @@ -346,7 +380,7 @@ rotate: 20 } } - this.covers.push(shopCover); + this.covers.push(shopCover) }); }, calculateAnchorX(name) { @@ -357,11 +391,10 @@ if (charCode >= 0x4e00 && charCode <= 0x9fa5) { chineseLength++; } else if (/[a-zA-Z]/.test(name[i])) { - englishLength = englishLength + 0.3; - // console.log(englishLength); + englishLength = englishLength + 0.3 } } - const totalLength = chineseLength + englishLength * 2; + const totalLength = chineseLength + englishLength * 2 return -totalLength * 7 }, @@ -373,18 +406,18 @@ onlyFromCamera: true, scanType: ['qrCode'], success: res => { - console.log('扫描结果：', res); + console.log('扫描结果：', res) let result = res.result uni.navigateTo({ url: '/page_user/yajin/index?sn=' + result }) }, fail: err => { - console.error('扫描失败：', err); + console.error('扫描失败：', err) uni.showToast({ title: '扫描失败', icon: 'none' - }); + }) } }); }, @@ -436,10 +469,9 @@ uni.getLocation({ type: 'wgs84', success: (res) => { - // console.log('我的位置：', res); - this.latitude = res.latitude; - this.longitude = res.longitude; - this.jinweidu = this.longitude + ',' + this.latitude; + this.jinweidu = res.longitude + ',' + res.latitude + this.latitude = Number(res.latitude.toFixed(5)) - 0.004 + this.longitude = Number(res.longitude.toFixed(5)) + 0.004 // 请求附近的店铺 this.$u.get("/app/store/listNearBy?center=" + this.jinweidu + '&radius=' + 1000).then( res => { @@ -480,13 +512,13 @@ textShadow: '2px 2px 0px white, -2px -2px 0px white, 2px -2px 0px white, -2px 2px 0px white', } }; - this.covers.push(shopCover); + this.covers.push(shopCover) }); } }) }, fail: (err) => { - console.error('获取位置失败：', err); + console.error('获取位置失败：', err) } }); }, @@ -498,7 +530,7 @@ if (res.code) { let data = { loginCode: res.code, - }; + } taht.$u.post('/app/auth/wxLogin', data).then(res => { if (res.code == 10003) { // uni.navigateTo({ @@ -515,7 +547,7 @@ }, handleMapClick(event) { - console.log(event); + console.log(event) const markerId = event.markerId; uni.navigateTo({ url: '/page_user/ditu?markerId=' + markerId @@ -540,7 +572,6 @@ } page { - // background-color: ; background: linear-gradient(180deg, #25CE88 0%, rgba(255, 255, 255, 0) 100%); border-radius: 0rpx 0rpx 0rpx 0rpx; } @@ -550,9 +581,9 @@ padding-left: 34rpx; padding-right: 34rpx; box-sizing: border-box; - position: fixed; - top: 0; - left: 0; + // position: fixed; + // top: 0; + // left: 0; .zujie { width: 750rpx; @@ -561,7 +592,7 @@ box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08); position: fixed; left: 0; - bottom: 0; + bottom: 30rpx; border-radius: 30rpx 30rpx 0 0; .tit { @@ -739,7 +770,6 @@ display: inline-block; width: 148rpx; height: 84rpx; - // background: #E1F3ED; text-align: center; line-height: 84rpx; } @@ -815,10 +845,6 @@ } } } - - - - //样式结束 .title { font-weight: 600; @@ -875,22 +901,29 @@ border-radius: 38rpx 38rpx 38rpx 38rpx; margin-top: 34rpx; padding-top: 16rpx; - + position: relative; + .fujin { + position: absolute; + top: 730rpx; + padding-left: 30rpx; + width: 100%; + + image { + width: 210rpx; + height: 74rpx; + } + } .dtxs { width: 642rpx; height: 812rpx; - // background-color: red; margin: auto; } .tubiao { display: flex; justify-content: space-between; - padding: 24rpx 50rpx; + padding: 20rpx 50rpx; box-sizing: border-box; - // padding-top: 20rpx; - // padding-bottom: 24rpx; - .gr { text-align: center; width: 100%; diff --git a/pages/login/login.vue b/pages/login/login.vue index 1e858f9..87b0893 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,6 +1,6 @@