Browse Source

搜索驾校修改

master
unknown 3 weeks ago
parent
commit
08e851f340
  1. 4
      config/site.config.js
  2. 14
      manifest.json
  3. 2
      nativePlugins/md.md
  4. 2
      pages/indexEntry/enroll/enroll.vue
  5. 3
      pages/indexEntry/enroll/payment/payh5.vue
  6. 20
      pages/indexEntry/enroll/registInfo/comp/searchSchool.vue
  7. 20
      pages/mineEntry/myForecastName/myForecastName.vue
  8. 6
      pages/mineEntry/personaInfo/personaInfo.vue
  9. 4
      pages/tabbar/learnCar/comp/topInfo.vue
  10. 10
      pages/tabbar/mine/index.vue

4
config/site.config.js

@ -2,8 +2,8 @@ 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://192.168.1.43:8318/',//非代理地址
// WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://work.lyjppt.com:8099/',// http://192.168.1.43:8318/ http://123.6.232.54:8099/非代理地址
WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://192.168.1.35:8318',//非代理地址
// WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://work.lyjppt.com:8099/',// http://192.168.1.43:8318/ http://123.6.232.1:8099//非代理地址
website: 'http://192.168.1.37',
httpPrefix: 'app-api/',
imgUrl: 'https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/'

14
manifest.json

