cxz-lastest-commit

app.json

@@ -1,7 +1,7 @@
 {
   "pages": [
-    "pages/personCenter/mine/mine",
     "pages/loginModule/pwdLogin/pwdLogin",
+    "pages/personCenter/mine/mine",
     "pages/personCenter/subCommissionSetting/subCommissionSetting",
     "pages/test/testVideo/testVideo",
     "pages/personCenter/withdrawal/withdrawal",

pages/loginModule/forgetPwd/forgetPwd.js

@@ -103,19 +103,21 @@ Page({
     // 3. 格式校验手机号
     if (!/^1\d{10}$/.test(phone)) {
       return wx.showToast({ title: '手机号格式不正确', icon: 'none' });
-    }
+    } 
     // 2. 密码一致
     if (newPwd !== confirmPwd) {
       return wx.showToast({ title: '两次密码不一致', icon: 'none' });
     }
     // 4. 发起重置请求
     wx.request({
-      url: baseUrl + '/userInfo/mini/forgetPwd',
+      url: baseUrl + '/userInfo/mini/out/reset/pwd',
       method: 'POST',
       data: {
         phoneNumber: phone,
         verificationCode: code,
-        newPassword: newPwd
+        userPassword: newPwd,
+        userConfirmPassword: confirmPwd,
+        sourceToken: null
       },
       success: res => {
         if (res.data.code === 1) {

pages/personCenter/resetPwd/resetPwd.js

@@ -29,7 +29,8 @@ Page({
         phoneNumber: phone,
         verificationCode: verificationCode,
         userPassword: password,
-        userConfirmPassword: currentPwd
+        userConfirmPassword: currentPwd,
+        sourceToken: wx.getStorageSync('token')
       },
       success: res => {
         console.log('修改密码--->',res);

pages/projectModule/projectDetail/projectDetail.js

@@ -16,13 +16,9 @@ Page({
   onLoad(options) {
     // console.log('---->',options);
     const id = options.id;
-    const promotionCode = options.promotionCode;
+    const isPromo = options.isPromo;
-    this.setData({ id,promotionCode });
+    console.log(isPromo)
-    if (promotionCode) {  //  切换到‘我的推广码状态’
+    this.setData({ id ,activeTab: Number(isPromo) });
-      this.setData({
-        activeTab: 1
-      })
-    }
   },
 
    // 每次页面展示都刷新（含navigateBack返回时）

pages/projectModule/projectList/projectList.js

@@ -59,7 +59,7 @@ Page({
     const projectId = e.currentTarget.dataset.id;
     // 带上 id 跳转到详情页（路径按你的项目结构调整）
     wx.navigateTo({
-      url: `/pages/projectModule/projectDetail/projectDetail?id=${projectId}`
+      url: `/pages/projectModule/projectDetail/projectDetail?id=${projectId}&isPromo=0`
     });
   },
 });

pages/projectModule/projectList/projectList.wxss

@@ -53,7 +53,7 @@
 
 /* 结算周期背景 */
 .text-wrapper {
-  padding: 7.5rpx 0;
+  padding: 10.5rpx 0;
   background-color: #ffebeb;
   border-radius: 9.38rpx;
   width: 112.5rpx;

pages/projectModule/userProject/userProject.js

@@ -9,7 +9,6 @@ Page({
 
   data: {
     userProjectList: [],
-    promotionCode: true,
   },
 
   /**
@@ -32,7 +31,7 @@ Page({
   // 获取项目列表
   getProgram() {
     wx.request({
-      url: baseUrl + '/project/query/card',
+      url: baseUrl + '/project/get/running',
       method: 'POST',
       header: {
         Authorization: wx.getStorageSync('token')
@@ -52,12 +51,17 @@ Page({
   gotoProjectDetail(e){
     // 获取data-id中的值
     const projectId = e.currentTarget.dataset.id;
-    const promotionCode = this.data.promotionCode;
-
     wx.navigateTo({
-      url: `/pages/projectModule/projectDetail/projectDetail?id=${projectId}&promotionCode=${promotionCode}`,
+      url: `/pages/projectModule/projectDetail/projectDetail?id=${projectId}&isPromo=0`,
     })
   },
+    // 子元素点击事件，阻止冒泡
+    stopEventPropagation(e) {
+      const projectId = e.currentTarget.dataset.id;
+      wx.navigateTo({
+        url: `/pages/projectModule/projectDetail/projectDetail?id=${projectId}&isPromo=1`,
+      })
+    },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/projectModule/userProject/userProject.wxml

@@ -1,6 +1,6 @@
 <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" >
+    <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
@@ -15,19 +15,17 @@
         <image
           class="image_2"
           src="./images/yjt.png"
-          bind:tap="gotoProjectDetail" 
-          data-id="{{ item.id }}"
         />
       </view>
       <view class="mt-14 flex-row group_2 equal-division">
-        <view class="flex-row justify-center items-center section equal-division-item" bind:tap="gotoProjectDetail" data-id="{{ item.id }}">
+        <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.id }}"> 
+        <view class="ml-14 flex-row items-center section equal-division-item_2" bind:tap="gotoSubSettlement" data-id="{{ item.projectId }}"> 
           <image
             class="shrink-0 image_4"
             src="./images/jsmx.png"