1
0

2 Commity 04094fa0f1 ... 8bd977ace9

Autor SHA1 Wiadomość Data
  xiaol 8bd977ace9 Merge branch 'master' of http://git.qiniu1314.com/cmy/CBB3 2 tygodni temu
  xiaol f8555cb643 2024-11-4 2 tygodni temu

+ 1 - 1
pages/chat/chat.vue

@@ -44,7 +44,7 @@
 		<view class="foot-view-info" id="foot-view-info">
 			<view class="foot-view fx-r fx-bc">
 				<image @tap="tapRecord" class="icon" src="/static/chat/voice.svg"></image>
-				<textarea  auto-height class="fx-g1"  v-model="msg"  :focus="focus" @focus="tapFoucus" :confirm-hold="true" :hold-keyboard="true" :adjust-position="false" @blur="tapBlur" ></textarea>
+				<textarea  auto-height maxlength="-1" class="fx-g1"  v-model="msg"  :focus="focus" @focus="tapFoucus" :confirm-hold="true" :hold-keyboard="true" :adjust-position="false" @blur="tapBlur" ></textarea>
 				<image @tap="tapCkFace(true)" class="icon" src="/static/chat/face.svg" v-if="!isFace"></image>
 				<image @tap="tapCkFace(false)" class="icon" src="/static/chat/cmore.svg" v-else></image>
 				<image @tap="tapOpenGroup" class="icon" style="width: 28px;height: 28px;" v-if="msg == ''" src="/static/chat/cadd.svg"></image>

+ 2 - 11
pages/chat/index.vue

@@ -134,8 +134,6 @@
 					<view class="avatar">
 						<image mode="aspectFill" :src="utils.getAvatar(item.img,item.type)"></image>
 					</view>
-
-
 					<view class="chat-info fx-r">
 						<view class="info fx-h">
 							<view class="fx-r">
@@ -144,8 +142,7 @@
 								<view class="time" v-if="item.time != ''">{{utils.timeLastdate(item.msg_time,true)}}
 								</view>
 							</view>
-
-							<view class="tag_value" v-if="item.type == 'chat'">
+							<view class="tag_value" v-if="item.type == 'chat'" style=" white-space: nowrap;overflow:hidden;height: 50rpx;line-height: 50rpx;">
 								<text class="value" v-if="item.msg_type == 'tip'">
 									{{item.msg_data}}
 								</text>
@@ -157,30 +154,24 @@
 								<text class="value" v-if="item.msg_type == 'red_envelope_tip'">
 									<rich-text class="title" :nodes="unDataChat(item,'red_envelope_tip')"></rich-text>
 								</text>
-
-
 								<!-- //文字聊天 -->
 								<text class="value" v-if="item.msg_type == 'voice'">
 									[语音文件]
 								</text>
-
 								<!-- //红包转账 -->
 								<text class="value" v-if="item.msg_type == 'red_envelope_transfer'">
 									<rich-text class="title"
 										:nodes="unDataChat(item,'red_envelope_transfer')"></rich-text>
 								</text>
-
 								<!-- //文字聊天 -->
 								<text class="value" v-if="item.msg_type == 'withdraw'">
 									撤回消息
 								</text>
-
 								<!-- //红包退回 -->
 								<text class="value" v-if="item.msg_type == 'red_envelope_transfer_back'">
 									<rich-text class="title"
 										:nodes="unDataChat(item,'red_envelope_transfer_back')"></rich-text>
 								</text>
-
 								<!-- //文字聊天 -->
 								<text class="value" v-if="item.msg_type == 'text'">
 									{{item.msg_text}}
@@ -195,7 +186,7 @@
 								<text class="value" v-if="item.msg_type == 'img'">[图片]</text>
 							</view>
 
-							<view class="tag_value" v-if="item.type == 'group_chat'">
+							<view class="tag_value" v-if="item.type == 'group_chat'" style=" white-space: nowrap;overflow:hidden;height: 50rpx;line-height: 50rpx;">
 								<text class="value" v-if="item.msg_type == 'tip'">
 									{{item.msg_data}}
 								</text>

+ 0 - 1
pages/login/register.vue

@@ -13,7 +13,6 @@
 					</view>
 					<view class="label-text">注册易趣CBB</view>
 				</view>
-				
 			</view>
 		</view>
 		<view class="body">

+ 1 - 1
pages/user/detail/anticipate.vue

@@ -237,7 +237,7 @@
 		}, 
 		onLoad(options) {
 			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
-			this.form.dateStr = this.utils.date('Y月m日');
+			this.form.dateStr = this.utils.date('Y年m月');
 			this.form.date = this.utils.date('Y-m');
 			this.datetime = this.utils.strtotime() * 1000;
 		},

+ 1 - 1
pages/user/detail/detail.vue

@@ -220,7 +220,7 @@
 		}, 
 		onLoad(options) {
 			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
-			this.form.dateStr = this.utils.date('Y月m日');
+			this.form.dateStr = this.utils.date('Y年m月');
 			this.form.date = this.utils.date('Y-m');
 			this.datetime = this.utils.strtotime() * 1000;
 			this.initView();

+ 1 - 1
pages/user/detail/integral.vue

@@ -300,7 +300,7 @@
 		}, 
 		onLoad(options) {
 			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
-			this.form.dateStr = this.utils.date('Y月m日');
+			this.form.dateStr = this.utils.date('Y年m月');
 			this.form.date = this.utils.date('Y-m');
 			this.datetime = this.utils.strtotime() * 1000;
 			

+ 1 - 1
unpackage/dist/build/web/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>CBB</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.2da1efab.css><script src=https://cn-shanghai-aliyun-cloudauth.oss-cn-shanghai.aliyuncs.com/web_sdk_js/jsvm_all.js></script><script src="https://cstaticdun.126.net/load.min.js?t=201903281201"></script></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><script src="https://cstaticdun.126.net/load.min.js?t=201903281201"></script><div id=app></div><script src=/h5/static/js/chunk-vendors.8d8331a6.js></script><script src=/h5/static/js/index.a97d741a.js></script></body></html><script>if(("standalone" in window.navigator) && window.navigator.standalone){
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.2da1efab.css><script src=https://cn-shanghai-aliyun-cloudauth.oss-cn-shanghai.aliyuncs.com/web_sdk_js/jsvm_all.js></script><script src="https://cstaticdun.126.net/load.min.js?t=201903281201"></script></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><script src="https://cstaticdun.126.net/load.min.js?t=201903281201"></script><div id=app></div><script src=/h5/static/js/chunk-vendors.8d8331a6.js></script><script src=/h5/static/js/index.e4ab670d.js></script></body></html><script>if(("standalone" in window.navigator) && window.navigator.standalone){
 	var noddy, remotes = false;
 	document.addEventListener('click', function(event) {
 		noddy = event.target;

BIN
unpackage/dist/build/web/web.zip