diff --git a/common/css/app.scss b/common/css/app.scss index a168a68..10f8eb2 100644 --- a/common/css/app.scss +++ b/common/css/app.scss @@ -146,17 +146,21 @@ image { } /* 通用 */ - ::-webkit-input-placeholder { color:#ADADAD; } - ::-moz-placeholder { color:#ADADAD; } /* firefox 19+ */ - :-ms-input-placeholder { color:#ADADAD; } /* ie */ - input:-moz-placeholder { color:#ADADAD; } + ::-webkit-input-placeholder { color:#BBBBBB; } + ::-moz-placeholder { color:#BBBBBB; } /* firefox 19+ */ + :-ms-input-placeholder { color:#BBBBBB; } /* ie */ + input:-moz-placeholder { color:#BBBBBB; } input::-webkit-input-placeholder { - color: #CDCDCD !important; - } - input::-moz-input-placeholder { - color: #CDCDCD !important; - } - input::-ms-input-placeholder { - color: #CDCDCD !important; - } + color: #BBBBBB !important; + } + input::-moz-input-placeholder { + color: #BBBBBB !important; + } + input::-ms-input-placeholder { + color: #BBBBBB !important; + } + + // .uni-input-placeholder { + // color: #BBBBBB !important; + // } diff --git a/common/js/utils.js b/common/js/utils.js index 3cc36ce..5802a21 100644 --- a/common/js/utils.js +++ b/common/js/utils.js @@ -120,6 +120,7 @@ const install = (Vue, vm) => { let clickSignUp = ()=> { let accessToken = store.state.user.vuex_loginInfo.accessToken + if(!accessToken) { store.commit('goLogin') return diff --git a/config/api.js b/config/api.js index 8536d66..c0e619c 100644 --- a/config/api.js +++ b/config/api.js @@ -226,6 +226,9 @@ export const periodConfirm = (data) => http.post('app/student-process/periodConf export const course_info = (data) => http.post('pay/ysb/course_info', data) // 查询支付状态 export const order_info = (data) => http.post('pay/ysb/order_info', data) + // 退学申请 + export const refuse_apply = (data) => http.post('pay/ysb/refuse_apply', data) + diff --git a/config/request.js b/config/request.js index 42afb1b..d67c745 100644 --- a/config/request.js +++ b/config/request.js @@ -44,8 +44,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 752a555..b6741f8 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -2,9 +2,12 @@ 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.35:8318',//非代理地址 + 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.1:8099//非代理地址 website: 'http://192.168.1.37', httpPrefix: 'app-api/', imgUrl: 'https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/' }; + + +// http://123.6.232.54:8099/测试地址 \ No newline at end of file diff --git a/main.js b/main.js index 49fac85..064df26 100644 --- a/main.js +++ b/main.js @@ -17,7 +17,6 @@ import uView from '@/uni_modules/uview-ui' Vue.use(uView) - const app = new Vue({ ...App, store diff --git a/manifest.json b/manifest.json index 6f41d7f..b5b2702 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "洛阳学车", "appid" : "__UNI__3347C6E", "description" : "", - "versionName" : "1.2.1", - "versionCode" : 121, + "versionName" : "1.2.6", + "versionCode" : 126, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -27,8 +27,7 @@ "Barcode" : {}, "Geolocation" : {}, "VideoPlayer" : {}, - "Share" : {}, - "Payment" : {} + "Share" : {} }, /* 应用发布信息 */ "distribute" : { @@ -59,7 +58,8 @@ "", "", "" - ] + ], + "targetSdkVersion" : 26 }, /* ios打包配置 */ "ios" : { @@ -190,8 +190,8 @@ "disableHostCheck" : true, "proxy" : { "/api" : { - "target" : "http://192.168.1.35:8318/", - // "target" : "http://192.168.1.36:48080/", + "target" : "http://192.168.1.43:8318/", + // "target" : "http://123.6.232.1:8099/", "changeOrigin" : true, "secure" : true, "pathRewrite" : { diff --git a/nativePlugins/md.md b/nativePlugins/md.md index 0ca0a59..b766682 100644 --- a/nativePlugins/md.md +++ b/nativePlugins/md.md @@ -1,2 +1,3 @@ -有一条理解，允许接纳的路，通向个体内在，只有内求才是无限的道路 \ No newline at end of file + +只要还清晰的数呼吸就继续， \ No newline at end of file diff --git a/pages/indexEntry/enroll/payment/payh5.vue b/pages/indexEntry/enroll/payment/payh5.vue index 2a9d54b..e14ce38 100644 --- a/pages/indexEntry/enroll/payment/payh5.vue +++ b/pages/indexEntry/enroll/payment/payh5.vue @@ -38,11 +38,11 @@ console.log(res) console.log('监听到的发送事件') console.log(item) - if(item.action=='lyxc-wxPay') { + if(item.action=='ysb-wxPay') { // this.$u.toast('用户点击了微信支付') this.iswxPay = true this.wxPay(item) - }else if(item.action=='lyxc-paySuccess') { + }else if(item.action=='ysb-paySuccess') { this.$u.toast('支付成功') this.iswxPay = false this.$store.dispatch('getUserInfo') @@ -50,7 +50,7 @@ uni.switchTab({ url: '/pages/tabbar/learnCar/index' }) - },1500) + },800) } }, // 轮询定时 diff --git a/pages/indexEntry/enroll/payment/payment.vue b/pages/indexEntry/enroll/payment/payment.vue index 6975863..2cc1258 100644 --- a/pages/indexEntry/enroll/payment/payment.vue +++ b/pages/indexEntry/enroll/payment/payment.vue @@ -21,7 +21,7 @@ - 确认支付 + 确认支付 @@ -75,6 +75,8 @@ }, // 获取订单信息 async course_infoFn() { + console.log('获取订单信息') + console.log(this.trainingApplyId) const {data: res} = await course_info({trainingApplyId: this.trainingApplyId}) this.amount = res.amount this.schoolName = res.schoolName diff --git a/pages/indexEntry/enroll/registInfo/registInfo.vue b/pages/indexEntry/enroll/registInfo/registInfo.vue index 5360a12..dda7507 100644 --- a/pages/indexEntry/enroll/registInfo/registInfo.vue +++ b/pages/indexEntry/enroll/registInfo/registInfo.vue @@ -620,6 +620,8 @@ let obj = Object.assign({},this.form) obj.name = obj.name.replace(/\s+/g, '') obj.idcard = obj.idcard.replace(/\s+/g, '') + console.log('请求参数') + console.log(obj) const {data: res} = await applyOnline(obj) // 报名成功 console.log(res) diff --git a/pages/indexEntry/findShcool/screen/screen.vue b/pages/indexEntry/findShcool/screen/screen.vue index 00728b2..311f390 100644 --- a/pages/indexEntry/findShcool/screen/screen.vue +++ b/pages/indexEntry/findShcool/screen/screen.vue @@ -41,7 +41,6 @@ } if(options.district) { this.areTypeArr = options.district.split(',').map(item=>item*1) - console.log(this.areTypeArr) } this.licenseTypeFn() this.nachangListFn() @@ -50,12 +49,10 @@ async licenseTypeFn() { const {data: res} = await licenseType() this.driverList = res - console.log(res) }, async nachangListFn() { const {data: res} = await nachangList() this.areList = res - console.log(res) }, driverTypeClick(item) { let index = this.driverTypeArr.indexOf(item.label) @@ -79,7 +76,6 @@ this.driverTypeArr = [] }, screenConfirm() { - console.log( this.driverTypeArr) let obj = { businessScope: this.driverTypeArr.join(','), district: this.areTypeArr.join(',') diff --git a/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue index 9e54f99..486057c 100644 --- a/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue +++ b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue @@ -120,7 +120,7 @@ const {data: res} = await getSchoolDetail(Object.assign(this.params,{id: this.schoolId})) uni.hideLoading() this.schoolDetail = res - this.swiperList = res.schoolIntroduceDO&&res.schoolIntroduceDO.headImages.split(',') + this.swiperList = res.schoolIntroduceDO&&res.schoolIntroduceDO.headImages&&res.schoolIntroduceDO.headImages.split(',') }, // 教练分页 async coachPageFn() { diff --git a/pages/mineEntry/myForecastName/myForecastName.vue b/pages/mineEntry/myForecastName/myForecastName.vue index 15e5d18..ba06f33 100644 --- a/pages/mineEntry/myForecastName/myForecastName.vue +++ b/pages/mineEntry/myForecastName/myForecastName.vue @@ -53,12 +53,12 @@ this.$u.toast('删除成功') } this.trainingApplyListFn() - console.log(res) } }) }, itemClickFn(item) { - console.log(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) { diff --git a/pages/mineEntry/myOrder/myOrder.vue b/pages/mineEntry/myOrder/myOrder.vue index 6ba1e2d..4974000 100644 --- a/pages/mineEntry/myOrder/myOrder.vue +++ b/pages/mineEntry/myOrder/myOrder.vue @@ -28,9 +28,9 @@ data() { return { tabList: [ - {text: '已完成',id: 1}, + {text: '已完成',id: 10}, {text: '待付款',id: 0}, - {text: '退款',id: -1}, + {text: '退款',id: 30}, ],//0：待支付，1：已支付，-1：已取消，2：支付失败 navList: [ {text: '全部', id: 0}, @@ -40,8 +40,8 @@ params: { pageNo: 1, pageSize: 20, - orderStatus: 1, - orderType: 0, + orderStatus: 10, + orderType: 1, sercheValue: '' }, list: [], diff --git a/pages/mineEntry/refund/comp/myform.vue b/pages/mineEntry/refund/comp/myform.vue index 9b1ef51..6965633 100644 --- a/pages/mineEntry/refund/comp/myform.vue +++ b/pages/mineEntry/refund/comp/myform.vue @@ -71,7 +71,7 @@