diff --git a/src/assets/i18n/language-zh.js b/src/assets/i18n/language-zh.js
index dc78d6f56c25f72d481be264dfb2d20a5000739f..ae4da5370bea50b1485ebd59c16ca9d5ab6c3be8 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/components/service-list/commodity-card copy.vue b/src/components/service-list/commodity-card-new.vue
similarity index 100%
rename from src/components/service-list/commodity-card copy.vue
rename to src/components/service-list/commodity-card-new.vue
diff --git a/src/components/service-list/commodity-card.vue b/src/components/service-list/commodity-card-old.vue
similarity index 100%
rename from src/components/service-list/commodity-card.vue
rename to src/components/service-list/commodity-card-old.vue
diff --git a/src/components/service-list/commodity-cell copy.vue b/src/components/service-list/commodity-cell-new.vue
similarity index 100%
rename from src/components/service-list/commodity-cell copy.vue
rename to src/components/service-list/commodity-cell-new.vue
diff --git a/src/components/service-list/commodity-cell.vue b/src/components/service-list/commodity-cell-old.vue
similarity index 100%
rename from src/components/service-list/commodity-cell.vue
rename to src/components/service-list/commodity-cell-old.vue
diff --git a/src/components/service-list/commodity-list copy.vue b/src/components/service-list/commodity-list-new.vue
similarity index 99%
rename from src/components/service-list/commodity-list copy.vue
rename to src/components/service-list/commodity-list-new.vue
index e8238e6af0deedee2f0eef3bc01f7357ca8c1e3c..0cb511161c62ef73a0b93a404d7ee95788112197 100644
--- a/src/components/service-list/commodity-list copy.vue	
+++ b/src/components/service-list/commodity-list-new.vue
@@ -65,8 +65,8 @@
 </template>
 
 <script>
