From d2f58a58471d1eae85bc204dced75c465d62fdd6 Mon Sep 17 00:00:00 2001
From: boi <boi@ciy.cn>
Date: Wed, 18 Jun 2025 01:40:02 +0800
Subject: [PATCH] update

---
 fapp/ciyon_ap/pages.json                    |   9 ++
 fapp/ciyon_ap/pages/main/me.vue             |  12 +-
 fapp/ciyon_ap/pages/main/me_cash_charge.vue | 119 ++++++++++++++++++++
 fapp/ciyon_ap/pages/main/me_cash_ie.vue     |  92 +++++++++++++++
 fapp/ciyon_ap/pages/main/me_cash_in.vue     |  29 +----
 5 files changed, 229 insertions(+), 32 deletions(-)
 create mode 100644 fapp/ciyon_ap/pages/main/me_cash_charge.vue
 create mode 100644 fapp/ciyon_ap/pages/main/me_cash_ie.vue

diff --git a/fapp/ciyon_ap/pages.json b/fapp/ciyon_ap/pages.json
index c8ff12d..12ed16d 100644
--- a/fapp/ciyon_ap/pages.json
+++ b/fapp/ciyon_ap/pages.json
@@ -18,6 +18,15 @@
     {
       "path": "pages/main/me_cash_bank"
     },