@ -2,8 +2,8 @@
"name" : "洛阳学车",
"appid" : "__UNI__3347C6E",
"description" : "",
"versionName" : "1.1.9",
"versionCode" : 119,
"versionName" : "1.2.1",
"versionCode" : 121,
"transformPx" : false,
/* 5+App */
"app-plus" : {
@ -82,8 +82,8 @@
"sdkConfigs" : {
"share" : {
"weixin" : {
"appid" : "wxdfeef42d2a053912",
"UniversalLinks" : "https://payconfig.jaxc.cn/"
"appid" : "wx6cf612192cd6927c",
"UniversalLinks" : "https://static-mp-87b9fa27-0273-48d3-a586-bd058cd2ce3d.next.bspapp.com/uni-universallinks/__UNI__3347C6E/"
}
},
"ad" : {},
@ -108,8 +108,8 @@
"payment" : {
"weixin" : {
"__platform__" : [ "ios", "android" ],
"appid" : "wxdfeef42d2a053912",
"UniversalLinks" : "https://payconfig.jaxc.cn/"
"appid" : "wx6cf612192cd6927c",
"UniversalLinks" : "https://static-mp-87b9fa27-0273-48d3-a586-bd058cd2ce3d.next.bspapp.com/uni-universallinks/__UNI__3347C6E/"
}
}
}
@ -190,7 +190,7 @@
"disableHostCheck" : true,
"proxy" : {
"/api" : {
"target" : "http://192.168.1.43:8318/",
"target" : "http://192.168.1.35:8318/",
// "target" : "http://192.168.1.36:48080/",
"changeOrigin" : true,
"secure" : true,

2
nativePlugins/md.md

@ -0,0 +1,2 @@
有一条理解,允许接纳的路,通向个体内在,只有内求才是无限的道路

2
pages/indexEntry/enroll/enroll.vue

@ -188,7 +188,7 @@
// this.$goPage('/pages/indexEntry/enroll/uploadAvatar/uploadAvatar')
},
async getInitFaceVerifyFn() {
const verifyPlugin = uni.requireNativePlugin('AP-FaceDetectModule');
const verifyPlugin = uni.requireNativePlugin('AP-FaceDetectModule');
var metaInfo = verifyPlugin.getMetaInfo()
let p = uni.getSystemInfoSync().platform;
if (p === "ios") {

3
pages/indexEntry/enroll/payment/payh5.vue

@ -39,12 +39,13 @@
console.log('监听到的发送事件')
console.log(item)
if(item.action=='lyxc-wxPay') {
this.$u.toast('用户点击了微信支付')
// this.$u.toast('')
this.iswxPay = true
this.wxPay(item)
}else if(item.action=='lyxc-paySuccess') {
this.$u.toast('支付成功')
this.iswxPay = false
this.$store.dispatch('getUserInfo')
setTimeout(()=>{
uni.switchTab({
url: '/pages/tabbar/learnCar/index'

20
pages/indexEntry/enroll/registInfo/comp/searchSchool.vue

@ -6,10 +6,10 @@
选择驾校
</view>
<view class="searchBox">
<u-search placeholder="请输入驾校名称" v-model.trim="keyword" @search="searchSchool" @custom="searchSchool">
<u-search placeholder="请输入驾校名称" v-model.trim="keyword" @search="searchSchool" @custom="searchSchool" @clear="searchSchool">
</u-search>
</view>
<scroll-view scroll-y="true" style="height: 700rpx" @scrolltolower="loadMore">
<scroll-view scroll-y="true" style="height: 700rpx" @scrolltolower="loadMoreFn">
<view class="ul">
<view class="li" v-for="(item,index) in listData" :key="index" @click="chooseSchool(item)">
<view class="name">
@ -42,7 +42,8 @@
pageSize: 20,
lat: 30.27419537786047,
lng: 120.20633397715788,
sercheType: '1'
sercheType: '1',
}
}
},
@ -52,7 +53,7 @@
this.params.lng = this.vuex_cityInfo.lng
}
this.schoolPageFn()
this.params.name = ''
},
methods: {
//
@ -67,6 +68,17 @@
this.total = res.total
if(this.listData.length>=this.total) this.status = 'nomore'
console.log(res)
},
searchSchool() {
this.params.pageNo = 1
this.params.name = this.keyword
this.listData = []
this.schoolPageFn()
},
loadMoreFn() {
if(this.listData.length<this.total) {
this.schoolPageFn()
}
}
}
}

20
pages/mineEntry/myForecastName/myForecastName.vue

@ -44,17 +44,21 @@
const {data: res} = await trainingApplyList({studentId: this.studentId})
this.list = res
},
async deleteFn(id) {
const res = await trainingApplyDelete({id})
if(res.code==0) {
this.$u.toast('删除成功')
}
this.trainingApplyListFn()
console.log(res)
deleteFn(id) {
uni.showModal({
content: '确定要删除吗?',
success: async () => {
const res = await trainingApplyDelete({id})
if(res.code==0) {
this.$u.toast('删除成功')
}
this.trainingApplyListFn()
console.log(res)
}
})
},
itemClickFn(item) {
console.log(item)
// return this.$goPage('/pages/indexEntry/enroll/payment/payment?trainingApplyId='+ item.trainingApplyId)
if(item.applyStep==3) {
this.$goPage('/pages/indexEntry/enroll/signContract/signContract?schoolId='+item.trainingSchoolId+'&trainingApplyId='+ item.trainingApplyId)
}else if(item.applyStep==4||item.applyStep==5) {

6
pages/mineEntry/personaInfo/personaInfo.vue

@ -54,14 +54,14 @@
</view>
</view>
<view class="card" v-if="vuex_userInfo.cardType==1">
<!-- <view class="card" v-if="vuex_userInfo.cardType==1">
<view class="row">
<view class="lab">拍照&体检&面签</view>
<view class="val">已完成</view>
</view>
</view>
</view> -->
<view class="logout" @click="deleteTestClick" style="margin-top: 40rpx;">删除测试账号开发用的</view>
<!-- <view class="logout" @click="deleteTestClick" style="margin-top: 40rpx;">删除测试账号开发用的</view> -->
</view>
<view class="footerBtn">

4
pages/tabbar/learnCar/comp/topInfo.vue

@ -2,8 +2,8 @@
<view class="topInfo card">
<view class="user_row">
<view class="avatar">
<!-- <image :src="vuex_userInfo.photoPath" mode="aspectFill" v-if="vuex_userInfo.photoPath"></image> -->
<image src="https://lyjp-bucket-main.oss-cn-beijing.aliyuncs.com/985114ca01ff35554333927a5d1d52883d3ad21301caac4b637df56169b2c916.png" mode="aspectFill" v-if="vuex_userInfo.photoPath"></image>
<image :src="vuex_userInfo.photoPath" mode="aspectFill" v-if="vuex_userInfo.photoPath"></image>
<!-- <image src="https://lyjp-bucket-main.oss-cn-beijing.aliyuncs.com/985114ca01ff35554333927a5d1d52883d3ad21301caac4b637df56169b2c916.png" mode="aspectFill" v-if="vuex_userInfo.photoPath"></image> -->
</view>
<view class="rightTxt">

10
pages/tabbar/mine/index.vue

@ -4,8 +4,8 @@
<!-- 用户信息 -->
<view class="userInfo">
<view class="avatar">
<!-- <image :src="vuex_userInfo.photoPath" mode="aspectFill" v-if="vuex_userInfo.photoPath" @click="show=true"></image> -->
<image src="https://lyjp-bucket-main.oss-cn-beijing.aliyuncs.com/985114ca01ff35554333927a5d1d52883d3ad21301caac4b637df56169b2c916.png" mode="aspectFill" v-if="vuex_userInfo.photoPath" ></image>
<image :src="vuex_userInfo.photoPath" mode="aspectFill" v-if="vuex_userInfo.photoPath" @click="show=true"></image>
<!-- <image src="https://lyjp-bucket-main.oss-cn-beijing.aliyuncs.com/985114ca01ff35554333927a5d1d52883d3ad21301caac4b637df56169b2c916.png" mode="aspectFill" v-if="vuex_userInfo.photoPath" ></image> -->
</view>
<view class="rightInfo" @click="topClick">
@ -94,9 +94,9 @@
if(item.name=='我的订单'&&this.vuex_userInfo.applyStep>2&&this.vuex_userInfo.applyStep<6) {
return this.$goPage('/pages/mineEntry/myForecastName/myForecastName')
}
// if(this.vuex_userInfo.applyStep!=6) {
// return this.$u.toast('')
// }
if(this.vuex_userInfo.applyStep!=6) {
return this.$u.toast('您还未报名驾校')
}
if(item.name=='同城转校') {
uni.showModal({
content: '请在原驾校退学后至新驾校报名!',

Loading…
Cancel
Save