添加文件

src/pages.json

@@ -179,6 +179,12 @@
 			"style": {
 				"navigationBarTitleText": "提现"
 			}
+		},
+		{
+			"path": "pages/accountDetails/teaBaby",
+			"style": {
+				"navigationBarTitleText": "茶宝明细"
+			}
 		}
 	],
 	"tabBar": {

src/pages/account/giveAsPresent.vue

@@ -1,129 +1,198 @@
 <template>
-	<view class="container">
-		<!-- 顶部 -->
-		<view class="head flex_r flex_ac flex_jb">
-			<input class="head_input" type="text" v-model="id" placeholder="输入对方账号" />
-			<view class="hea_text">积分赠送</view>
-		</view>
-		<!-- 顶部-end -->
-		
-		<!-- 赠送 -->
-		<view class="give">
-			<view class="give_option flex_r flex_ac"><text class="flex_r flex_ac">赠送数量</text>
-				<input type="text" v-model="give_num" placeholder="自定义赠送数量" placeholder-style="color:#989898;" />
-			</view>
-			<view class="give_con flex_r flex_ac flex_wrap">
+  <view class="container">
+    <!-- 顶部 -->
+    <view class="head flex_r flex_ac flex_jb">
+      <input
+        class="head_input"
+        type="number"
+        v-model="id"
+        placeholder="输入对方账号"
+      />
+      <view class="hea_text">茶宝赠送</view>
+    </view>
+    <!-- 顶部-end -->
+
+    <!-- 赠送 -->
+    <view class="give">
+      <view class="give_option flex_r flex_ac"
+        ><text class="flex_r flex_ac">赠送数量</text>
+        <input
+          type="number"
+          v-model="give_num"
+          placeholder="自定义赠送数量"
+          placeholder-style="color:#989898;"
+        />
+      </view>
+      <!-- <view class="give_con flex_r flex_ac flex_wrap">
 				<view class="give_list flex_c flex_ac" v-for="(item,index) in list" :key="index" @tap="setCurren(item.integralType)">
 					<view class="give_label flex_r flex_ac flex_jc" :class="curren == item.integralType ? 'actice' : ''" @tap="setCurren(item.integralType)">{{item.integralName}}</view>
 					<view class="give_number flex_r flex_ac flex_jc">{{curren == item.integralType ? '剩余(' + surplus + ')' : ''}}</view>
 				</view>
-			</view>
-		</view>
-		<!-- 赠送-end -->
-		
-		<!-- 确定赠送 -->
-		<view class="btn flex_r flex_ac flex_jc" @tap="giveIntegral">确定</view>
-		<!-- 确定赠送-end -->
-	</view>
+			</view> -->
+    </view>
+    <!-- 赠送-end -->
+
+    <!-- 确定赠送 -->
+    <view class="btn flex_r flex_ac flex_jc" @tap="giveIntegral">确定</view>
+    <!-- 确定赠送-end -->
+  </view>
 </template>
 
 <script>
 let page = 1;
-let app=getApp();
+let app = getApp();
 var appEv = app.$vm.$options;
 // let reqApi = new ReqApi();
 // import { ReqApi } from "@/utils/reqTools.js";
 import { get, post, u_post } from "@/request/api.js";
-	export default {
-		data() {
-			return {
-				id:'',
-				give_num:'',
-				curren:1,
-				surplus:0,
-				list:[]
-			};
-		},
-		onLoad:function(){
-			this.loadData()
-		},
-		methods:{
-			// 获取用户积分
-			loadData:function(){
-				let that = this;
-                post("ShuZiTeaIntegral/integral/getGiveIntegral").then(res => {
-                    if(res.status == 200){
-                        that.list = res.data
-                        // that.curren = list[0].integralType
-                        that.giveUserIntegral()
-                    }
-                })
-			},
-			giveUserIntegral:function(){
-				let that = this;
-				let data = {
-					type:this.curren
-				}
-                u_post("ShuZiTeaIntegral/integral/giveUserIntegral",data).then(res => {
-                    if(res.status == 200){
-                        that.surplus = res.integral
-                    }
-                })
-			},
-			setCurren:function(e){
-				this.surplus = 0;
-				this.curren = e;
-				this.giveUserIntegral();
-			},
-			// 赠送
-			giveIntegral:function(){
-				let that = this;
-				let data = {
-					type:this.curren,
-					giveIntegral:this.give_num,
-					userAccount:this.id
-				}
-                u_post("ShuZiTeaIntegral/integral/giveIntegral",data).then(res => {
-                    if(res.status == 200){
-                        that.give_num = 0;
-                        that.surplus = res.integral
-                        that.giveUserIntegral()
-                        appEv.errTips(res.msg)
-                    }else{
-                        appEv.errTips(res.msg)
-                    }
-                })
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      id: "",
+      give_num: "",
+      curren: 1,
+      surplus: 0,
+      list: [],
+      userinfo: undefined, // 获取用户信息
+    };
+  },
+  onLoad: function () {
+    this.userinfo = uni.getStorageSync("userinfo");
+  },
+  methods: {
+    setCurren: function (e) {
+      this.surplus = 0;
+      this.curren = e;
+      this.giveUserIntegral();
+    },
+    // 赠送
+    giveIntegral() {
+      if (this.give_num == 0) {
+        appEv.errTips("赠送数量不得为0");
+        return;
+      } else if (this.give_num > Number(this.userinfo.cha_bao)) {
+        appEv.errTips("赠送数量不得超过茶宝余额");
+        return;
+      } else if (this.id == "") {
+        appEv.errTips("请输入赠送账号");
+        return;
+      } else {
+        let data = {
+          mobile: this.id,
+          number: this.give_num,
+        };
+        post("my/give", data).then((res) => {
+          if (res.code === 0) {
+            this.give_num = 0;
+			this.id = ''
+            appEv.errTips(res.msg);
+          } else {
+            appEv.errTips(res.msg);
+          }
+        });
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss">
 // 页面配置
-.container{border-top:16rpx solid #f4f4f4;}
+.container {
+  border-top: 16rpx solid #f4f4f4;
+}
 // 页面配置-end
 
 // 顶部
-.hea_text{font-size: 32rpx;color:#404040;font-family: "SourceHanSansCN-Medium";}
-.head_input{width: 500rpx;height: 64rpx;background: #EBEBEB;padding: 0 40rpx;box-sizing: border-box;}
-.head{width: 100%;height: 147rpx;padding: 40rpx 30rpx;box-sizing: border-box;border-bottom: 3rpx solid #f4f4f4;}
+.hea_text {
+  font-size: 32rpx;
+  color: #404040;
+  font-family: "SourceHanSansCN-Medium";
+}
+.head_input {
+  width: 500rpx;
+  height: 64rpx;
+  background: #ebebeb;
+  padding: 0 40rpx;
+  box-sizing: border-box;
+}
+.head {
+  width: 100%;
+  height: 147rpx;
+  padding: 40rpx 30rpx;
+  box-sizing: border-box;
+  border-bottom: 3rpx solid #f4f4f4;
+}
 // 顶部-end
 
 // 赠送
-.give_con{width: 100%;}
-.give_option{height: 88rpx;}
-.give_list:nth-child(3n){margin-right: 0;}
-.give_list{width:calc((100% - 60rpx) / 3);margin-right: 30rpx;}
-.give{width: 100%;overflow: hidden;padding:0 30rpx;box-sizing: border-box;}
-.give_option text{font-size: 26rpx;color:#404040;font-family: "SourceHanSansCN-Medium";height: 100%;}
-.give_number{font-size: 24rpx;color:#17BB87;font-family: "SourceHanSansCN-Medium";height: 58rpx;width: 100%;}
-.give_option input{margin-left: 20rpx;font-size: 34rpx;font-family: "SourceHanSansCN-Bold";font-weight: bold;color:#17BB87;height: 100%;}
-.give_label{width: 100%;height: 70rpx;background: #EFEFEF;color:#7D7D7D;font-family: "SourceHanSansCN-Medium";font-size: 28rpx;border-radius: 4rpx;}
+.give_con {
+  width: 100%;
+}
+.give_option {
+  height: 88rpx;
+}
+.give_list:nth-child(3n) {
+  margin-right: 0;
+}
+.give_list {
+  width: calc((100% - 60rpx) / 3);
+  margin-right: 30rpx;
+}
+.give {
+  width: 100%;
+  overflow: hidden;
+  padding: 0 30rpx;
+  box-sizing: border-box;
+}
+.give_option text {
+  font-size: 26rpx;
+  color: #404040;
+  font-family: "SourceHanSansCN-Medium";
+  height: 100%;
+}
+.give_number {
+  font-size: 24rpx;
+  color: #17bb87;
+  font-family: "SourceHanSansCN-Medium";
+  height: 58rpx;
+  width: 100%;
+}
+.give_option input {
+  margin-left: 20rpx;
+  font-size: 34rpx;
+  font-family: "SourceHanSansCN-Bold";
+  font-weight: bold;
+  color: #17bb87;
+  height: 100%;
+}
+.give_label {
+  width: 100%;
+  height: 70rpx;
+  background: #efefef;
+  color: #7d7d7d;
+  font-family: "SourceHanSansCN-Medium";
+  font-size: 28rpx;
+  border-radius: 4rpx;
+}
 
-.actice{background: #18BB87;box-shadow: 0px 10rpx 16rpx 0px rgba(23, 187, 135, 0.6);color:#fff;}
+.actice {
+  background: #18bb87;
+  box-shadow: 0px 10rpx 16rpx 0px rgba(23, 187, 135, 0.6);
+  color: #fff;
+}
 // 赠送-end
 
 // 赠送按钮
-.btn{width: 369rpx;height: 72rpx;border-radius: 8rpx;color:#fff;background: #18BB87;font-size: 38rpx;font-family: "SourceHanSansCN-Medium";margin: 170rpx auto 0;}
+.btn {
+  width: 369rpx;
+  height: 72rpx;
+  border-radius: 8rpx;
+  color: #fff;
+  background: #18bb87;
+  font-size: 38rpx;
+  font-family: "SourceHanSansCN-Medium";
+  margin: 170rpx auto 0;
+}
 // 赠送按钮-end
 </style>

src/pages/account/wealth.vue

@@ -15,17 +15,17 @@
 		</view> -->
 		
 		<view class="con flex_r flex_ac flex_jb mar_t16">
-			<view class="list flex_c flex_ac"  @click="goDetail(1,'茶宝')">
+			<view class="list flex_c flex_ac"  @click="goAccMoney">
 				<view class="list_name">余额</view>
-				<view class="list_text flex_r flex_ae">{{details.integral}}</view>
+				<view class="list_text flex_r flex_ae">{{userinfo.user_money}}</view>
 			</view>
-			<view class="list flex_c flex_ac"  @click="goDetail(2,'消费积分')">
+			<view class="list flex_c flex_ac"  @click="goDetail">
 				<view class="list_name">茶宝</view>
-				<view class="list_text flex_r flex_ae">{{details.xfIntegral}}</view>
+				<view class="list_text flex_r flex_ae">{{userinfo.cha_bao}}</view>
 			</view>
-			<view class="list flex_c flex_ac"  @click="goDetail(3,'批发积分')">
+			<view class="list flex_c flex_ac"  @click="goIntegral">
 				<view class="list_name">批发积分</view>
-				<view class="list_text flex_r flex_ae">{{details.pfIntegral}}</view>
+				<view class="list_text flex_r flex_ae">{{userinfo.integral}}</view>
 			</view>
 		</view>
 		
@@ -62,17 +62,17 @@ import { get, post, u_post } from "@/request/api.js";
 			},
 			goDetail:function(integralType,pageName){
 				uni.navigateTo({
-					url:'/pages/wealth-detail/index?integralType='+integralType+'&pageName=' + pageName
+					url:'/pages/accountDetails/teaBaby'
 				})
 			},
 			goAccMoney:function(){
 				uni.navigateTo({
-					url:'/pages/acc-money-list/index'
+					url:'/pages/accountDetails/running'
 				})
 			},
-			goFund:function(){
+			goIntegral(){
 				uni.navigateTo({
-					url:'/pages/fund-list/index'
+					url:'/pages/accountDetails/integral'
 				})
 			}
 		}

src/pages/accountDetails/integral.vue

@@ -1,26 +1,36 @@
 <template>
-    <view class="container">
-        <!-- 顶部导航 -->
-        <view class="Tab_con flex_r flex_ac flex_jb">
-            <view class="tab_list flex_r flex_ac" :class="current == index ? 'active' : ''" v-for="(item,index) in TabList" :key="index" @tap="SetStatus(index)">{{item.title}}</view>
+  <view class="container">
+    <!-- 顶部导航 -->
+    <view class="Tab_con flex_r flex_ac flex_jb">
+      <view
+        class="tab_list flex_r flex_ac"
+        :class="current == index ? 'active' : ''"
+        v-for="(item, index) in TabList"
+        :key="index"
+        @tap="SetStatus(index)"
+        >{{ item.title }}</view
+      >
+    </view>
+    <!-- 顶部导航-end -->
+    <!-- 积分列表 -->
+    <view class="con">
+      <view class="list" v-for="(item, index) in list" :key="index">
+        <view class="list_head flex_r flex_ac flex_jb">
+          <view class="head_name" v-if="item.type == 0">零售收货发放积分</view>
+          <view class="head_name" v-else-if="item.type == 1">批发扣除积分</view>
+          <view class="head_name" v-else-if="item.type == 2">退货积分</view>
+
+          <view class="head_price g_color">{{item.act}}{{ item.num }}</view>
         </view>
-        <!-- 顶部导航-end -->
-        <!-- 积分列表 -->
-        <view class="con">
-            <view class="list" v-for="(item,index) in list" :key="index">
-                <view class="list_head flex_r flex_ac flex_jb">
-                    <view class="head_name">{{item.source}}</view>
-                    <view class="head_price g_color">{{item.integral}}</view>
-                </view>
-                <view class="list_con flex_r flex_ac flex_jb">
-                    <view class="list_time">{{item.integerType}}</view>
-                    <view class="list_balance">{{item.createTime}}</view>
-                </view>
-            </view>
-            <not-goods v-if="haveGoods" textStr="暂无积分信息"></not-goods>
+        <view class="list_con flex_r flex_ac flex_jb">
+          <!-- <view class="list_time">{{ item.integerType }}333</view> -->
+          <view class="list_balance">{{ item.create_time }}</view>
         </view>
-        <!-- 积分列表 -->
+      </view>
+      <not-goods v-if="haveGoods" textStr="暂无积分信息"></not-goods>
     </view>
+    <!-- 积分列表 -->
+  </view>
 </template>
 <script>
 let page = 1;
@@ -29,85 +39,84 @@ var appEv = app.$vm.$options;
 import { get, post, u_post } from "@/request/api.js";
 // let reqApi = new ReqApi();
 // import { ReqApi } from "@/utils/reqTools.js";
-import notGoods from '@/components/not-goods/index.vue'
+import notGoods from "@/components/not-goods/index.vue";
 export default {
-    components: {
-        notGoods
-    },
-    data() {
-        return {
-            haveGoods: false, // 是否有商品
-            current: 0,
-            TabList: [
-                { title: '全部', sauts: '' },
-                { title: '收益', sauts: 1 },
-                { title: '支出', sauts: 2 }
-            ],
-            list: [],
-            page:1
-        };
-    },
-    onShow: function() {
-        this.page = 1
-        this.list = []
-        this.loadData()
-    },
-    methods: {
-        loadData: function() {
-            let that = this;
-            let data = {
-                type: this.current == 0 ? '' : this.current,
-                page: page,
-                limit: 10
+  components: {
+    notGoods,
+  },
+  data() {
+    return {
+      haveGoods: false, // 是否有商品
+      current: 0,
+      TabList: [
+        { title: "全部", sauts: 0 },
+        { title: "收益", sauts: 1 },
+        { title: "支出", sauts: 2 },
+      ],
+      list: [],
+      page: 1,
+    };
+  },
+  onShow: function () {
+    this.page = 1;
+    this.list = [];
+    this.loadData();
+  },
+  methods: {
+    loadData: function () {
+      let that = this;
+      let data = {
+        type: this.current == 0 ? "" : this.current,
+        page: page,
+        limit: 10,
+      };
+      uni.showLoading({ mask: true });
+      post("/my/integral", data).then((res) => {
+        uni.hideLoading();
+        if (res.code === 0) {
+          if (res.data.data.data.length > 0) {
+            this.list = this.list.concat(res.data.data.data);
+          } else {
+            if (this.page == 1) {
+              this.haveGoods = true;
+              this.page = -1;
+            } else {
+              this.page = -1;
+              appEv.errTips("暂无更多");
             }
-            uni.showLoading({ mask: true })
-            post("/my/integral", data).then(res => {
-                uni.hideLoading()
-                if (res.status == 200) {
-                    let obj = res.dataList
-                    if (obj.length > 0) {
-                        that.list = [...that.list, ...obj]
-                    } else {
-                        if (page == 1) {
-                            that.haveGoods = true
-                            page = -1
-                        } else {
-                            page = -1
-                            appEv.errTips('暂无更多')
-                        }
-                    }
-                } else {
-                    if (page == 1) {
-                        that.haveGoods = true
-                        page = -1
-                    } else {
-                        page = -1
-                        appEv.errTips('暂无更多')
-                    }
-                }
-            })
-        },
-        SetStatus: function(i) {
-            this.current = i;
-            page = 1;
-            this.list = []
-            this.haveGoods = false;
-            this.loadData()
+          }
+        } else {
+          if (page == 1) {
+            this.haveGoods = true;
+            this.page = -1;
+          } else {
+            this.page = -1;
+            appEv.errTips("暂无更多");
+          }
         }
+      });
     },
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function() {
-        if (page != -1) {
-            var that = this;
-            setTimeout(function() {
-                ++page;
-                that.loadData();
-            }, 800);
-        }
+    SetStatus: function (i) {
+      this.current = i;
+      page = 1;
+      this.list = [];
+      this.haveGoods = false;
+      this.loadData();
+    },
+  },
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    if (page != -1) {
+      var that = this;
+      setTimeout(function () {
+        ++page;
+        that.loadData();
+      }, 800);
     }
-}
+  },
+};
 </script>
 <style lang="scss">
 // 页面配置
@@ -115,80 +124,80 @@ export default {
 
 // 顶部列表
 .tab_list {
-    height: 100%;
-    box-sizing: border-box;
-    font-size: 30rpx;
-    color: #808080;
+  height: 100%;
+  box-sizing: border-box;
+  font-size: 30rpx;
+  color: #808080;
 }
 
 .Tab_con {
-    width: 100%;
-    height: 92rpx;
-    background: #fff;
-    padding: 0 30rpx;
-    box-sizing: border-box;
+  width: 100%;
+  height: 92rpx;
+  background: #fff;
+  padding: 0 30rpx;
+  box-sizing: border-box;
 }
 
 .active {
-    color: #1BBD89;
-    border-bottom: 6rpx solid #1BBD89;
+  color: #1bbd89;
+  border-bottom: 6rpx solid #1bbd89;
 }
 
 // 顶部列表-end
 
 // 资金列表
 .con {
-    border-top: 16rpx solid #f4f4f4;
+  border-top: 16rpx solid #f4f4f4;
 }
 
 .list_con {
-    width: 100%;
-    overflow: hidden;
+  width: 100%;
+  overflow: hidden;
 }
 
 .list_head {
-    width: 100%;
-    overflow: hidden;
+  width: 100%;
+  overflow: hidden;
 }
 
 .list_time {
-    font-size: 24rpx;
-    color: #A1A1A1;
+  font-size: 24rpx;
+  color: #a1a1a1;
 }
 
 .list_balance {
-    font-size: 24rpx;
-    color: #A1A1A1;
+  font-size: 24rpx;
+  color: #a1a1a1;
 }
 
 .head_price {
-    font-size: 32rpx;
-    font-family: "SourceHanSansCN-Medium";
+  font-size: 32rpx;
+  font-family: "SourceHanSansCN-Medium";
 }
 
 .head_name {
-    font-size: 30rpx;
-    color: #212121;
-    font-family: "SourceHanSansCN-Medium";
+  font-size: 30rpx;
+  color: #212121;
+  font-family: "SourceHanSansCN-Medium";
 }
 
 .list {
-    width: 100%;
-    overflow: hidden;
-    padding: 30rpx;
-    box-sizing: border-box;
-    border-bottom: 3rpx solid #f4f4f4;
+  width: 100%;
+  overflow: hidden;
+  padding: 30rpx;
+  box-sizing: border-box;
+  border-bottom: 3rpx solid #f4f4f4;
 }
 
 // 资金列表-end
 
 // 状态颜色
 .g_color {
-    color: #1BBD89;
+  color: #1bbd89;
 }
 
 .y_color {
-    color: #F15B21;
+  color: #f15b21;
 }
 
 // 状态颜色-end

src/pages/accountDetails/running.vue

@@ -46,7 +46,7 @@ export default {
       haveGoods: false, // 是否有商品
       current: 0,
       TabList: [
-        { title: "全部", sauts: "" },
+        { title: "全部", sauts: 0 },
         { title: "收益", sauts: 1 },
         { title: "支出", sauts: 2 },
       ],
@@ -68,7 +68,6 @@ export default {
       };
       uni.showLoading({ mask: true });
       post("my/moneylog", data).then((res) => {
-        uni.hideLoading();
         uni.hideLoading();
         if (res.code === 0) {
           if (res.data.data.data.length > 0) {

src/pages/accountDetails/teaBaby.vue

@@ -0,0 +1,206 @@
+<template>
+  <view class="container">
+    <!-- 顶部导航 -->
+    <view class="Tab_con flex_r flex_ac flex_jb">
+      <view
+        class="tab_list flex_r flex_ac"
+        :class="current == index ? 'active' : ''"
+        v-for="(item, index) in TabList"
+        :key="index"
+        @tap="SetStatus(index)"
+        >{{ item.title }}</view
+      >
+    </view>
+    <!-- 顶部导航-end -->
+    <!-- 积分列表 -->
+    <view class="con">
+      <view class="list" v-for="(item, index) in list" :key="index">
+        <view class="list_head flex_r flex_ac flex_jb">
+          <view class="head_name" v-if="item.type == 0">收货后送茶宝</view>
+          <view class="head_name" v-else-if="item.type == 1">签到送茶宝</view>
+          <view class="head_name" v-else-if="item.type == 2">批发扣除茶宝</view>
+          <view class="head_name" v-else-if="item.type == 3">退款到茶宝</view>
+          <view class="head_name" v-else-if="item.type == 4">提现转茶宝</view>
+          <view class="head_name" v-else-if="item.type == 5">赠送茶宝</view>
+          <view class="head_price g_color">{{item.act}}{{ item.num }}</view>
+        </view>
+        <view class="list_con flex_r flex_ac flex_jb">
+          <!-- <view class="list_time">{{ item.integerType }}333</view> -->
+          <view class="list_balance">{{ item.create_time }}</view>
+        </view>
+      </view>
+      <not-goods v-if="haveGoods" textStr="暂无积分信息"></not-goods>
+    </view>
+    <!-- 积分列表 -->
+  </view>
+</template>
+<script>
+let page = 1;
+let app = getApp();
+var appEv = app.$vm.$options;
+import { get, post, u_post } from "@/request/api.js";
+// let reqApi = new ReqApi();
+// import { ReqApi } from "@/utils/reqTools.js";
+import notGoods from "@/components/not-goods/index.vue";
+export default {
+  components: {
+    notGoods,
+  },
+  data() {
+    return {
+      haveGoods: false, // 是否有商品
+      current: 0,
+      TabList: [
+        { title: "全部", sauts: "" },
+        { title: "收益", sauts: 1 },
+        { title: "支出", sauts: 2 },
+      ],
+      list: [],
+      page: 1,
+    };
+  },
+  onShow: function () {
+    this.page = 1;
+    this.list = [];
+    this.loadData();
+  },
+  methods: {
+    loadData: function () {
+      let that = this;
+      let data = {
+        type: this.current == 0 ? "" : this.current,
+        page: page,
+        limit: 10,
+      };
+      uni.showLoading({ mask: true });
+      post("/my/chabao", data).then((res) => {
+        uni.hideLoading();
+        if (res.code === 0) {
+          if (res.data.data.data.length > 0) {
+            this.list = this.list.concat(res.data.data.data);
+          } else {
+            if (this.page == 1) {
+              this.haveGoods = true;
+              this.page = -1;
+            } else {
+              this.page = -1;
+              appEv.errTips("暂无更多");
+            }
+          }
+        } else {
+          if (page == 1) {
+            this.haveGoods = true;
+            this.page = -1;
+          } else {
+            this.page = -1;
+            appEv.errTips("暂无更多");
+          }
+        }
+      });
+    },
+    SetStatus: function (i) {
+      this.current = i;
+      page = 1;
+      this.list = [];
+      this.haveGoods = false;
+      this.loadData();
+    },
+  },
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    if (page != -1) {
+      var that = this;
+      setTimeout(function () {
+        ++page;
+        that.loadData();
+      }, 800);
+    }
+  },
+};
+</script>
+<style lang="scss">
+// 页面配置
+// 页面配置-end
+
+// 顶部列表
+.tab_list {
+  height: 100%;
+  box-sizing: border-box;
+  font-size: 30rpx;
+  color: #808080;
+}
+
+.Tab_con {
+  width: 100%;
+  height: 92rpx;
+  background: #fff;
+  padding: 0 30rpx;
+  box-sizing: border-box;
+}
+
+.active {
+  color: #1bbd89;
+  border-bottom: 6rpx solid #1bbd89;
+}
+
+// 顶部列表-end
+
+// 资金列表
+.con {
+  border-top: 16rpx solid #f4f4f4;
+}
+
+.list_con {
+  width: 100%;
+  overflow: hidden;
+}
+
+.list_head {
+  width: 100%;
+  overflow: hidden;
+}
+
+.list_time {
+  font-size: 24rpx;
+  color: #a1a1a1;
+}
+
+.list_balance {
+  font-size: 24rpx;
+  color: #a1a1a1;
+}
+
+.head_price {
+  font-size: 32rpx;
+  font-family: "SourceHanSansCN-Medium";
+}
+
+.head_name {
+  font-size: 30rpx;
+  color: #212121;
+  font-family: "SourceHanSansCN-Medium";
+}
+
+.list {
+  width: 100%;
+  overflow: hidden;
+  padding: 30rpx;
+  box-sizing: border-box;
+  border-bottom: 3rpx solid #f4f4f4;
+}
+
+// 资金列表-end
+
+// 状态颜色
+.g_color {
+  color: #1bbd89;
+}
+
+.y_color {
+  color: #f15b21;
+}
+
+// 状态颜色-end
+</style>

src/pages/index/index.vue

@@ -20,7 +20,7 @@
                 </view>
                 <swiper class="notice_swiper" vertical autoplay circular :interval="5000" :duration="1000">
                     <swiper-item v-for="(item, index) in not_list" :key="index">
-                        <text class="not_list ellipsis1">{{ item.content }}</text>
+                        <text class="not_list ellipsis1">{{ item.title }}</text>
                         <text class="not_ico iconfont">&#xe62e;</text>
                     </swiper-item>
                 </swiper>