完成账单

2024-12-24 14:44:35 +08:00
parent 20b49801fb
commit cd0ac13094
30 changed files with 210 additions and 119 deletions
--- a/view/molistar/modules/myincome/index.html
+++ b/view/molistar/modules/myincome/index.html
@@ -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.2ab3c49db0611874bf5700de654e028a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.993852eff675f62fe242.js></script><script type=text/javascript src=./static/js/vendor.ef63a6e67767f10f7bb6.js></script><script type=text/javascript src=./static/js/app.36f760d4e09081923bc4.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>
--- a/view/molistar/modules/myincome/static/css/app.55287d886a3db2b9d1b32fa9f82dc6c9.css
+++ b/view/molistar/modules/myincome/static/css/app.55287d886a3db2b9d1b32fa9f82dc6c9.css
--- a/view/molistar/modules/myincome/static/fonts/nodate.f8134d5.png
+++ b/view/molistar/modules/myincome/static/fonts/nodate.f8134d5.png
--- a/view/molistar/modules/myincome/static/js/0.30fbedff4ed0e375ac3d.js
+++ b/view/molistar/modules/myincome/static/js/0.30fbedff4ed0e375ac3d.js
--- a/view/molistar/modules/myincome/static/js/0.b040ea26506725a01e07.js
+++ b/view/molistar/modules/myincome/static/js/0.b040ea26506725a01e07.js
--- a/view/molistar/modules/myincome/static/js/1.ce0f0d5501b525a3996c.js
+++ b/view/molistar/modules/myincome/static/js/1.ce0f0d5501b525a3996c.js
--- a/view/molistar/modules/myincome/static/js/10.9f5644b8d8539a302508.js
+++ b/view/molistar/modules/myincome/static/js/10.9f5644b8d8539a302508.js
--- a/view/molistar/modules/myincome/static/js/10.f6e85397f46b6b94d58d.js
+++ b/view/molistar/modules/myincome/static/js/10.f6e85397f46b6b94d58d.js
@@ -1,2 +1,2 @@
-webpackJsonp([11],{Mdy7:function(t,s){},RpvA:function(t,s,e){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var a=e("hff3"),i=e("+EAh"),n=e("X2Oc"),r=e("Fd2+"),o=e("KTi7"),c=e("QLzJ"),d=e("Z4iZ"),u={data:function(){return{number:"",gold:0,purse:{},info:{},showKeyboard:!1,password:""}},components:{navigation:a.a},created:function(){document.title="金幣兌換鉆石",this.getInfo(),this.getPurse(),n.a.initNav({type:4,data:{msg:"",link:"",title:"",showUrl:"",imgUrl:"",desc:""}})},methods:{back:function(){this.$router.go(-1)},sure:function(){if(this.number<=0)return this.$toast("兌換數量不可為0");this.showKeyboard=!0},exchange:function(){var t=this;r.b.loading({message:"加載中...",forbidClick:!0});var s="";s=Object(d.b)().app?Object(o.a)(this.password,"1ea53d260ecf11e7b56e00163e046a26"):Object(c.a)(this.password+"");var e={uid:window.sessionStorage.getItem("uid"),changeNum:this.number,paymentPwd:s,changeType:2};Object(i.d)(e).then(function(s){null!=s.data.data?(r.b.clear,Object(r.b)("兌換成功"),t.getPurse()):(r.b.clear,Object(r.b)(s.data.message),t.$message.error(s.data.message))})},getPurse:function(){var t=this;Object(i.q)({uid:window.sessionStorage.getItem("uid")}).then(function(s){null!=s.data?(t.purse=s.data.data,window.console.log(t.purse)):t.$message.error(s.data.message)})},getInfo:function(){this.info.uid=n.a.tools.nativeUtils.getUid(),this.info.ticket=n.a.tools.nativeUtils.getTicket()},onInput:function(t){this.password=(this.password+t).slice(0,6),6==this.password.length&&(this.showKeyboard=!1,this.exchange(),this.password="")},onDelete:function(){this.password=this.password.slice(0,this.password.length-1)}}},l={render:function(){var t=this,s=t.$createElement,e=t._self._c||s;return e("div",{staticClass:"box-all"},[this.$store.state.isApp?t._e():e("navigation",{attrs:{title:"金幣兌換鉆石",rightTitle:""}}),t._v(" "),e("div",{staticClass:"crystal-father"},[t._m(0),t._v(" "),e("span",{staticClass:"crystal-text"},[t._v("余額:")]),t._v(" "),e("span",{staticClass:"crystal-number"},[t._v(t._s(t.purse.golds))])]),t._v(" "),e("div",{staticClass:"input-number"},[e("input",{directives:[{name:"model",rawName:"v-model",value:t.number,expression:"number"}],staticClass:"number",attrs:{placeholder:"請輸入兌換的金幣數量"},domProps:{value:t.number},on:{input:function(s){s.target.composing||(t.number=s.target.value)}}})]),t._v(" "),e("div",{staticClass:"diamond"},[t._m(1),t._v(" "),e("span",{staticClass:"crystal-text"},[t._v("余額:")]),t._v(" "),e("span",{staticClass:"crystal-number"},[t._v(t._s(t.purse.diamonds))])]),t._v(" "),e("div",{staticClass:"sure",on:{click:t.sure}},[t._v("確認兌換")]),t._v(" "),e("div",{staticClass:"bottom-text"},[t._v("金幣可兌換鉆石，兌換比率：1金幣=1鉆石，金幣數量必須為10的整數倍。")]),t._v(" "),e("van-password-input",{directives:[{name:"show",rawName:"v-show",value:t.showKeyboard,expression:"showKeyboard"}],staticClass:"passwrod-input",attrs:{value:t.password,focused:t.showKeyboard},on:{focus:function(s){t.showKeyboard=!0}}}),t._v(" "),e("van-number-keyboard",{attrs:{show:t.showKeyboard},on:{blur:function(s){t.showKeyboard=!1},input:t.onInput,delete:t.onDelete}})],1)},staticRenderFns:[function(){var t=this.$createElement,s=this._self._c||t;return s("div",{staticClass:"crystal"},[s("img",{attrs:{src:e("Yxsz")}})])},function(){var t=this.$createElement,s=this._self._c||t;return s("div",{staticClass:"crystal"},[s("img",{attrs:{src:e("QCm6")}})])}]};var h=e("VU/8")(u,l,!1,function(t){e("Mdy7")},"data-v-9cfce14a",null);s.default=h.exports}});
-//# sourceMappingURL=11.5d316356ba01de644f13.js.map
+webpackJsonp([10],{Mdy7:function(t,s){},RpvA:function(t,s,e){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var a=e("hff3"),i=e("+EAh"),n=e("X2Oc"),r=e("Fd2+"),o=e("KTi7"),c=e("QLzJ"),d=e("Z4iZ"),u={data:function(){return{number:"",gold:0,purse:{},info:{},showKeyboard:!1,password:""}},components:{navigation:a.a},created:function(){document.title="金幣兌換鉆石",this.getInfo(),this.getPurse(),n.a.initNav({type:4,data:{msg:"",link:"",title:"",showUrl:"",imgUrl:"",desc:""}})},methods:{back:function(){this.$router.go(-1)},sure:function(){if(this.number<=0)return this.$toast("兌換數量不可為0");this.showKeyboard=!0},exchange:function(){var t=this;r.b.loading({message:"加載中...",forbidClick:!0});var s="";s=Object(d.b)().app?Object(o.a)(this.password,"1ea53d260ecf11e7b56e00163e046a26"):Object(c.a)(this.password+"");var e={uid:window.sessionStorage.getItem("uid"),changeNum:this.number,paymentPwd:s,changeType:2};Object(i.d)(e).then(function(s){null!=s.data.data?(r.b.clear,Object(r.b)("兌換成功"),t.getPurse()):(r.b.clear,Object(r.b)(s.data.message),t.$message.error(s.data.message))})},getPurse:function(){var t=this;Object(i.r)({uid:window.sessionStorage.getItem("uid")}).then(function(s){null!=s.data?(t.purse=s.data.data,window.console.log(t.purse)):t.$message.error(s.data.message)})},getInfo:function(){this.info.uid=n.a.tools.nativeUtils.getUid(),this.info.ticket=n.a.tools.nativeUtils.getTicket()},onInput:function(t){this.password=(this.password+t).slice(0,6),6==this.password.length&&(this.showKeyboard=!1,this.exchange(),this.password="")},onDelete:function(){this.password=this.password.slice(0,this.password.length-1)}}},l={render:function(){var t=this,s=t.$createElement,e=t._self._c||s;return e("div",{staticClass:"box-all"},[this.$store.state.isApp?t._e():e("navigation",{attrs:{title:"金幣兌換鉆石",rightTitle:""}}),t._v(" "),e("div",{staticClass:"crystal-father"},[t._m(0),t._v(" "),e("span",{staticClass:"crystal-text"},[t._v("余額:")]),t._v(" "),e("span",{staticClass:"crystal-number"},[t._v(t._s(t.purse.golds))])]),t._v(" "),e("div",{staticClass:"input-number"},[e("input",{directives:[{name:"model",rawName:"v-model",value:t.number,expression:"number"}],staticClass:"number",attrs:{placeholder:"請輸入兌換的金幣數量"},domProps:{value:t.number},on:{input:function(s){s.target.composing||(t.number=s.target.value)}}})]),t._v(" "),e("div",{staticClass:"diamond"},[t._m(1),t._v(" "),e("span",{staticClass:"crystal-text"},[t._v("余額:")]),t._v(" "),e("span",{staticClass:"crystal-number"},[t._v(t._s(t.purse.diamonds))])]),t._v(" "),e("div",{staticClass:"sure",on:{click:t.sure}},[t._v("確認兌換")]),t._v(" "),e("div",{staticClass:"bottom-text"},[t._v("金幣可兌換鉆石，兌換比率：1金幣=1鉆石，金幣數量必須為10的整數倍。")]),t._v(" "),e("van-password-input",{directives:[{name:"show",rawName:"v-show",value:t.showKeyboard,expression:"showKeyboard"}],staticClass:"passwrod-input",attrs:{value:t.password,focused:t.showKeyboard},on:{focus:function(s){t.showKeyboard=!0}}}),t._v(" "),e("van-number-keyboard",{attrs:{show:t.showKeyboard},on:{blur:function(s){t.showKeyboard=!1},input:t.onInput,delete:t.onDelete}})],1)},staticRenderFns:[function(){var t=this.$createElement,s=this._self._c||t;return s("div",{staticClass:"crystal"},[s("img",{attrs:{src:e("Yxsz")}})])},function(){var t=this.$createElement,s=this._self._c||t;return s("div",{staticClass:"crystal"},[s("img",{attrs:{src:e("QCm6")}})])}]};var h=e("VU/8")(u,l,!1,function(t){e("Mdy7")},"data-v-9cfce14a",null);s.default=h.exports}});
+//# sourceMappingURL=10.f6e85397f46b6b94d58d.js.map
--- a/view/molistar/modules/myincome/static/js/11.a5e798e367bdaa3003e9.js
+++ b/view/molistar/modules/myincome/static/js/11.a5e798e367bdaa3003e9.js
@@ -1,2 +1,2 @@
-webpackJsonp([12],{CXh3:function(t,n,a){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var v={created:function(){document.title="領獎說明"},components:{navigation:a("hff3").a}},s={render:function(){var t=this,n=t.$createElement,a=t._self._c||n;return a("div",{staticClass:"wrap"},[this.$store.state.isApp?t._e():a("navigation",{attrs:{title:"領獎說明"}}),t._v(" "),a("div",{staticClass:"part-title nomt"},[t._v("一、領獎綁定說明")]),t._v(" "),a("p",[t._v("\n    1.領獎前請前往app設置支付密碼、實名認證和綁定支付寶。\n  ")]),t._v(" "),a("p",[t._v("\n    2.綁定時務必確保所填信息有效，填寫資料錯誤導致的提現失敗損失將由用戶自行承擔。\n  ")]),t._v(" "),a("p",[t._v("\n    3.修改支付寶賬號時，暫不支持對賬號主體(即真實姓名和身份證號)進行修改。\n  ")]),t._v(" "),a("div",{staticClass:"part-title"},[t._v("二、領獎規則")]),t._v(" "),a("p",[t._v("\n    1.用戶賬戶內可領獎金額大於等於10元時，可申請領獎，每次領獎按聽獎金額的6.5%收取交易手續費。\n  ")]),t._v(" "),a("p",[t._v("\n    2.用戶隨時可申請提現，每周可提現5次，提交申請後審核及到賬時間為1個工作日內，具體到賬時間以綁定的支付寶賬號的到賬時間為準。\n  ")]),t._v(" "),a("div",{staticClass:"part-title"},[t._v("三、領獎審核不通過的原因")]),t._v(" "),t._m(0),t._v(" "),a("p",[t._v("\n    2.如平臺檢測到用戶的molistar賬戶有作弊或異常狀況，平臺將拒絕該用戶對收益進行提現。\n  ")]),t._v(" "),a("p",[t._v("3.如對領獎金額有疑問，可聯系在線客服並提供相關信息進行查詢。")]),t._v(" "),a("p",[t._v("\n    4.molistar有權依據國家政策、技術條件、產品功能等變化需要而對本說明進行修改並將修改後的說明予以發布，並對具體獎金發放規則及《領獎說明》擁有最終解釋權。\n  ")])],1)},staticRenderFns:[function(){var t=this,n=t.$createElement,a=t._self._c||n;return a("div",[a("p",[t._v("1.支付寶賬號未完成實名認證或開啟了隱私保護功能。")]),t._v(" "),a("p",{staticClass:"a"},[t._v("解決辦法：")]),t._v(" "),a("p",{staticClass:"b"},[t._v("（1）完成支付寶收款賬號實名認證")]),t._v(" "),a("p",{staticClass:"b c"},[t._v("（2）前往支付寶→我的→設置→開啟【通過手機號找到我】")]),t._v(" "),a("p",{staticClass:"b"},[t._v("（3）完成上述操作後，可重新進行領獎申請")])])}]};var e=a("VU/8")(v,s,!1,function(t){a("T94n")},"data-v-5bdeda0f",null);n.default=e.exports},T94n:function(t,n){}});
-//# sourceMappingURL=12.b16a14104ab77a57b8a2.js.map
+webpackJsonp([11],{CXh3:function(t,n,a){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var v={created:function(){document.title="領獎說明"},components:{navigation:a("hff3").a}},s={render:function(){var t=this,n=t.$createElement,a=t._self._c||n;return a("div",{staticClass:"wrap"},[this.$store.state.isApp?t._e():a("navigation",{attrs:{title:"領獎說明"}}),t._v(" "),a("div",{staticClass:"part-title nomt"},[t._v("一、領獎綁定說明")]),t._v(" "),a("p",[t._v("\n    1.領獎前請前往app設置支付密碼、實名認證和綁定支付寶。\n  ")]),t._v(" "),a("p",[t._v("\n    2.綁定時務必確保所填信息有效，填寫資料錯誤導致的提現失敗損失將由用戶自行承擔。\n  ")]),t._v(" "),a("p",[t._v("\n    3.修改支付寶賬號時，暫不支持對賬號主體(即真實姓名和身份證號)進行修改。\n  ")]),t._v(" "),a("div",{staticClass:"part-title"},[t._v("二、領獎規則")]),t._v(" "),a("p",[t._v("\n    1.用戶賬戶內可領獎金額大於等於10元時，可申請領獎，每次領獎按聽獎金額的6.5%收取交易手續費。\n  ")]),t._v(" "),a("p",[t._v("\n    2.用戶隨時可申請提現，每周可提現5次，提交申請後審核及到賬時間為1個工作日內，具體到賬時間以綁定的支付寶賬號的到賬時間為準。\n  ")]),t._v(" "),a("div",{staticClass:"part-title"},[t._v("三、領獎審核不通過的原因")]),t._v(" "),t._m(0),t._v(" "),a("p",[t._v("\n    2.如平臺檢測到用戶的molistar賬戶有作弊或異常狀況，平臺將拒絕該用戶對收益進行提現。\n  ")]),t._v(" "),a("p",[t._v("3.如對領獎金額有疑問，可聯系在線客服並提供相關信息進行查詢。")]),t._v(" "),a("p",[t._v("\n    4.molistar有權依據國家政策、技術條件、產品功能等變化需要而對本說明進行修改並將修改後的說明予以發布，並對具體獎金發放規則及《領獎說明》擁有最終解釋權。\n  ")])],1)},staticRenderFns:[function(){var t=this,n=t.$createElement,a=t._self._c||n;return a("div",[a("p",[t._v("1.支付寶賬號未完成實名認證或開啟了隱私保護功能。")]),t._v(" "),a("p",{staticClass:"a"},[t._v("解決辦法：")]),t._v(" "),a("p",{staticClass:"b"},[t._v("（1）完成支付寶收款賬號實名認證")]),t._v(" "),a("p",{staticClass:"b c"},[t._v("（2）前往支付寶→我的→設置→開啟【通過手機號找到我】")]),t._v(" "),a("p",{staticClass:"b"},[t._v("（3）完成上述操作後，可重新進行領獎申請")])])}]};var e=a("VU/8")(v,s,!1,function(t){a("T94n")},"data-v-5bdeda0f",null);n.default=e.exports},T94n:function(t,n){}});
+//# sourceMappingURL=11.a5e798e367bdaa3003e9.js.map
--- a/view/molistar/modules/myincome/static/js/12.b8ac2b08a54dd44dc799.js
+++ b/view/molistar/modules/myincome/static/js/12.b8ac2b08a54dd44dc799.js
--- a/view/molistar/modules/myincome/static/js/2.eea361aea4038663de01.js
+++ b/view/molistar/modules/myincome/static/js/2.eea361aea4038663de01.js
--- a/view/molistar/modules/myincome/static/js/3.00bcf5022e7d98b672a2.js
+++ b/view/molistar/modules/myincome/static/js/3.00bcf5022e7d98b672a2.js
--- a/view/molistar/modules/myincome/static/js/3.a4c2cd2893242b26adcb.js
+++ b/view/molistar/modules/myincome/static/js/3.a4c2cd2893242b26adcb.js
--- a/view/molistar/modules/myincome/static/js/4.c9d5b75efaa28b779e79.js
+++ b/view/molistar/modules/myincome/static/js/4.c9d5b75efaa28b779e79.js
--- a/view/molistar/modules/myincome/static/js/5.93d874959b80a4ee1da1.js
+++ b/view/molistar/modules/myincome/static/js/5.93d874959b80a4ee1da1.js
--- a/view/molistar/modules/myincome/static/js/6.de3228ef1e13c7d6649c.js
+++ b/view/molistar/modules/myincome/static/js/6.de3228ef1e13c7d6649c.js
--- a/view/molistar/modules/myincome/static/js/7.a1746a1c89c587b75f6f.js
+++ b/view/molistar/modules/myincome/static/js/7.a1746a1c89c587b75f6f.js
--- a/view/molistar/modules/myincome/static/js/8.67319477a4c5ac59b510.js
+++ b/view/molistar/modules/myincome/static/js/8.67319477a4c5ac59b510.js
@@ -1,2 +1,2 @@
-webpackJsonp([7],{"4pWt":function(t,e){},CroZ:function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=i("+EAh"),n=i("Fd2+");i("7+uW").a.use(n.c);var o=null,a={data:function(){return{phone:"",code:"",getCodeTitle:"獲取驗證碼",styleCode:!0}},methods:{blurBtn:function(){setTimeout(function(){var t=document.documentElement.scrollTop||document.body.scrollTop||0;window.scrollTo(0,Math.max(t-1,0))},100)},getCode:function(){var t=this;if(this.styleCode){/^[1]([3-9])[0-9]{9}$/.test(this.phone)?(this.styleCode=!1,Object(s.h)({mobile:this.phone,type:1}).then(function(e){200===e.data.code&&(Object(n.b)(e.data.message),t.timer())})):Object(n.b)("請輸入正確的手機號")}},logining:function(){var t=this;/^[1]([3-9])[0-9]{9}$/.test(this.phone)?(n.b.loading({message:"loading",forbidClick:!0}),Object(s.p)({mobile:this.phone,code:this.code}).then(function(e){if(200===e.data.code){window.sessionStorage.clear(),info.ticket=e.data.data.token,info.uid=e.data.data.uid,window.sessionStorage.setItem("uid",info.uid),window.sessionStorage.setItem("ticket",info.ticket),window.sessionStorage.setItem("jurisdiction","h5");var i=setTimeout(function(){t.$router.replace({path:"/MyIncome"}),n.b.clear(),clearTimeout(i)},600)}}).catch(function(t){503===t.code&&Object(n.b)("該手機號未註冊\n請先去molistar完成註冊")})):Object(n.b)("請輸入正確的手機號")},timer:function(){var t=this,e=60;clearInterval(o),this.getCodeTitle="重新獲取("+e+"s)",o=setInterval(function(){e--,t.getCodeTitle="重新獲取("+e+"s)",e<=0&&(clearInterval(o),t.styleCode=!0,t.getCodeTitle="獲取驗證碼")},1e3)}}},c={render:function(){var t=this,e=t.$createElement,s=t._self._c||e;return s("div",[s("img",{attrs:{src:i("Nl6a")}}),t._v(" "),s("p",{staticClass:"tit"},[t._v("登錄molistar")]),t._v(" "),s("div",{staticClass:"max"},[s("div",{staticClass:"phone"},[s("input",{directives:[{name:"model",rawName:"v-model",value:t.phone,expression:"phone"}],attrs:{type:"type",maxlength:"11",placeholder:"請輸入手機號碼"},domProps:{value:t.phone},on:{blur:t.blurBtn,input:function(e){e.target.composing||(t.phone=e.target.value)}}})]),t._v(" "),s("div",{staticClass:"phone_code"},[s("input",{directives:[{name:"model",rawName:"v-model",value:t.code,expression:"code"}],attrs:{type:"type",maxlength:"5",placeholder:"請輸入驗證碼"},domProps:{value:t.code},on:{blur:t.blurBtn,input:function(e){e.target.composing||(t.code=e.target.value)}}}),t._v(" "),s("span",{staticClass:"get-code",on:{click:function(e){return t.getCode()}}},[t._v(t._s(t.getCodeTitle))])])]),t._v(" "),s("p",{staticClass:"btn",attrs:{"data-lg":"1"},on:{click:t.logining}},[t._v("登錄")]),t._v(" "),t._m(0),t._v(" "),t._m(1),t._v(" "),t._m(2)])},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("p",{staticClass:"message"},[this._v("\n    驗證碼錯誤或者過期\n    "),e("span")])},function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"pop1"},[e("div",{staticClass:"content"},[e("div",{staticClass:"message_"}),this._v(" "),e("p",{staticClass:"check1",attrs:{id:"confirm1"}},[this._v("確定")])])])},function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"contact"},[e("p",[this._v("molistar客服微信號：molistarkefu01")]),this._v(" "),e("p",[e("span",[this._v("粵網文:(2018)8220-2981號")]),this._v(" "),e("span",[e("a",{attrs:{href:"http://www.beian.miit.gov.cn"}},[this._v("粵ICP備20032171")])])])])}]};var r=i("VU/8")(a,c,!1,function(t){i("4pWt")},"data-v-3914fcb0",null);e.default=r.exports},Nl6a:function(t,e,i){t.exports=i.p+"static/fonts/login.e6f4fdc.png"}});
-//# sourceMappingURL=7.770781e704ff5805cd00.js.map
+webpackJsonp([8],{"4pWt":function(t,e){},CroZ:function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=i("+EAh"),n=i("Fd2+");i("7+uW").a.use(n.c);var o=null,a={data:function(){return{phone:"",code:"",getCodeTitle:"獲取驗證碼",styleCode:!0}},methods:{blurBtn:function(){setTimeout(function(){var t=document.documentElement.scrollTop||document.body.scrollTop||0;window.scrollTo(0,Math.max(t-1,0))},100)},getCode:function(){var t=this;if(this.styleCode){/^[1]([3-9])[0-9]{9}$/.test(this.phone)?(this.styleCode=!1,Object(s.h)({mobile:this.phone,type:1}).then(function(e){200===e.data.code&&(Object(n.b)(e.data.message),t.timer())})):Object(n.b)("請輸入正確的手機號")}},logining:function(){var t=this;/^[1]([3-9])[0-9]{9}$/.test(this.phone)?(n.b.loading({message:"loading",forbidClick:!0}),Object(s.q)({mobile:this.phone,code:this.code}).then(function(e){if(200===e.data.code){window.sessionStorage.clear(),info.ticket=e.data.data.token,info.uid=e.data.data.uid,window.sessionStorage.setItem("uid",info.uid),window.sessionStorage.setItem("ticket",info.ticket),window.sessionStorage.setItem("jurisdiction","h5");var i=setTimeout(function(){t.$router.replace({path:"/MyIncome"}),n.b.clear(),clearTimeout(i)},600)}}).catch(function(t){503===t.code&&Object(n.b)("該手機號未註冊\n請先去molistar完成註冊")})):Object(n.b)("請輸入正確的手機號")},timer:function(){var t=this,e=60;clearInterval(o),this.getCodeTitle="重新獲取("+e+"s)",o=setInterval(function(){e--,t.getCodeTitle="重新獲取("+e+"s)",e<=0&&(clearInterval(o),t.styleCode=!0,t.getCodeTitle="獲取驗證碼")},1e3)}}},c={render:function(){var t=this,e=t.$createElement,s=t._self._c||e;return s("div",[s("img",{attrs:{src:i("Nl6a")}}),t._v(" "),s("p",{staticClass:"tit"},[t._v("登錄molistar")]),t._v(" "),s("div",{staticClass:"max"},[s("div",{staticClass:"phone"},[s("input",{directives:[{name:"model",rawName:"v-model",value:t.phone,expression:"phone"}],attrs:{type:"type",maxlength:"11",placeholder:"請輸入手機號碼"},domProps:{value:t.phone},on:{blur:t.blurBtn,input:function(e){e.target.composing||(t.phone=e.target.value)}}})]),t._v(" "),s("div",{staticClass:"phone_code"},[s("input",{directives:[{name:"model",rawName:"v-model",value:t.code,expression:"code"}],attrs:{type:"type",maxlength:"5",placeholder:"請輸入驗證碼"},domProps:{value:t.code},on:{blur:t.blurBtn,input:function(e){e.target.composing||(t.code=e.target.value)}}}),t._v(" "),s("span",{staticClass:"get-code",on:{click:function(e){return t.getCode()}}},[t._v(t._s(t.getCodeTitle))])])]),t._v(" "),s("p",{staticClass:"btn",attrs:{"data-lg":"1"},on:{click:t.logining}},[t._v("登錄")]),t._v(" "),t._m(0),t._v(" "),t._m(1),t._v(" "),t._m(2)])},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("p",{staticClass:"message"},[this._v("\n    驗證碼錯誤或者過期\n    "),e("span")])},function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"pop1"},[e("div",{staticClass:"content"},[e("div",{staticClass:"message_"}),this._v(" "),e("p",{staticClass:"check1",attrs:{id:"confirm1"}},[this._v("確定")])])])},function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"contact"},[e("p",[this._v("molistar客服微信號：molistarkefu01")]),this._v(" "),e("p",[e("span",[this._v("粵網文:(2018)8220-2981號")]),this._v(" "),e("span",[e("a",{attrs:{href:"http://www.beian.miit.gov.cn"}},[this._v("粵ICP備20032171")])])])])}]};var r=i("VU/8")(a,c,!1,function(t){i("4pWt")},"data-v-3914fcb0",null);e.default=r.exports},Nl6a:function(t,e,i){t.exports=i.p+"static/fonts/login.e6f4fdc.png"}});
+//# sourceMappingURL=8.67319477a4c5ac59b510.js.map
--- a/view/molistar/modules/myincome/static/js/9.cf187b6df4a386b203eb.js
+++ b/view/molistar/modules/myincome/static/js/9.cf187b6df4a386b203eb.js
--- a/view/molistar/modules/myincome/static/js/9.d02156509389fc441584.js
+++ b/view/molistar/modules/myincome/static/js/9.d02156509389fc441584.js
--- a/view/molistar/modules/myincome/static/js/app.36f760d4e09081923bc4.js
+++ b/view/molistar/modules/myincome/static/js/app.36f760d4e09081923bc4.js
--- a/view/molistar/modules/myincome/static/js/app.fb0c39d74d91f565e73d.js
+++ b/view/molistar/modules/myincome/static/js/app.fb0c39d74d91f565e73d.js
--- a/view/molistar/modules/myincome/static/js/manifest.8636e2a48ad2f09d6dbf.js
+++ b/view/molistar/modules/myincome/static/js/manifest.8636e2a48ad2f09d6dbf.js
@@ -1,3 +1,4 @@
+<<<<<<< HEAD:view/molistar/modules/myincome/static/js/manifest.525e73ccaf627848d5f0.js
 <<<<<<<< HEAD:view/molistar/modules/myincome/static/js/manifest.525e73ccaf627848d5f0.js
 !function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.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);s.length;)s.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:"b040ea26506725a01e07",1:"c2ef46c6dcac24931ba4",2:"17debe0f6011a97521e8",3:"a4c2cd2893242b26adcb",4:"1c8935faedda18361064",5:"23033c432e0012f87baf",6:"0e7ac399b5d59483b7f2",7:"770781e704ff5805cd00",8:"4218eb5becaddd649623",9:"d02156509389fc441584",10:"9f5644b8d8539a302508",11:"5d316356ba01de644f13",12:"b16a14104ab77a57b8a2"}[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.525e73ccaf627848d5f0.js.map
@@ -5,3 +6,7 @@
 !function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,d,i,u=0,s=[];u<r.length;u++)d=r[u],t[d]&&s.push(t[d][0]),t[d]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(u=0;u<c.length;u++)i=o(o.s=c[u]);return i};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:"9b42e162ef90c3d92a52",1:"c2ef46c6dcac24931ba4",2:"17debe0f6011a97521e8",3:"a4c2cd2893242b26adcb",4:"1c8935faedda18361064",5:"eb4d2db2d0f2e08dfd03",6:"0e7ac399b5d59483b7f2",7:"770781e704ff5805cd00",8:"4218eb5becaddd649623",9:"d02156509389fc441584",10:"9f5644b8d8539a302508",11:"5d316356ba01de644f13",12:"b16a14104ab77a57b8a2"}[e]+".js";var f=setTimeout(d,12e4);function d(){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=d,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.0e3fcb793d88e03113b5.js.map
 >>>>>>>> 31560ab (邀请活动暂存):view/molistar/modules/myincome/static/js/manifest.0e3fcb793d88e03113b5.js
+=======
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.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);s.length;)s.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:"30fbedff4ed0e375ac3d",1:"ce0f0d5501b525a3996c",2:"eea361aea4038663de01",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.8636e2a48ad2f09d6dbf.js.map
+>>>>>>> 756786d (完成账单):view/molistar/modules/myincome/static/js/manifest.8636e2a48ad2f09d6dbf.js
--- a/view/molistar/modules/myincome/static/js/vendor.8540296f0c06d331c2b6.js
+++ b/view/molistar/modules/myincome/static/js/vendor.8540296f0c06d331c2b6.js
--- a/view/molistar/vue-project/myincome/src/i18n/langs/ar.js
+++ b/view/molistar/vue-project/myincome/src/i18n/langs/ar.js
@@ -1,5 +1,7 @@
 const ar = {
    diamondLog: {
+        禮物總價值: "إجمالي قيمة الهدية",
+        邀請活動: "فعالية الدعوة",
        房間禮物支出: "نفقات هدايا الغرفة",
        總收入: "إجمالي الدخل:",
        總支出: "إجمالي المصروفات:",
--- a/view/molistar/vue-project/myincome/src/i18n/langs/en.js
+++ b/view/molistar/vue-project/myincome/src/i18n/langs/en.js
@@ -1,5 +1,7 @@
 const en = {
    diamondLog: {
+        禮物總價值: "Total gift value",
+        邀請活動: "Invitation event",
        房間禮物支出: "Room gift expense",
        總收入: "Total income:",
        總支出: "Total expense:",
--- a/view/molistar/vue-project/myincome/src/i18n/langs/zh.js
+++ b/view/molistar/vue-project/myincome/src/i18n/langs/zh.js
@@ -1,5 +1,7 @@
 const zh = {
  diamondLog: {
+    禮物總價值: "禮物總價值",
+    邀請活動: "邀請活動",
    房間禮物支出: "房間禮物支出",
    總收入: "總收入",
    總支出: "總支出",
--- a/view/molistar/vue-project/myincome/src/utils/request.js
+++ b/view/molistar/vue-project/myincome/src/utils/request.js
@@ -24,7 +24,7 @@ const service = axios.create({
 service.interceptors.request.use(config => {
    if (router.apps[0]._route.name === 'Login') {
        config.headers = {}
-    } else if (false) {//!checkVersion().app
+    } else if (!checkVersion().app) {//false
        if (router.apps[0]._route.name === 'WithDrawInfoBind' && config.url == `/sms/verify` || config.url == `/sms/getCode`) {
            config.headers = {
                'h5_token': window.sessionStorage.getItem('ticket'),
--- a/view/molistar/vue-project/myincome/src/view/myincome/DiamondLog.vue
+++ b/view/molistar/vue-project/myincome/src/view/myincome/DiamondLog.vue
@@ -37,7 +37,7 @@
      v-for="(res, i) in list"
      :key="i"
    >
-      <div :class="i == 0 ? 'titleNum titleNumF' : 'titleNum'">
+      <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>
@@ -48,7 +48,15 @@
          <b>{{ res.totalAmount }}</b>
          <img src="@/assets/img/gold.png" alt="" />
        </div>
+        <div class="left" v-show="tabAct == 4">
+          <span>{{ $t("diamondLog.禮物總價值") }}</span>
+          <b>{{ res.totalAmount }}</b>
+          <img src="@/assets/img/gold.png" alt="" />
+        </div>
        <div class="right">{{ res.date }}</div>
+        <div class="noMore" v-show="res.recordList.length == 0">
+          {{ $t("diamondLog.沒有更多了") }}
+        </div>
      </div>
      <div
        class="recordList"
@@ -210,6 +218,7 @@ export default {
      138: this.$t("diamondLog.购买房间背景"),
      139: this.$t("diamondLog.自定义房间背景"),
      90: this.$t("diamondLog.轉贈金幣給"),
+      144: this.$t("diamondLog.邀請活動"),
    };
    this.getLastSevenDaysTimestamps(2);
    this.getDate(2);
@@ -296,27 +305,32 @@ export default {
      })
        .then((res) => {
          if (res.data.code === 200) {
-            type == 1
-              ? this.list.push(res.data.data)
-              : (this.list = res.data.data);
-            if (this.page == 1 && res.data.data.length == 0) {
-              this.lock = false;
-              this.dateLists = false;
+            if (this.page == 1) {
+              this.list = res.data.data;
+            } else {
+              if (res.data.data.length >= 1) {
+                this.list = this.mergeArrays(this.list, res.data.data);
+              }
+            }
+            if (this.page == 1 && res.data.data.length == 0) {
+              this.dateLists = false;
+              this.lock = false;
            } else {
-              this.lock = true;
              this.dateLists = true;
+              this.lock = true;
              if (res.data.data.length == 0) {
                this.lock = false;
              }
            }
          } else {
+            this.lock = true;
            Toast(res.data.message);
          }
          this.loading = false;
        })
        .catch((err) => {
-          this.lock = true;
          this.loading = false;
+          this.lock = true;
        });
    },
    mergeArrays(arr1, arr2) {
@@ -365,6 +379,7 @@ export default {
    },
    timeClickOk() {
      this.timeListLoad = false;
+       this.currentIndex = null;
      this.tabAct == 4 ? this.giftReceiveFun(2) : this.getDate(2);
    },
    objTypeFun(val) {
@@ -392,6 +407,7 @@ export default {
  overflow-y: auto;
 }
 .tab {
+  z-index: 1;
  width: 375px;
  height: 38px;
  background: #fff;
@@ -571,6 +587,7 @@ ul {
    padding: 0 16px;
    border-bottom: none;
    margin: 0 auto 0;
+    position: relative;
    .left {
      height: 100%;
      line-height: 38px;
@@ -601,6 +618,19 @@ ul {
      font-size: 14px;
      font-weight: 500;
    }
+    .noMore {
+      position: absolute;
+      width: 100%;
+      height: 42px;
+      line-height: 42px;
+      text-align: center;
+      color: #7b7b7d;
+      font-size: 13px;
+      font-weight: 400;
+      background: #fff;
+      left: 0;
+      bottom: -42px;
+    }
  }
  .titleNumF {
    margin: 1.72rem auto 0;
@@ -651,16 +681,6 @@ ul {
      font-weight: 400;
    }
  }
-  .noMore {
-    width: 100%;
-    height: 42px;
-    line-height: 42px;
-    text-align: center;
-    color: #7b7b7d;
-    font-size: 13px;
-    font-weight: 400;
-    background: #fff;
-  }
 }
 .loading {
  position: fixed;
--- a/view/molistar/vue-project/myincome/src/view/myincome/GoldLog.vue
+++ b/view/molistar/vue-project/myincome/src/view/myincome/GoldLog.vue
@@ -33,7 +33,7 @@
      v-for="(res, i) in list"
      :key="i"
    >
-      <div :class="i == 0 ? 'titleNum titleNumF' : 'titleNum'">
+      <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>
@@ -44,7 +44,15 @@
          <b>{{ res.totalAmount }}</b>
          <img src="@/assets/img/diamond.png" alt="" />
        </div>
+        <div class="left" v-show="tabAct == 4">
+          <span>{{ $t("diamondLog.禮物總價值") }}</span>
+          <b>{{ res.totalAmount }}</b>
+          <img src="@/assets/img/diamond.png" alt="" />
+        </div>
        <div class="right">{{ res.date }}</div>
+        <div class="noMore" v-show="res.recordList.length == 0">
+          {{ $t("diamondLog.沒有更多了") }}
+        </div>
      </div>
      <div
        class="recordList"
@@ -70,9 +78,12 @@
          <div class="r">{{ formatDate(item.date, 1) }}</div>
        </div>
      </div>
-      <div class="noMore" v-show="res.recordList.length == 0">
+      <!-- <div
+        class="noMore"
+        v-show="!res.recordList || res.recordList.length == 0"
+      >
        {{ $t("diamondLog.沒有更多了") }}
-      </div>
+      </div> -->
    </div>
    <div class="dateLists" v-show="dateLists == false">
      <img src="@/assets/img/nodate.png" alt="" />
@@ -128,8 +139,8 @@ export default {
    this.$i18n.locale = window.sessionStorage.getItem("language");
  },
  created() {
-    this.$i18n.locale = window.sessionStorage.getItem("language");
-    document.title = this.$route.meta.title;
+   this.$i18n.locale = window.sessionStorage.getItem("language");
+    document.title = this.$t("goldLog.鉆石記錄");
    this.describeMap = {
      4: this.$t("goldLog.房間收禮物收入"),
      6: this.$t("goldLog.私聊禮物收入"),
@@ -171,20 +182,19 @@ export default {
    formatDate,
    // tab切换按钮
    cutTab(type) {
-      console.log(type);
      this.tabAct = type;
      this.time = null;
      this.lock = true;
      this.page = 1;
+      this.list = [];
      if (this.tabAct == 4) {
-        console.log(this.giftReceiveFun);
-        this.giftReceiveFun();
+        this.giftReceiveFun(2);
      } else {
-        this.getDate();
+        this.getDate(2);
      }
    },
    // 查询接口
-    getDate() {
+    getDate(type) {
      this.loading = true;
      this.lock = false;
      diamondLog({
@@ -197,7 +207,13 @@ export default {
      })
        .then((res) => {
          if (res.data.code === 200) {
-            this.list = res.data.data;
+            if (this.page == 1) {
+              this.list = res.data.data;
+            } else {
+              if (res.data.data.length >= 1) {
+                this.list = this.mergeArrays(this.list, res.data.data);
+              }
+            }
            if (this.page == 1 && res.data.data.length == 0) {
              this.dateLists = false;
              this.lock = false;
@@ -220,7 +236,7 @@ export default {
        });
    },
    // 查询接口
-    giftReceiveFun() {
+    giftReceiveFun(type) {
      this.lock = false;
      this.loading = true;
      giftReceiveGet({
@@ -230,28 +246,48 @@ export default {
      })
        .then((res) => {
          if (res.data.code === 200) {
-            this.list = res.data.data;
-            console.log(res.data.data);
-            if (this.page == 1 && res.data.data.length == 0) {
-              this.lock = false;
-              this.dateLists = false;
+            if (this.page == 1) {
+              this.list = res.data.data;
+            } else {
+              if (res.data.data.length >= 1) {
+                this.list = this.mergeArrays(this.list, res.data.data);
+              }
+            }
+            if (this.page == 1 && res.data.data.length == 0) {
+              this.dateLists = false;
+              this.lock = false;
            } else {
-              this.lock = true;
              this.dateLists = true;
+              this.lock = true;
              if (res.data.data.length == 0) {
                this.lock = false;
              }
            }
          } else {
+            this.lock = true;
            Toast(res.data.message);
          }
          this.loading = false;
        })
        .catch((err) => {
-          this.lock = true;
          this.loading = false;
+          this.lock = true;
        });
    },
+    mergeArrays(arr1, arr2) {
+      const resultMap = new Map();
+      [...arr1, ...arr2].forEach((item) => {
+        if (resultMap.has(item.date)) {
+          const existing = resultMap.get(item.date);
+          existing.recordList = [...existing.recordList, ...item.recordList];
+          existing.totalAmount += item.totalAmount;
+        } else {
+          resultMap.set(item.date, { ...item });
+        }
+      });
+
+      return Array.from(resultMap.values());
+    },
    handleScroll(event) {
      const container = event.target; // 获取滚动容器
      if (
@@ -260,11 +296,13 @@ export default {
      ) {
        // 滚动到底部
        console.log("已经到底部");
-        this.page++;
-        if (this.tabAct == 4) {
-          this.giftReceiveFun();
-        } else {
-          this.getDate();
+        if (this.lock) {
+          this.page++;
+          if (this.tabAct == 4) {
+            this.giftReceiveFun(1);
+          } else {
+            this.getDate(1);
+          }
        }
      }
    },
@@ -282,7 +320,8 @@ export default {
    },
    timeClickOk() {
      this.timeListLoad = false;
-      this.tabAct == 4 ? this.giftReceiveFun() : this.getDate();
+       this.currentIndex = null;
+      this.tabAct == 4 ? this.giftReceiveFun(2) : this.getDate(2);
    },
    objTypeFun(val) {
      var str = "";
@@ -309,6 +348,7 @@ export default {
  overflow-y: auto;
 }
 .tab {
+  z-index: 1;
  width: 375px;
  height: 38px;
  background: #fff;
@@ -411,7 +451,7 @@ ul {
        b {
          display: inline-block;
          vertical-align: middle;
-          color: #ff8c03;
+          color: #03AFFF;
          font-size: 16px;
          font-weight: 600;
        }
@@ -452,7 +492,7 @@ ul {
        vertical-align: middle;
      }
      b {
-        color: #ff8c03;
+        color: #03AFFF;
        display: inline-block;
        vertical-align: middle;
      }
@@ -488,6 +528,7 @@ ul {
    padding: 0 16px;
    border-bottom: none;
    margin: 0 auto 0;
+    position: relative;
    .left {
      height: 100%;
      line-height: 38px;
@@ -499,7 +540,7 @@ ul {
        vertical-align: middle;
      }
      b {
-        color: #ff8c03;
+        color: #03AFFF;
        display: inline-block;
        vertical-align: middle;
      }
@@ -518,6 +559,19 @@ ul {
      font-size: 14px;
      font-weight: 500;
    }
+    .noMore {
+      position: absolute;
+      width: 100%;
+      height: 42px;
+      line-height: 42px;
+      text-align: center;
+      color: #7b7b7d;
+      font-size: 13px;
+      font-weight: 400;
+      background: #fff;
+      left: 0;
+      bottom: -42px;
+    }
  }
  .titleNumF {
    margin: 1.72rem auto 0;
@@ -547,7 +601,7 @@ ul {
        b {
          display: inline-block;
          vertical-align: middle;
-          color: #ff8c03;
+          color: #03AFFF;
          font-size: 16px;
          font-weight: 600;
        }
@@ -568,16 +622,6 @@ ul {
      font-weight: 400;
    }
  }
-  .noMore {
-    width: 100%;
-    height: 42px;
-    line-height: 42px;
-    text-align: center;
-    color: #7b7b7d;
-    font-size: 13px;
-    font-weight: 400;
-    background: #fff;
-  }
 }
 .loading {
  position: fixed;
@@ -626,7 +670,7 @@ ul {
        top: 0;
      }
      b {
-        color: #ff8c03;
+        color: #03AFFF;
        z-index: 2;
        position: absolute;
        right: 16px;