Merge branch 'main-cq' of http://192.168.0.56:3000/hywen/SmartStorage into main-cq

南网打包配置
2024-10-08 09:02:43 +08:00 · 2024-10-08 09:02:37 +08:00
27 changed files with 638 additions and 618 deletions
--- a/apis/http.js
+++ b/apis/http.js
@ -18,29 +18,30 @@ class HttpConfig {
    // baseUrl = "https://z.csgmall.com.cn/gl"
    // baseUrl = "http://192.168.2.160:39080" // 梁超
    // baseUrl = "http://192.168.2.218:39080" // 福
-    target = "http://192.168.0.119:21624"; // 开发阶段后台ip
+    target = "http://192.168.2.74:49080"; // 开发阶段后台ip
    // #endif
    // 基地址 （部署时使用 需要加 dev-api）
    // authPath = `${this.baseUrl}/dev-api/auth`
    // systemPath = `${this.baseUrl}/dev-api/system`
    // basePath = `${this.baseUrl}/dev-api/base`
    // materialPath = `${this.baseUrl}/dev-api/material`
-    baseUrl = ENV === "production" ? "http://192.168.0.56:21627" : this.target;
-    authPath =
+    baseUrl =
        ENV === "production"
-            ? `${this.baseUrl}/dev-api/auth`
-            : `${this.baseUrl}/auth`;
+            ? "https://test-cc.zhgkxt.com/sgzbgl-api"
+            : this.target;
+    authPath =
+        ENV === "production" ? `${this.baseUrl}/auth` : `${this.baseUrl}/auth`;
    systemPath =
        ENV === "production"
-            ? `${this.baseUrl}/dev-api/system`
+            ? `${this.baseUrl}/system`
            : `${this.baseUrl}/system`;
    basePath =
        ENV === "production"
-            ? `${this.baseUrl}/dev-api/material/base`
+            ? `${this.baseUrl}/material/base`
            : `${this.baseUrl}/material/base`;
    materialPath =
        ENV === "production"
-            ? `${this.baseUrl}/dev-api/material`
+            ? `${this.baseUrl}/material`
            : `${this.baseUrl}/material`;
    // 短链
    serviceUrl = {
--- a/apis/request.js
+++ b/apis/request.js
@ -19,8 +19,8 @@ class Http {
                            title: "登录状态过期，请重新登录！",
                            success: () => {
                                uni.reLaunch({
-                                    url: "/pages/login/login",
-                                    // url: "/pages/nwLogin/index",
+                                    // url: "/pages/login/login",
+                                    url: "/pages/nwLogin/index",
                                });
                            },
                        });
@ -56,8 +56,8 @@ class Http {
                            title: "登录状态过期，请重新登录！",
                            success: () => {
                                uni.reLaunch({
-                                    url: "/pages/login/login",
-                                    // url: "/pages/nwLogin/index",
+                                    // url: "/pages/login/login",
+                                    url: "/pages/nwLogin/index",
                                });
                            },
                        });
@ -93,8 +93,8 @@ class Http {
                            title: "登录状态过期，请重新登录！",
                            success: () => {
                                uni.reLaunch({
-                                    url: "/pages/login/login",
-                                    // url: "/pages/nwLogin/index",
+                                    // url: "/pages/login/login",
+                                    url: "/pages/nwLogin/index",
                                });
                            },
                        });
@ -129,8 +129,8 @@ class Http {
                            title: "登录状态过期，请重新登录！",
                            success: () => {
                                uni.reLaunch({
-                                    url: "/pages/login/login",
-                                    // url: "/pages/nwLogin/index",
+                                    // url: "/pages/login/login",
+                                    url: "/pages/nwLogin/index",
                                });
                            },
                        });
@ -163,8 +163,8 @@ class Http {
                            title: "登录状态过期，请重新登录！",
                            success: () => {
                                uni.reLaunch({
-                                    url: "/pages/login/login",
-                                    // url: "/pages/nwLogin/index",
+                                    // url: "/pages/login/login",
+                                    url: "/pages/nwLogin/index",
                                });
                            },
                        });
--- a/manifest.json
+++ b/manifest.json
@ -43,7 +43,14 @@
                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
+                    "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\" />",
+                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\" />",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\\\" />",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\\\" />",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\\\" />",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\\\" />"
                ]
            },
            /* ios打包配置 */
--- a/pages.json
+++ b/pages.json
@ -48,7 +48,7 @@
        {
            "path": "pages/nwLogin/index",
            "style": {
-                "navigationBarTitleText": "南网登录"
+                "navigationBarTitleText": "登录"
            }
        },
        {
--- a/pages/exitExam/exitExam.vue
+++ b/pages/exitExam/exitExam.vue
--- a/pages/exitMaterial/exitMaterial.vue
+++ b/pages/exitMaterial/exitMaterial.vue
@ -434,8 +434,8 @@
                                uni.removeStorageSync("token");
                                uni.removeStorageSync("userInfo");
                                uni.reLaunch({
-                                    url: "/pages/login/login",
-                                    // url: "/pages/nwLogin/index",
+                                    // url: "/pages/login/login",
+                                    url: "/pages/nwLogin/index",
                                });
                            },
                        });
