diff --git a/app.json b/app.json index c03c751..ab91f62 100644 --- a/app.json +++ b/app.json @@ -2,8 +2,6 @@ "pages": [ "pages/index/index", "pages/login/index", - "pages/home/mobile/index", - "pages/home/password/index", "pages/home/setting/index", "pages/home/authory/index", "pages/home/certificate/index", @@ -68,6 +66,8 @@ "root": "submodel/", "pages": [ "pages/home/about/index", + "pages/home/mobile/index", + "pages/home/password/index", "pages/home/enterprise/index", "pages/html/personal/index", "pages/html/logistics/index", diff --git a/pages/home/attention-paper/index.wxml b/pages/home/attention-paper/index.wxml index 051b6cf..7f40738 100644 --- a/pages/home/attention-paper/index.wxml +++ b/pages/home/attention-paper/index.wxml @@ -32,9 +32,6 @@ - diff --git a/pages/home/mobile/index.wxss b/pages/home/mobile/index.wxss deleted file mode 100644 index ba39f6a..0000000 --- a/pages/home/mobile/index.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/home/password/index.wxss */ \ No newline at end of file diff --git a/pages/home/password/index.wxss b/pages/home/password/index.wxss deleted file mode 100644 index ba39f6a..0000000 --- a/pages/home/password/index.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/home/password/index.wxss */ \ No newline at end of file diff --git a/pages/home/setting/index.wxml b/pages/home/setting/index.wxml index 5b23682..6ea431a 100644 --- a/pages/home/setting/index.wxml +++ b/pages/home/setting/index.wxml @@ -5,15 +5,12 @@ - + - + - diff --git a/submodel/pages/home/enterprise/index.wxml b/submodel/pages/home/enterprise/index.wxml index 6e7e20e..9450a86 100644 --- a/submodel/pages/home/enterprise/index.wxml +++ b/submodel/pages/home/enterprise/index.wxml @@ -1,13 +1,8 @@ - 企业信息 - 公司名称 {{realName || ''}} diff --git a/submodel/pages/home/enterprise/index.wxss b/submodel/pages/home/enterprise/index.wxss index 39a9b8b..e69de29 100644 --- a/submodel/pages/home/enterprise/index.wxss +++ b/submodel/pages/home/enterprise/index.wxss @@ -1 +0,0 @@ -/* pages/home/info/index.wxss */ \ No newline at end of file diff --git a/pages/home/mobile/index.js b/submodel/pages/home/mobile/index.js similarity index 86% rename from pages/home/mobile/index.js rename to submodel/pages/home/mobile/index.js index 9b73b33..d969d0b 100644 --- a/pages/home/mobile/index.js +++ b/submodel/pages/home/mobile/index.js @@ -1,11 +1,9 @@ -// pages/home/password/index.js -import { $wuxCountDown } from '../../../components/index' -import { postCaptcha, modifyMobile } from '../../../api/user' -const util = require('../../../utils/util') +import { $wuxCountDown } from '../../../../components/index' +import { postCaptcha, modifyMobile } from '../../../../api/user' +const util = require('../../../../utils/util') const app = getApp() Page({ - /** * 页面的初始数据 */ @@ -22,7 +20,6 @@ Page({ requesting: false, mobile: '' }, - /** * 生命周期函数--监听页面加载 */ @@ -34,22 +31,11 @@ Page({ }, changePwd: function (e) { if (this.data.pwdType === 'password') { - this.setData({ - pwdType: 'text' - }) - this.setData({ - pwd_icon: 'attentionforbid' - }) + this.setData({ pwdType: 'text', pwd_icon: 'attentionforbid' }) } else { - this.setData({ - pwdType: 'password' - }) - this.setData({ - pwd_icon: 'attention' - }) + this.setData({ pwdType: 'password',pwd_icon: 'attention' }) } }, - fetchCode: function () { if (util.isEmpty(this.data.form.newMobile)) { util.showToast('请输入新手机号码!') diff --git a/pages/home/mobile/index.json b/submodel/pages/home/mobile/index.json similarity index 100% rename from pages/home/mobile/index.json rename to submodel/pages/home/mobile/index.json diff --git a/pages/home/mobile/index.wxml b/submodel/pages/home/mobile/index.wxml similarity index 97% rename from pages/home/mobile/index.wxml rename to submodel/pages/home/mobile/index.wxml index bf0af36..b1f3580 100644 --- a/pages/home/mobile/index.wxml +++ b/submodel/pages/home/mobile/index.wxml @@ -1,4 +1,3 @@ - 更换手机号码 diff --git a/submodel/pages/home/mobile/index.wxss b/submodel/pages/home/mobile/index.wxss new file mode 100644 index 0000000..e69de29 diff --git a/pages/home/password/index.js b/submodel/pages/home/password/index.js similarity index 93% rename from pages/home/password/index.js rename to submodel/pages/home/password/index.js index cf72733..13ce7f1 100644 --- a/pages/home/password/index.js +++ b/submodel/pages/home/password/index.js @@ -1,8 +1,7 @@ -// pages/home/password/index.js // 页面已经废弃,因为UEC的修改,暂时不会提供修改密码的功能 -import { $wuxCountDown } from '../../../components/index' -import { postCaptcha, setPassword } from "../../../api/user" -const util = require('../../../utils/util') +import { $wuxCountDown } from '../../../../components/index' +import { postCaptcha, setPassword } from "../../../../api/user" +const util = require('../../../../utils/util') const app = getApp() Page({ diff --git a/pages/home/password/index.json b/submodel/pages/home/password/index.json similarity index 100% rename from pages/home/password/index.json rename to submodel/pages/home/password/index.json diff --git a/pages/home/password/index.wxml b/submodel/pages/home/password/index.wxml similarity index 97% rename from pages/home/password/index.wxml rename to submodel/pages/home/password/index.wxml index 7528e6f..1ff238d 100644 --- a/pages/home/password/index.wxml +++ b/submodel/pages/home/password/index.wxml @@ -1,4 +1,3 @@ - {{first ? '设置密码' : '密码重置'}} diff --git a/submodel/pages/home/password/index.wxss b/submodel/pages/home/password/index.wxss new file mode 100644 index 0000000..e69de29