diff --git a/src/api/userinfo.js b/src/api/userinfo.js new file mode 100644 index 0000000..a9b64d0 --- /dev/null +++ b/src/api/userinfo.js @@ -0,0 +1,9 @@ +import request from "../utils/request"; +// 获取卡券信息 +export function userCardApi(data) { + return request({ + url: "/yishoudan/usercoupon/list", + // method: "post", + params: data, + }); +} diff --git a/src/assets/bgbalance.png b/src/assets/bgbalance.png new file mode 100644 index 0000000..e7cfc79 Binary files /dev/null and b/src/assets/bgbalance.png differ diff --git a/src/assets/bgintegral.png b/src/assets/bgintegral.png new file mode 100644 index 0000000..823cdc6 Binary files /dev/null and b/src/assets/bgintegral.png differ diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue index 6615cb3..e7dbb1a 100644 --- a/src/components/FirstJob/joblist.vue +++ b/src/components/FirstJob/joblist.vue @@ -1284,54 +1284,54 @@ export default { } } } - .pagecontainer { - display: flex; - justify-content: center; - text-align: center; - margin-bottom: 30px; - .ant-pagination-options-quick-jumper { - margin-left: 10px; - font-size: 16px; - } - .ant-pagination-disabled { - a:hover { - color: #c5c5c5 !important; - } - } - .ant-pagination-next, - .ant-pagination-prev { - a:hover { - color: #ff6a00; - } - } - input[type="text"] { - box-shadow: none; - &:focus { - border: 1px solid #ff6a00; - } - &:hover { - border: 1px solid #ff6a00; - } - } - .ant-pagination-item { - border: none; - a:hover { - color: #ff6a00; - } - } - .ant-pagination-item-active { - background: #ff6a00; - a { - color: white; - } - a:hover { - color: white; - } - } - .ant-pagination-item-link { - border: none; - } - } + // .pagecontainer { + // display: flex; + // justify-content: center; + // text-align: center; + // margin-bottom: 30px; + // .ant-pagination-options-quick-jumper { + // margin-left: 10px; + // font-size: 16px; + // } + // .ant-pagination-disabled { + // a:hover { + // color: #c5c5c5 !important; + // } + // } + // .ant-pagination-next, + // .ant-pagination-prev { + // a:hover { + // color: #ff6a00; + // } + // } + // input[type="text"] { + // box-shadow: none; + // &:focus { + // border: 1px solid #ff6a00; + // } + // &:hover { + // border: 1px solid #ff6a00; + // } + // } + // .ant-pagination-item { + // border: none; + // a:hover { + // color: #ff6a00; + // } + // } + // .ant-pagination-item-active { + // background: #ff6a00; + // a { + // color: white; + // } + // a:hover { + // color: white; + // } + // } + // .ant-pagination-item-link { + // border: none; + // } + // } } .maincontentright { > div { diff --git a/src/components/userinfo/usercenter/components/mybalance.vue b/src/components/userinfo/usercenter/components/mybalance.vue index 744b897..f9aff82 100644 --- a/src/components/userinfo/usercenter/components/mybalance.vue +++ b/src/components/userinfo/usercenter/components/mybalance.vue @@ -1,10 +1,49 @@ @@ -32,6 +49,11 @@ export default { // 组件状态值 data() { return { + pagination: { + pageNum: 1, + pageSize: 2, + total: 8, //分页配置 + }, columns: [ { title: "序号", @@ -108,6 +130,12 @@ export default { // 组件方法 methods: { onChange(e) { + this.pagination.pageNum = e; + console.log(e); + }, + inputpageChange(e) { + this.pagination.pageNum = e.target.value; + // this.getJobList(); console.log(e); }, }, @@ -120,6 +148,7 @@ export default { padding-bottom: 16px; justify-content: space-between; border-bottom: 1px solid rgba(77, 87, 94, 0.1); + margin-top: 16px; margin-bottom: 16px; span { font-size: 20px; diff --git a/src/components/userinfo/usercenter/components/mycard.vue b/src/components/userinfo/usercenter/components/mycard.vue index 6437458..9327073 100644 --- a/src/components/userinfo/usercenter/components/mycard.vue +++ b/src/components/userinfo/usercenter/components/mycard.vue @@ -1,16 +1,39 @@ @@ -47,6 +115,7 @@ export default { padding-bottom: 16px; justify-content: space-between; border-bottom: 1px solid rgba(77, 87, 94, 0.1); + margin-top: 16px; margin-bottom: 16px; span { font-size: 20px; @@ -68,4 +137,95 @@ export default { } } } +.cardbox { + ul { + li.used { + // 已使用和已过期的样式 + background: #eeeeee; + border: 1px solid #cccccc; + > div:nth-of-type(1) { + h1 { + color: #999999; + + span { + color: #999999; + } + } + p { + color: #999999; + } + } + + > div:nth-of-type(4) { + background: #cccccc; + } + } + li { + // display: flex; + // justify-content: space-between; + // align-items: center; + position: relative; + margin-bottom: 16px; + height: 102px; + // width: 790px; + background-color: #fff1e7; + border: 1px solid #ff6a00; + border-radius: 8px; + div { + float: left; + + vertical-align: middle; + // flex: 1; + } + > div:nth-of-type(1) { + margin-left: 52px; + margin-top: 16px; + color: #ff6a00; + h1 { + color: #ff6a00; + font-size: 44px; + font-weight: bold; + line-height: 44px; + span { + font-size: 32px; + } + } + p { + font-size: 16px; + text-align: right; + } + } + > div:nth-of-type(2) { + margin-top: 24px; + margin-left: 83px; + p:first-child { + font-size: 20px; + color: #4d575e; + } + p:last-child { + font-size: 16px; + color: #999999; + } + } + > div:nth-of-type(3) { + margin-top: 40px; + margin-left: 80px; + font-size: 16px; + color: #666666; + } + > div:nth-of-type(4) { + margin-top: 38px; + width: 68px; + height: 28px; + font-size: 14px; + line-height: 28px; + float: right; + color: #fff; + background: #ff6a00; + text-align: center; + border-radius: 96px 0px 0px 96px; + } + } + } +} diff --git a/src/components/userinfo/usercenter/components/myintegral.vue b/src/components/userinfo/usercenter/components/myintegral.vue index 3834a2d..b00c6f9 100644 --- a/src/components/userinfo/usercenter/components/myintegral.vue +++ b/src/components/userinfo/usercenter/components/myintegral.vue @@ -1,5 +1,52 @@ - + diff --git a/src/components/userinfo/usercenter/components/townsman.vue b/src/components/userinfo/usercenter/components/townsman.vue index 65bf7e0..c2512dc 100644 --- a/src/components/userinfo/usercenter/components/townsman.vue +++ b/src/components/userinfo/usercenter/components/townsman.vue @@ -11,11 +11,28 @@ {{ text }} +
+ +
+ 跳至页 +
+
@@ -31,6 +48,11 @@ export default { // 组件状态值 data() { return { + pagination: { + pageNum: 1, + pageSize: 2, + total: 8, //分页配置 + }, columns: [ { title: "序号", @@ -97,6 +119,12 @@ export default { // 组件方法 methods: { onChange(e) { + this.pagination.pageNum = e; + console.log(e); + }, + inputpageChange(e) { + this.pagination.pageNum = e.target.value; + // this.getJobList(); console.log(e); }, }, @@ -109,6 +137,7 @@ export default { padding-bottom: 16px; justify-content: space-between; border-bottom: 1px solid rgba(77, 87, 94, 0.1); + margin-top: 16px; margin-bottom: 16px; span { font-size: 20px; diff --git a/src/components/userinfo/usercenter/index.vue b/src/components/userinfo/usercenter/index.vue index 4878ec4..0416b77 100644 --- a/src/components/userinfo/usercenter/index.vue +++ b/src/components/userinfo/usercenter/index.vue @@ -139,14 +139,14 @@ export default { } } .usercontent { - height: 1000px; + // height: 1000px; margin-top: 16px; // background-color: pink; display: flex; .leftlist { width: 346px; - height: 500px; - background-color: skyblue; + // height: 500px; + // background-color: skyblue; margin-right: 16px; .userbaseinfo { ul { @@ -157,7 +157,7 @@ export default { li { position: relative; display: flex; - padding: 16px 16px 16px 16px; + padding: 16px; line-height: 24px; justify-content: space-between; background-color: #fff; @@ -238,8 +238,8 @@ export default { } .rightcontent { width: 838px; - height: 600px; - padding: 16px; + // height: 600px; + padding: 0 16px; background-color: #fff; } } diff --git a/src/style/index.less b/src/style/index.less index 543fdee..daa1afe 100644 --- a/src/style/index.less +++ b/src/style/index.less @@ -291,6 +291,57 @@ i { width: 1200px; margin: 0 auto; } + +// 分页器样式 +.pagecontainer { + display: flex; + justify-content: center; + text-align: center; + margin-bottom: 30px; + margin-top: 15px; + .ant-pagination-options-quick-jumper { + margin-left: 10px; + font-size: 16px; + } + .ant-pagination-disabled { + a:hover { + color: #c5c5c5 !important; + } + } + .ant-pagination-next, + .ant-pagination-prev { + a:hover { + color: #ff6a00; + } + } + input[type="text"] { + box-shadow: none; + &:focus { + border: 1px solid #ff6a00; + } + &:hover { + border: 1px solid #ff6a00; + } + } + .ant-pagination-item { + border: none; + a:hover { + color: #ff6a00; + } + } + .ant-pagination-item-active { + background: #ff6a00; + a { + color: white; + } + a:hover { + color: white; + } + } + .ant-pagination-item-link { + border: none; + } +} .ant-cascader-menus.monthlypay, .ant-cascader-menus.agestr { width: 100vw; @@ -404,7 +455,7 @@ i { } } -.beforeblock { +.beforeblock { display: inline-block; vertical-align: middle; margin-top: -4px; diff --git a/src/utils/request.js b/src/utils/request.js index 8b922c6..4f7cb91 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,5 +1,5 @@ import axios from "axios"; -const baseURL = "http://1shoudan.com"; +// const baseURL = "http://1shoudan.com"; // const baseURL = "https://d.matripe.com.cn"; // const baseURL = "http://bl7.matripe.com.cn:8001"; // const baseURL = "http://nb.renminshitang.com.cn"; @@ -8,8 +8,8 @@ const baseURL = "http://1shoudan.com"; axios.defaults.withCredentials = true; //添加这行代码 const service = axios.create({ - // baseURL: "/api_prod", // url = base url + request url - baseURL: baseURL, // baseURL: "/api", // url = base url + request url // url = base url + request url + baseURL: "/api_prod", // url = base url + request url + // baseURL: baseURL, // baseURL: "/api", // url = base url + request url // url = base url + request url withCredentials: true, // send cookies when cross-domain requests timeout: 10000, // request timeout crossDomain: true, diff --git a/src/views/userinfo.vue b/src/views/userinfo.vue index d38c6db..bb8de29 100644 --- a/src/views/userinfo.vue +++ b/src/views/userinfo.vue @@ -165,13 +165,7 @@