Skip to content

A
apaas-ui
Commit 742b97d3 authored by 何小勇's avatar 何小勇
Browse files
Options

merge dev

parents cc2234c0 4291dc94
Show whitespace changes
Inline Side-by-side
Showing with 934 additions and 1366 deletions
.beagle.yml
View file @ 742b97d3
......@@ -32,41 +32,23 @@ pipeline:
branch:
- [master,dev]
store-cache:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache:1.0
rebuild: true
mount:
- ./node_modules
volumes:
- /data/cache:/cache
when:
branch:
- dev
## 编译成静态文件
docker-master:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
volumes:
- /var/run/docker.sock:/var/run/docker.sock
base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
version: v3.0
args: "TARGETOS=linux,TARGETARCH=amd64" ## 不同架构的构建参数
registry: registry.cn-qingdao.aliyuncs.com
secrets:
- source: REGISTRY_USER_ALIYUN
target: REGISTRY_USER
- source: REGISTRY_PASSWORD_ALIYUN
target: REGISTRY_PASSWORD
when:
branch:
- master
# store-cache:
# image: registry.cn-qingdao.aliyuncs.com/wod/devops-cache:1.0
# rebuild: true
# mount:
# - ./node_modules
# volumes:
# - /data/cache:/cache
# when:
# branch:
# - dev
## 编译成静态文件
docker:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
volumes:
- /var/run/docker.sock:/var/run/docker.sock
base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0
base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
version: v3.0.3
......@@ -123,7 +105,7 @@ pipeline:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
volumes:
- /var/run/docker.sock:/var/run/docker.sock
base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0-arm64
base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-arm64
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
version: v3.0.3
......@@ -179,7 +161,7 @@ pipeline:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
volumes:
- /var/run/docker.sock:/var/run/docker.sock
base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0-ppc64le
base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-ppc64le
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
version: v3.0.3
......@@ -233,7 +215,7 @@ pipeline:
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0
volumes:
- /var/run/docker.sock:/var/run/docker.sock
base: registry.cn-qingdao.aliyuncs.com/wod-devops/ui-base:2.0-mips64le
base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-mips64le
dockerfile: .beagle/dockerfile
repo: wod/apaas-ui
version: v3.0.3
......
src/components/menu.vue
View file @ 742b97d3
......@@ -127,7 +127,7 @@
@click="settlement"
size="small"
class="shop_settlement"
>去购物车申请结算</el-button>
>去购物车申请</el-button>
</div>
</div>
<div
......@@ -156,6 +156,7 @@
@mouseleave.stop="change_now_hover(-1)"
@mouseenter.stop="change_now_hover(indexs)"
@click.stop="gotoChildPage(v, item.visit_url)"
v-if="v.menu_name != '在线组件工具'"
>
{{ v.menu_name }}
</div>
......@@ -284,6 +285,8 @@ export default {
} else if (parent == "/services_shop") {
this.$store.commit("serviceShopMenuAct", v.visit_url);
this.$router.push(v.visit_url);
} else if (v.visit_url.indexOf("orgId") > 0) {
this.$router.push(v.visit_url + this.userInfo.department_id);
} else if (v.visit_url.indexOf("#") > 0) {
window.open(v.visit_url);
} else {
......@@ -398,7 +401,7 @@ export default {
}
.menu_box {
float: right;
width: 185px;
width: 190px;
font-size: 16px;
height: 58px;
text-align: center;
......
src/components/order-list/order-list-cell.vue
View file @ 742b97d3
......@@ -18,7 +18,7 @@
</div>
</div>
<el-row class="cell_row">
<el-col :span="7" class="cell_msg">
<el-col :span="6" class="cell_msg">
<img
v-if="cellItem.order_type != 3"
:src="cellItem.cover"
......@@ -70,27 +70,7 @@
</div>
</el-col>
<el-col :span="5" class="cell_specification">
<div v-if="cellItem.order_type == 1">
<div>
{{ cellItem.spcs_type == 1 ? "计次收费" : "时长收费" }}：
{{ cellItem.single_money }}金币/
{{ cellItem.spcs_type == 1 ? cellItem.spcs_count + "次" : "月" }}
</div>
</div>
<div v-else-if="cellItem.order_type == 2">
<div>
{{
cellItem.spec_app == 0
? "申请获取应用镜像部署权限：" +
cellItem.single_money +
"金币/月"
: "申请获取应用镜像开发权限：" +
cellItem.single_money +
"金币/月"
}}
</div>
</div>
<div v-else-if="cellItem.order_type == 3">
<div v-if="cellItem.order_type == 3">
<el-tooltip
v-if="cellItem.apply_type == 0"
class="item"
......@@ -138,22 +118,24 @@
{{ cellItem.one_memory_min }}GB；
</div>
</div>
<div v-else>
-
</div>
</el-col>
<el-col :span="3" class="cell_specification">
<el-col :span="5" class="cell_specification">
<div>
{{
<!-- {{
cellItem.duration != 0 && cellItem.duration_unit == 1
? cellItem.duration + "个月"
: cellItem.duration != 0 && cellItem.duration_unit == 2
? cellItem.duration + "年"
: "不限时长"
}}
}} -->
{{cellItem.order_type == 3? cellItem.duration + '个月' : cellItem.request_start_time && cellItem.request_end_time? cellItem.request_start_time + '~' + cellItem.request_end_time : '-'}}
</div>
</el-col>
<el-col :span="3" class="cell_specification">
<div>{{ cellItem.total_money }}金币</div>
</el-col>
<el-col :span="3" class="approval_status">
<el-col :span="5" class="approval_status">
<div>
<div
v-if="
......
src/components/order-list/order-list-list.vue
View file @ 742b97d3
......@@ -2,11 +2,11 @@
<div class="order_list">
<div class="order_th_pad">
<el-row class="order_th">
<el-col :span="7">服务信息</el-col>
<el-col :span="6">服务信息</el-col>
<el-col :span="5">规格</el-col>
<el-col :span="3">购买时长</el-col>
<el-col :span="3">总价</el-col>
<el-col :span="3">申请状态</el-col>
<el-col :span="5">申请使用期限</el-col>
<!-- <el-col :span="3">总价</el-col> -->
<el-col :span="5">订单状态</el-col>
<el-col :span="3">操作</el-col>
</el-row>
</div>
......
src/components/service-box.vue 0 → 100644
View file @ 742b97d3
<template>
<div class="service_info_tab">
<!-- 服务详情信息 -->
<service-tab-detail
class="service_info"
:data="detailData"
></service-tab-detail>
<!-- 服务评价信息 -->
<p class="pj_title">评价信息：</p>
<service-tab-comments
class="service_info"
:data="commentsData"
:url="commentsUrl"
:is_app_detail="is_app_detail"
></service-tab-comments>
</div>
</template>
<script>
import serviceTabDetail from "@/components/service-tabs/service-tab-detail";
import serviceTabComments from "@/components/service-tabs/service-tab-comments";
export default {
components: {
serviceTabDetail,
serviceTabComments,
},
props: {
detailTitle: {
type: String,
default: () => "服务详情信息",
},
specificationTitle: {
type: String,
default: () => "规格说明",
},
providerTitle: {
type: String,
default: () => "服务机构及规格信息",
},
commentsTitle: {
type: String,
default: () => "服务评价信息",
},
detailData: {
type: Array,
},
serviceRequestSpcs: {
type: Object,
},
providerData: {
type: Object,
},
commentsData: {
type: Object,
},
commentsUrl: {
type: String,
},
is_app_detail: {
type: Boolean,
default: false,
},
},
data: () => ({
tabName: "detail",
}),
methods: {},
};
</script>
<style scoped>
.service_info_tab {
border: none;
box-shadow: 0px 4px 8px 0px
rgba(0, 7, 101, 0.04);
border-radius: 8px;
margin-bottom: 30px;
overflow: hidden;
background-color: #fff;
}
.pj_title {
padding: 0 50px;
font-size: 14px;
color: #8890a7;
}
.service_info {
padding: 35px 40px 40px;
box-sizing: border-box;
}
.service_tab-comments {
padding: 35px 20px 20px !important;
}
</style>
<style>
.service_info_tab.el-tabs--border-card > .el-tabs__content {
padding: 0;
}
.service_info_tab.el-tabs--border-card > .el-tabs__header .el-tabs__item {
height: 65px !important;
line-height: 59px !important;
background-color: #fff;
border-top: 4px solid #fff;
border-bottom: 2px solid #f4f7fc;
font-size: 15px;
font-weight: normal;
}
.service_info_tab.el-tabs--border-card
> .el-tabs__header
.el-tabs__item.is-active {
border-top: 4px solid #fff;
border-right: 2px solid #f4f7fc;
border-bottom: 2px solid #fff;
border-left: 2px solid #f4f7fc;
border-radius: 6px 6px 0 0;
color: #e56600 !important;
font-size: 15px;
font-weight: normal;
position: relative;
}
.service_info_tab.el-tabs--border-card
> .el-tabs__header
.el-tabs__item.is-active::before {
content: "";
position: absolute;
width: calc(100% + 3px);
height: 4px;
background-color: #f5ab4c;
border-radius: 4px 4px 0 0;
left: -2px;
top: -3px;
}
.service_info_tab.el-tabs--border-card
> .el-tabs__header
.el-tabs__item:first-child {
border-left: none;
}
.service_info_tab.el-tabs--border-card
> .el-tabs__header
.el-tabs__item:last-child {
border-right: none;
}
.service_info_tab .el-table th > .cell {
color: #1a2236;
}
.service_info_tab .el-table td,
.service_info_tab .el-table th.is-leaf {
border: none !important;
line-height: 23px;
}
.service_info_tab .el-table::before {
display: none;
}
.service_info_tab .el-table {
width: 100%;
text-align: left;
}
.service_info_tab .el-table__row:nth-child(odd) td {
background-color: #f8f9fd;
}
.service_info_tab .detail-list .el-table__header-wrapper {
display: none;
}
.service_info_tab .detail-list .el-table__row td {
color: #58617a;
}
.service_info_tab .detail-list .el-table__row td:first-child {
font-weight: bold;
color: #1a2236;
}
.service_info_tab .detail-list .el-table__row:nth-child(even) td {
background-color: #f8f9fd;
}
.service_info_tab .detail-list .el-table__row:nth-child(odd) td {
background-color: #fff;
}
.service_info_tab.el-tabs--border-card > .el-tabs__header .el-tabs__item:hover {
color: #e56600;
}
</style>
src/components/service-info/app-info.vue
View file @ 742b97d3
......@@ -3,63 +3,78 @@
:borRadius="8"
:paddingNum="32"
class="service_info apaas_button"
v-if="data"
v-if="datas"
>
<div class="main_container">
<div class="main_container-left">
<img :src="data.logo" width="100%" />
<img :src="datas.logo" width="100%" />
</div>
<div class="main_container-right">
<div class="service_title">
<span class="service_name" v-text="data.app_name"></span>
<span class="service_access_info">
<span class="service_name" v-text="datas.app_name"></span>
<div style="margin-right:auto">
<span class="service_access_info1">
<img :src="require('@/assets/imgs/icon_liulan.png')" />
<span v-text="data.view_count + '次浏览'"></span>
<span v-text="datas.view_count + '次浏览'"></span>
</span>
<span class="service_access_info">
<span class="service_access_info1">
<img :src="require('@/assets/imgs/icon_huoqu.png')" />
<span v-text="'本月' + data.apply_times + '次获取'"></span>
<span v-text="'本月' + datas.apply_times + '次获取'"></span>
</span>
</div>
<p class="des_p">{{ data.yyjj }}</p>
<div class="jiage_d">
<div class="dbn_wkdn">
价&nbsp;&nbsp;格：
<span class="ndwa_indowa"> {{ data.price * duration }} </span>
<span class="kfdf_jffa">金币</span>
</div>
<div class="nmd_kwd">
月售：
<span class="ndwa_dn"> {{ data.sale }} 笔 </span>
<img src="@/assets/imgs/shop_ic_star.png" class="dwin_diwa" />
<span class="dn_wjd"> {{ data.star }} </span>
</div>
</div>
<div class="commodity_information">
<span class="guige_title">规&emsp;&emsp;格：</span>
<div class="spec_btn_act">申请获取应用镜像部署权限</div>
</div>
<div class="spec_des">
{{ `申请获取应用镜像部署权限，每月${data.price}金币。` }}
</div>
<div class="commodity_information">
<span class="guige_title">购买时长：</span>
<div class="btn_container">
<el-input-number
v-model="duration"
:min="1"
:disabled="actionDisabled"
></el-input-number
>月
</div>
</div>
<div class="commodity_action">
<span class="service_access_info">
<el-button class="service_now_buy" @click="applyImmediately">
立即申请
</el-button>
</span>
<span class="service_access_info">
<el-button class="service_add_cart" @click="addToCart">
加入购物车
</el-button>
</span>
</div>
<div class="baseInfo_box">
<tr class="flex_3">
<td>部署来源：
<el-tooltip class="item" effect="dark" :content="datas.online_state_name" placement="top-start">
<span>{{datas.online_state_name}}</span>
</el-tooltip>
</td>
<td>业务领域：
<el-tooltip class="item" effect="dark" :content="datas.ywly_name" placement="top-start">
<span>{{datas.ywly_name}}</span>
</el-tooltip>
</td>
<td>应用类型：
<el-tooltip class="item" effect="dark" :content="datas.type_name" placement="top-start">
<span>{{datas.type_name}}</span>
</el-tooltip>
</td>
</tr>
<tr class="flex_3">
<td>提供组织：
<el-tooltip class="item" effect="dark" :content="datas.organization_name" placement="top-start">
<span>{{datas.organization_name}}</span>
</el-tooltip>
</td>
<td>联系人：
<el-tooltip class="item" effect="dark" :content="datas.username" placement="top-start">
<span>{{datas.username}}</span>
</el-tooltip>
</td>
<td>联系方式：
<el-tooltip class="item" effect="dark" :content="datas.phone" placement="top-start">
<span>{{datas.phone}}</span>
</el-tooltip>
</td>
</tr>
<tr class="flex_3">
<td>上线时间：
<el-tooltip class="item" effect="dark" :content="helper.dateStringTransform(datas.create_date)" placement="top-start">
<span>{{helper.dateStringTransform(datas.create_date)}}</span>
</el-tooltip>
</td>
</tr>
</div>
</div>
</div>
......@@ -68,6 +83,7 @@
<script>
import BlockRadius from "@/components/general/block-radius";
import helper from "@/services/helper.js";
export default {
components: {
BlockRadius,
......@@ -79,6 +95,7 @@ export default {
},
},
data: () => ({
helper,
specifications: [
{
name: "1.申请获取应用镜像部署权限",
......@@ -91,18 +108,8 @@ export default {
],
specificationID: 1,
duration: 1,
data: {},
}),
watch: {
datas: {
handler(val) {
this.data = val;
console.log(this.data);
},
deep: true,
immediate: true,
},
},
watch: {},
computed: {
actionDisabled() {
return this.specifications.length == 0;
......@@ -161,7 +168,6 @@ export default {
},
};
</script>
</script>
<style scoped>
.main_container {
......@@ -201,7 +207,7 @@ export default {
font-weight: bold;
color: #0d1847;
line-height: 36px;
margin-right: auto;
margin-right: 36px;
}
.service_title > .service_type {
flex-shrink: 0;
......@@ -222,6 +228,9 @@ export default {
color: #58617a;
margin-left: 20px;
}
.service_access_info1 {
margin-right: 16px;
}
.service_title > .service_access_info > * {
display: inline-block;
vertical-align: middle;
......@@ -230,6 +239,23 @@ export default {
width: 12px;
margin-right: 5px;
}
.baseInfo_box {
width: 100%;
margin-top: 16px;
}
.baseInfo_box .flex_3 {
display: flex;
width: 100%;
height: 32px;
line-height: 32px;
margin-bottom: 16px;
}
.baseInfo_box .flex_3 td {
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.service_base_info {
padding: 18px;
background-color: #f9fafc;
......@@ -359,23 +385,28 @@ export default {
left: -35px;
}
.service_add_cart {
width: 192px;
height: 40px;
width: 104px;
height: 28px;
background-color: #fcefd6;
border-radius: 6px;
border: solid 1px #fac266;
color: #e56600;
font-size: 16px;
font-size: 14px;
border: none;
padding: 0;
text-align: center;
line-height: 28px;
}
.service_now_buy {
width: 192px;
height: 40px;
width: 88px;
height: 28px;
background-color: #e56600;
border: solid 1px #e56600;
border-radius: 6px;
color: #fcefd6;
font-size: 16px;
margin-right: 24px;
font-size: 14px;
padding: 0;
text-align: center;
line-height: 28px;
}
.tags {
display: inline-block;
......
src/components/service-info/service-info.vue
View file @ 742b97d3
......@@ -3,7 +3,7 @@
:borRadius="8"
:paddingNum="32"
class="service_info apaas_button"
v-if="data && showItem"
v-if="data"
>
<div class="main_container">
<div class="main_container-left" v-if="data.cover">
......@@ -38,153 +38,87 @@
</span>
<span v-else class="tags sensitive">敏感</span>
<span class="service_access_info">
<img :src="require('@/assets/imgs/icon_liulan.png')" />
<span v-text="data.view_count + '次浏览'"></span>
</span>
<span class="service_access_info">
<img :src="require('@/assets/imgs/icon_huoqu.png')" />
<span v-text="data.apply_count + '次获取'"></span>
</span>
</div>
<p class="des_p">{{ data.descript }}</p>
<div class="jiage_d">
<div class="dbn_wkdn">
<span class="gnekg_fwf"
><span style="margin-right: 30px">价</span>格：</span
><span class="ndwa_indowa">
{{
specification && specification.money
? specification.money * (showTime ? duration : 1)
: 0
}}
</span>
<span class="kfdf_jffa">金币</span>
</div>
<div class="nmd_kwd">
<span class="bgnerighur"
>月售：<span class="ndwa_dn"
>{{ data.month_sale }} 笔
</span></span
>
<img src="@/assets/imgs/shop_ic_star.png" class="dwin_diwa" />
<span class="dn_wjd">{{ data.scoreDetail.avgScore }}</span>
</div>
</div>
<div class="commodity_information">
<span class="guige_title">计次收费：</span>
<span
v-if="
(data.serviceRequestSpcs.spcs_type_1 &&
data.serviceRequestSpcs.spcs_type_1.length == 0) ||
!data.serviceRequestSpcs.spcs_type_1
"
class="commodity_text"
>暂无</span
>
<div
v-else-if="
data.serviceRequestSpcs.spcs_type_1 &&
data.serviceRequestSpcs.spcs_type_1.length != 0
"
class="btn_container"
>
<div
v-for="(item, index) in data.serviceRequestSpcs.spcs_type_1"
:key="'spcs_' + index"
:class="
item.id === specification.id ? 'spec_btn_act' : 'spec_btn'
"
@click="changeSpecification(item, 0)"
>
{{ item.money }}金币/{{ item.spcs_count }}次
</div>
</div>
</div>
<div class="spec_des">
{{
specification && specification.spcs_type == 1
? specification.descript
: data.serviceRequestSpcs.spcs_type_1 &&
data.serviceRequestSpcs.spcs_type_1.length != 0
? data.serviceRequestSpcs.spcs_type_1[0].descript
: ""
}}
</div>
<div class="commodity_information">
<span class="guige_title">时长收费：</span>
<span
v-if="
(data.serviceRequestSpcs.spcs_type_2 &&
data.serviceRequestSpcs.spcs_type_2.length == 0) ||
!data.serviceRequestSpcs.spcs_type_2
"
class="commodity_text"
>暂无</span
>
<div v-else class="btn_container">
<div
v-for="(item, index) in data.serviceRequestSpcs.spcs_type_2"
:key="'spcs_' + index"
:class="
item.id === specification.id ? 'spec_btn_act' : 'spec_btn'
"
@click="changeSpecification(item, 1)"
>
{{ item.money }}金币/月
</div>
</div>
</div>
<div
class="spec_des"
v-if="
!(
(data.serviceRequestSpcs.spcs_type_2 &&
data.serviceRequestSpcs.spcs_type_2.length == 0) ||
!data.serviceRequestSpcs.spcs_type_2
)
"
>
{{ data.serviceRequestSpcs.spcs_type_2[0].descript || "-" }}
</div>
<!-- <div class="commodity_information">
<span class="guige_title">规格说明：</span>
<span v-if="actionDisabled" class="commodity_text">暂无</span>
<span
v-else
class="commodity_text"
v-text="(specification && specification.descript) || '-'"
></span>
</div> -->
<div class="commodity_information">
<span class="guige_title">购买时长：</span>
<div v-if="showTime" class="btn_container">
<el-input-number
v-model="duration"
:min="1"
:disabled="actionDisabled"
></el-input-number>
月
</div>
<div v-else class="btn_container">
<div class="spec_btn_act">不限时长</div>
</div>
</div>
<div class="commodity_action">
<el-button
class="service_now_buy"
@click="applyImmediately"
:disabled="actionDisabled"
>
立即申请
</el-button>
</span>
<span class="service_access_info">
<el-button
class="service_add_cart"
@click="addToCart"
:disabled="actionDisabled"
>
加入购物车
</el-button>
</span>
</div>
<div class="baseInfo_box">
<tr class="flex_3">
<td>
服务类型：
<el-tooltip class="item" effect="dark" :content="baseInfo.fwlx" placement="top-start">
<span>{{baseInfo.fwlx}}</span>
</el-tooltip>
</td>
<td>
服务领域：
<el-tooltip class="item" effect="dark" :content="baseInfo.fwly" placement="top-start">
<span>{{baseInfo.fwly}}</span>
</el-tooltip>
</td>
<td>
提供组织：
<el-tooltip class="item" effect="dark" :content="baseInfo.tgzz" placement="top-start">
<span>{{baseInfo.tgzz}}</span>
</el-tooltip>
</td>
</tr>
<tr class="flex_3">
<td>
联系人：
<el-tooltip class="item" effect="dark" :content="baseInfo.lxr" placement="top-start">
<span>{{baseInfo.lxr}}</span>
</el-tooltip>
</td>
<td>
联系方式：
<el-tooltip class="item" effect="dark" :content="baseInfo.lxfs" placement="top-start">
<span>{{baseInfo.lxfs}}</span>
</el-tooltip>
</td>
<td>
发布时间：
<el-tooltip class="item" effect="dark" :content="helper.dateStringTransform(baseInfo.fbsj)" placement="top-start">
<span>{{helper.dateStringTransform(baseInfo.fbsj)}}</span>
</el-tooltip>
</td>
</tr>
<tr class="flex_3">
<td>
最近更新时间：
<el-tooltip class="item" effect="dark" :content="helper.dateStringTransform(baseInfo.zjgxsj)" placement="top-start">
<span>{{helper.dateStringTransform(baseInfo.zjgxsj)}}</span>
</el-tooltip>
</td>
<td>
服务描述：
<el-tooltip class="item" effect="dark" :content="baseInfo.fwms" placement="top-start">
<span>{{baseInfo.fwms}}</span>
</el-tooltip>
</td>
<td></td>
</tr>
</div>
</div>
</div>
</BlockRadius>
......@@ -211,27 +145,37 @@ export default {
},
},
data: () => ({
helper,
types: [],
type: 1, // 购买方式 1：按月，2：按年
specification: {}, // 规格
duration: 1, // 时长
showTime: false,
showItem: false,
}),
computed: {
actionDisabled() {
let a = this.data.serviceRequestSpcs;
return (
a &&
a.spcs_type_1 &&
a.spcs_type_1.length == 0 &&
a.spcs_type_2 &&
a.spcs_type_2.length == 0
);
},
baseInfo: {
fwlx: '',
fwly: '',
tgzz: '',
lxr: '',
lxfs: '',
fbsj: '',
zjgxsj: '',
fwms: ''
},
}),
computed: {},
watch: {},
methods: {
getBaseInfo() {
let data = {...this.data}
this.baseInfo.fwlx = data.data_service_type && data.data_service_type.length > 0? data.data_service_type.join(' ') : ''
this.baseInfo.fwly = data.sectors_name
this.baseInfo.tgzz = data.organization_name
this.baseInfo.lxr = data.user_name
this.baseInfo.lxfs = data.phone
this.baseInfo.fbsj = data.create_time
this.baseInfo.zjgxsj = data.update_date
this.baseInfo.fwms = data.descript
},
dateTransform(datestr = "") {
return helper.dateStringTransform(datestr);
},
......@@ -291,63 +235,8 @@ export default {
});
},
},
mounted() {
// 初始化购买方式
if (this.data.serviceRequestSpcs && this.data.serviceRequestSpcs.length) {
if (!this.data.serviceRequestSpcs.spcs_type_1) {
this.data.serviceRequestSpcs.spcs_type_1 = [];
}
if (!this.data.serviceRequestSpcs.spcs_type_2) {
this.data.serviceRequestSpcs.spcs_type_2 = [];
}
let types = Array.from(
new Set(this.data.serviceRequestSpcs.map((item) => item.type))
);
if (types.indexOf(3) > -1) {
this.types = [
{
name: "按月",
value: 1,
},
{
name: "按年",
value: 2,
},
];
} else if (types.indexOf(2) > -1) {
this.types = [
{
name: "按年",
value: 2,
},
];
} else if (types.indexOf(1) > -1) {
this.types = [
{
name: "按月",
value: 1,
},
];
}
this.type = (this.types[0] && this.types[0].value) || 0;
}
// 初始化规格
if (
this.data.serviceRequestSpcs &&
this.data.serviceRequestSpcs.spcs_type_1 &&
this.data.serviceRequestSpcs.spcs_type_1.length > 0
) {
this.specification = this.data.serviceRequestSpcs.spcs_type_1[0];
} else if (
this.data.serviceRequestSpcs &&
this.data.serviceRequestSpcs.spcs_type_2 &&
this.data.serviceRequestSpcs.spcs_type_2.length > 0
) {
this.specification = this.data.serviceRequestSpcs.spcs_type_2[0];
}
this.showItem = true;
created() {
this.getBaseInfo()
},
};
</script>
......@@ -425,6 +314,23 @@ export default {
width: 12px;
margin-right: 5px;
}
.baseInfo_box {
width: 100%;
margin-top: 16px;
}
.baseInfo_box .flex_3 {
display: flex;
width: 100%;
height: 32px;
line-height: 32px;
margin-bottom: 16px;
}
.baseInfo_box .flex_3 td {
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.service_base_info {
padding: 18px;
background-color: #f9fafc;
......@@ -558,23 +464,28 @@ export default {
left: -44px;
}
.service_add_cart {
width: 192px;
height: 40px;
width: 104px;
height: 28px;
background-color: #fcefd6;
border-radius: 6px;
border: solid 1px #fac266;
color: #e56600;
font-size: 16px;
font-size: 14px;
border: none;
padding: 0;
text-align: center;
line-height: 28px;
}
.service_now_buy {
width: 192px;
height: 40px;
width: 88px;
height: 28px;
background-color: #e56600;
border: solid 1px #e56600;
border-radius: 6px;
color: #fcefd6;
font-size: 16px;
margin-right: 14px;
font-size: 14px;
padding: 0;
text-align: center;
line-height: 28px;
}
.tags {
display: inline-block;
......
src/components/shop-car-apply/apply_form.vue
View file @ 742b97d3
......@@ -20,6 +20,21 @@
<p class="formname">联系电话：</p>
<el-input v-model="formInline.phone" placeholder="联系电话"></el-input>
</el-form-item>
<el-form-item prop="date">
<p class="formname">申请使用期限</p>
<el-date-picker
v-model="formInline.date"
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item prop="sqly" class="all_box">
<p class="formname">申请理由</p>
<el-input v-model="formInline.sqly" placeholder="请输入申请理由" type="textarea"></el-input>
</el-form-item>
</el-form>
</div>
</template>
......@@ -57,6 +72,13 @@ export default {
{ required: true, message: "请输入联系电话", trigger: "blur" },
{ validator: check_phone, trigger: "blur" },
],
date: [
{ required: true, message: "请选择使用期限", trigger: "change" },
],
sqly: [
{ required: true, message: "请输入申请理由", trigger: "blur" },
{ max: 240, message: "不能超过240个字符", trigger: "blur" },
],
},
};
},
......@@ -104,7 +126,14 @@ export default {
.formout .el-form-item {
margin-right: 20px;
}
.formout .el-form-item:nth-of-type(2) {
.formout .el-form-item:nth-of-type(even) {
margin-right: 0px;
}
.formout .el-form-item:nth-of-type(5) {
margin-right: 0px;
width: 100%;
}
.formout .all_box /deep/.el-form-item__content {
width: 100%;
}
</style>
src/components/shop-car-apply/apply_service_state.vue
View file @ 742b97d3
......@@ -33,22 +33,23 @@
>{{ item.tip }}</span>
</p>
<p>{{ data.type }}</p>
<p>{{ data.auth }}</p>
<!-- <p>{{ data.auth }}</p> -->
</div>
</div>
<div class="size">
<p>{{data.size}}</p>
<p>{{data.auth}}</p>
</div>
<div class="num">{{ data.num }}</div>
<div class="count">{{ data.count }}</div>
<!-- <div class="num">{{ data.num }}</div>
<div class="count">{{ data.count }}</div> -->
<div class="oprate">
<upload-file
<!-- <upload-file
v-if="data.isMg"
:list="imgList"
:drag="false"
@getNewList="getNewList"
type="default"
></upload-file>
></upload-file> -->
<p>{{helper.dateStringTransform(data.fbsj)}}</p>
</div>
</div>
<p class="inputtitle">应用场景：</p>
......@@ -78,6 +79,7 @@
<script>
import uploadFile from "@/components/general/upload_file";
import tableUm from "@/components/table/table-um";
import helper from "@/services/helper.js";
export default {
props: ["data", "idx"],
components: {
......@@ -86,6 +88,7 @@ export default {
},
data() {
return {
helper,
sceneinput: "",
fileList: "",
imgList: [],
......@@ -120,7 +123,9 @@ export default {
},
watch: {},
computed: {},
created() {},
created() {
console.log(this.data,'------')
},
mounted() {},
methods: {
getNewList(val) {
......@@ -156,7 +161,7 @@ export default {
}
.serviceinfo {
width: 415px;
margin-right: 66px;
margin-right: 16px;
}
.pic {
width: 116px;
......@@ -196,6 +201,8 @@ export default {
line-height: 107px;
border-radius: 8px;
color: #242c43;
text-align: center;
margin-right: 170px;
}
.num {
width: 138px;
......@@ -215,10 +222,11 @@ export default {
text-align: center;
}
.oprate {
width: 150px;
width: 240px;
height: 107px;
padding-top: 34px;
padding-left: 30px;
line-height: 107px;
font-size: 14px;
text-align: center;
}
.inputtitle {
color: rgba(88, 97, 122, 1);
......
src/components/shop-car-apply/service_list.vue
View file @ 742b97d3
......@@ -2,10 +2,8 @@
<div class="out_list">
<p class="list_title">
<span>服务信息</span>
<span>规格</span>
<span>购买时长</span>
<span>小计</span>
<span>操作</span>
<span>提供组织</span>
<span>发布时间</span>
</p>
<apply-service-state ref="apply_service_state" v-for="(item,index) in service_arr" :idx="index" :key="index+5000" :data="item"></apply-service-state>
......@@ -68,15 +66,9 @@ export default {
font-weight: bold;
}
.list_title span:nth-of-type(1){
margin-right: 414px;
margin-right: 454px;
}
.list_title span:nth-of-type(2){
margin-right: 246px;
}
.list_title span:nth-of-type(3){
margin-right: 96px;
}
.list_title span:nth-of-type(4){
margin-right: 124px;
margin-right: 346px;
}
</style>
src/components/shop-cloud/shop-cloud-new.vue
View file @ 742b97d3
......@@ -611,30 +611,8 @@
</block-radius>
<block-radius :borRadius="8" v-if="!(activeName == 1 && !formShow)">
<div class="btn_footer fyzj_item">
<div class="fyzj">
<p class="fyzj_p">
<span v-if="getSumCoin > user_info.account_balance" class="yebz">
余额不足，请联系超级管理员进行充值
</span>
费用总计：<span class="fyzj_span">
{{ getSumCoin }}
</span>
<span class="fyzj_qian">金币</span>
</p>
<p class="ckfymx">
<span @click="dialogFymx = true" class="ckfymx_a">
查看费用明细
</span>
<span class="ckfymx_qian"
>账户余额：{{ user_info.account_balance }} 金币</span
>
</p>
</div>
<el-button
:class="
getSumCoin <= user_info.account_balance ? 'submit' : 'nosubmit'
"
:disabled="getSumCoin > user_info.account_balance"
class="submit"
@click="submitApp"
>
提交申请
......@@ -929,26 +907,6 @@
</el-col>
</el-row>
<div class="fyzj_dia">
<div class="fyzj_dia_init">
<p v-if="activeName == '1'" class="fyzj_2">
升级费用：<span class="fyzj_2_num">{{ amounts_payable }} 金币</span>
</p>
<!-- <p v-if="activeName == '1'" class="fyzj_2">
原规格抵扣费用：<span class="fyzj_2_num">2000 金币</span>
</p> -->
<div class="fyzj_1">
费用总计：
<p>
<span class="fyzj_1_num"> {{ getSumCoin }} </span
><span class="fyzj_1_jb">金币</span>
</p>
</div>
<p class="fyzj_2">
账户余额：<span class="fyzj_2_num"
>{{ user_info.account_balance }} 金币</span
>
</p>
</div>
<div class="clear_xxx"></div>
</div>
<div class="btn_footer acc">
......@@ -1025,394 +983,7 @@ export default {
props: {
name: { type: String, default: "" },
},
computed: {
getSumCoin() {
let sumCM = 0;
let sumDisk = 0;
let a_deductions = 0;
let arrJifei = JSON.parse(JSON.stringify(this.jifeiList));
if (this.activeName == "0") {
a_deductions = this.deductions;
if (this.cpu_memory && this.cpu_memory.length != 0) {
if (this.formNew.cpu == "8") {
if (this.formNew.memory == "16") {
let priceObj = this.cpu_memory.find((item) => {
return item.cpu == 8 && item.memory == 16;
});
this.eci_single_money = Number(priceObj.price);
sumCM += Number(priceObj.price);
} else if (this.formNew.memory == "32") {
let priceObj = this.cpu_memory.find((item) => {
return item.cpu == 8 && item.memory == 32;
});
this.eci_single_money = Number(priceObj.price);
sumCM += Number(priceObj.price);
}
} else if (this.formNew.cpu == "16") {
if (this.formNew.memory == "32") {
let priceObj = this.cpu_memory.find((item) => {
return item.cpu == 16 && item.memory == 32;
});
this.eci_single_money = Number(priceObj.price);
sumCM += Number(priceObj.price);
} else if (this.formNew.memory == "64") {
let priceObj = this.cpu_memory.find((item) => {
return item.cpu == 16 && item.memory == 64;
});
this.eci_single_money = Number(priceObj.price);
sumCM += Number(priceObj.price);
}
}
}
sumCM = sumCM * Number(this.formNew.appDuration);
if (
this.formNew.dataDisk >= 0 &&
this.formNew.perDataDisk >= 0 &&
this.formNew.appDuration >= 0
) {
if (this.hard_disk && this.hard_disk.length != 0) {
this.disk_single_money = Number(this.hard_disk[0].price);
sumDisk += (
Number(this.formNew.dataDisk) *
Number(this.formNew.perDataDisk) *
Number(this.formNew.appDuration) *
Number(this.hard_disk[0].price)
).toFixed(2);
}
arrJifei[2] = {
name: "数据盘",
num: `${this.formNew.dataDisk}个数据盘，每个数据盘${this.formNew.perDataDisk}GB`,
time: `${this.formNew.appDuration}个月`,
sum: `${sumDisk}金币`,
};
} else {
arrJifei.splice(2);
}
arrJifei[0].num = `${this.formNew.cpu >= 1 ? this.formNew.cpu : 0}核+${
this.formNew.memory >= 1 ? this.formNew.memory : 0
}G`;
arrJifei[0].time = `${
this.formNew.appDuration >= 1 ? this.formNew.appDuration : 0
}个月`;
arrJifei[0].sum = `${sumCM}金币`;
arrJifei[1].num = `${
this.formNew.containerGroup >= 1 ? this.formNew.containerGroup : 0
}个`;
arrJifei[1].time = `${
this.formNew.appDuration >= 1 ? this.formNew.appDuration : 0
}个月`;
} else if (this.activeName == "1") {
let nochangeCM = false,
nochangeRQ = false;
let diffDay = helper.getTwoTimesDiff(this.paramsOld.cloud_end_time);
a_deductions = this.deductions;
if (
(this.formOld.cpu == "" && this.formOld.memory == "") ||
(this.formOld.cpu == this.paramsOld.cpu &&
this.formOld.memory == this.paramsOld.memory) ||
(this.formOld.cpu == "" &&
this.formOld.memory == this.paramsOld.memory) ||
(this.formOld.cpu == this.paramsOld.cpu && this.formOld.memory == "")
) {
console.log("noCMchange");
// 没变
nochangeCM = true;
if (this.formOld.appDuration != 0) {
// 续期
let cpu0 = this.paramsOld.cpu;
let memory0 = this.paramsOld.memory;
let priceObj = this.cpu_memory.find((item) => {
return item.cpu == cpu0 && item.memory == memory0;
});
this.eci_single_money = Number(priceObj.price);
sumCM += Number(priceObj.price);
sumCM = sumCM * this.formOld.appDuration;
} else {
// 不续期
sumCM = 0;
}
arrJifei[0].num = `${
this.formOld.cpu && this.formOld.cpu > 0
? this.formOld.cpu
: this.paramsOld.cpu
}核+${
this.formOld.memory && this.formOld.memory > 0
? this.formOld.memory
: this.paramsOld.memory
}G`;
arrJifei[0].time = `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月"
: ""
}`;
arrJifei[0].sum = `${sumCM}金币`;
arrJifei[1].num = `${
this.formOld.containerGroup && this.formOld.containerGroup > 0
? this.formOld.containerGroup
: this.paramsOld.containers
}个`;
arrJifei[1].time = `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月"
: ""
}`;
} else if (
(this.formOld.cpu != "" &&
this.formOld.memory != "" &&
(this.formOld.cpu < this.paramsOld.cpu ||
this.formOld.memory < this.paramsOld.memory)) ||
this.formOld.cpu < this.paramsOld.cpu ||
this.formOld.memory < this.paramsOld.memory
) {
console.log("-CM");
// 减配置
if (this.formOld.appDuration != 0) {
// 续期
let cpu0 = this.formOld.cpu || this.paramsOld.cpu;
let memory0 = this.formOld.memory || this.paramsOld.memory;
let priceObj = this.cpu_memory.find((item) => {
return item.cpu == cpu0 && item.memory == memory0;
});
console.log(priceObj)
this.eci_single_money = Number(priceObj.price);
sumCM += Number(priceObj.price);
sumCM = (
(sumCM * (Number(this.formOld.appDuration) * 30 + diffDay)) /
30
).toFixed(2);
arrJifei[0].num = `${
this.formOld.cpu && this.formOld.cpu > 0
? this.formOld.cpu
: this.paramsOld.cpu
}核+${
this.formOld.memory && this.formOld.memory > 0
? this.formOld.memory
: this.paramsOld.memory
}G`;
arrJifei[0].time = `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月续期+剩余"
: "剩余"
}${diffDay}天`;
arrJifei[0].sum = `${sumCM}金币`;
arrJifei[1].num = `${
this.formOld.containerGroup && this.formOld.containerGroup > 0
? this.formOld.containerGroup
: this.paramsOld.containers
}个`;
arrJifei[1].time = `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月续期+剩余"
: "剩余"
}${diffDay}天`;
} else {
// 不续期
sumCM = 0;
arrJifei[0].num = `${
this.formOld.cpu && this.formOld.cpu > 0
? this.formOld.cpu
: this.paramsOld.cpu
}核+${
this.formOld.memory && this.formOld.memory > 0
? this.formOld.memory
: this.paramsOld.memory
}G`;
arrJifei[0].time = `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月续期+剩余"
: "剩余"
}${diffDay}天`;
arrJifei[0].sum = `${sumCM}金币`;
arrJifei[1].num = `${
this.formOld.containerGroup && this.formOld.containerGroup > 0
? this.formOld.containerGroup
: this.paramsOld.containers
}个`;
arrJifei[1].time = `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月续期+剩余"
: "剩余"
}${diffDay}天`;
}
} else {
// 加配置
console.log("+CM");
if (this.cpu_memory && this.cpu_memory.length != 0) {
console.log(this.formOld.cpu, this.formOld.memory);
let cpu0 = this.formOld.cpu || this.paramsOld.cpu;
let memory0 = this.formOld.memory || this.paramsOld.memory;
let priceObj = this.cpu_memory.find((item) => {
return item.cpu == cpu0 && item.memory == memory0;
});
this.eci_single_money = Number(priceObj.price);
sumCM += Number(priceObj.price);
}
sumCM =
(sumCM * (Number(this.formOld.appDuration) * 30 + diffDay)) / 30;
arrJifei[0].num = `${
this.formOld.cpu && this.formOld.cpu > 0
? this.formOld.cpu
: this.paramsOld.cpu
}核+${
this.formOld.memory && this.formOld.memory > 0
? this.formOld.memory
: this.paramsOld.memory
}G`;
arrJifei[0].time = `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月续期+剩余"
: "剩余"
}${diffDay}天`;
arrJifei[0].sum = `${sumCM}金币`;
arrJifei[1].num = `${
this.formOld.containerGroup && this.formOld.containerGroup > 0
? this.formOld.containerGroup
: this.paramsOld.containers
}个`;
arrJifei[1].time = `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月续期+剩余"
: "剩余"
}${diffDay}天`;
}
let nowHasCap = this.dataDiskList.reduce(
(sum, e) => sum + e.disk_cap,
0
);
if (
this.formOld.dataDisk > 0 &&
this.formOld.perDataDisk > 0
) {
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(
(
((Number(this.formOld.dataDisk) *
Number(this.formOld.perDataDisk) +
nowHasCap) *
Number(Number(this.formOld.appDuration) * 30 + diffDay) *
Number(this.hard_disk[0].price)) /
30
).toFixed(2)
);
}
arrJifei[2] = {
name: "数据盘",
num: `增加${this.formOld.dataDisk}个数据盘，每个数据盘${
this.formOld.perDataDisk
}GB${
nowHasCap == 0 ? "" : ",原有数据盘共计剩余" + nowHasCap + "GB"
}`,
time: `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月续期+剩余"
: "剩余"
}${diffDay}天`,
sum: `${sumDisk}金币`,
};
} else {
console.log("bjd");
// 不加D，续期
if (this.formOld.appDuration != 0) {
console.log("bj,xqd");
if (this.delDataDiskList.length != 0) {
console.log("bj,xq,scd");
if (this.hard_disk && this.hard_disk.length != 0) {
this.disk_single_money = Number(this.hard_disk[0].price);
sumDisk += Number(
(
(nowHasCap *
Number(Number(this.formOld.appDuration) * 30 + diffDay) *
Number(this.hard_disk[0].price)) /
30
).toFixed(2)
);
}
arrJifei[2] = {
name: "数据盘",
num: `原有数据盘共计剩余${nowHasCap}GB`,
time: `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月续期+剩余"
: "剩余"
}${diffDay}天`,
sum: `${sumDisk}金币`,
};
} else {
console.log("bj,xq,bscd");
// not Del
if (this.hard_disk && this.hard_disk.length != 0) {
this.disk_single_money = Number(this.hard_disk[0].price);
sumDisk += Number(
(
nowHasCap *
Number(this.formOld.appDuration) *
Number(this.hard_disk[0].price)
).toFixed(2)
);
}
arrJifei[2] = {
name: "数据盘",
num: `原有数据盘共计${nowHasCap}GB`,
time: `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月"
: ""
}`,
sum: `${sumDisk}金币`,
};
}
} else {
// 不加D，不续期
if (this.delDataDiskList.length != 0) {
console.log("bj,bxq,scd");
if (this.hard_disk && this.hard_disk.length != 0) {
this.disk_single_money = Number(this.hard_disk[0].price);
sumDisk += Number(
(
(nowHasCap * diffDay * Number(this.hard_disk[0].price)) /
30
).toFixed(2)
);
}
arrJifei[2] = {
name: "数据盘",
num: `原有数据盘共计剩余${nowHasCap}GB`,
time: `剩余${diffDay}天`,
sum: `${sumDisk}金币`,
};
} else {
console.log("bj,bxq,bscd");
sumDisk = 0;
arrJifei.splice(2);
}
}
}
if (
!this.formOld.containerGroup ||
this.formOld.containerGroup == "" ||
this.formOld.containerGroup == this.paramsOld.containers
) {
nochangeRQ = true;
}
if (nochangeRQ && this.formOld.appDuration == 0) {
arrJifei.splice(1, 1);
}
if (nochangeCM && this.formOld.appDuration == 0) {
arrJifei.splice(0, 1);
}
}
this.jifeiList1 = arrJifei;
console.log(sumCM, sumDisk);
this.amounts_payable = Number(
(Number(sumCM) + Number(sumDisk)).toFixed(2)
);
// this.total_money = sumCM + sumDisk - a_deductions;
return this.amounts_payable;
},
},
computed: {},
watch: {
formNew: {
handler() {
......
src/components/shopping-cart/shopping-cart-cell.vue
View file @ 742b97d3
......@@ -11,7 +11,7 @@
<span>已下架</span>
</div>
</el-col>
<el-col :span="8">
<el-col :span="10">
<div class="shopping_cell_item">
<img
:src="
......@@ -63,156 +63,25 @@
<div v-else class="shopping_cell_type">
{{ cellItems.application.ywly_name }}
</div>
<div class="shopping_cell_creator">
<!-- <div class="shopping_cell_creator">
{{
cellIsService
? cellItems.service.organization_name
: cellItems.application.org_name
}}
</div>
</div> -->
</div>
</div>
</div>
</el-col>
<el-col :span="5">
<div
v-if="
cellItems.service_id != 0 &&
cellItems.service.request_spcs_info.spcs_type_1 &&
cellItems.service.request_spcs_info.spcs_type_1.length != 0
"
class="shopping_cell_specification"
>
<div class="shopping_cell_specification_val">
<div class="shopping_cell_specification_val_specification">
<el-col :span="8" class="shopping_cell_num">
{{
cellItems.service.spcs_info.spcs_type == 1
? "计次收费"
: "时长收费"
}}：{{ cellItems.service.spcs_info.money }}金币/{{
cellItems.service.spcs_info.spcs_type == 1
? cellItems.service.spcs_info.spcs_count + "次"
: "月"
cellIsService
? cellItems.service.organization_name
: cellItems.application.org_name
}}
</div>
<div class="shopping_cell_specification_edit">
<el-popover
placement="right-start"
width="300"
v-model="visible"
@show="setSpecificationPop"
>
<div>
<div v-if="cellIsService">
<div class="shopping_cell_specification_title">规格：</div>
<div
v-if="
cellItems.service.request_spcs_info &&
cellItems.service.request_spcs_info.spcs_type_1 &&
cellItems.service.request_spcs_info.spcs_type_1
.length != 0
"
>
<el-button
v-for="(item, index) in cellItems.service
.request_spcs_info.spcs_type_1"
:key="'specification' + index"
:class="
specificationPop.id == item.id
? 'shopping_cell_specification_btn active'
: 'shopping_cell_specification_btn'
"
size="mini"
@click="changeSpecification(item)"
>
{{ item.money }}金币/{{ item.spcs_count }}次
</el-button>
<el-button
v-if="
cellItems.service.request_spcs_info.spcs_type_2 &&
cellItems.service.request_spcs_info.spcs_type_2
.length != 0
"
:class="
specificationPop.spcs_type == 2
? 'shopping_cell_specification_btn active'
: 'shopping_cell_specification_btn'
"
size="mini"
@click="
changeSpecification(
cellItems.service.request_spcs_info.spcs_type_2[0]
)
"
>{{
cellItems.service.request_spcs_info.spcs_type_2[0]
.money
}}金币/月</el-button
>
</div>
<div class="no_option" v-else>暂无规格</div>
</div>
</div>
<div class="pop_footer">
<el-button
class="shopping_cell_specification_cancel"
size="mini"
type="text"
@click="visible = false"
>
取消
</el-button>
<el-button
class="shopping_cell_specification_submit"
size="mini"
@click="submitPop"
>
确定
</el-button>
</div>
<el-button v-if="!readOnly" circle size="mini" slot="reference">
<img :src="specificationEdit" />
</el-button>
</el-popover>
</div>
</div>
</div>
<div v-else-if="cellItems.app_id != 0" class="shopping_cell_num">
{{ cellItems.application.price }}金币/月
</div>
<div v-else class="shopping_cell_num">
{{
cellItems.service.request_spcs_info.spcs_type_2 &&
cellItems.service.request_spcs_info.spcs_type_2.length != 0
? cellItems.service.request_spcs_info.spcs_type_2[0].money
: 0
}}金币/月
</div>
</el-col>
<el-col :span="3" class="shopping_cell_num">
<div v-if="cellIsService && cellItems.service.spcs_info.spcs_type == 1">
不限时长
</div>
<div v-else>
<el-input-number
:disabled="readOnly"
v-model="cellItems.duration"
@change="changeNum"
size="mini"
:min="1"
></el-input-number>
</div>
</el-col>
<el-col :span="3" class="shopping_cell_num">
{{
cellItems.service_id != 0
? (cellItems.service.spcs_info.money * cellItems.duration).toFixed(
2
)
: (cellItems.application.price * cellItems.duration).toFixed(2)
}}金币
</el-col>
<el-col :span="3" class="shopping_cell_options">
<el-col :span="4" class="shopping_cell_options">
<el-checkbox
v-if="!readOnly"
v-model="cellItems.is_subscribe"
......@@ -304,22 +173,23 @@ export default {
mounted() {},
methods: {
getState(val) {
if (
this.cellItems.service_id != 0 &&
!this.cellItems.service.spcs_info.id
) {
this.$message({
message:
(this.cellItems.service_id == 0
? this.cellItems.application.app_name
: this.cellItems.service.name) + "暂不支持购买",
type: "error",
});
this.checkedItem = false;
this.$emit("changeState", { state: false, index: this.cellIndex });
} else {
// if (
// this.cellItems.service_id != 0 &&
// !this.cellItems.service.spcs_info.id
// ) {
// this.$message({
// message:
// (this.cellItems.service_id == 0
// ? this.cellItems.application.app_name
// : this.cellItems.service.name) + "暂不支持购买",
// type: "error",
// });
// this.checkedItem = false;
// this.$emit("changeState", { state: false, index: this.cellIndex });
// } else {
// this.$emit("changeState", { state: val, index: this.cellIndex });
// }
this.$emit("changeState", { state: val, index: this.cellIndex });
}
},
changeSpecification(val) {
this.specificationPop = val;
......@@ -503,7 +373,7 @@ export default {
margin-top: 10px;
}
.shopping_cell_num {
text-align: center;
text-align: left;
padding-top: 32px;
}
.shopping_cell_options {
......@@ -560,19 +430,6 @@ export default {
width: 28px;
height: 28px;
}
.shopping_cell_num .el-input-number--mini {
width: 100px;
}
.shopping_cell_num .el-input-number__decrease {
border-radius: 8px 0 0 8px;
color: #8390ee;
font-size: 16px;
}
.shopping_cell_num .el-input-number__increase {
border-radius: 0 8px 8px 0;
color: #8390ee;
font-size: 16px;
}
.shopping_cell_options .el-button {
border: 0;
font-size: 14px;
......
src/components/shopping-cart/shopping-cart-com.vue
View file @ 742b97d3
......@@ -8,11 +8,11 @@
>全选</el-checkbox
>
</el-col>
<el-col :span="8" class="shopping_all_head_item">服务信息</el-col>
<el-col :span="5" class="shopping_all_head_item">规格</el-col>
<el-col :span="3" class="shopping_all_head_item">购买时长</el-col>
<el-col :span="3" class="shopping_all_head_item">小计</el-col>
<el-col :span="3" class="shopping_all_head_item">操作</el-col>
<el-col :span="10" class="shopping_all_head_item text_left">服务信息</el-col>
<el-col :span="8" class="shopping_all_head_item text_left">提供组织</el-col>
<!-- <el-col :span="3" class="shopping_all_head_item">购买时长</el-col>
<el-col :span="3" class="shopping_all_head_item">小计</el-col> -->
<el-col :span="4" class="shopping_all_head_item">操作</el-col>
</el-row>
</div>
<ShoppingCartList
......@@ -58,26 +58,10 @@
>
</el-col>
<el-col :span="15" class="shopping_cart_options_num">
<div class="fyzj">
<p class="fyzj_p">
<span v-if="getSumCoin > user_info.account_balance" class="yebz">
余额不足，请联系超级管理员进行充值
</span>
费用总计：<span class="fyzj_span">
{{ getSumCoin }}
</span>
<span class="fyzj_qian">金币</span>
</p>
<div class="ckfymx">
<p class="ckfymx_a">
共 {{ list.length }} 项服务，已选择
<span class="dwa_djf">{{ getNum }}</span> 项
<span class="ckfymx_qian"
>账户余额：{{ user_info.account_balance }} 金币</span
>
</p>
</div>
</div>
</el-col>
<el-col :span="4" class="shopping_cart_options_cell">
<el-button
......@@ -286,6 +270,8 @@ export default {
font-size: 14px;
font-weight: 500;
color: #58617a;
/* height: 100%; */
line-height: 80px;
}
.dwa_djf {
color: #e56600;
......@@ -310,37 +296,13 @@ export default {
.shopping_all_head_item {
text-align: center;
}
.text_left {
text-align: left;
padding-left: 12px;
}
.shopping_list_page {
padding: 10px 20px 0;
}
.fyzj_item {
position: relative;
}
.fyzj {
color: #242c43;
font-size: 18px;
margin-right: 10px;
text-align: right;
position: relative;
top: 8px;
line-height: 26px;
}
.fyzj_p {
margin-bottom: 6px;
}
.fyzj_span {
color: #e56600;
font-size: 24px;
font-weight: bold;
}
.fyzj_qian {
color: #e56600;
font-size: 14px;
}
.ckfymx {
color: #58617a;
font-size: 14px;
}
.ckfymx_a {
color: #58617a;
}
......
src/pages/authority/user/users.vue
View file @ 742b97d3
......@@ -72,15 +72,7 @@
分配角色
</a>
<span class="interval_line">|</span>
<a
:class="{btn:true,disabled:![3,4].includes(scope.row.is_admin)}"
@click="
goto_give_money(scope.row.user_id,scope.row.is_admin)
"
>
充值
</a>
<span class="interval_line">|</span>
<a
class="btn"
:class="{ warn: scope.row.state === 1 }"
......
src/pages/service_shop/cpDetail.vue
View file @ 742b97d3
......@@ -12,27 +12,28 @@
<service-info :data="baseInfo" v-if="baseInfo"></service-info>
<service-tabs
<service-box
:detail-data="detailData"
:provider-data="providerData"
:comments-data="commentsData"
:comments-url="commentsUrl"
></service-tabs>
></service-box>
</div>
</template>
<script>
import serviceInfo from "@/components/service-info/service-info";
import serviceTabs from "@/components/service-tabs/service-tabs";
import serviceBox from "@/components/service-box"
export default {
components: {
serviceInfo,
serviceTabs,
serviceBox,
},
data: () => ({
baseInfo: null,
detailData: null,
detailData: [],
providerData: null,
commentsData: null,
}),
......@@ -80,6 +81,8 @@ export default {
scoreDetail: datas.scoreDetail,
month_sale: datas.month_sale,
version: datas.version,
user_name: datas.register_user_info.user_name,
phone: datas.register_user_info.phone,
};
this.detailData = [
......@@ -88,17 +91,17 @@ export default {
type: "step_cp",
value: ["产品申请", "信息填写", "审核确认", "获取资源"],
},
{
name: "产品信息",
type: "cp-list",
value: {
cp_area: datas.sectors_name,
fb_time: datas.update_date,
org: datas.system_name,
org_url: datas.domain_name,
tags: datas.tags,
},
},
// {
// name: "产品信息",
// type: "cp-list",
// value: {
// cp_area: datas.sectors_name,
// fb_time: datas.update_date,
// org: datas.system_name,
// org_url: datas.domain_name,
// tags: datas.tags,
// },
// },
{
name: "产品详情",
type: "rich-text",
......
src/pages/service_shop/gzfwDetail.vue
View file @ 742b97d3
......@@ -12,27 +12,28 @@
<service-info :data="baseInfo" v-if="baseInfo"></service-info>
<service-tabs
<service-box
:detail-data="detailData"
:provider-data="providerData"
:comments-data="commentsData"
:comments-url="commentsUrl"
></service-tabs>
></service-box>
</div>
</template>
<script>
import serviceInfo from "@/components/service-info/service-info";
import serviceTabs from "@/components/service-tabs/service-tabs";
import serviceBox from "@/components/service-box"
export default {
components: {
serviceInfo,
serviceTabs,
serviceBox,
},
data: () => ({
baseInfo: null,
detailData: null,
detailData: [],
providerData: null,
commentsData: null,
}),
......@@ -76,6 +77,8 @@ export default {
serviceRequestSpcs: datas.serviceRequestSpcs || {spcs_type_1: [],spcs_type_2: []},
scoreDetail: datas.scoreDetail,
month_sale: datas.month_sale,
user_name: datas.register_user_info.user_name,
phone: datas.register_user_info.phone,
};
this.detailData = [
......@@ -84,21 +87,21 @@ export default {
type: "step",
value: ["服务申请", "信息填写", "审核确认", "服务获取"],
},
{
name: "服务信息",
type: "table-list",
value: {
data_service_type1_name: datas.data_service_type1_name,
data_service_type2_name: datas.data_service_type2_name,
sectors_name: datas.sectors_name,
create_time: datas.create_time,
update_date: datas.update_date,
req_type: ["-", "GET", "POST", "PUT", "DELETE"][
datas.req_type || 0
],
encode_method: datas.encode_method,
},
},
// {
// name: "服务信息",
// type: "table-list",
// value: {
// data_service_type1_name: datas.data_service_type1_name,
// data_service_type2_name: datas.data_service_type2_name,
// sectors_name: datas.sectors_name,
// create_time: datas.create_time,
// update_date: datas.update_date,
// req_type: ["-", "GET", "POST", "PUT", "DELETE"][
// datas.req_type || 0
// ],
// encode_method: datas.encode_method,
// },
// },
// {
// name: "请求方式",
// type: "text",
......
src/pages/service_shop/shop_car_apply.vue
View file @ 742b97d3
......@@ -19,11 +19,12 @@
@click="sub_service()"
>提交申请</span>
<div class="count_money">
<p>
<!-- <p>
费用总计:&nbsp;&nbsp;&nbsp; <span>{{ all_cost }}</span><span>金币</span>
</p>
</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>
......@@ -46,7 +47,9 @@ export default {
formInline: {
depart: "",
preson: "",
phone: ""
phone: "",
date:[],
sqly: '',
},
all_cost: 0,
now_money: 0,
......@@ -180,6 +183,7 @@ export default {
this.service_arr[0]["isapp"] = true;
console.log(data, this.service_arr);
this.all_cost = app_data.duration * parseFloat(data.price);
this.service_arr[0]["fbsj"] = data.create_date;
}
});
},
......@@ -205,6 +209,7 @@ export default {
objs.img = data.cover;
objs.title = data.name;
objs.type = data.data_service_type1_name;
objs.fbsj = data.create_time;
objs.tips = [
{
tip: this.share_arr[data.openness].name,
......@@ -278,10 +283,10 @@ export default {
});
},
sub_service() {
if (parseFloat(this.all_cost) > parseFloat(this.now_money)) {
this.$message.error("余额不足，请进行充值");
return;
}
// if (parseFloat(this.all_cost) > parseFloat(this.now_money)) {
// this.$message.error("余额不足，请进行充值");
// return;
// }
let formInline = this.$refs.apply_info.formInline;
let flag = null;
this.$refs.apply_info.$refs.ruleForm.validate(valid => {
......@@ -292,10 +297,15 @@ export default {
this.$message.error("输入正确号码");
return;
}
let request_start_time = formInline.date[0] || ''
let request_end_time = formInline.date[1] || ''
var temp = {
apply_part: {
o_name: formInline.preson,
o_mobile: formInline.phone
o_mobile: formInline.phone,
request_start_time: request_start_time,
request_end_time: request_end_time,
reason_application: formInline.sqly
},
carts: []
};
......@@ -347,7 +357,6 @@ export default {
}
}
}
this.$http
.post(`/apaas/serviceapp/v3/shopcart/apply`, temp)
.then(response => {
......@@ -519,28 +528,12 @@ export default {
}
.count_money {
float: right;
margin-top: -10px;
}
.count_money p:nth-of-type(1) {
font-size: 18px;
color: #242c43;
margin-bottom: 10px;
}
.count_money p:nth-of-type(1) span {
color: #e56600;
}
.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) {
font-size: 14px;
/* margin-top: -10px; */
height: 44px;
line-height: 44px;
}
.count_money p:nth-of-type(2) {
.count_money p {
font-size: 14px;
color: #58617a;
}
.count_money p:nth-of-type(2) span:nth-of-type(2) {
color: #a9aec0;
margin-left: 20px;
}
</style>
src/pages/service_shop/sjfwDetail.vue
View file @ 742b97d3
......@@ -12,27 +12,28 @@
<service-info :data="baseInfo" v-if="baseInfo"></service-info>
<service-tabs
<service-box
:detail-data="detailData"
:provider-data="providerData"
:comments-data="commentsData"
:comments-url="commentsUrl"
></service-tabs>
></service-box>
</div>
</template>
<script>
import serviceInfo from "@/components/service-info/service-info";
import serviceTabs from "@/components/service-tabs/service-tabs";
import serviceBox from "@/components/service-box"
export default {
components: {
serviceInfo,
serviceTabs,
serviceBox,
},
data: () => ({
baseInfo: null,
detailData: null,
detailData: [],
providerData: null,
commentsData: null,
}),
......@@ -76,6 +77,8 @@ export default {
serviceRequestSpcs: datas.serviceRequestSpcs || {spcs_type_1: [],spcs_type_2: []},
scoreDetail: datas.scoreDetail,
month_sale: datas.month_sale,
user_name: datas.register_user_info.user_name,
phone: datas.register_user_info.phone,
};
this.detailData = [
......@@ -84,21 +87,21 @@ export default {
type: "step",
value: ["服务申请", "信息填写", "审核确认", "服务获取"],
},
{
name: "服务信息",
type: "table-list",
value: {
data_service_type1_name: datas.data_service_type1_name,
data_service_type2_name: datas.data_service_type2_name,
sectors_name: datas.sectors_name,
create_time: datas.create_time,
update_date: datas.update_date,
req_type: ["-", "GET", "POST", "PUT", "DELETE"][
datas.req_type || 0
],
encode_method: datas.encode_method,
},
},
// {
// name: "服务信息",
// type: "table-list",
// value: {
// data_service_type1_name: datas.data_service_type1_name,
// data_service_type2_name: datas.data_service_type2_name,
// sectors_name: datas.sectors_name,
// create_time: datas.create_time,
// update_date: datas.update_date,
// req_type: ["-", "GET", "POST", "PUT", "DELETE"][
// datas.req_type || 0
// ],
// encode_method: datas.encode_method,
// },
// },
// {
// name: "请求方式",
// type: "text",
......
src/pages/service_shop/skfwDetail.vue
View file @ 742b97d3
......@@ -12,27 +12,28 @@
<service-info :data="baseInfo" v-if="baseInfo"></service-info>
<service-tabs
<service-box
:detail-data="detailData"
:provider-data="providerData"
:comments-data="commentsData"
:comments-url="commentsUrl"
></service-tabs>
></service-box>
</div>
</template>
<script>
import serviceInfo from "@/components/service-info/service-info";
import serviceTabs from "@/components/service-tabs/service-tabs";
import serviceBox from "@/components/service-box"
export default {
components: {
serviceInfo,
serviceTabs,
serviceBox,
},
data: () => ({
baseInfo: null,
detailData: null,
detailData: [],
providerData: null,
commentsData: null,
}),
......@@ -83,6 +84,8 @@ export default {
scoreDetail: datas.scoreDetail,
month_sale: datas.month_sale,
serviceRequestSpcs: datas.serviceRequestSpcs || {spcs_type_1: [],spcs_type_2: []},
user_name: datas.register_user_info.user_name,
phone: datas.register_user_info.phone,
};
this.detailData = [
......@@ -91,21 +94,21 @@ export default {
type: "step",
value: ["服务申请", "信息填写", "审核确认", "服务获取"],
},
{
name: "服务信息",
type: "table-list",
value: {
data_service_type1_name: datas.data_service_type1_name,
data_service_type2_name: datas.data_service_type2_name,
sectors_name: datas.sectors_name,
create_time: datas.create_time,
update_date: datas.update_date,
req_type: ["-", "GET", "POST", "PUT", "DELETE"][
datas.req_type || 0
],
encode_method: datas.encode_method,
},
},
// {
// name: "服务信息",
// type: "table-list",
// value: {
// data_service_type1_name: datas.data_service_type1_name,
// data_service_type2_name: datas.data_service_type2_name,
// sectors_name: datas.sectors_name,
// create_time: datas.create_time,
// update_date: datas.update_date,
// req_type: ["-", "GET", "POST", "PUT", "DELETE"][
// datas.req_type || 0
// ],
// encode_method: datas.encode_method,
// },
// },
/* {
name: "服务属性", // TODO: replace
type: "list",
......
src/pages/service_shop/spfwDetail.vue
View file @ 742b97d3
......@@ -12,27 +12,28 @@
<service-info :data="baseInfo" v-if="baseInfo"></service-info>
<service-tabs
<service-box
:detail-data="detailData"
:provider-data="providerData"
:comments-data="commentsData"
:comments-url="commentsUrl"
></service-tabs>
></service-box>
</div>
</template>
<script>
import serviceInfo from "@/components/service-info/service-info";
import serviceTabs from "@/components/service-tabs/service-tabs";
import serviceBox from "@/components/service-box"
export default {
components: {
serviceInfo,
serviceTabs,
serviceBox,
},
data: () => ({
baseInfo: null,
detailData: null,
detailData: [],
providerData: null,
commentsData: null,
}),
......@@ -76,6 +77,8 @@ export default {
serviceRequestSpcs: datas.serviceRequestSpcs || {spcs_type_1: [],spcs_type_2: []},
scoreDetail: datas.scoreDetail,
month_sale: datas.month_sale,
user_name: datas.register_user_info.user_name,
phone: datas.register_user_info.phone,
};
this.detailData = [
......@@ -84,21 +87,21 @@ export default {
type: "step",
value: ["服务申请", "信息填写", "审核确认", "服务获取"],
},
{
name: "服务信息",
type: "table-list",
value: {
data_service_type1_name: datas.data_service_type1_name,
data_service_type2_name: datas.data_service_type2_name,
sectors_name: datas.sectors_name,
create_time: datas.create_time,
update_date: datas.update_date,
req_type: ["-", "GET", "POST", "PUT", "DELETE"][
datas.req_type || 0
],
encode_method: datas.encode_method,
},
},
// {
// name: "服务信息",
// type: "table-list",
// value: {
// data_service_type1_name: datas.data_service_type1_name,
// data_service_type2_name: datas.data_service_type2_name,
// sectors_name: datas.sectors_name,
// create_time: datas.create_time,
// update_date: datas.update_date,
// req_type: ["-", "GET", "POST", "PUT", "DELETE"][
// datas.req_type || 0
// ],
// encode_method: datas.encode_method,
// },
// },
// {
// name: "请求方式",
// type: "text",
......
src/pages/service_shop/yysdDetail.vue
View file @ 742b97d3
......@@ -10,27 +10,36 @@
</el-breadcrumb>
</div>
<app-info :datas="baseInfo"></app-info>
<app-info :datas="baseInfo" v-if="showFlag"></app-info>
<service-tabs
<!-- <service-tabs
:detail-data="detailData"
detail-title="应用详情信息"
:provider-data="providerData"
:comments-url="commentsUrl"
comments-title="应用评价信息"
:is_app_detail="true"
></service-tabs>
></service-tabs> -->
<service-box
:detail-data="detailData"
detail-title="应用详情信息"
:provider-data="providerData"
comments-title="应用评价信息"
:comments-url="commentsUrl"
:is_app_detail="true"
></service-box>
</div>
</template>
<script>
import appInfo from "@/components/service-info/app-info";
import serviceTabs from "@/components/service-tabs/service-tabs";
import serviceBox from "@/components/service-box"
export default {
components: {
appInfo,
serviceTabs,
serviceBox
},
data: () => ({
baseInfo: {
......@@ -56,6 +65,8 @@ export default {
ywly_name: "",
yyjj: "",
price: "",
phone: "",
organization_name: "",
},
detailData: [
{
......@@ -63,11 +74,6 @@ export default {
type: "step_app",
value: ["应用申请", "信息填写", "审核确认", "应用获取"],
},
{
name: "应用信息",
type: "app-list",
value: {},
},
{
name: "功能简介",
type: "text",
......@@ -91,6 +97,7 @@ export default {
phone: "",
serviceRequestSpcsTable: [],
},
showFlag: false,
}),
computed: {
id() {
......@@ -138,13 +145,7 @@ export default {
this.baseInfo.price_style = response.data.data.price_style;
this.baseInfo.sale = response.data.data.sale;
this.baseInfo.star = response.data.data.star;
this.detailData[1].value = {
online_state_name: data.data.online_state_name,
type_name: data.data.type_name,
ywly_name: data.data.ywly_name,
create_date: data.data.create_date,
};
console.log(this.baseInfo)
});
})
.catch(function (error) {
......@@ -172,9 +173,9 @@ export default {
.then((response) => {
let data1 = response[0].data.data;
let data2 = response[1].data.data;
this.detailData[2].value = data1.gnjj;
this.detailData[3].value = data1.cjsl;
this.detailData[4].value = data2;
this.detailData[1].value = data1.gnjj;
this.detailData[2].value = data1.cjsl;
this.detailData[3].value = data2;
this.baseInfo.yyjj = data1.yyjj;
})
.catch(function (error) {
......@@ -188,10 +189,15 @@ export default {
this.providerData.picture_path = data.data.picture_path;
this.providerData.user_name = data.data.user_name;
this.providerData.phone = data.data.phone;
this.baseInfo.phone = data.data.phone
this.baseInfo.organization_name = data.data.department_name
})
.catch(function (error) {
console.log(error);
});
this.$nextTick(() => {
this.showFlag = true
})
},
},
mounted() {
......
src/pages/service_shop/zhfwDetail.vue
View file @ 742b97d3
......@@ -12,27 +12,28 @@
<service-info :data="baseInfo" v-if="baseInfo"></service-info>
<service-tabs
<service-box
:detail-data="detailData"
:provider-data="providerData"
:comments-data="commentsData"
:comments-url="commentsUrl"
></service-tabs>
></service-box>
</div>
</template>
<script>
import serviceInfo from "@/components/service-info/service-info";
import serviceTabs from "@/components/service-tabs/service-tabs";
import serviceBox from "@/components/service-box"
export default {
components: {
serviceInfo,
serviceTabs,
serviceBox,
},
data: () => ({
baseInfo: null,
detailData: null,
detailData: [],
providerData: null,
commentsData: null,
}),
......@@ -77,6 +78,8 @@ export default {
serviceRequestSpcs: datas.serviceRequestSpcs || {spcs_type_1: [],spcs_type_2: []},
scoreDetail: datas.scoreDetail,
month_sale: datas.month_sale,
user_name: datas.register_user_info.user_name,
phone: datas.register_user_info.phone,
};
this.detailData = [
{
......@@ -84,21 +87,21 @@ export default {
type: "step",
value: ["服务申请", "信息填写", "审核确认", "服务获取"],
},
{
name: "服务信息",
type: "table-list",
value: {
data_service_type1_name: datas.data_service_type1_name,
data_service_type2_name: datas.data_service_type2_name,
sectors_name: datas.sectors_name,
create_time: datas.create_time,
update_date: datas.update_date,
req_type: ["-", "GET", "POST", "PUT", "DELETE"][
datas.req_type || 0
],
encode_method: datas.encode_method,
},
},
// {
// name: "服务信息",
// type: "table-list",
// value: {
// data_service_type1_name: datas.data_service_type1_name,
// data_service_type2_name: datas.data_service_type2_name,
// sectors_name: datas.sectors_name,
// create_time: datas.create_time,
// update_date: datas.update_date,
// req_type: ["-", "GET", "POST", "PUT", "DELETE"][
// datas.req_type || 0
// ],
// encode_method: datas.encode_method,
// },
// },
/* {
name: "微服务响应列表", // TODO: replace
type: "table",
......
src/pages/user/order/order_detail.vue
View file @ 742b97d3
......@@ -203,7 +203,7 @@
<div class="detail_service">
<el-row class="detail_service_row">
<el-col
:span="8"
:span="14"
v-if="orderDetail.order_type == 1"
class="detail_service_msg"
>
......@@ -234,7 +234,7 @@
</div>
</el-col>
<el-col
:span="8"
:span="14"
v-else-if="orderDetail.order_type == 2"
class="detail_service_msg"
>
......@@ -252,7 +252,7 @@
</div>
</el-col>
<el-col
:span="8"
:span="10"
v-else-if="orderDetail.order_type == 3"
class="detail_service_msg"
>
......@@ -268,38 +268,9 @@
</div>
</div>
</el-col>
<el-col :span="6" class="detail_service_specification">
<div v-if="orderDetail.order_type == 1">
<div>
<span class="detail_service_specification_gg">
{{ orderDetail.spcs_type == 0 ? "计次收费：" : "时长收费：" }}
</span>
<span class="detail_service_specification_val">
{{ orderDetail.single_money }}金币/
{{
orderDetail.spcs_type == 1
? orderDetail.spcs_count + "次"
: "月"
}}
</span>
</div>
</div>
<div v-else-if="orderDetail.order_type == 2">
<div>
<span class="detail_service_specification_gg">
{{
orderDetail.spec_app == 0
? "申请获取应用镜像部署权限："
: "申请获取应用镜像开发权限："
}}
</span>
<span class="detail_service_specification_val">
{{ orderDetail.single_money }}金币/月
</span>
</div>
</div>
<div v-else-if="orderDetail.order_type == 3">
<div>
<el-col class="detail_service_msg" v-if="orderDetail.order_type == 3" :span="6">
<div class="lx_box">
<span class="detail_service_specification_gg">类型：</span>
<span class="detail_service_specification_val">{{
orderDetail.apply_type == 0
......@@ -307,37 +278,11 @@
: "升级现有工作区域"
}}</span>
</div>
</div>
</el-col>
<el-col :span="5" class="detail_service_time">
<div>
<span class="detail_service_time_title">申请时长：</span>
<span class="detail_service_specification_val">{{
orderDetail.duration == 0
? "不限"
: orderDetail.duration +
(orderDetail.duration_unit == 1 ? "个月" : "年")
}}</span>
</div>
</el-col>
<el-col :span="5" class="detail_service_money">
<el-col :span="orderDetail.order_type == 3? 8 : 10" class="detail_service_time">
<div>
<span class="detail_service_money_title">总价：</span>
<span class="detail_service_specification_val"
>{{ orderDetail.total_money }}金币</span
>
<!-- <span
v-if="
orderDetail.apply_type == 1 &&
orderDetail.amounts_payable - orderDetail.total_money > 0
"
class="adhekadwn"
>
（升级费用：
{{ orderDetail.amounts_payable }}金币，原规格抵扣：
{{ orderDetail.amounts_payable - orderDetail.total_money }}
金币）
</span> -->
申请使用期限：{{orderDetail.order_type == 3 ? orderDetail.duration + '个月' : orderDetail.request_start_time && orderDetail.request_end_time? orderDetail.request_start_time + '~' + orderDetail.request_end_time : '-' }}
</div>
</el-col>
</el-row>
......@@ -981,7 +926,12 @@ export default {
justify-content: space-between;
border-right: 1px #ededed solid;
}
.detail_service_msg .lx_box {
width: 100%;
height: 100%;
text-align: center;
line-height: 122px;
}
.detail_service_msg_img {
width: 118px;
height: 118px;
......
src/pages/workbench/fwgl/apply_service_detail.vue
View file @ 742b97d3
......@@ -687,22 +687,22 @@ export default {
type: "solt",
solt_name: "apply_table",
},
// {
// title: "申请规格：",
// info: "",
// },
{
title: "申请规格：",
title: "申请使用期限：",
info: "",
},
{
title: "申请时长：",
title: "申请理由",
info: "",
},
{
title: "申请时间：",
info: "",
},
{
title: "支付总价：",
info: "0",
},
{
title: "审批信息",
prop: "title",
......@@ -1089,16 +1089,18 @@ export default {
} else {
spcs = `${data.service_apply_info.single_money}金币/月`;
}
this.$set(this.apply_arr[6], "info", spcs);
// this.$set(this.apply_arr[6], "info", spcs);
this.$set(
this.apply_arr[7],
this.apply_arr[6],
"info",
data.service_apply_info.spcs_type == 1
? "不限时长"
: data.service_apply_info.duration +
(data.service_apply_info.duration_unit == 1 ? "月" : "年")
data.service_apply_info.request_start_time && data.service_apply_info.request_end_time ? data.service_apply_info.request_start_time + '~' + data.service_apply_info.request_end_time : '-'
);
this.$set(
this.apply_arr[7],
"info",
data.service_apply_info.reason_application || ''
)
this.$set(
this.apply_arr[8],
"info",
......@@ -1106,11 +1108,6 @@ export default {
.replace(/T|Z/g, " ")
.split("+")[0]
);
this.$set(
this.apply_arr[9],
"info",
data.service_apply_info.total_money + "金币"
);
this.res_table_arr = JSON.parse(
data.service_apply_info.res_fields || "[]"
);
......
src/pages/workbench/fwgl/approval_service_detail.vue
View file @ 742b97d3
......@@ -298,17 +298,17 @@ export default {
solt_name: "zd_table"
},
{
title: "申请时长：",
title: "申请使用期限：",
info: ""
},
{
title: "申请规格：",
info: ""
},
{
title: "总价：",
info: ""
}
// {
// title: "申请规格：",
// info: ""
// },
// {
// title: "总价：",
// info: ""
// }
]
};
},
......@@ -472,25 +472,23 @@ export default {
this.$set(
this.list_arr[8],
"info",
data.service_apply_info.spcs_type == 1
? "不限时长"
: data.service_apply_info.duration + "月"
);
this.$set(
this.list_arr[9],
"info",
data.service_apply_info.spcs_type == 1
? data.service_apply_info.single_money +
"金币/" +
data.service_apply_info.spcs_count +
"次"
: data.service_apply_info.single_money + "金币/月"
);
this.$set(
this.list_arr[10],
"info",
data.service_apply_info.total_money + "金币"
data.service_apply_info.request_start_time && data.service_apply_info.request_end_time ? data.service_apply_info.request_start_time + '~' + data.service_apply_info.request_end_time : '-'
);
// this.$set(
// this.list_arr[9],
// "info",
// data.service_apply_info.spcs_type == 1
// ? data.service_apply_info.single_money +
// "金币/" +
// data.service_apply_info.spcs_count +
// "次"
// : data.service_apply_info.single_money + "金币/月"
// );
// this.$set(
// this.list_arr[10],
// "info",
// data.service_apply_info.total_money + "金币"
// );
// console.log(data)
if (data.data_service_type1 == 36) {
this.list_arr.splice(6, 2);
......
src/pages/workbench/fwgl/cloud-detail.vue
View file @ 742b97d3
......@@ -342,10 +342,10 @@ export default {
title: "剩余使用天数：",
info: "1000天",
},
{
title: "支付总价：",
info: "0 金币",
},
// {
// title: "支付总价：",
// info: "0 金币",
// },
{
title: "到期时间：",
info: "2020-06-02 15:54:21",
......@@ -702,8 +702,8 @@ export default {
this.list_arr[3].url = data.apply_file; // application file url
this.list_arr[6].info = data.bgn_time; // get time
this.list_arr[7].info = data.time_remaining; // remaining days
this.list_arr[8].info = data.total_money;
this.list_arr[9].info = data.end_time; // maturity time
// this.list_arr[8].info = data.total_money;
this.list_arr[8].info = data.end_time; // maturity time
this.list_arr_my[0].info = data.first_level_time || "暂未提交"; // submit application time
this.list_arr_my[1].info = data.second_level_time || "暂未获取"; // super get time
this.super_status = data.second_level; // super status
......
src/pages/workbench/fwgl/fwglList.vue
View file @ 742b97d3
......@@ -586,11 +586,6 @@ export default {
];
},
},
{
label: "费用",
align: "center",
prop: "total_money"
},
{
label: "资源调整结果",
align: "center",
......
src/pages/workbench/fwgl/serviceDetail.vue
View file @ 742b97d3
......@@ -744,15 +744,15 @@ export default {
"服务基本信息",
"接口详细信息",
"服务运行状态",
"服务计费规则",
"服务交易记录",
// "服务计费规则",
// "服务交易记录",
],
[
"服务基本信息",
"接口详细信息",
"服务运行状态",
"服务规格",
"服务交易记录",
// "服务规格",
// "服务交易记录",
],
],
service_size_data: [], //服务规格数组
......@@ -1597,13 +1597,13 @@ export default {
this.service_arr[1][0] = "产品基本信息";
this.service_arr[1][1] = "";
this.service_arr[1][2] = "";
this.service_arr[1][3] = "产品计费规则";
this.service_arr[1][4] = "产品交易记录";
// this.service_arr[1][3] = "产品计费规则";
// this.service_arr[1][4] = "产品交易记录";
this.service_arr[2][0] = "产品基本信息";
this.service_arr[2][1] = "";
this.service_arr[2][2] = "";
this.service_arr[2][3] = "产品规格";
this.service_arr[2][4] = "产品交易记录";
// this.service_arr[2][3] = "产品规格";
// this.service_arr[2][4] = "产品交易记录";
this.getMd(data.doc_file);
}
// console.log(this.service_arr)
......
src/pages/workbench/workPlace.vue
View file @ 742b97d3
......@@ -6,7 +6,7 @@
<img style="width:40px;" :src="picture_path?picture_path:require('../../assets/imgs/img_head.png')" alt />
<span>你好，{{ person }}！{{login_time?'最近登录 ':''}}{{ login_time }}</span>
</div>
<div class="person_menu">
<!-- <div class="person_menu">
管理功能&nbsp;&nbsp;&nbsp;
<div class="person_manage_pic"></div>
......@@ -22,7 +22,7 @@
{{ item.text }}
</div>
</div>
</div>
</div> -->
</div>
<div class="menu">
<div
......@@ -319,7 +319,7 @@
:datas="app_data"
:stripe="true"
:detailsUrl="detailsUrl1[now_user][now_app]"
:ites="false"
:ites="now_app == 1 ? true : false"
height="285"
></table-um>
<list-pagination
......@@ -924,14 +924,14 @@ export default {
type: "app_count",
num: ""
},
{
text: "交易总额",
pic: require("@/assets/imgs/ic_shouyize.png"),
bg: "rgb(255,242,226)",
color: "#ea7d19",
type: "trade_money",
num: ""
}
// {
// text: "交易总额",
// pic: require("@/assets/imgs/ic_shouyize.png"),
// bg: "rgb(255,242,226)",
// color: "#ea7d19",
// type: "trade_money",
// num: ""
// }
],
[
{
......@@ -958,17 +958,18 @@ export default {
type: "app_count",
num: ""
},
{
text: "交易总额",
pic: require("@/assets/imgs/ic_shouyize.png"),
bg: "rgb(255,242,226)",
color: "#ea7d19",
type: "trade_money",
num: ""
}
// {
// text: "交易总额",
// pic: require("@/assets/imgs/ic_shouyize.png"),
// bg: "rgb(255,242,226)",
// color: "#ea7d19",
// type: "trade_money",
// num: ""
// }
]
],
online_tool_arr: [
<<<<<<< HEAD
{
text: "智能制图",
pic: require("@/assets/imgs/home_tool_ic_znht.png"),
......@@ -1008,6 +1009,47 @@ export default {
color: "#58617a",
url:'/search_engine',
},
=======
// {
// text: "智能制图",
// pic: require("@/assets/imgs/home_tool_ic_znht.png"),
// bg: "#e5f4fe",
// color: "#38aef9",
// url: "/vmap/#/map",
// target: 1
// },
// {
// text: "流程设计",
// pic: require("@/assets/imgs/home_tool_ic_lcsj.png"),
// bg: "#e6ebfe",
// color: "#515fe7",
// url: "/apaas/ui/#/progress",
// // url: "/lcyq/ui/#/process/model",
// target: 1
// },
// {
// text: "可视化图表",
// pic: require("@/assets/imgs/home_tool_ic_kshbb.png"),
// bg: "#fff2e2",
// color: "#ea7d19",
// url: "/iam/api/bi/token",
// target: 1
// },
// {
// text: "应用创新",
// pic: require("@/assets/imgs/home_tool_ic_yycx.png"),
// bg: "#e7fdfc",
// color: "#25bdb1",
// url: "/app_build",
// },
// {
// text: "搜索引擎",
// pic: require("@/assets/imgs/home_tool_ic_ssyq.png"),
// bg: "#f1f1f3",
// color: "#58617a",
// url:'/search_engine',
// },
>>>>>>> dev
],
service_arr: [
["服务列表", "申请服务", "云资源"],
......@@ -1044,7 +1086,7 @@ export default {
pic: require("@/assets/imgs/home_tool_ic_rongqiyun.png"),
text: "容器微服务管理",
role: 2,
url: "https://cloud4.wodcloud.com/awecloud/login/#/"
url: "/awecloud/ui/#/"
},
]
};
......@@ -1066,7 +1108,6 @@ export default {
})
},
mounted() {
console.log(this.level);
if (this.userInfo) {
this.now_user = this.level;
this.manage_arr[0].url =
......@@ -1078,8 +1119,77 @@ export default {
if (state != "needLogin") {
this.online_tool_arr.splice(0,1)
}
this.getNowMenu()
},
methods: {
getNowMenu() {
this.$api.general.getNowMenu({ teamName: "APAAS3" }).then(response => {
if (response.data.success == 1) {
let arr =
(response.data.data[0] && response.data.data[0].Child) || [];
if(arr && arr.length > 0){
let workplace_index = arr.findIndex(
item => item.visit_url == "/workplace"
);
let zxzjgz_index = arr[workplace_index].Child.findIndex(
item => item.visit_url == "/zxzjgz"
);
var menuList = arr[workplace_index].Child[zxzjgz_index].Child
var new_online_tool_arr = [];
if(menuList && menuList.length > 0){
for(var i=0;i<menuList.length;i++){
console.log(menuList[i])
if(menuList[i].menu_name == '智能制图'){
new_online_tool_arr.push({
text:menuList[i].menu_name,
pic: require("@/assets/imgs/home_tool_ic_znht.png"),
bg: "#e5f4fe",
color: "#38aef9",
url: menuList[i].visit_url,
target: 1
})
}else if(menuList[i].menu_name == '流程设计'){
new_online_tool_arr.push({
text: menuList[i].menu_name,
pic: require("@/assets/imgs/home_tool_ic_lcsj.png"),
bg: "#e6ebfe",
color: "#515fe7",
url: menuList[i].visit_url,
target: 1
})
}else if(menuList[i].menu_name == '可视化图表'){
new_online_tool_arr.push({
text:menuList[i].menu_name,
pic: require("@/assets/imgs/home_tool_ic_kshbb.png"),
bg: "#fff2e2",
color: "#ea7d19",
url: menuList[i].visit_url,
target: 1
})
}else if(menuList[i].menu_name == '应用创新'){
new_online_tool_arr.push({
text:menuList[i].menu_name,
pic: require("@/assets/imgs/home_tool_ic_yycx.png"),
bg: "#e7fdfc",
color: "#25bdb1",
url:menuList[i].visit_url,
})
}else if(menuList[i].menu_name == '搜索引擎'){
new_online_tool_arr.push({
text: menuList[i].menu_name,
pic: require("@/assets/imgs/home_tool_ic_ssyq.png"),
bg: "#f1f1f3",
color: "#58617a",
url:menuList[i].visit_url,
})
}
}
}
this.online_tool_arr = new_online_tool_arr;
}
}
});
},
//鼠标所在在线工具位置
change_now_online(n,m){
if((n||n==0)&&(m||m==0)){
......@@ -2075,11 +2185,11 @@ export default {
.menu_box2:nth-last-of-type(1) {
margin-right: 0px;
}
.menu_box1,
/* .menu_box1,
.menu_box2 {
width: calc((100% - 60px) / 4);
margin-right: 20px;
}
} */
.menu img {
float: left;
margin: 28px 0 0 28px;
......
src/pages/workbench/yygl/apply_app_detail.vue
View file @ 742b97d3
......@@ -134,10 +134,10 @@ export default {
title: "申请时间：",
info: "",
},
{
title: "总价：",
info: "",
},
// {
// title: "总价：",
// info: "",
// },
{
title: "审批信息",
prop:"title",
......@@ -231,7 +231,7 @@ export default {
this.$set(this.servicead_arr[2], "url", data.apply_file);
this.$set(this.servicead_arr[3], "info", data.apply_type_name);
this.$set(this.servicead_arr[4], "info", data.apply_time);
this.$set(this.servicead_arr[5], "info", data.total_money);
// this.$set(this.servicead_arr[5], "info", data.total_money);
})
.catch(function(response) {});
},
......
src/pages/workbench/yygl/approval_app_detail.vue
View file @ 742b97d3
......@@ -245,10 +245,10 @@ export default {
title: "申请时间：",
info: ""
},
{
title: "订单总价：",
info: ""
}
// {
// title: "订单总价：",
// info: ""
// }
]
};
},
......@@ -344,7 +344,7 @@ export default {
this.$set(this.list_arr[4], "info", data.apply_file.split('/')[0]);
this.$set(this.list_arr[4], "url", data.apply_file);
this.$set(this.list_arr[5], "info", data.apply_time.replace('Z',' ').replace('T',' '));
this.$set(this.list_arr[6], "info", data.total_money);
// this.$set(this.list_arr[6], "info", data.total_money);
})
.catch(function(response) {});
......
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