Compare commits
No commits in common. "54a2d757da3331e148646ba6603bb4945f82a816" and "52350392b0a8ca8364ef4e8c70ea06f3ea3c6709" have entirely different histories.
54a2d757da
...
52350392b0
17
apis/http.js
17
apis/http.js
|
|
@ -18,30 +18,29 @@ 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.2.74:49080"; // 开发阶段后台ip
|
||||
target = "http://192.168.0.119:21624"; // 开发阶段后台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"
|
||||
? "https://test-cc.zhgkxt.com/sgzbgl-api"
|
||||
: this.target;
|
||||
baseUrl = ENV === "production" ? "http://192.168.0.56:21627" : this.target;
|
||||
authPath =
|
||||
ENV === "production" ? `${this.baseUrl}/auth` : `${this.baseUrl}/auth`;
|
||||
ENV === "production"
|
||||
? `${this.baseUrl}/dev-api/auth`
|
||||
: `${this.baseUrl}/auth`;
|
||||
systemPath =
|
||||
ENV === "production"
|
||||
? `${this.baseUrl}/system`
|
||||
? `${this.baseUrl}/dev-api/system`
|
||||
: `${this.baseUrl}/system`;
|
||||
basePath =
|
||||
ENV === "production"
|
||||
? `${this.baseUrl}/material/base`
|
||||
? `${this.baseUrl}/dev-api/material/base`
|
||||
: `${this.baseUrl}/material/base`;
|
||||
materialPath =
|
||||
ENV === "production"
|
||||
? `${this.baseUrl}/material`
|
||||
? `${this.baseUrl}/dev-api/material`
|
||||
: `${this.baseUrl}/material`;
|
||||
// 短链
|
||||
serviceUrl = {
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
});
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -43,14 +43,7 @@
|
|||
"<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_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\\\" />"
|
||||
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
|
||||
]
|
||||
},
|
||||
/* ios打包配置 */
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
{
|
||||
"path": "pages/nwLogin/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "登录"
|
||||
"navigationBarTitleText": "南网登录"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -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",
|
||||
});
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
});
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
// });
|
||||
},
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -220,8 +220,6 @@
|
|||
const { data: messageRes } =
|
||||
await this.$api.login.getMessageCode(params);
|
||||
|
||||
console.log("-----", messageRes, "-----");
|
||||
|
||||
if (messageRes.code === 200) {
|
||||
uni.showToast({
|
||||
icon: "none",
|
||||
|
|
@ -458,7 +456,7 @@
|
|||
? "测试环境或者线上ip"
|
||||
: "本地调试ip";
|
||||
uni.request({
|
||||
url: "http://192.168.2.74:49080/code",
|
||||
url: "http://192.168.0.119:21624/sgzbgl-api/code",
|
||||
method: "GET",
|
||||
}).then((res) => {
|
||||
this.phoneCodeUrlNew =
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
});
|
||||
}
|
||||
},
|
||||
|
|
|
|||
14
router.js
14
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",
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
-keep class com.dcloud.** { *; }
|
||||
-keep public class * extends io.dcloud.* {
|
||||
*;
|
||||
}
|
||||
Binary file not shown.
|
|
@ -1 +1 @@
|
|||
https://app.liuyingyong.cn/build/download/0c114b20-7d8f-11ef-8759-952981b5c6a0
|
||||
https://app.liuyingyong.cn/build/download/ace9e090-602c-11ef-a76c-b5b4f2c19209
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue