diff --git a/components/area-product-list/index.vue b/components/area-product-list/index.vue
index 4965140..11f4cd7 100644
--- a/components/area-product-list/index.vue
+++ b/components/area-product-list/index.vue
@@ -108,6 +108,7 @@ export default {
},
handleProductClick(item) {
// 商品点击事件，可根据需求实现跳转或其他逻辑
+ console.log(item, '....ite?')
this.$emit('product-click', item)
},
handleAddToCart(item) {
diff --git a/components/area-product-list/special-area-wrapper.vue b/components/area-product-list/special-area-wrapper.vue
new file mode 100644
index 0000000..de8d889
--- /dev/null
+++ b/components/area-product-list/special-area-wrapper.vue
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/config/index.js b/config/index.js
index 5d2d869..6c63687 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,19 +1,20 @@
-
const http = uni.$u.http
-//首页
-export const userIndex = (params) => http.get('/sale/api/wares/get-app-index', { params })
-
//修改头像
-export const updateHead = (data) => http.post('/member/api/member/update-head', data)
+export const updateHead = data =>
+ http.post('/member/api/member/update-head', data)
//提货记录列表
-export const pickList = (params) => http.get('/activity/api/pick/list', { params })
+export const pickList = params =>
+ http.get('/activity/api/pick/list', { params })
//提货专区列表
-export const pickLogList = (params) => http.get('/activity/api/pick/pick-log', { params })
+export const pickLogList = params =>
+ http.get('/activity/api/pick/pick-log', { params })
//植树活动
-export const queryTreeActivity = (params) => http.get('/activity/api/sa-tree-order/queryTreeActivity', { params })
+export const queryTreeActivity = params =>
+ http.get('/activity/api/sa-tree-order/queryTreeActivity', { params })
//创客空间列表
-export const marketList = (params) => http.get('/member/api/maker-space/list', { params })
\ No newline at end of file
+export const marketList = params =>
+ http.get('/member/api/maker-space/list', { params })
diff --git a/config/order.js b/config/order.js
index 242d99d..a84c0fa 100644
--- a/config/order.js
+++ b/config/order.js
@@ -1,34 +1,47 @@
-
const http = uni.$u.http
//支付配置
-export const payConfig = (params) => http.get('/pay/config', { params })
+export const payConfig = params => http.get('/pay/config', { params })
//查询订单明细
-export const orderInfo = (params) => http.post('/sale/api/order/query-order', params)
+export const orderInfo = params =>
+ http.post('/sale/api/order/query-order', params)
//订单状态
-export const orderStatus = (params) => http.get('/system/pub/enums/order-status-api', { params })
+export const orderStatus = params =>
+ http.get('/system/pub/enums/order-status-api', { params })
//计算邮费
-export const pickPostAge = (params) => http.get('/activity/api/pick/postage', { params })
+export const pickPostAge = params =>
+ http.get('/activity/api/pick/postage', { params })
//订单列表
-export const orderList = (params) => http.get('/sale/api/my-order/list', { params })
+export const orderList = params =>
+ http.get('/sale/api/my-order/list', { params })
//订单详情
-export const orderDetails = (orderCode) => http.get('/sale/api/my-order/detail/' + orderCode)
+export const orderDetails = orderCode =>
+ http.get('/sale/api/my-order/detail/' + orderCode)
//订单取消
-export const cancelOrder = (orderCode) => http.delete('/sale/api/my-order/cancel/' + orderCode)
+export const cancelOrder = orderCode =>
+ http.delete('/sale/api/my-order/cancel/' + orderCode)
//物流状态
-export const expressList = (id) => http.get('/sale/api/my-order/express/' + id,)
+export const expressList = id => http.get('/sale/api/my-order/express/' + id)
//校验订单状态
-export const payCheck = (id) => http.get('/sale/api/my-order/pay-check/' + id,)
+export const payCheck = id => http.get('/sale/api/my-order/pay-check/' + id)
//订单类型
-export const orderType = (params) => http.get('/sale/api/my-order/order-type', { params })
+export const orderType = params =>
+ http.get('/sale/api/my-order/order-type', { params })
//提货卡详情
-export const pickDetails = (params) => http.get('/activity/api/pick/detail', { params })
-
+export const pickDetails = params =>
+ http.get('/activity/api/pick/detail', { params })
//自助撤单列表
-export const selfRevokeList = (params) => http.get('/sale/api/my-order/selfRevokeList', { params })
+export const selfRevokeList = params =>
+ http.get('/sale/api/my-order/selfRevokeList', { params })
//自助撤单参数校验
-export const selfRevokeListCheck = (params) => http.post('/sale/api/my-order/check-self-revoke-order', params)
+export const selfRevokeListCheck = params =>
+ http.post('/sale/api/my-order/check-self-revoke-order', params)
//自助撤单
-export const selfRevokeOrder = (params) => http.post('/sale/api/my-order/self-revoke-order', params)
\ No newline at end of file
+export const selfRevokeOrder = params =>
+ http.post('/sale/api/my-order/self-revoke-order', params)
+
+// 获取可升级级别
+export const getUpgradeLevel = params =>
+ http.post('/sale/api/retail-order/valid-mem-level', { params })
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4236975..59fcc14 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,9 +1,10 @@
-
+
-
+
+
@@ -27,53 +28,12 @@
+
-
-
-
-
-
-
-
-
-
-
- {{ '查看更多' }}
-
-
-
+
@@ -88,7 +48,9 @@
{{ item.waresName }}
-
+ 累计销量{{ formatSales(item.sales) }}
-->
@@ -169,16 +131,17 @@ import clTabbar from '@/components/cl-tabbar.vue'
import noticePopup from '@/components/noticePopup.vue'
import getTree from '@/components/getTree.vue'
import znNewsPopup from '@/components/znNewsPopup.vue'
-import areaProductList from '@/components/area-product-list/index.vue'
import { formatCurrency } from '@/util/index.js'
import { mapGetters } from 'vuex'
+import SpecialAreaWrapper from '@/components/area-product-list/special-area-wrapper.vue'
+import { REGIEST_AREA, REISSUE_AREA } from '@/util/specialAreaMap'
export default {
components: {
noticePopup,
znNewsPopup,
'cl-tabbar': clTabbar,
getTree,
- areaProductList,
+ 'special-area-wrapper': SpecialAreaWrapper,
},
filters: {
seles(value) {
@@ -203,194 +166,10 @@ export default {
duration: 500,
goodsList: [],
recommendSpecialAreaList: [],
- zoneList: [
- {
- label: '注册专区',
- value: 1,
- name: 'regiest',
- children: [
- {
- label: '自营专区',
- value: 1,
- name: 'regiestArea',
- isShow: true,
- },
- {
- label: '乐学易考',
- value: 24,
- name: 'ezLearnReg',
- isShow: true,
- },
- ],
- },
- {
- label: '升级专区',
- value: 2,
- name: 'upgrade',
- children: [
- {
- label: '自营专区',
- value: 2,
- name: 'upgradeArea',
- isShow: true,
- },
- {
- label: '海粉专区',
- value: 27,
- name: 'haiFunUpd',
- isShow: true,
- },
- {
- label: '乐学易考',
- value: 25,
- name: 'ezLearnUp',
- isShow: true,
- },
- ],
- },
-
- {
- label: '复购专区',
- value: 3,
- name: 'repurchase',
- children: [
- {
- label: '自营专区',
- value: 3,
- name: 'self',
- isShow: true,
- },
- {
- label: '乐学易考',
- value: 26,
- name: 'ezLearnRep',
- isShow: true,
- },
- {
- label: '免费注册',
- value: 21,
- name: 'haiFans',
- isShow: true,
- },
-
- {
- label: '复购合作',
- value: 22,
- name: 'cooperation',
- isShow: true,
- },
- {
- label: '直播专区',
- value: 14,
- name: 'live',
- isShow: true,
- },
- {
- label: '工具流',
- value: 12,
- name: 'gongju',
- isShow: true,
- },
- ],
- },
- {
- label: '福利专区',
- value: 13,
- children: [],
- name: 'welfare',
- },
- {
- label: '积分专区',
- value: 11,
- children: [],
- name: 'integral',
- },
- {
- label: '重消专区',
- value: 10,
- children: [],
- name: 'rescission',
- },
- {
- label: '专供专区',
- value: 31,
- children: [],
- name: 'wolesaleArea',
- },
- {
- label: '续约专区',
- value: 30,
- children: [],
- name: 'renewalArea',
- },
- {
- label: '创客空间专区',
- value: 28,
- children: [],
- name: 'makerArea',
- },
- {
- label: '架构管理',
- value: 6,
- name: 'frame',
- children: [
- {
- label: '安置架构',
- value: 6,
- name: 'architecture',
- isShow: true,
- },
- {
- label: '推荐架构',
- value: 7,
- name: 'recommend',
- isShow: true,
- },
- ],
- },
- {
- label: '分享专区',
- value: 7,
- name: 'share',
- children: [
- {
- label: '海粉分享',
- value: 7,
- name: 'hiFans',
- isShow: true,
- },
- {
- label: '免费注册',
- value: 21,
- name: 'haiFans',
- isShow: true,
- },
- ],
- },
- {
- label: '创客礼包',
- value: 18,
- isShow: true,
- children: [
- {
- label: '创客礼包',
- value: 18,
- isShow: true,
- children: [],
- },
- {
- label: '赋能礼包',
- value: 19,
- isShow: true,
- children: [],
- },
- ],
- },
- ],
}
},
computed: {
- ...mapGetters(['priceSymbol', 'priceSymbolVisible']),
+ ...mapGetters(['priceSymbol', 'priceSymbolVisible', 'isZeroLevel']),
},
onLoad() {
if (
@@ -398,21 +177,20 @@ export default {
uni.getStorageSync('showInfo') == 0
) {
}
- this.getGoodsInfo()
- this.getAreaGoods()
+ this.getAreaGoods(this.isZeroLevel ? REISSUE_AREA.id : REGIEST_AREA.id)
// this.getLanguage();
// this.getService()
},
onShow() {
this.$store.dispatch('getCarLength')
},
- onPullDownRefresh() {
- let that = this
- setTimeout(() => {
- that.getGoodsInfo()
- uni.stopPullDownRefresh() //停止刷新
- }, 1000)
- },
+ // onPullDownRefresh() {
+ // let that = this
+ // setTimeout(() => {
+ // that.getGoodsInfo()
+ // uni.stopPullDownRefresh() //停止刷新
+ // }, 1000)
+ // },
methods: {
formatCurrency,
formatSales(value) {
@@ -447,12 +225,18 @@ export default {
}
})
},
- getAreaGoods() {
- getAreaGoods().then(res => {
- this.recommendSpecialAreaList = res.data?.recommendSpecialAreaList || []
+ getAreaGoods(areaId) {
+ getAreaGoods({
+ pageNum: 1,
+ pageSize: 3,
+ specialArea: areaId,
+ }).then(res => {
+ if (res.code == 200) {
+ this.goodsList = res.data || []
+ }
})
},
- toDel() {
+ confirmHandle() {
this.promptFlag = false
if (this.jumpPage == 1) {
uni.navigateTo({
@@ -534,9 +318,9 @@ export default {
}
},
getGoodsInfo() {
- apis.userIndex().then(res => {
- this.goodsList = res.data
- })
+ // apis.userIndex().then(res => {
+ // this.goodsList = res.data
+ // })
},
goUrl(item) {
@@ -580,58 +364,6 @@ export default {
}
}
},
- navTap(item) {
- let tapx = -1
- this.zoneList.forEach((items, index) => {
- if (items.value == item.specialArea) {
- tapx = index
- }
- })
- if (tapx == -1) {
- this.zoneList.forEach((items, index) => {
- items.children.forEach(ctem => {
- if (ctem.value == item.specialArea) {
- if (item.specialArea == 21) {
- uni.navigateTo({
- url:
- '/pages/specialArea/haIndex?label=' +
- item.specialAreaName +
- '&specialArea=21&diff=1',
- })
- } else {
- uni.navigateTo({
- url:
- '/pages/specialArea/list?label=' +
- items.label +
- '&specialArea=' +
- items.value +
- '&childArea=' +
- item.specialArea +
- '&children=' +
- JSON.stringify(items.children) +
- '&diff=1',
- })
- }
- }
- })
- })
- } else {
- if (item.specialArea == 30) {
- this.goAreaUrl()
- } else {
- uni.navigateTo({
- url:
- '/pages/specialArea/list?label=' +
- item.specialAreaName +
- '&specialArea=' +
- item.specialArea +
- '&children=' +
- JSON.stringify(this.zoneList[tapx].children) +
- '&diff=1',
- })
- }
- }
- },
goSpecialArea() {
uni.navigateTo({
url: '/pages/index/specialArea/index',
@@ -687,7 +419,7 @@ header {
width: 100%;
margin-top: 10rpx;
color: #333;
- font-size: 26rpx;
+ font-size: 32rpx;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
@@ -732,7 +464,7 @@ header {
display: flex;
flex: 1;
flex-direction: column;
- justify-content: flex-end;
+ justify-content: space-between;
.goods-sales {
font-size: 24rpx;
@@ -764,10 +496,6 @@ header {
}
}
-.goods-sort {
- padding-bottom: 130rpx;
-}
-
.swiper-s {
height: 495rpx;
}
diff --git a/pages/other/index.vue b/pages/other/index.vue
index 4a56ad0..76ff2c7 100644
--- a/pages/other/index.vue
+++ b/pages/other/index.vue
@@ -7,9 +7,9 @@
-
+
-
+
diff --git a/pages/shoppingCar/index.vue b/pages/shoppingCar/index.vue
index 8aefe34..521c4bc 100644
--- a/pages/shoppingCar/index.vue
+++ b/pages/shoppingCar/index.vue
@@ -181,6 +181,14 @@
@@ -133,12 +36,4 @@ export default {
// padding: 0 20rpx;
min-height: 94vh;
}
-
-.goods-sort {
- padding-bottom: 130rpx;
- .goods-flexs {
- padding: 30rpx 20rpx 20rpx;
- position: relative;
- }
-}
diff --git a/store/getters.js b/store/getters.js
index a45d7bc..9dde4f5 100644
--- a/store/getters.js
+++ b/store/getters.js
@@ -1,9 +1,5 @@
-/*
- * @Descripttion:
- * @version:
- * @Author: kBank
- * @Date: 2022-10-24 10:45:39
- */
+import { MEMBER_SIGN } from '@/util/common'
+
const getters = {
shopCarLength: state => state.user.shopCarLength,
smallCarLength: state => state.user.smallCarLength,
@@ -11,5 +7,6 @@ const getters = {
priceSymbol: state => state.system.priceSymbol,
priceDecimal: state => state.system.priceDecimal,
priceSymbolVisible: state => state.system.priceSymbolVisible,
+ isZeroLevel: state => state.user?.user?.memberSign === MEMBER_SIGN.ZERO_LEVEL,
}
export default getters
diff --git a/util/common.js b/util/common.js
new file mode 100644
index 0000000..1164c20
--- /dev/null
+++ b/util/common.js
@@ -0,0 +1,10 @@
+// 会员标记(0=正常会员，1=V日会员，2=V5会员)
+// 正常会员:指V1以上，可以查看所有功能
+// VO会员:指V日级别，只有会员专区
+// V5会员:指V5级别，只有V5显示市场动态等
+
+export const MEMBER_SIGN = {
+ ZERO_LEVEL: 1,
+ NORMAL_LEVEL: 0,
+ V5_LEVEL: 2,
+}