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

准备上线

master
unknown 3 months ago
parent
33831367bb
commit
3940d9d642
12 changed files with 48 additions and 20 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. 2
      androidPrivacy.json
  2. 13
      config/request.js
  3. 10
      config/site.config.js
  4. 11
      manifest.json
  5. 1
      package.json
  6. 7
      pages/indexEntry/enroll/payment/payment.vue
  7. 10
      pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
  8. 2
      pages/mineEntry/personaInfo/personaInfo.vue
  9. 2
      pages/tabbar/index/comp/schoolItem.vue
  10. 10
      pages/tabbar/index/index.vue
  11. BIN
      static/images/bigImg/jlcbg.png
  12. BIN
      static/images/bigImg/radian.png

2
androidPrivacy.json
View File

@ -9,7 +9,7 @@
"backToExit" : "true", "backToExit" : "true",
"second" : { "second" : {
"title" : "确认提示", "title" : "确认提示",
"message" : "　　进入应用前，你需先同意<a href=\"http://file.jaxc.cn/htmls/user.html\">《服务协议》</a>和<a href=\"http://file.jaxc.cn/htmls/y.html\">《隐私政策》</a>，否则将退出应用。",
"message" : "　　进入应用前，你需先同意<a href=\"http://www.lyjppt.com/htmls/yhxy.html\">《服务协议》</a>和<a href=\"http://www.lyjppt.com/htmls/yszc.html\">《隐私政策》</a>，否则将退出应用。",
"buttonAccept" : "同意并继续", "buttonAccept" : "同意并继续",
"buttonRefuse" : "退出应用" "buttonRefuse" : "退出应用"
}, },

13
config/request.js
View File

