Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-ui/uni-app/src/App.vue

@@ -2,7 +2,7 @@
  * @Author: 王文杰
  * @Date: 2024-01-04 12:54:56
  * @LastEditors: jevononlie 728254585@qq.com
- * @LastEditTime: 2024-05-14 14:28:33
+ * @LastEditTime: 2024-05-14 15:57:54
  * @FilePath: /app-nx-personal/src/App.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -16,9 +16,11 @@ onLaunch(async () => {
     appId: 'com.chanko.yunxi.mes.android'
   }
   const res = await appUpdateApi(params)
+   console.log('1-0', res.versionId)
   plus.runtime.getProperty(plus.runtime.appid, function (wgtinfo) {
     const version = wgtinfo.version || plus.runtime.version
-    if (res.versionId !== version) {
+    console.log('1-1', res.versionId,version)
+    if (res.versionId != version) {
       uni.showModal({ //提醒用户更新
         title: '版本更新',
         showCancel: false,

mes-ui/uni-app/src/services/constants.ts

@@ -2,10 +2,10 @@
  * @Author: 王文杰 
  * @Date: 2024-01-04 12:54:56
  * @LastEditors: jevononlie 728254585@qq.com
- * @LastEditTime: 2024-05-09 13:20:50
+ * @LastEditTime: 2024-05-14 16:18:48
  * @FilePath: /hl-app/src/services/constants.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 // export const serviceDomain = 'https://nxhs.cjyx.cc'
-export const serviceDomain = 'http://192.168.0.72:9021'
+export const serviceDomain = 'http://222.71.165.187:9031'