feat(fsgx): 完成全部24项开发任务 Phase1-7
Phase1 后端核心：
- 新增 fsgx_v1.sql 迁移脚本（is_queue_goods/frozen_points/available_points/no_assess）
- SystemConfigServices 返佣设置扩展（周期人数/分档比例/范围/时机）
- StoreOrderCreateServices 周期循环佣金计算
- StoreOrderTakeServices 佣金发放后同步冻结积分
- StoreProductServices/StoreProduct 保存 is_queue_goods
Phase2 后端接口：
- GET /api/hjf/brokerage/progress 佣金周期进度
- GET /api/hjf/assets/overview 资产总览
- HjfPointsServices 每日 frozen_points 0.4‰ 释放定时任务
- PUT /adminapi/hjf/member/{uid}/no_assess 不考核接口
- GET /adminapi/hjf/points/release_log 积分日志接口
Phase3 前端清理：
- hjfCustom.js 路由精简（仅保留 points/log）
- hjfQueue.js/hjfMember.js API 清理/重定向至 CRMEB 原生接口
- pages.json 公排→推荐佣金/佣金记录/佣金规则
Phase4-5 前端改造：
- queue/status.vue 推荐佣金进度页整体重写
- 商品详情/订单确认/支付结果页文案与逻辑改造
- 个人中心/资产页/引导页/规则页文案改造
- HjfQueueProgress/HjfRefundNotice/HjfAssetCard 组件改造
- 推广中心嵌入佣金进度摘要
- hjfMockData.js 全量更新（公排字段→佣金字段）
Phase6 Admin 增强：
- 用户列表新增 frozen_points/available_points 列及不考核操作按钮
- hjfPoints.js USE_MOCK=false 对接真实积分日志接口
Phase7 配置文档：
- docs/fsgx-phase7-config-checklist.md 后台配置与全链路验收清单
Made-with: Cursor
This commit is contained in:
apple
659
pro_v3.5.1_副本/view/uniapp/pages/goods/lottery/grids/index.vue
Normal file
659
pro_v3.5.1_副本/view/uniapp/pages/goods/lottery/grids/index.vue
Normal file
File diff suppressed because one or more lines are too long
180
pro_v3.5.1_副本/view/uniapp/pages/goods/lottery/grids/record.vue
Normal file
180
pro_v3.5.1_副本/view/uniapp/pages/goods/lottery/grids/record.vue
Normal file
@@ -0,0 +1,180 @@
|
||||
<template>
|
||||
<view :style="colorStyle">
|
||||
<view class="px-20 mt-32">
|
||||
<view class="bg--w111-fff rd-24rpx p-24 flex-between-center item"
|
||||
v-for="item in lotteryList" :key="item.id">
|
||||
<easy-loadimage
|
||||
:image-src="item.prize.image"
|
||||
width="136rpx"
|
||||
height="136rpx"
|
||||
borderRadius="16rpx"></easy-loadimage>
|
||||
<view class="flex-1 pl-24 h-136 flex-between-center">
|
||||
<view class="w-328 h-136 flex-col justify-between">
|
||||
<view class="w-full h-80 line2">
|
||||
<text class="label" :class="'label' + item.prize.type">{{item.prize.type | typeName}}</text>
|
||||
<text class="name">{{item.prize.name}}</text>
|
||||
</view>
|
||||
<view class="fs-22 text--w111-999">兑换时间:{{item.receive_time || '--'}}</view>
|
||||
</view>
|
||||
<view class="w-120 h-56 rd-30rpx flex-center fs-24 bg-gradient text--w111-fff"
|
||||
@tap="goDetail(item)" v-if="item.type == 4">{{item.type ==4 && item.wechat_state == 'WAIT_USER_CONFIRM' ? '去领取' : '已领取'}}</view>
|
||||
<view class="w-120 h-56 rd-30rpx flex-center fs-24 bg-gradient text--w111-fff"
|
||||
@tap="goDetail(item)" v-else>{{item.is_receive == 0 && item.type == 6 ? '去领取' : '去查看'}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="px-20 mt-20" v-if="lotteryList.length === 0 && !loading">
|
||||
<emptyPage title="暂无中奖记录～" src="/statics/images/noOrder.gif"></emptyPage>
|
||||
</view>
|
||||
<home></home>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {getLotteryList} from '@/api/lottery.js';
|
||||
import { postCartAdd } from '@/api/store.js';
|
||||
import emptyPage from '@/components/emptyPage.vue'
|
||||
import colors from '@/mixins/color.js';
|
||||
export default {
|
||||
components: {
|
||||
emptyPage
|
||||
},
|
||||
mixins:[colors],
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
where: {
|
||||
page: 1,
|
||||
limit: 20,
|
||||
},
|
||||
lotteryList: [],
|
||||
loadTitle: ''
|
||||
}
|
||||
},
|
||||
onShow() {
|
||||
this.lotteryList = [];
|
||||
this.where.page = 1;
|
||||
this.loading = false;
|
||||
this.loadend = false;
|
||||
this.getLotteryList()
|
||||
},
|
||||
filters: {
|
||||
typeName(type) {
|
||||
if (type == 2) {
|
||||
return '积分'
|
||||
} else if (type == 3) {
|
||||
return '余额'
|
||||
} else if (type == 4) {
|
||||
return '红包'
|
||||
} else if (type == 5) {
|
||||
return '优惠券'
|
||||
} else if (type == 6) {
|
||||
return '商品'
|
||||
}
|
||||
}
|
||||
},
|
||||
onPageScroll(object) {
|
||||
uni.$emit('scroll');
|
||||
},
|
||||
methods: {
|
||||
getLotteryList() {
|
||||
if (this.loadend) return;
|
||||
if (this.loading) return;
|
||||
this.loading = true;
|
||||
this.loadTitle = '';
|
||||
getLotteryList(this.where).then(res => {
|
||||
let list = res.data;
|
||||
let lotteryList = this.$util.SplitArray(list, this.lotteryList);
|
||||
let loadend = list.length < this.where.limit;
|
||||
this.loadend = loadend;
|
||||
this.loading = false;
|
||||
this.loadTitle = loadend ? '没有更多内容啦~' : '加载更多';
|
||||
this.$set(this, 'lotteryList', lotteryList);
|
||||
this.$set(this.where, 'page', this.where.page + 1);
|
||||
}).catch(err => {
|
||||
that.loading = false;
|
||||
that.loadTitle = '加载更多';
|
||||
});
|
||||
},
|
||||
goDetail(item){
|
||||
let type = item.type;
|
||||
if (type == 2) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/user_integral/index'
|
||||
})
|
||||
} else if (type == 3) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/user_money/index'
|
||||
})
|
||||
} else if (type == 4) {
|
||||
if(item.wechat_state == 'WAIT_USER_CONFIRM'){
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/user_spread_money/receiving?type=2&id=' + item.order_id
|
||||
})
|
||||
}
|
||||
} else if (type == 5) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/user_coupon/index'
|
||||
})
|
||||
} else if (type == 6) {
|
||||
if(item.oid > 0){
|
||||
uni.navigateTo({
|
||||
url: `/pages/goods/order_details/index?order_id=${item.oid}`
|
||||
})
|
||||
}else{
|
||||
postCartAdd({
|
||||
cartNum: 1,
|
||||
new: 1,
|
||||
is_new: 1,
|
||||
productId: item.prize.product_id,
|
||||
uniqueId: item.prize.unique,
|
||||
luckRecordId: item.id,
|
||||
}).then(res => {
|
||||
uni.navigateTo({
|
||||
url: `/pages/goods/order_confirm/index?new=1&luckRecordId=${item.id}&cartId=${res.data.cartId}`
|
||||
});
|
||||
}).catch(err => {
|
||||
this.$util.Tips({
|
||||
title: `${err},请联系客服`
|
||||
});
|
||||
});;
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
onReachBottom() {
|
||||
this.getLotteryList();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.item ~ .item{
|
||||
margin-top: 20rpx;
|
||||
}
|
||||
.item{
|
||||
.name {
|
||||
width: 328rpx;
|
||||
height: 80rpx;
|
||||
line-height: 40rpx;
|
||||
color: #333;
|
||||
font-weight: 500;
|
||||
font-size: 28rpx;
|
||||
}
|
||||
.label {
|
||||
padding: 0 6rpx;
|
||||
font-size: 20rpx;
|
||||
margin-right: 16rpx;
|
||||
border-radius: 6rpx;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.label2, .label3, .label5{
|
||||
border: 1rpx solid #FF7D00;
|
||||
color: #FF7D00;
|
||||
}
|
||||
.label4, .label6{
|
||||
border: 1rpx solid var(--view-theme);
|
||||
color: var(--view-theme);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user