diff --git a/.env.development b/.env.development index e9dfee0..fa98f0d 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ - VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' + # VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' # 测试环境 # VITE_API_BASE='http://54.255.212.181:10704/' # 正式环境 @@ -11,6 +11,6 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload # zhangyong # VITE_API_BASE='http://192.168.3.83:8081/' # 本地 -#VITE_API_BASE='http://localhost:8081/' +VITE_API_BASE='http://localhost:8081/' # sunjiabei # VITE_API_BASE='http://192.168.1.70:8081/' \ No newline at end of file diff --git a/src/components/MoneyManage/ProductSelect.vue b/src/components/MoneyManage/ProductSelect.vue index 21e1ea4..4198fc4 100644 --- a/src/components/MoneyManage/ProductSelect.vue +++ b/src/components/MoneyManage/ProductSelect.vue @@ -38,8 +38,17 @@
+
软件
- +
+
+ {{ menu.name }} + + + +
+
+
AI机构探测神器
@@ -77,6 +86,7 @@ import { ref, watch, onMounted } from 'vue'; import { ArrowDown } from '@element-plus/icons-vue'; + const searchData = ref('') const isOpen = ref(false) const coinisOpen = ref(false) @@ -113,7 +123,20 @@ const selectedValue = ref([]) const AIProduct = ['AI机构追踪', 'AI机构出击 ', 'AI机构资金', 'AI机活跃度'] const superProduct = ['超级机构透视', '超级机构伏击 ', '超级机构猎杀', '超级机构脉搏', '超级机构罗盘'] const InfoFee = ['静态信息费'] - +const menuData = [ + { + name: '美股', + options: ['美服软件', '美服金卡', '美服套餐'] + }, + { + name: '新加坡股', + options: ['新加坡软件', '新加坡服务'] + }, + { + name: '韩股', + options: ['韩服工具', '韩服会员'] + } +]; // 监听金币充值选中状态变化 watch(isCoinRechargeChecked, (newVal) => { if (newVal) { @@ -138,6 +161,11 @@ watch(selectedSoftwareItems, (newVals) => { selectedItem.value = selectedValue.value[0] || ''; }); +//软件相关 +const activeIndex = ref(false) +const clickmenu = (index) => { + +} onMounted(() => { const initValue = props.modelValue; if (initValue.length === 0) return; @@ -263,23 +291,21 @@ onMounted(() => { border-top: 1px solid #7E91FF; } + .checktxt { + color: #5870ff; + font-family: "PingFang SC"; + font-size: 13px; + font-style: normal; + font-weight: 700; + line-height: 22px; + margin: 10px 20px; + } + .productOption { width: 100%; .ai { width: 100%; - - .checktxt { - color: #5870ff; - font-family: "PingFang SC"; - font-size: 13px; - font-style: normal; - font-weight: 700; - line-height: 22px; - margin: 10px 20px; - } - - } } } diff --git a/src/views/moneyManage/receiveDetail/receiveDetail.vue b/src/views/moneyManage/receiveDetail/receiveDetail.vue index 9d821eb..37fa314 100644 --- a/src/views/moneyManage/receiveDetail/receiveDetail.vue +++ b/src/views/moneyManage/receiveDetail/receiveDetail.vue @@ -5,33 +5,34 @@
精网号 - +
客户姓名 - +
所属地区 - +
订单状态 - +
支付方式 - +
活动名称 - +
产品名称 - +
付款时间 @@ -43,7 +44,7 @@
- 查询 + 查询 重置 导出excel 导出列表 @@ -95,32 +96,32 @@ - - - + + + - + - - + - + - + - - + + - - @@ -220,7 +221,7 @@ - +
@@ -240,7 +241,8 @@ - + @@ -447,6 +449,46 @@ import { color } from 'echarts'; import { template } from 'lodash'; import CurrencySelect from '@/components/MoneyManage/CurrencySelect.vue' import ProductSelect from '@/components/MoneyManage/ProductSelect.vue' +import { Search } from '@element-plus/icons-vue'; +import request from '@/util/http.js' + +//===================== 查询相关 ================================= +const tableData = ref([]) +const searchData = ref({ + +}) + +const getTime = ref({ + startTime:'', + endTime:'' +}) + +const search = ()=>{ + getlist() +} + +//获得表格数据接口 +const getlist = async () => { + try { + const result = await request({ + url: '/cashCollection/selectCollection', + data: { + ...pageInfo.value, + cashCollection: { + ...searchData.value, + ...getTime.value + } + } + }) + + console.log('返回参数：',result); + tableData.value = result.list + ElMessage.success('查询成功') + } catch(error) { + console.log(error); + + } +} //==================== 标签切换 ========================= const activeTab = ref('wait') @@ -503,7 +545,7 @@ const customOptions = ref(['新币', '马币', '港币', '美元', '英镑', ' //支付方式 const paytypeOptions = ref(["银行转账", "刷卡", "现金", "支票", "Grabpay", "Nets", "E-Transfer", "Paypal", "Stripe-链接收款", "PaymentAsia-链接收款", "Ipay88-链接收款"]) -const MoneyAddressOptions = ref(['马来西亚','香港','新加坡']) +const MoneyAddressOptions = ref(['马来西亚', '香港', '新加坡']) const handleCurrencyChange = (option) => { console.log('选中的币种:', option); }; @@ -675,152 +717,7 @@ const handleMouseMove = (e) => { // Y坐标与鼠标保持一致（垂直居中对齐） tooltipTop.value = e.clientY - 10; }; -const tableData = [ - { - "jwcode": "HM20240601", - "name": "张三", - "market": "华东区", - "activity": "2024年中促销", - "rateName": "年度会员套餐A", - "moneyType": "人民币", - "permanentGold": 2980.00, - "getMoneyType": "人民币", - "getMoney": 2980.00, - "shouxufei": 59.60, - "pastType": "支付宝转账", - "remark": "2024-06-01 09:30", - "voucher": "https://mock-img.com/voucher/2024060101.jpg", - "payModel": "https://mock-img.com/icon/alipay.png", - "bankOrder": "ALIPAY202406010001", - "submiter": "李四（运营部）", - "auditor": "王五（财务部）", - "mask": "客户主动购买，无特殊需求", - "rejectTime": null, - "rejectReason": null, - "getMoneyTime": "2024-06-01 10:15", - "orderStatus": "已撤回" - }, - { - "jwcode": "HM20240602", - "name": "李四", - "market": "华北区", - "activity": "新客首单优惠", - "rateName": "季度体验套餐B", - "moneyType": "美元", - "permanentGold": 99.00, - "getMoneyType": "人民币", - "getMoney": 712.50, - "shouxufei": 14.25, - "pastType": "PayPal", - "remark": "2024-06-02 14:15", - "voucher": "https://mock-img.com/voucher/2024060201.jpg", - "payModel": "https://mock-img.com/icon/paypal.png", - "bankOrder": "PAYPAL202406020001", - "submiter": "赵六（国际部）", - "auditor": "孙七（财务部）", - "mask": "跨境支付，汇率按当日中间价计算", - "rejectTime": null, - "rejectReason": null, - "getMoneyTime": "2024-06-02 16:40", - "orderStatus": "已通过" - }, - { - "jwcode": "HM20240603", - "name": "王五", - "market": "华南区", - "activity": "老客召回活动", - "rateName": "月度续费套餐C", - "moneyType": "人民币", - "permanentGold": 399.00, - "getMoneyType": null, - "getMoney": null, - "shouxufei": null, - "pastType": "微信支付", - "remark": "2024-06-03 11:20", - "voucher": "https://mock-img.com/voucher/2024060301.jpg", - "payModel": "https://mock-img.com/icon/wechat.png", - "bankOrder": null, - "submiter": "钱八（客服部）", - "auditor": null, - "mask": "待财务补充到账信息", - "rejectTime": null, - "rejectReason": null, - "getMoneyTime": null, - "orderStatus": "待审核" - }, - { - "jwcode": "HM20240604", - "name": "赵六", - "market": "西区", - "activity": "企业团购活动", - "rateName": "企业定制套餐D", - "moneyType": "人民币", - "permanentGold": 15800.00, - "getMoneyType": null, - "getMoney": null, - "shouxufei": null, - "pastType": "银行对公转账", - "remark": "2024-06-04 09:05", - "voucher": null, - "payModel": null, - "bankOrder": null, - "submiter": "周九（销售部）", - "auditor": "吴十（财务部）", - "mask": null, - "rejectTime": "2024-06-04 10:30", - "rejectReason": "未上传转账凭证，需补充后重新提交", - "getMoneyTime": null, - "orderStatus": "已驳回" - }, - { - "jwcode": "HM20240605", - "name": "孙七", - "market": "东北区", - "activity": "节日特惠活动", - "rateName": "年度会员套餐A", - "moneyType": "人民币", - "permanentGold": 2780.00, - "getMoneyType": "人民币", - "getMoney": 2780.00, - "shouxufei": 55.60, - "pastType": "银联支付", - "remark": "2024-06-05 15:40", - "voucher": "https://mock-img.com/voucher/2024060501.jpg", - "payModel": "https://mock-img.com/icon/unionpay.png", - "bankOrder": "UNION202406050001", - "submiter": "郑一（市场部）", - "auditor": "王二（财务部）", - "mask": "客户使用节日优惠券，已核减200元", - "rejectTime": null, - "rejectReason": null, - "getMoneyTime": "2024-06-05 16:25", - "orderStatus": "已通过" - }, - { - "jwcode": "HM20240606", - "name": "周八", - "market": "华北区", - "activity": "新客首单优惠", - "rateName": "季度体验套餐B", - "moneyType": "人民币", - "permanentGold": 359.00, - "getMoneyType": null, - "getMoney": null, - "shouxufei": null, - "pastType": "微信支付", - "remark": "2024-06-06 13:10", - "voucher": "https://mock-img.com/voucher/2024060601.jpg", - "payModel": "https://mock-img.com/icon/wechat.png", - "bankOrder": null, - "submiter": "吴九（客服部）", - "auditor": "郑十（财务部）", - "mask": null, - "rejectTime": "2024-06-06 14:00", - "rejectReason": "付款金额与订单金额不符（订单359元，实付349元）", - "getMoneyTime": null, - "orderStatus": "已驳回" - } -] +