From 52bf80d479c683e6bdd99e73b2538fec8c595575 Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Mon, 15 Jan 2024 14:06:51 +0800
Subject: [PATCH] update

---
 pages/index/components/numberScroll.vue |  10 +-
 pages/index/index.vue                   |   7 +-
 pages/merchantAccount/detail.vue        | 220 ++++++++++++++++++++----
 pages/merchantAccount/index.vue         |  85 +++++++--
 4 files changed, 263 insertions(+), 59 deletions(-)

diff --git a/pages/index/components/numberScroll.vue b/pages/index/components/numberScroll.vue
index 7f59ce8..36652b0 100644
--- a/pages/index/components/numberScroll.vue
+++ b/pages/index/components/numberScroll.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="content">
     <!-- num 是字符串，会被切成片渲染 -->
-    <view class="l-num" :style="{width: key===',' || key==='.'?'12rpx':'26rpx'}" v-for="(key,value) in num" :key="value">
+    <view class="l-num" :style="{width: key===',' || key==='.'?'12rpx':'28rpx'}" v-for="(key,value) in num" :key="value">
       <template v-if="key !== '.' && key !== ','">
         <view class="l-son" :style="'transform: translateY(-'+(key*52)+'rpx);'" >
           <view class="l-num l-posi" v-for="(s,i) in range" :style="'transform: translateY('+(i*52)+'rpx);'" :key="i">
