From 8b98e1f3c75dd47773451dbaccba7e982bac6321 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Mon, 11 Oct 2021 13:52:49 +0800 Subject: [PATCH] no message --- app.json | 6 +++--- pages/agent/address/index.wxml | 1 - pages/agent/address/index.wxss | 1 - pages/home/index/index.js | 4 ++-- pages/morder/create/index.wxml | 4 ++-- {pages => submodel/pages}/address/create/index.js | 8 ++++---- {pages => submodel/pages}/address/create/index.json | 0 {pages => submodel/pages}/address/create/index.wxml | 1 - {pages => submodel/pages}/address/create/index.wxss | 1 - {pages => submodel/pages}/address/list/index.js | 13 ++++++------- {pages => submodel/pages}/address/list/index.json | 0 {pages => submodel/pages}/address/list/index.wxml | 0 {pages => submodel/pages}/address/list/index.wxss | 0 utils/util.js | 4 ++-- 14 files changed, 19 insertions(+), 24 deletions(-) rename {pages => submodel/pages}/address/create/index.js (96%) rename {pages => submodel/pages}/address/create/index.json (100%) rename {pages => submodel/pages}/address/create/index.wxml (98%) rename {pages => submodel/pages}/address/create/index.wxss (83%) rename {pages => submodel/pages}/address/list/index.js (66%) rename {pages => submodel/pages}/address/list/index.json (100%) rename {pages => submodel/pages}/address/list/index.wxml (100%) rename {pages => submodel/pages}/address/list/index.wxss (100%) diff --git a/app.json b/app.json index bc36996..256b3ff 100644 --- a/app.json +++ b/app.json @@ -62,8 +62,6 @@ "pages/purchase/create/index", "pages/purchase/detail/index", "pages/message/index/index", - "pages/address/list/index", - "pages/address/create/index", "pages/html/agreement/index", "pages/html/bankcard/index", "pages/html/banner/index", @@ -82,7 +80,9 @@ "root": "submodel/", "pages": [ "pages/html/logistics/index", - "pages/html/service/index" + "pages/html/service/index", + "pages/address/list/index", + "pages/address/create/index" ] } ], diff --git a/pages/agent/address/index.wxml b/pages/agent/address/index.wxml index aecc877..f0fea5b 100644 --- a/pages/agent/address/index.wxml +++ b/pages/agent/address/index.wxml @@ -1,4 +1,3 @@ - 发货信息 diff --git a/pages/agent/address/index.wxss b/pages/agent/address/index.wxss index aa83230..e23258a 100644 --- a/pages/agent/address/index.wxss +++ b/pages/agent/address/index.wxss @@ -1,4 +1,3 @@ -/* pages/adress/create/index.wxss */ .margin-top{ margin-top: 16rpx; } diff --git a/pages/home/index/index.js b/pages/home/index/index.js index 0ab9137..34865c1 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/address/list/index') + util.navigateTo('/submodel/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/address/list/index' }) + wx.navigateTo({ url: '/submodel/pages/address/list/index' }) } }, onShareAppMessage: function () { diff --git a/pages/morder/create/index.wxml b/pages/morder/create/index.wxml index dedbdcf..c64c982 100644 --- a/pages/morder/create/index.wxml +++ b/pages/morder/create/index.wxml @@ -31,11 +31,11 @@ - + - + diff --git a/pages/address/create/index.js b/submodel/pages/address/create/index.js similarity index 96% rename from pages/address/create/index.js rename to submodel/pages/address/create/index.js index 3736ebe..56571c8 100644 --- a/pages/address/create/index.js +++ b/submodel/pages/address/create/index.js @@ -1,8 +1,8 @@ // pages/shop/apply/index.js -import { getAddressInfo, deleteAddress, createAddress, updateAddress } from "../../../api/ztb" -const util = require('../../../utils/util') -import regions from '../../../const/region' -const tdsdk = require('../../../libs/tdweapp') +import { getAddressInfo, deleteAddress, createAddress, updateAddress } from "../../../../api/ztb" +const util = require('../../../../utils/util') +import regions from '../../../../const/region' +const tdsdk = require('../../../../libs/tdweapp') const app = getApp() Page({ diff --git a/pages/address/create/index.json b/submodel/pages/address/create/index.json similarity index 100% rename from pages/address/create/index.json rename to submodel/pages/address/create/index.json diff --git a/pages/address/create/index.wxml b/submodel/pages/address/create/index.wxml similarity index 98% rename from pages/address/create/index.wxml rename to submodel/pages/address/create/index.wxml index b61c51d..d943f69 100644 --- a/pages/address/create/index.wxml +++ b/submodel/pages/address/create/index.wxml @@ -1,4 +1,3 @@ - {{type==1?'新增':'编辑'}}地址 diff --git a/pages/address/create/index.wxss b/submodel/pages/address/create/index.wxss similarity index 83% rename from pages/address/create/index.wxss rename to submodel/pages/address/create/index.wxss index aa83230..e23258a 100644 --- a/pages/address/create/index.wxss +++ b/submodel/pages/address/create/index.wxss @@ -1,4 +1,3 @@ -/* pages/adress/create/index.wxss */ .margin-top{ margin-top: 16rpx; } diff --git a/pages/address/list/index.js b/submodel/pages/address/list/index.js similarity index 66% rename from pages/address/list/index.js rename to submodel/pages/address/list/index.js index 0b52632..6744c21 100644 --- a/pages/address/list/index.js +++ b/submodel/pages/address/list/index.js @@ -1,7 +1,6 @@ -// pages/adress/list/index.js -import { getAddressList } from "../../../api/ztb" -const event = require('../../../utils/event.js') -const tdsdk = require('../../../libs/tdweapp') +import { getAddressList } from "../../../../api/ztb" +const event = require('../../../../utils/event.js') +const tdsdk = require('../../../../libs/tdweapp') Page({ data: { @@ -29,15 +28,15 @@ Page({ event.emit('EventMessage', { what: 301, obj: item, desc: 'AddressChoose' }) wx.navigateBack({ delta: 1 }) } else { - wx.navigateTo({ url: '/pages/adress/create/index?type=0&shippingAddressId='+ item.shippingAddressId }) + wx.navigateTo({ url: '/submodel/pages/address/create/index?type=0&shippingAddressId='+ item.shippingAddressId }) } }, toEdit: function (e) { var item = this.data.adressList[e.currentTarget.dataset.index] - wx.navigateTo({ url: '/pages/adress/create/index?type=0&shippingAddressId='+ item.shippingAddressId }) + wx.navigateTo({ url: '/submodel/pages/address/create/index?type=0&shippingAddressId='+ item.shippingAddressId }) }, toCreate: function () { - wx.navigateTo({ url: '/pages/adress/create/index?type=1' }) + wx.navigateTo({ url: '/submodel/pages/address/create/index?type=1' }) }, onHide: function(){ tdsdk.Page.onHide() diff --git a/pages/address/list/index.json b/submodel/pages/address/list/index.json similarity index 100% rename from pages/address/list/index.json rename to submodel/pages/address/list/index.json diff --git a/pages/address/list/index.wxml b/submodel/pages/address/list/index.wxml similarity index 100% rename from pages/address/list/index.wxml rename to submodel/pages/address/list/index.wxml diff --git a/pages/address/list/index.wxss b/submodel/pages/address/list/index.wxss similarity index 100% rename from pages/address/list/index.wxss rename to submodel/pages/address/list/index.wxss diff --git a/utils/util.js b/utils/util.js index 131d3f2..5df4539 100644 --- a/utils/util.js +++ b/utils/util.js @@ -171,7 +171,7 @@ const tokenList = [ '/pages/morder/index/index', '/pages/message/index/index', '/pages/home/setting/index', - '/pages/address/list/index', + '/submodel/pages/address/list/index', '/pages/article/list/index', '/pages/html/integral/index', '/pages/withdrawal/balance/index', @@ -231,7 +231,7 @@ function navigateTarget(redirectInfo){ } else if(redirectInfo.targetView == 'contract'){ navigateTo('/submodel/pages/html/service/index') } else if(redirectInfo.targetView == 'myAddress'){ - navigateTo('/pages/address/list/index') + navigateTo('/submodel/pages/address/list/index') } else if(redirectInfo.targetView == 'myBankCard'){ navigateTo('/pages/bank/vindex/index') } else if(redirectInfo.targetView == 'personalBillDetail'){