+    {
+      "path": "pages/main/me_cash_charge"
+    },
+    {
+      "path": "pages/main/me_cash_ie",
+      "style": {
+        "enablePullDownRefresh": true
+      }
+    },
     {
       "path": "pages/main/me_cash_in",
       "style": {
diff --git a/fapp/ciyon_ap/pages/main/me.vue b/fapp/ciyon_ap/pages/main/me.vue
index bae716a..5234c3c 100644
--- a/fapp/ciyon_ap/pages/main/me.vue
+++ b/fapp/ciyon_ap/pages/main/me.vue
@@ -21,7 +21,7 @@
 					<ciy-shownum speed="80" :value="me.mycashmoney" unit=",100,2|万,1000000,2|亿,10000000000,2"></ciy-shownum>
 				</view>
 				<view class="num" v-else>---</view>
-				<view class="tit" @tap="gourl" data-url="$/pages/main/me_cash">提现</view>
+				<view class="tit">余额</view>
 			</view>
 			
 			<view>
@@ -66,13 +66,13 @@
 	</view>
 	<view class="maincard" style="min-height:9em;">
 		<view class="ciy-grid">
-			<view class="grid">
+			<view class="grid" @tap="gourl" data-url="$/pages/main/me_cash_charge">
 				<view class="icon" :style="{backgroundImage:svg2bg(svg.ciy)}"></view>
-				<view class="name">图标名称</view>
+				<view class="name">充值</view>
 			</view>
-			<view class="grid">
+			<view class="grid" @tap="gourl" data-url="$/pages/main/me_cash">
 				<view class="icon" :style="{backgroundImage:svg2bg(svg.ciy)}"></view>
-				<view class="name">图标名称</view>
+				<view class="name">提现</view>
 			</view>
 			<view class="grid">
 				<view class="icon" :style="{backgroundImage:svg2bg(svg.ciy)}"></view>
@@ -104,7 +104,7 @@
 	</view>
 	<ciy-swipelist v-if="me.id>0" :icon="svg.ciy" title="实名认证" data-url="$/pages/main/me_real" @tap="gourl" :right="tomsk(me.truename, '#***')" more></ciy-swipelist>
 	<view class="bg5" style="height:0.3em;" v-if="me.id>0"></view>
-	<ciy-swipelist title="收入明细" v-if="me.id>0" @tap="gourl" data-url="$/pages/main/me_cash_in" more></ciy-swipelist>
+	<ciy-swipelist title="收支记录" v-if="me.id>0" @tap="gourl" data-url="$/pages/main/me_cash_ie" more></ciy-swipelist>
 
 	<view class="bg5" style="height:0.3em;"></view>
 	<ciy-swipelist v-if="me.id>0" title="个人信息" @tap="gourl" data-url="$/pages/main/me_info" more></ciy-swipelist>
diff --git a/fapp/ciyon_ap/pages/main/me_cash_charge.vue b/fapp/ciyon_ap/pages/main/me_cash_charge.vue
new file mode 100644
index 0000000..cd114af
--- /dev/null
+++ b/fapp/ciyon_ap/pages/main/me_cash_charge.vue
@@ -0,0 +1,119 @@
+<template>
+	<ciy-header title="充值"></ciy-header>
+	<view v-if="init.code != 1" class="px4 py4">
+		<view style="height:4em;width:100%;" class="ciy-skeleton"></view>
+		<view style="height:8em;width:100%;" class="ciy-skeleton"></view>
+		<view style="height:8em;width:100%;" class="ciy-skeleton"></view>
+	</view>
+	<view v-else>
+		<view class="ciy-card">
+			<view class="content char4">
+				<view class="flex flex-wrap" style="gap:1em;">
+					<view class="fpay" v-for="(item,index) in init.charges" :key="item" @tap="currbuy=index;money=item" :class="{select:currbuy==index}">
+						<view class="money">
+							<text>{{item/100}}</text>元
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="ciy-form">
+				<label>充值金额</label>
+				<view>
+					<ciy-inputbet left bb v-model="money" bet="100" unit="元"></ciy-inputbet>
+				</view>
+			</view>
+			<view class="ciy-form-bottom">
+				<button class="btn lg cc" @tap="paynow">立即充值</button>
+			</view>
+		</view>
+		<view class="ciy-hr"></view>
+		<ciy-swipelist title="充值记录" @tap="gourl" data-url="$/pages/main/me_cash_in" more></ciy-swipelist>
+	</view>
+</template>
+
+<style>
+	.fpay {
+		flex: 1 1 33.33%;
+		text-align: center;
+		background: var(--bg1);
+		border-radius: 0.5em;
+		border: 1px solid var(--bg5);
+		transition: all 0.5s;
+	}
+
+	.fpay.select {
+		border: 1px solid var(--man7);
+	}
+
+	.fpay .money {
+		padding: 2em 0;
+		font-size: 0.8em;
+	}
+
+	.fpay .money>text {
+		font-size: 2em;
+		padding: 0 0.3em;
+		color: var(--man7);
+		font-weight: bold;
+	}
+</style>
+
+<script>
+	export default {
+		data() {
+			return {
+				svg: {},
+				money: 0,
+				currbuy: -1
+			}
+		},
+		onLoad() {
+			this.getinit();
+		},
+		methods: {
+			async getinit() {
+				this.init.charges = [];
+				this.init.charges.push(1000);
+				this.init.charges.push(5000);
+				this.init.charges.push(10000);
+				this.init.charges.push(50000);
+				this.init.code = 1;
+			},
+			async paynow(e) {
+				if(this.money <= 0)
+					return this.toast('请选择或填写金额');
+				if (this._loading)
+					return;
+				this._loading = true;
+				var retjson = await this.callajax({
+					func: 'me.charge_paynow',
+					data: {
+						money: this.money
+					}
+				});
+				this._loading = false;
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+
+				retjson.provider = 'wxpay';
+				try {
+					var retpay = await uni.requestPayment(retjson);
+					await this.sleep(1000);
+					var retjson2 = await this.callajax({
+						func: 'me.charge_paychk',
+						data: {
+							orderid: retjson.orderid
+						}
+					});
+					if (retjson2.code != 1)
+						return this.toast('支付提示: ' + retjson2.errmsg);
+					var app = getApp();
+					var page = app.getpage(1);
+					if (page && page.getbalance)
+						page.getbalance(1);
+					this.toast('充值成功');
+				} catch (e) {}
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/fapp/ciyon_ap/pages/main/me_cash_ie.vue b/fapp/ciyon_ap/pages/main/me_cash_ie.vue
new file mode 100644
index 0000000..ebb90a5
--- /dev/null
+++ b/fapp/ciyon_ap/pages/main/me_cash_ie.vue
@@ -0,0 +1,92 @@
+<template>
+	<ciy-header title="收支明细" ref="header"></ciy-header>
+	<view v-if="init.code != 1">
+		<view class="px4 py4">
+			<view style="height:2em;width:100%;" class="ciy-skeleton"></view>
+			<view style="height:6em;width:100%;" class="ciy-skeleton"></view>
+			<view style="height:6em;width:100%;" class="ciy-skeleton"></view>
+		</view>
+	</view>
+	<view v-else>
+		<view class="sti" :style="{top:(header_statusbar_height+header_title_height)+'px'}">
+			<ciy-segment lis="1.收入,2.支出" all="全部" v-model="liid" @change="segment_change"></ciy-segment>
+		</view>
+		<view class="ciy-list" v-for="(item,index) in init.list" :key="item.id">
+			<view class="l2" style="margin-right: 4em;">{{item.name}}</view>
+			<view class="rt"><text class="code">{{ccode(g.cashietype, item.cashietype)}}</text></view>
+			<view class="lb">{{todatetime(item.addtimes)}}</view>
+			<view class="rb txt-lgg txt-wb">{{item.iemoney/100}}</view>
+		</view>
+		<ciy-listend :page="pageno" :listlen="init.list.length" :nodataimg="file_stor('/img/mbnone.png')"></ciy-listend>
+	</view>
+</template>
+
+<style>
+</style>
+
+<script>
+	export default {
+		data() {
+			return {
+				liid: 0,
+			}
+		},
+		onLoad() {
+			this.liid = this.opn.liid;
+			this.getlist();
+		},
+		onReachBottom(b) {
+			if (this.init.code != 1)
+				return;
+			this.getlist();
+		},
+		onPullDownRefresh(b) {
+			this.pageno = 0;
+			this._stopPullDown = true;
+			this.getlist();
+		},
+		watch: {},
+		computed: {},
+		methods: {
+			async getlist() {
+				if (this.pageno < 0)
+					return;
+				this.pagepost.pageno = this.pageno + 1;
+				this.pagepost.query.liid = this.liid;
+				if (this._loading)
+					return;
+				this._loading = true;
+				var retjson = await this.callajax({
+					func: 'me.cashie_get',
+					data: this.pagepost
+				});
+				this._loading = false;
+				if (retjson.code != 1)
+					return this.alert(retjson.errmsg);
+				this.pageno++;
+				if (this.pageno == 1)
+					this.init.list = [];
+				this.init = this.objdeepmerge(this.init, retjson);
+				if (retjson.list.length < retjson.pagecount)
+					this.pageno = -1;
+			},
+			segment_change() {
+				this.pageno = 0;
+				this.getlist();
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 800
+				});
+			},
+			search_change(e) {
+				this.pagepost.query.key = e.value;
+				this.pageno = 0;
+				this.getlist();
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 800
+				});
+			},
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/fapp/ciyon_ap/pages/main/me_cash_in.vue b/fapp/ciyon_ap/pages/main/me_cash_in.vue
index 1891df8..5f789ad 100644
--- a/fapp/ciyon_ap/pages/main/me_cash_in.vue
+++ b/fapp/ciyon_ap/pages/main/me_cash_in.vue
@@ -1,5 +1,5 @@
 <template>
-	<ciy-header title="收入明细" ref="header"></ciy-header>
+	<ciy-header title="充值记录" ref="header"></ciy-header>
 	<view v-if="init.code != 1">
 		<view class="px4 py4">
 			<view style="height:2em;width:100%;" class="ciy-skeleton"></view>
@@ -8,14 +8,9 @@
 		</view>
 	</view>
 	<view v-else>
-		<view class="sti" :style="{top:(header_statusbar_height+header_title_height)+'px'}">
-			<ciy-segment :lis="g.cashintype" all="全部" v-model="liid" @change="segment_change"></ciy-segment>
-		</view>
 		<view class="ciy-list" v-for="(item,index) in init.list" :key="item.id">
-			<view class="l2" style="margin-right: 4em;">{{item.name}}</view>
-			<view class="rt"><text class="code">{{ccode(g.cashintype, item.cashintype)}}</text></view>
-			<view class="lb">{{todatetime(item.addtimes)}}</view>
-			<view class="rb txt-lgg txt-wb">{{item.cashmoney/100}}</view>
+			<view class="l2"><ciy-showmoney :value="item.inmoney" ciystyle="text-align:left;font-size:1.5em;"></ciy-showmoney></view>
+			<view class="rb">{{todatetime(item.addtimes)}}</view>
 		</view>
 		<ciy-listend :page="pageno" :listlen="init.list.length" :nodataimg="file_stor('/img/mbnone.png')"></ciy-listend>
 	</view>
@@ -29,7 +24,6 @@
 		data() {
 			return {
 				liid: 0,
-				pageno: 0,
 			}
 		},
 		onLoad() {
@@ -71,23 +65,6 @@
 				if (retjson.list.length < retjson.pagecount)
 					this.pageno = -1;
 			},
-			segment_change() {
-				this.pageno = 0;
-				this.getlist();
-				uni.pageScrollTo({
-					scrollTop: 0,
-					duration: 800
-				});
-			},
-			search_change(e) {
-				this.pagepost.query.key = e.value;
-				this.pageno = 0;
-				this.getlist();
-				uni.pageScrollTo({
-					scrollTop: 0,
-					duration: 800
-				});
-			},
 		}
 	}
 </script>
\ No newline at end of file