Commit 8e8f6424 authored by 罗超's avatar 罗超

1

parent ed291154
...@@ -706,7 +706,7 @@ export default { ...@@ -706,7 +706,7 @@ export default {
if (res.data.data && res.data.data.BottomNavIsShadow) { if (res.data.data && res.data.data.BottomNavIsShadow) {
this.mallMsg.BottomNavIsShadow = res.data.data.BottomNavIsShadow; this.mallMsg.BottomNavIsShadow = res.data.data.BottomNavIsShadow;
} }
if (res.data.data && res.data.data.IsShowIcon) { if (res.data.data) {
this.mallMsg.IsShowIcon = res.data.data.IsShowIcon; this.mallMsg.IsShowIcon = res.data.data.IsShowIcon;
} }
this.mallMsg.BottomTagList = res.data.data.BottomTagList; this.mallMsg.BottomTagList = res.data.data.BottomTagList;
......
This diff is collapsed.
...@@ -92,36 +92,62 @@ ...@@ -92,36 +92,62 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="DianZanNum" label="点赞数" width="80">
<template slot-scope="scope">
<div v-if="scope.row.IsTieZi === 1">{{ scope.row.DianZanNum }}</div>
</template>
</el-table-column>
<el-table-column prop="ReplyNum" label="回复数量" width="80"> <el-table-column prop="ReplyNum" label="回复数量" width="80">
</el-table-column> </el-table-column>
<el-table-column prop="EnrollNum" label="报名人数" width="80"> <el-table-column prop="EnrollNum" label="报名人数" width="80">
<template slot-scope="scope">
<div v-if="scope.row.IsTieZi === 0">{{ scope.row.EnrollNum }}</div>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="EnrollNum" label="是否开启报名" width="120"> <el-table-column prop="EnrollNum" label="是否开启报名" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.IsOpenEnroll == 1" style="color: green" <span
v-if="scope.row.IsOpenEnroll == 1 && scope.row.IsTieZi === 0"
style="color: green"
></span ></span
> >
<span v-if="scope.row.IsOpenEnroll == 2" style="color: red" <span
v-if="scope.row.IsOpenEnroll == 2 && scope.row.IsTieZi === 0"
style="color: red"
></span ></span
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="标签" width="70"> <el-table-column label="标签" width="70">
<template slot-scope="scope" v-if="scope.row.Label"> <template slot-scope="scope" v-if="scope.row.Label">
<el-tag> <el-tag v-if="scope.row.IsTieZi === 0">
{{ scope.row.Label }} {{ scope.row.Label }}
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="活动时间" width="220"> <el-table-column label="活动时间" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<div>开始时间:{{ scope.row.StartTime }}</div> <div v-if="scope.row.IsTieZi === 0">
<div>结束时间:{{ scope.row.EndTime }}</div> 开始时间:{{ scope.row.StartTime }}
</div>
<div v-if="scope.row.IsTieZi === 0">
结束时间:{{ scope.row.EndTime }}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ManNum" label="男数量" width="70"> <el-table-column prop="ManNum" label="男数量" width="70">
<template slot-scope="scope">
<div v-if="scope.row.IsTieZi === 0">
{{ scope.row.ManNum }}
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="WoManNum" label="女数量" width="70"> <el-table-column prop="WoManNum" label="女数量" width="70">
<template slot-scope="scope">
<div v-if="scope.row.IsTieZi === 0">
{{ scope.row.WoManNum }}
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="Deadline" label="截止报名日期" width="150"> <el-table-column prop="Deadline" label="截止报名日期" width="150">
</el-table-column> </el-table-column>
......
...@@ -734,7 +734,7 @@ ...@@ -734,7 +734,7 @@
<div v-if="cat.isCustom === 0">{{ cat.name }}</div> <div v-if="cat.isCustom === 0">{{ cat.name }}</div>
<el-input v-else v-model="cat.name" size="small"></el-input> <el-input v-else v-model="cat.name" size="small"></el-input>
</div> </div>
<div flex="box:first"> <div flex="box:first" v-if="cat.isCustom === 1">
<div class="diy-goods-label">帖子范围</div> <div class="diy-goods-label">帖子范围</div>
<div> <div>
<el-radio-group <el-radio-group
...@@ -762,6 +762,17 @@ ...@@ -762,6 +762,17 @@
<el-input v-model="cat.menuName" size="small"></el-input> <el-input v-model="cat.menuName" size="small"></el-input>
</div> </div>
</div> </div>
<div flex="box:first" v-if="cat.isCustom === 0">
<div class="diy-goods-label">自定义帖子</div>
<div>
<el-switch
v-model="cat.range"
:active-value="3"
:inactive-value="1"
></el-switch>
</div>
</div>
<div flex="box:first" v-if="cat.range === 1 || cat.range === 2"> <div flex="box:first" v-if="cat.range === 1 || cat.range === 2">
<div class="diy-goods-label">贴子数量</div> <div class="diy-goods-label">贴子数量</div>
<div> <div>
......
...@@ -886,7 +886,7 @@ export default { ...@@ -886,7 +886,7 @@ export default {
miaiuser, miaiuser,
miaiactivitytype, miaiactivitytype,
miaiactivityCustom, miaiactivityCustom,
Posts, Posts, //帖子
}, },
methods: { methods: {
//选择图片 //选择图片
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment