This commit is contained in:
zmj 2024-05-14 18:44:55 +08:00
parent 8c1858b2c2
commit 36dcd802cc
6 changed files with 97 additions and 48 deletions

View File

@ -2,16 +2,27 @@ import request from '@/utils/request';
//报价单列表
export const bindCradApi = (data) => {
return request.post('/merchant/merchant/add_bank', data);
return request.post('/user/userbank/add_bank', data);
}
//报价单提交
export const bankListApi = (data) => {
return request.get('/bank/bank/lists', data);
}
export const amountAccountApi = (data) => {
return request.get('/user/UserWithdraw/amount_account', data);
}
// //报价单提交
// export const aboutUsApi = (data) => {
// return request.post('/operation/OpurchaseGoodsOffer/offer', data);
// }
export const UserWithdrawApi = (data) => {
return request.post('/user/UserWithdraw/withdraw', data);
}
export const UserWithdrawIndexApi = (data) => {
return request.get('/user/UserWithdraw/index', data);
}
export const UserWithdrawListsApi = (data) => {
return request.get('/user/UserWithdraw/lists', data);
}

View File

@ -14,7 +14,7 @@ switch (env) {
BASE_URL = 'https://ceshi-erp.lihaink.cn';
break;
default:
BASE_URL = 'http://192.168.1.16:8546';
BASE_URL = 'http://192.168.1.21:8546';
}
let HTTP_REQUEST_URL

View File

