From 0923bb456dcf87b659b949d9455482086ec22962 Mon Sep 17 00:00:00 2001 From: wangpeng Date: Wed, 17 Apr 2024 00:29:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=BC=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/tool.js | 7 +- manifest.json | 66 +++++++++++++++---- .../driving-item-check-list.vue | 11 +++- pages/login/home.vue | 8 +-- 4 files changed, 71 insertions(+), 21 deletions(-) diff --git a/common/tool.js b/common/tool.js index 3a6f338..bed8457 100644 --- a/common/tool.js +++ b/common/tool.js @@ -1,6 +1,7 @@ -// export var basePath = "http://192.168.0.42:8099/"; -export var basePath = "http://192.168.0.69:7072/"; -// export var basePath = "https://gateway.qhdsafety.com/"; + +// export var basePath = "http://192.168.0.69:7082/"; +// export var basePath = "http://192.168.0.31:7082/integrated_traffic/"; +export var basePath = "http://39.101.166.211:8073/integrated_traffic/"; export const baseImgPath = "https://file.zcloudchina.com/YTHFile"; export const adminPath = "http://192.168.0.18:8085"; export const projectManagerUrl = 'https://pm.qhdsafety.com/zy-projectManage/'; diff --git a/manifest.json b/manifest.json index 06db41b..290366b 100644 --- a/manifest.json +++ b/manifest.json @@ -1,15 +1,20 @@ { - "name" : "秦安双控", - "appid" : "__UNI__F48179F", - "description" : "秦安双控", - "versionName" : "3.0.0", - "versionCode" : 3, + "name" : "交运安全", + "appid" : "__UNI__CEE68CC", + "description" : "交运安全", + "versionName" : "1.0.0", + "versionCode" : 1, "transformPx" : false, "app-plus" : { /* 5+App特有相关 */ "modules" : { "Geolocation" : {}, - "LivePusher" : {} + "LivePusher" : {}, + "Camera" : {}, + "Maps" : {}, + "VideoPlayer" : {}, + "Barcode" : {}, + "Contacts" : {} }, "compatible" : { "ignoreVersion" : true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持 @@ -40,15 +45,19 @@ "", "", "", + "", "", "", + "", "", "", "", "", "", + "", "" - ] + ], + "abiFilters" : [ "armeabi-v7a" ] }, "ios" : { "privacyDescription" : { @@ -58,7 +67,8 @@ "NSMicrophoneUsageDescription" : "调取手机麦克风用于用户快捷输入", "NSLocationAlwaysAndWhenInUseUsageDescription" : "使用用户地理位置用于提供客户的位置信息", "NSLocationWhenInUseUsageDescription" : "使用用户地理位置用于提供客户的位置信息" - } + }, + "dSYMs" : false }, /* ios打包配置 */ "sdkConfigs" : { @@ -69,17 +79,47 @@ "appkey_android" : "43G1sKuHV6oRTrdR9VTIGPF9soej7V5a" } }, - "ad" : {} + "ad" : {}, + "maps" : { + "baidu" : { + "appkey_ios" : "g3lZyqt0KkFnZGUsjIVO7U6lTCfpjSCt", + "appkey_android" : "43G1sKuHV6oRTrdR9VTIGPF9soej7V5a" + } + } }, "splashscreen" : { "androidStyle" : "common" }, "icons" : { "android" : { - "hdpi" : "C:/Users/Administrator/Desktop/icons/72x72.png", - "xhdpi" : "C:/Users/Administrator/Desktop/icons/96x96.png", - "xxhdpi" : "C:/Users/Administrator/Desktop/icons/144x144.png", - "xxxhdpi" : "C:/Users/Administrator/Desktop/icons/192x192.png" + "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" + } } } } diff --git a/pages/application/driving-inspections/driving-item-check-list.vue b/pages/application/driving-inspections/driving-item-check-list.vue index d08a078..26056d1 100644 --- a/pages/application/driving-inspections/driving-item-check-list.vue +++ b/pages/application/driving-inspections/driving-item-check-list.vue @@ -55,8 +55,9 @@ - + 实时照片 + *照片说明:车辆正前方、左右两侧45°角及车尾部拍照 @@ -516,6 +517,14 @@ }); return; } + if (_this.liveImgs.length < 4) { + uni.showToast({ + icon: 'none', + title: '车辆检查需要4张照片', + duration: 1500 + }); + return; + } if (_this.imgList.length <= 0) { uni.showToast({ icon: 'none', diff --git a/pages/login/home.vue b/pages/login/home.vue index 59cdc47..b6ac662 100644 --- a/pages/login/home.vue +++ b/pages/login/home.vue @@ -46,7 +46,7 @@ - @@ -61,7 +61,7 @@ 《隐私政策》 - + --> @@ -199,13 +199,13 @@ this.userPwd = e.detail.value }, login() { - if (this.radio !== '1') { + /*if (this.radio !== '1') { uni.showToast({ title: '请先阅读并同意《服务协议》和《隐私政策》', icon: 'none' }) return; - } + }*/ var _this = this; var userName = _this.userName; var userPwd = _this.userPwd;