zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product

pull/2/head
tangqian 2023-05-26 18:18:59 +08:00
parent fe3648013c 8af70137b9
commit e379bff378
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
View File

@ -97,12 +97,7 @@ public class MemberAuthServiceImpl implements MemberAuthService {
smsCodeApi.useSmsCode(AuthConvert.INSTANCE.convert(reqVO, SmsSceneEnum.MEMBER_LOGIN.getScene(), userIp));
// 获得获得注册用户
// 校验账号是否存在
MemberUserDO user = userService.getUserByMobile(reqVO.getMobile());
if (user == null) {
createLoginLog(null, reqVO.getMobile(), LoginLogTypeEnum.LOGIN_SMS, LoginResultEnum.BAD_CREDENTIALS);
throw exception(AUTH_LOGIN_BAD_CREDENTIALS);
}
MemberUserDO user = userService.createUserIfAbsent(reqVO.getMobile(),reqVO.getMobile(), userIp,reqVO.getPromoterId());
// 校验是否禁用
if (ObjectUtil.notEqual(user.getStatus(), CommonStatusEnum.ENABLE.getStatus())) {
createLoginLog(user.getId(), reqVO.getMobile(), LoginLogTypeEnum.LOGIN_SMS, LoginResultEnum.USER_DISABLED);

24
yudao-ui-app/pages/users/order_list/index.vue
View File

@ -1,11 +1,11 @@
<template>
<view class="container">
<view class="navbar">
<view class="goback"></view>
<view class="goback" @tap="goBack"></view>
<view class="search">
<view class="icon"></view>
<view class="input">
<u--input placeholder="搜索我的订单" v-model="value" @change="change"></u--input>
<u--input placeholder="搜索我的订单" v-model="value"></u--input>
</view>
<view class="button">搜索</view>
</view>
@ -14,7 +14,7 @@
</view>
</view>
<view class="tabs">
<u-tabs :list="list1" @tap="click" lineWidth="60rpx" lineHeight="9rpx"></u-tabs>
<u-tabs :current="getTabVal()" :list="list1" @tap="click" lineWidth="60rpx" lineHeight="9rpx"></u-tabs>
</view>
<!-- <view class="item" @tap="goOrderDetails(123)">
@ -93,6 +93,7 @@
// #endif
import emptyPage from '@/components/emptyPage.vue'
export default {
// props:['status'],
components: {
payment,
home,
@ -110,6 +111,7 @@
orderData: {}, //订单详细统计
orderStatus: 0, //订单状态
page: 1,
tabVal: '',
list1: [{
name: '全部',
value: '99'
@ -161,6 +163,7 @@
this.loadmore()
},
onShow() {
this.tabVal = this.$route.query.status
if (this.isLogin) {
this.loadend = false;
this.page = 1;
@ -175,6 +178,21 @@
// }
},
methods: {
// 返回上一级
goBack(){
uni.navigateBack({
delta: 1
});
},
// 获取对应标签
getTabVal(){
for(let i in this.list1){
if(this.list1[i].value == this.tabVal){
return i
}
}
},
getStatus(val) {
if (val == '0') {
return '待发货'