@ -110,9 +110,9 @@
const form = reactive({
"name": "赵明军",
"bank_id": 1,
"bank_name": '中国邮政',
"bank_code": "62179967580064578451",
"bank_branch": "迎晖路支行",
"bank_name": '中国见识过和',
"bank_code": "6213362109985515778",
"bank_branch": "支行",
"financial_img": "",
"is_own": 0,
phone: '19130550023',
@ -122,7 +122,6 @@
user_type: userStore?.userInfo?.merchant?.mer_id ? '1' : '2'
})
console.log(userStore?.userInfo)
const submit = () => {
bindCradApi({

View File

@ -4,13 +4,13 @@
<view class="head_conent">
<view class="sum">
<view class="text">已提现金额</view>
<u-count-to class="num" style="color: #F84221;" :startVal="0" :endVal="sumTofixed" :decimals="2"
bold font-size="22"></u-count-to>
<u-count-to class="num" style="color: #F84221;" :startVal="0" :endVal="total" :decimals="2" bold
font-size="22"></u-count-to>
</view>
<view class="line"></view>
<view class="sum">
<view class="text">已提现次数</view>
<u-count-to class="num" :startVal="0" :endVal="all_count" bold font-size="22"></u-count-to>
<u-count-to class="num" :startVal="0" :endVal="count" bold font-size="22"></u-count-to>
</view>
</view>
</view>
@ -19,36 +19,25 @@
<text>2024-4-7</text>-<text>2024-4-7</text>
</view>
<view class="recoder">
<view class="card" v-for="(item,index) in 10" :key="index">
<view class="card" v-for="(item,index) in lists" :key="index">
<view class="right">
<view class="item" style="justify-content: flex-start;">
<text class="rest">余额提现至</text>
<!-- <text class="code">({item.financial_account.bank_code})</text> -->
<text class="code">({item})</text>
<text class="withdraw-type legal_company">{{"对公"}}</text>
<text class="code">{{item.merchant_bank_info.bank_code}}</text>
<text class="withdraw-type legal_company">{{ item.merchant_bank_info.is_own?"对公" :"个人"}}</text>
</view>
<view class="item">
<view class="item_title">
<!-- <text>{`${item.financial_account.bank}`}</text> -->
<text>{`${item}`}</text>
<text>{{item.merchant_bank_info.bank_info.name }}</text>
</view>
<!-- <view class="item_money">+{item.extract_money}</view> -->
<view class="item_money">+{ite}</view>
<view class="item_money">+{{item.amount}}</view>
</view>
<view class="item">
<view class="item-time">{item.create_time}</view>
<view class="item_status audit" v-if="item.status == 0||true">待审核</view>
<!-- <view class="item_status trans" v-if="item.status == 1 && (!item.image || item.length> 0)">待转账
</view>
<view class="item_status done" v-if="item.status == 1 && item.image && item.image.length > 0"
@click="handleView(item)">
已转账
<u-icon name="arrow-right" color="#46B03A"></u-icon>
</view>
<view class="item_status lose" v-if="item.status == -1">审核不通过</view> -->
<view class="item-time">{{item.create_time}}</view>
{{item.is_check==1?'审核通过':item.is_check==2?"审核不通过":"待审核" }}
</view>
</view>
<view class="remark" v-if="item.mark||true">{item.mark}</view>
<view class="remark" v-if="item.fail_msg">{{item.fail_msg}}</view>
</view>
</view>
@ -68,6 +57,31 @@
ref,
reactive
} from "vue"
import {
UserWithdrawListsApi,
UserWithdrawIndexApi
} from "@/api/balance.js"
const count = ref(0)
const total = ref(0)
const getInfo = async () => {
let res = await UserWithdrawIndexApi()
count.value = res.data.count
total.value = res.data.total
}
getInfo()
const lists = ref([])
const getList = async () => {
let res = await UserWithdrawListsApi({
create_time: '2024-05 '
})
lists.value = res.data.lists
console.log(res)
}
getList()
const nowDate = new Date()
// cconst

View File

@ -5,7 +5,7 @@
账户总余额()
</view>
<view style="font-size: 36rpx;">
1860.00
{{balance}}
</view>
</view>
<view class="action">
@ -13,32 +13,31 @@
提现至
</view>
<view style="font-weight: bold;">
请选择提现账户
{{target_bank.is_own?'对公账户':"个人账户"}}
</view>
<view style="display: flex;align-items: center;color: #20B128;"
@click="navgo('/pageQuota/Balance/bindAccout')">
<text>绑定账户</text> <up-icon color="#20B128" name="arrow-right"></up-icon>
<text>更换账户</text> <up-icon color="#20B128" name="arrow-right"></up-icon>
</view>
</view>
<view class="form" v-if='true'>
<up-form labelPosition="left" borderBottom :label-style="{fontSize:'30rpx'}" :model="model1" :rules="rules"
ref="form1" labelWidth='70'>
<up-form-item label="银行卡" prop="userInfo.name" borderBottom ref="item1">
<up-input style="border: none;" v-model="form.name" />
<up-input style="border: none;" v-model="target_bank.bank_name" />
</up-form-item>
<up-form-item label="持卡人" prop="userInfo.name" borderBottom ref="item1">
<up-input style="border: none;" v-model="form.name" />
<up-input style="border: none;" v-model="target_bank.name" />
</up-form-item>
<up-form-item label="银行账户" prop="userInfo.name" borderBottom ref="item1">
<up-input style="border: none;" v-model="form.name" />
<up-input style="border: none;" v-model="target_bank.bank_code" />
</up-form-item>
<up-form-item label="开户网点" prop="userInfo.name" borderBottom ref="item1">
<up-input style="border: none;" v-model="form.name" />
<up-input style="border: none;" v-model="target_bank.bank_branch" />
</up-form-item>
<up-form-item label="提现金额" prop="userInfo.name" borderBottom ref="item1">
<up-input style="border: none;" v-model="form.name" placeholder="请输入提现金额" />
<up-input style="border: none;" v-model="form.money" placeholder="请输入提现金额" />
</up-form-item>
<text style="color: #999999;font-size: 24rpx;">
说明:用户下单后该订单金额存放在暂存金额中用户确认收货后次日18:00才可提现该笔订单金额
提货付款订单在完成后次日18:00才可提现
@ -53,7 +52,7 @@
明细
</view>
<view class="submit-btn">
<up-button text="提现" shape="circle" color="#50C758"></up-button>
<up-button text="提现" @click="submit" shape="circle" color="#50C758"></up-button>
</view>
</view>
</template>
@ -61,6 +60,8 @@
<script setup>
import {
bankListApi,
amountAccountApi,
UserWithdrawApi
} from "@/api/balance.js"
import {
ref,
@ -89,14 +90,38 @@
const form = reactive({
name: ""
money: ""
})
const bank_list = ref([])
const balance = ref(0.00)
const target_bank = ref([])
const getBanlance = () => {
amountAccountApi().then(res => {
balance.value = res.data.balance
bank_list.value = res.data.bank_list
target_bank.value = res.data.bank_list[0]
console.log(target_bank.value)
})
}
getBanlance()
const submit = async () => {
await UserWithdrawApi({
"merchant_bank_id": target_bank.value.id,
"amount": form.money
})
uni.showToast({
title: '提交成功',
duration: 1500
})
uni.$u.sleep(1500).then(res => {
uni.navigateTo({
url: '/pageQuota/Balance/detail'
})
})
}
// 使 reactive

View File

@ -25,7 +25,7 @@ const useUserStore = defineStore("user", () => {
// #ifdef H5
token.value = "9cc93459ebdb4a2367a53a08b3d96e89"
token.value = "f8503407982ed2391ff3dc740da26596"
// token.value = "95b24dd6d2dda836fe07854b08ba0944"
userInfo.value = {
avatar: "https://lihaiim.oss-cn-chengdu.aliyuncs.com/image/admin/default_avatar.png",
@ -35,7 +35,7 @@ const useUserStore = defineStore("user", () => {
mobile: "19330904744",
nickname: "用户1714964250",
supplier: null,
token: "9cc93459ebdb4a2367a53a08b3d96e89"
token: "f8503407982ed2391ff3dc740da26596"
}
// #endif