diff --git a/common/config.js b/common/config.js
index 3c95e4e..17531a7 100644
--- a/common/config.js
+++ b/common/config.js
@@ -3,10 +3,10 @@
// const API_URL = `http://${BASE_HOST}:10002`
// const WS_URL = `ws://${BASE_HOST}:10001`
-const BASE_DOMAIN = '47.117.71.33:15219'
+const BASE_DOMAIN = '49.232.154.205:10006'
const CHAT_URL = `http://${BASE_DOMAIN}/chat`
const API_URL = `http://${BASE_DOMAIN}/api`
-const WS_URL = `ws://${BASE_DOMAIN}/msg_gateway`
+const WS_URL = `ws://${BASE_DOMAIN}/msg_gateway`
const version = 'Uniapp-Demo'
diff --git a/components/MyAvatar/index.vue b/components/MyAvatar/index.vue
index 9e0a9a9..1884f01 100644
--- a/components/MyAvatar/index.vue
+++ b/components/MyAvatar/index.vue
@@ -66,10 +66,18 @@ export default {
},
methods: {
getFixedSourceUrl(url) {
- // 如果 url 以 http://47.117.71.33/api/object/ 开头，则替换为带端口的
- if (typeof url === 'string' && url.startsWith('http://47.117.71.33/api/object/')) {
- return url.replace('http://47.117.71.33/api/object/', 'http://47.117.71.33:15219/api/object/');
+ console.log('替换头像', url)
+ // 如果 url 以 http://49.232.154.205/api/object/ 开头，则替换为带端口的
+ if (typeof url === 'string' && url.startsWith('http://49.232.154.205/api/object/')) {
+ console.log('替换1')
+ return url.replace('http://49.232.154.205/api/object/', 'http://49.232.154.205:10006/api/object/');
}
+
+ else if (typeof url === 'string' && url.startsWith('http://47.117.71.33/api/object/')) {
+ console.log("替换2")
+ return url.replace('http://47.117.71.33/api/object/', 'http://49.232.154.205:10006/api/object/');
+ }
+
return url;
},
errorHandle() {
diff --git a/manifest.json b/manifest.json
index eaea2a6..970ebc0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -120,7 +120,22 @@
}
}
},
- "nativePlugins" : {},
+ "nativePlugins" : {
+ "Tuoyun-OpenIMSDK" : {
+ "__plugin_info__" : {
+ "name" : "OpenIM SDK",
+ "description" : "OpenIM：由IM技术专家打造的基于 Go 实现的即时通讯（IM）项目，从服务端到客户端SDK开源即时通讯（IM）整体解决方案，可以轻松替代第三方IM云服务，打造具备聊天、社交功能的app。",
+ "platforms" : "Android,iOS",
+ "url" : "https://ext.dcloud.net.cn/plugin?id=6577",
+ "android_package_name" : "com.fad.im",
+ "ios_bundle_id" : "com.fad.im",
+ "isCloud" : true,
+ "bought" : 1,
+ "pid" : "6577",
+ "parameters" : {}
+ }
+ }
+ },
"uniStatistics" : {
"enable" : false
}
diff --git a/pages/conversation/chating/components/MessageItem/FileMessageRender.vue b/pages/conversation/chating/components/MessageItem/FileMessageRender.vue
index 749da8b..d5ce0ac 100644
--- a/pages/conversation/chating/components/MessageItem/FileMessageRender.vue
+++ b/pages/conversation/chating/components/MessageItem/FileMessageRender.vue
@@ -66,10 +66,13 @@ export default {
},
methods: {
getFixedSourceUrl: function(url) {
- // 如果 url 以 http://47.117.71.33/api/object/ 开头，则替换为带端口的
- if (typeof url === 'string' && url.startsWith('http://47.117.71.33/api/object/')) {
- return url.replace('http://47.117.71.33/api/object/', 'http://47.117.71.33:15219/api/object/');
+ // 如果 url 以 http://49.232.154.205/api/object/ 开头，则替换为带端口的
+ if (typeof url === 'string' && url.startsWith('http://49.232.154.205/api/object/')) {
+ return url.replace('http://49.232.154.205/api/object/', 'http://49.232.154.205:10006/api/object/');
}
+ else if (typeof url === 'string' && url.startsWith('http://47.117.71.33/api/object/')) {
+ return url.replace('http://47.117.71.33/api/object/', 'http://49.232.154.205:10006/api/object/');
+ }
return url;
},
downloadFile: function() {
diff --git a/pages/conversation/chating/components/MessageItem/MediaMessageRender.vue b/pages/conversation/chating/components/MessageItem/MediaMessageRender.vue
index e8249a9..ba0a7dc 100644
--- a/pages/conversation/chating/components/MessageItem/MediaMessageRender.vue
+++ b/pages/conversation/chating/components/MessageItem/MediaMessageRender.vue
@@ -1,6 +1,6 @@
-
-
+
@@ -39,7 +39,7 @@ export default {
computed: {
- getImgUrl() {
+ getImgUrl() {
if (!this.message || !this.message.pictureElem) {
return '';
}
@@ -61,8 +61,12 @@ export default {
},
methods: {
getFixedSourceUrl(url) {
- if (typeof url === 'string' && url.startsWith('http://47.117.71.33/api/object/')) {
- return url.replace('http://47.117.71.33/api/object/', 'http://47.117.71.33:15219/api/object/');
+ // 如果 url 以 http://49.232.154.205/api/object/ 开头，则替换为带端口的
+ if (typeof url === 'string' && url.startsWith('http://49.232.154.205/api/object/')) {
+ return url.replace('http://49.232.154.205/api/object/', 'http://49.232.154.205:10006/api/object/');
+ }
+ else if (typeof url === 'string' && url.startsWith('http://47.117.71.33/api/object/')) {
+ return url.replace('http://47.117.71.33/api/object/', 'http://49.232.154.205:10006/api/object/');
}
return url;
},
diff --git a/pages/conversation/chating/components/MessageItem/VoiceMessageRender.vue b/pages/conversation/chating/components/MessageItem/VoiceMessageRender.vue
index 1767a5d..6a8c42d 100644
--- a/pages/conversation/chating/components/MessageItem/VoiceMessageRender.vue
+++ b/pages/conversation/chating/components/MessageItem/VoiceMessageRender.vue
@@ -37,10 +37,14 @@ export default {
},
methods: {
getFixedSourceUrl(url) {
- // 如果 url 以 http://47.117.71.33/api/object/ 开头，则替换为带端口的
- if (typeof url === 'string' && url.startsWith('http://47.117.71.33/api/object/')) {
- return url.replace('http://47.117.71.33/api/object/', 'http://47.117.71.33:15219/api/object/');
- }
+ // 如果 url 以 http://49.232.154.205/api/object/ 开头，则替换为带端口的
+ // 或者 url 以 http://47.117.71.33/api/object/ 开头，也替换为http://49.232.154.205:10006/api/object/
+ if (typeof url === 'string' && url.startsWith('http://49.232.154.205/api/object/')) {
+ return url.replace('http://49.232.154.205/api/object/', 'http://49.232.154.205:10006/api/object/');
+ }
+ else if (typeof url === 'string' && url.startsWith('http://47.117.71.33/api/object/')) {
+ return url.replace('http://47.117.71.33/api/object/', 'http://49.232.154.205:10006/api/object/');
+ }
return url;
},
playVoice() {
diff --git a/pages/profile/index/index.vue b/pages/profile/index/index.vue
index 358b9a4..431f070 100644
--- a/pages/profile/index/index.vue
+++ b/pages/profile/index/index.vue
@@ -63,11 +63,11 @@ export default {
title: "应用更新",
icon: require("static/images/profile_menu_about.png"),
},
- {
- idx: 5,
- title: '测试推送',
- icon: require("static/images/profile_menu_about.png")
- },
+ // {
+ // idx: 5,
+ // title: '测试推送',
+ // icon: require("static/images/profile_menu_about.png")
+ // },
{
idx: 6,
title: "清除缓存",
diff --git a/pages/workbench/reportWork/reportWork.vue b/pages/workbench/reportWork/reportWork.vue
index 6f92dd8..9bd0217 100644
--- a/pages/workbench/reportWork/reportWork.vue
+++ b/pages/workbench/reportWork/reportWork.vue
@@ -92,11 +92,9 @@
请选择项目
-
@@ -472,17 +470,6 @@ export default {
this.getList();
},
-
- // 项目选择变化处理
- handleProjectChange(value) {
- console.log('项目选择变化:', value);
- this.form.projectId = value;
- // 获取选中的项目信息
- const selectedProject = this.projectList.find(p => p.value === value);
- if (selectedProject) {
- console.log('选中的项目:', selectedProject);
- }
- }
}
}
diff --git a/util/update.js b/util/update.js
index f2201eb..8a403c5 100644
--- a/util/update.js
+++ b/util/update.js
@@ -72,7 +72,7 @@ function checkUpdate(forceCheck = false) {
const localVersion = plus.runtime.version;
const localWgtVersion = uni.getStorageSync('wgtVersion') || localVersion;
uni.request({
- url: 'http://47.117.71.33:11295/fadapp-update/version.json?t=' + Date.now(),
+ url: 'http://49.232.154.205:10900/fadapp-update/version.json?t=' + Date.now(),
success: (res) => {
const remoteVersion = res.data.version;
const wgtUrl = res.data.wgtUrl;
@@ -89,7 +89,7 @@ function checkUpdate(forceCheck = false) {
cancelText: '取消',
success: (res) => {
if (res.confirm) {
- const downloadUrl = `http://47.117.71.33:11295/fadapp-update/fad${remoteVersion}.apk`;
+ const downloadUrl = `http://49.232.154.205:10900/fadapp-update/fad${remoteVersion}.apk`;
// #ifdef APP-PLUS
plus.runtime.openURL(downloadUrl);
// #endif
diff --git a/version.md b/version.md
index 692b422..1649f28 100644
--- a/version.md
+++ b/version.md
@@ -17,4 +17,14 @@
## 4.6.1
+ 优化部分展示
-+ 修改权限失效的bug
\ No newline at end of file
++ 修改权限失效的bug
+
+## 4.7.0
++ 新增采购进度应用
++ 新增入库记录应用
++ 新增出库记录应用
++ 线上营销增加收信次数，发薪次数的展示
+
+## 4.7.1
++ 修改路径替换规则
++ 修改更新地址
\ No newline at end of file