报工页面的项目选择器

common/config.js

@@ -3,7 +3,7 @@
 // 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` 

components/MyAvatar/index.vue

@@ -66,10 +66,18 @@ export default {
   },
   methods: {
     getFixedSourceUrl(url) {
-      // 如果 url 以 http://47.117.71.33/api/object/ 开头，则替换为带端口的
+			console.log('替换头像', url)
-      if (typeof url === 'string' && url.startsWith('http://47.117.71.33/api/object/')) {
+      // 如果 url 以 http://49.232.154.205/api/object/ 开头，则替换为带端口的
-        return url.replace('http://47.117.71.33/api/object/', 'http://47.117.71.33:15219/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() {

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
         }

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/ 开头，则替换为带端口的
+      // 如果 url 以 http://49.232.154.205/api/object/ 开头，则替换为带端口的
-      if (typeof url === 'string' && url.startsWith('http://47.117.71.33/api/object/')) {
+      if (typeof url === 'string' && url.startsWith('http://49.232.154.205/api/object/')) {
-        return url.replace('http://47.117.71.33/api/object/', 'http://47.117.71.33:15219/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() {

pages/conversation/chating/components/MessageItem/MediaMessageRender.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="media_message_container" @click="clickMediaItem">
-    <u--image
+    <u-image
       @load="onLoaded"
       :showLoading="true"
       width="120"
@@ -21,7 +21,7 @@
           </view>
         </view>
       </template>
-    </u--image>
+    </u-image>
   </view>
 </template>
 
@@ -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/')) {
+      // 如果 url 以 http://49.232.154.205/api/object/ 开头，则替换为带端口的
-        return url.replace('http://47.117.71.33/api/object/', 'http://47.117.71.33:15219/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;
     },

pages/conversation/chating/components/MessageItem/VoiceMessageRender.vue

@@ -37,10 +37,14 @@ export default {
   },
   methods: {
     getFixedSourceUrl(url) {
-      // 如果 url 以 http://47.117.71.33/api/object/ 开头，则替换为带端口的
+      // 如果 url 以 http://49.232.154.205/api/object/ 开头，则替换为带端口的
-      if (typeof url === 'string' && url.startsWith('http://47.117.71.33/api/object/')) {
+			// 或者 url 以 http://47.117.71.33/api/object/ 开头，也替换为http://49.232.154.205:10006/api/object/
-        return url.replace('http://47.117.71.33/api/object/', 'http://47.117.71.33:15219/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() {

pages/profile/index/index.vue

@@ -63,11 +63,11 @@ export default {
           title: "应用更新",
           icon: require("static/images/profile_menu_about.png"),
         },
-        {
+        // {
-          idx: 5,
+        //   idx: 5,
-          title: '测试推送',
+        //   title: '测试推送',
-          icon: require("static/images/profile_menu_about.png")
+        //   icon: require("static/images/profile_menu_about.png")
-        },
+        // },
         {
           idx: 6,
           title: "清除缓存",

pages/workbench/reportWork/reportWork.vue

@@ -92,11 +92,9 @@
 						
 						<view class="form-item">
 							<view class="form-label">请选择项目</view>
-							<uni-data-select
+							<oa-project-select
 								v-model="form.projectId"
-								:localdata="projectList"
 								placeholder="请选择项目"
-								@change="handleProjectChange"
 							></uni-data-select>
 						</view>
 						
@@ -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);
-			}
-		}
 	}
 }
 </script>

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

version.md

@@ -18,3 +18,13 @@
 ## 4.6.1
 + 优化部分展示
 + 修改权限失效的bug
+
+## 4.7.0
++ 新增采购进度应用
++ 新增入库记录应用
++ 新增出库记录应用
++ 线上营销增加收信次数，发薪次数的展示
+
+## 4.7.1
++ 修改路径替换规则
++ 修改更新地址