From 4b7b237550d525f0e5aa4418c817820e9baca09f Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Mon, 11 Oct 2021 19:35:47 +0800 Subject: [PATCH] no message --- app.json | 4 ++-- pages/home/about/index.wxss | 1 - pages/home/city-select/index.js | 1 - pages/home/city-select/index.wxml | 1 - pages/home/city-select/index.wxss | 1 - pages/home/info/index.js | 2 +- pages/home/setting/index.wxml | 2 +- pages/mall/search-list/index.js | 1 - pages/mall/search-list/index.wxml | 1 - pages/mall/search-list/index.wxss | 1 - pages/purchase/create/index.wxml | 1 - {pages => submodel/pages}/home/about/index.js | 3 --- {pages => submodel/pages}/home/about/index.json | 0 {pages => submodel/pages}/home/about/index.wxml | 1 - submodel/pages/home/about/index.wxss | 0 {pages => submodel/pages}/home/enterprise/index.js | 8 ++++---- {pages => submodel/pages}/home/enterprise/index.json | 0 {pages => submodel/pages}/home/enterprise/index.wxml | 0 {pages => submodel/pages}/home/enterprise/index.wxss | 0 19 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 pages/home/about/index.wxss rename {pages => submodel/pages}/home/about/index.js (82%) rename {pages => submodel/pages}/home/about/index.json (100%) rename {pages => submodel/pages}/home/about/index.wxml (87%) create mode 100644 submodel/pages/home/about/index.wxss rename {pages => submodel/pages}/home/enterprise/index.js (98%) rename {pages => submodel/pages}/home/enterprise/index.json (100%) rename {pages => submodel/pages}/home/enterprise/index.wxml (100%) rename {pages => submodel/pages}/home/enterprise/index.wxss (100%) diff --git a/app.json b/app.json index 8ff5192..c03c751 100644 --- a/app.json +++ b/app.json @@ -2,7 +2,6 @@ "pages": [ "pages/index/index", "pages/login/index", - "pages/home/about/index", "pages/home/mobile/index", "pages/home/password/index", "pages/home/setting/index", @@ -19,7 +18,6 @@ "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", @@ -69,6 +67,8 @@ { "root": "submodel/", "pages": [ + "pages/home/about/index", + "pages/home/enterprise/index", "pages/html/personal/index", "pages/html/logistics/index", "pages/html/service/index", diff --git a/pages/home/about/index.wxss b/pages/home/about/index.wxss deleted file mode 100644 index 5b09acd..0000000 --- a/pages/home/about/index.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/home/about/index.wxss */ \ No newline at end of file diff --git a/pages/home/city-select/index.js b/pages/home/city-select/index.js index 251237a..00efaea 100644 --- a/pages/home/city-select/index.js +++ b/pages/home/city-select/index.js @@ -1,4 +1,3 @@ -// pages/home/about/index.js const util = require('../../../utils/util') const event = require('../../../utils/event') const storage = require('../../../utils/storage') diff --git a/pages/home/city-select/index.wxml b/pages/home/city-select/index.wxml index d8bc76e..2ec72b6 100644 --- a/pages/home/city-select/index.wxml +++ b/pages/home/city-select/index.wxml @@ -1,4 +1,3 @@ - 城市选择 diff --git a/pages/home/city-select/index.wxss b/pages/home/city-select/index.wxss index 5d99ec0..0609138 100644 --- a/pages/home/city-select/index.wxss +++ b/pages/home/city-select/index.wxss @@ -1,4 +1,3 @@ -/* pages/home/about/index.wxss */ .list-bar{ display: flex; flex-direction: column; diff --git a/pages/home/info/index.js b/pages/home/info/index.js index b1fc488..981e021 100644 --- a/pages/home/info/index.js +++ b/pages/home/info/index.js @@ -308,7 +308,7 @@ Page({ }, goEnterpriseInfo: function () { if(app.globalData.userInfo.isEnterpriseAuth){ - wx.navigateTo({ url: '/pages/home/enterprise/index' }) + wx.navigateTo({ url: '/submodel/pages/home/enterprise/index' }) } else { wx.navigateTo({ url: '/pages/home/certificate/index' }) } diff --git a/pages/home/setting/index.wxml b/pages/home/setting/index.wxml index 06cf791..5b23682 100644 --- a/pages/home/setting/index.wxml +++ b/pages/home/setting/index.wxml @@ -39,7 +39,7 @@ - + 业务人员邀请码 {{userInfo.bizUserCode || '点击填写业务人员邀请码'}} diff --git a/pages/mall/search-list/index.js b/pages/mall/search-list/index.js index a0c29aa..a851e3f 100644 --- a/pages/mall/search-list/index.js +++ b/pages/mall/search-list/index.js @@ -1,4 +1,3 @@ -// pages/home/about/index.js import { getFactoryPrice, getProxyOrderList } from "../../../api/ztb" import { getPreferList, getInformationList } from "../../../api/moment" const storage = require('../../../utils/storage') diff --git a/pages/mall/search-list/index.wxml b/pages/mall/search-list/index.wxml index 00a360a..12ee6f2 100644 --- a/pages/mall/search-list/index.wxml +++ b/pages/mall/search-list/index.wxml @@ -1,4 +1,3 @@ - 搜索 diff --git a/pages/mall/search-list/index.wxss b/pages/mall/search-list/index.wxss index 5b09acd..e69de29 100644 --- a/pages/mall/search-list/index.wxss +++ b/pages/mall/search-list/index.wxss @@ -1 +0,0 @@ -/* pages/home/about/index.wxss */ \ No newline at end of file diff --git a/pages/purchase/create/index.wxml b/pages/purchase/create/index.wxml index 087edf0..6988bf6 100644 --- a/pages/purchase/create/index.wxml +++ b/pages/purchase/create/index.wxml @@ -4,7 +4,6 @@ - diff --git a/pages/home/about/index.js b/submodel/pages/home/about/index.js similarity index 82% rename from pages/home/about/index.js rename to submodel/pages/home/about/index.js index 3a2f5e8..ff72836 100644 --- a/pages/home/about/index.js +++ b/submodel/pages/home/about/index.js @@ -1,13 +1,10 @@ -// pages/home/about/index.js Page({ - /** * 页面的初始数据 */ data: { }, - /** * 生命周期函数--监听页面加载 */ diff --git a/pages/home/about/index.json b/submodel/pages/home/about/index.json similarity index 100% rename from pages/home/about/index.json rename to submodel/pages/home/about/index.json diff --git a/pages/home/about/index.wxml b/submodel/pages/home/about/index.wxml similarity index 87% rename from pages/home/about/index.wxml rename to submodel/pages/home/about/index.wxml index 7ecca3d..81cddd1 100644 --- a/pages/home/about/index.wxml +++ b/submodel/pages/home/about/index.wxml @@ -1,4 +1,3 @@ - 关于纸通宝 diff --git a/submodel/pages/home/about/index.wxss b/submodel/pages/home/about/index.wxss new file mode 100644 index 0000000..e69de29 diff --git a/pages/home/enterprise/index.js b/submodel/pages/home/enterprise/index.js similarity index 98% rename from pages/home/enterprise/index.js rename to submodel/pages/home/enterprise/index.js index 91e0247..1f0d453 100644 --- a/pages/home/enterprise/index.js +++ b/submodel/pages/home/enterprise/index.js @@ -1,7 +1,7 @@ -import { zconfig, getBaseInfo, updateUserInfoZtb } from '../../../api/ztb' -import { updateUserInfo } from '../../../api/user' -const util = require('../../../utils/util') -const tdsdk = require('../../../libs/tdweapp') +import { zconfig, getBaseInfo, updateUserInfoZtb } from '../../../../api/ztb' +import { updateUserInfo } from '../../../../api/user' +const util = require('../../../../utils/util') +const tdsdk = require('../../../../libs/tdweapp') const app = getApp() Page({ diff --git a/pages/home/enterprise/index.json b/submodel/pages/home/enterprise/index.json similarity index 100% rename from pages/home/enterprise/index.json rename to submodel/pages/home/enterprise/index.json diff --git a/pages/home/enterprise/index.wxml b/submodel/pages/home/enterprise/index.wxml similarity index 100% rename from pages/home/enterprise/index.wxml rename to submodel/pages/home/enterprise/index.wxml diff --git a/pages/home/enterprise/index.wxss b/submodel/pages/home/enterprise/index.wxss similarity index 100% rename from pages/home/enterprise/index.wxss rename to submodel/pages/home/enterprise/index.wxss