Merge remote-tracking branch 'origin/developer' into developerB

src/main/resources/static/css/encyclopedia/detail.css

@@ -8,12 +8,12 @@
     .bk-detail{position:relative;z-index:20;background:#fff;-webkit-box-sizing:border-box;box-sizing:border-box;padding:40px 32px;-webkit-transform:translateY(-100px);-ms-transform:translateY(-100px);transform:translateY(-100px);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;font-size:14px;color:#333}
     .bk-detail-left{width:835px}
     .bk-detail-left .bk-name{font-size:18px}
-    .bk-detail-left .bk-overview{color:#999999;margin-top:16px}
+    .bk-detail-left .bk-overview{color:#999999;margin-top:16px;white-space: pre-wrap;line-height: 24px;}
     .bk-detail-left .bk-information{display:table;margin-top:48px;margin-bottom:48px;width:100%}
     .bk-detail-left .bk-information .bk-row{display:table-row}
     .bk-detail-left .bk-information .bk-row .bk-label{display:table-cell;font-weight:bold;color:#9AA5B5;border-bottom:1px dashed #BEBEBE;padding:18px 0 10px;white-space:nowrap;}
     .bk-detail-left .bk-information .bk-row .bk-content{font-size:14px;display:table-cell;border-bottom:1px dashed #BEBEBE;padding:18px 10px 10px}
-    .bk-detail-left .bk-section .bk-section-content{line-height: 1.8}
+    .bk-detail-left .bk-section .bk-section-content{line-height: 1.8;white-space: pre-wrap;}
     .bk-detail-left .bk-section .bk-title{position:relative;margin-top:40px;margin-bottom:24px}
     .bk-detail-left .bk-section .bk-title h2{background:#fff;font-size:22px;display:inline-block;font-weight:normal;position:relative;z-index:20;padding-right:16px}
     .bk-detail-left .bk-section .bk-title::before{position:absolute;content:"";display:block;width:12px;height:24px;left:-32px;top:50%;-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%);background:#FF9D63}
@@ -69,7 +69,7 @@
     .bk-entry-name{padding:0.4rem 0.32rem 0.32rem;background:#fff}
     .bk-entry-name .bk-name{font-size:0.36rem;font-weight:bold}
     .bk-detail-left .bk-name{font-size:0.36rem;font-weight:bold;padding:0 0.32rem;background:#fff}
-    .bk-detail-left .bk-overview{color:#999999;padding:0.24rem 0.32rem 0;background:#fff}
+    .bk-detail-left .bk-overview{color:#999999;padding:0.24rem 0.32rem 0;background:#fff;white-space: pre-wrap;}
     .bk-detail-left .bk-information{position:relative;width:100%;padding:0.56rem 0.32rem  0.48rem;display:table;margin-bottom:0.16rem;background:#fff;-webkit-box-sizing:border-box;box-sizing:border-box}
     .bk-detail-left .bk-information .bk-row{display:table-row}
     .bk-detail-left .bk-information .bk-row .bk-label{color:#9AA5B5;display:table-cell;padding:0.16rem 0.4rem 0.16rem 0}
@@ -77,7 +77,7 @@
     .bk-detail-left .bk-section{position:relative;padding:0.48rem 0.32rem;background:#fff;margin-bottom:0.16rem;}
     .bk-detail-left .bk-section .bk-title{position:relative;margin-bottom:0.32rem}
     .bk-detail-left .bk-section .bk-title h2{font-size:0.36rem;position:relative;z-index:20}
-    .bk-detail-left .bk-section .bk-section-content{line-height: 1.8;text-align:justify;}
+    .bk-detail-left .bk-section .bk-section-content{line-height: 1.8;text-align:justify;white-space: pre-wrap;}
     .bk-detail-left .bk-section h3{font-size:0.32rem;margin-bottom:0.32rem;margin-top:0.4rem;font-weight:normal}
     .bk-literature{padding:0.4rem 0.32rem;background:#fff}
     .bk-literature .bk-title{font-size:0.36rem;font-weight:bold;margin-bottom:0.32rem}

src/main/resources/static/js/supplier-center/article/article-list.js

@@ -114,7 +114,7 @@ var articleList = new Vue({
                 if (res.code === 0) {
                     // 不刷新数据更新
                     article.status = newStatus;
-                    const tip = newStatus ? '文章已发布' : '文章已存入草稿箱';
+                    const tip = newStatus ? '文章已发布' : '文章暂不发布';
                     CAIMEI.dialog(tip);
                 } else {
                     CAIMEI.dialog('修改文章状态失败!');

src/main/resources/static/js/supplier-center/encyclopedia/list.js

@@ -89,7 +89,7 @@ const list = new Vue({
         handleStorageEntry(item) {
             const self = this
             shopBikeApi.UpdateEntryStatus({id: item.id, status: 0}, function (res) {
-                CAIMEI.dialog('词条已保存到草稿箱', false);
+                CAIMEI.dialog('词条暂不发布', false);
                 self.getList()
             })
         },
@@ -129,4 +129,4 @@ const list = new Vue({
         }
     }
 
-})
+})

src/main/resources/templates/supplier-center/article/article-edit.html

@@ -116,14 +116,14 @@
                                 <span class="cm-label"><em>*</em>状态:</span>
                                 <el-radio-group v-model="formData.status">
                                     <el-radio :label="1">发布</el-radio>
-                                    <el-radio :label="0">保存草稿箱</el-radio>
+                                    <el-radio :label="0">暂不发布</el-radio>
                                 </el-radio-group>
                             </el-form-item>
                         </el-form>
                         <!-- 提交 -->
                         <div class="form-item btns">
                             <button class="btn break" @click="handleBack">返回</button>
-                            <button class="btn submit" @click="handleSave">保存</button>
+                            <button class="btn submit" @click="handleSave">提交</button>
                         </div>
                     </div>
                 </div>

src/main/resources/templates/supplier-center/article/article-list.html

@@ -146,11 +146,11 @@
                                 </td>
                                 <td>
                                     <span class="state primary" v-if="articleInfo.status === 1">已发布</span>
-                                    <span class="state danger" v-else>保存草<br>稿箱</span>
+                                    <span class="state danger" v-else>暂不发布</span>
                                 </td>
                                 <td class="option">
                                     <div class="option">
-                                        <button class="form-button stop" @click="clickOption(articleInfo, 2)">{{ articleInfo.status === 1 ? '保存草稿箱':'发布' }}</button>
+                                        <button class="form-button stop" @click="clickOption(articleInfo, 2)">{{ articleInfo.status === 1 ? '暂不发布':'发布' }}</button>
                                         <button class="form-button edit" @click="clickOption(articleInfo, 1)">编辑</button><br>
                                         <button class="form-button search" @click="clickOption(articleInfo, 3)">查看</button>
                                         <button class="form-button delete" @click="clickOption(articleInfo, 4)">删除</button>

src/main/resources/templates/supplier-center/encyclopedia/edit.html

@@ -99,8 +99,8 @@
                                     </content-edit>
                                 </template>
                                 <div class="bk-section">
-                                    <span @click="handleAddTextInfo(index, 1)">+一级目录</span>
-                                    <span @click="handleAddTextInfo(index, 2)">+二级目录</span>
+                                    <span @click="handleAddTextInfo(index, 1)">+一级标题</span>
+                                    <span @click="handleAddTextInfo(index, 2)">+二级标题</span>
                                     <span @click="handleAddTextInfo(index, 3)">+内容</span>
                                     <span class="delete" @click="handleRemoveTextInfo(index)" v-if="formData.textInfoList.length > 3">删除</span>
                                 </div>
@@ -139,7 +139,7 @@
                                 <label class="el-form-item__label">状态：</label>
                                 <el-radio-group v-model="formData.status">
                                     <el-radio :label="1">发布</el-radio>
-                                    <el-radio :label="0">保存草稿箱</el-radio>
+                                    <el-radio :label="0">暂不发布</el-radio>
                                 </el-radio-group>
                             </div>
                         </el-form-item>
@@ -148,7 +148,7 @@
                     </el-form>
                     <div class="bk-control">
                         <button class="bk-back" @click="handleBack">返回</button>
-                        <button class="bk-confirm" @click="handleConfirm">保存</button>
+                        <button class="bk-confirm" @click="handleConfirm">提交</button>
                     </div>
                 </div>
             </div>

src/main/resources/templates/supplier-center/encyclopedia/list.html

@@ -119,11 +119,11 @@
                             <div class="bk-td">{{item.addTime | dateFormat}}</div>
                             <template>
                                 <div class="bk-td" v-if="item.status === 1">已发布</div>
-                                <div class="bk-td bk-primary" v-if="item.status === 0">保存草稿箱</div>
+                                <div class="bk-td bk-primary" v-if="item.status === 0">暂不发布</div>
                             </template>
                             <div class="bk-td">
                                 <template v-if="item.status === 1">
-                                    <button @click="handleStorageEntry(item)">保存草稿箱</button>
+                                    <button @click="handleStorageEntry(item)">暂不发布</button>
                                 </template>
                                 <template v-if="item.status === 0">
                                     <button @click="handlePublishEntry(item)">发布</button>
@@ -166,4 +166,4 @@
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/shopBaike.service.js(v=${version})}"></script>
 <script charset="UTF-8" type="text/javascript" th:src="@{/js/supplier-center/encyclopedia/list.js(v=${version})}"></script>
 </body>
-</html>
+</html>