2 Commits 8569a326af ... 0737490154

Author SHA1 Message Date
  xiaol 0737490154 Merge branch 'master' of http://git.qiniu1314.com/cmy/CBB3 3 weeks ago
  xiaol 2b33d33213 2024-11-4 3 weeks ago

+ 2 - 1
manifest.json

@@ -24,7 +24,8 @@
             "VideoPlayer" : {},
             "Record" : {},
             "Camera" : {},
-            "Geolocation" : {}
+            "Geolocation" : {},
+            "Barcode" : {}
         },
         /* 应用发布信息 */
         "distribute" : {

+ 4 - 2
pages/chat/chatGroup.vue

@@ -48,7 +48,7 @@
 		<view class="foot-view-info" id="foot-view-info">
 			<view class="foot-view fx-r fx-bc">
 				<image class="icon" src="/static/chat/voice.svg" @tap="tapRecord"></image>
-				<textarea  auto-height @input="tapInput" 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" @input="tapInput" class="fx-g1 limited-height"  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>
@@ -214,7 +214,9 @@
 	.pop-win-scroll .item:last-child .info{border-bottom: 0;}
 	.pop-win-scroll .letter{padding: 10px;background: #F8F6F6;}
 	
-	
+	.limited-height{
+		height: 300rpx;
+	}
 	
 	
 	.red-lq{position: fixed;height: 100%;width: 100%;background: rgba(0, 0, 0, 0.5);left: 0;top: 0;z-index: 10;}

+ 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.f6948fc5.js></script><script src=/h5/static/js/index.43f7eab7.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.a97d741a.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