添加的功能：查看推广码对应的结算记录

app.json

@@ -21,7 +21,8 @@
     "pages/personCenter/commissionSetting/commissionSetting",
     "pages/personCenter/resetPwd/resetPwd",
     "pages/personCenter/bindBankCard/bindBankCard",
-    "pages/projectModule/settlement/settlement"
+    "pages/projectModule/settlement/settlement",
+    "pages/projectModule/subSettlement/subSettlement"
   ],
   "window": {
     "navigationBarTextStyle": "black",

pages/loginModule/pwdLogin/pwdLogin.wxml

@@ -24,7 +24,7 @@
       <view class="flex-col self-stretch">
         <view class="flex-col justify-start relative section parentstyle ">
         <view class='centerStyle'>
-          <input
+          <input style="font-size: 30.25rpx;"
             class="flex-col justify-start items-start text-wrapper view input"
             placeholder="请输入手机号"
             maxlength="11"

pages/loginModule/pwdLogin/pwdLogin.wxss

@@ -63,10 +63,7 @@
   margin-left: 16.88rpx;
   margin-right: 16.88rpx;
 }
-.view {
+
-  padding: 15.92rpx 0 12.64rpx;
-  background-color: #ffffff00;
-}
 .section_2 {
   margin-right: 4.93rpx;
   padding: 12.63rpx 16.88rpx 9.75rpx;

pages/personCenter/commissionSetting/commissionSetting.js

@@ -1,8 +1,17 @@
 import { baseUrl } from "../../../request";
-
+import { globalImgUrl } from '../../../request';
 // pages/personCenter/commissionSetting/commissionSetting.js
 Page({
 
+    /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.getProjectList()
+    this.getFixedRate()
+  },
+
+
   /**
    * 页面的初始数据
    */
@@ -19,6 +28,7 @@ Page({
     nowProjectDetailName: '', // 现在的‘项目详细名称’，用于传给弹窗 
     isSub: false, // 用于区分是项目抽佣页面还是单个用户抽佣页面
     fixedRate: 0,  //  固定抽佣——一键设置
+    globalImgUrl,
   },
 
   // 获取项目列表
@@ -116,13 +126,6 @@ Page({
     })
   },
   
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    this.getProjectList()
-    this.getFixedRate()
-  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成

pages/personCenter/commissionSetting/commissionSetting.wxml

@@ -22,7 +22,7 @@
         <view class="flex-row flex-1 self-center">
           <image
             class="shrink-0 image_3"
-            src="{{ item.projectImage }}"
+            src="{{ globalImgUrl + item.projectImage }}"
           />
           <view class="flex-col items-start flex-1 group_3 ml-13">
             <text class="font">{{ item.projectName }}</text>

pages/personCenter/fundingDetails/fundingDetails.js

@@ -57,11 +57,12 @@ Page({
           })
         }
         if (res.data.code === 1) {
+          let result = res.data.data
           this.setData({
-            currentBalance: res.data.data.currentBalance,
+            currentBalance: result.currentBalance,
-            withdrawalAmount: res.data.data.withdrawalAmount,
+            withdrawalAmount: result.withdrawalAmount,
-            withdrawnAmount: res.data.data.withdrawnAmount,
+            withdrawnAmount: result.withdrawnAmount,
-            fundsChangeVOList: res.data.data.fundsChangeVOList
+            fundsChangeVOList: result.fundsChangeVOList
           });
         }
       }

pages/personCenter/fundingDetails/fundingDetails.wxml

@@ -9,11 +9,11 @@
       <view class="flex-row self-stretch group_2">
         <view class="flex-row items-baseline">
           <text class="font text_4">提现中</text>
-          <text class="ml-8 font_2">{{withdrawalAmount}}￥</text> <!-- 提现中的余额 -->
+          <text class="ml-8 font_2">￥{{withdrawalAmount}}</text> <!-- 提现中的余额 -->
         </view>
         <view class="flex-row items-baseline ml-33">
           <text class="font text_5">已提现</text>
-          <text class="font_2 ml-7">{{withdrawnAmount}}￥</text> <!-- 已提现金额 -->
+          <text class="font_2 ml-7">￥{{withdrawnAmount}}</text> <!-- 已提现金额 -->
         </view>
       </view>
     </view>