@@ -141,14 +141,14 @@ export default {
 }
 
 .l-num{
-  font-size: 42rpx;
-  font-family: DINAlternate, DINAlternate;
+  font-size: 48rpx;
+  font-family: DINAlternate-Bold, DINAlternate;
   font-weight: bold;
   color: #160002;
-  line-height: 52rpx;
+  line-height: 56rpx;
   display: inline-block;
   text-align: center;
-  height: 52rpx;
+  height: 56rpx;
   overflow: hidden;
   position: relative;
 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4a5a9e0..52b29fe 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -805,7 +805,7 @@
               <text class="day">/{{howDay}}</text>
             </view>
             <view class="revenyeTopRight" @click="handlePage">
-              <image  class="right" src="https://eshangtech.cinstantRevenueom/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
+              <image  class="right" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
             </view>
           </view>
 
@@ -2840,7 +2840,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
     width: 100%;
     background: linear-gradient(180deg, #DCE6FF 0%, #F3F4F9  100%);
     box-sizing: border-box;
-    padding-bottom: 20rpx;
+    //padding-bottom: 20rpx;
     //padding: 0 16px;
     //position: relative;
     .headerTop{
@@ -4623,7 +4623,8 @@ $iphoneHeight: env(safe-area-inset-bottom);
     background-repeat: no-repeat;
     background-size: 100% 100%;
     box-sizing: border-box;
-    padding: 14rpx 0 32px 0;
+    //padding: 14rpx 0 32px 0;
+    padding: 0 0 32px 0;
     //transform: translateY(-16px);
     border-top-right-radius: 16px;
     border-top-left-radius: 16px;
diff --git a/pages/merchantAccount/detail.vue b/pages/merchantAccount/detail.vue
index 97ef4e0..df85699 100644
--- a/pages/merchantAccount/detail.vue
+++ b/pages/merchantAccount/detail.vue
@@ -16,8 +16,9 @@
           </view>
         </view>
 
-        <swiper :current="currentSwiper" @change="changeSwiper" :indicator-dots="true" indicator-color="rgb(225, 227, 232)" indicator-active-color="rgb(178, 180, 185)">
-          <swiper-item v-for="(item,index) in 4">
+        <swiper :current="currentSwiper" @change="changeSwiper">
+<!--          :indicator-dots="true" indicator-color="rgb(225, 227, 232)" indicator-active-color="rgb(178, 180, 185)"-->
+          <swiper-item v-for="(item,index) in swiperList" :key="index">
             <view class="detailBox" >
               <view class="listItem">
                 <view class="typeBox">商家</view>
@@ -28,10 +29,10 @@
 
                   <view class="itemRight">
                     <view class="rightTitleBox">
-                      <text class="title">合肥好顺坊餐饮管理有限公司</text>
+                      <text class="title">{{item.MerchantName}}</text>
                     </view>
                     <view style="display: inline-block">
-                      <view class="numberProject">6 个项目</view>
+                      <view class="numberProject">{{ `${item.ProjectCount}个项目` }}</view>
                     </view>
                   </view>
                 </view>
@@ -43,7 +44,7 @@
                     </view>
                     <view class="moneyDetail">
                       <text class="itemLabel">到账 /元</text>
-                      <text class="itemValue">79.435,54</text>
+                      <text class="itemValue">{{item.SubRoyaltyPrice?$util.fmoney(item.SubRoyaltyPrice,2):'-'}}</text>
                     </view>
                   </view>
 
@@ -53,7 +54,7 @@
                     </view>
                     <view class="moneyDetail">
                       <text class="itemLabel">入账 /元</text>
-                      <text class="itemValue">79.435,54</text>
+                      <text class="itemValue">{{item.SubRoyaltyTheory?$util.fmoney(item.SubRoyaltyTheory,2):'-'}}</text>
                     </view>
                   </view>
 
@@ -63,7 +64,7 @@
                     </view>
                     <view class="moneyDetail">
                       <text class="itemLabel">应缴 /元</text>
-                      <text class="itemValue">79.435,54</text>
+                      <text class="itemValue">{{item.ReceivableAmount?$util.fmoney(item.ReceivableAmount,2):'-'}}</text>
                     </view>
                   </view>
                 </view>
@@ -106,14 +107,14 @@
         </view>
       </view>
 
-      <view class="listBox">
-        <view class="listItem" v-for="(item,index) in 6">
+      <scroll-view :show-scrollbar="false" scroll-y="true" class="listBox" :style="{height: 'calc(100vh - 320px)'}" v-if="dataList && dataList.length>0">
+        <view class="listItem" v-for="(item,index) in dataList">
           <view class="bigBox">
             <view class="itemLeft" >
               <image class="bg" src="https://eshangtech.com/ShopICO/ahyd-BID/car/itemLeftBg.svg"/>
               <!--            <view class="statueBox" :style="{backgroundImage:`url(${item.RevenueAmount?'https://eshangtech.com/ShopICO/ahyd-BID/car/statusHaveBg.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/statusNoHaveBg.svg'})`}">{{item.RevenueAmount?'营业中':'休息中'}}</view>-->
               <view class="nameBox">
-                <text class="serviceName">新桥</text>
+                <text class="serviceName">{{item.ServerpartName.split('服务区')[0]}}</text>
                 <text class="serviceLabel">服务区</text>
               </view>
             </view>
@@ -121,50 +122,52 @@
               <view class="itemRightTop">
                 <view class="topLeft">
                   <view class="indexBox" :style="{backgroundImage:`url(${0===0?'https://eshangtech.com/ShopICO/ahyd-BID/car/1stBg.svg':index===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/2stBg.svg':index===2?'https://eshangtech.com/ShopICO/ahyd-BID/car/3stBg.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/4stBg.svg'})`}">
-                    1
+                    {{index+1}}
                   </view>
-                  <text class="brandLabel">品牌数量<text class="brandValue">4</text></text>
+                  <text class="brandLabel">品牌数量<text class="brandValue">{{item.BrandCount?item.BrandCount:''}}</text></text>
                 </view>
-                <view class="topRight" @click="handleExpand">
-                  <text class="retract">收起</text>
-                  <image class="retractIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/merchantAccount/retractIcon.svg"/>
+                <view class="topRight" @click="handleExpand(item)">
+                  <text class="retract">{{ item.showChild?'收起':'展开' }}</text>
+                  <image class="retractIcon" :style="{transform: `rotate(${item.showChild?'180deg':''})`}" src="https://eshangtech.com/ShopICO/ahyd-BID/merchantAccount/retractIcon.svg"/>
                 </view>
               </view>
 
               <view class="itemRightBottom">
                 <view class="bottomItem">
                   <text class="bottomLabel">到账<text class="bottomUnit">/元</text></text>
-                  <text class="bottomValue">79.435,54</text>
+                  <text class="bottomValue">{{item.SubRoyaltyPrice?$util.fmoney(item.SubRoyaltyPrice,2):'-'}}</text>
                 </view>
 
                 <view class="bottomItem">
                   <text class="bottomLabel">入账<text class="bottomUnit">/元</text></text>
-                  <text class="bottomValue">79.435,54</text>
+                  <text class="bottomValue">{{item.SubRoyaltyTheory?$util.fmoney(item.SubRoyaltyTheory,2):'-'}}</text>
                 </view>
 
                 <view class="bottomItem">
                   <text class="bottomLabel">应缴<text class="bottomUnit">/元</text></text>
-                  <text class="bottomValue">79.435,54</text>
+                  <text class="bottomValue">{{item.ReceivableAmount ?$util.fmoney(item.ReceivableAmount ,2):'-'}}</text>
                 </view>
               </view>
             </view>
           </view>
 
-          <view class="smallListBox">
-            <view class="smallItem">
+          <view class="smallListBox" v-if="item.BrandAccountList && item.BrandAccountList.length>0 && item.showChild">
+            <view class="smallItem" v-for="(subItem,subIndex) in item.BrandAccountList" :key="subIndex">
               <view class="smallItemTop">
                 <view class="brandIcon">
-                  <image class="brandImage" src=""/>
+                  <image class="brandImage" :src="subItem.BrandICO?subItem.BrandICO:'https://eshangtech.com/ShopICO/ahyd-BID/brand/defaultIcon.png'"/>
                 </view>
 
                 <view class="smallDetailBox">
                   <view class="brandNameBox">
-                    <text class="brandName">老乡鸡</text>
+                    <text class="brandName">{{subItem.BrandName || '-'}}</text>
                     <image class="brandMore" src="https://eshangtech.com/ShopICO/ahyd-BID/merchantAccount/goMore.svg"/>
                   </view>
                   <view class="typeBox">
-                    <view class="typeItem" style="background: #FFEFEA;color: #FF6531">固定租金</view>
-                    <view class="typeItem" style="background: #E3EFFF;color: #1979FE">营收回款</view>
+                    <view class="typeItem" style="background: #FFEFEA;color: #FF6531" v-if="subItem.SettlementMods">{{settlementModes[subItem.SettlementMods]}}</view>
+<!--                    {{settlementModes[subItem.SettlementMods]}}-->
+                    <view class="typeItem" style="background: #E3EFFF;color: #1979FE" v-if="subItem.BusinessType">{{businessType[subItem.BusinessType]}}</view>
+<!--                    {{businessType[subItem.BusinessType]}}-->
                   </view>
                 </view>
               </view>
@@ -172,25 +175,31 @@
               <view class="otherBox">
                 <view class="otherItem">
                   <text class="otherLabel">到账<text class="otherUnit">/元</text></text>
-                  <text class="otherValue">79.435,54</text>
+                  <text class="otherValue">{{subItem.SubRoyaltyPrice?$util.fmoney(subItem.SubRoyaltyPrice,2):'-'}}</text>
                 </view>
                 <view class="otherItem">
                   <text class="otherLabel">入账<text class="otherUnit">/元</text></text>
-                  <text class="otherValue">79.435,54</text>
+                  <text class="otherValue">{{subItem.SubRoyaltyTheory?$util.fmoney(subItem.SubRoyaltyTheory,2):'-'}}</text>
                 </view>
                 <view class="otherItem">
                   <text class="otherLabel">应缴<text class="otherUnit">/元</text></text>
-                  <text class="otherValue">79.435,54</text>
+                  <text class="otherValue">{{subItem.ReceivableAmount ?$util.fmoney(subItem.ReceivableAmount ,2):'-'}}</text>
                 </view>
               </view>
             </view>
           </view>
         </view>
+      </scroll-view>
+
+      <view class="noDataBox" :style="{height: 'calc(100vh - 360px)'}" v-else>
+        <image class="typeImg" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/noData.svg"></image>
+        <text class="noDataText">暂无数据</text>
       </view>
     </view>
   </view>
 </template>
 <script>
+import request from '@/util/index.js'
 export default {
   name:'detail',
   data(){
@@ -201,21 +210,100 @@ export default {
       endData:'',
       sortName:3, // 排序字段 1到账 2入账 3应缴
       sortType:1, // 正序降序 0正序  1降序
-      currentSwiper:0
+      currentSwiper:0,
+      swiperList:[],// 横向滑动的列表
+      pageData:{},// 页面数据
+      dataList:[],// 数据列表
+      businessType:{},
+      settlementModes:{},
+      currentObj:{}
     }
   },
-  onLoad(){
+  async onLoad(query){
     this.menu = uni.getMenuButtonBoundingClientRect()
-    let lastDay = uni.getStorageSync('lastDay')
+    let lastDay = ''
+    const endDate = uni.getStorageSync('lastDay')
+    if (query.selectTime){
+      lastDay = query.selectTime
+    }else{
+      lastDay = uni.getStorageSync('lastDay')
+    }
+
     const date = new Date(lastDay)
     let y = date.getFullYear()
     let m = date.getMonth() + 1
     this.single = `${y}-${m<10?'0'+m :m}`
-    this.endData = lastDay
+    this.endData = endDate
+    console.log('query',query)
+    let list = []
+    if (query.list){
+      list = JSON.parse(query.list)
+      console.log('list',list)
+      this.swiperList = list
+    }
+    let currentObj = {}
+    if (query.currentItem){
+      currentObj = JSON.parse(query.currentItem)
+      this.currentObj = currentObj
+      console.log('currentObj',currentObj)
+    }
+    list.forEach((item,index)=>{
+      if (item.MerchantId===currentObj.MerchantId){
+        this.currentSwiper = index
+      }
+    })
+    this.businessType = await this.handleGetField('BUSINESS_TYPE')
+    this.settlementModes = await this.handleGetField('SETTLEMENT_MODES')
+    this.handleGetDetail(currentObj.MerchantId)
+    console.log('this.businessType',this.businessType)
+    console.log('this.settlementModes',this.settlementModes)
   },
   methods:{
+    // 拿到枚举
+    async handleGetField(name){
+      const data = await request.$webGet('EShangApiMain/FrameWork/GetFieldEnumByField', { FieldExplainField: name, sessionName: name })
+      let list = data.Result_Data.List
+      let obj = {}
+      list.forEach(item=>{
+        obj[item.value] = item.label
+      })
+      console.log('obj',obj)
+      return obj
+    },
+    // 拿到详情数据
+    async handleGetDetail(id){
+      uni.showLoading({
+        title: '正在加载...'
+      })
+      const date = new Date(this.single)
+      let y = date.getFullYear()
+      let m = date.getMonth() + 1
+      if (m<10){
+        m = '0' + m
+      }
+      const req = {
+        StatisticsMonth:`${y}${m}`,
+        MerchantId:id,
+        SortStr:`${this.sortName===1?'SubRoyaltyPrice':this.sortName===2?'SubRoyaltyTheory':this.sortName===3?'ReceivableAmount':''}${this.sortType===1?' desc':''}`
+      }
+      const data = await request.$webGet('CommercialApi/Contract/GetMerchantAccountDetail',req)
+      this.pageData = data.Result_Data
+      let list = data.Result_Data.ProjectDetailList
+      list.forEach(item=>{
+        item.showChild = false
+      })
+      this.dataList = list
+      console.log('pageData',this.pageData)
+      console.log('dataList',this.dataList)
+      uni.hideLoading()
+    },
     bindDateChange(e){
+      this.swiperList = []
+      this.dataList = []
+      this.$forceUpdate()
       this.single = e.detail.value
+      this.handleGetSwiperList()
+      this.handleGetDetail(this.currentObj.MerchantId)
     },
     // 返回
     handleBack(){
@@ -234,14 +322,45 @@ export default {
         this.sortName = value
         this.sortType=1
       }
+      this.handleGetDetail(this.currentObj.MerchantId)
     },
     changeSwiper(e){
-      console.log('e',e)
+      console.log('echangeSwiper',e)
+      this.dataList = []
+      this.currentObj = this.swiperList[Number(e.detail.current)]
+      this.handleGetDetail(this.currentObj.MerchantId)
     },
     // 展开收起
-    handleExpand(){
-
-    }
+    handleExpand(obj){
+      console.log('obj',obj)
+      this.dataList.forEach(item=>{
+        if (item.ServerpartId===obj.ServerpartId){
+          item.showChild = !item.showChild
+        }
+      })
+      this.$forceUpdate()
+    },
+    // 切换日期 要更新列表数据
+    handleGetSwiperList(){
+      uni.showLoading({
+        title: '正在加载...'
+      })
+      const date = new Date(this.single)
+      let y = date.getFullYear()
+      let m = date.getMonth() + 1
+      if (m<10){
+        m = '0' + m
+      }
+      const req = {
+        StatisticsMonth:`${y}${m}`,
+        SortStr:`ReceivableAmount desc`
+      }
+      request.$webGet('CommercialApi/Contract/GetMerchantAccountSplit',req).then(res=>{
+        this.swiperList = res.Result_Data.MerchantAccountList
+        uni.hideLoading()
+        console.log('this.swiperList',this.swiperList)
+      })
+    },
   }
 }
 </script>
@@ -403,11 +522,12 @@ export default {
                 line-height: 36rpx;
               }
               .itemValue{
-                font-size: 28rpx;
+                font-size: 24rpx;
                 font-family: DINAlternate, DINAlternate;
                 font-weight: bold;
                 color: #160002;
                 line-height: 32rpx;
+                letter-spacing: -0.5px;
               }
             }
           }
@@ -627,11 +747,12 @@ export default {
                   }
                 }
                 .bottomValue{
-                  font-size: 28rpx;
+                  font-size: 24rpx;
                   font-family: DINAlternate, DINAlternate;
                   font-weight: bold;
                   color: #160002;
                   line-height: 32rpx;
+                  letter-spacing: -0.5px;
                 }
               }
             }
