From af34267450a6c7a737a9f1feb9f55d0f545fdfcd Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Mon, 11 Oct 2021 14:04:01 +0800 Subject: [PATCH] no message --- app.json | 4 ++-- pages/agent/address/index.json | 3 +-- pages/agent/address/index.wxml | 2 +- pages/article/attention-factory/index.json | 1 - pages/home/info/index.js | 4 +--- pages/home/personal/index.wxss | 1 - submodel/pages/address/list/index.json | 3 +-- {pages/home => submodel/pages/html}/personal/index.js | 6 +++--- {pages/home => submodel/pages/html}/personal/index.json | 0 {pages/home => submodel/pages/html}/personal/index.wxml | 6 ------ submodel/pages/html/personal/index.wxss | 0 11 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 pages/home/personal/index.wxss rename {pages/home => submodel/pages/html}/personal/index.js (99%) rename {pages/home => submodel/pages/html}/personal/index.json (100%) rename {pages/home => submodel/pages/html}/personal/index.wxml (92%) create mode 100644 submodel/pages/html/personal/index.wxss diff --git a/app.json b/app.json index 256b3ff..17b16dd 100644 --- a/app.json +++ b/app.json @@ -19,6 +19,7 @@ "pages/home/tab6/index", "pages/home/attention-paper/index", "pages/home/business-license/index", + "pages/home/enterprise/index", "pages/shop/create/index", "pages/shop/detail/index", "pages/shop/order/index", @@ -70,8 +71,6 @@ "pages/html/rules/index", "pages/html/notice/index", "pages/html/integral/index", - "pages/home/personal/index", - "pages/home/enterprise/index", "pages/moment/paper/index", "pages/ztbvip/index" ], @@ -79,6 +78,7 @@ { "root": "submodel/", "pages": [ + "pages/html/personal/index", "pages/html/logistics/index", "pages/html/service/index", "pages/address/list/index", diff --git a/pages/agent/address/index.json b/pages/agent/address/index.json index 049c4f8..353a2e4 100644 --- a/pages/agent/address/index.json +++ b/pages/agent/address/index.json @@ -1,6 +1,5 @@ { "usingComponents": { - "wux-button": "/components/button/index", - "wux-cascader": "/components/cascader/index" + "wux-button": "/components/button/index" } } \ No newline at end of file diff --git a/pages/agent/address/index.wxml b/pages/agent/address/index.wxml index f0fea5b..cadb72c 100644 --- a/pages/agent/address/index.wxml +++ b/pages/agent/address/index.wxml @@ -35,4 +35,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/pages/article/attention-factory/index.json b/pages/article/attention-factory/index.json index 51ec566..e44bf81 100644 --- a/pages/article/attention-factory/index.json +++ b/pages/article/attention-factory/index.json @@ -1,6 +1,5 @@ { "usingComponents": { - "wux-cascader": "/components/cascader/index", "wux-accordion-group": "/components/accordion-group/index", "wux-accordion": "/components/accordion/index" } diff --git a/pages/home/info/index.js b/pages/home/info/index.js index ba734e8..b1fc488 100644 --- a/pages/home/info/index.js +++ b/pages/home/info/index.js @@ -304,9 +304,7 @@ Page({ }) }, goPersonalInfo: function () { - wx.navigateTo({ - url: '/pages/home/personal/index' - }) + wx.navigateTo({url: '/submodel/pages/html/personal/index' }) }, goEnterpriseInfo: function () { if(app.globalData.userInfo.isEnterpriseAuth){ diff --git a/pages/home/personal/index.wxss b/pages/home/personal/index.wxss deleted file mode 100644 index 39a9b8b..0000000 --- a/pages/home/personal/index.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/home/info/index.wxss */ \ No newline at end of file diff --git a/submodel/pages/address/list/index.json b/submodel/pages/address/list/index.json index 43b6d73..e1f4a3a 100644 --- a/submodel/pages/address/list/index.json +++ b/submodel/pages/address/list/index.json @@ -1,7 +1,6 @@ { "usingComponents": { "wux-alert": "/components/alert/index", - "wux-button": "/components/button/index", - "wux-cascader": "/components/cascader/index" + "wux-button": "/components/button/index" } } \ No newline at end of file diff --git a/pages/home/personal/index.js b/submodel/pages/html/personal/index.js similarity index 99% rename from pages/home/personal/index.js rename to submodel/pages/html/personal/index.js index f6bcfc2..3449e4a 100644 --- a/pages/home/personal/index.js +++ b/submodel/pages/html/personal/index.js @@ -1,6 +1,6 @@ -import { zconfig, getBaseInfo, updateUserInfoZtb } from '../../../api/ztb' -import { updateUserInfo } from '../../../api/user' -const util = require('../../../utils/util') +import { zconfig, getBaseInfo, updateUserInfoZtb } from '../../../../api/ztb' +import { updateUserInfo } from '../../../../api/user' +const util = require('../../../../utils/util') const app = getApp() Page({ diff --git a/pages/home/personal/index.json b/submodel/pages/html/personal/index.json similarity index 100% rename from pages/home/personal/index.json rename to submodel/pages/html/personal/index.json diff --git a/pages/home/personal/index.wxml b/submodel/pages/html/personal/index.wxml similarity index 92% rename from pages/home/personal/index.wxml rename to submodel/pages/html/personal/index.wxml index 302e54b..d96fa25 100644 --- a/pages/home/personal/index.wxml +++ b/submodel/pages/html/personal/index.wxml @@ -1,14 +1,8 @@ - 从业信息 - - 从业身份 {{userInfo.identityTag || '点击修改从业身份'}} diff --git a/submodel/pages/html/personal/index.wxss b/submodel/pages/html/personal/index.wxss new file mode 100644 index 0000000..e69de29