lyuis vor 7 Monaten
Ursprung
Commit
5584177d66
100 geänderte Dateien mit 13 neuen und 7 gelöschten Zeilen
  1. 5 2
      common/config.js
  2. 4 3
      pages/msg/im.vue
  3. 4 2
      pages/msg/index.vue
  4. BIN
      static/emoji/1f192.gif
  5. BIN
      static/emoji/1f193.gif
  6. BIN
      static/emoji/1f195.gif
  7. BIN
      static/emoji/1f197.gif
  8. BIN
      static/emoji/1f199.gif
  9. BIN
      static/emoji/1f1e7-1f1fe.gif
  10. BIN
      static/emoji/1f308.gif
  11. BIN
      static/emoji/1f311.gif
  12. BIN
      static/emoji/1f312.gif
  13. BIN
      static/emoji/1f313.gif
  14. BIN
      static/emoji/1f314.gif
  15. BIN
      static/emoji/1f315.gif
  16. BIN
      static/emoji/1f316.gif
  17. BIN
      static/emoji/1f317.gif
  18. BIN
      static/emoji/1f318.gif
  19. BIN
      static/emoji/1f31a.gif
  20. BIN
      static/emoji/1f31b.gif
  21. BIN
      static/emoji/1f31c.gif
  22. BIN
      static/emoji/1f31d.gif
  23. BIN
      static/emoji/1f31e.gif
  24. BIN
      static/emoji/1f31f.gif
  25. BIN
      static/emoji/1f321-fe0f.gif
  26. BIN
      static/emoji/1f324-fe0f.gif
  27. BIN
      static/emoji/1f325-fe0f.gif
  28. BIN
      static/emoji/1f326-fe0f.gif
  29. BIN
      static/emoji/1f327-fe0f.gif
  30. BIN
      static/emoji/1f328-fe0f.gif
  31. BIN
      static/emoji/1f329-fe0f.gif
  32. BIN
      static/emoji/1f32d.gif
  33. BIN
      static/emoji/1f32e.gif
  34. BIN
      static/emoji/1f331.gif
  35. BIN
      static/emoji/1f332.gif
  36. BIN
      static/emoji/1f333.gif
  37. BIN
      static/emoji/1f334.gif
  38. BIN
      static/emoji/1f335.gif
  39. BIN
      static/emoji/1f337.gif
  40. BIN
      static/emoji/1f338.gif
  41. BIN
      static/emoji/1f339.gif
  42. BIN
      static/emoji/1f33a.gif
  43. BIN
      static/emoji/1f33c.gif
  44. BIN
      static/emoji/1f33f.gif
  45. BIN
      static/emoji/1f340.gif
  46. BIN
      static/emoji/1f346.gif
  47. BIN
      static/emoji/1f34c.gif
  48. BIN
      static/emoji/1f351.gif
  49. BIN
      static/emoji/1f353.gif
  50. BIN
      static/emoji/1f354.gif
  51. BIN
      static/emoji/1f355.gif
  52. BIN
      static/emoji/1f356.gif
  53. BIN
      static/emoji/1f357.gif
  54. BIN
      static/emoji/1f358.gif
  55. BIN
      static/emoji/1f359.gif
  56. BIN
      static/emoji/1f35f.gif
  57. BIN
      static/emoji/1f361.gif
  58. BIN
      static/emoji/1f362.gif
  59. BIN
      static/emoji/1f363.gif
  60. BIN
      static/emoji/1f365.gif
  61. BIN
      static/emoji/1f366.gif
  62. BIN
      static/emoji/1f369.gif
  63. BIN
      static/emoji/1f36a.gif
  64. BIN
      static/emoji/1f36b.gif
  65. BIN
      static/emoji/1f36d.gif
  66. BIN
      static/emoji/1f36e.gif
  67. BIN
      static/emoji/1f370.gif
  68. BIN
      static/emoji/1f371.gif
  69. BIN
      static/emoji/1f373.gif
  70. BIN
      static/emoji/1f377.gif
  71. BIN
      static/emoji/1f378.gif
  72. BIN
      static/emoji/1f379.gif
  73. BIN
      static/emoji/1f37c.gif
  74. BIN
      static/emoji/1f37d-fe0f.gif
  75. BIN
      static/emoji/1f37e.gif
  76. BIN
      static/emoji/1f37f.gif
  77. BIN
      static/emoji/1f382.gif
  78. BIN
      static/emoji/1f383.gif
  79. BIN
      static/emoji/1f384.gif
  80. BIN
      static/emoji/1f385.gif
  81. BIN
      static/emoji/1f386.gif
  82. BIN
      static/emoji/1f387.gif
  83. BIN
      static/emoji/1f388.gif
  84. BIN
      static/emoji/1f389.gif
  85. BIN
      static/emoji/1f38a.gif
  86. BIN
      static/emoji/1f393.gif
  87. BIN
      static/emoji/1f396-fe0f.gif
  88. BIN
      static/emoji/1f397-fe0f.gif
  89. BIN
      static/emoji/1f399-fe0f.gif
  90. BIN
      static/emoji/1f39f-fe0f.gif
  91. BIN
      static/emoji/1f3a2.gif
  92. BIN
      static/emoji/1f3a4.gif
  93. BIN
      static/emoji/1f3a8.gif
  94. BIN
      static/emoji/1f3a9.gif
  95. BIN
      static/emoji/1f3ab.gif
  96. BIN
      static/emoji/1f3ac.gif
  97. BIN
      static/emoji/1f3ad.gif
  98. BIN
      static/emoji/1f3ae.gif
  99. BIN
      static/emoji/1f3af.gif
  100. BIN
      static/emoji/1f3b0.gif

