Commit cb3eb136 authored by 王飞龙's avatar 王飞龙

Merge remote-tracking branch 'origin/master'

parents bf161e69 d0ad590b
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
</div> </div>
<el-row> <el-row>
<el-col :span="1.5" style="margin: 0 10px 0 75px"> <el-col :span="1.5" style="margin: 0 10px 0 75px">
<span>关于我们:</span> <span>关于我们</span>
</el-col> </el-col>
<el-col v-if="isEdit===true" :span="19"> <el-col v-if="isEdit===true" :span="19">
<rich-text v-model="privacyPolicy.content" :height="500" :content="'请输入关于我们'" /> <rich-text v-model="privacyPolicy.content" :height="500" :content="'请输入关于我们'" />
......
...@@ -179,6 +179,7 @@ export default { ...@@ -179,6 +179,7 @@ export default {
.title-text { .title-text {
margin-left: 10px; margin-left: 10px;
font-weight: bold;
} }
} }
} }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
</div> </div>
<el-row> <el-row>
<el-col :span="1.5" style="margin: 0 10px 0 75px"> <el-col :span="1.5" style="margin: 0 10px 0 75px">
<span>用户协议:</span> <span>隐私政策</span>
</el-col> </el-col>
<el-col v-if="isEdit===true" :span="19"> <el-col v-if="isEdit===true" :span="19">
<rich-text v-model="privacyPolicy.content" :height="500" :content="'请输入隐私政策'" /> <rich-text v-model="privacyPolicy.content" :height="500" :content="'请输入隐私政策'" />
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
</div> </div>
<el-row> <el-row>
<el-col :span="1.5" style="margin: 0 10px 0 75px"> <el-col :span="1.5" style="margin: 0 10px 0 75px">
<span>用户协议:</span> <span>用户协议</span>
</el-col> </el-col>
<el-col v-if="isEdit===true" :span="19"> <el-col v-if="isEdit===true" :span="19">
<rich-text v-model="privacyPolicy.content" :height="500" :content="'请输入用户协议'" /> <rich-text v-model="privacyPolicy.content" :height="500" :content="'请输入用户协议'" />
......
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