From 199e7b1d494e5d75c2a57e0f6a9222abddd8782b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=AE=BF=E6=98=95?= <liudianxin@bd-apaas.com>
Date: Tue, 17 Nov 2020 17:19:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=88=E6=8F=90=E4=B8=80=E7=89=88=E6=B5=8Bbu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/i18n/language-zh.js                |  1 +
 src/pages/service_shop/gzfwDetail.vue         |  2 +-
 src/pages/service_shop/sjfwDetail.vue         |  2 +-
 src/pages/service_shop/skfwDetail.vue         |  2 +-
 src/pages/service_shop/spfwDetail.vue         |  2 +-
 src/pages/service_shop/zhfwDetail.vue         |  2 +-
 .../answer-center/detail.vue                  | 82 +++++++++++++++----
 .../technical-support/answer-center/list.vue  |  8 +-
 src/pages/user/my-coin.vue                    |  8 +-
 src/pages/user/questions-answers/my-qa.vue    | 38 ++++++---
 .../workbench/fwgl/apply_service_detail.vue   |  2 +-
 src/pages/workbench/fwgl/serviceDetail.vue    |  2 +-
 12 files changed, 112 insertions(+), 39 deletions(-)

diff --git a/src/assets/i18n/language-zh.js b/src/assets/i18n/language-zh.js
index dc78d6f..ae4da53 100644
--- a/src/assets/i18n/language-zh.js
+++ b/src/assets/i18n/language-zh.js
@@ -8,6 +8,7 @@ export const lang = {
     profile: "个人档案",
     message_center: "消息中心",
     my_questions_and_answers: "我的问答",
+    my_coin: "我的金币",
 
     // unit of purchase duration
     by_year: "按年",
diff --git a/src/pages/service_shop/gzfwDetail.vue b/src/pages/service_shop/gzfwDetail.vue
index 7097cd8..306cfc5 100644
--- a/src/pages/service_shop/gzfwDetail.vue
+++ b/src/pages/service_shop/gzfwDetail.vue
@@ -75,7 +75,7 @@ export default {
             descript: datas.descript,
             serviceRequestSpcs: datas.serviceRequestSpcs,
             scoreDetail: datas.scoreDetail,
-            month_sale: data.month_sale,
+            month_sale: datas.month_sale,
           };
 
           this.detailData = [
diff --git a/src/pages/service_shop/sjfwDetail.vue b/src/pages/service_shop/sjfwDetail.vue
index 623a94b..c271366 100644
--- a/src/pages/service_shop/sjfwDetail.vue
+++ b/src/pages/service_shop/sjfwDetail.vue
@@ -76,7 +76,7 @@ export default {
             descript: datas.descript,
             serviceRequestSpcs: datas.serviceRequestSpcs,
             scoreDetail: datas.scoreDetail,
-            month_sale: data.month_sale,
+            month_sale: datas.month_sale,
           };
 
           this.detailData = [
diff --git a/src/pages/service_shop/skfwDetail.vue b/src/pages/service_shop/skfwDetail.vue
index b83905f..0ef453c 100644
--- a/src/pages/service_shop/skfwDetail.vue
+++ b/src/pages/service_shop/skfwDetail.vue
@@ -81,7 +81,7 @@ export default {
             ],
             descript: datas.descript,
             scoreDetail: datas.scoreDetail,
-            month_sale: data.month_sale,
+            month_sale: datas.month_sale,
             serviceRequestSpcs: datas.serviceRequestSpcs,
           };
 
diff --git a/src/pages/service_shop/spfwDetail.vue b/src/pages/service_shop/spfwDetail.vue
index 363d248..626b389 100644
--- a/src/pages/service_shop/spfwDetail.vue
+++ b/src/pages/service_shop/spfwDetail.vue
@@ -75,7 +75,7 @@ export default {
             descript: datas.descript,
             serviceRequestSpcs: datas.serviceRequestSpcs,
             scoreDetail: datas.scoreDetail,
-            month_sale: data.month_sale,
+            month_sale: datas.month_sale,
           };
 
           this.detailData = [
diff --git a/src/pages/service_shop/zhfwDetail.vue b/src/pages/service_shop/zhfwDetail.vue
index 575ada8..8ee40e2 100644
--- a/src/pages/service_shop/zhfwDetail.vue
+++ b/src/pages/service_shop/zhfwDetail.vue
@@ -76,7 +76,7 @@ export default {
             descript: datas.descript,
             serviceRequestSpcs: datas.serviceRequestSpcs,
             scoreDetail: datas.scoreDetail,
-            month_sale: data.month_sale,
+            month_sale: datas.month_sale,
           };
           this.detailData = [
             {
diff --git a/src/pages/technical-support/answer-center/detail.vue b/src/pages/technical-support/answer-center/detail.vue
index 8356b19..5ec10b1 100644
--- a/src/pages/technical-support/answer-center/detail.vue
+++ b/src/pages/technical-support/answer-center/detail.vue
@@ -36,9 +36,9 @@
         <div class="answer_list">
             <div class="answer_box" v-for="(item,index) in answer" :key="'answer'+index+200">
                 <div class="picture">
-                    <img :src="item.user_picture_path" alt="" style="width:100%">
+                    <img :src="item.user_picture_path || head_pic" alt="" style="width:100%">
                 </div>
-                <div class="text" :style="index == answer.length-1||item.children?{border:'0'}:''">
+                <div class="text" :style="index == answer.length-1?{border:'0'}:''">
                     <p>
                         <span class="left">{{item.username}}</span> 
                         <span class="right"> 
@@ -55,25 +55,25 @@
                           :ref="'input'+index"
                           v-model="back_info">
                           <div slot="prefix" style="height:48px;line-height:48px;">
-                            <img :src="user_info.picture_path" alt="" style="width:24px;margin:0 10px 0 10px;vertical-align:-6px;border-radius:50%;"></div>
+                            <img :src="user_info.picture_path || head_pic" alt="" style="width:24px;margin:0 10px 0 10px;vertical-align:-6px;border-radius:50%;"></div>
                           <div slot="suffix" class="back_solt" @click="answer_question(item.id,item.user_id)">回复</div>
                       </el-input>
                     </div>
                     <template v-for="(it,idx) in item.children">
                       <div class="back_fllow answer_box" :key="'ans_child'+idx+5000" v-if="idx<=4||answer_child_index===index">
                         <div :style="idx == item.children.length-1&&item.children.length<=5?{border:'0',overflow:'hidden',}:{borderBottom:'2px solid #f4f7fc',overflow:'hidden',}" >
-                          <div class="picture">
-                              <img :src="it.user_picture_path" alt="" style="width:100%">
+                          <div class="picture_fllow">
+                              <img :src="it.user_picture_path || head_pic" alt="" style="width:100%">
                           </div>
-                          <div class="text" style="border:0;">
+                          <div class="text_fllow" style="border:0;">
                               <p>
                                   <span class="left">{{it.username}} <span><span style="color:#bcc1d0;margin:0 9px;">回复</span>{{it.answered_user}}</span> </span> 
                                   <span class="right"> 
                                       <span></span><span>{{deal_time(it.created)}}</span> 
                                   </span> 
                               </p>
-                              <div v-html="it.content" class="hf_content"></div>
-                              <div @click="showinput(index,idx)" class="back"><img src="../../../assets/imgs/jszc_btn_huifu.png" alt=""> 回复</div>
+                              <div v-html="it.content" class="hf_content_fllow"></div>
+                              <div @click="showinput(index,idx)" class="back_fllow_in">回复</div>
                           </div>
                           <div class="back_input" style="padding:0;height:auto;margin-bottom:0;" v-if="answer_count[0]==index&&answer_count[1]==idx">
                             <el-input
@@ -82,7 +82,7 @@
                                 :ref="'input'+index+idx"
                                 v-model="back_info">
                                 <div slot="prefix" style="height:48px;line-height:48px;">
-                                  <img :src="user_info.picture_path" alt="" style="width:24px;margin:0 10px 0 10px;vertical-align:-6px;border-radius:50%;"></div>
+                                  <img :src="user_info.picture_path || head_pic" alt="" style="width:24px;margin:0 10px 0 10px;vertical-align:-6px;border-radius:50%;"></div>
                                 <div slot="suffix" class="back_solt" @click="answer_question(item.id,it.user_id)">回复</div>
                             </el-input>
                           </div>
@@ -101,7 +101,7 @@
       </div>
 
       <div class="ans_self">
-        <p><img :src="user_info.picture_path" alt=""> <span>{{user_info.user_name}}</span> </p>
+        <p><img :src="user_info.picture_path || head_pic" alt=""> <span>{{user_info.user_name}}</span> </p>
         <wang-e-bd class="editbox" v-model="editstr" :menu="menu" :full="false"></wang-e-bd>
         <div class="pubilc" @click="answer_question1"><img src="../../../assets/imgs/jszc_ic_fabu.png" alt="">发表</div>
       </div>
@@ -137,6 +137,7 @@ export default {
       ],
       editstr:'',
       answer: [],
+      head_pic: require("@/assets/imgs/img_head.png"),
     };
   },
   watch: {},
@@ -380,15 +381,37 @@ export default {
     margin-left: 17px;
 }
 .hf_content{
-    padding: 16px 0;
-    color: #242c43;
+  width: 750px;
+  overflow: auto;
+  padding: 16px 0 0;
+  color: #242c43;
+  margin-bottom: 16px;
+}
+
+.hf_content::-webkit-scrollbar {
+  width: 16px;
+  height: 16px;
+}
+.hf_content::-webkit-scrollbar-thumb {
+  border-radius: 8px;
+  box-shadow: 0 8px 0 #a5adb7 inset;
+  border: 4px solid rgba(0, 0, 0, 0);
+  /* background-color: #a5adb7; */
+}
+
+.hf_content::-webkit-scrollbar-track {
+  border-radius: 8px;
+  box-shadow: 0 8px 0 #f4f4f4 inset;
+  border: 4px solid rgba(0, 0, 0, 0);
+  /* background-color: #f4f4f4; */
 }
 .text .back{
     float: right;
-    color: #58617a;
+    color: #0f2683;
     font-size: 14px;
     cursor: pointer;
     margin-bottom: 16px;
+    margin-right: 10px;
 }
 .text .back img{
     vertical-align: -3px;
@@ -397,7 +420,10 @@ export default {
 .back_fllow{
     background-color: #fbfbfc;
     width: 100%;
-    padding: 16px;
+    padding: 16px 16px 0;
+}
+.back_fllow:nth-last-child(1) {
+  margin-bottom: 16px;
 }
 .ans_self{
     width: 856px;
@@ -473,6 +499,34 @@ export default {
   color: #515fe7;
   cursor: pointer;
 }
+.picture_fllow {
+  float: left;
+  width: 24px;
+  height: 24px;
+  border-radius: 50%;
+  overflow: hidden;
+}
+.text_fllow {
+  float: right;
+  width: calc(100% - 30px);
+  border-bottom: 2px solid #f4f7fc;
+  overflow: hidden;
+}
+.hf_content_fllow {
+  width: 690px;
+  overflow: auto;
+  padding: 10px 0 0;
+  color: #242c43;
+  margin-bottom: 14px;
+}
+.back_fllow_in {
+  float: right;
+  color: #0f2683;
+  font-size: 14px;
+  cursor: pointer;
+  margin-bottom: 14px;
+  margin-right: 10px;
+}
 </style>
 <style>
   .back_input .el-input__inner{
diff --git a/src/pages/technical-support/answer-center/list.vue b/src/pages/technical-support/answer-center/list.vue
index a82030e..4c31b4b 100644
--- a/src/pages/technical-support/answer-center/list.vue
+++ b/src/pages/technical-support/answer-center/list.vue
@@ -162,10 +162,10 @@ export default {
       return helper.dateStringTransform(time || "");
     },
     getContentText(content) {
-      let text = content.replace(/<img[^>]+>/g, "【图片】");
-
-      text = text.replace(/<iframe(([\s\S])*?)<\/iframe>/g, "【视频】");
-      text = text.replace(/<pre(([\s\S])*?)<\/pre>/g, "【代码】");
+      let text = content.replace(/<img[^>]+>/g, "[图片]");
+      text = text.replace(/<iframe(([\s\S])*?)<\/iframe>/g, "[视频]");
+      text = text.replace(/<video(([\s\S])*?)<\/video>/g, "[视频]");
+      text = text.replace(/<pre(([\s\S])*?)<\/pre>/g, "[代码]");
       text = text.replace(/<\/?.+?>/g, "");
 
       return text;
diff --git a/src/pages/user/my-coin.vue b/src/pages/user/my-coin.vue
index e5bfd6d..ca6b414 100644
--- a/src/pages/user/my-coin.vue
+++ b/src/pages/user/my-coin.vue
@@ -5,13 +5,13 @@
         $t("lang.personal_center")
       }}</el-breadcrumb-item>
       <el-breadcrumb-item>{{
-        $t("lang.my_questions_and_answers")
+        $t("lang.my_coin")
       }}</el-breadcrumb-item>
     </el-breadcrumb>
     <BlockRadius class="info_block user_qa">
       <div class="left_user">
         <div class="img_head">
-          <img :src="user_info.picture_path" class="img_head_in" />
+          <img :src="user_info.picture_path || head_pic" class="img_head_in" />
         </div>
         <div class="left_word">
           <p class="left_name">{{ user_info.user_name }}</p>
@@ -112,6 +112,7 @@ export default {
     currentPage: 1,
     currentlimit: 10,
     date: [],
+    head_pic: require("@/assets/imgs/img_head.png"),
   }),
   watch: {},
   methods: {
@@ -129,6 +130,9 @@ export default {
       this.$api.user.getUserCoins().then((response) => {
         if (response.data.success == 1) {
           this.user_info = response.data.data;
+          if (!this.user_info.recharge_count) {
+            this.user_info.recharge_count = 0;
+          }
         }
       });
     },
diff --git a/src/pages/user/questions-answers/my-qa.vue b/src/pages/user/questions-answers/my-qa.vue
index 8886452..b820ca7 100644
--- a/src/pages/user/questions-answers/my-qa.vue
+++ b/src/pages/user/questions-answers/my-qa.vue
@@ -11,7 +11,7 @@
     <BlockRadius class="info_block user_qa">
       <div class="left_user">
         <div class="img_head">
-          <img :src="user_info.picture_path" class="img_head_in" />
+          <img :src="user_info.picture_path || head_pic" class="img_head_in" />
         </div>
         <div class="left_word">
           <p class="left_name">{{ user_info.user_name }}</p>
@@ -70,7 +70,7 @@
               <p
                 v-if="item.answer != ''"
                 class="cell_answer"
-                v-html="item.answer"
+                v-text="getContentText(item.answer)"
               ></p>
               <p
                 @click="gotodeta(item.question_id)"
@@ -78,21 +78,25 @@
               >
                 {{ item.title }}
               </p>
-              <p class="cell_cont">
-                {{
-                  item.question_content && item.question_content != ""
-                    ? item.question_content.replace(/<[^<>]+>/g, "")
-                    : item.content && item.content != ""
-                    ? item.content.replace(/<[^<>]+>/g, "")
-                    : ""
-                }}
-              </p>
+              <p
+                class="cell_cont"
+                v-if="item.question_content && item.question_content != ''"
+                v-text="getContentText(item.question_content)"
+              ></p>
+              <p
+                class="cell_cont"
+                v-else-if="item.content && item.content != ''"
+                v-text="getContentText(item.content)"
+              ></p>
+              <p class="cell_cont" v-else></p>
               <p v-if="activeName == 2" class="cell_other">
                 <span>
                   删除时间：{{ helper.dateStringTransform(item.deleted_time) }}
                 </span>
                 <span>删除人：{{ item.delete_user }}</span>
-                <span>删除理由：{{ item.delete_reason }}</span>
+                <span v-if="item.delete_reason"
+                  >删除理由：{{ item.delete_reason }}</span
+                >
               </p>
               <p v-else class="cell_other">
                 <span>{{ helper.dateStringTransform(item.created) }}</span>
@@ -211,6 +215,7 @@ export default {
     },
     diaDelItem: false,
     delItem: {},
+    head_pic: require("@/assets/imgs/img_head.png"),
   }),
   watch: {
     activeName: {
@@ -352,6 +357,15 @@ export default {
         }
       });
     },
+    getContentText(content) {
+      let text = content.replace(/<img[^>]+>/g, "[图片]");
+      text = text.replace(/<iframe(([\s\S])*?)<\/iframe>/g, "[视频]");
+      text = text.replace(/<video(([\s\S])*?)<\/video>/g, "[视频]");
+      text = text.replace(/<pre(([\s\S])*?)<\/pre>/g, "[代码]");
+      text = text.replace(/<\/?.+?>/g, "");
+
+      return text;
+    },
   },
   created() {
     if (this.$route.query.name !== undefined) {
diff --git a/src/pages/workbench/fwgl/apply_service_detail.vue b/src/pages/workbench/fwgl/apply_service_detail.vue
index 51d6809..321b192 100644
--- a/src/pages/workbench/fwgl/apply_service_detail.vue
+++ b/src/pages/workbench/fwgl/apply_service_detail.vue
@@ -882,7 +882,7 @@ export default {
           );
           this.$set(this.list_arr[4], "info", data.organization_name);
           this.$set(this.list_arr[5], "info", data.openness_name);
-          this.$set(this.list_arr[6], "info", data.encode_method);
+          this.$set(this.list_arr[6], "info", "自动生成");
           this.$set(
             this.list_arr[7],
             "info",
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index 0582820..2a2de52 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -1376,7 +1376,7 @@ export default {
             this.$set(this.list_arr[1], "info", data.sectors_name);
             this.$set(this.list_arr[2], "info", data.organization_name);
             this.$set(this.list_arr[3], "info", data.openness_name);
-            this.$set(this.list_arr[4], "info", data.encode_method);
+            this.$set(this.list_arr[4], "info", "自动生成");
             this.$set(
               this.list_arr[5],
               "info",
-- 
2.26.0