Commit b4b27930 authored by 刘殿昕's avatar 刘殿昕

fixed 云服务,删掉象山

parent 9a208bd9
...@@ -963,7 +963,7 @@ ...@@ -963,7 +963,7 @@
<div class="fyzj_1"> <div class="fyzj_1">
费用总计: 费用总计:
<p> <p>
<span class="fyzj_1_num"> 2 </span <span class="fyzj_1_num"> {{ getSumCoin }} </span
><span class="fyzj_1_jb">金币</span> ><span class="fyzj_1_jb">金币</span>
</p> </p>
</div> </div>
...@@ -1081,6 +1081,7 @@ export default { ...@@ -1081,6 +1081,7 @@ export default {
sumCM += Number(priceObj.price); sumCM += Number(priceObj.price);
} }
} }
sumCM = sumCM * Number(this.formNew.appDuration);
if ( if (
this.formNew.dataDisk >= 1 && this.formNew.dataDisk >= 1 &&
this.formNew.perDataDisk >= 1 && this.formNew.perDataDisk >= 1 &&
...@@ -1140,6 +1141,7 @@ export default { ...@@ -1140,6 +1141,7 @@ export default {
sumCM += Number(priceObj.price); sumCM += Number(priceObj.price);
} }
} }
sumCM = sumCM * Number(this.formOld.appDuration);
if ( if (
this.formOld.dataDisk >= 1 && this.formOld.dataDisk >= 1 &&
this.formOld.perDataDisk >= 1 && this.formOld.perDataDisk >= 1 &&
...@@ -1173,6 +1175,7 @@ export default { ...@@ -1173,6 +1175,7 @@ export default {
this.formOld.appDuration >= 1 ? this.formOld.appDuration : 0 this.formOld.appDuration >= 1 ? this.formOld.appDuration : 0
}个月`; }个月`;
} }
console.log(sumCM, sumDisk)
this.amounts_payable = Number((Number(sumCM) + Number(sumDisk)).toFixed(2)); this.amounts_payable = Number((Number(sumCM) + Number(sumDisk)).toFixed(2));
// this.total_money = sumCM + sumDisk - a_deductions; // this.total_money = sumCM + sumDisk - a_deductions;
return this.amounts_payable; return this.amounts_payable;
...@@ -1243,7 +1246,7 @@ export default { ...@@ -1243,7 +1246,7 @@ export default {
perCPU: undefined, perCPU: undefined,
perRAMs: undefined, perRAMs: undefined,
perRAM: undefined, perRAM: undefined,
appDuration: undefined, appDuration: 1,
durType: 1, durType: 1,
apply_file: "", apply_file: "",
apply_file_name: "", apply_file_name: "",
...@@ -1336,7 +1339,7 @@ export default { ...@@ -1336,7 +1339,7 @@ export default {
perCPU: undefined, perCPU: undefined,
perRAMs: undefined, perRAMs: undefined,
perRAM: undefined, perRAM: undefined,
appDuration: undefined, appDuration: 1,
durType: 1, durType: 1,
apply_file: "", apply_file: "",
apply_file_name: "", apply_file_name: "",
......
...@@ -1004,14 +1004,6 @@ export default { ...@@ -1004,14 +1004,6 @@ export default {
color: "#58617a", color: "#58617a",
url:'/search_engine', url:'/search_engine',
}, },
{
text: "数据采集",
pic: require("@/assets/imgs/home_tool_ic_sscj.png"),
bg: "#fff2e2",
color: "#ea7d19",
url:'https://apaas3.wodcloud.com/sjcj/ui/',
target: 1,
},
], ],
service_arr: [ service_arr: [
["服务列表", "申请服务", "云资源"], ["服务列表", "申请服务", "云资源"],
...@@ -1038,12 +1030,6 @@ export default { ...@@ -1038,12 +1030,6 @@ export default {
role: 2, role: 2,
url: "/authority/organization" url: "/authority/organization"
}, },
{
pic: require("@/assets/imgs/home_tool_ic_shuju.png"),
text: "数据采集管理",
role: 2,
url: "https://apaas3.wodcloud.com/sjcj/ui/#/data_acquisition/file"
},
{ {
pic: require("@/assets/imgs/home_tool_ic_message.png"), pic: require("@/assets/imgs/home_tool_ic_message.png"),
text: "消息与推送管理", text: "消息与推送管理",
......
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