+ 5 - 2
common/config.js

@@ -1,4 +1,5 @@
 const h5Url='https://bossweb.edccc.cn'
+const ossUrl='https://yi-zhipin.oss-cn-hangzhou.aliyuncs.com/emoji/'
 if (process.env.NODE_ENV !== 'development') {
 	//正式环境
 	const ROOTPATH = "https://yizhizan.edccc.cn/sqx_fast";
@@ -12,7 +13,8 @@ if (process.env.NODE_ENV !== 'development') {
 		WSHOST: ROOTPATH2,
 		WSHOST1: ROOTPATH3,
 		WSHOST4: ROOTPATH4,
-		h5Url
+		h5Url,
+		ossUrl
 	};
 }else{
 	//测试环境
@@ -27,7 +29,8 @@ if (process.env.NODE_ENV !== 'development') {
 		WSHOST: ROOTPATH2,
 		WSHOST1: ROOTPATH3,
 		WSHOST4: ROOTPATH4,
-		h5Url
+		h5Url,
+		ossUrl
 	
 	};
 }

+ 4 - 3
pages/msg/im.vue

@@ -390,7 +390,7 @@
 							:src="item.content" style="height: 200rpx;width: 200rpx;margin-left: 20rpx;"></image>
 						<image class="chat-listitem-text" 
 							v-if="item.content && item.messageType === 4"
-							:src="'../../static/emoji/' +item.content"
+							:src="ossUrl +item.content"
 							style="height: 80rpx;width: 80rpx;margin-left: 20rpx;"></image>
 
 						<view v-if="item.content && item.messageType === 3" class="chat-listitem-text bubble voice"
@@ -510,7 +510,7 @@
 							style="height: 200rpx;width: 200rpx;margin-right: 20rpx;"></image>
 						<image class="chat-listitem-text textColor"
 							v-if="item.content && item.messageType === 4"
-							:src="'../../static/emoji/' +item.content"
+							:src="ossUrl +item.content"
 							style="height: 80rpx;width: 80rpx;margin-right: 20rpx;">
 						</image>
 
@@ -554,7 +554,7 @@
 				<swiper-item v-for="(page1,pid) in emojiList" :key="pid">
 					<view v-for="(em,eid) in page1" :key="eid" @tap="setChatSave(4,em.url)">
 						<!-- <image src="../../static/emoji/100.gif" mode="widthFix"></image> -->
-						<image mode="widthFix" :src="'../../static/emoji/'+em.url"></image>
+						<image mode="widthFix" :src="ossUrl+em.url"></image>
 					</view>
 				</swiper-item>
 			</swiper>
@@ -1014,6 +1014,7 @@
 				socketTimer: null, //心跳定时器
 				isVip: false, //是否是会员
 				isVideo: false, //是否打视频
