From 41311a7ef5c0ed756f930cce9fdb595f4356fb78 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Mon, 11 Oct 2021 13:47:39 +0800 Subject: [PATCH] no message --- app.json | 5 +- pages/{adress => address}/create/index.js | 0 pages/{adress => address}/create/index.json | 0 pages/{adress => address}/create/index.wxml | 0 pages/{adress => address}/create/index.wxss | 0 pages/{adress => address}/list/index.js | 0 pages/{adress => address}/list/index.json | 0 pages/{adress => address}/list/index.wxml | 0 pages/{adress => address}/list/index.wxss | 0 pages/agent/factory/index.json | 1 - pages/article/price-detail/index.js | 66 --------------------- pages/article/price-detail/index.wxml | 2 - pages/home/index/index.js | 4 +- pages/morder/create/index.wxml | 4 +- utils/util.js | 7 +-- 15 files changed, 8 insertions(+), 81 deletions(-) rename pages/{adress => address}/create/index.js (100%) rename pages/{adress => address}/create/index.json (100%) rename pages/{adress => address}/create/index.wxml (100%) rename pages/{adress => address}/create/index.wxss (100%) rename pages/{adress => address}/list/index.js (100%) rename pages/{adress => address}/list/index.json (100%) rename pages/{adress => address}/list/index.wxml (100%) rename pages/{adress => address}/list/index.wxss (100%) delete mode 100644 pages/article/price-detail/index.js delete mode 100644 pages/article/price-detail/index.wxml diff --git a/app.json b/app.json index 75c6965..bc36996 100644 --- a/app.json +++ b/app.json @@ -31,7 +31,6 @@ "pages/bidding/detail/index", "pages/article/publish/index", "pages/article/detail/index", - "pages/article/price-detail/index", "pages/article/factory/index", "pages/article/feedback/index", "pages/article/list/index", @@ -63,8 +62,8 @@ "pages/purchase/create/index", "pages/purchase/detail/index", "pages/message/index/index", - "pages/adress/list/index", - "pages/adress/create/index", + "pages/address/list/index", + "pages/address/create/index", "pages/html/agreement/index", "pages/html/bankcard/index", "pages/html/banner/index", diff --git a/pages/adress/create/index.js b/pages/address/create/index.js similarity index 100% rename from pages/adress/create/index.js rename to pages/address/create/index.js diff --git a/pages/adress/create/index.json b/pages/address/create/index.json similarity index 100% rename from pages/adress/create/index.json rename to pages/address/create/index.json diff --git a/pages/adress/create/index.wxml b/pages/address/create/index.wxml similarity index 100% rename from pages/adress/create/index.wxml rename to pages/address/create/index.wxml diff --git a/pages/adress/create/index.wxss b/pages/address/create/index.wxss similarity index 100% rename from pages/adress/create/index.wxss rename to pages/address/create/index.wxss diff --git a/pages/adress/list/index.js b/pages/address/list/index.js similarity index 100% rename from pages/adress/list/index.js rename to pages/address/list/index.js diff --git a/pages/adress/list/index.json b/pages/address/list/index.json similarity index 100% rename from pages/adress/list/index.json rename to pages/address/list/index.json diff --git a/pages/adress/list/index.wxml b/pages/address/list/index.wxml similarity index 100% rename from pages/adress/list/index.wxml rename to pages/address/list/index.wxml diff --git a/pages/adress/list/index.wxss b/pages/address/list/index.wxss similarity index 100% rename from pages/adress/list/index.wxss rename to pages/address/list/index.wxss diff --git a/pages/agent/factory/index.json b/pages/agent/factory/index.json index f3fc945..5966ea1 100644 --- a/pages/agent/factory/index.json +++ b/pages/agent/factory/index.json @@ -9,7 +9,6 @@ "fold-text": "/components/fold-text/index", "wux-divider": "/components/divider/index", "info-item": "/pages/moment/info-item/index", - "article-item": "/pages/article/article-item/index", "wux-popup": "/components/popup/index" } } \ No newline at end of file diff --git a/pages/article/price-detail/index.js b/pages/article/price-detail/index.js deleted file mode 100644 index a3e29ec..0000000 --- a/pages/article/price-detail/index.js +++ /dev/null @@ -1,66 +0,0 @@ -// pages/article/price-detail/index.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function () { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function () { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function () { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function () { - - } -}) \ No newline at end of file diff --git a/pages/article/price-detail/index.wxml b/pages/article/price-detail/index.wxml deleted file mode 100644 index c3786c6..0000000 --- a/pages/article/price-detail/index.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -pages/article/price-detail/index.wxml diff --git a/pages/home/index/index.js b/pages/home/index/index.js index d867564..0ab9137 100644 --- a/pages/home/index/index.js +++ b/pages/home/index/index.js @@ -116,7 +116,7 @@ Component({ } else if (e.currentTarget.id == 'article') { util.navigateTo('/pages/article/list/index') } else if (e.currentTarget.id == 'adress') { - util.navigateTo('/pages/adress/list/index') + util.navigateTo('/pages/address/list/index') } else if (e.currentTarget.id == 'setting') { util.navigateTo('/pages/home/setting/index') } else if (e.currentTarget.id == 'tovip') { @@ -189,7 +189,7 @@ Component({ } else if (parseInt(e.currentTarget.id) == 6) { wx.navigateTo({ url: '/pages/article/list/index' }) } else if (parseInt(e.currentTarget.id) == 7) { - wx.navigateTo({ url: '/pages/adress/list/index' }) + wx.navigateTo({ url: '/pages/address/list/index' }) } }, onShareAppMessage: function () { diff --git a/pages/morder/create/index.wxml b/pages/morder/create/index.wxml index db18f4e..dedbdcf 100644 --- a/pages/morder/create/index.wxml +++ b/pages/morder/create/index.wxml @@ -31,11 +31,11 @@ - + - + diff --git a/utils/util.js b/utils/util.js index b525f4a..131d3f2 100644 --- a/utils/util.js +++ b/utils/util.js @@ -166,13 +166,12 @@ function checkId(id) { const tokenList = [ 'pages/mall/price-index/index', - '/pages/article/price-detail/index', '/pages/shop/index/index', '/pages/bidding/index/index', '/pages/morder/index/index', '/pages/message/index/index', '/pages/home/setting/index', - '/pages/adress/list/index', + '/pages/address/list/index', '/pages/article/list/index', '/pages/html/integral/index', '/pages/withdrawal/balance/index', @@ -215,8 +214,6 @@ function navigateTarget(redirectInfo){ navigateTo('/pages/agent/index/index') } else if(redirectInfo.targetView == 'showQNPrice'){ navigateTo('/pages/mall/price-index/index') - } else if(redirectInfo.targetView == 'showFactoryPrice'){ - navigateTo('/pages/article/price-detail/index') } else if(redirectInfo.targetView == 'showArticleHome'){ event.emit('EventMessage', { what: 250, desc: 'page-article', index: 0 }) } else if(redirectInfo.targetView == 'myArticle'){ @@ -234,7 +231,7 @@ function navigateTarget(redirectInfo){ } else if(redirectInfo.targetView == 'contract'){ navigateTo('/submodel/pages/html/service/index') } else if(redirectInfo.targetView == 'myAddress'){ - navigateTo('/pages/adress/list/index') + navigateTo('/pages/address/list/index') } else if(redirectInfo.targetView == 'myBankCard'){ navigateTo('/pages/bank/vindex/index') } else if(redirectInfo.targetView == 'personalBillDetail'){