From 9415f397d2de1e7656e623b6595dbcc23cb21a79 Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Sun, 4 Jan 2026 14:40:00 +0800 Subject: [PATCH] =?UTF-8?q?chore(=E7=BB=84=E4=BB=B6):=20=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=B0=BD=E9=87=8F=E4=BD=BF=E7=94=A8=E5=BC=82=E6=AD=A5=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/js/goods_detail_base.js | 2 +- components-diy/diy-bargain.vue | 3 + components-diy/diy-category.vue | 3 +- components-diy/diy-coupon.vue | 4 + components-diy/diy-digit.vue | 8 +- components-diy/diy-goods-brand.vue | 8 +- components-diy/diy-goods-list.vue | 4 +- components-diy/diy-goods-recommend.vue | 3 + components-diy/diy-graphic-nav.vue | 4 + components-diy/diy-groupbuy.vue | 3 + components-diy/diy-image-nav.vue | 3 +- components-diy/diy-index-page.vue | 7 +- components-diy/diy-live.vue | 3 + components-diy/diy-map.vue | 1 + components-diy/diy-member-info.vue | 7 +- components-diy/diy-member-my-order.vue | 4 + components-diy/diy-merch-list.vue | 5 + components-diy/diy-notes.vue | 5 + components-diy/diy-notice.vue | 4 + components-diy/diy-payment-qrcode.vue | 4 + components-diy/diy-pinfan.vue | 5 + components-diy/diy-pintuan.vue | 5 + components-diy/diy-presale.vue | 5 + 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 | 5 + components-diy/diy-store-label.vue | 5 + 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 | 2 +- .../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-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 | 4 +- 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 + pages/index/index.vue | 22 +- 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_order/detail.vue | 485 +++--- pages_order/detail_local_delivery.vue | 3 + pages_order/detail_pickup.vue | 3 + pages_order/detail_point.vue | 341 ++-- pages_order/list.vue | 15 +- pages_order/payment.vue | 3 + .../components/yuyue-date/yuyue-date.vue | 643 +++---- pages_promotion/fenxiao/apply.vue | 10 +- pages_promotion/fenxiao/bill.vue | 35 +- pages_promotion/fenxiao/child_fenxiao.vue | 25 +- pages_promotion/fenxiao/goods_list.vue | 66 +- pages_promotion/fenxiao/index.vue | 18 +- pages_promotion/fenxiao/level.vue | 448 ++--- pages_promotion/fenxiao/order.vue | 75 +- pages_promotion/fenxiao/order_detail.vue | 53 +- pages_promotion/fenxiao/promote.vue | 12 +- pages_promotion/fenxiao/promote_code.vue | 452 ++--- pages_promotion/fenxiao/ranking_list.vue | 586 ++++--- pages_promotion/fenxiao/relation.vue | 17 +- pages_promotion/fenxiao/team.vue | 17 +- pages_promotion/fenxiao/withdraw_apply.vue | 3 + pages_promotion/fenxiao/withdraw_list.vue | 39 +- pages_promotion/fenxiao/withdrawal_detail.vue | 3 + pages_promotion/merch/detail.vue | 230 +-- pages_promotion/merch/merchcategory.vue | 5 +- pages_promotion/point/detail.vue | 25 +- pages_promotion/point/goods_list.vue | 1471 +++++++++-------- pages_promotion/point/list.vue | 726 ++++---- pages_promotion/point/order_list.vue | 956 +++++------ pages_promotion/point/payment.vue | 175 +- pages_promotion/point/result.vue | 136 +- pages_tool/agreement/contenr.vue | 68 +- pages_tool/article/detail.vue | 252 +-- pages_tool/article/list.vue | 335 ++-- pages_tool/cases/index.vue | 42 +- .../components/chat-message/chat-message.vue | 12 +- .../components/uni-calendar/uni-calendar.vue | 4 +- .../components/uni-nav-bar/uni-nav-bar.vue | 6 +- pages_tool/contact/contact.vue | 40 +- pages_tool/files/list.vue | 457 ++--- pages_tool/form/form.vue | 219 +-- pages_tool/form/formdata.vue | 16 +- pages_tool/goods/brand.vue | 196 ++- pages_tool/goods/coupon.vue | 770 ++++----- 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 | 535 +++--- pages_tool/help/detail.vue | 212 +-- pages_tool/help/list.vue | 16 +- pages_tool/index/diy.vue | 31 +- pages_tool/login/find.vue | 67 +- pages_tool/login/login.vue | 8 +- pages_tool/member/account.vue | 692 ++++---- pages_tool/member/account_edit.vue | 14 +- pages_tool/member/address.vue | 22 +- pages_tool/member/address_edit.vue | 801 +++++---- pages_tool/member/apply_withdrawal.vue | 599 +++---- pages_tool/member/balance.vue | 36 +- pages_tool/member/balance_detail.vue | 582 ++++--- pages_tool/member/cancellation.vue | 2 +- pages_tool/member/cancelrefuse.vue | 4 +- pages_tool/member/cancelstatus.vue | 269 ++- pages_tool/member/cancelsuccess.vue | 142 +- pages_tool/member/card.vue | 204 +-- pages_tool/member/card_agreement.vue | 4 +- pages_tool/member/card_buy.vue | 466 +++--- pages_tool/member/collection.vue | 97 +- pages_tool/member/contact.vue | 5 +- pages_tool/member/coupon.vue | 625 +++---- pages_tool/member/footprint.vue | 56 +- pages_tool/member/index.vue | 65 +- pages_tool/member/info.vue | 405 ++--- pages_tool/member/info_edit.vue | 457 ++--- pages_tool/member/invite_friends.vue | 113 +- pages_tool/member/level.vue | 471 +++--- pages_tool/member/level_growth_rules.vue | 404 ++--- pages_tool/member/modify_face.vue | 297 ++-- pages_tool/member/pay_password.vue | 434 ++--- pages_tool/member/point.vue | 22 +- pages_tool/member/point_detail.vue | 36 +- pages_tool/member/withdrawal.vue | 18 +- pages_tool/member/withdrawal_detail.vue | 3 +- pages_tool/notice/detail.vue | 234 +-- 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 | 40 +- pages_tool/order/refund.vue | 64 +- pages_tool/order/refund_batch.vue | 81 +- pages_tool/order/refund_detail.vue | 61 +- pages_tool/order/refund_goods_select.vue | 371 +++-- pages_tool/order/refund_type_select.vue | 169 +- pages_tool/pay/cashier.vue | 40 +- pages_tool/pay/index.vue | 4 +- pages_tool/pay/result.vue | 513 +++--- pages_tool/pay/wx_pay.vue | 40 +- pages_tool/recharge/list.vue | 988 +++++------ 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 | 7 +- pages_tool/weapp/order_shipping.vue | 72 +- pages_tool/webview/webview.vue | 5 +- 172 files changed, 11520 insertions(+), 10979 deletions(-) diff --git a/common/js/goods_detail_base.js b/common/js/goods_detail_base.js index 2fe192a..c04b212 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'; +import htmlParser from '@/common/js/html-parser.js'; export default { data() { diff --git a/components-diy/diy-bargain.vue b/components-diy/diy-bargain.vue index 373dd8a..2939daf 100644 --- a/components-diy/diy-bargain.vue +++ b/components-diy/diy-bargain.vue @@ -186,6 +186,9 @@ export default { type: Object } }, + components: { + XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'), + }, mixins: [DiyMinx], data() { return { diff --git a/components-diy/diy-category.vue b/components-diy/diy-category.vue index f907f50..c5d392b 100644 --- a/components-diy/diy-category.vue +++ b/components-diy/diy-category.vue @@ -161,14 +161,13 @@ 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 + nsGoodsSkuCategory: () => import('@/components/ns-goods-sku/ns-goods-sku-category.vue'), }, name: 'diy-category', props: { diff --git a/components-diy/diy-coupon.vue b/components-diy/diy-coupon.vue index 52d0b86..b3bf43f 100644 --- a/components-diy/diy-coupon.vue +++ b/components-diy/diy-coupon.vue @@ -303,6 +303,10 @@ export default { } } }, + components: { + XSkeleton: () => import('@/uni_modules/x-skeleton/components/x-skeleton/x-skeleton.vue'), + 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 4a51a91..91eacc7 100644 --- a/components-diy/diy-digit.vue +++ b/components-diy/diy-digit.vue @@ -1,4 +1,4 @@ - - \ 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 f958edd..c4ea7d3 100644 --- a/components/ns-goods-action-icon/ns-goods-action-icon.vue +++ b/components/ns-goods-action-icon/ns-goods-action-icon.vue @@ -20,7 +20,6 @@ - - \ No newline at end of file diff --git a/pages_goods/category.vue b/pages_goods/category.vue index 57902b4..98a0413 100644 --- a/pages_goods/category.vue +++ b/pages_goods/category.vue @@ -25,17 +25,13 @@ @@ -570,12 +594,12 @@ export default { position: relative; z-index: 999; } - - \ No newline at end of file diff --git a/pages_order/detail.vue b/pages_order/detail.vue index 659d78b..3fe333e 100644 --- a/pages_order/detail.vue +++ b/pages_order/detail.vue @@ -1,7 +1,8 @@ \ No newline at end of file diff --git a/pages_order/detail_local_delivery.vue b/pages_order/detail_local_delivery.vue index ff0c6d3..506fb93 100644 --- a/pages_order/detail_local_delivery.vue +++ b/pages_order/detail_local_delivery.vue @@ -6,6 +6,9 @@ \ No newline at end of file diff --git a/pages_promotion/fenxiao/apply.vue b/pages_promotion/fenxiao/apply.vue index c8eae81..d388389 100644 --- a/pages_promotion/fenxiao/apply.vue +++ b/pages_promotion/fenxiao/apply.vue @@ -153,10 +153,13 @@ @@ -165,8 +159,10 @@ 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; @@ -190,6 +186,7 @@ export default { } } } + .content { overflow: hidden; padding: 0 30rpx 160rpx; @@ -202,12 +199,14 @@ 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; } @@ -221,6 +220,7 @@ export default { border-radius: 10rpx; overflow: hidden; flex-shrink: 0; + image { width: 100%; height: 100%; @@ -241,6 +241,7 @@ export default { .goods-name { width: 100%; line-height: 1.3; + .name { line-height: 1.3; word-break: break-all; @@ -250,10 +251,12 @@ 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; @@ -285,6 +288,7 @@ export default { padding: 0 $padding; border-radius: 50rpx; border: 2rpx solid $base-color; + text { color: $base-color; border-radius: 40rpx; @@ -299,6 +303,7 @@ export default { } } } + .active-btn { position: fixed; bottom: 40rpx; @@ -312,10 +317,12 @@ export default { border-radius: 50rpx; background-color: $base-color; color: #fff; + .btn { flex: 1; text-align: center; } + .share-btn { margin: 0; padding: 0; @@ -355,6 +362,7 @@ export default { border: none; line-height: 1; height: auto; + text { margin-top: 20rpx; font-size: $font-size-tag; @@ -367,6 +375,7 @@ export default { font-size: 80rpx; line-height: initial; } + .icon-fuzhilianjie, .icon-pengyouquan, .icon-haowuquan, @@ -383,39 +392,48 @@ 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/index.vue b/pages_promotion/fenxiao/index.vue index dc128d6..8cc162d 100644 --- a/pages_promotion/fenxiao/index.vue +++ b/pages_promotion/fenxiao/index.vue @@ -261,11 +261,25 @@ \ No newline at end of file diff --git a/pages_promotion/fenxiao/order.vue b/pages_promotion/fenxiao/order.vue index 36e0a17..6e398d2 100644 --- a/pages_promotion/fenxiao/order.vue +++ b/pages_promotion/fenxiao/order.vue @@ -2,40 +2,51 @@ - {{ item.name }} + {{ item.name }} + - + {{ orderItem.order_no }} 已退款 - 已结算 + 已结算 待结算 - + {{ 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] }} @@ -57,18 +68,24 @@ 合计： {{ $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] }} - - - - + + + + @@ -79,22 +96,16 @@ \ No newline at end of file diff --git a/pages_promotion/fenxiao/ranking_list.vue b/pages_promotion/fenxiao/ranking_list.vue index 6a134eb..8211aa3 100644 --- a/pages_promotion/fenxiao/ranking_list.vue +++ b/pages_promotion/fenxiao/ranking_list.vue @@ -3,17 +3,22 @@ - 分销佣金 - {{ info.today_commission}}元 + {{ info.today_commission }}元 @@ -50,7 +55,7 @@ 推广人数 - {{ info.one_child_num}}人 + {{ info.one_child_num }}人 @@ -67,20 +72,21 @@ - 佣金排行 - 推广排行 + 佣金排行 + 推广排行 {{ index + 1 }} - + {{ item.nickname }} - ￥{{ item.total_commission|moneyFormat }} + ￥{{ item.total_commission | moneyFormat }} {{ item.child_num }}人 @@ -97,337 +103,329 @@ diff --git a/pages_promotion/fenxiao/relation.vue b/pages_promotion/fenxiao/relation.vue index 36927b5..f0e643b 100644 --- a/pages_promotion/fenxiao/relation.vue +++ b/pages_promotion/fenxiao/relation.vue @@ -72,23 +72,16 @@ - + diff --git a/pages_promotion/point/list.vue b/pages_promotion/point/list.vue index c1331b1..47f99e5 100644 --- a/pages_promotion/point/list.vue +++ b/pages_promotion/point/list.vue @@ -2,16 +2,19 @@ - - + :style="{ 'padding-top': menuButtonBounding.top + 'px', height: menuButtonBounding.height + 'px' }"> + + 搜索商品 - + @@ -20,7 +23,7 @@ - + @@ -39,7 +42,7 @@ - - - + 储值{{ parseFloat(item.buy_price) }}元 可得{{ item.point }}积分 @@ -92,10 +96,13 @@ - - + + - + - {{ couponItem.at_least == 0 ? '无门槛优惠券' : '满' + parseFloat(couponItem.at_least).toFixed(0) + '可用' }} + {{ couponItem.at_least == 0 ? '无门槛优惠券' : '满' + + parseFloat(couponItem.at_least).toFixed(0) + '可用' }} - 全场券 - 指定券 + 全场券 + + 指定券 @@ -139,7 +150,9 @@ - + @@ -188,17 +201,19 @@ + - {{ parseFloat(item.price).toFixed(2).split(".")[0] }} - .{{ parseFloat(item.price).toFixed(2).split(".")[1] }}元 + {{ + 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) }} @@ -216,19 +231,19 @@ - {{ isEnEnv ? 'Integral Description' : '积分说明'}} + {{ isEnEnv ? 'Integral Description' : '积分说明' }} - {{ isEnEnv ? 'Integral Acquisition' : '积分的获取'}} + {{ isEnEnv ? 'Integral Acquisition' : '积分的获取' }} 1、积分可在注册、签到、分享、消费、充值时获得。 2、在购买部分商品时可获得积分。 - {{ isEnEnv ? 'Integral Use' : '积分的使用'}} + {{ isEnEnv ? 'Integral Use' : '积分的使用' }} 1、积分可用于兑换积分中心的商品。 2、积分可在参与某些活动时使用。 3、积分不得转让，出售，不设有效期。 - {{ isEnEnv ? 'Integral Query' : '积分的查询'}} + {{ isEnEnv ? 'Integral Query' : '积分的查询' }} 1、积分可在会员中心中查询具体数额以及明细。 @@ -245,349 +260,358 @@ \ No newline at end of file diff --git a/pages_promotion/point/order_list.vue b/pages_promotion/point/order_list.vue index 66b6a83..2ab4990 100644 --- a/pages_promotion/point/order_list.vue +++ b/pages_promotion/point/order_list.vue @@ -1,36 +1,43 @@ diff --git a/pages_promotion/point/payment.vue b/pages_promotion/point/payment.vue index 155cf6f..b53424f 100644 --- a/pages_promotion/point/payment.vue +++ b/pages_promotion/point/payment.vue @@ -2,9 +2,9 @@ + 'padding-top': menuButtonBounding.top + 'px', + height: menuButtonBounding.height + 'px' + }"> 确认订单 @@ -18,11 +18,12 @@ - + @@ -241,22 +269,29 @@ - + - + {{ item.store_name }} ({{ item.distance }}km) - + 营业时间：{{ item.open_date }} - + 地址：{{ item.full_address }}{{ item.address }} - + 所选择收货地址附近没有可以自提的门店 @@ -267,7 +302,8 @@ - + @@ -277,48 +313,41 @@ \ No newline at end of file diff --git a/pages_promotion/point/result.vue b/pages_promotion/point/result.vue index ce14ea8..62c7f14 100644 --- a/pages_promotion/point/result.vue +++ b/pages_promotion/point/result.vue @@ -12,81 +12,81 @@ diff --git a/pages_tool/agreement/contenr.vue b/pages_tool/agreement/contenr.vue index 7dfcaa9..581f70b 100644 --- a/pages_tool/agreement/contenr.vue +++ b/pages_tool/agreement/contenr.vue @@ -5,50 +5,48 @@ - \ 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 d2c7c25..7b39f90 100644 --- a/pages_tool/article/detail.vue +++ b/pages_tool/article/detail.vue @@ -25,134 +25,140 @@ \ No newline at end of file diff --git a/pages_tool/article/list.vue b/pages_tool/article/list.vue index bcbbb96..4d9ca46 100644 --- a/pages_tool/article/list.vue +++ b/pages_tool/article/list.vue @@ -6,7 +6,8 @@ - + {{ item.article_title }} @@ -33,203 +34,195 @@ \ No newline at end of file diff --git a/pages_tool/cases/index.vue b/pages_tool/cases/index.vue index 50303ad..7b52aac 100644 --- a/pages_tool/cases/index.vue +++ b/pages_tool/cases/index.vue @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/pages_tool/form/formdata.vue b/pages_tool/form/formdata.vue index 7743cc8..66e4a5b 100644 --- a/pages_tool/form/formdata.vue +++ b/pages_tool/form/formdata.vue @@ -3,11 +3,13 @@ - + 请填写表单所需信息 - + @@ -21,6 +23,12 @@ \ No newline at end of file diff --git a/pages_tool/goods/coupon.vue b/pages_tool/goods/coupon.vue index 2b332ba..80c0bfc 100644 --- a/pages_tool/goods/coupon.vue +++ b/pages_tool/goods/coupon.vue @@ -2,42 +2,53 @@ - 全部 - 满减券 - 折扣券 - + 全部 + 满减券 + 折扣券 + - + - + - + ￥ {{ parseFloat(item.money) }} - + {{ parseFloat(item.discount) }} 折 - 满{{ item.at_least }}元可用 - 无门槛优惠券 + 满{{ item.at_least }}元可用 + 无门槛优惠券 {{ item.coupon_name }} - 指定商品 + 指定商品 全场商品 (最大优惠{{ item.discount_limit }}元) - {{ item.use_channel_name }} - @@ -70,406 +81,401 @@ \ No newline at end of file diff --git a/pages_tool/goods/coupon_receive.vue b/pages_tool/goods/coupon_receive.vue index eb910ea..7daebfe 100644 --- a/pages_tool/goods/coupon_receive.vue +++ b/pages_tool/goods/coupon_receive.vue @@ -39,6 +39,13 @@ \ No newline at end of file diff --git a/pages_tool/help/detail.vue b/pages_tool/help/detail.vue index cd41c7f..cb6104b 100644 --- a/pages_tool/help/detail.vue +++ b/pages_tool/help/detail.vue @@ -15,51 +15,49 @@ \ No newline at end of file diff --git a/pages_tool/help/list.vue b/pages_tool/help/list.vue index 32f5f6b..83ae09e 100644 --- a/pages_tool/help/list.vue +++ b/pages_tool/help/list.vue @@ -3,7 +3,8 @@ {{ item.class_name }} - {{ s_item.title }} + {{ s_item.title }} @@ -19,12 +20,18 @@ \ No newline at end of file diff --git a/pages_tool/member/account_edit.vue b/pages_tool/member/account_edit.vue index 0225527..5507b2c 100644 --- a/pages_tool/member/account_edit.vue +++ b/pages_tool/member/account_edit.vue @@ -2,7 +2,8 @@ - + 提现 @@ -53,163 +55,130 @@ \ No newline at end of file diff --git a/pages_tool/member/balance.vue b/pages_tool/member/balance.vue index 1976189..f00c414 100644 --- a/pages_tool/member/balance.vue +++ b/pages_tool/member/balance.vue @@ -2,9 +2,9 @@ + 'padding-top': menuButtonBounding.top + 'px', + 'height': menuButtonBounding.height + 'px' + }"> @@ -13,12 +13,14 @@ - - - + + + 账户余额（元） - {{ (parseFloat(balanceInfo.balance) + parseFloat(balanceInfo.balance_money)).toFixed(2) }} - - - - + {{ $util.timeStampTurnTime(item.create_time) }} - {{ item.account_data > 0 ? '+' + item.account_data : item.account_data }}元 + {{ item.account_data > 0 ? + '+' + item.account_data : item.account_data }}元 @@ -50,324 +53,319 @@ \ No newline at end of file diff --git a/pages_tool/member/cancellation.vue b/pages_tool/member/cancellation.vue index b1e05a8..f9d60f3 100644 --- a/pages_tool/member/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 index 4f975ab..a028ccf 100644 --- a/pages_tool/member/cancelsuccess.vue +++ b/pages_tool/member/cancelsuccess.vue @@ -12,88 +12,88 @@ \ No newline at end of file diff --git a/pages_tool/member/card.vue b/pages_tool/member/card.vue index 2d5d236..9706d63 100644 --- a/pages_tool/member/card.vue +++ b/pages_tool/member/card.vue @@ -5,8 +5,9 @@ @@ -70,347 +80,342 @@ \ No newline at end of file diff --git a/pages_tool/member/footprint.vue b/pages_tool/member/footprint.vue index 4cf5824..f31e808 100644 --- a/pages_tool/member/footprint.vue +++ b/pages_tool/member/footprint.vue @@ -10,11 +10,14 @@ {{ datetime(item) }} - + - - {{ goodsTag(item) }} + + + {{ goodsTag(item) }} + @@ -24,22 +27,28 @@ {{ $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 : '件' }} @@ -49,10 +58,12 @@ - + 全选 - + @@ -64,22 +75,15 @@ \ No newline at end of file diff --git a/pages_tool/member/info_edit.vue b/pages_tool/member/info_edit.vue index 6a64810..ac1a93c 100644 --- a/pages_tool/member/info_edit.vue +++ b/pages_tool/member/info_edit.vue @@ -5,7 +5,8 @@ 用户名 - + 用户名仅可修改一次，请谨慎设置 @@ -16,7 +17,8 @@ 昵称 - + @@ -26,7 +28,8 @@ 姓名 - + @@ -39,7 +42,8 @@ @@ -53,7 +57,8 @@ 生日 - + {{ formData.birthday ? formData.birthday : '请选择生日' }} @@ -69,35 +74,42 @@ 请先绑定手机再执行该操作 - + 原密码 - + 新密码 - + 再次输入 - - + + 点击“获取动态码”，将会向您已绑定的手机号{{ memberInfoformData.mobile | mobile }}发送验证码 新密码 - + 再次输入 - + @@ -109,17 +121,21 @@ 手机号 - + 验证码 - + 短信验证码 - - + + @@ -138,7 +154,7 @@ 所在地区 - + {{ formData.fullAddress ? formData.fullAddress : '请选择省市区县' }} @@ -157,237 +173,238 @@ \ No newline at end of file diff --git a/pages_tool/member/invite_friends.vue b/pages_tool/member/invite_friends.vue index 8321783..3e8c1b1 100644 --- a/pages_tool/member/invite_friends.vue +++ b/pages_tool/member/invite_friends.vue @@ -9,12 +9,15 @@ 活动说明 - + - 活动时间：{{ $util.timeStampTurnTime(info.start_time, 1) }}至{{ $util.timeStampTurnTime(info.end_time, 1) }} + 活动时间：{{ $util.timeStampTurnTime(info.start_time, 1) }}至{{ $util.timeStampTurnTime(info.end_time, 1) + }} - 立即邀请 + 立即邀请 我的好友 @@ -23,7 +26,8 @@ - + @@ -43,11 +47,13 @@ - + 查看更多 - 没有更多数据了 + 没有更多数据了 @@ -62,7 +68,7 @@ - + {{ $lang('common.currencySymbol') }} @@ -73,7 +79,7 @@ - + {{ parseInt(info.point) }} @@ -128,7 +134,7 @@ - + 分享链接给好友 @@ -137,7 +143,7 @@ - + 好友进入 @@ -146,7 +152,7 @@ - + 好友注册成功获得奖励 @@ -231,56 +237,55 @@ diff --git a/pages_tool/member/level.vue b/pages_tool/member/level.vue index c7e6d1d..3d48a5c 100644 --- a/pages_tool/member/level.vue +++ b/pages_tool/member/level.vue @@ -5,7 +5,8 @@