diff --git a/weapp/images/landmark.svg b/weapp/images/landmark.svg
new file mode 100644
index 0000000..8a53d58
--- /dev/null
+++ b/weapp/images/landmark.svg
@@ -0,0 +1,3 @@
+
diff --git a/weapp/package/inspectionInput/inspectionInput.js b/weapp/package/inspectionInput/inspectionInput.js
index 717aaab..149cbed 100644
--- a/weapp/package/inspectionInput/inspectionInput.js
+++ b/weapp/package/inspectionInput/inspectionInput.js
@@ -141,7 +141,7 @@ Page({
},
handleChangeTwo (e) {
- const isNormal = e.detail.value === 'normal';
+ const isNormal = e.detail === 'normal';
const inspectContent = this.data.inspectContent;
inspectContent[e.currentTarget.dataset.item].isNormal = isNormal;
if (isNormal) { // 清除异常数据
@@ -156,7 +156,7 @@ Page({
handleChangeThree (e) {
const inspectContent = this.data.inspectContent;
- inspectContent[e.currentTarget.dataset.item].level = e.detail.value;
+ inspectContent[e.currentTarget.dataset.item].level = e.detail;
this.setData({
inspectContent
})
diff --git a/weapp/package/inspectionInput/inspectionInput.json b/weapp/package/inspectionInput/inspectionInput.json
index 90c8459..e4ba6c1 100644
--- a/weapp/package/inspectionInput/inspectionInput.json
+++ b/weapp/package/inspectionInput/inspectionInput.json
@@ -8,6 +8,11 @@
"t-cell-group": "tdesign-miniprogram/cell-group/cell-group",
"t-cell": "tdesign-miniprogram/cell/cell",
"t-picker": "tdesign-miniprogram/picker/picker",
- "t-picker-item": "tdesign-miniprogram/picker-item/picker-item"
+ "t-picker-item": "tdesign-miniprogram/picker-item/picker-item",
+ "van-cell": "@vant/weapp/cell/index",
+ "van-cell-group": "@vant/weapp/cell-group/index",
+ "van-icon": "@vant/weapp/icon/index",
+ "van-radio": "@vant/weapp/radio/index",
+ "van-radio-group": "@vant/weapp/radio-group/index"
}
}
\ No newline at end of file
diff --git a/weapp/package/inspectionInput/inspectionInput.wxml b/weapp/package/inspectionInput/inspectionInput.wxml
index 7c718d1..abe4bd7 100644
--- a/weapp/package/inspectionInput/inspectionInput.wxml
+++ b/weapp/package/inspectionInput/inspectionInput.wxml
@@ -8,29 +8,37 @@
当前点位:
- {{itemData.name}}
+ {{itemData.name}}
+
当前位置:
-
+
{{address}}
-
- 点击获取当前位置
+
+
+
+ 点击获取
+
+
- {{item.name}}:
-
- 正常
- 异常
-
-
-
- 轻微
- 中度
- 严重
-
+
+ {{item.name}}:
+
+ 正常
+ 异常
+
+
+
+
+ 轻微
+ 中度
+ 严重
+
+
@@ -44,6 +52,7 @@
+
取消
diff --git a/weapp/package/inspectionInput/inspectionInput.wxss b/weapp/package/inspectionInput/inspectionInput.wxss
index caa3b62..6759f3e 100644
--- a/weapp/package/inspectionInput/inspectionInput.wxss
+++ b/weapp/package/inspectionInput/inspectionInput.wxss
@@ -1,4 +1,20 @@
/* package/inspectionInput/inspectionInput.wxss */
+.divider {
+ width: 100%;
+ height: 0px;
+ border-top: 1px solid #F5F5F5;
+}
+
+.flex-between {
+ display: flex;
+ justify-content: space-between;
+}
+
+.flex-end {
+ display: flex;
+ justify-content: flex-end;
+}
+
.popBox {
position: absolute;
left: 50%;
@@ -14,31 +30,37 @@
}
.btnBox {
- padding: 30rpx;
+ padding: 50px 30rpx;
overflow: hidden;
font-size: 30rpx;
+ display: flex;
+ justify-content: space-between;
}
.cancel {
- width: 180rpx;
- float: left;
+ width: 38vw;
+ height: 42px;
+ line-height: 42px;
text-align: center;
background: #fff;
- border: 2rpx solid #1979ff;
- border-radius: 10rpx;
- padding: 12rpx 0;
- color: #1979ff;
+ border: 1px solid #006BE3;
+ border-radius: 24px;
+ font-weight: 600;
+ font-size: 16px;
+ color: #1684FF;
}
.submit {
- width: 180rpx;
- float: right;
+ width: 38vw;
+ height: 42px;
+ line-height: 42px;
text-align: center;
- border-radius: 10rpx;
- padding: 12rpx 0;
- background: #1979ff;
- color: #fff;
- border: 2rpx solid #1979ff;
+ background: #1684FF;
+ border: 1px solid #006BE3;
+ border-radius: 24px;
+ font-weight: 600;
+ font-size: 16px;
+ color: #FFFFFF;
}
.pic {
@@ -60,10 +82,33 @@
}
.upload {
- width: 160rpx;
- height: 160rpx;
+ width: 63px;
+ height: 63px;
}
.block {
display: block;
+}
+
+.icon {
+ width: 18px;
+ height: 18px;
+ margin-right: 5px;
+}
+
+.radio-text {
+ font-size: 14px;
+ color: #323233;
+}
+
+.van-radio-group {
+ display: flex;
+}
+
+.textarea {
+ width: 84%;
+ margin: 0 auto;
+ padding: 20rpx;
+ height: 120rpx;
+ border: 1px solid #61616166;
}
\ No newline at end of file