Skip to content

A
apaas-ui
"src/components/service-list/commodity-card.vue" did not exist on "3b402e584ca527c359665fc3d09ccfdb346e97a6"
Commit 81b7ff6a authored by 刘殿昕's avatar 刘殿昕
Browse files
Options

Merge branch 'ldx' into dev

parents f4278363 a2492774
Hide whitespace changes
Inline Side-by-side
Showing with 431 additions and 28 deletions
src/assets/css/index.css
View file @ 81b7ff6a
......@@ -268,7 +268,7 @@ div {
}
.el-tabs__nav-scroll .el-tabs__item {
line-height: 30px !important;
line-height: 38px !important;
height: 44px !important;
}
......
src/components/new-com/inlineForm.vue
View file @ 81b7ff6a
......@@ -107,20 +107,20 @@ export default {
.from_content1 .el-input__inner {
background-color: #f7f8f9;
}
.el-date-editor.el-range-editor .el-range-input {
.from_content1 .el-date-editor.el-range-editor .el-range-input {
background-color: #f7f8f9;
width: 80px;
}
.el-date-editor.el-range-editor .el-range-separator {
.from_content1 .el-date-editor.el-range-editor .el-range-separator {
width: 40px;
position: relative;
top: 2px;
}
.el-date-editor.el-range-editor {
.from_content1 .el-date-editor.el-range-editor {
width: 260px;
padding: 3px 10px 3px 15px;
}
.el-date-editor .el-range__icon {
.from_content1 .el-date-editor .el-range__icon {
margin-right: 8px;
}
</style>
\ No newline at end of file
src/components/shopping-cart/shopping-cart-cell.vue
View file @ 81b7ff6a
......@@ -125,7 +125,7 @@
</div>
</div>
</el-col>
<el-col :span="4" class="shopping_cell_num">
<el-col :span="3" class="shopping_cell_num">
<div v-if="cellIsService">
<el-input-number
:disabled="readOnly"
......@@ -136,7 +136,18 @@
></el-input-number>
</div>
</el-col>
<el-col :span="4" class="shopping_cell_options">
<el-col :span="2" class="shopping_cell_num">
<div v-if="cellIsService">
<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_options">
<el-checkbox
v-if="!readOnly"
v-model="cellItems.is_subscribe"
......
src/components/shopping-cart/shopping-cart-com.vue
View file @ 81b7ff6a
......@@ -8,8 +8,9 @@
</el-col>
<el-col :span="9" class="shopping_all_head_item">服务信息</el-col>
<el-col :span="5" class="shopping_all_head_item">规格</el-col>
<el-col :span="4" class="shopping_all_head_item">购买时长</el-col>
<el-col :span="4" class="shopping_all_head_item">操作</el-col>
<el-col :span="3" class="shopping_all_head_item">购买时长</el-col>
<el-col :span="2" class="shopping_all_head_item">小计</el-col>
<el-col :span="3" class="shopping_all_head_item">操作</el-col>
</el-row>
</div>
<ShoppingCartList
......
src/pages/user/my-coin.vue 0 → 100644
View file @ 81b7ff6a
<template>
<div class="my_qa">
<el-breadcrumb separator="/" class="bread_crumb1 bread_left">
<el-breadcrumb-item :to="{ path: '/user' }">{{
$t("lang.personal_center")
}}</el-breadcrumb-item>
<el-breadcrumb-item>{{
$t("lang.my_questions_and_answers")
}}</el-breadcrumb-item>
</el-breadcrumb>
<BlockRadius class="info_block user_qa">
<div class="left_user">
<div class="img_head">
<img :src="user_info.picture_path" class="img_head_in" />
</div>
<div class="left_word">
<p class="left_name">{{ user_info.user_name }}</p>
<p class="left_role">{{ user_info.role }}</p>
</div>
</div>
<div class="right_list">
<div class="user_qa_card my_a">
<img src="@/assets/imgs/wdjb_ic_zhye.png" />
<div class="card_word">
<p class="card_name">账户余额</p>
<p>
{{ helper.numberFormat(user_info.answer_num)
}}<span v-if="user_info.answer_num > 10000" class="card_wan">
万
</span>
</p>
</div>
</div>
<div class="user_qa_card my_view">
<img src="@/assets/imgs/wdjb_ic_czbs.png" />
<div class="card_word">
<p class="card_name">充值笔数</p>
<p>
{{ helper.numberFormat(user_info.view_num)
}}<span v-if="user_info.view_num > 10000" class="card_wan">
万
</span>
</p>
</div>
</div>
</div>
</BlockRadius>
<BlockRadius class="block_down info_block">
<div class="czjl">
<div class="czjl_p">
充值记录
<el-tooltip
class="tool_item"
effect="dark"
content="充值明细（如需进行充值，请线下联系平台超级管理员）"
placement="top-start"
offset="5"
>
<img class="tool_img" src="@/assets/imgs/tool_ic_tips.png" />
</el-tooltip>
</div>
<el-date-picker
v-model="date"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
:clearable="false"
></el-date-picker>
</div>
<apass-table
class="apa_table"
ref="outtreetable"
:data="tableData"
:header="table_header"
></apass-table>
<list-pagination
:total="total_list"
:page-sizes="[50, 20, 10]"
:page-size="currentlimit"
:current-page="currentPage"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
></list-pagination>
</BlockRadius>
</div>
</template>
<script>
import BlockRadius from "@/components/general/block-radius";
import apassTable from "@/components/apass-table";
import listPagination from "@/components/comments-pagination";
import helper from "@/services/helper.js";
export default {
components: {
BlockRadius,
apassTable,
listPagination,
},
data: () => ({
helper,
user_info: {
user_name: "",
role: "",
question_num: 0,
answer_num: 0,
view_num: 0,
picture_path: "",
},
tableData: [{}, {}],
table_header: [],
total_list: 0,
currentPage: 1,
currentlimit: 10,
date: [],
}),
watch: {},
methods: {
handleSizeChange(val) {
this.pagination.rowsPerPage = val;
this.refreshData();
},
handleCurrentChange(val) {
this.pagination.page += val;
this.refreshData();
},
getUserCoin() {
this.$api.user.getUserQA().then((response) => {
if (response.data.success == 1) {
this.user_info = response.data.data;
}
});
},
selectnum({ select, rows }) {
this.num = select.length;
this.selected_date = select;
},
getCoinList() {
let query = {
start: this.date.length != 0 ? this.date[0] : "",
end: this.date.length != 0 ? this.date[1] : "",
};
console.log(query)
this.$api.user.getUserQA().then((response) => {
if (response.data.success == 1) {
this.user_info = response.data.data;
}
});
},
},
mounted() {
this.getUserCoin();
this.getCoinList();
this.table_header = [
{
prop: "title",
label: "充值流水ID",
align: "center",
type: "html",
getHtml: (str) => {
return `<span style="color:#0f2683;font-weight:bold;width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;" title="${str.title}">123123</span>`;
},
},
{
prop: "content",
label: "充值金额（金币/个）",
align: "center",
type: "html",
getHtml: (str) => {
return `<span style="width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">123123123</span>`;
},
},
{
prop: "answer_num",
label: "账户余额（金币/个）",
align: "center",
},
{
prop: "created",
label: "充值时间",
align: "center",
type: "html",
getHtml: (str) => {
return `<span>${helper.dateStringTransform(str.created)}</span>`;
},
},
];
},
};
</script>
<style scoped>
.my_qa {
/* height: calc(100% - 20px); */
height: calc(100%);
overflow: hidden;
}
.info_block {
margin: 0 20px 20px;
position: relative;
}
.block_down {
height: calc(100% - 214px);
}
.czjl {
height: 50px;
position: relative;
display: flex;
justify-content: space-between;
top: -6px;
}
.czjl::after {
content: "";
position: absolute;
left: -20px;
bottom: 0;
width: calc(100% + 40px);
height: 1px;
background-color: #e6ebfe;
}
.czjl_p {
font-weight: bold;
padding-left: 20px;
position: relative;
font-size: 16px;
top: 8px;
}
.czjl_p::after {
position: absolute;
content: "";
width: 4px;
height: 16px;
background-color: #515fe7;
border-radius: 2px;
left: 8px;
top: 3px;
}
.apa_table {
height: calc(100% - 90px);
}
.user_qa {
height: 120px;
display: flex;
justify-content: space-between;
}
.left_user {
width: 300px;
display: flex;
justify-content: space-between;
}
.img_head {
width: 76px;
height: 76px;
margin: 2px 10px;
border-radius: 50%;
overflow: hidden;
border: solid 2px #e3e5ef;
}
.img_head_in {
width: 100%;
height: 100%;
}
.left_word {
width: 200px;
padding-top: 5px;
}
.left_name {
color: #1d1e20;
font-size: 22px;
line-height: 44px;
}
.left_role {
color: #8890a7;
font-size: 14px;
}
.right_list {
width: 40%;
min-width: 550px;
max-width: 700px;
display: flex;
justify-content: space-between;
}
.user_qa_card {
width: 49%;
height: 80px;
border-radius: 10px 10px 10px 40px;
display: flex;
justify-content: space-around;
align-items: center;
font-size: 34px;
font-family: Arial;
font-weight: bold;
text-align: right;
}
.my_q {
background-color: #fcefd6;
color: #ef9433;
}
.my_a {
background-color: #e7fdfc;
color: #25bdb1;
}
.my_view {
background-color: #e5f4fe;
color: #38aef9;
}
.card_word {
}
.card_name {
color: #242c43;
font-size: 14px;
font-family: Microsoft YaHei;
font-weight: normal;
}
.card_wan {
font-size: 14px;
}
</style>
<style scoped>
.com-pagination {
margin-top: 20px;
font-size: 14px;
padding: 0 5%;
display: flex;
justify-content: space-between;
align-items: center;
}
.com_page_item {
display: flex;
justify-content: flex-end;
align-items: center;
}
.commodity_card {
}
.commodity_card_list {
width: 100%;
display: flex;
flex-wrap: wrap;
}
.commodity_card_item {
margin: 10px 0;
}
.commodity_card_item_in {
margin: 0 auto;
}
.tool_item {
}
.tool_img {
width: 16px;
height: 16px;
position: relative;
top: 2px;
left: 2px;
}
</style>
<style>
.czjl .el-input__inner {
background-color: #f7f8f9;
}
.czjl .el-date-editor.el-range-editor .el-range-input {
background-color: #f7f8f9;
width: 80px;
}
.czjl .el-date-editor.el-range-editor .el-range-separator {
width: 40px;
position: relative;
top: 2px;
}
.czjl .el-date-editor.el-range-editor {
width: 260px;
padding: 3px 10px 3px 15px;
}
.czjl .el-date-editor .el-range__icon {
margin-right: 8px;
}
</style>
\ No newline at end of file
src/pages/user/questions-answers/community.vue
View file @ 81b7ff6a
......@@ -35,7 +35,7 @@
<list-pagination
v-if="tableData.length"
:total="total_list"
:page-sizes="[50, 10]"
:page-sizes="[50, 20, 10]"
:page-size="currentlimit"
:current-page="currentPage"
@size-change="handleSizeChange"
......@@ -92,7 +92,7 @@ export default {
table_header: [],
total_list: 0,
currentPage: 1,
currentlimit: 50,
currentlimit: 10,
form_data: [
{
label: "问题搜索",
......
src/pages/user/questions-answers/my-qa.vue
View file @ 81b7ff6a
......@@ -25,33 +25,33 @@
<p class="card_name">我的提问</p>
<p>
{{ helper.numberFormat(user_info.question_num)
}}<span v-if="user_info.question_num > 10000" class="card_wan"
>万</span
>
}}<span v-if="user_info.question_num > 10000" class="card_wan">
万
</span>
</p>
</div>
</div>
<div class="user_qa_card my_a">
<img src="@/assets/imgs/ic_wodehuida.png" />
<div class="card_word">
<p class="card_name">我的提问</p>
<p class="card_name">我的回答</p>
<p>
{{ helper.numberFormat(user_info.answer_num)
}}<span v-if="user_info.answer_num > 10000" class="card_wan"
>万</span
>
}}<span v-if="user_info.answer_num > 10000" class="card_wan">
万
</span>
</p>
</div>
</div>
<div class="user_qa_card my_view">
<img src="@/assets/imgs/ic_liulanshu.png" />
<div class="card_word">
<p class="card_name">我的提问</p>
<p class="card_name">浏览数</p>
<p>
{{ helper.numberFormat(user_info.view_num)
}}<span v-if="user_info.view_num > 10000" class="card_wan"
>万</span
>
}}<span v-if="user_info.view_num > 10000" class="card_wan">
万
</span>
</p>
</div>
</div>
......@@ -77,11 +77,9 @@
{{ item.content.replace(/<[^<>]+>/g, "") }}
</p>
<p v-if="activeName == 2" class="cell_other">
<span
>删除时间：{{
helper.dateStringTransform(item.deleted_time)
}}</span
>
<span>
删除时间：{{ helper.dateStringTransform(item.deleted_time) }}
</span>
<span>删除人：{{ item.delete_user }}</span>
<span>删除理由：{{ item.reason }}</span>
</p>
......
src/pages/workbench/fwzc_fwcs.vue
View file @ 81b7ff6a
......@@ -1012,7 +1012,7 @@ export default {
this.serviceUrl = "";
this.noSearchUrl = "";
this.gz_fhsjgs = "JSON";
this.zhyyVal = "";
this.zhyyVal = 22;
this.datasSj = [];
this.tokenVal = "";
this.datasZh = [];
......@@ -1550,6 +1550,9 @@ export default {
}
},
changeZhType(val) {
this.serviceUrl = "";
this.select = "GET";
this.activeZh = "0";
this.resultShow = false;
this.resSuccess = false;
},
......
src/request/api/user.js
View file @ 81b7ff6a
......@@ -67,6 +67,14 @@ const user = {
},
getUserQA() {
return axios.get(`/apaas/support/qa/info`)
},
// my coins
getUserCoins() {
return axios.get(``)
},
getCoinList() {
return axios.get(``)
}
}
......
src/router/index.js
View file @ 81b7ff6a
......@@ -437,6 +437,11 @@ export default new Router({
name: "myQA",
component: () => import("@/pages/user/questions-answers/my-qa"),
},
{
path: "/user/my_coin", // 我的金币
name: "myCoin",
component: () => import("@/pages/user/my-coin"),
},
],
}, // 个人中心
{
......
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