From 51cca32d236262be90f2d39b8889fa343f1adfa1 Mon Sep 17 00:00:00 2001
From: 13404089107 <puwei@sinata.cn>
Date: 星期四, 08 五月 2025 16:13:37 +0800
Subject: [PATCH] 迭代
---
pages/home/home.js | 100 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 69 insertions(+), 31 deletions(-)
diff --git a/pages/home/home.js b/pages/home/home.js
index 6a3184a..48d7a53 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -172,6 +172,8 @@
// 协议痰喘显示隐藏
agreementShow: wx.getStorageSync('token') ? false : !wx.getStorageSync('isAgreement') && true,
showModel: false,
+ jumpUrl: '',
+ priceObj:{},
},
@@ -187,6 +189,10 @@
this.setData({
showModel: false
})
+ },
+
+ bindTap(e) {
+ console.log('shuju', e);
},
@@ -213,8 +219,8 @@
},
-//邀请有礼跳转
- shareGift(){
+ //邀请有礼跳转
+ shareGift() {
wx.navigateTo({
url: '/pages/invite/invite',
})
@@ -817,7 +823,7 @@
showSwiperTop: false
})
},
-
+
//获取广告
getadver(adcode) {
if (wx.getStorageSync('adcode') !== "") {
@@ -1018,10 +1024,10 @@
// app.getFloatStr(5)
// this.show()
- console.log('shuju1111111111',options);
+ console.log('shuju1111111111', options);
- if(options.scene){
- console.log(1111111111,);
+ if (options.scene) {
+ console.log(1111111111, );
const uidMatch = options.scene.match(/uid%3D(\d+)/);
const userTypeMatch = options.scene.match(/userType%3D(\d+)/);
// 提取匹配到的值
@@ -1078,14 +1084,33 @@
getNotice() {
unit.post(app.globalData.Url + '/base/notice/allert').then(res => {
if (res.data.data[0]?.id) {
+ // let regex = /<a[^>]*\shref="([^"]+)"[^>]*>([^<]+)<\/a>/gi;
+ // let url = regex.exec(res.data.data[0].content)[1]
+ // console.log('shuju45645648488464',url);
this.setData({
noticeInfo: res.data.data[0],
- showNotice: true
+ showNotice: true,
+ // jumpUrl: url
})
- unit.post(app.globalData.Url + '/api/confitm', {
- id: res.data.data.id
+ unit.post(app.globalData.Url + '/api/systemNotice/delSystemNotice', {
+ id: res.data.data[0].id
})
}
+ })
+ },
+ //跳转广告配置的h5
+
+ goWebView() {
+ // if(this.data.jumpUrl){
+ // let idStr = this.data.jumpUrl.split('?')[1].split('=')[1]
+ // // let urlStr = `/pages/home/webh5/webh5?act=1&url=${this.data.jumpUrl}&${idStr}`
+ // console.log('//////////',idStr);
+ // wx.navigateTo({
+ // url: `/pages/home/webh5/webh5?act=1&id=${idStr}&url=` + this.data.jumpUrl,
+ // })
+ // }
+ wx.navigateTo({
+ url: '/pages/setting/userHelp/userHelp?type=5',
})
},
getSetting() {
@@ -1401,7 +1426,7 @@
// longitude: res.originalData.result.location.lng,
adcode: res.originalData.result.addressComponent.adcode,
cityNameStart: res.originalData.result.formatted_address,
- changeStartName:res.originalData.result.formatted_address,
+ changeStartName: res.originalData.result.formatted_address,
district: res.originalData.result.addressComponent.district,
province: res.originalData.result.addressComponent.province,
formatted_address: res.originalData.result.formatted_address
@@ -1592,8 +1617,8 @@
success: (res) => {
btnCarData.startLon = res.data.result[0].x
btnCarData.startLat = res.data.result[0].y
- btnCarData.endLon = res.data.result[1]?.x
- btnCarData.endLat = res.data.result[1]?.y
+ // btnCarData.endLon = res.data.result[1]?.x
+ // btnCarData.endLat = res.data.result[1]?.y
if (Object.keys(btnCarData).length == 17) {
btnCarData.oldPeople = Number(!mode)
if (Number(!mode)) {
@@ -1693,8 +1718,8 @@
success: (res) => {
btnCarData.startLon = res.data.result[0].x
btnCarData.startLat = res.data.result[0].y
- btnCarData.endLon = res.data.result[1]?.x
- btnCarData.endLat = res.data.result[1]?.y
+ // btnCarData.endLon = res.data.result[1]?.x
+ // btnCarData.endLat = res.data.result[1]?.y
if (Object.keys(btnCarData).length == 17) {
btnCarData.oldPeople = Number(!mode)
if (Number(!mode)) {
@@ -2222,21 +2247,21 @@
success: (resp) => {
console.log('获取当前地理位置 获取当前地理位置', resp, 'longitude', longitude, 'latitude', latitude, 'move move move', move)
bmap.regeocoding({
- location:move?(latitude+ ',' +longitude):(resp.data.result[0].y + ',' + resp.data.result[0].x),
+ location: move ? (latitude + ',' + longitude) : (resp.data.result[0].y + ',' + resp.data.result[0].x),
// location:latitude+ ',' +longitude,
// location: '30.657469'+','+'104.06669',
- success: (res)=> {
+ success: (res) => {
//这里的res参数里有具体的城市数据
console.log('这里的res参数里有具体的城市数据', res)
var name = res.originalData.result.addressComponent
that.setData({
changeStartName: res.originalData.result.formatted_address,
- startLat: move?'':resp.data.result[0].y,
- startLon: move?'':resp.data.result[0].x,
+ startLat: move ? '' : resp.data.result[0].y,
+ startLon: move ? '' : resp.data.result[0].x,
cityNameStart: res.originalData.result.formatted_address,
adcode: res.originalData.result.addressComponent.adcode,
- latitude:move?latitude:resp.data.result[0].y,
- longitude:move?longitude:resp.data.result[0].x
+ latitude: move ? latitude : resp.data.result[0].y,
+ longitude: move ? longitude : resp.data.result[0].x
// latitude:'30.657469',
// longitude:"104.06669"
})
@@ -2262,9 +2287,6 @@
//选择目的地后开始对地图绘制信息
pointAddress() {
- // qqmapsdk = new QQMapWX({
- // key: 'SVIBZ-4RN6J-LPRF2-XZOZF-EAZKF-USFTD' //这里自己的key秘钥进行填充
- // });
var that = this;
// 标注起点终点
if (that.data.nextBoolean) {
@@ -2278,10 +2300,6 @@
},
]
-
-
-
-
let startLat = that.data.startLat || that.data.latitude
let startLon = that.data.startLon || that.data.longitude
wx.request({
@@ -2400,6 +2418,26 @@
nextLongitude: that.data.nextLongitude,
})
.then((res) => {
+
+ unit.post(app.globalData.Url + '/api/taxi/getAllForecastPrice', {
+ payManner: that.data.changeModel == '线上计费' ? 1 : 2,
+ startLat:resp.data.result[0].y,
+ startLon:resp.data.result[0].x,
+ endLat: that.data.nextLatitude,
+ endLon: that.data.nextLongitude
+ })
+ .then((res) => {
+ console.log(res)
+ if (res.data.code == 200) {
+ res.data.data.online = res.data.data.online.toFixed(2)
+ res.data.data.offline = res.data.data.offline.toFixed(2)
+
+ this.setData({
+ priceObj:res.data.data
+ })
+ }
+ })
+
var coors = res.data.data
var polyline = [];
coors.forEach(function (step, index) {
@@ -2431,7 +2469,7 @@
longitude: lng
});
- if (coors.length == index + 1 && list.length==ind+1) {
+ if (coors.length == index + 1 && list.length == ind + 1) {
unit.post(app.globalData.Url + '/base/taxi/queryExpectedTime', {
// slat:that.data.latitude,
// slon:that.data.longitude,
@@ -2445,12 +2483,12 @@
// let markers1 = that.data.markers[0]
// let markers2 =
// that.data.markers[1]+ that.data.markers[1][callout]
-
+
// this.setData({
// markers:[markers1,markers2]
// })
console.log(list, '2222222222222222222222');
-
+
var markers = [{
iconPath: "../../img/start_icon.png",
id: 1,
@@ -2488,7 +2526,7 @@
}
})
// }
-
+
});
that.setData({
polyline: [{
--
Gitblit v1.7.1