Merge remote-tracking branch 'origin/master'

homePage/shop/index.vue

@@ -88,7 +88,15 @@
 					},]
 			 }
 		 },
+		 onShow() {
+		 	this.getFloor()
+		 },
 		 methods: {
+			 getFloor(){
+				 this.$u.get('/shop/mobile/selectShopFloor').then(res => {
+					 console.log('res',res)
+				 })
+			 },
 			 toDetail(){
 				 uni.navigateTo({
 				 	url:'/homePage/shop/detail/index'

moreFunction/feedback/index.vue

@@ -4,7 +4,7 @@
 			<u-form labelWidth="160" :model="form" ref="uForm" :rules="rules">
 				<u-form-item label="投诉标题" prop="title" borderBottom  required="true" labelWidth="160"
 					labelPosition="top">
-					<u-input placeholder="请输入投诉标题" :maxlength="30" v-model="form.title" border="none"></u-input>
+					<u-input placeholder="请输入投诉标题" :maxlength="30" v-model="form.title" :border="border"></u-input>
 				</u-form-item>
 				<!-- <u-form-item label="投诉类型" prop="type" borderBottom required="true" labelWidth="160"
 					labelPosition="top" @click="show = true; hideKeyboard()">
@@ -13,7 +13,7 @@
 				</u-form-item> -->
 				<u-form-item label="投诉内容" prop="details" borderBottom required="true" labelWidth="160"
 					labelPosition="top">
-					<u-input placeholder="请输入投诉内容" :maxlength="30" v-model="form.details" border="none"></u-input>
+					<u-input placeholder="请输入投诉内容"  :height="height" :auto-height="autoHeight" :type="type"  :maxlength="30" v-model="form.details"  :border="border"></u-input>
 				</u-form-item>
 				<u-form-item label="联系人" prop="contact" borderBottom  required="true" labelWidth="160"
 					labelPosition="top">
@@ -21,7 +21,7 @@
 				</u-form-item>
 				<u-form-item label="联系方式" prop="phone" borderBottom   required="true" labelWidth="160"
 					labelPosition="top">
-					<u-input placeholder="请输入联系方式" :maxlength="11" v-model="form.phone" border="none"></u-input>
+					<u-input placeholder="请输入联系方式" :maxlength="11" v-model="form.phone" :border="border"></u-input>
 				</u-form-item>
 			</u-form>
 		</view>
@@ -36,6 +36,10 @@
 	export default {
 		data(){
 			return{
+				type: 'textarea',
+				height: 100,
+				autoHeight: true,
+				border: false,
 				tenantId: '',
 				showSex: false,
 				form: {

moreFunction/improveInformation/index.vue

@@ -105,13 +105,13 @@
 				],
 				matrimonyList: [
 					{
-						value: '0',
+						value: 0,
 						label: '未婚'
 						
 					}
 					,
 					{
-						value: '1',
+						value: 1,
 						label: '已婚'
 					}
 				],

my/member/index.vue

@@ -14,7 +14,7 @@
 	export default{
 		data(){
 			return{
-				bashUrl: 'http://192.144.239.97:20043/file/',
+				bashUrl: 'http://192.144.239.97:20065/upload/',
 				src: 'http://192.144.239.97:20043/file/banner/20230605/6F749760FE1148369C4081EBD3248C6C.jpeg',
 				list2: [
 					{
@@ -46,8 +46,8 @@
 							for(const index in list) {
 								console.log('index',index)
 								const item = list[index]
-								item.image = baseApi + '/file/getImgStream?idFile=' + item.membershipCard
-								item.rankCard = baseApi + '/file/getImgStream?idFile=' + item.rankCard
+								item.image = bashUrl +item.membershipCard
+								item.rankCard =  bashUrl + item.rankCard
 							}
 							that.list2 = list
 							that.src = that.list2[0].rankCard

my/membershipCode/index.vue

@@ -17,7 +17,7 @@
 			</view>
 			<!-- 按钮 -->
 			<view class="button" @click="toDetai">
-				<view class="text">修改头像昵称</view>
+				<view class="text">修改头像</view>
 			</view>
 		</view>
 		<!-- 卡主体信息 -->

my/myMessage/index.vue

@@ -2,18 +2,18 @@
 	<view class="myMessage">
 		<view v-for="(item,index) in list" :key="index">
 			<!-- 时间 -->
-			<view class="date">{{item.time}}</view>
+			<view class="date">{{item.pushTime}}</view>
 			<view class="uplowCard">
 				<view class="one">
-					<view class="address">{{item.address}}</view>
-					<view class="time">{{item.time}}</view>
+					<view class="address">{{tenantName}}</view>
+					<view class="time">{{item.pushTime}}</view>
 				</view>
 				<view class="two">
 					<view class="title">{{item.title}}</view>
 					<view class="content">{{item.content}}</view>
 				</view>
 			</view>
-			<view class="lowerCard">
+			<view class="lowerCard" @click="toUser(item)">
 				<view class="button">立即使用</view>
 				<view class="icon">
 					<u-icon name="arrow-right"></u-icon>
@@ -27,14 +27,68 @@
 	export default{
 		data() {
 		  return{
+			total: 0,
 			time: '2023-07-05',
-			list: [{
-				time: '2023-07-05',
-				address: '天津复悦里',
-				title: '【新会员】 1小时停车券',
-				content: '亲爱的会员，您已成功领取【新会员】1小时停车券！有效期：领取后当天生效，生效后持续7天使用规则：请到适用商场使用'
-			}]
+			tenantName: '天津复悦里',
+			list: []
 		  }
+		},
+		onShow() {
+			this.getList()
+		},
+		methods: {
+			// 去使用
+			toUser(item){
+				console.log('item',item)
+				this.$u.route({
+				url:item.url,
+				})
+			},
+			// 获取消息list
+			getList(){
+				let recipientId = ''
+				let tenantId = ''
+				const that = this
+				// 没有登录跳转登录页
+				uni.getStorage({
+					key: 'lifeData',
+					success: function (res) {
+					    console.log('data',res.data);
+						recipientId = res.data.vuex_user.id
+						if(res.data.vuex_token === '') {
+							that.$u.route({
+							url:'/pages/login/login',
+							params:{}
+							})
+						} else {
+							uni.getStorage({
+								key: 'business',
+								success:function(Lres){
+								tenantId = Lres.data.id
+								that.tenantName = Lres.data.name
+								 console.log('recipientId',recipientId)
+								 console.log('tenantId',tenantId)
+								 that.$u.get('/mobile/messageInstance/list/'+tenantId + '/' + recipientId).then(response => {
+									 for(const index in response.records){
+										 const item =  response.records[index]
+										 item.pushTime = item.pushTime.substring(0,10)
+									 }
+									 that.list = response.records
+									 that.total = response.total
+								 })
+								}
+							})
+						}
+					},
+					fail: function(res) {
+					    console.log('fail',res.data);
+							that.$u.route({
+								url:'/pages/login/login',
+								params:{}
+							})
+					}
+				});
+			}
 		}
 	}
 </script>

pages/setting/updateAvatar.vue

 <template>
 	<view class="wrap">
 		<view class="u-flex u-row-center">
-			<u-avatar :src="pic" size="140"></u-avatar>
+			<u-avatar :src="pic" size="140" style="margin-top: 400rpx;"></u-avatar>
 
 		</view>
 		<view class="u-flex u-row-center u-margin-top-20 ">