1、修改续费

i18n/zh-CN.js

@@ -226,7 +226,7 @@ const home = {
   cpInfo: '商户信息',
   paramSetting: '参数设置',
   productDetail: '产品详情',
-  homeTitle: '泛家居建陶行业云服务',
+  homeTitle: '泛家居行业云服务',
   homeProduct: '了解产品',
   homeFreeLogin: '免费体验',
   homeAddCompany: '加入企业',

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

@@ -17,8 +17,8 @@ Page({
      */
     data: {
         // 升级标识
-        upgradeFlag:false,
-        gradeCode:null,
+        upgradeFlag: false,
+        gradeCode: null,
         freeFlag: false,
         // 企业名称
         companyName: null,
@@ -28,6 +28,7 @@ Page({
         wxMaxNum: null,
         cpEndDate: null,
         activityTable: null,
+        vipTable: null,
         readFlag: false,
         staffCount: {
             maxNum: 1,
@@ -35,6 +36,8 @@ Page({
             wxMaxNum: 0
         },
         curentAdItem: null,
+        // 选择的vip报表
+        chooseVipFlag:false,
         summaryInfo: {},
         routeObjName: 'company',
         pageFlag: false,
@@ -58,7 +61,7 @@ Page({
         let months = item.validLong + item.extraLong
         let endDate = app.globalData.company.endDate
         // 升级需要从当天开始算
-        if(this.data.upgradeFlag){
+        if (this.data.upgradeFlag) {
             endDate = new Date()
         }
         endDate = new Date(endDate).addMonths(months).addDays(-1)
@@ -71,6 +74,30 @@ Page({
         this.countSummaryAmount(item);
     },
     /**
+     * @desc : 选择VIP报表明细
+     * @author : 周兴
+     * @date : 2024/4/1
+     */
+    chooseVipItem(e) {
+        let item = e.currentTarget.dataset.item;
+        // let summaryInfo = this.data.summaryInfo
+        // // 计算截止日期
+        // let months = item.validLong + item.extraLong
+        // let endDate = app.globalData.company.endDate
+        // // 升级需要从当天开始算
+        // if (this.data.upgradeFlag) {
+        //     endDate = new Date()
+        // }
+        // endDate = new Date(endDate).addMonths(months).addDays(-1)
+        // summaryInfo.endDate = endDate.toDateStr();
+        this.setData({
+            chooseVipFlag: !this.data.chooseVipFlag,
+            // summaryInfo: summaryInfo
+        })
+        // 计算金额
+        this.countSummaryAmountSTD();
+    },
+    /**
      * @desc : 勾选已阅读表示
      * @author : 周兴
      * @date : 2024/5/17
@@ -131,6 +158,7 @@ Page({
      */
     countSummaryAmountSTD() {
         let item = this.data.curentAdItem;
+        let vipTable = this.data.vipTable
         let summaryInfo = this.data.summaryInfo
         let amount = 0;
         // 先清空
@@ -140,9 +168,15 @@ Page({
         if (summaryInfo.reCountFlag) {
             // 手机端用户
             if (summaryInfo.wxMaxNum) {
-                summaryInfo.amountInfo += item.wxPrice + ' * ' + summaryInfo.wxMaxNum
+                summaryInfo.amountInfo += item.wxPrice + '(元) * ' + summaryInfo.wxMaxNum + '(个) ' 
                 amount += item.wxPrice * summaryInfo.wxMaxNum
             }
+            // vip报表
+            if(this.data.chooseVipFlag && vipTable && vipTable.length > 0){
+                let vipItem = vipTable[0]
+                summaryInfo.amountInfo += + ' + ' +vipItem.wxPrice + '(元/VIP) ';
+                amount +=  vipItem.wxPrice;
+            }
             if (summaryInfo.amountInfo) {
                 summaryInfo.amountInfo += ' = ' + amount + '(元)'
                 summaryInfo.amount = amount;
@@ -151,11 +185,20 @@ Page({
         } else {
             extendDays = new Date(summaryInfo.userEndDate).dayDiff(nowDate) + 1;
             if (summaryInfo.wxMaxNum) {
-                summaryInfo.amountInfo += item.wxPrice + '(元) / 365(天) * ' + extendDays + '(天) * ' + summaryInfo.wxMaxNum + '(个)'
-                amount = (item.wxPrice / 365 * extendDays * summaryInfo.wxMaxNum).toFixed(2)
-                console.log('amount', parseFloat(item.wxPrice / 365 * extendDays * summaryInfo.wxMaxNum), amount);
+                summaryInfo.amountInfo += item.wxPrice + '(元)  '
+                amount += item.wxPrice * summaryInfo.wxMaxNum 
             }
+            // vip报表
+            if(this.data.chooseVipFlag && vipTable && vipTable.length > 0){
+                let vipItem = vipTable[0]
+                console.log('vipItem.wxPrice',vipItem.wxPrice);
+                summaryInfo.amountInfo +=   ' + ' + vipItem.wxPrice + '(元/VIP) ';
+                summaryInfo.amountInfo = '( ' + summaryInfo.amountInfo + ' ) ';
+                amount +=  vipItem.wxPrice;
+            }
+            summaryInfo.amountInfo +=  ' / 365(天) * ' + extendDays + '(天) * ' + summaryInfo.wxMaxNum + '(个)'
             if (summaryInfo.amountInfo) {
+                amount = (amount / 365 * extendDays) .toFixed(2);
                 summaryInfo.amountInfo += ' = ' + amount + '(元)'
                 summaryInfo.amount = amount;
             }
@@ -189,10 +232,10 @@ Page({
         summaryInfo.webMaxNum = webNum
         summaryInfo.wxMaxNum = wxNum
         // 升级从当天算
-        if(this.data.upgradeFlag){
-            summaryInfo.buyBeginDate = new Date().addDays(1).toDateStr(); 
+        if (this.data.upgradeFlag) {
+            summaryInfo.buyBeginDate = new Date().addDays(1).toDateStr();
             summaryInfo.extendDays = new Date(summaryInfo.endDate).dayDiff(new Date().addDays(1));
-        }else{
+        } else {
             summaryInfo.buyBeginDate = new Date(this.data.cpEndDate).addDays(1).toDateStr();
             summaryInfo.extendDays = new Date(summaryInfo.endDate).dayDiff(new Date(this.data.cpEndDate).addDays(1));
         }
@@ -326,6 +369,9 @@ Page({
             params.buyEndDate = summaryInfo.userEndDate
             params.endDate = app.globalData.company.endDate
             params.wxMaxNum = summaryInfo.wxMaxNum
+            if(this.data.chooseVipFlag){
+                params.vip = true;
+            }
             if (!summaryInfo.reCountFlag && summaryInfo.wxMaxNumSocial) {
                 params.wxMaxNum = summaryInfo.wxMaxNum + summaryInfo.wxMaxNumSocial
             }
@@ -376,20 +422,32 @@ Page({
     getActivity() {
         let params = {
             appCode: Constants.APP_CODE,
-            activityTypeList: [Constants.kindCode.activityGrade, Constants.kindCode.activityMenu],
+
             gradeCode: this.data.gradeCode
         }
+        // 标准版
+        if (this.data.gradeCode == Constants.gradeCode.STD) {
+            params.activityTypeList = [Constants.kindCode.activityGrade, Constants.kindCode.activityVip];
+        } else {
+            params.activityTypeList = [Constants.kindCode.activityGrade];
+        }
         let service = app.globalData['activityService']
         this.excute(service, service.selectActivityItems, params).then(res => {
             if (res.data.code == Constants.SUCESS_CODE) {
                 if (res.data && res.data.data) {
                     let activityTable = res.data.data;
-                    this.setData({
-                        activityTable: activityTable
-                    })
+
                     // 如果是标准版，需要进行截止日期的处理
                     if (this.data.gradeCode == Constants.gradeCode.STD) {
+                        this.setData({
+                            activityTable:activityTable.filter(it=>it.activityType == Constants.kindCode.activityGrade),
+                            vipTable:activityTable.filter(it=>it.activityType == Constants.kindCode.activityVip),
+                        })
                         this.handleDataStd(activityTable);
+                    }else{
+                        this.setData({
+                            activityTable: activityTable
+                        })
                     }
                 }
             }
@@ -441,15 +499,15 @@ Page({
                 title: mixins.$t('updateSpecialized'),
             })
             this.setData({
-                gradeCode:Constants.gradeCode.PRO,
-                upgradeFlag:true
+                gradeCode: Constants.gradeCode.PRO,
+                upgradeFlag: true
             })
         } else {
             wx.setNavigationBarTitle({
                 title: mixins.$t('reNew'),
             })
             this.setData({
-                gradeCode:app.globalData.company.gradeCode
+                gradeCode: app.globalData.company.gradeCode
             })
         }
 

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

@@ -49,6 +49,18 @@
 				<van-stepper integer="{{true}}" value="{{ summaryInfo.wxMaxNum}}" min="1" bind:change="changeUserSTD" />
 			</view>
 		</view>
+
+		<!--VIP报表-->
+		<view class="{{chooseVipFlag?'func-card-vip-std-selected':'func-card-vip-std'}}"  wx:for="{{vipTable}}" wx:for-item="item" wx:key="index" data-item="{{item}}" catchtap="chooseVipItem">
+			<!-- 标题 -->
+			<view class="card-title-std">{{item.activityItemName}}
+			</view>
+			<!-- 价格-->
+			<dk-cell fontSize="19" center="center" contentFontWeight="700" contentColor="#FF7B1A" content="{{item.wxPrice}}"></dk-cell>
+			<!-- 描述-->
+			<view class="card-desc">{{item.activityItemDescribe}}
+			</view>
+		</view>
 	</view>
 </view>
 

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

@@ -124,6 +124,23 @@ page {
 	border: 3rpx solid #CE9965;
 }
 
+.func-card-vip-std-selected{
+	margin: 15rpx 10rpx 15rpx 0;
+	width: 38%;
+	height: 215rpx;
+	background: #FCF0DD;
+	border-radius: 19rpx;
+	border: 3rpx solid #CE9965;
+}
+
+.func-card-vip-std{
+	margin: 15rpx 10rpx 15rpx 0;
+	width: 38%;
+	height: 215rpx;
+	background: #ffffff;
+	border-radius: 19rpx;
+}
+
 .card-name {
 	font-style: normal;
 	font-weight: 600;

pages/welcome/welcome.js

@@ -187,7 +187,8 @@ Page({
             {
                 'appCode': Constants.APP_CODE,
                 'cpId': app.globalData.company.cpId,
-                'userId': app.globalData.user.userId
+                'userId': app.globalData.user.userId,
+                'vip':app.globalData.company.vip
             }).then(res => {
                 if (res.data.code === Constants.SUCESS_CODE) {
                     // 员工

utils/Constants.js

@@ -493,6 +493,7 @@ module.exports = {
     activityGrade: '活动分类-版本',
     activityAd: '活动分类-广告',
     activityMenu: '活动分类-功能',
+    activityVip: '活动分类-VIP',
   },
 
   // 收款进度