--- a/pages/fetchExam/fetchExam.vue
+++ b/pages/fetchExam/fetchExam.vue
@ -644,8 +644,8 @@
                                    uni.removeStorageSync("token");
                                    uni.removeStorageSync("userInfo");
                                    uni.reLaunch({
-                                        url: "/pages/login/login",
-                                        // url: "/pages/nwLogin/index",
+                                        // url: "/pages/login/login",
+                                        url: "/pages/nwLogin/index",
                                    });
                                },
                            });
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -273,12 +273,12 @@
                            success: () => {
                                uni.removeStorageSync("token");
                                uni.removeStorageSync("userInfo");
-                                uni.reLaunch({
-                                    url: "/pages/login/login",
-                                });
                                // uni.reLaunch({
-                                //     url: "/pages/nwLogin/index",
+                                //     url: "/pages/login/login",
                                // });
+                                uni.reLaunch({
+                                    url: "/pages/nwLogin/index",
+                                });
                            },
                        });
                    }
--- a/pages/nwLogin/index.vue
+++ b/pages/nwLogin/index.vue
@ -220,6 +220,8 @@
                        const { data: messageRes } =
                            await this.$api.login.getMessageCode(params);

+                        console.log("-----", messageRes, "-----");
+
                        if (messageRes.code === 200) {
                            uni.showToast({
                                icon: "none",
@ -456,7 +458,7 @@
                        ? "测试环境或者线上ip"
                        : "本地调试ip";
                uni.request({
-                    url: "http://192.168.0.119:21624/sgzbgl-api/code",
+                    url: "http://192.168.2.74:49080/code",
                    method: "GET",
                }).then((res) => {
                    this.phoneCodeUrlNew =
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@ -72,8 +72,8 @@
                            uni.removeStorageSync("token");
                            uni.removeStorageSync("userInfo");
                            uni.reLaunch({
-                                url: "/pages/login/login",
-                                // url: "/pages/nwLogin/index",
+                                // url: "/pages/login/login",
+                                url: "/pages/nwLogin/index",
                            });
                        }
                    },
--- a/router.js
+++ b/router.js
@ -25,16 +25,16 @@ const router = createRouter({
            },
        },
        // 重庆登录页
-        {
-            path: "/pages/login/login",
-            name: "login",
-        },
-
-        // 南网登陆页
        // {
-        //     path: "/pages/nwLogin/index",
+        //     path: "/pages/login/login",
        //     name: "login",
        // },
+
+        // 南网登陆页
+        {
+            path: "/pages/nwLogin/index",
+            name: "login",
+        },
        {
            path: "/pages/fetchMaterial/fetchMaterial",
            name: "fetchMaterial",
--- a/uniapp.pro
+++ b/uniapp.pro
@ -0,0 +1,4 @@
+-keep class com.dcloud.** { *; }
+-keep public class * extends io.dcloud.* {
+    *;
+}
--- a/unpackage/cache/apk/UNI9D122E1_cm.apk
+++ b/unpackage/cache/apk/UNI9D122E1_cm.apk
--- a/unpackage/cache/apk/apkurl
+++ b/unpackage/cache/apk/apkurl
@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/ace9e090-602c-11ef-a76c-b5b4f2c19209
+https://app.liuyingyong.cn/build/download/0c114b20-7d8f-11ef-8759-952981b5c6a0
--- a/unpackage/cache/apk/cmManifestCache.json
+++ b/unpackage/cache/apk/cmManifestCache.json
--- a/unpackage/cache/wgt/UNI9D122E1/app-config-service.js
+++ b/unpackage/cache/wgt/UNI9D122E1/app-config-service.js
--- a/unpackage/cache/wgt/UNI9D122E1/app-service.js
+++ b/unpackage/cache/wgt/UNI9D122E1/app-service.js
--- a/unpackage/cache/wgt/UNI9D122E1/app-view.js
+++ b/unpackage/cache/wgt/UNI9D122E1/app-view.js
--- a/unpackage/cache/wgt/UNI9D122E1/manifest.json
+++ b/unpackage/cache/wgt/UNI9D122E1/manifest.json
--- a/unpackage/dist/build/app-plus/app-config-service.js
+++ b/unpackage/dist/build/app-plus/app-config-service.js
--- a/unpackage/dist/build/app-plus/app-service.js
+++ b/unpackage/dist/build/app-plus/app-service.js
--- a/unpackage/dist/build/app-plus/app-view.js
+++ b/unpackage/dist/build/app-plus/app-view.js
--- a/unpackage/dist/build/app-plus/manifest.json
+++ b/unpackage/dist/build/app-plus/manifest.json
--- a/unpackage/dist/dev/app-plus/app-config-service.js
+++ b/unpackage/dist/dev/app-plus/app-config-service.js
--- a/unpackage/dist/dev/app-plus/app-service.js
+++ b/unpackage/dist/dev/app-plus/app-service.js
--- a/unpackage/dist/dev/app-plus/app-view.js
+++ b/unpackage/dist/dev/app-plus/app-view.js
--- a/unpackage/dist/dev/app-plus/manifest.json
+++ b/unpackage/dist/dev/app-plus/manifest.json
Author	SHA1	Message	Date
BianLzhaoMin	54a2d757da	Merge branch 'main-cq' of http://192.168.0.56:3000/hywen/SmartStorage into main-cq	2024-10-08 09:02:43 +08:00
BianLzhaoMin	6f2a317f72	南网打包配置	2024-10-08 09:02:37 +08:00