@@ -42,11 +42,11 @@
     <view class="flex-col list-item mt-13" wx:for="{{fundsChangeVOList}}" wx:for-item="item" wx:for-index="index" wx:key="index">
       <view class="flex-row">
         <text class="flex-1 font_4">{{item.projectName}}</text> <!-- 项目名称 -->
-        <text class="shrink-0 self-start font_5 text_9 ml-21">{{item.changeAmount}} ￥</text> <!-- 变动金额 -->
+        <text class="shrink-0 self-start font_5 text_9 ml-21">{{item.changeAmount}}</text> <!-- 变动金额 -->
       </view>
       <view class="mt-12 flex-row justify-between items-center">
         <text class="font_6 text_10">{{item.createTime}}</text> <!-- 创建时间 -->
-        <text class="font_3">{{item.currentAmount}} ￥</text> <!-- 当前金额 -->
+        <text class="font_3">{{item.currentAmount}}</text> <!-- 当前金额 -->
       </view>
     </view>
   </view>

pages/personCenter/subCommissionSetting/subCommissionSetting.wxss

@@ -62,6 +62,7 @@
   line-height: 24.49rpx;
 }
 .section_3 {
+  position: relative;
   padding: 40.14rpx 31.69rpx 25.61rpx 34.52rpx;
   background-color: #f5f5f5;
   border-radius: 10.05rpx;
@@ -101,7 +102,8 @@
   line-height: 25.54rpx;
 }
 .group_2 {
-  margin-left: 135.81rpx;
+  position: absolute;
+  right: 40rpx;
   width: 75.75rpx;
 }
 .image_2 {

pages/personCenter/teamManage/teamManage.js

@@ -24,12 +24,13 @@ Page({
       },
       success: res => {
         console.log('团队成员信息---->',res.data.data);
+        let result = res.data.data
         this.setData({
-          directAgentSize: res.data.data.directAgentSize,
+          directAgentSize: result.directAgentSize,
-          teamSize: res.data.data.teamSize,
+          teamSize: result.teamSize,
-          teamEarnings: res.data.data.teamEarnings,
+          teamEarnings: result.teamEarnings,
-          invitationCode: res.data.data.invitationCode,
+          invitationCode: result.invitationCode,
-          userMemberInfoVOList: res.data.data.userMemberInfoVOList
+          userMemberInfoVOList: result.userMemberInfoVOList
         })
       }
     })

pages/personCenter/teamManage/teamManage.wxss

