diff --git a/components/PayDialog/index.vue b/components/PayDialog/index.vue index bc84214..851d33d 100644 --- a/components/PayDialog/index.vue +++ b/components/PayDialog/index.vue @@ -261,9 +261,10 @@ export default { if (this.pay_type_num === 40) { backUrlCRshlcICwGdGY.useGold = this.useGold; } - + console.log(backUrlCRshlcICwGdGY); try { const data = await createOrder(backUrlCRshlcICwGdGY); + console.log(data.msg); uni.hideLoading(); if (data.code === 200) { this.$emit("change", { @@ -275,6 +276,7 @@ export default { this.$emit("update:open", false); } } catch (err) { + console.log(err) uni.hideLoading(); this.$util.showMsg(err.msg); } diff --git a/manifest.json b/manifest.json index 9ec2403..a78115e 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { "name" : "梦航学习宝", "appid" : "__UNI__640EC10", - "description" : "1.1.4", - "versionName" : "1.0.14", - "versionCode" : 114, + "description" : "1.1.5", + "versionName" : "1.0.15", + "versionCode" : 115, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -61,10 +61,10 @@ "dSYMs" : false, "urltypes" : "zsff.xinbadaweb.cn", "privacyDescription" : { - "NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册,用于设置个人头像", - "NSPhotoLibraryAddUsageDescription" : "该应用需要写入你的相册,用于设置个人头像", - "NSLocationWhenInUseUsageDescription" : "该应用需要获取你的地理位置,以便为你推荐附近的线下课程", - "NSCameraUsageDescription" : "该应用需要调用摄像头,用于设置个人头像" + "NSPhotoLibraryUsageDescription" : "梦航学习宝需要读取你的相册,用于设置个人头像", + "NSPhotoLibraryAddUsageDescription" : "梦航学习宝需要写入你的相册,用于设置个人头像", + "NSLocationWhenInUseUsageDescription" : "梦航学习宝需要获取你的地理位置,以便为你推荐附近的线下课程", + "NSCameraUsageDescription" : "梦航学习宝需要调用摄像头,用于设置个人头像" }, "idfa" : false }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 7553d8e..6968c94 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -566,6 +566,7 @@ import ColorThief from "colorthief"; import SquareStyleCourse from '@/components/Course/squareStyleCourse.vue'; import Advert from '@/components/Advert/index.vue'; import { SET_POSITION } from "@/store/types/muations-types"; +import { REQUEST_PERMISSIONS } from "@/store/types/action-types"; import { getLocation } from './getLocation.js'; import { changeCategory } from '@/api/learning'; @@ -626,7 +627,7 @@ export default { }, onLoad() { wx.setNavigationBarTitle({ - title:"一合知道" + title:"梦航学习宝" }); let platform = uni.getSystemInfoSync().platform; if (platform !== 'android') { @@ -921,15 +922,28 @@ export default { } ); }, - toPosition() { + async toPosition() { + // #ifdef APP-PLUS + let result = await store.dispatch("app/" + REQUEST_PERMISSIONS, 'ACCESS_FINE_LOCATION') + if (result !== 1) return + if (this.currentPosition) { + uni.navigateTo({ + url: `/pages/index/position?position=${this.currentPosition}`, + }); + } else { + this.authPosition(); + } + // #endif + // #ifndef APP-PLUS let platform = uni.getSystemInfoSync().platform; - if (platform === 'android' && !this.currentPosition) { + if (platform === 'android' || !this.currentPosition) { this.authPosition(); } else { uni.navigateTo({ url: `/pages/index/position?position=${this.currentPosition}`, }); } + // #endif }, }, }; diff --git a/pages/my/user_info.vue b/pages/my/user_info.vue index 074986e..f9bc37d 100644 --- a/pages/my/user_info.vue +++ b/pages/my/user_info.vue @@ -79,10 +79,12 @@