Commit e754a0bf authored by chenfenglei's avatar chenfenglei

公众号页面样式优化

parent 1e863357
This diff is collapsed.
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
placement="bottom-end" placement="bottom-end"
width="400" width="400"
:offset="10" :offset="10"
trigger="manual" trigger="hover"
v-model="showEmotion"> v-model="showEmotion">
<div> <div>
<emotion @emotion="handleEmotion" :height="200" ></emotion> <emotion @emotion="handleEmotion" :height="200" ></emotion>
......
...@@ -293,8 +293,6 @@ ...@@ -293,8 +293,6 @@
return item.role_name == "管理员" return item.role_name == "管理员"
}) })
break; break;
default:
break;
} }
} }
this.adminList = res.list; this.adminList = res.list;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<template slot-scope="props"> <template slot-scope="props">
<el-form label-position="top" class="demo-table-expand"> <el-form label-position="top" class="demo-table-expand">
<el-form-item label="回复内容"> <el-form-item label="回复内容">
<div v-for="(item, index) in JSON.parse(props.row.desc)"> <div v-for="(item, index) in props.row.desc">
回复{{index+1}}({{item.type | type}}): 回复{{index+1}}({{item.type | type}}):
<span v-if="item.content && item.type==='text'"> <span v-if="item.content && item.type==='text'">
<span v-html="item.content.replace(/\/[\u4E00-\u9FA5]{1,3}/gi, emotion)"></span> <span v-html="item.content.replace(/\/[\u4E00-\u9FA5]{1,3}/gi, emotion)"></span>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<el-table-column <el-table-column
label="回复内容"> label="回复内容">
<template slot-scope="scope"> <template slot-scope="scope">
{{ JSON.parse(scope.row.desc).length }} 条回复 {{scope.row.desc.length }} 条回复
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
} else if (value === 'news-item') { } else if (value === 'news-item') {
return '图文链接' return '图文链接'
} else { } else {
return val return value
} }
} }
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
center center
append-to-body append-to-body
:visible.sync="show" :visible.sync="show"
width="800px"> width="50%">
<div v-loading="loading"> <div v-loading="loading">
<el-form ref="form" :model="form" :rules="rules" > <el-form ref="form" :model="form" :rules="rules" >
<el-row> <el-row>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<div v-for="(item, index) in JSON.parse(form.desc)" class="msg-item"> <div v-for="(item, index) in JSON.parse(form.desc)" class="msg-item">
<span class="msg-text" v-if="item.type==='text'">{{item.content}}</span> <span class="msg-text" v-if="item.type==='text'">{{item.content}}</span>
<img v-else-if="item.type==='image' && item.content" :src="item.content"/> <img v-else-if="item.type==='image' && item.content" :src="item.content"/>
<span v-else-if="item.type==='image' && item.variable" class="msg-text">我的老师二维码</span> <span v-else-if="item.type==='image' && item.variable" class="msg-text" >我的老师二维码</span>
<a v-else-if="item.type==='video'" :href="item.content.down_url" target="_blank">{{item.content.title}}</a> <a v-else-if="item.type==='video'" :href="item.content.down_url" target="_blank">{{item.content.title}}</a>
<div v-else-if="item.type==='news' && item.content && item.content.news_item" class="news-media" style="display: inline-block"> <div v-else-if="item.type==='news' && item.content && item.content.news_item" class="news-media" style="display: inline-block">
<el-card :body-style="{ padding: '0px' }"> <el-card :body-style="{ padding: '0px' }">
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<i class="el-icon-delete" @click="onDelText(item, index)"></i> <i class="el-icon-delete" @click="onDelText(item, index)"></i>
</div> </div>
</template> </template>
<div class="msg_sender_wrp"> <div class="msg_sender_wrp" style="width:100%;">
<div> <div>
<i class="el-icon-circle-plus-outline" @click="onAddContent"></i> <i class="el-icon-circle-plus-outline" @click="onAddContent"></i>
</div> </div>
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
placeholder="请输入内容" placeholder="请输入内容"
v-model="content"> v-model="content">
</el-input> </el-input>
<div style="float: right"> <div style="float:left;">
<el-popover <el-popover
placement="bottom-end" placement="bottom-end"
width="400" width="400"
...@@ -114,14 +114,14 @@ ...@@ -114,14 +114,14 @@
trigger="hover" trigger="hover"
v-model="showEmotion"> v-model="showEmotion">
<div> <div>
<emotion @emotion="handleEmotion" :height="200" ></emotion> <emotion @emotion="handleEmotion" :height="200"></emotion>
</div> </div>
<el-button @click="showEmotion = !showEmotion" slot="reference" type="text"> <el-button @click="showEmotion = !showEmotion" slot="reference" type="text">
<span class="icon_emotion emotion_switch"></span> <span class="icon_emotion emotion_switch" ></span>
</el-button> </el-button>
</el-popover> </el-popover>
<el-button v-if="form.key !== 'mini_keywords_reply'" @click="addTeacherName" type="warning" plain>添加老师名字</el-button> <el-button v-if="form.key !== 'mini_keywords_reply'" @click="addTeacherName" type="warning" plain style="margin-top: 10px;">添加老师名字</el-button>
<el-button v-if="form.key !== 'mini_keywords_reply'" @click="addTeacherAlias" type="success" plain>添加老师别名</el-button> <el-button v-if="form.key !== 'mini_keywords_reply'" @click="addTeacherAlias" type="success" plain style="margin-top: 10px;">添加老师别名</el-button>
</div> </div>
</template> </template>
<template v-if="type==='image'"> <template v-if="type==='image'">
...@@ -345,7 +345,7 @@ ...@@ -345,7 +345,7 @@
</template> </template>
<div class="tool_bar"> <div class="tool_bar">
<el-button @click="close">取 消</el-button> <el-button @click="close">取 消</el-button>
<el-button class="weui-desktop-btn weui-desktop-btn_primary" @click="confirm">确定</el-button> <el-button class="weui-desktop-btn weui-desktop-btn_primary el-button--primary" @click="confirm">确定</el-button>
</div> </div>
</div> </div>
</div> </div>
...@@ -874,9 +874,10 @@ ...@@ -874,9 +874,10 @@
display: inline-block; display: inline-block;
} }
.msg-item { .msg-item {
margin-bottom: 10px; margin: 30px 0;
width: 600px;
img { img {
width: 20%; width: 30%;
} }
} }
.msg-text { .msg-text {
......
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
placement="bottom-end" placement="bottom-end"
width="400" width="400"
:offset="10" :offset="10"
trigger="manual" trigger="hover"
v-model="showEmotion"> v-model="showEmotion">
<div> <div>
<emotion @emotion="handleEmotion" :height="200" ></emotion> <emotion @emotion="handleEmotion" :height="200" ></emotion>
......
...@@ -3324,10 +3324,10 @@ ...@@ -3324,10 +3324,10 @@
float: right; float: right;
} }
.title { .title {
font-size: 16px; /* font-size: 16px; */
font-weight: 400; font-weight: 400;
display: block; display: block;
line-height: 1.2; /* line-height: 1.2; */
color: #353535; color: #353535;
} }
.digest { .digest {
......
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