lhl 1 jaar geleden
bovenliggende
commit
d3e691e24a
100 gewijzigde bestanden met toevoegingen van 39 en 20 verwijderingen
  1. 2 2
      manifest.json
  2. 1 4
      pages.json
  3. 6 2
      pages/chat/message.vue
  4. 4 3
      pages/my/index.vue
  5. 5 4
      pages/my/qrcode.vue
  6. 20 4
      pages/push/game.vue
  7. BIN
      static/img/icon.png
  8. BIN
      static/img/logo.png
  9. BIN
      static/img/qunfa.png
  10. BIN
      static/logo.png
  11. BIN
      static/my/group.png
  12. BIN
      static/share/album_down_save.webp
  13. BIN
      static/share/album_share_friend.webp
  14. BIN
      static/share/im_group_qr_bg_big.png
  15. BIN
      static/share/share_icon.png
  16. BIN
      static/share_icon.png
  17. BIN
      static/theme/default/Image.png
  18. BIN
      static/theme/default/add.png
  19. BIN
      static/theme/default/album_down_save.webp
  20. BIN
      static/theme/default/album_share_friend.webp
  21. BIN
      static/theme/default/collection_icon.png
  22. BIN
      static/theme/default/contact_icon.png
  23. BIN
      static/theme/default/details/conversation.png
  24. BIN
      static/theme/default/details/logo.png
  25. BIN
      static/theme/default/details/msg.png
  26. BIN
      static/theme/default/envelope_icon.png
  27. BIN
      static/theme/default/file_icon.png
  28. BIN
      static/theme/default/ic_chat_face_wct.png
  29. BIN
      static/theme/default/location_icon.png
  30. BIN
      static/theme/default/message/concat.png
  31. BIN
      static/theme/default/message/video.png
  32. BIN
      static/theme/default/message/voice.png
  33. BIN
      static/theme/default/my/emoji.png
  34. BIN
      static/theme/default/my/images.png
  35. BIN
      static/theme/default/my/photo-album.png
  36. BIN
      static/theme/default/my/real.png
  37. BIN
      static/theme/default/my/scan.png
  38. BIN
      static/theme/default/my/set.png
  39. BIN
      static/theme/default/my/user_icon_bg.png
  40. BIN
      static/theme/default/my/user_icon_help.png
  41. BIN
      static/theme/default/my/user_icon_scan.png
  42. BIN
      static/theme/default/my/wen.png
  43. BIN
      static/theme/default/push/circle/like.png
  44. BIN
      static/theme/default/push/circle/liked.png
  45. BIN
      static/theme/default/shooting_icon.png
  46. BIN
      static/theme/default/tabBar/1_1.png
  47. BIN
      static/theme/default/tabBar/2_1.png
  48. BIN
      static/theme/default/tabBar/3_1.png
  49. BIN
      static/theme/default/tabBar/4_1.png
  50. BIN
      static/theme/default/tool_icon.png
  51. BIN
      static/theme/default/user/1.png
  52. BIN
      static/theme/default/user/2.png
  53. BIN
      static/theme/default/user/3.png
  54. BIN
      static/theme/default/user/4.png
  55. BIN
      static/theme/default/user/5.png
  56. BIN
      unpackage/cache/apk/__UNI__B354A60_cm.apk
  57. 1 1
      unpackage/cache/apk/apkurl
  58. 0 0
      unpackage/cache/apk/cmManifestCache.json
  59. 0 0
      unpackage/cache/wgt/__UNI__B354A60/app-config-service.js
  60. 0 0
      unpackage/cache/wgt/__UNI__B354A60/app-service.js
  61. 0 0
      unpackage/cache/wgt/__UNI__B354A60/app-view.js
  62. 0 0
      unpackage/cache/wgt/__UNI__B354A60/manifest.json
  63. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/img/icon.png
  64. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/img/logo.png
  65. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/img/qunfa.png
  66. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/logo.png
  67. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/my/group.png
  68. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/share/album_down_save.webp
  69. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/share/album_share_friend.webp
  70. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/share/im_group_qr_bg_big.png
  71. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/share/share_icon.png
  72. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/share_icon.png
  73. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/Image.png
  74. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/add.png
  75. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/album_down_save.webp
  76. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/album_share_friend.webp
  77. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/collection_icon.png
  78. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/contact_icon.png
  79. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/details/conversation.png
  80. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/details/logo.png
  81. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/details/msg.png
  82. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/envelope_icon.png
  83. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/file_icon.png
  84. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/ic_chat_face_wct.png
  85. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/location_icon.png
  86. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/message/concat.png
  87. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/message/video.png
  88. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/message/voice.png
  89. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/emoji.png
  90. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/images.png
  91. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/photo-album.png
  92. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/real.png
  93. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/scan.png
  94. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/set.png
  95. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/user_icon_bg.png
  96. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/user_icon_help.png
  97. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/user_icon_scan.png
  98. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/wen.png
  99. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/push/circle/like.png
  100. BIN
      unpackage/cache/wgt/__UNI__B354A60/static/theme/default/push/circle/liked.png

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "易趣聊",
     "appid" : "__UNI__B354A60",
     "description" : "易趣聊",
