angelo
/
web-store-retail-h5
forked from angelo/web-retail-h5
3
0
Fork 0
Code Pull Requests Activity

feat(userData): 移除无用字段，处理用户昵称保存报错的问题，订单列表高级筛选问题修复

This commit is contained in:
ywk 2025-04-07 18:00:26 +08:00
parent 27f7a374f4
commit 36461e76b6
4 changed files with 109 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
App.vue
View File

@ -12,14 +12,14 @@ export default {
// 分享注册 // 分享注册
const whiteList = [ const whiteList = [
'pages/shareRegist/index', // 'pages/shareRegist/index',
'pages/shareRegist/success', // 'pages/shareRegist/success',
'pages/login/index', 'pages/login/index',
'pages/wechatPay/bfPay/', // 'pages/wechatPay/bfPay/',
'pages/wechatPay/hfPay/', // 'pages/wechatPay/hfPay/',
'pages/shareArea/hiList', // 'pages/shareArea/hiList',
'pages/shareArea/hiOrder', // 'pages/shareArea/hiOrder',
'pages/pay/hiPay' // 'pages/pay/hiPay'
] ]
if (whiteList.indexOf(url) !== -1) { if (whiteList.indexOf(url) !== -1) {
} else { } else {

48
pages/mine/index.vue
View File

@ -23,24 +23,34 @@
<!-- <view class="kuang"> <!-- <view class="kuang">
{{userInfo.pkAwardsVal}} {{userInfo.pkAwardsVal}}
</view> --> </view> -->
<view class="btom_inder"> <!-- <view class="btom_inder">
<view class="jxbox"> <view class="jxbox">
<!-- <image
<image
class="jximg" class="jximg"
@click="goRoad(1)" @click="goRoad(1)"
:src="userInfo.gradeIcon" :src="userInfo.gradeIcon"
mode="" mode=""
></image> --> ></image>
</view> </view>
<!-- <view class="jxbox"> <view class="jxbox">
<image class="jximg" @click="goRoad(2)" :src="userInfo.awardsIcon" mode=""></image> <image class="jximg" @click="goRoad(2)" :src="userInfo.awardsIcon" mode=""></image>
</view> --> </view>
</view> -->
<view class="grade_left">
<view class="gra_left1" v-if="userData.registerAuthority">
<image
class="gra_icon"
src="@/static/images/fw_icon.png"
mode=""
></image>
<view class="">
{{ userData.registerAuthorityVal }}
</view>
</view>
</view> </view>
</view> </view>
<view class="cmem"> <!-- <view class="cmem">
<view class="tTit2"
>{{ '结算等级' }}:{{ userInfo.pkGradeVal }}</view
>
<view class="grade_left"> <view class="grade_left">
<view class="gra_left1" v-if="userData.registerAuthority"> <view class="gra_left1" v-if="userData.registerAuthority">
<image <image
@ -63,7 +73,7 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view> -->
</view> </view>
</view> </view>
<view class="top_right" @click="goTo('/pages/userData/index')"> <view class="top_right" @click="goTo('/pages/userData/index')">
@ -86,13 +96,17 @@
<view class="jxTit1">{{ awardsList.maxAwardsName }}</view> <view class="jxTit1">{{ awardsList.maxAwardsName }}</view>
</view> </view>
<view class="jxTit"> <view class="jxTit">
<view>{{ '结算等级' }}</view>
<view class="jxTit1">{{ userInfo.pkGradeVal }}</view>
</view>
<!-- <view class="jxTit">
<view>{{ '上月奖衔' }}</view> <view>{{ '上月奖衔' }}</view>
<view class="jxTit1">{{ awardsList.awardsName }}</view> <view class="jxTit1">{{ awardsList.awardsName }}</view>
</view> </view> -->
<view class="jxTit" v-if="awardsList.historyAwards"> <!-- <view class="jxTit" v-if="awardsList.historyAwards">
<view>{{ '历史荣誉' }}</view> <view>{{ '历史荣誉' }}</view>
<view class="yt1">{{ awardsList.historyAwards }} </view> <view class="yt1">{{ awardsList.historyAwards }} </view>
</view> </view> -->
</view> </view>
<view class="ju_grade" v-if="!ifSpecial"> <view class="ju_grade" v-if="!ifSpecial">
<!-- <view class="ju_title"> <!-- <view class="ju_title">
@ -1185,7 +1199,7 @@ export default {
font-size: 12px; font-size: 12px;
color: #fb3024; color: #fb3024;
font-weight: 400; font-weight: 400;
margin-left: 20rpx; // margin-left: 20rpx;
.gra_left1 { .gra_left1 {
background: #ffffff; background: #ffffff;
border: 1rpx solid #ffffff; border: 1rpx solid #ffffff;
@ -1201,9 +1215,9 @@ export default {
margin-right: 6rpx; margin-right: 6rpx;
} }
} }
.gra_left1:last-child { // .gra_left1:last-child {
margin-left: 20rpx; // margin-left: 20rpx;
} // }
} }
.grade_flex { .grade_flex {

43
pages/mine/order/index.vue
View File

@ -10,36 +10,27 @@
<view class="index_header"> <view class="index_header">
<view>{{'我的订单'}}</view> <view>{{'我的订单'}}</view>
</view> </view>
<view class="shareImg" <!-- <view class="clearFilter" @click="clearFilter">
@click="rightOpen"> 清除筛选
<img src="@/static/images/serach_999.png" </view> -->
alt=""> <view
class="shareImg"
@click="rightOpen"
>
<img
src="@/static/images/serach_999.png"
alt=""
/>
</view> </view>
<view class="zhan1"></view> <view class="zhan1"></view>
<view class="con_top"> <view class="con_top">
<!-- <view class="seach">
<view class="seach_i" @tap="goSeach">
<u--input prefixIcon="search" v-model="select.queryStr" prefixIconStyle="font-size: 22px;color: #909399;height:32px" border="none" placeholder="请输入关键字" suffixIconStyle="color: #909399"></u--input>
</view>
<view class="seatch_r" @click="getDataList">
<u-icon name="search" size="22" color="#fff"></u-icon>
</view>
</view> -->
<!-- 日期区间 -->
<!-- <view class="timeSlide">
<view class="timeA">{{'日期区间'}}</view>
<view class="timeB" @click="openDate(0)">{{ select.creationTimeStart?select.creationTimeStart:'开始时间' }}</view>
<view class="timeA">{{'至'}}</view>
<view class="timeB" @click="openDate(1)">{{ select.creationTimeEnd?select.creationTimeEnd:'结束时间' }}</view>
</view>
<view class="hui"></view> -->
<view class="tab"> <view class="tab">
<view v-for="(item, index) in orderStatusList" <view v-for="(item, index) in orderStatusList"
:key="index" :key="index"
@click="isTab = item.value" @click="isTab = item.value"
class="tab_i"> class="tab_i">
<view>{{ item.label }}</view> <view>{{ item.label }}</view>
<view :class="[isTab===item.value?'heng':'heng1']"> <view :class="isTab===item.value?'heng':'heng1'">
</view> </view>
</view> </view>
</view> </view>
@ -48,6 +39,7 @@
<view class="zhan"></view> <view class="zhan"></view>
<view v-for="(item, index) in orderLists" <view v-for="(item, index) in orderLists"
:key="index"
class="orderList_i"> class="orderList_i">
<view @click.stop="getDetails(item)"> <view @click.stop="getDetails(item)">
<view class="disFlex atm just mbt10"> <view class="disFlex atm just mbt10">
@ -508,6 +500,7 @@ export default {
getDataList(index) { getDataList(index) {
if (index) { if (index) {
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
this.orderLists = []
} }
this.rightShow = false this.rightShow = false
api api
@ -546,6 +539,14 @@ export default {
height: 40rpx; height: 40rpx;
} }
} }
.clearFilter {
position: fixed;
top: 28rpx;
right: 90rpx;
z-index: 1000000000;
color: #999;
font-size: 28rpx;
}
.zhan1 { .zhan1 {
height: 50px; height: 50px;

95
pages/userData/index.vue
View File

@ -33,18 +33,18 @@
</view> </view>
</view> </view>
<view class="content"> <view class="content">
<view class="index-view tops"> <view class="index-view tops">
<view class="user-name">{{'真实姓名'}}</view> <view class="user-name">{{'真实姓名'}}</view>
<view class="user-right"> <view class="user-right">
{{userInfo.memberName}} {{userInfo.memberName}}
</view> </view>
</view> </view>
<view class="index-view"> <view class="index-view">
<view class="user-name">{{'会员编号'}}</view> <view class="user-name">{{'会员编号'}}</view>
<view class="user-right"> <view class="user-right">
{{userInfo.memberCode}} {{userInfo.memberCode}}
</view> </view>
</view> </view>
<view class="index-view"> <view class="index-view">
<view class="user-name"> <view class="user-name">
{{'联系方式'}}</view> {{'联系方式'}}</view>
@ -91,11 +91,11 @@
</view> </view>
</view> --> </view> -->
<view class="index-view"> <view class="index-view">
<view class="user-name">{{'真实奖衔'}}</view> <view class="user-name">{{'真实奖衔'}}</view>
<view class="user-right"> <view class="user-right">
{{userInfo.awardsVal}} {{userInfo.awardsVal}}
</view> </view>
</view> </view>
<view class="index-view"> <view class="index-view">
<view class="user-name">荣誉奖衔</view> <view class="user-name">荣誉奖衔</view>
<view class="user-right"> <view class="user-right">
@ -139,27 +139,30 @@
</view> </view>
</view> </view>
</view> </view>
<u-button type="success" <!-- <u-button type="success"
shape="circle" shape="circle"
class="btn" class="btn"
@click="submit" @click="submit"
>{{'保存'}}</u-button> >{{'保存'}}</u-button>
<view style="height: 20rpx;"></view> <view style="height: 20rpx;"></view> -->
<u-popup :show="downShow" <u-popup
mode="bottom" :show="downShow"
closeOnClickOverlay mode="bottom"
closeable closeOnClickOverlay
round="10" closeable
@close="close"> round="10"
<view class="title">修改昵称</view> @close="close"
<view class="kung"> >
<u--input <view class="title">修改昵称</view>
:maxlength="40" <view class="kung">
placeholder="请输入内容" <u--input
v-model="userInfo.nickName" :maxlength="40"
></u--input> placeholder="请输入昵称"
</view> v-model="userInfo.nickName"
<u-button @click="submit" type="error" text="确定"></u-button> >
</u--input>
</view>
<u-button :disabled="!userInfo.nickName" class="btn" @click="submit" type="error" text="确 定"></u-button>
</u-popup> </u-popup>
</view> </view>
</template> </template>
@ -211,22 +214,22 @@ export default {
}); });
}, },
fail: err => { fail: err => {
this.myToast('上传失败', 'none'); uni.$u.toast('上传失败', 'none');
} }
}); });
}, },
submit() { submit() {
api.updateData({ api.updateData({
nickName: this.userInfo.nickName, nickName: this.userInfo.nickName,
}).then((res)=>{ }).then((res)=>{
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
icon: 'none', icon: 'none',
duration: 1500, duration: 1500,
}) })
this.getInfo() this.getInfo()
this.close() this.close()
}) })
}, },
// upload() { // upload() {
// let that = this // let that = this