Skip to content

B
bob-wap
Commit ec9c4fd2 by GiottoMaster
Options

update

parent d476cb14
Showing with 232 additions and 6 deletions
config/index.js
......@@ -12,8 +12,8 @@ module.exports = {
assetsPublicPath: '/',
proxyTable: {
'/api': {
// target:'https://bob.test-hh.com//api/', // 你请求的第三方接口
target: 'https://97w5xg.tdrart.com/api/',
// target: 'https://97w5xg.tdrart.com/api/',
target: 'http://129.226.60.49:9924/api/',
changeOrigin:true, /* 在本地会创建一个虚拟服务端，然后发送请求的数据，
并同时接收请求的数据，这样服务端和服务端进行数据的交互就不会有跨域问题 */
pathRewrite:{ // 路径重写，
......
index.html
......@@ -5,6 +5,7 @@
<meta charset="utf-8">
<meta name="format-detection" content="telephone=no"/>
<meta http-equiv="X-UA-Compatible" content="edge">
<meta name="google" content="notranslate" />
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
<title></title>
<!-- 适用于所有设备 -->
......
src/components/mode/index.vue
......@@ -212,7 +212,7 @@
<van-dialog v-model="dialogShow" :closeOnClickOverlay="true" :showConfirmButton="false">
<div class="wrap">
<div class="label">{{ $t('mode.index.windowLabel1') }}</div>
<!-- <div class="label">{{ $t('mode.index.windowLabel1') }}</div>
<div class="label">{{ $t('mode.index.windowLabel2') }}</div>
<br />
<div class="label">{{ $t('mode.index.windowLabel3') }}</div>
......@@ -222,7 +222,8 @@
<br />
<div class="label">{{ $t('mode.index.windowLabel7') }}</div>
<br />
<div class="label">{{ $t('mode.index.windowLabel8') }}</div>
<div class="label">{{ $t('mode.index.windowLabel8') }}</div> -->
<div class="label">{{ $t('mode.index.windowLabel11') }}</div>
<div class="close" @click="dialogShow = false">
<van-icon name="cross" size="20px"/>
</div>
......
src/components/mode/mine.vue
......@@ -207,6 +207,13 @@
<span class="tisf"></span>
<img class="rigiong" src="/static/style/icoArrowGrey@2x.abc43ab099390c4587d33290a76fc15e.png" alt="" />
</div>
<!-- <div class="hgsw" @click="$parent.goNav('/rebates')">
<img class="firsimg" src="/static/image/fanli.png" alt="" />
<span class="tit">{{ $t('main.rebates.label1') }}</span>
<span class="tisf"></span>
<img class="rigiong" src="/static/style/icoArrowGrey@2x.abc43ab099390c4587d33290a76fc15e.png" alt="" />
</div> -->
<!-- <div class="hgsw" @click="$parent.goNav('/betList')">
<img class="firsimg" src="/static/image/help.png" alt="" />
<span class="tit">投注列表</span>
......
src/components/mode/rebates.vue 0 → 100644
<template>
<main>
<header>
<van-nav-bar :title="$t('main.rebates.label1')" left-arrow @click-left="$router.back()" /> <!-- 返水记录 -->
</header>
<div class="list">
<van-list v-model="loading" :finished="finished" offset="50" @load="onLoad" class="tbody" :loading-text="`${ $t('foot.loading') }...`" :finished-text="`${ $t('main.lottery.label16') }`">
<div class="tr" v-for="(item, index) in dealRecordList" :key="index" >
<div class="row">
<div class="label">{{ $t('main.rebates.label2') }}</div>
<div class="value">{{ item.order_sn }}</div>
</div>
<div class="row">
<div class="label">{{ $t('main.rebates.label3') }}</div>
<div class="value">{{ item.created_at }}</div>
</div>
<div class="row">
<div class="label">{{ $t('main.rebates.label4') }}</div>
<div class="value">{{ item.balance }}KRW</div>
</div>
<div class="row">
<div class="label">{{ $t('main.rebates.label5') }}</div>
<div class="value">{{ item.rate }}%</div>
</div>
<div class="row">
<div class="label">{{ $t('main.rebates.label6') }}</div>
<div class="value">{{ item.rate_money }}KRW</div>
</div>
<!-- <div class="row">
<div class="label">{{ $t('main.rebates.label7') }}</div>
<div class="value">{{ item.amount }}</div>
</div> -->
</div>
</van-list>
</div>
</main>
</template>
<script>
export default {
name: 'message',
data() {
return {
params: {
page: 0
},
startPlaceholder: '',
endPlaceholder: '',
currentDate: new Date(),
minDate: new Date(2020,0,1),
maxDate: new Date(2030,0,1),
startTimeShow: false,
endTimeShow: false,
loading: false,
finished: false,
dealRecordList: [],
dealRecordData: {},
statusInfo: []
}
},
created() {
// this.getDealRecordList()
this.statusInfo = [
this.$t('main.rebates.label5'),
this.$t('main.rebates.label6'),
this.$t('main.rebates.label7'),
]
},
methods: {
async getDealRecordList(refresh = false) {
const res = await this.$apiFun.getRateListApi(this.params)
res.data.data.map(item => {
console.log(item.opencode, item)
if(item.opencode) {
const l = item.opencode.split(',')
item.total = l.reduce((s, t) => (Number(s) + Number(t)), 0)
if(item.total == item.bet_code) {
item.openStatus = 0
}else {
item.openStatus = 1
}
}else {
item.openStatus = 2
}
return item
})
// 判断是刷新还是加载
if (refresh) {
this.dealRecordList = res.data.data
} else {
this.dealRecordList = [...this.dealRecordList, ...res.data.data]
}
this.dealRecordData = res.data
this.loading = false
if (this.params.page >= this.dealRecordData.last_page) {
this.finished = true
}
this.$parent.loading = false
},
onLoad () {
this.loading = true
this.params.page++
this.getDealRecordList(false)
}
},
};
</script>
<style lang="scss" scoped>
header {
height: 46px;
.van-nav-bar {
position: fixed;
width: 100%;
top: 0;
}
.right {
position: fixed;
display: flex;
align-items: center;
z-index: 1000;
height: 46px;
line-height: 46px;
right: 20px;
font-weight: 500;
font-size: .35rem;
}
}
.list {
background: #F3F3F9;
box-sizing: border-box;
height: calc(var(--vh) * 100 - 47px);
padding-top: 10px;
overflow: auto;
.tr {
margin: 0px 15px;
padding: 15px 10px ;
background: #fff;
border-radius: 5px;
.row {
display: flex;
color: #98A8C5;
justify-content: space-between;
align-items: center;
height: 30px;
.label {
color: #98A8C5;
}
}
}
.tr+.tr{
margin-top: 10px;
}
}
</style>
\ No newline at end of file
src/http/api.js
......@@ -78,6 +78,11 @@ import https from './http.js';
return https.get('/api/lottery/order', params)
}
// 返利列表
apiFun.getRateListApi = (params) => {
return https.get('/api/interest/order/rate_list', params)
}
......
src/http/http.js
......@@ -4,6 +4,7 @@ import router from './../router'
// let baseURL = 'https://bob.test-hh.com/'
let baseURL = 'https://97w5xg.tdrart.com/'
// let baseURL = 'https://97w5xg.njtsmk.top/' //备用
import _this from '../main.js'
......
src/i18n/lan/cn.js
......@@ -103,6 +103,8 @@ export const mode = {
windowLabel7: '示例:A和B等同時下注時，在同一遊戲中進行與結果相沖突的多次下注時，利用多個賬戶分別下注遊戲結果時',
windowLabel8: '📌 請堂堂正正地使用。 違反時責任在於本人,對由此帶來的不利影響不接受任何異議。',
windowLabel11: '为提供更便捷的资金服务，平台支持所有用户使用 USDT（TRC20）进行出入金，系统将自动按实时汇率折算并快速到账',
},
mine: {
......@@ -790,6 +792,15 @@ export const main = {
label6: '未中奖',
label7: '未开奖',
},
rebates: {
label1: '返水记录',
label2: '单号',
label3: '时间',
label4: '金额',
label5: '利率',
label6: '利息',
label7: '总利息',
},
}
......
src/i18n/lan/en.js
......@@ -102,6 +102,8 @@ export const mode = {
windowLabel7: 'Example: When betting on A and B at the same time, when making multiple bets with conflicting results in the same game, when using multiple accounts to bet on the game results',
windowLabel8: '📌Please use the service fairly. Responsibility for violations lies with the user, and no objections will be accepted for any disadvantages resulting from this.',
windowLabel11: 'In order to provide more convenient funding services, the platform supports all users to use USDT (TRC20) for deposits and withdrawals. The system will automatically convert the funds according to the real-time exchange rate and quickly transfer them to the account.',
},
mine: {
......@@ -191,7 +193,7 @@ export const main = {
label4: 'Status:',
label5: 'Empty',
label6: 'Not agreed',
label7: 'Waiting for review',
label7: 'Waiting for background review',
label8: 'Approved',
label9: 'Rejected',
label10: 'Not agreed',
......@@ -521,7 +523,7 @@ export const main = {
label12: 'Transfer out',
label13: 'All platforms',
label14: 'Undefined',
label15: 'Waiting for review',
label15: 'Waiting for background review',
label16: 'Review passed',
label17: 'Review rejected',
label18: 'Failed',
......@@ -789,6 +791,15 @@ export const main = {
label6: 'Not won',
label7: 'Not drawn',
},
rebates: {
label1: 'Rebate Record',
label2: 'Order Number',
label3: 'Time',
label4: 'Amount',
label5: 'Rebate Rate',
label6: 'Rebate Amount',
label7: 'Total Rebate Amount',
},
}
......
src/i18n/lan/kr.js
......@@ -105,6 +105,7 @@ export const mode = {
windowLabel7: '예시 : A와 B등 동시에 베팅하는 경우, 동일 게임에서 결과에 상충하는 복수의 베팅을 하는 경우 다계정을 이용해 게임 결과에 각각 베팅하는 경우',
windowLabel8: '📌 정정당당한 이용을 부탁드립니다. 위반 시 책임은 본인에게 있으며, 이로 인한 불이익에 대해서는 어떠한 이의도 받지 않습니다.',
windowLabel11: '더 빠르고 편리한 서비스 제공을 위해 플랫폼에서는 모든 회원님께 USDT(TRC20) 기반의 입출금을 지원하며, 입출금 시 실시간 환율이 자동 적용됩니다.ke',
},
mine: {
......@@ -792,6 +793,15 @@ export const main = {
label6: '미당첨',
label7: '미추첨',
},
rebates: {
label1: '리베이트 내역',
label2: '주문 번호',
label3: '시간',
label4: '금액',
label5: '이자율',
label6: '이자',
label7: '총 이자',
},
}
......
src/router/index.js
......@@ -54,6 +54,8 @@ import rechargeRecord from '@/components/mine/rechargeRecord'
import withdrawalRecord from '@/components/mine/withdrawalRecord'
import setLanguage from '@/components/mine/setLanguage'
import yingkui from '@/components/mine/yingkui'
import rebates from '@/components/mode/rebates'
......@@ -415,6 +417,15 @@ export default new Router({
},
{
path: '/rebates',
name: 'rebates',
component: rebates,
meta: {
requireAuth: true,
}
},
{
path: '/rechargeRecord',
name: 'rechargeRecord',
component: rechargeRecord,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment