moliparty/peko-h5
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决星级厨房遗漏繁，修改钻字段

Browse Source
This commit is contained in:
Dragon
2022-10-22 15:17:05 +08:00
parent f73cb53f04
commit 1eb14c3489
87 changed files with 310 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
view/peko/vue-project/myincome/src/api/myincome.js
View File

@@ -214,7 +214,7 @@ export const updateWithdrawInfo = (params) => {
// let getWithDrawList = host + '/withDraw/findList'
// //水晶记录get
// let getCrystals = host + '/bill/record/get'
// //兑换钻石post
// //兑换鉆石post
// let exchange = host + '/change/gold'
// //获取支付宝信息get
// let getAlipayInfo = host + '/withDraw/exchange'

2
view/peko/vue-project/myincome/src/router/index.js
View File

@@ -14,7 +14,7 @@ var routers = new Router({
{ path: '/BindAlipay', name: 'BindAlipay', component: () => import('@/view/myincome/BindAlipay.vue') },
{ path: '/CrystalLog', name: 'CrystalLog', component: () => import('@/view/myincome/CrystalLog.vue') },
{ path: '/GoldLog', name: 'GoldLog', component: () => import('@/view/myincome/GoldLog.vue') },
{ path: '/DiamondLog', name: 'DiamondLog', component: () => import('@/view/myincome/DiamondLog.vue'), meta: { title: "钻石记录" } },
{ path: '/DiamondLog', name: 'DiamondLog', component: () => import('@/view/myincome/DiamondLog.vue'), meta: { title: "鉆石记录" } },
{ path: '/Login', name: 'Login', component: () => import('@/view/myincome/Login.vue'), meta: { title: "登录" } },
{ path: '/runningWater', name: 'runningWater', component: () => import('@/view/running/runningWater.vue'), meta: { title: "房间流水" } },
{ path: '/GameWithDrawDesc', name: 'GameWithDrawDesc', component: () => import('@/view/myincome/GameWithDrawDesc.vue'), meta: { title: "领奖说明" } },

8
view/peko/vue-project/myincome/src/view/myincome/CrystalExchangeDiamond.vue
View File

@@ -4,10 +4,10 @@
<div class="back" @click="back">
<img src="../../assets/img/back.png"/>
</div>
<span>水晶兑换钻石</span>
<span>水晶兑换鉆石</span>
<div class="back"></div>
</div>-->
<navigation v-if="!this.$store.state.isApp" title="水晶兑换钻石" rightTitle></navigation>
<navigation v-if="!this.$store.state.isApp" title="水晶兑换鉆石" rightTitle></navigation>
<div class="crystal-father">
<div class="crystal">
<img src="@/assets/img/crystal.png" />
@@ -30,7 +30,7 @@
<div class="sure" @click="sure">确认兑换</div>
<div class="bottom-text">水晶可兑换钻石，兑换比率：1水晶=1钻石，水晶数量必须为10的整数倍。</div>
<div class="bottom-text">水晶可兑换鉆石，兑换比率：1水晶=1鉆石，水晶数量必须为10的整数倍。</div>
<van-password-input
class="passwrod-input"
@@ -187,7 +187,7 @@ export default {
},
components: { navigation },
created() {
document.title = "水晶兑换钻石";
document.title = "水晶兑换鉆石";
this.getInfo();
this.getPurse();
common.initNav({

8
view/peko/vue-project/myincome/src/view/myincome/CrystalLog.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="box-all">
<navigation v-if="!this.$store.state.isApp" title="水晶记录" rightTitle="钻石记录"></navigation>
<navigation v-if="!this.$store.state.isApp" title="水晶记录" rightTitle="鉆石记录"></navigation>
<div :class="!this.$store.state.isApp ? 'crystal-top' : 'crystal-top crystal-top-app'">
<div class="box-top-title">
<div
@@ -64,7 +64,7 @@
</div>
<div v-if="tableType == 8" class="item-title">
{{item1.amount}}
兑换钻石
兑换鉆石
</div>
<!-- <div v-if="tableType == 3" class="item-title">{{relDate(item1.recordTime,1)}}</div> -->
<div v-if="tableType == 4 || tableType == 3" class="item-title">{{relDate(item1.recordTime,1)}}</div>
@@ -398,9 +398,9 @@ export default {
common.initNav({
type: 1,
data: {
msg: "钻石记录",
msg: "鉆石记录",
link: faqLink,
title: "钻石记录",
title: "鉆石记录",
showUrl: faqLink,
imgUrl: faqLink,
desc: ""

16
view/peko/vue-project/myincome/src/view/myincome/DiamondLog.vue
View File

@@ -1,6 +1,6 @@
<template>
<div>
<navigation v-if="!this.$store.state.isApp" title="钻石记录" rightTitle></navigation>
<navigation v-if="!this.$store.state.isApp" title="鉆石记录" rightTitle></navigation>
<div :class="!this.$store.state.isApp ? 'diamond-tab' : 'diamond-tab crystal-top-app'">
<div :class="tab === 11 ?'active' :''" @click="cutTab(11)">
<span>收入记录</span>
@@ -37,7 +37,7 @@
<span class="time">{{ relDate(item.date) }}</span>
<span>{{tab === 11 ? "共收入" : tab == 1 ? '共获得价值' : '共支出'}}</span>
<span class="total">{{tab === 1? item.totalGiftGoldNumDailySum: item.total}}</span>
<span>钻石</span>
<span>鉆石</span>
</van-index-anchor>
<div class="in-all-detail" v-for="(item1, index1) in item[item.date]" :key="index1">
@@ -47,14 +47,14 @@
<p v-else-if="tab === 11 && item1.objType === 44">全服红包-来自{{ item1.roomTitle }}</p>
<p v-else-if="tab === 11 && item1.objType === 41">房间红包退款-来自{{ item1.roomTitle }}</p>
<p v-else-if="tab === 11 && item1.objType === 42">全服红包退款-来自{{ item1.roomTitle }}</p>
<p v-else-if="tab === 11 && item1.objType === 13">水晶兑换钻石</p>
<p v-else-if="tab === 11 && item1.objType === 15">金币兑换钻石</p>
<p v-else-if="tab === 11 && item1.objType === 23">活动赠送钻石</p>
<p v-else-if="tab === 11 && item1.objType === 13">水晶兑换鉆石</p>
<p v-else-if="tab === 11 && item1.objType === 15">金币兑换鉆石</p>
<p v-else-if="tab === 11 && item1.objType === 23">活动赠送鉆石</p>
<p v-else-if="tab === 11 && item1.objType === 1">充值</p>
<p v-else-if="tab === 11 && item1.objType === 59">塔罗占卜</p>
<p v-else-if="tab === 11 && item1.objType === 60">集福气瓜分钻石</p>
<p v-else-if="tab === 11 && item1.objType === 60">集福气瓜分鉆石</p>
<p v-else-if="tab === 11 && item1.objType === 71">CP邀请退还</p>
<p v-else-if="tab === 11 && item1.objType === 89">{{item1.targetNick}}赠送钻石</p>
<p v-else-if="tab === 11 && item1.objType === 89">{{item1.targetNick}}赠送鉆石</p>
<!-- <p v-else-if="tab === 11 || !item1.targetNick">{{ item1.srcNick }}</p> -->
<p v-if="tab === 12 && item1.objType === 40">全服红包-发生在{{ item1.roomTitle }}</p>
<p v-else-if="tab === 12 && item1.objType === 39">房间红包-发生在{{ item1.roomTitle }}</p>
@@ -73,7 +73,7 @@
<p v-else-if="tab === 12 && item1.objType === 86">航海冒险礼包支出</p>
<p v-else-if="tab === 12 && item1.objType === 31">购买座驾支出</p>
<p v-else-if="tab === 12 && item1.objType === 32">赠送座驾支出</p>
<p v-else-if="tab === 12 && item1.objType === 90">转赠钻石给 {{item1.targetNick}} {{item1.sendDiamondAmount}}钻</p>
<p v-else-if="tab === 12 && item1.objType === 90">转赠鉆石给 {{item1.targetNick}} {{item1.sendDiamondAmount}}鉆</p>
<!-- <p v-if="tab === 12">{{ item1.srcNick }}</p> -->
<p
v-else-if="tab === 12 && item1.targetNick"

8
view/peko/vue-project/myincome/src/view/myincome/GoldExchangeDiamond.vue
View File

@@ -4,10 +4,10 @@
<div class="back" @click="back">
<img src="../../assets/img/back.png"/>
</div>
<span>金币兑换钻石</span>
<span>金币兑换鉆石</span>
<div class="back"></div>
</div>-->
<navigation v-if="!this.$store.state.isApp" title="金币兑换钻石" rightTitle></navigation>
<navigation v-if="!this.$store.state.isApp" title="金币兑换鉆石" rightTitle></navigation>
<div class="crystal-father">
<div class="crystal">
<img src="@/assets/img/gold.png" />
@@ -30,7 +30,7 @@
<div class="sure" @click="sure">确认兑换</div>
<div class="bottom-text">金币可兑换钻石，兑换比率：1金币=1钻石，金币数量必须为10的整数倍。</div>
<div class="bottom-text">金币可兑换鉆石，兑换比率：1金币=1鉆石，金币数量必须为10的整数倍。</div>
<van-password-input
class="passwrod-input"
@@ -182,7 +182,7 @@ export default {
},
components: { navigation },
created() {
document.title = "金币兑换钻石";
document.title = "金币兑换鉆石";
this.getInfo();
this.getPurse();
common.initNav({

10
view/peko/vue-project/myincome/src/view/myincome/GoldLog.vue
View File

@@ -7,7 +7,7 @@
<span>金币记录</span>
<div class="right">常见问题</div>
</div>-->
<navigation v-if="!this.$store.state.isApp" title="金币记录" rightTitle="钻石记录"></navigation>
<navigation v-if="!this.$store.state.isApp" title="金币记录" rightTitle="鉆石记录"></navigation>
<div :class="!this.$store.state.isApp ? 'crystal-top' : 'crystal-top crystal-top-app'">
<div class="box-top-title">
<div
@@ -49,7 +49,7 @@
<div v-if="tableType == 5" class="item-left-title">水晶 转换 金币收入</div>
<div v-if="tableType == 6" class="item-left-title">活动发放 金币收入</div>
<div v-if="tableType == 9" class="item-left-title">{{item1.amount | abs}}金币提现</div>
<div v-if="tableType == 10" class="item-left-title">{{item1.amount | abs}}金币兑换钻石</div>
<div v-if="tableType == 10" class="item-left-title">{{item1.amount | abs}}金币兑换鉆石</div>
<div class="item-left-dsc">{{dateFormat(item1.recordTime)}}</div>
</div>
<div class="item-right">
@@ -74,7 +74,7 @@
<div v-if="tableType == 5" class="item-left-title">水晶 转换 金币收入</div>
<div v-if="tableType == 6" class="item-left-title">活动发放 金币收入</div>
<div v-if="tableType == 9" class="item-left-title">{{item1.amount | abs}}金币提现</div>
<div v-if="tableType == 10" class="item-left-title">{{item1.amount | abs}}金币兑换钻石</div>
<div v-if="tableType == 10" class="item-left-title">{{item1.amount | abs}}金币兑换鉆石</div>
<div class="item-left-dsc">{{dateFormat(item1.date)}}</div>
</div>
<div class="item-right">
@@ -418,9 +418,9 @@ export default {
common.initNav({
type: 1,
data: {
msg: "钻石记录",
msg: "鉆石记录",
link: faqLink,
title: "钻石记录",
title: "鉆石记录",
showUrl: faqLink,
imgUrl: faqLink,
desc: ""

12
view/peko/vue-project/myincome/src/view/myincome/MyIncome.vue
View File

@@ -32,7 +32,7 @@
</div>
<div class="line"></div>
<div class="exchange" @click="crystalExchangeDiamond">兑换钻石</div>
<div class="exchange" @click="crystalExchangeDiamond">兑换鉆石</div>
</div>
<div class="gold">
@@ -55,7 +55,7 @@
<div class="gold-exchange">
<div class="left" @click="toWithDraw">提现</div>
<div class="split"></div>
<div class="right" @click="goldExchangeDiamond">兑换钻石</div>
<div class="right" @click="goldExchangeDiamond">兑换鉆石</div>
</div>
</div>
<div class="running" v-if="runningWater">
@@ -94,9 +94,9 @@
</div>
<div class="bottom">
<p>提现和兑换钻石说明：</p>
<p>提现和兑换鉆石说明：</p>
<div class="des">
1. 水晶和金币均可兑换成钻石；
1. 水晶和金币均可兑换成鉆石；
<br />2. 账户上的水晶余额于每天凌晨3点自动转换成可提现的金币；
<br />3. 金币提现时，将扣取一定比例的手续费。
<br />
@@ -640,9 +640,9 @@ export default {
common.initNav({
type: 4,
data: {
msg: "钻石记录",
msg: "鉆石记录",
link: faqLink,
title: "钻石记录",
title: "鉆石记录",
showUrl: faqLink,
imgUrl: faqLink,
desc: "",

4
view/peko/vue-project/wishRank/src/router/index.js
View File

@@ -10,8 +10,8 @@ var routers = new Router({
{ path: '/wishingWellRank', name: 'wishingWellRank', meta: { title: '许愿池榜单' }, component: () => import('@/view/rank/WishingWellRank.vue') },
{ path: '/wishingWellRecord', name: 'wishingWellRecord', meta: { title: '许愿池中奖记录' }, component: () => import('@/view/rank/WishingWellRecord.vue') },
{ path: '/wishingWellRule', name: 'wishingWellRule', meta: { title: '玩法规则' }, component: () => import('@/view/rank/wishingWellRule.vue') },
{ path: '/DiamondLog', name: 'DiamondLog', meta: { title: '钻石记录' }, component: () => import('@/view/rank/DiamondLog.vue') },
// { path: '/diamond', name: 'diamond', meta: { title: '钻石记录' }, component: () => import('@/view/my/diamond.vue') },
{ path: '/DiamondLog', name: 'DiamondLog', meta: { title: '鉆石记录' }, component: () => import('@/view/rank/DiamondLog.vue') },
// { path: '/diamond', name: 'diamond', meta: { title: '鉆石记录' }, component: () => import('@/view/my/diamond.vue') },
]
});

2
view/peko/vue-project/wishRank/src/view/rank/DiamondLog.vue
View File

@@ -13,7 +13,7 @@
<span class="time">{{ relDate(item.date) }}</span>
<span>共收入</span>
<span class="total">{{countTotal(index, item)}}</span>
<span>钻石</span>
<span>鉆石</span>
</van-index-anchor>
<div class="in-all-detail" v-for="(item1, index1) in item[item.date]" :key="index1">