From 60a0e5133efe70092cd177ff62d5fc911395e5ca Mon Sep 17 00:00:00 2001
From: ZF sun <34314687@qq.com>
Date: Mon, 5 Jan 2026 15:56:49 +0800
Subject: [PATCH] =?UTF-8?q?revert:=20=E6=89=80=E6=9C=89=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E4=B8=8Ecustom/common=E5=88=86=E6=94=AF=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.local.config.js | 39 -
.local.config.js.example | 10 +-
common/js/config-external.js | 6 +-
common/js/diy.js | 5 +-
common/js/goods_detail_base.js | 2 +-
common/js/util.js | 103 +-
components-diy/diy-category-item.vue | 3 -
components-diy/diy-category.vue | 7 +-
components-diy/diy-coupon.vue | 3 -
components-diy/diy-digit.vue | 8 +-
components-diy/diy-goods-brand.vue | 7 +-
components-diy/diy-goods-list.vue | 5 +-
components-diy/diy-graphic-nav.vue | 3 -
components-diy/diy-group.vue | 65 +-
components-diy/diy-image-nav.vue | 3 +-
components-diy/diy-index-page.vue | 7 +-
components-diy/diy-map.vue | 1 -
components-diy/diy-member-info.vue | 7 +-
components-diy/diy-member-my-order.vue | 12 +-
components-diy/diy-merch-list.vue | 6 +-
components-diy/diy-notes.vue | 4 -
components-diy/diy-notice.vue | 4 -
components-diy/diy-payment-qrcode.vue | 4 -
components-diy/diy-pinfan.vue | 4 -
components-diy/diy-pintuan.vue | 4 -
components-diy/diy-presale.vue | 4 -
components-diy/diy-quick-nav.vue | 4 -
components-diy/diy-rich-text.vue | 6 +-
components-diy/diy-rubik-cube.vue | 2 +-
components-diy/diy-search.vue | 4 -
components-diy/diy-seckill.vue | 4 -
components-diy/diy-store-label.vue | 4 -
components-diy/diy-video-list.vue | 3 +-
.../ai-chat-message/ai-chat-message.vue | 3 +-
components/common-payment/common-payment.vue | 21 +-
components/common-payment/payment.js | 4 +-
.../goods-detail-view/goods-detail-view.vue | 15 +-
components/mescroll/mescroll-body.vue | 8 +-
components/mescroll/mescroll-uni.vue | 11 +-
components/mescroll/my-list-mescroll.vue | 225 +--
components/ns-adv/ns-adv.vue | 238 ++--
.../ns-birthday-gift/ns-birthday-gift.vue | 7 +-
components/ns-contact/ns-contact.vue | 3 -
components/ns-copyright/ns-copyright.vue | 282 ++--
components/ns-form/ns-form.vue | 3 +-
.../ns-goods-action-button.vue | 192 ++-
.../ns-goods-action-icon.vue | 3 +-
.../ns-goods-recommend/ns-goods-recommend.vue | 7 +-
.../ns-goods-sku/ns-goods-sku-category.vue | 4 +-
.../ns-goods-sku/ns-goods-sku-index.vue | 4 +-
components/ns-goods-sku/ns-goods-sku.vue | 6 +-
components/ns-login/ns-login.vue | 15 +-
components/ns-mp-html/ns-mp-html.vue | 2 +-
components/ns-new-gift/ns-new-gift.vue | 8 +-
components/ns-newform/ns-newform.vue | 4 +-
components/ns-payment/ns-payment.vue | 12 +-
components/ns-select-time/ns-select-time.vue | 62 +-
components/payment/payment.vue | 7 +-
components/pick-regions/pick-regions.vue | 3 -
.../register-reward/register-reward.vue | 4 +-
components/uni-grid-item/uni-grid-item.vue | 3 +-
components/wxwork-contact/wxwork-contact.vue | 3 -
manifest.json | 4 +-
pages.json | 985 ++++++-------
pages/index/index.vue | 41 +-
pages_goods/cart.vue | 207 ++-
pages_goods/category.vue | 12 +-
.../goods-detail-view/goods-detail-view.vue | 15 +-
.../ns-goods-promotion/ns-goods-promotion.vue | 30 +-
pages_goods/detail.vue | 377 +++--
pages_goods/list.vue | 222 ++-
pages_goods/public/js/cart.js | 2 +-
pages_order/{detail => }/detail.vue | 471 +++----
.../{detail => }/detail_local_delivery.vue | 5 +-
pages_order/{detail => }/detail_pickup.vue | 5 +-
pages_order/{detail => }/detail_point.vue | 325 +++--
pages_order/{base => }/list.vue | 27 +-
pages_order/{base => }/payment.vue | 3 -
.../components/yuyue-date/yuyue-date.vue | 645 +++++----
.../fenxiao/{core/base => }/apply.vue | 14 +-
.../fenxiao/{withdraw => }/bill.vue | 35 +-
.../fenxiao/{relation => }/child_fenxiao.vue | 25 +-
pages_promotion/fenxiao/core/base/level.vue | 329 -----
.../fenxiao/core/promote/promote_code.vue | 314 -----
.../fenxiao/{core/promote => }/goods_list.vue | 70 +-
.../fenxiao/{core/base => }/index.vue | 23 +-
pages_promotion/fenxiao/level.vue | 319 +++++
pages_promotion/fenxiao/{order => }/order.vue | 77 +-
.../fenxiao/{order => }/order_detail.vue | 53 +-
.../fenxiao/{core/promote => }/promote.vue | 12 +-
pages_promotion/fenxiao/promote_code.vue | 306 ++++
pages_promotion/fenxiao/ranking_list.vue | 433 ++++++
.../fenxiao/{relation => }/relation.vue | 19 +-
pages_promotion/fenxiao/stat/ranking_list.vue | 431 ------
.../fenxiao/{relation => }/team.vue | 17 +-
.../fenxiao/{withdraw => }/withdraw_apply.vue | 3 -
.../fenxiao/{withdraw => }/withdraw_list.vue | 39 +-
.../{withdraw => }/withdrawal_detail.vue | 3 -
pages_promotion/merch/detail.vue | 230 ++-
pages_promotion/merch/merchcategory.vue | 5 +-
pages_promotion/point/base/goods_list.vue | 924 ------------
pages_promotion/point/base/list.vue | 617 --------
pages_promotion/point/{detail => }/detail.vue | 25 +-
pages_promotion/point/detail/order_list.vue | 603 --------
pages_promotion/point/detail/result.vue | 92 --
pages_promotion/point/goods_list.vue | 907 ++++++++++++
pages_promotion/point/list.vue | 593 ++++++++
pages_promotion/point/order_list.vue | 591 ++++++++
.../point/{detail => }/payment.vue | 175 +--
pages_promotion/point/result.vue | 92 ++
pages_tool/agreement/contenr.vue | 68 +-
pages_tool/article/detail.vue | 250 ++--
pages_tool/article/list.vue | 337 ++---
pages_tool/cases/index.vue | 42 +-
.../components}/chat-message/chat-message.vue | 12 +-
.../components}/img-cropping/cropping.vue | 0
.../components}/myp-one/myp-one.vue | 0
pages_tool/components/ns-adv/ns-adv.vue | 120 ++
.../components}/ns-chat/ns-chat-goods.vue | 0
.../components}/ns-chat/ns-chat-order.vue | 298 ++--
.../ns-chat/ns-chat-receiveGoods.vue | 0
.../components}/ns-progress/ns-progress.vue | 74 +-
.../components}/sx-rate/common.js | 12 +-
.../components}/sx-rate/index.vue | 0
.../components}/sx-rate/sx-rate/iconfont.css | 42 +-
.../components}/sx-rate/sx-rate/iconfont.eot | Bin
.../components}/sx-rate/sx-rate/iconfont.svg | 58 +-
.../components}/sx-rate/sx-rate/iconfont.ttf | Bin
.../components}/sx-rate/sx-rate/iconfont.woff | Bin
.../sx-rate/sx-rate/iconfont.woff2 | Bin
.../components}/uni-calendar/calendar.js | 1246 ++++++++---------
.../uni-calendar/uni-calendar-item.vue | 0
.../components}/uni-calendar/uni-calendar.vue | 4 +-
.../components}/uni-calendar/util.js | 708 +++++-----
.../components}/uni-nav-bar/uni-nav-bar.vue | 6 +-
.../uni-status-bar/uni-status-bar.vue | 0
pages_tool/contact/contact.vue | 39 +-
pages_tool/files/list.vue | 457 +++---
pages_tool/form/form.vue | 221 ++-
pages_tool/form/formdata.vue | 16 +-
pages_tool/goods/brand.vue | 196 +--
pages_tool/goods/coupon.vue | 752 +++++-----
pages_tool/goods/coupon_receive.vue | 7 -
pages_tool/goods/evaluate.vue | 22 +-
pages_tool/goods/not_exist.vue | 7 +-
pages_tool/goods/search.vue | 543 ++++---
pages_tool/help/detail.vue | 220 ++-
pages_tool/help/list.vue | 16 +-
pages_tool/index/diy.vue | 27 +-
pages_tool/login/find.vue | 67 +-
pages_tool/login/login.vue | 8 +-
pages_tool/member/account.vue | 465 ++++++
.../member/{basic => }/account_edit.vue | 14 +-
pages_tool/member/{address => }/address.vue | 22 +-
pages_tool/member/address/address_edit.vue | 496 -------
pages_tool/member/address_edit.vue | 501 +++++++
pages_tool/member/apply_withdrawal.vue | 425 ++++++
pages_tool/member/{other => }/assets.vue | 0
.../member/{finance/account => }/balance.vue | 38 +-
pages_tool/member/balance_detail.vue | 373 +++++
pages_tool/member/basic/account.vue | 465 ------
pages_tool/member/basic/modify_face.vue | 195 ---
.../member/{other => }/cancellation.vue | 2 +-
.../member/{other => }/cancelrefuse.vue | 4 +-
pages_tool/member/cancelstatus.vue | 189 +++
pages_tool/member/cancelsuccess.vue | 99 ++
.../member/{finance/transaction => }/card.vue | 200 ++-
.../transaction => }/card_agreement.vue | 4 +-
.../{finance/transaction => }/card_buy.vue | 444 +++---
pages_tool/member/collection.vue | 99 ++
pages_tool/member/{other => }/contact.vue | 5 +-
pages_tool/member/coupon.vue | 416 ++++++
.../member/finance/account/balance_detail.vue | 371 -----
.../member/finance/account/pay_password.vue | 280 ----
.../finance/transaction/apply_withdrawal.vue | 430 ------
pages_tool/member/{other => }/footprint.vue | 58 +-
pages_tool/member/{basic => }/index.vue | 64 +-
pages_tool/member/{basic => }/info.vue | 405 +++---
pages_tool/member/{basic => }/info_edit.vue | 491 ++++---
.../member/{rights => }/invite_friends.vue | 113 +-
pages_tool/member/level.vue | 382 +++++
pages_tool/member/level_growth_rules.vue | 274 ++++
pages_tool/member/modify_face.vue | 194 +++
pages_tool/member/other/cancelstatus.vue | 188 ---
pages_tool/member/other/cancelsuccess.vue | 99 --
pages_tool/member/other/collection.vue | 96 --
pages_tool/member/pay_password.vue | 278 ++++
.../member/{finance/account => }/point.vue | 24 +-
.../{finance/account => }/point_detail.vue | 50 +-
pages_tool/member/rights/coupon.vue | 421 ------
pages_tool/member/rights/level.vue | 391 ------
.../member/rights/level_growth_rules.vue | 274 ----
.../{finance/transaction => }/withdrawal.vue | 18 +-
.../transaction => }/withdrawal_detail.vue | 3 +-
pages_tool/notice/detail.vue | 240 ++--
pages_tool/notice/list.vue | 17 +-
pages_tool/order/activist.vue | 35 +-
pages_tool/order/detail_virtual.vue | 8 +-
pages_tool/order/evaluate.vue | 60 +-
pages_tool/order/logistics.vue | 42 +-
pages_tool/order/public/js/evaluate.js | 6 +-
pages_tool/order/refund.vue | 66 +-
pages_tool/order/refund_batch.vue | 83 +-
pages_tool/order/refund_detail.vue | 65 +-
pages_tool/order/refund_goods_select.vue | 375 +++--
pages_tool/order/refund_type_select.vue | 165 ++-
pages_tool/pay/cashier.vue | 40 +-
pages_tool/pay/index.vue | 4 +-
pages_tool/pay/result.vue | 533 ++++---
pages_tool/pay/wx_pay.vue | 40 +-
pages_tool/recharge/list.vue | 1024 +++++++-------
pages_tool/recharge/order_list.vue | 23 +-
pages_tool/seal/medium/detail.vue | 10 +-
pages_tool/seal/medium/search.vue | 9 +-
pages_tool/seal/structure.vue | 7 +-
pages_tool/storeclose/storeclose.vue | 11 +-
pages_tool/vr/index.vue | 4 +-
pages_tool/weapp/order_shipping.vue | 74 +-
pages_tool/webview/webview.vue | 5 +-
219 files changed, 14860 insertions(+), 15585 deletions(-)
delete mode 100644 .local.config.js
rename pages_order/{detail => }/detail.vue (73%)
rename pages_order/{detail => }/detail_local_delivery.vue (57%)
rename pages_order/{detail => }/detail_pickup.vue (57%)
rename pages_order/{detail => }/detail_point.vue (50%)
rename pages_order/{base => }/list.vue (95%)
rename pages_order/{base => }/payment.vue (97%)
rename pages_promotion/fenxiao/{core/base => }/apply.vue (94%)
rename pages_promotion/fenxiao/{withdraw => }/bill.vue (81%)
rename pages_promotion/fenxiao/{relation => }/child_fenxiao.vue (89%)
delete mode 100644 pages_promotion/fenxiao/core/base/level.vue
delete mode 100644 pages_promotion/fenxiao/core/promote/promote_code.vue
rename pages_promotion/fenxiao/{core/promote => }/goods_list.vue (89%)
rename pages_promotion/fenxiao/{core/base => }/index.vue (92%)
create mode 100644 pages_promotion/fenxiao/level.vue
rename pages_promotion/fenxiao/{order => }/order.vue (63%)
rename pages_promotion/fenxiao/{order => }/order_detail.vue (86%)
rename pages_promotion/fenxiao/{core/promote => }/promote.vue (90%)
create mode 100644 pages_promotion/fenxiao/promote_code.vue
create mode 100644 pages_promotion/fenxiao/ranking_list.vue
rename pages_promotion/fenxiao/{relation => }/relation.vue (88%)
delete mode 100644 pages_promotion/fenxiao/stat/ranking_list.vue
rename pages_promotion/fenxiao/{relation => }/team.vue (91%)
rename pages_promotion/fenxiao/{withdraw => }/withdraw_apply.vue (99%)
rename pages_promotion/fenxiao/{withdraw => }/withdraw_list.vue (77%)
rename pages_promotion/fenxiao/{withdraw => }/withdrawal_detail.vue (93%)
delete mode 100644 pages_promotion/point/base/goods_list.vue
delete mode 100644 pages_promotion/point/base/list.vue
rename pages_promotion/point/{detail => }/detail.vue (92%)
delete mode 100644 pages_promotion/point/detail/order_list.vue
delete mode 100644 pages_promotion/point/detail/result.vue
create mode 100644 pages_promotion/point/goods_list.vue
create mode 100644 pages_promotion/point/list.vue
create mode 100644 pages_promotion/point/order_list.vue
rename pages_promotion/point/{detail => }/payment.vue (63%)
create mode 100644 pages_promotion/point/result.vue
rename {components => pages_tool/components}/chat-message/chat-message.vue (95%)
rename {components => pages_tool/components}/img-cropping/cropping.vue (100%)
rename {components => pages_tool/components}/myp-one/myp-one.vue (100%)
create mode 100644 pages_tool/components/ns-adv/ns-adv.vue
rename {components => pages_tool/components}/ns-chat/ns-chat-goods.vue (100%)
rename {components => pages_tool/components}/ns-chat/ns-chat-order.vue (96%)
rename {components => pages_tool/components}/ns-chat/ns-chat-receiveGoods.vue (100%)
rename {components => pages_tool/components}/ns-progress/ns-progress.vue (94%)
rename {components => pages_tool/components}/sx-rate/common.js (97%)
rename {components => pages_tool/components}/sx-rate/index.vue (100%)
rename {components => pages_tool/components}/sx-rate/sx-rate/iconfont.css (68%)
rename {components => pages_tool/components}/sx-rate/sx-rate/iconfont.eot (100%)
rename {components => pages_tool/components}/sx-rate/sx-rate/iconfont.svg (97%)
rename {components => pages_tool/components}/sx-rate/sx-rate/iconfont.ttf (100%)
rename {components => pages_tool/components}/sx-rate/sx-rate/iconfont.woff (100%)
rename {components => pages_tool/components}/sx-rate/sx-rate/iconfont.woff2 (100%)
rename {components => pages_tool/components}/uni-calendar/calendar.js (97%)
rename {components => pages_tool/components}/uni-calendar/uni-calendar-item.vue (100%)
rename {components => pages_tool/components}/uni-calendar/uni-calendar.vue (95%)
rename {components => pages_tool/components}/uni-calendar/util.js (95%)
rename {components => pages_tool/components}/uni-nav-bar/uni-nav-bar.vue (92%)
rename {components => pages_tool/components}/uni-status-bar/uni-status-bar.vue (100%)
create mode 100644 pages_tool/member/account.vue
rename pages_tool/member/{basic => }/account_edit.vue (95%)
rename pages_tool/member/{address => }/address.vue (96%)
delete mode 100644 pages_tool/member/address/address_edit.vue
create mode 100644 pages_tool/member/address_edit.vue
create mode 100644 pages_tool/member/apply_withdrawal.vue
rename pages_tool/member/{other => }/assets.vue (100%)
rename pages_tool/member/{finance/account => }/balance.vue (83%)
create mode 100644 pages_tool/member/balance_detail.vue
delete mode 100644 pages_tool/member/basic/account.vue
delete mode 100644 pages_tool/member/basic/modify_face.vue
rename pages_tool/member/{other => }/cancellation.vue (98%)
rename pages_tool/member/{other => }/cancelrefuse.vue (94%)
create mode 100644 pages_tool/member/cancelstatus.vue
create mode 100644 pages_tool/member/cancelsuccess.vue
rename pages_tool/member/{finance/transaction => }/card.vue (65%)
rename pages_tool/member/{finance/transaction => }/card_agreement.vue (94%)
rename pages_tool/member/{finance/transaction => }/card_buy.vue (58%)
create mode 100644 pages_tool/member/collection.vue
rename pages_tool/member/{other => }/contact.vue (92%)
create mode 100644 pages_tool/member/coupon.vue
delete mode 100644 pages_tool/member/finance/account/balance_detail.vue
delete mode 100644 pages_tool/member/finance/account/pay_password.vue
delete mode 100644 pages_tool/member/finance/transaction/apply_withdrawal.vue
rename pages_tool/member/{other => }/footprint.vue (81%)
rename pages_tool/member/{basic => }/index.vue (87%)
rename pages_tool/member/{basic => }/info.vue (50%)
rename pages_tool/member/{basic => }/info_edit.vue (58%)
rename pages_tool/member/{rights => }/invite_friends.vue (82%)
create mode 100644 pages_tool/member/level.vue
create mode 100644 pages_tool/member/level_growth_rules.vue
create mode 100644 pages_tool/member/modify_face.vue
delete mode 100644 pages_tool/member/other/cancelstatus.vue
delete mode 100644 pages_tool/member/other/cancelsuccess.vue
delete mode 100644 pages_tool/member/other/collection.vue
create mode 100644 pages_tool/member/pay_password.vue
rename pages_tool/member/{finance/account => }/point.vue (88%)
rename pages_tool/member/{finance/account => }/point_detail.vue (87%)
delete mode 100644 pages_tool/member/rights/coupon.vue
delete mode 100644 pages_tool/member/rights/level.vue
delete mode 100644 pages_tool/member/rights/level_growth_rules.vue
rename pages_tool/member/{finance/transaction => }/withdrawal.vue (88%)
rename pages_tool/member/{finance/transaction => }/withdrawal_detail.vue (97%)
diff --git a/.local.config.js b/.local.config.js
deleted file mode 100644
index 9026bc8..0000000
--- a/.local.config.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// 本地调试配置示例文件
-// 复制此文件并重命名为 local.config.js 以使用自定义本地配置
-
-const localDevConfig = ({
- '460': { // 制氧设备平台
- uniacid: 460,
- domain: 'https://xcx30.5g-quickapp.com/',
- },
- '2285': { // 数码喷墨墨水
- uniacid: 2285,
- domain: 'https://xcx.aigc-quickapp.com/',
- },
- '2811': { // POCT检测分析平台
- uniacid: 2811,
- domain: 'https://xcx.aigc-quickapp.com/',
- },
- '2724': { // 生物菌肥
- uniacid: 2724,
- domain: 'https://xcx.aigc-quickapp.com/',
- },
- '2505': { // 煤矿钻机
- uniacid: 2505,
- domain: 'https://xcx.aigc-quickapp.com/',
- },
- '2777': { // 养老服务
- uniacid: 2777,
- domain: 'https://xcx.aigc-quickapp.com/',
- },
- '1': { // 开发平台
- uniacid: 1,
- domain: 'https://dev.aigc-quickapp.com',
- },
- '1-test': { // 测试平台
- uniacid: 1,
- domain: 'https://test.aigc-quickapp.com',
- },
-})['2285']; // 选择要使用的环境配置
-
-export default localDevConfig;
\ No newline at end of file
diff --git a/.local.config.js.example b/.local.config.js.example
index 738b89e..fd74a22 100644
--- a/.local.config.js.example
+++ b/.local.config.js.example
@@ -9,7 +9,15 @@ const localDevConfig = ({
'2285': { // 数码喷墨墨水
uniacid: 2285,
domain: 'https://xcx.aigc-quickapp.com/',
+ },
+ '2724': { // 德龙生物肥料
+ uniacid: 2724,
+ domain: 'https://xcx.aigc-quickapp.com/',
},
+ '2777': { // 养老服务
+ uniacid: 2777,
+ domain: 'https://xcx.aigc-quickapp.com/',
+ },
'1': { // 开发平台
uniacid: 1,
domain: 'https://dev.aigc-quickapp.com',
@@ -18,6 +26,6 @@ const localDevConfig = ({
uniacid: 1,
domain: 'https://test.aigc-quickapp.com',
},
-})['2285']; // 选择要使用的环境配置
+})['2724']; // 选择要使用的环境配置
export default localDevConfig;
\ No newline at end of file
diff --git a/common/js/config-external.js b/common/js/config-external.js
index 555a704..26cc8f1 100644
--- a/common/js/config-external.js
+++ b/common/js/config-external.js
@@ -110,7 +110,8 @@ class ConfigExternal {
try {
// 动态加载主题配置
- const themeData = require(`@/common/js/style_color.js`)[theme];
+ const themeData = require(`@/common/js/style_color.js`)['default'][theme];
+ console.log('sync themeData => ', themeData);
this.loadedConfigs[`theme_${theme}`] = themeData;
return themeData;
} catch (error) {
@@ -136,7 +137,8 @@ class ConfigExternal {
this.loadPromises[`theme_${theme}`] = new Promise((resolve, reject) => {
try {
// 动态加载主题配置
- const themeData = require(`@/common/js/style_color.js`)[theme];
+ const themeData = require(`@/common/js/style_color.js`)['default'][theme];
+ console.log('async themeData => ', themeData);
this.loadedConfigs[`theme_${theme}`] = themeData;
resolve(themeData);
} catch (error) {
diff --git a/common/js/diy.js b/common/js/diy.js
index 3adc343..539e0fc 100644
--- a/common/js/diy.js
+++ b/common/js/diy.js
@@ -111,8 +111,9 @@ export default {
}
},
- async onShow() {
- await this.init();
+ onShow() {
+
+ this.init();
},
onHide() {
if (this.storeTimeOut) {
diff --git a/common/js/goods_detail_base.js b/common/js/goods_detail_base.js
index c04b212..2fe192a 100644
--- a/common/js/goods_detail_base.js
+++ b/common/js/goods_detail_base.js
@@ -1,5 +1,5 @@
// 商品详情业务
-import htmlParser from '@/common/js/html-parser.js';
+import htmlParser from '@/common/js/html-parser';
export default {
data() {
diff --git a/common/js/util.js b/common/js/util.js
index 9beac5c..2874026 100644
--- a/common/js/util.js
+++ b/common/js/util.js
@@ -35,7 +35,7 @@ export const adaptSubpackageUrl = (url) => {
'/pages/goods/': '/pages_goods/',
'/pages/contact/': '/pages_tool/contact/',
'/pages/member/': '/pages_tool/member/',
- '/pages/vr': '/pages_tool/vr/',
+ '/pages/vr': '/pages_tool/vr/'
};
// 构建正则表达式
@@ -58,106 +58,7 @@ export const adaptSubpackageUrl = (url) => {
});
}
- const currentUrl = replacePrefix(url);
-
- // 分包子包导致的路径变化，需要根据前后关系修复
- const subPackagesMap = {
- // pages_order 基础功能子包
- '/pages_order/list': '/pages_order/base/list',
- '/pages_order/payment': '/pages_order/base/payment',
-
- // pages_order 详情功能子包
- '/pages_order/detail': '/pages_order/detail/detail',
- '/pages_order/detail_local_delivery': '/pages_order/detail/detail_local_delivery',
- '/pages_order/detail_pickup': '/pages_order/detail/detail_pickup',
- '/pages_order/detail_point': '/pages_order/detail/detail_point',
-
- // pages_promotion/fenxiao/core 基础功能子包
- '/pages_promotion/fenxiao/core/index': '/pages_promotion/fenxiao/core/base/index',
- '/pages_promotion/fenxiao/core/apply': '/pages_promotion/fenxiao/core/base/apply',
- '/pages_promotion/fenxiao/core/level': '/pages_promotion/fenxiao/core/base/level',
-
- // pages_promotion/fenxiao/core 推广功能子包
- '/pages_promotion/fenxiao/core/promote': '/pages_promotion/fenxiao/core/promote/promote',
- '/pages_promotion/fenxiao/core/promote_code': '/pages_promotion/fenxiao/core/promote/promote_code',
- '/pages_promotion/fenxiao/core/goods_list': '/pages_promotion/fenxiao/core/promote/goods_list',
-
- // pages_promotion/point 基础功能子包
- '/pages_promotion/point/list': '/pages_promotion/point/base/list',
- '/pages_promotion/point/goods_list': '/pages_promotion/point/base/goods_list',
-
- // pages_promotion/point 详情功能子包
- '/pages_promotion/point/detail': '/pages_promotion/point/detail/detail',
- '/pages_promotion/point/order_list': '/pages_promotion/point/detail/order_list',
- '/pages_promotion/point/payment': '/pages_promotion/point/detail/payment',
- '/pages_promotion/point/result': '/pages_promotion/point/detail/result',
-
- // basic子包
- '/pages_tool/member/index': '/pages_tool/member/basic/index',
- '/pages_tool/member/info': '/pages_tool/member/basic/info',
- '/pages_tool/member/info_edit': '/pages_tool/member/basic/info_edit',
- '/pages_tool/member/account': '/pages_tool/member/basic/account',
- '/pages_tool/member/account_edit': '/pages_tool/member/basic/account_edit',
- '/pages_tool/member/modify_face': '/pages_tool/member/basic/modify_face',
-
- // address子包
- '/pages_tool/member/address': '/pages_tool/member/address/address',
- '/pages_tool/member/address_edit': '/pages_tool/member/address/address_edit',
-
- // finance子包 - 基础账户和积分相关
- '/pages_tool/member/balance': '/pages_tool/member/finance/account/balance',
- '/pages_tool/member/balance_detail': '/pages_tool/member/finance/account/balance_detail',
- '/pages_tool/member/point': '/pages_tool/member/finance/account/point',
- '/pages_tool/member/point_detail': '/pages_tool/member/finance/account/point_detail',
- '/pages_tool/member/pay_password': '/pages_tool/member/finance/account/pay_password',
-
- // finance子包 - 提现和储值卡相关
- '/pages_tool/member/card': '/pages_tool/member/finance/transaction/card',
- '/pages_tool/member/card_buy': '/pages_tool/member/finance/transaction/card_buy',
- '/pages_tool/member/card_agreement': '/pages_tool/member/finance/transaction/card_agreement',
- '/pages_tool/member/apply_withdrawal': '/pages_tool/member/finance/transaction/apply_withdrawal',
- '/pages_tool/member/withdrawal': '/pages_tool/member/finance/transaction/withdrawal',
- '/pages_tool/member/withdrawal_detail': '/pages_tool/member/finance/transaction/withdrawal_detail',
-
- // finance子包路径映射（从旧的finance子包路径到新的account和transaction子子包路径）
- '/pages_tool/member/finance/balance': '/pages_tool/member/finance/account/balance',
- '/pages_tool/member/finance/balance_detail': '/pages_tool/member/finance/account/balance_detail',
- '/pages_tool/member/finance/point': '/pages_tool/member/finance/account/point',
- '/pages_tool/member/finance/point_detail': '/pages_tool/member/finance/account/point_detail',
- '/pages_tool/member/finance/pay_password': '/pages_tool/member/finance/account/pay_password',
-
- '/pages_tool/member/finance/card': '/pages_tool/member/finance/transaction/card',
- '/pages_tool/member/finance/card_buy': '/pages_tool/member/finance/transaction/card_buy',
- '/pages_tool/member/finance/card_agreement': '/pages_tool/member/finance/transaction/card_agreement',
- '/pages_tool/member/finance/apply_withdrawal': '/pages_tool/member/finance/transaction/apply_withdrawal',
- '/pages_tool/member/finance/withdrawal': '/pages_tool/member/finance/transaction/withdrawal',
- '/pages_tool/member/finance/withdrawal_detail': '/pages_tool/member/finance/transaction/withdrawal_detail',
-
- // rights子包
- '/pages_tool/member/coupon': '/pages_tool/member/rights/coupon',
- '/pages_tool/member/level': '/pages_tool/member/rights/level',
- '/pages_tool/member/level_growth_rules': '/pages_tool/member/rights/level_growth_rules',
- '/pages_tool/member/invite_friends': '/pages_tool/member/rights/invite_friends',
-
- // other子包
- '/pages_tool/member/signin': '/pages_tool/member/other/signin',
- '/pages_tool/member/collection': '/pages_tool/member/other/collection',
- '/pages_tool/member/footprint': '/pages_tool/member/other/footprint',
- '/pages_tool/member/assets': '/pages_tool/member/other/assets',
- '/pages_tool/member/cancellation': '/pages_tool/member/other/cancellation',
- '/pages_tool/member/cancelstatus': '/pages_tool/member/other/cancelstatus',
- '/pages_tool/member/cancelsuccess': '/pages_tool/member/other/cancelsuccess',
- '/pages_tool/member/cancelrefuse': '/pages_tool/member/other/cancelrefuse',
- '/pages_tool/member/contact': '/pages_tool/member/other/contact'
- }
-
-
- // 修复url
- if (subPackagesMap[currentUrl]) {
- return subPackagesMap[currentUrl];
- }
-
- return currentUrl;
+ return replacePrefix(url);
}
/**
diff --git a/components-diy/diy-category-item.vue b/components-diy/diy-category-item.vue
index 54e5611..4e4cd06 100644
--- a/components-diy/diy-category-item.vue
+++ b/components-diy/diy-category-item.vue
@@ -293,9 +293,6 @@ export default {
default: false
}
},
- components: {
- loadingCover: () => import('@/components/loading-cover/loading-cover.vue'),
- },
mixins: [DiyMinx],
data() {
return {
diff --git a/components-diy/diy-category.vue b/components-diy/diy-category.vue
index 16df131..f907f50 100644
--- a/components-diy/diy-category.vue
+++ b/components-diy/diy-category.vue
@@ -161,13 +161,14 @@ let menuButtonInfo = {};
menuButtonInfo = uni.getMenuButtonBoundingClientRect();
// #endif
+import nsGoodsSkuCategory from '@/components/ns-goods-sku/ns-goods-sku-category.vue';
import DiyMinx from './minx.js'
var contentWrapHeight, query, cartPosition;
// 商品分类
export default {
- components: {
- nsGoodsSkuCategory: () => import('@/components/ns-goods-sku/ns-goods-sku-category.vue'),
+ components: {
+ nsGoodsSkuCategory
},
name: 'diy-category',
props: {
@@ -462,7 +463,7 @@ export default {
cart_ids: this.cartIds.toString()
},
success: () => {
- this.$util.redirectTo('/pages_order/base/payment');
+ this.$util.redirectTo('/pages_order/payment');
this.isSub = false;
}
});
diff --git a/components-diy/diy-coupon.vue b/components-diy/diy-coupon.vue
index eae716a..52d0b86 100644
--- a/components-diy/diy-coupon.vue
+++ b/components-diy/diy-coupon.vue
@@ -303,9 +303,6 @@ export default {
}
}
},
- components: {
- nsLogin: () => import('@/components/ns-login/ns-login.vue'),
- },
mixins: [DiyMinx],
data() {
return {
diff --git a/components-diy/diy-digit.vue b/components-diy/diy-digit.vue
index 91eacc7..4a51a91 100644
--- a/components-diy/diy-digit.vue
+++ b/components-diy/diy-digit.vue
@@ -1,4 +1,4 @@
-
+
@@ -38,13 +38,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/components/ns-adv/ns-adv.vue b/components/ns-adv/ns-adv.vue
index 978f3bd..0d44df7 100644
--- a/components/ns-adv/ns-adv.vue
+++ b/components/ns-adv/ns-adv.vue
@@ -1,120 +1,120 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/components/ns-birthday-gift/ns-birthday-gift.vue b/components/ns-birthday-gift/ns-birthday-gift.vue
index e3cd63b..e34abb7 100644
--- a/components/ns-birthday-gift/ns-birthday-gift.vue
+++ b/components/ns-birthday-gift/ns-birthday-gift.vue
@@ -80,12 +80,13 @@
-
\ No newline at end of file
diff --git a/components/ns-form/ns-form.vue b/components/ns-form/ns-form.vue
index 4ff72b0..452c8df 100644
--- a/components/ns-form/ns-form.vue
+++ b/components/ns-form/ns-form.vue
@@ -200,10 +200,11 @@
-
-
\ No newline at end of file
diff --git a/components/ns-goods-action-icon/ns-goods-action-icon.vue b/components/ns-goods-action-icon/ns-goods-action-icon.vue
index c4ea7d3..f958edd 100644
--- a/components/ns-goods-action-icon/ns-goods-action-icon.vue
+++ b/components/ns-goods-action-icon/ns-goods-action-icon.vue
@@ -20,6 +20,7 @@
-
-
-
-
\ No newline at end of file
diff --git a/pages_goods/category.vue b/pages_goods/category.vue
index 98a0413..57902b4 100644
--- a/pages_goods/category.vue
+++ b/pages_goods/category.vue
@@ -25,13 +25,17 @@
@@ -594,12 +570,12 @@ export default {
position: relative;
z-index: 999;
}
+
-
\ No newline at end of file
diff --git a/pages_goods/public/js/cart.js b/pages_goods/public/js/cart.js
index 04001a3..5c2f9ab 100644
--- a/pages_goods/public/js/cart.js
+++ b/pages_goods/public/js/cart.js
@@ -367,7 +367,7 @@ export default {
cart_ids: cart_ids.toString()
},
success: () => {
- this.$util.redirectTo('/pages_order/base/payment');
+ this.$util.redirectTo('/pages_order/payment');
this.isSub = false;
}
});
diff --git a/pages_order/detail/detail.vue b/pages_order/detail.vue
similarity index 73%
rename from pages_order/detail/detail.vue
rename to pages_order/detail.vue
index 9e896f7..659d78b 100644
--- a/pages_order/detail/detail.vue
+++ b/pages_order/detail.vue
@@ -1,8 +1,7 @@
-
+
@@ -65,9 +64,9 @@
{{ orderData.delivery_store_name }}
@@ -109,11 +108,8 @@
复制
-
-
+
+
@@ -125,8 +121,7 @@
-
+
{{ goodsItem.sku_name }}
@@ -134,18 +129,16 @@
{{ x.spec_value_name }}
- {{ i < goodsItem.sku_spec_format.length - 1 ? '; ' : '' }}
+ {{ i < goodsItem.sku_spec_format.length - 1 ? '; ' : '' }}
+
{{ $lang('common.currencySymbol') }}
- {{
- parseFloat(goodsItem.price).toFixed(2).split('.')[0]
- }}
- .{{
- parseFloat(goodsItem.price).toFixed(2).split('.')[1] }}
+ {{ parseFloat(goodsItem.price).toFixed(2).split('.')[0] }}
+ .{{ parseFloat(goodsItem.price).toFixed(2).split('.')[1] }}
@@ -159,10 +152,8 @@
次卡抵扣
-{{ $lang('common.currencySymbol') }}
- {{
- parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[0] }}
- .{{
- parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[1] }}
+ {{ parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[0] }}
+ .{{ parseFloat(goodsItem.card_promotion_money).toFixed(2).split('.')[1] }}
@@ -173,8 +164,7 @@
{{ item.value.title }}：
-
+
@@ -186,15 +176,13 @@
-
+
{{ orderData.order_status == 10 ? '申请售后' : '申请退款' }}
-
+
{{ orderData.order_status == 10 ? '查看售后' : '查看退款' }}
@@ -327,12 +315,11 @@
我的卡包：
- 查看
+ 查看
-
-
+
@@ -633,218 +608,216 @@
\ No newline at end of file
diff --git a/pages_order/detail/detail_local_delivery.vue b/pages_order/detail_local_delivery.vue
similarity index 57%
rename from pages_order/detail/detail_local_delivery.vue
rename to pages_order/detail_local_delivery.vue
index c5f3987..ff0c6d3 100644
--- a/pages_order/detail/detail_local_delivery.vue
+++ b/pages_order/detail_local_delivery.vue
@@ -6,15 +6,12 @@
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/core/base/apply.vue b/pages_promotion/fenxiao/apply.vue
similarity index 94%
rename from pages_promotion/fenxiao/core/base/apply.vue
rename to pages_promotion/fenxiao/apply.vue
index d2d7d54..c8eae81 100644
--- a/pages_promotion/fenxiao/core/base/apply.vue
+++ b/pages_promotion/fenxiao/apply.vue
@@ -152,14 +152,11 @@
-
-
-
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/core/promote/promote_code.vue b/pages_promotion/fenxiao/core/promote/promote_code.vue
deleted file mode 100644
index 637f0a9..0000000
--- a/pages_promotion/fenxiao/core/promote/promote_code.vue
+++ /dev/null
@@ -1,314 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 长按识别图中二维码
-
-
-
- 保存海报
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/core/promote/goods_list.vue b/pages_promotion/fenxiao/goods_list.vue
similarity index 89%
rename from pages_promotion/fenxiao/core/promote/goods_list.vue
rename to pages_promotion/fenxiao/goods_list.vue
index 09ecec6..ef3f20c 100644
--- a/pages_promotion/fenxiao/core/promote/goods_list.vue
+++ b/pages_promotion/fenxiao/goods_list.vue
@@ -2,28 +2,28 @@
-
+
- 全部
- 全部
+
+ @click="changeCategory(item.category_id)"
+ >
{{ item.category_name }}
-
+
-
+
@@ -132,18 +132,24 @@
@@ -159,10 +165,8 @@ export default {
/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
max-height: unset !important;
}
-
.quick-nav {
margin-bottom: 20rpx;
-
.quick-nav-item {
display: flex;
align-items: center;
@@ -186,7 +190,6 @@ export default {
}
}
}
-
.content {
overflow: hidden;
padding: 0 30rpx 160rpx;
@@ -199,14 +202,12 @@ export default {
background-size: 100%;
background-repeat: no-repeat;
box-sizing: border-box;
-
.goods-item {
margin-bottom: 20rpx;
background: #ffffff;
padding: $padding;
display: flex;
border-radius: 10rpx;
-
&:last-child {
margin-bottom: 0;
}
@@ -220,7 +221,6 @@ export default {
border-radius: 10rpx;
overflow: hidden;
flex-shrink: 0;
-
image {
width: 100%;
height: 100%;
@@ -241,7 +241,6 @@ export default {
.goods-name {
width: 100%;
line-height: 1.3;
-
.name {
line-height: 1.3;
word-break: break-all;
@@ -251,12 +250,10 @@ export default {
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
-
.label-list {
display: flex;
align-items: center;
margin-top: 6rpx;
-
.label-item {
padding: 4rpx 10rpx;
font-size: $font-size-tag;
@@ -288,7 +285,6 @@ export default {
padding: 0 $padding;
border-radius: 50rpx;
border: 2rpx solid $base-color;
-
text {
color: $base-color;
border-radius: 40rpx;
@@ -303,7 +299,6 @@ export default {
}
}
}
-
.active-btn {
position: fixed;
bottom: 40rpx;
@@ -317,12 +312,10 @@ export default {
border-radius: 50rpx;
background-color: $base-color;
color: #fff;
-
.btn {
flex: 1;
text-align: center;
}
-
.share-btn {
margin: 0;
padding: 0;
@@ -362,7 +355,6 @@ export default {
border: none;
line-height: 1;
height: auto;
-
text {
margin-top: 20rpx;
font-size: $font-size-tag;
@@ -375,7 +367,6 @@ export default {
font-size: 80rpx;
line-height: initial;
}
-
.icon-fuzhilianjie,
.icon-pengyouquan,
.icon-haowuquan,
@@ -392,48 +383,39 @@ export default {
text-align: center;
}
}
-
.poster-layer {
.generate-poster {
padding: 40rpx 0;
-
.iconfont {
font-size: 80rpx;
color: #07c160;
line-height: initial;
}
-
- >view {
+ > view {
text-align: center;
-
&:last-child {
margin-top: 20rpx;
}
}
}
-
.image-wrap {
width: 64%;
height: 854rpx;
margin: 60rpx auto 40rpx auto;
box-shadow: 0 0 32rpx rgba(100, 100, 100, 0.3);
-
image {
width: 480rpx;
height: 854rpx;
}
}
-
.msg {
padding: 40rpx;
}
-
.save {
text-align: center;
height: 80rpx;
line-height: 80rpx;
}
-
.close {
position: absolute;
top: 0;
diff --git a/pages_promotion/fenxiao/core/base/index.vue b/pages_promotion/fenxiao/index.vue
similarity index 92%
rename from pages_promotion/fenxiao/core/base/index.vue
rename to pages_promotion/fenxiao/index.vue
index df7f728..dc128d6 100644
--- a/pages_promotion/fenxiao/core/base/index.vue
+++ b/pages_promotion/fenxiao/index.vue
@@ -261,25 +261,11 @@
+
+
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/order/order.vue b/pages_promotion/fenxiao/order.vue
similarity index 63%
rename from pages_promotion/fenxiao/order/order.vue
rename to pages_promotion/fenxiao/order.vue
index efb6747..36e0a17 100644
--- a/pages_promotion/fenxiao/order/order.vue
+++ b/pages_promotion/fenxiao/order.vue
@@ -2,51 +2,40 @@
- {{ item.name }}
-
+ {{ item.name }}
-
+
-
+
{{ orderItem.sku_name }}
返{{ fenxiaoWords.account }}
- {{
- $lang('common.currencySymbol') }}
- {{
- parseFloat(orderItem.commission).toFixed(2).split(".")[0] }}
- .{{
- parseFloat(orderItem.commission).toFixed(2).split(".")[1] }}
+ {{ $lang('common.currencySymbol') }}
+ {{ parseFloat(orderItem.commission).toFixed(2).split(".")[0] }}
+ .{{ parseFloat(orderItem.commission).toFixed(2).split(".")[1] }}
- {{ $lang('common.currencySymbol')
- }}
- {{
- parseFloat(orderItem.price).toFixed(2).split(".")[0] }}
- .{{
- parseFloat(orderItem.price).toFixed(2).split(".")[1] }}
+ {{ $lang('common.currencySymbol') }}
+ {{ parseFloat(orderItem.price).toFixed(2).split(".")[0] }}
+ .{{ parseFloat(orderItem.price).toFixed(2).split(".")[1] }}
@@ -68,24 +57,18 @@
合计：
{{ $lang('common.currencySymbol') }}
- {{
- parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[0] }}
- .{{
- parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[1] }}
+ {{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[0] }}
+ .{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[1] }}
-
-
-
-
+
+
+
+
@@ -96,16 +79,22 @@
diff --git a/pages_promotion/fenxiao/order/order_detail.vue b/pages_promotion/fenxiao/order_detail.vue
similarity index 86%
rename from pages_promotion/fenxiao/order/order_detail.vue
rename to pages_promotion/fenxiao/order_detail.vue
index eb2267a..4158687 100644
--- a/pages_promotion/fenxiao/order/order_detail.vue
+++ b/pages_promotion/fenxiao/order_detail.vue
@@ -12,20 +12,15 @@
-
-
-
+
{{ orderData.sku_name }}
￥
- {{
- parseFloat(orderData.price).toFixed(2).split(".")[0] }}
- .{{
- parseFloat(orderData.price).toFixed(2).split(".")[1] }}
+ {{ parseFloat(orderData.price).toFixed(2).split(".")[0] }}
+ .{{ parseFloat(orderData.price).toFixed(2).split(".")[1] }}
@@ -66,10 +61,9 @@
￥
{{ parseFloat(orderData.commission).toFixed(2).split(".")[0] }}
- .{{
- parseFloat(orderData.commission).toFixed(2).split(".")[1] }}
+ .{{ parseFloat(orderData.commission).toFixed(2).split(".")[1] }}
-
+
@@ -82,10 +76,6 @@
+
+
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/ranking_list.vue b/pages_promotion/fenxiao/ranking_list.vue
new file mode 100644
index 0000000..6a134eb
--- /dev/null
+++ b/pages_promotion/fenxiao/ranking_list.vue
@@ -0,0 +1,433 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{info.nickname}}
+
+ 点击提现
+ 我的团队
+
+
+
+
+
+
+
+
+
+
+
+ 分销佣金
+ {{ info.today_commission}}元
+
+
+
+
+
+
+
+
+
+ 佣金排行
+ 您排行第{{ ranking }}名
+
+
+
+
+
+
+
+
+
+
+
+ 推广人数
+ {{ info.one_child_num}}人
+
+
+
+
+
+
+
+
+
+ 推广排行
+ 您排行第{{ ranking }}名
+
+
+
+
+
+ 佣金排行
+ 推广排行
+
+
+
+ {{ index + 1 }}
+
+
+
+
+ {{ item.nickname }}
+
+
+ ￥{{ item.total_commission|moneyFormat }}
+ {{ item.child_num }}人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages_promotion/fenxiao/relation/relation.vue b/pages_promotion/fenxiao/relation.vue
similarity index 88%
rename from pages_promotion/fenxiao/relation/relation.vue
rename to pages_promotion/fenxiao/relation.vue
index b51e94e..36927b5 100644
--- a/pages_promotion/fenxiao/relation/relation.vue
+++ b/pages_promotion/fenxiao/relation.vue
@@ -72,16 +72,23 @@
diff --git a/pages_promotion/fenxiao/relation/team.vue b/pages_promotion/fenxiao/team.vue
similarity index 91%
rename from pages_promotion/fenxiao/relation/team.vue
rename to pages_promotion/fenxiao/team.vue
index 069ee50..87d9a47 100644
--- a/pages_promotion/fenxiao/relation/team.vue
+++ b/pages_promotion/fenxiao/team.vue
@@ -83,15 +83,22 @@
-
-
-
diff --git a/pages_promotion/point/base/list.vue b/pages_promotion/point/base/list.vue
deleted file mode 100644
index d3ba7e9..0000000
--- a/pages_promotion/point/base/list.vue
+++ /dev/null
@@ -1,617 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- 搜索商品
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 我的积分
-
-
- {{ point }}
- 积分
-
-
-
-
-
-
-
-
-
-
-
- 储值{{ parseFloat(item.buy_price) }}元
- 可得{{ item.point }}积分
- 去储值
-
-
-
-
-
-
-
- 积分换券
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ￥
- {{ parseFloat(couponItem.money) }}
-
-
-
- {{ parseFloat(couponItem.discount) }}折
-
-
-
-
-
- {{ couponItem.at_least == 0 ? '无门槛优惠券' : '满' +
- parseFloat(couponItem.at_least).toFixed(0) + '可用' }}
-
- 全场券
-
- 指定券
-
-
-
- {{ couponItem.point }}积分
- 兑换
-
-
-
-
-
-
-
-
-
-
-
- 积分换红包
-
-
-
-
-
-
-
-
-
-
-
-
- ￥
- {{ parseFloat(hongbaoItem.balance).toFixed(0) }}
-
-
-
-
- {{ hongbaoItem.point }}积分
- 兑换
-
-
-
-
-
-
-
-
-
-
- 积分换礼品
-
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
- {{ item.point }}
- 积分
-
-
- +
-
- {{
- parseFloat(item.price).toFixed(2).split(".")[0] }}
- .{{
- parseFloat(item.price).toFixed(2).split(".")[1] }}元
-
-
-
- 兑换
-
-
-
- 库存:{{ isNaN(parseInt(item.stock)) ? 0 : parseInt(item.stock) }}
-
- 已兑:{{ isNaN(parseInt(item.sale_num)) ? 0 : parseInt(item.sale_num) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ isEnEnv ? 'Integral Description' : '积分说明' }}
-
-
-
-
- {{ isEnEnv ? 'Integral Acquisition' : '积分的获取' }}
- 1、积分可在注册、签到、分享、消费、充值时获得。
- 2、在购买部分商品时可获得积分。
- {{ isEnEnv ? 'Integral Use' : '积分的使用' }}
- 1、积分可用于兑换积分中心的商品。
- 2、积分可在参与某些活动时使用。
- 3、积分不得转让，出售，不设有效期。
- {{ isEnEnv ? 'Integral Query' : '积分的查询' }}
- 1、积分可在会员中心中查询具体数额以及明细。
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages_promotion/point/detail/detail.vue b/pages_promotion/point/detail.vue
similarity index 92%
rename from pages_promotion/point/detail/detail.vue
rename to pages_promotion/point/detail.vue
index b992616..5dfd5ad 100644
--- a/pages_promotion/point/detail/detail.vue
+++ b/pages_promotion/point/detail.vue
@@ -195,23 +195,18 @@
-
-
diff --git a/pages_promotion/point/detail/result.vue b/pages_promotion/point/detail/result.vue
deleted file mode 100644
index 62c7f14..0000000
--- a/pages_promotion/point/detail/result.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
- {{ $lang('exchangeSuccess') }}
-
- {{ $lang('see') }}
- {{ $lang('goHome') }}
-
-
-
-
-
-
-
diff --git a/pages_promotion/point/goods_list.vue b/pages_promotion/point/goods_list.vue
new file mode 100644
index 0000000..fa3ce71
--- /dev/null
+++ b/pages_promotion/point/goods_list.vue
@@ -0,0 +1,907 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ isEnEnv ? 'Comprehensive' : '综合' }}
+
+
+ {{ isEnEnv ? 'Points' : '积分' }}
+
+
+
+
+
+
+ {{ isEnEnv ? 'New Arrival' : '上新时间' }}
+
+
+
+
+
+
+ {{ isEnEnv ? 'Filter' : '筛选' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
+
+
+
+ {{ item.point }}
+ {{ isEnEnv ? 'Points' : '积分' }}
+
+ +
+ {{ $lang('common.currencySymbol') }}
+ {{ parseFloat(item.price).toFixed(2).split(".")[0] }}
+ .{{ parseFloat(item.price).toFixed(2).split(".")[1] }}
+
+
+
+
+ {{ isEnEnv ? 'Stock ' : '库存' }}{{ item.stock }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ isEnEnv ? 'Filter' : '筛选' }}
+
+
+
+ {{ isEnEnv ? 'Point Range' : '积分区间' }}
+
+
+
+
+
+
+
+
+ {{ isEnEnv ? 'All Categories' : '全部分类' }}
+
+ {{ isEnEnv ? 'All' : '全部' }}
+
+ {{ item.category_name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages_promotion/point/list.vue b/pages_promotion/point/list.vue
new file mode 100644
index 0000000..c1331b1
--- /dev/null
+++ b/pages_promotion/point/list.vue
@@ -0,0 +1,593 @@
+
+
+
+
+
+
+
+
+
+
+ 搜索商品
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 我的积分
+
+
+ {{point}}
+ 积分
+
+
+
+
+
+
+
+
+
+
+
+ 储值{{ parseFloat(item.buy_price) }}元
+ 可得{{ item.point }}积分
+ 去储值
+
+
+
+
+
+
+
+ 积分换券
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{ parseFloat(couponItem.money) }}
+
+
+
+ {{ parseFloat(couponItem.discount) }}折
+
+
+
+
+
+ {{ couponItem.at_least == 0 ? '无门槛优惠券' : '满' + parseFloat(couponItem.at_least).toFixed(0) + '可用' }}
+
+ 全场券
+ 指定券
+
+
+
+ {{ couponItem.point }}积分
+ 兑换
+
+
+
+
+
+
+
+
+
+
+
+ 积分换红包
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{ parseFloat(hongbaoItem.balance).toFixed(0) }}
+
+
+
+
+ {{ hongbaoItem.point }}积分
+ 兑换
+
+
+
+
+
+
+
+
+
+
+ 积分换礼品
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+ {{ item.point }}
+ 积分
+
+
+ +
+
+ {{ parseFloat(item.price).toFixed(2).split(".")[0] }}
+ .{{ parseFloat(item.price).toFixed(2).split(".")[1] }}元
+
+
+
+ 兑换
+
+
+
+ 库存:{{ isNaN(parseInt(item.stock)) ? 0 : parseInt(item.stock) }}
+
+ 已兑:{{ isNaN(parseInt(item.sale_num)) ? 0 : parseInt(item.sale_num) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ isEnEnv ? 'Integral Description' : '积分说明'}}
+
+
+
+
+ {{ isEnEnv ? 'Integral Acquisition' : '积分的获取'}}
+ 1、积分可在注册、签到、分享、消费、充值时获得。
+ 2、在购买部分商品时可获得积分。
+ {{ isEnEnv ? 'Integral Use' : '积分的使用'}}
+ 1、积分可用于兑换积分中心的商品。
+ 2、积分可在参与某些活动时使用。
+ 3、积分不得转让，出售，不设有效期。
+ {{ isEnEnv ? 'Integral Query' : '积分的查询'}}
+ 1、积分可在会员中心中查询具体数额以及明细。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_promotion/point/order_list.vue b/pages_promotion/point/order_list.vue
new file mode 100644
index 0000000..66b6a83
--- /dev/null
+++ b/pages_promotion/point/order_list.vue
@@ -0,0 +1,591 @@
+
+
+
+
+
+ {{ statusItem.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ orderItem.exchange_name }}
+
+
+ {{ orderItem.point }}
+ 积分
+
+ +
+ {{ $lang('common.currencySymbol') }}
+ {{ parseFloat(orderItem.price).toFixed(2).split(".")[0] }}
+ .{{ parseFloat(orderItem.price).toFixed(2).split(".")[1] }}
+
+
+
+
+ {{ orderItem.num }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages_promotion/point/detail/payment.vue b/pages_promotion/point/payment.vue
similarity index 63%
rename from pages_promotion/point/detail/payment.vue
rename to pages_promotion/point/payment.vue
index 4f43bc1..155cf6f 100644
--- a/pages_promotion/point/detail/payment.vue
+++ b/pages_promotion/point/payment.vue
@@ -2,9 +2,9 @@
+ 'padding-top': menuButtonBounding.top + 'px',
+ height: menuButtonBounding.height + 'px'
+ }">
确认订单
@@ -18,12 +18,11 @@
-
+
{{ deliveryItem.title }}
@@ -32,12 +31,10 @@
-
-
+
由 {{ storeInfo.currStore.store_name }} 提供配送
@@ -52,19 +49,14 @@
-
+
- {{ orderCreateData.member_address.name ?
- orderCreateData.member_address.name : '' }}
- {{ orderCreateData.member_address.mobile ?
- orderCreateData.member_address.mobile : '' }}
+ {{ orderCreateData.member_address.name ? orderCreateData.member_address.name : '' }}
+ {{ orderCreateData.member_address.mobile ? orderCreateData.member_address.mobile : '' }}
- {{ orderCreateData.member_address.full_address ?
- orderCreateData.member_address.full_address : '' }}
- {{ orderCreateData.member_address.address ? orderCreateData.member_address.address : ''
- }}
+ {{ orderCreateData.member_address.full_address ? orderCreateData.member_address.full_address : '' }}
+ {{ orderCreateData.member_address.address ? orderCreateData.member_address.address : '' }}
@@ -77,14 +69,11 @@
-
+
送达时间
- {{
- orderCreateData.buyer_ask_delivery_title ?
- orderCreateData.buyer_ask_delivery_title : '请选择送达时间' }}
+ {{ orderCreateData.buyer_ask_delivery_title ? orderCreateData.buyer_ask_delivery_title : '请选择送达时间' }}
@@ -93,9 +82,7 @@
-
+
@@ -117,22 +104,20 @@
姓名
-
+
预留手机
+ placeholder-class="color-tip placeholder" class="input" v-model="member_address.mobile" />
自提时间
- {{ orderCreateData.buyer_ask_delivery_title }}
+ {{orderCreateData.buyer_ask_delivery_title}}
@@ -152,35 +137,27 @@
手机号码
-
+
-
+
-
+
-
+
-
+
@@ -205,8 +182,7 @@
@@ -220,8 +196,7 @@
积分
-
+
运费
{{ $lang('common.currencySymbol') }}
@@ -231,9 +206,8 @@
-
- {{ orderPaymentData.delivery.error_msg }}
+
+ {{orderPaymentData.delivery.error_msg}}
@@ -247,14 +221,12 @@
-
+
@@ -269,29 +241,22 @@
-
+
-
+
{{ item.store_name }}
({{ item.distance }}km)
-
+
营业时间：{{ item.open_date }}
-
+
地址：{{ item.full_address }}{{ item.address }}
-
+
所选择收货地址附近没有可以自提的门店
@@ -302,8 +267,7 @@
-
+
@@ -313,41 +277,48 @@
\ No newline at end of file
diff --git a/pages_promotion/point/result.vue b/pages_promotion/point/result.vue
new file mode 100644
index 0000000..ce14ea8
--- /dev/null
+++ b/pages_promotion/point/result.vue
@@ -0,0 +1,92 @@
+
+
+
+
+
+ {{ $lang('exchangeSuccess') }}
+
+ {{ $lang('see') }}
+ {{ $lang('goHome') }}
+
+
+
+
+
+
+
diff --git a/pages_tool/agreement/contenr.vue b/pages_tool/agreement/contenr.vue
index 581f70b..7dfcaa9 100644
--- a/pages_tool/agreement/contenr.vue
+++ b/pages_tool/agreement/contenr.vue
@@ -5,48 +5,50 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/pages_tool/article/detail.vue b/pages_tool/article/detail.vue
index 7b39f90..d2c7c25 100644
--- a/pages_tool/article/detail.vue
+++ b/pages_tool/article/detail.vue
@@ -25,140 +25,134 @@
\ No newline at end of file
diff --git a/pages_tool/article/list.vue b/pages_tool/article/list.vue
index 967fcfa..bcbbb96 100644
--- a/pages_tool/article/list.vue
+++ b/pages_tool/article/list.vue
@@ -6,8 +6,7 @@
-
+
{{ item.article_title }}
@@ -34,195 +33,203 @@
\ No newline at end of file
diff --git a/pages_tool/cases/index.vue b/pages_tool/cases/index.vue
index 7b52aac..50303ad 100644
--- a/pages_tool/cases/index.vue
+++ b/pages_tool/cases/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -8,9 +8,7 @@
-
+
@@ -19,16 +17,16 @@
- {{ item.$orig.title }}
- {{ item.$orig.desc }}
- {{ "完成时间：" + item.g3 }}
+ {{item.$orig.title}}
+ {{item.$orig.desc}}
+ {{"完成时间：" + item.g3}}
- {{ item.$orig.files_title }}
+ {{item.$orig.files_title}}
查看PDF文件
@@ -61,15 +59,13 @@
联系方式
-
+
留言内容
-
+
@@ -81,11 +77,9 @@
-
+
-
+
@@ -94,9 +88,6 @@
+
+
\ No newline at end of file
diff --git a/components/ns-chat/ns-chat-goods.vue b/pages_tool/components/ns-chat/ns-chat-goods.vue
similarity index 100%
rename from components/ns-chat/ns-chat-goods.vue
rename to pages_tool/components/ns-chat/ns-chat-goods.vue
diff --git a/components/ns-chat/ns-chat-order.vue b/pages_tool/components/ns-chat/ns-chat-order.vue
similarity index 96%
rename from components/ns-chat/ns-chat-order.vue
rename to pages_tool/components/ns-chat/ns-chat-order.vue
index d78afec..334c9fd 100644
--- a/components/ns-chat/ns-chat-order.vue
+++ b/pages_tool/components/ns-chat/ns-chat-order.vue
@@ -1,149 +1,149 @@
-
-
-
-
-
- {{ orderdetails.order_goods ? orderdetails.order_goods[0].sku_name : '' }}
- 订单状态:{{ orderdetails.order_status_name }}
- 配送方式:{{ orderdetails.delivery_type_name }}
-
-
- ￥
- {{ orderdetails.order_goods ? orderdetails.order_goods[0].price : '' }}
-
- 发送
-
-
-
-
-
-
- {{ orderInfo.order_goods ? orderInfo.order_goods[0].sku_name : '' }}
- 订单状态:{{ orderInfo.order_status_name }}
- 配送方式:{{ orderInfo.delivery_type_name }}
-
-
- ￥
- {{ orderInfo.order_goods ? orderInfo.order_goods[0].price : '' }}
-
- 已发送
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ orderdetails.order_goods ? orderdetails.order_goods[0].sku_name : '' }}
+ 订单状态:{{ orderdetails.order_status_name }}
+ 配送方式:{{ orderdetails.delivery_type_name }}
+
+
+ ￥
+ {{ orderdetails.order_goods ? orderdetails.order_goods[0].price : '' }}
+
+ 发送
+
+
+
+
+
+
+ {{ orderInfo.order_goods ? orderInfo.order_goods[0].sku_name : '' }}
+ 订单状态:{{ orderInfo.order_status_name }}
+ 配送方式:{{ orderInfo.delivery_type_name }}
+
+
+ ￥
+ {{ orderInfo.order_goods ? orderInfo.order_goods[0].price : '' }}
+
+ 已发送
+
+
+
+
+
+
+
+
+
diff --git a/components/ns-chat/ns-chat-receiveGoods.vue b/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue
similarity index 100%
rename from components/ns-chat/ns-chat-receiveGoods.vue
rename to pages_tool/components/ns-chat/ns-chat-receiveGoods.vue
diff --git a/components/ns-progress/ns-progress.vue b/pages_tool/components/ns-progress/ns-progress.vue
similarity index 94%
rename from components/ns-progress/ns-progress.vue
rename to pages_tool/components/ns-progress/ns-progress.vue
index ac70b54..e3afc36 100644
--- a/components/ns-progress/ns-progress.vue
+++ b/pages_tool/components/ns-progress/ns-progress.vue
@@ -1,37 +1,37 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/components/sx-rate/common.js b/pages_tool/components/sx-rate/common.js
similarity index 97%
rename from components/sx-rate/common.js
rename to pages_tool/components/sx-rate/common.js
index 3128593..6e559dc 100644
--- a/components/sx-rate/common.js
+++ b/pages_tool/components/sx-rate/common.js
@@ -1,6 +1,6 @@
-export function getClientRect(selector, component) {
- return new Promise((resolve, reject) => {
- let query = component ? uni.createSelectorQuery().in(component) : uni.createSelectorQuery();
- return query.select(selector).boundingClientRect(resolve).exec()
- })
-}
+export function getClientRect(selector, component) {
+ return new Promise((resolve, reject) => {
+ let query = component ? uni.createSelectorQuery().in(component) : uni.createSelectorQuery();
+ return query.select(selector).boundingClientRect(resolve).exec()
+ })
+}
diff --git a/components/sx-rate/index.vue b/pages_tool/components/sx-rate/index.vue
similarity index 100%
rename from components/sx-rate/index.vue
rename to pages_tool/components/sx-rate/index.vue
diff --git a/components/sx-rate/sx-rate/iconfont.css b/pages_tool/components/sx-rate/sx-rate/iconfont.css
similarity index 68%
rename from components/sx-rate/sx-rate/iconfont.css
rename to pages_tool/components/sx-rate/sx-rate/iconfont.css
index 897ecc0..48200e0 100644
--- a/components/sx-rate/sx-rate/iconfont.css
+++ b/pages_tool/components/sx-rate/sx-rate/iconfont.css
@@ -1,21 +1,21 @@
-@font-face {font-family: "iconfont";
- src: url('~@/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482'); /* IE9 */
- src: url('~@/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAK8AAsAAAAABnAAAAJwAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcAp8gQgBNgIkAwgLBgAEIAWEbQcuG6wFyA4lTcHACOEZBUg8fL/2O3f3fTHEkoh28SSayCSxkkgQG6Uz3UvYITu9Qr5K0Vh6Ij6f+8CXKzVBHDvWa6d0lSfK57mc3gQ6kGt8oBz3ojUG9QLqxYEU6B4YRVYqecPYBS7hMYG6QWF0dlOycoGxxFoViFuxkALGuYAksXRVKNccTOJdSTV7zbSAt/D78Y8XxmRKOavq5CZZAOK+7u2svLVode0TggR0vIQc84BEXNQmjugJxumpJ/SNAvsqD77ui8K3i71aBPvrrNIm6IfSe5K58ltNZ3BbU40Blkf9OmKsIW/Un1qddc4dcSma3ArIX7PPXdlxK5l2zJ+aD6TXnQqmu330wqpeWkYN/OnNm/0trU+YvqNR4UN99f+x/tApIFTfR7u39X4gKPnb9pOX5RAQB6DYyc/zOKCD4OUp6KiiPeqnapbAp56NdegrdhLo5wKq+3UG/0fWcyDpCsuWJVVWO5oZO29bXR0FwJ4uV2ONvTeTCVW9I1wVAylyVeNkYudR0rCOsqoN1M1JPd7QDdMTqYZZXQChwwYybT6Q63BIJvYSJX1eUNYReqi7CrsLGyZDbJqIEUWQAPLroJhWKhjHQUyj8mwkrJJROKsI+XyENeIw5LI4xXQqUiA8xxZNtZBHCAMZrJTDFPAcksmUUIWVEkQTlogQVQSbzdS9iUUr5cDUDgyhEIgAxFcHEqMpKTD+eMK09PlsiFAVGQpu6atJ5kMwDfHsEBcLpweZqlX06ruXVzSqCfEQBANiYEpyUAqYh8jIKEGq+nkSCI1gEY2IqURg28OYvlrW+nr5152AOsuUhV2fSy+EwgAAAA==') format('woff2'),
- url('~@/components/sx-rate/sx-rate/iconfont.woff?t=1574760464482') format('woff'),
- url('~@/components/sx-rate/sx-rate/iconfont.ttf?t=1574760464482') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
- url('~@/components/sx-rate/sx-rate/iconfont.svg?t=1574760464482#iconfont') format('svg'); /* iOS 4.1- */
-}
-
-.iconfont {
- font-family: "iconfont" !important;
- font-size: inherit;
- font-style: normal;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-star:before {
- content: "\e6e3";
-}
-
+@font-face {font-family: "iconfont";
+ src: url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482'); /* IE9 */
+ src: url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.eot?t=1574760464482#iefix') format('embedded-opentype'), /* IE6-IE8 */
+ url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAK8AAsAAAAABnAAAAJwAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcAp8gQgBNgIkAwgLBgAEIAWEbQcuG6wFyA4lTcHACOEZBUg8fL/2O3f3fTHEkoh28SSayCSxkkgQG6Uz3UvYITu9Qr5K0Vh6Ij6f+8CXKzVBHDvWa6d0lSfK57mc3gQ6kGt8oBz3ojUG9QLqxYEU6B4YRVYqecPYBS7hMYG6QWF0dlOycoGxxFoViFuxkALGuYAksXRVKNccTOJdSTV7zbSAt/D78Y8XxmRKOavq5CZZAOK+7u2svLVode0TggR0vIQc84BEXNQmjugJxumpJ/SNAvsqD77ui8K3i71aBPvrrNIm6IfSe5K58ltNZ3BbU40Blkf9OmKsIW/Un1qddc4dcSma3ArIX7PPXdlxK5l2zJ+aD6TXnQqmu330wqpeWkYN/OnNm/0trU+YvqNR4UN99f+x/tApIFTfR7u39X4gKPnb9pOX5RAQB6DYyc/zOKCD4OUp6KiiPeqnapbAp56NdegrdhLo5wKq+3UG/0fWcyDpCsuWJVVWO5oZO29bXR0FwJ4uV2ONvTeTCVW9I1wVAylyVeNkYudR0rCOsqoN1M1JPd7QDdMTqYZZXQChwwYybT6Q63BIJvYSJX1eUNYReqi7CrsLGyZDbJqIEUWQAPLroJhWKhjHQUyj8mwkrJJROKsI+XyENeIw5LI4xXQqUiA8xxZNtZBHCAMZrJTDFPAcksmUUIWVEkQTlogQVQSbzdS9iUUr5cDUDgyhEIgAxFcHEqMpKTD+eMK09PlsiFAVGQpu6atJ5kMwDfHsEBcLpweZqlX06ruXVzSqCfEQBANiYEpyUAqYh8jIKEGq+nkSCI1gEY2IqURg28OYvlrW+nr5152AOsuUhV2fSy+EwgAAAA==') format('woff2'),
+ url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.woff?t=1574760464482') format('woff'),
+ url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.ttf?t=1574760464482') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+ url('~@/pages_tool/components/sx-rate/sx-rate/iconfont.svg?t=1574760464482#iconfont') format('svg'); /* iOS 4.1- */
+}
+
+.iconfont {
+ font-family: "iconfont" !important;
+ font-size: inherit;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-star:before {
+ content: "\e6e3";
+}
+
diff --git a/components/sx-rate/sx-rate/iconfont.eot b/pages_tool/components/sx-rate/sx-rate/iconfont.eot
similarity index 100%
rename from components/sx-rate/sx-rate/iconfont.eot
rename to pages_tool/components/sx-rate/sx-rate/iconfont.eot
diff --git a/components/sx-rate/sx-rate/iconfont.svg b/pages_tool/components/sx-rate/sx-rate/iconfont.svg
similarity index 97%
rename from components/sx-rate/sx-rate/iconfont.svg
rename to pages_tool/components/sx-rate/sx-rate/iconfont.svg
index 3e53590..8e29477 100644
--- a/components/sx-rate/sx-rate/iconfont.svg
+++ b/pages_tool/components/sx-rate/sx-rate/iconfont.svg
@@ -1,29 +1,29 @@
-
-
-
-
+
+
+
+
diff --git a/components/sx-rate/sx-rate/iconfont.ttf b/pages_tool/components/sx-rate/sx-rate/iconfont.ttf
similarity index 100%
rename from components/sx-rate/sx-rate/iconfont.ttf
rename to pages_tool/components/sx-rate/sx-rate/iconfont.ttf
diff --git a/components/sx-rate/sx-rate/iconfont.woff b/pages_tool/components/sx-rate/sx-rate/iconfont.woff
similarity index 100%
rename from components/sx-rate/sx-rate/iconfont.woff
rename to pages_tool/components/sx-rate/sx-rate/iconfont.woff
diff --git a/components/sx-rate/sx-rate/iconfont.woff2 b/pages_tool/components/sx-rate/sx-rate/iconfont.woff2
similarity index 100%
rename from components/sx-rate/sx-rate/iconfont.woff2
rename to pages_tool/components/sx-rate/sx-rate/iconfont.woff2
diff --git a/components/uni-calendar/calendar.js b/pages_tool/components/uni-calendar/calendar.js
similarity index 97%
rename from components/uni-calendar/calendar.js
rename to pages_tool/components/uni-calendar/calendar.js
index b42c560..2331f75 100644
--- a/components/uni-calendar/calendar.js
+++ b/pages_tool/components/uni-calendar/calendar.js
@@ -1,623 +1,623 @@
-/**
- * @1900-2100区间内的公历、农历互转
- * @charset UTF-8
- * @github https://github.com/jjonline/calendar.js
- * @Author Jea杨(JJonline@JJonline.Cn)
- * @Time 2014-7-21
- * @Time 2016-8-13 Fixed 2033hex、Attribution Annals
- * @Time 2016-9-25 Fixed lunar LeapMonth Param Bug
- * @Time 2017-7-24 Fixed use getTerm Func Param Error.use solar year,NOT lunar year
- * @Version 1.0.3
- * @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
- * @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
- */
-/* eslint-disable */
-var calendar = {
-
- /**
- * 农历1900-2100的润大小信息表
- * @Array Of Property
- * @return Hex
- */
- lunarInfo: [0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0,
- 0x055d2, // 1900-1909
- 0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
- 0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
- 0x06566, 0x0d4a0, 0x0ea50, 0x06e95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
- 0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
- 0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
- 0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
- 0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
- 0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
- 0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
- 0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
- 0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
- 0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
- 0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
- 0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
- /** Add By JJonline@JJonline.Cn**/
- 0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
- 0x0a2e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
- 0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
- 0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
- 0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
- 0x0d520
- ], // 2100
-
- /**
- * 公历每个月份的天数普通表
- * @Array Of Property
- * @return Number
- */
- solarMonth: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
-
- /**
- * 天干地支之天干速查表
- * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
- * @return Cn string
- */
- Gan: ['\u7532', '\u4e59', '\u4e19', '\u4e01', '\u620a', '\u5df1', '\u5e9a', '\u8f9b', '\u58ec', '\u7678'],
-
- /**
- * 天干地支之地支速查表
- * @Array Of Property
- * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
- * @return Cn string
- */
- Zhi: ['\u5b50', '\u4e11', '\u5bc5', '\u536f', '\u8fb0', '\u5df3', '\u5348', '\u672a', '\u7533', '\u9149',
- '\u620c',
- '\u4ea5'
- ],
-
- /**
- * 天干地支之地支速查表<=>生肖
- * @Array Of Property
- * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
- * @return Cn string
- */
- Animals: ['\u9f20', '\u725b', '\u864e', '\u5154', '\u9f99', '\u86c7', '\u9a6c', '\u7f8a', '\u7334', '\u9e21',
- '\u72d7', '\u732a'
- ],
-
- /**
- * 24节气速查表
- * @Array Of Property
- * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
- * @return Cn string
- */
- solarTerm: ['\u5c0f\u5bd2', '\u5927\u5bd2', '\u7acb\u6625', '\u96e8\u6c34', '\u60ca\u86f0', '\u6625\u5206',
- '\u6e05\u660e', '\u8c37\u96e8', '\u7acb\u590f', '\u5c0f\u6ee1', '\u8292\u79cd', '\u590f\u81f3',
- '\u5c0f\u6691',
- '\u5927\u6691', '\u7acb\u79cb', '\u5904\u6691', '\u767d\u9732', '\u79cb\u5206', '\u5bd2\u9732',
- '\u971c\u964d',
- '\u7acb\u51ac', '\u5c0f\u96ea', '\u5927\u96ea', '\u51ac\u81f3'
- ],
-
- /**
- * 1900-2100各年的24节气日期速查表
- * @Array Of Property
- * @return 0x string For splice
- */
- sTermInfo: ['9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
- '97bcf97c3598082c95f8c965cc920f',
- '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
- '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa',
- '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f',
- 'b027097bd097c36b0b6fc9274c91aa', '9778397bd19801ec9210c965cc920e', '97b6b97bd19801ec95f8c965cc920f',
- '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd197c36c9210c9274c91aa',
- '97b6b97bd19801ec95f8c965cc920e', '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2',
- '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec95f8c965cc920e', '97bcf97c3598082c95f8e1cfcc920f',
- '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e',
- '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
- '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722',
- '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f',
- '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
- '97bcf97c359801ec95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
- '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd097bd07f595b0b6fc920fb0722',
- '9778397bd097c36b0b6fc9210c8dc2', '9778397bd19801ec9210c9274c920e', '97b6b97bd19801ec95f8c965cc920f',
- '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
- '97b6b97bd19801ec95f8c965cc920f', '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
- '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bd07f1487f595b0b0bc920fb0722',
- '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
- '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
- '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
- '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f531b0b0bb0b6fb0722',
- '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
- '97bcf7f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
- '97b6b97bd19801ec9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
- '9778397bd097c36b0b6fc9210c91aa', '97b6b97bd197c36c9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722',
- '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
- '97b6b7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
- '9778397bd097c36b0b70c9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
- '7f0e397bd097c35b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
- '7f0e27f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
- '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
- '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
- '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
- '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
- '97b6b7f0e47f531b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
- '9778397bd097c36b0b6fc9210c91aa', '97b6b7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
- '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '977837f0e37f149b0723b0787b0721',
- '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c35b0b6fc9210c8dc2',
- '977837f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
- '7f0e397bd097c35b0b6fc9210c8dc2', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
- '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '977837f0e37f14998082b0787b06bd',
- '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
- '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
- '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
- '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd',
- '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
- '977837f0e37f14998082b0723b06bd', '7f07e7f0e37f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
- '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b0721',
- '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f595b0b0bb0b6fb0722', '7f0e37f0e37f14898082b0723b02d5',
- '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f531b0b0bb0b6fb0722',
- '7f0e37f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
- '7f0e37f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
- '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35',
- '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
- '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f149b0723b0787b0721',
- '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0723b06bd',
- '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722', '7f0e37f0e366aa89801eb072297c35',
- '7ec967f0e37f14998082b0723b06bd', '7f07e7f0e37f14998083b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
- '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14898082b0723b02d5', '7f07e7f0e37f14998082b0787b0721',
- '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66aa89801e9808297c35', '665f67f0e37f14898082b0723b02d5',
- '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66a449801e9808297c35',
- '665f67f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
- '7f0e36665b66a449801e9808297c35', '665f67f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
- '7f07e7f0e47f531b0723b0b6fb0721', '7f0e26665b66a449801e9808297c35', '665f67f0e37f1489801eb072297c35',
- '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722'
- ],
-
- /**
- * 数字转中文速查表
- * @Array Of Property
- * @trans ['日','一','二','三','四','五','六','七','八','九','十']
- * @return Cn string
- */
- nStr1: ['\u65e5', '\u4e00', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d',
- '\u5341'
- ],
-
- /**
- * 日期转农历称呼速查表
- * @Array Of Property
- * @trans ['初','十','廿','卅']
- * @return Cn string
- */
- nStr2: ['\u521d', '\u5341', '\u5eff', '\u5345'],
-
- /**
- * 月份转农历称呼速查表
- * @Array Of Property
- * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
- * @return Cn string
- */
- nStr3: ['\u6b63', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341',
- '\u51ac',
- '\u814a'
- ],
-
- /**
- * 返回农历y年一整年的总天数
- * @param lunar Year
- * @return Number
- * @eg:var count = calendar.lYearDays(1987) ;//count=387
- */
- lYearDays: function(y) {
- var i;
- var sum = 348
- for (i = 0x8000; i > 0x8; i >>= 1) {
- sum += (this.lunarInfo[y - 1900] & i) ? 1 : 0
- }
- return (sum + this.leapDays(y))
- },
-
- /**
- * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
- * @param lunar Year
- * @return Number (0-12)
- * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
- */
- leapMonth: function(y) { // 闰字编码 \u95f0
- return (this.lunarInfo[y - 1900] & 0xf)
- },
-
- /**
- * 返回农历y年闰月的天数 若该年没有闰月则返回0
- * @param lunar Year
- * @return Number (0、29、30)
- * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
- */
- leapDays: function(y) {
- if (this.leapMonth(y)) {
- return ((this.lunarInfo[y - 1900] & 0x10000) ? 30 : 29)
- }
- return (0)
- },
-
- /**
- * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
- * @param lunar Year
- * @return Number (-1、29、30)
- * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
- */
- monthDays: function(y, m) {
- if (m > 12 || m < 1) {
- return -1
- } // 月份参数从1至12，参数错误返回-1
- return ((this.lunarInfo[y - 1900] & (0x10000 >> m)) ? 30 : 29)
- },
-
- /**
- * 返回公历(!)y年m月的天数
- * @param solar Year
- * @return Number (-1、28、29、30、31)
- * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
- */
- solarDays: function(y, m) {
- if (m > 12 || m < 1) {
- return -1
- } // 若参数错误 返回-1
- var ms = m - 1
- if (ms == 1) { // 2月份的闰平规律测算后确认返回28或29
- return (((y % 4 == 0) && (y % 100 != 0) || (y % 400 == 0)) ? 29 : 28)
- } else {
- return (this.solarMonth[ms])
- }
- },
-
- /**
- * 农历年份转换为干支纪年
- * @param lYear 农历年的年份数
- * @return Cn string
- */
- toGanZhiYear: function(lYear) {
- var ganKey = (lYear - 3) % 10
- var zhiKey = (lYear - 3) % 12
- if (ganKey == 0) ganKey = 10 // 如果余数为0则为最后一个天干
- if (zhiKey == 0) zhiKey = 12 // 如果余数为0则为最后一个地支
- return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
- },
-
- /**
- * 公历月、日判断所属星座
- * @param cMonth [description]
- * @param cDay [description]
- * @return Cn string
- */
- toAstro: function(cMonth, cDay) {
- var s =
- '\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
- var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
- return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7' // 座
- },
-
- /**
- * 传入offset偏移量返回干支
- * @param offset 相对甲子的偏移量
- * @return Cn string
- */
- toGanZhi: function(offset) {
- return this.Gan[offset % 10] + this.Zhi[offset % 12]
- },
-
- /**
- * 传入公历(!)y年获得该年第n个节气的公历日期
- * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
- * @return day Number
- * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
- */
- getTerm: function(y, n) {
- if (y < 1900 || y > 2100) {
- return -1
- }
- if (n < 1 || n > 24) {
- return -1
- }
- var _table = this.sTermInfo[y - 1900]
- var _info = [
- parseInt('0x' + _table.substr(0, 5)).toString(),
- parseInt('0x' + _table.substr(5, 5)).toString(),
- parseInt('0x' + _table.substr(10, 5)).toString(),
- parseInt('0x' + _table.substr(15, 5)).toString(),
- parseInt('0x' + _table.substr(20, 5)).toString(),
- parseInt('0x' + _table.substr(25, 5)).toString()
- ]
- var _calday = [
- _info[0].substr(0, 1),
- _info[0].substr(1, 2),
- _info[0].substr(3, 1),
- _info[0].substr(4, 2),
-
- _info[1].substr(0, 1),
- _info[1].substr(1, 2),
- _info[1].substr(3, 1),
- _info[1].substr(4, 2),
-
- _info[2].substr(0, 1),
- _info[2].substr(1, 2),
- _info[2].substr(3, 1),
- _info[2].substr(4, 2),
-
- _info[3].substr(0, 1),
- _info[3].substr(1, 2),
- _info[3].substr(3, 1),
- _info[3].substr(4, 2),
-
- _info[4].substr(0, 1),
- _info[4].substr(1, 2),
- _info[4].substr(3, 1),
- _info[4].substr(4, 2),
-
- _info[5].substr(0, 1),
- _info[5].substr(1, 2),
- _info[5].substr(3, 1),
- _info[5].substr(4, 2)
- ]
- return parseInt(_calday[n - 1])
- },
-
- /**
- * 传入农历数字月份返回汉语通俗表示法
- * @param lunar month
- * @return Cn string
- * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
- */
- toChinaMonth: function(m) { // 月 => \u6708
- if (m > 12 || m < 1) {
- return -1
- } // 若参数错误 返回-1
- var s = this.nStr3[m - 1]
- s += '\u6708' // 加上月字
- return s
- },
-
- /**
- * 传入农历日期数字返回汉字表示法
- * @param lunar day
- * @return Cn string
- * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
- */
- toChinaDay: function(d) { // 日 => \u65e5
- var s
- switch (d) {
- case 10:
- s = '\u521d\u5341';
- break
- case 20:
- s = '\u4e8c\u5341';
- break
- break
- case 30:
- s = '\u4e09\u5341';
- break
- break
- default:
- s = this.nStr2[Math.floor(d / 10)]
- s += this.nStr1[d % 10]
- }
- return (s)
- },
-
- /**
- * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
- * @param y year
- * @return Cn string
- * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
- */
- getAnimal: function(y) {
- return this.Animals[(y - 4) % 12]
- },
-
- /**
- * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
- * @param y solar year
- * @param m solar month
- * @param d solar day
- * @return JSON object
- * @eg:console.log(calendar.solar2lunar(1987,11,01));
- */
- solar2lunar: function(y, m, d) { // 参数区间1900.1.31~2100.12.31
- // 年份限定、上限
- if (y < 1900 || y > 2100) {
- return -1 // undefined转换为数字变为NaN
- }
- // 公历传参最下限
- if (y == 1900 && m == 1 && d < 31) {
- return -1
- }
- // 未传参 获得当天
- if (!y) {
- var objDate = new Date()
- } else {
- var objDate = new Date(y, parseInt(m) - 1, d)
- }
- var i;
- var leap = 0;
- var temp = 0
- // 修正ymd参数
- var y = objDate.getFullYear()
- var m = objDate.getMonth() + 1
- var d = objDate.getDate()
- var offset = (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) - Date.UTC(1900, 0,
- 31)) /
- 86400000
- for (i = 1900; i < 2101 && offset > 0; i++) {
- temp = this.lYearDays(i)
- offset -= temp
- }
- if (offset < 0) {
- offset += temp;
- i--
- }
-
- // 是否今天
- var isTodayObj = new Date()
- var isToday = false
- if (isTodayObj.getFullYear() == y && isTodayObj.getMonth() + 1 == m && isTodayObj.getDate() == d) {
- isToday = true
- }
- // 星期几
- var nWeek = objDate.getDay()
- var cWeek = this.nStr1[nWeek]
- // 数字表示周几顺应天朝周一开始的惯例
- if (nWeek == 0) {
- nWeek = 7
- }
- // 农历年
- var year = i
- var leap = this.leapMonth(i) // 闰哪个月
- var isLeap = false
-
- // 效验闰月
- for (i = 1; i < 13 && offset > 0; i++) {
- // 闰月
- if (leap > 0 && i == (leap + 1) && isLeap == false) {
- --i
- isLeap = true;
- temp = this.leapDays(year) // 计算农历闰月天数
- } else {
- temp = this.monthDays(year, i) // 计算农历普通月天数
- }
- // 解除闰月
- if (isLeap == true && i == (leap + 1)) {
- isLeap = false
- }
- offset -= temp
- }
- // 闰月导致数组下标重叠取反
- if (offset == 0 && leap > 0 && i == leap + 1) {
- if (isLeap) {
- isLeap = false
- } else {
- isLeap = true;
- --i
- }
- }
- if (offset < 0) {
- offset += temp;
- --i
- }
- // 农历月
- var month = i
- // 农历日
- var day = offset + 1
- // 天干地支处理
- var sm = m - 1
- var gzY = this.toGanZhiYear(year)
-
- // 当月的两个节气
- // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
- var firstNode = this.getTerm(y, (m * 2 - 1)) // 返回当月「节」为几日开始
- var secondNode = this.getTerm(y, (m * 2)) // 返回当月「节」为几日开始
-
- // 依据12节气修正干支月
- var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
- if (d >= firstNode) {
- gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
- }
-
- // 传入的日期的节气与否
- var isTerm = false
- var Term = null
- if (firstNode == d) {
- isTerm = true
- Term = this.solarTerm[m * 2 - 2]
- }
- if (secondNode == d) {
- isTerm = true
- Term = this.solarTerm[m * 2 - 1]
- }
- // 日柱 当月一日与 1900/1/1 相差天数
- var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
- var gzD = this.toGanZhi(dayCyclical + d - 1)
- // 该日期所属的星座
- var astro = this.toAstro(m, d)
-
- return {
- 'lYear': year,
- 'lMonth': month,
- 'lDay': day,
- 'Animal': this.getAnimal(year),
- 'IMonthCn': (isLeap ? '\u95f0' : '') + this.toChinaMonth(month),
- 'IDayCn': this.toChinaDay(day),
- 'cYear': y,
- 'cMonth': m,
- 'cDay': d,
- 'gzYear': gzY,
- 'gzMonth': gzM,
- 'gzDay': gzD,
- 'isToday': isToday,
- 'isLeap': isLeap,
- 'nWeek': nWeek,
- 'ncWeek': '\u661f\u671f' + cWeek,
- 'isTerm': isTerm,
- 'Term': Term,
- 'astro': astro
- }
- },
-
- /**
- * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
- * @param y lunar year
- * @param m lunar month
- * @param d lunar day
- * @param isLeapMonth lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
- * @return JSON object
- * @eg:console.log(calendar.lunar2solar(1987,9,10));
- */
- lunar2solar: function(y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
- var isLeapMonth = !!isLeapMonth
- var leapOffset = 0
- var leapMonth = this.leapMonth(y)
- var leapDay = this.leapDays(y)
- if (isLeapMonth && (leapMonth != m)) {
- return -1
- } // 传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
- if (y == 2100 && m == 12 && d > 1 || y == 1900 && m == 1 && d < 31) {
- return -1
- } // 超出了最大极限值
- var day = this.monthDays(y, m)
- var _day = day
- // bugFix 2016-9-25
- // if month is leap, _day use leapDays method
- if (isLeapMonth) {
- _day = this.leapDays(y, m)
- }
- if (y < 1900 || y > 2100 || d > _day) {
- return -1
- } // 参数合法性效验
-
- // 计算农历的时间差
- var offset = 0
- for (var i = 1900; i < y; i++) {
- offset += this.lYearDays(i)
- }
- var leap = 0;
- var isAdd = false
- for (var i = 1; i < m; i++) {
- leap = this.leapMonth(y)
- if (!isAdd) { // 处理闰月
- if (leap <= i && leap > 0) {
- offset += this.leapDays(y);
- isAdd = true
- }
- }
- offset += this.monthDays(y, i)
- }
- // 转换闰月农历 需补充该年闰月的前一个月的时差
- if (isLeapMonth) {
- offset += day
- }
- // 1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
- var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
- var calObj = new Date((offset + d - 31) * 86400000 + stmap)
- var cY = calObj.getUTCFullYear()
- var cM = calObj.getUTCMonth() + 1
- var cD = calObj.getUTCDate()
-
- return this.solar2lunar(cY, cM, cD)
- }
-}
-
-export default calendar
+/**
+ * @1900-2100区间内的公历、农历互转
+ * @charset UTF-8
+ * @github https://github.com/jjonline/calendar.js
+ * @Author Jea杨(JJonline@JJonline.Cn)
+ * @Time 2014-7-21
+ * @Time 2016-8-13 Fixed 2033hex、Attribution Annals
+ * @Time 2016-9-25 Fixed lunar LeapMonth Param Bug
+ * @Time 2017-7-24 Fixed use getTerm Func Param Error.use solar year,NOT lunar year
+ * @Version 1.0.3
+ * @公历转农历：calendar.solar2lunar(1987,11,01); //[you can ignore params of prefix 0]
+ * @农历转公历：calendar.lunar2solar(1987,09,10); //[you can ignore params of prefix 0]
+ */
+/* eslint-disable */
+var calendar = {
+
+ /**
+ * 农历1900-2100的润大小信息表
+ * @Array Of Property
+ * @return Hex
+ */
+ lunarInfo: [0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0,
+ 0x055d2, // 1900-1909
+ 0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977, // 1910-1919
+ 0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970, // 1920-1929
+ 0x06566, 0x0d4a0, 0x0ea50, 0x06e95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950, // 1930-1939
+ 0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557, // 1940-1949
+ 0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5b0, 0x14573, 0x052b0, 0x0a9a8, 0x0e950, 0x06aa0, // 1950-1959
+ 0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0, // 1960-1969
+ 0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b6a0, 0x195a6, // 1970-1979
+ 0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570, // 1980-1989
+ 0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x05ac0, 0x0ab60, 0x096d5, 0x092e0, // 1990-1999
+ 0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5, // 2000-2009
+ 0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930, // 2010-2019
+ 0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530, // 2020-2029
+ 0x05aa0, 0x076a3, 0x096d0, 0x04afb, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45, // 2030-2039
+ 0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0, // 2040-2049
+ /** Add By JJonline@JJonline.Cn**/
+ 0x14b63, 0x09370, 0x049f8, 0x04970, 0x064b0, 0x168a6, 0x0ea50, 0x06b20, 0x1a6c4, 0x0aae0, // 2050-2059
+ 0x0a2e0, 0x0d2e3, 0x0c960, 0x0d557, 0x0d4a0, 0x0da50, 0x05d55, 0x056a0, 0x0a6d0, 0x055d4, // 2060-2069
+ 0x052d0, 0x0a9b8, 0x0a950, 0x0b4a0, 0x0b6a6, 0x0ad50, 0x055a0, 0x0aba4, 0x0a5b0, 0x052b0, // 2070-2079
+ 0x0b273, 0x06930, 0x07337, 0x06aa0, 0x0ad50, 0x14b55, 0x04b60, 0x0a570, 0x054e4, 0x0d160, // 2080-2089
+ 0x0e968, 0x0d520, 0x0daa0, 0x16aa6, 0x056d0, 0x04ae0, 0x0a9d4, 0x0a2d0, 0x0d150, 0x0f252, // 2090-2099
+ 0x0d520
+ ], // 2100
+
+ /**
+ * 公历每个月份的天数普通表
+ * @Array Of Property
+ * @return Number
+ */
+ solarMonth: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
+
+ /**
+ * 天干地支之天干速查表
+ * @Array Of Property trans["甲","乙","丙","丁","戊","己","庚","辛","壬","癸"]
+ * @return Cn string
+ */
+ Gan: ['\u7532', '\u4e59', '\u4e19', '\u4e01', '\u620a', '\u5df1', '\u5e9a', '\u8f9b', '\u58ec', '\u7678'],
+
+ /**
+ * 天干地支之地支速查表
+ * @Array Of Property
+ * @trans["子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"]
+ * @return Cn string
+ */
+ Zhi: ['\u5b50', '\u4e11', '\u5bc5', '\u536f', '\u8fb0', '\u5df3', '\u5348', '\u672a', '\u7533', '\u9149',
+ '\u620c',
+ '\u4ea5'
+ ],
+
+ /**
+ * 天干地支之地支速查表<=>生肖
+ * @Array Of Property
+ * @trans["鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"]
+ * @return Cn string
+ */
+ Animals: ['\u9f20', '\u725b', '\u864e', '\u5154', '\u9f99', '\u86c7', '\u9a6c', '\u7f8a', '\u7334', '\u9e21',
+ '\u72d7', '\u732a'
+ ],
+
+ /**
+ * 24节气速查表
+ * @Array Of Property
+ * @trans["小寒","大寒","立春","雨水","惊蛰","春分","清明","谷雨","立夏","小满","芒种","夏至","小暑","大暑","立秋","处暑","白露","秋分","寒露","霜降","立冬","小雪","大雪","冬至"]
+ * @return Cn string
+ */
+ solarTerm: ['\u5c0f\u5bd2', '\u5927\u5bd2', '\u7acb\u6625', '\u96e8\u6c34', '\u60ca\u86f0', '\u6625\u5206',
+ '\u6e05\u660e', '\u8c37\u96e8', '\u7acb\u590f', '\u5c0f\u6ee1', '\u8292\u79cd', '\u590f\u81f3',
+ '\u5c0f\u6691',
+ '\u5927\u6691', '\u7acb\u79cb', '\u5904\u6691', '\u767d\u9732', '\u79cb\u5206', '\u5bd2\u9732',
+ '\u971c\u964d',
+ '\u7acb\u51ac', '\u5c0f\u96ea', '\u5927\u96ea', '\u51ac\u81f3'
+ ],
+
+ /**
+ * 1900-2100各年的24节气日期速查表
+ * @Array Of Property
+ * @return 0x string For splice
+ */
+ sTermInfo: ['9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+ '97bcf97c3598082c95f8c965cc920f',
+ '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+ '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f', 'b027097bd097c36b0b6fc9274c91aa',
+ '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd0b06bdb0722c965ce1cfcc920f',
+ 'b027097bd097c36b0b6fc9274c91aa', '9778397bd19801ec9210c965cc920e', '97b6b97bd19801ec95f8c965cc920f',
+ '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd197c36c9210c9274c91aa',
+ '97b6b97bd19801ec95f8c965cc920e', '97bd09801d98082c95f8e1cfcc920f', '97bd097bd097c36b0b6fc9210c8dc2',
+ '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec95f8c965cc920e', '97bcf97c3598082c95f8e1cfcc920f',
+ '97bd097bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+ '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+ '97b6b97bd19801ec9210c965cc920e', '97bcf97c3598082c95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722',
+ '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f',
+ '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+ '97bcf97c359801ec95f8c965cc920f', '97bd097bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+ '97b6b97bd19801ec9210c965cc920e', '97bcf97c359801ec95f8c965cc920f', '97bd097bd07f595b0b6fc920fb0722',
+ '9778397bd097c36b0b6fc9210c8dc2', '9778397bd19801ec9210c9274c920e', '97b6b97bd19801ec95f8c965cc920f',
+ '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+ '97b6b97bd19801ec95f8c965cc920f', '97bd07f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+ '9778397bd097c36c9210c9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bd07f1487f595b0b0bc920fb0722',
+ '7f0e397bd097c36b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+ '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+ '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+ '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e', '97bcf7f1487f531b0b0bb0b6fb0722',
+ '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b97bd19801ec9210c965cc920e',
+ '97bcf7f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+ '97b6b97bd19801ec9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+ '9778397bd097c36b0b6fc9210c91aa', '97b6b97bd197c36c9210c9274c920e', '97bcf7f0e47f531b0b0bb0b6fb0722',
+ '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '9778397bd097c36c9210c9274c920e',
+ '97b6b7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c36b0b6fc9210c8dc2',
+ '9778397bd097c36b0b70c9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+ '7f0e397bd097c35b0b6fc9210c8dc2', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+ '7f0e27f1487f595b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+ '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+ '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+ '7f0e397bd097c35b0b6fc920fb0722', '9778397bd097c36b0b6fc9274c91aa', '97b6b7f0e47f531b0723b0b6fb0721',
+ '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9274c91aa',
+ '97b6b7f0e47f531b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+ '9778397bd097c36b0b6fc9210c91aa', '97b6b7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+ '7f0e397bd07f595b0b0bc920fb0722', '9778397bd097c36b0b6fc9210c8dc2', '977837f0e37f149b0723b0787b0721',
+ '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f5307f595b0b0bc920fb0722', '7f0e397bd097c35b0b6fc9210c8dc2',
+ '977837f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e37f1487f595b0b0bb0b6fb0722',
+ '7f0e397bd097c35b0b6fc9210c8dc2', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+ '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722', '977837f0e37f14998082b0787b06bd',
+ '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd097c35b0b6fc920fb0722',
+ '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+ '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+ '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14998082b0787b06bd',
+ '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0b0bb0b6fb0722', '7f0e397bd07f595b0b0bc920fb0722',
+ '977837f0e37f14998082b0723b06bd', '7f07e7f0e37f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+ '7f0e397bd07f595b0b0bc920fb0722', '977837f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b0721',
+ '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f595b0b0bb0b6fb0722', '7f0e37f0e37f14898082b0723b02d5',
+ '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e37f1487f531b0b0bb0b6fb0722',
+ '7f0e37f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+ '7f0e37f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+ '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e37f14898082b072297c35',
+ '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722',
+ '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f149b0723b0787b0721',
+ '7f0e27f1487f531b0b0bb0b6fb0722', '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14998082b0723b06bd',
+ '7f07e7f0e47f149b0723b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722', '7f0e37f0e366aa89801eb072297c35',
+ '7ec967f0e37f14998082b0723b06bd', '7f07e7f0e37f14998083b0787b0721', '7f0e27f0e47f531b0723b0b6fb0722',
+ '7f0e37f0e366aa89801eb072297c35', '7ec967f0e37f14898082b0723b02d5', '7f07e7f0e37f14998082b0787b0721',
+ '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66aa89801e9808297c35', '665f67f0e37f14898082b0723b02d5',
+ '7ec967f0e37f14998082b0787b0721', '7f07e7f0e47f531b0723b0b6fb0722', '7f0e36665b66a449801e9808297c35',
+ '665f67f0e37f14898082b0723b02d5', '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721',
+ '7f0e36665b66a449801e9808297c35', '665f67f0e37f14898082b072297c35', '7ec967f0e37f14998082b0787b06bd',
+ '7f07e7f0e47f531b0723b0b6fb0721', '7f0e26665b66a449801e9808297c35', '665f67f0e37f1489801eb072297c35',
+ '7ec967f0e37f14998082b0787b06bd', '7f07e7f0e47f531b0723b0b6fb0721', '7f0e27f1487f531b0b0bb0b6fb0722'
+ ],
+
+ /**
+ * 数字转中文速查表
+ * @Array Of Property
+ * @trans ['日','一','二','三','四','五','六','七','八','九','十']
+ * @return Cn string
+ */
+ nStr1: ['\u65e5', '\u4e00', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d',
+ '\u5341'
+ ],
+
+ /**
+ * 日期转农历称呼速查表
+ * @Array Of Property
+ * @trans ['初','十','廿','卅']
+ * @return Cn string
+ */
+ nStr2: ['\u521d', '\u5341', '\u5eff', '\u5345'],
+
+ /**
+ * 月份转农历称呼速查表
+ * @Array Of Property
+ * @trans ['正','一','二','三','四','五','六','七','八','九','十','冬','腊']
+ * @return Cn string
+ */
+ nStr3: ['\u6b63', '\u4e8c', '\u4e09', '\u56db', '\u4e94', '\u516d', '\u4e03', '\u516b', '\u4e5d', '\u5341',
+ '\u51ac',
+ '\u814a'
+ ],
+
+ /**
+ * 返回农历y年一整年的总天数
+ * @param lunar Year
+ * @return Number
+ * @eg:var count = calendar.lYearDays(1987) ;//count=387
+ */
+ lYearDays: function(y) {
+ var i;
+ var sum = 348
+ for (i = 0x8000; i > 0x8; i >>= 1) {
+ sum += (this.lunarInfo[y - 1900] & i) ? 1 : 0
+ }
+ return (sum + this.leapDays(y))
+ },
+
+ /**
+ * 返回农历y年闰月是哪个月；若y年没有闰月 则返回0
+ * @param lunar Year
+ * @return Number (0-12)
+ * @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
+ */
+ leapMonth: function(y) { // 闰字编码 \u95f0
+ return (this.lunarInfo[y - 1900] & 0xf)
+ },
+
+ /**
+ * 返回农历y年闰月的天数 若该年没有闰月则返回0
+ * @param lunar Year
+ * @return Number (0、29、30)
+ * @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
+ */
+ leapDays: function(y) {
+ if (this.leapMonth(y)) {
+ return ((this.lunarInfo[y - 1900] & 0x10000) ? 30 : 29)
+ }
+ return (0)
+ },
+
+ /**
+ * 返回农历y年m月（非闰月）的总天数，计算m为闰月时的天数请使用leapDays方法
+ * @param lunar Year
+ * @return Number (-1、29、30)
+ * @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
+ */
+ monthDays: function(y, m) {
+ if (m > 12 || m < 1) {
+ return -1
+ } // 月份参数从1至12，参数错误返回-1
+ return ((this.lunarInfo[y - 1900] & (0x10000 >> m)) ? 30 : 29)
+ },
+
+ /**
+ * 返回公历(!)y年m月的天数
+ * @param solar Year
+ * @return Number (-1、28、29、30、31)
+ * @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
+ */
+ solarDays: function(y, m) {
+ if (m > 12 || m < 1) {
+ return -1
+ } // 若参数错误 返回-1
+ var ms = m - 1
+ if (ms == 1) { // 2月份的闰平规律测算后确认返回28或29
+ return (((y % 4 == 0) && (y % 100 != 0) || (y % 400 == 0)) ? 29 : 28)
+ } else {
+ return (this.solarMonth[ms])
+ }
+ },
+
+ /**
+ * 农历年份转换为干支纪年
+ * @param lYear 农历年的年份数
+ * @return Cn string
+ */
+ toGanZhiYear: function(lYear) {
+ var ganKey = (lYear - 3) % 10
+ var zhiKey = (lYear - 3) % 12
+ if (ganKey == 0) ganKey = 10 // 如果余数为0则为最后一个天干
+ if (zhiKey == 0) zhiKey = 12 // 如果余数为0则为最后一个地支
+ return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
+ },
+
+ /**
+ * 公历月、日判断所属星座
+ * @param cMonth [description]
+ * @param cDay [description]
+ * @return Cn string
+ */
+ toAstro: function(cMonth, cDay) {
+ var s =
+ '\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
+ var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
+ return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7' // 座
+ },
+
+ /**
+ * 传入offset偏移量返回干支
+ * @param offset 相对甲子的偏移量
+ * @return Cn string
+ */
+ toGanZhi: function(offset) {
+ return this.Gan[offset % 10] + this.Zhi[offset % 12]
+ },
+
+ /**
+ * 传入公历(!)y年获得该年第n个节气的公历日期
+ * @param y公历年(1900-2100)；n二十四节气中的第几个节气(1~24)；从n=1(小寒)算起
+ * @return day Number
+ * @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
+ */
+ getTerm: function(y, n) {
+ if (y < 1900 || y > 2100) {
+ return -1
+ }
+ if (n < 1 || n > 24) {
+ return -1
+ }
+ var _table = this.sTermInfo[y - 1900]
+ var _info = [
+ parseInt('0x' + _table.substr(0, 5)).toString(),
+ parseInt('0x' + _table.substr(5, 5)).toString(),
+ parseInt('0x' + _table.substr(10, 5)).toString(),
+ parseInt('0x' + _table.substr(15, 5)).toString(),
+ parseInt('0x' + _table.substr(20, 5)).toString(),
+ parseInt('0x' + _table.substr(25, 5)).toString()
+ ]
+ var _calday = [
+ _info[0].substr(0, 1),
+ _info[0].substr(1, 2),
+ _info[0].substr(3, 1),
+ _info[0].substr(4, 2),
+
+ _info[1].substr(0, 1),
+ _info[1].substr(1, 2),
+ _info[1].substr(3, 1),
+ _info[1].substr(4, 2),
+
+ _info[2].substr(0, 1),
+ _info[2].substr(1, 2),
+ _info[2].substr(3, 1),
+ _info[2].substr(4, 2),
+
+ _info[3].substr(0, 1),
+ _info[3].substr(1, 2),
+ _info[3].substr(3, 1),
+ _info[3].substr(4, 2),
+
+ _info[4].substr(0, 1),
+ _info[4].substr(1, 2),
+ _info[4].substr(3, 1),
+ _info[4].substr(4, 2),
+
+ _info[5].substr(0, 1),
+ _info[5].substr(1, 2),
+ _info[5].substr(3, 1),
+ _info[5].substr(4, 2)
+ ]
+ return parseInt(_calday[n - 1])
+ },
+
+ /**
+ * 传入农历数字月份返回汉语通俗表示法
+ * @param lunar month
+ * @return Cn string
+ * @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
+ */
+ toChinaMonth: function(m) { // 月 => \u6708
+ if (m > 12 || m < 1) {
+ return -1
+ } // 若参数错误 返回-1
+ var s = this.nStr3[m - 1]
+ s += '\u6708' // 加上月字
+ return s
+ },
+
+ /**
+ * 传入农历日期数字返回汉字表示法
+ * @param lunar day
+ * @return Cn string
+ * @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
+ */
+ toChinaDay: function(d) { // 日 => \u65e5
+ var s
+ switch (d) {
+ case 10:
+ s = '\u521d\u5341';
+ break
+ case 20:
+ s = '\u4e8c\u5341';
+ break
+ break
+ case 30:
+ s = '\u4e09\u5341';
+ break
+ break
+ default:
+ s = this.nStr2[Math.floor(d / 10)]
+ s += this.nStr1[d % 10]
+ }
+ return (s)
+ },
+
+ /**
+ * 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
+ * @param y year
+ * @return Cn string
+ * @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
+ */
+ getAnimal: function(y) {
+ return this.Animals[(y - 4) % 12]
+ },
+
+ /**
+ * 传入阳历年月日获得详细的公历、农历object信息 <=>JSON
+ * @param y solar year
+ * @param m solar month
+ * @param d solar day
+ * @return JSON object
+ * @eg:console.log(calendar.solar2lunar(1987,11,01));
+ */
+ solar2lunar: function(y, m, d) { // 参数区间1900.1.31~2100.12.31
+ // 年份限定、上限
+ if (y < 1900 || y > 2100) {
+ return -1 // undefined转换为数字变为NaN
+ }
+ // 公历传参最下限
+ if (y == 1900 && m == 1 && d < 31) {
+ return -1
+ }
+ // 未传参 获得当天
+ if (!y) {
+ var objDate = new Date()
+ } else {
+ var objDate = new Date(y, parseInt(m) - 1, d)
+ }
+ var i;
+ var leap = 0;
+ var temp = 0
+ // 修正ymd参数
+ var y = objDate.getFullYear()
+ var m = objDate.getMonth() + 1
+ var d = objDate.getDate()
+ var offset = (Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) - Date.UTC(1900, 0,
+ 31)) /
+ 86400000
+ for (i = 1900; i < 2101 && offset > 0; i++) {
+ temp = this.lYearDays(i)
+ offset -= temp
+ }
+ if (offset < 0) {
+ offset += temp;
+ i--
+ }
+
+ // 是否今天
+ var isTodayObj = new Date()
+ var isToday = false
+ if (isTodayObj.getFullYear() == y && isTodayObj.getMonth() + 1 == m && isTodayObj.getDate() == d) {
+ isToday = true
+ }
+ // 星期几
+ var nWeek = objDate.getDay()
+ var cWeek = this.nStr1[nWeek]
+ // 数字表示周几顺应天朝周一开始的惯例
+ if (nWeek == 0) {
+ nWeek = 7
+ }
+ // 农历年
+ var year = i
+ var leap = this.leapMonth(i) // 闰哪个月
+ var isLeap = false
+
+ // 效验闰月
+ for (i = 1; i < 13 && offset > 0; i++) {
+ // 闰月
+ if (leap > 0 && i == (leap + 1) && isLeap == false) {
+ --i
+ isLeap = true;
+ temp = this.leapDays(year) // 计算农历闰月天数
+ } else {
+ temp = this.monthDays(year, i) // 计算农历普通月天数
+ }
+ // 解除闰月
+ if (isLeap == true && i == (leap + 1)) {
+ isLeap = false
+ }
+ offset -= temp
+ }
+ // 闰月导致数组下标重叠取反
+ if (offset == 0 && leap > 0 && i == leap + 1) {
+ if (isLeap) {
+ isLeap = false
+ } else {
+ isLeap = true;
+ --i
+ }
+ }
+ if (offset < 0) {
+ offset += temp;
+ --i
+ }
+ // 农历月
+ var month = i
+ // 农历日
+ var day = offset + 1
+ // 天干地支处理
+ var sm = m - 1
+ var gzY = this.toGanZhiYear(year)
+
+ // 当月的两个节气
+ // bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
+ var firstNode = this.getTerm(y, (m * 2 - 1)) // 返回当月「节」为几日开始
+ var secondNode = this.getTerm(y, (m * 2)) // 返回当月「节」为几日开始
+
+ // 依据12节气修正干支月
+ var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
+ if (d >= firstNode) {
+ gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
+ }
+
+ // 传入的日期的节气与否
+ var isTerm = false
+ var Term = null
+ if (firstNode == d) {
+ isTerm = true
+ Term = this.solarTerm[m * 2 - 2]
+ }
+ if (secondNode == d) {
+ isTerm = true
+ Term = this.solarTerm[m * 2 - 1]
+ }
+ // 日柱 当月一日与 1900/1/1 相差天数
+ var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
+ var gzD = this.toGanZhi(dayCyclical + d - 1)
+ // 该日期所属的星座
+ var astro = this.toAstro(m, d)
+
+ return {
+ 'lYear': year,
+ 'lMonth': month,
+ 'lDay': day,
+ 'Animal': this.getAnimal(year),
+ 'IMonthCn': (isLeap ? '\u95f0' : '') + this.toChinaMonth(month),
+ 'IDayCn': this.toChinaDay(day),
+ 'cYear': y,
+ 'cMonth': m,
+ 'cDay': d,
+ 'gzYear': gzY,
+ 'gzMonth': gzM,
+ 'gzDay': gzD,
+ 'isToday': isToday,
+ 'isLeap': isLeap,
+ 'nWeek': nWeek,
+ 'ncWeek': '\u661f\u671f' + cWeek,
+ 'isTerm': isTerm,
+ 'Term': Term,
+ 'astro': astro
+ }
+ },
+
+ /**
+ * 传入农历年月日以及传入的月份是否闰月获得详细的公历、农历object信息 <=>JSON
+ * @param y lunar year
+ * @param m lunar month
+ * @param d lunar day
+ * @param isLeapMonth lunar month is leap or not.[如果是农历闰月第四个参数赋值true即可]
+ * @return JSON object
+ * @eg:console.log(calendar.lunar2solar(1987,9,10));
+ */
+ lunar2solar: function(y, m, d, isLeapMonth) { // 参数区间1900.1.31~2100.12.1
+ var isLeapMonth = !!isLeapMonth
+ var leapOffset = 0
+ var leapMonth = this.leapMonth(y)
+ var leapDay = this.leapDays(y)
+ if (isLeapMonth && (leapMonth != m)) {
+ return -1
+ } // 传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
+ if (y == 2100 && m == 12 && d > 1 || y == 1900 && m == 1 && d < 31) {
+ return -1
+ } // 超出了最大极限值
+ var day = this.monthDays(y, m)
+ var _day = day
+ // bugFix 2016-9-25
+ // if month is leap, _day use leapDays method
+ if (isLeapMonth) {
+ _day = this.leapDays(y, m)
+ }
+ if (y < 1900 || y > 2100 || d > _day) {
+ return -1
+ } // 参数合法性效验
+
+ // 计算农历的时间差
+ var offset = 0
+ for (var i = 1900; i < y; i++) {
+ offset += this.lYearDays(i)
+ }
+ var leap = 0;
+ var isAdd = false
+ for (var i = 1; i < m; i++) {
+ leap = this.leapMonth(y)
+ if (!isAdd) { // 处理闰月
+ if (leap <= i && leap > 0) {
+ offset += this.leapDays(y);
+ isAdd = true
+ }
+ }
+ offset += this.monthDays(y, i)
+ }
+ // 转换闰月农历 需补充该年闰月的前一个月的时差
+ if (isLeapMonth) {
+ offset += day
+ }
+ // 1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
+ var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
+ var calObj = new Date((offset + d - 31) * 86400000 + stmap)
+ var cY = calObj.getUTCFullYear()
+ var cM = calObj.getUTCMonth() + 1
+ var cD = calObj.getUTCDate()
+
+ return this.solar2lunar(cY, cM, cD)
+ }
+}
+
+export default calendar
diff --git a/components/uni-calendar/uni-calendar-item.vue b/pages_tool/components/uni-calendar/uni-calendar-item.vue
similarity index 100%
rename from components/uni-calendar/uni-calendar-item.vue
rename to pages_tool/components/uni-calendar/uni-calendar-item.vue
diff --git a/components/uni-calendar/uni-calendar.vue b/pages_tool/components/uni-calendar/uni-calendar.vue
similarity index 95%
rename from components/uni-calendar/uni-calendar.vue
rename to pages_tool/components/uni-calendar/uni-calendar.vue
index 0d47d42..604f6d4 100644
--- a/components/uni-calendar/uni-calendar.vue
+++ b/pages_tool/components/uni-calendar/uni-calendar.vue
@@ -44,7 +44,7 @@
\ No newline at end of file
diff --git a/pages_tool/form/form.vue b/pages_tool/form/form.vue
index c6342be..52f2d16 100644
--- a/pages_tool/form/form.vue
+++ b/pages_tool/form/form.vue
@@ -10,7 +10,7 @@
-
+
@@ -18,135 +18,130 @@
\ No newline at end of file
diff --git a/pages_tool/form/formdata.vue b/pages_tool/form/formdata.vue
index 66e4a5b..7743cc8 100644
--- a/pages_tool/form/formdata.vue
+++ b/pages_tool/form/formdata.vue
@@ -3,13 +3,11 @@
-
+
请填写表单所需信息
-
+
@@ -23,12 +21,6 @@
\ No newline at end of file
diff --git a/pages_tool/goods/coupon.vue b/pages_tool/goods/coupon.vue
index 80c0bfc..2b332ba 100644
--- a/pages_tool/goods/coupon.vue
+++ b/pages_tool/goods/coupon.vue
@@ -2,53 +2,42 @@
- 全部
- 满减券
- 折扣券
-
+ 全部
+ 满减券
+ 折扣券
+
-
+
-
+
-
+
￥
{{ parseFloat(item.money) }}
-
+
{{ parseFloat(item.discount) }}
折
- 满{{ item.at_least }}元可用
- 无门槛优惠券
+ 满{{ item.at_least }}元可用
+ 无门槛优惠券
{{ item.coupon_name }}
- 指定商品
+ 指定商品
全场商品
(最大优惠{{ item.discount_limit }}元)
- {{
- item.use_channel_name }}
-
@@ -81,401 +70,406 @@
\ No newline at end of file
diff --git a/pages_tool/goods/coupon_receive.vue b/pages_tool/goods/coupon_receive.vue
index 7daebfe..eb910ea 100644
--- a/pages_tool/goods/coupon_receive.vue
+++ b/pages_tool/goods/coupon_receive.vue
@@ -39,13 +39,6 @@
\ No newline at end of file
diff --git a/pages_tool/help/detail.vue b/pages_tool/help/detail.vue
index cb6104b..cd41c7f 100644
--- a/pages_tool/help/detail.vue
+++ b/pages_tool/help/detail.vue
@@ -15,49 +15,51 @@
\ No newline at end of file
diff --git a/pages_tool/help/list.vue b/pages_tool/help/list.vue
index 83ae09e..32f5f6b 100644
--- a/pages_tool/help/list.vue
+++ b/pages_tool/help/list.vue
@@ -3,8 +3,7 @@
{{ item.class_name }}
- {{ s_item.title }}
+ {{ s_item.title }}
@@ -20,18 +19,12 @@
+
+
+
+
\ No newline at end of file
diff --git a/pages_tool/member/basic/account_edit.vue b/pages_tool/member/account_edit.vue
similarity index 95%
rename from pages_tool/member/basic/account_edit.vue
rename to pages_tool/member/account_edit.vue
index 5507b2c..0225527 100644
--- a/pages_tool/member/basic/account_edit.vue
+++ b/pages_tool/member/account_edit.vue
@@ -2,8 +2,7 @@
{{ $lang('name') }}
-
+
{{ $lang('mobilePhone') }}
@@ -18,13 +17,11 @@
银行名称
-
+
提现账号
-
+
@@ -36,9 +33,6 @@
-
-
\ No newline at end of file
diff --git a/pages_tool/member/address_edit.vue b/pages_tool/member/address_edit.vue
new file mode 100644
index 0000000..d028016
--- /dev/null
+++ b/pages_tool/member/address_edit.vue
@@ -0,0 +1,501 @@
+
+
+
+ 地址信息
+
+
+ {{ $lang('consignee') }}
+ *
+
+
+
+
+
+ {{ $lang('mobile') }}
+ *
+
+
+
+
+ {{ $lang('telephone') }}
+
+
+
+
+
+
+ {{ $lang('receivingCity') }}
+ *
+
+
+ {{ formData.full_address ? formData.full_address : '请选择省市区县' }}
+
+
+
+
+
+
+
+
+ {{ $lang('receivingCity') }}
+ *
+
+
+
+ {{ formData.full_address ? formData.full_address : '请选择省市区县' }}
+
+
+
+
+
+
+
+ {{ $lang('address') }}
+ *
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_tool/member/apply_withdrawal.vue b/pages_tool/member/apply_withdrawal.vue
new file mode 100644
index 0000000..d258e4f
--- /dev/null
+++ b/pages_tool/member/apply_withdrawal.vue
@@ -0,0 +1,425 @@
+
+
+
+
+ 提现到
+ 微信默认钱包
+ {{ bankAccountInfo.bank_account }}
+
+
+
+
+
+
+
+
+
+
+
+ 请添加提现方式
+
+
+
+
+ 提现金额
+
+ {{ $lang('common.currencySymbol') }}
+
+
+
+
+
+
+
+ 可提现余额：{{ $lang('common.currencySymbol') }}{{ withdrawInfo.member_info.balance_money | moneyFormat }}
+ 全部提现
+
+
+
+ 最小提现金额为{{ $lang('common.currencySymbol') }}{{ withdrawInfo.config.min | moneyFormat }}
+ ，手续费为{{ withdrawInfo.config.rate + '%' }}
+
+
+
+
+ 提现
+
+
+
+ 提现记录
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_tool/member/other/assets.vue b/pages_tool/member/assets.vue
similarity index 100%
rename from pages_tool/member/other/assets.vue
rename to pages_tool/member/assets.vue
diff --git a/pages_tool/member/finance/account/balance.vue b/pages_tool/member/balance.vue
similarity index 83%
rename from pages_tool/member/finance/account/balance.vue
rename to pages_tool/member/balance.vue
index 2bbfd65..1976189 100644
--- a/pages_tool/member/finance/account/balance.vue
+++ b/pages_tool/member/balance.vue
@@ -2,9 +2,9 @@
+ 'padding-top': menuButtonBounding.top + 'px',
+ 'height': menuButtonBounding.height + 'px'
+ }">
@@ -13,14 +13,12 @@
-
-
-
+
+
+
账户余额（元）
- {{ (parseFloat(balanceInfo.balance) +
- parseFloat(balanceInfo.balance_money)).toFixed(2) }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ item.remark }}
+
+ {{ $util.timeStampTurnTime(item.create_time) }}
+
+
+ {{ item.account_data > 0 ? '+' + item.account_data : item.account_data }}元
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_tool/member/basic/account.vue b/pages_tool/member/basic/account.vue
deleted file mode 100644
index aa3ead7..0000000
--- a/pages_tool/member/basic/account.vue
+++ /dev/null
@@ -1,465 +0,0 @@
-
-
-
-
-
-
-
-
- 提现到余额
-
-
-
-
-
-
-
- {{ item.withdraw_type_name }}
-
- {{ item.realname }}
- {{ item.mobile }}
-
-
-
- 提现账号：{{ item.bank_account }}
-
-
- 银行名称 ：{{ item.branch_bank_name }}
-
-
-
- 修改
-
-
-
-
- 设为默认账户
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 暂无账户信息，请添加
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages_tool/member/basic/modify_face.vue b/pages_tool/member/basic/modify_face.vue
deleted file mode 100644
index cd9f7be..0000000
--- a/pages_tool/member/basic/modify_face.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages_tool/member/other/cancellation.vue b/pages_tool/member/cancellation.vue
similarity index 98%
rename from pages_tool/member/other/cancellation.vue
rename to pages_tool/member/cancellation.vue
index f9d60f3..b1e05a8 100644
--- a/pages_tool/member/other/cancellation.vue
+++ b/pages_tool/member/cancellation.vue
@@ -19,7 +19,7 @@
+
+
\ No newline at end of file
diff --git a/pages_tool/member/cancelsuccess.vue b/pages_tool/member/cancelsuccess.vue
new file mode 100644
index 0000000..4f975ab
--- /dev/null
+++ b/pages_tool/member/cancelsuccess.vue
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+ 您已成功注销账号
+ 待下次与您更好的相遇，如需再次使用，请重新注册
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_tool/member/finance/transaction/card.vue b/pages_tool/member/card.vue
similarity index 65%
rename from pages_tool/member/finance/transaction/card.vue
rename to pages_tool/member/card.vue
index 48d3b06..2d5d236 100644
--- a/pages_tool/member/finance/transaction/card.vue
+++ b/pages_tool/member/card.vue
@@ -5,9 +5,8 @@
-
-
+
+
{{ memberInfo.nickname }}
@@ -23,18 +22,15 @@
{{ levelInfo.level_name }}
{{ levelInfo.level_name }}可享受消费折扣和
会员大礼包等权益
-
+
-
+
-
+
@@ -122,111 +118,113 @@
-
\ No newline at end of file
diff --git a/pages_tool/member/finance/transaction/card_agreement.vue b/pages_tool/member/card_agreement.vue
similarity index 94%
rename from pages_tool/member/finance/transaction/card_agreement.vue
rename to pages_tool/member/card_agreement.vue
index b489938..aa54a01 100644
--- a/pages_tool/member/finance/transaction/card_agreement.vue
+++ b/pages_tool/member/card_agreement.vue
@@ -6,7 +6,7 @@
\ No newline at end of file
diff --git a/pages_tool/member/collection.vue b/pages_tool/member/collection.vue
new file mode 100644
index 0000000..5153e8b
--- /dev/null
+++ b/pages_tool/member/collection.vue
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+ {{ item.sku_name }}
+
+
+ ￥
+ {{ parseFloat(item.discount_price).toFixed(2).split('.')[0] }}
+ .{{ parseFloat(item.discount_price).toFixed(2).split('.')[1] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_tool/member/other/contact.vue b/pages_tool/member/contact.vue
similarity index 92%
rename from pages_tool/member/other/contact.vue
rename to pages_tool/member/contact.vue
index f10d1b5..3ef3863 100644
--- a/pages_tool/member/other/contact.vue
+++ b/pages_tool/member/contact.vue
@@ -10,8 +10,8 @@ export default {
data() {
return {};
},
- onLoad(options) { },
- onShow() { },
+ onLoad(options) {},
+ onShow() {},
methods: {}
};
@@ -21,7 +21,6 @@ export default {
width: 80%;
text-align: center;
margin: 0 auto;
-
image {
width: 500rpx;
}
diff --git a/pages_tool/member/coupon.vue b/pages_tool/member/coupon.vue
new file mode 100644
index 0000000..660888b
--- /dev/null
+++ b/pages_tool/member/coupon.vue
@@ -0,0 +1,416 @@
+
+
+
+
+ 未使用
+ 已使用
+ 已过期
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{ parseFloat(item.money) }}
+
+
+ ￥
+ {{ parseFloat(item.money) }}
+
+
+ {{ parseFloat(item.discount) }}
+ 折
+
+
+ 满{{ item.at_least }}元可用
+ 无门槛优惠券
+
+
+
+
+ {{ item.coupon_name }}
+ 指定商品
+ (最大优惠{{ item.discount_limit }}元)
+ {{ item.use_channel_name }}
+
+
+ 有效期：{{ $util.timeStampTurnTime(item.end_time) }}
+
+ 有效期：长期有效
+
+
+ 去使用
+ 已使用
+ 已过期
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_tool/member/finance/account/balance_detail.vue b/pages_tool/member/finance/account/balance_detail.vue
deleted file mode 100644
index f0f4a82..0000000
--- a/pages_tool/member/finance/account/balance_detail.vue
+++ /dev/null
@@ -1,371 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.remark }}
-
- {{ $util.timeStampTurnTime(item.create_time) }}
-
-
- {{ item.account_data > 0 ?
- '+' + item.account_data : item.account_data }}元
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages_tool/member/finance/account/pay_password.vue b/pages_tool/member/finance/account/pay_password.vue
deleted file mode 100644
index a5d6c1b..0000000
--- a/pages_tool/member/finance/account/pay_password.vue
+++ /dev/null
@@ -1,280 +0,0 @@
-
-
- 请输入6位支付密码，建议不要使用重复或连续数字
- 验证码已发送至{{ memberInfo.mobile | mobile }}请在下方输入4位数字验证码
-
-
-
- {{ dynacodeData.codeText }}
-
- 输入短信验证码
- 请设置支付密码
- 请再次输入
- 确认
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages_tool/member/finance/transaction/apply_withdrawal.vue b/pages_tool/member/finance/transaction/apply_withdrawal.vue
deleted file mode 100644
index 1b93d35..0000000
--- a/pages_tool/member/finance/transaction/apply_withdrawal.vue
+++ /dev/null
@@ -1,430 +0,0 @@
-
-
-
-
- 提现到
- 微信默认钱包
- {{ bankAccountInfo.bank_account }}
-
-
-
-
-
-
-
-
-
-
-
- 请添加提现方式
-
-
-
-
- 提现金额
-
- {{ $lang('common.currencySymbol') }}
-
-
-
-
-
-
-
- 可提现余额：{{ $lang('common.currencySymbol') }}{{
- withdrawInfo.member_info.balance_money | moneyFormat }}
- 全部提现
-
-
-
- 最小提现金额为{{ $lang('common.currencySymbol') }}{{ withdrawInfo.config.min | moneyFormat }}
- ，手续费为{{ withdrawInfo.config.rate + '%' }}
-
-
-
-
- 提现
-
-
-
- 提现记录
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages_tool/member/other/footprint.vue b/pages_tool/member/footprint.vue
similarity index 81%
rename from pages_tool/member/other/footprint.vue
rename to pages_tool/member/footprint.vue
index 20cbd6e..4cf5824 100644
--- a/pages_tool/member/other/footprint.vue
+++ b/pages_tool/member/footprint.vue
@@ -10,14 +10,11 @@
{{ datetime(item) }}
-
+
-
-
- {{ goodsTag(item) }}
-
+
+ {{ goodsTag(item) }}
@@ -27,28 +24,22 @@
{{ $lang('common.currencySymbol') }}
- {{
- parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}
- .{{
- parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}
+ {{ parseFloat(showPrice(item)).toFixed(2).split('.')[0] }}
+ .{{ parseFloat(showPrice(item)).toFixed(2).split('.')[1] }}
-
+
-
-
+
-
+
{{ $lang('common.currencySymbol') }}
{{ showMarketPrice(item) }}
- 已售{{
- item.sale_num }}{{ item.unit ? item.unit : '件' }}
+ 已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}
@@ -58,12 +49,10 @@
-
+
全选
-
+
@@ -75,15 +64,22 @@
\ No newline at end of file
diff --git a/pages_tool/member/basic/info_edit.vue b/pages_tool/member/info_edit.vue
similarity index 58%
rename from pages_tool/member/basic/info_edit.vue
rename to pages_tool/member/info_edit.vue
index d73b44f..6a64810 100644
--- a/pages_tool/member/basic/info_edit.vue
+++ b/pages_tool/member/info_edit.vue
@@ -5,8 +5,7 @@
用户名
-
+
用户名仅可修改一次，请谨慎设置
@@ -17,8 +16,7 @@
昵称
-
+
@@ -28,8 +26,7 @@
姓名
-
+
@@ -42,8 +39,7 @@
@@ -57,8 +53,7 @@
生日
-
+
{{ formData.birthday ? formData.birthday : '请选择生日' }}
@@ -74,42 +69,35 @@
请先绑定手机再执行该操作
-
+
原密码
-
+
新密码
-
+
再次输入
-
-
+
+
点击“获取动态码”，将会向您已绑定的手机号{{ memberInfoformData.mobile | mobile }}发送验证码
新密码
-
+
再次输入
-
+
@@ -121,21 +109,17 @@
手机号
-
+
验证码
-
+
短信验证码
-
-
+
+
@@ -154,7 +138,7 @@
所在地区
-
+
{{ formData.fullAddress ? formData.fullAddress : '请选择省市区县' }}
@@ -173,238 +157,237 @@
\ No newline at end of file
diff --git a/pages_tool/member/rights/invite_friends.vue b/pages_tool/member/invite_friends.vue
similarity index 82%
rename from pages_tool/member/rights/invite_friends.vue
rename to pages_tool/member/invite_friends.vue
index 4cb9c65..8321783 100644
--- a/pages_tool/member/rights/invite_friends.vue
+++ b/pages_tool/member/invite_friends.vue
@@ -9,15 +9,12 @@
活动说明
-
+
- 活动时间：{{ $util.timeStampTurnTime(info.start_time, 1) }}至{{ $util.timeStampTurnTime(info.end_time, 1)
- }}
+ 活动时间：{{ $util.timeStampTurnTime(info.start_time, 1) }}至{{ $util.timeStampTurnTime(info.end_time, 1) }}
- 立即邀请
+ 立即邀请
我的好友
@@ -26,8 +23,7 @@
-
+
@@ -47,13 +43,11 @@
-
+
查看更多
- 没有更多数据了
+ 没有更多数据了
@@ -68,7 +62,7 @@
-
+
{{ $lang('common.currencySymbol') }}
@@ -79,7 +73,7 @@
-
+
{{ parseInt(info.point) }}
@@ -134,7 +128,7 @@
-
+
分享链接给好友
@@ -143,7 +137,7 @@
-
+
好友进入
@@ -152,7 +146,7 @@
-
+
好友注册成功获得奖励
@@ -237,55 +231,56 @@
diff --git a/pages_tool/member/level.vue b/pages_tool/member/level.vue
new file mode 100644
index 0000000..c7e6d1d
--- /dev/null
+++ b/pages_tool/member/level.vue
@@ -0,0 +1,382 @@
+
+
+
+
+
+
+
+
+
+
+ {{ memberInfo.nickname }}
+ 当前等级：{{ memberInfo.member_level_name }}
+
+
+
+ 成长规则
+
+
+
+
+
+
+
+
+
+
+
+ {{ levelList[curIndex].level_name }}
+ 当前等级
+
+ 当前成长值
+ {{ growth }}
+
+
+
+
+ 再获得{{ levelList[curIndex + 1].needGrowth > 0 ? levelList[curIndex + 1].needGrowth : 0 }}成长值成为{{
+ levelList[curIndex + 1].level_name
+ }}
+
+
+
+ 您现在已经是最高等级
+
+
+
+
+
+ 再获得{{ levelList[curIndex].needGrowth }}成长值成为{{ levelList[curIndex].level_name }}
+
+
+
+
+
+
+
+
+ 会员权益
+
+
+
+ 包邮服务
+ 提供商品包邮服务
+
+
+
+
+
+ 享受消费折扣服务
+ 不享受任何消费折扣和其他权益
+ 提供{{ levelList[curIndex].consume_discount }}折消费折扣
+
+
+
+
+
+ 享受积分回馈服务
+ 提供{{ levelList[curIndex].point_feedback }}倍积分回馈倍率
+
+
+
+
+
+ 会员礼包
+
+
+
+ 积分礼包
+ 赠送{{ levelList[curIndex].send_point }}积分
+
+
+
+
+
+ 红包礼包
+ 赠送{{ levelList[curIndex].send_balance }}元红包
+
+
+
+
+
+ 优惠券礼包
+ 赠送{{ levelList[curIndex].coupon_length }}张优惠券
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_tool/member/level_growth_rules.vue b/pages_tool/member/level_growth_rules.vue
new file mode 100644
index 0000000..69a684e
--- /dev/null
+++ b/pages_tool/member/level_growth_rules.vue
@@ -0,0 +1,274 @@
+
+
+
+
+
+ 成长值说明
+
+
+
+
+ 等级
+ 成长值
+
+
+ {{ item.level_name }}
+ {{ item.growth }}
+
+
+
+
+
+
+ 什么是成长值
+
+ 成长值是消费者在店铺成为会员后，通过消费计算出来的值。成长值决定会员等级，会员等级越高，所享受的会员权益和会员礼包就越多。
+
+
+
+
+ 如何获得成长值
+
+
+ 1、注册会员送x成长值。
+ 2、会员充值到余额送x成长值。
+ 3、会员签到送x成长值。
+ 4、会员消费x元，交易完成即可获得x个成长值。
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_tool/member/modify_face.vue b/pages_tool/member/modify_face.vue
new file mode 100644
index 0000000..593b9e1
--- /dev/null
+++ b/pages_tool/member/modify_face.vue
@@ -0,0 +1,194 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_tool/member/other/cancelstatus.vue b/pages_tool/member/other/cancelstatus.vue
deleted file mode 100644
index 481ea04..0000000
--- a/pages_tool/member/other/cancelstatus.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-
-
-
-
-
- 1
-
- 提交申请
- 您已提交申请，请耐心等待~
-
-
-
-
- 2
-
- 等待审核
- 等待审核中，审核通过后您的账号将直接被删除
-
-
-
-
-
-
-
- 审核通过，注销完成
- 您已成功注销账号，期待下一次与您相遇
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages_tool/member/other/cancelsuccess.vue b/pages_tool/member/other/cancelsuccess.vue
deleted file mode 100644
index a028ccf..0000000
--- a/pages_tool/member/other/cancelsuccess.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
- 您已成功注销账号
- 待下次与您更好的相遇，如需再次使用，请重新注册
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages_tool/member/other/collection.vue b/pages_tool/member/other/collection.vue
deleted file mode 100644
index 9263921..0000000
--- a/pages_tool/member/other/collection.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- {{ item.sku_name }}
-
-
- ￥
- {{
- parseFloat(item.discount_price).toFixed(2).split('.')[0] }}
- .{{
- parseFloat(item.discount_price).toFixed(2).split('.')[1] }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages_tool/member/pay_password.vue b/pages_tool/member/pay_password.vue
new file mode 100644
index 0000000..67e2774
--- /dev/null
+++ b/pages_tool/member/pay_password.vue
@@ -0,0 +1,278 @@
+
+
+ 请输入6位支付密码，建议不要使用重复或连续数字
+ 验证码已发送至{{ memberInfo.mobile | mobile }}请在下方输入4位数字验证码
+
+
+
+ {{ dynacodeData.codeText }}
+
+ 输入短信验证码
+ 请设置支付密码
+ 请再次输入
+ 确认
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages_tool/member/finance/account/point.vue b/pages_tool/member/point.vue
similarity index 88%
rename from pages_tool/member/finance/account/point.vue
rename to pages_tool/member/point.vue
index 4526b74..3c4ae9d 100644
--- a/pages_tool/member/finance/account/point.vue
+++ b/pages_tool/member/point.vue
@@ -2,9 +2,10 @@
+ 'padding-top': menuButtonBounding.top + 'px',
+ 'height': menuButtonBounding.height + 'px'
+ }"
+ >
@@ -13,9 +14,8 @@
-
-
+
+
{{ pointInfo.point }}
当前积分
@@ -48,7 +48,7 @@
积分商城
-
-
-
-
-
-
-
-
-
-
-
- ￥
- {{ parseFloat(item.money) }}
-
-
- ￥
- {{ parseFloat(item.money) }}
-
-
- {{ parseFloat(item.discount) }}
- 折
-
-
- 满{{ item.at_least }}元可用
- 无门槛优惠券
-
-
-
-
- {{ item.coupon_name }}
- 指定商品
- (最大优惠{{ item.discount_limit
- }}元)
- {{
- item.use_channel_name }}
-
-
- 有效期：{{ $util.timeStampTurnTime(item.end_time) }}
-
- 有效期：长期有效
-
-
- 去使用
- 已使用
- 已过期
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages_tool/member/rights/level.vue b/pages_tool/member/rights/level.vue
deleted file mode 100644
index 2e131f2..0000000
--- a/pages_tool/member/rights/level.vue
+++ /dev/null
@@ -1,391 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- {{ memberInfo.nickname }}
- 当前等级：{{ memberInfo.member_level_name }}
-
-
-
- 成长规则
-
-
-
-
-
-
-
-
-
-
-
- {{ levelList[curIndex].level_name }}
- 当前等级
-
- 当前成长值
-
- {{
- growth }}
-
-
-
-
- 再获得{{ levelList[curIndex + 1].needGrowth > 0 ? levelList[curIndex +
- 1].needGrowth : 0 }}成长值成为{{
- levelList[curIndex + 1].level_name
- }}
-
-
-
- 您现在已经是最高等级
-
-
-
-
-
- 再获得{{ levelList[curIndex].needGrowth }}成长值成为{{ levelList[curIndex].level_name }}
-
-
-
-
-
-
-
-
- 会员权益
-
-
-
- 包邮服务
- 提供商品包邮服务
-
-
-
-
-
- 享受消费折扣服务
- 不享受任何消费折扣和其他权益
- 提供{{ levelList[curIndex].consume_discount }}折消费折扣
-
-
-
-
-
- 享受积分回馈服务
- 提供{{ levelList[curIndex].point_feedback }}倍积分回馈倍率
-
-
-
-
-
- 会员礼包
-
-
-
- 积分礼包
- 赠送{{ levelList[curIndex].send_point }}积分
-
-
-
-
-
- 红包礼包
- 赠送{{ levelList[curIndex].send_balance }}元红包
-
-
-
-
-
- 优惠券礼包
- 赠送{{ levelList[curIndex].coupon_length }}张优惠券
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages_tool/member/rights/level_growth_rules.vue b/pages_tool/member/rights/level_growth_rules.vue
deleted file mode 100644
index fc264a4..0000000
--- a/pages_tool/member/rights/level_growth_rules.vue
+++ /dev/null
@@ -1,274 +0,0 @@
-
-
-
-
-
- 成长值说明
-
-
-
-
- 等级
- 成长值
-
-
- {{ item.level_name }}
- {{ item.growth }}
-
-
-
-
-
-
- 什么是成长值
-
- 成长值是消费者在店铺成为会员后，通过消费计算出来的值。成长值决定会员等级，会员等级越高，所享受的会员权益和会员礼包就越多。
-
-
-
-
- 如何获得成长值
-
-
- 1、注册会员送x成长值。
- 2、会员充值到余额送x成长值。
- 3、会员签到送x成长值。
- 4、会员消费x元，交易完成即可获得x个成长值。
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages_tool/member/finance/transaction/withdrawal.vue b/pages_tool/member/withdrawal.vue
similarity index 88%
rename from pages_tool/member/finance/transaction/withdrawal.vue
rename to pages_tool/member/withdrawal.vue
index c839671..0efa35e 100644
--- a/pages_tool/member/finance/transaction/withdrawal.vue
+++ b/pages_tool/member/withdrawal.vue
@@ -30,15 +30,21 @@
\ No newline at end of file
diff --git a/pages_tool/notice/list.vue b/pages_tool/notice/list.vue
index bacc3da..9d9c465 100644
--- a/pages_tool/notice/list.vue
+++ b/pages_tool/notice/list.vue
@@ -28,15 +28,20 @@
-
+
diff --git a/pages_tool/order/evaluate.vue b/pages_tool/order/evaluate.vue
index 28ba68e..1f01bdc 100644
--- a/pages_tool/order/evaluate.vue
+++ b/pages_tool/order/evaluate.vue
@@ -6,31 +6,27 @@
-
+
{{ item.sku_name }}
描述相符
-
+
-
- 好评
- 中评
- 差评
+ 好评
+ 中评
+ 差评
@@ -39,24 +35,20 @@
-
+
{{ goodsEvalList[index].content.length }}/200
-
+
{{ goodsEvalList[index].again_content.length }}/200
-
+
-
+
{{ imgList[index].length ? 6 - imgList[index].length : 0 }}/6
@@ -67,8 +59,7 @@
-
+
匿名
@@ -80,17 +71,16 @@
\ No newline at end of file
diff --git a/pages_tool/order/logistics.vue b/pages_tool/order/logistics.vue
index 371b60b..90f4522 100644
--- a/pages_tool/order/logistics.vue
+++ b/pages_tool/order/logistics.vue
@@ -1,27 +1,22 @@
-
-
+
+
{{ packageItem.package_name }}
-
+
-
+
- {{ goodsItem.sku_name
- }}
+ {{ goodsItem.sku_name }}
@@ -36,9 +31,7 @@
-
-
-
+
承运公司： {{ packageItem.express_company_name }}
@@ -55,14 +48,16 @@
-
+
- {{ traceItem.remark
- }}
- {{
- traceItem.datetime }}
+ {{ traceItem.remark }}
+ {{ traceItem.datetime }}
@@ -81,9 +76,6 @@
diff --git a/pages_tool/order/refund_type_select.vue b/pages_tool/order/refund_type_select.vue
index 19975d4..8ca80fd 100644
--- a/pages_tool/order/refund_type_select.vue
+++ b/pages_tool/order/refund_type_select.vue
@@ -25,97 +25,96 @@
-
\ No newline at end of file
diff --git a/pages_tool/pay/cashier.vue b/pages_tool/pay/cashier.vue
index abc2a58..72cfdd1 100644
--- a/pages_tool/pay/cashier.vue
+++ b/pages_tool/pay/cashier.vue
@@ -7,17 +7,15 @@
￥
{{ payInfo.pay_money | moneyFormat }}
-
+
-
+
{{ item.name }}
-
+
@@ -33,13 +31,11 @@
-
\ No newline at end of file
diff --git a/pages_tool/pay/wx_pay.vue b/pages_tool/pay/wx_pay.vue
index d6af337..f9af381 100644
--- a/pages_tool/pay/wx_pay.vue
+++ b/pages_tool/pay/wx_pay.vue
@@ -12,15 +12,15 @@ export default {
name: 'wx_pay',
data() {
return {
- show: true,
- wx_alipay: "",
- out_trade_no: ""
+ show : true,
+ wx_alipay : "",
+ out_trade_no : ""
};
},
onLoad(options) {
this.wx_alipay = options.wx_alipay || '';
this.out_trade_no = options.out_trade_no || '';
- if (!this.$util.isWeiXin() && this.wx_alipay) {
+ if(!this.$util.isWeiXin() && this.wx_alipay){
this.show = false;
location.href = this.wx_alipay;
}
@@ -36,7 +36,7 @@ export default {
success: res => {
if (res.code >= 0 && res.data) {
this.checkPayStatus();
- }
+ }
}
});
},
@@ -64,33 +64,29 @@ export default {
diff --git a/pages_tool/recharge/order_list.vue b/pages_tool/recharge/order_list.vue
index c35f44e..8b7870e 100644
--- a/pages_tool/recharge/order_list.vue
+++ b/pages_tool/recharge/order_list.vue
@@ -9,14 +9,11 @@
{{ orderItem.order_no }}
- {{ $util.timeStampTurnTime(orderItem.create_time)
- }}
+ {{ $util.timeStampTurnTime(orderItem.create_time) }}
-
- 充值成功
-
+ 充值成功
￥
@@ -43,13 +40,17 @@
diff --git a/pages_tool/webview/webview.vue b/pages_tool/webview/webview.vue
index bd3a940..62f7d93 100644
--- a/pages_tool/webview/webview.vue
+++ b/pages_tool/webview/webview.vue
@@ -11,11 +11,14 @@