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:
183
pro_v3.5.1_副本/view/uniapp/pages/behalf/cashier/index.vue
Normal file
183
pro_v3.5.1_副本/view/uniapp/pages/behalf/cashier/index.vue
Normal file
@@ -0,0 +1,183 @@
|
||||
<template>
|
||||
<view>
|
||||
<view class="flex-col flex-center py-80">
|
||||
<baseMoney :money="payPriceShow" symbolSize="48" integerSize="64" decimalSize="48" color="#333" weight></baseMoney>
|
||||
<view class="flex-y-center mt-20">
|
||||
<text class="fs-24 text--w111-333 lh-36rpx pr-10">支付剩余时间</text>
|
||||
<countDown
|
||||
:is-day="false"
|
||||
tip-text=" "
|
||||
day-text=" "
|
||||
hour-text=":"
|
||||
minute-text=":"
|
||||
second-text=" "
|
||||
bgColor="#FFFFFF"
|
||||
colors="#FF7E00"
|
||||
dotColor="#FF7E00"
|
||||
:datatime="invalidTime"></countDown>
|
||||
</view>
|
||||
</view>
|
||||
<view class="px-20">
|
||||
<view class="bg--w111-fff rd-24rpx px-24">
|
||||
<view class="pt-60 flex-center fs-30 lh-42rpx fw-500">
|
||||
<text>方式一:</text>
|
||||
<view class="flex-y-center pl-30" @tap="checkType('weixin')">
|
||||
<text class="iconfont" :class="paytype == 'weixin' ? 'icon-ic_Selected' : 'icon-ic_unselect'"></text>
|
||||
<text class="pl-10">微信扫码</text>
|
||||
</view>
|
||||
<view class="flex-y-center ml-50" @tap="checkType('alipay')">
|
||||
<text class="iconfont" :class="paytype == 'alipay' ? 'icon-ic_Selected' : 'icon-ic_unselect'"></text>
|
||||
<text class="pl-10">支付宝扫码</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex-center mt-40 pb-50 border-b" v-show="config.code">
|
||||
<w-qrcode :options="config"></w-qrcode>
|
||||
</view>
|
||||
<view class="pt-50 flex-center fs-30 lh-42rpx fw-500">方式二:用户进入商城支付订单</view>
|
||||
<view class="py-60 flex-center">
|
||||
<image class="guide" :src="imgHost + '/statics/images/pay_guide.png'"></image>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="h-200"></view>
|
||||
<view class="fixed-lb w-full pb-safe">
|
||||
<view class="w-full h-128 flex-center">
|
||||
<view class="w-710 h-80 flex-center rd-40rpx fs-28 bg-primary text--w111-fff" @tap="backPage">返回</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import countDown from '@/components/countDown';
|
||||
import { getCashierApi, getPayStatusApi } from "@/api/admin.js";
|
||||
import {HTTP_REQUEST_URL} from '@/config/app';
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
imgHost:HTTP_REQUEST_URL,
|
||||
payPriceShow:0,
|
||||
invalidTime:0,
|
||||
orderId: '',
|
||||
paytype:'weixin',
|
||||
userId:0,
|
||||
qrcode:'',
|
||||
config: {
|
||||
code: '',
|
||||
size: 280, // 二维码大小
|
||||
level: 3, //等级 0~4
|
||||
bgColor: '#FFFFFF',
|
||||
color: ['#333', '#333'], //边框颜色支持渐变色
|
||||
},
|
||||
timer: null
|
||||
}
|
||||
},
|
||||
components: {
|
||||
countDown,
|
||||
},
|
||||
onLoad(options) {
|
||||
this.userId = options.uid || 0;
|
||||
if (options.order_id) {
|
||||
this.orderId = options.order_id;
|
||||
this.getCashierOrder();
|
||||
}
|
||||
|
||||
},
|
||||
onUnload() {
|
||||
this.stopSetInterval();
|
||||
},
|
||||
methods: {
|
||||
getCashierOrder(){
|
||||
let data = {
|
||||
uni: this.orderId,
|
||||
paytype: this.paytype,
|
||||
quitUrl: '/pages/behalf/cashier/index'
|
||||
};
|
||||
getCashierApi(this.userId,data).then(res=>{
|
||||
if(res.data.status == 'SUCCESS'){
|
||||
return this.$util.Tips({
|
||||
title: '支付成功'
|
||||
}, {
|
||||
tab: 5,
|
||||
url: '/pages/behalf/record/index'
|
||||
});
|
||||
}
|
||||
this.payPriceShow = res.data.result.pay_price;
|
||||
this.invalidTime = res.data.result.jsConfig.invalid;
|
||||
this.config.code = this.paytype == 'weixin' ? res.data.result.jsConfig.code_url : res.data.result.jsConfig.qrCode;
|
||||
this.createSetInterval(res.data.result.order_id);
|
||||
}).catch(err=>{
|
||||
return this.$util.Tips({
|
||||
title: err
|
||||
})
|
||||
})
|
||||
},
|
||||
checkType(val){
|
||||
this.paytype = val;
|
||||
this.getCashierOrder();
|
||||
},
|
||||
createSetInterval(order_id) {
|
||||
this.stopSetInterval();
|
||||
this.timer = setInterval(() => {
|
||||
this.getOrderResult(order_id);
|
||||
}, 2000);
|
||||
},
|
||||
stopSetInterval() {
|
||||
if (this.timer) {
|
||||
clearInterval(this.timer);
|
||||
this.timer = null;
|
||||
}
|
||||
},
|
||||
getOrderResult(id){
|
||||
//接口响应成功以后销毁定时器
|
||||
getPayStatusApi({
|
||||
order_id:id,
|
||||
end_time:this.invalidTime
|
||||
}).then(res=>{
|
||||
if(res.data.time == 0){
|
||||
this.stopSetInterval();
|
||||
this.getCashierOrder();
|
||||
}
|
||||
if(res.data.status || res.data.time == 0){
|
||||
this.stopSetInterval();
|
||||
uni.reLaunch({
|
||||
url:'/pages/behalf/record/index'
|
||||
})
|
||||
}
|
||||
}).catch(err=>{
|
||||
return this.$util.Tips({
|
||||
title: err
|
||||
})
|
||||
})
|
||||
},
|
||||
backPage(){
|
||||
uni.reLaunch({
|
||||
url:'/pages/admin/work/index'
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
/deep/ .styleAll{
|
||||
padding: 0 6rpx;
|
||||
border: 1rpx solid #DDDDDD;
|
||||
border-radius: 8rpx;
|
||||
font-family: Regular;
|
||||
line-height: 40rpx;
|
||||
}
|
||||
.border-b{
|
||||
border-bottom: 1px dashed #ccc;
|
||||
}
|
||||
.icon-ic_Selected{
|
||||
color: $primary-admin;
|
||||
}
|
||||
.bg-primary{
|
||||
background-color: $primary-admin;
|
||||
}
|
||||
.guide{
|
||||
width: 570rpx;
|
||||
height: 214rpx;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user