@@ -643,6 +764,7 @@ export default {
           width: 100%;
           margin-top: 46rpx;
           .smallItem{
+            margin-top: 40rpx;
             .smallItemTop{
               display: flex;
               align-items: center;
@@ -703,6 +825,8 @@ export default {
               align-items: center;
               .otherItem{
                 width: calc(100% / 3);
+                display: flex;
+                flex-direction: column;
                 .otherLabel{
                   font-size: 24rpx;
                   font-family: PingFangSC, PingFang SC;
@@ -719,7 +843,7 @@ export default {
                   }
                 }
                 .otherValue{
-                  font-size: 28rpx;
+                  font-size: 24rpx;
                   font-family: DINAlternate, DINAlternate;
                   font-weight: bold;
                   color: #160002;
@@ -731,6 +855,26 @@ export default {
         }
       }
     }
+    .noDataBox{
+      width: 100%;
+      margin-top: 24rpx;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      .typeImg{
+        width: 80px;
+        height: 80px;
+        margin-bottom: 15px;
+      }
+      .noDataText{
+        font-size: 28rpx;
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 400;
+        color: #6C737A;
+        line-height: 40rpx;
+      }
+    }
   }
 }
 </style>
diff --git a/pages/merchantAccount/index.vue b/pages/merchantAccount/index.vue
index 906cfb0..f107a0c 100644
--- a/pages/merchantAccount/index.vue
+++ b/pages/merchantAccount/index.vue
@@ -25,7 +25,7 @@
               <text class="itemTitle">商家到账<text class="itemUnit">/元</text></text>
               <image class="noticeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/noticeIcon.svg"/>
             </view>
-            <text class="itemRight">1,005,164.28</text>
+            <text class="itemRight">{{pageData && pageData.SubRoyaltyPrice?$util.fmoney(pageData.SubRoyaltyPrice,2):'-'}}</text>
           </view>
 
           <view class="entryItem">
@@ -34,7 +34,7 @@
               <text class="itemTitle">商家入账<text class="itemUnit">/元</text></text>
               <image class="noticeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/noticeIcon.svg"/>
             </view>
-            <text class="itemRight">1,005,164.28</text>
+            <text class="itemRight">{{pageData && pageData.SubRoyaltyTheory?$util.fmoney(pageData.SubRoyaltyTheory,2):'-'}}</text>
           </view>
 
           <view class="entryItem">
@@ -43,7 +43,7 @@
               <text class="itemTitle">商家应缴<text class="itemUnit">/元</text></text>
               <image class="noticeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/noticeIcon.svg"/>
             </view>
-            <text class="itemRight">1,005,164.28</text>
+            <text class="itemRight">{{pageData && pageData.ReceivableAmount?$util.fmoney(pageData.ReceivableAmount,2):'-'}}</text>
           </view>
         </view>
       </view>
@@ -78,8 +78,8 @@
         </view>
       </view>
 
-      <view class="listBox">
-        <view class="listItem" v-for="(item,index) in 8">
+      <scroll-view :style="{height: 'calc(100vh - 360px)'}" :show-scrollbar="false" scroll-y="true" class="listBox" v-if="dataList && dataList.length>0">
+        <view class="listItem" v-for="(item,index) in dataList" :key="index"  @click="handleGoDetail(item)">
           <view class="typeBox">商家</view>
           <view class="itemTop">
             <view class="itemLeft">
@@ -87,12 +87,12 @@
             </view>
 
             <view class="itemRight">
-              <view class="rightTitleBox" @click="handleGoDetail(item)">
-                <text class="title">合肥好顺坊餐饮管理有限公司</text>
+              <view class="rightTitleBox">
+                <text class="title">{{item.MerchantName}}</text>
                 <image class="goMore" src="https://eshangtech.com/ShopICO/ahyd-BID/merchantAccount/goMore.svg"/>
               </view>
               <view style="display: inline-block">
-                <view class="numberProject">6 个项目</view>
+                <view class="numberProject">{{`${item.ProjectCount}个项目`}}</view>
               </view>
             </view>
           </view>
@@ -101,25 +101,30 @@
           <view class="moneyBox">
               <view class="moneyItem">
                 <text class="itemLabel">到账 /元</text>
-                <text class="itemValue">79.435,54</text>
+                <text class="itemValue">{{item.SubRoyaltyPrice?$util.fmoney(item.SubRoyaltyPrice,2):'-'}}</text>
               </view>
 
               <view class="moneyItem">
                 <text class="itemLabel">入账 /元</text>
-                <text class="itemValue">79.435,54</text>
+                <text class="itemValue">{{item.SubRoyaltyTheory?$util.fmoney(item.SubRoyaltyTheory,2):'-'}}</text>
               </view>
 
               <view class="moneyItem">
                 <text class="itemLabel">应缴 /元</text>
-                <text class="itemValue">79.435,54</text>
+                <text class="itemValue">{{item.ReceivableAmount ?$util.fmoney(item.ReceivableAmount ,2):'-'}}</text>
               </view>
             </view>
         </view>
+      </scroll-view>
+      <view class="noDataBox" :style="{height: 'calc(100vh - 360px)'}" v-else>
+        <image class="typeImg" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/noData.svg"></image>
+        <text class="noDataText">暂无数据</text>
       </view>
     </div>
   </view>
 </template>
 <script>
+import request from '@/util/index.js'
 export default {
   name: "index",
   data(){
@@ -130,6 +135,8 @@ export default {
       endData:'',
       sortName:3, // 排序字段 1到账 2入账 3应缴
       sortType:1, // 正序降序 0正序  1降序
+      pageData:{},// 页面数据
+      dataList:[],// 数据数组
     }
   },
   onLoad(){
@@ -140,11 +147,39 @@ export default {
     let m = date.getMonth() + 1
     this.single = `${y}-${m<10?'0'+m :m}`
     this.endData = lastDay
+    this.handleGetPageData()
   },
   methods:{
+    // 拿到页面数据
+    handleGetPageData(){
+      uni.showLoading({
+        title: '正在加载...'
+      })
+      const date = new Date(this.single)
+      let y = date.getFullYear()
+      let m = date.getMonth() + 1
+      if (m<10){
+        m = '0' + m
+      }
+      const req = {
+        StatisticsMonth:`${y}${m}`,
+        SortStr:`${this.sortName===1?'SubRoyaltyPrice':this.sortName===2?'SubRoyaltyTheory':this.sortName===3?'ReceivableAmount':''}${this.sortType===1?' desc':''}`
+      }
+      request.$webGet('CommercialApi/Contract/GetMerchantAccountSplit',req).then(res=>{
+        this.pageData = res.Result_Data
+        this.dataList = res.Result_Data.MerchantAccountList
+        uni.hideLoading()
+        console.log('this.pageData',this.pageData)
+      })
+    },
     // 修改时间
     bindDateChange(e){
+      this.pageData = null
+      this.dataList = []
+      console.log('dataList',this.dataList)
+      this.$forceUpdate()
       this.single = e.detail.value
+      this.handleGetPageData()
     },
     // 返回
     handleBack(){
@@ -164,11 +199,13 @@ export default {
         this.sortName = value
         this.sortType=1
       }
+      this.handleGetPageData()
     },
     // 跳转到详情的方法
     handleGoDetail(obj){
+      console.log('obj',obj)
       uni.navigateTo({
-        url: '/pages/merchantAccount/detail'
+        url: `/pages/merchantAccount/detail?list=${JSON.stringify(this.dataList)}&currentItem=${JSON.stringify(obj)}&selectTime=${this.single}`
       })
     }
   }
@@ -298,6 +335,7 @@ export default {
   }
   .merchantData{
     width: calc(100% - 64rpx);
+    height: calc(100vh - 300px);
     margin-left: 32rpx;
     box-sizing: border-box;
     padding: 24rpx;
@@ -443,16 +481,37 @@ export default {
               margin-bottom: 4rpx;
             }
             .itemValue{
-              font-size: 28rpx;
+              font-size: 24rpx;
               font-family: DINAlternate, DINAlternate;
               font-weight: bold;
               color: #160002;
               line-height: 32rpx;
+              letter-spacing: -0.5px;
             }
           }
         }
       }
     }
+    .noDataBox{
+      width: 100%;
+      margin-top: 24rpx;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      .typeImg{
+        width: 80px;
+        height: 80px;
+        margin-bottom: 15px;
+      }
+      .noDataText{
+        font-size: 28rpx;
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 400;
+        color: #6C737A;
+        line-height: 40rpx;
+      }
+    }
   }
 }
 </style>