@@ -131,7 +131,7 @@
   height: 35.63rpx;
 }
 .text_8 {
-  color: #8c8c8c;
+  color: #323232;
   line-height: 20.96rpx;
 }
 .list {

pages/projectModule/projectDetail/projectDetail.js

@@ -1,4 +1,5 @@
 const { baseUrl } = require('../../../request');
+import { globalImgUrl } from '../../../request';
 
 Page({
   data: {
@@ -10,7 +11,8 @@ Page({
     id: null,
     showPromoPop: false,
     currentQrcode: '',
-    currentPromoLink: ''
+    currentPromoLink: '',
+    globalImgUrl,
   },
 
   onLoad(options) {
@@ -87,17 +89,24 @@ Page({
   },
 
   // 跳转结算明细
-  gotoSubSettlement(e) {
+  gotoSettlement(e) {
-
     const projectId = e.currentTarget.dataset.id;
     const url = e.currentTarget.dataset.url;
     const name = e.currentTarget.dataset.name;
-
     wx.navigateTo({
       url: `/pages/projectModule/settlement/settlement?id=${projectId}&picurl=${url}&name=${name}`,
     })
   },
 
+  gotoSubSettlement(e) {
+    const promoId = e.currentTarget.dataset.id;
+    const image = e.currentTarget.dataset.image
+    const name = e.currentTarget.dataset.name
+    wx.navigateTo({
+      url: `/pages/projectModule/subSettlement/subSettlement?id=${promoId}&image=${image}&name=${name}`,
+    })
+  },
+
 
   // 推广码-查看资料
   goToPromoMaterial(e) {

pages/projectModule/projectDetail/projectDetail.wxml

@@ -3,13 +3,13 @@
     <view class="flex-row items-center">
       <image
         class="shrink-0 image"
-        src="{{projectDetail.projectImage}}"
+        src="{{ globalImgUrl + projectDetail.projectImage }}"
       />
       <view class="flex-col flex-1 group_1 ml-20">
         <text class="self-start font text">{{projectDetail.projectName}}</text>
         <view class="flex-row items-center self-stretch mt-7">
           <text class="flex-1 font_2 text_2">{{projectDetail.projectDescription}}</text>
-          <view class="flex-row items-center shrink-0 section ml-13" bindtap="gotoSubSettlement" data-id="{{ projectDetail.id }}" data-url="{{ projectDetail.projectImage }}" data-name="{{ projectDetail.projectName }}">
+          <view class="flex-row items-center shrink-0 section ml-13" bindtap="gotoSettlement" data-id="{{ projectDetail.id }}" data-url="{{ projectDetail.projectImage }}" data-name="{{ projectDetail.projectName }}">
             <image
               class="shrink-0 image_2"
               src="./images/jsmx.png"
@@ -149,7 +149,7 @@
               data-link="{{item.promoCodeLink}}"
                >查看推广码</text>
               <view class="flex-row self-stretch group_12">
-                <view class="flex-col justify-start items-center text-wrapper_3" >
+                <view data-promoId="{{item.id}}" class="flex-col justify-start items-center text-wrapper_3" bindtap="gotoSubSettlement" data-id="{{ item.id }}" data-image="{{ projectDetail.projectImage }}" data-name="{{ item.salespersonName }}">
                   <text class="font_14 text_21">结算明细</text>
                 </view>
                 <view class="flex-col justify-start items-center text-wrapper_4 ml-12" bindtap="goToPromoMaterial" data-id="{{item.projectId}}"
@@ -172,7 +172,7 @@
 
 <promo-pop
   show="{{showPromoPop}}"
-  qrcode="{{currentQrcode}}"
+  qrcode="{{ globalImgUrl + currentQrcode }}"
   link="{{currentPromoLink}}"
   close-icon="../promoPop/images/cha.png"
   bind:close="onClosePromoPop"

pages/projectModule/projectList/projectList.js

@@ -1,4 +1,5 @@
 const { baseUrl } = require('../../../request');
+import { globalImgUrl } from '../../../request';
 
 Page({
   /**
@@ -13,7 +14,8 @@ Page({
       './images/banner.png'
     ],
     // 后端返回的项目列表
-    items: []
+    items: [],
+    globalImgUrl,
   },
 
   /**

pages/projectModule/projectList/projectList.wxml

@@ -28,7 +28,7 @@
         <!-- 项目图片 -->
         <image
           class="image_2"
-          src="{{item.projectImage}}"
+          src="{{ globalImgUrl + item.projectImage }}"
           mode="aspectFill"
         />
         <view class="ml-14 flex-row items-end">

pages/projectModule/settlement/settlement.js

@@ -1,4 +1,5 @@
 import { baseUrl } from "../../../request";
+import { globalImgUrl } from "../../../request";
 
 // pages/projectModule/settlement/settlement.js
 Page({
@@ -17,6 +18,7 @@ Page({
     workTime: '', // 作业收益
     settlementTime: '', // 结算时间
     revenueSource: false, // 收益来源(true抽成，false为推广码)
+    globalImgUrl,
   },
 
   // 获取项目结算明细列表

pages/projectModule/settlement/settlement.wxml

@@ -6,7 +6,7 @@
         <view class="flex-row items-center flex-1">
           <image
             class="shrink-0 image"
-            src="{{ picurl }}"
+            src="{{ globalImgUrl + picurl }}"
           />
           <text class="font text_2 ml-14">{{ item.projectDetailName}}</text>
         </view>

pages/projectModule/settlement/settlement.wxss

@@ -91,12 +91,6 @@
 .text_6 {
   width: 103.13rpx;
 }
-.pos {
-  /* position: absolute;
-  left: 0.99rpx;
-  top: 50%;
-  transform: translateY(-50%); */
-}
 .font_4 {
   font-size: 26.25rpx;
   font-family: SourceHanSansCN;
@@ -109,12 +103,6 @@
   line-height: 19.93rpx;
   color: #ff8d1a;
 }
-.pos_2 {
-  /* position: absolute;
-  right: -14.23rpx;
-  top: 50%;
-  transform: translateY(-50%); */
-}
 .group_1 {
   display: flex;
   justify-content: space-between;

pages/projectModule/subSettlement/subSettlement.js

@@ -1,3 +1,6 @@
+import { baseUrl } from "../../../request";
+import { globalImgUrl } from "../../../request";
+
 // pages/projectModule/settlement/settlement.js
 Page({
 
@@ -5,14 +8,59 @@ Page({
    * 页面的初始数据
    */
   data: {
-    items: [null, null],
+    settlementData: [], // 用来存储从后端获取的结算数据
+    globalImgUrl,
+    projectImage: '',
+    saleName: '',
+    id: '',
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    // 调用后端接口
+    this.setData({id: options.id})
+    this.setData({projectImage: options.image})
+    this.setData({saleName: options.name})
+    this.fetchSettlementData();
+  },
 
+  /**
+   * 请求结算数据
+   */
+  fetchSettlementData() {
+    const token = wx.getStorageSync('token');  // 从本地存储获取 token
+    const data = {
+      id: 5
+    };
+    wx.request({
+      url: baseUrl + '/projectSettlement/query/settle',
+      method: 'POST',
+      data: data,
+      header: {
+        'Authorization': token,  // 设置请求头，包含 token
+      },
+      success: (res) => {
+        if (res.data.code === 1) {
+          // 请求成功，更新页面数据
+          this.setData({
+            settlementData: res.data.data // 将返回的数据赋值给 settlementData
+          });
+        } else {
+          wx.showToast({
+            title: '加载数据失败',
+            icon: 'none'
+          });
+        }
+      },
+      fail: () => {
+        wx.showToast({
+          title: '请求失败',
+          icon: 'none'
+        });
+      }
+    });
   },
 
   /**
@@ -63,4 +111,4 @@ Page({
   onShareAppMessage() {
 
   }
-})
+});

pages/projectModule/subSettlement/subSettlement.wxml

@@ -1,16 +1,18 @@
 <view class="flex-col page">
-  <view class="flex-col justify-start items-start text-wrapper"><text class="text">业务员：陈新知</text></view>
+  <view class="flex-col justify-start items-start text-wrapper">
+    <text class="text">业务员：{{ saleName }}</text>
+  </view>
   <view class="flex-col mt-11">
-    <view class="flex-col list-item mt-20" wx:for="{{items}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+    <view class="flex-col list-item mt-20" wx:for="{{settlementData}}" wx:for-item="item" wx:for-index="index" wx:key="index">
       <view class="flex-row items-center group">
         <view class="flex-row items-center flex-1">
           <image
             class="shrink-0 image"
-            src="https://ide.code.fun/api/image?token=68368d354ae84d001230f4d1&name=1ca23eeec01596125d5539fcda13702d.png"
+            src="{{ globalImgUrl + projectImage }}"
           />
-          <text class="font text_2 ml-14">美团神券包-春季活动</text>
+          <text class="font text_2 ml-14">{{item.projectDetailName}}</text>
         </view>
-        <text class="font text_3 ml-21">业务员：陈新知</text>
+        <text class="font text_3 ml-21">业务员：{{item.salespersonName}}</text>
       </view>
       <view class="flex-col section">
         <view class="flex-row justify-between">
@@ -20,22 +22,22 @@
         </view>
         <view class="flex-col justify-start group_2 mt-10">
           <view class="flex-row justify-center items-center relative section_2">
-            <text class="font_3 text_6 pos">3.6元购买券</text>
+            <text class="font_3 text_6 pos">{{item.settlementRevenue}}元购买券</text>
-            <text class="font_4">10</text>
+            <text class="font_4">{{item.settlementQuantity}}</text>
-            <text class="font_5 pos_2">￥3.00</text>
+            <text class="font_5 pos_2">￥{{item.settlementRevenue}}</text>
           </view>
         </view>
       </view>
       <view class="flex-row group_1">
         <view class="group_3">
           <text class="font_6 text_7">作业时间：</text>
-          <text class="font_5">2025-05-20</text>
+          <text class="font_5">{{item.workTime}}</text>
         </view>
         <view class="group_4 ml-47">
           <text class="font_6">结算时间：</text>
-          <text class="font_5">2025-05-22</text>
+          <text class="font_5">{{item.settlementTime}}</text>
         </view>
       </view>
     </view>
   </view>
-</view>
+</view>

pages/projectModule/subSettlement/subSettlement.wxss

@@ -8,7 +8,7 @@
   margin-left: 88.13rpx;
 }
 .page {
-  padding: 50.63rpx 24.38rpx 608.44rpx;
+  padding: 50.63rpx 24.38rpx 100.44rpx;
   background-image: linear-gradient(180deg, #ff8d1a -7.3%, #f5f5f5 39.3%);
   width: 100%;
   overflow-y: auto;
@@ -91,12 +91,6 @@
 .text_6 {
   width: 103.13rpx;
 }
-.pos {
-  /* position: absolute;
-  left: 0.99rpx;
-  top: 50%;
-  transform: translateY(-50%); */
-}
 .font_4 {
   font-size: 26.25rpx;
   font-family: SourceHanSansCN;
@@ -109,12 +103,6 @@
   line-height: 19.93rpx;
   color: #ff8d1a;
 }
-.pos_2 {
-  /* position: absolute;
-  right: -14.23rpx;
-  top: 50%;
-  transform: translateY(-50%); */
-}
 .group_1 {
   display: flex;
   justify-content: space-between;

pages/projectModule/userProject/userProject.js

@@ -1,4 +1,5 @@
 import { baseUrl } from "../../../request"
+import { globalImgUrl } from "../../../request"
 
 // pages/projectModule/userProject/userProject.js
 Page({
@@ -8,6 +9,7 @@ Page({
    */
 
   data: {
+    globalImgUrl,
     userProjectList: [],
   },
 
@@ -20,11 +22,9 @@ Page({
 
   // 结算记录
   gotoSubSettlement(e) {
-
     const projectId = e.currentTarget.dataset.id;
     const url = e.currentTarget.dataset.url;
     const name = e.currentTarget.dataset.name;
-
     wx.navigateTo({
       url: `/pages/projectModule/settlement/settlement?id=${projectId}&picurl=${url}&name=${name}`,
     })
@@ -53,6 +53,7 @@ Page({
   gotoProjectDetail(e){
     // 获取data-id中的值
     const projectId = e.currentTarget.dataset.id;
+    console.log('项目id =============>', projectId)
     wx.navigateTo({
       url: `/pages/projectModule/projectDetail/projectDetail?id=${projectId}&isPromo=0`,
     })

pages/projectModule/userProject/userProject.wxml

@@ -1,11 +1,11 @@
 <view class="flex-col justify-start page">
   <view class="flex-col list">
-    <view class="flex-col list-item mt-15" wx:for="{{ userProjectList }}" wx:for-item="item" wx:for-index="index" wx:key="index"           bind:tap="gotoProjectDetail" data-id="{{ item.projectId }}">
+    <view class="flex-col list-item mt-15" wx:for="{{ userProjectList }}" wx:for-item="item" wx:for-index="index" wx:key="index" bind:tap="gotoProjectDetail" data-id="{{ item.projectId }}">
       <view class="flex-row justify-between items-center self-stretch">
         <view class="flex-row items-center">
           <image
             class="shrink-0 image"
-            src="{{ item.projectImage }}"
+            src="{{ globalImgUrl + item.projectImage }}"
           />
           <view class="ml-18 flex-col shrink-0 group">
             <text class="font">{{ item.projectName }}</text>
@@ -18,14 +18,14 @@
         />
       </view>
       <view class="mt-14 flex-row group_2 equal-division">
-        <view class="flex-row justify-center items-center section equal-division-item" data-id="{{ item.projectId }}"catch:tap="stopEventPropagation">
+        <view class="flex-row justify-center items-center section equal-division-item" data-id="{{ item.projectId }}" catch:tap="stopEventPropagation">
           <image
             class="image_3"
             src="./images/tgm.png"
           />
           <text class="ml-4 font_3">推广码</text>
         </view>
-        <view class="ml-14 flex-row items-center section equal-division-item_2" bind:tap="gotoSubSettlement" data-id="{{ item.projectId }}" data-url="{{ item.projectImage }}" data-name="{{ item.projectName }}"> 
+        <view class="ml-14 flex-row items-center section equal-division-item_2" catch:tap="gotoSubSettlement" data-id="{{ item.projectId }}" data-url="{{ item.projectImage }}" data-name="{{ item.projectName }}"> 
           <image
             class="shrink-0 image_4"
             src="./images/jsmx.png"

request.js

@@ -1,6 +1,6 @@
 export const local='http://localhost:9091';
 export const ip = 'http://27.30.77.229:9091';
 export const test = 'http://27.30.77.229:9092';
-export const baseUrl = test;
+export const baseUrl = ip;
 
 export const globalImgUrl = baseUrl + '/file/download/'