-    "versionName" : "1.0.4",
-    "versionCode" : 104,
+    "versionName" : "1.0.5",
+    "versionCode" : 105,
     "transformPx" : false,
     "networkTimeout" : {
         "request" : 6000,

+ 1 - 4
pages.json

@@ -1136,7 +1136,7 @@
 	},
 	"tabBar": {
 		"color": "#717171",
-		"selectedColor": "#2da2fd",
+		"selectedColor": "#ff443f",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"iconWidth": "30px",
@@ -1155,9 +1155,6 @@
 				"text": "通讯录"
 			},
 			{
-
-
-
 				"pagePath": "pages/push/wap",
 				"iconPath": "/static/theme/default/logo.png",
 				"selectedIconPath": "/static/theme/default/logo.png",

+ 6 - 2
pages/chat/message.vue

@@ -224,7 +224,7 @@
 									<image @longtap="showAction(row)" @tap="goDetails(row.msg.user_info.uid,row)"
 										:src="(row.msg.is_niming == 1)? '/static/theme/default/my/niming.png' : (staticPhoto + row.msg.user_info.face)"
 										:lazy-load="true" style="border-radius: 10px;" :data-id="index"
-										@error="imageError" />
+										@error="imageError" class="u-logo"/>
 									<view class="action" v-if="row.showAction">
 										<view class="action-item" @click="addFriendChat(row)">
 											@TA
@@ -2821,7 +2821,11 @@ console.log('监听会话数据变化的会话');
 	.other {
 		.left {
 			position: relative;
-
+			.u-logo {
+				width: 90rpx !important;
+				height: 90rpx !important;
+				flex-shrink: 0;
+			}
 			.action {
 				width: 160rpx;
 				background: #fff;

+ 4 - 3
pages/my/index.vue

@@ -59,6 +59,7 @@
 	import _get from '../../common/_get';
 	import _hook from '../../common/_hook';
 	import _data from '../../common/_data';
+	import _page from '../../common/common';
 
 
 	export default {
@@ -127,9 +128,9 @@
 				})
 				// #endif
 				// #ifdef APP-PLUS
-				uni.scanCode({
-
-				})
+				let _this = this;
+				// _this.action_menu = false;
+				_page.scanCode();
 				// #endif
 			},
 			toHelp() {

+ 5 - 4
pages/my/qrcode.vue

@@ -39,10 +39,10 @@
 						<image src="/static/share/album_down_save.webp" mode="widthFix"></image>
 						<text>保存</text>
 					</view>
-					<view class="btn" @click="createPoster">
+					<!-- <view class="btn" @click="createPoster">
 						<image src="/static/share/album_share_friend.webp" mode="widthFix"></image>
 						<text>分享</text>
-					</view>
+					</view> -->
 				</view>
 			</view>
 			<view class="share" v-if="load_image">
@@ -229,10 +229,11 @@
 		width: 400rpx;
 		height: 120rpx;
 		display: flex;
-		justify-content: space-between;
+		// justify-content: space-between;
+		justify-content:center;
 		align-items: center;
 		margin: 20rpx auto;
-
+		
 		.btn {
 			display: flex;
 			flex-direction: column;

+ 20 - 4
pages/push/game.vue

@@ -172,6 +172,7 @@
 											});
 											break;
 										default:
+										console.log('哪里');
 											uni.showModal({
 												content: '二维码内容:' + res.result,
 												showCancel: false,
@@ -179,6 +180,7 @@
 											break;
 									}
 								} else {
+									console.log('这里');
 									uni.showModal({
 										content: '二维码内容:' + res.result,
 										showCancel: false,
@@ -191,10 +193,24 @@
 								});
 							}
 						} else {
-							uni.showModal({
-								content: '二维码内容:' + res.result,
-								showCancel: false,
-							});
+							
+							let da = JSON.parse(res.result)
+							if(da.action == 'chat_add') {
+								console.log('在这里');
+								uni.navigateTo({
+									url: '/pages/details/index?user_id=' + da.user_id +
+										'&is_type=3',
+									fail(err) {
+										console.log(err);
+									}
+								});
+							}else {
+								uni.showModal({
+									content: '二维码内容:' + res.result,
+									showCancel: false,
+								});
+							}
+							
 						}
 					},
 					fail(e) {

BIN
static/img/icon.png


BIN
static/img/logo.png


BIN
static/img/qunfa.png


BIN
static/logo.png


BIN
static/my/group.png


BIN
static/share/album_down_save.webp


BIN
static/share/album_share_friend.webp


BIN
static/share/im_group_qr_bg_big.png


BIN
static/share/share_icon.png


BIN
static/share_icon.png


BIN
static/theme/default/Image.png


BIN
static/theme/default/add.png


BIN
static/theme/default/album_down_save.webp


BIN
static/theme/default/album_share_friend.webp


BIN
static/theme/default/collection_icon.png


BIN
static/theme/default/contact_icon.png


BIN
static/theme/default/details/conversation.png


BIN
static/theme/default/details/logo.png


BIN
static/theme/default/details/msg.png


BIN
static/theme/default/envelope_icon.png


BIN
static/theme/default/file_icon.png


BIN
static/theme/default/ic_chat_face_wct.png


BIN
static/theme/default/location_icon.png


BIN
static/theme/default/message/concat.png


BIN
static/theme/default/message/video.png


BIN
static/theme/default/message/voice.png


BIN
static/theme/default/my/emoji.png


BIN
static/theme/default/my/images.png


BIN
static/theme/default/my/photo-album.png


BIN
static/theme/default/my/real.png


BIN
static/theme/default/my/scan.png


BIN
static/theme/default/my/set.png


BIN
static/theme/default/my/user_icon_bg.png


BIN
static/theme/default/my/user_icon_help.png


BIN
static/theme/default/my/user_icon_scan.png


BIN
static/theme/default/my/wen.png


BIN
static/theme/default/push/circle/like.png


BIN
static/theme/default/push/circle/liked.png


BIN
static/theme/default/shooting_icon.png


BIN
static/theme/default/tabBar/1_1.png


BIN
static/theme/default/tabBar/2_1.png


BIN
static/theme/default/tabBar/3_1.png


BIN
static/theme/default/tabBar/4_1.png


BIN
static/theme/default/tool_icon.png


BIN
static/theme/default/user/1.png


BIN
static/theme/default/user/2.png


BIN
static/theme/default/user/3.png


BIN
static/theme/default/user/4.png


BIN
static/theme/default/user/5.png


BIN
unpackage/cache/apk/__UNI__B354A60_cm.apk


+ 1 - 1
unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/eaae9100-3fed-11ee-908a-23a996ee5129
+https://ide.dcloud.net.cn/build/download/029a1c60-418b-11ee-982c-0d94aba03cb1

File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/apk/cmManifestCache.json


File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__B354A60/app-config-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__B354A60/app-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__B354A60/app-view.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__B354A60/manifest.json


BIN
unpackage/cache/wgt/__UNI__B354A60/static/img/icon.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/img/logo.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/img/qunfa.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/logo.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/my/group.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/share/album_down_save.webp


BIN
unpackage/cache/wgt/__UNI__B354A60/static/share/album_share_friend.webp


BIN
unpackage/cache/wgt/__UNI__B354A60/static/share/im_group_qr_bg_big.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/share/share_icon.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/share_icon.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/Image.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/add.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/album_down_save.webp


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/album_share_friend.webp


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/collection_icon.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/contact_icon.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/details/conversation.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/details/logo.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/details/msg.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/envelope_icon.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/file_icon.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/ic_chat_face_wct.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/location_icon.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/message/concat.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/message/video.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/message/voice.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/emoji.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/images.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/photo-album.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/real.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/scan.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/set.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/user_icon_bg.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/user_icon_help.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/user_icon_scan.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/my/wen.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/push/circle/like.png


BIN
unpackage/cache/wgt/__UNI__B354A60/static/theme/default/push/circle/liked.png


Some files were not shown because too many files changed in this diff