界面优化

pages.json

@@ -227,6 +227,13 @@
 					}
 				},
 				{
+					"path" : "rule/vipRule",
+					"style": {
+						"navigationBarTitleText": "活动规则",
+						"enablePullDownRefresh" : false
+					}
+				},
+				{
 					"path" : "levelDetail/index",
 					"style": {
 						"navigationBarTitleText": "会员等级详情",

setting/equityFundLog/index.vue

@@ -45,18 +45,17 @@
 					<view class="flex-between padding-sm part-top">
 						<text class="text-title text-lg text-black">权益金入账信息</text>
 						
-						<view class="flex-row-center">
+		<!-- 				<view class="flex-row-center">
 							<button v-for="(item,k) in tabList" :key="k" class="cu-btn sm" :class="tabIndex ===k?'bg-blue':'bg-white'" @tap="onTabChange(k)">{{item.name}}</button>
-						</view>
+						</view> -->
 						
 					</view>
-					<view class="list-content">
-						<view v-for="(item,index) in list" :key="index" class="list-item" @tap="onNavToOrderInfo(item)">
-
+					<view v-if="tabIndex ==1 && list2.length" class="list-content">
+						<view v-for="(item,index) in list2" :key="index" class="list-item">
 							<view class="flex-between">
 								<view class="flex-row-center">
-									<text class="">入账时间:</text>
-									<text class="margin-left">{{item.createTime}}</text>
+									<text class="">待入账时间:</text>
+									<text class="margin-left">{{item.expireTime}}</text>
 								</view>
 								<view class="">
 
@@ -64,7 +63,7 @@
 							</view>
 
 							<view class="flex-between">
-								<text class="">金额:</text>
+								<text class="">待入账金额:</text>
 								<text class="text-pink text-bold text-lg">￥{{item.equityFund}}</text>
 							</view>
 
@@ -72,12 +71,48 @@
 								<text class="">说明:</text>
 								<text class="text-black"><text
 										class="text-bold">{{item.newNickName || '凑角用户'}}_{{item.phone4Last}}</text>进行<text
-										class="text-bold">{{equityFundTypeEnum[item.equityFundType]}}</text></text>
+										class="text-bold">{{equityFundTypeEnum[item.equityFundType||'2']}}</text></text>
 							</view>
+							<view class="flex-between">
+								<view class="flex-row-center">
+									<text class="">创建时间:</text>
+									<text class="margin-left">{{item.createTime}}</text>
+								</view>
+								<view class="">
 
+								</view>
+							</view>
 
 						</view>
 					</view>
+					<view v-else-if="tabIndex != 1 && list.length " class="list-content">
+						<view v-for="(item,index) in list" :key="index" class="list-item" @tap="onNavToOrderInfo(item)">
+					
+							<view class="flex-between">
+								<view class="flex-row-center">
+									<text class="">入账日期:</text>
+									<text class="margin-left">{{item.createTime}}</text>
+								</view>
+								<view class="">
+					
+								</view>
+							</view>
+					
+							<view class="flex-between">
+								<text class="">已入账金额:</text>
+								<text class="text-pink text-bold text-lg">￥{{item.equityFund}}</text>
+							</view>
+					
+							<view class="flex-between">
+								<text class="">说明:</text>
+								<text class="text-black"><text
+										class="text-bold">{{item.newNickName || '凑角用户'}}_{{item.phone4Last}}</text>进行<text
+										class="text-bold">{{equityFundTypeEnum[item.equityFundType]}}</text></text>
+							</view>
+					
+					
+						</view>
+					</view>
 
 					<view v-if="list.length == 0" class="empty-box">
 						<u-empty text="暂无数据" textColor='#C1C1C1' width="120" :icon="listBlankImage">
@@ -123,6 +158,7 @@
 				nomoreText: '到底啦',
 				statusIndex: 0,
 				list: [],
+				list2:[],
 				assetsPath: config.assetsPath,
 				scrollTop: 0,
 				queryParams: {
@@ -282,17 +318,17 @@
 						})
 				
 						if (this.queryParams.pageNum === 1) {
-							this.list = list
+							this.list2 = list
 						} else {
-							this.list.push(...list);
+							this.list2.push(...list);
 						}
 				
-						if (this.list.length < res.data.total) {
+						if (this.list2.length < res.data.total) {
 							this.status = "loadmore"
 						} else {
 							this.status = "nomore"
 						}
-				
+				        console.log(this.list2,99999999999)
 					} else if (res.data.code == 401) {
 						this.loginStatus = false
 					}

setting/rule/vipRule.vue

+<template>
+	<view class="article">
+			<image class="img" :src="assetsPath+'/vip_rule.png'" mode="widthFix"></image>
+	</view>
+</template>
+
+<script>
+	import config from "@/config/index.config";
+
+	export default {
+		data() {
+			return {
+				assetsPath: config.assetsPath,
+				article: {
+					protocolTitle: '',
+					content: '',
+				},
+				keyData: ""
+			};
+		},
+		onLoad(option) {
+			
+		},
+		methods: {
+
+		}
+	}
+</script>
+<style>
+</style>
+<style lang="scss">
+	.article {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		width: 100vw;
+		.img{
+			width: 100%;
+		}
+	}
+</style>
\ No newline at end of file