diff --git a/config.js b/config.js index 0af7126..e909725 100644 --- a/config.js +++ b/config.js @@ -1,11 +1,15 @@ // 应用全局配置 module.exports = { // baseUrl: 'https://www.nuoyunr.com/admin-api', - baseUrl: 'http://127.0.0.1:48080/admin-api', + // baseUrl: 'http://[2408:8214:41d:82d0:878c:10f8:2a8e:5d7a]:48080/admin-api', + baseUrl: 'http://192.168.1.36:48080/admin-api', + // baseUrl: 'http://localhost:48080/admin-api', // baseUrl: 'http://uncs3q.natappfree.cc/admin-api', imagesUrl: 'http://www.nuoyunr.com/lananRsc', baseImageUrl: 'https://www.nuoyunr.com/minio', - wsUrl: 'ws://127.0.0.1:48080', + shareUrl: 'https://www.lighting-it.cn/inspection/inspection?inviteId=', + wsUrl: 'ws://192.168.1.36:48080', + // wsUrl: 'ws://[2408:8215:41b:3230:fdd2:dea8:c1d2:7803]:48080', // 应用信息 appInfo: { // 应用名称 diff --git a/manifest.json b/manifest.json index beb329a..1fe4eaa 100644 --- a/manifest.json +++ b/manifest.json @@ -1,156 +1,160 @@ { - "name" : "机动车小助手", - "appid" : "__UNI__5383BA6", - "description" : "", - "versionName" : "1.0.0", - "versionCode" : "100", - "transformPx" : false, - /* 5+App特有相关 */ - "app-plus" : { - "usingComponents" : true, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 - }, - /* 模块配置 */ - "modules" : { - "Maps" : {}, - "Geolocation" : {}, - "Camera" : {}, - "Barcode" : {} - }, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios" : { - "dSYMs" : false - }, - /* SDK配置 */ - "sdkConfigs" : { - "maps" : { - "amap" : { - "appkey_ios" : "36576cf7091d7b12a49c207cabf92661", - "appkey_android" : "36576cf7091d7b12a49c207cabf92661" - } - }, - "ad" : {}, - "geolocation" : { - "amap" : { - "__platform__" : [ "android" ], - "appkey_ios" : "36576cf7091d7b12a49c207cabf92661", - "appkey_android" : "36576cf7091d7b12a49c207cabf92661" - } - } - }, - "icons" : { - "android" : { - "hdpi" : "unpackage/res/icons/72x72.png", - "xhdpi" : "unpackage/res/icons/96x96.png", - "xxhdpi" : "unpackage/res/icons/144x144.png", - "xxxhdpi" : "unpackage/res/icons/192x192.png" - }, - "ios" : { - "appstore" : "unpackage/res/icons/1024x1024.png", - "ipad" : { - "app" : "unpackage/res/icons/76x76.png", - "app@2x" : "unpackage/res/icons/152x152.png", - "notification" : "unpackage/res/icons/20x20.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "proapp@2x" : "unpackage/res/icons/167x167.png", - "settings" : "unpackage/res/icons/29x29.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "spotlight" : "unpackage/res/icons/40x40.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png" - }, - "iphone" : { - "app@2x" : "unpackage/res/icons/120x120.png", - "app@3x" : "unpackage/res/icons/180x180.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "notification@3x" : "unpackage/res/icons/60x60.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "settings@3x" : "unpackage/res/icons/87x87.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png", - "spotlight@3x" : "unpackage/res/icons/120x120.png" - } - } - } - }, - "nativePlugins" : { - "DC-WBOCRServiceV2" : { - "__plugin_info__" : { - "name" : "DC-WBOCRServiceV2", - "description" : "OCR 识别SDK,支持银行卡、身份证、驾驶证和行驶证识别。", - "platforms" : "Android,iOS", - "url" : "https://ext.dcloud.net.cn/plugin?id=8994", - "android_package_name" : "com.lzlanan.inspection", - "ios_bundle_id" : "com.lzlanan.inspection", - "isCloud" : true, - "bought" : 1, - "pid" : "8994", - "parameters" : {} - } - } - } - }, - /* 快应用特有相关 */ - "quickapp" : {}, - /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "", - "setting" : { - "urlCheck" : false - }, - "usingComponents" : true - }, - "mp-alipay" : { - "usingComponents" : true - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "uniStatistics" : { - "enable" : false - }, - "vueVersion" : "2", - "h5" : { - "sdkConfigs" : { - "maps" : { - "qqmap" : { - "key" : "Z2MBZ-YDXKQ-7O25N-B3ACC-ABVV5-SAFVZ" - } - } - } - } -} + "name": "机动车小助手", + "appid": "__UNI__5383BA6", + "description": "", + "versionName": "1.0.0", + "versionCode": "100", + "transformPx": false, + "sassImplementationName": "node-sass", + /* 5+App特有相关 */ + "app-plus": { + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + /* 模块配置 */ + "modules": { + "Maps": {}, + "Geolocation": {}, + "Camera": {}, + "Barcode": {} + }, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios": { + "dSYMs": false + }, + /* SDK配置 */ + "sdkConfigs": { + "maps": { + "amap": { + "appkey_ios": "36576cf7091d7b12a49c207cabf92661", + "appkey_android": "36576cf7091d7b12a49c207cabf92661" + } + }, + "ad": {}, + "geolocation": { + "amap": { + "__platform__": ["android"], + "appkey_ios": "36576cf7091d7b12a49c207cabf92661", + "appkey_android": "36576cf7091d7b12a49c207cabf92661" + } + } + }, + "icons": { + "android": { + "hdpi": "unpackage/res/icons/72x72.png", + "xhdpi": "unpackage/res/icons/96x96.png", + "xxhdpi": "unpackage/res/icons/144x144.png", + "xxxhdpi": "unpackage/res/icons/192x192.png" + }, + "ios": { + "appstore": "unpackage/res/icons/1024x1024.png", + "ipad": { + "app": "unpackage/res/icons/76x76.png", + "app@2x": "unpackage/res/icons/152x152.png", + "notification": "unpackage/res/icons/20x20.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "proapp@2x": "unpackage/res/icons/167x167.png", + "settings": "unpackage/res/icons/29x29.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "spotlight": "unpackage/res/icons/40x40.png", + "spotlight@2x": "unpackage/res/icons/80x80.png" + }, + "iphone": { + "app@2x": "unpackage/res/icons/120x120.png", + "app@3x": "unpackage/res/icons/180x180.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "notification@3x": "unpackage/res/icons/60x60.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "settings@3x": "unpackage/res/icons/87x87.png", + "spotlight@2x": "unpackage/res/icons/80x80.png", + "spotlight@3x": "unpackage/res/icons/120x120.png" + } + } + }, + "splashscreen": { + "androidStyle": "common" + } + }, + "nativePlugins": { + "DC-WBOCRServiceV2": { + "__plugin_info__": { + "name": "DC-WBOCRServiceV2", + "description": "OCR 识别SDK,支持银行卡、身份证、驾驶证和行驶证识别。", + "platforms": "Android,iOS", + "url": "https://ext.dcloud.net.cn/plugin?id=8994", + "android_package_name": "com.lzlanan.inspection", + "ios_bundle_id": "com.lzlanan.inspection", + "isCloud": true, + "bought": 1, + "pid": "8994", + "parameters": {} + } + } + } + }, + /* 快应用特有相关 */ + "quickapp": {}, + /* 小程序特有相关 */ + "mp-weixin": { + "appid": "", + "setting": { + "urlCheck": false + }, + "usingComponents": true + }, + "mp-alipay": { + "usingComponents": true + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "uniStatistics": { + "enable": false + }, + "vueVersion": "2", + "h5": { + "sdkConfigs": { + "maps": { + "qqmap": { + "key": "Z2MBZ-YDXKQ-7O25N-B3ACC-ABVV5-SAFVZ" + } + } + } + } +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..cf996f9 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,88 @@ +{ + "name": "detection-business", + "version": "1.2", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "version": "1.2", + "dependencies": { + "cos-js-sdk-v5": "^1.8.7", + "uqrcodejs": "^4.0.7" + } + }, + "node_modules/cos-js-sdk-v5": { + "version": "1.8.7", + "resolved": "https://registry.npmjs.org/cos-js-sdk-v5/-/cos-js-sdk-v5-1.8.7.tgz", + "integrity": "sha512-KK3PYbUiLxcjvVhyvEeBQRWzDgAmuldDZQL1lTRM0aeQaI+hlm84xQQQyv+oIRxPnnAIleZF2vUgB4sJFUzcxQ==", + "dependencies": { + "fast-xml-parser": "4.5.0" + } + }, + "node_modules/fast-xml-parser": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz", + "integrity": "sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + }, + { + "type": "paypal", + "url": "https://paypal.me/naturalintelligence" + } + ], + "dependencies": { + "strnum": "^1.0.5" + }, + "bin": { + "fxparser": "src/cli/cli.js" + } + }, + "node_modules/strnum": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.1.2.tgz", + "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ] + }, + "node_modules/uqrcodejs": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/uqrcodejs/-/uqrcodejs-4.0.7.tgz", + "integrity": "sha512-84+aZmD2godCVI+93lxE3YUAPNY8zAJvNA7xRS7R7U+q57KzMDepBSfNCwoRUhWOfR6eHFoAOcHRPwsP6ka1cA==" + } + }, + "dependencies": { + "cos-js-sdk-v5": { + "version": "1.8.7", + "resolved": "https://registry.npmjs.org/cos-js-sdk-v5/-/cos-js-sdk-v5-1.8.7.tgz", + "integrity": "sha512-KK3PYbUiLxcjvVhyvEeBQRWzDgAmuldDZQL1lTRM0aeQaI+hlm84xQQQyv+oIRxPnnAIleZF2vUgB4sJFUzcxQ==", + "requires": { + "fast-xml-parser": "4.5.0" + } + }, + "fast-xml-parser": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz", + "integrity": "sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==", + "requires": { + "strnum": "^1.0.5" + } + }, + "strnum": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.1.2.tgz", + "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==" + }, + "uqrcodejs": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/uqrcodejs/-/uqrcodejs-4.0.7.tgz", + "integrity": "sha512-84+aZmD2godCVI+93lxE3YUAPNY8zAJvNA7xRS7R7U+q57KzMDepBSfNCwoRUhWOfR6eHFoAOcHRPwsP6ka1cA==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..a22d20b --- /dev/null +++ b/package.json @@ -0,0 +1,22 @@ +{ + "id": "qianziyu-select", + "displayName": "基于uview2.x封装的下拉框", + "version": "1.2", + "description": "公共选择下拉框,基于uview2.x。支持下拉加载、列表搜索、单选|多选", + "keywords": [ + "下拉", + "单选", + "多选", + "uview" + ], + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ] + }, + "dependencies": { + "cos-js-sdk-v5": "^1.8.7", + "uqrcodejs": "^4.0.7" + } +} diff --git a/pages/index/staffProjectList/staffProjectList.vue b/pages/index/staffProjectList/staffProjectList.vue index 7286654..5147f5f 100644 --- a/pages/index/staffProjectList/staffProjectList.vue +++ b/pages/index/staffProjectList/staffProjectList.vue @@ -17,53 +17,57 @@ - + + 选择筛选项 - 清除筛选项 + + - + + + - - - - 业务渠道 - - - + + 业务渠道 + + - - - 客户来源 - - - + + + 客户来源 + + - - 检测项目 - - - + + + 检测项目 + + - + + + 取消 确定 + @@ -340,13 +344,13 @@ .popup-footer { display: flex; justify-content: space-between; - margin-top: 60rpx; - margin-bottom: 30rpx; + /* margin-top: 60rpx; */ + /* margin-bottom: 30rpx; */ } - .popup-footer button { + .popup-footer-fixed button { padding: 10rpx 20rpx; - margin: 0 10rpx; + margin: 0 50rpx; border-radius: 5px; background-color: #327DFB; color: #fff; @@ -374,4 +378,17 @@ .filter-section .options u-icon { margin-left: 10rpx; } + + .popup-footer-fixed { + position: absolute; + bottom: 0; + left: 0; + width: 100%; + padding: 20rpx; + background-color: #fff; + display: flex; + justify-content: space-around; + box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.1); + z-index: 10; + } \ No newline at end of file