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

修复提起数据异常问题

Browse Source
This commit is contained in:
dragon
2024-12-25 15:48:50 +08:00
parent 9f035177c3
commit c738fcafcf
11 changed files with 94 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
view/molistar/modules/myincome/index.html
View File

@@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>molistar</title><link href=./static/css/app.f9330f668ea485b181da3ba4e8796f3f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.1aba4e0ef6b88acd5c0e.js></script><script type=text/javascript src=./static/js/vendor.8540296f0c06d331c2b6.js></script><script type=text/javascript src=./static/js/app.fb0c39d74d91f565e73d.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>molistar</title><link href=./static/css/app.6305baec15a3eec041a10dfc00b7c586.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.ef4a5f82a32f92e0c69b.js></script><script type=text/javascript src=./static/js/vendor.8540296f0c06d331c2b6.js></script><script type=text/javascript src=./static/js/app.e4eb99a5c9299853fd59.js></script></body></html>

2
view/molistar/modules/myincome/static/css/app.6305baec15a3eec041a10dfc00b7c586.css Normal file
View File

File diff suppressed because one or more lines are too long

2
view/molistar/modules/myincome/static/css/app.f9330f668ea485b181da3ba4e8796f3f.css
View File

File diff suppressed because one or more lines are too long

2
view/molistar/modules/myincome/static/js/1.b7bf56a558d711273ba5.js
View File

File diff suppressed because one or more lines are too long

2
view/molistar/modules/myincome/static/js/1.c87f223b0448a3627df1.js Normal file
View File

File diff suppressed because one or more lines are too long

2
view/molistar/modules/myincome/static/js/2.042873bbb11297779a68.js
View File

File diff suppressed because one or more lines are too long

2
view/molistar/modules/myincome/static/js/2.2f3a281a54d4e670e350.js Normal file
View File

File diff suppressed because one or more lines are too long

5
view/molistar/modules/myincome/static/js/app.fb0c39d74d91f565e73d.js → view/molistar/modules/myincome/static/js/app.e4eb99a5c9299853fd59.js
View File

File diff suppressed because one or more lines are too long

5
view/molistar/modules/myincome/static/js/manifest.1aba4e0ef6b88acd5c0e.js → view/molistar/modules/myincome/static/js/manifest.ef4a5f82a32f92e0c69b.js
View File

@@ -1,3 +1,4 @@
<<<<<<< HEAD:view/molistar/modules/myincome/static/js/manifest.1aba4e0ef6b88acd5c0e.js
<<<<<<< HEAD:view/molistar/modules/myincome/static/js/manifest.8636e2a48ad2f09d6dbf.js
<<<<<<< HEAD:view/molistar/modules/myincome/static/js/manifest.525e73ccaf627848d5f0.js
<<<<<<<< HEAD:view/molistar/modules/myincome/static/js/manifest.525e73ccaf627848d5f0.js
@@ -15,3 +16,7 @@
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);b.length;)b.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"12dee36927ebdbb36952",1:"b7bf56a558d711273ba5",2:"042873bbb11297779a68",3:"00bcf5022e7d98b672a2",4:"c9d5b75efaa28b779e79",5:"93d874959b80a4ee1da1",6:"de3228ef1e13c7d6649c",7:"a1746a1c89c587b75f6f",8:"67319477a4c5ac59b510",9:"cf187b6df4a386b203eb",10:"f6e85397f46b6b94d58d",11:"a5e798e367bdaa3003e9",12:"b8ac2b08a54dd44dc799"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.1aba4e0ef6b88acd5c0e.js.map
>>>>>>> f43ba45 (修改传参字段-账单):view/molistar/modules/myincome/static/js/manifest.1aba4e0ef6b88acd5c0e.js
=======
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);b.length;)b.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"12dee36927ebdbb36952",1:"c87f223b0448a3627df1",2:"2f3a281a54d4e670e350",3:"00bcf5022e7d98b672a2",4:"c9d5b75efaa28b779e79",5:"93d874959b80a4ee1da1",6:"de3228ef1e13c7d6649c",7:"a1746a1c89c587b75f6f",8:"67319477a4c5ac59b510",9:"cf187b6df4a386b203eb",10:"f6e85397f46b6b94d58d",11:"a5e798e367bdaa3003e9",12:"b8ac2b08a54dd44dc799"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.ef4a5f82a32f92e0c69b.js.map
>>>>>>> fb74d3a (修复提起数据异常问题):view/molistar/modules/myincome/static/js/manifest.ef4a5f82a32f92e0c69b.js

