diff --git a/pages.json b/pages.json index ad3a7fe..4da8876 100644 --- a/pages.json +++ b/pages.json @@ -22,14 +22,6 @@ } }, { - "path" : "pages/login/login", - "style" : - { - "navigationBarTitleText": "登录", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/register/register", "style" : { diff --git a/pages.json b/pages.json index ad3a7fe..4da8876 100644 --- a/pages.json +++ b/pages.json @@ -22,14 +22,6 @@ } }, { - "path" : "pages/login/login", - "style" : - { - "navigationBarTitleText": "登录", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/register/register", "style" : { diff --git a/pages/info/info.vue b/pages/info/info.vue index 4f5b443..e9e9c6a 100644 --- a/pages/info/info.vue +++ b/pages/info/info.vue @@ -1,8 +1,10 @@ @@ -58,7 +60,13 @@ diff --git a/pages.json b/pages.json index ad3a7fe..4da8876 100644 --- a/pages.json +++ b/pages.json @@ -22,14 +22,6 @@ } }, { - "path" : "pages/login/login", - "style" : - { - "navigationBarTitleText": "登录", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/register/register", "style" : { diff --git a/pages/info/info.vue b/pages/info/info.vue index 4f5b443..e9e9c6a 100644 --- a/pages/info/info.vue +++ b/pages/info/info.vue @@ -1,8 +1,10 @@ @@ -58,7 +60,13 @@ diff --git a/pages/list/list.vue b/pages/list/list.vue index 3a1c8ec..0e5bbca 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -38,9 +38,9 @@ {{item.number}} {{item.name}} - - - + + + @@ -130,7 +130,7 @@ if(this.checkboxList.indexOf(item) == -1){ this.checkboxList.push(item) }else { - this.checkboxList.splice(this.checkboxList.indexOf(item)) + this.checkboxList.splice(this.checkboxList.indexOf(item),1) } if(this.checkboxList.length > 0){ this.checkExport = '选中的' diff --git a/pages.json b/pages.json index ad3a7fe..4da8876 100644 --- a/pages.json +++ b/pages.json @@ -22,14 +22,6 @@ } }, { - "path" : "pages/login/login", - "style" : - { - "navigationBarTitleText": "登录", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/register/register", "style" : { diff --git a/pages/info/info.vue b/pages/info/info.vue index 4f5b443..e9e9c6a 100644 --- a/pages/info/info.vue +++ b/pages/info/info.vue @@ -1,8 +1,10 @@ @@ -58,7 +60,13 @@ diff --git a/pages/list/list.vue b/pages/list/list.vue index 3a1c8ec..0e5bbca 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -38,9 +38,9 @@ {{item.number}} {{item.name}} - - - + + + @@ -130,7 +130,7 @@ if(this.checkboxList.indexOf(item) == -1){ this.checkboxList.push(item) }else { - this.checkboxList.splice(this.checkboxList.indexOf(item)) + this.checkboxList.splice(this.checkboxList.indexOf(item),1) } if(this.checkboxList.length > 0){ this.checkExport = '选中的' diff --git a/pages/login/login.vue b/pages/login/login.vue deleted file mode 100644 index 6d57f8c..0000000 --- a/pages/login/login.vue +++ /dev/null @@ -1,174 +0,0 @@ -/** - * 登录页面 - */ - - - - - diff --git a/pages.json b/pages.json index ad3a7fe..4da8876 100644 --- a/pages.json +++ b/pages.json @@ -22,14 +22,6 @@ } }, { - "path" : "pages/login/login", - "style" : - { - "navigationBarTitleText": "登录", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/register/register", "style" : { diff --git a/pages/info/info.vue b/pages/info/info.vue index 4f5b443..e9e9c6a 100644 --- a/pages/info/info.vue +++ b/pages/info/info.vue @@ -1,8 +1,10 @@ @@ -58,7 +60,13 @@ diff --git a/pages/list/list.vue b/pages/list/list.vue index 3a1c8ec..0e5bbca 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -38,9 +38,9 @@ {{item.number}} {{item.name}} - - - + + + @@ -130,7 +130,7 @@ if(this.checkboxList.indexOf(item) == -1){ this.checkboxList.push(item) }else { - this.checkboxList.splice(this.checkboxList.indexOf(item)) + this.checkboxList.splice(this.checkboxList.indexOf(item),1) } if(this.checkboxList.length > 0){ this.checkExport = '选中的' diff --git a/pages/login/login.vue b/pages/login/login.vue deleted file mode 100644 index 6d57f8c..0000000 --- a/pages/login/login.vue +++ /dev/null @@ -1,174 +0,0 @@ -/** - * 登录页面 - */ - - - - - diff --git a/pages/register/register.vue b/pages/register/register.vue index bcef374..3b01d03 100644 --- a/pages/register/register.vue +++ b/pages/register/register.vue @@ -3,88 +3,92 @@ */ @@ -102,29 +106,6 @@ required: true, message: '请填写员工号', trigger: ['blur', 'change'], - }], - password: [{ - required: true, - message: '请填写密码', - trigger: ['blur', 'change'] - }, - { - pattern: /^[0-9a-zA-Z]*$/g, - transform(value) { - return String(value); - }, - message: '只能包含字母或数字' - }, - { - min: 8, - max: 15, - message: '长度在8-15个字符之间' - } - ], - confirmPassword: [{ - required: true, - message: '请填写确认密码', - trigger: ['blur', 'change'], }] }, form: { @@ -132,8 +113,6 @@ name: '', //姓名 type: '', //员工类型 phone: '', //电话 - password: '', //密码 - confirmPassword: '', //确认密码 }, tips: { text: '请选择员工类型', @@ -216,26 +195,21 @@ }, 30) // this.$refs.form1.validateField('userInfo.sex') }, - //跳转登录页面 - goRegister() { - this.successShow = false - wx.navigateTo({ - url: '/pages/login/login' - }) - }, } }