diff --git a/api/index.js b/api/index.js index b549bd1..d51fa29 100644 --- a/api/index.js +++ b/api/index.js @@ -26,5 +26,46 @@ class indexApi { async getLoginRegistCode(data) { return await Ajax1( '/util/manage/getLoginRegistCode.do', data, 'post'); } + // 验证码登录 + async loginSMS(data) { + return await Ajax1('/account/manage/login.do', data,'post'); + } + // 我的查询个人账号基本信息 + async getOwnerAccountBase(data) { + return await http('/account/manage/getOwnerAccountBase.do', data,'post'); + } + // 创建转校报名信息（包括修改）-1 + async createTransferTrainingApplyDetails(data={}) { + return await Ajax1('/apply/manage/createTransferTrainingApplyDetails.do', data,'post'); + } + // 提交表单 + async createTrainingApplyDetails(data) { + return await Ajax1('/apply/manage/createTrainingApplyDetails.do', data,'post'); + } + // 通过车型查询班型列表 + async querySimpleTrainingClasssByModel(data) { + return await Ajax1('/class/manage/querySimpleTrainingClasssByModel.do', data,'post'); + } + // 查询报名详情-3 + async getTrainingApplyDetails(data) { + return await Ajax1('/apply/manage/getTrainingApplyDetails.do', data,'post'); + } + + // 根据驾校id查询车型 + async queryDriveModels(data) { + return await Ajax1('/school/manage/queryDriveModels.do', data,'post'); + } + //创建报名-1 + async createTrainingApplySimple(data) { + return await Ajax1('/apply/manage/createTrainingApplySimple.do', data,'post'); + } + // app升级版本 + async getLastVersion(data={}) { + return await Ajax1('/appVersion/getLastVersion.do', data,'post'); + } + // 查询区域 + async queryRegionByParentCode(data) { + return await Ajax1('/util/manage/queryRegionByParentCode.do?regionCode=330100', data,'post'); + } } export default new indexApi(); \ No newline at end of file diff --git a/pages.json b/pages.json index bb08997..ed19f95 100644 --- a/pages.json +++ b/pages.json @@ -73,8 +73,40 @@ "navigationBarBackgroundColor": "#FFFFFF", "navigationBarTextStyle": "black" //状态栏字体颜色 } + }, + { + "path": "pages/application/fillRegistInfo", + "style": { + "navigationBarTitleText": "填写报名信息", + "enablePullDownRefresh": false, + "bounce": "none", + "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarTextStyle": "black" //状态栏字体颜色 + } + }, + { + "path": "pages/application/payment", + "style": { + "navigationBarTitleText": "支付费用", + "enablePullDownRefresh": false, + "bounce": "none", + "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarTextStyle": "black" //状态栏字体颜色 + } + }, + { + "path": "pages/application/success", + "style": { + "navigationBarTitleText": "报名成功", + "enablePullDownRefresh": false, + "bounce": "none", + "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarTextStyle": "black" //状态栏字体颜色 + } } + + diff --git a/pages/application/entry.vue b/pages/application/entry.vue index 435ae07..34dd437 100644 --- a/pages/application/entry.vue +++ b/pages/application/entry.vue @@ -9,7 +9,7 @@ 请选择 以下两种报名方式，均享受会员价 - + @@ -22,13 +22,13 @@ - + - - 为自己报名 - 我是工会会员，为自己报名 + + 为家人报名 + 我是工会会员，为家人报名 @@ -40,6 +40,18 @@ \ No newline at end of file diff --git a/pages/application/payment.vue b/pages/application/payment.vue new file mode 100644 index 0000000..81348fd --- /dev/null +++ b/pages/application/payment.vue @@ -0,0 +1,363 @@ + + + + + diff --git a/pages/application/registrationPhone.vue b/pages/application/registrationPhone.vue index 8b8d466..e0f4411 100644 --- a/pages/application/registrationPhone.vue +++ b/pages/application/registrationPhone.vue @@ -13,18 +13,18 @@ - + {{codeText}} - 确定 + 确定 - + 我已阅读并同意 《用户协议》 和 diff --git a/pages/application/success.vue b/pages/application/success.vue new file mode 100644 index 0000000..4f4b90b --- /dev/null +++ b/pages/application/success.vue @@ -0,0 +1,167 @@ + + + + + \ No newline at end of file diff --git a/pages/index/comp/list.vue b/pages/index/comp/list.vue index 3577ece..44b03a4 100644 --- a/pages/index/comp/list.vue +++ b/pages/index/comp/list.vue @@ -1,6 +1,6 @@ @@ -67,14 +75,18 @@ lat: 30.27419537786047, trainingScope: '', lng: 120.20633397715788, - schoolName: '四' + schoolName: '' }, - listData: [] + show: false, + listData: [], + region: [], + regionName: '杭州市' } }, onLoad() { this.listInit() + this.queryRegionByParentCodeFn() const latLng = this.$u.utils.getLocation() console.log(latLng) }, @@ -96,6 +108,19 @@ this.listData = [] this.queryTrainingSchoolListFromAppFn() }, + // 选择区域 + confirmRegion(i) { + let index = i[0] + let item = this.region[index] + this.queryParams.district = item.regionCode + this.regionName = item.regionName + this.listInit() + }, + // 获取区域数据 + async queryRegionByParentCodeFn() { + const [nulls, res] = await indexApi.queryRegionByParentCode() + this.region = res.data + }, // 列表 async queryTrainingSchoolListFromAppFn() { let obj = {} @@ -204,12 +229,35 @@ background: #FFFFFF; border-radius: 32rpx 32rpx 0px 0px; padding: 0 32rpx 32rpx 32rpx; + margin-top: 32rpx; .area { display: flex; - align-content: center; + align-items: center; font-size: 28rpx; color: #686B73; margin-bottom: 40rpx; + .areaLab { + font-size: 28rpx; + color: #686B73; + margin-right: 16rpx; + } + .areaChoose { + height: 56rpx; + background: #F6F7F8; + border-radius: 8rpx; + padding: 8rpx 16rpx; + display: flex; + align-items: center; + .txt { + font-size: 28rpx; + color: #686B73; + } + .iconImg { + width: 24rpx; + height: 24rpx; + margin-left: 8rpx; + } + } } } diff --git a/pages/payRecords/payRecords.vue b/pages/payRecords/payRecords.vue index 233c011..b519e60 100644 --- a/pages/payRecords/payRecords.vue +++ b/pages/payRecords/payRecords.vue @@ -41,6 +41,11 @@ + + + + + @@ -50,6 +55,15 @@ \ No newline at end of file diff --git a/static/images/idcardA.png b/static/images/idcardA.png new file mode 100644 index 0000000..ea57af6 Binary files /dev/null and b/static/images/idcardA.png differ diff --git a/static/images/idcardB.png b/static/images/idcardB.png new file mode 100644 index 0000000..28d4327 Binary files /dev/null and b/static/images/idcardB.png differ diff --git a/static/images/jiaofei_zfbIphone@2x.png b/static/images/jiaofei_zfbIphone@2x.png new file mode 100644 index 0000000..7d2b980 Binary files /dev/null and b/static/images/jiaofei_zfbIphone@2x.png differ diff --git a/static/images/jiaofei_zhifu_selectIphone@2x.png b/static/images/jiaofei_zhifu_selectIphone@2x.png new file mode 100644 index 0000000..0e6ea91 Binary files /dev/null and b/static/images/jiaofei_zhifu_selectIphone@2x.png differ diff --git a/static/images/jiaofei_zhifu_unselectIphone@2x.png b/static/images/jiaofei_zhifu_unselectIphone@2x.png new file mode 100644 index 0000000..4108b24 Binary files /dev/null and b/static/images/jiaofei_zhifu_unselectIphone@2x.png differ diff --git a/static/images/third_icon_success@2x.png b/static/images/third_icon_success@2x.png new file mode 100644 index 0000000..4a6dfa1 Binary files /dev/null and b/static/images/third_icon_success@2x.png differ diff --git a/static/images/third_img_fail@2x.png b/static/images/third_img_fail@2x.png new file mode 100644 index 0000000..f7afb11 Binary files /dev/null and b/static/images/third_img_fail@2x.png differ diff --git a/store/index.js b/store/index.js index a23123e..9d0d5f3 100644 --- a/store/index.js +++ b/store/index.js @@ -7,7 +7,7 @@ Vue.use(Vuex); const store = new Vuex.Store({ state: { - pushMessage: {}, + currentSchool: '', latLng: {}, classChooseItem: {}, pdfUrl: '', @@ -28,10 +28,8 @@ const store = new Vuex.Store({ }, getters, mutations: { - updatePushMessage(state, message) { - let payload = message.payload; - if (typeof payload === 'string') payload = JSON.parse(payload); - state.pushMessage = payload || {}; + upDateTrainingSchoolId(state, currentSchool) { + state.currentSchool = currentSchool }, updatePdfUrl(state, url) { state.pdfUrl = url