From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html | 133 +++++++++++++++++++++++++++-----------------
1 files changed, 82 insertions(+), 51 deletions(-)
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 1780ed7..896b822 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,39 +91,48 @@
<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>
<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">
@@ -152,7 +162,7 @@
<el-tab-pane label="奖品设置" name="second">
<el-row style="display:flex;">
<el-col :span="20">
- <el-tabs v-model="editableTabsValue" type="card" closable @tab-remove="removeTab">
+ <el-tabs v-model="editableTabsValue" type="card" closable @tab-click="clickTab" @tab-remove="removeTab">
<el-tab-pane v-for="(item, index) in editableTabs" :key="item.name" :label="item.title" :name="item.name">
<el-row v-show="editableTabsValue !== '1'">
<el-form-item label="签到累计天数">
@@ -253,6 +263,15 @@
:on-success="wechatImgSuccess">
<img v-if="item.content.wechatImg" :src="item.content.wechatImg" style="max-width: 200px;">
</el-upload>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
+ <div v-show="[1,3].includes(item.content.awardWay)">
+ <el-row >
+ <el-col>
+ <el-form-item label="客服电话">
+ <el-input v-model="item.content.customerPhone"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -407,13 +426,8 @@
stripe:true
style="width: 100%">
<el-table-column
- prop="cname"
- label="优惠券名称"
- show-overflow-tooltip>
- </el-table-column>
- <el-table-column
- prop="endTime"
- label="截止日期"
+ prop="name"
+ label="名称"
show-overflow-tooltip>
</el-table-column>
<el-table-column
@@ -456,7 +470,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 +479,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 +490,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 +499,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
@@ -511,11 +525,11 @@
<el-color-picker v-model="typographyColor"></el-color-picker>
</el-form-item>
<el-form-item label="字体大小" style="padding: 10px">
- <el-input-number v-model="typographyNum" :min="10" :max="20" label="描述文字"></el-input-number>
+ <el-input-number v-model="typographyNum" :min="10" :max="50" label="描述文字"></el-input-number>
</el-form-item>
- <el-form-item label="字体透明度" style="padding: 10px">
+ <!--<el-form-item label="字体透明度" style="padding: 10px">
<el-input-number v-model="typographyLight" :min="1" :max="100" label="描述文字">%</el-input-number>
- </el-form-item>
+ </el-form-item>-->
</div>
</el-tab-pane>
</el-tabs>
@@ -564,6 +578,7 @@
wechatImg:'',
scoreCnt:'',
couponId:'',
+ customerPhone:'',
goodsId:'',
couponName:'',
goodsName:'',
@@ -575,8 +590,8 @@
formLabelWidth: '120px',
//标题图片
imageUrlTitle: '',
- imageUrlHead: '',
- imageUrlButton: '',
+ imageUrlHead: "../../../images/sign/signHead.png",
+ imageUrlButton: "../../../images/sign/signButton.png",
imageUrlState: '',
activeClickTab:0,
@@ -666,6 +681,8 @@
let _this = this;
_this.drawerCoupon = true;
_this.activeClickTab = parseInt(name);
+
+ console.log(_this.activeClickTab);
_this.formCoupon.yhjmc = val;
_this.loadCouponList();
},
@@ -701,8 +718,6 @@
},
//重置
resetFormCoupon(formName) {
- // this.formCoupon.yhjmc = ''
- // console.log(this.$refs[formName].resetFields)
(this.$refs[formName])[0].resetFields();
},
changePageSizeCoupon(val) {
@@ -824,6 +839,7 @@
awardType: parseInt(prizeVo.awardType),
awardName: prizeVo.awardName,
introduceImg: prizeVo.introduceImg,
+ customerPhone: prizeVo.customerPhone,
introduceTip: prizeVo.introduceTip,
awardInventoryCnt: prizeVo.awardInventoryCnt,
awardDistributeCnt: prizeVo.awardDistributeCnt,
@@ -892,9 +908,15 @@
let activitySignAwardSets = [];
for (let i = 0; i < _this.editableTabs.length; i++) {
let prize = _this.editableTabs[i].content;
+ let name = _this.editableTabs[i].title;
+ let awardRule = 2;
+ if(name == "签到日常奖励"){
+ awardRule = 1;
+ }
let activitySignAwardSet = {
id: prize.id,
cumulativeDay: prize.cumulativeDay,
+ awardRule: awardRule,
awardType: prize.awardType,
awardName: prize.awardName,
introduceImg: prize.introduceImg,
@@ -903,6 +925,7 @@
awardDistributeCnt: prize.awardDistributeCnt,
awardWay: prize.awardWay,
operationTip: prize.operationTip,
+ customerPhone: prize.customerPhone,
prizeAddress: prize.prizeAddress,
wechatImg: prize.wechatImg,
scoreCnt: prize.scoreCnt,
@@ -945,6 +968,14 @@
content: JSON.parse(JSON.stringify(prize)),
});
this.editableTabsValue = newTabName;
+ this.activeClickTab = parseInt(newTabName);
+ },
+ clickSecondTab(targetName) {
+ this.activeClickTab = 1;
+ },
+ clickTab(targetName) {
+ console.log(targetName.name);
+ this.activeClickTab = parseInt(targetName.name);
},
removeTab(targetName) {
let tabs = this.editableTabs;
--
Gitblit v1.9.1