diff --git a/components/tabBar/tabBar.vue b/components/tabBar/tabBar.vue
index 49cccec..4c4e7e7 100644
--- a/components/tabBar/tabBar.vue
+++ b/components/tabBar/tabBar.vue
@@ -97,7 +97,7 @@
// #endif
if (!this.nowPageInterval) {
this.nowPageInterval = setInterval(() => {
-
+ console.log('this.$msgSocket: ',this.$msgSocket);
this.msgSocket = this.$msgSocket
}, 3000);
}
diff --git a/manifest.json b/manifest.json
index f240a96..e0a27ec 100644
--- a/manifest.json
+++ b/manifest.json
@@ -21,7 +21,8 @@
"Maps" : {},
"Geolocation" : {},
"Camera" : {},
- "Barcode" : {}
+ "Barcode" : {},
+ "Push" : {}
},
/* 应用发布信息 */
"distribute" : {
@@ -69,6 +70,12 @@
"appkey_ios" : "10fbc0a1e5490c06278eff3a10f0af50",
"appkey_android" : "10fbc0a1e5490c06278eff3a10f0af50"
}
+ },
+ "push" : {
+ "unipush" : {
+ "version" : "2",
+ "offline" : false
+ }
}
},
"icons" : {
@@ -189,6 +196,9 @@
},
"vueVersion" : "2",
"h5" : {
+ "devServer" : {
+ "port" : 8081
+ },
"sdkConfigs" : {
"maps" : {
"qqmap" : {
diff --git a/pages/details/details.vue b/pages/details/details.vue
index 87a606a..fec447d 100644
--- a/pages/details/details.vue
+++ b/pages/details/details.vue
@@ -50,7 +50,7 @@
-
+
diff --git a/pages/move/move.vue b/pages/move/move.vue
index 1587a1e..22b4540 100644
--- a/pages/move/move.vue
+++ b/pages/move/move.vue
@@ -81,7 +81,7 @@
定位
-
+
拨打电话
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 704a2b2..d5e8bcc 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -35,9 +35,9 @@
-
+
-
+
添加车辆，查看更多救援信息
去还车
@@ -49,26 +49,26 @@
-
+
待支付
-
+
待取车
-
+
救援中
-
+
已完成
@@ -80,7 +80,7 @@
-
+
评价管理
@@ -91,7 +91,7 @@
-
+
车辆管理
@@ -102,7 +102,7 @@
-
+
扣车管理
@@ -113,7 +113,7 @@
-
+
数据统计
@@ -124,7 +124,7 @@
-
+
退出登录
diff --git a/pages/rescue/rescue.vue b/pages/rescue/rescue.vue
index f57575d..1f6bb27 100644
--- a/pages/rescue/rescue.vue
+++ b/pages/rescue/rescue.vue
@@ -207,9 +207,8 @@
-
-
+
+
车辆提醒
@@ -763,7 +762,7 @@
}
.boxf1 {
- height: 84px;
+ height: 140rpx;
overflow: hidden;
box-sizing: border-box;
border-radius: 6px;
@@ -777,7 +776,7 @@
}
.boxf2 {
- height: 84px;
+ height: 140rpx;
overflow: hidden;
box-sizing: border-box;
border-radius: 6px;
@@ -791,7 +790,7 @@
}
.boxf3 {
- height: 84px;
+ height: 140rpx;
overflow: hidden;
box-sizing: border-box;
border-radius: 6px;
diff --git a/static/move/204首页-线性@2x.png b/static/move/204首页-线性@2x.png
deleted file mode 100644
index d8f38e1..0000000
Binary files a/static/move/204首页-线性@2x.png and /dev/null differ
diff --git a/static/move/编组 7@2x.png b/static/move/bz72x.png
similarity index 100%
rename from static/move/编组 7@2x.png
rename to static/move/bz72x.png
diff --git a/static/move/个人@2x.png b/static/move/个人@2x.png
deleted file mode 100644
index 9048088..0000000
Binary files a/static/move/个人@2x.png and /dev/null differ
diff --git a/static/move/矩形@2x(1).png b/static/move/矩形@2x(1).png
deleted file mode 100644
index 32d592d..0000000
Binary files a/static/move/矩形@2x(1).png and /dev/null differ
diff --git a/static/move/矩形@2x.png b/static/move/矩形@2x.png
deleted file mode 100644
index d8b8f4b..0000000
Binary files a/static/move/矩形@2x.png and /dev/null differ
diff --git a/static/move/运力管理@2x.png b/static/move/运力管理@2x.png
deleted file mode 100644
index afc5e37..0000000
Binary files a/static/move/运力管理@2x.png and /dev/null differ
diff --git a/static/my/01运输中、物流-线性@2x.png b/static/my/01运输中、物流-线性@2x.png
deleted file mode 100644
index d136717..0000000
Binary files a/static/my/01运输中、物流-线性@2x.png and /dev/null differ
diff --git a/static/my/204首页-线性@2x.png b/static/my/204首页-线性@2x.png
deleted file mode 100644
index d8f38e1..0000000
Binary files a/static/my/204首页-线性@2x.png and /dev/null differ
diff --git a/static/my/303正确、完成-线性圆框@2x.png b/static/my/303zqwc-xxyk@2x.png
similarity index 100%
rename from static/my/303正确、完成-线性圆框@2x.png
rename to static/my/303zqwc-xxyk@2x.png
diff --git a/static/my/4出场车辆@2x.png b/static/my/4cccl@2x.png
similarity index 100%
rename from static/my/4出场车辆@2x.png
rename to static/my/4cccl@2x.png
diff --git a/static/my/编组 17@2x.png b/static/my/bz17@2x.png
similarity index 100%
rename from static/my/编组 17@2x.png
rename to static/my/bz17@2x.png
diff --git a/static/my/编组 18@2x.png b/static/my/bz18@2x.png
similarity index 100%
rename from static/my/编组 18@2x.png
rename to static/my/bz18@2x.png
diff --git a/static/my/编组 19@2x.png b/static/my/bz19@2x.png
similarity index 100%
rename from static/my/编组 19@2x.png
rename to static/my/bz19@2x.png
diff --git a/static/my/编组 20@2x.png b/static/my/bz20@2x.png
similarity index 100%
rename from static/my/编组 20@2x.png
rename to static/my/bz20@2x.png
diff --git a/static/my/编组 21@2x.png b/static/my/bz21@2x.png
similarity index 100%
rename from static/my/编组 21@2x.png
rename to static/my/bz21@2x.png
diff --git a/static/my/待支付payment@2x.png b/static/my/dzfpayment@2x.png
similarity index 100%
rename from static/my/待支付payment@2x.png
rename to static/my/dzfpayment@2x.png
diff --git a/static/my/救援力量@2x.png b/static/my/jyll@2x.png
similarity index 100%
rename from static/my/救援力量@2x.png
rename to static/my/jyll@2x.png
diff --git a/static/my/位图@2x.png b/static/my/wt@2x.png
similarity index 100%
rename from static/my/位图@2x.png
rename to static/my/wt@2x.png
diff --git a/static/my/一键还车@2x.png b/static/my/yjhc2x.png
similarity index 100%
rename from static/my/一键还车@2x.png
rename to static/my/yjhc2x.png
diff --git a/static/my/编组 22@2x.png b/static/my/编组 22@2x.png
deleted file mode 100644
index 33e19f5..0000000
Binary files a/static/my/编组 22@2x.png and /dev/null differ