diff --git a/src/api/person.js b/src/api/person.js index 41dbd47..bb71fa1 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -1,96 +1,88 @@ /* - * @Descripttion: - * @version: + * @Descripttion: + * @version: * @Author: kBank * @Date: 2023-03-03 15:41:50 */ -import request from '@/util/request' +import request from "@/util/request"; // 获取个人资料 export function memberInfo(params) { return request({ - url: '/member/api/member/get-data', - method: 'get', - params - }) + url: "/member/api/member/get-data", + method: "get", + params, + }); } // 地址列标 export function addressList(params) { return request({ - url: '/member/api/member-address/list', - method: 'get', - params - }) + url: "/member/api/member-address/list", + method: "get", + params, + }); } // 会员地址列表 export function getMemberGift(params) { return request({ - url: '/member/api/member-gift/member-gift-list', - method: 'get', - params - }) + url: "/member/api/member-gift/member-gift-list", + method: "get", + params, + }); } // 更新昵称 export function memberInfoUpdate(data) { return request({ - url: '/member/api/member/update-data', - method: 'put', - data - }) + url: "/member/api/member/update-data", + method: "put", + data, + }); } // 更新头像 export function memberInfoHeadUpdate(data) { return request({ - url: '/member/api/member/update-head', - method: 'put', - data - }) + url: "/member/api/member/update-head", + method: "put", + data, + }); } // 更新密码 export function updatePwd(data) { return request({ - url: '/member/api/member/update-password', - method: 'put', - data - }) + url: "/member/api/member/update-password", + method: "put", + data, + }); } // 验证码 export function verification(params) { return request({ - url: '/member/api/sms/verification', - method: 'get', - params - }) + url: "/member/api/sms/verification", + method: "get", + params, + }); } // 当前用户短信验证码 export function selfVerification(params) { return request({ - url: '/member/api/sms/self-verification', - method: 'get', - params - }) + url: "/member/api/sms/self-verification", + method: "get", + params, + }); } // 更新邮箱 export function updateEmail(data) { return request({ - url: '/member/api/member/update-email', - method: 'put', - data - }) + url: "/member/api/member/update-email", + method: "put", + data, + }); } // 更新支付密码 export function forgetPassword(data) { return request({ - url: '/member/api/member/forget-pay-password', - method: 'put', - data - }) + url: "/member/api/member/forget-pay-password", + method: "put", + data, + }); } -// 获取会员卡信息 -export function getCard(params) { - return request({ - url: '/member/api/member/get-card', - method: 'get', - params - }) -} \ No newline at end of file diff --git a/src/components/HeaderTop.vue b/src/components/HeaderTop.vue index 8121eba..7a5e6b2 100644 --- a/src/components/HeaderTop.vue +++ b/src/components/HeaderTop.vue @@ -50,7 +50,11 @@
{{ item.label }}
0) { + } else if (ctem != undefined && item.children?.length > 0) { this.$router.push({ path: "/shoppingMall", query: { @@ -771,7 +775,7 @@ export default { .aBsolt_ic:hover { color: #ffffff; - background: #e80502; + background: var(--primary-color); margin: 0 30px; border-radius: 8px 8px 8px 8px; } diff --git a/src/components/special-area-list/index.vue b/src/components/special-area-list/index.vue index 4d437b6..4ea404c 100644 --- a/src/components/special-area-list/index.vue +++ b/src/components/special-area-list/index.vue @@ -10,7 +10,7 @@ round plain class="more-button" - @click="() => goToMore()" + @click="() => goToMore(specialAreaId)" > 更多 diff --git a/src/views/index/components/sidebarUserInfo.vue b/src/views/index/components/sidebarUserInfo.vue index 6464a8b..3c009e2 100644 --- a/src/views/index/components/sidebarUserInfo.vue +++ b/src/views/index/components/sidebarUserInfo.vue @@ -35,7 +35,7 @@
-
+
昨日业绩
@@ -292,7 +292,8 @@ export default { .sidebar-container { width: 380px; - padding: 20px 0; + box-sizing: border-box; + padding: 20px; background: #ffffff; box-shadow: 5px 5px 20px 0px rgba(233, 233, 233, 0.5); border-radius: 10px 10px 10px 10px; @@ -349,6 +350,7 @@ export default { line-height: 40px; font-size: 14px; color: #666; + justify-content: center; .margin-s { margin: 0 10px; } @@ -367,7 +369,7 @@ export default { } .awardscard { - width: 346px; + width: 100%; margin: 0 auto; margin-top: 10px; background: url("~@/assets/images/id-card-bg.png") no-repeat; diff --git a/src/views/personal/index.vue b/src/views/personal/index.vue index fcd5ba7..cb62bb5 100644 --- a/src/views/personal/index.vue +++ b/src/views/personal/index.vue @@ -51,23 +51,20 @@ - - + + - - + + - - + + @@ -78,32 +75,10 @@ - - - - - - + - - - - - - - - - - - - - - - - - - - @@ -139,104 +112,7 @@
{{ "保存" }}
- -
-
{{ "电子会员卡" }}
-
-
-
- - -
-
-
- -
-
- {{ "会员编号" }}:{{ userInfo.memberCode }} -
-
{{ "姓名" }}：{{ userInfo.memberName }}
-
{{ "等级" }}：{{ userInfo.pkGradeVal }}
-
{{ "国家" }}：{{ userInfo.pkCountryVal }}
-
- {{ "国家编码" }}：{{ userInfo.countryCode }} -
-
-
-
-
- -
- {{ "注册时间" }}：{{ datatime(userInfo.registerTime) }} -
-
-
-
- -
{{ form.awardsVal }}
-
-
-
-
- {{ "全球编号" }}：{{ userInfo.globalCode }} -
- -
-
-
-
-
{{ "下载图片" }}
- -
- -
-
-
{{ "礼品地址" }}
-
- - - - - - - - - - - - - - - - - - -
-
-
@@ -387,16 +263,7 @@
{{ "修改支付密码" }}
- - - - - - - -
{{ "设置邮箱" }}
- - + @@ -704,7 +571,6 @@
-
@@ -721,7 +587,6 @@ import { checkIfShow } from "@/api/wallet.js"; import { numberToCurrencyNo } from "@/util/numberToCurrency"; import { getMemberGift } from "@/api/person.js"; -import { getCard } from "../../api/person"; export default { components: { AddAddress, @@ -787,18 +652,18 @@ export default { // id: 3, // text: '会员积分', // }, - { - id: 6, - text: "礼品地址", - }, + // { + // id: 6, + // text: "礼品地址", + // }, { id: 4, text: "地址管理", }, - { - id: 5, - text: "电子会员卡", - }, + // { + // id: 5, + // text: "电子会员卡", + // }, ], form: { headPath: "", @@ -821,10 +686,8 @@ export default { this.isClick = this.$route.query.id; this.getMemberInfo(); this.getAddressList(); - this.getAddressList1(); this.getAllArea(); this.checkIfShow(); - this.getCardInfo(); }, methods: { checkIfShow() { @@ -832,21 +695,7 @@ export default { this.showFix = res.data.existDomicile; }); }, - getCardInfo() { - api.getCard().then((res) => { - this.userInfos = res.data; - if (res.data.gradeIconStr) { - this.userInfos.gradeIconStr = - "data:image/png;base64," + res.data.gradeIconStr; - this.userInfos.gradeIconStr.replace(/[\r\n]/g, ""); - } - if (res.data.awardsIconStr) { - this.userInfos.awardsIconStr = - "data:image/png;base64," + res.data.awardsIconStr; - this.userInfos.awardsIconStr.replace(/[\r\n]/g, ""); - } - }); - }, + getAuth() { ads.authenticationDetails().then((res) => { if (res.data) { @@ -890,29 +739,7 @@ export default { } return false; }, - saveImage() { - const options = { - backgroundColor: null, // null或transparent可将canvas背景设置为透明 - allowTaint: false, - useCORS: true /*使用跨域*/, - }; - html2canvas(document.querySelector("#myImage"), options).then( - (canvas) => { - const image = canvas - .toDataURL("image/png") - .replace("image/png", "image/octet-stream"); - const link = document.getElementById("link"); - link.setAttribute("download", "电子会员卡.png"); - link.setAttribute( - "href", - canvas - .toDataURL("image/png") - .replace("image/png", "image/octet-stream") - ); - link.click(); - } - ); - }, + datatime(value) { var data = new Date(value); const month = @@ -1095,11 +922,7 @@ export default { changeAds(id) { this.$refs.addAddress.isShowAddress(true, this.areaData, id); }, - getAddressList1() { - api.getMemberGift().then((res) => { - this.addressArr1 = res.data; - }); - }, + getAddressList() { api.addressList().then((res) => { this.addressArr = res.data; @@ -1358,6 +1181,7 @@ export default { .safty { text-align: center; width: 40%; + min-width: 800px; margin: 100px auto 0 auto; ::v-deep .el-row { display: flex; diff --git a/src/views/register/index.vue b/src/views/register/index.vue index bcdab7a..025d149 100644 --- a/src/views/register/index.vue +++ b/src/views/register/index.vue @@ -48,101 +48,7 @@ - - - - - -
- - -
- - - - - - - - - -
- - -
- - - - - - + - - @@ -200,7 +104,11 @@ - + - + - + + + + --> + - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/views/shoppingMall/index.vue b/src/views/shoppingMall/index.vue index 60e73fe..53fee02 100644 --- a/src/views/shoppingMall/index.vue +++ b/src/views/shoppingMall/index.vue @@ -186,7 +186,7 @@ - {{ - "搜索" - }} + 搜索