Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

package-basic-data/pages/share-power/share-power.js

@@ -44,6 +44,22 @@ Page({
   onShow() {
     this.showPowerModel()
     this.getSystemButtonLocation()
+    this.getHelpUserNumber()
+  },
+
+  /**
+  * @desc : 获取当前链接有多少人助力
+  * @date : 2024/7/31 13:49
+  * @author : 刘尧
+   */
+  getHelpUserNumber() {
+    const params = this.data.params
+    let service = app.globalData['couponReceiveService']
+    this.excute(service, 'get_receive_user_number', params).then(res => {
+        this.setData({
+          helpUserNumber: res.data.data
+        })
+    })
   },
   /**
 * @desc : 页面加载时获取返回按钮距上边距

package-basic-data/pages/share/share.js

@@ -63,6 +63,8 @@ Page({
   onShow() {
     // 积分
     this.getIntegral()
+    // 优惠劵
+    this.getCouponNumber()
   },
 
   /**
@@ -85,8 +87,6 @@ Page({
     this.getCouponTactic()
     // 获取用户头像
     this.getUser()
-    // 优惠劵
-    this.getCouponNumber()
   },
 
   /**

package-business-analysis/pages/profit-report/profit-report.wxml

@@ -4,18 +4,19 @@
 <!-- 顶部 -->
 <view bindtap="handleTap">
   <!-- 顶部筛选条件 -->
-  <view class="head" style="position: fixed;top:0; z-index: 95;">
+  <!-- <view class="head" style="position: fixed;top:0; z-index: 95;"> 20240808edit 刘尧 修复销售利润表显示问题
     <view style="overflow: hidden;position: absolute;width: 100%; z-index: 6666;">
-      <van-sticky scroll-top="0">
-        <dk-navbar titleFontColor="#000000" navbarTitle="销售利润" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight" />
-        <dk-dropdown-menu id="menu" model:value="{{searchForm}}" menuList="{{searchContent}}" bind:dkdropdowndateCommit="changeSearchContent" bind:search="getSaleProfit" flgSearchText="{{false}}">
-        </dk-dropdown-menu>
-      </van-sticky>
-      <!-- 顶部筛选条件 -->
-      <!-- <view class="head" style="position: fixed;top:0; z-index: 95;">
-  <view style="overflow: hidden;position: absolute;width: 100%; z-index: 6666;">-->
+      顶部筛选条件
+      <view class="head" style="position: fixed;top:0; z-index: 95;">
+  <view style="overflow: hidden;position: absolute;width: 100%; z-index: 6666;">
     </view>
-  </view>
+  </view> -->
+
+  <van-sticky scroll-top="0">
+    <dk-navbar titleFontColor="#000000" navbarTitle="销售利润" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight" />
+    <dk-dropdown-menu id="menu" model:value="{{searchForm}}" menuList="{{searchContent}}" bind:dkdropdowndateCommit="changeSearchContent" bind:search="getSaleProfit" flgSearchText="{{false}}">
+    </dk-dropdown-menu>
+  </van-sticky>
 
 
   <view class="func">

package-business-analysis/pages/profit-report/profit-report.wxss

@@ -159,7 +159,7 @@ page {
 .func {
   width: 100%;
   height: 440rpx;
-  margin-top: -100rpx;
+  /* margin-top: -100rpx;  20240808edit 刘尧 修复销售利润表显示问题*/
   /* background: #F8F9FD; */
   border-radius: 40rpx 40rpx 0 0;
 

pages/company/company.js

@@ -232,7 +232,6 @@ Page({
                     app.globalData.company_social = { ...app.globalData.company }
                     app.globalData.user_social = { ...app.globalData.user }
                 }
-                ('app.company', app.globalData);
                 // 记录登录的缓存
                 app.globalData.company = data.company
 

pages/home-page/home-page.js

@@ -632,8 +632,9 @@ Page({
     })
     // 本周本月数据
     this.tauchSwiper('swiperList');
-    // 查询广告数据
-    this.getAdvertisement();
+     // 查询广告数据
+     this.getAdvertisement();
+
     // options 中的 scene  todo.. 先不要删除日志
     if (options.scene) {
       // var scene = options.scene

pages/mine/mine.js

@@ -635,7 +635,12 @@ Page({
       }
       return this.excute(_this.data.oauthService, _this.data.oauthService.logout, params).then(res => {
         if (res.data.code === Constants.SUCESS_CODE) {
-          app.globalData = {}
+          // 不能清除整个globalData,切换公司会因为找不到globalData数据而报错
+          // app.globalData = {}
+          // 清除掉用户信息
+          delete app.globalData['user']
+          // 清除公司信息
+          delete app.globalData['company']
           // 调转主页
           wx.reLaunch({
             url: '../../pages/welcome/welcome',