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

Compare commits

base: zenghuapei:eddde958a5d4cdf10f5f9682ef1a92be947dcf7a
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product
..
compare: zenghuapei:8310ec40d1feab0ae9d3ace9b551f12c296b60f9
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product

No commits in common. "eddde958a5d4cdf10f5f9682ef1a92be947dcf7a" and "8310ec40d1feab0ae9d3ace9b551f12c296b60f9" have entirely different histories.
eddde958a5 ... 8310ec40d1

5 changed files with 10 additions and 10 deletions
Show Stats Expand all files Collapse all files

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/AppUserInfoReqVO.java
View File

@ -42,7 +42,7 @@ public class AppUserInfoReqVO {
/**
* 地址
*/
// @NotEmpty(message = "用户昵称不能为空")
@NotEmpty(message = "用户昵称不能为空")
private String userAddress;
/**

7
yudao-ui-app/pages/member_equity/index.vue
View File

@ -7,7 +7,7 @@
<text>{{userInfo.mobile}}</text>
<text>会员积分：{{memberDetail.integral}}</text>
</view>
<!-- <text>再升1级即可获得【XX】等6项权益</text> -->
<text>再升1级即可获得【XX】等6项权益</text>
<view class="left-button">
<view class="left-shopping" @click="handleRouter('购买记录')">
<text>购买记录</text>
@ -31,7 +31,7 @@
<image src='../../static/images/memberLogo.png'></image>
<text class="equity-member">我的会员权益</text>
</view>
<!-- <text class="equity-look">查看权益></text> -->
<text class="equity-look">查看权益></text>
</view>
<view class="equity-item" v-for="(item,index) in equityData" :key="index">
<view class="equity-grade">
@ -165,9 +165,10 @@
<style lang="scss" scoped>
.box {
padding-bottom: 20%;
margin-bottom: 30%;
margin-top: 10%;
background: #fff;
height: 100vh;
background: url(../../static/images/memberBg.png);
background-size: cover;
background-repeat: no-repeat;

5
yudao-ui-app/pages/member_record/index.vue
View File

@ -10,7 +10,7 @@
<text>充值号码：{{item.userPhone}}</text>
</view>
<button v-show="item.bool && item.refundStatus == 0" @click.stop="handleService(item)">申请退款</button>
<view v-show="item.refundStatus != 0">{{list[item.refundStatus]}}</view>
<view v-show="item.refundStatus == 1">申请退款中</view>
</view>
<view class="item-text">
<text>充值档次：{{item.grade}}</text>
@ -32,8 +32,7 @@
data() {
return {
keyword:'',
memberData:[],
list:['未退款','退款申请中','已退款','退款中']
memberData:[]
};
},
async onLoad() {

4
yudao-ui-app/pages/user/index.vue
View File

@ -90,9 +90,9 @@
<view class="user-menus" style="margin-top: 20rpx;">
<!-- <view class="menu-title">我的服务</view> -->
<u-cell-group>
<!-- <u-cell title="收货地址" isLink @click="jumpPage('/pages/users/user_address_list/index')">
<u-cell title="收货地址" isLink @click="jumpPage('/pages/users/user_address_list/index')">
<u-icon slot="icon" size="45" name="/static/images/user_icon1.png"></u-icon>
</u-cell> -->
</u-cell>
<u-cell title="分销中心" v-if="userInfo.userType === 'PROMOTER'" isLink
@click="jumpPage('/pages/users/user_spread_code/index')">
<u-icon slot="icon" size="45" name="/static/images/user_icon2.png"></u-icon>

2
yudao-ui-app/pages/users/login/index.vue
View File

@ -27,7 +27,7 @@
<div class="item" v-else>
<div class="acea-row row-middle">
<image src="/static/images/code_4.png" style="width: 40rpx; height: 40rpx;"></image>
<input type="text" maxlength="6" placeholder="请输入您的验证码" class="texts" v-model="captcha" />
<input type="text" placeholder="请输入您的验证码" class="texts" v-model="captcha" />
</div>
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="code">
{{ text }}