diff --git a/App.vue b/App.vue index 79b8c7c..32df8d2 100644 --- a/App.vue +++ b/App.vue @@ -5,7 +5,6 @@ // location.getLocation(()=>{ // this.$store.dispatch('getCity') // }); - // this.getLocationAuthority() }, onShow: function() { console.log('App Show') @@ -14,31 +13,7 @@ console.log('App Hide') }, methods: { - getLocationAuthority() { - let _this = this - uni.getLocation({ - type: 'wgs84', - success: function(res) { - _this.$store.dispatch('getCity') - }, - fail: function(err) { - console.log('为什么失败了') - console.log(err) - uni.showModal({ - content: '为了能够获取精确的数据，请去手机设置里手动开启app定位权限', - showCancel: false, - confirmText: '知道了，关闭弹窗', - success: function(res) { - if (res.confirm) { - console.log('用户点击确定'); - } else if (res.cancel) { - console.log('用户点击取消'); - } - } - }); - } - }); - } + } } diff --git a/config/api.js b/config/api.js index aa93aec..a370c7c 100644 --- a/config/api.js +++ b/config/api.js @@ -230,6 +230,9 @@ export const periodConfirm = (data) => http.post('app/student-process/periodConf export const refuse_apply = (data) => http.post('pay/ysb/refuse_apply', data) // 获取退款申请的金额 export const refund_amount = (data) => http.post('pay/ysb/refund_amount', data) + // 头像修改申请 + export const avatarApply = (data) => http.post('app/student-record/avatar_apply', data) + diff --git a/config/utils.js b/config/utils.js index 0290f8c..c26fe56 100644 --- a/config/utils.js +++ b/config/utils.js @@ -115,7 +115,7 @@ export function uploadImgApi(filePath, imgName, imgLink='image') { formData: { path: imgLink+'/'+ uni.$u.date(timer, 'yyyy-mm-dd')+'/'+timer + '-'+ imgName, type: 1, - fileSuffix: "png" + fileSuffix: "mp4" }, header: { Authorization: token, @@ -172,6 +172,7 @@ export function uploadImgApi(filePath, imgName, imgLink='image') { success: function(res) { console.log('条码类型：' + res.scanType); console.log('条码内容：' + res.result); + console.log('扫码结果***********') let obj = JSON.parse(res.result) console.log(obj) // 扫教练码去报名的 @@ -187,12 +188,12 @@ export function uploadImgApi(filePath, imgName, imgLink='image') { } _this.$store.commit('upDateSchoolClass', {}) + if(obj.QrType==1) { // 判断是扫教练码来的还是驾校码来的 if(item.id) { _this.$store.commit('updateSchool', {}) - console.log('扫码结果***********') - console.log(item) + _this.$store.commit('upDateSchoolCoach', item) }else { obj.schoolName = decodeURIComponent(obj.schoolName) diff --git a/manifest.json b/manifest.json index 202b4d2..917a64f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "洛阳学车", "appid" : "__UNI__3347C6E", "description" : "", - "versionName" : "1.4.0", - "versionCode" : 140, + "versionName" : "1.4.4", + "versionCode" : 144, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -25,9 +25,9 @@ "modules" : { "Maps" : {}, "Barcode" : {}, - "Geolocation" : {}, "VideoPlayer" : {}, - "Share" : {} + "Share" : {}, + "Camera" : {} }, /* 应用发布信息 */ "distribute" : { @@ -67,9 +67,11 @@ "dSYMs" : false, "UIBackgroundModes" : "location", "privacyDescription" : { - "NSLocationWhenInUseUsageDescription" : "运行期访问位置", - "NSLocationAlwaysUsageDescription" : "后台运行访问位置", - "NSLocationAlwaysAndWhenInUseUsageDescription" : "访问位置" + "NSPhotoLibraryAddUsageDescription" : "该应用需要读取您的相册，以便扫驾校二维码时读取驾校信息，与咨询投诉时上传照片", + "NSCameraUsageDescription" : "该应用需要读取您的相册，以便扫驾校二维码时读取驾校信息，与咨询投诉时上传照片", + "NSLocationWhenInUseUsageDescription" : "该应用需要读取您的位置，以便查找驾校显示当前位置信息或查找附件数据", + "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要读取您的位置，以便查找驾校显示当前位置信息或查找附件数据", + "NSPhotoLibraryUsageDescription" : "该应用需要读取您的相册，以便扫驾校二维码时读取驾校信息，与咨询投诉时上传照片" }, "capabilities" : { "entitlements" : { @@ -101,10 +103,10 @@ "__platform__" : [ "ios", "android" ] }, "amap" : { + "name" : "amapOV4nNDfa", "__platform__" : [ "ios", "android" ], "appkey_ios" : "2839b2b14fdcd2983e0d6247ce9baf7a", - "appkey_android" : "3c5fcc5ee6aaba56e4806f3382399c16", - "name" : "amapOV4nNDfa" + "appkey_android" : "3c5fcc5ee6aaba56e4806f3382399c16" } }, "payment" : { @@ -227,8 +229,9 @@ "disableHostCheck" : true, "proxy" : { "/api" : { - "target" : "http://www.lyjppt.com/", + // "target" : "http://www.lyjppt.com/", // "target" : "http://123.6.232.1:8099/", + "target" : "http://192.168.1.106:8318/", "changeOrigin" : true, "secure" : true, "pathRewrite" : { @@ -251,7 +254,9 @@ } } }, - "_spaceID" : "mp-87b9fa27-0273-48d3-a586-bd058cd2ce3d" + "_spaceID" : "mp-87b9fa27-0273-48d3-a586-bd058cd2ce3d", + "fallbackLocale" : "zh-Hans", + "locale" : "auto" } /* ios打包配置 *//* SDK配置 */ diff --git a/pages/indexEntry/enroll/uploadAvatar/uAvatarCropper/uAvatarCropper.vue b/pages/indexEntry/enroll/uploadAvatar/uAvatarCropper/uAvatarCropper.vue index 45d60ed..7755ea4 100644 --- a/pages/indexEntry/enroll/uploadAvatar/uAvatarCropper/uAvatarCropper.vue +++ b/pages/indexEntry/enroll/uploadAvatar/uAvatarCropper/uAvatarCropper.vue @@ -113,9 +113,9 @@ export default { }, // 裁剪框和输出图片的尺寸，高度默认等于宽度 // 输出图片宽度，单位px - destWidth: 147, + destWidth: 240, // 裁剪框宽度，单位px - rectWidth: 295, + rectWidth: 240, // 输出的图片类型，如果'png'类型发现裁剪的图片太大，改成"jpg"即可 fileType: 'png', src: '', // 选择的图片路径，用于在点击确定时，判断是否选择了图片 @@ -137,7 +137,7 @@ export default { x: (this.width - rectWidth) / 2, y: (this.height - rectWidth) / 2, width: rectWidth, - height: 413 + height: 320 }; } this.rectWidth = this.rectWidth; @@ -179,7 +179,7 @@ export default { if(!this.src) return this.$u.toast('请先选择图片再裁剪'); let cropper_opt = { - destHeight: 206, // uni.canvasToTempFilePath要求这些参数为数值 + destHeight: 320, // uni.canvasToTempFilePath要求这些参数为数值 destWidth: Number(this.destWidth), fileType: this.fileType }; diff --git a/pages/indexEntry/findShcool/screen/screen.vue b/pages/indexEntry/findShcool/screen/screen.vue index 9fbb01c..61da10d 100644 --- a/pages/indexEntry/findShcool/screen/screen.vue +++ b/pages/indexEntry/findShcool/screen/screen.vue @@ -4,14 +4,14 @@ 驾照类型 - {{ item.label }} + {{ item.label }} 区域 - {{ item.areaName }} + {{ item.areaName }} diff --git a/pages/mineEntry/personaInfo/personaInfo.vue b/pages/mineEntry/personaInfo/personaInfo.vue index c8d070c..542bcbb 100644 --- a/pages/mineEntry/personaInfo/personaInfo.vue +++ b/pages/mineEntry/personaInfo/personaInfo.vue @@ -1,14 +1,14 @@