@ -2,7 +2,8 @@
import { H5_API, WX_API,httpPrefix } from '@/config/site.config.js'; import { H5_API, WX_API,httpPrefix } from '@/config/site.config.js';
import { refreshToken } from './utils' import { refreshToken } from './utils'
import md5 from 'js-md5'
let secretKey = '22d90e09d1374f0f9e4accd07d333e55'
@ -27,7 +28,13 @@ module.exports = (vm) => {
config.data = config.data || {} config.data = config.data || {}
// 根据custom参数中配置的是否需要token，添加对应的请求头 // 根据custom参数中配置的是否需要token，添加对应的请求头
console.log('--------------') 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 let token = vm.$store.state.user.vuex_loginInfo.accessToken
if(token) { if(token) {
config.header.Authorization = 'Bearer ' + token config.header.Authorization = 'Bearer ' + token
@ -36,6 +43,8 @@ module.exports = (vm) => {
if(noToken&&config.header.Authorization) { if(noToken&&config.header.Authorization) {
delete config.header.Authorization delete config.header.Authorization
} }
console.log('config')
console.log(config)
return config return config
}, config => { // 可使用async await 做异步操作 }, config => { // 可使用async await 做异步操作
return Promise.reject(config) return Promise.reject(config)

10
config/site.config.js
View File

@ -3,13 +3,17 @@ const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM;
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://123.6.232.54:8099/',//非代理地址 不要忘记加/ 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', 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/',
// 支付测试地址
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://123.6.232.54:8099/测试地址
// http://192.168.1.43:8318/本地地址
//http://www.lyjppt.com/正式地址 //http://www.lyjppt.com/正式地址

11
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "洛阳学车", "name" : "洛阳学车",
"appid" : "__UNI__3347C6E", "appid" : "__UNI__3347C6E",
"description" : "", "description" : "",
"versionName" : "1.3.0",
"versionCode" : 130,
"versionName" : "1.3.2",
"versionCode" : 132,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {
@ -59,7 +59,8 @@
"<uses-permission android:name=\"android.permission.FOREGROUND_SERVICE\"/>", "<uses-permission android:name=\"android.permission.FOREGROUND_SERVICE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>" "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>"
], ],
"targetSdkVersion" : 26
"targetSdkVersion" : 30,
"abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios" : { "ios" : {
@ -225,8 +226,8 @@
"disableHostCheck" : true, "disableHostCheck" : true,
"proxy" : { "proxy" : {
"/api" : { "/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, "changeOrigin" : true,
"secure" : true, "secure" : true,
"pathRewrite" : { "pathRewrite" : {

1
package.json
View File

@ -10,6 +10,7 @@
"author": "", "author": "",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"js-md5": "^0.8.3",
"uview-ui": "^2.0.36" "uview-ui": "^2.0.36"
} }
} }

7
pages/indexEntry/enroll/payment/payment.vue
View File

@ -33,6 +33,7 @@
import { import {
getStudentByPayment, pre_create, param_sign,course_info getStudentByPayment, pre_create, param_sign,course_info
} from '@/config/api.js' } from '@/config/api.js'
import { preUrl } from '@/config/site.config.js';
export default { export default {
data() { data() {
return { return {
@ -51,6 +52,7 @@
// this.getYSBLink() // this.getYSBLink()
this.course_infoFn() this.course_infoFn()
this.initWx() this.initWx()
alert(preUrl)
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.course_infoFn() this.course_infoFn()
@ -76,10 +78,11 @@
// 获取订单信息 // 获取订单信息
async course_infoFn() { async course_infoFn() {
console.log('获取订单信息') console.log('获取订单信息')
console.log(this.trainingApplyId)
const {data: res} = await course_info({trainingApplyId: this.trainingApplyId}) const {data: res} = await course_info({trainingApplyId: this.trainingApplyId})
this.amount = res.amount this.amount = res.amount
this.schoolName = res.schoolName this.schoolName = res.schoolName
this.channelNo = res.channelNo
console.log(res)
}, },
// 1，下订单 // 1，下订单
async getStudentByPayment(type) { async getStudentByPayment(type) {
@ -116,7 +119,7 @@
const platform = 'common'; const platform = 'common';
//易收宝H5的前端页面地址，不同的环境详见第四章第4节 //易收宝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://u8wbs.zyebank.cn/cem_ysb_u8/index.html'
// 生产地址 // 生产地址
// const preUrl = 'https://zmcht.zybank.com.cn/cem_ysb/index.html'; // const preUrl = 'https://zmcht.zybank.com.cn/cem_ysb/index.html';

10
pages/indexEntry/findShcool/shcoolDetail/shcoolDetail.vue
View File

@ -49,12 +49,15 @@
import { coachPage, getSchoolDetail, getListComment } from '@/config/api.js' import { coachPage, getSchoolDetail, getListComment } from '@/config/api.js'
import { imgUrl } from '@/config/site.config' import { imgUrl } from '@/config/site.config'
import schoolItme from '@/pages/tabbar/index/comp/schoolItem.vue' 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 { export default {
components: { tab1, tab2, tab3, tab4, schoolItme}, components: { tab1, tab2, tab3, tab4, schoolItme},
data() { data() {
return { return {
swiperList: [], swiperList: [],
radianImg: imgUrl+'radian.png',
radianImg: radian,
show: false, show: false,
navList: [ navList: [
{text: '班型', id: 1}, {text: '班型', id: 1},
@ -121,6 +124,11 @@
uni.hideLoading() uni.hideLoading()
this.schoolDetail = res this.schoolDetail = res
this.swiperList = res.schoolIntroduceDO&&res.schoolIntroduceDO.headImages&&res.schoolIntroduceDO.headImages.split(',') 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() { async coachPageFn() {

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

@ -61,7 +61,7 @@
</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">

2
pages/tabbar/index/comp/schoolItem.vue
View File

@ -64,6 +64,8 @@
border-radius: 20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
flex-shrink: 0; flex-shrink: 0;
background: url('../../../../static/images/bigImg/jlcbg.png') no-repeat;
background-size: cover;
} }
.textCon { .textCon {

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

@ -161,11 +161,11 @@
icon: require('../../../static/images/indexIcon/entryIcon (5).png'), icon: require('../../../static/images/indexIcon/entryIcon (5).png'),
url: '/pages/indexEntry/signIn/signIn', url: '/pages/indexEntry/signIn/signIn',
}, },
{
text: '理论学习',
icon: require('../../../static/images/indexIcon/entryIcon (2).png'),
url: '/pages/indexEntry/theory/theory',
},
// {
// text: '理论学习',
// icon: require('../../../static/images/indexIcon/entryIcon (2).png'),
// url: '/pages/indexEntry/theory/theory',
// },
], ],
swiperDotIndex: 0, swiperDotIndex: 0,

BIN
static/images/bigImg/jlcbg.png
View File

Side by Side

After

Width: 711  |  Height: 265  |  Size: 330 KiB

BIN
static/images/bigImg/radian.png
View File

Side by Side

After

Width: 750  |  Height: 84  |  Size: 4.9 KiB

Write Preview
Loading…
Cancel
Save