Commit 22b9410c authored by 刘殿昕's avatar 刘殿昕

Merge branch 'dev'

parents 98321b8f 861875c2
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
> >
<div class="main_container"> <div class="main_container">
<div class="main_container-left" v-if="data.cover"> <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 <workflows-view
:isShop="true" :isShop="true"
:id="parseInt(data.workflows_id)" :id="parseInt(data.workflows_id)"
:hideDetail="true" :hideDetail="true"
v-if="data.type == 'workflow'" v-if="data.type == 'workflow' && data.workflows_id != 0"
></workflows-view> ></workflows-view>
<map-view <map-view
v-if="data.type === 'Map Service'" v-if="data.type === 'Map Service'"
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
></map-view> ></map-view>
<process-view <process-view
:id="parseInt(data.workflows_id)" :id="parseInt(data.workflows_id)"
v-if="data.type == 'workflow'" v-if="data.type == 'workflow' && data.workflows_id != 0"
></process-view> ></process-view>
</div> </div>
<div class="main_container-right"> <div class="main_container-right">
......
...@@ -1281,11 +1281,10 @@ export default { ...@@ -1281,11 +1281,10 @@ export default {
); );
if ( if (
this.formOld.dataDisk > 0 && this.formOld.dataDisk > 0 &&
this.formOld.perDataDisk > 0 && this.formOld.perDataDisk > 0
this.formOld.appDuration > 0
) { ) {
console.log("j,xqd"); console.log("jd");
// 加D,续期 // 加D
if (this.hard_disk && this.hard_disk.length != 0) { if (this.hard_disk && this.hard_disk.length != 0) {
this.disk_single_money = Number(this.hard_disk[0].price); this.disk_single_money = Number(this.hard_disk[0].price);
sumDisk += Number( sumDisk += Number(
......
...@@ -319,7 +319,7 @@ ...@@ -319,7 +319,7 @@
:datas="app_data" :datas="app_data"
:stripe="true" :stripe="true"
:detailsUrl="detailsUrl1[now_user][now_app]" :detailsUrl="detailsUrl1[now_user][now_app]"
:ites="true" :ites="false"
height="285" height="285"
></table-um> ></table-um>
<list-pagination <list-pagination
......
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