1
This commit is contained in:
parent
c3eb02f522
commit
9a9e8327f6
@ -1,3 +1,3 @@
|
||||
# 开发环境
|
||||
# 请求接口地址
|
||||
VITE_REQUEST_BASE_URL = http://10.75.166.174:8080
|
||||
VITE_REQUEST_BASE_URL = https://36.112.48.190
|
||||
|
@ -2,7 +2,7 @@
|
||||
"name" : "数智产销",
|
||||
"appid" : "__UNI__F0AFD30",
|
||||
"description" : "",
|
||||
"versionName" : "1.0.0",
|
||||
"versionName" : "1.0.1",
|
||||
"versionCode" : 20240929,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
|
@ -2,6 +2,6 @@
|
||||
"dependencies": {
|
||||
"@dcloudio/uni-ui": "^1.5.6",
|
||||
"base-64": "^1.0.0",
|
||||
"dayjs": "^1.11.12"
|
||||
"dayjs": "^1.11.13"
|
||||
}
|
||||
}
|
||||
|
@ -195,7 +195,7 @@
|
||||
getCategoryItemsApi('1838487445813645313').then((res) => { //请假类型
|
||||
if (res.success) {
|
||||
dataSource.value = res.result
|
||||
console.log('--',res.result)
|
||||
console.log('--', res.result)
|
||||
}
|
||||
})
|
||||
|
||||
|
@ -88,17 +88,17 @@
|
||||
});
|
||||
|
||||
/*生产环境 begin */
|
||||
// loginApi({
|
||||
// username: un,
|
||||
// password: pw,
|
||||
// ip: getDeviceIp()
|
||||
loginApi({
|
||||
username: un,
|
||||
password: pw,
|
||||
ip: getDeviceIp()
|
||||
/*生产环境 end */
|
||||
|
||||
/*开发环境 begin */
|
||||
localLoginApi({
|
||||
username: username.value,
|
||||
password: password.value,
|
||||
captcha: 'app'
|
||||
/*开发环境 begin */
|
||||
// localLoginApi({
|
||||
// username: username.value,
|
||||
// password: password.value,
|
||||
// captcha: 'app'
|
||||
/*开发环境 end */
|
||||
}).then((loginres) => {
|
||||
if (loginres.success) {
|
||||
@ -120,11 +120,9 @@
|
||||
store.setUserInfo(loginres.result.userInfo)
|
||||
|
||||
// 跳转首页
|
||||
|
||||
uni.switchTab({
|
||||
url: '/pages/tab/index'
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
|
2
unpackage/dist/build/app-plus/app-service.js
vendored
2
unpackage/dist/build/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
2
unpackage/dist/build/app-plus/manifest.json
vendored
2
unpackage/dist/build/app-plus/manifest.json
vendored
@ -7,7 +7,7 @@
|
||||
"id": "__UNI__F0AFD30",
|
||||
"name": "数智产销",
|
||||
"version": {
|
||||
"name": "1.0.7",
|
||||
"name": "1.0.1",
|
||||
"code": 20240929
|
||||
},
|
||||
"description": "",
|
||||
|
@ -1 +1 @@
|
||||
[data-v-3dca468b] .uni-select{border:none;padding-left:0;height:2.75rem}[data-v-3dca468b] .uni-select__input-placeholder{font-size:.875rem;color:#999}[data-v-3dca468b] .uni-icons{display:none}.logo[data-v-3dca468b]{padding-top:5.75rem}.logo uni-image[data-v-3dca468b]{width:14.84375rem;height:6.21875rem}.form[data-v-3dca468b]{margin-top:1.875rem}.form .box[data-v-3dca468b]{width:17.8125rem;height:2.75rem;background:#f8f8f8;border-radius:1.375rem;padding:0 .9375rem;margin-top:1.25rem;position:relative}.form .box .account_box[data-v-3dca468b]{position:absolute;top:3.125rem;left:2.8125rem;width:15.625rem;background-color:#fff;box-shadow:0 0 3px 1px #dfdfdf;z-index:99;border-radius:.3125rem}.form .box .account_box .account[data-v-3dca468b]{max-height:6.25rem;overflow-y:auto}.form .box .account_box .account uni-view[data-v-3dca468b]{padding:.3125rem}.form .box uni-image[data-v-3dca468b]{width:1.25rem;height:1.25rem;margin-right:.625rem}.form .box uni-input[data-v-3dca468b]{height:100%;flex:1}.pwd[data-v-3dca468b]{justify-content:flex-end;margin-top:.625rem;margin-right:1.875rem;font-size:.75rem;color:#01508b}.pwd uni-image[data-v-3dca468b]{width:1.0625rem;height:1.0625rem;margin-right:.125rem}.login[data-v-3dca468b]{margin-top:1.96875rem}.login uni-view[data-v-3dca468b]{width:19.6875rem;height:2.75rem;background:#4e74fb;border-radius:1.375rem;font-size:1rem;color:#fff;text-align:center;line-height:2.75rem}
|
||||
[data-v-d8711c35] .uni-select{border:none;padding-left:0;height:2.75rem}[data-v-d8711c35] .uni-select__input-placeholder{font-size:.875rem;color:#999}[data-v-d8711c35] .uni-icons{display:none}.logo[data-v-d8711c35]{padding-top:5.75rem}.logo uni-image[data-v-d8711c35]{width:14.84375rem;height:6.21875rem}.form[data-v-d8711c35]{margin-top:1.875rem}.form .box[data-v-d8711c35]{width:17.8125rem;height:2.75rem;background:#f8f8f8;border-radius:1.375rem;padding:0 .9375rem;margin-top:1.25rem;position:relative}.form .box .account_box[data-v-d8711c35]{position:absolute;top:3.125rem;left:2.8125rem;width:15.625rem;background-color:#fff;box-shadow:0 0 3px 1px #dfdfdf;z-index:99;border-radius:.3125rem}.form .box .account_box .account[data-v-d8711c35]{max-height:6.25rem;overflow-y:auto}.form .box .account_box .account uni-view[data-v-d8711c35]{padding:.3125rem}.form .box uni-image[data-v-d8711c35]{width:1.25rem;height:1.25rem;margin-right:.625rem}.form .box uni-input[data-v-d8711c35]{height:100%;flex:1}.pwd[data-v-d8711c35]{justify-content:flex-end;margin-top:.625rem;margin-right:1.875rem;font-size:.75rem;color:#01508b}.pwd uni-image[data-v-d8711c35]{width:1.0625rem;height:1.0625rem;margin-right:.125rem}.login[data-v-d8711c35]{margin-top:1.96875rem}.login uni-view[data-v-d8711c35]{width:19.6875rem;height:2.75rem;background:#4e74fb;border-radius:1.375rem;font-size:1rem;color:#fff;text-align:center;line-height:2.75rem}
|
||||
|
File diff suppressed because one or more lines are too long
@ -1,73 +0,0 @@
|
||||
@file:Suppress("UNCHECKED_CAST", "USELESS_CAST", "INAPPLICABLE_JVM_NAME")
|
||||
package uts.sdk.modules.wuwxStepCounter;
|
||||
import android.content.Context;
|
||||
import android.hardware.Sensor;
|
||||
import android.hardware.SensorEvent;
|
||||
import android.hardware.SensorEventListener;
|
||||
import android.hardware.SensorManager;
|
||||
import io.dcloud.uniapp.*;
|
||||
import io.dcloud.uniapp.extapi.*;
|
||||
import io.dcloud.uts.*;
|
||||
import io.dcloud.uts.Map;
|
||||
import io.dcloud.uts.Set;
|
||||
import io.dcloud.uts.UTSAndroid;
|
||||
import kotlinx.coroutines.CoroutineScope;
|
||||
import kotlinx.coroutines.Deferred;
|
||||
import kotlinx.coroutines.Dispatchers;
|
||||
import kotlinx.coroutines.async;
|
||||
open class StartStepCountingUpdatesOptions (
|
||||
open var stepCounts: Int? = null,
|
||||
open var handler: (numberOfSteps: Float, timestamp: Date, error: Any) -> Unit,
|
||||
) : UTSObject()
|
||||
open class QueryStepCountStartingOptions (
|
||||
open var start: Date? = null,
|
||||
open var end: Date? = null,
|
||||
open var handler: (numberOfSteps: Int, error: Any) -> Unit,
|
||||
) : UTSObject()
|
||||
var successHandler = fun(numberOfSteps: Float, timestamp: Date, error: Any){};
|
||||
open class StepCounterSensorEventListener : SensorEventListener {
|
||||
override fun onSensorChanged(event: SensorEvent): Unit {
|
||||
successHandler(event.values[0], Date(), "");
|
||||
}
|
||||
override fun onAccuracyChanged(sensor: Sensor, param1: Int): Unit {}
|
||||
}
|
||||
fun startStepCountingUpdates(options: StartStepCountingUpdatesOptions) {
|
||||
var stepCounterSensorEventListener = StepCounterSensorEventListener();
|
||||
successHandler = options.handler;
|
||||
val context = UTSAndroid.getAppContext();
|
||||
if (context != null) {
|
||||
val sensorManager = context.getSystemService(Context.SENSOR_SERVICE) as SensorManager;
|
||||
sensorManager.unregisterListener(stepCounterSensorEventListener, sensorManager.getDefaultSensor(Sensor.TYPE_STEP_COUNTER));
|
||||
sensorManager.registerListener(stepCounterSensorEventListener, sensorManager.getDefaultSensor(Sensor.TYPE_STEP_COUNTER), SensorManager.SENSOR_DELAY_NORMAL);
|
||||
}
|
||||
}
|
||||
fun stopStepCountingUpdates() {}
|
||||
fun queryStepCountStarting(options: QueryStepCountStartingOptions) {}
|
||||
fun isStepCountingAvailable() {}
|
||||
open class StartStepCountingUpdatesOptionsJSONObject : UTSJSONObject() {
|
||||
open var stepCounts: Int? = null;
|
||||
open lateinit var handler: UTSCallback;
|
||||
}
|
||||
open class QueryStepCountStartingOptionsJSONObject : UTSJSONObject() {
|
||||
open var start: Date? = null;
|
||||
open var end: Date? = null;
|
||||
open lateinit var handler: UTSCallback;
|
||||
}
|
||||
fun startStepCountingUpdatesByJs(options: StartStepCountingUpdatesOptionsJSONObject) {
|
||||
return startStepCountingUpdates(StartStepCountingUpdatesOptions(stepCounts = options.stepCounts, handler = fun(numberOfSteps: Float, timestamp: Date, error: Any): Unit {
|
||||
options.handler(numberOfSteps, timestamp, error);
|
||||
}
|
||||
));
|
||||
}
|
||||
fun stopStepCountingUpdatesByJs() {
|
||||
return stopStepCountingUpdates();
|
||||
}
|
||||
fun queryStepCountStartingByJs(options: QueryStepCountStartingOptionsJSONObject) {
|
||||
return queryStepCountStarting(QueryStepCountStartingOptions(start = options.start, end = options.end, handler = fun(numberOfSteps: Int, error: Any): Unit {
|
||||
options.handler(numberOfSteps, error);
|
||||
}
|
||||
));
|
||||
}
|
||||
fun isStepCountingAvailableByJs() {
|
||||
return isStepCountingAvailable();
|
||||
}
|
64
unpackage/dist/dev/app-plus/app-service.js
vendored
64
unpackage/dist/dev/app-plus/app-service.js
vendored
@ -61,7 +61,7 @@ if (uni.restoreGlobal) {
|
||||
const _imports_4 = "/static/login/eye-off.png";
|
||||
const _imports_5 = "/static/login/nocheck.png";
|
||||
const _imports_6 = "/static/login/checked.png";
|
||||
let baseUrl$1 = "http://10.75.166.174:8080/jeecg-boot";
|
||||
let baseUrl$1 = "https://36.112.48.190/jeecg-boot";
|
||||
let loading = false;
|
||||
function https(config) {
|
||||
if (loading)
|
||||
@ -130,9 +130,9 @@ if (uni.restoreGlobal) {
|
||||
});
|
||||
return promise;
|
||||
}
|
||||
function localLoginApi(config) {
|
||||
function loginApi(config) {
|
||||
return https({
|
||||
url: "/sys/login",
|
||||
url: "/sys/sinopecLogin",
|
||||
method: "post",
|
||||
data: config
|
||||
});
|
||||
@ -1779,15 +1779,21 @@ This will fail in production.`);
|
||||
return proxy.$toast("请输入账号");
|
||||
if (!password.value.trim())
|
||||
return proxy.$toast("请输入密码");
|
||||
Base64.encode(encodeURIComponent(username.value));
|
||||
Base64.encode(encodeURIComponent(password.value));
|
||||
let un = Base64.encode(encodeURIComponent(username.value));
|
||||
let pw = Base64.encode(encodeURIComponent(password.value));
|
||||
uni.showLoading({
|
||||
title: "登录中..."
|
||||
});
|
||||
localLoginApi({
|
||||
username: username.value,
|
||||
password: password.value,
|
||||
captcha: "app"
|
||||
loginApi({
|
||||
username: un,
|
||||
password: pw,
|
||||
ip: getDeviceIp()
|
||||
/*生产环境 end */
|
||||
/*开发环境 begin */
|
||||
// localLoginApi({
|
||||
// username: username.value,
|
||||
// password: password.value,
|
||||
// captcha: 'app'
|
||||
/*开发环境 end */
|
||||
}).then((loginres) => {
|
||||
if (loginres.success) {
|
||||
@ -1808,7 +1814,7 @@ This will fail in production.`);
|
||||
});
|
||||
}
|
||||
}).catch((err) => {
|
||||
formatAppLog("log", "at pages/login/login.vue:132", err);
|
||||
formatAppLog("log", "at pages/login/login.vue:130", err);
|
||||
});
|
||||
};
|
||||
vue.ref([]);
|
||||
@ -1819,6 +1825,31 @@ This will fail in production.`);
|
||||
password.value = obj.pw ? obj.pw : "";
|
||||
}
|
||||
});
|
||||
function getDeviceIp() {
|
||||
let deviceIp;
|
||||
if (plus.os.name == "Android") {
|
||||
let Context = plus.android.importClass("android.content.Context");
|
||||
let main = plus.android.runtimeMainActivity();
|
||||
let cm = main.getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||
plus.android.importClass(cm);
|
||||
let linkProperties = cm.getLinkProperties(cm.getActiveNetwork());
|
||||
let linkAddrs = plus.android.invoke(linkProperties, "getLinkAddresses");
|
||||
plus.android.importClass(linkAddrs);
|
||||
for (var i2 = 0; i2 < linkAddrs.size(); i2++) {
|
||||
let inetAddr = plus.android.invoke(linkAddrs.get(i2), "getAddress");
|
||||
deviceIp = plus.android.invoke(inetAddr, "getHostAddress");
|
||||
}
|
||||
if (deviceIp == "") {
|
||||
var wifiManager = plus.android.runtimeMainActivity().getSystemService(Context.WIFI_SERVICE);
|
||||
var wifiInfo = plus.android.invoke(wifiManager, "getConnectionInfo");
|
||||
var ipAddress = plus.android.invoke(wifiInfo, "getIpAddress");
|
||||
if (ipAddress != 0) {
|
||||
deviceIp = (ipAddress & 255) + "." + (ipAddress >> 8 & 255) + "." + (ipAddress >> 16 & 255) + "." + (ipAddress >> 24 & 255);
|
||||
}
|
||||
}
|
||||
}
|
||||
return deviceIp;
|
||||
}
|
||||
return (_ctx, _cache) => {
|
||||
return vue.openBlock(), vue.createElementBlock(
|
||||
"view",
|
||||
@ -6434,7 +6465,7 @@ This will fail in production.`);
|
||||
}
|
||||
};
|
||||
const customNav = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["__scopeId", "data-v-420daeb5"], ["__file", "D:/projects/cxc-szcx-uniapp/bpm/customNav.vue"]]);
|
||||
const baseurl = "http://10.75.166.174:8080/jeecg-boot/sys/common/static";
|
||||
const baseurl = "https://36.112.48.190/jeecg-boot/sys/common/static/";
|
||||
const toast = (title, icon, duration) => {
|
||||
uni.showToast({
|
||||
title,
|
||||
@ -6631,15 +6662,18 @@ This will fail in production.`);
|
||||
});
|
||||
};
|
||||
const opendocument = (url) => {
|
||||
formatAppLog("log", "at utils/index.js:276", "--1", baseurl + url);
|
||||
uni.downloadFile({
|
||||
url: baseurl + url,
|
||||
success: function(res) {
|
||||
formatAppLog("log", "at utils/index.js:280", "---2", res);
|
||||
var filePath = res.tempFilePath;
|
||||
formatAppLog("log", "at utils/index.js:282", "---2", filePath);
|
||||
uni.openDocument({
|
||||
filePath,
|
||||
showMenu: true,
|
||||
success: function(res2) {
|
||||
formatAppLog("log", "at utils/index.js:284", "打开文档成功");
|
||||
formatAppLog("log", "at utils/index.js:287", "打开文档成功");
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -6654,7 +6688,7 @@ This will fail in production.`);
|
||||
vue.useCssVars((_ctx) => ({
|
||||
"ae0729d5-cusnavbarheight": cusnavbarheight
|
||||
}));
|
||||
const baseurl2 = "http://10.75.166.174:8080/jeecg-boot";
|
||||
const baseurl2 = "https://36.112.48.190/jeecg-boot";
|
||||
const store = useStore();
|
||||
onShow(() => {
|
||||
cxcDaping();
|
||||
@ -11731,7 +11765,7 @@ This will fail in production.`);
|
||||
const _sfc_main$j = {
|
||||
__name: "useredit",
|
||||
setup(__props) {
|
||||
const baseUrl2 = "http://10.75.166.174:8080/jeecg-boot";
|
||||
const baseUrl2 = "https://36.112.48.190/jeecg-boot";
|
||||
const store = useStore();
|
||||
const chooseAvatar = () => {
|
||||
uni.chooseImage({
|
||||
@ -17560,7 +17594,7 @@ ${i3}
|
||||
__definePage("pages/safe/detail", PagesSafeDetail);
|
||||
__definePage("pages/zhiban/index", PagesZhibanIndex);
|
||||
__definePage("pages/task/self", PagesTaskSelf);
|
||||
const baseUrl = "http://10.75.166.174:8080/jeecg-boot/sys/common/static/";
|
||||
const baseUrl = "https://36.112.48.190/jeecg-boot/sys/common/static/";
|
||||
const useUpdateApp = defineStore("updateApp", () => {
|
||||
const updateOptions = vue.reactive({
|
||||
force: false,
|
||||
|
2
unpackage/dist/dev/app-plus/manifest.json
vendored
2
unpackage/dist/dev/app-plus/manifest.json
vendored
@ -7,7 +7,7 @@
|
||||
"id": "__UNI__F0AFD30",
|
||||
"name": "数智产销",
|
||||
"version": {
|
||||
"name": "1.0.0",
|
||||
"name": "1.0.1",
|
||||
"code": 20240929
|
||||
},
|
||||
"description": "",
|
||||
|
@ -1,4 +1,4 @@
|
||||
const baseurl = import.meta.env.VITE_REQUEST_BASE_URL + '/jeecg-boot/sys/common/static'
|
||||
const baseurl = import.meta.env.VITE_REQUEST_BASE_URL + '/jeecg-boot/sys/common/static/'
|
||||
/**提示*/
|
||||
export const toast = (title, icon, duration) => {
|
||||
uni.showToast({
|
||||
@ -273,10 +273,13 @@ const weatherRequest = (params) => {
|
||||
}
|
||||
|
||||
export const opendocument = (url) => {
|
||||
console.log('--1',baseurl + url)
|
||||
uni.downloadFile({
|
||||
url: baseurl + url,
|
||||
success: function(res) {
|
||||
console.log('---2',res)
|
||||
var filePath = res.tempFilePath;
|
||||
console.log('---2',filePath)
|
||||
uni.openDocument({
|
||||
filePath: filePath,
|
||||
showMenu: true,
|
||||
|
Loading…
Reference in New Issue
Block a user