diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 99f9c39..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# gdt - -#### Description -广东台小程序 - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 99f9c39..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# gdt - -#### Description -广东台小程序 - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md index 7897a05..b8301ae 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,14 @@ # gdt #### 介绍 -广东台小程序 +安防平台小程序 #### 软件架构 -软件架构说明 +uniapp、uvew2.0、vue2 + +#### 工具 +HBuilder、微信开发者工具 -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 99f9c39..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# gdt - -#### Description -广东台小程序 - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md index 7897a05..b8301ae 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,14 @@ # gdt #### 介绍 -广东台小程序 +安防平台小程序 #### 软件架构 -软件架构说明 +uniapp、uvew2.0、vue2 + +#### 工具 +HBuilder、微信开发者工具 -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/components/base/getphonePopup.vue b/components/base/getphonePopup.vue index b58d483..ef92e06 100644 --- a/components/base/getphonePopup.vue +++ b/components/base/getphonePopup.vue @@ -3,7 +3,7 @@ diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 99f9c39..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# gdt - -#### Description -广东台小程序 - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md index 7897a05..b8301ae 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,14 @@ # gdt #### 介绍 -广东台小程序 +安防平台小程序 #### 软件架构 -软件架构说明 +uniapp、uvew2.0、vue2 + +#### 工具 +HBuilder、微信开发者工具 -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/components/base/getphonePopup.vue b/components/base/getphonePopup.vue index b58d483..ef92e06 100644 --- a/components/base/getphonePopup.vue +++ b/components/base/getphonePopup.vue @@ -3,7 +3,7 @@ diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 89e61e6..4eebf06 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -26,7 +26,10 @@ :key="item.id" v-if="isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true"> {{item.name}} - {{item.value}} + {{item.value}} @@ -73,6 +76,11 @@ value: '' }, { + id: 'visitorApplyStatus', + name: '申请状态', + value: '' + }, + { id: 'staffCode', name: '申请者工号', value: '' @@ -186,7 +194,11 @@ this.list.forEach(item => { for(let key in res) { if(item.id === key) { - item.value = res[key]; + if(key === 'visitorApplyStatus') { + item.value = res[key] === '1' ? '申请已提交' : res[key] === '2' ? '申请已通过' : '申请未通过'; + } else { + item.value = res[key]; + } } else if(item.id === 'time') { item.value = res.inTime + ' ~ ' + res.outTime; } @@ -253,6 +265,15 @@ margin-right: 60rpx; font-weight: 600; } + .green { + color: #2ebf00; + } + .blue { + color: #1076e3; + } + .red { + color: #f02a0a; + } } .button-area-manager { display: flex; diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 99f9c39..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# gdt - -#### Description -广东台小程序 - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md index 7897a05..b8301ae 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,14 @@ # gdt #### 介绍 -广东台小程序 +安防平台小程序 #### 软件架构 -软件架构说明 +uniapp、uvew2.0、vue2 + +#### 工具 +HBuilder、微信开发者工具 -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/components/base/getphonePopup.vue b/components/base/getphonePopup.vue index b58d483..ef92e06 100644 --- a/components/base/getphonePopup.vue +++ b/components/base/getphonePopup.vue @@ -3,7 +3,7 @@ diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 89e61e6..4eebf06 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -26,7 +26,10 @@ :key="item.id" v-if="isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true"> {{item.name}} - {{item.value}} + {{item.value}} @@ -73,6 +76,11 @@ value: '' }, { + id: 'visitorApplyStatus', + name: '申请状态', + value: '' + }, + { id: 'staffCode', name: '申请者工号', value: '' @@ -186,7 +194,11 @@ this.list.forEach(item => { for(let key in res) { if(item.id === key) { - item.value = res[key]; + if(key === 'visitorApplyStatus') { + item.value = res[key] === '1' ? '申请已提交' : res[key] === '2' ? '申请已通过' : '申请未通过'; + } else { + item.value = res[key]; + } } else if(item.id === 'time') { item.value = res.inTime + ' ~ ' + res.outTime; } @@ -253,6 +265,15 @@ margin-right: 60rpx; font-weight: 600; } + .green { + color: #2ebf00; + } + .blue { + color: #1076e3; + } + .red { + color: #f02a0a; + } } .button-area-manager { display: flex; diff --git a/pages/index/index.vue b/pages/index/index.vue index a5b3d3d..c15f990 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -59,7 +59,6 @@ methods: { // ...mapMutations(['setNavRect']) async handleClick(id) { - // subscription(); this.active = id; const sessionId = uni.getStorageSync("sessionId"); @@ -67,12 +66,19 @@ if (!sessionId) { await getLogin(); } - if (this.phone) { - this.checkphone(); - } else { - //弹获取手机号 - this.popShow = true; - } + if(id === 'submit') { + if (this.phone) { + this.checkphone(); + } else { + //弹获取手机号 + this.popShow = true; + } + } else { + uni.showToast({ + title: '敬请期待', + icon: 'none' + }); + } }, //通过手机号检查是否存在这个用户 async checkphone() { @@ -109,20 +115,27 @@ @@ -130,7 +143,7 @@ .index { .u-popup__content { padding: 30rpx 40rpx; - padding-bottom: 0; + // padding-bottom: 0; } } diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 99f9c39..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# gdt - -#### Description -广东台小程序 - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md index 7897a05..b8301ae 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,14 @@ # gdt #### 介绍 -广东台小程序 +安防平台小程序 #### 软件架构 -软件架构说明 +uniapp、uvew2.0、vue2 + +#### 工具 +HBuilder、微信开发者工具 -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/components/base/getphonePopup.vue b/components/base/getphonePopup.vue index b58d483..ef92e06 100644 --- a/components/base/getphonePopup.vue +++ b/components/base/getphonePopup.vue @@ -3,7 +3,7 @@ diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 89e61e6..4eebf06 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -26,7 +26,10 @@ :key="item.id" v-if="isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true"> {{item.name}} - {{item.value}} + {{item.value}} @@ -73,6 +76,11 @@ value: '' }, { + id: 'visitorApplyStatus', + name: '申请状态', + value: '' + }, + { id: 'staffCode', name: '申请者工号', value: '' @@ -186,7 +194,11 @@ this.list.forEach(item => { for(let key in res) { if(item.id === key) { - item.value = res[key]; + if(key === 'visitorApplyStatus') { + item.value = res[key] === '1' ? '申请已提交' : res[key] === '2' ? '申请已通过' : '申请未通过'; + } else { + item.value = res[key]; + } } else if(item.id === 'time') { item.value = res.inTime + ' ~ ' + res.outTime; } @@ -253,6 +265,15 @@ margin-right: 60rpx; font-weight: 600; } + .green { + color: #2ebf00; + } + .blue { + color: #1076e3; + } + .red { + color: #f02a0a; + } } .button-area-manager { display: flex; diff --git a/pages/index/index.vue b/pages/index/index.vue index a5b3d3d..c15f990 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -59,7 +59,6 @@ methods: { // ...mapMutations(['setNavRect']) async handleClick(id) { - // subscription(); this.active = id; const sessionId = uni.getStorageSync("sessionId"); @@ -67,12 +66,19 @@ if (!sessionId) { await getLogin(); } - if (this.phone) { - this.checkphone(); - } else { - //弹获取手机号 - this.popShow = true; - } + if(id === 'submit') { + if (this.phone) { + this.checkphone(); + } else { + //弹获取手机号 + this.popShow = true; + } + } else { + uni.showToast({ + title: '敬请期待', + icon: 'none' + }); + } }, //通过手机号检查是否存在这个用户 async checkphone() { @@ -109,20 +115,27 @@ @@ -130,7 +143,7 @@ .index { .u-popup__content { padding: 30rpx 40rpx; - padding-bottom: 0; + // padding-bottom: 0; } } diff --git a/pages/list/list.vue b/pages/list/list.vue index 3633fe1..342ad9b 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -53,7 +53,7 @@ diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 99f9c39..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# gdt - -#### Description -广东台小程序 - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md index 7897a05..b8301ae 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,14 @@ # gdt #### 介绍 -广东台小程序 +安防平台小程序 #### 软件架构 -软件架构说明 +uniapp、uvew2.0、vue2 + +#### 工具 +HBuilder、微信开发者工具 -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/components/base/getphonePopup.vue b/components/base/getphonePopup.vue index b58d483..ef92e06 100644 --- a/components/base/getphonePopup.vue +++ b/components/base/getphonePopup.vue @@ -3,7 +3,7 @@ diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 89e61e6..4eebf06 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -26,7 +26,10 @@ :key="item.id" v-if="isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true"> {{item.name}} - {{item.value}} + {{item.value}} @@ -73,6 +76,11 @@ value: '' }, { + id: 'visitorApplyStatus', + name: '申请状态', + value: '' + }, + { id: 'staffCode', name: '申请者工号', value: '' @@ -186,7 +194,11 @@ this.list.forEach(item => { for(let key in res) { if(item.id === key) { - item.value = res[key]; + if(key === 'visitorApplyStatus') { + item.value = res[key] === '1' ? '申请已提交' : res[key] === '2' ? '申请已通过' : '申请未通过'; + } else { + item.value = res[key]; + } } else if(item.id === 'time') { item.value = res.inTime + ' ~ ' + res.outTime; } @@ -253,6 +265,15 @@ margin-right: 60rpx; font-weight: 600; } + .green { + color: #2ebf00; + } + .blue { + color: #1076e3; + } + .red { + color: #f02a0a; + } } .button-area-manager { display: flex; diff --git a/pages/index/index.vue b/pages/index/index.vue index a5b3d3d..c15f990 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -59,7 +59,6 @@ methods: { // ...mapMutations(['setNavRect']) async handleClick(id) { - // subscription(); this.active = id; const sessionId = uni.getStorageSync("sessionId"); @@ -67,12 +66,19 @@ if (!sessionId) { await getLogin(); } - if (this.phone) { - this.checkphone(); - } else { - //弹获取手机号 - this.popShow = true; - } + if(id === 'submit') { + if (this.phone) { + this.checkphone(); + } else { + //弹获取手机号 + this.popShow = true; + } + } else { + uni.showToast({ + title: '敬请期待', + icon: 'none' + }); + } }, //通过手机号检查是否存在这个用户 async checkphone() { @@ -109,20 +115,27 @@ @@ -130,7 +143,7 @@ .index { .u-popup__content { padding: 30rpx 40rpx; - padding-bottom: 0; + // padding-bottom: 0; } } diff --git a/pages/list/list.vue b/pages/list/list.vue index 3633fe1..342ad9b 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -53,7 +53,7 @@ diff --git a/pages/register/register.vue b/pages/register/register.vue index ff70b2a..7e5f96b 100644 --- a/pages/register/register.vue +++ b/pages/register/register.vue @@ -72,7 +72,7 @@ diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 99f9c39..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# gdt - -#### Description -广东台小程序 - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md index 7897a05..b8301ae 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,14 @@ # gdt #### 介绍 -广东台小程序 +安防平台小程序 #### 软件架构 -软件架构说明 +uniapp、uvew2.0、vue2 + +#### 工具 +HBuilder、微信开发者工具 -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/components/base/getphonePopup.vue b/components/base/getphonePopup.vue index b58d483..ef92e06 100644 --- a/components/base/getphonePopup.vue +++ b/components/base/getphonePopup.vue @@ -3,7 +3,7 @@ diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 89e61e6..4eebf06 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -26,7 +26,10 @@ :key="item.id" v-if="isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true"> {{item.name}} - {{item.value}} + {{item.value}} @@ -73,6 +76,11 @@ value: '' }, { + id: 'visitorApplyStatus', + name: '申请状态', + value: '' + }, + { id: 'staffCode', name: '申请者工号', value: '' @@ -186,7 +194,11 @@ this.list.forEach(item => { for(let key in res) { if(item.id === key) { - item.value = res[key]; + if(key === 'visitorApplyStatus') { + item.value = res[key] === '1' ? '申请已提交' : res[key] === '2' ? '申请已通过' : '申请未通过'; + } else { + item.value = res[key]; + } } else if(item.id === 'time') { item.value = res.inTime + ' ~ ' + res.outTime; } @@ -253,6 +265,15 @@ margin-right: 60rpx; font-weight: 600; } + .green { + color: #2ebf00; + } + .blue { + color: #1076e3; + } + .red { + color: #f02a0a; + } } .button-area-manager { display: flex; diff --git a/pages/index/index.vue b/pages/index/index.vue index a5b3d3d..c15f990 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -59,7 +59,6 @@ methods: { // ...mapMutations(['setNavRect']) async handleClick(id) { - // subscription(); this.active = id; const sessionId = uni.getStorageSync("sessionId"); @@ -67,12 +66,19 @@ if (!sessionId) { await getLogin(); } - if (this.phone) { - this.checkphone(); - } else { - //弹获取手机号 - this.popShow = true; - } + if(id === 'submit') { + if (this.phone) { + this.checkphone(); + } else { + //弹获取手机号 + this.popShow = true; + } + } else { + uni.showToast({ + title: '敬请期待', + icon: 'none' + }); + } }, //通过手机号检查是否存在这个用户 async checkphone() { @@ -109,20 +115,27 @@ @@ -130,7 +143,7 @@ .index { .u-popup__content { padding: 30rpx 40rpx; - padding-bottom: 0; + // padding-bottom: 0; } } diff --git a/pages/list/list.vue b/pages/list/list.vue index 3633fe1..342ad9b 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -53,7 +53,7 @@ diff --git a/pages/register/register.vue b/pages/register/register.vue index ff70b2a..7e5f96b 100644 --- a/pages/register/register.vue +++ b/pages/register/register.vue @@ -72,7 +72,7 @@ diff --git a/store/modules/tabBar.js b/store/modules/tabBar.js index 99cbf98..e9048f8 100644 --- a/store/modules/tabBar.js +++ b/store/modules/tabBar.js @@ -17,10 +17,18 @@ let type = temp; const state = { + type: 'user_applicant', list: tabBar[type] } +const mutations = { + changeType(state, payload) { + state.type = payload.type; + } +} + export default { namespaced: true, - state + state, + mutations } \ No newline at end of file diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 99f9c39..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# gdt - -#### Description -广东台小程序 - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md index 7897a05..b8301ae 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,14 @@ # gdt #### 介绍 -广东台小程序 +安防平台小程序 #### 软件架构 -软件架构说明 +uniapp、uvew2.0、vue2 + +#### 工具 +HBuilder、微信开发者工具 -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/components/base/getphonePopup.vue b/components/base/getphonePopup.vue index b58d483..ef92e06 100644 --- a/components/base/getphonePopup.vue +++ b/components/base/getphonePopup.vue @@ -3,7 +3,7 @@ diff --git a/pages/checkMessageDetail/checkMessageDetail.vue b/pages/checkMessageDetail/checkMessageDetail.vue index 89e61e6..4eebf06 100644 --- a/pages/checkMessageDetail/checkMessageDetail.vue +++ b/pages/checkMessageDetail/checkMessageDetail.vue @@ -26,7 +26,10 @@ :key="item.id" v-if="isManager ? true : item.id === 'staffPhone' || item.id === 'staffName' ? false : true"> {{item.name}} - {{item.value}} + {{item.value}} @@ -73,6 +76,11 @@ value: '' }, { + id: 'visitorApplyStatus', + name: '申请状态', + value: '' + }, + { id: 'staffCode', name: '申请者工号', value: '' @@ -186,7 +194,11 @@ this.list.forEach(item => { for(let key in res) { if(item.id === key) { - item.value = res[key]; + if(key === 'visitorApplyStatus') { + item.value = res[key] === '1' ? '申请已提交' : res[key] === '2' ? '申请已通过' : '申请未通过'; + } else { + item.value = res[key]; + } } else if(item.id === 'time') { item.value = res.inTime + ' ~ ' + res.outTime; } @@ -253,6 +265,15 @@ margin-right: 60rpx; font-weight: 600; } + .green { + color: #2ebf00; + } + .blue { + color: #1076e3; + } + .red { + color: #f02a0a; + } } .button-area-manager { display: flex; diff --git a/pages/index/index.vue b/pages/index/index.vue index a5b3d3d..c15f990 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -59,7 +59,6 @@ methods: { // ...mapMutations(['setNavRect']) async handleClick(id) { - // subscription(); this.active = id; const sessionId = uni.getStorageSync("sessionId"); @@ -67,12 +66,19 @@ if (!sessionId) { await getLogin(); } - if (this.phone) { - this.checkphone(); - } else { - //弹获取手机号 - this.popShow = true; - } + if(id === 'submit') { + if (this.phone) { + this.checkphone(); + } else { + //弹获取手机号 + this.popShow = true; + } + } else { + uni.showToast({ + title: '敬请期待', + icon: 'none' + }); + } }, //通过手机号检查是否存在这个用户 async checkphone() { @@ -109,20 +115,27 @@ @@ -130,7 +143,7 @@ .index { .u-popup__content { padding: 30rpx 40rpx; - padding-bottom: 0; + // padding-bottom: 0; } } diff --git a/pages/list/list.vue b/pages/list/list.vue index 3633fe1..342ad9b 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -53,7 +53,7 @@ diff --git a/pages/register/register.vue b/pages/register/register.vue index ff70b2a..7e5f96b 100644 --- a/pages/register/register.vue +++ b/pages/register/register.vue @@ -72,7 +72,7 @@ diff --git a/store/modules/tabBar.js b/store/modules/tabBar.js index 99cbf98..e9048f8 100644 --- a/store/modules/tabBar.js +++ b/store/modules/tabBar.js @@ -17,10 +17,18 @@ let type = temp; const state = { + type: 'user_applicant', list: tabBar[type] } +const mutations = { + changeType(state, payload) { + state.type = payload.type; + } +} + export default { namespaced: true, - state + state, + mutations } \ No newline at end of file diff --git a/uni_modules/uview-ui/components/u-modal/u-modal.vue b/uni_modules/uview-ui/components/u-modal/u-modal.vue index 4c37ae2..e8716db 100644 --- a/uni_modules/uview-ui/components/u-modal/u-modal.vue +++ b/uni_modules/uview-ui/components/u-modal/u-modal.vue @@ -1,6 +1,6 @@