50
view/molistar/vue-project/myincome/src/view/myincome/DiamondLog.vue
View File

@@ -1,8 +1,9 @@
<template>
<!-- style="padding-top: 1.8rem" -->
<div class="scroll-container" @scroll="handleScroll">
<!-- !this.$store.state.isApp -->
<navigation
v-if="!this.$store.state.isApp"
v-if="false"
:title="this.$t(`diamondLog.金幣記錄`)"
rightTitle
></navigation>
@@ -37,7 +38,16 @@
v-for="(res, i) in list"
:key="i"
>
<div :class="i == 0 ? 'titleNum titleNumF' : 'titleNum'" :style="i == 0?'':res.recordList.length == 0?'margin-bottom:42px;':'margin: 0 auto 0;'">
<div
:class="i == 0 ? 'titleNum titleNumF' : 'titleNum'"
:style="
i == 0
? ''
: res.recordList.length == 0
? 'margin-bottom:42px;'
: 'margin: 0 auto 0;'
"
>
<div class="left" v-show="tabAct == 1">
<span>{{ $t("diamondLog.總收入") }}</span>
<b>{{ res.totalAmount }}</b>
@@ -94,7 +104,9 @@
<p>{{ $t("diamondLog.沒有更多了") }}</p>
</div>
<!-- loading -->
<div class="loading" v-show="loading">{{ $t("diamondLog.加載中") }}</div>
<div class="loading" v-show="loading">
<div>{{ $t("diamondLog.加載中") }}</div>
</div>
<!-- 日期列表 -->
<div v-show="timeListLoad" class="timeList">
<div class="timeList_in">
@@ -378,8 +390,10 @@ export default {
this.currentIndex = i; // 更新当前选中的索引
},
timeClickOk() {
this.page = 1;
this.list = [];
this.timeListLoad = false;
this.currentIndex = null;
this.currentIndex = null;
this.tabAct == 4 ? this.giftReceiveFun(2) : this.getDate(2);
},
objTypeFun(val) {
@@ -407,14 +421,14 @@ export default {
overflow-y: auto;
}
.tab {
z-index: 1;
z-index: 3;
width: 375px;
height: 38px;
background: #fff;
position: fixed;
left: 50%;
transform: translateX(-50%);
top: 1.3rem;
top: 0;
overflow-x: scroll;
display: flex;
box-sizing: border-box;
@@ -459,7 +473,7 @@ export default {
}
.dataList {
position: fixed;
top: 2.3rem;
top: 1rem;
left: 50%;
transform: translateX(-50%);
z-index: 2;
@@ -685,13 +699,21 @@ ul {
.loading {
position: fixed;
z-index: 99;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
background: rgba(0, 0, 0, 0.6);
color: #fff;
border-radius: 10px;
padding: 10px 20px;
left: 0;
top: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.5);
div {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
color: #fff;
border-radius: 10px;
padding: 10px 20px;
font-size: 16px;
}
}
.timeList {
position: fixed;

62
view/molistar/vue-project/myincome/src/view/myincome/GoldLog.vue
View File

@@ -2,7 +2,7 @@
<!-- style="padding-top: 1.8rem" -->
<div class="scroll-container" @scroll="handleScroll">
<navigation
v-if="!this.$store.state.isApp"
v-if="false"
:title="this.$t(`goldLog.鉆石記錄`)"
rightTitle
></navigation>
@@ -33,7 +33,16 @@
v-for="(res, i) in list"
:key="i"
>
<div :class="i == 0 ? 'titleNum titleNumF' : 'titleNum'" :style="i == 0?'':res.recordList.length == 0?'margin-bottom:42px;':'margin: 0 auto 0;'">
<div
:class="i == 0 ? 'titleNum titleNumF' : 'titleNum'"
:style="
i == 0
? ''
: res.recordList.length == 0
? 'margin-bottom:42px;'
: 'margin: 0 auto 0;'
"
>
<div class="left" v-show="tabAct == 1">
<span>{{ $t("diamondLog.總收入") }}</span>
<b>{{ res.totalAmount }}</b>
@@ -89,8 +98,9 @@
<img src="@/assets/img/nodate.png" alt="" />
<p>{{ $t("diamondLog.沒有更多了") }}</p>
</div>
<!-- loading -->
<div class="loading" v-show="loading">{{ $t("diamondLog.加載中") }}</div>
<div class="loading" v-show="loading">
<div>{{ $t("diamondLog.加載中") }}</div>
</div>
<!-- 日期列表 -->
<div v-show="timeListLoad" class="timeList">
<div class="timeList_in">
@@ -139,7 +149,7 @@ export default {
this.$i18n.locale = window.sessionStorage.getItem("language");
},
created() {
this.$i18n.locale = window.sessionStorage.getItem("language");
this.$i18n.locale = window.sessionStorage.getItem("language");
document.title = this.$t("goldLog.鉆石記錄");
this.describeMap = {
4: this.$t("goldLog.房間收禮物收入"),
@@ -319,8 +329,10 @@ export default {
this.currentIndex = i; // 更新当前选中的索引
},
timeClickOk() {
this.page = 1;
this.list = [];
this.timeListLoad = false;
this.currentIndex = null;
this.currentIndex = null;
this.tabAct == 4 ? this.giftReceiveFun(2) : this.getDate(2);
},
objTypeFun(val) {
@@ -348,14 +360,14 @@ export default {
overflow-y: auto;
}
.tab {
z-index: 1;
z-index: 3;
width: 375px;
height: 38px;
background: #fff;
position: fixed;
left: 50%;
transform: translateX(-50%);
top: 1.3rem;
top: 0rem;
overflow-x: scroll;
display: flex;
box-sizing: border-box;
@@ -400,7 +412,7 @@ export default {
}
.dataList {
position: fixed;
top: 2.3rem;
top: 1rem;
left: 50%;
transform: translateX(-50%);
z-index: 2;
@@ -451,7 +463,7 @@ ul {
b {
display: inline-block;
vertical-align: middle;
color: #03AFFF;
color: #03afff;
font-size: 16px;
font-weight: 600;
}
@@ -492,7 +504,7 @@ ul {
vertical-align: middle;
}
b {
color: #03AFFF;
color: #03afff;
display: inline-block;
vertical-align: middle;
}
@@ -540,7 +552,7 @@ ul {
vertical-align: middle;
}
b {
color: #03AFFF;
color: #03afff;
display: inline-block;
vertical-align: middle;
}
@@ -601,7 +613,7 @@ ul {
b {
display: inline-block;
vertical-align: middle;
color: #03AFFF;
color: #03afff;
font-size: 16px;
font-weight: 600;
}
@@ -626,13 +638,21 @@ ul {
.loading {
position: fixed;
z-index: 99;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
background: rgba(0, 0, 0, 0.6);
color: #fff;
border-radius: 10px;
padding: 10px 20px;
left: 0;
top: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.5);
div {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
color: #fff;
border-radius: 10px;
padding: 10px 20px;
font-size: 16px;
}
}
.timeList {
position: fixed;
@@ -670,7 +690,7 @@ ul {
top: 0;
}
b {
color: #03AFFF;
color: #03afff;
z-index: 2;
position: absolute;
right: 16px;