From 6b0803fefaccbfd15aaa92992b2a14eb18cd329a Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Thu, 7 Nov 2024 18:56:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E4=B8=80=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 3 +
common/css/app.scss | 7 +-
components/searchRow/searchRow.vue | 2 +-
config/api.js | 58 +---
config/request.js | 4 +-
config/site.config.js | 4 +-
config/utils.js | 7 +-
manifest.json | 4 +-
pages.json | 23 +-
pages/indexEntry/enroll/registInfo/registInfo.vue | 2 +-
pages/indexEntry/findCoach/comp/coachItem.vue | 2 +-
pages/indexEntry/findShcool/findShcool.vue | 24 +-
.../findShcool/searchShcool/searchShcool.vue | 2 +-
.../findShcool/shcoolDetail/shcoolDetail.vue | 2 +-
.../signIn/signAndOut/signAndOutSubjiect1.vue | 373 +++++++++++++++++++++
pages/indexEntry/signIn/signIn.vue | 14 +-
pages/indexEntry/webView/webView.vue | 2 +-
pages/mineEntry/personaInfo/personaInfo.vue | 6 +-
pages/tabbar/index/comp/coachItem.vue | 4 +-
pages/tabbar/index/comp/schoolItem.vue | 18 +-
pages/tabbar/index/index.vue | 52 +--
pages/tabbar/mine/index.vue | 8 +-
pages/userCenter/login/login.vue | 12 +-
pages/userCenter/login/new_file.html | 204 +++++++++++
store/modules/user.js | 7 +-
25 files changed, 735 insertions(+), 109 deletions(-)
create mode 100644 pages/indexEntry/signIn/signAndOut/signAndOutSubjiect1.vue
create mode 100644 pages/userCenter/login/new_file.html
diff --git a/App.vue b/App.vue
index 32df8d2..b7afa91 100644
--- a/App.vue
+++ b/App.vue
@@ -23,6 +23,9 @@
@import '@/uni_modules/uview-ui/index.scss';
@import 'common/css/app.scss';
.pageBgImg {
+ font-size: 28rpx;;
+ color: #333;
+ min-height: 100vh;
background: url('./static/images/bigImg/topBg.png') #F6F7FA no-repeat;
background-size: 100% 278rpx;
}
diff --git a/common/css/app.scss b/common/css/app.scss
index 9ebf5ea..4b5f677 100644
--- a/common/css/app.scss
+++ b/common/css/app.scss
@@ -40,12 +40,11 @@ view {
min-height: 100vh;
}
.pageBgImg {
- font-size: 28rpx;;
- color: #333;
+ // font-size: 28rpx;;
+ // color: #333;
+ // min-height: 100vh;
// background: url('https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/complain/2024-03-18/1710759177684-0') #F6F7FA no-repeat;
// background-size: 100% 278rpx;
-
- min-height: 100vh;
}
.starBox {
diff --git a/components/searchRow/searchRow.vue b/components/searchRow/searchRow.vue
index 38e8eca..1db2458 100644
--- a/components/searchRow/searchRow.vue
+++ b/components/searchRow/searchRow.vue
@@ -7,7 +7,7 @@
{{ placeholder }}
-
+
diff --git a/config/api.js b/config/api.js
index a370c7c..f7d9be4 100644
--- a/config/api.js
+++ b/config/api.js
@@ -14,13 +14,7 @@ export const getUserInfo = (data) => http.post('member/user/get', {header: {'con
export const logOut = (data={}) => http.post('member/auth/logout', data, {custom: {catch: true, toast: false }})
// 驾校列表分页
export const schoolPage = (params) => http.get('business/school/page', {params: params})
-// 附近场地
-// export const getexamSite = (params) => http.get('business/school/getexamSite', {params: params})
-// 考场详情
-// export const getExamSiteDatil = (params) => http.get('business/school/getExamSiteDatil', {params: params})
-// 考场资讯
-// export const getExamSiteInfo = (params) => http.get('business/school/getExamSiteInfo', {params: params})
-// 创建驾校评价
+
export const addSchoolComment = (data={}) => http.post('business/appcomplain/addSchoolComment', data,)
// 创建教练评价
export const addCoachComment = (data={}) => http.post('business/appcomplain/addCoachComment', data,)
@@ -38,24 +32,6 @@ export const getSchoolDetail = (params) => http.get('business/school/getSchool',
export const schoolClass = (params) => http.get('business/school-class/page', {params: params})
// 教练列表分页
export const coachPage = (params) => http.get('business/coach/page', {params: params})
-// 公益视频
-// export const publicVideoPage = (params) => http.get('business/video/page', {params: params})
-// 公益视频 详情
-// export const publicGetvideo = (params) => http.get('business/video/getvideo', {params: params})
-// 公益视频点赞
-// export const createUpvote = (data) => http.post('business/contentdata/createUpvote', data)
-// 公益视频取消点赞 upvoteId
-// export const deleteUpvote = (data) => http.delete(`/business/contentdata/deleteUpvote?upvoteId=${data.upvoteId}&mobile=${data.mobile}`)
-// 公益视频收藏
-// export const createCollect = (data) => http.post('business/contentdata/createCollect', data)
-// 公益视频取消收藏 CollectId
-// export const deleteRetransmission = (data) => http.delete(`business/contentdata/deleteCollect?collectId=${data.CollectId}&mobile=${data.mobile}`)
-// 公益视频分享
-// export const createRetransmission = (data) => http.post('business/contentdata/createRetransmission', data)
-// 公益视频是否点赞收藏
-// export const getlikesCollection = (params) => http.get('business/users/getContent', {params: params})
-// 公益视频我的收藏
-// export const getcollectVideo = (params) => http.get('business/users/getcollectVideo', {params: params})
// 行业资讯，
export const getarticleList = (params) => http.get('business/video/article', {params: params})
// 行业政策
@@ -88,32 +64,12 @@ export const getpersonface = (params) => http.get('app/student-record/getpersonf
export const GetDetectInfoEnhanced = (params) => http.get('app/student-record/GetDetectInfoEnhanced', {params})
// 证件类型获取
export const getCardType = (params) => http.get('system/dict/cardType', {params})
-// // 获得合同信息
-// export const getContract = (params) => http.get('business/contract/get', {params})
-// // 创建合同信息
-// export const contractCreate = (data) => http.post('business/contract/create', data)
-// // 获取驾校的合同
-// export const getSchoolContract = (params) => http.get('business/contract/getSchoolContract', {params})
// 我的合同
export const selectContractPdfBase64 = (params) => http.get('business/contract/selectContractPdfBase64', {params})
// 获取合同链接
export const getSignContract = (data) => http.post('business/contract/signContract', data)
// 查询学员合同签署状态
export const getContractStatus = (params) => http.get('business/contract/getContractStatus', {params})
-// 1获得模拟预约点
-// export const simulationPoint = (params) => http.get('business/booking/simulation-point/page', {params})
-// 2获得模拟器排课
-// export const simulationClass = (params) => http.get('business/booking/simulation-class/get', {params})
-// 3获得模拟器
-// export const simulationDevices = (params) => http.get('business/booking/simulation-devices/list', {params})
-// 4创建模拟预约
-// export const simulationCreate = (data) => http.post('business/booking/simulation-record/create', data)
-// 5获得模拟预约记录
-// export const simulationPage = (params) => http.get('business/booking/simulation-record/page', {params})
-// 6获得模拟详情
-// export const simulationDetail = (params) => http.get('business/booking/simulation-record/get', {params})
-// 7取消模拟预约
-// export const cancelSimulationDevice = (params) => http.put('business/booking/simulation-record/cancelSimulation?id='+ params.id,)
// 1获得考场
export const examSitePage = (params) => http.get('business/exam-site/list', {params})
// 2获得车辆
@@ -204,14 +160,26 @@ export const vailStudentInfo = (data) => http.post('business/coach/sign/vailStud
export const signOutAuth = (data) => http.post('business/student/sign/outAuth', data)
// 签退
export const signOut = (data) => http.post('business/student/sign/out', data)
+// 学员扫码签到前置校验——理科
+export const vailStudentSignSubject1 = (data) => http.post('business/student/theorySign/before_in', data)
+// 学员扫码签退前置校验——理科
+export const vailStudentSignOutSubject1 = (data) => http.post('business/student/theorySign/before_out', data)
+// 学员扫码签到—理科
+export const theorySignSubject1 = (data) => http.post('business/student/theorySign/in', data)
+// 学员扫码签退 -- 签退不做人脸—理科
+export const theorySignOutSubject1 = (data) => http.post('business/student/theorySign/out', data)
// 支付
export const getStudentByPayment = (params={}) => http.get('app/student-record/getStudentByPayment', {params})
// 补签
export const reSignOut = (data) => http.post('business/student/sign/reSignOut', data)
// 学员扫码签到记录 -- 按月查询
export const monthSignRecord = (data) => http.post('business/student/sign/monthSignRecord', data)
+// 学员扫码签到记录 -- 按月查询-理科
+export const monthSignRecordSubjiect1 = (data) => http.post('business/student/theorySign/monthSignRecord', data)
// 学员扫码签到记录 -- 按天查询
export const signDetail = (data) => http.post('business/student/sign/signDetail', data)
+// 学员扫码签到记录 -- 按天查询-理科
+export const signDetailSubjiect1 = (data) => http.post('business/student/theorySign/signDetail', data)
// 学时确认
export const periodConfirm = (data) => http.post('app/student-process/periodConfirm', data)
// 获得学员动态
diff --git a/config/request.js b/config/request.js
index cce8b88..e242b80 100644
--- a/config/request.js
+++ b/config/request.js
@@ -51,8 +51,8 @@ module.exports = (vm) => {
// 响应拦截
uni.$u.http.interceptors.response.use(async (response) => { /* 对响应成功做点什么 可使用async await 做异步操作*/
const data = response.data
- // console.log('请求结果')
- // console.log(data)
+ console.log('请求结果')
+ console.log(data)
if(data.code==406&&response.config.url!='member/auth/refresh-token'&&response.config.url!=='member/auth/logout') {
await refreshToken()
let obj = response.config
diff --git a/config/site.config.js b/config/site.config.js
index c988e84..39ae6b4 100644
--- a/config/site.config.js
+++ b/config/site.config.js
@@ -2,14 +2,14 @@ const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM;
// localIp = false
module.exports = {
H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理
- WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://www.lyjppt.com/',//非代理地址 不要忘记加/
+ WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://192.168.1.106:8318/',//非代理地址 不要忘记加/
website: 'http://192.168.1.37',
httpPrefix: 'app-api/',
imgUrl: 'https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/',
// 支付测试地址
// preUrl: 'https://u8wbs.zyebank.cn/cem_ysb_u6/index.html',
// preUrl: 'https://u8wbs.zyebank.cn/cem_ysb_u8/index.html',
- // 生产地址
+ // 支付生产地址
preUrl: 'https://zmcht.zybank.com.cn/cem_ysb/index.html',
};
diff --git a/config/utils.js b/config/utils.js
index c26fe56..e285081 100644
--- a/config/utils.js
+++ b/config/utils.js
@@ -201,10 +201,15 @@ export function uploadImgApi(filePath, imgName, imgLink='image') {
_this.$store.commit('updateSchool', item)
}
_this.$u.utils.clickSignUp()
- }else {
+ }else if(obj.QrType==2||obj.QrType==3){
// 签到的
_this.$store.commit('upDateSchoolCoach', item)
_this.$goPage('/pages/indexEntry/signIn/signAndOut/signAndOut')
+ }else if(obj.QrType==4||obj.QrType==5){
+ // 签到的
+ console.log('没来这里？')
+ _this.$store.commit('upDateSchoolCoach', item)
+ _this.$goPage('/pages/indexEntry/signIn/signAndOut/signAndOutSubjiect1')
}
}else {
_this.$store.commit('updateWebVeiwUrl', res.result)
diff --git a/manifest.json b/manifest.json
index 917a64f..58b3f00 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "洛阳学车",
"appid" : "__UNI__3347C6E",
"description" : "",
- "versionName" : "1.4.4",
- "versionCode" : 144,
+ "versionName" : "1.4.5",
+ "versionCode" : 145,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index 0594a02..9a09d99 100644
--- a/pages.json
+++ b/pages.json
@@ -5,8 +5,7 @@
"style": {
"navigationBarTitleText": "首页",
"navigationStyle": "custom",
- "enablePullDownRefresh": true,
- "backgroundTextStyle": "dark"
+ "enablePullDownRefresh": true
}
},
{
@@ -14,8 +13,7 @@
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom",
- "enablePullDownRefresh": true,
- "backgroundTextStyle": "dark"
+ "enablePullDownRefresh": true
}
},
{
@@ -23,8 +21,7 @@
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom",
- "enablePullDownRefresh": true,
- "backgroundTextStyle": "dark"
+ "enablePullDownRefresh": true
}
}
@@ -44,9 +41,18 @@
}
},
{
+ "path": "signIn/signAndOut/signAndOutSubjiect1",
+ "style": {
+ "navigationBarTitleText": "理论签到/签退确认",
+ "enablePullDownRefresh": false,
+ "backgroundTextStyle": "dark"
+ }
+ },
+
+ {
"path": "signIn/signAndOut/signAndOut",
"style": {
- "navigationBarTitleText": "签到/签退确认",
+ "navigationBarTitleText": "实操签到/签退确认",
"enablePullDownRefresh": false,
"backgroundTextStyle": "dark"
}
@@ -560,7 +566,8 @@
"navigationBarTextStyle": "black",
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#F6F7FA",
- "backgroundColor": "#F6F7FA"
+ "backgroundColor": "#F6F7FA",
+ "lazyload": true
},
"uniIdRouter": {},
"tabBar": {
diff --git a/pages/indexEntry/enroll/registInfo/registInfo.vue b/pages/indexEntry/enroll/registInfo/registInfo.vue
index dda7507..c636f9b 100644
--- a/pages/indexEntry/enroll/registInfo/registInfo.vue
+++ b/pages/indexEntry/enroll/registInfo/registInfo.vue
@@ -614,7 +614,7 @@
},
async comfigClick(val) {
- console.log(val)
+ console.log(this.form)
this.showPopup = false
if(!val) return false
let obj = Object.assign({},this.form)
diff --git a/pages/indexEntry/findCoach/comp/coachItem.vue b/pages/indexEntry/findCoach/comp/coachItem.vue
index f794527..5c9dbc9 100644
--- a/pages/indexEntry/findCoach/comp/coachItem.vue
+++ b/pages/indexEntry/findCoach/comp/coachItem.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/pages/indexEntry/findShcool/findShcool.vue b/pages/indexEntry/findShcool/findShcool.vue
index 6663f53..981e520 100644
--- a/pages/indexEntry/findShcool/findShcool.vue
+++ b/pages/indexEntry/findShcool/findShcool.vue
@@ -4,7 +4,7 @@
-
+
@@ -18,7 +18,7 @@
-
+
@@ -118,6 +118,9 @@
},
// 获取驾校列表
async schoolPageFn() {
+ uni.showLoading({
+ title: '正在加载...'
+ })
let obj = {}
for(let key in this.params) {
if(this.params[key]) {
@@ -126,10 +129,27 @@
}
const {data: res} = await schoolPage(obj)
this.params.pageNo ++
+ // let arr = res.list.map(item=>{
+ // if(!item.schoolIntroduceDO) item.schoolIntroduceDO = {}
+ // let obj = {
+ // iconPath: item.schoolIntroduceDO.iconPath,
+ // name: item.name,
+ // stars: item.stars,
+ // reviewTotal: item.reviewTotal,
+ // phone: item.phone,
+ // id: item.id,
+ // distance: item.distance,
+ // districtName: item.districtName
+ // }
+ // return obj
+ // })
this.listData.push(...res.list)
this.total = res.total
if(this.listData.length>=this.total) this.status = 'nomore'
console.log(res)
+ this.$nextTick(()=>{
+ uni.hideLoading()
+ })
}
}
}
diff --git a/pages/indexEntry/findShcool/searchShcool/searchShcool.vue b/pages/indexEntry/findShcool/searchShcool/searchShcool.vue
index 84d1dda..b7e112d 100644
--- a/pages/indexEntry/findShcool/searchShcool/searchShcool.vue
+++ b/pages/indexEntry/findShcool/searchShcool/searchShcool.vue
@@ -4,7 +4,7 @@
-
+
diff --git a/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
index c44d6c2..d5141d5 100644
--- a/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
+++ b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
@@ -121,12 +121,12 @@
title: '正在加载……'
})
const {data: res} = await getSchoolDetail(Object.assign(this.params,{id: this.schoolId}))
- uni.hideLoading()
this.schoolDetail = res
this.swiperList = res.schoolIntroduceDO&&res.schoolIntroduceDO.headImages&&res.schoolIntroduceDO.headImages.split(',')
if(!this.swiperList||!this.swiperList.length) {
this.swiperList = [jlcBg]
}
+ this.$nextTick(()=>{uni.hideLoading()})
console.log('this.swiperList')
console.log(this.swiperList)
},
diff --git a/pages/indexEntry/signIn/signAndOut/signAndOutSubjiect1.vue b/pages/indexEntry/signIn/signAndOut/signAndOutSubjiect1.vue
new file mode 100644
index 0000000..3bf689f
--- /dev/null
+++ b/pages/indexEntry/signIn/signAndOut/signAndOutSubjiect1.vue
@@ -0,0 +1,373 @@
+
+
+
+
+
+
+
+
+ 步骤
+
+
+
+
+
+ 状态
+
+
+
+
+
+
+ 1
+
+
+
+ 信息认证
+ 失败原因：{{stepFailureReason}}
+
+ {{step1?'通过': '不通过'}}
+
+
+
+
+ 2
+
+
+
+ 人脸识别
+
+
+ 通过
+
+
+
+
+ 3
+
+
+ 信息同步
+
+
+ 通过
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/indexEntry/signIn/signIn.vue b/pages/indexEntry/signIn/signIn.vue
index 156c259..b7e505b 100644
--- a/pages/indexEntry/signIn/signIn.vue
+++ b/pages/indexEntry/signIn/signIn.vue
@@ -17,7 +17,7 @@
@@ -53,7 +60,6 @@
background: #FFFFFF;
border-radius: 16rpx;
padding: 20rpx 0rpx;
- position: relative;
display: flex;
border-bottom: 1px solid #F4F4F4;
}
@@ -64,8 +70,8 @@
border-radius: 20rpx;
overflow: hidden;
flex-shrink: 0;
- background: url('../../../../static/images/bigImg/jlcbg.png') no-repeat;
- background-size: cover;
+ // background: url('../../../../static/images/bigImg/jlcbg.png') no-repeat;
+ // background-size: cover;
}
.textCon {
diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue
index 5d20de2..bcd44c5 100644
--- a/pages/tabbar/index/index.vue
+++ b/pages/tabbar/index/index.vue
@@ -4,13 +4,14 @@
- {{ vuex_cityInfo.city }}
-
-
+
+
- -->
+
@@ -55,12 +56,12 @@
-
+
风采驾校
-
+
@@ -192,7 +193,7 @@
}
},
async onLoad() {
-
+ this.initApi()
},
onPullDownRefresh() {
@@ -225,7 +226,9 @@
this.getBannerListFn()
// this.getarticleListFn()
}
- this.initApi()
+ if(this.vuex_cityInfo.lat != this.lat) {
+ this.recommendSchoolList()
+ }
},
computed: {
@@ -233,6 +236,9 @@
methods: {
async getLatLngFn() {
+ uni.showLoading({
+ title: '正在更新位置...'
+ })
await this.$store.dispatch('getCity')
this.recommendSchoolList()
},
@@ -244,10 +250,14 @@
this.$store.commit('updateWebVeiwUrl', link)
this.$goPage('/pages/indexEntry/webView/webView')
},
- initApi() {
- this.getarticleListFn()
- this.getRecommendList()
- this.recommendSchoolList()
+ async initApi() {
+ uni.showLoading({
+ title: '正在加载...'
+ })
+ await this.getarticleListFn()
+ await this.getRecommendList()
+ await this.recommendSchoolList()
+ this.$nextTick(()=>{uni.hideLoading()})
},
goCoachDetail(item) {
let objStr = encodeURIComponent(JSON.stringify(item))
@@ -257,22 +267,26 @@
async getRecommendList() {
const {data: res} = await getRecommendList({pageNo:1,pageSize: 20, })
this.coachList = res
- console.log(res)
+ // console.log(res)
},
// 推荐驾校
async recommendSchoolList() {
// if(!this.vuex_cityInfo.lat) {
// await this.$store.dispatch('getCity')
// }
- const {data: res} = await recommendSchoolList({pageNo:1,pageSize: 3, lat: this.vuex_cityInfo.lat||'34.682945', lng: this.vuex_cityInfo.lng||'112.477298'})
- this.recommendSchool = res
- console.log(res)
+ this.lat = this.vuex_cityInfo.lat
+ const {data: res} = await recommendSchoolList({pageNo:1,pageSize: 20, lat: this.vuex_cityInfo.lat||'34.682945', lng: this.vuex_cityInfo.lng||'112.477298'})
+ res[8].schoolIntroduceDO.iconPath = ''
+ res[9].schoolIntroduceDO.iconPath = ''
+ this.recommendSchool = Object.freeze(res)
+ // this.recommendSchool = res
+ // console.log(res)
},
async getBannerListFn() {
const {data: res} = await getBannerList()
this.swiperInfo = res.list
- console.log(this.swiperInfo)
+ // console.log(this.swiperInfo)
},
async entrySectionClick(item) {
if(item.text=='学车报名') {
diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue
index e9b8fef..7214a75 100644
--- a/pages/tabbar/mine/index.vue
+++ b/pages/tabbar/mine/index.vue
@@ -45,7 +45,7 @@
-
+
@@ -58,6 +58,7 @@
+
+
\ No newline at end of file
diff --git a/store/modules/user.js b/store/modules/user.js
index 8953d2b..0d55aee 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -135,6 +135,7 @@ export default user
// h5高德地图
function gaoDeFn(longitude,latitude,commit,resolve, reject,) {
+
uni.request({
method: 'GET',
url: 'https://restapi.amap.com/v3/geocode/regeo?parameters',
@@ -172,6 +173,7 @@ function getCityInfo(resolve, reject, commit) {
// import { requestSingleFreshLocation } from '@/common/js/qqLatLng.js'
let qqLatLng = require('@/common/js/qqLatLng.js')
try{
+
qqLatLng.requestSingleFreshLocation().then(res=>{
let result = res.location
if(result.latitude===0) {
@@ -184,13 +186,14 @@ function getCityInfo(resolve, reject, commit) {
console.log('只为弹出权限当前位置的经度：' + res.longitude);
// console.log('当前位置的纬度：' + res);
getCityInfo(resolve, reject, commit)
-
+ uni.hideLoading()
},
fail() {
uni.showToast({
title: '您的定位权限已关闭，请手动开启定位权限',
icon: 'none'
})
+ uni.hideLoading()
}
})
}else {
@@ -206,11 +209,13 @@ function getCityInfo(resolve, reject, commit) {
}
commit('update_vuex_cityInfo', obj)
resolve(obj)
+ uni.hideLoading()
}
})
}catch(e){
console.log('来到这是里了吗？腾讯云经纬度了')
+ uni.hideLoading()
uni.getLocation({
// type: 'wgs84',
type: 'gcj02',