From a249277453a62ed21da2ad8c9c12b73f489266c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=AE=BF=E6=98=95?= Date: Tue, 27 Oct 2020 02:29:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=87=91=E5=B8=81=E5=95=A5?= =?UTF-8?q?=E5=95=A5=E5=95=A5=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/index.css | 2 +- src/assets/imgs/tool_ic_tips.png | Bin 0 -> 1225 bytes src/assets/imgs/wdjb_ic_czbs.png | Bin 0 -> 2609 bytes src/assets/imgs/wdjb_ic_zhye.png | Bin 0 -> 2717 bytes src/components/new-com/inlineForm.vue | 8 +- .../shopping-cart/shopping-cart-cell.vue | 15 +- .../shopping-cart/shopping-cart-com.vue | 5 +- src/pages/user/my-coin.vue | 377 ++++++++++++++++++ .../user/questions-answers/community.vue | 4 +- src/pages/user/questions-answers/my-qa.vue | 30 +- src/pages/workbench/fwzc_fwcs.vue | 5 +- src/request/api/user.js | 8 + src/router/index.js | 5 + 13 files changed, 431 insertions(+), 28 deletions(-) create mode 100644 src/assets/imgs/tool_ic_tips.png create mode 100644 src/assets/imgs/wdjb_ic_czbs.png create mode 100644 src/assets/imgs/wdjb_ic_zhye.png create mode 100644 src/pages/user/my-coin.vue diff --git a/src/assets/css/index.css b/src/assets/css/index.css index 3738387..71351b9 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -268,7 +268,7 @@ div { } .el-tabs__nav-scroll .el-tabs__item { - line-height: 30px !important; + line-height: 38px !important; height: 44px !important; } diff --git a/src/assets/imgs/tool_ic_tips.png b/src/assets/imgs/tool_ic_tips.png new file mode 100644 index 0000000000000000000000000000000000000000..ef54b892a7c09e2878789a537c61b7b2a9c7bfa0 GIT binary patch literal 1225 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 P$`2!n=t!u-`~UVIQZb3Y literal 0 HcmV?d00001 diff --git a/src/components/new-com/inlineForm.vue b/src/components/new-com/inlineForm.vue index 1498e7f..e326ed5 100644 --- a/src/components/new-com/inlineForm.vue +++ b/src/components/new-com/inlineForm.vue @@ -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; } \ No newline at end of file diff --git a/src/components/shopping-cart/shopping-cart-cell.vue b/src/components/shopping-cart/shopping-cart-cell.vue index 5807e44..51e06e9 100644 --- a/src/components/shopping-cart/shopping-cart-cell.vue +++ b/src/components/shopping-cart/shopping-cart-cell.vue @@ -125,7 +125,7 @@ - +
- + +
+ +
+ + 服务信息 规格 - 购买时长 - 操作 + 购买时长 + 小计 + 操作 +
+ + {{ + $t("lang.personal_center") + }} + {{ + $t("lang.my_questions_and_answers") + }} + + +
+
+ +
+
+

{{ user_info.user_name }}

+

{{ user_info.role }}

+
+
+
+
+ +
+

账户余额

+

+ {{ helper.numberFormat(user_info.answer_num) + }} + 万 + +

+
+
+
+ +
+

充值笔数

+

+ {{ helper.numberFormat(user_info.view_num) + }} + 万 + +

+
+
+
+ + +
+
+ 充值记录 + + + +
+ +
+ + + +
+ + + + + + + \ No newline at end of file diff --git a/src/pages/user/questions-answers/community.vue b/src/pages/user/questions-answers/community.vue index 11f3d6b..ef737ec 100644 --- a/src/pages/user/questions-answers/community.vue +++ b/src/pages/user/questions-answers/community.vue @@ -35,7 +35,7 @@ 我的提问

{{ helper.numberFormat(user_info.question_num) - }}万 + }} + 万 +

-

我的提问

+

我的回答

{{ helper.numberFormat(user_info.answer_num) - }}万 + }} + 万 +

-

我的提问

+

浏览数

{{ helper.numberFormat(user_info.view_num) - }}万 + }} + 万 +

@@ -77,11 +77,9 @@ {{ item.content.replace(/<[^<>]+>/g, "") }}

- 删除时间：{{ - helper.dateStringTransform(item.deleted_time) - }} + + 删除时间：{{ helper.dateStringTransform(item.deleted_time) }} + 删除人：{{ item.delete_user }} 删除理由：{{ item.reason }}

diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue index f37d98b..0b81c0b 100644 --- a/src/pages/workbench/fwzc_fwcs.vue +++ b/src/pages/workbench/fwzc_fwcs.vue @@ -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; }, diff --git a/src/request/api/user.js b/src/request/api/user.js index a391862..6e7a07c 100644 --- a/src/request/api/user.js +++ b/src/request/api/user.js @@ -67,6 +67,14 @@ const user = { }, getUserQA() { return axios.get(`/apaas/support/qa/info`) + }, + + // my coins + getUserCoins() { + return axios.get(``) + }, + getCoinList() { + return axios.get(``) } } diff --git a/src/router/index.js b/src/router/index.js index d74bbae..f1be497 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -423,6 +423,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"), + }, ], }, // 个人中心 { -- 2.26.0