diff --git a/androidPrivacy.json b/androidPrivacy.json
index 0a55e44..2afc71f 100644
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -9,7 +9,7 @@
"backToExit" : "true",
"second" : {
"title" : "确认提示",
- "message" : " 进入应用前，你需先同意《服务协议》和《隐私政策》，否则将退出应用。",
+ "message" : " 进入应用前，你需先同意《服务协议》和《隐私政策》，否则将退出应用。",
"buttonAccept" : "同意并继续",
"buttonRefuse" : "退出应用"
},
diff --git a/config/request.js b/config/request.js
index 346402c..50e7334 100644
--- a/config/request.js
+++ b/config/request.js
@@ -2,7 +2,8 @@
import { H5_API, WX_API,httpPrefix } from '@/config/site.config.js';
import { refreshToken } from './utils'
-
+import md5 from 'js-md5'
+let secretKey = '22d90e09d1374f0f9e4accd07d333e55'
@@ -27,7 +28,13 @@ module.exports = (vm) => {
config.data = config.data || {}
// 根据custom参数中配置的是否需要token，添加对应的请求头
console.log('--------------')
- console.log(config)
+ config.data['timestamp'] = Date.now()
+ let jsonString = JSON.stringify(config.data)
+ let strSecretKey = jsonString + secretKey
+ let hash = md5(strSecretKey)
+ config.header['Signature'] = hash
+ config.data = jsonString
+ console.log(config.data)
let token = vm.$store.state.user.vuex_loginInfo.accessToken
if(token) {
config.header.Authorization = 'Bearer ' + token
@@ -36,6 +43,8 @@ module.exports = (vm) => {
if(noToken&&config.header.Authorization) {
delete config.header.Authorization
}
+ console.log('config')
+ console.log(config)
return config
}, config => { // 可使用async await 做异步操作
return Promise.reject(config)
diff --git a/config/site.config.js b/config/site.config.js
index d585812..4888438 100644
--- a/config/site.config.js
+++ b/config/site.config.js
@@ -3,13 +3,17 @@ const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM;
module.exports = {
H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理
WX_API: VUE_APP_PLATFORM === 'h5' ? '/' : 'http://123.6.232.54:8099/',//非代理地址 不要忘记加/
- // 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/'
+ imgUrl: 'https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/',
+ // 支付测试地址
+ preUrl: 'https://u8wbs.zyebank.cn/cem_ysb_u6/index.html',
+ // const preUrl = 'https://u8wbs.zyebank.cn/cem_ysb_u8/index.html'
+ // 生产地址
+ // preUrl: 'https://zmcht.zybank.com.cn/cem_ysb/index.html',
};
// http://123.6.232.54:8099/测试地址
-
+// http://192.168.1.43:8318/本地地址
//http://www.lyjppt.com/正式地址
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index dd67b50..acb935f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "洛阳学车",
"appid" : "__UNI__3347C6E",
"description" : "",
- "versionName" : "1.3.0",
- "versionCode" : 130,
+ "versionName" : "1.3.2",
+ "versionCode" : 132,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
@@ -59,7 +59,8 @@
"",
""
],
- "targetSdkVersion" : 26
+ "targetSdkVersion" : 30,
+ "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
},
/* ios打包配置 */
"ios" : {
@@ -225,8 +226,8 @@
"disableHostCheck" : true,
"proxy" : {
"/api" : {
- "target" : "http://192.168.1.40:8318/",
- // "target" : "http://123.6.232.1:8099/",
+ // "target" : "http://192.168.1.43:8318/",
+ "target" : "http://123.6.232.54:8099/",
"changeOrigin" : true,
"secure" : true,
"pathRewrite" : {
diff --git a/package.json b/package.json
index a87594f..c1a52b2 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
"author": "",
"license": "ISC",
"dependencies": {
+ "js-md5": "^0.8.3",
"uview-ui": "^2.0.36"
}
}
diff --git a/pages/indexEntry/enroll/payment/payment.vue b/pages/indexEntry/enroll/payment/payment.vue
index a0f5572..c102263 100644
--- a/pages/indexEntry/enroll/payment/payment.vue
+++ b/pages/indexEntry/enroll/payment/payment.vue
@@ -33,6 +33,7 @@
import {
getStudentByPayment, pre_create, param_sign,course_info
} from '@/config/api.js'
+ import { preUrl } from '@/config/site.config.js';
export default {
data() {
return {
@@ -51,6 +52,7 @@
// this.getYSBLink()
this.course_infoFn()
this.initWx()
+ alert(preUrl)
},
onPullDownRefresh() {
this.course_infoFn()
@@ -76,10 +78,11 @@
// 获取订单信息
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
+ this.channelNo = res.channelNo
+ console.log(res)
},
// 1，下订单
async getStudentByPayment(type) {
@@ -116,7 +119,7 @@
const platform = 'common';
//易收宝H5的前端页面地址，不同的环境详见第四章第4节
// 测试地址
- const preUrl = 'https://u8wbs.zyebank.cn/cem_ysb_u6/index.html'
+ // const preUrl = 'https://u8wbs.zyebank.cn/cem_ysb_u6/index.html'
// const preUrl = 'https://u8wbs.zyebank.cn/cem_ysb_u8/index.html'
// 生产地址
// const preUrl = 'https://zmcht.zybank.com.cn/cem_ysb/index.html';
diff --git a/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
index 486057c..c44d6c2 100644
--- a/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
+++ b/pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
@@ -49,12 +49,15 @@
import { coachPage, getSchoolDetail, getListComment } from '@/config/api.js'
import { imgUrl } from '@/config/site.config'
import schoolItme from '@/pages/tabbar/index/comp/schoolItem.vue'
+ const jlcBg = require('@/static/images/bigImg/jlcbg.png')
+ const radian = require('@/static/images/bigImg/radian.png')
+
export default {
components: { tab1, tab2, tab3, tab4, schoolItme},
data() {
return {
swiperList: [],
- radianImg: imgUrl+'radian.png',
+ radianImg: radian,
show: false,
navList: [
{text: '班型', id: 1},
@@ -121,6 +124,11 @@
uni.hideLoading()
this.schoolDetail = res
this.swiperList = res.schoolIntroduceDO&&res.schoolIntroduceDO.headImages&&res.schoolIntroduceDO.headImages.split(',')
+ if(!this.swiperList||!this.swiperList.length) {
+ this.swiperList = [jlcBg]
+ }
+ console.log('this.swiperList')
+ console.log(this.swiperList)
},
// 教练分页
async coachPageFn() {
diff --git a/pages/mineEntry/personaInfo/personaInfo.vue b/pages/mineEntry/personaInfo/personaInfo.vue
index 0b6a63a..84b3339 100644
--- a/pages/mineEntry/personaInfo/personaInfo.vue
+++ b/pages/mineEntry/personaInfo/personaInfo.vue
@@ -61,7 +61,7 @@
-->
- 删除测试账号（开发用的）
+