-import CommodityCell from "@/components/service-list/commodity-cell.vue";
-import CommodityCard from "@/components/service-list/commodity-card.vue";
+import CommodityCell from "@/components/service-list/commodity-cell-new.vue";
+import CommodityCard from "@/components/service-list/commodity-card-new.vue";
 export default {
   components: {
     "commodity-cell": CommodityCell,
diff --git a/src/components/service-list/commodity-list.vue b/src/components/service-list/commodity-list-old.vue
similarity index 100%
rename from src/components/service-list/commodity-list.vue
rename to src/components/service-list/commodity-list-old.vue
diff --git a/src/components/service-list/service_list copy.vue b/src/components/service-list/service_list-new.vue
similarity index 99%
rename from src/components/service-list/service_list copy.vue
rename to src/components/service-list/service_list-new.vue
index 3bf7b06393c3f7575cb9f38f506bbbc3106bd0bc..eaef673c07dbe8a34e5d6a000895fdb7846baa79 100644
--- a/src/components/service-list/service_list copy.vue	
+++ b/src/components/service-list/service_list-new.vue
@@ -210,7 +210,7 @@
 </template>
 
 <script>
-import CommodityList from "@/components/service-list/commodity-list.vue";
+import CommodityList from "@/components/service-list/commodity-list-new.vue";
 import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
diff --git a/src/components/service-list/service_list.vue b/src/components/service-list/service_list-old.vue
similarity index 99%
rename from src/components/service-list/service_list.vue
rename to src/components/service-list/service_list-old.vue
index 980050bb77484fc0f4310d111765c46b204db673..6f7a9b3633c2c686515c001bea9f4bf5f3999577 100644
--- a/src/components/service-list/service_list.vue
+++ b/src/components/service-list/service_list-old.vue
@@ -190,7 +190,7 @@
 </template>
 
 <script>
-import CommodityList from "@/components/service-list/commodity-list.vue";
+import CommodityList from "@/components/service-list/commodity-list-new.vue";
 import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
diff --git a/src/components/service-list/service_shop_menu_copy.vue b/src/components/service-list/service_shop_menu-new.vue
similarity index 100%
rename from src/components/service-list/service_shop_menu_copy.vue
rename to src/components/service-list/service_shop_menu-new.vue
diff --git a/src/components/service-list/service_shop_menu.vue b/src/components/service-list/service_shop_menu-old.vue
similarity index 100%
rename from src/components/service-list/service_shop_menu.vue
rename to src/components/service-list/service_shop_menu-old.vue
diff --git a/src/components/shop-cloud/shop-cloud copy.vue b/src/components/shop-cloud/shop-cloud-new.vue
similarity index 100%
rename from src/components/shop-cloud/shop-cloud copy.vue
rename to src/components/shop-cloud/shop-cloud-new.vue
diff --git a/src/components/shop-cloud/shop-cloud.vue b/src/components/shop-cloud/shop-cloud-old.vue
similarity index 100%
rename from src/components/shop-cloud/shop-cloud.vue
rename to src/components/shop-cloud/shop-cloud-old.vue
diff --git a/src/pages/example/example_com_list.vue b/src/pages/example/example_com_list.vue
index 32ece6592e24ef25f1cf554506a2fb3f1765ecec..9ed0b57e44aea5bcf9d5093141146210d998212c 100644
--- a/src/pages/example/example_com_list.vue
+++ b/src/pages/example/example_com_list.vue
@@ -9,7 +9,7 @@
 
 <script>
 // @ is an alias to /src
-import CommodityList from "@/components/service-list/commodity-list.vue";
+import CommodityList from "@/components/service-list/commodity-list-new.vue";
 import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
diff --git a/src/pages/service_shop/gzfwDetail.vue b/src/pages/service_shop/gzfwDetail.vue
index 7097cd811d44f47ab4099700ba407b2ea12ae73b..306cfc5dc740e9c3d7fec74b865cde977758a28f 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/shop_cloud copy.vue b/src/pages/service_shop/shop_cloud-new.vue
similarity index 88%
rename from src/pages/service_shop/shop_cloud copy.vue
rename to src/pages/service_shop/shop_cloud-new.vue
index 3533b7fbb07eb723f28545e4e21bd6a101355295..d7ccfb1db842dfbb87f994fe601aaf839b6b01c6 100644
--- a/src/pages/service_shop/shop_cloud copy.vue	
+++ b/src/pages/service_shop/shop_cloud-new.vue
@@ -12,8 +12,8 @@
 </template>
 
 <script>
-import ServiceShopMenu from "@/components/service-list/service_shop_menu";
-import ShopCloud from "@/components/shop-cloud/shop-cloud";
+import ServiceShopMenu from "@/components/service-list/service_shop_menu-new";
+import ShopCloud from "@/components/shop-cloud/shop-cloud-new";
 export default {
   components: {
     ServiceShopMenu,
diff --git a/src/pages/service_shop/shop_cloud.vue b/src/pages/service_shop/shop_cloud-old.vue
similarity index 100%
rename from src/pages/service_shop/shop_cloud.vue
rename to src/pages/service_shop/shop_cloud-old.vue
diff --git a/src/pages/service_shop/shop_list copy.vue b/src/pages/service_shop/shop_list-new.vue
similarity index 97%
rename from src/pages/service_shop/shop_list copy.vue
rename to src/pages/service_shop/shop_list-new.vue
index c87d0ed1b3deb28afeb30a002e85408b0671f393..231364c4f3fbba042fe2dad0e148169a486aca9e 100644
--- a/src/pages/service_shop/shop_list copy.vue	
+++ b/src/pages/service_shop/shop_list-new.vue
@@ -17,8 +17,8 @@
 </template>
 
 <script>
-import ServiceShopMenu from "@/components/service-list/service_shop_menu";
-import ServiceList from "@/components/service-list/service_list";
+import ServiceShopMenu from "@/components/service-list/service_shop_menu-new";
+import ServiceList from "@/components/service-list/service_list-new";
 import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
diff --git a/src/pages/service_shop/shop_list.vue b/src/pages/service_shop/shop_list-old.vue
similarity index 100%
rename from src/pages/service_shop/shop_list.vue
rename to src/pages/service_shop/shop_list-old.vue
diff --git a/src/pages/service_shop/sjfwDetail.vue b/src/pages/service_shop/sjfwDetail.vue
index 623a94bd32225d0dbc2326eae1d1c4f4ce0727de..c271366654dfeacbd0d7d30707141f2a5ed29968 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 b83905f7bb0def015d43e4ba171a200ffbe34d28..0ef453c56e09b88e7a5d57a4c99344885f1c3f87 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 363d2489cf311f96e03b454f2af8d0218216f974..626b3897087051035c6845492ef59926b9e5f2fc 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 575ada852fc7401543780479c1ebbbe3823f249a..8ee40e293f59dbeedc7952fea3c6d0381ccdd240 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 8356b195ee5a87931460a8a03621314548b7c80e..5ec10b147d40233c00b32af0f5d02f2e0a3bcbac 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 a82030ebf4ad5058bb565d051eff92d226e3a34a..4c31b4b439985d422c040be74b7fa005241cf2e0 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 e5bfd6d4399db49673bf42720e48f1bc34e1381f..ca6b414b3d7bc931a853215b53d6fd19067bdd01 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 8886452df61480e3c0b2ed0b2b87404f503e5da2..b820ca7dd6fc3114b861b549e174828ab8999ba6 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 51d68094d559d78bafd88b26ab7870c9a24c77a3..321b192e28967ec8b0f99ecd67204e85c34997a7 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 0582820192339a84c5003262d9eb8c4e07e3b761..2a2de52f613e00a4f3a792f221da79f7b8b87548 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",
diff --git a/src/router/index.js b/src/router/index.js
index 4f844dd0e1be681ff2a3e54cedbf284be8849111..283d1a5657cf2566e27528275df547c1208160a0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -281,32 +281,32 @@ export default new Router({
             {
               path: "/shop/data_service_list/:id", // 数据服务列表页
               name: "shopDataList",
-              component: () => import("@/pages/service_shop/shop_list"),
+              component: () => import("@/pages/service_shop/shop_list-new"),
             },
             {
               path: "/shop/space_time_service_list/:id", // 时空服务列表页
               name: "shopSpaceTimeList",
-              component: () => import("@/pages/service_shop/shop_list"),
+              component: () => import("@/pages/service_shop/shop_list-new"),
             },
             {
               path: "/shop/video_service_list/:id", // 视频服务列表页
               name: "shopVideoList",
-              component: () => import("@/pages/service_shop/shop_list"),
+              component: () => import("@/pages/service_shop/shop_list-new"),
             },
             {
               path: "/shop/perception_service_list/:id", // 感知服务列表页
               name: "shopPerceptionList",
-              component: () => import("@/pages/service_shop/shop_list"),
+              component: () => import("@/pages/service_shop/shop_list-new"),
             },
             {
               path: "/shop/comprehensive_app_list/:id", // 综合应用列表页
               name: "shopComAppList",
-              component: () => import("@/pages/service_shop/shop_list"),
+              component: () => import("@/pages/service_shop/shop_list-new"),
             },
             {
               path: "/shop/cloud", // 云资源服务
               name: "shopCloud",
-              component: () => import("@/pages/service_shop/shop_cloud"),
+              component: () => import("@/pages/service_shop/shop_cloud-new"),
             },
             {
               path: "/shop/service_application_successfully", // 申请服务成功
@@ -317,7 +317,7 @@ export default new Router({
             {
               path: "/shop/app_store_list/:id", // 应用商店列表页
               name: "shopAppStoreList",
-              component: () => import("@/pages/service_shop/shop_list"),
+              component: () => import("@/pages/service_shop/shop_list-new"),
             },
             {
               path: "/shop/shopping_cart", // 购物车页