gjy преди 2 години
родител
ревизия
36d9788e81
променени са 4 файла, в които са добавени 47 реда и са изтрити 4 реда
  1. 7 0
      pages.json
  2. 15 2
      pages/bill/index.vue
  3. 24 1
      pages/user/setUp.vue
  4. 1 1
      pages/user/set_nickname.vue

+ 7 - 0
pages.json

@@ -612,6 +612,13 @@
 		},
 		{
 			"path": "pages/user/set_nickname",
+			"style": {
+				"navigationBarTitleText": "用户名",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/user/set_wechatNo",
 			"style": {
 				"navigationBarTitleText": "昵称",
 				"enablePullDownRefresh": true

+ 15 - 2
pages/bill/index.vue

@@ -12,11 +12,16 @@
 					name="close-circle-fill" color="#D6D9E0"></u-icon>
 				<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
 			</view>
-			<view style='background:#fff;padding:0 15px;border-radius:0rpx 0rpx 30rpx 30rpx;' class="Semibold">
+			<view style='background:#fff;padding:0 15px;border-radius:0rpx 0rpx 30rpx 30rpx;position:relative;' class="Semibold">
 				<view @click='tabcarchange(0)' class='line' :class='TabCur==0?"active":""'>全部</view>
 				<view @click='tabcarchange(5)' class='line' :class='TabCur==5?"active":""'>待付款</view>
 				<view @click='tabcarchange(6)' class='line' :class='TabCur==6?"active":""'>已付款</view>
+			<view style='position:absolute;right: 20px;font-weight:500;top:25%;' @click='dateshow=true'>{{datetext?datetext:'日期筛选'}}</view>
 			</view>
+			
+			<u-picker :range="dateList" range-key="value" @confirm='dateCheck($event)' v-model="dateshow"
+				mode="selector">
+			</u-picker>
 		</view>
 		<view class='wrap' v-for='item in dataInfo'>
 			<view style='margin:5px;padding:10px 0;border-bottom:1px solid #eee;'
@@ -100,7 +105,10 @@
 				show: false,
 				img: '',
 				searchType: '',
-				dataInfo: []
+				dataInfo: [],
+				dateshow:false,
+				dateList:[{value:'一个月'},{value:'三个月'},{value:'一年'}],
+				datetext:''
 			}
 		},
 		onShow() {},
@@ -134,6 +142,10 @@
 			closepop() {
 				this.show = false
 			},
+			dateCheck(e){
+				this.datetext=this.dateList[e[0]].value
+				this.loadData()
+			},
 			xiazai() {
 				const that = this;
 				uni.downloadFile({
@@ -259,6 +271,7 @@
 						managementType: 1,
 						appFlag:1,
 						customerPhone: this.userInfo.phone,
+						dateFilter:this.datetext
 						// pcFlag:1
 						// warehouseName:'',
 					}).then(res => {

+ 24 - 1
pages/user/setUp.vue

@@ -14,7 +14,7 @@
 			</view>
 			<view class='cu-item' style='margin-bottom:10px;' @click="nickname(username)">
 				<view>
-					<text>昵称</text>
+					<text>用户名</text>
 				</view>
 				<view style='align-items: center;' class="flex">
 					<view class="username">
@@ -23,6 +23,17 @@
 					<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow"></image>
 				</view>
 			</view>
+			<view class='cu-item' style='margin-bottom:10px;' @click="nickname1(wechatNo)">
+				<view>
+					<text>昵称</text>
+				</view>
+				<view style='align-items: center;' class="flex">
+					<view class="username">
+						{{wechatNo}}
+					</view>
+					<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow"></image>
+				</view>
+			</view>
 			<view class='cu-item' style='margin-bottom:10px;' @click='fankui'>
 				<view>
 					<text>意见反馈</text>
@@ -100,6 +111,7 @@
 				content: '您确定要退出吗?',
 				headUrl: "../../static/img/myimg/YongHu@3x.png",
 				username: "",
+				wechatNo:'',
 				gridList: [{
 					num: 0,
 					name: '退出登录',
@@ -329,6 +341,12 @@
 					this.headUrl = "../../static/img/myimg/YongHu@3x.png"
 				}
 				this.username = this.userInfo.userName
+				if(!uni.getStorageSync('userInfo').wechatNo){
+					this.wechatNo = this.userInfo.userName
+				}else{
+					this.wechatNo = this.userInfo.wechatNo
+				}
+				
 			},
 			switchPicture() {
 				uni.navigateTo({
@@ -340,6 +358,11 @@
 					url: `/pages/user/set_nickname?nickname=${username}`
 				})
 			},
+			nickname1(username) {
+				uni.navigateTo({
+					url: `/pages/user/set_wechatNo?nickname=${username}`
+				})
+			},
 			exitlogin() {
 
 			},

+ 1 - 1
pages/user/set_nickname.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="explain">
-			昵称长度限制在2-24个字符内
+			用户名长度限制在2-24个字符内
 		</view>
 		<view class="editText">
 			<input placeholder="请输入昵称" placeholder-color="#C6C6C6" name="input" v-model="nickname" class="texts"></input>