diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 8e87cc7..fc1dcee 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -1,7 +1,7 @@
const install = (Vue, vm) => {
uni.setStorageSync('deptId', 100);
Vue.prototype.$u.http.setConfig({
- // baseUrl: 'http://192.168.2.76:4101', //键辉本地
+ // baseUrl: 'http://192.168.2.65:4101', //键辉本地
// baseUrl: 'http://192.168.0.102:4101', //景森本地
baseUrl: 'https://ele.ccttiot.com/prod-api', //线上
loadingText: '努力加载中~',
diff --git a/page_fenbao/storedlist/trueorder.vue b/page_fenbao/storedlist/trueorder.vue
index 70f129d..a5abc1e 100644
--- a/page_fenbao/storedlist/trueorder.vue
+++ b/page_fenbao/storedlist/trueorder.vue
@@ -691,6 +691,8 @@
this.$u.get(`/app/device/availableDetail?sn=${this.sn}`).then((res) => {
if (res.code == 200) {
this.bikeobj = res.data
+ console.log(res.data,'020202');
+ this.$u.put(`/app/user/bindArea?areaId=${res.data.areaId}`).then(resp =>{})
// if (res.data.onlineStatus == 0) {
// wx.openBluetoothAdapter({
// success: function(res) {
diff --git a/page_fenbao/webview.vue b/page_fenbao/webview.vue
new file mode 100644
index 0000000..bc30cbf
--- /dev/null
+++ b/page_fenbao/webview.vue
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/page_shanghu/admin_index.vue b/page_shanghu/admin_index.vue
index a782af3..94961d6 100644
--- a/page_shanghu/admin_index.vue
+++ b/page_shanghu/admin_index.vue
@@ -121,7 +121,7 @@
- 牌:{{item.vehicleNum}}
+ 牌:{{item.vehicleNum == null ? '--' : item.vehicleNum}}
-
+
@@ -38,7 +38,7 @@
处理
-
+
维修完成
@@ -85,14 +85,45 @@
this.getlist()
}
},
-
+ // 点击完成
+ btnwc(item){
+ let data = {
+ id:item.id,
+ pass:true
+ }
+ this.$u.put('/bst/fault/complete', data).then((res) => {
+ if (res.code === 200) {
+ uni.showToast({
+ title: '操作成功',
+ icon: 'none',
+ duration: 2000
+ });
+ this.pageNum = 1;
+ this.list = []; // 清空当前列表
+ this.getlist();
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ });
+ }
+ })
+ },
+ // 点击处理和忽略
unpass(item,num){
+ let passflag = ''
+ if(num == 0){
+ passflag = false
+ }else if(num == 1){
+ passflag = true
+ }
uni.showLoading({
title:'加载中...'
})
let data = {
id:item.id,
- handle:num
+ pass:passflag
}
this.$u.put('/bst/fault/handle', data).then((res) => {
if (res.code === 200) {
@@ -115,7 +146,7 @@
},
parsePictures(pictureString) {
if (pictureString) {
- return pictureString.split(',');
+ return pictureString.split(',')
}
return [];
},
@@ -123,7 +154,7 @@
uni.previewImage({
current: pic, // 当前显示图片的链接
urls: this.parsePictures(item.picture) // 需要预览的图片链接列表
- });
+ })
},
getlist() {
let data = {
@@ -140,21 +171,20 @@
this.list = this.list.concat(res.rows)
}
this.pageNum ++
- // this.list = [...this.list, ...res.rows]; // 拼接新数据
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
- });
+ })
}
}).catch(error => {
console.error("Error fetching area data:", error);
- });
+ })
},
loadMore() {
- this.pageNum += 1; // 页码增加
- this.getlist(); // 调用getlist方法获取更多数据
+ this.pageNum += 1 // 页码增加
+ this.getlist() // 调用getlist方法获取更多数据
},
search() {
clearTimeout(timerId1);
@@ -169,18 +199,16 @@
todetail() {
uni.navigateTo({
url: '/pages_adminSet/shDetail'
- });
+ })
}
}
- };
+ }
-