diff --git a/pages.json b/pages.json index d86948f..cfad06e 100644 --- a/pages.json +++ b/pages.json @@ -14,24 +14,43 @@ "backgroundColor": "#fff" } }, + // bd用户 { "path": "pages/bd/mine" }, + // bd用户列表 { "path": "pages/bd/record" }, + // bd访问详情 { - "path": "pages/visit/detail" + "path": "pages/bd/bddetail" }, + // 访问新增 { "path": "pages/visit/addrecord" }, + // 学习 { "path": "pages/visit/study" }, + // 测试并提交 { "path": "pages/visit/testStudy" - } + }, + // 提交后页面 + { + "path": "pages/visit/successform" + }, + // 访客 历史拜访记录 + { + "path": "pages/visit/visithistory" + }, + // 访客 详情 + { + "path": "pages/visit/detail" + } + ], "globalStyle": { "navigationBarTextStyle": "#FFFFFF", diff --git a/pages/bd/bddetail.vue b/pages/bd/bddetail.vue new file mode 100644 index 0000000..fd462ce --- /dev/null +++ b/pages/bd/bddetail.vue @@ -0,0 +1,174 @@ + + + + + diff --git a/pages/bd/mine.vue b/pages/bd/mine.vue index 10a8c76..f893ce3 100644 --- a/pages/bd/mine.vue +++ b/pages/bd/mine.vue @@ -48,24 +48,28 @@ - 被访人:{{item.accept_admin_id}} - 部门:生产 - 访问区域:{{item.visit_area_id}} + 被访人:{{item.accept_admin.name}} + 部门:{{item.accept_admin.department.name}} + 访问区域:{{item.visit_area.name}} - 拜访人:{{item.name}} + 拜访人:{{item.name}} 电话:{{item.mobile}} - 事由:{{item.reason}} + 事由:{{item.reason}} 车牌:{{item.plate}} - + 长期访客申请:{{item.long_time==0?'否':'是'}} 长期访问时间:{{item.start_date}} 至 {{item.end_date}} + + + + @@ -106,10 +110,11 @@ select: { page: 1, page_size: 5, - total: 0, - audit_status:0, - keyword:"" - } + total: 0, + audit_status: 0, + keyword: "" + }, + isEmpty: false } }, onLoad() { @@ -145,7 +150,7 @@ }, toDetail(id) { uni.navigateTo({ - url: '/pages/visit/detail?id=' + id + url: '/pages/bd/bddetail?id=' + id }) }, getBdInfo() { @@ -153,6 +158,7 @@ this.util.request({ api: '/api/admin/auth/me', method: "POST", + requestType: 'bd', utilSuccess: function(res) { console.log(res) that.userName = res.name @@ -178,13 +184,17 @@ this.util.request({ api: '/api/admin/visit/index', method: "get", + requestType: 'bd', data: { page: this.select.page, - page_size: this.select.page_size, - audit_status:this.select.audit_status, - keyword:this.select.keyword + page_size: this.select.page_size, + audit_status: this.select.audit_status, + keyword: this.select.keyword }, utilSuccess: function(res) { + if (res.total == 0) { + that.isEmpty = true + } if (that.select.page == 1) { that.list = res.data } else { @@ -202,10 +212,10 @@ } }) }, - searchList(val) { - this.select.keyword = val - this.select.page = 1 - this.loadList() + searchList(val) { + this.select.keyword = val + this.select.page = 1 + this.loadList() }, // scrolltolower(){}, @@ -272,4 +282,8 @@ text-align: center; margin-top: 15rpx } + + /deep/ .u-empty { + min-height: 30vh; + } diff --git a/pages/bd/record.vue b/pages/bd/record.vue index 9c717ab..38d1496 100644 --- a/pages/bd/record.vue +++ b/pages/bd/record.vue @@ -1,7 +1,7 @@ + + + + diff --git a/static/img/success.png b/static/img/success.png new file mode 100644 index 0000000..e839c05 Binary files /dev/null and b/static/img/success.png differ diff --git a/utils/util.js b/utils/util.js index fe80af8..08ec418 100755 --- a/utils/util.js +++ b/utils/util.js @@ -58,7 +58,14 @@ const getOpenidInfo = (cb, refresh) => { uni.request({ url: url, method: 'GET', - success: result => { + success: result => { + // if(result.errmsg){ + // uni.showToast({ + // title:result.errmsg, + // duration:2000 + // }) + // return + // } let user_info = result.data uni.setStorageSync(user_info_key, user_info) cb(user_info) @@ -166,10 +173,14 @@ const request = options => { }; // 如果已登录,请求中拼openId var access_token = uni.getStorageSync(user_info_key).token; - var access_token_bd = uni.getStorageSync(userInfo_BD_token).token; + var access_bd_token = uni.getStorageSync(userInfo_BD_token).token; - var request_token = access_token_bd?access_token_bd:access_token - console.log(request_token) + var request_token = access_token + if(options.requestType=='bd'){ + request_token = access_bd_token + } + // var request_token = access_bd_token?access_bd_token:access_token + // console.log(request_token) if (isLogin()) { options.data = { ...options.data,