diff --git a/pages/bd/bddetail.vue b/pages/bd/bddetail.vue
index 1dc0806..d278d4f 100644
--- a/pages/bd/bddetail.vue
+++ b/pages/bd/bddetail.vue
@@ -220,8 +220,7 @@
@@ -273,12 +272,12 @@
statusList: [
{
value: 1,
- text: "通过",
+ text: "通过/Approve",
textEn: "Approve"
},
{
value: 2,
- text: "驳回",
+ text: "驳回/Reject",
textEn: "Reject"
},
],
@@ -425,7 +424,8 @@
.label-with-en-inline {
display: flex;
flex-direction: column;
- align-items: flex-start;
+ align-items: flex-start;
+ margin-right: 15rpx;
}
.en-text {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 30b7aaf..b692be4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -6,14 +6,14 @@
- 选择入口
- Select the entrance
+ 访客系统
+ Visitor System
- 迈柯唯访客
+ 访客
Visitor
@@ -26,34 +26,34 @@
学习培训
- Learning and training
+ Learning and Training
普通访客
- Ordinary visitor
+ General Visitor
物流司机
- Logistics driver
+ Logistics Driver
施工人员
- Construction worker
+ Construction Worker
- 迈柯唯员工
+ 员工
Employee
@@ -63,14 +63,17 @@
- 迈柯唯员工
- Employee
+ 员工登录
+ Employee Login
>
+
@@ -343,4 +346,10 @@
.sgry view {
margin-top: 40rpx
}
+ .footer-text{
+ font-size: 24rpx;
+ color: #999999;
+ text-align: center;
+ margin-top: 40rpx;
+ }
diff --git a/pages/visit/addrecord.vue b/pages/visit/addrecord.vue
index 8a4e859..faf9077 100644
--- a/pages/visit/addrecord.vue
+++ b/pages/visit/addrecord.vue
@@ -828,11 +828,11 @@
return
}
if (this.visitAreaText == "生产区") {
- this.configKey = 'cjfk'
+ this.configKey = 'ptfk'
this.getConfig()
this.areaShow = false
} else if (this.visitAreaText == "研发R&D") {
- this.configKey = 'yffk'
+ this.configKey = 'ptfk'
this.getConfig()
this.areaShow = false
} else {
@@ -869,25 +869,25 @@
getVisitArea() {
let that = this
- that.visitArea = [{
- name: '非生产区',
- id: 3
- }, {
- name: '生产区',
- id: 4
- }, {
- name: "研发R&D",
- id: 5
- }]
- // this.util.request({
- // api: '/api/mobile/visit/visit-area',
- // data: {},
- // utilSuccess: function(res) {
- // console.log(res)
- // that.visitArea = res
- // },
- // utilFail: function(res) {}
- // })
+ // that.visitArea = [{
+ // name: '非生产区',
+ // id: 3
+ // }, {
+ // name: '生产区',
+ // id: 4
+ // }, {
+ // name: "研发R&D",
+ // id: 5
+ // }]
+ this.util.request({
+ api: '/api/mobile/visit/visit-area',
+ data: {},
+ utilSuccess: function(res) {
+ console.log(res)
+ that.visitArea = res
+ },
+ utilFail: function(res) {}
+ })
},
changeVisitArea(e) {
console.log(e)
diff --git a/pages/visit/successform.vue b/pages/visit/successform.vue
index 5931393..af0173d 100644
--- a/pages/visit/successform.vue
+++ b/pages/visit/successform.vue
@@ -91,7 +91,7 @@
display: flex;
flex-direction: column;
align-items: center;
- margin-bottom: 40rpx;
+ /* margin-bottom: 40rpx; */
font-size: 32rpx;
color: #666;
}
@@ -112,6 +112,6 @@
.history-btn .en-text {
font-size: 22rpx;
opacity: 0.9;
- margin-top: 4rpx;
+ /* margin-top: 4rpx; */
}