From 815b7f21921c620e7605c461a3c4b4bbc4a26494 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 19 Apr 2021 14:42:40 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/static/images/sign/meiriqiandao.png | 0
zq-erp/src/main/resources/static/images/sign/signButton.png | 0
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html | 84 +++++++++++++++------------
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java | 18 +++---
zq-erp/src/main/resources/static/images/sign/signHead.png | 0
zq-erp/src/main/resources/static/images/sign/jisumiaosha.png | 0
zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html | 16 ++--
zq-erp/src/main/resources/static/images/sign/shalonghuodong.png | 0
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html | 40 ++++++++-----
zq-erp/src/main/resources/static/images/sign/tiantianpingtuan.png | 0
10 files changed, 89 insertions(+), 69 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 1e81b08..e027a03 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
@@ -113,7 +113,7 @@
@ApiResponse(code = 200, message = "ok", response = SignSuccessVo.class)
})
- @GetMapping(value = "/clickSign")
+ @GetMapping(value = "/clickSign/{actId}")
@ResponseBody
@Transactional
public AjaxResult clickSign(@PathVariable("actId") long actId) {
@@ -152,9 +152,9 @@
ActivitySignRecord activitySignRecordOld = activitySignRecordDao.selectOneByActIdAndUserIdLikesignTime(actId,userId,offsetDay);
ActivitySignRecord activitySignRecordAdd = new ActivitySignRecord();
activitySignRecordAdd.setCompanyId(companyId);
- activitySignRecordAdd.setCreateBy(user.getName());
+ activitySignRecordAdd.setCreateBy(user.getVipName());
activitySignRecordAdd.setCreateTime(new Date());
- activitySignRecordAdd.setUpdateBy(user.getName());
+ activitySignRecordAdd.setUpdateBy(user.getVipName());
activitySignRecordAdd.setUpdateTime(new Date());
activitySignRecordAdd.setActivityId(actId);
activitySignRecordAdd.setSignTime(date);
@@ -187,9 +187,9 @@
activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
activitySignReceiveRecord.setActivityId(actId);
activitySignReceiveRecord.setCompanyId(companyId);
- activitySignReceiveRecord.setCreateBy(user.getName());
+ activitySignReceiveRecord.setCreateBy(user.getVipName());
activitySignReceiveRecord.setCreateTime(new Date());
- activitySignReceiveRecord.setUpdateBy(user.getName());
+ activitySignReceiveRecord.setUpdateBy(user.getVipName());
activitySignReceiveRecord.setUpdateTime(new Date());
activitySignReceiveRecordDao.insert(activitySignReceiveRecord);
@@ -228,9 +228,9 @@
activitySignReceiveRecord.setActivityId(actId);
activitySignReceiveRecord.setCompanyId(companyId);
activitySignReceiveRecord.setState(ActivitySignReceiveRecord.STATE_DONE);
- activitySignReceiveRecord.setCreateBy(user.getName());
+ activitySignReceiveRecord.setCreateBy(user.getVipName());
activitySignReceiveRecord.setCreateTime(new Date());
- activitySignReceiveRecord.setUpdateBy(user.getName());
+ activitySignReceiveRecord.setUpdateBy(user.getVipName());
activitySignReceiveRecord.setUpdateTime(new Date());
/**
* 奖项类型（1：自定义产品2：积分3：优惠券4：店铺商品）
@@ -296,9 +296,9 @@
activitySignWriteoff.setUserId(userId);
activitySignWriteoff.setCompanyId(companyId);
activitySignWriteoff.setReceiveId(activitySignReceiveRecord.getId());
- activitySignWriteoff.setCreateBy(user.getName());
+ activitySignWriteoff.setCreateBy(user.getVipName());
activitySignWriteoff.setCreateTime(new Date());
- activitySignWriteoff.setUpdateBy(user.getName());
+ activitySignWriteoff.setUpdateBy(user.getVipName());
activitySignWriteoff.setUpdateTime(new Date());
activitySignWriteoffDao.insert(activitySignWriteoff);
}
diff --git a/zq-erp/src/main/resources/static/images/sign/jisumiaosha.png b/zq-erp/src/main/resources/static/images/sign/jisumiaosha.png
new file mode 100644
index 0000000..f690d6f
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/sign/jisumiaosha.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/sign/meiriqiandao.png b/zq-erp/src/main/resources/static/images/sign/meiriqiandao.png
new file mode 100644
index 0000000..b338432
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/sign/meiriqiandao.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/sign/shalonghuodong.png b/zq-erp/src/main/resources/static/images/sign/shalonghuodong.png
new file mode 100644
index 0000000..19e4579
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/sign/shalonghuodong.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/sign/signButton.png b/zq-erp/src/main/resources/static/images/sign/signButton.png
new file mode 100644
index 0000000..3021259
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/sign/signButton.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/sign/signHead.png b/zq-erp/src/main/resources/static/images/sign/signHead.png
new file mode 100644
index 0000000..9e31b32
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/sign/signHead.png
Binary files differ
diff --git a/zq-erp/src/main/resources/static/images/sign/tiantianpingtuan.png b/zq-erp/src/main/resources/static/images/sign/tiantianpingtuan.png
new file mode 100644
index 0000000..83dfcd5
--- /dev/null
+++ b/zq-erp/src/main/resources/static/images/sign/tiantianpingtuan.png
Binary files differ
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html
index d1658b5..cd166ff 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html
@@ -56,7 +56,7 @@
<el-row>
<el-col :span="4">
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
- <img src="imageUrlqd" class="image">
+ <img src="../../../images/sign/meiriqiandao.png" class="image">
<div style="padding: 5px;">
<span style="padding:5px;font-size: 30px;">每日签到</span>
<div class="bottom clearfix">
@@ -67,7 +67,7 @@
</el-col>
<el-col :span="4">
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
- <img src="imageUrlpt" class="image">
+ <img src="../../../images/sign/tiantianpingtuan.png" class="image">
<div style="padding: 5px;">
<span style="padding:5px;font-size: 30px;">拼团</span>
<div class="bottom clearfix">
@@ -78,7 +78,7 @@
</el-col>
<el-col :span="4">
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
- <img src="imageUrlms" class="image">
+ <img src="../../../images/sign/jisumiaosha.png" class="image">
<div style="padding: 5px;">
<span style="padding:5px;font-size: 30px;">秒杀</span>
<div class="bottom clearfix">
@@ -89,7 +89,7 @@
</el-col>
<el-col :span="4">
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
- <img src="imageUrlsl" class="image">
+ <img src="../../../images/sign/shalonghuodong.png" class="image">
<div style="padding: 5px;">
<span style="padding:5px;font-size: 30px;">沙龙</span>
<div class="bottom clearfix">
@@ -116,10 +116,10 @@
var app = new Vue({
el: '#app',
data: {
- imageUrlqd: basePath + "/image/meiriqiandao.png",
- imageUrlms: basePath + "/image/jisumiaosha.png",
- imageUrlpt: basePath + "/image/tiantianpingtuan.png",
- imageUrlsl: basePath + "/image/shalonghuodong.png",
+ imageUrlqd: "../../images/sign/meiriqiandao.png",
+ imageUrlms: "../../images/sign/jisumiaosha.png",
+ imageUrlpt: "../../images/sign/tiantianpingtuan.png",
+ imageUrlsl: "../../images/sign/shalonghuodong.png",
},
created: function () {
},
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 8c6e40b..3a96413 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
@@ -49,13 +49,12 @@
}
.imageTwo {
display: block;
- height: 50px;
+ height: 280px;
padding: 5px 5px;
text-align: center;
}
.imageThree {
display: block;
- height: 50px;
padding: 5px 5px;
text-align: center;
}
@@ -74,14 +73,16 @@
<el-container>
<el-aside width="30%">
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
- <div @click="uploadImg()" class="imageOne">
+ <!--<div @click="uploadImg()" class="imageOne">
<img v-if="imageUrlTitle" :src="imageUrlTitle" style="width: 100%;">
<el-button type="primary" v-show="imageUrlTitle == ''" round><span style="font-size: 20px;">标题</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
- </div>
- <div @click="uploadImg()" class="imageTwo" >
- <img v-if="imageUrlHead" :src="imageUrlHead" style="width: 100%;">
- <el-button type="primary" v-show="imageUrlHead == ''" round><span style="font-size: 20px;">头部</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
- </div>
+ </div>-->
+ <el-row>
+ <div @click="uploadImg()" class="imageTwo" >
+ <img v-if="imageUrlHead" :src="imageUrlHead" style="width: 100%;height: 100%">
+ <el-button type="primary" v-show="imageUrlHead == ''" round><span style="font-size: 20px;">头部</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
+ </div>
+ </el-row>
<el-row style="display:flex;">
<el-col>
<div style="padding:5px;font-size: 15px;text-align: left;"><span>您已累计签到<span style="color: red;">3</span>天</span></div>
@@ -90,33 +91,42 @@
<div style="padding:5px;font-size: 15px;text-align: right;"><span>签到提醒</span></div>
</el-col>
</el-row>
- <div @click="uploadImg()">
- <el-calendar :range="['2019-03-04', '2019-03-24']"></el-calendar>
- <img v-if="imageUrlState" :src="imageUrlState" style="width: 100%;">
- <el-button type="primary" v-show="imageUrlState == ''" round><span style="font-size: 20px;">日历签到背景</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
- </div>
- <div @click="uploadImg()" class="imageThree" >
- <el-button type="primary" v-show="imageUrlButton == ''" round><span style="font-size: 20px;">签到按钮</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
- <img v-if="imageUrlButton" :src="imageUrlButton" style="width: 100%;">
- </div>
- <div style="text-align: center;padding: 5px;" @click="gzsmSet()">
- <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
- <span style="padding:5px;font-size: 30px;">-- 规则说明--</span>
+ <el-row>
+ <div @click="uploadImg()">
+ <el-calendar :range="['2019-03-04', '2019-03-24']"></el-calendar>
+ <img v-if="imageUrlState" :src="imageUrlState" style="width: 100%;">
+ <!--<el-button type="primary" v-show="imageUrlState == ''" round><span style="font-size: 20px;">日历签到背景</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>-->
</div>
- <div class="el-col-sm-24" style="text-align: center;">
- <span style="padding:5px;font-size: 15px;color: red;">(点击，编辑规则内容，背景颜色，字体颜色、大小、透明度)</span>
+ </el-row>
+
+ <el-row>
+ <div @click="uploadImg()" class="imageThree" >
+ <el-button type="primary" v-show="imageUrlButton == ''" round><span style="font-size: 20px;">签到按钮</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
+ <img v-if="imageUrlButton" :src="imageUrlButton" style="width: 100%;">
</div>
- <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
- <span style="padding:5px;font-size: 15px;">1、每天参与签到可获得积分</span>
+ </el-row>
+
+
+ <el-row>
+ <div style="text-align: center;padding: 5px;" @click="gzsmSet()">
+ <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
+ <span style="padding:5px;font-size: 30px;">-- 规则说明--</span>
+ </div>
+ <div class="el-col-sm-24" style="text-align: center;">
+ <span style="padding:5px;font-size: 15px;color: red;">(点击，编辑规则内容，背景颜色，字体颜色、大小、透明度)</span>
+ </div>
+ <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
+ <span style="padding:5px;font-size: 15px;">1、每天参与签到可获得积分</span>
+ </div>
+ <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
+ <span style="padding:5px;font-size: 15px;">2、连续签到7天将获得赠送大礼包</span>
+ </div>
+ <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
+ <span style="padding:5px;font-size: 15px;">3、每7天重新开始计算</span>
+ </div>
</div>
- <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
- <span style="padding:5px;font-size: 15px;">2、连续签到7天将获得赠送大礼包</span>
- </div>
- <div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
- <span style="padding:5px;font-size: 15px;">3、每7天重新开始计算</span>
- </div>
- </div>
+ </el-row>
</el-card>
</el-aside>
@@ -456,7 +466,7 @@
</el-tab-pane>
<el-tab-pane label="背景图片上传" name="third">
- <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
+ <!--<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
<el-form-item label="标题">
<el-upload
action="/admin/multipleUploadFile/doUpload"
@@ -465,7 +475,7 @@
<img v-if="imageUrlTitle" :src="imageUrlTitle" style="max-width: 300px;">
</el-upload>
</el-form-item>
- </div>
+ </div>-->
<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
<el-form-item label="头部">
<el-upload
@@ -476,7 +486,7 @@
</el-upload>
</el-form-item>
</div>
- <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
+ <!--<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
<el-form-item label="日历签到背景">
<el-upload
action="/admin/multipleUploadFile/doUpload"
@@ -485,7 +495,7 @@
<img v-if="imageUrlState" :src="imageUrlState" style="max-width: 300px;">
</el-upload>
</el-form-item>
- </div>
+ </div>-->
<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
<el-form-item label="签到按钮">
<el-upload
@@ -575,8 +585,8 @@
formLabelWidth: '120px',
//标题图片
imageUrlTitle: '',
- imageUrlHead: '',
- imageUrlButton: '',
+ imageUrlHead: "../../../images/sign/signHead.png",
+ imageUrlButton: "../../../images/sign/signButton.png",
imageUrlState: '',
activeClickTab:0,
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 eba3a4c..d1bcf13 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
@@ -56,13 +56,12 @@
}
.imageTwo {
display: block;
- height: 50px;
+ height: 280px;
padding: 5px 5px;
text-align: center;
}
.imageThree {
display: block;
- height: 50px;
padding: 5px 5px;
text-align: center;
}
@@ -81,14 +80,16 @@
<el-container>
<el-aside width="30%">
<el-card class="box-card" :body-style="{ padding: '10px 10px'}">
- <div @click="uploadImg()" class="imageOne">
+ <!--<div @click="uploadImg()" class="imageOne">
<img v-if="imageUrlTitle" :src="imageUrlTitle" style="width: 100%;">
<el-button type="primary" v-show="imageUrlTitle == ''" round><span style="font-size: 20px;">标题</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
- </div>
- <div @click="uploadImg()" class="imageTwo" >
- <img v-if="imageUrlHead" :src="imageUrlHead" style="width: 100%;">
- <el-button type="primary" v-show="imageUrlHead == ''" round><span style="font-size: 20px;">头部</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
- </div>
+ </div>-->
+ <el-row>
+ <div @click="uploadImg()" class="imageTwo" >
+ <img v-if="imageUrlHead" :src="imageUrlHead" style="width: 100%;height: 100%">
+ <el-button type="primary" v-show="imageUrlHead == ''" round><span style="font-size: 20px;">头部</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
+ </div>
+ </el-row>
<el-row style="display:flex;">
<el-col>
<div style="padding:5px;font-size: 15px;text-align: left;"><span>您已累计签到<span style="color: red;">3</span>天</span></div>
@@ -97,16 +98,24 @@
<div style="padding:5px;font-size: 15px;text-align: right;"><span>签到提醒</span></div>
</el-col>
</el-row>
+
+ <el-row>
<div @click="uploadImg()">
<el-calendar :range="['2019-03-04', '2019-03-24']"></el-calendar>
<img v-if="imageUrlState" :src="imageUrlState" style="width: 100%;">
- <el-button type="primary" v-show="imageUrlState == ''" round><span style="font-size: 20px;">日历签到背景</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
+ <!--<el-button type="primary" v-show="imageUrlState == ''" round><span style="font-size: 20px;">日历签到背景</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>-->
</div>
+ </el-row>
+
+ <el-row>
<div @click="uploadImg()" class="imageThree" >
<el-button type="primary" v-show="imageUrlButton == ''" round><span style="font-size: 20px;">签到按钮</span><span style="padding:5px;font-size: 15px;color: red;">(上传图片)</span></span></el-button>
<img v-if="imageUrlButton" :src="imageUrlButton" style="width: 100%;">
</div>
+ </el-row>
+
+ <el-row>
<div style="text-align: center;padding: 5px;" @click="gzsmSet()">
<div class="col-sm-8 col-sm-offset-2" style="text-align: left;">
<span style="padding:5px;font-size: 30px;">-- 规则说明--</span>
@@ -124,6 +133,7 @@
<span style="padding:5px;font-size: 15px;">3、每7天重新开始计算</span>
</div>
</div>
+ </el-row>
</el-card>
</el-aside>
@@ -462,7 +472,7 @@
</el-tab-pane>
<el-tab-pane label="背景图片上传" name="third">
- <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
+ <!--<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
<el-form-item label="标题">
<el-upload
action="/admin/multipleUploadFile/doUpload"
@@ -471,7 +481,7 @@
<img v-if="imageUrlTitle" :src="imageUrlTitle" style="max-width: 300px;">
</el-upload>
</el-form-item>
- </div>
+ </div>-->
<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
<el-form-item label="头部">
<el-upload
@@ -482,7 +492,7 @@
</el-upload>
</el-form-item>
</div>
- <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
+ <!--<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
<el-form-item label="日历签到背景">
<el-upload
action="/admin/multipleUploadFile/doUpload"
@@ -491,7 +501,7 @@
<img v-if="imageUrlState" :src="imageUrlState" style="max-width: 300px;">
</el-upload>
</el-form-item>
- </div>
+ </div>-->
<div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
<el-form-item label="签到按钮">
<el-upload
@@ -616,8 +626,8 @@
//标题图片
imageUrlTitle: '',
- imageUrlHead: basePath + "/image/signHead.png",
- imageUrlButton: basePath + "/image/signButton.png",
+ imageUrlHead: "../../../images/sign/signHead.png",
+ imageUrlButton: "../../../images/sign/signButton.png",
imageUrlState: '',
//字体颜色
--
Gitblit v1.9.1