From b80593f2b88df26fa949eb1243b4f0763ec45ebc Mon Sep 17 00:00:00 2001 From: woody Date: Wed, 7 May 2025 10:50:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(shoppingMall):=20tab=20id=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/HeaderTop.vue | 80 +- src/components/special-area-list/index.vue | 27 +- src/mixins/special-list-mixin.js | 83 + src/views/goodsDetails/index.vue | 14 +- src/views/hiFans/index.vue | 1092 ++++---- src/views/index/index.vue | 11 +- src/views/integral/index.vue | 762 +++--- src/views/newGiftPay/index.vue | 2 +- src/views/pickPay/index.vue | 2 +- src/views/repurchase/index.vue | 2617 +++++++++++--------- src/views/rescission/index.vue | 2017 ++++++++------- src/views/shareConfirm/index.vue | 2 +- src/views/shareFansConfirm/index.vue | 2 +- src/views/shoppingMall/index.vue | 103 +- src/views/tvIng/index.vue | 2 +- src/views/upgrade/index.vue | 2 +- src/views/welfare/index.vue | 2 +- 17 files changed, 3559 insertions(+), 3261 deletions(-) create mode 100644 src/mixins/special-list-mixin.js diff --git a/src/components/HeaderTop.vue b/src/components/HeaderTop.vue index b2bc6bf..99b26b6 100644 --- a/src/components/HeaderTop.vue +++ b/src/components/HeaderTop.vue @@ -174,91 +174,15 @@ \ No newline at end of file + diff --git a/src/views/newGiftPay/index.vue b/src/views/newGiftPay/index.vue index 882ca2f..c638c59 100644 --- a/src/views/newGiftPay/index.vue +++ b/src/views/newGiftPay/index.vue @@ -329,7 +329,7 @@ export default { moren: '', allGoodsData: {}, allData: [], - agreementShow: false, + agreementShow: true, countryList: [], transList: [ { diff --git a/src/views/pickPay/index.vue b/src/views/pickPay/index.vue index a5b4b8b..7128670 100644 --- a/src/views/pickPay/index.vue +++ b/src/views/pickPay/index.vue @@ -361,7 +361,7 @@ export default { moren: '', allGoodsData: [], allData: [], - agreementShow: false, + agreementShow: true, countryList: [], transList: [ { diff --git a/src/views/repurchase/index.vue b/src/views/repurchase/index.vue index 742b877..36950cc 100644 --- a/src/views/repurchase/index.vue +++ b/src/views/repurchase/index.vue @@ -5,111 +5,181 @@ * @Date: 2023-01-29 17:32:44 --> \ No newline at end of file + .pop_title2 { + width: 100%; + font-size: 16px; + text-align: center; + margin-top: 20px; + font-weight: 500; + } +} + diff --git a/src/views/rescission/index.vue b/src/views/rescission/index.vue index f0d2361..e305886 100644 --- a/src/views/rescission/index.vue +++ b/src/views/rescission/index.vue @@ -5,82 +5,127 @@ * @Date: 2023-01-29 17:32:44 --> \ No newline at end of file +.tab_b { + text-align: right; + font-size: 12px; + font-family: PingFang SC-Regular, PingFang SC; + font-weight: 400; + color: #666666; + padding: 20px 60px 0 0; +} + diff --git a/src/views/shareConfirm/index.vue b/src/views/shareConfirm/index.vue index 11e261c..954692a 100644 --- a/src/views/shareConfirm/index.vue +++ b/src/views/shareConfirm/index.vue @@ -362,7 +362,7 @@ export default { moren: '', allGoodsData: {}, allData: [], - agreementShow: false, + agreementShow: true, countryList: [], transList: [ { diff --git a/src/views/shareFansConfirm/index.vue b/src/views/shareFansConfirm/index.vue index 88cf5d0..21c6b9d 100644 --- a/src/views/shareFansConfirm/index.vue +++ b/src/views/shareFansConfirm/index.vue @@ -333,7 +333,7 @@ export default { moren: '', allGoodsData: [], allData: [], - agreementShow: false, + agreementShow: true, countryList: [], transList: [ { diff --git a/src/views/shoppingMall/index.vue b/src/views/shoppingMall/index.vue index 09372a5..8f8737b 100644 --- a/src/views/shoppingMall/index.vue +++ b/src/views/shoppingMall/index.vue @@ -418,9 +418,11 @@ import * as api from "@/api/goods.js"; import { mapGetters } from "vuex"; import noticePopup from "@/components/noticePopup.vue"; import selSpaceGoods from "@/components/selSpaceGoods.vue"; +import specialListMixin from "@/mixins/special-list-mixin.js"; import * as ads from "@/api/register.js"; export default { + mixins: [specialListMixin], components: { noticePopup, personInfo, @@ -447,107 +449,6 @@ export default { startPrice: "", endPrice: "", index: 30, - zoneList: [ - { - label: "分享专区", - value: 100, - name: "share", - children: [ - { - label: "海粉分享", - value: 7, - name: "hiFans", - }, - { - label: "免费注册", - value: 21, - name: "haiFans", - }, - ], - }, - { - label: "注册专区", - value: 1, - name: "regiest", - children: [ - { - label: "乐学易考", - value: 24, - name: "ezLearnReg", - }, - ], - }, - { - label: "升级专区", - value: 2, - name: "upgrade", - children: [ - { - label: "乐学易考", - value: 25, - name: "ezLearnUp", - }, - ], - }, - { - label: "复购专区", - value: 3, - name: "repurchase", - children: [ - { - label: "自营专区", - value: 3, - name: "self", - }, - { - label: "三方供应", - value: 21, - name: "haiFans", - }, - { - label: "复购合作", - value: 22, - name: "cooperation", - }, - { - label: "乐学易考", - value: 26, - name: "ezLearnRep", - }, - ], - }, - { - label: "福利专区", - value: 13, - children: [], - name: "welfare", - }, - - { - label: "重消专区", - value: 10, - children: [], - name: "rescission", - }, - { - label: "续约专区", - value: 30, - children: [], - name: "renewalArea", - }, - { - label: "专供专区", - value: 31, - children: [], - name: "wolesaleArea", - }, - { - label: "创客空间专区", - value: 28, - children: [], - name: "makerArea", - }, - ], specialArea: 0, specialArea0: 0, goodList: [], diff --git a/src/views/tvIng/index.vue b/src/views/tvIng/index.vue index f3ea4cc..bac3f2c 100644 --- a/src/views/tvIng/index.vue +++ b/src/views/tvIng/index.vue @@ -395,7 +395,7 @@ export default { moren: '', allGoodsData: [], allData: [], - agreementShow: false, + agreementShow: true, countryList: [], transList: [ { diff --git a/src/views/upgrade/index.vue b/src/views/upgrade/index.vue index ce848d8..ed46d37 100644 --- a/src/views/upgrade/index.vue +++ b/src/views/upgrade/index.vue @@ -504,7 +504,7 @@ export default { moren: "", allGoodsData: [], allData: [], - agreementShow: false, + agreementShow: true, countryList: [], transList: [ { diff --git a/src/views/welfare/index.vue b/src/views/welfare/index.vue index 47dc301..ebf8352 100644 --- a/src/views/welfare/index.vue +++ b/src/views/welfare/index.vue @@ -377,7 +377,7 @@ export default { moren: '', allGoodsData: [], allData: [], - agreementShow: false, + agreementShow: true, countryList: [], transList: [ {