+				ossUrl:configdata.ossUrl
 			};
 		},
 		onUnload() {

+ 4 - 2
pages/msg/index.vue

@@ -87,7 +87,7 @@
 							<view class="text-grey" v-else-if="item.messageType == 2">[图片]</view>
 							<view class="text-grey" v-else-if="item.messageType == 4"><image class="chat-listitem-text"
 							v-if="item.content && item.messageType === 4"
-							:src="'../../static/emoji/' +item.content"
+							:src="ossUrl +item.content"
 							style="height: 40rpx;width: 40rpx;"></image></view>
 							<view class="text-grey" v-else-if="item.messageType == 20">[视频通话]</view>
 							<view class="text-grey" v-else-if="item.messageType == 21">[语音通话]</view>
@@ -176,6 +176,7 @@
 
 <script>
 	import empty from '../../components/empty.vue'
+	import configData from '../../common/config.js'
 	export default {
 		components: {
 			empty
@@ -193,7 +194,8 @@
 				arr: [],
 				showModal: true,
 				showSettings: false, // 控制设置弹窗显示
-				notificationEnabled: true // 消息通知开关状态
+				notificationEnabled: true, // 消息通知开关状态
+				ossUrl:configData.ossUrl
 			}
 		},
 		onLoad() {

BIN
static/emoji/1f192.gif


BIN
static/emoji/1f193.gif


BIN
static/emoji/1f195.gif


BIN
static/emoji/1f197.gif


BIN
static/emoji/1f199.gif


BIN
static/emoji/1f1e7-1f1fe.gif


BIN
static/emoji/1f308.gif


BIN
static/emoji/1f311.gif


BIN
static/emoji/1f312.gif


BIN
static/emoji/1f313.gif


BIN
static/emoji/1f314.gif


BIN
static/emoji/1f315.gif


BIN
static/emoji/1f316.gif


BIN
static/emoji/1f317.gif


BIN
static/emoji/1f318.gif


BIN
static/emoji/1f31a.gif


BIN
static/emoji/1f31b.gif


BIN
static/emoji/1f31c.gif


BIN
static/emoji/1f31d.gif


BIN
static/emoji/1f31e.gif


BIN
static/emoji/1f31f.gif


BIN
static/emoji/1f321-fe0f.gif


BIN
static/emoji/1f324-fe0f.gif


BIN
static/emoji/1f325-fe0f.gif


BIN
static/emoji/1f326-fe0f.gif


BIN
static/emoji/1f327-fe0f.gif


BIN
static/emoji/1f328-fe0f.gif


BIN
static/emoji/1f329-fe0f.gif


BIN
static/emoji/1f32d.gif


BIN
static/emoji/1f32e.gif


BIN
static/emoji/1f331.gif


BIN
static/emoji/1f332.gif


BIN
static/emoji/1f333.gif


BIN
static/emoji/1f334.gif


BIN
static/emoji/1f335.gif


BIN
static/emoji/1f337.gif


BIN
static/emoji/1f338.gif


BIN
static/emoji/1f339.gif


BIN
static/emoji/1f33a.gif


BIN
static/emoji/1f33c.gif


BIN
static/emoji/1f33f.gif


BIN
static/emoji/1f340.gif


BIN
static/emoji/1f346.gif


BIN
static/emoji/1f34c.gif


BIN
static/emoji/1f351.gif


BIN
static/emoji/1f353.gif


BIN
static/emoji/1f354.gif


BIN
static/emoji/1f355.gif


BIN
static/emoji/1f356.gif


BIN
static/emoji/1f357.gif


BIN
static/emoji/1f358.gif


BIN
static/emoji/1f359.gif


BIN
static/emoji/1f35f.gif


BIN
static/emoji/1f361.gif


BIN
static/emoji/1f362.gif


BIN
static/emoji/1f363.gif


BIN
static/emoji/1f365.gif


BIN
static/emoji/1f366.gif


BIN
static/emoji/1f369.gif


BIN
static/emoji/1f36a.gif


BIN
static/emoji/1f36b.gif


BIN
static/emoji/1f36d.gif


BIN
static/emoji/1f36e.gif


BIN
static/emoji/1f370.gif


BIN
static/emoji/1f371.gif


BIN
static/emoji/1f373.gif


BIN
static/emoji/1f377.gif


BIN
static/emoji/1f378.gif


BIN
static/emoji/1f379.gif


BIN
static/emoji/1f37c.gif


BIN
static/emoji/1f37d-fe0f.gif


BIN
static/emoji/1f37e.gif


BIN
static/emoji/1f37f.gif


BIN
static/emoji/1f382.gif


BIN
static/emoji/1f383.gif


BIN
static/emoji/1f384.gif


BIN
static/emoji/1f385.gif


BIN
static/emoji/1f386.gif


BIN
static/emoji/1f387.gif


BIN
static/emoji/1f388.gif


BIN
static/emoji/1f389.gif


BIN
static/emoji/1f38a.gif


BIN
static/emoji/1f393.gif


BIN
static/emoji/1f396-fe0f.gif


BIN
static/emoji/1f397-fe0f.gif


BIN
static/emoji/1f399-fe0f.gif


BIN
static/emoji/1f39f-fe0f.gif


BIN
static/emoji/1f3a2.gif


BIN
static/emoji/1f3a4.gif


BIN
static/emoji/1f3a8.gif


BIN
static/emoji/1f3a9.gif


BIN
static/emoji/1f3ab.gif


BIN
static/emoji/1f3ac.gif


BIN
static/emoji/1f3ad.gif


BIN
static/emoji/1f3ae.gif


BIN
static/emoji/1f3af.gif


BIN
static/emoji/1f3b0.gif


Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.