Authored by yyq

fix

... ... @@ -43,7 +43,7 @@ module.exports = {
codeGain(req, res, next) {
let params = req.body;
if (!params.uid || !params.actPrizeId || !params.userName || !params.userThumb) {
if (!params.uid || !params.actPrizeId || !params.userName || !params.userThumb || !params.unionId) {
return res.json({
code: 400,
message: '参数非法'
... ...
... ... @@ -694,7 +694,7 @@ class AdminModel extends global.yoho.BaseModel {
let contentKey = `content${index}`;
let sortKey = `sort${index}`;
unionParams[typeKey] = value.type;
unionParams[typeKey] = value.type || 1;
unionParams[contentKey] = value.content;
unionParams[sortKey] = value.sort;
... ... @@ -704,7 +704,7 @@ class AdminModel extends global.yoho.BaseModel {
if (union.length) {
mysqlCli.insert(`insert into ${TABLE_ACT_PRIZE_PRODUCT_CONTENT} (
act_prize_id, floor_type, content, sort)
${union.join(' union all')}`, unionParams);
${union.join(' union all ')}`, unionParams);
}
}
... ... @@ -740,6 +740,8 @@ class AdminModel extends global.yoho.BaseModel {
userList.push(value.union_id);
});
userList = _.uniq(userList);
if (!userList.length) {
return Promise.resolve();
}
... ... @@ -753,7 +755,7 @@ class AdminModel extends global.yoho.BaseModel {
activityTime: moment().format('YYYY-MM-DD HH:mm') + ':00',
pageUrl: '/page/subPackage/pages/zeroSell/detail?actPrizeId=' + id
}),
uidList: _.uniq(userList)
uidList: userList
}
});
}
... ...
... ... @@ -102,33 +102,35 @@
<div>
<div class="col-md-6 col-md-offset-3 floor-view-box">
{{# content}}
<div class="floor-item"
data-id="{{id}}"
data-sort="{{sort}}"
data-content="{{content}}"
{{#isEqualOr floor_type 1}}
data-type="text">
{{#if floor_type}}
<div class="floor-item"
data-id="{{id}}"
data-sort="{{sort}}"
data-content="{{content}}"
{{#isEqualOr floor_type 1}}
data-type="text">
<p class="item-content">{{content}}</p
{{/isEqualOr}}
{{#isEqualOr floor_type 2}}
data-type="img">
<img src="{{content}}" class="item-content"
{{/isEqualOr}}
{{#isEqualOr floor_type 3}}
data-type="video">
<video src="{{content}}" class="item-content">
您的浏览器不支持 video 标签。
</video>
{{/isEqualOr}}
>
<p class="item-content">{{content}}</p
{{/isEqualOr}}
{{#isEqualOr floor_type 2}}
data-type="img">
<img src="{{content}}" class="item-content"
{{/isEqualOr}}
{{#isEqualOr floor_type 3}}
data-type="video">
<video src="{{content}}" class="item-content">
您的浏览器不支持 video 标签。
</video>
{{/isEqualOr}}
>
<div class="option-btns">
<span class="glyphicon glyphicon-arrow-up up-item-btn"></span>
<span class="glyphicon glyphicon-arrow-down down-item-btn"></span>
<div class="option-btns">
<span class="glyphicon glyphicon-arrow-up up-item-btn"></span>
<span class="glyphicon glyphicon-arrow-down down-item-btn"></span>
</div>
<span class="del-item-btn">删除</span>
</div>
<span class="del-item-btn">删除</span>
</div>
{{/if}}
{{/ content}}
</div>
<div class="col-md-6 col-md-offset-3">
... ...
... ... @@ -46,7 +46,7 @@
<td class="text-center">{{limit}}</td>
<td class="text-center">{{sort}}</td>
<td class="text-center">
<image src="{{cover_img}}">
<image src="{{cover_img}}" class="cover-img">
</td>
<td class="text-center">
{{# btns}}
... ...
... ... @@ -52,6 +52,7 @@
<li><a href="/admin/activity/list">活动列表</a></li>
<li><a href="/admin/activity/create">活动创建</a></li>
<li><a href="/admin/activity/upload_excel">上传Y100excel</a></li>
<li><a href="/admin/activity/zerobuy">0元购</a></li>
</ul>
</li>
<li><a><i class="fa fa-users"></i> 用户管理 <span class="fa fa-chevron-down"></span></a>
... ...
... ... @@ -188,6 +188,7 @@ function bindEditPageEvent() {
if (!item.id) {
newFloors.push({
type: typeNum[item.type] || 1,
content: item.newContent,
sort: index
});
... ... @@ -258,6 +259,11 @@ function bindEditPageEvent() {
$floorBox.children('.floor-item').each(() => {
let $this = $(this);
let data = $this.data();
if (!data) {
return;
}
let cid = generateCid(data.id);
$this.data('cid', cid);
... ...
@import '~bootstrap-daterangepicker';
.cover-img {
width: 160px;
}
.floor-view-box {
min-height: 300px;
border: 1px solid #ccc;
... ...