4 Commits 967e1ca9bd ... f97ba38e9b

Autor SHA1 Mensagem Data
  ck110 f97ba38e9b 改bug 2 semanas atrás
  ck110 6d41bd7609 Merge branch 'master' of http://150.158.33.144:3000/lalalashen/MeetMateApp 2 semanas atrás
  ck110 35e49652cc Merge branch 'master' of http://150.158.33.144:3000/lalalashen/MeetMateApp 2 semanas atrás
  ck110 be63b0ad6b M币创建群聊 2 semanas atrás

+ 4 - 3
manifest.json

@@ -2,8 +2,8 @@
 	"name": "遇见玛特",
 	"appid": "__UNI__A59181F",
 	"description": "",
-	"versionName": "1.0.8",
-	"versionCode": 108,
+	"versionName": "1.0.9",
+	"versionCode": 109,
 	"transformPx": false,
 	/* 5+App特有相关 hfhz-mrro-iqmv-igdl storygarden2024@outlook.com*/
 	"app-plus": {
@@ -28,7 +28,8 @@
 		/* 模块配置 */
 		"modules": {
 			"Push": {},
-			"Geolocation": {}
+			"Geolocation": {},
+			"Camera": {}
 		},
 		/* 应用发布信息 */
 		"distribute": {

+ 1 - 1
pages/chat/components/message.vue

@@ -18,7 +18,7 @@
 				<view class="avatar" @tap="toDetail(item.from)">
 					<!-- <view class="avatorImg2" v-if="item._isMy">{{item.avatar}}</view>
 					<view class="avatorImg" v-else>{{item.avatar}}</view> -->
-					<image :src="item.avatar" mode="aspectFit" />
+					<image :src="item.avatar" mode="aspectFill" />
 				</view>
 
 				<!-- 详细 -->

+ 1 - 1
pages/chat/groupMemlist.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<view class="bcenter">
 			<view class="avator" v-for="(item, index) in list" :key="index">
-				<image src="https://e.yujianmate.com/images/avator/a1.jpg" mode="widthFix" />
+				<image src="https://e.yujianmate.com/images/avator/a1.jpg" mode="aspectFill" />
 				<text>{{item.nick}}</text>
 				<image v-if="is_del" class="delit" src="../../static/icon/del_mem.png"
 					@click="actMem('del',item.userID)">

+ 1 - 1
pages/chat/groupSetting.vue

@@ -2,7 +2,7 @@
 	<view class="page">
 		<view class="bcenter">
 			<view class="avator" v-for="(item, index) in list" :key="index">
-				<image src="https://e.yujianmate.com/images/avator/a1.jpg" mode="widthFix" />
+				<image src="https://e.yujianmate.com/images/avator/a1.jpg" mode="aspectFill" />
 				<text>{{item.nick}}</text>
 				<image v-if="is_del" class="delit" src="../../static/icon/del_mem.png"
 					@click="actMem('del',item.userID)">

+ 20 - 2
pages/chat/newGroup.vue

@@ -29,7 +29,7 @@
 			}
 		},
 		onLoad(parms) {
-			this.type = parms.type || "joinGroup"
+			this.type = parms.type || "newGroup"
 		},
 		onShow() {},
 		methods: {
@@ -42,6 +42,24 @@
 					});
 					return;
 				}
+				let that = this;
+				if (this.type == 'newGroup') {
+					this.$refs['DialogBox'].confirm({
+						title: '提示',
+						content: '是否确定消耗100M币创建群聊',
+						DialogType: 'inquiry',
+						btn1: '否',
+						btn2: '是',
+						animation: 0
+					}).then((res) => {
+						that.submitData2();
+					})
+				} else {
+					that.submitData2();
+				}
+			},
+			submitData2() {
+
 				uni.request({
 					url: this.$apiHost2 + '/Chat/groupAction', //仅为示例,并非真实接口地址。
 					data: {
@@ -65,7 +83,7 @@
 						}
 					}
 				});
-			},
+			}
 		}
 	}
 </script>

+ 1 - 1
pages/index/peopleHome.vue

@@ -39,7 +39,7 @@
 					<image class="icon" src="../../static/me/ta_article_title.png" mode="widthFix">
 					</image>
 				</view>
-				<view class="more">
+				<view class="more" v-if="false">
 					更多
 					<image class="icon" src="../../static/me/arrow_right_gray.png" mode="widthFix">
 					</image>

+ 3 - 3
pages/my/managePhoto.vue

@@ -4,7 +4,7 @@
 
 			<view class="item_tag">
 				<view class="tag" v-for="(item,index) in list">
-					<image class="logo" :src="item" mode="widthFix"></image>
+					<image class="logo" :src="item" mode="aspectFill"></image>
 					<image class="close" src="../../static/me/close2.png" mode="widthFix" @click="delImg(item)" />
 				</view>
 				<view class="tagAdd" @click="upload">
@@ -37,10 +37,10 @@
 				list: [],
 			}
 		},
-		onLoad() {},
-		onShow() {
+		onLoad() {
 			this.loadData();
 		},
+		onShow() {},
 		methods: {
 			onBack() {},
 			chkSel() {

+ 1 - 1
pages/my/my.vue

@@ -4,7 +4,7 @@
 			<view class="header">
 				<view class="infoBg">
 					<view class="left" @click="goPage('/pages/my/editInfo')">
-						<image class="img" mode="widthFix" :src="myinfo.avator"></image>
+						<image class="img" mode="aspectFill" :src="myinfo.avator"></image>
 					</view>
 					<view class="right" @click="goPage('/pages/my/editInfo')">
 						<view class="nickname">

+ 1 - 1
pages/my/myArticle.scss

@@ -44,7 +44,7 @@ page {
 		.avator {
 			width:88rpx;
 			.icon {
-				width:72rpx;height:72rpx;
+				width:72rpx;height:72rpx;border-radius: 36rpx;
 			}
 		}
 		.tit {