Skip to content

A
apaas-ui
Commit ce8c8245 authored by 赵伟庚's avatar 赵伟庚
Browse files
Options

fix 去除金币

parent 101528ac
Expand all Show whitespace changes
Inline Side-by-side
Showing with 661 additions and 865 deletions
src/components/menu.vue
View file @ ce8c8245
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
@click="settlement" @click="settlement"
size="small" size="small"
class="shop_settlement" class="shop_settlement"
>去购物车申请结算</el-button> >去购物车申请</el-button>
</div> </div>
</div> </div>
<div <div
......
src/components/order-list/order-list-cell.vue
View file @ ce8c8245
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</div> </div>
</div> </div>
<el-row class="cell_row"> <el-row class="cell_row">
<el-col :span="7" class="cell_msg"> <el-col :span="6" class="cell_msg">
<img <img
v-if="cellItem.order_type != 3" v-if="cellItem.order_type != 3"
:src="cellItem.cover" :src="cellItem.cover"
...@@ -70,27 +70,7 @@ ...@@ -70,27 +70,7 @@
</div> </div>
</el-col> </el-col>
<el-col :span="5" class="cell_specification"> <el-col :span="5" class="cell_specification">
<div v-if="cellItem.order_type == 1"> <div v-if="cellItem.order_type == 3">
<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">
<el-tooltip <el-tooltip
v-if="cellItem.apply_type == 0" v-if="cellItem.apply_type == 0"
class="item" class="item"
...@@ -138,22 +118,24 @@ ...@@ -138,22 +118,24 @@
{{ cellItem.one_memory_min }}GB； {{ cellItem.one_memory_min }}GB；
</div> </div>
</div> </div>
<div v-else>
-
</div>
</el-col> </el-col>
<el-col :span="3" class="cell_specification"> <el-col :span="5" class="cell_specification">
<div> <div>
{{ <!-- {{
cellItem.duration != 0 && cellItem.duration_unit == 1 cellItem.duration != 0 && cellItem.duration_unit == 1
? cellItem.duration + "个月" ? cellItem.duration + "个月"
: cellItem.duration != 0 && cellItem.duration_unit == 2 : cellItem.duration != 0 && cellItem.duration_unit == 2
? cellItem.duration + "年" ? 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> </div>
</el-col> </el-col>
<el-col :span="3" class="cell_specification"> <el-col :span="5" class="approval_status">
<div>{{ cellItem.total_money }}金币</div>
</el-col>
<el-col :span="3" class="approval_status">
<div> <div>
<div <div
v-if=" v-if="
......
src/components/order-list/order-list-list.vue
View file @ ce8c8245
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
<div class="order_list"> <div class="order_list">
<div class="order_th_pad"> <div class="order_th_pad">
<el-row class="order_th"> <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="5">规格</el-col>
<el-col :span="3">购买时长</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="3">操作</el-col>
</el-row> </el-row>
</div> </div>
......
src/components/service-box.vue 0 → 100644
View file @ ce8c8245
<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 @ ce8c8245
...@@ -3,63 +3,50 @@ ...@@ -3,63 +3,50 @@
:borRadius="8" :borRadius="8"
:paddingNum="32" :paddingNum="32"
class="service_info apaas_button" class="service_info apaas_button"
v-if="data" v-if="datas"
> >
<div class="main_container"> <div class="main_container">
<div class="main_container-left"> <div class="main_container-left">
<img :src="data.logo" width="100%" /> <img :src="datas.logo" width="100%" />
</div> </div>
<div class="main_container-right"> <div class="main_container-right">
<div class="service_title"> <div class="service_title">
<span class="service_name" v-text="data.app_name"></span> <span class="service_name" v-text="datas.app_name"></span>
<span class="service_access_info"> <div style="margin-right:auto">
<span class="service_access_info1">
<img :src="require('@/assets/imgs/icon_liulan.png')" /> <img :src="require('@/assets/imgs/icon_liulan.png')" />
<span v-text="data.view_count + '次浏览'"></span> <span v-text="datas.view_count + '次浏览'"></span>
</span> </span>
<span class="service_access_info"> <span class="service_access_info1">
<img :src="require('@/assets/imgs/icon_huoqu.png')" /> <img :src="require('@/assets/imgs/icon_huoqu.png')" />
<span v-text="'本月' + data.apply_times + '次获取'"></span> <span v-text="'本月' + datas.apply_times + '次获取'"></span>
</span> </span>
</div> </div>
<p class="des_p">{{ data.yyjj }}</p> <span class="service_access_info">
<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">
<el-button class="service_now_buy" @click="applyImmediately"> <el-button class="service_now_buy" @click="applyImmediately">
立即申请 立即申请
</el-button> </el-button>
</span>
<span class="service_access_info">
<el-button class="service_add_cart" @click="addToCart"> <el-button class="service_add_cart" @click="addToCart">
加入购物车 加入购物车
</el-button> </el-button>
</span>
</div>
<div class="baseInfo_box">
<tr class="flex_3">
<td>部署来源：{{datas.online_state_name}}</td>
<td>业务领域：{{datas.ywly_name}}</td>
<td>应用类型：{{datas.type_name}}</td>
</tr>
<tr class="flex_3">
<td>提供组织：{{datas.organization_name}}</td>
<td>联系人：{{datas.username}}</td>
<td>联系方式：{{datas.phone}}</td>
</tr>
<tr class="flex_3">
<td>上线时间：{{helper.dateStringTransform(datas.create_date)}}</td>
</tr>
</div> </div>
</div> </div>
</div> </div>
...@@ -68,6 +55,7 @@ ...@@ -68,6 +55,7 @@
<script> <script>
import BlockRadius from "@/components/general/block-radius"; import BlockRadius from "@/components/general/block-radius";
import helper from "@/services/helper.js";
export default { export default {
components: { components: {
BlockRadius, BlockRadius,
...@@ -79,6 +67,7 @@ export default { ...@@ -79,6 +67,7 @@ export default {
}, },
}, },
data: () => ({ data: () => ({
helper,
specifications: [ specifications: [
{ {
name: "1.申请获取应用镜像部署权限", name: "1.申请获取应用镜像部署权限",
...@@ -91,18 +80,8 @@ export default { ...@@ -91,18 +80,8 @@ export default {
], ],
specificationID: 1, specificationID: 1,
duration: 1, duration: 1,
data: {},
}), }),
watch: { watch: {},
datas: {
handler(val) {
this.data = val;
console.log(this.data);
},
deep: true,
immediate: true,
},
},
computed: { computed: {
actionDisabled() { actionDisabled() {
return this.specifications.length == 0; return this.specifications.length == 0;
...@@ -161,7 +140,6 @@ export default { ...@@ -161,7 +140,6 @@ export default {
}, },
}; };
</script> </script>
</script>
<style scoped> <style scoped>
.main_container { .main_container {
...@@ -201,7 +179,7 @@ export default { ...@@ -201,7 +179,7 @@ export default {
font-weight: bold; font-weight: bold;
color: #0d1847; color: #0d1847;
line-height: 36px; line-height: 36px;
margin-right: auto; margin-right: 36px;
} }
.service_title > .service_type { .service_title > .service_type {
flex-shrink: 0; flex-shrink: 0;
...@@ -222,6 +200,9 @@ export default { ...@@ -222,6 +200,9 @@ export default {
color: #58617a; color: #58617a;
margin-left: 20px; margin-left: 20px;
} }
.service_access_info1 {
margin-right: 16px;
}
.service_title > .service_access_info > * { .service_title > .service_access_info > * {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
...@@ -230,6 +211,20 @@ export default { ...@@ -230,6 +211,20 @@ export default {
width: 12px; width: 12px;
margin-right: 5px; 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;
}
.service_base_info { .service_base_info {
padding: 18px; padding: 18px;
background-color: #f9fafc; background-color: #f9fafc;
...@@ -359,23 +354,28 @@ export default { ...@@ -359,23 +354,28 @@ export default {
left: -35px; left: -35px;
} }
.service_add_cart { .service_add_cart {
width: 192px; width: 104px;
height: 40px; height: 28px;
background-color: #fcefd6; background-color: #fcefd6;
border-radius: 6px; border-radius: 6px;
border: solid 1px #fac266;
color: #e56600; color: #e56600;
font-size: 16px; font-size: 14px;
border: none;
padding: 0;
text-align: center;
line-height: 28px;
} }
.service_now_buy { .service_now_buy {
width: 192px; width: 88px;
height: 40px; height: 28px;
background-color: #e56600; background-color: #e56600;
border: solid 1px #e56600; border: solid 1px #e56600;
border-radius: 6px; border-radius: 6px;
color: #fcefd6; color: #fcefd6;
font-size: 16px; font-size: 14px;
margin-right: 24px; padding: 0;
text-align: center;
line-height: 28px;
} }
.tags { .tags {
display: inline-block; display: inline-block;
......
src/components/shop-car-apply/apply_form.vue
View file @ ce8c8245
...@@ -20,6 +20,21 @@ ...@@ -20,6 +20,21 @@
<p class="formname">联系电话：</p> <p class="formname">联系电话：</p>
<el-input v-model="formInline.phone" placeholder="联系电话"></el-input> <el-input v-model="formInline.phone" placeholder="联系电话"></el-input>
</el-form-item> </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> </el-form>
</div> </div>
</template> </template>
...@@ -57,6 +72,13 @@ export default { ...@@ -57,6 +72,13 @@ export default {
{ required: true, message: "请输入联系电话", trigger: "blur" }, { required: true, message: "请输入联系电话", trigger: "blur" },
{ validator: check_phone, 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 { ...@@ -104,7 +126,14 @@ export default {
.formout .el-form-item { .formout .el-form-item {
margin-right: 20px; margin-right: 20px;
} }
.formout .el-form-item:nth-of-type(2) { .formout .el-form-item:nth-of-type(even) {
margin-right: 0px; 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> </style>
src/components/shop-car-apply/apply_service_state.vue
View file @ ce8c8245
...@@ -33,22 +33,23 @@ ...@@ -33,22 +33,23 @@
>{{ item.tip }}</span> >{{ item.tip }}</span>
</p> </p>
<p>{{ data.type }}</p> <p>{{ data.type }}</p>
<p>{{ data.auth }}</p> <!-- <p>{{ data.auth }}</p> -->
</div> </div>
</div> </div>
<div class="size"> <div class="size">
<p>{{data.size}}</p> <p>{{data.auth}}</p>
</div> </div>
<div class="num">{{ data.num }}</div> <!-- <div class="num">{{ data.num }}</div>
<div class="count">{{ data.count }}</div> <div class="count">{{ data.count }}</div> -->
<div class="oprate"> <div class="oprate">
<upload-file <!-- <upload-file
v-if="data.isMg" v-if="data.isMg"
:list="imgList" :list="imgList"
:drag="false" :drag="false"
@getNewList="getNewList" @getNewList="getNewList"
type="default" type="default"
></upload-file> ></upload-file> -->
<p>{{helper.dateStringTransform(data.fbsj)}}</p>
</div> </div>
</div> </div>
<p class="inputtitle">应用场景：</p> <p class="inputtitle">应用场景：</p>
...@@ -78,6 +79,7 @@ ...@@ -78,6 +79,7 @@
<script> <script>
import uploadFile from "@/components/general/upload_file"; import uploadFile from "@/components/general/upload_file";
import tableUm from "@/components/table/table-um"; import tableUm from "@/components/table/table-um";
import helper from "@/services/helper.js";
export default { export default {
props: ["data", "idx"], props: ["data", "idx"],
components: { components: {
...@@ -86,6 +88,7 @@ export default { ...@@ -86,6 +88,7 @@ export default {
}, },
data() { data() {
return { return {
helper,
sceneinput: "", sceneinput: "",
fileList: "", fileList: "",
imgList: [], imgList: [],
...@@ -120,7 +123,9 @@ export default { ...@@ -120,7 +123,9 @@ export default {
}, },
watch: {}, watch: {},
computed: {}, computed: {},
created() {}, created() {
console.log(this.data,'------')
},
mounted() {}, mounted() {},
methods: { methods: {
getNewList(val) { getNewList(val) {
...@@ -156,7 +161,7 @@ export default { ...@@ -156,7 +161,7 @@ export default {
} }
.serviceinfo { .serviceinfo {
width: 415px; width: 415px;
margin-right: 66px; margin-right: 16px;
} }
.pic { .pic {
width: 116px; width: 116px;
...@@ -196,6 +201,8 @@ export default { ...@@ -196,6 +201,8 @@ export default {
line-height: 107px; line-height: 107px;
border-radius: 8px; border-radius: 8px;
color: #242c43; color: #242c43;
text-align: center;
margin-right: 170px;
} }
.num { .num {
width: 138px; width: 138px;
...@@ -215,10 +222,11 @@ export default { ...@@ -215,10 +222,11 @@ export default {
text-align: center; text-align: center;
} }
.oprate { .oprate {
width: 150px; width: 240px;
height: 107px; height: 107px;
padding-top: 34px; line-height: 107px;
padding-left: 30px; font-size: 14px;
text-align: center;
} }
.inputtitle { .inputtitle {
color: rgba(88, 97, 122, 1); color: rgba(88, 97, 122, 1);
......
src/components/shop-car-apply/service_list.vue
View file @ ce8c8245
...@@ -2,10 +2,8 @@ ...@@ -2,10 +2,8 @@
<div class="out_list"> <div class="out_list">
<p class="list_title"> <p class="list_title">
<span>服务信息</span> <span>服务信息</span>
<span>规格</span> <span>提供组织</span>
<span>购买时长</span> <span>发布时间</span>
<span>小计</span>
<span>操作</span>
</p> </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> <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 { ...@@ -68,15 +66,9 @@ export default {
font-weight: bold; font-weight: bold;
} }
.list_title span:nth-of-type(1){ .list_title span:nth-of-type(1){
margin-right: 414px; margin-right: 454px;
} }
.list_title span:nth-of-type(2){ .list_title span:nth-of-type(2){
margin-right: 246px; margin-right: 346px;
}
.list_title span:nth-of-type(3){
margin-right: 96px;
}
.list_title span:nth-of-type(4){
margin-right: 124px;
} }
</style> </style>
src/components/shop-cloud/shop-cloud-new.vue
View file @ ce8c8245
...@@ -611,25 +611,6 @@ ...@@ -611,25 +611,6 @@
</block-radius> </block-radius>
<block-radius :borRadius="8" v-if="!(activeName == 1 && !formShow)"> <block-radius :borRadius="8" v-if="!(activeName == 1 && !formShow)">
<div class="btn_footer fyzj_item"> <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 <el-button
:class=" :class="
getSumCoin <= user_info.account_balance ? 'submit' : 'nosubmit' getSumCoin <= user_info.account_balance ? 'submit' : 'nosubmit'
...@@ -929,26 +910,6 @@ ...@@ -929,26 +910,6 @@
</el-col> </el-col>
</el-row> </el-row>
<div class="fyzj_dia"> <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 class="clear_xxx"></div>
</div> </div>
<div class="btn_footer acc"> <div class="btn_footer acc">
......
src/components/shopping-cart/shopping-cart-cell.vue
View file @ ce8c8245
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<span>已下架</span> <span>已下架</span>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="10">
<div class="shopping_cell_item"> <div class="shopping_cell_item">
<img <img
:src=" :src="
...@@ -63,156 +63,25 @@ ...@@ -63,156 +63,25 @@
<div v-else class="shopping_cell_type"> <div v-else class="shopping_cell_type">
{{ cellItems.application.ywly_name }} {{ cellItems.application.ywly_name }}
</div> </div>
<div class="shopping_cell_creator"> <!-- <div class="shopping_cell_creator">
{{ {{
cellIsService cellIsService
? cellItems.service.organization_name ? cellItems.service.organization_name
: cellItems.application.org_name : cellItems.application.org_name
}} }}
</div> </div> -->
</div> </div>
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="8" class="shopping_cell_num">
<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">
{{ {{
cellItems.service.spcs_info.spcs_type == 1 cellIsService
? "计次收费" ? cellItems.service.organization_name
: "时长收费" : cellItems.application.org_name
}}：{{ cellItems.service.spcs_info.money }}金币/{{
cellItems.service.spcs_info.spcs_type == 1
? cellItems.service.spcs_info.spcs_count + "次"
: "月"
}} }}
</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>
<el-col :span="3" class="shopping_cell_options"> <el-col :span="4" class="shopping_cell_options">
<el-checkbox <el-checkbox
v-if="!readOnly" v-if="!readOnly"
v-model="cellItems.is_subscribe" v-model="cellItems.is_subscribe"
...@@ -304,22 +173,23 @@ export default { ...@@ -304,22 +173,23 @@ export default {
mounted() {}, mounted() {},
methods: { methods: {
getState(val) { getState(val) {
if ( // if (
this.cellItems.service_id != 0 && // this.cellItems.service_id != 0 &&
!this.cellItems.service.spcs_info.id // !this.cellItems.service.spcs_info.id
) { // ) {
this.$message({ // this.$message({
message: // message:
(this.cellItems.service_id == 0 // (this.cellItems.service_id == 0
? this.cellItems.application.app_name // ? this.cellItems.application.app_name
: this.cellItems.service.name) + "暂不支持购买", // : this.cellItems.service.name) + "暂不支持购买",
type: "error", // type: "error",
}); // });
this.checkedItem = false; // this.checkedItem = false;
this.$emit("changeState", { state: false, index: this.cellIndex }); // this.$emit("changeState", { state: false, index: this.cellIndex });
} else { // } else {
// this.$emit("changeState", { state: val, index: this.cellIndex });
// }
this.$emit("changeState", { state: val, index: this.cellIndex }); this.$emit("changeState", { state: val, index: this.cellIndex });
}
}, },
changeSpecification(val) { changeSpecification(val) {
this.specificationPop = val; this.specificationPop = val;
...@@ -503,7 +373,7 @@ export default { ...@@ -503,7 +373,7 @@ export default {
margin-top: 10px; margin-top: 10px;
} }
.shopping_cell_num { .shopping_cell_num {
text-align: center; text-align: left;
padding-top: 32px; padding-top: 32px;
} }
.shopping_cell_options { .shopping_cell_options {
...@@ -560,19 +430,6 @@ export default { ...@@ -560,19 +430,6 @@ export default {
width: 28px; width: 28px;
height: 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 { .shopping_cell_options .el-button {
border: 0; border: 0;
font-size: 14px; font-size: 14px;
......
src/components/shopping-cart/shopping-cart-com.vue
View file @ ce8c8245
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
>全选</el-checkbox >全选</el-checkbox
> >
</el-col> </el-col>
<el-col :span="8" class="shopping_all_head_item">服务信息</el-col> <el-col :span="10" class="shopping_all_head_item text_left">服务信息</el-col>
<el-col :span="5" class="shopping_all_head_item">规格</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="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="4" class="shopping_all_head_item">操作</el-col>
</el-row> </el-row>
</div> </div>
<ShoppingCartList <ShoppingCartList
...@@ -58,26 +58,10 @@ ...@@ -58,26 +58,10 @@
> >
</el-col> </el-col>
<el-col :span="15" class="shopping_cart_options_num"> <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"> <p class="ckfymx_a">
共 {{ list.length }} 项服务，已选择 共 {{ list.length }} 项服务，已选择
<span class="dwa_djf">{{ getNum }}</span> 项 <span class="dwa_djf">{{ getNum }}</span> 项
<span class="ckfymx_qian"
>账户余额：{{ user_info.account_balance }} 金币</span
>
</p> </p>
</div>
</div>
</el-col> </el-col>
<el-col :span="4" class="shopping_cart_options_cell"> <el-col :span="4" class="shopping_cart_options_cell">
<el-button <el-button
...@@ -286,6 +270,8 @@ export default { ...@@ -286,6 +270,8 @@ export default {
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
color: #58617a; color: #58617a;
/* height: 100%; */
line-height: 80px;
} }
.dwa_djf { .dwa_djf {
color: #e56600; color: #e56600;
...@@ -310,37 +296,13 @@ export default { ...@@ -310,37 +296,13 @@ export default {
.shopping_all_head_item { .shopping_all_head_item {
text-align: center; text-align: center;
} }
.text_left {
text-align: left;
padding-left: 12px;
}
.shopping_list_page { .shopping_list_page {
padding: 10px 20px 0; 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 { .ckfymx_a {
color: #58617a; color: #58617a;
} }
......
src/pages/service_shop/cpDetail.vue
View file @ ce8c8245
...@@ -12,27 +12,28 @@ ...@@ -12,27 +12,28 @@
<service-info :data="baseInfo" v-if="baseInfo"></service-info> <service-info :data="baseInfo" v-if="baseInfo"></service-info>
<service-tabs <service-box
:detail-data="detailData" :detail-data="detailData"
:provider-data="providerData" :provider-data="providerData"
:comments-data="commentsData" :comments-data="commentsData"
:comments-url="commentsUrl" :comments-url="commentsUrl"
></service-tabs> ></service-box>
</div> </div>
</template> </template>
<script> <script>
import serviceInfo from "@/components/service-info/service-info"; import serviceInfo from "@/components/service-info/service-info";
import serviceTabs from "@/components/service-tabs/service-tabs"; import serviceTabs from "@/components/service-tabs/service-tabs";
import serviceBox from "@/components/service-box"
export default { export default {
components: { components: {
serviceInfo, serviceInfo,
serviceTabs, serviceTabs,
serviceBox,
}, },
data: () => ({ data: () => ({
baseInfo: null, baseInfo: null,
detailData: null, detailData: [],
providerData: null, providerData: null,
commentsData: null, commentsData: null,
}), }),
...@@ -80,6 +81,8 @@ export default { ...@@ -80,6 +81,8 @@ export default {
scoreDetail: datas.scoreDetail, scoreDetail: datas.scoreDetail,
month_sale: datas.month_sale, month_sale: datas.month_sale,
version: datas.version, version: datas.version,
user_name: datas.register_user_info.user_name,
phone: datas.register_user_info.phone,
}; };
this.detailData = [ this.detailData = [
...@@ -88,17 +91,17 @@ export default { ...@@ -88,17 +91,17 @@ export default {
type: "step_cp", type: "step_cp",
value: ["产品申请", "信息填写", "审核确认", "获取资源"], value: ["产品申请", "信息填写", "审核确认", "获取资源"],
}, },
{ // {
name: "产品信息", // name: "产品信息",
type: "cp-list", // type: "cp-list",
value: { // value: {
cp_area: datas.sectors_name, // cp_area: datas.sectors_name,
fb_time: datas.update_date, // fb_time: datas.update_date,
org: datas.system_name, // org: datas.system_name,
org_url: datas.domain_name, // org_url: datas.domain_name,
tags: datas.tags, // tags: datas.tags,
}, // },
}, // },
{ {
name: "产品详情", name: "产品详情",
type: "rich-text", type: "rich-text",
......
src/pages/service_shop/gzfwDetail.vue
View file @ ce8c8245
...@@ -12,27 +12,28 @@ ...@@ -12,27 +12,28 @@
<service-info :data="baseInfo" v-if="baseInfo"></service-info> <service-info :data="baseInfo" v-if="baseInfo"></service-info>
<service-tabs <service-box
:detail-data="detailData" :detail-data="detailData"
:provider-data="providerData" :provider-data="providerData"
:comments-data="commentsData" :comments-data="commentsData"
:comments-url="commentsUrl" :comments-url="commentsUrl"
></service-tabs> ></service-box>
</div> </div>
</template> </template>
<script> <script>
import serviceInfo from "@/components/service-info/service-info"; import serviceInfo from "@/components/service-info/service-info";
import serviceTabs from "@/components/service-tabs/service-tabs"; import serviceTabs from "@/components/service-tabs/service-tabs";
import serviceBox from "@/components/service-box"
export default { export default {
components: { components: {
serviceInfo, serviceInfo,
serviceTabs, serviceTabs,
serviceBox,
}, },
data: () => ({ data: () => ({
baseInfo: null, baseInfo: null,
detailData: null, detailData: [],
providerData: null, providerData: null,
commentsData: null, commentsData: null,
}), }),
...@@ -76,6 +77,8 @@ export default { ...@@ -76,6 +77,8 @@ export default {
serviceRequestSpcs: datas.serviceRequestSpcs || {spcs_type_1: [],spcs_type_2: []}, serviceRequestSpcs: datas.serviceRequestSpcs || {spcs_type_1: [],spcs_type_2: []},
scoreDetail: datas.scoreDetail, scoreDetail: datas.scoreDetail,
month_sale: datas.month_sale, month_sale: datas.month_sale,
user_name: datas.register_user_info.user_name,
phone: datas.register_user_info.phone,
}; };
this.detailData = [ this.detailData = [
...@@ -84,21 +87,21 @@ export default { ...@@ -84,21 +87,21 @@ export default {
type: "step", type: "step",
value: ["服务申请", "信息填写", "审核确认", "服务获取"], value: ["服务申请", "信息填写", "审核确认", "服务获取"],
}, },
{ // {
name: "服务信息", // name: "服务信息",
type: "table-list", // type: "table-list",
value: { // value: {
data_service_type1_name: datas.data_service_type1_name, // data_service_type1_name: datas.data_service_type1_name,
data_service_type2_name: datas.data_service_type2_name, // data_service_type2_name: datas.data_service_type2_name,
sectors_name: datas.sectors_name, // sectors_name: datas.sectors_name,
create_time: datas.create_time, // create_time: datas.create_time,
update_date: datas.update_date, // update_date: datas.update_date,
req_type: ["-", "GET", "POST", "PUT", "DELETE"][ // req_type: ["-", "GET", "POST", "PUT", "DELETE"][
datas.req_type || 0 // datas.req_type || 0
], // ],
encode_method: datas.encode_method, // encode_method: datas.encode_method,
}, // },
}, // },
// { // {
// name: "请求方式", // name: "请求方式",
// type: "text", // type: "text",
......
src/pages/service_shop/shop_car_apply.vue
View file @ ce8c8245
...@@ -19,11 +19,12 @@ ...@@ -19,11 +19,12 @@
@click="sub_service()" @click="sub_service()"
>提交申请</span> >提交申请</span>
<div class="count_money"> <div class="count_money">
<p> <!-- <p>
费用总计:&nbsp;&nbsp;&nbsp; <span>{{ all_cost }}</span><span>金币</span> 费用总计:&nbsp;&nbsp;&nbsp; <span>{{ all_cost }}</span><span>金币</span>
</p> </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> </p>
</div> </div>
</div> </div>
...@@ -46,7 +47,9 @@ export default { ...@@ -46,7 +47,9 @@ export default {
formInline: { formInline: {
depart: "", depart: "",
preson: "", preson: "",
phone: "" phone: "",
date:[],
sqly: '',
}, },
all_cost: 0, all_cost: 0,
now_money: 0, now_money: 0,
...@@ -180,6 +183,7 @@ export default { ...@@ -180,6 +183,7 @@ export default {
this.service_arr[0]["isapp"] = true; this.service_arr[0]["isapp"] = true;
console.log(data, this.service_arr); console.log(data, this.service_arr);
this.all_cost = app_data.duration * parseFloat(data.price); this.all_cost = app_data.duration * parseFloat(data.price);
this.service_arr[0]["fbsj"] = data.create_date;
} }
}); });
}, },
...@@ -205,6 +209,7 @@ export default { ...@@ -205,6 +209,7 @@ export default {
objs.img = data.cover; objs.img = data.cover;
objs.title = data.name; objs.title = data.name;
objs.type = data.data_service_type1_name; objs.type = data.data_service_type1_name;
objs.fbsj = data.create_time;
objs.tips = [ objs.tips = [
{ {
tip: this.share_arr[data.openness].name, tip: this.share_arr[data.openness].name,
...@@ -278,10 +283,10 @@ export default { ...@@ -278,10 +283,10 @@ export default {
}); });
}, },
sub_service() { sub_service() {
if (parseFloat(this.all_cost) > parseFloat(this.now_money)) { // if (parseFloat(this.all_cost) > parseFloat(this.now_money)) {
this.$message.error("余额不足，请进行充值"); // this.$message.error("余额不足，请进行充值");
return; // return;
} // }
let formInline = this.$refs.apply_info.formInline; let formInline = this.$refs.apply_info.formInline;
let flag = null; let flag = null;
this.$refs.apply_info.$refs.ruleForm.validate(valid => { this.$refs.apply_info.$refs.ruleForm.validate(valid => {
...@@ -292,10 +297,15 @@ export default { ...@@ -292,10 +297,15 @@ export default {
this.$message.error("输入正确号码"); this.$message.error("输入正确号码");
return; return;
} }
let request_start_time = formInline.date[0] || ''
let request_end_time = formInline.date[1] || ''
var temp = { var temp = {
apply_part: { apply_part: {
o_name: formInline.preson, 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: [] carts: []
}; };
...@@ -347,7 +357,6 @@ export default { ...@@ -347,7 +357,6 @@ export default {
} }
} }
} }
this.$http this.$http
.post(`/apaas/serviceapp/v3/shopcart/apply`, temp) .post(`/apaas/serviceapp/v3/shopcart/apply`, temp)
.then(response => { .then(response => {
...@@ -519,28 +528,12 @@ export default { ...@@ -519,28 +528,12 @@ export default {
} }
.count_money { .count_money {
float: right; float: right;
margin-top: -10px; /* margin-top: -10px; */
} height: 44px;
.count_money p:nth-of-type(1) { line-height: 44px;
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;
} }
.count_money p:nth-of-type(2) { .count_money p {
font-size: 14px; font-size: 14px;
color: #58617a; color: #58617a;
} }
.count_money p:nth-of-type(2) span:nth-of-type(2) {
color: #a9aec0;
margin-left: 20px;
}
</style> </style>
src/pages/service_shop/sjfwDetail.vue
View file @ ce8c8245
...@@ -12,27 +12,28 @@ ...@@ -12,27 +12,28 @@
<service-info :data="baseInfo" v-if="baseInfo"></service-info> <service-info :data="baseInfo" v-if="baseInfo"></service-info>
<service-tabs <service-box
:detail-data="detailData" :detail-data="detailData"
:provider-data="providerData" :provider-data="providerData"
:comments-data="commentsData" :comments-data="commentsData"
:comments-url="commentsUrl" :comments-url="commentsUrl"
></service-tabs> ></service-box>
</div> </div>
</template> </template>
<script> <script>
import serviceInfo from "@/components/service-info/service-info"; import serviceInfo from "@/components/service-info/service-info";
import serviceTabs from "@/components/service-tabs/service-tabs"; import serviceTabs from "@/components/service-tabs/service-tabs";
import serviceBox from "@/components/service-box"
export default { export default {
components: { components: {
serviceInfo, serviceInfo,
serviceTabs, serviceTabs,
serviceBox,
}, },
data: () => ({ data: () => ({
baseInfo: null, baseInfo: null,
detailData: null, detailData: [],
providerData: null, providerData: null,
commentsData: null, commentsData: null,
}), }),
...@@ -76,6 +77,8 @@ export default { ...@@ -76,6 +77,8 @@ export default {
serviceRequestSpcs: datas.serviceRequestSpcs || {spcs_type_1: [],spcs_type_2: []}, serviceRequestSpcs: datas.serviceRequestSpcs || {spcs_type_1: [],spcs_type_2: []},
scoreDetail: datas.scoreDetail, scoreDetail: datas.scoreDetail,
month_sale: datas.month_sale, month_sale: datas.month_sale,
user_name: datas.register_user_info.user_name,
phone: datas.register_user_info.phone,
}; };
this.detailData = [ this.detailData = [
...@@ -84,21 +87,21 @@ export default { ...@@ -84,21 +87,21 @@ export default {
type: "step", type: "step",
value: ["服务申请", "信息填写", "审核确认", "服务获取"], value: ["服务申请", "信息填写", "审核确认", "服务获取"],
}, },
{ // {
name: "服务信息", // name: "服务信息",
type: "table-list", // type: "table-list",
value: { // value: {
data_service_type1_name: datas.data_service_type1_name, // data_service_type1_name: datas.data_service_type1_name,
data_service_type2_name: datas.data_service_type2_name, // data_service_type2_name: datas.data_service_type2_name,
sectors_name: datas.sectors_name, // sectors_name: datas.sectors_name,
create_time: datas.create_time, // create_time: datas.create_time,
update_date: datas.update_date, // update_date: datas.update_date,
req_type: ["-", "GET", "POST", "PUT", "DELETE"][ // req_type: ["-", "GET", "POST", "PUT", "DELETE"][
datas.req_type || 0 // datas.req_type || 0
], // ],
encode_method: datas.encode_method, // encode_method: datas.encode_method,
}, // },
}, // },
// { // {
// name: "请求方式", // name: "请求方式",
// type: "text", // type: "text",
......
src/pages/service_shop/skfwDetail.vue
View file @ ce8c8245
...@@ -12,27 +12,28 @@ ...@@ -12,27 +12,28 @@
<service-info :data="baseInfo" v-if="baseInfo"></service-info> <service-info :data="baseInfo" v-if="baseInfo"></service-info>
<service-tabs <service-box
:detail-data="detailData" :detail-data="detailData"
:provider-data="providerData" :provider-data="providerData"
:comments-data="commentsData" :comments-data="commentsData"
:comments-url="commentsUrl" :comments-url="commentsUrl"
></service-tabs> ></service-box>
</div> </div>
</template> </template>
<script> <script>
import serviceInfo from "@/components/service-info/service-info"; import serviceInfo from "@/components/service-info/service-info";
import serviceTabs from "@/components/service-tabs/service-tabs"; import serviceTabs from "@/components/service-tabs/service-tabs";
import serviceBox from "@/components/service-box"
export default { export default {
components: { components: {
serviceInfo, serviceInfo,
serviceTabs, serviceTabs,
serviceBox,
}, },
data: () => ({ data: () => ({
baseInfo: null, baseInfo: null,
detailData: null, detailData: [],
providerData: null, providerData: null,
commentsData: null, commentsData: null,
}), }),
...@@ -83,6 +84,8 @@ export default { ...@@ -83,6 +84,8 @@ export default {
scoreDetail: datas.scoreDetail, scoreDetail: datas.scoreDetail,
month_sale: datas.month_sale, month_sale: datas.month_sale,
serviceRequestSpcs: datas.serviceRequestSpcs || {spcs_type_1: [],spcs_type_2: []}, 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 = [ this.detailData = [
...@@ -91,21 +94,21 @@ export default { ...@@ -91,21 +94,21 @@ export default {
type: "step", type: "step",
value: ["服务申请", "信息填写", "审核确认", "服务获取"], value: ["服务申请", "信息填写", "审核确认", "服务获取"],
}, },
{ // {
name: "服务信息", // name: "服务信息",
type: "table-list", // type: "table-list",
value: { // value: {
data_service_type1_name: datas.data_service_type1_name, // data_service_type1_name: datas.data_service_type1_name,
data_service_type2_name: datas.data_service_type2_name, // data_service_type2_name: datas.data_service_type2_name,
sectors_name: datas.sectors_name, // sectors_name: datas.sectors_name,
create_time: datas.create_time, // create_time: datas.create_time,
update_date: datas.update_date, // update_date: datas.update_date,
req_type: ["-", "GET", "POST", "PUT", "DELETE"][ // req_type: ["-", "GET", "POST", "PUT", "DELETE"][
datas.req_type || 0 // datas.req_type || 0
], // ],
encode_method: datas.encode_method, // encode_method: datas.encode_method,
}, // },
}, // },
/* { /* {
name: "服务属性", // TODO: replace name: "服务属性", // TODO: replace
type: "list", type: "list",
......
src/pages/service_shop/spfwDetail.vue
View file @ ce8c8245
...@@ -12,27 +12,28 @@ ...@@ -12,27 +12,28 @@
<service-info :data="baseInfo" v-if="baseInfo"></service-info> <service-info :data="baseInfo" v-if="baseInfo"></service-info>
<service-tabs <service-box
:detail-data="detailData" :detail-data="detailData"
:provider-data="providerData" :provider-data="providerData"
:comments-data="commentsData" :comments-data="commentsData"
:comments-url="commentsUrl" :comments-url="commentsUrl"
></service-tabs> ></service-box>
</div> </div>
</template> </template>
<script> <script>
import serviceInfo from "@/components/service-info/service-info"; import serviceInfo from "@/components/service-info/service-info";
import serviceTabs from "@/components/service-tabs/service-tabs"; import serviceTabs from "@/components/service-tabs/service-tabs";
import serviceBox from "@/components/service-box"
export default { export default {
components: { components: {
serviceInfo, serviceInfo,
serviceTabs, serviceTabs,
serviceBox,
}, },
data: () => ({ data: () => ({
baseInfo: null, baseInfo: null,
detailData: null, detailData: [],
providerData: null, providerData: null,
commentsData: null, commentsData: null,
}), }),
...@@ -76,6 +77,8 @@ export default { ...@@ -76,6 +77,8 @@ export default {
serviceRequestSpcs: datas.serviceRequestSpcs || {spcs_type_1: [],spcs_type_2: []}, serviceRequestSpcs: datas.serviceRequestSpcs || {spcs_type_1: [],spcs_type_2: []},
scoreDetail: datas.scoreDetail, scoreDetail: datas.scoreDetail,
month_sale: datas.month_sale, month_sale: datas.month_sale,
user_name: datas.register_user_info.user_name,
phone: datas.register_user_info.phone,
}; };
this.detailData = [ this.detailData = [
...@@ -84,21 +87,21 @@ export default { ...@@ -84,21 +87,21 @@ export default {
type: "step", type: "step",
value: ["服务申请", "信息填写", "审核确认", "服务获取"], value: ["服务申请", "信息填写", "审核确认", "服务获取"],
}, },
{ // {
name: "服务信息", // name: "服务信息",
type: "table-list", // type: "table-list",
value: { // value: {
data_service_type1_name: datas.data_service_type1_name, // data_service_type1_name: datas.data_service_type1_name,
data_service_type2_name: datas.data_service_type2_name, // data_service_type2_name: datas.data_service_type2_name,
sectors_name: datas.sectors_name, // sectors_name: datas.sectors_name,
create_time: datas.create_time, // create_time: datas.create_time,
update_date: datas.update_date, // update_date: datas.update_date,
req_type: ["-", "GET", "POST", "PUT", "DELETE"][ // req_type: ["-", "GET", "POST", "PUT", "DELETE"][
datas.req_type || 0 // datas.req_type || 0
], // ],
encode_method: datas.encode_method, // encode_method: datas.encode_method,
}, // },
}, // },
// { // {
// name: "请求方式", // name: "请求方式",
// type: "text", // type: "text",
......
src/pages/service_shop/yysdDetail.vue
View file @ ce8c8245
...@@ -10,27 +10,36 @@ ...@@ -10,27 +10,36 @@
</el-breadcrumb> </el-breadcrumb>
</div> </div>
<app-info :datas="baseInfo"></app-info> <app-info :datas="baseInfo" v-if="showFlag"></app-info>
<service-tabs <!-- <service-tabs
:detail-data="detailData" :detail-data="detailData"
detail-title="应用详情信息" detail-title="应用详情信息"
:provider-data="providerData" :provider-data="providerData"
:comments-url="commentsUrl" :comments-url="commentsUrl"
comments-title="应用评价信息" comments-title="应用评价信息"
:is_app_detail="true" :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> </div>
</template> </template>
<script> <script>
import appInfo from "@/components/service-info/app-info"; import appInfo from "@/components/service-info/app-info";
import serviceTabs from "@/components/service-tabs/service-tabs"; import serviceTabs from "@/components/service-tabs/service-tabs";
import serviceBox from "@/components/service-box"
export default { export default {
components: { components: {
appInfo, appInfo,
serviceTabs, serviceTabs,
serviceBox
}, },
data: () => ({ data: () => ({
baseInfo: { baseInfo: {
...@@ -56,6 +65,8 @@ export default { ...@@ -56,6 +65,8 @@ export default {
ywly_name: "", ywly_name: "",
yyjj: "", yyjj: "",
price: "", price: "",
phone: "",
organization_name: "",
}, },
detailData: [ detailData: [
{ {
...@@ -63,11 +74,6 @@ export default { ...@@ -63,11 +74,6 @@ export default {
type: "step_app", type: "step_app",
value: ["应用申请", "信息填写", "审核确认", "应用获取"], value: ["应用申请", "信息填写", "审核确认", "应用获取"],
}, },
{
name: "应用信息",
type: "app-list",
value: {},
},
{ {
name: "功能简介", name: "功能简介",
type: "text", type: "text",
...@@ -91,6 +97,7 @@ export default { ...@@ -91,6 +97,7 @@ export default {
phone: "", phone: "",
serviceRequestSpcsTable: [], serviceRequestSpcsTable: [],
}, },
showFlag: false,
}), }),
computed: { computed: {
id() { id() {
...@@ -138,13 +145,7 @@ export default { ...@@ -138,13 +145,7 @@ export default {
this.baseInfo.price_style = response.data.data.price_style; this.baseInfo.price_style = response.data.data.price_style;
this.baseInfo.sale = response.data.data.sale; this.baseInfo.sale = response.data.data.sale;
this.baseInfo.star = response.data.data.star; 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) { .catch(function (error) {
...@@ -172,9 +173,9 @@ export default { ...@@ -172,9 +173,9 @@ export default {
.then((response) => { .then((response) => {
let data1 = response[0].data.data; let data1 = response[0].data.data;
let data2 = response[1].data.data; let data2 = response[1].data.data;
this.detailData[2].value = data1.gnjj; this.detailData[1].value = data1.gnjj;
this.detailData[3].value = data1.cjsl; this.detailData[2].value = data1.cjsl;
this.detailData[4].value = data2; this.detailData[3].value = data2;
this.baseInfo.yyjj = data1.yyjj; this.baseInfo.yyjj = data1.yyjj;
}) })
.catch(function (error) { .catch(function (error) {
...@@ -188,10 +189,15 @@ export default { ...@@ -188,10 +189,15 @@ export default {
this.providerData.picture_path = data.data.picture_path; this.providerData.picture_path = data.data.picture_path;
this.providerData.user_name = data.data.user_name; this.providerData.user_name = data.data.user_name;
this.providerData.phone = data.data.phone; this.providerData.phone = data.data.phone;
this.baseInfo.phone = data.data.phone
this.baseInfo.organization_name = data.data.department_name
}) })
.catch(function (error) { .catch(function (error) {
console.log(error); console.log(error);
}); });
this.$nextTick(() => {
this.showFlag = true
})
}, },
}, },
mounted() { mounted() {
......
src/pages/service_shop/zhfwDetail.vue
View file @ ce8c8245
...@@ -12,27 +12,28 @@ ...@@ -12,27 +12,28 @@
<service-info :data="baseInfo" v-if="baseInfo"></service-info> <service-info :data="baseInfo" v-if="baseInfo"></service-info>
<service-tabs <service-box
:detail-data="detailData" :detail-data="detailData"
:provider-data="providerData" :provider-data="providerData"
:comments-data="commentsData" :comments-data="commentsData"
:comments-url="commentsUrl" :comments-url="commentsUrl"
></service-tabs> ></service-box>
</div> </div>
</template> </template>
<script> <script>
import serviceInfo from "@/components/service-info/service-info"; import serviceInfo from "@/components/service-info/service-info";
import serviceTabs from "@/components/service-tabs/service-tabs"; import serviceTabs from "@/components/service-tabs/service-tabs";
import serviceBox from "@/components/service-box"
export default { export default {
components: { components: {
serviceInfo, serviceInfo,
serviceTabs, serviceTabs,
serviceBox,
}, },
data: () => ({ data: () => ({
baseInfo: null, baseInfo: null,
detailData: null, detailData: [],
providerData: null, providerData: null,
commentsData: null, commentsData: null,
}), }),
...@@ -77,6 +78,8 @@ export default { ...@@ -77,6 +78,8 @@ export default {
serviceRequestSpcs: datas.serviceRequestSpcs || {spcs_type_1: [],spcs_type_2: []}, serviceRequestSpcs: datas.serviceRequestSpcs || {spcs_type_1: [],spcs_type_2: []},
scoreDetail: datas.scoreDetail, scoreDetail: datas.scoreDetail,
month_sale: datas.month_sale, month_sale: datas.month_sale,
user_name: datas.register_user_info.user_name,
phone: datas.register_user_info.phone,
}; };
this.detailData = [ this.detailData = [
{ {
...@@ -84,21 +87,21 @@ export default { ...@@ -84,21 +87,21 @@ export default {
type: "step", type: "step",
value: ["服务申请", "信息填写", "审核确认", "服务获取"], value: ["服务申请", "信息填写", "审核确认", "服务获取"],
}, },
{ // {
name: "服务信息", // name: "服务信息",
type: "table-list", // type: "table-list",
value: { // value: {
data_service_type1_name: datas.data_service_type1_name, // data_service_type1_name: datas.data_service_type1_name,
data_service_type2_name: datas.data_service_type2_name, // data_service_type2_name: datas.data_service_type2_name,
sectors_name: datas.sectors_name, // sectors_name: datas.sectors_name,
create_time: datas.create_time, // create_time: datas.create_time,
update_date: datas.update_date, // update_date: datas.update_date,
req_type: ["-", "GET", "POST", "PUT", "DELETE"][ // req_type: ["-", "GET", "POST", "PUT", "DELETE"][
datas.req_type || 0 // datas.req_type || 0
], // ],
encode_method: datas.encode_method, // encode_method: datas.encode_method,
}, // },
}, // },
/* { /* {
name: "微服务响应列表", // TODO: replace name: "微服务响应列表", // TODO: replace
type: "table", type: "table",
......
src/pages/user/order/order_detail.vue
View file @ ce8c8245
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
<div class="detail_service"> <div class="detail_service">
<el-row class="detail_service_row"> <el-row class="detail_service_row">
<el-col <el-col
:span="8" :span="14"
v-if="orderDetail.order_type == 1" v-if="orderDetail.order_type == 1"
class="detail_service_msg" class="detail_service_msg"
> >
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
</div> </div>
</el-col> </el-col>
<el-col <el-col
:span="8" :span="14"
v-else-if="orderDetail.order_type == 2" v-else-if="orderDetail.order_type == 2"
class="detail_service_msg" class="detail_service_msg"
> >
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
</div> </div>
</el-col> </el-col>
<el-col <el-col
:span="8" :span="10"
v-else-if="orderDetail.order_type == 3" v-else-if="orderDetail.order_type == 3"
class="detail_service_msg" class="detail_service_msg"
> >
...@@ -268,38 +268,9 @@ ...@@ -268,38 +268,9 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="6" class="detail_service_specification"> <el-col class="detail_service_msg" v-if="orderDetail.order_type == 3" :span="6">
<div v-if="orderDetail.order_type == 1">
<div> <div class="lx_box">
<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>
<span class="detail_service_specification_gg">类型：</span> <span class="detail_service_specification_gg">类型：</span>
<span class="detail_service_specification_val">{{ <span class="detail_service_specification_val">{{
orderDetail.apply_type == 0 orderDetail.apply_type == 0
...@@ -307,37 +278,11 @@ ...@@ -307,37 +278,11 @@
: "升级现有工作区域" : "升级现有工作区域"
}}</span> }}</span>
</div> </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>
<el-col :span="5" class="detail_service_money"> <el-col :span="orderDetail.order_type == 3? 8 : 10" class="detail_service_time">
<div> <div>
<span class="detail_service_money_title">总价：</span> 申请使用期限：{{orderDetail.order_type == 3 ? orderDetail.duration + '个月' : orderDetail.request_start_time && orderDetail.request_end_time? orderDetail.request_start_time + '~' + orderDetail.request_end_time : '-' }}
<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> -->
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -981,7 +926,12 @@ export default { ...@@ -981,7 +926,12 @@ export default {
justify-content: space-between; justify-content: space-between;
border-right: 1px #ededed solid; border-right: 1px #ededed solid;
} }
.detail_service_msg .lx_box {
width: 100%;
height: 100%;
text-align: center;
line-height: 122px;
}
.detail_service_msg_img { .detail_service_msg_img {
width: 118px; width: 118px;
height: 118px; height: 118px;
......
src/pages/workbench/fwgl/apply_service_detail.vue
View file @ ce8c8245
...@@ -687,22 +687,22 @@ export default { ...@@ -687,22 +687,22 @@ export default {
type: "solt", type: "solt",
solt_name: "apply_table", solt_name: "apply_table",
}, },
// {
// title: "申请规格：",
// info: "",
// },
{ {
title: "申请规格：", title: "申请使用期限：",
info: "", info: "",
}, },
{ {
title: "申请时长：", title: "申请理由",
info: "", info: "",
}, },
{ {
title: "申请时间：", title: "申请时间：",
info: "", info: "",
}, },
{
title: "支付总价：",
info: "0",
},
{ {
title: "审批信息", title: "审批信息",
prop: "title", prop: "title",
...@@ -1089,16 +1089,18 @@ export default { ...@@ -1089,16 +1089,18 @@ export default {
} else { } else {
spcs = `${data.service_apply_info.single_money}金币/月`; 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.$set(
this.apply_arr[7], this.apply_arr[6],
"info", "info",
data.service_apply_info.spcs_type == 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 : '-'
? "不限时长"
: data.service_apply_info.duration +
(data.service_apply_info.duration_unit == 1 ? "月" : "年")
); );
this.$set(
this.apply_arr[7],
"info",
data.service_apply_info.reason_application || ''
)
this.$set( this.$set(
this.apply_arr[8], this.apply_arr[8],
"info", "info",
...@@ -1106,11 +1108,6 @@ export default { ...@@ -1106,11 +1108,6 @@ export default {
.replace(/T|Z/g, " ") .replace(/T|Z/g, " ")
.split("+")[0] .split("+")[0]
); );
this.$set(
this.apply_arr[9],
"info",
data.service_apply_info.total_money + "金币"
);
this.res_table_arr = JSON.parse( this.res_table_arr = JSON.parse(
data.service_apply_info.res_fields || "[]" data.service_apply_info.res_fields || "[]"
); );
......
src/pages/workbench/fwgl/approval_service_detail.vue
View file @ ce8c8245
...@@ -472,9 +472,7 @@ export default { ...@@ -472,9 +472,7 @@ export default {
this.$set( this.$set(
this.list_arr[8], this.list_arr[8],
"info", "info",
data.service_apply_info.spcs_type == 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 : '-'
? "不限时长"
: data.service_apply_info.duration + "月"
); );
// this.$set( // this.$set(
// this.list_arr[9], // this.list_arr[9],
......
src/pages/workbench/yygl/apply_app_detail.vue
View file @ ce8c8245
...@@ -134,10 +134,10 @@ export default { ...@@ -134,10 +134,10 @@ export default {
title: "申请时间：", title: "申请时间：",
info: "", info: "",
}, },
{ // {
title: "总价：", // title: "总价：",
info: "", // info: "",
}, // },
{ {
title: "审批信息", title: "审批信息",
prop:"title", prop:"title",
...@@ -231,7 +231,7 @@ export default { ...@@ -231,7 +231,7 @@ export default {
this.$set(this.servicead_arr[2], "url", data.apply_file); 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[3], "info", data.apply_type_name);
this.$set(this.servicead_arr[4], "info", data.apply_time); 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) {}); .catch(function(response) {});
}, },
......
src/pages/workbench/yygl/approval_app_detail.vue
View file @ ce8c8245
...@@ -245,10 +245,10 @@ export default { ...@@ -245,10 +245,10 @@ export default {
title: "申请时间：", title: "申请时间：",
info: "" info: ""
}, },
{ // {
title: "订单总价：", // title: "订单总价：",
info: "" // info: ""
} // }
] ]
}; };
}, },
...@@ -344,7 +344,7 @@ export default { ...@@ -344,7 +344,7 @@ export default {
this.$set(this.list_arr[4], "info", data.apply_file.split('/')[0]); 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[4], "url", data.apply_file);
this.$set(this.list_arr[5], "info", data.apply_time.replace('Z',' ').replace('T',' ')); 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) {}); .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