From 791ed472d662baaff6688e86baae45907efb7fa7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 19 Apr 2021 15:37:31 +0800
Subject: [PATCH] 20210419 签到
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html | 6 +++++-
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java | 7 +++----
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html | 7 +++++--
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java
index 00a854b..c172110 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java
@@ -107,11 +107,10 @@
List<ActivitySignRecordVo> activitySignRecordVos = activitySignRecordDao.selectRecordByMonth(actId,userId,DateUtil.date());
if(CollUtil.isNotEmpty(activitySignRecordVos)){
signBasicInfoVo.setActivitySignRecords(activitySignRecordVos);
- signBasicInfoVo.setActAumulativeDay(activitySignRecordVos.size());
- }else{
- signBasicInfoVo.setActAumulativeDay(0);
}
-
+ //累计签到日期
+ int cumulativeDay = getCumulativeDay(actId, userId, DateUtil.date(), 0);
+ signBasicInfoVo.setActAumulativeDay(cumulativeDay);
ajaxResult = AjaxResult.buildSuccessInstance("");
ajaxResult.setData(signBasicInfoVo);
return ajaxResult;
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html
index 0272331..f69911a 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html
@@ -132,7 +132,7 @@
<el-main width="70%">
<div>
- <el-tabs v-model="activeName" >
+ <el-tabs v-model="activeName" @tab-click="clickSecondTab">
<el-tab-pane label="活动设置" name="first">
<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
<el-form-item label="活动名称" prop="actName">
@@ -961,6 +961,10 @@
content: JSON.parse(JSON.stringify(prize)),
});
this.editableTabsValue = newTabName;
+ this.activeClickTab = parseInt(newTabName);
+ },
+ clickSecondTab(targetName) {
+ this.activeClickTab = 1;
},
clickTab(targetName) {
console.log(targetName.name);
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
index 82a9e5f..a2e4ff2 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html
@@ -139,7 +139,7 @@
<el-main width="70%">
<div>
- <el-tabs v-model="activeName" >
+ <el-tabs v-model="activeName" @tab-click="clickSecondTab">
<el-tab-pane label="活动设置" name="first">
<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
<el-form-item label="活动名称" prop="actName">
@@ -890,6 +890,10 @@
content: JSON.parse(JSON.stringify(prize)),
});
this.editableTabsValue = newTabName;
+ this.activeClickTab = parseInt(newTabName);
+ },
+ clickSecondTab(targetName) {
+ this.activeClickTab = 1;
},
clickTab(targetName) {
console.log(targetName.name);
@@ -954,7 +958,6 @@
//奖品设置的图片介绍
introduceImgSuccess(res, file) {
this.editableTabs[this.activeClickTab-1].content.introduceImg = res.path;
- // this.prize.introduceImg = URL.createObjectURL(file.raw);
},
//奖品设置的客服微信
wechatImgSuccess(res, file) {
--
Gitblit v1.9.1