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

# Conflicts:
#	app.json

app.json

@@ -74,8 +74,9 @@
                 "pages/historical-purchase-history/historical-purchase-history",
                 "pages/draw-bill/draw-bill",
                 "pages/draw-bill/add/add",
-                "pages/invoice-header/invoice-header",
-                "pages/invoice-header/add/add"
+                "pages/invoice-header/invoice-header", 
+                "pages/invoice-header/add/add",
+                "pages/understand-software/understand-software" 
             ]
         },
         {

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

@@ -431,6 +431,7 @@ Page({
         params.buyBeginDate = summaryInfo.buyBeginDate;
         params.buyEndDate = summaryInfo.endDate
         params.extendDays = summaryInfo.extendDays;
+        params.staffNameFrom = app.globalData.user.staffName
         if (this.data.gradeCode == Constants.gradeCode.STD) {
             params.buyEndDate = summaryInfo.userEndDate
             params.endDate = app.globalData.company.endDate

package-basic-data/pages/func-buy/add-confirm/add-confirm.js

@@ -143,7 +143,7 @@ Page({
             params.vip = true;
         }
         params.buyLong = this.data.extendDays + '天'
-        console.log(params);
+        params.staffNameFrom = app.globalData.user.staffName
         return params;
     },
     /**

package-basic-data/pages/register/company-register/company-register.js

@@ -323,10 +323,10 @@ Page({
     }
     // 从好有分享过来的数据 好友互利共赢  shareType=1 cpid userid startdate enddate 
     if (this.data.shareType) {
-      params.cpIdFrom = this.data.cpIdFrom 
-      params.shareEndDate = this.data.shareEndDate 
-      params.userIdFrom = this.data.userIdFrom 
-      params.staffNameFrom = this.data.staffNameFrom  
+      params.cpIdFrom = this.data.cpIdFrom
+      params.shareEndDate = new Date(this.data.shareEndDate).toDateTimeStr()
+      params.userIdFrom = this.data.userIdFrom
+      params.staffNameFrom = this.data.staffNameFrom
     }
     return params
   },
@@ -471,6 +471,7 @@ Page({
    * @author : 周兴
    */
   onLoad: function (options) {
+    console.log(options, "register");
     // 从好有分享过来的数据 好友互利共赢  shareType=1 cpid userid startdate enddate   
     if (options.shareType) {
       this.setData({
@@ -518,10 +519,19 @@ Page({
   getCurrentDate() {
     let _this = this
     let service = app.globalData['companyService']
-    _this.excute(service, service.getCurrentDate, {}).then(res => {
+    _this.excute(service, service.getCurrentDate, { flgTime: true }).then(res => {
       if (res.data.code == Constants.SUCESS_CODE) {
-        //服务器的时间  
+        //服务器的时间 ---带时分秒的
         let nowDate = res.data.data.currentDate
+        // 返回的 邀请 的时间 和服务器的时间
+        if (this.data.shareEndDate && this.data.shareEndDate != null) {
+          let dayDiffs = new Date(nowDate).dayDiff(new Date(this.data.shareEndDate))
+          // 返回的 
+          if (dayDiffs > 0) {
+            util.showToast('邀请的链接已过期');
+          }
+        }
+
         nowDate = new Date(nowDate).toDateStr()
         _this.setData({
           buyBeginDate: nowDate

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

@@ -13,6 +13,7 @@ Page({
     needHelpUserNumber: 5,
     powerModelShowFlag: true,
     menuButtonTop: 48,
+    helpUserNumber: 0,
     params: {},
     helpFlag: true
   },
@@ -21,9 +22,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    console.log('options', options);
+    const userNum = Number(options.userNum)
+    options.receiveUser = options.userIdForm
     this.setData({
-      params: options
+      params: options,
+      needHelpUserNumber: userNum,
     })
     wx.hideShareMenu()
   },
@@ -96,6 +99,18 @@ Page({
     })
   },
   /**
+  * @desc : 跳转了解软件
+  * @author : 刘尧
+  * @date : 2024/7/29 09:26
+  */
+  toUnderstand(){
+    let toUrl = '/package-basic-data/pages/understand-software/understand-software'
+    wx.navigateTo({
+      url: toUrl,
+    })
+
+  },
+  /**
 * @desc : 获取微信派发的 openid
 * @date : 2022/5/12 13:49
 * @author : 姜永辉
@@ -133,6 +148,9 @@ Page({
           _this.excute(service, 'insert_coupon_send', params).then(res => {
             if (res.data.code == Constants.SUCESS_CODE) {
               util.showToast('助力成功！')
+              this.setData({
+                helpUserNumber: this.data.helpUserNumber + 1
+              })
             }
               this.setData({
                 helpFlag: false,

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

@@ -35,7 +35,10 @@
       </view>
       <view class="icon-view">
         <view class="info">
-          <view class="user-icon" wx:for="{{needHelpUserNumber}}">
+          <view class="user-icon" wx:for="{{helpUserNumber}}">
+            <image fit="fill" src="{{imageUrl+'/user_icon.png'}}" />
+          </view>
+          <view class="user-icon" wx:for="{{needHelpUserNumber - helpUserNumber}}">
             <van-icon class="icon" name="plus" />
           </view>
         </view>
@@ -46,7 +49,7 @@
         <van-button size="normal" wx:else color="#FF7B1A" custom-style="width:100%;margin-top:30rpx;border-radio:50rpx;">我也想使用软件
         </van-button>
         <van-button size="normal" color="#FF7B1A1A;"
-          custom-style="width:100%;margin-top:30rpx;margin-bottom:50rpx;border-radio:50rpx;">了解软件</van-button>
+          custom-style="width:100%;margin-top:30rpx;margin-bottom:50rpx;border-radio:50rpx;" bind:tap="toUnderstand">了解软件</van-button>
       </view>
     </view>
     <van-overlay show="{{ powerModelShowFlag }}" z-index="100" bind:click="onClickHide" />

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

@@ -1,6 +1,4 @@
 /* package-basic-data/pages/share-power/share-power.wxss */
-.background-view{
-}
 
 .background-view image{
   position: fixed;
@@ -115,6 +113,11 @@
   color: #8992a1f1;
 }
 
+.content .icon-view .info .user-icon image {
+  width: 45px;
+  height: 45px;
+}
+
 .content .icon-view .icon{
   font-size: 40px;
   color: #FFFFFF;

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

@@ -57,6 +57,13 @@ Page({
       })
     }
   },
+  /**
+  * 生命周期函数--监听页面显示
+  */
+  onShow() {
+    // 积分
+    this.getIntegral()
+  },
 
   /**
    * @desc : onLoad生命周期回调
@@ -76,8 +83,6 @@ Page({
     this.getIntegralTactic()
     // 获取优惠劵助力信息
     this.getCouponTactic()
-    // 积分
-    this.getIntegral()
     // 获取用户头像
     this.getUser()
     // 优惠劵
@@ -108,17 +113,25 @@ Page({
                 couponSendItem: data
               })
             }
+            that.setData({
+              couponSendItem: data
+            })
           })
           break;
         case 'toRegister':
           const that = this
           this.getRegisterItem().then(res => {
             const item = res.data.data
-            const endDate = item.endDate
-            const nowTime = item.nowDate
-            const time = that.calculateTimeDifference(new Date(nowTime), new Date(endDate))
+            if(item){
+              const endDate = item.endDate
+              const nowTime = item.nowDate
+              const time = that.calculateTimeDifference(new Date(nowTime), new Date(endDate))
+              that.setData({
+                time: time,
+                integralShareItem: item
+              })
+            }
             that.setData({
-              time: time,
               integralShareItem: item
             })
           })
@@ -140,12 +153,28 @@ Page({
     let service = app.globalData['couponSendService']
     return this.excute(service, 'get_item', params)
   },
+  formatDate(isoDateString) {
+    // 首先，尝试将ISO 8601格式的日期字符串转换为Date对象  
+    const date = new Date(isoDateString);
+
+    // 然后，使用Date对象的方法获取年、月、日、时、分、秒  
+    // 注意月份是从0开始的，所以要+1  
+    const year = date.getUTCFullYear();
+    const month = String(date.getUTCMonth() + 1).padStart(2, '0');
+    const day = String(date.getUTCDate()).padStart(2, '0');
+    const hours = String(date.getUTCHours()).padStart(2, '0');
+    const minutes = String(date.getUTCMinutes()).padStart(2, '0');
+    const seconds = String(date.getUTCSeconds()).padStart(2, '0');
+
+    // 最后，按照yyyy-MM-ddTHH:mm:ss的格式拼接字符串  
+    return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`;
+  },
   /**
   * @desc : 获取助力明细
   * @author : 刘尧
   * @date : 2024/7/30 
   */
-  getRegisterItem(){
+  getRegisterItem() {
     let service = app.globalData['integralShareService']
     const params = {
       cpId: app.globalData.company.cpId,
@@ -279,7 +308,7 @@ Page({
   * @author : 刘尧
   * @date : 2024/8/1 11:32
   */
-  insertNewRegisterItem(){
+  insertNewRegisterItem() {
     const params = {
       cpId: app.globalData.company.cpId,
       tacticId: this.data.integralTacticItem.tacticId,
@@ -312,7 +341,7 @@ Page({
   * @author : 刘尧
   * @date : 2024/7/30 15:40
   */
-  shareIntegral(){
+  shareIntegral() {
     let service = app.globalData['integralShareService']
     const params = {
       cpId: app.globalData.company.cpId,
@@ -324,13 +353,13 @@ Page({
     }
     return this.excute(service, service.insert, params)
   },
-  
+
   /**
   * @desc : 获取用户剩余分享次数
   * @author : 刘尧
   * @date : 2024/7/30 15:40
   */
-  getShareNumber(){
+  getShareNumber() {
     let service = app.globalData['integralShareService']
     const params = {
       cpId: app.globalData.company.cpId,
@@ -348,17 +377,35 @@ Page({
       })
     })
   },
+  
+  /**
+  * @desc : 跳转云币规则
+  * @author : 刘尧
+  * @date : 2024/8/2 14:54
+  */
+  toIntegralRules() {
+    let url = config.knowledge_url + '/agreement-index?agId=10002024-0802-0000-0000-000009ff303e'
+    let toUrl = '/pages/product/product'
+    if (url) {
+      wx.navigateTo({
+        url: toUrl,
+        success: function (res) {
+          res.eventChannel.emit('url', url);
+        }
+      })
+    }
+  },
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: async function(e) {
+  onShareAppMessage: async function (e) {
     const url = this.data.imageUrl + 'share-background.png'
     this.setData({
       cilckViewId: e.target.dataset.detail
     })
     if (e.target.dataset.detail === "toShare") {
       const integralTacticItem = this.data.integralTacticItem
-      if(integralTacticItem.shareDayNum > 0){
+      if (integralTacticItem.shareDayNum > 0) {
         const res = await this.shareIntegral()
         if (res.data.code == Constants.SUCESS_CODE) {
           this.getShareNumber()
@@ -370,14 +417,14 @@ Page({
             imageUrl: url
           }
         }
-      }else {
+      } else {
         util.showToast('今日分享已达上限！')
       }
     }
     if (e.target.dataset.detail === "toRegister") {
       let item = await this.getRegisterItem()
       item = item.data.data
-      if(item){
+      if (item) {
         const that = this
         const endDate = item.endDate
         const nowTime = item.nowDate
@@ -387,33 +434,29 @@ Page({
           integralShareItem: item
         })
       }
-      if(!this.data.integralShareItem){
+      if (!this.data.integralShareItem) {
         const res = await this.insertNewRegisterItem()
         if (res.data.code == Constants.SUCESS_CODE) {
           const that = this
           const data = res.data.data
           const endDate = data.endDate
-          const nowTime = data.nowDate
+          const nowTime = data.nowTime
           const time = that.calculateTimeDifference(new Date(nowTime), new Date(endDate))
           that.setData({
             time: time,
             integralShareItem: data
           })
-          return {
-            title: '邀请好友，互利共赢',
-            desc: '邀请注册拿云币',
-            path: '/pages/welcome/welcome?cpIdForm=' + app.globalData.company.cpId + '&shareType=1&shareEndDate=' + endDate + '&staffNameFrom=' +  app.globalData.user.staffName + 'userIdForm=' + app.globalData.user.userId,
-            imageUrl: url
-          }
-        }
-      }else {
-        return {
-          title: '邀请好友，互利共赢',
-          desc: '邀请注册拿云币',
-          path: '/pages/welcome/welcome?cpIdForm=' + app.globalData.company.cpId + '&shareType=1&shareEndDate=' + that.data.integralShareItem.endDate + '&staffNameFrom=' + app.globalData.user.staffName + 'userIdForm=' + app.globalData.user.userId,
-          imageUrl: url
         }
       }
+      const that = this
+      let path = '/pages/welcome/welcome?cpIdFrom=' + app.globalData.company.cpId + '&shareType=1&shareEndDate=' + that.data.integralShareItem.endDate + '&staffNameFrom=' + app.globalData.user.staffName + '&userIdFrom=' + app.globalData.user.userId
+      console.log("path",path);
+      return {
+        title: '邀请好友，互利共赢',
+        desc: '邀请注册拿云币',
+        path: path,
+        imageUrl: url
+      }
     }
     if (e.target.dataset.detail === "toPower") {
       const couponDesc = this.data.couponItem.couponDesc
@@ -429,7 +472,10 @@ Page({
           couponSendItem: item
         })
       }
-      if(!this.data.couponSendItem){
+      this.setData({
+        couponSendItem: item
+      })
+      if (!this.data.couponSendItem) {
         const that = this
         const res = await this.insertNewPowerItem()
         if (res.data.code == Constants.SUCESS_CODE) {
@@ -447,7 +493,7 @@ Page({
       return {
         title: couponDesc,
         desc: '助力拿福利',
-        path: '/package-basic-data/pages/share-power/share-power?cpId=' + app.globalData.company.cpId + '&couponId=' + that.data.couponItem.couponId + '&sendId=' + that.data.couponSendItem.sendId + '&discount=' + that.data.couponItem.discount + '&userIdForm=' + app.globalData.user.userId,
+        path: '/package-basic-data/pages/share-power/share-power?cpId=' + app.globalData.company.cpId + '&couponId=' + that.data.couponItem.couponId + '&sendId=' + that.data.couponSendItem.sendId + '&discount=' + that.data.couponItem.discount + '&userIdForm=' + app.globalData.user.userId + '&userNum=' + this.data.couponItem.userNum,
         imageUrl: url
       }
     }

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

@@ -39,7 +39,7 @@
         </view>
       </view>
       <view class="rearmk-view">
-        <view class="title">云币说明:<span class="info">完成签到、分享、邀请可获得云币，云币可完全抵扣续费、购买授权、购买功能包等费用。<span style="color: #3F5CF4;text-decoration:underline;">查看云币具体规则；</span>完成助力可获得优惠券，优惠券有期限请注意使用</span></view>
+        <view class="title">云币说明:<span class="info">完成签到、分享、邀请可获得云币，云币可完全抵扣续费、购买授权、购买功能包等费用。<span style="color: #3F5CF4;text-decoration:underline;" bind:tap="toIntegralRules">查看云币具体规则；</span>完成助力可获得优惠券，优惠券有期限请注意使用</span></view>
       </view>
     </view>
     <view class="user-card-backgorund">
@@ -95,12 +95,12 @@
         </van-button>
       </view>
     </view>
-    <view class="button-view-footer" wx:if="{{ cilckViewId=='toPower' && couponSendItem }}">
+    <view class="button-view-footer" wx:if="{{ cilckViewId=='toPower' && couponSendItem && couponSendItem != null }}">
       <view class="user-list">
         <view class="user-icon" wx:for="{{couponSendItem.userHelpNum}}">
           <image fit="fill" src="{{imageUrl+'/user_icon.png'}}" />
         </view>
-        <view class="user-icon" wx:for="{{ couponItem.userNum > 5? 5 - couponItem: couponItem.userNum - couponSendItem.userHelpNum }}">
+        <view class="user-icon" wx:for="{{ couponItem.userNum > 5? 5 - couponItem: couponItem.userNum - (couponSendItem.userHelpNum? couponSendItem.userHelpNum: 0) }}">
           <!-- <van-icon class="icon" name="add-o" /> -->
           <van-icon class="icon" name="plus" />
         </view>

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

@@ -293,13 +293,13 @@ page {
 .activity-card .button-view-footer .user-list {
   display: flex;
   max-width: 220rpx;
-  min-width: 98rpx;
+  min-width: 100rpx;
   justify-content: space-between;
 }
 
 .activity-card .button-view-footer .user-list .user-icon image {
-  width: 20px;
-  height: 20px;
+  width: 23px;
+  height: 23px;
   margin-top: 20rpx;
 }
 
@@ -323,6 +323,7 @@ page {
 .activity-card .button-view-footer .remark .time-view .time {
   background-color: #95A8CB;
   padding: 5rpx;
+  border-radius: 5rpx;
 }
 
 .van-transition {

package-basic-data/pages/sign-share-detail/coupon-detail.wxss

@@ -2,7 +2,7 @@ page {
   background: #F8F9FD;
 }
 .content{
-  padding: 20rpx 10px 0rpx 10px;
+  padding: 20rpx 10px 50rpx 10px;
 }
 
 .user-card{

package-basic-data/pages/sign-share-detail/integral-detail.js

@@ -95,6 +95,23 @@ Page({
     });
   },
 
+  /**
+  * @desc : 跳转云币规则
+  * @author : 刘尧
+  * @date : 2024/8/2 14:54
+  */
+  toIntegralRules() {
+    let url = config.knowledge_url + '/agreement-index?agId=10002024-0802-0000-0000-000009ff303e'
+    let toUrl = '/pages/product/product'
+    if (url) {
+      wx.navigateTo({
+        url: toUrl,
+        success: function (res) {
+          res.eventChannel.emit('url', url);
+        }
+      })
+    }
+  },
   /** 
   * @desc : 查询签到，分享，邀请，使用 
   * @date : 2024年3月8日

package-basic-data/pages/sign-share-detail/integral-detail.wxml

@@ -30,7 +30,7 @@
       <view class="rearmk-view">
         <view class="title">说明:
           <span class="info">完成签到、分享、邀请可获得云币，云币可完全抵扣续费、购买授权、购买功能包等费用。
-            <span style="color: #3F5CF4;text-decoration:underline;">查看云币具体规则；</span>
+            <span style="color: #3F5CF4;text-decoration:underline;" bind:tap="toIntegralRules">查看云币具体规则；</span>
           </span>
         </view>
       </view>

package-basic-data/pages/sign-share-detail/integral-detail.wxss

@@ -2,7 +2,7 @@ page {
   background: #F8F9FD;
 }
 .content{
-  padding: 20rpx 10px 0rpx 10px;
+  padding: 20rpx 10px 50rpx 10px;
 }
 
 .user-card{

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

@@ -13,237 +13,258 @@ const config = require('@/config/config.js');
 const util = require('@/utils/util');
 const app = getApp()
 Page({
-    mixins: [mixins],
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        staffName: '',
-        staffPhone: '',
-        companyName: '',
-        versionName: '',
-        // 路由
-        routeObjName: 'signRecord',
-        // 策略
-        integralTacticItem: {},
-        // 积分
-        integral: 0,
-        // 优惠券
-        couponCount: 0,
-        avatarUrl: config.image_url + '/static/img/' + '/order_billing_detail_01.png',
-        spot: [],
-        navigateBackFlag: true,
-        defaultTime: null,
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-        this.getCurrentDate()
-        // 策略
-        // this.getIntegralTactic()
-        // // 积分
-        // this.getIntegral()
-        // 头像
-        this.getUser()
-    },
-
-    loadInit() {
-        // 版本
-        this.setData({
-            versionName: this.data.freeVersionFlag ? mixins.$t('standardVersion') : mixins.$t('professionalVersion'),
-            companyName: app.globalData.company.cpName,
-            staffName: app.globalData.user.staffName,
-            staffPhone: app.globalData.user.staffPhone
-        })
-    },
-
-    /**
-    * 日期
-    * @param {*} e 
-    */
-    dateChange(e) {
-        // 当前日期的区间
-        let dateArrs = util.getCurrentDateMonth(e.detail.dateString)
-        let dayDiffs = new Date(this.data.serverDate).dayDiff(new Date(dateArrs[1]))
-        if (dayDiffs > 0) {
-            this.selectComponent('#timeclockCalendar').setDefaultTime(dateArrs[1])
-        } else {
-            this.selectComponent('#timeclockCalendar').setDefaultTime(this.data.serverDate)
+  mixins: [mixins],
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    staffName: '',
+    staffPhone: '',
+    companyName: '',
+    versionName: '',
+    // 路由
+    routeObjName: 'signRecord',
+    // 策略
+    integralTacticItem: {},
+    // 积分
+    integral: 0,
+    // 优惠券
+    couponCount: 0,
+    avatarUrl: config.image_url + '/static/img/' + '/order_billing_detail_01.png',
+    spot: [],
+    navigateBackFlag: true,
+    defaultTime: null,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.getCurrentDate()
+    // 策略
+    // this.getIntegralTactic()
+    // // 积分
+    // this.getIntegral()
+    // 头像
+    this.getUser()
+  },
+
+  loadInit() {
+    // 版本
+    this.setData({
+      versionName: this.data.freeVersionFlag ? mixins.$t('standardVersion') : mixins.$t('professionalVersion'),
+      companyName: app.globalData.company.cpName,
+      staffName: app.globalData.user.staffName,
+      staffPhone: app.globalData.user.staffPhone
+    })
+  },
+
+  /**
+  * 日期
+  * @param {*} e 
+  */
+  dateChange(e) {
+    // 当前日期的区间
+    let dateArrs = util.getCurrentDateMonth(e.detail.dateString)
+    let dayDiffs = new Date(this.data.serverDate).dayDiff(new Date(dateArrs[1]))
+    if (dayDiffs > 0) {
+      this.selectComponent('#timeclockCalendar').setDefaultTime(dateArrs[1])
+    } else {
+      this.selectComponent('#timeclockCalendar').setDefaultTime(this.data.serverDate)
+    }
+
+    this.getSignData(dateArrs[0], dateArrs[1])
+
+  },
+
+  /**
+  * @desc : 跳转云币规则
+  * @author : 刘尧
+  * @date : 2024/8/2 14:54
+  */
+  toIntegralRules() {
+    let url = config.knowledge_url + '/agreement-index?agId=10002024-0802-0000-0000-000009ff303e'
+    let toUrl = '/pages/product/product'
+    if (url) {
+      wx.navigateTo({
+        url: toUrl,
+        success: function (res) {
+          res.eventChannel.emit('url', url);
         }
+      })
+    }
+  },
+
+  /**
+  * @desc : 服务器的日期
+  * @author : 姜永辉
+  * @date : 2024/4/1
+  */
+  getCurrentDate() {
+    let _this = this
+    let service = app.globalData['commonService']
+    _this.excute(service, service.getCurrentDate, {}).then(res => {
+      //执行保存编辑操作
+      _this.save({})
+      if (res.data.code == Constants.SUCESS_CODE) {
+        //服务器的时间  
+        let nowDate = res.data.data.currentDate
+        let serverDate = new Date(nowDate).toDateStr()
+        _this.setData({
+          serverDate,
+          defaultTime: serverDate
+        })
+
+      }
+    });
+  },
+
 
-        this.getSignData(dateArrs[0], dateArrs[1])
-
-    },
-
-    /**
-    * @desc : 服务器的日期
-    * @author : 姜永辉
-    * @date : 2024/4/1
-    */
-    getCurrentDate() {
-        let _this = this
-        let service = app.globalData['commonService']
-        _this.excute(service, service.getCurrentDate, {}).then(res => {
-            //执行保存编辑操作
-            _this.save({})
-            if (res.data.code == Constants.SUCESS_CODE) {
-                //服务器的时间  
-                let nowDate = res.data.data.currentDate
-                let serverDate = new Date(nowDate).toDateStr()
-                _this.setData({
-                    serverDate,
-                    defaultTime: serverDate
-                })
-
-            }
-        });
-    },
-
-
-    /**
-    * @desc : 策略
-    * @author : 姜永辉
-    * @date : 2024/4/1
-    */
-    getIntegralTactic() {
-        let params = {}
-        let service = app.globalData['integralTacticService']
-        this.excute(service, service.selectByCond, params).then(res => {
-            if (res.data.code == Constants.SUCESS_CODE) {
-                if (res.data && res.data.data.list && res.data.data.list.length > 0) {
-                    this.setData({
-                        integralTacticItem: res.data.data.list[0],
-                    })
-                }
-            }
-        });
-    },
-
-    /**
-    * @desc : 公司积分
-    * @author : 姜永辉
-    * @date : 2024/4/1
-    */
-    getIntegral() {
-        let params = {}
-        let service = app.globalData['integralService']
-        this.excute(service, app.globalData.company.cpId, params).then(res => {
-            console.log(res.data, 'getIntegral');
-            if (res.data.code == Constants.SUCESS_CODE) {
-                if (res.data && res.data.data) {
-                    this.setData({
-                        integral: res.data.data.integral,
-                    })
-                }
-            }
-        });
-    },
-    /**
-    * @desc : 优惠券
-    * @author : 姜永辉
-    * @date : 2024/4/1
-    */
-    getCouponCount() {
-        let params = {
-            integralType: Constants.integralType.sign
+  /**
+  * @desc : 策略
+  * @author : 姜永辉
+  * @date : 2024/4/1
+  */
+  getIntegralTactic() {
+    let params = {}
+    let service = app.globalData['integralTacticService']
+    this.excute(service, service.selectByCond, params).then(res => {
+      if (res.data.code == Constants.SUCESS_CODE) {
+        if (res.data && res.data.data.list && res.data.data.list.length > 0) {
+          this.setData({
+            integralTacticItem: res.data.data.list[0],
+          })
         }
-        let service = app.globalData['couponUseService']
-        this.excute(service, '10002024-0718-0000-0000-000005c0a01e', params).then(res => {
-            console.log(res.data);
-            if (res.data.code == Constants.SUCESS_CODE) {
-
-            }
-        });
-    },
-
-    /**
-     * @desc : 头像
-     * @date : 2024/7/1 15:49
-     * @author : 姜永辉
-     */
-    getUser() {
-        let service = app.globalData['oauthService']
-        return this.excute(service, service.getUser + '/' + app.globalData.user.userId, {}).then(res => {
-            if (res.data.code == Constants.SUCESS_CODE) {
-                let avatarUrl = res.data.data.userImage || this.data.defaultAvatarUrl
-                this.setData({
-                    avatarUrl: avatarUrl
-                })
-            }
-        });
-    },
-
-    /** 
-     * @desc : 查询签到 
-     * @date : 2024年3月8日
-     * @author : jyh 
-     */
-    getSignData(accDateStart, accDateEnd) {
-        let _this = this
-        let params = {
-            integralType: Constants.integralType.sign,
-            accDateStart: accDateStart,
-            accDateEnd: accDateEnd,
-            flgValid: true,
-            userId: app.globalData.user.userId,
+      }
+    });
+  },
+
+  /**
+  * @desc : 公司积分
+  * @author : 姜永辉
+  * @date : 2024/4/1
+  */
+  getIntegral() {
+    let params = {}
+    let service = app.globalData['integralService']
+    this.excute(service, app.globalData.company.cpId, params).then(res => {
+      console.log(res.data, 'getIntegral');
+      if (res.data.code == Constants.SUCESS_CODE) {
+        if (res.data && res.data.data) {
+          this.setData({
+            integral: res.data.data.integral,
+          })
         }
-        let service = app.globalData['integralItemService']
-        return this.excute(service, service.selectByCond, params).then(res => {
-            if (res.data.code == Constants.SUCESS_CODE) {
-                let spot = []
-                console.log(res.data.data.list);
-                res.data.data.list.forEach(it => {
-                    spot.push({
-                        date: it.accDate,
-                        title: it.integral + '个',
-                        isnormal: true,
-                    })
-                })
-                _this.setData({
-                    spot
-                })
-            }
+      }
+    });
+  },
+  /**
+  * @desc : 优惠券
+  * @author : 姜永辉
+  * @date : 2024/4/1
+  */
+  getCouponCount() {
+    let params = {
+      integralType: Constants.integralType.sign
+    }
+    let service = app.globalData['couponUseService']
+    this.excute(service, '10002024-0718-0000-0000-000005c0a01e', params).then(res => {
+      console.log(res.data);
+      if (res.data.code == Constants.SUCESS_CODE) {
+
+      }
+    });
+  },
+
+  /**
+   * @desc : 头像
+   * @date : 2024/7/1 15:49
+   * @author : 姜永辉
+   */
+  getUser() {
+    let service = app.globalData['oauthService']
+    return this.excute(service, service.getUser + '/' + app.globalData.user.userId, {}).then(res => {
+      if (res.data.code == Constants.SUCESS_CODE) {
+        let avatarUrl = res.data.data.userImage || this.data.defaultAvatarUrl
+        this.setData({
+          avatarUrl: avatarUrl
+        })
+      }
+    });
+  },
+
+  /** 
+   * @desc : 查询签到 
+   * @date : 2024年3月8日
+   * @author : jyh 
+   */
+  getSignData(accDateStart, accDateEnd) {
+    let _this = this
+    let params = {
+      integralType: Constants.integralType.sign,
+      accDateStart: accDateStart,
+      accDateEnd: accDateEnd,
+      flgValid: true,
+      userId: app.globalData.user.userId,
+    }
+    let service = app.globalData['integralItemService']
+    return this.excute(service, service.selectByCond, params).then(res => {
+      if (res.data.code == Constants.SUCESS_CODE) {
+        let spot = []
+        console.log(res.data.data.list);
+        res.data.data.list.forEach(it => {
+          spot.push({
+            date: it.accDate,
+            title: it.integral + '个',
+            isnormal: true,
+          })
         })
-    },
-
-
-    /**
-     * @desc : 保存的參數設置
-     * @date : 2024/2/1 15:49
-     * @author : 姜永辉
-     */
-    setParams(params) {
-        params.userId = app.globalData.user.userId
-        params.cpId = app.globalData.company.cpId
-        params.staffName = app.globalData.user.staffName
-        return params
-    },
-
-    /**
-    * @desc : 保存签到
-    * @date : 2024/2/1 15:49
-    * @author : 姜永辉
-    */
-    saveData() {
-        let _this = this
-        return this.excute(this.data.service, this.data.service.insert, this.data.params).then(res => {
-            if (res.data.code == Constants.SUCESS_CODE) { 
-                if (!res.data.data) { 
-                    wx.showToast({
-                        title: '签到成功',
-                        image: '/static/image/success.png',
-                        duration: 2000
-                    })
-                }
-                let serverDate = _this.data.serverDate
-                let dateArrs = util.getCurrentDateMonth(serverDate)
-                _this.getSignData(dateArrs[0], dateArrs[1])
-                _this.getIntegral()
-            }
+        _this.setData({
+          spot
         })
-    },
- 
+      }
+    })
+  },
+
+
+  /**
+   * @desc : 保存的參數設置
+   * @date : 2024/2/1 15:49
+   * @author : 姜永辉
+   */
+  setParams(params) {
+    params.userId = app.globalData.user.userId
+    params.cpId = app.globalData.company.cpId
+    params.staffName = app.globalData.user.staffName
+    return params
+  },
+
+  /**
+  * @desc : 保存签到
+  * @date : 2024/2/1 15:49
+  * @author : 姜永辉
+  */
+  saveData() {
+    let _this = this
+    return this.excute(this.data.service, this.data.service.insert, this.data.params).then(res => {
+      if (res.data.code == Constants.SUCESS_CODE) {
+        if (!res.data.data) {
+          wx.showToast({
+            title: '签到成功',
+            image: '/static/image/success.png',
+            duration: 2000
+          })
+        }
+        let serverDate = _this.data.serverDate
+        let dateArrs = util.getCurrentDateMonth(serverDate)
+        _this.getSignData(dateArrs[0], dateArrs[1])
+        _this.getIntegral()
+        _this.setData({
+          loading: false,
+        })
+      }
+    })
+  },
+
 
 })

package-basic-data/pages/sign/sign.wxml

@@ -27,7 +27,7 @@
 				</view>
 			</view>
 			<view class="rearmk-view">
-				<view class="title">云币说明:<span class="info">完成签到、分享、邀请可获得云币，云币可完全抵扣续费、购买授权、购买功能包等费用。<span style="color: #3F5CF4;text-decoration:underline;">查看云币具体规则；</span>完成助力可获得优惠券，优惠券有期限请注意使用</span></view>
+				<view class="title">云币说明:<span class="info">完成签到、分享、邀请可获得云币，云币可完全抵扣续费、购买授权、购买功能包等费用。<span style="color: #3F5CF4;text-decoration:underline;" bind:tap="toIntegralRules">查看云币具体规则；</span>完成助力可获得优惠券，优惠券有期限请注意使用</span></view>
 			</view>
 		</view>
 		<view class="user-card-backgorund">

package-basic-data/pages/understand-software/understand-software.js

@@ -0,0 +1,71 @@
+// package-basic-data/pages/understand-software/understand-software.js
+const Constants = require('@/utils/Constants.js');
+const mixins = require('@/mixins/index.js');
+const app = getApp()
+const util = require('@/utils/util.js')
+const api = require('@/utils/api.js');
+Page({
+  mixins: [mixins],
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

package-basic-data/pages/understand-software/understand-software.json

@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationStyle": "custom"
+}

package-basic-data/pages/understand-software/understand-software.wxml

@@ -0,0 +1,13 @@
+<view>
+  <view class="background-view">
+    <image fit="fill" src="{{imageUrl+'/powerPage_backgorund.png'}}"></image>
+  </view>
+  <van-sticky scroll-top="0" id="sticky">
+    <dk-navbar titleFontColor="#ffffff" leftButtonHide="{{false}}" operateShow="{{false}}" fixed="{{true}}"
+      navbarTitle="助力抢劵" customStyle="background-color:transparent;" />
+  </van-sticky>
+  <view class="content">
+    <image mode="widthFix" style="border-top-left-radius: 20rpx;border-top-right-radius: 20rpx;" src="{{imageUrl+'/understand_software_top.png'}}"></image>
+    <image mode="widthFix" style="border-bottom-left-radius: 20rpx;border-bottom-right-radius: 20rpx;margin-top: -10rpx;" src="{{imageUrl+'/understand_software_bottom.png'}}"></image>
+  </view>
+</view>

package-basic-data/pages/understand-software/understand-software.wxss

@@ -0,0 +1,27 @@
+/* package-basic-data/pages/understand-software/understand-software.wxss */
+
+.background-view image{
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100%;
+  z-index: 10;
+}
+
+.content{
+  margin-top: 200rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  border-radius: 20rpx;
+  padding: 20rpx;
+  background-color: #95A8CB;
+}
+
+.content image{
+  width: 95%;
+  height: auto;
+  z-index: 20;
+}

pages/login/login.js

@@ -379,13 +379,15 @@ Page({
           // }
 
         } else {
+          
           // 从好有分享过来的数据 好友互利共赢  shareType=1 cpid userid startdate enddate
           let url = _this.data.shareType
-            ? '/package-basic-data/pages/register/company-register/company-register?shareType' + _this.data.shareType + '&cpIdFrom=' + _this.data.cpIdFrom
+            ? '/package-basic-data/pages/register/company-register/company-register?shareType=' + _this.data.shareType + '&cpIdFrom=' + _this.data.cpIdFrom
             + '&shareEndDate=' + _this.data.shareEndDate
-            + '&userIdFrom=' + this.data.userIdFrom
-            + '&staffNameFrom=' + this.data.staffNameFrom
+            + '&userIdFrom=' + _this.data.userIdFrom
+            + '&staffNameFrom=' + _this.data.staffNameFrom
             : '/package-basic-data/pages/register/company-register/company-register'
+            console.log(url,"login");
           wx.navigateTo({
             url: url,
             events: {

pages/mine/mine.js

@@ -1027,8 +1027,7 @@ Page({
       menuBtnInfo: wx.getMenuButtonBoundingClientRect()
     })
 
-    // 积分
-    this.getIntegral()
+   
   },
   onShow() {
     if (this.data.mineFlag) {
@@ -1052,6 +1051,9 @@ Page({
         break
     }
     this.getHomeOrderRecCost(dates[0], dates[1])
+
+     // 积分
+     this.getIntegral()
   },
   /**
    * 页面相关事件处理函数--监听用户下拉动作

pages/mine/mine.wxml

@@ -7,13 +7,17 @@
   <image src="{{imageUrl + 'home-back.png'}}" class="head-image"></image>
   <!-- 公司 -->
   <view class="company" style="top:{{statusHeight + 'rpx'}}">
-    <view style="display: flex;align-items: center;" catchtap="changeCp">
-      <view class="company-change-class">
-        {{companyName?companyName:''}}
+    <view style="display: flex;align-items: center;align-content: center;">
+      <view style="display: flex;align-items: center;line-height: 22px;" catchtap="changeCp">
+        <view class="company-change-class">
+          {{companyName?companyName:''}}
+        </view>
+        <image src="/static/image/triangle.png" style="width: 28rpx;height:28rpx;"></image>
+      </view>
+      <view class="cp-setting" catch:tap="toSetting">
+        <van-icon name="setting-o" />
       </view>
-      <image src="/static/image/triangle.png" style="width: 28rpx;height:28rpx;"></image>
     </view>
-
     <view style="margin-top: 40rpx;display: flex;">
       <!-- 头像 -->
       <!-- <open-data type="userAvatarUrl" class='wx-avatar'></open-data> -->
@@ -131,9 +135,9 @@
       </view>
     </view>
     <!--商户设置-->
-    <view class="todo-view" style="margin-bottom: 4rpx;">
+    <!-- <view class="todo-view" style="margin-bottom: 4rpx;">
       <view class="todo-view-title" catch:tap="toSetting">{{$t['settingCommany']}}</view>
-    </view>
+    </view> -->
     <!--操作手册-->
     <!-- <view class="todo-view" style="margin-bottom: 4rpx;">
       <view style="display: flex;justify-content: space-between;">
@@ -190,7 +194,7 @@
 
 
 <!-- 退出 -->
-<view style="display: flex; justify-content: space-between; margin: 100rpx 30rpx;">
+<view style="display: flex; justify-content: space-between; margin: 50rpx 40rpx;">
   <view style="flex: 1; margin: 1vw;">
     <van-button custom-style="height:88rpx;border-radius:15rpx;" style="width: 100%;" color="#3E69F6" size="large" bind:tap="LogInAgain">重新登录</van-button>
   </view>

pages/mine/mine.wxss

@@ -431,7 +431,8 @@ page {
 .company-change-class {
 	margin-right: 10rpx;
 	font-size: 16px;
-	font-weight: 500;
+  font-weight: 500;
+  text-align: center;
 }
 
 .head-image {
@@ -445,4 +446,11 @@ page {
 	margin-right: 40rpx;
 	width: calc(100% - 80rpx);
 	background: #FFFFFF;
+}
+
+.cp-setting{
+  margin-left: 30rpx;
+  display: flex;
+  align-items: center;
+  padding: 6rpx;
 }

pages/welcome/welcome.js

@@ -89,6 +89,7 @@ Page({
                 staffNameFrom: options.staffNameFrom,
             })
         }
+        console.log(options,"welcome");
     },
 
     /**