diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..6806e47
Binary files /dev/null and b/dist.zip differ
diff --git a/src/view/commodity.vue b/src/view/commodity.vue
index 62d793a..e4475da 100644
--- a/src/view/commodity.vue
+++ b/src/view/commodity.vue
@@ -75,7 +75,6 @@ const value = ref(2)
const tableClick = (e) => {
if (e.ceil) {
if (e.columnIndex == 1) {
-
let tag = document.getElementById(`zmj${e.rowIndex}`)
let tag2 = document.getElementById(`lj${e.rowIndex}`)
tag.style.display = 'none'
@@ -104,6 +103,7 @@ const num = (n) => {
const ShwostoreType = ref(true)
const a = (aaa, data, flag) => {
if (flag) {
+ console.log(data,'data')
data.forEach((item, i) => {
if (i % 2 == 0) {
@@ -123,7 +123,6 @@ const a = (aaa, data, flag) => {
`
-
@@ -317,7 +317,6 @@ const foundIcon = (te) => {
}
-// console.log(foundIcon('订单收入总金额'))
@@ -326,15 +325,19 @@ const foundIcon = (te) => {
const changeTable = (type, num) => {
if (type == 0) {
+ configs.data.splice(0, configs.data.length)
configs.data.splice(0, configs.data.length)
withdraw_listApi(
{
...areaStore.area,
+
limit: 50,
}
).then(res => {
addDta(res.data.list)
+
})
+
}
if (type == 1) {
configs1.data.splice(0, configs1.data.length)
@@ -346,7 +349,6 @@ const changeTable = (type, num) => {
}
).then(res => {
addDta(res.data.list)
- // addDta(testList)
})
}
@@ -370,8 +372,8 @@ const changeTable = (type, num) => {
}
const hdClick = (e) => {
- if (e.columnIndex == 10) {
- }
+
+ alert(45)
}
@@ -385,51 +387,37 @@ const extractTypeFn = (type) => {
const statusFn = (type) => {
if (type == -1) return "未通过"
if (type == 0) return "审核中"
- if (type == 1) return "已提现"
+ if (type == 1) return "审核通过"
}
const addDta = (data) => {
-
data.reverse().forEach((item, i) => {
if (headerIndex.value == 0) {
if (i % 2 == 0) {
configs.data.push(
-
[
`
${i + 1}
`,
- `
-
-
`,
- `
${item.real_name}
`,
- `
${item.uid}
`,
- `
${item.real_name}
`,
- `
${item.extract_price}
`,
- `
${extractTypeFn(item.extract_type)}
`,
- `
${"--"}
`,
- `
${item.bank_code}
`,
+ `
${item.merchant?.is_trader?"自营":"非自营"}
`,
+ `
${item.merchant?.mer_name}
`,
+ `
${item.create_time}
`,
+ `
${item.extract_money}
`,
+ `
${'银行'}
`,
`
${statusFn(item.status)}
`,
- `
${item.fail_msg || '--'}
`,
- `
${item.create_time || '--'}
`,
+ `
${item.financial_status?"已到账":"未到账"}
`,
],
)
} else {
configs.data.push(
- [`
${item.uid}
`,
- `
-
-
`,
- `
${item.real_name}
`,
- `
${item.uid}
`,
- `
${item.real_name}
`,
- `
${item.extract_price}
`,
- `
${extractTypeFn(item.extract_type)}
`,
- `
${"--"}
`,
- `
${item.bank_code}
`,
- `
${statusFn(item.status)}
`,
- `
${item.fail_msg || '--'}
`,
- `
${item.create_time || '--'}
`,
-
+ [
+ `
${i + 1}
`,
+ `
${item.merchant?.is_trader?"自营":"非自营"}
`,
+ `
${item.merchant?.mer_name}
`,
+ `
${item.create_time}
`,
+ `
${item.extract_money}
`,
+ `
${'银行'}
`,
+ `
${statusFn(item.status)}
`,
+ `
${item.financial_status?"已到账":"未到账"}
`,
]
)
}
@@ -498,7 +486,7 @@ const addDta = (data) => {
})
-
+console.log(configs)
}
@@ -542,7 +530,7 @@ const configs2 = reactive({
const headerIndex = ref(0)
const configList = reactive([configs, configs1, configs2])
const headerList = [
- ['序号', '二维码', '用户信息', '用户UID', '户名', '提现金额', '提现方式', '银行名称', '账号', '审核状态', '拒绝原因', '添加时间'],
+ ['序号', '商户类别', '商户名称', '申请时间', '转账金额(元)', '收款方式', '审核状态', '到账状态', ],
['会员ID', '昵称', '金额', '明细类型', '备注', '创建时间'],
['序号', '日期', '账期内收入', '账期内支出', '平台入账金额', '操作'],
@@ -569,7 +557,6 @@ const detailData = reactive({})
const hdClick3 = (e) => {
if (e.columnIndex == 5) {
-
if (billType.value == 1) {
financial_record_detailApi(
{ ...areaStore.area, date: billData[e.rowIndex].time }