angelo
/
web-base-pc
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(register): 布局更改

This commit is contained in:
woody 2025-05-07 15:02:11 +08:00
parent 8f9c980ad2
commit 4e877a1ea0
7 changed files with 98 additions and 427 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/api/person.js
View File

@ -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
})
}

14
src/components/HeaderTop.vue
View File

@ -50,7 +50,11 @@
<div class="aBsolt_ii">{{ item.label }}</div>
<div
class="aBsolt_c"
v-if="childShow == item.value && item.children.length > 0"
v-if="
childShow == item.value &&
item.children &&
item.children.length > 0
"
>
<div
v-for="ctem in item.children"
@ -427,6 +431,7 @@ export default {
});
},
openPage(item) {
console.log(item, "....item");
this.$router.push({
path: item.path,
query: {
@ -456,8 +461,7 @@ export default {
}
return;
}
// console.log("🌈", item, ctem);
if (ctem == undefined && item.children.length == 0) {
if (ctem == undefined && !item.children?.length) {
if (item.value == 30) {
this.getAuth();
} else {
@ -472,7 +476,7 @@ export default {
}
this.$router.push(routeParams);
}
} else if (ctem != undefined && item.children.length > 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;
}

2
src/components/special-area-list/index.vue
View File

@ -10,7 +10,7 @@
round
plain
class="more-button"
@click="() => goToMore()"
@click="() => goToMore(specialAreaId)"
>
<span class="more-text">更多</span>
<i class="el-icon-arrow-right"></i>

8
src/views/index/components/sidebarUserInfo.vue
View File

@ -35,7 +35,7 @@
<!--! 用户卡片信息 -->
<div class="awardscard">
<div class="user-cards" @click="clickTap">
<div class="user-cards">
<div class="user-cards-left">
<div class="progress-wrapper">
<div class="progress-wrapper__label">昨日业绩</div>
@ -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;

216
src/views/personal/index.vue
View File

@ -51,23 +51,20 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'自然国家'">
<el-input disabled v-model="form.countryName"></el-input>
<el-form-item :label="'创建日期'">
<el-input disabled v-model="form.payTime"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="rowBto" justify="space-between">
<el-col :span="6">
<el-form-item :label="'结算国家'">
<el-input
disabled
v-model="form.settleCountryName"
></el-input>
<el-form-item :label="'注册等级'">
<el-input disabled v-model="form.registerGradeVal"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'注册等级'">
<el-input disabled v-model="form.registerGradeVal"></el-input>
<el-form-item :label="'注册业绩'">
<el-input disabled v-model="form.consumeAchieve"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -78,32 +75,10 @@
</el-row>
<el-row type="flex" class="rowBto" justify="space-between">
<el-col :span="6">
<el-form-item :label="'代理等级'">
<el-input disabled v-model="form.agentGrade"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'真实奖衔'">
<el-form-item :label="'荣誉奖衔'">
<el-input disabled v-model="form.awardsVal"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="荣誉奖衔">
<el-input disabled v-model="form.maxAwardsVal"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="rowBto" justify="space-between">
<el-col :span="6">
<el-form-item :label="'创建日期'">
<el-input disabled v-model="form.payTime"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'注册业绩'">
<el-input disabled v-model="form.consumeAchieve"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'会员权益'">
<el-input
@ -112,8 +87,6 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="rowBto" justify="space-between">
<el-col :span="6">
<el-form-item :label="'支付时间'">
<el-input disabled v-model="form.payTime"></el-input>
@ -139,104 +112,7 @@
<div class="redBtn" @click="saveNickName">{{ "保存" }}</div>
</div>
</div>
<!-- 电子会员卡 -->
<div class="main_r" v-show="isClick == 5">
<div class="card_title">{{ "电子会员卡" }}</div>
<div class="card-center" id="myImage">
<div class="id-card1">
<div class="bg-color" v-if="userInfo.headPath">
<img :src="userInfo.headPath" />
<!-- <div>{{ userInfo.pkAwardsVal }}</div>-->
</div>
<div class="card-content">
<div class="icon">
<img src="@/assets/images/logo.png" />
</div>
<div class="number" style="color: #ffff00">
{{ "会员编号" }}:{{ userInfo.memberCode }}
</div>
<div class="number">{{ "姓名" }}：{{ userInfo.memberName }}</div>
<div class="number">{{ "等级" }}：{{ userInfo.pkGradeVal }}</div>
<div class="number">{{ "国家" }}：{{ userInfo.pkCountryVal }}</div>
<div class="CN">
{{ "国家编码" }}：<span>{{ userInfo.countryCode }}</span>
</div>
</div>
</div>
<div class="id-card1">
<div class="number margin_s">
<!-- <div class="CN flexs">
{{ '全球编号' }}：{{ userInfo.globalCode }}
</div> -->
<div style="margin-right: 30px">
{{ "注册时间" }}：{{ datatime(userInfo.registerTime) }}
</div>
</div>
<div class="card-img">
<div class="imged">
<img v-if="userInfo.awardsIcon" :src="userInfo.awardsIcon" />
<div class="award">{{ form.awardsVal }}</div>
</div>
</div>
<div class="icons">
<div class="CN flexs" style="color: #fff">
{{ "全球编号" }}：{{ userInfo.globalCode }}
</div>
<!-- <img src="@/assets/images/logo.png" /> -->
</div>
<div
class="card-content"
style="color: #fff; margin-top: 30px; font-size: 14px"
></div>
</div>
</div>
<div class="download" @click="saveImage">{{ "下载图片" }}</div>
<a id="link"></a>
</div>
<!-- 地址管理 -->
<div class="main_r" v-show="isClick == 6">
<div class="main_rt">
<div class="tit">{{ "礼品地址" }}</div>
<div class="tab_le">
<el-table
:data="addressArr1"
style="width: 100%"
:header-cell-style="{ background: '#EEEEEE' }"
:row-class-name="tableRowClassName"
>
<el-table-column
align="center"
prop="accountName"
:label="'收货人'"
>
</el-table-column>
<el-table-column align="center" prop="phone" :label="'联系方式'">
</el-table-column>
<el-table-column align="center" prop="pkProvinceVal" :label="'省'">
</el-table-column>
<el-table-column align="center" prop="pkCityVal" :label="'市'">
</el-table-column>
<el-table-column align="center" prop="pkCountyVal" :label="'区/县'">
</el-table-column>
<el-table-column align="center" prop="address" :label="'详细地址'">
</el-table-column>
<el-table-column align="center" prop="time" :label="'操作'">
<template slot-scope="scope">
<el-button
@click="changeAds1(scope.row)"
type="text"
size="small"
>
{{ "修改" }}
</el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
</div>
<!-- 地址管理 -->
<div class="main_r" v-show="isClick == 4">
<div class="main_rt">
@ -387,16 +263,7 @@
<div @click="loginPwd = 0">{{ "修改支付密码" }}</div>
</el-col>
</el-row>
<el-row>
<el-col :span="14">
<el-form-item :label="'绑定邮箱'">
<el-input v-model="safty.email" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="10" class="righTxt">
<div @click="loginPwd = 3">{{ "设置邮箱" }}</div>
</el-col>
</el-row>
<el-row>
<el-col :span="14">
<el-form-item :label="'联系方式'">
@ -704,7 +571,6 @@
</div>
</div>
<AddAddress ref="addAddress" @getAdList="getAddressList"></AddAddress>
<giftAddress ref="addAddress1" @getAdList1="getAddressList1"></giftAddress>
</div>
</template>
@ -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;

185
src/views/register/index.vue
View File

@ -48,101 +48,7 @@
<el-input v-model="ruleForm.pkGradeVal" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<!-- <el-form-item :label="'自然国家'"
prop="pkCountry"
class="guoqikang">
<el-select v-model="ruleForm.pkCountry"
placeholder=""
@change="changeSelection"
ref="select"
popper-class="guoqi">
<el-option v-for="item in countryList"
:key="item.pkId"
:label="item.name"
:value="item.pkId">
<img :src="item.nationalFlag2"
class="imgSize" />
<div class="shortName">{{ item.shortName }}</div>
</el-option>
</el-select>
</el-form-item> -->
<el-form-item :label="'自然国家'" prop="pkCountry" class="guoqikang">
<el-select
v-model="ruleForm.pkCountry"
placeholder=""
@change="changeSelection"
ref="select"
popper-class="guoqi"
>
<el-option
v-for="item in countryList"
:key="item.pkId"
:label="item.name"
:value="item.pkId"
>
<div class="option_box">
<el-image
class="option_img"
:src="item.nationalFlag2"
></el-image>
<span v-text="item.shortName"></span>
</div>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<!-- <el-form-item :label="'结算国家'"
class="guoqikang"
prop="pkSettleCountry">
<el-select v-model="ruleForm.pkSettleCountry"
:disabled="true"
placeholder=""
ref="select1"
popper-class="guoqi">
<el-option v-for="item in countryList"
:key="item.pkId"
:label="item.name"
:value="item.pkId">
<img :src="item.nationalFlag2"
class="imgSize" />
<div class="shortName">{{ item.shortName }}</div>
</el-option>
</el-select>
</el-form-item> -->
<el-form-item
:label="'结算国家'"
class="guoqikang"
prop="pkSettleCountry"
>
<el-select
v-model="ruleForm.pkSettleCountry"
:disabled="true"
@change="changeSelection1"
placeholder=""
ref="select1"
popper-class="guoqi"
>
<el-option
v-for="item in countryList"
:key="item.pkId"
:label="item.name"
:value="item.pkId"
>
<div class="option_box">
<el-image
class="option_img"
:src="item.nationalFlag2"
></el-image>
<span v-text="item.shortName"></span>
</div>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40" class="padRow">
<el-col :span="6">
<el-form-item :label="'推荐编号'" prop="parent">
<el-input
@ -179,8 +85,6 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40" class="padRow">
<el-col :span="6">
<el-form-item :label="'安置位置'" prop="placeDept">
<!-- <div class="dis_flex"> -->
@ -200,7 +104,11 @@
<!-- </div> -->
</el-form-item>
</el-col>
<el-col :span="6" v-if="userInfo.specialRegistration == 1">
<el-col
key="specialRegistration-member"
:span="6"
v-if="userInfo.specialRegistration == 1"
>
<el-form-item :label="'会员姓名'" prop="memberName">
<el-input
v-model="ruleForm.memberName"
@ -209,7 +117,11 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="6" v-if="userInfo.specialRegistration == 1">
<el-col
key="specialRegistration-phone"
:span="6"
v-if="userInfo.specialRegistration == 1"
>
<el-form-item :label="'联系方式'" prop="phone" v-if="pkCountry == 1">
<el-input
v-model="ruleForm.phone"
@ -227,7 +139,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="6" v-if="userInfo.specialRegistration == 0">
<!-- <el-col :span="6" v-if="userInfo.specialRegistration == 0">
<el-form-item :label="'会员姓名'" prop="memberName">
<el-input
v-model="ruleForm.memberName"
@ -244,18 +156,16 @@
:placeholder="'请输入联系方式'"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6" v-if="pageList.card">
</el-col> -->
<!-- <el-col :span="6" v-if="pageList.card">
<el-form-item :label="'证件号码'">
<el-input
v-model="ruleForm.idCard"
:placeholder="'请输入证件号码'"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40" class="padRow">
<el-col :span="6" v-if="pageList.bankName">
</el-col> -->
<!-- <el-col :span="6" v-if="pageList.bankName">
<el-form-item :label="'银行名称'">
<el-select
v-model="ruleForm.pkBank"
@ -287,19 +197,8 @@
:placeholder="'请输入开户支行'"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6" v-if="pageList.mail">
<el-form-item :label="'邮箱'" prop="email">
<el-input
v-model="ruleForm.email"
type="email"
:placeholder="'请输入邮箱'"
></el-input>
</el-form-item>
</el-col>
<!-- </el-row>
<el-row :gutter="40"
class="padRow"> -->
</el-col> -->
<el-col :span="6">
<el-form-item :label="'发货方式'" prop="deliveryWay">
<el-select
@ -339,54 +238,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" v-if="howSure">
<el-form-item :label="'创客空间'" prop="makerSpaceMember">
<el-select
v-model="ruleForm.makerSpaceMember"
:placeholder="'请选择'"
>
<el-option
v-for="item in queryCardList"
:key="item.pkMember"
:label="item.storeName"
:value="item.pkMember"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" v-if="pkCountry != 1">
<el-form-item :label="'会员店铺'">
<el-select
v-model="ruleForm.pkMemberStore"
:placeholder="'请选择会员店铺'"
>
<el-option
v-for="item in storeList"
:key="item.pkId"
:label="item.storeName"
:value="item.pkId"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" v-if="pkCountry != 1">
<el-form-item :label="'仓库'">
<el-select
v-model="ruleForm.pkStorehouse"
:placeholder="'请选择仓库'"
>
<el-option
v-for="item in storehouseList"
:key="item.pkId"
:label="item.name"
:value="item.pkId"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- 收货人信息 -->
<div v-show="isDeliveryWay">

6
src/views/shoppingMall/index.vue
View File

@ -186,7 +186,7 @@
<el-row :gutter="10" style="width: 100%">
<el-col :span="8">
<el-input
:placeholder="'请输商品名称'"
placeholder="请输入商品名称"
@keyup.enter.native="getAllGoods1()"
v-model="waresName"
clearable
@ -194,9 +194,7 @@
</el-input>
</el-col>
<el-col :span="4">
<el-button type="danger" class="delBtn" @click="getAllGoods1()">{{
"搜索"
}}</el-button>
<el-button type="primary" @click="getAllGoods1()">搜索</el-button>
</el-col>
</el-row>
</div>