diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 4313401..374b767 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -9,8 +9,8 @@ const install = (Vue, vm) => {
// // 设置为json，返回后会对数据进行一次JSON.parse()
// dataType: 'json',
// showLoading: true, // 是否显示请求中的loading
- // loadingText: '...', // 请求loading中的文字提示
- loadingTime: 10000, // 在此时间内，请求还没回来的话，就显示加载中动画，单位ms
+ // loadingText: '请求加载中...', // 请求loading中的文字提示
+ // loadingTime: 10000, // 在此时间内，请求还没回来的话，就显示加载中动画，单位ms
// originalData: false, // 是否在拦截器中返回服务端的原始数据
// loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透
// // 配置请求头信息
@@ -27,7 +27,8 @@ const install = (Vue, vm) => {
// baseUrl: 'https://dianche.chuantewulian.cn/prod-api',
baseUrl: 'https://dche.ccttiot.com/prod-api',
loadingText: '努力加载中~',
- // loadingTime: 2000,
+ loadingTime: 50000,
+
// 设置自定义头部content-type
header: {
'content-type': 'application/json;charset=UTF-8',
diff --git a/manifest.json b/manifest.json
index 04af682..da040ab 100644
--- a/manifest.json
+++ b/manifest.json
@@ -51,7 +51,7 @@
/* 小程序特有相关 */
"mp-weixin" : {
"libVersion" : "latest",
- "appid" : "wx4d178f8c80348214",
+ "appid" : "wx3428c498d5061192",
"setting" : {
"urlCheck" : false
},
diff --git a/page_user/yj.vue b/page_user/yj.vue
index f666ad7..2d263d5 100644
--- a/page_user/yj.vue
+++ b/page_user/yj.vue
@@ -122,6 +122,29 @@
-->
+
+
+
+
+ 提现成功
+
+
+ 充值押金将在10分钟内按原路退还，是否返回？
+
+
+
+
+ 取消
+
+
+ 确定
+
+
+
+
@@ -143,6 +166,7 @@
+
@@ -175,7 +199,8 @@
isback:false,
showBack:false,
loadingmask:false,
- ispaid:false
+ ispaid:false,
+ showtxtip:false
}
@@ -223,11 +248,11 @@
});
},
getlist() {
- uni.showLoading({
- title:'加载中...'
- })
+ // uni.showLoading({
+ // title:'加载中...'
+ // })
this.$u.get("/appVerify/order/list?type=2&userId=" + this.userId).then((res) => {
- uni.hideLoading()
+ // uni.hideLoading()
if (res.code == 200) {
this.orderList = res.rows
this.total = res.total
@@ -242,17 +267,17 @@
},
tixian() {
- uni.showLoading({
- title:'加载中...'
- })
+ this.show = false
+ this.loadingmask=true
this.$u.post("/appVerify/order/withdraw").then((res) => {
if (res.code == 200) {
setTimeout(() => {
- uni.hideLoading()
+ this.loadingmask=false
this.getinfo()
this.getlist()
- this.show = false
+
+ this.showtxtip=true
}, 500)
} else {
@@ -296,7 +321,7 @@
console.log('进入判断了',this.isback);
if(this.isback==true){
console.log('进入判断了1');
- this.showBack=true
+ // this.showBack=true
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1427278..6428235 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -17,6 +17,9 @@
嵛你出行
+
+
+
@@ -252,7 +255,7 @@
-
+
预估金额：{{ parseFloat(money).toFixed(2) }}元
@@ -1530,8 +1533,8 @@
id: sn,
latitude: latitude,
longitude: longitude,
- width: 10,
- height: 10,
+ width: 5,
+ height: 5,
iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u4D2g8B76trqZLhIiNWN'
};
this.markers.push(specificDeviceMarker);
@@ -1689,9 +1692,12 @@
this.seeDetail = false;
if (res.code === 200) {
this.opencar()
+ this.backfalse=0
this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
this.toploadtxt = '开锁成功';
this.buletxt = '开锁成功';
+ this.lastClickedMarkerId=null
+ this.mappolyline=[]
setTimeout(() => {
this.maskloading = false;
this.getisInOrder();
@@ -1952,6 +1958,7 @@
if (res.code === 200) {
that.reboot()
+ that.backfalse=0
that.isbackdevice = false
// that.close()
// that.getisInOrder()
@@ -2007,6 +2014,7 @@
if (res.code === 200) {
that.reboot()
+ that.backfalse=0
that.isbackdevice = false
that.loadimg =
'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
@@ -2109,7 +2117,7 @@
})
},
payback() {
- console.log(this.OrderdeviceInfos.onlineStatus, 'this.OrderdeviceInfosthis.OrderdeviceInfos');
+
if (this.OrderdeviceInfos.onlineStatus == 1 && this.backfalse < 1) {
// 设备未离线
console.log('在线还车');
@@ -2126,7 +2134,37 @@
}
}, 40); // 每40毫秒更新一次，可以调整
setTimeout(() => {
- this.backDevice()
+ this.$u.post('/appVerify/device/return?returnType=1&orderNo=' + this.orderinfo.orderNo +
+ '&isInParkingArea=' + this.isInParkingArea).then((
+ res) => {
+
+ if (res.code === 200) {
+ this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
+ this.toploadtxt = '还车成功!';
+ this.backfalse=0
+ setTimeout(() => {
+ this.close()
+ this.maskloading = false;
+ this.getisInOrder();
+
+ }, 800);
+
+ } else {
+
+ this.backfalse = this.backfalse + 1
+ this.payback()
+ // this.cheackgps()
+ // this.toploadtxt = '还车失败';
+ // setTimeout(() => {
+ // this.maskloading = false;
+ // uni.showToast({
+ // title: res.msg,
+ // icon: 'none',
+ // duration: 2000
+ // });
+ // }, 1000);
+ }
+ })
}, 2100);
} else if (this.OrderdeviceInfos.onlineStatus == 0 || this.backfalse >= 1) {
@@ -2154,6 +2192,7 @@
if (res.code === 200) {
this.reboot()
+ this.backfalse=0
this.isbackdevice = false
this.loadimg =
'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
@@ -2207,14 +2246,18 @@
if (res.code === 200) {
this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
this.toploadtxt = '还车成功!';
+ this.backfalse=0
setTimeout(() => {
this.close()
this.maskloading = false;
this.getisInOrder();
+
}, 800);
} else {
+
this.backfalse = this.backfalse + 1
+ this.cheackgps()
this.toploadtxt = '还车失败';
setTimeout(() => {
this.maskloading = false;
@@ -2411,6 +2454,8 @@
if (res.code === 200) {
this.loadimg = 'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
this.toploadtxt = '开锁成功';
+ this.lastClickedMarkerId=null
+ this.mappolyline=[]
setTimeout(() => {
this.maskloading = false;
this.getisInOrder();
@@ -2676,6 +2721,7 @@
.orderNo).then((res) => {
if (res.code === 200) {
+ this.backfalse=0
this.loadimg =
'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
this.toploadtxt = '开锁成功';
@@ -2687,10 +2733,11 @@
} else {
this.backfalse = this.backfalse + 1
- this.toploadtxt = '开锁失败';
- setTimeout(() => {
- this.maskloading = false;
- }, 1000);
+ this.unloackdevices()
+ // this.toploadtxt = '开锁失败';
+ // setTimeout(() => {
+ // this.maskloading = false;
+ // }, 1000);
// if (res.msg == '10500-----') {
// uni.showToast({
@@ -2738,6 +2785,7 @@
'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
that.buletxt = '解锁成功';
that.toploadtxt = '解锁成功'
+ that.backfalse=0
setTimeout(() => {
that.maskloading = false;
that.getisInOrder();
@@ -2805,6 +2853,7 @@
if (res.code === 200) {
// this.getisInOrder()
+ this.backfalse=0
this.loadimg =
'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
this.toploadtxt = '锁车成功';
@@ -2815,15 +2864,16 @@
}, 1000);
} else {
this.backfalse = this.backfalse + 1
- this.toploadtxt = '锁车失败';
- setTimeout(() => {
- this.maskloading = false;
- uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
- });
- }, 1000);
+ this.loackdevice()
+ // this.toploadtxt = '锁车失败';
+ // setTimeout(() => {
+ // this.maskloading = false;
+ // uni.showToast({
+ // title: res.msg,
+ // icon: 'none',
+ // duration: 2000
+ // });
+ // }, 1000);
// if (res.msg == '10500-----') {
// uni.showToast({
@@ -2868,6 +2918,7 @@
// console.log('发送了离线锁车请求');
// that.getisInOrder()
that.buleclose = false
+ that.backfalse=0
that.loadimg =
'https://lxnapi.ccttiot.com/bike/img/static/upNvRa9ZQMyiwxLliF5z';
that.buletxt = '锁车成功';
@@ -5070,7 +5121,10 @@
.navBarBox {
position: fixed;
z-index: 10;
- background: linear-gradient(to bottom, rgba(255, 255, 255, 0.8), transparent);
+ // background:#fff;
+ // background: linear-gradient(to bottom, rgba(255, 255, 255, 0.9) 70%, transparent);
+ background: linear-gradient(to bottom, rgba(255, 255, 255, 1) 50%, rgba(255, 255, 255, 0.5) 75%, transparent 100%);
+ // background: linear-gradient( 180deg, #FFFFFF 58%, rgba(255,255,255,0) 52%);
.navBar {
width: 100vw;
@@ -5741,7 +5795,10 @@
}
.page3 {
+
+
.bot_btns {
+ // position: relative;
// display: flex;
// justify-content: center;
width: 750rpx;
@@ -5749,13 +5806,13 @@
// background: #fff;
// box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
border-radius: 50rpx 50rpx 0 0;
+ // padding-left: 8rpx;
padding-left: 10rpx;
-
- .info {
+ .infoss {
// margin-top: 20rpx;
- padding: 0 60rpx;
+ padding: 0 55rpx;
// margin-right: 20rpx;
display: flex;
flex-wrap: nowrap;
diff --git a/pages_admin/order/device_detail.vue b/pages_admin/order/device_detail.vue
index 4b524c4..5c12aaa 100644
--- a/pages_admin/order/device_detail.vue
+++ b/pages_admin/order/device_detail.vue
@@ -55,11 +55,11 @@
车辆状态：{{status()}}
-
- 续航里程：
- {{deviceInfos.remainingMileage}} KM
- --
-
+
+ 网络状态：离线
+
+
+ 网络状态：在线
@@ -68,6 +68,12 @@
{{deviceInfos.remainingPower}}%
--
+
+ 续航里程：
+ {{deviceInfos.remainingMileage}} KM
+ --
+
+
-
+
设备重启
+
+ 车辆禁用
+
+
+ 车辆解禁
+
+
+ 车辆回仓
+
+
+ 车辆出仓
+
+
+ 车牌修改
+
-
-
-
- 修改车牌号
-
-
-
-
- 车牌号
-
-
-
- 元
-
-
-
-
-
-
- 取消
-
-
- 确定
-
-
-
+