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

Merge branch 'dev' of http://47.94.45.65:3000/angelo/web-zk-h5 into test

This commit is contained in:
woody 2025-11-04 10:14:02 +08:00
parent fd94ae706d 9a441a4831
commit 67d8ea296c
5 changed files with 257 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/area-product-list/special-area-wrapper.vue
View File

@ -103,7 +103,7 @@ export default {
},
created() {
this.getAreaListById(UPGRADE_AREA.id, this.upgradeList)
this.getAreaListById(REGIEST_AREA.id, this.registList)
// this.getAreaListById(REGIEST_AREA.id, this.registList)
this.getAreaListById(REPURCHASE_AREA.id, this.repurchaseList)
this.getAreaListById(HALF_PRICE_AREA.id, this.halfPriceList)
this.getAreaListById(REISSUE_AREA.id, this.rescissionList)

5
pages/index/index.vue
View File

@ -1,11 +1,6 @@
<template>
<view :class="userInfo && userInfo.skin ? 'content1' : 'content'">
<view class="content_a">
<!-- 商品专区入口 先别删 -->
<!-- <view @tap="goSpecialArea">会员专区</view> -->
<!-- <view :class="userInfo && userInfo.skin ? 'index-top1' : 'index-top'">
</view> -->
<view class="banner" v-if="isEmpty(banners) == false">
<view class="uni-margin-wrap">
<swiper

446
pages/shareRegist/index.vue
View File

@ -1,64 +1,55 @@
<!--
* @Descripttion:
* @version:
* @Author: kBank
* @Date: 2022-11-21 15:11:22
-->
<template>
<view>
<view v-if="!pkCountry" class="content1">
<!-- <view class="index_header">
<view>注册</view>
</view> -->
<!-- <view class="tit" v-if="!pkCountry">{{ '嗨粉扫天下' }}</view> -->
<!-- 海粉 -->
<view class="content1">
<!-- <view class="title">欢迎注册</view> -->
<view class="formed1">
<u-form :model="form" labelWidth="80px" ref="uForm" :rules="rules">
<u-form-item label="" prop="memberCode">
<u-input v-model="form.memberCode" type="number" disabled>
<u--text
:text="howHeader"
slot="prefix"
margin="0 3px 0 0"
type="tips"
></u--text>
</u-input>
</u-form-item>
<u-form-item label="" prop="memberName">
<u-form
:model="form"
labelWidth="90px"
ref="uForm"
labelPosition="top"
:rules="rules"
>
<!-- <u-form-item label="推荐编号" prop="parentCode">
<u-input v-model="form.parentCode" disabled> </u-input>
</u-form-item> -->
<u-form-item label="会员姓名" prop="memberName">
<u-input
class="custom-input"
v-model="form.memberName"
:placeholder="'请输入会员姓名'"
/>
</u-form-item>
<u-form-item label="" prop="phone">
<u-form-item label="联系方式" prop="phone">
<u-input
class="custom-input"
v-model="form.phone"
@blur="setMemberCode"
:placeholder="'请输入联系方式'"
type="number"
maxlength="20"
/>
</u-form-item>
<u-form-item label="" prop="loginPassword">
<!--
<u-form-item label="登录密码" prop="loginPwd">
<u-input
:password="isPwd"
:placeholder="'请输入登录密码'"
v-model="form.loginPassword"
v-model="form.loginPwd"
>
<template slot="suffix">
<template #suffix>
<u-icon name="eye" @tap="isPwd = !isPwd" v-if="!isPwd"></u-icon>
<u-icon name="eye-off" @tap="isPwd = !isPwd" v-else></u-icon>
</template>
</u-input>
</u-form-item>
<u-form-item label="" prop="payPassword">
<u-form-item label="支付密码" prop="payPwd">
<u-input
:password="isPwd2"
:placeholder="'请输入支付密码'"
v-model="form.payPassword"
v-model="form.payPwd"
>
<template slot="suffix">
<template #suffix>
<u-icon
name="eye"
@tap="isPwd2 = !isPwd2"
@ -68,13 +59,14 @@
</template>
</u-input>
</u-form-item>
<u-form-item label="" prop="code">
<u-input v-model="form.code" :placeholder="'请输入验证码'">
<template slot="suffix">
<u-form-item label="验证码" prop="smsCode">
<u-input v-model="form.smsCode" :placeholder="'请输入验证码'">
<template #suffix>
<view class="getCode" @tap="getVilCode">{{ getCode }}</view>
</template>
</u-input>
</u-form-item>
-->
</u-form>
<u-button
type="success"
@ -84,111 +76,60 @@
:loading="isLoading"
:loadingText="'注册中'"
@click="toLogin"
>{{ '立即注册' }}</u-button
>{{ '欢迎注册' }}</u-button
>
</view>
</view>
<view v-else class="content">
<!-- <view class="tit" >{{ '海粉扫天下' }}</view>
<view class="formed"
>
<u-form :model="form"
ref="uForm1"
:rules="rules1"
labelWidth="80px">
<u-form-item label=""
prop="memberName">
<u-input v-model="form.memberName"
:placeholder="'请输入真实姓名'" />
</u-form-item>
<u-form-item label=""
prop="phone">
<u-input v-model="form.phone"
:placeholder="'请输入联系方式'" />
</u-form-item>
<u-form-item label=""
prop="code">
<u-input v-model="form.code"
:placeholder="'请输入验证码'">
<template slot="suffix">
<view class="getCode"
@tap="getVilCode">{{ getCode }}</view>
</template>
</u-input>
</u-form-item>
<u-form-item label=""
@click="selCountry">
<view class="picker">
<u-input v-model="form.pkCountryName"
disabled
disabledColor="#ffffff"
:placeholder="'请选择自然国'"
border="none"></u-input>
<u-icon name="arrow-right"></u-icon>
</view>
</u-form-item>
<u-form-item label="">
<view class="picker">
<u-input v-model="form.jsName"
disabled
disabledColor="#ffffff"
:placeholder="'请选择结算国'"
border="none"></u-input>
</view>
</u-form-item>
<u-form-item label=""
prop="loginPassword">
<u-input :password="isPwd1"
:placeholder="'请输入登录密码'"
v-model="form.loginPassword">
<template slot="suffix">
<u-icon name="eye"
@tap="isPwd1=!isPwd1"
v-if="!isPwd1"></u-icon>
<u-icon name="eye-off"
@tap="isPwd1=!isPwd1"
v-else></u-icon>
</template>
</u-input>
</u-form-item>
<u-form-item label=""
prop="payPassword">
<u-input :password="isPwd2"
:placeholder="'请输入支付密码'"
v-model="form.payPassword">
<template slot="suffix">
<u-icon name="eye"
@tap="isPwd2=!isPwd2"
v-if="!isPwd2"></u-icon>
<u-icon name="eye-off"
@tap="isPwd2=!isPwd2"
v-else></u-icon>
</template>
</u-input>
</u-form-item>
</u-form>
<u-button type="success"
class="uBtn"
shape="circle"
color="linear-gradient(to right, #005BAC, #005BAC )"
:loading="isLoading"
:loadingText="'注册中'"
@click="hiLogin">{{ '立即注册' }}</u-button>
<u-picker :show="isCountry"
keyName="label"
immediateChange
@confirm="confirmPopup"
@cancel="isCountry = false"
:columns="countryList"></u-picker>
</view> -->
</view>
<view class="mask" v-if="isTrue"> </view>
<u-modal
:show="showSuccessModal"
title="注册成功"
:show-cancel-button="true"
cancel-text="复制"
confirm-text="自动登录"
@confirm="onModalConfirm"
@cancel="onModalCancel"
@close="showSuccessModal = false"
>
<view class="slot-content" v-if="successData">
<view class="success-item">
<text class="item-label">会员编号:</text>
<text class="item-value">{{ successData.memberCode }}</text>
</view>
<view class="success-item">
<text class="item-label">会员姓名:</text>
<text class="item-value">{{ successData.memberName }}</text>
</view>
<view class="success-item">
<text class="item-label">联系方式:</text>
<text class="item-value">{{ successData.phone }}</text>
</view>
<view class="success-item">
<text class="item-label">登录密码:</text>
<text class="item-value">{{ successData.loginPassword }}</text>
</view>
<view class="success-item">
<text class="item-label">支付密码:</text>
<text class="item-value">{{ successData.payPassword }}</text>
</view>
<view class="success-item">
<text class="item-label">登录地址:</text>
<text class="item-value">{{ successData.urlAddress }}</text>
</view>
</view>
</u-modal>
</view>
</template>
<script>
import * as api from '@/config/goods'
import {
getMemberCode,
getPhoneCode,
getRegister,
autoLogin,
} from '@/config/share'
import { setToken } from '@/config/auth.js'
import store from '@/store'
export default {
components: {},
data() {
@ -198,6 +139,11 @@ export default {
pkParent: '',
form: {
memberName: '',
smsCode: '',
loginPwd: '',
payPwd: '',
parentCode: '',
phone: '',
},
isLoading: false,
getCode: '获取验证码',
@ -210,11 +156,13 @@ export default {
isPwd: true,
isPwd1: true,
isPwd2: true,
showSuccessModal: false,
successData: null,
rules: {
memberCode: [
parentCode: [
{
required: true,
asyncValidator: this.memberCodeRule,
message: '请输入推荐编号',
trigger: ['blur'],
},
],
@ -224,6 +172,13 @@ export default {
message: '请输入会员姓名',
trigger: ['blur'],
},
{
validator: (rule, value, callback) => {
return this.$u.test.chinese(value)
},
message: '请输入中文',
trigger: ['blur'],
},
],
phone: [
{
@ -231,22 +186,29 @@ export default {
message: '请输入联系方式',
trigger: ['blur'],
},
{
validator: (rule, value, callback) => {
return this.$u.test.mobile(value)
},
message: '手机号格式不正确',
trigger: ['blur'],
},
],
code: [
smsCode: [
{
required: true,
message: '请输入验证码',
trigger: ['blur'],
},
],
loginPassword: [
loginPwd: [
{
required: true,
message: '请输入登录密码',
trigger: ['blur'],
},
],
payPassword: [
payPwd: [
{
required: true,
message: '请输入支付密码',
@ -276,14 +238,14 @@ export default {
trigger: ['change', 'blur'],
},
],
loginPassword: [
loginPwd: [
{
required: true,
message: '请输入登录密码',
trigger: ['change', 'blur'],
},
],
payPassword: [
payPwd: [
{
required: true,
message: '请输入支付密码',
@ -296,15 +258,14 @@ export default {
onReady() {},
onLoad(options) {
this.pkParent = options.code
this.pkCountry = 1
this.getGenerate()
this.pkCountry = options.country || ''
if (this.pkCountry) {
this.getCountry()
// this.getCountry()
this.form.pkCountry = this.pkCountry
uni.setStorageSync('pkCountry', this.pkCountry)
uni.redirectTo({
url: '/pages/shareArea/hiList?pkParent=' + this.pkParent,
})
// uni.redirectTo({
// url: '/pages/shareArea/hiList?pkParent=' + this.pkParent,
// })
// this.$refs.uForm1.setRules(this.rules1)
} else {
// 获取前缀
@ -315,11 +276,22 @@ export default {
},
onShow() {},
methods: {
setMemberCode() {
// this.form.memberCode = this.form.phone
this.$set(this.form, 'memberCode', this.form.phone)
getUseInfo() {
getUseInfo().then(res => {
this.userInfo = res.data
})
},
selCountry() {
uni.showModal({
title: '提示',
content: '确认更换自然国',
success: res => {
if (res.confirm) {
this.isCountry = true
}
},
})
},
memberCodeRule(rule, value, callback) {
if (!value) {
callback(new Error('请输入会员编号'))
@ -338,44 +310,103 @@ export default {
}
},
getHeader() {
api.checkShare().then(res => {
if (res.code != 200) {
this.isTrue = true
} else {
this.isTrue = false
}
getMemberCode(this.pkParent).then(res => {
this.$set(this.form, 'parentCode', res.data)
console.log(this.form)
})
// api.prefix(this.pkParent).then((res) => {
// this.howHeader = res.msg
// })
},
getGenerate() {
return new Promise((resolve, reject) => {
api.generate().then(res => {
resolve(res)
uni.setStorageSync('mToken', res.msg)
})
api.generate().then(res => {
uni.setStorageSync('mToken', res.msg)
})
},
toLogin() {
this.$refs.uForm.validate().then(res => {
this.$refs.uForm.validate().then(() => {
this.isLoading = true
api
.regShareMember(
Object.assign({}, this.form, { parent: this.pkParent })
)
// getRegister(Object.assign({}, this.form, { parentCode: this.pkParent }))
getRegister({ ...this.form, parentCode: this.pkParent })
.then(res => {
this.isLoading = false
if (res.code == 200) {
uni.redirectTo({
url:
'/pages/shareRegist/success?allData=' +
JSON.stringify(res.data),
this.successData = res.data
this.showSuccessModal = true
} else {
uni.showToast({
title: res.msg || '注册失败',
icon: 'none',
})
}
})
.catch(() => {
this.isLoading = false
uni.showToast({
title: '注册请求失败',
icon: 'none',
})
})
})
},
onModalConfirm() {
if (this.successData) {
this.handleAutoLogin(this.successData)
}
},
onModalCancel() {
if (this.successData) {
const modalContent = `会员编号: ${this.successData.memberCode}\n会员姓名: ${this.successData.memberName}\n联系方式: ${this.successData.phone}\n登录密码: ${this.successData.loginPassword}\n支付密码: ${this.successData.payPassword}\n登录地址: ${this.successData.urlAddress}`
uni.setClipboardData({
data: modalContent,
success: function () {
uni.showToast({
title: '复制成功',
icon: 'success',
})
},
})
}
},
handleAutoLogin(loginData) {
autoLogin({
username: loginData.memberCode,
password: loginData.loginPassword,
uuid: loginData.uuid,
pkParent: this.pkParent,
})
.then(loginRes => {
if (loginRes.code === 200) {
uni.showToast({
title: '登录成功',
icon: 'success',
duration: 1500,
})
setToken(loginRes.data.access_token)
store.dispatch('GetInfo').then(res => {
uni.switchTab({ url: '/pages/index/index' })
})
// setTimeout(() => {
// uni.reLaunch({
// url: '/pages/index/index',
// })
// }, 1500)
} else {
uni.showToast({
title: loginRes.msg || '自动登录失败',
icon: 'none',
})
}
})
.catch(err => {
console.log(err)
uni.showToast({
title: '自动登录请求失败',
icon: 'none',
})
})
},
hiLogin() {
this.$refs.uForm1.validate().then(res => {
this.isLoading = true
@ -419,10 +450,10 @@ export default {
// 获取验证码
getVilCode() {
this.startTime()
api
.verification({
phone: this.form.phone,
})
getPhoneCode({
phone: this.form.phone,
parentCode: this.pkParent,
})
.then(res => {})
.catch(err => {
this.beginTime = 0
@ -451,27 +482,24 @@ export default {
<style lang="scss" scoped>
.content1 {
background-image: url('@/static/images/haiRgeiest1.jpg');
background-size: 100%;
background-repeat: no-repeat;
height: 100vh;
}
.content {
background-image: url('@/static/images/huan.jpg');
// background-image: url('@/static/images/regiestBg.jpg');
overflow: auto;
background-image: url('@/static/images/regist-bg.jpg');
background-size: cover;
background-repeat: no-repeat;
background-position: center;
height: 100vh;
display: flex;
justify-content: center;
// padding-top: 35vh;
}
.tit {
font-size: 48px;
font-family: PangMenZhengDao-Regular, PangMenZhengDao;
font-weight: 400;
color: #ffffff;
.title {
font-size: 48rpx;
font-weight: bold;
color: #333;
text-align: center;
padding-top: 80px;
margin-bottom: 20px;
padding-top: 120rpx;
padding-bottom: 80rpx;
}
.index_header {
background: #f9f9f9;
@ -490,8 +518,11 @@ export default {
padding: 0 120rpx;
}
.formed1 {
padding: 0 120rpx;
padding-top: 550rpx;
width: 70%;
margin-top: 37vh;
.custom-input {
border-radius: 60rpx;
}
}
.getCode {
font-size: 10px;
@ -516,7 +547,7 @@ export default {
background: #fff;
}
::v-deep .u-input {
background: #fff;
background: rgb(233, 233, 233);
}
.mask {
position: fixed;
@ -525,4 +556,37 @@ export default {
height: 100vh;
top: 0;
}
@keyframes gradient {
0% {
background-position: 0% 50%;
}
50% {
background-position: 100% 50%;
}
100% {
background-position: 0% 50%;
}
}
.slot-content {
padding: 30rpx 20rpx;
font-size: 28rpx;
}
.success-item {
display: flex;
justify-content: space-between;
align-items: center;
padding: 10rpx 0;
}
.item-label {
color: #606266;
margin-right: 20rpx;
flex-shrink: 0;
}
.item-value {
color: #303133;
word-break: break-all;
text-align: right;
}
</style>

BIN
static/images/regist-bg.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 473 KiB

2
util/specialAreaMap.js
View File

@ -6,7 +6,7 @@ export const REGIEST_AREA = {
export const UPGRADE_AREA = {
id: 42,
// name: '升级专区',
name: '复购专区',
name: '精品专区',
}
export const REISSUE_AREA = {