Skip to content

A
apaas-ui
Commit 961f3ade authored by 刘殿昕's avatar 刘殿昕
Browse files
Options

统一修复

parent cf6f5727
Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 102 deletions
src/assets/css/index.css
View file @ 961f3ade
......@@ -228,13 +228,14 @@ div {
.el-dialog__header {
border-bottom: 1px solid #edf0ff;
padding: 20px 16px;
}
.el-dialog__title {
font-size: 16px;
font-size: 18px;
font-weight: 700;
color: #1d1e20;
padding-left: 8px;
padding-left: 12px;
position: relative;
}
......@@ -246,7 +247,19 @@ div {
border-radius: 2px;
background-color: #515fe7;
left: 0;
top: 2px;
top: 5px;
}
.el-dialog__headerbtn {
top: 24px;
}
.el-dialog__headerbtn .el-dialog__close {
color: #8890a7;
}
.el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close {
color: #515fe7;
}
.el-dialog__body {
......@@ -1227,4 +1240,13 @@ border-radius:8px;
.el-input__inner:-ms-input-placeholder,
.el-textarea__inner:-ms-input-placeholder {
color: #a9aec0;
}
[class*=" el-icon-"], [class^=el-icon-] {
font-weight: 700;
}
.el-rate__item .el-rate__icon {
font-size: 18px;
margin-right: 0;
}
\ No newline at end of file
src/components/comments-list.vue
View file @ 961f3ade
......@@ -12,10 +12,11 @@
<p class="comment-user_name" v-text="item.user_name"></p>
<div class="commnet-rate">
<el-rate
:colors="['#e69232', '#e69232', '#e69232']"
:colors="['#fac266', '#fac266', '#fac266']"
:value="item.score"
disabled
score-template="{value}"
disabled-void-color="#d9dce5"
>
</el-rate>
</div>
......
src/components/comments-score.vue
View file @ 961f3ade
......@@ -7,9 +7,10 @@
<p class="comment-full_score">满分5分</p>
<div class="comment-total_rata">
<el-rate
:colors="['#e69232', '#e69232', '#e69232']"
:colors="['#fac266', '#fac266', '#fac266']"
:value="data.score"
disabled
disabled-void-color="#d9dce5"
>
</el-rate>
</div>
......@@ -23,7 +24,7 @@
>
<el-rate
class="comments_score_item-rate"
:colors="['#8890a7', '#8890a7', '#8890a7']"
:colors="['#fac266', '#fac266', '#fac266']"
:value="item.star"
disabled
disabled-void-color="transparent"
......
src/components/e-charts/commentlist.vue
View file @ 961f3ade
......@@ -25,10 +25,11 @@
</p>
<div class="commnet-rate">
<el-rate
:colors="['#e69232', '#e69232', '#e69232']"
:colors="['#fac266', '#fac266', '#fac266']"
:value="item.score"
disabled
score-template="{value}"
disabled-void-color="#d9dce5"
></el-rate>
</div>
<p class="comment-description" v-text="item.message"></p>
......@@ -158,10 +159,10 @@ export default {
<style>
.comment-right > .commnet-rate .el-rate {
height: 20px;
height: 18px;
}
.comment-right > .commnet-rate .el-rate__icon {
font-size: 20px;
font-size: 18px;
margin-right: 0;
}
</style>
src/components/e-charts/starlist.vue
View file @ 961f3ade
......@@ -4,7 +4,7 @@
<el-rate
v-if="show_star"
class="item-rate"
:colors="['#8890a7', '#8890a7', '#8890a7']"
:colors="['#fac266', '#fac266', '#fac266']"
:value="option.star"
disabled
disabled-void-color="transparent"
......
src/components/order-list/order-list-cell.vue
View file @ 961f3ade
......@@ -209,6 +209,7 @@
:colors="colors"
show-score
score-template="{value}"
disabled-void-color="#d9dce5"
></el-rate>
</div>
<p>填写评价：</p>
......@@ -310,6 +311,7 @@
v-model="message.score"
disabled
:colors="colors"
disabled-void-color="#d9dce5"
></el-rate>
</div>
<div class="msg_title">评价详情：</div>
......@@ -334,7 +336,7 @@ export default {
},
data: () => ({
visible: false,
colors: ["#99A9BF", "#F7BA2A", "#FF9900"],
colors: ["#fac266", "#fac266", "#fac266"],
serviceRate: null,
textarea: "",
showMsgBox: false,
......@@ -436,11 +438,12 @@ export default {
});
},
nextApply() {
console.log(this.cellItem.spec_app)
let query = {};
if (this.cellItem.order_type == 1) {
query = {
service_id: parseFloat(this.cellItem.service_id),
spcs_id: this.cellItem.spcs_id,
spec_id: this.cellItem.svc_spec_id,
duration: this.cellItem.duration,
duration_unit: this.cellItem.duration_unit,
};
......@@ -451,7 +454,7 @@ export default {
} else if (this.cellItem.order_type == 2) {
query = {
app_id: parseFloat(this.cellItem.app_id),
spec_id: this.cellItem.spec_app++,
spec_id: this.cellItem.svc_spec_id,
duration: this.cellItem.duration,
duration_unit: this.cellItem.duration_unit,
};
......@@ -723,7 +726,7 @@ export default {
font-size: 24px;
}
.pop_rate .el-rate__text {
font-size: 20px;
font-size: 18px;
margin-left: 20px;
position: relative;
top: 1px;
......
src/components/service-list/commodity-card-new.vue
View file @ 961f3ade
......@@ -7,7 +7,10 @@
<div class="com_cell_up_right">
<div class="up_title">
<div class="up_tit_name_in">
<span class="up_tit_name" :title="cellData.app_name + ' ( V' + cellData.version + ' )'">
<span
class="up_tit_name"
:title="cellData.app_name + ' ( V' + cellData.version + ' )'"
>
{{ cellData.app_name }} ( V{{ cellData.version }} )
</span>
</div>
......@@ -19,6 +22,8 @@
show-score
text-color="#ea7d19"
score-template="{value}"
:colors="['#fac266', '#fac266', '#fac266']"
disabled-void-color="#d9dce5"
></el-rate>
<p class="get_num">
获取次数：
......@@ -38,14 +43,14 @@
{{ cellData.yyjj }}
</p>
<el-row :gutter="16">
<el-col :span="14" class="com_other">
<el-col :span="14" class="com_other1">
<span class="name_title">应用类型：</span>
{{ cellData.type_name }}
&nbsp;&nbsp;{{ cellData.data_service_type2_name }} &nbsp;&nbsp;{{
cellData.data_service_type3_name
}}
</el-col>
<el-col :span="10" class="com_other">
<el-col :span="10" class="com_other1">
<span class="name_title">业务领域：</span>
{{ cellData.area_name }}
</el-col>
......@@ -197,7 +202,7 @@ export default {
-webkit-line-clamp: 2;
overflow: hidden;
height: 42px;
margin-bottom: 8px;
margin-bottom: 5px;
}
.com_other {
color: #58617a;
......@@ -207,15 +212,19 @@ export default {
-webkit-line-clamp: 1;
overflow: hidden;
}
.com_other1 {
color: #58617a;
margin-bottom: 9px;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
}
.name_title {
color: #8890a7;
}
</style>
<style>
.com_cell .el-rate__item .el-rate__icon {
font-size: 20px;
margin-right: 0;
}
.com_cell .el-rate__text {
margin-left: 4px;
position: relative;
......
src/components/service-list/commodity-cell-new.vue
View file @ 961f3ade
......@@ -29,7 +29,9 @@
disabled
show-score
text-color="#ea7d19"
:colors="['#fac266', '#fac266', '#fac266']"
score-template="{value}"
disabled-void-color="#d9dce5"
></el-rate>
<p class="get_num">
获取次数：
......@@ -49,14 +51,14 @@
{{ cellData.descript }}
</p>
<el-row :gutter="16">
<el-col :span="14" class="com_other">
<el-col :span="14" class="com_other1">
<span class="name_title">服务类型：</span>
{{ cellData.data_service_type1_name }}
&nbsp;&nbsp;{{ cellData.data_service_type2_name }} &nbsp;&nbsp;{{
cellData.data_service_type3_name
}}
</el-col>
<el-col :span="10" class="com_other">
<el-col :span="10" class="com_other1">
<span class="name_title">服务领域：</span>
{{ cellData.sectors_name }}
</el-col>
......@@ -208,7 +210,7 @@ export default {
-webkit-line-clamp: 2;
overflow: hidden;
height: 42px;
margin-bottom: 8px;
margin-bottom: 5px;
}
.com_other {
color: #58617a;
......@@ -218,15 +220,19 @@ export default {
-webkit-line-clamp: 1;
overflow: hidden;
}
.com_other1 {
color: #58617a;
margin-bottom: 9px;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
}
.name_title {
color: #8890a7;
}
</style>
<style>
.com_cell .el-rate__item .el-rate__icon {
font-size: 20px;
margin-right: 0;
}
.com_cell .el-rate__text {
margin-left: 4px;
position: relative;
......
src/components/service-list/commodity-cell-old.vue
View file @ 961f3ade
......@@ -41,6 +41,8 @@
show-score
text-color="#58617a"
score-template="{value}"
:colors="['#fac266', '#fac266', '#fac266']"
disabled-void-color="#d9dce5"
></el-rate>
<div class="com_cell_right_text">
<span class="com_cell_right_time_tit">本月获取次数：</span>
......
src/pages/service_shop/shop_car_apply.vue
View file @ 961f3ade
<template>
<div class="apply_container">
<info-list :list_arr="module_arr">
<apply-form :formInline="formInline" ref="apply_info" slot="apply_info"></apply-form>
<service-list ref="apply_service" slot="apply_service" :service_arr="service_arr"></service-list>
<apply-form
:formInline="formInline"
ref="apply_info"
slot="apply_info"
></apply-form>
<service-list
ref="apply_service"
slot="apply_service"
:service_arr="service_arr"
></service-list>
</info-list>
<div class="footout">
<span class="applybtn" @click="sub_service()">提交申请</span>
<div class="count_money">
<p>
费用总计:&nbsp;&nbsp;&nbsp; <span>{{all_cost}}</span><span>金币</span>
费用总计:&nbsp;&nbsp;&nbsp; <span>{{ all_cost }}</span
><span>金币</span>
</p>
<p>
<span>共{{service_arr.length}}项服务</span><span>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;账户余额: {{now_money}}金币</span>
<span>共{{ service_arr.length }}项服务</span
><span
>|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;账户余额: {{ now_money }}金币</span
>
</p>
</div>
</div>
......@@ -129,17 +141,16 @@ export default {
});
this.get_car_list(temp_arr);
}
this.get_account_money()
this.get_account_money();
},
mounted() {},
methods: {
get_account_money(){
this.$http
.get(`/apaas/backmgt/user/myAccount`).then(res=>{
if(res.data.success){
this.now_money = res.data.data.account_balance || 0
}
})
get_account_money() {
this.$http.get(`/apaas/backmgt/user/myAccount`).then((res) => {
if (res.data.success) {
this.now_money = res.data.data.account_balance || 0;
}
});
},
get_one_app(app_data) {
this.$http
......@@ -160,14 +171,16 @@ export default {
this.service_arr[0]["title"] = data.app_name;
this.service_arr[0]["type"] = data.type_name;
this.service_arr[0]["auth"] = data.org_name;
this.service_arr[0]["size"] ="应用镜像部署权限："+data.price+"金币/月";
this.service_arr[0]["size"] =
"应用镜像部署权限：" + data.price + "金币/月";
this.service_arr[0]["applytype"] =
"申请方式：" + (app_data.duration_unit == 1 ? "月" : "年");
this.service_arr[0]["num"] = `${app_data.duration}个月`;
this.service_arr[0]["count"] = app_data.duration*parseFloat(data.price)+'金币';
this.service_arr[0]["count"] =
app_data.duration * parseFloat(data.price) + "金币";
this.service_arr[0]["isMg"] = false;
this.service_arr[0]["isapp"] = true;
this.all_cost = app_data.duration*parseFloat(data.price)
this.all_cost = app_data.duration * parseFloat(data.price);
}
});
},
......@@ -189,44 +202,48 @@ export default {
);
this.post_arr[0].duration = parseInt(service_data.duration);
this.post_arr[0].id = "";
this.service_arr.push({});
this.service_arr[0]["img"] = data.cover;
this.service_arr[0]["title"] = data.name;
this.service_arr[0]["type"] = data.data_service_type1_name;
this.service_arr[0]["tips"] = [
let objs = {};
objs.img = data.cover;
objs.title = data.name;
objs.type = data.data_service_type1_name;
objs.tips = [
{
tip: this.share_arr[data.openness].name,
type: this.share_arr[data.openness].val,
},
];
this.service_arr[0]["auth"] = data.organization_name;
this.service_arr[0]["size"] = "";
this.service_arr[0]["count"] = "";
objs.auth = data.organization_name;
objs.size = "";
objs.count = "";
data.request_spcs_info.forEach((el) => {
if (service_data.spec_id == el.id) {
let size = "";
let count = "";
if (el.spcs_type==1) {
size = `计次收费：${el.money}金币/${el.spcs_count}次`;
this.service_arr[0]["num"] = "不限时长"
count = el.money;
} else {
size = `${el.money}金币/${el.duration_unit == 1 ? "月" : "年"}`;
this.service_arr[0]["num"] = service_data.duration + (el.duration_unit == 1 ? "个月" : "年");
count = service_data.duration*el.money;
}
this.service_arr[0]["size"] = size;
this.service_arr[0]["count"] = count+'金币';
this.all_cost = count;
let size = "";
let count = "";
if (el.spcs_type == 1) {
size = `计次收费：${el.money}金币/${el.spcs_count}次`;
objs.num = "不限时长";
count = el.money;
} else {
size = `${el.money}金币/${
el.duration_unit == 1 ? "月" : "年"
}`;
objs.num =
service_data.duration +
(el.duration_unit == 1 ? "个月" : "年");
count = service_data.duration * el.money;
}
objs.size = size;
objs.count = count + "金币";
this.all_cost = count;
}
});
this.service_arr[0]["applytype"] =
objs.applytype =
"申请方式：" + (service_data.duration_unit == 1 ? "月" : "年");
this.service_arr[0]["isMg"] = data.openness == 3;
this.service_arr[0]["data"] = JSON.parse(data.res_fields);
console.log(this.service_arr[0]["data"]);
this.service_arr[0]["isapp"] = false;
objs.isMg = data.openness == 3;
objs.data = JSON.parse(data.res_fields);
objs.isapp = false;
this.service_arr = [objs];
console.log(this.service_arr);
} else {
this.$message.error(response.data.errMsg);
}
......@@ -264,9 +281,9 @@ export default {
});
},
sub_service() {
if(this.all_cost>this.now_money){
this.$message.error('余额不足，请进行充值')
return
if (this.all_cost > this.now_money) {
this.$message.error("余额不足，请进行充值");
return;
}
let formInline = this.$refs.apply_info.formInline;
let flag = null;
......@@ -358,7 +375,7 @@ export default {
get_car_list(car_arr) {
this.service_arr = [];
this.post_arr = [];
var temp_cost = 0
var temp_cost = 0;
this.$http
.get(`/apaas/serviceapp/v3/shopcart/list`)
.then((response) => {
......@@ -377,14 +394,21 @@ export default {
this.service_arr[l]["title"] = e.application.app_name;
this.service_arr[l]["type"] = e.application.type_name;
this.service_arr[l]["auth"] = e.application.org_name;
this.service_arr[l]["size"] ="应用镜像部署权限："+e.application.price+"金币/月";
this.service_arr[l]["size"] =
"应用镜像部署权限：" + e.application.price + "金币/月";
this.service_arr[l]["applytype"] =
"申请方式：" + (e.duration_method == 1 ? "月" : "年");
this.service_arr[l]["num"] = `${e.duration}${e.duration_unit == 1 ? "个月" : "年"}`;
this.service_arr[l]["count"] = e.duration*parseFloat(e.application.price)+'金币';
this.service_arr[l]["num"] = `${e.duration}${
e.duration_unit == 1 ? "个月" : "年"
}`;
this.service_arr[l]["count"] =
e.duration * parseFloat(e.application.price) + "金币";
this.service_arr[l]["isMg"] = false;
this.service_arr[l]["isapp"] = true;
temp_cost = this.floatAdd(temp_cost, e.duration*parseFloat(e.application.price))
temp_cost = this.floatAdd(
temp_cost,
e.duration * parseFloat(e.application.price)
);
} else {
//服务
this.service_arr[l]["img"] = e.service.cover;
......@@ -402,20 +426,26 @@ export default {
let spcs_type_1 = e.service.request_spcs_info.spcs_type_1 || [];
let spcs_type_2 = e.service.request_spcs_info.spcs_type_2 || [];
spcs_type_1.forEach((el,ind) => {
spcs_type_1.forEach((el, ind) => {
if (e.spec_id == el.id) {
this.service_arr[l]["size"] = `计次收费：${el.money}金币/${el.spcs_count}次`;
this.service_arr[l][
"size"
] = `计次收费：${el.money}金币/${el.spcs_count}次`;
this.service_arr[l]["num"] = "不限时长";
this.service_arr[l]["count"] = e.duration*el.money+'金币';
temp_cost = this.floatAdd(temp_cost, e.duration*el.money);
this.service_arr[l]["count"] = e.duration * el.money + "金币";
temp_cost = this.floatAdd(temp_cost, e.duration * el.money);
}
});
spcs_type_2.forEach((el,ind) => {
spcs_type_2.forEach((el, ind) => {
if (e.spec_id == el.id) {
this.service_arr[l]["size"] = `时长收费：${el.money}金币/${el.duration_unit == 1 ? "月" : "年"}`;
this.service_arr[l]["num"] = `${e.duration}${el.duration_unit == 1 ? "个月" : "年"}`;
this.service_arr[l]["count"] = e.duration*el.money+'金币';
temp_cost = this.floatAdd(temp_cost, e.duration*el.money);
this.service_arr[l]["size"] = `时长收费：${el.money}金币/${
el.duration_unit == 1 ? "月" : "年"
}`;
this.service_arr[l]["num"] = `${e.duration}${
el.duration_unit == 1 ? "个月" : "年"
}`;
this.service_arr[l]["count"] = e.duration * el.money + "金币";
temp_cost = this.floatAdd(temp_cost, e.duration * el.money);
}
});
......@@ -429,7 +459,7 @@ export default {
this.service_arr[l]["isapp"] = false;
}
});
this.all_cost = temp_cost
this.all_cost = temp_cost;
// this.service_arr =
})
.catch((response) => {});
......@@ -466,7 +496,7 @@ export default {
}
return (arg1 + arg2) / m;
},
}
},
};
</script>
......@@ -498,29 +528,29 @@ export default {
margin-left: 20px;
cursor: pointer;
}
.count_money{
.count_money {
float: right;
margin-top: -10px;
}
.count_money p:nth-of-type(1){
.count_money p:nth-of-type(1) {
font-size: 18px;
color: #242c43;
margin-bottom: 10px;
}
.count_money p:nth-of-type(1) span{
.count_money p:nth-of-type(1) span {
color: #e56600;
}
.count_money p:nth-of-type(1) span:nth-of-type(1){
.count_money p:nth-of-type(1) span:nth-of-type(1) {
font-size: 24px;
}
.count_money p:nth-of-type(1) span:nth-of-type(2){
.count_money p:nth-of-type(1) span:nth-of-type(2) {
font-size: 14px;
}
.count_money p:nth-of-type(2){
.count_money p:nth-of-type(2) {
font-size: 14px;
color: #58617a;
}
.count_money p:nth-of-type(2) span:nth-of-type(2){
.count_money p:nth-of-type(2) span:nth-of-type(2) {
color: #a9aec0;
margin-left: 20px;
}
......
src/pages/user/order/order_detail.vue
View file @ 961f3ade
......@@ -97,6 +97,7 @@
:colors="colors"
show-score
score-template="{value}"
disabled-void-color="#d9dce5"
></el-rate>
</div>
<p>填写评价：</p>
......@@ -188,6 +189,7 @@
v-model="message.score"
disabled
:colors="colors"
disabled-void-color="#d9dce5"
></el-rate>
</div>
<div class="msg_title">评价详情：</div>
......@@ -276,7 +278,7 @@
{{ orderDetail.single_money }}金币/
{{
orderDetail.spcs_type == 1
? orderDetail.spec_count + "次"
? orderDetail.spcs_count + "次"
: "月"
}}
</span>
......@@ -486,7 +488,7 @@ export default {
data: () => ({
helper: helper,
visible: false,
colors: ["#99A9BF", "#F7BA2A", "#FF9900"],
colors: ["#fac266", "#fac266", "#fac266"],
serviceRate: 0,
textarea: "",
orderDetail: {},
......@@ -747,7 +749,7 @@ export default {
if (this.orderDetail.order_type == 1) {
query = {
service_id: parseFloat(this.orderDetail.service_id),
spcs_id: this.orderDetail.spcs_id,
spec_id: this.orderDetail.svc_spec_id,
duration: this.orderDetail.duration,
duration_unit: this.orderDetail.duration_unit,
};
......@@ -759,7 +761,7 @@ export default {
} else if (this.orderDetail.order_type == 2) {
query = {
app_id: parseFloat(this.orderDetail.app_id),
spcs_id: this.orderDetail.spcs_id,
spec_id: this.orderDetail.svc_spec_id,
duration: this.orderDetail.duration,
duration_unit: this.orderDetail.duration_unit,
};
......
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