Merge branch 'master' of http://150.158.33.144:3000/lalalashen/MeetMateApp

# Conflicts:
#	pages/my/editInfo.vue

manifest.json

@@ -2,8 +2,8 @@
 	"name": "遇见玛特",
 	"appid": "__UNI__A59181F",
 	"description": "",
-	"versionName": "1.1.0",
-	"versionCode": 110,
+	"versionName": "1.1.1",
+	"versionCode": 111,
 	"transformPx": false,
 	/* 5+App特有相关 hfhz-mrro-iqmv-igdl storygarden2024@outlook.com*/
 	"app-plus": {

pages/my/editInfo.vue

@@ -288,9 +288,7 @@
 							title: res.data.str,
 							animation: 0
 						});
-						if (res.data.success == "yes") {
-
-						}
+						this.getInfoData()
 					}
 				});
 			},

pages/my/share_img.vue

@@ -95,9 +95,11 @@
 			saveImg() {
 				// #ifdef APP-PLUS
 				let that = this;
-				uni.showLoading()
+				uni.showLoading({
+					title:'正在保存...',
+				})
 				uni.downloadFile({
-					url: that.myinfo.share_img,
+					url: that.myinfo.share_img0,
 					success: (res) => {
 						if (res.statusCode === 200) {
 							uni.saveImageToPhotosAlbum({
@@ -110,7 +112,7 @@
 								fail: function(e) {
 									uni.showToast({
 										icon: 'none',
-										title: '保存失败'
+										title: '保存到相册失败'
 									});
 								},
 								complete: function() {
@@ -118,25 +120,25 @@
 								}
 							});
 						} else {
-							uni.hideLoading()
 							uni.showToast({
 								icon: 'none',
-								title: '保存失败'
+								title: '邀请码下载失败'
 							})
+							uni.hideLoading()
 						}
 					},
 					fail: function() {
-						uni.hideLoading()
 						uni.showToast({
 							icon: 'none',
-							title: '保存失败'
+							title: '邀请码下载错误'
 						})
+					},
+					complete() {
+						uni.hideLoading()
 					}
 				})
-
 				// #endif
 			}
-
 		}
 	}
 </script>

pages/my/wish.vue

@@ -27,7 +27,7 @@
 					</view>
 					<view class="list_mem">
 						<image class="icon" v-for="(item2,index2) in item.mem_list" :src="item2.avator"
-							mode="widthFix" />
+							mode="aspectFill" />
 					</view>
 					<view class="btn_submit" @click="JoinIt(item)" v-if="item.status == 1">加入心愿</view>
 					<view class="btn_submit gray" v-if="item.status == 2">已加入</view>

pages/my/wishDetail.vue

@@ -42,7 +42,7 @@
 					<view class="list_record">
 						<view class="record" v-for="(item,index) in info.mem_list">
 							<view class="left">
-								<image class="icon" :src="item.avator" mode="widthFix" />
+								<image class="icon" :src="item.avator" mode="aspectFill" />
 								<text>{{item.nickname}}</text>
 							</view>
 							<text class="right">{{item.create_time}}</text>

pages/w3/share_img.vue

@@ -92,7 +92,9 @@
 			saveImg() {
 				// #ifdef APP-PLUS
 				let that = this;
-				uni.showLoading()
+				uni.showLoading({
+					title:'正在保存...',
+				})
 				uni.downloadFile({
 					url: that.myinfo.share_img,
 					success: (res) => {
@@ -107,7 +109,7 @@
 								fail: function(e) {
 									uni.showToast({
 										icon: 'none',
-										title: '保存失败'
+										title: '保存到相册失败'
 									});
 								},
 								complete: function() {
@@ -115,19 +117,21 @@
 								}
 							});
 						} else {
-							uni.hideLoading()
 							uni.showToast({
 								icon: 'none',
-								title: '保存失败'
+								title: '邀请码下载失败'
 							})
+							uni.hideLoading()
 						}
 					},
 					fail: function() {
-						uni.hideLoading()
 						uni.showToast({
 							icon: 'none',
-							title: '保存失败'
+							title: '邀请码下载错误'
 						})
+					},
+					complete() {
+						uni.hideLoading()
 					}
 				})