diff --git a/components/bottom-button/index.vue b/components/bottom-button/index.vue
index 686489b..d1fec06 100644
--- a/components/bottom-button/index.vue
+++ b/components/bottom-button/index.vue
@@ -1,74 +1,80 @@
-
+
{{ cancelText }}
-
- 确认
+
+ {{type=='view'?'下一步':'下一步'}}
+ .view-btn {
+ margin-left: 0;
+ padding: 8rpx 0rpx 8rpx 0rpx;
+
+ uni-text {
+ position: relative;
+ left: auto;
+ }
+ }
+
+ .view-btn::before {
+ width: 0%;
+ left: -10rpx;
+ transform: skew(0deg);
+ background-color: #2663BF;
+ }
+
\ No newline at end of file
diff --git a/components/bottom-button/three.vue b/components/bottom-button/three.vue
index cb07693..8a3133a 100644
--- a/components/bottom-button/three.vue
+++ b/components/bottom-button/three.vue
@@ -1,73 +1,88 @@
-
+
{{ firstText }}
-
+
{{ secondText }}
-
- {{ thirdText }}
+
+ {{isSubmit?(type=='view'?'关闭':thirdText):nextText}}
+
\ No newline at end of file
diff --git a/pages/investigation/index.vue b/pages/investigation/index.vue
index 5e1b59e..ceacc3c 100644
--- a/pages/investigation/index.vue
+++ b/pages/investigation/index.vue
@@ -190,10 +190,14 @@
})
},
handleClick(row) {
- console.log(row)
+ // console.log(row)
if (this.tab === 1) {
- this.$.open('/pages/map/index?businessId=' + row.businessId)
+ this.$.open('/pages/map/index?businessId=' + row.businessId + '&type=' + (this.tab == 1 ? 'edit' : 'view'))
+ // this.$.open('/pages/map/index?businessId=' + row.businessId)
+ }else{
+ this.$.open('/pages/investigation/task?id=' + row.businessId + '&type=' + (this.tab == 1 ? 'edit' : 'view'))
}
+
},
// 跳转页面
skipPage(even) {
diff --git a/pages/investigation/task.vue b/pages/investigation/task.vue
index 75bcfb0..4fb21cd 100644
--- a/pages/investigation/task.vue
+++ b/pages/investigation/task.vue
@@ -342,13 +342,13 @@
-
-
-
- 智能排查
- 人工排查
+ 智能排查
+ 人工排查
+ 查看排查详情
根据当前定位信息,您要排查的是这条路吗?
{{ rname }}
- 更换
- 智能排查
- 人工排查
+ 更换
+ 智能排查
+ 人工排查
+ 查看排查详情
@@ -202,12 +204,14 @@ export default {
name3: "",
name4: "",
show: false,
+ type:''
};
},
onLoad(options) {
console.log(options);
// this.businessId = "RX202310210238";
this.businessId = options.businessId;
+ this.type = options.type;
this.pageHeight = uni.getSystemInfoSync().windowHeight;
this.pageType = 1;
@@ -743,6 +747,14 @@ export default {
background-size: 100% 100%;
background-repeat: no-repeat;
}
+ .btn8 {
+ width: 100%;
+ /* background: url(../../static/map/rr.png);
+ background-size: 100% 100%;
+ background-repeat: no-repeat; */
+ background-color: rgb(53, 103, 193);
+ border-radius:9px;
+ }
}
}
.dialog-one {