diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json new file mode 100644 index 0000000..1b8d0f6 --- /dev/null +++ b/.hbuilderx/launch.json @@ -0,0 +1,9 @@ +{ + "version" : "1.0", + "configurations" : [ + { + "playground" : "custom", + "type" : "uni-app:app-android" + } + ] +} diff --git a/nativeplugins/Tm-TmSafeSaveFileModule/android/Tm-TmSafeSaveFileModule.aar b/nativeplugins/Tm-TmSafeSaveFileModule/android/Tm-TmSafeSaveFileModule.aar new file mode 100644 index 0000000..b11db39 Binary files /dev/null and b/nativeplugins/Tm-TmSafeSaveFileModule/android/Tm-TmSafeSaveFileModule.aar differ diff --git a/nativeplugins/Tm-TmSafeSaveFileModule/package.json b/nativeplugins/Tm-TmSafeSaveFileModule/package.json new file mode 100644 index 0000000..3fee52b --- /dev/null +++ b/nativeplugins/Tm-TmSafeSaveFileModule/package.json @@ -0,0 +1,29 @@ +{ + "name": "TmSafeSaveFileModule隐私数据保存", + "id": "Tm-TmSafeSaveFileModule", + "version": "1.0.0", + "description": "TmSafeSaveFileModule隐私数据保存", + "_dp_type": "nativeplugin", + "_dp_nativeplugin": { + "android": { + "plugins": [ + { + "type": "module", + "name": "Tm-TmSafeSaveFileModule", + "class": "io.dcloud.uniplugin.safesave.TmSafeSaveFileModule" + } + ], + "abis": [ + "armeabi-v7a", + "x86" + ], + "minSdkVersion": "26", + "integrateType": "aar", + "dependencies": [ + "androidx.security:security-crypto:1.1.0-alpha06" + ], + "permissions": [ + ] + } + } +} \ No newline at end of file diff --git a/src/components/multipleSelect.vue b/src/components/multipleSelect.vue index 791b253..9692abb 100644 --- a/src/components/multipleSelect.vue +++ b/src/components/multipleSelect.vue @@ -111,7 +111,7 @@ const active = ref(false); // 组件是否激活, let changevalue = reactive([]); let realValue = reactive([]); onMounted(() => { - init(); + // init(); }); // 初始化函数 diff --git a/src/manifest.json b/src/manifest.json index dde2e76..d7b6ef8 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,7 +1,7 @@ { "id" : "H5E705637", - "name" : "app", - // "appid" : "H5E705637", + "name" : "718友晟", + "appid" : "__UNI__4C459F4", "description" : "", "versionName" : "1.0.0", "versionCode" : "100", @@ -16,7 +16,7 @@ "compilerVersion" : 3, "splashscreen" : { "alwaysShowBeforeRender" : true, - "waiting" : false,// 是否显示等待界面 + "waiting" : false, // 是否显示等待界面 "autoclose" : true, "delay" : 0 }, @@ -43,6 +43,9 @@ "", "" ], + "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ], + "minSdkVersion" : 26, + "targetSdkVersion" : 35, "icons" : { "android" : { "hdpi" : "static/icons/72x72.png", @@ -53,9 +56,27 @@ } }, /* ios打包配置 */ - "ios" : {}, + "ios" : { + "dSYMs" : false + }, /* SDK配置 */ "sdkConfigs" : {} + }, + "nativePlugins" : { + "Tm-TmSafeSaveFileModule" : { + "__plugin_info__" : { + "name" : "TmSafeSaveFileModule隐私数据保存", + "description" : "TmSafeSaveFileModule隐私数据保存", + "platforms" : "Android", + "url" : "", + "android_package_name" : "", + "ios_bundle_id" : "", + "isCloud" : false, + "bought" : -1, + "pid" : "", + "parameters" : {} + } + } } }, /* 快应用特有相关 */ @@ -84,8 +105,8 @@ "h5" : { "router" : { "base" : "" - /*,"mode": "history" 仅对 H5 平台生效 */ }, + /*,"mode": "history" 仅对 H5 平台生效 */ "template" : "index.html" } } diff --git a/src/pages/business/CRM/marketActivity/visitorReportAdd.vue b/src/pages/business/CRM/marketActivity/visitorReportAdd.vue index 380bf94..131a919 100644 --- a/src/pages/business/CRM/marketActivity/visitorReportAdd.vue +++ b/src/pages/business/CRM/marketActivity/visitorReportAdd.vue @@ -69,7 +69,10 @@ class="uni-forms-item is-direction-top is-top"> + :options="myLeaderList" + @change="changeValue2" :key="Math.round()" + :slabel="'text'" + > @@ -251,10 +254,11 @@ function chooseRecord(e) { .form-con { /* #ifdef APP-PLUS */ - height: calc(100vh - 100px) - /* #endif */ - /* #ifndef APP-PLUS */ - /* #endif */ + height: calc(100vh - 95px) !important; + /* #endif */ + /* #ifndef APP-PLUS */ + height:calc(100vh - 68px) !important; + /* #endif */ } :deep(.uni-date-x) { diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index c0c14dc..34104c1 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -266,6 +266,7 @@ const submitForm = () => { //h5测试用 内网-sn123456 //公司外网 '9516053c-b441-465b-9781-06e7b8031811' //友晟外网 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2' + //8f9bbe3b-7f1d-4e7f-9734-6faa6b86350f param.uniqCode = 'b97527c8-2ad4-493c-a01c-5f9d0aabaff2'; let res = await login(param); userStore.login(res); @@ -278,7 +279,7 @@ const submitForm = () => { // 读取设备ID safeSave.getSafeFile({ "key": "app_device_id" }, res3 => { if (res3.code == 1) { - let deviceId = res3.data;//'b97527c8-2ad4-493c-a01c-5f9d0aabaff2' // + let deviceId = res3.data; // showAlert("读取成功=>"+deviceId); param.uniqCode = deviceId; console.log("param=>",param) diff --git a/src/utils/request/index.js b/src/utils/request/index.js index fca3e66..b4ce122 100644 --- a/src/utils/request/index.js +++ b/src/utils/request/index.js @@ -13,7 +13,7 @@ const requestHooks = { requestInterceptorsHook(options, config) { // console.log("request=>config=>",config) const { urlPrefix, baseUrl, withToken, isAuth } = config; - options.header = options.header ?? {}; + options.header = options.header ? options.header:{}; if (urlPrefix) { options.url = `${urlPrefix}${options.url}`; }