Skip to content

A
apaas-ui
"src/components/service-list/commodity-cell copy.vue" did not exist on "a02b10e08b11b43053b6219f3a3d5db5a2a59213"
Commit 135c8dff authored by 刘殿昕's avatar 刘殿昕
Browse files
Options

Merge branch 'ldx' into dev

parents 4bb60f56 233de7a5
Hide whitespace changes
Inline Side-by-side
Showing with 262 additions and 178 deletions
src/components/order-list/order-list-cell.vue
View file @ 135c8dff
...@@ -3,7 +3,11 @@ ...@@ -3,7 +3,11 @@
<div class="order_cell_head"> <div class="order_cell_head">
<div class="application_time">申请时间：{{ helper.dateStringTransform(cellItem.add_time) }}</div> <div class="application_time">申请时间：{{ helper.dateStringTransform(cellItem.add_time) }}</div>
<div class="order_number">订单编号：{{ cellItem.order_id }}</div> <div class="order_number">订单编号：{{ cellItem.order_id }}</div>
<div class="cell_del_btn" @click="delOrder(cellItem.order_id)">删除</div> <div
v-if="cellItem.approval_first_level == -1 || cellItem.approval_second_level != 0 || cellItem.pay_status == -1"
class="cell_del_btn"
@click="delOrder(cellItem.order_id)"
>删除</div>
</div> </div>
<el-row class="cell_row"> <el-row class="cell_row">
<el-col :span="10" class="cell_msg"> <el-col :span="10" class="cell_msg">
...@@ -23,7 +27,7 @@ ...@@ -23,7 +27,7 @@
<div class="cell_msg_other"> <div class="cell_msg_other">
<div <div
class="cell_type" class="cell_type"
>{{ cellItem.order_type != 3 ? cellItem.sector : cellItem.namespace }}</div> >{{ cellItem.order_type == 1 ? cellItem.sector : cellItem.order_type == 2 ? cellItem.app_type : cellItem.namespace }}</div>
<div <div
v-if="cellItem.order_type != 3" v-if="cellItem.order_type != 3"
class="cell_creator" class="cell_creator"
...@@ -122,6 +126,11 @@ ...@@ -122,6 +126,11 @@
class="cell_option_spec" class="cell_option_spec"
@click="nextApply" @click="nextApply"
>再次申请</div> >再次申请</div>
<div
v-if="(cellItem.approval_first_level == 0 && cellItem.pay_status != -1) || (cellItem.approval_first_level == 1 && cellItem.approval_second_level == 0 && cellItem.pay_status != -1)"
class="cell_option_spec"
@click="cancelDetail"
>取消申请</div>
</div> </div>
</el-col> </el-col>
<el-collapse-transition> <el-collapse-transition>
...@@ -153,8 +162,8 @@ export default { ...@@ -153,8 +162,8 @@ export default {
default: () => { default: () => {
{ {
} }
} },
} },
}, },
data: () => ({ data: () => ({
visible: false, visible: false,
...@@ -163,14 +172,14 @@ export default { ...@@ -163,14 +172,14 @@ export default {
textarea: "", textarea: "",
showMsgBox: false, showMsgBox: false,
helper: helper, helper: helper,
message: {} message: {},
}), }),
methods: { methods: {
addEvaluation() { addEvaluation() {
if (this.textarea == "" && this.serviceRate == null) { if (this.textarea == "" && this.serviceRate == null) {
this.$message({ this.$message({
message: "请先完善评价内容", message: "请先完善评价内容",
type: "error" type: "error",
}); });
} else { } else {
if (this.cellItem.order_type == 1) { if (this.cellItem.order_type == 1) {
...@@ -178,20 +187,20 @@ export default { ...@@ -178,20 +187,20 @@ export default {
service_id: this.cellItem.service_id, service_id: this.cellItem.service_id,
content: this.textarea, content: this.textarea,
score: this.serviceRate, score: this.serviceRate,
apply_id: this.cellItem.apply_id apply_id: this.cellItem.apply_id,
}; };
this.$api.user.addServiceEvaluation(query).then(response => { this.$api.user.addServiceEvaluation(query).then((response) => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.$message({ this.$message({
message: "评价订单成功", message: "评价订单成功",
type: "success" type: "success",
}); });
this.visible = false; this.visible = false;
this.$emit("updateList"); this.$emit("updateList");
} else { } else {
this.$message({ this.$message({
message: "评价订单失败", message: "评价订单失败",
type: "error" type: "error",
}); });
} }
}); });
...@@ -200,20 +209,20 @@ export default { ...@@ -200,20 +209,20 @@ export default {
app: this.cellItem.app_id, app: this.cellItem.app_id,
content: this.textarea, content: this.textarea,
score: this.serviceRate, score: this.serviceRate,
apply_id: this.cellItem.apply_id apply_id: this.cellItem.apply_id,
}; };
this.$api.user.addServiceEvaluation(query).then(response => { this.$api.user.addServiceEvaluation(query).then((response) => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.$message({ this.$message({
message: "评价订单成功", message: "评价订单成功",
type: "success" type: "success",
}); });
this.visible = false; this.visible = false;
this.$emit("updateList"); this.$emit("updateList");
} else { } else {
this.$message({ this.$message({
message: "评价订单失败", message: "评价订单失败",
type: "error" type: "error",
}); });
} }
}); });
...@@ -224,20 +233,22 @@ export default { ...@@ -224,20 +233,22 @@ export default {
this.$router.push("/user/order_detail/" + val); this.$router.push("/user/order_detail/" + val);
}, },
delOrder() { delOrder() {
this.$api.user.delOrder({ id: this.cellItem.order_id }).then(response => { this.$api.user
if (response.data.success == 1) { .delOrder({ id: this.cellItem.order_id })
this.$message({ .then((response) => {
message: "删除订单成功", if (response.data.success == 1) {
type: "success" this.$message({
}); message: "删除订单成功",
this.$emit("updateList"); type: "success",
} else { });
this.$message({ this.$emit("updateList");
message: "删除订单失败", } else {
type: "error" this.$message({
}); message: "删除订单失败",
} type: "error",
}); });
}
});
}, },
nextApply() { nextApply() {
let query = {}; let query = {};
...@@ -246,26 +257,26 @@ export default { ...@@ -246,26 +257,26 @@ export default {
service_id: parseFloat(this.cellItem.service_id), service_id: parseFloat(this.cellItem.service_id),
spec_id: this.cellItem.svc_spec_id, spec_id: this.cellItem.svc_spec_id,
duration: this.cellItem.duration, duration: this.cellItem.duration,
duration_unit: this.cellItem.duration_unit duration_unit: this.cellItem.duration_unit,
}; };
this.$router.push({ this.$router.push({
path: "/shop/shop_car_apply", path: "/shop/shop_car_apply",
query: query query: query,
}); });
} else if (this.cellItem.order_type == 2) { } else if (this.cellItem.order_type == 2) {
query = { query = {
app_id: parseFloat(this.cellItem.app_id), app_id: parseFloat(this.cellItem.app_id),
spec_id: this.cellItem.spec_app, spec_id: this.cellItem.spec_app,
duration: this.cellItem.duration, duration: this.cellItem.duration,
duration_unit: this.cellItem.duration_unit duration_unit: this.cellItem.duration_unit,
}; };
this.$router.push({ this.$router.push({
path: "/shop/shop_car_apply", path: "/shop/shop_car_apply",
query: query query: query,
}); });
} else if (this.cellItem.order_type == 2) { } else if (this.cellItem.order_type == 2) {
this.$router.push({ this.$router.push({
path: "/shop/shop_cloud" path: "/shop/shop_cloud",
}); });
} }
}, },
...@@ -273,34 +284,52 @@ export default { ...@@ -273,34 +284,52 @@ export default {
if (this.cellItem.order_type == 1) { if (this.cellItem.order_type == 1) {
this.$api.user this.$api.user
.getServiceEvaluation({ apply_id: this.cellItem.apply_id }) .getServiceEvaluation({ apply_id: this.cellItem.apply_id })
.then(response => { .then((response) => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.message = response.data.data; this.message = response.data.data;
this.showMsgBox = true; this.showMsgBox = true;
} else { } else {
this.$message({ this.$message({
message: "获取评价失败", message: "获取评价失败",
type: "error" type: "error",
}); });
} }
}); });
} else if (this.cellItem.order_type == 2) { } else if (this.cellItem.order_type == 2) {
this.$api.user this.$api.user
.getAppEvaluation({ apply_id: this.cellItem.apply_id }) .getAppEvaluation({ apply_id: this.cellItem.apply_id })
.then(response => { .then((response) => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.message = response.data.data; this.message = response.data.data;
this.showMsgBox = true; this.showMsgBox = true;
} else { } else {
this.$message({ this.$message({
message: "获取评价失败", message: "获取评价失败",
type: "error" type: "error",
}); });
} }
}); });
} }
} },
} cancelDetail() {
this.$api.user
.cancelOrder({ order_id: this.cellItem.order_id })
.then((response) => {
if (response.data.success == 1) {
this.$message({
message: "取消订单成功",
type: "success",
});
this.$emit("updateList");
} else {
this.$message({
message: "取消订单失败",
type: "error",
});
}
});
},
},
}; };
</script> </script>
......
src/components/service-list/commodity-card.vue
View file @ 135c8dff
<template> <template>
<div class="com_card"> <div class="com_card">
<div class="com_card_top"> <div class="com_card_top">
<img <img :src="cellData.logo" class="com_card_img" />
:src="cellData.logo"
class="com_card_img"
/>
<div class="com_card_name_v"> <div class="com_card_name_v">
<div class="com_card_msg_name">{{ cellData.app_name }}</div> <div class="com_card_msg_name">{{ cellData.app_name }}</div>
<div class="com_card_msg_version">V{{ cellData.version }}</div> <div class="com_card_msg_version">V{{ cellData.version }}</div>
...@@ -35,10 +32,10 @@ export default { ...@@ -35,10 +32,10 @@ export default {
components: {}, components: {},
props: { props: {
url: { type: String, default: "" }, url: { type: String, default: "" },
cellData: { type: Object, default: {} } cellData: { type: Object, default: {} },
}, },
data: () => ({ data: () => ({
helper: helper helper: helper,
}), }),
computed: {}, computed: {},
watch: {}, watch: {},
...@@ -48,9 +45,40 @@ export default { ...@@ -48,9 +45,40 @@ export default {
this.$router.push(this.url + "/" + parame); this.$router.push(this.url + "/" + parame);
} }
}, },
addShop(id) {} addShop(id) {
let query = {
service_id: 0, // 0表示不是服务
app_id: parseFloat(id),
spec_id: 1,
duration: 1,
duration_method: 1,
is_subscribe: 0, // 是否订阅
};
this.$api.serviceShop
.addShoppingCart()
.then(({ data }) => {
if (data.success == 1) {
this.$message({
message: data.errMsg,
type: "success",
});
this.$store.commit("setMenuCartState");
} else {
this.$message({
message: data.errMsg,
type: "warning",
});
}
})
.catch((error) => {
this.$message({
message: `添加购物车失败`,
type: "warning",
});
});
},
}, },
mounted() {} mounted() {},
}; };
</script> </script>
......
src/components/service-list/service_list.vue
View file @ 135c8dff
...@@ -9,9 +9,11 @@ ...@@ -9,9 +9,11 @@
<div> <div>
<div class="head_flex"> <div class="head_flex">
<el-breadcrumb separator="/" class="bread_crumb1 bread_left"> <el-breadcrumb separator="/" class="bread_crumb1 bread_left">
<el-breadcrumb-item :to="{ path: '/shop' }">{{ <el-breadcrumb-item :to="{ path: '/shop' }">
{{
$t("lang.service_shop") $t("lang.service_shop")
}}</el-breadcrumb-item> }}
</el-breadcrumb-item>
<el-breadcrumb-item>{{ name }}</el-breadcrumb-item> <el-breadcrumb-item>{{ name }}</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
<div class="input_right"> <div class="input_right">
...@@ -26,11 +28,7 @@ ...@@ -26,11 +28,7 @@
<block-radius> <block-radius>
<!-- filter --> <!-- filter -->
<div v-if="urlFilter" class="classification"> <div v-if="urlFilter" class="classification">
<div <div v-for="(item, index) in filterLists" :key="'cd' + index" class="classification_line">
v-for="(item, index) in filterLists"
:key="'cd' + index"
class="classification_line"
>
<div <div
class="classification_line_if" class="classification_line_if"
v-if="item.childDomains && item.childDomains.length != 0" v-if="item.childDomains && item.childDomains.length != 0"
...@@ -60,8 +58,7 @@ ...@@ -60,8 +58,7 @@
? 'classification_act' ? 'classification_act'
: '' : ''
" "
>全部</span >全部</span>
>
</div> </div>
</li> </li>
<li <li
...@@ -83,8 +80,7 @@ ...@@ -83,8 +80,7 @@
? 'classification_act' ? 'classification_act'
: '' : ''
" "
>{{ items.name }}</span >{{ items.name }}</span>
>
<!-- if item have children, we will use an arrow to prompt --> <!-- if item have children, we will use an arrow to prompt -->
<i <i
v-if=" v-if="
...@@ -120,14 +116,8 @@ ...@@ -120,14 +116,8 @@
> >
<span v-if="openList[index] == 'down'">收起</span> <span v-if="openList[index] == 'down'">收起</span>
<span v-if="openList[index] == 'up'">展开</span> <span v-if="openList[index] == 'up'">展开</span>
<i <i v-if="openList[index] == 'down'" class="el-icon-caret-top"></i>
v-if="openList[index] == 'down'" <i v-if="openList[index] == 'up'" class="el-icon-caret-bottom"></i>
class="el-icon-caret-top"
></i>
<i
v-if="openList[index] == 'up'"
class="el-icon-caret-bottom"
></i>
</div> </div>
</div> </div>
<!-- filter children --> <!-- filter children -->
...@@ -155,8 +145,7 @@ ...@@ -155,8 +145,7 @@
? 'classification_act' ? 'classification_act'
: '' : ''
" "
>{{ itemChildren.name }}</span >{{ itemChildren.name }}</span>
>
</div> </div>
</li> </li>
</ul> </ul>
...@@ -181,12 +170,9 @@ ...@@ -181,12 +170,9 @@
size="small" size="small"
:class="index == activeBtn ? 'button_filter_act' : 'button_filter'" :class="index == activeBtn ? 'button_filter_act' : 'button_filter'"
@click="clickButtonFilter(index)" @click="clickButtonFilter(index)"
>{{ item.name }}</el-button >{{ item.name }}</el-button>
>
<div v-if="urlFilter == 'app'" class="btn_right_check"> <div v-if="urlFilter == 'app'" class="btn_right_check">
<el-checkbox v-model="couldTwice" @change="changeTwice" <el-checkbox v-model="couldTwice" @change="changeTwice">支持二次开发</el-checkbox>
>支持二次开发</el-checkbox
>
</div> </div>
</div> </div>
<!-- the list --> <!-- the list -->
...@@ -441,7 +427,9 @@ export default { ...@@ -441,7 +427,9 @@ export default {
let list = this.filterLists; let list = this.filterLists;
for (let i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
if (list[i].childDomains.length != 0) { if (list[i].childDomains.length != 0) {
let offHeight = Math.ceil(document.getElementById(list[i].id).offsetHeight); let offHeight = Math.ceil(
document.getElementById(list[i].id).offsetHeight
);
if (offHeight > 60) { if (offHeight > 60) {
list[i].showOpen = true; list[i].showOpen = true;
this.openList[i] = "up"; this.openList[i] = "up";
...@@ -669,11 +657,26 @@ export default { ...@@ -669,11 +657,26 @@ export default {
.button_filter { .button_filter {
background-color: #e6eefe; background-color: #e6eefe;
color: #626de9; color: #626de9;
font-size: 10px; border: 1px solid #e6eefe;
font-size: 12px;
}
.button_filter:hover {
border: 1px solid rgb(198, 226, 255);
}
.button_filter:focus {
border: 1px solid rgb(58, 142, 230);
} }
.button_filter_act { .button_filter_act {
background-color: #515fe7; background-color: #515fe7;
border: 1px solid #515fe7;
color: #f8f9fd; color: #f8f9fd;
font-size: 12px;
}
.button_filter_act:hover {
border: 1px solid #414fd7;
}
.button_filter_act:focus {
border: 1px solid #313fc7;
} }
.btn_group { .btn_group {
margin-bottom: 15px; margin-bottom: 15px;
......
src/components/service-list/service_shop_menu.vue
View file @ 135c8dff
...@@ -119,7 +119,7 @@ export default { ...@@ -119,7 +119,7 @@ export default {
.service_shop_menu_list > li { .service_shop_menu_list > li {
padding: 16px 10px 8px 22px; padding: 16px 10px 8px 22px;
border-left: 5px solid #0d1847; border-left: 5px solid #0d1847;
font-size: 16px; font-size: 15px;
line-height: 24px; line-height: 24px;
cursor: pointer; cursor: pointer;
} }
......
src/components/service-tabs/service-tabs.vue
View file @ 135c8dff
...@@ -180,4 +180,7 @@ export default { ...@@ -180,4 +180,7 @@ export default {
.service_info_tab .detail-list .el-table__row:nth-child(odd) td { .service_info_tab .detail-list .el-table__row:nth-child(odd) td {
background-color: #fff; background-color: #fff;
} }
.service_info_tab.el-tabs--border-card > .el-tabs__header .el-tabs__item:hover {
color: #e56600;
}
</style> </style>
src/components/shop-card.vue
View file @ 135c8dff
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
</p> </p>
</div> </div>
<div class="shop_card-bottom"> <div class="shop_card-bottom">
<p class="shop_card-text summary text_clip_2" v-if="data.resourceSummary"> <p class="shop_card-text summary text_clip_2" v-if="data.descript">
<span v-text="data.resourceSummary"></span> <span v-text="data.descript"></span>
</p> </p>
<p class="shop_card-text update_time"> <p class="shop_card-text update_time">
<img <img
......
src/pages/user/order/order_detail.vue
View file @ 135c8dff
...@@ -25,7 +25,10 @@ ...@@ -25,7 +25,10 @@
class="detail_head_cell_val text_red" class="detail_head_cell_val text_red"
v-else-if="(orderDetail.approval_first_level == -1 || orderDetail.approval_second_level == -1) && orderDetail.pay_status != -1" v-else-if="(orderDetail.approval_first_level == -1 || orderDetail.approval_second_level == -1) && orderDetail.pay_status != -1"
>审核未通过</p> >审核未通过</p>
<p class="detail_head_cell_val text_blackblue" v-else-if="orderDetail.pay_status == -1">订单已取消</p> <p
class="detail_head_cell_val text_blackblue"
v-else-if="orderDetail.pay_status == -1"
>订单已取消</p>
</div> </div>
<div class="detail_head_cell detail_head_no border_right"> <div class="detail_head_cell detail_head_no border_right">
<p class="detail_head_cell_title">订单编号</p> <p class="detail_head_cell_title">订单编号</p>
...@@ -181,11 +184,11 @@ ...@@ -181,11 +184,11 @@
</div> </div>
<div v-if="orderDetail.order_type == 2"> <div v-if="orderDetail.order_type == 2">
<div class="detail_s_title">应用简介：</div> <div class="detail_s_title">应用简介：</div>
<div class="detail_app_scence">{{ orderDetail.scene }}</div> <div class="detail_app_scence">{{ orderDetail.app_desc }}</div>
</div> </div>
<div v-if="orderDetail.order_type == 2"> <div v-if="orderDetail.order_type == 2">
<div class="detail_s_title">功能简介：</div> <div class="detail_s_title">功能简介：</div>
<div class="detail_app_scence">{{ orderDetail.scene }}</div> <div class="detail_app_scence">{{ orderDetail.app_func }}</div>
</div> </div>
<div v-if="orderDetail.order_type == 1 || orderDetail.order_type == 2"> <div v-if="orderDetail.order_type == 1 || orderDetail.order_type == 2">
<div class="detail_s_title">应用场景：</div> <div class="detail_s_title">应用场景：</div>
...@@ -256,7 +259,7 @@ export default { ...@@ -256,7 +259,7 @@ export default {
BlockRadius, BlockRadius,
ProcessCard, ProcessCard,
TableUm, TableUm,
InfoList InfoList,
}, },
data: () => ({ data: () => ({
helper: helper, helper: helper,
...@@ -275,21 +278,21 @@ export default { ...@@ -275,21 +278,21 @@ export default {
{ {
title: "审批时间：", title: "审批时间：",
type: "time", type: "time",
info: "" info: "",
}, },
{ {
title: "审批单位：", title: "审批单位：",
info: "" info: "",
}, },
{ {
title: "审批人：", title: "审批人：",
info: "" info: "",
}, },
{ {
title: "审批意见：", title: "审批意见：",
info: "" info: "",
} },
] ],
}, },
{ {
title: "二级审批", title: "二级审批",
...@@ -298,21 +301,21 @@ export default { ...@@ -298,21 +301,21 @@ export default {
{ {
title: "审批时间：", title: "审批时间：",
type: "time", type: "time",
info: "" info: "",
}, },
{ {
title: "审批单位：", title: "审批单位：",
info: "" info: "",
}, },
{ {
title: "审批人：", title: "审批人：",
info: "" info: "",
}, },
{ {
title: "审批意见：", title: "审批意见：",
info: "" info: "",
} },
] ],
}, },
{ {
title: "三级审批", title: "三级审批",
...@@ -321,76 +324,76 @@ export default { ...@@ -321,76 +324,76 @@ export default {
{ {
title: "审批时间：", title: "审批时间：",
type: "time", type: "time",
info: "" info: "",
}, },
{ {
title: "审批单位：", title: "审批单位：",
info: "" info: "",
}, },
{ {
title: "审批人：", title: "审批人：",
info: "" info: "",
}, },
{ {
title: "审批意见：", title: "审批意见：",
info: "" info: "",
} },
] ],
} },
], ],
header_arr: [ header_arr: [
{ {
prop: "name", prop: "name",
label: "字段编码", label: "字段编码",
minWidth: "10%", minWidth: "10%",
align: "center" align: "center",
}, },
{ {
prop: "show_type", prop: "show_type",
label: "字段类型", label: "字段类型",
width: "120px", width: "120px",
align: "center" align: "center",
}, },
{ {
prop: "label", prop: "label",
label: "字段名称", label: "字段名称",
minWidth: "20%", minWidth: "20%",
align: "center" align: "center",
}, },
{ {
prop: "descript", prop: "descript",
label: "字段说明", label: "字段说明",
minWidth: "40%", minWidth: "40%",
align: "center" align: "center",
}, },
{ {
prop: "example", prop: "example",
label: "字段示例", label: "字段示例",
minWidth: "20%", minWidth: "20%",
align: "center" align: "center",
} },
], ],
list_arr: [ list_arr: [
{ {
title: "申请人：", title: "申请人：",
info: "" info: "",
}, },
{ {
title: "联系方式：", title: "联系方式：",
info: "" info: "",
}, },
{ {
title: "申请单位：", title: "申请单位：",
info: "" info: "",
}, },
{ {
title: "申请文件：", title: "申请文件：",
info: "", info: "",
url: "", url: "",
type: "down" type: "down",
} },
], ],
data: [] data: [],
}), }),
mounted() { mounted() {
this.getOrderDetail(); this.getOrderDetail();
...@@ -404,7 +407,7 @@ export default { ...@@ -404,7 +407,7 @@ export default {
getOrderDetail() { getOrderDetail() {
this.$api.user this.$api.user
.getOrderDetail({ order_id: this.$route.params.id }) .getOrderDetail({ order_id: this.$route.params.id })
.then(response => { .then((response) => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.orderDetail = response.data.data; this.orderDetail = response.data.data;
if (this.orderDetail.res_fields != "") { if (this.orderDetail.res_fields != "") {
...@@ -421,12 +424,14 @@ export default { ...@@ -421,12 +424,14 @@ export default {
getOrderUser() { getOrderUser() {
this.$api.user this.$api.user
.getOrderUser({ order_id: this.$route.params.id }) .getOrderUser({ order_id: this.$route.params.id })
.then(response => { .then((response) => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.list_arr[0].info = response.data.data.name; this.list_arr[0].info = response.data.data.name;
this.list_arr[1].info = response.data.data.phone_number; this.list_arr[1].info = response.data.data.phone_number;
this.list_arr[2].info = response.data.data.organization; this.list_arr[2].info = response.data.data.organization;
this.list_arr[3].info = response.data.data.apply_file; this.list_arr[3].info = helper.downloadFileFormat(
response.data.data.apply_file
);
this.list_arr[3].url = response.data.data.apply_file; this.list_arr[3].url = response.data.data.apply_file;
} else { } else {
console.log(response.data.errMsg); console.log(response.data.errMsg);
...@@ -437,9 +442,9 @@ export default { ...@@ -437,9 +442,9 @@ export default {
this.$api.user this.$api.user
.getOrderApproval({ .getOrderApproval({
apply_id: this.orderDetail.apply_id, apply_id: this.orderDetail.apply_id,
kind: this.orderDetail.order_type kind: this.orderDetail.order_type,
}) })
.then(response => { .then((response) => {
if (response.data.success == 1) { if (response.data.success == 1) {
let data = response.data.data || []; let data = response.data.data || [];
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
...@@ -462,36 +467,36 @@ export default { ...@@ -462,36 +467,36 @@ export default {
service_id: parseFloat(this.orderDetail.service_id), service_id: parseFloat(this.orderDetail.service_id),
spec_id: this.orderDetail.svc_spec_id, spec_id: this.orderDetail.svc_spec_id,
duration: this.orderDetail.duration, duration: this.orderDetail.duration,
duration_unit: this.orderDetail.duration_unit duration_unit: this.orderDetail.duration_unit,
}; };
} else if (this.orderDetail.order_type == 2) { } else if (this.orderDetail.order_type == 2) {
query = { query = {
app_id: parseFloat(this.orderDetail.app_id), app_id: parseFloat(this.orderDetail.app_id),
spec_id: this.orderDetail.spec_app, spec_id: this.orderDetail.spec_app,
duration: this.orderDetail.duration, duration: this.orderDetail.duration,
duration_unit: this.orderDetail.duration_unit duration_unit: this.orderDetail.duration_unit,
}; };
} }
window.sessionStorage.setItem("shoppingCart", JSON.stringify(query)); window.sessionStorage.setItem("shoppingCart", JSON.stringify(query));
this.$router.push({ this.$router.push({
path: "/shop/shop_car_apply", path: "/shop/shop_car_apply",
query: query query: query,
}); });
}, },
cancelDetail() { cancelDetail() {
this.$api.user this.$api.user
.cancelOrder({ order_id: this.orderDetail.order_id }) .cancelOrder({ order_id: this.orderDetail.order_id })
.then(response => { .then((response) => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.$message({ this.$message({
message: "取消订单成功", message: "取消订单成功",
type: "success" type: "success",
}); });
this.$router.push({ name: "orderList" }); this.$router.push({ name: "orderList" });
} else { } else {
this.$message({ this.$message({
message: "取消订单失败", message: "取消订单失败",
type: "error" type: "error",
}); });
} }
}); });
...@@ -500,34 +505,34 @@ export default { ...@@ -500,34 +505,34 @@ export default {
if (this.orderDetail.order_type == 1) { if (this.orderDetail.order_type == 1) {
this.$api.user this.$api.user
.getServiceEvaluation({ apply_id: this.orderDetail.apply_id }) .getServiceEvaluation({ apply_id: this.orderDetail.apply_id })
.then(response => { .then((response) => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.message = response.data.data; this.message = response.data.data;
this.showMsgBox = true; this.showMsgBox = true;
} else { } else {
this.$message({ this.$message({
message: "获取评价失败", message: "获取评价失败",
type: "error" type: "error",
}); });
} }
}); });
} else if (this.orderDetail.order_type == 2) { } else if (this.orderDetail.order_type == 2) {
this.$api.user this.$api.user
.getAppEvaluation({ apply_id: this.orderDetail.apply_id }) .getAppEvaluation({ apply_id: this.orderDetail.apply_id })
.then(response => { .then((response) => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.message = response.data.data; this.message = response.data.data;
this.showMsgBox = true; this.showMsgBox = true;
} else { } else {
this.$message({ this.$message({
message: "获取评价失败", message: "获取评价失败",
type: "error" type: "error",
}); });
} }
}); });
} }
} },
} },
}; };
</script> </script>
<style scoped> <style scoped>
......
src/pages/workbench/fwgl/cloud-detail.vue
View file @ 135c8dff
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<div class="params_block_item_in"> <div class="params_block_item_in">
<span class="params_block_item_title">数据盘：</span> <span class="params_block_item_title">数据盘：</span>
<div class="params_block_item_val"> <div class="params_block_item_val">
<div>{{ cloudDteail.disk }}</div> <div>{{ cloudDteail.disk != "" ? cloudDteail.disk : "无" }}</div>
</div> </div>
</div> </div>
<!-- <div class="params_block_item_in"> <!-- <div class="params_block_item_in">
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<div class="params_block_item_in"> <div class="params_block_item_in">
<span class="params_block_item_title">数据盘：</span> <span class="params_block_item_title">数据盘：</span>
<div class="params_block_item_val"> <div class="params_block_item_val">
<div>{{ cloudDetailNew.adjust_disk}}</div> <div>{{ cloudDetailNew.adjust_disk != "" ? cloudDetailNew.adjust_disk : "无"}}</div>
</div> </div>
</div> </div>
<!-- <div class="params_block_item_in"> <!-- <div class="params_block_item_in">
...@@ -238,9 +238,7 @@ ...@@ -238,9 +238,7 @@
</div> </div>
</InfoList> </InfoList>
</div> </div>
<div <div class="btn_footer">
class="btn_footer"
>
<el-button <el-button
v-if="now_user == 1 && apploy_msg.first_level == 0" v-if="now_user == 1 && apploy_msg.first_level == 0"
class="submit" class="submit"
...@@ -454,7 +452,7 @@ export default { ...@@ -454,7 +452,7 @@ export default {
apploy_msg: { apploy_msg: {
first_level: null, first_level: null,
second_level: null, second_level: null,
state: null state: null,
}, },
use_uid: "", use_uid: "",
could_delete: false, could_delete: false,
......
src/pages/workbench/fwzc_fwcs.vue
View file @ 135c8dff
<template> <template>
<div class="fwcs"> <div class="fwcs">
<el-breadcrumb separator="/" class="bread_crumb"> <el-breadcrumb v-if="is_map" separator="/" class="bread_crumb">
<el-breadcrumb-item :to="{ path: '/intelligent_drawing' }">在线组件工具</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/intelligent_drawing' }">智能制图</el-breadcrumb-item>
<el-breadcrumb-item>发布信息填写</el-breadcrumb-item>
</el-breadcrumb>
<el-breadcrumb v-else separator="/" class="bread_crumb">
<el-breadcrumb-item :to="{ path: '/fwzc' }">服务注册</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: '/fwzc' }">服务注册</el-breadcrumb-item>
<el-breadcrumb-item v-if="!jcxxtx">服务测试</el-breadcrumb-item> <el-breadcrumb-item v-if="!jcxxtx">服务测试</el-breadcrumb-item>
<el-breadcrumb-item v-else :to="{ path: '/fwzc' }">服务测试</el-breadcrumb-item> <el-breadcrumb-item v-else :to="{ path: '/fwzc' }">服务测试</el-breadcrumb-item>
...@@ -337,8 +342,11 @@ ...@@ -337,8 +342,11 @@
<el-radio :label="3">敏感</el-radio> <el-radio :label="3">敏感</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-if="is_map" class="btn_footer">
<el-form-item class="btn_footer"> <el-button class="previous" @click="goto('/intelligent_drawing')">返回智能制图</el-button>
<el-button class="registe" @click="registe">服务发布</el-button>
</el-form-item>
<el-form-item v-else class="btn_footer">
<el-button class="previous" @click="previous">上一步</el-button> <el-button class="previous" @click="previous">上一步</el-button>
<el-button class="registe" @click="registe">服务注册</el-button> <el-button class="registe" @click="registe">服务注册</el-button>
</el-form-item> </el-form-item>
...@@ -359,7 +367,7 @@ export default { ...@@ -359,7 +367,7 @@ export default {
BlockRadius, BlockRadius,
CesTable, CesTable,
"v-apaas-code": Codes, "v-apaas-code": Codes,
uploadFile uploadFile,
}, },
data() { data() {
return { return {
...@@ -371,7 +379,7 @@ export default { ...@@ -371,7 +379,7 @@ export default {
{ label: "GET", value: "GET" }, { label: "GET", value: "GET" },
{ label: "POST", value: "POST" }, { label: "POST", value: "POST" },
{ label: "PUT", value: "PUT" }, { label: "PUT", value: "PUT" },
{ label: "DELETE", value: "DELETE" } { label: "DELETE", value: "DELETE" },
], ],
optionType1: [{ label: "GET", value: "GET" }], optionType1: [{ label: "GET", value: "GET" }],
activeName: 0, activeName: 0,
...@@ -381,9 +389,9 @@ export default { ...@@ -381,9 +389,9 @@ export default {
label: "请求字段编码", label: "请求字段编码",
prop: "requestEncoding", prop: "requestEncoding",
type: "input", type: "input",
align: "left" align: "left",
}, },
{ label: "请求值", prop: "requestValue", type: "input", align: "left" } { label: "请求值", prop: "requestValue", type: "input", align: "left" },
], ],
sjfwQqcstx: [ sjfwQqcstx: [
{ label: "字段编码", prop: "name", type: "", align: "left" }, { label: "字段编码", prop: "name", type: "", align: "left" },
...@@ -393,13 +401,13 @@ export default { ...@@ -393,13 +401,13 @@ export default {
prop: "show_type", prop: "show_type",
type: "", type: "",
align: "left", align: "left",
width: "140" width: "140",
}, },
{ {
label: "字段名称*", label: "字段名称*",
prop: "label", prop: "label",
type: "input", type: "input",
align: "left" align: "left",
}, },
{ {
label: "是否必须*", label: "是否必须*",
...@@ -409,11 +417,11 @@ export default { ...@@ -409,11 +417,11 @@ export default {
width: 100, width: 100,
selectArr: [ selectArr: [
{ label: "是", value: 1 }, { label: "是", value: 1 },
{ label: "否", value: 0 } { label: "否", value: 0 },
], ],
hasDefault: true hasDefault: true,
}, },
{ label: "字段说明", prop: "descript", type: "input", align: "left" } { label: "字段说明", prop: "descript", type: "input", align: "left" },
], ],
sjfwFhcstx: [ sjfwFhcstx: [
{ label: "字段编码", prop: "name", type: "", align: "left" }, { label: "字段编码", prop: "name", type: "", align: "left" },
...@@ -423,9 +431,9 @@ export default { ...@@ -423,9 +431,9 @@ export default {
label: "字段名称*", label: "字段名称*",
prop: "label", prop: "label",
type: "input", type: "input",
align: "left" align: "left",
}, },
{ label: "字段说明", prop: "descript", type: "input", align: "left" } { label: "字段说明", prop: "descript", type: "input", align: "left" },
], ],
zhfwQqcsForm: [ zhfwQqcsForm: [
{ label: "请求字段编码", prop: "key", type: "input", align: "left" }, { label: "请求字段编码", prop: "key", type: "input", align: "left" },
...@@ -437,15 +445,15 @@ export default { ...@@ -437,15 +445,15 @@ export default {
width: 100, width: 100,
selectArr: [ selectArr: [
{ label: "text", value: "text" }, { label: "text", value: "text" },
{ label: "file", value: "file" } { label: "file", value: "file" },
] ],
}, },
{ {
label: "请求值", label: "请求值",
prop: "val", prop: "val",
type: "upload", type: "upload",
align: "center", align: "center",
uploadKey: "field_type" uploadKey: "field_type",
}, },
{ {
label: "操作", label: "操作",
...@@ -455,10 +463,10 @@ export default { ...@@ -455,10 +463,10 @@ export default {
btnList: [ btnList: [
{ {
type: "primary-del", type: "primary-del",
label: "删除" label: "删除",
} },
] ],
} },
], ],
datasZhForm: [], datasZhForm: [],
datasZhwww: [], datasZhwww: [],
...@@ -476,7 +484,7 @@ export default { ...@@ -476,7 +484,7 @@ export default {
{ label: "模型算法类", value: 22 }, { label: "模型算法类", value: 22 },
{ label: "查询验证类", value: 23 }, { label: "查询验证类", value: 23 },
{ label: "流程类", value: 24 }, { label: "流程类", value: 24 },
{ label: "应用类", value: 34 } { label: "应用类", value: 34 },
], ],
zhyyVal: 22, zhyyVal: 22,
jcxxtx: false, jcxxtx: false,
...@@ -486,12 +494,12 @@ export default { ...@@ -486,12 +494,12 @@ export default {
area: "", area: "",
origin: "", origin: "",
code: "自动生成", code: "自动生成",
resource: 1 resource: 1,
}, },
rules: { rules: {
name: [ name: [
{ required: true, message: "请输入服务名称", trigger: "blur" }, { required: true, message: "请输入服务名称", trigger: "blur" },
{ min: 0, max: 15, message: "服务名称不超过15个字", trigger: "blur" } { min: 0, max: 15, message: "服务名称不超过15个字", trigger: "blur" },
], ],
desc: [ desc: [
{ required: true, message: "请输入服务描述", trigger: "blur" }, { required: true, message: "请输入服务描述", trigger: "blur" },
...@@ -499,16 +507,16 @@ export default { ...@@ -499,16 +507,16 @@ export default {
min: 0, min: 0,
max: 200, max: 200,
message: "服务描述不超过200个字", message: "服务描述不超过200个字",
trigger: "blur" trigger: "blur",
} },
], ],
area: [{ required: true, message: "请选择服务领域", trigger: "blur" }], area: [{ required: true, message: "请选择服务领域", trigger: "blur" }],
origin: [ origin: [
{ required: true, message: "请选择所属组织", trigger: "blur" } { required: true, message: "请选择所属组织", trigger: "blur" },
], ],
resource: [ resource: [
{ required: true, message: "请选择开放程度", trigger: "blur" } { required: true, message: "请选择开放程度", trigger: "blur" },
] ],
}, },
cover: [], cover: [],
optionsArea: [], optionsArea: [],
...@@ -520,7 +528,8 @@ export default { ...@@ -520,7 +528,8 @@ export default {
response_fields: [], response_fields: [],
noSearchUrl: "", noSearchUrl: "",
requestRules: 0, requestRules: 0,
responseRules: 0 responseRules: 0,
is_map: false,
}; };
}, },
computed: {}, computed: {},
...@@ -651,9 +660,9 @@ export default { ...@@ -651,9 +660,9 @@ export default {
? this.skfwQqt ? this.skfwQqt
: this.activeBtn == 4 : this.activeBtn == 4
? this.zhyyVal ? this.zhyyVal
: 0 : 0,
}; };
this.$api.workbench.fwzcFwcs(query).then(response => { this.$api.workbench.fwzcFwcs(query).then((response) => {
if (response.data.success == 1) { if (response.data.success == 1) {
let data = response.data.data; let data = response.data.data;
if (data.body_fields && data.body_fields.length != 0) { if (data.body_fields && data.body_fields.length != 0) {
...@@ -732,9 +741,9 @@ export default { ...@@ -732,9 +741,9 @@ export default {
}, },
getOrganization() { getOrganization() {
let query = { let query = {
id: this.$store.state.userInfo.user_id id: this.$store.state.userInfo.user_id,
}; };
this.$api.user.getUserDetail(query).then(request => { this.$api.user.getUserDetail(query).then((request) => {
if (request.data.success == 1) { if (request.data.success == 1) {
this.form.origin = request.data.data.department; this.form.origin = request.data.data.department;
} else { } else {
...@@ -743,7 +752,7 @@ export default { ...@@ -743,7 +752,7 @@ export default {
}); });
}, },
registe() { registe() {
this.$refs.form.validate(valid => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
if (this.cover.length != 0) { if (this.cover.length != 0) {
let contentType = ""; let contentType = "";
...@@ -775,9 +784,9 @@ export default { ...@@ -775,9 +784,9 @@ export default {
url: this.serviceUrl, url: this.serviceUrl,
request_fields: this.request_fields, request_fields: this.request_fields,
response_fields: this.response_fields, response_fields: this.response_fields,
content_type: contentType content_type: contentType,
}; };
this.$api.workbench.serviceAdd(query).then(response => { this.$api.workbench.serviceAdd(query).then((response) => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.$message.success("服务注册成功"); this.$message.success("服务注册成功");
this.$router.push("/fwgl/" + this.$store.getters.level); this.$router.push("/fwgl/" + this.$store.getters.level);
...@@ -831,7 +840,7 @@ export default { ...@@ -831,7 +840,7 @@ export default {
}, },
changeZhfwQqt() {}, changeZhfwQqt() {},
getArea() { getArea() {
this.$api.workbench.getServiceAreaList().then(response => { this.$api.workbench.getServiceAreaList().then((response) => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.optionsArea = response.data.data; this.optionsArea = response.data.data;
} else { } else {
...@@ -840,7 +849,7 @@ export default { ...@@ -840,7 +849,7 @@ export default {
}); });
}, },
getServiceType1() { getServiceType1() {
this.$api.workbench.getServiceTypeList().then(response => { this.$api.workbench.getServiceTypeList().then((response) => {
if (response.data.success == 1) { if (response.data.success == 1) {
this.btnList = response.data.data; this.btnList = response.data.data;
this.skfwRadios = this.btnList[1].childDomains; this.skfwRadios = this.btnList[1].childDomains;
...@@ -850,12 +859,22 @@ export default { ...@@ -850,12 +859,22 @@ export default {
console.log(response.data.errMsg); console.log(response.data.errMsg);
} }
}); });
} },
judgeMap() {
if (this.$route.query.map && this.$route.query.map != 0) {
this.is_map = true;
this.jcxxtx = true;
}
},
goto(path) {
this.$router.push(path);
},
}, },
mounted() { mounted() {
this.judgeMap();
this.getServiceType1(); this.getServiceType1();
this.getArea(); this.getArea();
} },
}; };
</script> </script>
...@@ -924,7 +943,6 @@ export default { ...@@ -924,7 +943,6 @@ export default {
color: #f8f9fd; color: #f8f9fd;
} }
.btn_footer .previous { .btn_footer .previous {
width: 100px;
background-color: #c3caf8; background-color: #c3caf8;
color: #0f2683; color: #0f2683;
} }
......
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