Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

杨鑫
2 parents e22d7ad7 2ac8e91c
Showing 7 changed files with 200 additions and 20 deletions
lvdao-miniapp/pages.json
lvdao-miniapp/pages/my/my.vue
lvdao-miniapp/pages/my/remove.vue
lvdao-miniapp/pages/workbench/workbench.vue
lvdao-miniapp/pagesA/rentPay/rentPay.vue
lvdao-miniapp/pagesA/rentPay/rentPayDetails.vue
lvdao-miniapp/utils/request.js
@@ -414,6 +414,14 @@
 				"navigationBarBackgroundColor": "#FFFFFF",
 				"navigationBarTitleText": "商品详情"
 			}
+		},
+		{
+			"path" : "pages/my/remove",
+			"style" : 
+			{
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarTitleText": "修改资料"
+			}
 		}
 	],
 	"subpackages": [{
@@ -34,8 +34,8 @@
 						</view>
 					</view>
 				</view>
-				<view class="user-right">
-					<!-- <image :src="$imgUrl('/right1.png')"></image> -->
+				<view class="user-right" @click="gopath('/pages/my/remove')">
+					<image  :src="$imgUrl('/right1.png')"></image>
 				</view>
 			</view>
 			<!-- 我的服务 -->
@@ -286,18 +286,21 @@
 			};
 		},
 		onload() {
-
+		
 		},
 		onShow() {
 			const isLogin = uni.getStorageSync('token');
-			this.user = uni.getStorageSync('user')
+			// this.user = uni.getStorageSync('user')
 			if (isLogin == '') {
 				// 如果未登录，跳转到登录页面
 				uni.navigateTo({
 					url: '/pages/login/login'
 				})
 			} else {
-
+				this.$http.sendRequest('/business/getUserDetails', 'GET', {}).then(res => {
+					
+					this.user = res.data.data
+				})
 				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{pageSize:10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
 					if(res.data.data.content.length>0) {
 						let c1 = res.data.data.content[0]
+<template>
+	<view>
+		<view class="user-wrap">
+			<view class="user-group">
+				<text class="nick-name">头像</text>
+				<button class="choose-avatar" open-type="chooseAvatar" @chooseavatar="onChooseAvatar" style="width: 80rpx;padding: 0;margin: 0;">
+				  <image class="user-avatar" :src="arr1.avatar?arr1.avatar:$imgUrl('/img/head.jpg')" mode="aspectFill"></image>
+				</button>
+			</view>
+			<view class="user-group">
+				<text class="nick-name">昵称</text>
+				<input class="choose-nickname" type="nickname" v-model="arr1.name" @change="nickNameChange"/>
+			</view>
+			<view class="user-group">
+				<text class="nick-name">性别</text>
+				<picker mode="selector" @change="bindPickerChange1" :value="arr1.sex" :range="range" :range-key="'text'">
+					<text>{{arr1.sex}}</text>
+					<uni-icons type="right" size="15"></uni-icons>
+				</picker>
+			</view>
+			<view class="confirm-user" @tap="backToCenter" >
+				确认
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				arr1:{
+					name:'',
+					avatar:'',
+					mobilePhone:'',
+					sex:'',
+					birthday:'',
+					occupation:'',
+					hobby:'',
+					workAddress:''
+				},
+				range: [
+					{
+						value: '男',
+						text: "男"
+					},
+					{
+						value: '女',
+						text: "女"
+					},
+				
+				],
+			}
+		},
+		onShow() {
+			this.gain()
+		},
+		methods: {
+			gain() {
+				let that =this
+				that.$http.sendRequest('/business/getUserDetails', 'GET', {}).then(res => {
+					
+					that.arr1 = res.data.data
+					console.log({...that.arr1})
+				})
+			},
+			open() {
+				this.$refs.calendar.open();
+			},
+			confirm(e) {
+				console.log(e);
+				this.arr1.birthday = e.fulldate
+			},
+			bindPickerChange1(e) {
+				this.arr1.sex =this.range[Number(e.detail.value)].value
+				console.log(this.arr1.sex)	
+			},
+			uploadFilePromise(url) {
+				console.log(url)
+				return new Promise((resolve, reject) => {
+					let a = uni.uploadFile({
+						url: this.$upload, // 仅为示例，非真实的接口地址
+						filePath: url,
+						name: 'file', // 后端接收的文件参数名
+						formData: {
+							filePath: 'user', // 其他表单数据
+						},
+						success: (res) => {
+							this.arr1.avatar = this.$img+ JSON.parse(res.data).data
+							resolve(JSON.parse(res.data).data)
+						}
+					});
+				})
+			},
+			async onChooseAvatar(e) {
+				console.log(e.detail)
+				this.arr1.avatar = e.detail.avatarUrl;
+				await this.uploadFilePromise(this.arr1.avatar)
+			},
+			nickNameChange(e) {
+				this.arr1.name = e.detail.value
+			},
+			async backToCenter() {
+				console.log({...this.arr1})
+				this.$http.sendRequest('/business/updateAvatar', 'POST', this.arr1).then(res => {
+					if(res.data.code == 200) {
+						uni.showToast({
+							icon: 'none',
+							title: "修改成功",
+						})
+						setTimeout(() => {
+							uni.reLaunch({
+								url:'/pages/my/my'
+							})
+						}, 500)
+					}
+			
+					console.log(res)
+				})
+			}
+		},
+	}
+</script>
+
+<style>
+	.user-wrap {
+	  padding: 0 30rpx;
+	  background: #fff;
+	  font-size: 26rpx;
+	  /* margin-top: 50rpx; */
+	}
+	.user-group {
+	  display: flex;
+	  justify-content: space-between;
+	  align-items: center;
+	  height: 100rpx;
+	  border-bottom: 2rpx solid #ccc;
+	}
+	.nick-name {
+	  font-weight: 700;
+	}
+	.choose-avatar {
+	  height: 80rpx;
+	  border-radius: 80rpx;
+	}
+	.user-avatar {
+	  width: 100%;
+	  height: 100%;
+	}
+	.choose-nickname {
+	  text-align: right;
+	}
+	
+	.confirm-user {
+		background-color: #19be6b;
+		color: #fff;
+		text-align: center;
+		width: 90%;
+		margin: 0 auto;
+		height: 80rpx;
+		border-radius: 30rpx;
+		line-height: 80rpx;
+		font-size: 32rpx;
+		position: fixed;
+		bottom: 30rpx;
+		left: 5%;
+		
+	}
+</style>
@@ -318,8 +318,8 @@
 					"page": 1,
 					"pageSize": 1
 				}, 1).then(res => {
-					if (res.data.data.list.length > 0) {
-						uni.setStorageSync('shopId', res.data.data.list[0].shopId);
+					if (res.data.data.content.length > 0) {
+						uni.setStorageSync('shopId', res.data.data.content[0].shopId);
 					} else {
 						// uni.show
 						uni.setStorageSync('shopId', '');
@@ -51,7 +51,7 @@
 				<view class="cart-add">
 					合计：<view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{payAll}}</view>
 				</view>
-				<u-button type="success" class="buttons" @click="joinShow" size="mini">去支付</u-button>
+				<u-button type="success" class="buttons" @click="joinShow">去支付</u-button>
 			</view>
 		</view>
 		<!-- <u-loading :show="true" size="60" style="position: absolute; top:80%;left: ;" color="red"></u-loading> -->
@@ -208,7 +208,7 @@
  
 				const msg = JSON.stringify(this.list1[this.ListIndex])
 				uni.navigateTo({
-					url: `/pagesA/rentPay/rentPayDetails?msg=${msg}&merchants=${this.relatedMerchants}`
+					url: `/pagesA/rentPay/rentPayDetails?msg=${encodeURIComponent(msg)}&merchants=${encodeURIComponent(this.relatedMerchants)}`
 				})
 			},
 			async joinShow() {
@@ -236,10 +236,7 @@
 					})
  
 					// return
-					const payId =  this.$http.sendRequest('/order/rentAggregatePayment', 'POST', arr, 3).then(res => {
-						console.log(res.data)
-						console.log(JSON.parse(res.data.data).payUrl)
-						
+					const payId =  await this.$http.sendRequest('/order/rentAggregatePayment', 'POST', arr, 3).then(res => {
 						if (res.data.data) {
 							let payUrl =  JSON.parse(res.data.data).payUrl
 							let c1 = payUrl.split('=')[1]
@@ -34,7 +34,7 @@
 				</view>
 			</view>
 		</view>
-		<view v-if="dataList.length === 0" class="nonemsg">
+		<view v-if="dataList.length === 0" class="nonemsg" style="font-size: 24rpx;">
 			暂无数据
 		</view>
 	</view>
@@ -57,10 +57,12 @@
 			this.pageIndex.time = this.getCurrentYear()
 		},
 		onLoad(options) {
+			console.error(options)
 			if (options.msg && options.merchants) {
 				this.allPay = 0
-				let receivedMsg = JSON.parse(options.msg)
-				this.merchants = options.merchants
+				let receivedMsg = JSON.parse(decodeURIComponent(options.msg))
+				this.merchants = decodeURIComponent(options.merchants)
+				console.error(this.merchants)
 				this.getAll(receivedMsg.list)
 			}
 		},
@@ -145,6 +147,7 @@
 					paymentTimeStart: firstDay,
 					paymentTimeEnd: lastDay
 				}, 1).then(res => {
+					console.log(res)
 					if (res.data.data.length > 0) {
 						this.getAll(res.data.data[0].cerePropertyOrderList)
 					} else {
@@ -176,7 +179,7 @@
 				const minutes = String(date.getMinutes()).padStart(2, '0');
  
 				// 按照所需格式拼接并返回结果
-				return `${month}.${day} ${hours}:${minutes}`;
+				return `${month}月${day}日 ${hours}:${minutes}`;
 			},
 			formatDate(dateStr) {
 				// 使用 split 方法将日期字符串按 - 分割成数组
@@ -21,7 +21,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
  
-		// bases = 'http://128.10.249.41:9003'+ url;
+		// bases = 'http://128.10.249.23:9003'+ url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
  
 		bases = c1 + 'cdwlMall/meserver/admin-server' + url; 
@@ -30,7 +30,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
 		// bases = 'http://128.10.249.22:9003:9007' + url;
-		// bases = 'http://128.10.249.41:9007' + url;
+		// bases = 'http://128.10.249.23:9007' + url;
 		bases = c1 + 'cdwlMall/meserver/api' + url;
  
 	}else{
@@ -39,7 +39,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		// bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
-		// bases = 'http://128.10.249.41:9004' + url;
+		// bases = 'http://128.10.249.23:9004' + url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
 		bases = c1 + 'cdwlMall/business-server' + url;