zs 2 anos atrás
pai
commit
6780269ad9
3 arquivos alterados com 194 adições e 25 exclusões
  1. 6 0
      pages.json
  2. 42 25
      pagesMy/assets/index.vue
  3. 146 0
      pagesMy/assets/info.vue

+ 6 - 0
pages.json

@@ -141,6 +141,12 @@
 						"enablePullDownRefresh": true
 					}
 				},
+				{
+					"path": "assets/info",
+					"style": {
+						"navigationBarTitleText": "资产详情"
+					}
+				},
 				{
 					"path": "dough/index",
 					"style": {

+ 42 - 25
pagesMy/assets/index.vue

@@ -13,12 +13,15 @@
 				<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
 					<view class="list-scroll-view">
 						<view class="list" v-for="(item, index) in list" :key="index">
-							<view class="other">
-								<view class="other_1">返现金额: <text class="money">{{item.money}}</text></view>
-								<view class="other_1">推荐人: <text>{{item.inviter}}</text></view>
-								<view class="other_1">返现时间: <text>{{item.time}}</text></view>
-								<view class="other_1">来源: <text>{{item.zhSource}}</text></view>
-								<view class="other_1">状态: <text>{{item.zhStatus}}</text></view>
+							<view class="other" @tap="toDetail(item)">
+								<view class="other_1">
+									<view class="source">{{item.zhSource}}</view>
+									<view class="time">{{item.time}}</view>
+								</view>
+								<view class="other_2">
+									<view class="money">{{item.money}}</view>
+									<text class="iconfont icon-jiantouyou"></text>
+								</view>
 							</view>
 						</view>
 						<view class="is_bottom" v-if="is_bottom">
@@ -44,8 +47,6 @@
 				skip: 0,
 				limit: 6,
 				page: 0,
-				// 状态
-				statusList: [],
 				// 来源
 				sourceList: [],
 				// 数据是否触底
@@ -53,7 +54,7 @@
 				scrollTop: 0,
 			};
 		},
