From 7f3218a9113985d4f7a152b27b76c55063f926d3 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Mon, 30 Oct 2023 10:17:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/shouye/me.vue   | 16 +++++++--------
 src/pages/shouye/model.ts | 42 ++++++++++-----------------------------
 src/utils/request.ts      |  2 +-
 src/utils/url.ts          |  2 +-
 vue.config.js             |  4 ++--
 5 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/src/pages/shouye/me.vue b/src/pages/shouye/me.vue
index 966ef35..f19ca4b 100644
--- a/src/pages/shouye/me.vue
+++ b/src/pages/shouye/me.vue
@@ -34,7 +34,7 @@
       </view>
     </view>
     <view class="astyle">
-      <view @click="checkupdate"> 检查更新 </view>
+      <view @click="checkupdate()"> 检查更新 </view>
       <!-- <u-button
         @click.native="
           uni.navigateTo({
@@ -64,7 +64,7 @@ export default class RawHome extends BasePage {
   model = model;
   src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
   today = dayjs().format('YYYY-MM-DD dddd');
-  version: '0.01';
+  version = '0.0.0';
   checkversion: any = {};
   onLoad() {
     // this.model.getMenuList();
@@ -94,18 +94,18 @@ export default class RawHome extends BasePage {
   }
   async checkupdate() {
     try {
-      this.checkversion = await model.checkupdate();
-      const queryversion = this.checkversion.Version.match(/\d+\.\d+\.\d+/)[0];
-      let versionNumber = this.compareVersion(this.version, queryversion);
-      versionNumber = 1;
+      await this.model.checkupdate();
+      const queryversion = this.model.checkversion.version;
+      //const queryversion = this.checkversion.Version.match(/\d+\.\d+\.\d+/)[0];
+      let versionNumber = this.compareVersion(this.version, queryversion); //this.version, queryversion
       if (versionNumber == -1) {
         // 版本更新提示
         uni.showModal({
-          content: '新版本为：' + this.checkversion.Version + ',' + '是否更新？',
+          content: '新版本为：' + this.model.checkversion.version + ',' + '是否更新？',
           success: (res) => {
             if (res.confirm) {
               //确定执行下载
-              let downloadApkUrl = this.checkversion.url;
+              let downloadApkUrl = this.checkversion.fileAddress;
               uni.showLoading({
                 title: '下载中',
               });
diff --git a/src/pages/shouye/model.ts b/src/pages/shouye/model.ts
index fcf5ac1..7a6ec53 100644
--- a/src/pages/shouye/model.ts
+++ b/src/pages/shouye/model.ts
@@ -1,44 +1,24 @@
 import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
 import store from '@/store';
 import http from '@/utils/request';
-//import { url } from '@/utils/url';
-//import { session } from '@/store/modules/session';
-//import { stringify } from 'query-string';
-
+// import { url } from '@/utils/url';
+// import { session } from '@/store/modules/session';
 @Module({
   namespaced: true,
   dynamic: true,
   store,
-  name: 'product.model',
+  name: 'page.shouye',
 })
-export class ReceiptModule extends VuexModule {
-  /**
-   * 原材料菜单
-   */
-  menuList = [];
-  /**
-   * 查询原材料菜单列表
-   */
-  // @MutationAction
-  // async getMenuList() {
-  //   const result: any = await http.post(
-  //     url.menu,
-  //     stringify({
-  //       // factoryCode: session.factoryCode,
-  //       loginName: session.loginName,
-  //       resType: 4,
-  //     }),
-  //   );
-  //   console.log('aaaa', result);
-  //   const menuList = result.data;
-  //   return { menuList };
-  // }
+export class shouye extends VuexModule {
+  checkversion: any = {};
   @MutationAction
   async checkupdate() {
-    const result = await http.post('///');
-    const checkversion = result.data;
-    return checkversion;
+    const result: any = await http.post('/prod-api/system/apkFile/getLastApkVersion', {
+      factory: 1000,
+    });
+    const checkversion: any = result.data;
+    return { checkversion };
   }
 }
 
-export default getModule(ReceiptModule);
+export default getModule(shouye);
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 9832e12..f3a13a1 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -26,7 +26,7 @@ http.interceptors.request.use(
     // if (config.url.includes('/api')) {
     //   config.baseURL = 'http://192.168.202.23:5001';
     // } else {
-    //   config.baseURL = 'http://192.168.202.20:9000';
+    //   config.baseURL = 'http://192.168.202.34:30000';
     // }
     // 所有请求默认提示加载中
     if (!loading) {
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 5eb8e5a..08b371f 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-const qianzhuione = '/dev-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用
+const qianzhuione = '/prod-api'; // '/prod-api'生产环境 // '/dev-api'开发环境是调后端本地时使用
 // const qianzhuione = '/prod-api';
 export const url = {
   wmspda: {
diff --git a/vue.config.js b/vue.config.js
index 0a74e69..63ac076 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,9 +3,9 @@ module.exports = {
     proxy: {
       '/prod-api': {
         //正式生产
-        //target: 'http://192.168.202.34:30000',
+        target: 'http://192.168.202.34:30000',
         //测试生产
-        target: 'http://192.168.202.20:9000',
+        //target: 'http://192.168.202.20:9000',
         changeOrigin: true,
         // pathRewrite: {
         //   '^/prod-ap': '',

From ec5a5b3a95e63353ac043cd7350f0f1afe38346c Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Mon, 30 Oct 2023 15:14:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/shouye/me.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/shouye/me.vue b/src/pages/shouye/me.vue
index f19ca4b..5637a1d 100644
--- a/src/pages/shouye/me.vue
+++ b/src/pages/shouye/me.vue
@@ -64,7 +64,7 @@ export default class RawHome extends BasePage {
   model = model;
   src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
   today = dayjs().format('YYYY-MM-DD dddd');
-  version = '0.0.0';
+  version = '0.0.2';
   checkversion: any = {};
   onLoad() {
     // this.model.getMenuList();
@@ -105,7 +105,7 @@ export default class RawHome extends BasePage {
           success: (res) => {
             if (res.confirm) {
               //确定执行下载
-              let downloadApkUrl = this.checkversion.fileAddress;
+              let downloadApkUrl = this.model.checkversion.fileAddress;
               uni.showLoading({
                 title: '下载中',
               });
@@ -129,6 +129,11 @@ export default class RawHome extends BasePage {
           },
         });
         return;
+      } else {
+        uni.showToast({
+          title: '无更新内容',
+          icon: 'none',
+        });
       }
     } catch (e) {
       console.log('error', e);