diff --git a/common/style/layout.styl b/common/style/layout.styl
index bed274b..17722b8 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -529,7 +529,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
top -10%
left -10%
z-index 301
- transform scale(0)
+ // transform scale(0)
.pop_point_content
position relative
margin-top 40rpx
@@ -538,7 +538,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
border-radius 10rpx
&::after
position absolute
- top -40rpx
+ top -36rpx
left calc(50% - 20rpx)
content ''
width: 0;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index db0377e..f4d4df9 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -67,9 +67,9 @@
})
},
async toLogin() {
- // uni.redirectTo({
- // url: '/pages/home/home'
- // })
+ uni.redirectTo({
+ url: '/pages/home/home'
+ })
this.disabled = true
if (this.user === '') {
uni.showToast({
diff --git a/pages/login/setup.vue b/pages/login/setup.vue
index f48c4ab..0fbfbf3 100644
--- a/pages/login/setup.vue
+++ b/pages/login/setup.vue
@@ -11,10 +11,10 @@
ACS地址
-->
-
+
@@ -58,13 +58,13 @@
// })
// return
// }
- if (this.setTime === '') {
- uni.showToast({
- title: '请填写刷新时间',
- icon: 'none'
- })
- return
- }
+ // if (this.setTime === '') {
+ // uni.showToast({
+ // title: '请填写刷新时间',
+ // icon: 'none'
+ // })
+ // return
+ // }
// 存值
this.$store.dispatch('setConfig',{baseUrl: this.addrip, acsUrl: this.acsip, printUrl: this.printip,setTime: this.setTime * 1000})
uni.redirectTo({
diff --git a/pages/manage/agv-call-manage.vue b/pages/manage/agv-call-manage.vue
index bb4de12..b2884c2 100644
--- a/pages/manage/agv-call-manage.vue
+++ b/pages/manage/agv-call-manage.vue
@@ -3,17 +3,26 @@
-
+
+
+ 查找点位
+
+
+
+
+
+
+
任务起点1
{{sCode1}}
-
+
任务终点1
{{nCode1}}
-
+
任务起点2
{{sCode2}}
@@ -47,7 +56,7 @@
-
+
@@ -68,8 +77,8 @@