From 139dd138691bbb8ef747c7fecdb1a609b39e2a96 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 17 七月 2025 03:46:18 +0800
Subject: [PATCH] 解决主包过大问题
---
pages/tabbar/user/utils/tool.vue | 48 +-
pages/cusbar/m-share/index.vue | 0
vue.config.js | 39 +-
static/tabbar/cart-s.png | 0
pages/product/m-share/index.vue | 0
pages/promotion/bargain/list.vue | 2
pages/promotion/m-buy/popup.js | 0
pages/passport/verification/icon.css | 0
pages/order/orderDetail.vue | 2
pages/cart/m-buy/popup.scss | 0
pages/passport/entry/seller/step1.vue | 2
pages/product/m-take-down-sale-goods/index.vue | 2
pages/mine/set/personMsg.vue | 2
static/tabbar/mine-s.png | 0
pages/product/m-share/mp-share.scss | 0
pages/promotion/m-buy/goods.vue | 0
pages/promotion/m-share/mp-share.scss | 0
pages/mine/im/emojis.js | 145 ++++++++++
pages/promotion/m-goods-list/promotion.vue | 2
static/tabbar/home-s.png | 0
pages/subComponents/uniMap.vue | 0
static/mine/myaddress.png | 0
static/mine/shensu.png | 0
pages/order/afterSales/afterSalesDetail.vue | 2
pages/mine/set/securityCenter/editPassword.vue | 2
static/tabbar/home.png | 0
pages/cart/m-buy/goods.vue | 0
pages/cart/m-goods-recommend/README.md | 0
pages/cusbar/m-share/mp-share.scss | 0
pages/mine/verification/verification.vue | 0
pages/order/m-share/mp-share.scss | 0
package-lock.json | 100 +++++++
static/mine/kanjia.png | 0
static/mine/setting.png | 0
static/mine/feedback.png | 0
pages/passport/verification/verification.vue | 0
pages/promotion/seckill.vue | 2
pages/navigation/m-goods-list/base-list.vue | 2
components/custom-tabbar.vue | 20
static/tabbar/cart.png | 0
pages/promotion/m-goods-list/common.vue | 0
pages/mine/verification/animation.css | 0
pages/navigation/search/searchPage.vue | 4
pages/product/m-buy/goods.vue | 0
static/tabbar/video1-selected.png | 0
pages/product/m-goods-list/common.vue | 0
static/mine/order.png | 0
static/mine/logistics.png | 0
static/mine/couponcenter.png | 0
pages/cart/payment/shareOrderGoods.vue | 4
pages/passport/entry/seller/step3.vue | 4
pages/cart/m-goods-recommend/index.vue | 2
pages/product/product/popup/address.vue | 4
static/mine/myfavorite.png | 0
pages/passport/login.vue | 2
pages/product/m-goods-recommend/index.vue | 2
pages/navigation/m-goods-list/README.md | 0
pages/promotion/bargain/detail.vue | 4
pages/product/product/goods/-goods-recommend.vue | 2
pages/promotion/m-goods-list/list.vue | 2
pages/video/video-edit.vue | 2
pages/promotion/m-goods-list/README.md | 0
static/tabbar/mine.png | 0
pages/mine/address/add.vue | 4
pages/subComponents/my-tag.vue | 0
pages/navigation/m-goods-list/promotion.vue | 2
pages/product/m-buy/popup.scss | 0
pages/promotion/point/detail.vue | 2
pages/product/m-goods-list/base-list.vue | 2
pages/navigation/m-search-revision/m-search-revision.vue | 0
pages/product/goods.vue | 4
pages/product/m-goods-list/README.md | 0
pages/product/shopPageGoods.vue | 2
pages.json | 352 +++++++++++++-----------
pages/promotion/joinGroup.vue | 2
pages/mine/set/securityCenter/bindMobile.vue | 2
static/mine/sign.png | 0
pages/navigation/m-goods-list/common.vue | 0
pages/product/m-buy/popup.js | 0
static/tabbar/video.png | 0
pages/order/m-city/m-city.vue | 0
pages/order/m-share/index.vue | 0
static/tabbar/category-s.png | 0
static/tabbar/video1.png | 0
static/mine/im.png | 0
pages/product/m-goods-recommend/README.md | 0
static/mine/mypoint.png | 0
static/tabbar/category.png | 0
pages/mine/set/m-city/m-city.vue | 0
pages/navigation/m-goods-list/list.vue | 2
pages/cart/payment/success.vue | 2
pages/cart/m-buy/README.md | 0
pages/cusbar/video/video.vue | 2
pages/product/shopPage.vue | 2
pages/mine/verification/icon.css | 0
pages/passport/verification/animation.css | 0
pages/mine/m-city/m-city.vue | 0
pages/promotion/m-share/index.vue | 0
static/mine/mycoupon.png | 0
pages/product/m-goods-list/promotion.vue | 2
pages/cusbar/cart/cartList.vue | 2
pages/product/m-buy/README.md | 0
pages/promotion/m-buy/README.md | 0
static/tabbar/video-selected.png | 0
pages/passport/m-city/m-city.vue | 0
pages/promotion/m-buy/popup.scss | 0
static/mine/distribution.png | 0
pages/product/m-goods-list/list.vue | 2
static/mine/pointgift.png | 0
pages/cart/m-buy/popup.js | 0
static/mine/mycommit.png | 0
package.json | 5
static/mine/myhistory.png | 0
pages/promotion/m-goods-list/base-list.vue | 2
114 files changed, 530 insertions(+), 267 deletions(-)
diff --git a/components/custom-tabbar.vue b/components/custom-tabbar.vue
index 07acf1f..d4577e8 100644
--- a/components/custom-tabbar.vue
+++ b/components/custom-tabbar.vue
@@ -35,8 +35,8 @@
marginBottom: 0,
list: [{
"pagePath": "/pages/tabbar/index/home",
- "iconPath": "/pages/subComponents/static/tabbar/home.png",
- "selectedIconPath": "/pages/subComponents/static/tabbar/home-s.png",
+ "iconPath": "/static/tabbar/home.png",
+ "selectedIconPath": "/static/tabbar/home-s.png",
"text": "棣栭〉",
"key": 'index'
},
@@ -44,28 +44,28 @@
// "pagePath": "/pages/tabbar/category/category",
"pagePath": "/pages/kitchen/KitchenVideo",
- "iconPath": "/pages/subComponents/static/tabbar/category.png",
- "selectedIconPath": "/pages/subComponents/static/tabbar/category-s.png",
+ "iconPath": "/static/tabbar/category.png",
+ "selectedIconPath": "/static/tabbar/category-s.png",
"text": "绁炲帹",
"key": 'kitchen'
},
{
"pagePath": "/pages/cusbar/video/video",
- "iconPath": "/pages/subComponents/static/tabbar/video1.png",
- "selectedIconPath": "/pages/subComponents/static/tabbar/video1-selected.png",
+ "iconPath": "/static/tabbar/video1.png",
+ "selectedIconPath": "/static/tabbar/video1-selected.png",
"key": 'video'
},
{
"pagePath": "/pages/cusbar/cart/cartList",
- "iconPath": "/pages/subComponents/static/tabbar/cart.png",
- "selectedIconPath": "/pages/subComponents/static/tabbar/cart-s.png",
+ "iconPath": "/static/tabbar/cart.png",
+ "selectedIconPath": "/static/tabbar/cart-s.png",
"text": "璐墿杞�",
"key": 'buyCar'
},
{
"pagePath": "/pages/tabbar/user/my",
- "iconPath": "/pages/subComponents/static/tabbar/mine.png",
- "selectedIconPath": "/pages/subComponents/static/tabbar/mine-s.png",
+ "iconPath": "/static/tabbar/mine.png",
+ "selectedIconPath": "/static/tabbar/mine-s.png",
"text": "鎴戠殑",
"key": 'my'
}
diff --git a/package-lock.json b/package-lock.json
index 48e341a..b9ee42c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,3 +1,101 @@
{
- "lockfileVersion": 1
+ "name": "da-tree 鏍戠粍浠讹紙鏀寔鍗曢�夈�佸閫夈�佹棤闄愮骇銆佷富棰樿壊锛孷ue2鐗堬級",
+ "version": "1.4.1",
+ "lockfileVersion": 1,
+ "requires": true,
+ "dependencies": {
+ "@types/json-schema": {
+ "version": "7.0.15",
+ "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.15.tgz",
+ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
+ },
+ "ajv": {
+ "version": "8.17.1",
+ "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.17.1.tgz",
+ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+ "requires": {
+ "fast-deep-equal": "^3.1.3",
+ "fast-uri": "^3.0.1",
+ "json-schema-traverse": "^1.0.0",
+ "require-from-string": "^2.0.2"
+ }
+ },
+ "ajv-formats": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmmirror.com/ajv-formats/-/ajv-formats-2.1.1.tgz",
+ "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+ "requires": {
+ "ajv": "^8.0.0"
+ }
+ },
+ "ajv-keywords": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+ "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+ "requires": {
+ "fast-deep-equal": "^3.1.3"
+ }
+ },
+ "fast-deep-equal": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+ },
+ "fast-uri": {
+ "version": "3.0.6",
+ "resolved": "https://registry.npmmirror.com/fast-uri/-/fast-uri-3.0.6.tgz",
+ "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw=="
+ },
+ "image-minimizer-webpack-plugin": {
+ "version": "4.1.3",
+ "resolved": "https://registry.npmmirror.com/image-minimizer-webpack-plugin/-/image-minimizer-webpack-plugin-4.1.3.tgz",
+ "integrity": "sha512-yJvYlLAZosu2iqlGF81BEUHfUiWRPD05krtoax9Ffst3Yzbn3X7p04VXambwlx3uhbSwH/BeyM5+bJHQksnuyw==",
+ "requires": {
+ "schema-utils": "^4.2.0",
+ "serialize-javascript": "^6.0.2"
+ }
+ },
+ "json-schema-traverse": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+ },
+ "randombytes": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmmirror.com/randombytes/-/randombytes-2.1.0.tgz",
+ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+ "requires": {
+ "safe-buffer": "^5.1.0"
+ }
+ },
+ "require-from-string": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmmirror.com/require-from-string/-/require-from-string-2.0.2.tgz",
+ "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
+ },
+ "safe-buffer": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+ },
+ "schema-utils": {
+ "version": "4.3.2",
+ "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-4.3.2.tgz",
+ "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
+ "requires": {
+ "@types/json-schema": "^7.0.9",
+ "ajv": "^8.9.0",
+ "ajv-formats": "^2.1.1",
+ "ajv-keywords": "^5.1.0"
+ }
+ },
+ "serialize-javascript": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+ "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+ "requires": {
+ "randombytes": "^2.1.0"
+ }
+ }
+ }
}
diff --git a/package.json b/package.json
index c1e9355..94182fe 100644
--- a/package.json
+++ b/package.json
@@ -15,5 +15,6 @@
"鍓嶇缁勪欢",
"閫氱敤缁勪欢"
]
- }
-}
\ No newline at end of file
+ },
+ "devDependencies": {}
+}
diff --git a/pages.json b/pages.json
index 0b94002..37c23dc 100644
--- a/pages.json
+++ b/pages.json
@@ -397,15 +397,15 @@
{
"root": "pages/mine",
"pages": [
- {
- "path": "signIn",
- "style": {
- "navigationBarTitleText": "绛惧埌",
- "componentPlaceholder": {
- "u-icon": "view"
- }
- }
- },
+ // {
+ // "path": "signIn",
+ // "style": {
+ // "navigationBarTitleText": "绛惧埌",
+ // "componentPlaceholder": {
+ // "u-icon": "view"
+ // }
+ // }
+ // },
{
"path": "myTracks",
"style": {
@@ -422,109 +422,109 @@
}
}
},
- {
- "path": "myCollect",
- "style": {
- "navigationBarTitleText": "鏀惰棌",
- "enablePullDownRefresh": true,
- //涓嬫媺鍒锋柊
- "navigationStyle": "custom",
- "app-plus": {
- "scrollIndicator": "none"
- },
- "componentPlaceholder": {
- "u-navbar": "view",
- "u-tabs": "view",
- "u-empty": "view",
- "u-swipe-action": "view",
- "u-image": "view",
- "u-loading": "view",
- "u-tag": "view"
- }
- }
- },
- {
- "path": "distribution/list",
- "style": {
- "navigationBarTitleText": "鎺ㄥ箍鍒嗕剑",
- "app-plus": {
- //app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
- "scrollIndicator": "none"
- },
- "componentPlaceholder": {
- "u-swipe-action": "view",
- "u-image": "view",
- "u-modal": "view"
- }
- }
- },
- {
- "path": "distribution/withdrawal",
- "style": {
- "navigationBarTitleText": "鎻愮幇",
- "app-plus": {
- //app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
- "scrollIndicator": "none"
- },
- "componentPlaceholder": {
- "u-input": "view"
- }
- }
- },
- {
- "path": "distribution/join",
- "style": {
- "navigationBarTitleText": "鎺ㄥ箍璧勬牸鐢宠",
- "navigationBarTextStyle": "black",
- "app-plus": {
- //app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
- "scrollIndicator": "none"
- },
- "componentPlaceholder": {
- "u-tabs": "view",
- "u-form": "view",
- "u-form-item": "view",
- "u-input": "view",
- "u-button": "view"
- }
- }
- },
- {
- "path": "distribution/history",
- "style": {
- "navigationBarTitleText": "鎻愮幇鍘嗗彶",
- "componentPlaceholder": {
- "u-loadmore": "view"
- }
- }
- },
- {
- "path": "distribution/auth",
- "style": {
- "navigationBarTitleText": "浼氬憳瀹炲悕璁よ瘉",
- "componentPlaceholder": {
- "u-form": "view",
- "u-form-item": "view",
- "u-input": "view",
- "u-button": "view"
- }
- }
- },
- {
- "path": "distribution/achievement",
- "style": {
- "navigationBarTitleText": "鎴戠殑鍒嗛攢涓氱哗"
- }
- },
- {
- "path": "distribution/home",
- "style": {
- "navigationBarTitleText": "鎺ㄥ箍鍒嗕剑",
- "componentPlaceholder": {
- "u-icon": "view"
- }
- }
- },
+ // {
+ // "path": "myCollect",
+ // "style": {
+ // "navigationBarTitleText": "鏀惰棌",
+ // "enablePullDownRefresh": true,
+ // //涓嬫媺鍒锋柊
+ // "navigationStyle": "custom",
+ // "app-plus": {
+ // "scrollIndicator": "none"
+ // },
+ // "componentPlaceholder": {
+ // "u-navbar": "view",
+ // "u-tabs": "view",
+ // "u-empty": "view",
+ // "u-swipe-action": "view",
+ // "u-image": "view",
+ // "u-loading": "view",
+ // "u-tag": "view"
+ // }
+ // }
+ // },
+ // {
+ // "path": "distribution/list",
+ // "style": {
+ // "navigationBarTitleText": "鎺ㄥ箍鍒嗕剑",
+ // "app-plus": {
+ // //app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
+ // "scrollIndicator": "none"
+ // },
+ // "componentPlaceholder": {
+ // "u-swipe-action": "view",
+ // "u-image": "view",
+ // "u-modal": "view"
+ // }
+ // }
+ // },
+ // {
+ // "path": "distribution/withdrawal",
+ // "style": {
+ // "navigationBarTitleText": "鎻愮幇",
+ // "app-plus": {
+ // //app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
+ // "scrollIndicator": "none"
+ // },
+ // "componentPlaceholder": {
+ // "u-input": "view"
+ // }
+ // }
+ // },
+ // {
+ // "path": "distribution/join",
+ // "style": {
+ // "navigationBarTitleText": "鎺ㄥ箍璧勬牸鐢宠",
+ // "navigationBarTextStyle": "black",
+ // "app-plus": {
+ // //app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
+ // "scrollIndicator": "none"
+ // },
+ // "componentPlaceholder": {
+ // "u-tabs": "view",
+ // "u-form": "view",
+ // "u-form-item": "view",
+ // "u-input": "view",
+ // "u-button": "view"
+ // }
+ // }
+ // },
+ // {
+ // "path": "distribution/history",
+ // "style": {
+ // "navigationBarTitleText": "鎻愮幇鍘嗗彶",
+ // "componentPlaceholder": {
+ // "u-loadmore": "view"
+ // }
+ // }
+ // },
+ // {
+ // "path": "distribution/auth",
+ // "style": {
+ // "navigationBarTitleText": "浼氬憳瀹炲悕璁よ瘉",
+ // "componentPlaceholder": {
+ // "u-form": "view",
+ // "u-form-item": "view",
+ // "u-input": "view",
+ // "u-button": "view"
+ // }
+ // }
+ // },
+ // {
+ // "path": "distribution/achievement",
+ // "style": {
+ // "navigationBarTitleText": "鎴戠殑鍒嗛攢涓氱哗"
+ // }
+ // },
+ // {
+ // "path": "distribution/home",
+ // "style": {
+ // "navigationBarTitleText": "鎺ㄥ箍鍒嗕剑",
+ // "componentPlaceholder": {
+ // "u-icon": "view"
+ // }
+ // }
+ // },
{
"path": "deposit/index",
"style": {
@@ -543,12 +543,12 @@
"navigationBarTitleText": "鍏呭�奸噾棰�"
}
},
- {
- "path": "deposit/withdrawal",
- "style": {
- "navigationBarTitleText": "鎻愮幇閲戦"
- }
- },
+ // {
+ // "path": "deposit/withdrawal",
+ // "style": {
+ // "navigationBarTitleText": "鎻愮幇閲戦"
+ // }
+ // },
{
"path": "deposit/info",
"style": {
@@ -567,13 +567,13 @@
}
}
},
- {
- "path": "address/storeAddress",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": "鑷彁鐐�"
- }
- },
+ // {
+ // "path": "address/storeAddress",
+ // "style": {
+ // "enablePullDownRefresh": true,
+ // "navigationBarTitleText": "鑷彁鐐�"
+ // }
+ // },
{
"path": "address/add",
"style": {
@@ -600,24 +600,24 @@
}
}
},
- {
- "path": "set/versionFunctionList",
- "style": {
- "navigationBarTitleText": "鍔熻兘浠嬬粛"
- }
- },
- {
- "path": "set/securityCenter/fingerLogin",
- "style": {
- "navigationBarTitleText": "鎸囩汗鐧诲綍"
- }
- },
- {
- "path": "set/securityCenter/faceLogin",
- "style": {
- "navigationBarTitleText": "闈㈠鐧诲綍"
- }
- },
+ // {
+ // "path": "set/versionFunctionList",
+ // "style": {
+ // "navigationBarTitleText": "鍔熻兘浠嬬粛"
+ // }
+ // },
+ // {
+ // "path": "set/securityCenter/fingerLogin",
+ // "style": {
+ // "navigationBarTitleText": "鎸囩汗鐧诲綍"
+ // }
+ // },
+ // {
+ // "path": "set/securityCenter/faceLogin",
+ // "style": {
+ // "navigationBarTitleText": "闈㈠鐧诲綍"
+ // }
+ // },
{
"path": "set/securityCenter/editPassword",
"style": {
@@ -660,12 +660,12 @@
}
}
},
- {
- "path": "set/securityCenter/securityCenter",
- "style": {
- "navigationBarTitleText": "瀹夊叏涓績"
- }
- },
+ // {
+ // "path": "set/securityCenter/securityCenter",
+ // "style": {
+ // "navigationBarTitleText": "瀹夊叏涓績"
+ // }
+ // },
{
"path": "set/editionIntro",
"style": {
@@ -734,24 +734,24 @@
}
}
},
- {
- "path": "msgTips/main",
- "style": {
- "navigationBarTitleText": "娑堟伅涓績"
- }
- },
- {
- "path": "msgTips/sysMsg/index",
- "style": {
- "navigationBarTitleText": "绯荤粺娑堟伅"
- }
- },
- {
- "path": "msgTips/serviceMsg/index",
- "style": {
- "navigationBarTitleText": "瀹㈡湇璁板綍"
- }
- },
+ // {
+ // "path": "msgTips/main",
+ // "style": {
+ // "navigationBarTitleText": "娑堟伅涓績"
+ // }
+ // },
+ // {
+ // "path": "msgTips/sysMsg/index",
+ // "style": {
+ // "navigationBarTitleText": "绯荤粺娑堟伅"
+ // }
+ // },
+ // {
+ // "path": "msgTips/serviceMsg/index",
+ // "style": {
+ // "navigationBarTitleText": "瀹㈡湇璁板綍"
+ // }
+ // },
{
"path": "msgTips/packageMsg/index",
"style": {
@@ -859,6 +859,7 @@
},
{
"root": "pages/product",
+ // 鍏抽敭閰嶇疆
"pages": [
{
"path": "shopPage",
@@ -1024,6 +1025,7 @@
},
{
"root": "pages/floor",
+
"pages": [
{
"path": "empty"
@@ -1076,6 +1078,7 @@
},
{
"root": "pages/passport",
+
"pages": [
{
"path": "login",
@@ -1184,6 +1187,7 @@
},
{
"root": "pages/promotion",
+
"pages": [
{
"path": "seckill",
@@ -1260,6 +1264,7 @@
},
{
"root": "pages/cart",
+
"pages": [
{
"path": "coupon/myCoupon",
@@ -1331,6 +1336,7 @@
},
{
"root": "pages/order",
+
"pages": [
{
"path": "complain/complain",
@@ -1514,6 +1520,7 @@
},
{
"root": "pages/health",
+
"pages": [
{
"path": "healthVideo",
@@ -1526,6 +1533,7 @@
},
{
"root": "pages/tabbar/home",
+
"pages": [
{
"path": "web-view",
@@ -1535,6 +1543,7 @@
},
{
"root": "pages/kitchen",
+
"pages": [
{
"path": "KitchenVideo",
@@ -1559,6 +1568,7 @@
},
{
"root": "pages/tabbar/user",
+
"pages": [
{
"path": "my",
@@ -1577,6 +1587,7 @@
},
{
"root": "pages/supplier/suppler-order",
+
"pages": [
{
"path": "suppler-order",
@@ -1596,6 +1607,7 @@
},
{
"root": "pages/supplier/publish-goods",
+
"pages": [
{
"path": "publishGoods",
@@ -1624,6 +1636,7 @@
},
{
"root": "pages/goods-manager",
+
"pages": [
{
"path": "goodsList/goodsList",
@@ -1660,6 +1673,7 @@
},
{
"root": "pages/news",
+
"pages": [
{
"path": "news",
@@ -1701,6 +1715,7 @@
},
{
"root": "pages/userPermissions",
+
"pages": [
{
"path": "addStoreMember",
@@ -1747,6 +1762,7 @@
},
{
"root": "pages/commodity-square",
+
"pages": [
{
"path": "commoditySquare",
@@ -1769,6 +1785,7 @@
},
{
"root": "pages/navigation",
+
"pages": [
{
"path": "search/searchPage",
@@ -1797,6 +1814,7 @@
},
{
"root": "pages/cusbar",
+
"pages": [
{
"path": "special/special",
diff --git a/pages/subComponents/m-buy/README.md b/pages/cart/m-buy/README.md
similarity index 100%
rename from pages/subComponents/m-buy/README.md
rename to pages/cart/m-buy/README.md
diff --git a/pages/subComponents/m-buy/goods.vue b/pages/cart/m-buy/goods.vue
similarity index 100%
rename from pages/subComponents/m-buy/goods.vue
rename to pages/cart/m-buy/goods.vue
diff --git a/pages/subComponents/m-buy/popup.js b/pages/cart/m-buy/popup.js
similarity index 100%
rename from pages/subComponents/m-buy/popup.js
rename to pages/cart/m-buy/popup.js
diff --git a/pages/subComponents/m-buy/popup.scss b/pages/cart/m-buy/popup.scss
similarity index 100%
rename from pages/subComponents/m-buy/popup.scss
rename to pages/cart/m-buy/popup.scss
diff --git a/pages/subComponents/m-goods-recommend/README.md b/pages/cart/m-goods-recommend/README.md
similarity index 100%
rename from pages/subComponents/m-goods-recommend/README.md
rename to pages/cart/m-goods-recommend/README.md
diff --git a/pages/subComponents/m-goods-recommend/index.vue b/pages/cart/m-goods-recommend/index.vue
similarity index 96%
rename from pages/subComponents/m-goods-recommend/index.vue
rename to pages/cart/m-goods-recommend/index.vue
index cda8578..245bbc0 100644
--- a/pages/subComponents/m-goods-recommend/index.vue
+++ b/pages/cart/m-goods-recommend/index.vue
@@ -5,7 +5,7 @@
</div>
</template>
<script>
- import goodsTemplate from '@/pages/subComponents/m-goods-list/list.vue'
+ import goodsTemplate from '@/pages/promotion/m-goods-list/list.vue'
import { getGoodsList } from "@/api/goods.js";
export default {
data() {
diff --git a/pages/cart/payment/shareOrderGoods.vue b/pages/cart/payment/shareOrderGoods.vue
index a904ce9..52eed0c 100644
--- a/pages/cart/payment/shareOrderGoods.vue
+++ b/pages/cart/payment/shareOrderGoods.vue
@@ -66,9 +66,9 @@
import '@/components/uview-components/uview-ui'
import { getGoods } from "@/api/goods.js";
import { getPinTuanShare } from "@/api/order";
-import shares from "@/pages/subComponents/m-share/index.vue";
+import shares from "@/pages/cusbar/m-share/index.vue";
import storage from "@/utils/storage.js";
-import popupGoods from "@/pages/subComponents/m-buy/goods.vue"; //璐墿杞﹀晢鍝佺殑妯″潡
+import popupGoods from "@/pages/cart/m-buy/goods.vue"; //璐墿杞﹀晢鍝佺殑妯″潡
export default {
data() {
diff --git a/pages/cart/payment/success.vue b/pages/cart/payment/success.vue
index f692b23..afcdae9 100644
--- a/pages/cart/payment/success.vue
+++ b/pages/cart/payment/success.vue
@@ -25,7 +25,7 @@
</template>
<script>
-import goodsRecommend from "@/pages/subComponents/m-goods-recommend/index.vue";
+import goodsRecommend from "@/pages/cart/m-goods-recommend/index.vue";
export default {
data() {
return {
diff --git a/pages/cusbar/cart/cartList.vue b/pages/cusbar/cart/cartList.vue
index 38e5ea9..5978190 100644
--- a/pages/cusbar/cart/cartList.vue
+++ b/pages/cusbar/cart/cartList.vue
@@ -10,7 +10,7 @@
<image src="/pages/subComponents/static/emptyCart.png" mode="aspectFit"></image>
<view class="empty-tips">
绌虹┖濡備篃
- <navigator class="navigator" url="/pages/tabbar/home/index" open-type="switchTab">闅忎究閫涢��></navigator>
+ <navigator class="navigator" url="/pages/commodity-square/commoditySquare" open-type="navigate">闅忎究閫涢��></navigator>
</view>
</view>
<!-- 搴楅摵鍟嗗搧淇℃伅 -->
diff --git a/pages/subComponents/m-share/index.vue b/pages/cusbar/m-share/index.vue
similarity index 100%
rename from pages/subComponents/m-share/index.vue
rename to pages/cusbar/m-share/index.vue
diff --git a/pages/subComponents/m-share/mp-share.scss b/pages/cusbar/m-share/mp-share.scss
similarity index 100%
rename from pages/subComponents/m-share/mp-share.scss
rename to pages/cusbar/m-share/mp-share.scss
diff --git a/pages/cusbar/video/video.vue b/pages/cusbar/video/video.vue
index c601704..9d44a31 100644
--- a/pages/cusbar/video/video.vue
+++ b/pages/cusbar/video/video.vue
@@ -206,7 +206,7 @@
<script>
import '@/components/uview-components/uview-ui';
-import MyTag from '@/components/my-tag.vue'
+import MyTag from '@/pages/subComponents/my-tag.vue'
import { getSTSToken } from "@/api/common.js";
import { publish } from "@/api/video.js";
diff --git a/pages/mine/address/add.vue b/pages/mine/address/add.vue
index 293a39c..6c3c767 100644
--- a/pages/mine/address/add.vue
+++ b/pages/mine/address/add.vue
@@ -43,8 +43,8 @@
import '@/components/uview-components/uview-ui';
import { addAddress, editAddress, getAddressDetail } from "@/api/address.js";
-import city from "@/pages/subComponents/m-city/m-city.vue";
-import uniMap from "@/components/uniMap";
+import city from "@/pages/mine/m-city/m-city.vue";
+import uniMap from "@/pages/subComponents/uniMap.vue";
import permision from "@/js_sdk/wa-permission/permission.js";
export default {
components: {
diff --git a/pages/mine/im/emojis.js b/pages/mine/im/emojis.js
new file mode 100644
index 0000000..9b41d77
--- /dev/null
+++ b/pages/mine/im/emojis.js
@@ -0,0 +1,145 @@
+/**
+ * 鍔ㄦ�佽〃鎯�
+ */
+const emojis = {
+ "[寰瑧]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/0.gif'>",
+ "[鎾囧槾]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/1.gif'>",
+ "[鑹瞉": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/2.gif'>",
+ "[鍙戝憜]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/3.gif'>",
+ "[寰楁剰]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/4.gif'>",
+ "[娴佹唱]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/5.gif'>",
+ "[瀹崇緸]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/6.gif'>",
+ "[闂槾]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/7.gif'>",
+ "[鐫": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/8.gif'>",
+ "[澶у摥]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/9.gif'>",
+ "[灏村艾]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/10.gif'>",
+ "[鍙戞�抅": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/11.gif'>",
+ "[璋冪毊]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/12.gif'>",
+ "[鍛茬墮]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/13.gif'>",
+ "[鎯婅]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/14.gif'>",
+ "[闅捐繃]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/15.gif'>",
+ "[閰穄": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/16.gif'>",
+ "[鍐锋睏]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/17.gif'>",
+ "[鎶撶媯]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/18.gif'>",
+ "[鍚怾": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/19.gif'>",
+ "[鍋风瑧]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/20.gif'>",
+ "[鍙埍]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/21.gif'>",
+ "[鐧界溂]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/22.gif'>",
+ "[鍌叉參]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/23.gif'>",
+ "[楗ラタ]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/24.gif'>",
+ "[鍥癩": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/25.gif'>",
+ "[鎯婃亹]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/26.gif'>",
+ "[娴佹睏]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/27.gif'>",
+ "[鎲ㄧ瑧]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/28.gif'>",
+ "[澶у叺]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/29.gif'>",
+ "[濂嬫枟]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/30.gif'>",
+ "[鍜掗獋]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/31.gif'>",
+ "[鐤戦棶]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/32.gif'>",
+ "[鍢榏": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/33.gif'>",
+ "[鏅昡": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/34.gif'>",
+ "[鎶樼（]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/35.gif'>",
+ "[琛癩": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/36.gif'>",
+ "[楠烽珔]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/37.gif'>",
+ "[鏁叉墦]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/38.gif'>",
+ "[鍐嶈]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/39.gif'>",
+ "[鎿︽睏]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/40.gif'>",
+ "[鎶犻蓟]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/41.gif'>",
+ "[榧撴帉]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/42.gif'>",
+ "[绯楀ぇ浜哴": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/43.gif'>",
+ "[鍧忕瑧]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/44.gif'>",
+ "[宸﹀摷鍝糫": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/45.gif'>",
+ "[鍙冲摷鍝糫": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/46.gif'>",
+ "[鍝堟瑺]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/47.gif'>",
+ "[閯欒]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/48.gif'>",
+ "[濮斿眻]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/49.gif'>",
+ "[蹇摥浜哴": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/50.gif'>",
+ "[闃撮櫓]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/51.gif'>",
+ "[浜蹭翰]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/52.gif'>",
+ "[鍚揮": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/53.gif'>",
+ "[鍙�淽": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/54.gif'>",
+ "[鑿滃垁]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/55.gif'>",
+ "[瑗跨摐]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/56.gif'>",
+ "[鍟ら厭]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/57.gif'>",
+ "[绡悆]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/58.gif'>",
+ "[涔掍箵]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/59.gif'>",
+ "[鍜栧暋]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/60.gif'>",
+ "[楗璢": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/61.gif'>",
+ "[鐚ご]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/62.gif'>",
+ "[鐜懓]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/63.gif'>",
+ "[鍑嬭阿]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/64.gif'>",
+ "[绀虹埍]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/65.gif'>",
+ "[鐖卞績]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/66.gif'>",
+ "[蹇冪]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/67.gif'>",
+ "[铔嬬硶]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/68.gif'>",
+ "[闂數]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/69.gif'>",
+ "[鐐稿脊]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/70.gif'>",
+ "[鍒�]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/71.gif'>",
+ "[瓒崇悆]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/72.gif'>",
+ "[鐡㈣櫕]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/73.gif'>",
+ "[渚夸究]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/74.gif'>",
+ "[鏈堜寒]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/75.gif'>",
+ "[澶槼]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/76.gif'>",
+ "[绀肩墿]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/77.gif'>",
+ "[鎷ユ姳]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/78.gif'>",
+ "[寮篯": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/79.gif'>",
+ "[寮盷": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/80.gif'>",
+ "[鎻℃墜]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/81.gif'>",
+ "[鑳滃埄]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/82.gif'>",
+ "[鎶辨嫵]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/83.gif'>",
+ "[鍕惧紩]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/84.gif'>",
+ "[鎷冲ご]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/85.gif'>",
+ "[宸姴]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/86.gif'>",
+ "[鐖变綘]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/87.gif'>",
+ "[NO]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/88.gif'>",
+ "[OK]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/89.gif'>",
+ "[鐖辨儏]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/90.gif'>",
+ "[椋炲惢]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/91.gif'>",
+ "[璺宠烦]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/92.gif'>",
+ "[鍙戞姈]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/93.gif'>",
+ "[鎬勭伀]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/94.gif'>",
+ "[杞湀]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/95.gif'>",
+ "[纾曞ご]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/96.gif'>",
+ "[鍥炲ご]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/97.gif'>",
+ "[璺崇怀]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/98.gif'>",
+ "[鎸ユ墜]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/99.gif'>",
+ "[婵�鍔╙": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/100.gif'>",
+ "[琛楄垶]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/101.gif'>",
+ "[鐚惢]": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/102.gif'>",
+ "[宸﹀お鏋乚": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/103.gif'>",
+ "[鍙冲お鏋乚": "<img src='https://res.wx.qq.com/mpres/htmledition/images/icon/emotion/104.gif'>",
+};
+
+/**
+* 绗﹀彿琛ㄦ儏
+*/
+const symbol = [
+ "馃槧", "馃槱", "馃槻", "馃槥", "馃樀", "馃槹", "馃槖", "馃槏", "馃槫", "馃槣", "馃槤", "馃構", "馃槝", "馃槡", "馃樂",
+ "馃槼", "馃槂", "馃槄", "馃槅", "馃榿", "馃槀", "馃槉", "鈽�", "馃槃", "馃槩",
+ "馃槶", "馃槰", "馃槪", "馃槨", "馃槍", "馃槚", "馃様", "馃槺", "馃槳", "馃槒", "馃槗", "馃槬", "馃槴", "馃槈",
+ "鉁�", "鉁�", "鉁�", "馃憡", "馃憤", "鈽�", "馃憜", "馃憞", "馃憟", "馃憠",
+ "馃憢", "馃憦", "馃憣", "馃憥"
+];
+
+const emojisKeys = Object.keys(emojis);
+
+export const emojiList = {
+ symbol,
+ emojis
+}
+
+const regEmoji = emojisKeys.map((value) => '|\\' + value).join('').replace('|', '')
+
+/**
+* 鏇挎崲琛ㄦ儏鏂囧瓧
+*
+* @param {String} content 闇�瑕佹浛鎹㈢殑瀛楃涓�
+*/
+export function textReplaceEmoji (content) {
+ if (!content) {
+ return ""
+ }
+ return content.replace(new RegExp(`(${regEmoji})`, 'gi'), ($0, $1) => {
+ return emojis[$1];
+ });
+}
+export const emojistwo = Object.keys(emojis)
\ No newline at end of file
diff --git a/pages/subComponents/m-city/m-city.vue b/pages/mine/m-city/m-city.vue
similarity index 100%
rename from pages/subComponents/m-city/m-city.vue
rename to pages/mine/m-city/m-city.vue
diff --git a/pages/subComponents/m-city/m-city.vue b/pages/mine/set/m-city/m-city.vue
similarity index 100%
copy from pages/subComponents/m-city/m-city.vue
copy to pages/mine/set/m-city/m-city.vue
diff --git a/pages/mine/set/personMsg.vue b/pages/mine/set/personMsg.vue
index 9f288cd..e330a0c 100644
--- a/pages/mine/set/personMsg.vue
+++ b/pages/mine/set/personMsg.vue
@@ -48,7 +48,7 @@
import { upload } from "@/api/common.js";
import { getFileKey } from "@/utils/file.js";
import storage from "@/utils/storage.js";
-import city from "@/pages/subComponents/m-city/m-city.vue";
+import city from "@/pages/mine/set/m-city/m-city.vue";
export default {
components: { "m-city": city },
data() {
diff --git a/pages/mine/set/securityCenter/bindMobile.vue b/pages/mine/set/securityCenter/bindMobile.vue
index 22c10d0..2bdf4f8 100644
--- a/pages/mine/set/securityCenter/bindMobile.vue
+++ b/pages/mine/set/securityCenter/bindMobile.vue
@@ -36,7 +36,7 @@
bindMobile
} from "@/api/login";
- import myVerification from "@/pages/subComponents/verification/verification.vue"; //楠岃瘉
+ import myVerification from "@/pages/mine/verification/verification.vue"; //楠岃瘉
import uuid from "@/utils/uuid.modified.js";
export default {
components: {
diff --git a/pages/mine/set/securityCenter/editPassword.vue b/pages/mine/set/securityCenter/editPassword.vue
index d13c046..2640062 100644
--- a/pages/mine/set/securityCenter/editPassword.vue
+++ b/pages/mine/set/securityCenter/editPassword.vue
@@ -53,7 +53,7 @@
import {
md5
} from "@/utils/md5.js"; // md5
- import myVerification from "@/pages/subComponents/verification/verification.vue"; //楠岃瘉
+ import myVerification from "@/pages/mine/verification/verification.vue"; //楠岃瘉
import uuid from "@/utils/uuid.modified.js";
export default {
components: {
diff --git a/pages/subComponents/verification/animation.css b/pages/mine/verification/animation.css
similarity index 100%
rename from pages/subComponents/verification/animation.css
rename to pages/mine/verification/animation.css
diff --git a/pages/subComponents/verification/icon.css b/pages/mine/verification/icon.css
similarity index 100%
rename from pages/subComponents/verification/icon.css
rename to pages/mine/verification/icon.css
diff --git a/pages/subComponents/verification/verification.vue b/pages/mine/verification/verification.vue
similarity index 100%
rename from pages/subComponents/verification/verification.vue
rename to pages/mine/verification/verification.vue
diff --git a/pages/subComponents/m-goods-list/README.md b/pages/navigation/m-goods-list/README.md
similarity index 100%
rename from pages/subComponents/m-goods-list/README.md
rename to pages/navigation/m-goods-list/README.md
diff --git a/pages/subComponents/m-goods-list/base-list.vue b/pages/navigation/m-goods-list/base-list.vue
similarity index 98%
rename from pages/subComponents/m-goods-list/base-list.vue
rename to pages/navigation/m-goods-list/base-list.vue
index 2098442..bf28149 100644
--- a/pages/subComponents/m-goods-list/base-list.vue
+++ b/pages/navigation/m-goods-list/base-list.vue
@@ -116,7 +116,7 @@
</template>
<script>
-import commonTpl from "@/pages/subComponents/m-goods-list/common.vue";
+import commonTpl from "@/pages/navigation/m-goods-list/common.vue";
export default {
data() {
return {
diff --git a/pages/subComponents/m-goods-list/common.vue b/pages/navigation/m-goods-list/common.vue
similarity index 100%
rename from pages/subComponents/m-goods-list/common.vue
rename to pages/navigation/m-goods-list/common.vue
diff --git a/pages/subComponents/m-goods-list/list.vue b/pages/navigation/m-goods-list/list.vue
similarity index 98%
rename from pages/subComponents/m-goods-list/list.vue
rename to pages/navigation/m-goods-list/list.vue
index 37ad901..b459273 100644
--- a/pages/subComponents/m-goods-list/list.vue
+++ b/pages/navigation/m-goods-list/list.vue
@@ -103,7 +103,7 @@
<script>
import '@/components/uview-components/uview-ui';
- import commonTpl from '@/pages/subComponents/m-goods-list/common.vue'
+ import commonTpl from '@/pages/navigation/m-goods-list/common.vue'
export default {
data() {
return {
diff --git a/pages/subComponents/m-goods-list/promotion.vue b/pages/navigation/m-goods-list/promotion.vue
similarity index 97%
rename from pages/subComponents/m-goods-list/promotion.vue
rename to pages/navigation/m-goods-list/promotion.vue
index 0e66445..df0a4af 100644
--- a/pages/subComponents/m-goods-list/promotion.vue
+++ b/pages/navigation/m-goods-list/promotion.vue
@@ -45,7 +45,7 @@
<script>
import '@/components/uview-components/uview-ui'
- import commonTpl from '@/pages/subComponents/m-goods-list/common.vue'
+ import commonTpl from '@/pages/navigation/m-goods-list/common.vue'
export default {
data() {
return {
diff --git a/pages/subComponents/m-search-revision/m-search-revision.vue b/pages/navigation/m-search-revision/m-search-revision.vue
similarity index 100%
rename from pages/subComponents/m-search-revision/m-search-revision.vue
rename to pages/navigation/m-search-revision/m-search-revision.vue
diff --git a/pages/navigation/search/searchPage.vue b/pages/navigation/search/searchPage.vue
index 25f532e..53893a3 100644
--- a/pages/navigation/search/searchPage.vue
+++ b/pages/navigation/search/searchPage.vue
@@ -206,9 +206,9 @@
import '@/components/uview-components/uview-ui';
import { getGoodsList, getGoodsRelated } from '@/api/goods.js';
-import goodsList from '@/pages/subComponents/m-goods-list/list.vue';
+import goodsList from '@/pages/navigation/m-goods-list/list.vue';
import { getHotKeywords } from '@/api/home.js';
-import mSearch from '@/pages/subComponents/m-search-revision/m-search-revision.vue';
+import mSearch from '@/pages/navigation/m-search-revision/m-search-revision.vue';
import storage from '@/utils/storage';
export default {
components: {
diff --git a/pages/order/afterSales/afterSalesDetail.vue b/pages/order/afterSales/afterSalesDetail.vue
index 30161e9..a157028 100644
--- a/pages/order/afterSales/afterSalesDetail.vue
+++ b/pages/order/afterSales/afterSalesDetail.vue
@@ -104,7 +104,7 @@
getAfterSaleInfo,
} from "@/api/after-sale";
-import city from "@/pages/subComponents/m-city/m-city.vue";
+import city from "@/pages/order/m-city/m-city.vue";
import { upload } from "@/api/common.js";
import { checkBankno } from "@/utils/Foundation";
import storage from "@/utils/storage.js";
diff --git a/pages/subComponents/m-city/m-city.vue b/pages/order/m-city/m-city.vue
similarity index 100%
copy from pages/subComponents/m-city/m-city.vue
copy to pages/order/m-city/m-city.vue
diff --git a/pages/subComponents/m-share/index.vue b/pages/order/m-share/index.vue
similarity index 100%
copy from pages/subComponents/m-share/index.vue
copy to pages/order/m-share/index.vue
diff --git a/pages/subComponents/m-share/mp-share.scss b/pages/order/m-share/mp-share.scss
similarity index 100%
copy from pages/subComponents/m-share/mp-share.scss
copy to pages/order/m-share/mp-share.scss
diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue
index 29e10f4..a1ce441 100644
--- a/pages/order/orderDetail.vue
+++ b/pages/order/orderDetail.vue
@@ -267,7 +267,7 @@
import { getExpress, getPackage ,buyBack} from "@/api/trade.js";
import { cancelOrder, confirmReceipt, getOrderDetail } from "@/api/order.js";
-import shares from "@/pages/subComponents/m-share/index.vue"; //鍒嗕韩
+import shares from "@/pages/order/m-share/index.vue"; //鍒嗕韩
import { getClearReason } from "@/api/after-sale.js";
diff --git a/pages/passport/entry/seller/step1.vue b/pages/passport/entry/seller/step1.vue
index d0344b9..9aeeaa6 100644
--- a/pages/passport/entry/seller/step1.vue
+++ b/pages/passport/entry/seller/step1.vue
@@ -182,7 +182,7 @@
import '@/components/uview-components/uview-ui';
import { applyFirst } from "@/api/entry";
-import city from "@/pages/subComponents/m-city/m-city.vue";
+import city from "@/pages/passport/m-city/m-city.vue";
import storage from "@/utils/storage.js";
import { upload } from "@/api/common.js";
import * as RegExp from "@/utils/RegExp.js";
diff --git a/pages/passport/entry/seller/step3.vue b/pages/passport/entry/seller/step3.vue
index 4ccb3da..111b531 100644
--- a/pages/passport/entry/seller/step3.vue
+++ b/pages/passport/entry/seller/step3.vue
@@ -115,10 +115,10 @@
import { applyThird } from "@/api/entry";
import { getCategoryList } from "@/api/goods";
-import city from "@/pages/subComponents/m-city/m-city.vue";
+import city from "@/pages/passport/m-city/m-city.vue";
import storage from "@/utils/storage.js";
import { upload } from "@/api/common.js";
-import uniMap from "@/components/uniMap";
+import uniMap from "@/pages/subComponents/uniMap.vue";
import permision from "@/js_sdk/wa-permission/permission.js";
export default {
components: { "m-city": city, uniMap},
diff --git a/pages/passport/login.vue b/pages/passport/login.vue
index 8529c74..af5d29b 100644
--- a/pages/passport/login.vue
+++ b/pages/passport/login.vue
@@ -93,7 +93,7 @@
smsLogin,
userLogin
} from "@/api/login";
- import myVerification from "@/pages/subComponents/verification/verification.vue"; //楠岃瘉鐮佹ā鍧�
+ import myVerification from "@/pages/passport/verification/verification.vue"; //楠岃瘉鐮佹ā鍧�
import uuid from "@/utils/uuid.modified.js"; // uuid
import verifyCode from "@/pages/passport/verify-code/verify-code";
import {
diff --git a/pages/subComponents/m-city/m-city.vue b/pages/passport/m-city/m-city.vue
similarity index 100%
copy from pages/subComponents/m-city/m-city.vue
copy to pages/passport/m-city/m-city.vue
diff --git a/pages/subComponents/verification/animation.css b/pages/passport/verification/animation.css
similarity index 100%
copy from pages/subComponents/verification/animation.css
copy to pages/passport/verification/animation.css
diff --git a/pages/subComponents/verification/icon.css b/pages/passport/verification/icon.css
similarity index 100%
copy from pages/subComponents/verification/icon.css
copy to pages/passport/verification/icon.css
diff --git a/pages/subComponents/verification/verification.vue b/pages/passport/verification/verification.vue
similarity index 100%
copy from pages/subComponents/verification/verification.vue
copy to pages/passport/verification/verification.vue
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 2b8dd2e..b905084 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -299,9 +299,9 @@
import storeLayout from "./product/shop/-shop"; //搴楅摵缁勪欢
import Evaluation from "./product/evaluation/-evaluation"; //璇勪环缁勪欢
import GoodsSwiper from "./product/goods/-goods-swiper"; //杞挱鍥剧粍浠�
-import popupGoods from "@/pages/subComponents/m-buy/goods.vue"; //璐墿杞﹀晢鍝佺殑妯″潡
+import popupGoods from "@/pages/product/m-buy/goods.vue"; //璐墿杞﹀晢鍝佺殑妯″潡
import popupAddress from "./product/popup/address"; //鍦板潃閫夋嫨妯″潡
-import shares from "@/pages/subComponents/m-share/index.vue"; //鍒嗕韩
+import shares from "@/pages/product/m-share/index.vue"; //鍒嗕韩
import popups from "@/pages/product/popups/popups.vue"; //姘旀场妗�
import takeDownFormSaleGoods from "@/pages/product/m-take-down-sale-goods/index"; //涓嬫灦妗�
import setup from "./product/popup/popup";
diff --git a/pages/subComponents/m-buy/README.md b/pages/product/m-buy/README.md
similarity index 100%
copy from pages/subComponents/m-buy/README.md
copy to pages/product/m-buy/README.md
diff --git a/pages/subComponents/m-buy/goods.vue b/pages/product/m-buy/goods.vue
similarity index 100%
copy from pages/subComponents/m-buy/goods.vue
copy to pages/product/m-buy/goods.vue
diff --git a/pages/subComponents/m-buy/popup.js b/pages/product/m-buy/popup.js
similarity index 100%
copy from pages/subComponents/m-buy/popup.js
copy to pages/product/m-buy/popup.js
diff --git a/pages/subComponents/m-buy/popup.scss b/pages/product/m-buy/popup.scss
similarity index 100%
copy from pages/subComponents/m-buy/popup.scss
copy to pages/product/m-buy/popup.scss
diff --git a/pages/subComponents/m-goods-list/README.md b/pages/product/m-goods-list/README.md
similarity index 100%
copy from pages/subComponents/m-goods-list/README.md
copy to pages/product/m-goods-list/README.md
diff --git a/pages/subComponents/m-goods-list/base-list.vue b/pages/product/m-goods-list/base-list.vue
similarity index 98%
copy from pages/subComponents/m-goods-list/base-list.vue
copy to pages/product/m-goods-list/base-list.vue
index 2098442..62d57a4 100644
--- a/pages/subComponents/m-goods-list/base-list.vue
+++ b/pages/product/m-goods-list/base-list.vue
@@ -116,7 +116,7 @@
</template>
<script>
-import commonTpl from "@/pages/subComponents/m-goods-list/common.vue";
+import commonTpl from "@/pages/product/m-goods-list/common.vue";
export default {
data() {
return {
diff --git a/pages/subComponents/m-goods-list/common.vue b/pages/product/m-goods-list/common.vue
similarity index 100%
copy from pages/subComponents/m-goods-list/common.vue
copy to pages/product/m-goods-list/common.vue
diff --git a/pages/subComponents/m-goods-list/list.vue b/pages/product/m-goods-list/list.vue
similarity index 98%
copy from pages/subComponents/m-goods-list/list.vue
copy to pages/product/m-goods-list/list.vue
index 37ad901..fa54ff5 100644
--- a/pages/subComponents/m-goods-list/list.vue
+++ b/pages/product/m-goods-list/list.vue
@@ -103,7 +103,7 @@
<script>
import '@/components/uview-components/uview-ui';
- import commonTpl from '@/pages/subComponents/m-goods-list/common.vue'
+ import commonTpl from '@/pages/product/m-goods-list/common.vue'
export default {
data() {
return {
diff --git a/pages/subComponents/m-goods-list/promotion.vue b/pages/product/m-goods-list/promotion.vue
similarity index 97%
copy from pages/subComponents/m-goods-list/promotion.vue
copy to pages/product/m-goods-list/promotion.vue
index 0e66445..90bc250 100644
--- a/pages/subComponents/m-goods-list/promotion.vue
+++ b/pages/product/m-goods-list/promotion.vue
@@ -45,7 +45,7 @@
<script>
import '@/components/uview-components/uview-ui'
- import commonTpl from '@/pages/subComponents/m-goods-list/common.vue'
+ import commonTpl from '@/pages/product/m-goods-list/common.vue'
export default {
data() {
return {
diff --git a/pages/subComponents/m-goods-recommend/README.md b/pages/product/m-goods-recommend/README.md
similarity index 100%
copy from pages/subComponents/m-goods-recommend/README.md
copy to pages/product/m-goods-recommend/README.md
diff --git a/pages/subComponents/m-goods-recommend/index.vue b/pages/product/m-goods-recommend/index.vue
similarity index 96%
copy from pages/subComponents/m-goods-recommend/index.vue
copy to pages/product/m-goods-recommend/index.vue
index cda8578..245bbc0 100644
--- a/pages/subComponents/m-goods-recommend/index.vue
+++ b/pages/product/m-goods-recommend/index.vue
@@ -5,7 +5,7 @@
</div>
</template>
<script>
- import goodsTemplate from '@/pages/subComponents/m-goods-list/list.vue'
+ import goodsTemplate from '@/pages/promotion/m-goods-list/list.vue'
import { getGoodsList } from "@/api/goods.js";
export default {
data() {
diff --git a/pages/subComponents/m-share/index.vue b/pages/product/m-share/index.vue
similarity index 100%
copy from pages/subComponents/m-share/index.vue
copy to pages/product/m-share/index.vue
diff --git a/pages/subComponents/m-share/mp-share.scss b/pages/product/m-share/mp-share.scss
similarity index 100%
copy from pages/subComponents/m-share/mp-share.scss
copy to pages/product/m-share/mp-share.scss
diff --git a/pages/product/m-take-down-sale-goods/index.vue b/pages/product/m-take-down-sale-goods/index.vue
index 64da83c..2d8709f 100644
--- a/pages/product/m-take-down-sale-goods/index.vue
+++ b/pages/product/m-take-down-sale-goods/index.vue
@@ -14,7 +14,7 @@
<script>
import '@/components/uview-components/uview-ui';
-import goodsRecommend from "@/pages/subComponents/m-goods-recommend/index.vue";
+import goodsRecommend from "@/pages/product/m-goods-recommend/index.vue";
export default {
components: { goodsRecommend },
diff --git a/pages/product/product/goods/-goods-recommend.vue b/pages/product/product/goods/-goods-recommend.vue
index e0a6f9a..0a8b6a1 100644
--- a/pages/product/product/goods/-goods-recommend.vue
+++ b/pages/product/product/goods/-goods-recommend.vue
@@ -6,7 +6,7 @@
</template>
<script>
-import goodsList from '@/pages/subComponents/m-goods-list/list.vue'
+import goodsList from '@/pages/product/m-goods-list/list.vue'
export default {
props: ["res"],
components:{goodsList},
diff --git a/pages/product/product/popup/address.vue b/pages/product/product/popup/address.vue
index cab76dd..dbfc807 100644
--- a/pages/product/product/popup/address.vue
+++ b/pages/product/product/popup/address.vue
@@ -29,7 +29,7 @@
<script>
import '@/components/uview-components/uview-ui';
-import setup from "@/pages/subComponents/m-buy/popup.js";
+import setup from "@/pages/product/m-buy/popup.js";
/************璇锋眰瀛樺偍***************/
import * as API_Address from "@/api/address.js";
@@ -159,7 +159,7 @@
border-radius: 50%;
border: 2rpx solid #ededed;
}
-@import "@/pages/subComponents/m-buy/popup.scss";
+@import "@/pages/product/m-buy/popup.scss";
.view-box {
height: 810rpx;
// #ifdef MP-WEIXIN
diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue
index 4a901a7..b0062c2 100644
--- a/pages/product/shopPage.vue
+++ b/pages/product/shopPage.vue
@@ -177,7 +177,7 @@
import tpl_search from "@/pages/tabbar/home/template/tpl_search"; //鎼滅储鏍�
import tpl_group from "@/pages/tabbar/home/template/tpl_group"; //
import tpl_goods from "@/pages/tabbar/home/template/tpl_goods"; //鍟嗗搧鍒嗙被浠ュ強鍒嗙被涓殑鍟嗗搧
-import goodsTemplate from '@/pages/subComponents/m-goods-list/list.vue'
+import goodsTemplate from '@/pages/product/m-goods-list/list.vue'
import { getStoreBaseInfo, getStoreCategory } from "@/api/store.js";
import {
receiveCoupons,
diff --git a/pages/product/shopPageGoods.vue b/pages/product/shopPageGoods.vue
index 8638f42..ba4c3c1 100644
--- a/pages/product/shopPageGoods.vue
+++ b/pages/product/shopPageGoods.vue
@@ -15,7 +15,7 @@
import {
getGoodsList
} from "@/api/goods.js";
- import goodsTemplate from '@/pages/subComponents/m-goods-list/list.vue'
+ import goodsTemplate from '@/pages/product/m-goods-list/list.vue'
export default {
data() {
return {
diff --git a/pages/promotion/bargain/detail.vue b/pages/promotion/bargain/detail.vue
index 8e3ced9..2f6ef16 100644
--- a/pages/promotion/bargain/detail.vue
+++ b/pages/promotion/bargain/detail.vue
@@ -112,7 +112,7 @@
<script>
import '@/components/uview-components/uview-ui'
-import popupGoods from "@/pages/subComponents/m-buy/goods.vue"; //璐墿杞﹀晢鍝佺殑妯″潡
+import popupGoods from "@/pages/promotion/m-buy/goods.vue"; //璐墿杞﹀晢鍝佺殑妯″潡
import {
getBargainDetail,
getBargainActivity,
@@ -120,7 +120,7 @@
getBargainLog,
helpBargain,
} from "@/api/promotions";
-import shares from "@/pages/subComponents/m-share/index.vue";
+import shares from "@/pages/promotion/m-share/index.vue";
import config from "@/config/config";
export default {
components: {
diff --git a/pages/promotion/bargain/list.vue b/pages/promotion/bargain/list.vue
index 07e2f95..d01d23f 100644
--- a/pages/promotion/bargain/list.vue
+++ b/pages/promotion/bargain/list.vue
@@ -18,7 +18,7 @@
<script>
import '@/components/uview-components/uview-ui'
import { getBargainList } from "@/api/promotions";
-import goodsTemplate from '@/pages/subComponents/m-goods-list/promotion.vue'
+import goodsTemplate from '@/pages/promotion/m-goods-list/promotion.vue'
export default {
components:{goodsTemplate},
data() {
diff --git a/pages/promotion/joinGroup.vue b/pages/promotion/joinGroup.vue
index 8cd3e3e..705a8ec 100644
--- a/pages/promotion/joinGroup.vue
+++ b/pages/promotion/joinGroup.vue
@@ -33,7 +33,7 @@
import '@/components/uview-components/uview-ui'
import * as API_Promotions from "@/api/promotions";
import * as API_Goods from "@/api/goods";
- import goodsTemplate from '@/pages/subComponents/m-goods-list/promotion.vue'
+ import goodsTemplate from '@/pages/promotion/m-goods-list/promotion.vue'
export default {
components: {
goodsTemplate
diff --git a/pages/subComponents/m-buy/README.md b/pages/promotion/m-buy/README.md
similarity index 100%
copy from pages/subComponents/m-buy/README.md
copy to pages/promotion/m-buy/README.md
diff --git a/pages/subComponents/m-buy/goods.vue b/pages/promotion/m-buy/goods.vue
similarity index 100%
copy from pages/subComponents/m-buy/goods.vue
copy to pages/promotion/m-buy/goods.vue
diff --git a/pages/subComponents/m-buy/popup.js b/pages/promotion/m-buy/popup.js
similarity index 100%
copy from pages/subComponents/m-buy/popup.js
copy to pages/promotion/m-buy/popup.js
diff --git a/pages/subComponents/m-buy/popup.scss b/pages/promotion/m-buy/popup.scss
similarity index 100%
copy from pages/subComponents/m-buy/popup.scss
copy to pages/promotion/m-buy/popup.scss
diff --git a/pages/subComponents/m-goods-list/README.md b/pages/promotion/m-goods-list/README.md
similarity index 100%
copy from pages/subComponents/m-goods-list/README.md
copy to pages/promotion/m-goods-list/README.md
diff --git a/pages/subComponents/m-goods-list/base-list.vue b/pages/promotion/m-goods-list/base-list.vue
similarity index 98%
copy from pages/subComponents/m-goods-list/base-list.vue
copy to pages/promotion/m-goods-list/base-list.vue
index 2098442..62d57a4 100644
--- a/pages/subComponents/m-goods-list/base-list.vue
+++ b/pages/promotion/m-goods-list/base-list.vue
@@ -116,7 +116,7 @@
</template>
<script>
-import commonTpl from "@/pages/subComponents/m-goods-list/common.vue";
+import commonTpl from "@/pages/product/m-goods-list/common.vue";
export default {
data() {
return {
diff --git a/pages/subComponents/m-goods-list/common.vue b/pages/promotion/m-goods-list/common.vue
similarity index 100%
copy from pages/subComponents/m-goods-list/common.vue
copy to pages/promotion/m-goods-list/common.vue
diff --git a/pages/subComponents/m-goods-list/list.vue b/pages/promotion/m-goods-list/list.vue
similarity index 98%
copy from pages/subComponents/m-goods-list/list.vue
copy to pages/promotion/m-goods-list/list.vue
index 37ad901..fa54ff5 100644
--- a/pages/subComponents/m-goods-list/list.vue
+++ b/pages/promotion/m-goods-list/list.vue
@@ -103,7 +103,7 @@
<script>
import '@/components/uview-components/uview-ui';
- import commonTpl from '@/pages/subComponents/m-goods-list/common.vue'
+ import commonTpl from '@/pages/product/m-goods-list/common.vue'
export default {
data() {
return {
diff --git a/pages/subComponents/m-goods-list/promotion.vue b/pages/promotion/m-goods-list/promotion.vue
similarity index 97%
copy from pages/subComponents/m-goods-list/promotion.vue
copy to pages/promotion/m-goods-list/promotion.vue
index 0e66445..90bc250 100644
--- a/pages/subComponents/m-goods-list/promotion.vue
+++ b/pages/promotion/m-goods-list/promotion.vue
@@ -45,7 +45,7 @@
<script>
import '@/components/uview-components/uview-ui'
- import commonTpl from '@/pages/subComponents/m-goods-list/common.vue'
+ import commonTpl from '@/pages/product/m-goods-list/common.vue'
export default {
data() {
return {
diff --git a/pages/subComponents/m-share/index.vue b/pages/promotion/m-share/index.vue
similarity index 100%
copy from pages/subComponents/m-share/index.vue
copy to pages/promotion/m-share/index.vue
diff --git a/pages/subComponents/m-share/mp-share.scss b/pages/promotion/m-share/mp-share.scss
similarity index 100%
copy from pages/subComponents/m-share/mp-share.scss
copy to pages/promotion/m-share/mp-share.scss
diff --git a/pages/promotion/point/detail.vue b/pages/promotion/point/detail.vue
index 44a04bc..24e0599 100644
--- a/pages/promotion/point/detail.vue
+++ b/pages/promotion/point/detail.vue
@@ -52,7 +52,7 @@
<script>
import '@/components/uview-components/uview-ui'
-import popupGoods from "@/pages/subComponents/m-buy/goods.vue"; //璐墿杞﹀晢鍝佺殑妯″潡
+import popupGoods from "@/pages/promotion/m-buy/goods.vue"; //璐墿杞﹀晢鍝佺殑妯″潡
import { getPointsGoodsDetail } from "@/api/promotions";
export default {
components: {
diff --git a/pages/promotion/seckill.vue b/pages/promotion/seckill.vue
index 3b1e365..32b24bc 100644
--- a/pages/promotion/seckill.vue
+++ b/pages/promotion/seckill.vue
@@ -38,7 +38,7 @@
getSeckillTimeGoods
} from "@/api/promotions.js";
import Foundation from "@/utils/Foundation.js";
- import goodsTemplate from '@/pages/subComponents/m-goods-list/promotion.vue'
+ import goodsTemplate from '@/pages/promotion/m-goods-list/promotion.vue'
export default {
components: {
goodsTemplate
diff --git a/components/my-tag.vue b/pages/subComponents/my-tag.vue
similarity index 100%
rename from components/my-tag.vue
rename to pages/subComponents/my-tag.vue
diff --git a/components/uniMap.vue b/pages/subComponents/uniMap.vue
similarity index 100%
rename from components/uniMap.vue
rename to pages/subComponents/uniMap.vue
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index e3cc1f9..d2e4e9d 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -6,77 +6,77 @@
<div class="paddingBox">
<view class="interact-container">
<view class="interact-item" @click="navigateTo('/pages/mine/address/addressManage')">
- <image src="/pages/subComponents/static/mine/myaddress.png" mode=""></image>
+ <image src="/static/mine/myaddress.png" mode=""></image>
<view>鍦板潃绠＄悊</view>
</view>
<!-- <view class="interact-item" @click="navigateTo('/pages/mine/myTracks')">
- <image src="/pages/subComponents/static/mine/logistics.png" mode=""></image>
+ <image src="/static/mine/logistics.png" mode=""></image>
<view>鎴戠殑瓒宠抗</view>
</view> -->
<view class="interact-item" @click="navigateTo('/pages/order/evaluate/myEvaluate')">
- <image src="/pages/subComponents/static/mine/feedback.png" mode=""></image>
+ <image src="/static/mine/feedback.png" mode=""></image>
<view>鎴戠殑璇勪环</view>
</view>
<!-- <view class="interact-item" @click="linkMsgDetail()">
- <image src="/pages/subComponents/static/mine/mycommit.png" mode=""></image>
+ <image src="/static/mine/mycommit.png" mode=""></image>
<view>鎴戠殑娑堟伅</view>
</view> -->
<!-- <view class="interact-item" @click="navigateTo('/pages/mine/myCollect')">
- <image src="/pages/subComponents/static/mine/myfavorite.png" mode=""></image>
+ <image src="/static/mine/myfavorite.png" mode=""></image>
<view>鎴戠殑鍏虫敞</view>
</view> -->
<view class="interact-item" @click="navigateTo('/pages/mine/point/myPoint')">
- <image src="/pages/subComponents/static/mine/mypoint.png" mode=""></image>
+ <image src="/static/mine/mypoint.png" mode=""></image>
<view>鎴戠殑绉垎</view>
</view>
<!-- <view class="interact-item" @click="distribution">
- <image src="/pages/subComponents/static/mine/distribution.png" mode=""></image>
+ <image src="/static/mine/distribution.png" mode=""></image>
<view>鎴戠殑鍒嗛攢</view>
</view> -->
<!-- <view class="interact-item" @click="navigateTo('/pages/mine/myCollect')">
- <image src="/pages/subComponents/static/mine/shensu.png" mode=""></image>
+ <image src="/static/mine/shensu.png" mode=""></image>
<view>鎴戠殑鏀惰棌</view>
</view> -->
<!-- <view class="interact-item" @click="navigateTo('/pages/mine/activity/myActivity')">
- <image src="/pages/subComponents/static/mine/shensu.png" mode=""></image>
+ <image src="/static/mine/shensu.png" mode=""></image>
<view>鎴戠殑娲诲姩</view>
</view> -->
<!-- <view class="interact-item" @click="navigateTo('/pages/mine/myCollect/myCollect')">
- <image src="/pages/subComponents/static/mine/shensu.png" mode=""></image>
+ <image src="/static/mine/shensu.png" mode=""></image>
<view>鎴戠殑鏀惰棌</view>
</view> -->
<view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/userPermissions/userPermissions')">
- <image src="/pages/subComponents/static/mine/shensu.png" mode=""></image>
+ <image src="/static/mine/shensu.png" mode=""></image>
<view>鐢ㄦ埛鏉冮檺</view>
</view>
<view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/news/news')">
- <image src="/pages/subComponents/static/mine/shensu.png" mode=""></image>
+ <image src="/static/mine/shensu.png" mode=""></image>
<view>鏂伴椈</view>
</view>
<!-- <view class="interact-item" v-if="isStoreManger" @click="navigateTo('/pages/customerManager/customerManager')">
- <image src="/pages/subComponents/static/mine/shensu.png" mode=""></image>
+ <image src="/static/mine/shensu.png" mode=""></image>
<view>瀹㈡埛绠＄悊</view>
</view> -->
<view class="interact-item" @click="navigateTo('/pages/order/complain/complainList')">
- <image src="/pages/subComponents/static/mine/shensu.png" mode=""></image>
+ <image src="/static/mine/shensu.png" mode=""></image>
<view>鎴戠殑鎶曡瘔</view>
</view>
<view class="interact-item" @click="navigateTo('/pages/cart/coupon/myCoupon')">
- <image src="/pages/subComponents/static/mine/mycoupon.png" mode=""></image>
+ <image src="/static/mine/mycoupon.png" mode=""></image>
<view>浼樻儬鍒�</view>
</view>
@@ -84,50 +84,50 @@
<!-- <view class="interact-item" @click="navigateTo('/pages/mine/signIn')">
- <image src="/pages/subComponents/static/mine/sign.png" mode=""></image>
+ <image src="/static/mine/sign.png" mode=""></image>
<view>姣忔棩绛惧埌</view>
</view> -->
<view class="interact-item" @click="navigateTo('/pages/cart/coupon/couponCenter')">
- <image src="/pages/subComponents/static/mine/couponcenter.png" mode=""></image>
+ <image src="/static/mine/couponcenter.png" mode=""></image>
<view>棰嗗埜涓績</view>
</view>
<!-- <view class="interact-item" @click="navigateTo('/pages/promotion/bargain/log')">
- <image src="/pages/subComponents/static/mine/kanjia.png" mode=""></image>
+ <image src="/static/mine/kanjia.png" mode=""></image>
<view>鐮嶄环璁板綍</view>
</view> -->
<view class="interact-item" @click="navigateTo('/pages/mine/set/feedBack')">
- <image src="/pages/subComponents/static/mine/feedback.png" mode=""></image>
+ <image src="/static/mine/feedback.png" mode=""></image>
<view>鎰忚鍙嶉</view>
</view>
<view class="interact-item" @click="navigateTo('/pages/mine/set/editionIntro')">
- <image src="/pages/subComponents/static/mine/pointgift.png" mode=""></image>
+ <image src="/static/mine/pointgift.png" mode=""></image>
<view>鍏充簬</view>
</view>
<view class="interact-item" @click="navigateTo('/pages/passport/entry/seller/index')">
- <image src="/pages/subComponents/static/mine/feedback.png" mode=""></image>
+ <image src="/static/mine/feedback.png" mode=""></image>
<view>搴楅摵鍏ラ┗</view>
</view>
<view class="interact-item" @click="navigateTo('/pages/mine/set/setUp')">
- <image src="/pages/subComponents/static/mine/setting.png" mode=""></image>
+ <image src="/static/mine/setting.png" mode=""></image>
<view>璁剧疆</view>
</view>
<view class="interact-item" @click="navigateTo('/pages/goods-manager/goodsList/goodsList')">
- <image src="/pages/subComponents/static/mine/setting.png" mode=""></image>
+ <image src="/static/mine/setting.png" mode=""></image>
<view>鍟嗗搧绠＄悊</view>
</view>
<view class="interact-item" @click="navigateTo('/pages/supplier/suppler-order/suppler-order')">
- <image src="/pages/subComponents/static/mine/order.png" mode=""></image>
+ <image src="/static/mine/order.png" mode=""></image>
<view>鍟嗘埛璁㈠崟绠＄悊</view>
</view>
diff --git a/pages/video/video-edit.vue b/pages/video/video-edit.vue
index 1cbdbaa..1b15ab4 100644
--- a/pages/video/video-edit.vue
+++ b/pages/video/video-edit.vue
@@ -206,7 +206,7 @@
<script>
import '@/components/uview-components/uview-ui';
-import MyTag from '@/components/my-tag.vue'
+import MyTag from '@/pages/subComponents/my-tag.vue'
import { getSTSToken, getFilePreviewUrl } from "@/api/common.js";
import { updateVideo, getVideoDetail } from "@/api/video.js";
diff --git a/pages/subComponents/static/mine/couponcenter.png b/static/mine/couponcenter.png
similarity index 100%
rename from pages/subComponents/static/mine/couponcenter.png
rename to static/mine/couponcenter.png
Binary files differ
diff --git a/pages/subComponents/static/mine/distribution.png b/static/mine/distribution.png
similarity index 100%
rename from pages/subComponents/static/mine/distribution.png
rename to static/mine/distribution.png
Binary files differ
diff --git a/pages/subComponents/static/mine/feedback.png b/static/mine/feedback.png
similarity index 100%
rename from pages/subComponents/static/mine/feedback.png
rename to static/mine/feedback.png
Binary files differ
diff --git a/pages/subComponents/static/mine/im.png b/static/mine/im.png
similarity index 100%
rename from pages/subComponents/static/mine/im.png
rename to static/mine/im.png
Binary files differ
diff --git a/pages/subComponents/static/mine/kanjia.png b/static/mine/kanjia.png
similarity index 100%
rename from pages/subComponents/static/mine/kanjia.png
rename to static/mine/kanjia.png
Binary files differ
diff --git a/pages/subComponents/static/mine/logistics.png b/static/mine/logistics.png
similarity index 100%
rename from pages/subComponents/static/mine/logistics.png
rename to static/mine/logistics.png
Binary files differ
diff --git a/pages/subComponents/static/mine/myaddress.png b/static/mine/myaddress.png
similarity index 100%
rename from pages/subComponents/static/mine/myaddress.png
rename to static/mine/myaddress.png
Binary files differ
diff --git a/pages/subComponents/static/mine/mycommit.png b/static/mine/mycommit.png
similarity index 100%
rename from pages/subComponents/static/mine/mycommit.png
rename to static/mine/mycommit.png
Binary files differ
diff --git a/pages/subComponents/static/mine/mycoupon.png b/static/mine/mycoupon.png
similarity index 100%
rename from pages/subComponents/static/mine/mycoupon.png
rename to static/mine/mycoupon.png
Binary files differ
diff --git a/pages/subComponents/static/mine/myfavorite.png b/static/mine/myfavorite.png
similarity index 100%
rename from pages/subComponents/static/mine/myfavorite.png
rename to static/mine/myfavorite.png
Binary files differ
diff --git a/pages/subComponents/static/mine/myhistory.png b/static/mine/myhistory.png
similarity index 100%
rename from pages/subComponents/static/mine/myhistory.png
rename to static/mine/myhistory.png
Binary files differ
diff --git a/pages/subComponents/static/mine/mypoint.png b/static/mine/mypoint.png
similarity index 100%
rename from pages/subComponents/static/mine/mypoint.png
rename to static/mine/mypoint.png
Binary files differ
diff --git a/pages/subComponents/static/mine/order.png b/static/mine/order.png
similarity index 100%
rename from pages/subComponents/static/mine/order.png
rename to static/mine/order.png
Binary files differ
diff --git a/pages/subComponents/static/mine/pointgift.png b/static/mine/pointgift.png
similarity index 100%
rename from pages/subComponents/static/mine/pointgift.png
rename to static/mine/pointgift.png
Binary files differ
diff --git a/pages/subComponents/static/mine/setting.png b/static/mine/setting.png
similarity index 100%
rename from pages/subComponents/static/mine/setting.png
rename to static/mine/setting.png
Binary files differ
diff --git a/pages/subComponents/static/mine/shensu.png b/static/mine/shensu.png
similarity index 100%
rename from pages/subComponents/static/mine/shensu.png
rename to static/mine/shensu.png
Binary files differ
diff --git a/pages/subComponents/static/mine/sign.png b/static/mine/sign.png
similarity index 100%
rename from pages/subComponents/static/mine/sign.png
rename to static/mine/sign.png
Binary files differ
diff --git a/pages/subComponents/static/tabbar/cart-s.png b/static/tabbar/cart-s.png
similarity index 100%
rename from pages/subComponents/static/tabbar/cart-s.png
rename to static/tabbar/cart-s.png
Binary files differ
diff --git a/pages/subComponents/static/tabbar/cart.png b/static/tabbar/cart.png
similarity index 100%
rename from pages/subComponents/static/tabbar/cart.png
rename to static/tabbar/cart.png
Binary files differ
diff --git a/pages/subComponents/static/tabbar/category-s.png b/static/tabbar/category-s.png
similarity index 100%
rename from pages/subComponents/static/tabbar/category-s.png
rename to static/tabbar/category-s.png
Binary files differ
diff --git a/pages/subComponents/static/tabbar/category.png b/static/tabbar/category.png
similarity index 100%
rename from pages/subComponents/static/tabbar/category.png
rename to static/tabbar/category.png
Binary files differ
diff --git a/pages/subComponents/static/tabbar/home-s.png b/static/tabbar/home-s.png
similarity index 100%
rename from pages/subComponents/static/tabbar/home-s.png
rename to static/tabbar/home-s.png
Binary files differ
diff --git a/pages/subComponents/static/tabbar/home.png b/static/tabbar/home.png
similarity index 100%
rename from pages/subComponents/static/tabbar/home.png
rename to static/tabbar/home.png
Binary files differ
diff --git a/pages/subComponents/static/tabbar/mine-s.png b/static/tabbar/mine-s.png
similarity index 100%
rename from pages/subComponents/static/tabbar/mine-s.png
rename to static/tabbar/mine-s.png
Binary files differ
diff --git a/pages/subComponents/static/tabbar/mine.png b/static/tabbar/mine.png
similarity index 100%
rename from pages/subComponents/static/tabbar/mine.png
rename to static/tabbar/mine.png
Binary files differ
diff --git a/pages/subComponents/static/tabbar/video-selected.png b/static/tabbar/video-selected.png
similarity index 100%
rename from pages/subComponents/static/tabbar/video-selected.png
rename to static/tabbar/video-selected.png
Binary files differ
diff --git a/pages/subComponents/static/tabbar/video.png b/static/tabbar/video.png
similarity index 100%
rename from pages/subComponents/static/tabbar/video.png
rename to static/tabbar/video.png
Binary files differ
diff --git a/pages/subComponents/static/tabbar/video1-selected.png b/static/tabbar/video1-selected.png
similarity index 100%
rename from pages/subComponents/static/tabbar/video1-selected.png
rename to static/tabbar/video1-selected.png
Binary files differ
diff --git a/pages/subComponents/static/tabbar/video1.png b/static/tabbar/video1.png
similarity index 100%
rename from pages/subComponents/static/tabbar/video1.png
rename to static/tabbar/video1.png
Binary files differ
diff --git a/vue.config.js b/vue.config.js
index 4fcbd16..02de6ab 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,20 +1,21 @@
-// module.exports = {
-// /**
-// * 姝ゅ涓哄彂琛宧5,寰俊灏忕▼搴忥紝app涓垹闄onsole
-// * 濡傞渶鏄剧ずconsole 闇�瑕佹敞閲婃澶勯噸鏂拌繍琛�
-// */
-// chainWebpack: (config) => {
-// // 鍙戣鎴栬繍琛屾椂鍚敤浜嗗帇缂╂椂浼氱敓鏁�
-// config.optimization.minimizer('terser').tap((args) => {
-// const compress = args[0].terserOptions.compress
-// // 闈� App 骞冲彴绉婚櫎 console 浠ｇ爜(鍖呭惈鎵�鏈� console 鏂规硶锛屽 log,debug,info...)
-// compress.drop_console = true
-// compress.pure_funcs = [
-// '__f__', // App 骞冲彴 vue 绉婚櫎鏃ュ織浠ｇ爜
-// // 'console.debug' // 鍙Щ闄ゆ寚瀹氱殑 console 鏂规硶
-// ]
-// return args
-// })
-// }
-// }
\ No newline at end of file
+module.exports = {
+ /**
+ * 姝ゅ涓哄彂琛宧5,寰俊灏忕▼搴忥紝app涓垹闄onsole
+ * 濡傞渶鏄剧ずconsole 闇�瑕佹敞閲婃澶勯噸鏂拌繍琛�
+ */
+ chainWebpack: (config) => {
+ // 鍙戣鎴栬繍琛屾椂鍚敤浜嗗帇缂╂椂浼氱敓鏁�
+ config.optimization.minimizer('terser').tap((args) => {
+ const compress = args[0].terserOptions.compress
+ // 闈� App 骞冲彴绉婚櫎 console 浠ｇ爜(鍖呭惈鎵�鏈� console 鏂规硶锛屽 log,debug,info...)
+ compress.drop_console = true
+ compress.pure_funcs = [
+ '__f__', // App 骞冲彴 vue 绉婚櫎鏃ュ織浠ｇ爜
+ // 'console.debug' // 鍙Щ闄ゆ寚瀹氱殑 console 鏂规硶
+ ]
+ return args
+ })
+
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0