fangwenqiao
/
luoyang-uniapp-app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

搜索驾校修改

master
unknown 6 months ago
parent
a8cb9e4023
commit
08e851f340
10 changed files with 52 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      config/site.config.js
  2. 14
      manifest.json
  3. 2
      nativePlugins/md.md
  4. 3
      pages/indexEntry/enroll/payment/payh5.vue
  5. 20
      pages/indexEntry/enroll/registInfo/comp/searchSchool.vue
  6. 8
      pages/mineEntry/myForecastName/myForecastName.vue
  7. 6
      pages/mineEntry/personaInfo/personaInfo.vue
  8. 4
      pages/tabbar/learnCar/comp/topInfo.vue
  9. 10
      pages/tabbar/mine/index.vue

4
config/site.config.js
View File

@ -2,8 +2,8 @@ const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM;
// localIp = false // localIp = false
module.exports = { module.exports = {
H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理 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', website: 'http://192.168.1.37',
httpPrefix: 'app-api/', httpPrefix: 'app-api/',
imgUrl: 'https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/' imgUrl: 'https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/'

14
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "洛阳学车", "name" : "洛阳学车",
"appid" : "__UNI__3347C6E", "appid" : "__UNI__3347C6E",
"description" : "", "description" : "",
"versionName" : "1.1.9",
"versionCode" : 119,
"versionName" : "1.2.1",
"versionCode" : 121,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {
@ -82,8 +82,8 @@
"sdkConfigs" : { "sdkConfigs" : {
"share" : { "share" : {
"weixin" : { "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" : {}, "ad" : {},
@ -108,8 +108,8 @@
"payment" : { "payment" : {
"weixin" : { "weixin" : {
"__platform__" : [ "ios", "android" ], "__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, "disableHostCheck" : true,
"proxy" : { "proxy" : {
"/api" : { "/api" : {
"target" : "http://192.168.1.43:8318/",
"target" : "http://192.168.1.35:8318/",
// "target" : "http://192.168.1.36:48080/", // "target" : "http://192.168.1.36:48080/",
"changeOrigin" : true, "changeOrigin" : true,
"secure" : true, "secure" : true,

2
nativePlugins/md.md
View File

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

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

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

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

@ -6,10 +6,10 @@
选择驾校 选择驾校
</view> </view>
<view class="searchBox"> <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> </u-search>
</view> </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="ul">
<view class="li" v-for="(item,index) in listData" :key="index" @click="chooseSchool(item)"> <view class="li" v-for="(item,index) in listData" :key="index" @click="chooseSchool(item)">
<view class="name"> <view class="name">
@ -42,7 +42,8 @@
pageSize: 20, pageSize: 20,
lat: 30.27419537786047, lat: 30.27419537786047,
lng: 120.20633397715788, lng: 120.20633397715788,
sercheType: '1'
sercheType: '1',
} }
} }
}, },
@ -52,7 +53,7 @@
this.params.lng = this.vuex_cityInfo.lng this.params.lng = this.vuex_cityInfo.lng
} }
this.schoolPageFn() this.schoolPageFn()
this.params.name = ''
}, },
methods: { methods: {
// 选择驾校 // 选择驾校
@ -67,6 +68,17 @@
this.total = res.total this.total = res.total
if(this.listData.length>=this.total) this.status = 'nomore' if(this.listData.length>=this.total) this.status = 'nomore'
console.log(res) 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()
}
} }
} }
} }

8
pages/mineEntry/myForecastName/myForecastName.vue
View File

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

6
pages/mineEntry/personaInfo/personaInfo.vue
View File

@ -54,14 +54,14 @@
</view> </view>
</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="row">
<view class="lab">拍照&体检&面签</view> <view class="lab">拍照&体检&面签</view>
<view class="val">已完成</view> <view class="val">已完成</view>
</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>
<view class="footerBtn"> <view class="footerBtn">

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

@ -2,8 +2,8 @@
<view class="topInfo card"> <view class="topInfo card">
<view class="user_row"> <view class="user_row">
<view class="avatar"> <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>
<view class="rightTxt"> <view class="rightTxt">

10
pages/tabbar/mine/index.vue
View File

@ -4,8 +4,8 @@
<!-- 用户信息 --> <!-- 用户信息 -->
<view class="userInfo"> <view class="userInfo">
<view class="avatar"> <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>
<view class="rightInfo" @click="topClick"> <view class="rightInfo" @click="topClick">
@ -94,9 +94,9 @@
if(item.name=='我的订单'&&this.vuex_userInfo.applyStep>2&&this.vuex_userInfo.applyStep<6) { if(item.name=='我的订单'&&this.vuex_userInfo.applyStep>2&&this.vuex_userInfo.applyStep<6) {
return this.$goPage('/pages/mineEntry/myForecastName/myForecastName') 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=='同城转校') { if(item.name=='同城转校') {
uni.showModal({ uni.showModal({
content: '请在原驾校退学后至新驾校报名!', content: '请在原驾校退学后至新驾校报名!',

Write Preview
Loading…
Cancel
Save