Merge branch 'dev'

src/components/service-info/service-info.vue

@@ -7,12 +7,12 @@
   >
     <div class="main_container">
       <div class="main_container-left" v-if="data.cover">
-        <img :src="data.cover" width="100%" v-if="data.type !== 'workflow'" />
+        <img :src="data.cover" width="100%" v-if="!(data.type == 'workflow' && data.workflows_id != 0) || !(data.type === 'Map Service')" />
         <workflows-view
           :isShop="true"
           :id="parseInt(data.workflows_id)"
           :hideDetail="true"
-          v-if="data.type == 'workflow'"
+          v-if="data.type == 'workflow' && data.workflows_id != 0"
         ></workflows-view>
         <map-view
           v-if="data.type === 'Map Service'"
@@ -20,7 +20,7 @@
         ></map-view>
         <process-view
           :id="parseInt(data.workflows_id)"
-          v-if="data.type == 'workflow'"
+          v-if="data.type == 'workflow' && data.workflows_id != 0"
         ></process-view>
       </div>
       <div class="main_container-right">

src/components/shop-cloud/shop-cloud-new.vue

@@ -1281,11 +1281,10 @@ export default {
         );
         if (
           this.formOld.dataDisk > 0 &&
-          this.formOld.perDataDisk > 0 &&
-          this.formOld.appDuration > 0
+          this.formOld.perDataDisk > 0
         ) {
-          console.log("j,xqd");
-          // 加D，续期 
+          console.log("jd");
+          // 加D
           if (this.hard_disk && this.hard_disk.length != 0) {
             this.disk_single_money = Number(this.hard_disk[0].price);
             sumDisk += Number(

src/pages/workbench/workPlace.vue

@@ -319,7 +319,7 @@
             :datas="app_data"
             :stripe="true"
             :detailsUrl="detailsUrl1[now_user][now_app]"
-            :ites="true"
+            :ites="false"
             height="285"
           ></table-um>
           <list-pagination