-		onLoad: async function(e) {
+		onShow: async function(e) {
 			const that = this;
 			that.searchConfig();
 			await that.searchOther();
@@ -104,8 +105,6 @@
 					if (res.errcode == '0') {
 						let list = [...that.list, ...res.data];
 						for (let val of list) {
-							let status = that.statusList.find(i => i.value == val.status)
-							if (status) val.zhStatus = status.label;
 							let source = that.sourceList.find(i => i.value == val.source)
 							if (source) val.zhSource = source.label;
 						}
@@ -122,12 +121,6 @@
 			async searchOther() {
 				const that = this;
 				let res;
-				res = await that.$api(`/dictData`, 'GET', {
-					code: "cashBack_status"
-				});
-				if (res.errcode == '0') {
-					that.$set(that, `statusList`, res.data)
-				}
 				res = await that.$api(`/dictData`, 'GET', {
 					code: "cashBack_source"
 				});
@@ -168,7 +161,15 @@
 				that.$set(that, `skip`, 0)
 				that.$set(that, `limit`, 6)
 				that.$set(that, `page`, 0)
-			}
+			},
+			// 明细
+			toDetail(item) {
+				const that = this;
+				that.clearPage();
+				uni.navigateTo({
+					url: `/pagesMy/assets/info?id=${item._id}`
+				})
+			},
 		},
 		onPullDownRefresh: async function() {
 			const that = this;
@@ -219,24 +220,40 @@
 
 			.list {
 				width: 92vw;
-				border: 0.5vw solid var(--f1Color);
-				margin: 2vw 2vw 0 1.5vw;
+				border-bottom: 0.5vw solid var(--f1Color);
+				margin: 2vw 2vw 0 2vw;
 				padding: 2vw;
 				border-radius: 5px;
 
 				.other {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
 					.other_1 {
 						font-size: var(--font16Size);
 						margin: 0 0 1vw 0;
 
+						.time {
+							margin: 1vw 0 0 0;
+							color: var(--f85Color);
+							font-size: var(--font12Size);
+						}
+					}
+
+					.other_2 {
+						display: flex;
+						align-items: center;
+						width: 10vw;
+
 						.money {
-							color: #ff0000;
+							font-size: var(--font18Size);
+							font-weight: bold;
+							margin: 0 1vw;
 						}
 
-						text {
-							margin: 0 0 0 2vw;
-							color: var(--f85Color);
-							font-size: var(--font14Size);
+						.iconfont {
+							font-size: 16px;
 						}
 					}
 				}

+ 146 - 0
pagesMy/assets/info.vue

@@ -0,0 +1,146 @@
+<template>
+	<mobile-frame>
+		<view class="main">
+			<view class="info">
+				<view class="one">
+					<view class="left">返现金额</view>
+					<view class="right">{{info.money}}</view>
+				</view>
+				<view class="two">
+					<view class="left">状态</view>
+					<view class="right">{{info.zhStatus}}</view>
+				</view>
+				<view class="two">
+					<view class="left">返现时间</view>
+					<view class="right">{{info.time}}</view>
+				</view>
+				<view class="two">
+					<view class="left">推荐人</view>
+					<view class="right">{{info.inviter_name}}</view>
+				</view>
+				<view class="two">
+					<view class="left">来源</view>
+					<view class="right">{{info.zhSource}}</view>
+				</view>
+			</view>
+		</view>
+	</mobile-frame>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				user: {},
+				info: {},
+				// 状态
+				statusList: [],
+				// 来源
+				sourceList: [],
+			};
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.$set(that, `id`, e.id || '');
+			await that.searchOther();
+			await that.watchLogin();
+		},
+		methods: {
+			// 查询其他信息
+			async searchOther() {
+				const that = this;
+				let res;
+				res = await that.$api(`/dictData`, 'GET', {
+					code: "cashBack_status"
+				});
+				if (res.errcode == '0') {
+					that.$set(that, `statusList`, res.data)
+				}
+				res = await that.$api(`/dictData`, 'GET', {
+					code: "cashBack_source"
+				});
+				if (res.errcode == '0') {
+					that.$set(that, `sourceList`, res.data)
+				}
+			},
+			// 监听用户是否登录
+			watchLogin() {
+				const that = this;
+				uni.getStorage({
+					key: 'token',
+					success: async function(res) {
+						let user = that.$jwt(res.data);
+						if (user) {
+							that.$set(that, `user`, user);
+							if (that.id) {
+								let arr = await that.$api(`/cashBack/${that.id}`, 'GET')
+								if (arr.errcode == '0') {
+									let status = that.statusList.find(i => i.value == arr.data.status)
+									if (status) arr.data.zhStatus = status.label;
+									let source = that.sourceList.find(i => i.value == arr.data.source)
+									if (source) arr.data.zhSource = source.label;
+									// 查询推荐人信息
+									let res = await that.$api(`/user/${arr.data.inviter}`, 'GET');
+									if (res.errcode == '0') arr.data.inviter_name = res.data.name
+									that.$set(that, `info`, arr.data)
+								}
+							}
+						}
+					},
+					fail: function(err) {
+						uni.navigateTo({
+							url: `/pages/login/index`
+						})
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.main {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
+
+		.info {
+			padding: 2vw;
+
+			.one {
+				display: flex;
+				justify-content: space-between;
+				padding: 10vw 2vw;
+				border-bottom: 0.5vw solid var(--f1Color);
+
+				.left {
+					color: #696969;
+					font-size: var(--font14Size);
+				}
+
+				.right {
+					font-size: var(--font16Size);
+					font-weight: bold;
+				}
+			}
+
+			.two {
+				display: flex;
+				justify-content: space-between;
+				padding: 2vw;
+
+				.left {
+					color: #696969;
+					font-size: var(--font14Size);
+				}
+
+				.right {
+					color: #A9A9A9;
+					font-size: var(--font14Size);
+				}
+			}
+		}
+	}
+</style>