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

common/websocketUtil.js

@@ -188,7 +188,7 @@ class websocketUtil {
 					}
 				}
 				if (resdata.response.code != 200) {
-					console.log(res.data)
+					// console.log(res.data)
 				}
 
 			});

pages/index/index.vue

@@ -71,10 +71,10 @@
 						<image class="icon" mode="widthFix" src="../../static/home/icon_sex2.png"></image>
 						<text>{{item.age}}</text>
 					</view>
-					<view class="tag2">
+					<view class="tag2" v-if="item.ziye">
 						<text>{{item.ziye}}</text>
 					</view>
-					<view class="tag2">
+					<view class="tag2" v-if="item.xinzuo">
 						<text>{{item.xinzuo}}</text>
 					</view>
 

pages/my/setting.vue

@@ -89,26 +89,36 @@
 						'name': '客服热线',
 						'desc': '400-888-1688',
 						'path': ''
-					}
-				]
+					},
+				] 
 			}
 		},
 		onLoad() {
-			// setTimeout(function() {
-			// 	uni.setNavigationBarColor({
-			// 		frontColor: '#ffffff',
-			// 		backgroundColor: '#00000000',
-			// 		animation: {
-			// 			duration: 400,
-			// 			timingFunc: 'easeIn'
-			// 		}
-			// 	})
-			// }, 200);
+			// #ifdef APP-PLUS
+			this.getAppVersion()
+			// #endif
 		},
 		onShow() {
 			this.loadData();
 		},
 		methods: {
+			getAppVersion() {
+				uni.getSystemInfo({
+					success: (info) => {
+						// app系统环境
+						let appPlatform = info.platform;
+						console.log("appPlatform", appPlatform)
+						// 获取本机版本号
+						plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
+							this.list.push({
+								'name': '版本号',
+								'desc': 'V' + wgtinfo.version,
+								'path': ''
+							})
+						});
+					}
+				});
+			},
 			onBack() {},
 			chkSel() {
 				if (this.sel == 1) {

pages/my/wishHelp.vue

@@ -4,7 +4,7 @@
 		<view class="list_info">
 			<view class="item">
 				<view class="avator">
-					<image class="icon" :src="info.image" mode="widthFix">
+					<image class="icon" :src="info.image" mode="aspectFill">
 					</image>
 				</view>
 				<view class="tit">
@@ -20,7 +20,7 @@
 				<view class="title">助力好友</view>
 				<view class="list_mem">
 					<view class="mem" v-for="(item,index) in info.mem_list">
-						<image class="icon" :src="item.avator" mode="widthFix" />
+						<image class="icon" :src="item.avator" mode="aspectFill" />
 						<text>{{item.nickname}}</text>
 					</view>
 				</view>