diff --git a/common/css/iconfont.css b/common/css/iconfont.css
index 5f87d64..bdd489e 100644
--- a/common/css/iconfont.css
+++ b/common/css/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 4503426 */
- src: url('//at.alicdn.com/t/c/font_4503426_iai3d7mxog.woff2?t=1712816649291') format('woff2'),
- url('//at.alicdn.com/t/c/font_4503426_iai3d7mxog.woff?t=1712816649291') format('woff'),
- url('//at.alicdn.com/t/c/font_4503426_iai3d7mxog.ttf?t=1712816649291') format('truetype');
+ src: url('//at.alicdn.com/t/c/font_4503426_46km7g1hjg9.woff2?t=1716779352968') format('woff2'),
+ url('//at.alicdn.com/t/c/font_4503426_46km7g1hjg9.woff?t=1716779352968') format('woff'),
+ url('//at.alicdn.com/t/c/font_4503426_46km7g1hjg9.ttf?t=1716779352968') format('truetype');
}
.iconfont {
@@ -13,6 +13,10 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-chakanxiangqing:before {
+ content: "\e64c";
+}
+
.icon-xiangyou1:before {
content: "\e775";
}
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 939d93b..117cf88 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -21,8 +21,8 @@ const install = (Vue, vm) => {
// });
Vue.prototype.$u.http.setConfig({
// baseUrl: 'http://61.174.243.28:15861',
- // baseUrl: 'http://192.168.2.6:8080',
- baseUrl: 'https://dianche.chuantewulian.cn/prod-api',
+ baseUrl: 'http://192.168.2.6:8080',
+ // baseUrl: 'https://dche.ccttiot.com/prod-api',
loadingText: '努力加载中~',
loadingTime: 800,
// 设置自定义头部content-type
@@ -90,26 +90,26 @@ const install = (Vue, vm) => {
// return res.result;
- // uni.login({
- // success: function(ret) {
- // console.log("main.js==>res", ret)
- // // vm.$u.post('/user/login',{"js_code": ret.code}).then(res=>{
- // // if (res.code == 10003) {
- // // // console.log("新用户登录")
- // // uni.setStorageSync('token', res.data);
+ // uni.login({
+ // success: function(ret) {
+ // console.log("main.js==>res", ret)
+ // // vm.$u.post('/user/login',{"js_code": ret.code}).then(res=>{
+ // // if (res.code == 10003) {
+ // // // console.log("新用户登录")
+ // // uni.setStorageSync('token', res.data);
- // // } else if (res.code == 200) {
- // // // console.log("老用户登录",res.data)
- // // uni.setStorageSync('token', res.data);
+ // // } else if (res.code == 200) {
+ // // // console.log("老用户登录",res.data)
+ // // uni.setStorageSync('token', res.data);
- // // }
- // // });
- // }
+ // // }
+ // // });
+ // }
+ // });
+ // uni.showLoading({
+ // title: '登录中...',
+ // mask: true // Set to true if you want to prevent user interactions while loading
// });
- uni.showLoading({
- title: '登录中...',
- mask: true // Set to true if you want to prevent user interactions while loading
- });
wx.login({
success(res) {
if (res.code) {
@@ -117,19 +117,20 @@ const install = (Vue, vm) => {
let data = {
wxOpenId: res.code,
- };
- vm.$u.post('/loginByopenid?jsCode='+res.code).then(res=>{
+ };
+ let areaId=uni.getStorageSync('areaId');
+ vm.$u.post('/loginByopenid?jsCode='+res.code+'&areaId='+areaId).then(res=>{
uni.hideLoading();
if (res.code == 200) {
uni.setStorageSync('token', res.token);
- // uni.switchTab({
- // url:'/pages/index/index'
- // })
+ uni.navigateTo({
+ url:'/pages/index/index'
+ })
} else {
// console.log("老用户登录",res.data)
- uni.navigateTo({
+ uni.redirectTo({
url:'/pages/login/login'
})
}
diff --git a/manifest.json b/manifest.json
index f95f42c..cad1f86 100644
--- a/manifest.json
+++ b/manifest.json
@@ -51,7 +51,7 @@
/* 小程序特有相关 */
"mp-weixin" : {
"libVersion" : "latest",
- "appid" : "wxbbe52b5414ab65ac",
+ "appid" : "wx3428c498d5061192",
"setting" : {
"urlCheck" : false
},
diff --git a/package-lock.json b/package-lock.json
index 5245a62..044955a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,23 +1,90 @@
{
"name": "dianbiao",
"version": "1.0.0",
- "lockfileVersion": 1,
+ "lockfileVersion": 2,
"requires": true,
+ "packages": {
+ "": {
+ "name": "dianbiao",
+ "version": "1.0.0",
+ "license": "ISC",
+ "dependencies": {
+ "crypto-js": "^4.1.1",
+ "fast-xml-parser": "^4.0.12",
+ "js-base64": "^3.7.3",
+ "js-md5": "^0.7.3",
+ "mp-html": "^2.4.2",
+ "mpvue-echarts": "^0.3.2",
+ "uview-ui": "^1.8.8",
+ "weapp-cookie": "^1.4.8"
+ }
+ },
+ "node_modules/crypto-js": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+ "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+ },
+ "node_modules/fast-xml-parser": {
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.2.tgz",
+ "integrity": "sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg==",
+ "dependencies": {
+ "strnum": "^1.0.5"
+ },
+ "bin": {
+ "fxparser": "src/cli/cli.js"
+ }
+ },
+ "node_modules/js-base64": {
+ "version": "3.7.5",
+ "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.5.tgz",
+ "integrity": "sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA=="
+ },
+ "node_modules/js-md5": {
+ "version": "0.7.3",
+ "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
+ "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ=="
+ },
+ "node_modules/mp-html": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/mp-html/-/mp-html-2.4.2.tgz",
+ "integrity": "sha512-MSfJh5ckuaI2uibeO4qiUl2e/j5fpXy6cmW/ZzSkb+U3rTJfMSNzODqrDwG0YWOd8BVI+tD9/jLZiBhJbMupUg=="
+ },
+ "node_modules/mpvue-echarts": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/mpvue-echarts/-/mpvue-echarts-0.3.2.tgz",
+ "integrity": "sha512-KULGS1DOMNhXu3nBkBv6BtmnqjyHLc+2Dur7eW+2s2aic1NCOygglCMmAmMEU6/TGSR67ttFA2NYxXPUYbNhWQ=="
+ },
+ "node_modules/set-cookie-parser": {
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz",
+ "integrity": "sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ=="
+ },
+ "node_modules/strnum": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
+ "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA=="
+ },
+ "node_modules/uview-ui": {
+ "version": "1.8.8",
+ "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.8.tgz",
+ "integrity": "sha512-Osal3yzXiHor0In9OPTZuXTaqTbDglMZ9RGK/MPYDoQQs+y0hrBCUD0Xp5T70C8i2lLu2X6Z11zJhmsQWMR7Jg=="
+ },
+ "node_modules/weapp-cookie": {
+ "version": "1.4.8",
+ "resolved": "https://registry.npmjs.org/weapp-cookie/-/weapp-cookie-1.4.8.tgz",
+ "integrity": "sha512-YksOnCI4mM+MAlAf/5iL0aSzwfePHZTUS9NorL0RerAxJMOpzzrEZrMBF+wKS1usH/UQqkZTMSxjiWs0ZcAE9g==",
+ "dependencies": {
+ "set-cookie-parser": "^2.4.8"
+ }
+ }
+ },
"dependencies": {
"crypto-js": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
"integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
},
- "echarts": {
- "version": "5.4.3",
- "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz",
- "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==",
- "requires": {
- "tslib": "2.3.0",
- "zrender": "5.4.4"
- }
- },
"fast-xml-parser": {
"version": "4.3.2",
"resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.2.tgz",
@@ -56,11 +123,6 @@
"resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
"integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA=="
},
- "tslib": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
- "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
- },
"uview-ui": {
"version": "1.8.8",
"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.8.tgz",
@@ -73,14 +135,6 @@
"requires": {
"set-cookie-parser": "^2.4.8"
}
- },
- "zrender": {
- "version": "5.4.4",
- "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz",
- "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==",
- "requires": {
- "tslib": "2.3.0"
- }
}
}
}
diff --git a/package.json b/package.json
index 01b5e97..c6477e8 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,6 @@
"homepage": "https://github.com/lchighpass/lchighpass-speaking#readme",
"dependencies": {
"crypto-js": "^4.1.1",
- "echarts": "^5.4.0",
"fast-xml-parser": "^4.0.12",
"js-base64": "^3.7.3",
"js-md5": "^0.7.3",
diff --git a/page_user/good_list.vue b/page_user/good_list.vue
index e334599..0827d0a 100644
--- a/page_user/good_list.vue
+++ b/page_user/good_list.vue
@@ -1,124 +1,175 @@
-
-
-
-
-
- 车辆故障
-
-
- 处理完成
-
-
-
- 时间：2023-12-31 21:22
-
-
- 时长：14分钟4秒
-
-
- 距离：2.1公里
-
-
- 3元
-
-
-
-
-
+
+
+
+
+
+ 电单车
+
+
+ 已完成
+
+
+
+ 时间：{{ item.payTime }}
+
+
+ 时长：{{ item.duration }}
+
+
+ 距离：2.1公里
+
+
+ {{item.totalFee}}元
+
+
+
-
diff --git a/page_user/idcard_test.vue b/page_user/idcard_test.vue
new file mode 100644
index 0000000..63d98ab
--- /dev/null
+++ b/page_user/idcard_test.vue
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+ 姓名
+
+
+
+
+
+
+ 身份证号
+
+
+
+
+
+ 以上信息仅用于验证，我们将严格为您保密
+
+
+ 认证
+
+
+
+
+
+
+
diff --git a/page_user/yj.vue b/page_user/yj.vue
index 3239b77..f6d3fd3 100644
--- a/page_user/yj.vue
+++ b/page_user/yj.vue
@@ -136,10 +136,10 @@
},
onShow() {
- this.$store.dispatch('fetchFeeRules', this.$u).then(() => {
+ // this.$store.dispatch('fetchFeeRules', this.$u).then(() => {
- // 执行其他操作...
- });
+ // // 执行其他操作...
+ // });
this.getinfo()
},
@@ -216,10 +216,10 @@
this.userinfo = res.user
this.getlist()
} else {
- setTimeout(()=>{
- this.getinfo()
- this.getlist()
- },1000)
+ // setTimeout(()=>{
+ // this.getinfo()
+ // this.getlist()
+ // },1000)
}
});
},
diff --git a/pages.json b/pages.json
index f162c1c..528d158 100644
--- a/pages.json
+++ b/pages.json
@@ -302,6 +302,15 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
+ },
+ {
+ "path" : "idcard_test",
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "enablePullDownRefresh" : false,
+ "navigationStyle": "custom"
+ }
}
// 其他 userpages 目录下的页面...
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d3496a7..d78c899 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,7 +1,7 @@
-
+
@@ -40,7 +40,7 @@
预约费（10分钟）
- {{appointmentServiceFee}} 元
+ {{areaInfo.appointmentServiceFee}} 元
@@ -77,15 +77,21 @@
- 起步价（{{startingHowManyMinutes}}分钟内）
+ 剩余电量
-
- {{startingPrice}}元
+
+ {{ deviceInfos.remainingPower}}%
+
+
+
+
+
+
-
+
-
+
-
- {{item.name}}
-
-
-
- 可骑行{{item.time}}小时
+
+
+ {{item.name}}
-
- {{item.fee}} 元
+
+
+ 起步价
+
+
+ {{item.ridingRuleJson.startingPrice}}元（含{{item.ridingRuleJson.startingTime}}分钟小时天）
+
+
+
+
+ 超出费
+
+
+ {{item.ridingRuleJson.timeoutPrice}}元/{{ item.ridingRuleJson.timeoutTime}}分钟小时天
+
+
+
+
+ 查看详情
-
-
+
+
+
+ {{item.name}}
-
- 原价 {{item.originalFee}}元
+
+
+
+ {{items.start}}-{{items.end}}分钟
+ 小时
+ 天,
+ 每{{items.eachUnit}}分钟
+ 小时
+ 天/{{items.fee}}元
+
+
+
+
+
+ 查看详情
+
+
+
+ ....
+
+
+
+
-
- 超出起步价包含时长后收取
-
+
-
+
+ 确认开锁
+
+
+
确认预约
-
- 确认支付
+
+ 确认预约
+
+
+ 确认预约
-
+
-
+
预估金额：{{money}}元
+
- {{timeString}}
+ {{timeString}}
@@ -177,8 +244,8 @@
可继续行驶53公里
-
-
+
+
@@ -186,30 +253,36 @@
-
+
+
-
-
+
+
- 解锁骑行
+ 解锁骑行
-
+
+ 取消预约
+
+
取消预约
-
-
-
- 临时锁车
+
+
+
+ 临时锁车
-
- 解锁用车
+
+ 解锁用车
-
+
还车
@@ -225,7 +298,7 @@
-
+
使用时间：{{timeString}}
@@ -236,16 +309,16 @@
查看骑行费明细 >
- 去支付
+ 去支付
-
- 去支付
+
+ 去支付
-
+
扫码开锁
@@ -258,13 +331,13 @@
押金充值
-
+
@@ -288,7 +361,43 @@
+
+ 您有正在进行中的套餐
+
+
+
+
+
+
+ {{orderinfo.rule.name}}
+
+
+
+
+
+ 在套餐时间为结束是可随意进行车辆预约和解锁
+
+
+
+
+
+
+ 车辆二维码模糊可使用下方编号开锁
+
+
+
+
+
+ {{timeString}}后
+
+
+ 您将失去该套餐
+
+
+ 我已知晓
+
+
安全骑行 禁止超载
@@ -325,6 +434,121 @@
我已阅读同意
+
+
+
+
+
+
+ 收费价格说明
+
+
+
+ 免费时长
+
+
+ {{freeInfo.freeRideTime}}分钟
+
+
+
+
+ 起步价
+
+
+ {{freeInfo.ridingRuleJson.startingPrice}}元（含{{freeInfo.ridingRuleJson.startingTime}}分钟小时天）
+
+
+
+
+ 超起步价后
+
+
+ {{freeInfo.ridingRuleJson.timeoutPrice}}元/{{ freeInfo.ridingRuleJson.timeoutTime}}分钟小时天
+
+
+
+
+
+ 计费规则
+
+
+
+ {{items.start}}-{{items.end}}分钟
+ 小时
+ 天,
+ 每{{items.eachUnit}}分钟
+ 小时
+ 天/{{items.fee}}元
+
+
+ >{{items.start}}分钟
+ 小时
+ 天,
+ 每{{items.eachUnit}}分钟
+ 小时
+ 天/{{items.fee}}元
+
+
+
+
+
+
+
+
+ 不足1分钟
+ 小时
+ 天，按1分钟
+ 小时
+ 天算
+
+
+
+
+ 调度费
+
+
+ {{areaInfo.vehicleManagementFee}}元（停车点外还车）
+
+
+
+
+
+
+
+ {{areaInfo.dispatchFee}}元（运营区域外还车）
+
+
+
+
+
+
+
+ P点外归还设备将收取调度费
+
+
+
+
+ 支付订单后
+
+
+ 自动退押金
+
+
+
+
+
+
+
+
@@ -339,12 +563,12 @@
押金充值
-
+
@@ -398,21 +622,27 @@
areas: [],
gps: {},
deviceInfos: {},
- OrderdeviceInfos:{},
+ OrderdeviceInfos: {},
showdevice: false,
deviceIndex: 0,
type: 0,
freList: [],
freeListIndex: 0,
freeInfo: {},
- socket: null,
- sn:'',
- eventKey:0,
- orderinfo:{},
- timer :null,
- timeString:'',
- money:0
-
+ socket: null,
+ sn: '',
+ eventKey: 0,
+ orderinfo: {},
+ timer: null,
+ timeString: '',
+ money: 0,
+ showtc: false,
+ showtcs: false,
+ areaInfo: {},
+ // feeInfo:{},
+ showfeeDetail: false,
+
+
// userId:this.$store.getters.userId,
}
},
@@ -424,12 +654,15 @@
}
},
onLoad(e) {
- if(e.sn){
- this.sn=e.sn
+ if (e.sn) {
+ this.sn = e.sn
this.deviceInfo()
- this.showdevice=true
- this.deviceIndex = 1
- this.type=1
+ setTimeout(() => {
+ this.showdevice = true
+ this.deviceIndex = 1
+ this.type = 1
+ }, 2000)
+
}
},
onShow() {
@@ -437,25 +670,27 @@
this.$store.dispatch('userInfo', this.$u).then(() => {
// 执行其他操作...
+
});
+
}
- if(uni.getStorageSync('role')){
+ if (uni.getStorageSync('role')) {
let abb = uni.getStorageSync('role')
-
+
}
// this.eventKey = Math.floor(Math.random() * 100000);
console.log(this.userId);
- this.getArea()
- this.getlist()
- setTimeout(() => {
- this.getParking()
- }, 2000)
+
+ // setTimeout(() => {
+ // this.getisInOrder()
+
+ // }, 2000)
// this.role()
- this.$store.dispatch('fetchFeeRules', this.$u).then(() => {
+ // this.$store.dispatch('fetchFeeRules', this.$u).then(() => {
- // 执行其他操作...
- });
+ // // 执行其他操作...
+ // });
// this.fetchFeeRules()
let that = this
@@ -468,10 +703,17 @@
that.gps.latitude = '26.940805',
that.gps.longitude = '120.356157';
that.getmarks()
+ that.getArea()
+ //
},
fail: function(error) {
- that.getmarks()
+ uni.showToast({
+ title: '未获取到定位信息，请点击设置勾选允许位置信息，即可使用全部功能',
+ icon: 'none',
+ duration: 2000
+ });
+ // that.getmarks()
// 在这里处理获取位置信息失败的情况
}
@@ -509,340 +751,580 @@
},
},
methods: {
- cancel(){
- this.$u.post('/appVerify/device/cancelAppointment?userId=' + this.userId+'&orderNo='+this.orderinfo.orderNo ).then((res) => {
+ feedetail(item, index) {
+ this.freeInfo = item
+ this.showfeeDetail = true
+ this.freeListIndex = index
+ },
+ // 无套餐取消预约
+ cancel() {
+ this.$u.post('/appVerify/device/cancelAppointment?userId=' + this.userId + '&orderNo=' + this.orderinfo
+ .orderNo).then((res) => {
if (res.code === 200) {
this.getisInOrder()
} else {
uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
});
}
})
},
- backDevice(){
- this.$u.post('/appVerify/device/return?returnType=1&orderNo=' +this.orderinfo.orderNo ).then((res) => {
+ // 套餐取消预约
+ cancel1() {
+ this.$u.post('/appVerify/device/cancelAppointment?userId=' + this.userId + '&orderNo=' + this.orderinfo
+ .orderNo + '&ruleId=' + this.orderinfo.ruleId).then((res) => {
if (res.code === 200) {
this.getisInOrder()
} else {
uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
});
}
})
},
- // 预约解锁骑行
- unlockdevice(){
+ backDevice() {
+ this.$u.post('/appVerify/device/return?returnType=1&orderNo=' + this.orderinfo.orderNo).then((res) => {
+ if (res.code === 200) {
+ this.getisInOrder()
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ });
+ }
+ })
+ },
+ // 套餐直接开锁
+ sub6() {
let data = {
userId: this.userId,
- sn: this.orderinfo.sn,
-
+ sn: this.sn,
+
// ruleId: this.freeInfo.ruleId,
// money: this.freeInfo.fee,
- mark: "预约开锁",
+ mark: "套餐直接开锁",
// type: '1',
- orderNo:this.orderinfo.orderNo
-
+ ruleId: this.orderinfo.ruleId,
+ orderNo: this.orderinfo.orderNo
+
}
this.$u.post('/appVerify/device/snSwitch', data).then((res) => {
if (res.code === 200) {
this.getisInOrder()
} else {
-
+
}
})
},
- unloackdevices(){
- this.$u.post('/appVerify/device/unlock?sn='+this.OrderdeviceInfos.sn+'&orderNo='+this.orderinfo.orderNo).then((res) => {
+ // 预约解锁骑行
+ unlockdevice() {
+ if (this.orderinfo.ruleId == null) {
+ let data = {
+ userId: this.userId,
+ sn: this.orderinfo.sn,
+
+ // ruleId: this.freeInfo.ruleId,
+ // money: this.freeInfo.fee,
+ mark: "预约开锁",
+ // type: '1',
+ orderNo: this.orderinfo.orderNo
+
+ }
+ this.$u.post('/appVerify/device/snSwitch', data).then((res) => {
+ if (res.code === 200) {
+ this.getisInOrder()
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ });
+ }
+ })
+ } else {
+ let data = {
+ userId: this.userId,
+ sn: this.orderinfo.sn,
+
+ // ruleId: this.freeInfo.ruleId,
+ // money: this.freeInfo.fee,
+ mark: "套餐预约开锁",
+ // type: '1',
+ ruleId: this.orderinfo.ruleId,
+ orderNo: this.orderinfo.orderNo
+
+ }
+ this.$u.post('/appVerify/device/snSwitch', data).then((res) => {
+ if (res.code === 200) {
+ this.getisInOrder()
+ } else {
+
+ }
+ })
+ }
+
+ },
+ unloackdevices() {
+ this.$u.post('/appVerify/device/unlock?sn=' + this.OrderdeviceInfos.sn + '&orderNo=' + this.orderinfo
+ .orderNo).then((res) => {
if (res.code === 200) {
this.getisInOrder()
} else {
-
+
}
})
},
// ；临时锁车
- loackdevice(){
- this.$u.post('/appVerify/device/lock?sn='+this.OrderdeviceInfos.sn+'&orderNo='+this.orderinfo.orderNo).then((res) => {
+ loackdevice() {
+ this.$u.post('/appVerify/device/lock?sn=' + this.OrderdeviceInfos.sn + '&orderNo=' + this.orderinfo
+ .orderNo).then((res) => {
if (res.code === 200) {
this.getisInOrder()
} else {
-
+
}
})
},
starTime() {
clearInterval(this.timer)
- this.timer=null
- this.$u.get('/app/device/info?sn=' + this.orderinfo.sn).then((res) => {
- if (res.code === 200) {
- this.OrderdeviceInfos = res.data
- }
- })
-
-
- // 预约中
- if(this.orderinfo.status==0&&this.orderinfo.ruleId==null){
- this.showdevice = true
- this.deviceIndex=2
- const createTimeTimestamp = new Date(this.orderinfo.appointmentStartTime).getTime();
-
- // 定义定时器
- this.timer = setInterval(() => {
- const currentTime = Date.now();
- const timePassed = currentTime - createTimeTimestamp;
- const secondsPassed = Math.floor(timePassed / 1000);
-
- // 转换为时分秒格式
- const hours = Math.floor(secondsPassed / 3600);
- const minutes = Math.floor((secondsPassed % 3600) / 60);
- const seconds = secondsPassed % 60;
- const timeString = `${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
- const tenMinuteIntervals = Math.floor((hours * 60 + minutes) / 10)+1 ; // 加1是因为不满十分钟也算一个十分钟
- let money =0
- // 增加费用逻辑，假设每次增加10元
- this.money = (this.appointmentServiceFee* tenMinuteIntervals )+this.startingPrice;
- // console.log("已经过去了：" + timeString);
- // console.log("增加了" +money+ "元费用");
- // 每隔十分钟增加费用
- if (minutes % 10 === 0 && seconds === 0) {
-
- }
- this.timeString=timeString
- // console.log("已经过去了：" + timeString);
- }, 1000);
- }else if(this.orderinfo.status==1&&this.orderinfo.ruleId==null){
- // 取消预约
- // this.topay()
- const createTimeTimestamp = new Date(this.orderinfo.appointmentStartTime).getTime();
-
- // 定义定时器
-
- const currentTime = new Date(this.orderinfo.appointmentEndTime).getTime();;
- const timePassed = currentTime - createTimeTimestamp;
- const secondsPassed = Math.floor(timePassed / 1000);
-
- // 转换为时分秒格式
- const hours = Math.floor(secondsPassed / 3600);
- const minutes = Math.floor((secondsPassed % 3600) / 60);
- const seconds = secondsPassed % 60;
- const timeString = `${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
- const tenMinuteIntervals = Math.floor((hours * 60 + minutes) / 10)+1 ; // 加1是因为不满十分钟也算一个十分钟
- let money =0
- // 增加费用逻辑，假设每次增加10元
- this.money = (this.appointmentServiceFee* tenMinuteIntervals )+this.startingPrice;
- this.timeString=timeString
- // console.log("已经过去了：" + timeString);
-
- this.showdevice = true
- this.deviceIndex=3
- }else if(this.orderinfo.status==2&&this.orderinfo.ruleId==null){
- // 开始骑行
- // this.topay()
- this.showdevice = true
- this.deviceIndex=2
- const createTimeTimestamp = new Date(this.orderinfo.createTime).getTime();
-
- // 定义定时器
- this.timer = setInterval(() => {
- const currentTime = Date.now();
- const timePassed = currentTime - createTimeTimestamp;
- const secondsPassed = Math.floor(timePassed / 1000);
-
- // 转换为时分秒格式
- const hours = Math.floor(secondsPassed / 3600);
- const minutes = Math.floor((secondsPassed % 3600) / 60);
- const seconds = secondsPassed % 60;
- const timeString = `${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
- const tenMinuteIntervals = Math.floor((hours * 60 + minutes) / 10)+1 ; // 加1是因为不满十分钟也算一个十分钟
- let money =0
- // 增加费用逻辑，假设每次增加10元
- this.money = (this.appointmentServiceFee* tenMinuteIntervals )+this.startingPrice;
- // console.log("已经过去了：" + timeString);
- // console.log("增加了" +money+ "元费用");
- // 每隔十分钟增加费用
- if (minutes % 10 === 0 && seconds === 0) {
-
- }
- this.timeString=timeString
- // console.log("已经过去了：" + timeString);
- }, 1000);
- }else if(this.orderinfo.status==3&&this.orderinfo.ruleId==null){
- // 骑行结束
- // this.topay()
- const createTimeTimestamp = new Date(this.orderinfo.createTime).getTime();
-
- // 定义定时器
-
- const currentTime = Date.now();
- const timePassed = currentTime - createTimeTimestamp;
- const secondsPassed = Math.floor(timePassed / 1000);
-
- // 转换为时分秒格式
- const hours = Math.floor(secondsPassed / 3600);
- const minutes = Math.floor((secondsPassed % 3600) / 60);
- const seconds = secondsPassed % 60;
- const timeString = `${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
- const tenMinuteIntervals = Math.floor((hours * 60 + minutes) / 10)+1 ; // 加1是因为不满十分钟也算一个十分钟
-
- this.timeString=timeString
- // console.log("已经过去了：" + timeString);
-
- this.showdevice = true
- this.deviceIndex=3
+ this.timer = null
+ this.$u.get('/app/device/info?sn=' + this.orderinfo.sn).then((res) => {
+ if (res.code === 200) {
+ this.OrderdeviceInfos = res.data
}
-
-
-
- // 将 createTime 转换为时间戳
-
+ })
+
+ // if (this.orderinfo.ruleId != null && this.orderinfo.sn == '') {
+ // this.showdevice = false;
+ // this.deviceIndex = 0;
+ // this.showtc = true
+ // const ruleEndTimeTimestamp = new Date(this.orderinfo.ruleEndTime).getTime();
+
+ // // 定义定时器
+ // this.timer = setInterval(() => {
+ // const currentTime = Date.now();
+ // // const timePassed = currentTime - createTimeTimestamp;
+ // const timeRemaining = ruleEndTimeTimestamp - currentTime;
+
+ // if (timeRemaining <= 0) {
+ // clearInterval(this.timer);
+ // this.timeString = "00:00:00";
+ // // 可以在这里添加时间结束后的逻辑
+ // return;
+ // }
+
+ // const secondsRemaining = Math.floor(timeRemaining / 1000);
+
+ // // 转换为时分秒格式
+ // const hours = Math.floor(secondsRemaining / 3600);
+ // const minutes = Math.floor((secondsRemaining % 3600) / 60);
+ // const seconds = secondsRemaining % 60;
+ // const timeString =
+ // `${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
+ // const totalMinutes = hours * 60 + minutes;
+ // const tenMinuteIntervals = Math.floor(totalMinutes / 10) + 1;
+
+ // this.timeString = timeString;
+
+ // // console.log("剩余时间：" + timeString);
+ // }, 1000);
+ // } else if (this.orderinfo.status == 0 && this.orderinfo.ruleId != null) {
+ // this.showdevice = true;
+ // this.deviceIndex = 2;
+ // // const createTimeTimestamp = new Date(this.orderinfo.payTime).getTime();
+ // const ruleEndTimeTimestamp = new Date(this.orderinfo.ruleEndTime).getTime();
+
+ // // 定义定时器
+ // this.timer = setInterval(() => {
+ // const currentTime = Date.now();
+ // // const timePassed = currentTime - createTimeTimestamp;
+ // const timeRemaining = ruleEndTimeTimestamp - currentTime;
+ // console.log(timeRemaining);
+ // if (timeRemaining <= 0) {
+ // clearInterval(this.timer);
+ // this.timeString = "00:00:00";
+ // // 可以在这里添加时间结束后的逻辑
+ // return;
+ // }
+
+ // const secondsRemaining = Math.floor(timeRemaining / 1000);
+
+ // // 转换为时分秒格式
+ // const hours = Math.floor(secondsRemaining / 3600);
+ // const minutes = Math.floor((secondsRemaining % 3600) / 60);
+ // const seconds = secondsRemaining % 60;
+ // const timeString =
+ // `${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
+ // const totalMinutes = hours * 60 + minutes;
+ // const tenMinuteIntervals = Math.floor(totalMinutes / 10) + 1;
+
+ // this.timeString = timeString;
+
+ // // console.log("剩余时间：" + timeString);
+ // }, 1000);
+ // } else if (this.orderinfo.status == 2 && this.orderinfo.ruleId != null) {
+ // this.showdevice = true;
+ // this.deviceIndex = 2;
+ // // const createTimeTimestamp = new Date(this.orderinfo.payTime).getTime();
+ // const ruleEndTimeTimestamp = new Date(this.orderinfo.ruleEndTime).getTime();
+
+ // // 定义定时器
+ // this.timer = setInterval(() => {
+ // const currentTime = Date.now();
+ // // const timePassed = currentTime - createTimeTimestamp;
+ // const timeRemaining = ruleEndTimeTimestamp - currentTime;
+ // console.log(timeRemaining);
+ // if (timeRemaining <= 0) {
+ // clearInterval(this.timer);
+ // this.timeString = "00:00:00";
+ // // 可以在这里添加时间结束后的逻辑
+ // return;
+ // }
+
+ // const secondsRemaining = Math.floor(timeRemaining / 1000);
+
+ // // 转换为时分秒格式
+ // const hours = Math.floor(secondsRemaining / 3600);
+ // const minutes = Math.floor((secondsRemaining % 3600) / 60);
+ // const seconds = secondsRemaining % 60;
+ // const timeString =
+ // `${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
+ // const totalMinutes = hours * 60 + minutes;
+ // const tenMinuteIntervals = Math.floor(totalMinutes / 10) + 1;
+
+ // this.timeString = timeString;
+
+ // // console.log("剩余时间：" + timeString);
+ // }, 1000);
+ // }
+
+
+ // 预约中
+ if (this.orderinfo.status == 0) {
+ this.showdevice = true
+ this.deviceIndex = 2
+ const createTimeTimestamp = new Date(this.orderinfo.createTime).getTime();
+
+ // 定义定时器
+ this.timer = setInterval(() => {
+ const currentTime = Date.now();
+ const timePassed = currentTime - createTimeTimestamp;
+ const secondsPassed = Math.floor(timePassed / 1000);
+
+ // 转换为时分秒格式
+ const hours = Math.floor(secondsPassed / 3600);
+ const minutes = Math.floor((secondsPassed % 3600) / 60);
+ const seconds = secondsPassed % 60;
+ const timeString =
+ `${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
+ const totalMinutes = hours * 60 + minutes;
+ const tenMinuteIntervals = Math.floor(totalMinutes / 10) + 1;
+ this.money = tenMinuteIntervals * parseFloat(this.areaInfo.appointmentServiceFee)
+ // console.log(this.money,'this.areaInfo.appointmentServiceFeethis.areaInfo.appointmentServiceFee');
+ // if (totalMinutes <= this.startingHowManyMinutes) {
+ // this.money = this.startingPrice;
+ // } else {
+ // const extraTime = totalMinutes - this.startingHowManyMinutes;
+ // const extraIntervals = Math.floor(extraTime / parseFloat(this.timeMinutes)) + 1;
+ // console.log(extraIntervals * this.timeFee, 'extraIntervalsextraIntervals');
+ // this.money = parseFloat(this.startingPrice) + (extraIntervals * parseFloat(this
+ // .timeFee));
+ // }
+ // console.log("已经过去了：" + timeString);
+ // console.log("增加了" +money+ "元费用");
+ // 每隔十分钟增加费用
+ if (minutes % 10 === 0 && seconds === 0) {
+
+ }
+ this.timeString = timeString
+ // console.log("已经过去了：" + timeString);
+ }, 1000);
+ } else if (this.orderinfo.status == 1) {
+ // 取消预约
+ // this.topay()
+ const createTimeTimestamp = new Date(this.orderinfo.appointmentstartingTime).getTime();
+
+ // 定义定时器
+
+ const currentTime = new Date(this.orderinfo.appointmentEndTime).getTime();;
+ const timePassed = currentTime - createTimeTimestamp;
+ const secondsPassed = Math.floor(timePassed / 1000);
+
+ // 转换为时分秒格式
+ const hours = Math.floor(secondsPassed / 3600);
+ const minutes = Math.floor((secondsPassed % 3600) / 60);
+ const seconds = secondsPassed % 60;
+ const timeString =
+ `${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
+ const totalMinutes = hours * 60 + minutes;
+ const tenMinuteIntervals = Math.floor(totalMinutes / 10) + 1;
+
+ // if (totalMinutes <= this.startingHowManyMinutes) {
+ // this.money = this.startingPrice;
+ // } else {
+ // const extraTime = totalMinutes - this.startingHowManyMinutes;
+ // const extraIntervals = Math.floor(extraTime / parseFloat(this.timeMinutes)) + 1;
+ // console.log(extraIntervals * this.timeFee, 'extraIntervalsextraIntervals');
+ // this.money = parseFloat(this.startingPrice) + (extraIntervals * parseFloat(this.timeFee));
+ // }
+ this.timeString = timeString
+ // console.log("已经过去了：" + timeString);
+
+ this.showdevice = true
+ this.deviceIndex = 3
+ } else if (this.orderinfo.status == 2) {
+ // 开始骑行
+ // this.topay()
+ this.showdevice = true
+ this.deviceIndex = 2
+ const createTimeTimestamp = new Date(this.orderinfo.unlockTime).getTime();
+
+ // 定义定时器
+ this.timer = setInterval(() => {
+ const currentTime = Date.now();
+ const timePassed = currentTime - createTimeTimestamp;
+ const secondsPassed = Math.floor(timePassed / 1000);
+
+ // 转换为时分秒格式
+ const hours = Math.floor(secondsPassed / 3600);
+ const minutes = Math.floor((secondsPassed % 3600) / 60);
+ const seconds = secondsPassed % 60;
+ const timeString =
+ `${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
+ let totalMinutes = hours * 60 + minutes;
+
+ let totalTime;
+ if (this.orderinfo.rule.rentalUnit === 'minutes') {
+ totalTime = totalMinutes;
+ } else if (this.orderinfo.rule.rentalUnit === 'hours') {
+ totalTime = hours + minutes / 60;
+ } else if (this.orderinfo.rule.rentalUnit === 'day') {
+ totalTime = hours / 24 + minutes / 1440;
+ }
+
+ // 计费规则计算
+ if (this.orderinfo.rule.ridingRule == 1) {
+ const ridingRuleJson = JSON.parse(this.orderinfo.rule.ridingRuleJson);
+ const timeoutTime = parseFloat(ridingRuleJson.timeoutTime);
+ const startingPrice = parseFloat(ridingRuleJson.startingPrice);
+ const startingTime = parseFloat(ridingRuleJson.startingTime);
+ const timeoutPrice = parseFloat(ridingRuleJson.timeoutPrice);
+
+ let totalCharge;
+ if (totalTime <= startingTime) {
+ totalCharge = startingPrice;
+ } else {
+ const extraTime = totalTime - startingTime;
+ const extraCharge = Math.ceil(extraTime / timeoutTime) * timeoutPrice;
+ totalCharge = startingPrice + extraCharge;
+ }
+
+ // 更新money值
+ this.money = totalCharge+this.orderinfo.appointmentFee
+ } else if (this.orderinfo.rule.ridingRule == 2) {
+ const ridingRuleJson = JSON.parse(this.orderinfo.rule.ridingRuleJson);
+ const rules = ridingRuleJson.rule;
+ let totalCharge = 0;
+
+ for (let rule of rules) {
+ const start = parseFloat(rule.start);
+ const end = parseFloat(rule.end);
+ const eachUnit = parseFloat(rule.eachUnit);
+ const fee = parseFloat(rule.fee);
+
+ if (totalTime > start && (end === 9999 || totalTime <= end)) {
+ // 所有时间都按照该区间的费率来计算
+ totalCharge = Math.ceil(totalTime / eachUnit) * fee;
+ break;
+ }
+ }
+
+ // 更新money值
+ this.money = totalCharge+this.orderinfo.appointmentFee
+ }
+
+ // 更新时间字符串
+ this.timeString = timeString;
+ }, 1000);
+ } else if (this.orderinfo.status == 3) {
+ // 骑行结束
+ // this.topay()
+ const createTimeTimestamp = new Date(this.orderinfo.createTime).getTime();
+
+ // 定义定时器
+
+ const currentTime = Date.now();
+ const timePassed = currentTime - createTimeTimestamp;
+ const secondsPassed = Math.floor(timePassed / 1000);
+
+ // 转换为时分秒格式
+ const hours = Math.floor(secondsPassed / 3600);
+ const minutes = Math.floor((secondsPassed % 3600) / 60);
+ const seconds = secondsPassed % 60;
+ const timeString =
+ `${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
+ const tenMinuteIntervals = Math.floor((hours * 60 + minutes) / 10) + 1; // 加1是因为不满十分钟也算一个十分钟
+
+ this.timeString = timeString
+ // console.log("已经过去了：" + timeString);
+
+ this.showdevice = true
+ this.deviceIndex = 3
+ }
+
+
+
+ // 将 createTime 转换为时间戳
+
},
// 取消预约支付
- topay(){
+ topay() {
let data = {
userId: this.userId,
sn: this.orderinfo.sn,
- orderNo:this.orderinfo.orderNo,
-
+ orderNo: this.orderinfo.orderNo,
+
// money: this.freeInfo.fee,
mark: "订单支付",
type: '2'
-
-
+
+
}
console.log('点击了');
- let that =this
+ let that = this
this.$u.post('/appVerify/pre/order', data).then((res) => {
if (res.code === 200) {
// this.freList=res.rows
uni.requestPayment({
- provider: 'wxpay',
- timeStamp: res.data.timeStamp,
- nonceStr: res.data.nonceStr,
- package: res.data.packageVal,
- signType: res.data.signType,
- paySign: res.data.paySign,
- success(res) {
- // 支付成功逻辑
- that.getisInOrder()
-
- },
- fail(err) {
- // 支付失败逻辑
- uni.showToast({
- title: '支付失败',
- icon: 'none',
- duration: 2000
- });
- }
- });
+ provider: 'wxpay',
+ timeStamp: res.data.timeStamp,
+ nonceStr: res.data.nonceStr,
+ package: res.data.packageVal,
+ signType: res.data.signType,
+ paySign: res.data.paySign,
+ success(res) {
+ // 支付成功逻辑
+ that.getisInOrder()
+
+ },
+ fail(err) {
+ // 支付失败逻辑
+ uni.showToast({
+ title: '支付失败',
+ icon: 'none',
+ duration: 2000
+ });
+ }
+ });
} else {
uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
});
}
})
},
// 骑行结束支付
- topay1(){
+ topay1() {
let data = {
userId: this.userId,
sn: this.orderinfo.sn,
- orderNo:this.orderinfo.orderNo,
-
+ orderNo: this.orderinfo.orderNo,
+
// money: this.freeInfo.fee,
mark: "订单支付",
type: '1'
-
-
+
+
}
console.log('点击了');
- let that =this
+ let that = this
this.$u.post('/appVerify/pre/order', data).then((res) => {
if (res.code === 200) {
// this.freList=res.rows
uni.requestPayment({
- provider: 'wxpay',
- timeStamp: res.data.timeStamp,
- nonceStr: res.data.nonceStr,
- package: res.data.packageVal,
- signType: res.data.signType,
- paySign: res.data.paySign,
- success(res) {
- // 支付成功逻辑
- that.getisInOrder()
-
- },
- fail(err) {
- // 支付失败逻辑
- uni.showToast({
- title: '支付失败',
- icon: 'none',
- duration: 2000
- });
- }
- });
+ provider: 'wxpay',
+ timeStamp: res.data.timeStamp,
+ nonceStr: res.data.nonceStr,
+ package: res.data.packageVal,
+ signType: res.data.signType,
+ paySign: res.data.paySign,
+ success(res) {
+ console.log('支付成功');
+ // 支付成功逻辑
+ that.getisInOrder()
+
+ },
+ fail(err) {
+ // 支付失败逻辑
+ uni.showToast({
+ title: '支付失败',
+ icon: 'none',
+ duration: 2000
+ });
+ }
+ });
} else {
uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
});
}
})
},
- topage(num){
- if(num==0){
+ topage(num) {
+ if (num == 0) {
// uni.navigateTo({
// url:''
// })
- }else if(num==1){
+ } else if (num == 1) {
uni.navigateTo({
- url:'/page_user/yj'
+ url: '/page_user/yj'
})
- }else if(num==2){
+ } else if (num == 2) {
uni.navigateTo({
- url:'/page_user/jfgz'
+ url: '/page_user/jfgz'
})
- }else if(num==3){
+ } else if (num == 3) {
uni.navigateTo({
- url:'/page_user/yczn'
+ url: '/page_user/yczn'
})
- }else if(num==4){
+ } else if (num == 4) {
uni.navigateTo({
- url:'/page_user/bhks'
+ url: '/page_user/bhks'
})
- }else if(num==5){
+ } else if (num == 5) {
uni.navigateTo({
- url:'/page_user/gzsb'
+ url: '/page_user/gzsb'
})
- }else if(num==6){
+ } else if (num == 6) {
uni.navigateTo({
- url:'/pages/my'
+ url: '/pages/my'
})
- }else if(num==7){
+ } else if (num == 7) {
uni.navigateTo({
- url:'/page_user/gzsb?sn='+this.sn
+ url: '/page_user/gzsb?sn=' + this.sn
})
}
},
createWebSocket() {
// 创建 WebSocket 实例，传入 token
- let token =uni.getStorageSync('token')
- let that =this
+ let token = uni.getStorageSync('token')
+ let that = this
this.socket = uni.connectSocket({
url: `ws://192.168.2.8:8080/appVerify/ws/${this.eventKey}`, // WebSocket 服务器地址
header: {
'Authorization': token // 设置 Authorization 请求头
},
success(res) {
-
+
console.log('WebSocket 连接成功', res);
},
fail(err) {
@@ -879,23 +1361,50 @@
reason: 'Closing connection' // 关闭连接的原因
});
},
+ sub5() {
+ this.$u.post('/appVerify/device/appointment?userId=' + this.userId + '&sn=' + this.sn + '&ruleId=' + this
+ .orderinfo.ruleId + '&type=2' + '&orderNo=' + this.orderinfo.orderNo).then((res) => {
+ if (res.code === 200) {
+ uni.showLoading({
+ title: '预约中...'
+ })
+ setTimeout(() => {
+ this.getisInOrder()
+ uni.hideLoading()
+ }, 1000)
+ // this.freList=res.rows
+
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ });
+ }
+ })
+ },
// 确认开锁
sub1() {
+
let data = {
userId: this.userId,
sn: this.sn,
- // ruleId: this.freeInfo.ruleId,
+ ruleId: this.freeInfo.ruleId,
// money: this.freeInfo.fee,
mark: "确认开锁",
type: '1'
-
-
+
+
}
this.$u.post('/appVerify/device/snSwitch', data).then((res) => {
if (res.code === 200) {
- this.getisInOrder()
+ this.getisInOrder()
} else {
-
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ });
}
})
},
@@ -906,68 +1415,80 @@
sn: this.sn,
ruleId: this.freeInfo.ruleId,
// money: this.freeInfo.fee,
- isAppointment:false,
+ isAppointment: false,
mark: "套餐开锁",
type: '3'
-
-
+
+
}
- this.$u.post('/appVerify/device/snSwitch', data).then((res) => {
+ this.$u.post('/appVerify/pre/order', data).then((res) => {
if (res.code === 200) {
// this.freList=res.rows
uni.requestPayment({
- provider: 'wxpay',
- timeStamp: res.data.timeStamp,
- nonceStr: res.data.nonceStr,
- package: res.data.packageVal,
- signType: res.data.signType,
- paySign: res.data.paySign,
- success(res) {
- // 支付成功逻辑
- this.showdevice = false
- this.deviceIndex = 0
- this.mac = ''
- this.type = 0
- this.freeInfo = {}
- this.freeListIndex = 0
- },
- fail(err) {
- // 支付失败逻辑
- uni.showToast({
- title: '支付失败',
- icon: 'none',
- duration: 2000
- });
- }
- });
+ provider: 'wxpay',
+ timeStamp: res.data.timeStamp,
+ nonceStr: res.data.nonceStr,
+ package: res.data.packageVal,
+ signType: res.data.signType,
+ paySign: res.data.paySign,
+ success(res) {
+ // 支付成功逻辑
+ this.showdevice = false
+ this.deviceIndex = 0
+ this.mac = ''
+ this.type = 0
+ this.freeInfo = {}
+ this.freeListIndex = 0
+ this.getisInOrder()
+ },
+ fail(err) {
+ // 支付失败逻辑
+ uni.showToast({
+ title: '支付失败',
+ icon: 'none',
+ duration: 2000
+ });
+ }
+ });
} else {
uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
- });
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ });
}
})
},
// 确认预约
sub3() {
-
- this.$u.post('/appVerify/device/appointment?userId=' + this.userId+'&sn='+this.sn ).then((res) => {
+ let data = {
+ userId: this.userId,
+ sn: this.sn,
+ ruleId: this.freeInfo.ruleId,
+ // isAppointment: true,
+ // money: this.freeInfo.fee,
+ mark: "预约购买套餐",
+ type: '2'
+
+
+ }
+ this.$u.post('/appVerify/device/appointment?userId=' + this.userId + '&sn=' + this.sn + '&ruleId=' + this
+ .freeInfo.ruleId).then((res) => {
if (res.code === 200) {
uni.showLoading({
- title:'预约中...'
+ title: '预约中...'
})
- setTimeout(()=>{
+ setTimeout(() => {
this.getisInOrder()
uni.hideLoading()
- },1000)
+ }, 1000)
// this.freList=res.rows
-
+
} else {
uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
});
}
})
@@ -978,7 +1499,7 @@
userId: this.userId,
sn: this.sn,
ruleId: this.freeInfo.ruleId,
- isAppointment:true,
+ isAppointment: true,
// money: this.freeInfo.fee,
mark: "预约购买套餐",
type: '3'
@@ -990,36 +1511,37 @@
if (res.code === 200) {
// this.freList=res.rows
uni.requestPayment({
- provider: 'wxpay',
- timeStamp: res.data.timeStamp,
- nonceStr: res.data.nonceStr,
- package: res.data.packageVal,
- signType: res.data.signType,
- paySign: res.data.paySign,
- success(res) {
- // 支付成功逻辑
-
- this.showdevice = false
- this.deviceIndex = 0
- this.mac = ''
- this.type = 0
- this.freeInfo = {}
- this.freeListIndex = 0
- },
- fail(err) {
- // 支付失败逻辑
- uni.showToast({
- title: '支付失败',
- icon: 'none',
- duration: 2000
- });
- }
- });
+ provider: 'wxpay',
+ timeStamp: res.data.timeStamp,
+ nonceStr: res.data.nonceStr,
+ package: res.data.packageVal,
+ signType: res.data.signType,
+ paySign: res.data.paySign,
+ success(res) {
+ // 支付成功逻辑
+
+ this.showdevice = false
+ this.deviceIndex = 0
+ this.mac = ''
+ this.type = 0
+ this.freeInfo = {}
+ this.freeListIndex = 0
+ this.getisInOrder()
+ },
+ fail(err) {
+ // 支付失败逻辑
+ uni.showToast({
+ title: '支付失败',
+ icon: 'none',
+ duration: 2000
+ });
+ }
+ });
} else {
uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
});
}
})
@@ -1028,13 +1550,13 @@
this.$u.post('/app/user/isInOrder?userId=' + this.userId, ).then((res) => {
if (res.code === 200) {
// this.freList=res.rows
- if(res.data!=''){
- this.orderinfo=res.data[0]
-
+ if (res.data != '') {
+ this.orderinfo = res.data[0]
+
this.starTime()
- }else{
+ } else {
this.showdevice = false
- this.deviceIndex=0
+ this.deviceIndex = 0
}
} else {
@@ -1046,9 +1568,20 @@
this.freeListIndex = index
},
getlist() {
- this.$u.get('/app/fee/list').then((res) => {
+ let data = {
+ areaId: this.areaInfo.areaId
+ }
+ this.$u.get('/app/fee/list?', data).then((res) => {
if (res.code === 200) {
- this.freList = res.rows
+ this.freList = res.data.map(item => {
+ try {
+ item.ridingRuleJson = JSON.parse(item.ridingRuleJson);
+ } catch (e) {
+ console.error('Invalid JSON in ridingRuleJson:', item.ridingRuleJson);
+ }
+ return item;
+ });
+ console.log(this.freList, ' this.freList this.freList');
} else {
uni.showToast({
title: '未登录，请登录后尝试',
@@ -1059,7 +1592,7 @@
})
},
// 发现坏车
-
+
// 预约车辆
Reserve() {
@@ -1144,7 +1677,7 @@
console.log('点击了标记：', e.markerId);
// 这里可以根据需要处理点击标记的逻辑
// 阻止事件冒泡
- this.showindex=0
+ this.showindex = 0
this.showdevice = true
this.sn = e.markerId
this.deviceInfo()
@@ -1190,7 +1723,7 @@
})
})
// this.markers = markers;
- console.log(this.markers, ' this.markers this.markers');
+ // console.log(this.markers, ' this.markers this.markers');
} else {
// 处理接口返回错误的情况
}
@@ -1200,20 +1733,50 @@
},
getArea() {
// 发送请求获取数据
- this.$u.get('/app/area/list').then((res) => {
+ this.$u.get('/app/area/info?', this.gps).then((res) => {
if (res.code === 200) {
// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
- const polylines = res.rows
- .filter(area => area.boundaryStr) // 过滤掉boundary为空的数据
- .map(area => this.convertBoundaryToPolyline(area.boundaryStr));
+ const polylines = this.convertBoundaryToPolyline(res.data.boundaryStr)
+ // console.log(polylines,'polylinespolylinespolylines');
+ // .filter(area => area.boundaryStr) // 过滤掉boundary为空的数据
+ // .map(area => this.convertBoundaryToPolyline(area.boundaryStr));
// 更新折线数据
- this.polyline = polylines;
+ this.areaInfo = res.data
+ this.polyline.push(polylines)
+ // console.log(this.areaInfo, 'areaInfoareaInfo');
+ uni.setStorageSync('areaId', res.data.areaId);
+ this.getlist()
+ this.getParking()
+ this.getisInOrder()
// console.log(this.polyline);
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ });
}
}).catch(error => {
console.error("Error fetching area data:", error);
});
},
+ // getArea() {
+ // // 发送请求获取数据
+ // this.$u.get('/app/area/list',this.gps).then((res) => {
+ // if (res.code === 200) {
+ // // 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
+ // const polylines = res.rows
+ // .filter(area => area.boundaryStr) // 过滤掉boundary为空的数据
+ // .map(area => this.convertBoundaryToPolyline(area.boundaryStr));
+ // // 更新折线数据
+ // this.polyline = polylines;
+ // this.getlist()
+ // // console.log(this.polyline);
+ // }
+ // }).catch(error => {
+ // console.error("Error fetching area data:", error);
+ // });
+ // },
convertBoundaryToPolylines(boundaries) {
return boundaries.map(boundary => {
if (!boundary) return null;
@@ -1243,7 +1806,10 @@
},
getParking() {
// 发送请求获取数据
- this.$u.get('/app/parking/list').then((res) => {
+ let data = {
+ areaId: this.areaInfo.areaId
+ }
+ this.$u.get('/app/parking/list?', data).then((res) => {
if (res.code === 200) {
// 处理接口返回的数据
const validBoundaries = res.rows.map(row => row.boundaryStr).filter(boundary =>
@@ -1252,7 +1818,7 @@
// 将处理后的数据添加到 this.polyline 中
this.polyline = this.polyline.concat(polylines);
- console.log(this.polyline);
+ // console.log(this.polyline);
}
}).catch(error => {
console.error("Error fetching parking data:", error);
@@ -1321,6 +1887,88 @@
.page {
width: 750rpx;
+ .feeDetail {
+ padding: 36rpx 22rpx;
+ position: fixed;
+ display: flex;
+ flex-wrap: wrap;
+ bottom: 0;
+ left: 0;
+ width: 750rpx;
+ height: 900rpx;
+ background: #F7F7F7;
+ box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(0, 0, 0, 0.3);
+ border-radius: 53rpx 53rpx 0 0;
+ z-index: 200;
+ overflow-y: auto;
+
+ /* Enable vertical scrolling */
+ .close {
+ position: absolute;
+ top: 20rpx;
+ right: 20rpx;
+ width: 30rpx;
+ height: 30rpx;
+ }
+
+ .feeCard {
+ margin-top: 20rpx;
+ padding: 38rpx;
+ width: 708rpx;
+ // height: 710rpx;
+ background: #FFFFFF;
+ border-radius: 32rpx 32rpx 32rpx 32rpx;
+
+ .tit1 {
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #3D3D3D;
+ }
+
+ .cont {
+ width: 100%;
+ margin-top: 26rpx;
+ display: flex;
+ flex-wrap: nowrap;
+
+ .left {
+ width: 40%;
+ font-weight: 600;
+ font-size: 28rpx;
+ color: #3D3D3D;
+ }
+
+ .right {
+ width: 60%;
+ display: flex;
+ flex-wrap: wrap;
+ font-weight: 500;
+ font-size: 28rpx;
+ color: #FF4444;
+
+ .li {
+ width: 100%;
+ }
+ }
+ }
+ }
+ }
+
+ .tipss {
+ position: fixed;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-wrap: nowrap;
+ bottom: 304rpx;
+ left: 38rpx;
+ width: 350rpx;
+ height: 64rpx;
+ background: #FFFFFF;
+ box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(0, 0, 0, 0.3);
+ border-radius: 53rpx 53rpx 53rpx 53rpx;
+ }
+
.map {
width: 750rpx;
height: 80vh;
@@ -1548,12 +2196,30 @@
flex-wrap: wrap;
justify-content: center;
+
.text {
+ text-align: center;
+ width: 100%;
font-weight: 400;
font-size: 24rpx;
color: #808080;
}
+ .speed {
+ margin-top: 18rpx;
+ width: 226rpx;
+ height: 22rpx;
+ background: #ccc;
+ border-radius: 16rpx 16rpx 16rpx 16rpx;
+
+ .speeds {
+ // width: 90%;
+ height: 100%;
+ background: #77B8FD;
+ border-radius: 16rpx 16rpx 16rpx 16rpx;
+ }
+ }
+
.txt {
width: 100%;
@@ -1592,7 +2258,7 @@
margin-right: 20rpx;
position: relative;
padding: 16rpx 24rpx;
- // width: 368rpx;
+ width: 500rpx !important;
height: 228rpx;
background: #FFFFFF;
box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
@@ -1608,13 +2274,33 @@
}
.tit {
- width: 320rpx;
+ display: flex;
+ flex-wrap: nowrap;
+ align-items: center;
+ width: 100%;
font-weight: 500;
font-size: 32rpx;
color: #3D3D3D;
+
+ }
+
+ .tips {
+ display: flex;
+ flex-wrap: nowrap;
+ align-items: center;
+ margin-left: auto;
+ font-size: 30rpx;
+ color: #3D3D3D;
+
+ .icon-chakanxiangqing {
+ font-size: 30rpx;
+ color: #3D3D3D;
+ font-weight: 600;
+ }
}
.nmtxt {
+ width: 100%;
margin-top: 22rpx;
display: flex;
flex-wrap: nowrap;
@@ -1625,6 +2311,21 @@
font-weight: 400;
font-size: 24rpx;
color: #3D3D3D;
+
+ .tips {
+ display: flex;
+ flex-wrap: nowrap;
+ align-items: center;
+ margin-left: auto;
+ font-size: 30rpx;
+ color: #3D3D3D;
+
+ .icon-chakanxiangqing {
+ font-size: 30rpx;
+ color: #3D3D3D;
+ font-weight: 600;
+ }
+ }
}
.right {
@@ -1633,6 +2334,15 @@
color: #3D3D3D;
}
+ // .text-ellipsis {
+ // display: -webkit-box;
+ // -webkit-line-clamp: 3;
+ // -webkit-box-orient: vertical;
+ // overflow: hidden;
+ // text-overflow: ellipsis;
+ // word-break: break-all;
+ // // height: 72rpx; /* Adjust the height based on font size and line height */
+ // }
.red {
font-weight: 400;
font-size: 36rpx;
@@ -1681,15 +2391,17 @@
}
}
}
- .page3{
- .bot_btn{
-
+
+ .page3 {
+ .bot_btn {
+
width: 750rpx;
height: 648rpx;
background: #F7F7F7;
- box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0,0,0,0.08);
- border-radius: 50rpx 50rpx 0 0 ;
- .info{
+ box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
+ border-radius: 50rpx 50rpx 0 0;
+
+ .info {
padding: 0 60rpx;
display: flex;
flex-wrap: nowrap;
@@ -1700,48 +2412,58 @@
background: #FFFFFF;
border-radius: 20rpx 20rpx 20rpx 20rpx;
}
- .card{
+
+ view {}
+
+ .card {
margin-top: 12rpx;
padding: 20rpx 30rpx;
width: 708rpx;
height: 288rpx;
background: #FFFFFF;
border-radius: 20rpx 20rpx 20rpx 20rpx;
- .tit{
+
+ .tit {
font-weight: 500;
font-size: 36rpx;
color: #3D3D3D;
}
- .cont{
+
+ .cont {
display: flex;
flex-wrap: nowrap;
align-items: center;
justify-content: space-between;
- .left{
- .text{
+
+ .left {
+ .text {
font-weight: 400;
font-size: 28rpx;
color: #3D3D3D;
}
- .speed{
+
+ .speed {
margin-top: 18rpx;
width: 226rpx;
height: 22rpx;
background: #EFEFEF;
border-radius: 16rpx 16rpx 16rpx 16rpx;
- .speeds{
+
+ .speeds {
// width: 90%;
height: 100%;
- background:#77B8FD ;
+ background: #77B8FD;
border-radius: 16rpx 0rpx 0rpx 16rpx;
}
}
- .mac{
+
+ .mac {
margin-top: 18rpx;
}
}
- .right{
- image{
+
+ .right {
+ image {
width: 244rpx;
height: 196rpx;
font-weight: 400;
@@ -1751,7 +2473,8 @@
}
}
}
- .bot{
+
+ .bot {
display: flex;
align-items: center;
justify-content: center;
@@ -1761,9 +2484,10 @@
width: 750rpx;
height: 184rpx;
background: #FFFFFF;
- box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0,0,0,0.08), 0rpx 10rpx 64rpx 0rpx rgba(0,0,0,0.08);
+ box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08), 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
border-radius: 0rpx 0rpx 0rpx 0rpx;
- .btn{
+
+ .btn {
display: flex;
justify-content: center;
align-items: center;
@@ -1771,13 +2495,14 @@
height: 90rpx;
background: #4C97E7;
border-radius: 54rpx 54rpx 54rpx 54rpx;
-
+
font-weight: 500;
font-size: 40rpx;
color: #FFFFFF;
}
- .btn1{
-
+
+ .btn1 {
+
display: flex;
justify-content: center;
align-items: center;
@@ -1792,8 +2517,9 @@
}
}
}
- .page4{
- .bot_btn{
+
+ .page4 {
+ .bot_btn {
// padding: 26rpx 34rpx 48rpx 34rpx;
// position: fixed;
// display: flex;
@@ -1803,9 +2529,10 @@
width: 750rpx;
height: 420rpx;
background: #FFFFFF;
- box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0,0,0,0.08);
+ box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
border-radius: 30rpx;
- .time{
+
+ .time {
// height: 88rpx;
width: 100%;
text-align: center;
@@ -1813,21 +2540,24 @@
font-weight: 400;
font-size: 28rpx;
color: #3D3D3D;
- border-bottom: 2rpx solid #EFEFEF;
+ border-bottom: 2rpx solid #EFEFEF;
}
- .price{
+
+ .price {
margin-top: 22rpx;
width: 100%;
text-align: center;
font-weight: 500;
font-size: 72rpx;
color: #3D3D3D;
- span{
+
+ span {
font-size: 28rpx;
font-weight: 500;
}
}
- .toinfo{
+
+ .toinfo {
// margin-top: 12rpx;
width: 100%;
text-align: center;
@@ -1835,7 +2565,8 @@
font-size: 24rpx;
color: #3D3D3D;
}
- .btn{
+
+ .btn {
margin-top: 34rpx;
display: flex;
align-items: center;
@@ -1848,7 +2579,7 @@
font-size: 40rpx;
color: #FFFFFF;
}
-
+
}
}
}
@@ -1924,6 +2655,14 @@
border-radius: 20rpx 20rpx 20rpx 20rpx;
z-index: 110;
+ .time {
+ margin-top: 20rpx;
+ text-align: center;
+ font-weight: 500;
+ font-size: 48rpx;
+ color: #4C97E7;
+ }
+
.tit {
// width: 604rpx;
text-align: center;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d0a713c..e59f512 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -66,7 +66,8 @@
};
wxLoginAsync()
.then(async (data) => {
- this.$u.post("/wxlogin?mobileCode="+data.mobileCode+'&jsCode='+data.jscode).then((res) => {
+ let areaId=uni.getStorageSync('areaId');
+ this.$u.post("/wxlogin?mobileCode="+data.mobileCode+'&jsCode='+data.jscode+'&areaId='+areaId).then((res) => {
diff --git a/pages/my.vue b/pages/my.vue
index b8f0007..13f49ce 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -3,7 +3,7 @@
-
+