commission--yt-commit

pages/projectModule/applyCode/applyCode.js

@@ -53,6 +53,11 @@ Page({
       return;
     }
 
+    wx.showLoading({
+      title: '申请中',
+      mask: true
+    })
+
     const token = wx.getStorageSync('token');
     wx.request({
       url: baseUrl + '/promoCodeApply/apply',
@@ -73,6 +78,7 @@ Page({
             icon: 'success',
             duration: 1000
           });
+          wx.hideLoading()
           setTimeout(() => {
             wx.navigateBack();
           }, 1000);
@@ -81,6 +87,7 @@ Page({
             title: res.data.message || '申请失败',
             icon: 'none'
           });
+          wx.hideLoading()
         }
       },
       fail: () => {

pages/projectModule/projectDetail/projectDetail.js

@@ -41,6 +41,7 @@ Page({
           id
       },
       success: (res) => {
+        console.log('项目详细---->',res.data.data);
         if (res.data.code === 1) {
           const detail = res.data.data || {};
           this.setData({
@@ -85,13 +86,19 @@ Page({
     });
   },
 
-  // “结算明细”跳转
-  goToSettlementDetail() {
+  // 跳转结算明细
+  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/subSettlement/subSettlement' // 替换为你的页面路径
-    });
+      url: `/pages/projectModule/settlement/settlement?id=${projectId}&picurl=${url}&name=${name}`,
+    })
   },
 
+
   // 推广码-查看资料
   goToPromoMaterial(e) {
     const id = e.currentTarget.dataset.id;    // 项目id

pages/projectModule/projectDetail/projectDetail.wxml

@@ -9,7 +9,7 @@
         <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="goToSettlementDetail">
+          <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 }}">
             <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" bindtap="goToSettlementDetail">
+                <view class="flex-col justify-start items-center text-wrapper_3" >
                   <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}}"