Compare commits
6 Commits
7569be214a
...
64a66f2a3a
Author | SHA1 | Date |
---|---|---|
tangqian | 64a66f2a3a | |
tangqian | fb3196dcca | |
tangqian | 01a1e11f9b | |
TianYu | 99f1fb5e33 | |
TianYu | 1462178e7a | |
Jruome | b11b71be2e |
|
@ -74,4 +74,12 @@ public class MemberController {
|
||||||
return CommonResult.success(rechargeGearService.memberByPhoneGradeInfo(phone));
|
return CommonResult.success(rechargeGearService.memberByPhoneGradeInfo(phone));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 充值列表记录
|
||||||
|
@Operation(summary = "根据手机号获取充值充值记录")
|
||||||
|
@RequestMapping(value = "/memberOrderInfoByPhone", method = RequestMethod.GET)
|
||||||
|
@PreAuthenticated
|
||||||
|
@TenantIgnore
|
||||||
|
public CommonResult<List<RechargeOrderRespVO>> memberOrderInfoByPhone(@RequestParam String phone) {
|
||||||
|
return CommonResult.success(rechargeOrderService.memberOrderInfoByPhone(phone));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1463,7 +1463,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
|
||||||
});
|
});
|
||||||
|
|
||||||
List<PhoneRecordDO> infoDOS = phoneRecordMapper.selectList(Wrappers.<PhoneRecordDO>lambdaQuery()
|
List<PhoneRecordDO> infoDOS = phoneRecordMapper.selectList(Wrappers.<PhoneRecordDO>lambdaQuery()
|
||||||
.eq(PhoneRecordDO::getUserId, user.getId())
|
.eq(PhoneRecordDO::getUserId, user.getMobile())
|
||||||
.in(PhoneRecordDO::getRechargeGearId, collect));
|
.in(PhoneRecordDO::getRechargeGearId, collect));
|
||||||
|
|
||||||
if (!CollectionUtils.isEmpty(infoDOS)) {
|
if (!CollectionUtils.isEmpty(infoDOS)) {
|
||||||
|
@ -1481,7 +1481,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
|
||||||
MemberUserRespDTO userByMobile = userService.getUserByMobile(request.getUserPhone());
|
MemberUserRespDTO userByMobile = userService.getUserByMobile(request.getUserPhone());
|
||||||
// 初始化一个账号
|
// 初始化一个账号
|
||||||
if (Objects.isNull(userByMobile)) {
|
if (Objects.isNull(userByMobile)) {
|
||||||
userService.saveMemberUser(request.getUserPhone());
|
userService.saveMemberUser(request.getUserPhone(),user.getPromoterId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,35 +1,33 @@
|
||||||
package cn.iocoder.yudao.module.shop.service.recharge;
|
package cn.iocoder.yudao.module.shop.service.recharge;
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.common.exception.ServiceException;
|
import cn.iocoder.yudao.framework.common.exception.ServiceException;
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
import cn.iocoder.yudao.framework.security.core.LoginUser;
|
import cn.iocoder.yudao.framework.security.core.LoginUser;
|
||||||
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
|
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
|
||||||
|
import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
|
||||||
|
import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
|
||||||
|
import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.*;
|
||||||
|
import cn.iocoder.yudao.module.shop.convert.recharge.RechargeGearConvert;
|
||||||
import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.PhoneRecordDO;
|
import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.PhoneRecordDO;
|
||||||
import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeOrderDO;
|
import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeGearDO;
|
||||||
import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeOrderInfoDO;
|
|
||||||
import cn.iocoder.yudao.module.shop.dal.mysql.recharge.PhoneRecordMapper;
|
import cn.iocoder.yudao.module.shop.dal.mysql.recharge.PhoneRecordMapper;
|
||||||
|
import cn.iocoder.yudao.module.shop.dal.mysql.recharge.RechargeGearMapper;
|
||||||
import cn.iocoder.yudao.module.shop.dal.mysql.recharge.RechargeOrderInfoMapper;
|
import cn.iocoder.yudao.module.shop.dal.mysql.recharge.RechargeOrderInfoMapper;
|
||||||
import cn.iocoder.yudao.module.shop.dal.mysql.recharge.RechargeOrderMapper;
|
import cn.iocoder.yudao.module.shop.dal.mysql.recharge.RechargeOrderMapper;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
|
||||||
|
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|
||||||
import java.util.*;
|
import javax.annotation.Resource;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.*;
|
|
||||||
import cn.iocoder.yudao.module.shop.dal.dataobject.recharge.RechargeGearDO;
|
|
||||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.module.shop.convert.recharge.RechargeGearConvert;
|
|
||||||
import cn.iocoder.yudao.module.shop.dal.mysql.recharge.RechargeGearMapper;
|
|
||||||
|
|
||||||
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||||
import static cn.iocoder.yudao.module.shop.enums.ErrorCodeConstants.*;
|
import static cn.iocoder.yudao.module.shop.enums.ErrorCodeConstants.RECHARGE_GEAR_NOT_EXISTS;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 充值档位 Service 实现类
|
* 充值档位 Service 实现类
|
||||||
|
@ -48,6 +46,8 @@ public class RechargeGearServiceImpl implements RechargeGearService {
|
||||||
private RechargeOrderMapper orderMapper;
|
private RechargeOrderMapper orderMapper;
|
||||||
@Resource
|
@Resource
|
||||||
private PhoneRecordMapper phoneRecordMapper;
|
private PhoneRecordMapper phoneRecordMapper;
|
||||||
|
@Autowired
|
||||||
|
private MemberUserApi userService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Long createRechargeGear(RechargeGearCreateReqVO createReqVO) {
|
public Long createRechargeGear(RechargeGearCreateReqVO createReqVO) {
|
||||||
|
@ -104,6 +104,7 @@ public class RechargeGearServiceImpl implements RechargeGearService {
|
||||||
@Override
|
@Override
|
||||||
public List<RechargeGearRespVO> getGradeInfo() {
|
public List<RechargeGearRespVO> getGradeInfo() {
|
||||||
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
|
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
|
||||||
|
MemberUserRespDTO user = userService.getUser(loginUser.getId());
|
||||||
Assert.notNull(loginUser, "登录失效,请重新登录!");
|
Assert.notNull(loginUser, "登录失效,请重新登录!");
|
||||||
List<RechargeGearDO> rechargeGearDOS = rechargeGearMapper.selectList(Wrappers.<RechargeGearDO>lambdaQuery()
|
List<RechargeGearDO> rechargeGearDOS = rechargeGearMapper.selectList(Wrappers.<RechargeGearDO>lambdaQuery()
|
||||||
.eq(RechargeGearDO::getDeleted, 0));
|
.eq(RechargeGearDO::getDeleted, 0));
|
||||||
|
@ -111,7 +112,7 @@ public class RechargeGearServiceImpl implements RechargeGearService {
|
||||||
throw new ServiceException("未初始化档次信息!");
|
throw new ServiceException("未初始化档次信息!");
|
||||||
}
|
}
|
||||||
List<RechargeGearRespVO> rechargeGearRespVOS = RechargeGearConvert.INSTANCE.convertList(rechargeGearDOS);
|
List<RechargeGearRespVO> rechargeGearRespVOS = RechargeGearConvert.INSTANCE.convertList(rechargeGearDOS);
|
||||||
List<PhoneRecordDO> infoDOS = phoneRecordMapper.selectList(Wrappers.<PhoneRecordDO>lambdaQuery().eq(PhoneRecordDO::getUserId, loginUser.getId()));
|
List<PhoneRecordDO> infoDOS = phoneRecordMapper.selectList(Wrappers.<PhoneRecordDO>lambdaQuery().eq(PhoneRecordDO::getPhone, user.getMobile()));
|
||||||
Map<Long, List<PhoneRecordDO>> collect = infoDOS.stream().collect(Collectors.groupingBy(PhoneRecordDO::getRechargeGearId));
|
Map<Long, List<PhoneRecordDO>> collect = infoDOS.stream().collect(Collectors.groupingBy(PhoneRecordDO::getRechargeGearId));
|
||||||
rechargeGearRespVOS.forEach(vo -> {
|
rechargeGearRespVOS.forEach(vo -> {
|
||||||
List<PhoneRecordDO> infoDOS1 = collect.get(vo.getId());
|
List<PhoneRecordDO> infoDOS1 = collect.get(vo.getId());
|
||||||
|
|
|
@ -76,4 +76,6 @@ public interface RechargeOrderService {
|
||||||
List<RechargeOrderRespVO> memberOrderInfo();
|
List<RechargeOrderRespVO> memberOrderInfo();
|
||||||
|
|
||||||
MemberHeadResponse memberHeadInfo();
|
MemberHeadResponse memberHeadInfo();
|
||||||
|
|
||||||
|
List<RechargeOrderRespVO> memberOrderInfoByPhone(String phone);
|
||||||
}
|
}
|
||||||
|
|
|
@ -171,4 +171,35 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<RechargeOrderRespVO> memberOrderInfoByPhone(String phone) {
|
||||||
|
List<RechargeOrderDO> orderDOS = rechargeOrderMapper.selectList(Wrappers.<RechargeOrderDO>lambdaQuery()
|
||||||
|
.eq(RechargeOrderDO::getUserPhone, phone).eq(RechargeOrderDO::getPaid, 1));
|
||||||
|
if (!CollectionUtils.isEmpty(orderDOS)) {
|
||||||
|
List<RechargeOrderRespVO> rechargeOrderRespVOS = RechargeOrderConvert.INSTANCE.convertList(orderDOS);
|
||||||
|
List<String> collect1 = rechargeOrderRespVOS.stream().map(RechargeOrderBaseVO::getOrderId).collect(Collectors.toList());
|
||||||
|
List<RechargeOrderInfoDO> infoDOS = infoMapper.selectList(Wrappers.<RechargeOrderInfoDO>lambdaQuery().in(RechargeOrderInfoDO::getOrderNo, collect1));
|
||||||
|
Map<String, List<RechargeOrderInfoDO>> collect = infoDOS.stream().collect(Collectors.groupingBy(RechargeOrderInfoDO::getOrderNo));
|
||||||
|
for (RechargeOrderRespVO orderDO : rechargeOrderRespVOS) {
|
||||||
|
StringBuilder grade = new StringBuilder();
|
||||||
|
List<RechargeOrderInfoDO> infoDOS1 = collect.get(orderDO.getOrderId());
|
||||||
|
for (RechargeOrderInfoDO infoDO : infoDOS1) {
|
||||||
|
if (infoDO.getPrice().compareTo(new BigDecimal("240")) == 0) {
|
||||||
|
grade.append("套餐1,");
|
||||||
|
} else if (infoDO.getPrice().compareTo(new BigDecimal("400")) == 0) {
|
||||||
|
grade.append("套餐2,");
|
||||||
|
} else if (infoDO.getPrice().compareTo(new BigDecimal("640")) == 0) {
|
||||||
|
grade.append("套餐3");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
orderDO.setGrade(grade.toString());
|
||||||
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
||||||
|
orderDO.setStringCreateTime(orderDO.getCreateTime().format(formatter));
|
||||||
|
}
|
||||||
|
|
||||||
|
return rechargeOrderRespVOS;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -80,7 +80,7 @@ public interface MemberUserApi {
|
||||||
MemberUserRespDTO getInfo();
|
MemberUserRespDTO getInfo();
|
||||||
|
|
||||||
|
|
||||||
void saveMemberUser(String phone);
|
void saveMemberUser(String phone,Long promoterId);
|
||||||
|
|
||||||
PromoterDTO getPromoterDOByUserId(Long userId);
|
PromoterDTO getPromoterDOByUserId(Long userId);
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,9 +5,11 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
|
||||||
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
|
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
|
||||||
import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
|
import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
|
||||||
import cn.iocoder.yudao.module.member.api.user.dto.PromoterDTO;
|
import cn.iocoder.yudao.module.member.api.user.dto.PromoterDTO;
|
||||||
|
import cn.iocoder.yudao.module.member.controller.app.auth.vo.AppAuthSmsLoginReqVO;
|
||||||
import cn.iocoder.yudao.module.member.convert.user.UserConvert;
|
import cn.iocoder.yudao.module.member.convert.user.UserConvert;
|
||||||
import cn.iocoder.yudao.module.member.dal.dataobject.promoter.PromoterDO;
|
import cn.iocoder.yudao.module.member.dal.dataobject.promoter.PromoterDO;
|
||||||
import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
|
import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
|
||||||
|
import cn.iocoder.yudao.module.member.service.auth.MemberAuthService;
|
||||||
import cn.iocoder.yudao.module.member.service.promoter.PromoterService;
|
import cn.iocoder.yudao.module.member.service.promoter.PromoterService;
|
||||||
import cn.iocoder.yudao.module.member.service.user.MemberUserService;
|
import cn.iocoder.yudao.module.member.service.user.MemberUserService;
|
||||||
import com.thoughtworks.xstream.core.SecurityUtils;
|
import com.thoughtworks.xstream.core.SecurityUtils;
|
||||||
|
@ -31,6 +33,8 @@ public class MemberUserApiImpl implements MemberUserApi {
|
||||||
private MemberUserService userService;
|
private MemberUserService userService;
|
||||||
@Resource
|
@Resource
|
||||||
private PromoterService promoterService;
|
private PromoterService promoterService;
|
||||||
|
@Resource
|
||||||
|
private MemberAuthService authService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@TenantIgnore
|
@TenantIgnore
|
||||||
|
@ -103,8 +107,12 @@ public class MemberUserApiImpl implements MemberUserApi {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void saveMemberUser(String phone) {
|
public void saveMemberUser(String phone,Long promoterId) {
|
||||||
userService.saveMemberUser(phone);
|
AppAuthSmsLoginReqVO reqVO = new AppAuthSmsLoginReqVO();
|
||||||
|
reqVO.setMobile(phone);
|
||||||
|
reqVO.setPromoterId(promoterId);
|
||||||
|
reqVO.setRealName("初始化账号");
|
||||||
|
authService.initialize(reqVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -44,6 +44,14 @@ public interface MemberAuthService {
|
||||||
*/
|
*/
|
||||||
Long register(@Valid AppAuthSmsLoginReqVO reqVO);
|
Long register(@Valid AppAuthSmsLoginReqVO reqVO);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 初始化账号
|
||||||
|
*
|
||||||
|
* @param reqVO 登陆信息
|
||||||
|
* @return 登录结果
|
||||||
|
*/
|
||||||
|
Long initialize(@Valid AppAuthSmsLoginReqVO reqVO);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 社交登录,使用 code 授权码
|
* 社交登录,使用 code 授权码
|
||||||
|
|
|
@ -139,6 +139,19 @@ public class MemberAuthServiceImpl implements MemberAuthService {
|
||||||
return memberUserDO.getId();
|
return memberUserDO.getId();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Long initialize(AppAuthSmsLoginReqVO reqVO) {
|
||||||
|
// 校验验证码
|
||||||
|
String userIp = getClientIP();
|
||||||
|
// 用户已经存在
|
||||||
|
MemberUserDO user = userService.getUserByMobile(reqVO.getMobile());
|
||||||
|
if (user != null) {
|
||||||
|
throw new ServiceException(ErrorCodeConstants.AUTH_MOBILE_EXISTS);
|
||||||
|
}
|
||||||
|
MemberUserDO memberUserDO = userService.createUserIfAbsent(reqVO.getMobile(),reqVO.getRealName(), userIp,reqVO.getPromoterId());
|
||||||
|
return memberUserDO.getId();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AppAuthLoginRespVO socialLogin(AppAuthSocialLoginReqVO reqVO) {
|
public AppAuthLoginRespVO socialLogin(AppAuthSocialLoginReqVO reqVO) {
|
||||||
// 使用 code 授权码,进行登录。然后,获得到绑定的用户编号
|
// 使用 code 授权码,进行登录。然后,获得到绑定的用户编号
|
||||||
|
|
|
@ -101,7 +101,7 @@ public class MemberUserServiceImpl implements MemberUserService {
|
||||||
user.setMobile(mobile);
|
user.setMobile(mobile);
|
||||||
user.setNickname(realName);
|
user.setNickname(realName);
|
||||||
user.setStatus(CommonStatusEnum.ENABLE.getStatus()); // 默认开启
|
user.setStatus(CommonStatusEnum.ENABLE.getStatus()); // 默认开启
|
||||||
user.setPassword(encodePassword(password)); // 加密密码
|
user.setPassword(encodePassword("123456")); // 加密密码
|
||||||
user.setRegisterIp(registerIp);
|
user.setRegisterIp(registerIp);
|
||||||
user.setPromoterId(promoterId);
|
user.setPromoterId(promoterId);
|
||||||
memberUserMapper.insert(user);
|
memberUserMapper.insert(user);
|
||||||
|
|
|
@ -396,11 +396,9 @@ export default {
|
||||||
logistics.shippingNodelivery({ tempId: this.tempId }).then(res => {
|
logistics.shippingNodelivery({ tempId: this.tempId }).then(res => {
|
||||||
res.data.forEach((item, index) => {
|
res.data.forEach((item, index) => {
|
||||||
// item.title = JSON.parse(item.title)
|
// item.title = JSON.parse(item.title)
|
||||||
item.city_ids = item.cityId.split(',')
|
item.city_ids = JSON.parse(item.title)
|
||||||
})
|
})
|
||||||
this.ruleForm.noDelivery = res.data
|
this.ruleForm.noDelivery = res.data
|
||||||
console.log(this.ruleForm.noDelivery )
|
|
||||||
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
removeChild(list){
|
removeChild(list){
|
||||||
|
@ -507,13 +505,10 @@ export default {
|
||||||
// })
|
// })
|
||||||
}
|
}
|
||||||
if (this.ruleForm.noDelivery) {
|
if (this.ruleForm.noDelivery) {
|
||||||
param.shippingTemplatesNoDeliveryRespVOS = [{
|
param.shippingTemplatesNoDeliveryRespVOS = {
|
||||||
cityId:[],
|
title:JSON.stringify(this.ruleForm.noRegion),
|
||||||
}]
|
cityId:this.ruleForm.noRegion.join(','),
|
||||||
this.ruleForm.noRegion.forEach((item,index) => {
|
}
|
||||||
param.shippingTemplatesNoDeliveryRespVOS[0].cityId.push(item[2])
|
|
||||||
})
|
|
||||||
param.shippingTemplatesNoDeliveryRespVOS[0].cityId = param.shippingTemplatesNoDeliveryRespVOS[0].cityId.join(",")
|
|
||||||
}
|
}
|
||||||
if (this.type === 0) {
|
if (this.type === 0) {
|
||||||
logistics.shippingSave(param).then(res => {
|
logistics.shippingSave(param).then(res => {
|
||||||
|
|
|
@ -216,7 +216,7 @@
|
||||||
width: 100%;
|
width: 100%;
|
||||||
border-radius: 16rpx 16rpx 0 0;
|
border-radius: 16rpx 16rpx 0 0;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
padding-bottom: 100rpx;
|
padding-bottom: 20%;
|
||||||
z-index: 99;
|
z-index: 99;
|
||||||
transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
|
transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
|
||||||
transform: translate3d(0, 100%, 0);
|
transform: translate3d(0, 100%, 0);
|
||||||
|
|
|
@ -22,6 +22,12 @@
|
||||||
"navigationBarTitleText": "权益明细"
|
"navigationBarTitleText": "权益明细"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"path": "pages/member_back/index",
|
||||||
|
"style": {
|
||||||
|
"navigationBarTitleText": "话费返回"
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "pages/member_equity/index",
|
"path": "pages/member_equity/index",
|
||||||
"style": {
|
"style": {
|
||||||
|
|
|
@ -258,11 +258,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
button {
|
button {
|
||||||
|
border-radius: 18rpx;
|
||||||
margin-top: 10rpx;
|
margin-top: 10rpx;
|
||||||
padding: 7rpx 16rpx;
|
padding: 7rpx 16rpx;
|
||||||
background: #F22E60;
|
background: #F22E60;
|
||||||
border-image: linear-gradient(0deg, #A8052E, #FFFFFF) 10 10;
|
border-image: linear-gradient(0deg, #A8052E, #FFFFFF) 10 10;
|
||||||
border-radius: 18rpx;
|
|
||||||
font-size: 22rpx;
|
font-size: 22rpx;
|
||||||
font-family: PingFang SC;
|
font-family: PingFang SC;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
|
|
|
@ -43,7 +43,6 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import {
|
import {
|
||||||
memberGradeInfo,
|
|
||||||
memberByHomeGradeInfo
|
memberByHomeGradeInfo
|
||||||
} from '@/api/member.js';
|
} from '@/api/member.js';
|
||||||
import paymentMember from '@/components/paymentMember';
|
import paymentMember from '@/components/paymentMember';
|
||||||
|
@ -120,7 +119,7 @@
|
||||||
mask: true
|
mask: true
|
||||||
});
|
});
|
||||||
try{
|
try{
|
||||||
const res = await memberGradeInfo()
|
const res = await memberByHomeGradeInfo()
|
||||||
this.memberData = res.data
|
this.memberData = res.data
|
||||||
} finally{
|
} finally{
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
|
|
|
@ -55,7 +55,6 @@
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
handleBack(item){
|
handleBack(item){
|
||||||
console.log(item)
|
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url:`/pages/member_back/index?userPhone=${item.userPhone}&grade=${item.grade}`
|
url:`/pages/member_back/index?userPhone=${item.userPhone}&grade=${item.grade}`
|
||||||
})
|
})
|
||||||
|
@ -87,7 +86,13 @@
|
||||||
.box {
|
.box {
|
||||||
margin-top: 10%;
|
margin-top: 10%;
|
||||||
padding: 20% 40rpx;
|
padding: 20% 40rpx;
|
||||||
|
height: 100vh;
|
||||||
|
background: url(../../static/images/memberBg.png);
|
||||||
|
background-size: cover;
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
background-attachment: fixed;
|
||||||
.box-seach{
|
.box-seach{
|
||||||
|
z-index: 999;
|
||||||
padding: 10% 40rpx;
|
padding: 10% 40rpx;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
|
|
|
@ -115,7 +115,7 @@
|
||||||
if (!that.mobile) return that.$util.Tips({
|
if (!that.mobile) return that.$util.Tips({
|
||||||
title: '请填写手机号码'
|
title: '请填写手机号码'
|
||||||
});
|
});
|
||||||
if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.mobile)) return that.$util.Tips({
|
if (/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(that.mobile)) return that.$util.Tips({
|
||||||
title: '请输入正确的手机号码'
|
title: '请输入正确的手机号码'
|
||||||
});
|
});
|
||||||
if (!that.captcha) return that.$util.Tips({
|
if (!that.captcha) return that.$util.Tips({
|
||||||
|
@ -156,7 +156,7 @@
|
||||||
if (!that.mobile) return that.$util.Tips({
|
if (!that.mobile) return that.$util.Tips({
|
||||||
title: '请填写手机号码'
|
title: '请填写手机号码'
|
||||||
});
|
});
|
||||||
if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.mobile)) return that.$util.Tips({
|
if (/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(that.mobile)) return that.$util.Tips({
|
||||||
title: '请输入正确的手机号码'
|
title: '请输入正确的手机号码'
|
||||||
});
|
});
|
||||||
if (!that.captcha) return that.$util.Tips({
|
if (!that.captcha) return that.$util.Tips({
|
||||||
|
@ -204,7 +204,7 @@
|
||||||
if (!that.mobile) return that.$util.Tips({
|
if (!that.mobile) return that.$util.Tips({
|
||||||
title: '请填写手机号码'
|
title: '请填写手机号码'
|
||||||
});
|
});
|
||||||
if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.mobile)) return that.$util.Tips({
|
if (/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(that.mobile)) return that.$util.Tips({
|
||||||
title: '请输入正确的手机号码'
|
title: '请输入正确的手机号码'
|
||||||
});
|
});
|
||||||
await registerVerify(that.mobile, 1)
|
await registerVerify(that.mobile, 1)
|
||||||
|
|
|
@ -88,7 +88,7 @@
|
||||||
if (!this.registerForm.mobile) return this.$util.Tips({
|
if (!this.registerForm.mobile) return this.$util.Tips({
|
||||||
title: '请填写手机号码'
|
title: '请填写手机号码'
|
||||||
});
|
});
|
||||||
if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(this.registerForm.mobile)) return this.$util.Tips({
|
if (/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[1-25-9])\d{8}$/g.test(this.registerForm.mobile)) return this.$util.Tips({
|
||||||
title: '请输入正确的手机号码'
|
title: '请输入正确的手机号码'
|
||||||
});
|
});
|
||||||
if(this.checked.length === 0) return this.$util.Tips({
|
if(this.checked.length === 0) return this.$util.Tips({
|
||||||
|
|
|
@ -85,7 +85,7 @@
|
||||||
if (!that.account) return that.$util.Tips({
|
if (!that.account) return that.$util.Tips({
|
||||||
title: '请填写手机号码'
|
title: '请填写手机号码'
|
||||||
});
|
});
|
||||||
if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
|
if (/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(that.account)) return that.$util.Tips({
|
||||||
title: '请输入正确的手机号码'
|
title: '请输入正确的手机号码'
|
||||||
});
|
});
|
||||||
if (!that.captcha) return that.$util.Tips({
|
if (!that.captcha) return that.$util.Tips({
|
||||||
|
@ -114,7 +114,7 @@
|
||||||
if (!that.account) return that.$util.Tips({
|
if (!that.account) return that.$util.Tips({
|
||||||
title: '请填写手机号码'
|
title: '请填写手机号码'
|
||||||
});
|
});
|
||||||
if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
|
if (/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(that.account)) return that.$util.Tips({
|
||||||
title: '请输入正确的手机号码'
|
title: '请输入正确的手机号码'
|
||||||
});
|
});
|
||||||
await registerVerify(that.account, 3)
|
await registerVerify(that.account, 3)
|
||||||
|
|
|
@ -99,7 +99,12 @@
|
||||||
that.$util.Tips({
|
that.$util.Tips({
|
||||||
title: '生成成功,长按保存图片'
|
title: '生成成功,长按保存图片'
|
||||||
})
|
})
|
||||||
});
|
}).catch(()=>{
|
||||||
|
that.$util.Tips({
|
||||||
|
title: '生成失败'
|
||||||
|
})
|
||||||
|
that.isHideBtn = false
|
||||||
|
})
|
||||||
},
|
},
|
||||||
// 生成二维码;
|
// 生成二维码;
|
||||||
make() {
|
make() {
|
||||||
|
|
Loading…
Reference in New Issue