diff --git a/api/index.js b/api/index.js index d51fa29..3868b87 100644 --- a/api/index.js +++ b/api/index.js @@ -67,5 +67,29 @@ class indexApi { async queryRegionByParentCode(data) { return await Ajax1('/util/manage/queryRegionByParentCode.do?regionCode=330100', data,'post'); } + // 提交表单 + async createTrainingApplyDetails(data) { + return await Ajax1('/apply/manage/createTrainingApplyDetails.do', data,'post'); + } + // 获取签约链接 + async signContract(data) { + return await Ajax1('/apply/manage/signContract.do', data,'post'); + } + // 查询订单详情-1 + async getOrderDetails(data) { + return await Ajax1('/order/manage/getOrderDetails.do', data,'post'); + } + // 创建订单 + async createOrder(data) { + return await Ajax1('/order/manage/createOrder.do', data,'post'); + } + // 创建变更车型银行预支付订单-4 + async createChangeModelPrepaid(data) { + return await http('/order/manage/createChangeModelPrepaid.do', data,'post'); + } + // 创建银行预支付订单 + async createPrepaid(data) { + return await Ajax1('/order/manage/createPrepaid.do', data,'post'); + } } export default new indexApi(); \ No newline at end of file diff --git a/common/js/utils.js b/common/js/utils.js index 1428209..12f3d01 100644 --- a/common/js/utils.js +++ b/common/js/utils.js @@ -3,55 +3,31 @@ import learnDriveApi from '@/api/learnDrive.js'; // 引入 import store from '@/store'; const install = (Vue, vm) => { - const callPhone = (phone)=> { - phone = phone.trim() - if(!phone) { - uni.showToast({ - title: '暂无联系方式', - icon: 'none' - }); - return - } - uni.showModal({ - content: '确定要拨打：'+phone+'？' , - success: function (res) { - if (res.confirm) { - uni.makePhoneCall({ - phoneNumber: phone //仅为示例 - }); - } else if (res.cancel) { - console.log('用户点击取消'); - } - } - }); - } - - - + // 打开地图 - const openMap = (lat,lng)=>{ + const openMap = (lat, lng) => { uni.openLocation({ latitude: lat, longitude: lng }) } - + // 距离换算 - const distanceFn = (val)=> { - if(val*1<1000) { + const distanceFn = (val) => { + if (val * 1 < 1000) { return val + '米' - }else { + } else { return (val / 1000).toFixed(2) + '公里' } } // 价格计算 - const priceTo = (price = 0)=> { + const priceTo = (price = 0) => { // return (price / 100).toFixed(2) - return ( parseInt( price * 100 ) / 100 / 100 ).toFixed(2) - + return (parseInt(price * 100) / 100 / 100).toFixed(2) + } - - const distanceLatLng = (lat1, lng1)=> { + + const distanceLatLng = (lat1, lng1) => { var that = this; let lat2 = store.state.latLng.lat; let lng2 = store.state.latLng.lng; @@ -68,29 +44,29 @@ const install = (Vue, vm) => { s = s.toString(); s = s.substring(0, s.indexOf('.') + 2); return s - - } - - const getLocation = ()=> { - return new Promise((resolve,reject)=>{ + + } + + const getLocation = () => { + return new Promise((resolve, reject) => { uni.getLocation({ type: 'wgs84', - success: function (res) { + success: function(res) { console.log('当前位置的经度：' + res.longitude); console.log('当前位置的纬度：' + res.latitude); let obj = { lat: res.latitude, lng: res.longitude } - store.commit('updateLatLng',obj) + store.commit('updateLatLng', obj) resolve(obj) } }); }).catch((e) => {}) } - + // 查询用户信息 - let getOwnerAccountBase = async ()=> { + let getOwnerAccountBase = async () => { const [err, data] = await loginApi.getOwnerAccountBase(); if (data.code != 0) { uni.removeStorageSync('Authorization') @@ -100,46 +76,50 @@ const install = (Vue, vm) => { uni.setStorageSync('userInfo', data.data); return data.data; } - + // 查看是否有未支付订单 - let checkOrderPay = async ()=>{ + let checkOrderPay = async () => { // 这一步判断是否有实名,避免接口报错 let userInfo = await getOwnerAccountBase() - + uni.setStorageSync('userInfo', userInfo); - if(!userInfo||!userInfo.idcard) return false - + if (!userInfo || !userInfo.idcard) return false + // 1查询报名驾校 const [nulls, res] = await learnDriveApi.queryTrainingApplyByOwner() - if(!res.data) return false - let trainingApplyId = res.data[0].trainingApplyId - let transfer = res.data[0].transfer - if(!trainingApplyId) { + if (!res.data) return false + let trainingApplyId = res.data[0].trainingApplyId + let transfer = res.data[0].transfer + if (!trainingApplyId) { return {} } - - - + + + // 2查询订单id - let [err, res2] = await learnDriveApi.getTrainingApplyDetails({trainingApplyId: trainingApplyId}) + let [err, res2] = await learnDriveApi.getTrainingApplyDetails({ + trainingApplyId: trainingApplyId + }) let detail = res2.data - if(!detail.trainingOrderId) { + if (!detail.trainingOrderId) { return {} } - + // 查询订单详情 - let [err3, res3] = await learnDriveApi.getOwnerStudentStatus({trainingOrderId: detail.trainingOrderId}) - + let [err3, res3] = await learnDriveApi.getOwnerStudentStatus({ + trainingOrderId: detail.trainingOrderId + }) + console.log('详情') console.log(res3.data) res3.data.trainingOrderId = detail.trainingOrderId - + // 有同城转样没有完成 用这个？transferStatus 还是用transfer - if(res3.haveTransfer==2) { + if (res3.haveTransfer == 2) { uni.showModal({ content: '您有转校入学申请等完成', confirmText: '去完成', - success: function (res) { + success: function(res) { if (res.confirm) { uni.navigateTo({ url: '/pages/user/businessHandling/transferAppliRecord/transferAppliRecord' @@ -149,43 +129,81 @@ const install = (Vue, vm) => { }); } return res3.data - + } - + function addZeroPrefix(number) { - return number < 10 ? `0${number}`:number + return number < 10 ? `0${number}` : number } - - let getDate = (date, splitor = '-')=> { - const year = date.getFullYear() - const month = date.getMonth() + 1 - const day = date.getDate() - return `${year}${splitor}${addZeroPrefix(month)}${splitor}${addZeroPrefix(day)}` + + let getDate = (date, splitor = '-') => { + const year = date.getFullYear() + const month = date.getMonth() + 1 + const day = date.getDate() + return `${year}${splitor}${addZeroPrefix(month)}${splitor}${addZeroPrefix(day)}` } - - var lastTime = 0 - var audioContext = uni.createInnerAudioContext() // 播放音频的 - - let shakeFn = (res)=>{ - if(!store.state.havePay) return false - let nowTimer = new Date().getTime() - if (nowTimer - lastTime < 1000) return - lastTime = nowTimer - // 自己根据自己的力度调节 变量大小 满足自己设定的值后触发自己的逻辑 - if ((Math.abs(res.x) > 20 || Math.abs(res.y) > 20 || Math.abs(res.z) > 20) ) { - console.log('yayaoyaoya6666666666666666') - // 进入判断后 相当于摇一摇成功 - audioContext.src = 'https://lg-fe2b58o2-1255788064.cos.ap-shanghai.myqcloud.com/shark.mp3' // 播放音频 - audioContext.play() // 播放 - uni.navigateTo({ - url: '/pages/user/studentIdImg/studentIdImg' - }) + + const browser = { + versions: function() { + const u = navigator.userAgent; + return { + ios: !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/), //ios终端 + android: u.indexOf('Android') > -1 || u.indexOf('Linux') > -1, //android终端或者uc浏览器 + } + }() + }; + + + + //调⽤APP交互 + //apiName：⽅法名称 + //parameter：参数 + function appPostMessage(apiName, parameter) { + // console.log(browser.versions) + if (browser.versions.ios) { //判读iOS或安卓 + try { + //参数类型可以为对象类型 + var par = { + "type": apiName, + "callBack": { + //回调函数⾃定义参数 + "callBackName": 'arouseNativeMsg', + }, + "postParameter": parameter + }; + //iOS调⽤格式 + window.webkit.messageHandlers.requestApp.postMessage(par); + return "ios" + } catch (err) { + // on catch + } + } else if (browser.versions.android) { + try { + //par参数格式为json字符串 + var par = { + "type": apiName, + "callBack": { + // + "callBackName": "arouseNativeMsg", //固定参数arouseNativeMsg + "callBackParms": parameter + } + }; + //转jsonString + var parString = JSON.stringify(par); + //Android调⽤格式window.forJs.requestApp(par); + window.forJs.requestApp(parString); + return "android" + } catch (err) { + // on catch + } + } else { + alert("不是安卓或者IOS") } } - - vm.$u.utils={ - callPhone, + + + vm.$u.utils = { openMap, getLocation, getOwnerAccountBase, @@ -194,8 +212,7 @@ const install = (Vue, vm) => { distanceLatLng, distanceFn, getDate, - shakeFn - + appPostMessage } } diff --git a/pages.json b/pages.json index ed19f95..407939f 100644 --- a/pages.json +++ b/pages.json @@ -103,15 +103,18 @@ "navigationBarBackgroundColor": "#FFFFFF", "navigationBarTextStyle": "black" //状态栏字体颜色 } + }, + { + "path": "pages/application/webView", + "style": { + "navigationBarTitleText": "报名成功", + "enablePullDownRefresh": false, + "bounce": "none", + "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarTextStyle": "black" //状态栏字体颜色 + } } - - - - - - - ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/application/entry.vue b/pages/application/entry.vue index 34dd437..f633513 100644 --- a/pages/application/entry.vue +++ b/pages/application/entry.vue @@ -9,7 +9,7 @@ 请选择 以下两种报名方式，均享受会员价 - + @@ -22,7 +22,7 @@ - + @@ -40,16 +40,37 @@ diff --git a/pages/application/fillRegistInfo.vue b/pages/application/fillRegistInfo.vue index 620c523..d1513e0 100644 --- a/pages/application/fillRegistInfo.vue +++ b/pages/application/fillRegistInfo.vue @@ -48,8 +48,8 @@ - - + + 学员信息 请准确填写学员真实信息 - + - + + - + - - - + + + 中国 - + 身份证 - + - + + - - + + + - - + + + @@ -124,19 +132,21 @@ 总额： - ￥266.00 + ￥{{ $u.utils.priceTo(newPrice)}} - 300.00 + {{$u.utils.priceTo(totalPrice)}} - 享9.5折，已减271元！ + 享9.5折，已减{{$u.utils.priceTo(totalPrice - newPrice)}}元！ - 下一步 + 下一步 - + + + @@ -180,11 +190,27 @@ showOldDriveModel: false, form: { classModel: '', + businessType: 0,//业务类型 + firstLicenceTime: '',//原驾驶证初领日期 + avatar: '',//上传头像 + certificateType: 1,//证件类型 + trainingClassId: '',//班型 + realName: '', + certificateCode: '', + sex: '', + nationality: '中国', + oldDriveModel: '',//原驾驶证车型 + + address: '', + adaptability: 0, + + businessTypeName: '', + sexName: '', trainingClassLable: '', - businessType: 0, - firstLicenceTime: '', - avatar: [],//上传头像 + idcardA: '', + idcardB: '' }, + showSex: false, info: {}, selectorTrainingClasss: [],//班型数据 selectorDriveModels: [],//车型数据 @@ -192,6 +218,10 @@ {name: '初领', id: 0}, {name: '增领', id: 1} ], + sexArr: [ + {id: 1, lab: '男'}, + {id: 2, lab: '女'}, + ], carTypeArr: [ {lab: '小车',arr: ['C1','C2','C3']}, {lab: '货车',arr: ['A2','B2',]}, @@ -205,15 +235,88 @@ month: true, day: true, }, + trainingApplyId: '', + totalPrice: '', + newPrice: 0 } }, - onLoad() { + onLoad(options) { + this.trainingApplyId = options.trainingApplyId // totalPrice trainingClassId - this.createTrainingApplySimpleFn() this.form.classModel = this.classChooseItem.className + this.totalPrice = this.classChooseItem.totalPrice + this.newPrice = this.totalPrice * 0.95 + this.form.trainingClassId = this.classChooseItem.trainingClassId this.form.trainingClassLable = this.classChooseItem.classModel + + this.InitFn() + }, methods: { + async InitFn() { + await this.getTrainingApplyDetailsFn() + this.queryTrainingClasssFn() + this.queryDriveModelsFn() + }, + // 确认提交表单还是继续修改 + async oneBtnConfirm() { + this.form.trainingSchoolId = this.info.trainingSchoolId + this.form.trainingApplyId = this.trainingApplyId + let obj = {} + for(let key in this.form) { + if(this.form[key]!=='') { + obj[key] = this.form[key] + } + } + if(this.form.businessType) { + // 如果是增驾——原驾驶证号==身份证 + obj.driveLicence = obj.certificateCode + } + delete obj.businessTypeName + delete obj.sexName + delete obj.trainingClassLable + + console.log(obj) + const [nulls, res] = await indexApi.createTrainingApplyDetails(obj) + setTimeout(()=>{ + uni.navigateTo({ + url: '/pages/application/payment' + }) + },2000) + this.$store.commit('upDateCoachItem', {}) + console.log('表单已提交') + console.log(res) + if(res.code==0) { + this.signContractFn() + } + }, + // 获取签约链接 + async signContractFn() { + uni.showLoading({ + title: '请稍后', + mask: true + }) + const [nulls, res] = await indexApi.signContract({trainingApplyId: this.trainingApplyId}) + console.log('获取签约链接') + console.log(res) + if(res.code!=0) return this.$u.toast(res.message) + // this.showWebView = true + // this.webVeiwUrl = res.data.url + // console.log(this.webVeiwUrl) + uni.hideLoading() + this.$store.commit('updateWebVeiwUrl',res.data.url) + this.showSignConfirmPopup = false + uni.navigateTo({ + url: 'pages/application/webView?id='+ this.trainingApplyId + }) + }, + // 选择性别 + confirmSex(i) { + let index = i[0] + let item = this.sexArr[index] + this.form.sex = item.id + this.form.sexName = item.lab + }, // 选择原驾驶证学驾车型 pickerCarClick(item) { let index = this.pickerCarArr.indexOf(item) @@ -298,18 +401,7 @@ } } }, - // 第一步先报名 - async createTrainingApplySimpleFn() { - let trainingSchoolId = this.$store.state.currentSchool.trainingSchoolId - let trainingClassId = this.$store.state.classChooseItem.trainingClassId - const [nulls, res] = await indexApi.createTrainingApplySimple({trainingSchoolId, trainingClassId}) - if(res.code==0) { - this.trainingOrderId = res.data - }else if(res.code==502) { - // 已经报名过这个学校了 存在未支付订单 - this.$u.toast(res.message) - } - }, + //选择图片 chooseImages(type) { uni.chooseImage({ @@ -322,11 +414,11 @@ title: '图片上传中...' }); - this.uploadImgApi(res.tempFilePaths[0]) + this.uploadImgApi(res.tempFilePaths[0],type) } }) }, - uploadImgApi(filePath) { + uploadImgApi(filePath,type) { console.log(filePath) let _this = this // 上传图片到服务器 @@ -348,7 +440,7 @@ let res2 = JSON.parse(res.data) console.log(res2) if(res2.code==0) { - _this.form.avatar = res2.data + _this.form[type] = res2.data } uni.hideLoading(); }, diff --git a/pages/application/payment.vue b/pages/application/payment.vue index 81348fd..e0aca6b 100644 --- a/pages/application/payment.vue +++ b/pages/application/payment.vue @@ -1,363 +1,457 @@ - - - - - diff --git a/pages/application/registrationPhone.vue b/pages/application/registrationPhone.vue index e0f4411..6041c1b 100644 --- a/pages/application/registrationPhone.vue +++ b/pages/application/registrationPhone.vue @@ -102,7 +102,7 @@ uni.setStorageSync('Authorization', data.data.token); uni.setStorageSync('studentId', data.data.studentId); await this.getOwnerAccountBase() - this.$goPage('/pages/application/fillRegistInfo') + this.createTrainingApplySimpleFn() }, //获取用户信息 @@ -111,6 +111,19 @@ if (data.code != 0) return uni.$u.toast(data.message); uni.setStorageSync('userInfo', data.data); }, + // 第一步先报名 + async createTrainingApplySimpleFn() { + let trainingSchoolId = this.$store.state.currentSchool.trainingSchoolId + let trainingClassId = this.$store.state.classChooseItem.trainingClassId + const [nulls, res] = await indexApi.createTrainingApplySimple({trainingSchoolId, trainingClassId}) + if(res.code==0) { + this.$goPage('/pages/application/fillRegistInfo?trainingApplyId='+ res.data) + }else if(res.code==502) { + // 已经报名过这个学校了 存在未支付订单 + this.$u.toast(res.message) + this.$goPage('/pages/application/fillRegistInfo?trainingApplyId='+ res.data) + } + } } } diff --git a/pages/application/success.vue b/pages/application/success.vue index 4f4b90b..e8c206c 100644 --- a/pages/application/success.vue +++ b/pages/application/success.vue @@ -5,7 +5,7 @@ 浙里学车APP - 立即下载 + 立即下载 @@ -27,7 +27,7 @@ - 确认支付 + 立即下载 @@ -51,6 +51,9 @@ console.log(platform) const [err, res] = await indexApi.getLastVersion({appType, version:'1.0.0'}) console.log(res) + }, + download() { + this.$u.toast('需要下载接口') } } } diff --git a/pages/learnDriveStep/webView/webView.vue b/pages/application/webView.vue similarity index 100% rename from pages/learnDriveStep/webView/webView.vue rename to pages/application/webView.vue diff --git a/pages/index/index.vue b/pages/index/index.vue index 3386736..852bbc5 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,6 +1,6 @@ @@ -88,22 +89,34 @@ this.listInit() this.queryRegionByParentCodeFn() const latLng = this.$u.utils.getLocation() - console.log(latLng) + this.queryParams.lat = latLng.lat + this.queryParams.lng = latLng.lng + + this.$u.utils.appPostMessage("encryption_user_msg_type"); + + //Android和iOS获取⽤户信息回调 + window.arouseNativeMsg = function(data) { + if(data) { + + } + } }, onReachBottom() { - if(this.status=='nomore') return + if (this.status == 'nomore') return this.queryTrainingSchoolListFromAppFn() }, onPullDownRefresh() { this.listInit() - setTimeout(()=>{ + setTimeout(() => { uni.stopPullDownRefresh() - },1500) + }, 1500) }, methods: { - + goApp() { + this.$u.utils.appPostMessage("backToApp"); + }, listInit() { - this.status=='loadmore' + this.status == 'loadmore' this.queryParams.pageIndex = 1 this.listData = [] this.queryTrainingSchoolListFromAppFn() @@ -119,22 +132,22 @@ // 获取区域数据 async queryRegionByParentCodeFn() { const [nulls, res] = await indexApi.queryRegionByParentCode() - this.region = res.data + this.region = res.data }, // 列表 async queryTrainingSchoolListFromAppFn() { let obj = {} - for(let key in this.queryParams) { - if(this.queryParams[key]) { + for (let key in this.queryParams) { + if (this.queryParams[key]) { obj[key] = this.queryParams[key] } } - const [nulls,res] = await indexApi.queryTrainingSchoolListFromApp(obj) - this.queryParams.pageIndex ++ + const [nulls, res] = await indexApi.queryTrainingSchoolListFromApp(obj) + this.queryParams.pageIndex++ this.listData.push(...res.data) console.log('驾校列表') console.log(res.data) - if(res.data.length \ No newline at end of file diff --git a/pages/learnDriveStep/chooseCoach/chooseCoach.vue b/pages/learnDriveStep/chooseCoach/chooseCoach.vue deleted file mode 100644 index 4ff6918..0000000 --- a/pages/learnDriveStep/chooseCoach/chooseCoach.vue +++ /dev/null @@ -1,99 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/learnDriveStep/confirmClassHour/confirmClassHour.vue b/pages/learnDriveStep/confirmClassHour/confirmClassHour.vue deleted file mode 100644 index e37f667..0000000 --- a/pages/learnDriveStep/confirmClassHour/confirmClassHour.vue +++ /dev/null @@ -1,138 +0,0 @@ - - - \ No newline at end of file diff --git a/pages/learnDriveStep/confirmClassHour/signature.vue b/pages/learnDriveStep/confirmClassHour/signature.vue deleted file mode 100644 index 542685c..0000000 --- a/pages/learnDriveStep/confirmClassHour/signature.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - - diff --git a/pages/learnDriveStep/learnDriveStep.scss b/pages/learnDriveStep/learnDriveStep.scss deleted file mode 100644 index 76dbd8b..0000000 --- a/pages/learnDriveStep/learnDriveStep.scss +++ /dev/null @@ -1,135 +0,0 @@ -.main { - width: 100vw; - display: flex; - flex-direction: column; - min-height: 100vh; - padding-bottom: 160rpx; - .card { - background: #fff; - z-index: 99; - } - .step-row { - display: flex; - width: 100vw; - padding: 30rpx; - background: #fff; - z-index: 99; - .step { - flex-direction: column; - flex: 1; - display: flex; - align-items: center; - position: relative; - padding: 4rpx; - - .okIcon { - position: absolute; - left: 60%; - top: 0; - z-index: 9; - image { - display: block; - width: 38rpx; - height: 38rpx; - } - } - .arrow { - position: absolute; - left: 90%; - top: 40%; - transform: translateY(-50%); - image { - display: block; - width: 24rpx; - height: 22rpx; - } - } - .icon { - padding: 6rpx; - border-radius: 50%; - &.active { - border: 1px solid #1989FA; - } - image { - display: block; - width: 80rpx; - height: 80rpx; - } - } - - .text { - margin-top: 12rpx; - font-size: 24rpx; - color: #333; - } - } - } - } - .checkCon { - padding: 96rpx 30rpx 24rpx 30rpx; - } - .btnBg { - width: 100%; - height: 128rpx; - padding: 16rpx 30rpx; - background: #fff; - .btn { - width: 100%; - height: 96rpx; - background: linear-gradient(180deg, #3593FB 0%, #53D3E5 100%); - border-radius: 48rpx; - font-size: 36rpx; - color: #fff; - text-align: center; - line-height: 96rpx; - } - } - .select_row { - display: flex;justify-content: flex-end;width: 100%; - } - - .line { - position: relative; - &::before { - content: ''; - height: 20rpx; - width: 100vw; - background-color: #f7f7f7; - position: absolute; - left: -30rpx; - bottom: -20rpx; - } - } - .flex1 { - flex: 1 - } - .stepBtn_row { - display: flex; - padding: 30rpx; - position: fixed; - width: 100%; - bottom: 0; - left: 0; - justify-content: space-between; - background-color: #fff; - z-index: 9; - .stepBtn { - width: 48%; - height: 96rpx; - border: 2rpx solid rgba(53, 147, 251, 1); - color: #1989FA; - border-radius: 50rpx; - text-align: center; - line-height: 96rpx; - font-size: 36rpx; - text-align: center; - &.bg { - color: #fff; - border:none; - } - &.opacity { - opacity: 0.5; - } - } - } - \ No newline at end of file diff --git a/pages/learnDriveStep/learnDriveStep.vue b/pages/learnDriveStep/learnDriveStep.vue deleted file mode 100644 index 73f6015..0000000 --- a/pages/learnDriveStep/learnDriveStep.vue +++ /dev/null @@ -1,253 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/learnDriveStep/payMoney/payMoney.vue b/pages/learnDriveStep/payMoney/payMoney.vue deleted file mode 100644 index ed1d202..0000000 --- a/pages/learnDriveStep/payMoney/payMoney.vue +++ /dev/null @@ -1,625 +0,0 @@ - - - - - diff --git a/pages/learnDriveStep/payMoney/payMoneySuccess.vue b/pages/learnDriveStep/payMoney/payMoneySuccess.vue deleted file mode 100644 index 3fecdcf..0000000 --- a/pages/learnDriveStep/payMoney/payMoneySuccess.vue +++ /dev/null @@ -1,97 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/learnDriveStep/realName/realName.vue b/pages/learnDriveStep/realName/realName.vue deleted file mode 100644 index 44e75e1..0000000 --- a/pages/learnDriveStep/realName/realName.vue +++ /dev/null @@ -1,142 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/learnDriveStep/step/step0.vue b/pages/learnDriveStep/step/step0.vue deleted file mode 100644 index a353632..0000000 --- a/pages/learnDriveStep/step/step0.vue +++ /dev/null @@ -1,147 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/learnDriveStep/step/step1.vue b/pages/learnDriveStep/step/step1.vue deleted file mode 100644 index 5cde55d..0000000 --- a/pages/learnDriveStep/step/step1.vue +++ /dev/null @@ -1,225 +0,0 @@ - - - - - diff --git a/pages/learnDriveStep/step/step2.vue b/pages/learnDriveStep/step/step2.vue deleted file mode 100644 index a338ff1..0000000 --- a/pages/learnDriveStep/step/step2.vue +++ /dev/null @@ -1,63 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/learnDriveStep/step/step3.vue b/pages/learnDriveStep/step/step3.vue deleted file mode 100644 index 8791898..0000000 --- a/pages/learnDriveStep/step/step3.vue +++ /dev/null @@ -1,524 +0,0 @@ - - - - - - diff --git a/pages/learnDriveStep/step/step3formValidation.vue b/pages/learnDriveStep/step/step3formValidation.vue deleted file mode 100644 index 8580bf3..0000000 --- a/pages/learnDriveStep/step/step3formValidation.vue +++ /dev/null @@ -1,121 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/learnDriveStep/step/step4.vue b/pages/learnDriveStep/step/step4.vue deleted file mode 100644 index bbc45f3..0000000 --- a/pages/learnDriveStep/step/step4.vue +++ /dev/null @@ -1,174 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/learnDriveStep/webView/webView - 副本 (2).vue b/pages/learnDriveStep/webView/webView - 副本 (2).vue deleted file mode 100644 index 3efebec..0000000 --- a/pages/learnDriveStep/webView/webView - 副本 (2).vue +++ /dev/null @@ -1,148 +0,0 @@ - - - - - diff --git a/pages/schoolDetails/details.vue b/pages/schoolDetails/details.vue index 1f0a95b..62234e8 100644 --- a/pages/schoolDetails/details.vue +++ b/pages/schoolDetails/details.vue @@ -240,7 +240,7 @@ } .rightCon { - width: 96rpx; + min-width: 96rpx; text-align: center; margin-right: 32rpx; diff --git a/static/images/avatar.png b/static/images/avatar.png new file mode 100644 index 0000000..248c612 Binary files /dev/null and b/static/images/avatar.png differ diff --git a/static/images/jiaofei_wxIphone@2x.png b/static/images/jiaofei_wxIphone@2x.png new file mode 100644 index 0000000..cf648d3 Binary files /dev/null and b/static/images/jiaofei_wxIphone@2x.png differ diff --git a/static/images/third_icon_gengduoIphone@2x.png b/static/images/third_icon_gengduoIphone@2x.png new file mode 100644 index 0000000..defcd9f Binary files /dev/null and b/static/images/third_icon_gengduoIphone@2x.png differ diff --git a/static/images/third_img_tuijianIphone@2x.png b/static/images/third_img_tuijianIphone@2x.png new file mode 100644 index 0000000..fbb5971 Binary files /dev/null and b/static/images/third_img_tuijianIphone@2x.png differ