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

测试过全流程版本

master
unknown 6 months ago
parent
77cf59fc7c
commit
a2055daaf4
24 changed files with 177 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      App.vue
  2. 38
      androidPrivacy.json
  3. 9
      common/css/app.scss
  4. 3
      common/js/mixins.js
  5. 3
      manifest.json
  6. 9
      pages.json
  7. 2
      pages/indexEntry/enroll/signContract/signContract.vue
  8. 23
      pages/indexEntry/theory/theory.vue
  9. 44
      pages/indexEntry/theory/webView.vue
  10. 43
      pages/indexEntry/webView/webView.vue
  11. 3
      pages/mineEntry/myOrder/detail/detail.vue
  12. 2
      pages/mineEntry/personaInfo/personaInfo.vue
  13. 4
      pages/mineEntry/refund/comp/myform.vue
  14. 6
      pages/tabbar/index/index.vue
  15. 11
      pages/tabbar/learnCar/comp/subject2.vue
  16. 11
      pages/tabbar/learnCar/comp/subject3.vue
  17. 2
      pages/tabbar/learnCar/comp/topInfo.vue
  18. 7
      pages/tabbar/mine/index.vue
  19. BIN
      static/images/bigImg/h1Active.png
  20. BIN
      static/images/bigImg/homeBg.png
  21. BIN
      static/images/bigImg/indexTopBanner.png
  22. BIN
      static/images/bigImg/loginTopBg.png
  23. BIN
      static/images/bigImg/topBg.png
  24. BIN
      static/images/topBg.png

23
App.vue
View File

@ -42,5 +42,26 @@
<style lang="scss">
/*每个页面公共css */
@import '@/uni_modules/uview-ui/index.scss';
@import 'common/css/app.scss'
@import 'common/css/app.scss';
.pageBgImg {
background: url('./static/images/bigImg/topBg.png') #F6F7FA no-repeat;
background-size: 100% 278rpx;
}
.topBg{
background: url('./static/images/bigImg/topBg.png') #F6F7FA no-repeat;
background-size: 100% 100%;
}
.h1 {
text {
&.active {
&::before {
background: url('./static/images/bigImg/h1Active.png') #F6F7FA no-repeat;
background-size: 100% 100%;
}
}
}
}
</style>

38
androidPrivacy.json
View File

@ -0,0 +1,38 @@
{
"version" : "1",
"prompt" : "template",
"title" : "服务协议和隐私政策",
"message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
"buttonAccept" : "同意并接受",
"buttonRefuse" : "暂不同意",
"hrefLoader" : "system",
"backToExit" : "true",
"second" : {
"title" : "确认提示",
"message" : "　　进入应用前，你需先同意<a href=\"http://file.jaxc.cn/htmls/user.html\">《服务协议》</a>和<a href=\"http://file.jaxc.cn/htmls/y.html\">《隐私政策》</a>，否则将退出应用。",
"buttonAccept" : "同意并继续",
"buttonRefuse" : "退出应用"
},
"disagreeMode" : {
"support" : false,
"loadNativePlugins" : false,
"visitorEntry" : false,
"showAlways" : false
},
"styles" : {
"backgroundColor" : "#fff",
"borderRadius" : "5px",
"title" : {
"color" : "#333"
},
"buttonAccept" : {
"color" : "#333"
},
"buttonRefuse" : {
"color" : "#cccccc"
},
"buttonVisitor" : {
"color" : "#333"
}
}
}

9
common/css/app.scss
View File

@ -42,16 +42,13 @@ view {
.pageBgImg {
font-size: 28rpx;;
color: #333;
background: url('https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/complain/2024-03-18/1710759177684-0') #F6F7FA no-repeat;
background-size: 100% 278rpx;
// background: url('https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/complain/2024-03-18/1710759177684-0') #F6F7FA no-repeat;
// background-size: 100% 278rpx;
min-height: 100vh;
}
.topBg{
background: url('https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/complain/2024-03-18/1710759177684-0') #F6F7FA no-repeat;
background-size: 100% 100%;
}
.pad {
padding: 0 28rpx;

3
common/js/mixins.js
View File

@ -25,8 +25,9 @@ export default {
},1500)
let token = this.$store.state.user.vuex_loginInfo.accessToken
if(token) {
this.$store.dispatch('getCity')
this.$store.dispatch('getUserInfo')
}
this.$store.dispatch('getCity')
},
}

3
manifest.json
View File

@ -112,6 +112,9 @@
"UniversalLinks" : "https://static-mp-87b9fa27-0273-48d3-a586-bd058cd2ce3d.next.bspapp.com/uni-universallinks/__UNI__3347C6E/"
}
}
},
"splashscreen" : {
"useOriginalMsgbox" : true
}
},
"nativePlugins" : {

9
pages.json
View File

@ -266,6 +266,15 @@
}
},
{
"path": "theory/webView",
"style": {
"navigationBarTitleText": "理论学习webview",
"navigationStyle": "custom",
"enablePullDownRefresh": false,
"backgroundTextStyle": "dark"
}
},
{
"path": "consult/consult",
"style": {
"navigationBarTitleText": "咨询投诉",

2
pages/indexEntry/enroll/signContract/signContract.vue
View File

@ -87,6 +87,8 @@
} = await getSignContract(obj)
uni.hideLoading()
this.webViewUrl = res.url
console.log('===============webview地址==================')
console.log(this.webViewUrl)
},
// 查询签约状态

23
pages/indexEntry/theory/theory.vue
View File

@ -24,10 +24,10 @@
return {
radioArr: [
{text: '自学练习', id: 1},
{text: '记录理论学时', id: 2},
{text: '安全警示教育在线视频学习', id: 3},
// {text: '记录理论学时', id: 2},
// {text: '安全警示教育在线视频学习', id: 3},
],
currentId: 2,
currentId: 1,
}
},
onLoad(options) {
@ -38,23 +38,12 @@
this.currentId = item.id
},
goPage() {
return this.$u.toast('待确定！')
// return this.$u.toast('待确定！')
if(this.currentId==1) {
// let url = 'https://www.hzsjspx.com/theory/scienceStudy?token=amlhcGVpMTY5NTc3NzUzODg5ODA5NjU1&lat=30.343055&lng=120.183711&isUni=1'
let questionUrl = website+':93/question/'
let phone = this.vuex_userInfo.phone
let obj = {
phone,
cityCode: '3311',
}
// #ifdef MP-WEIXIN
obj.isWx = 1
// #endif
let uniItem = encodeURIComponent(JSON.stringify(obj))
let url = `${questionUrl}?uniItem=${uniItem}`
console.log(url)
let url =`http://121.41.97.244/question/question?phone=${this.vuex_userInfo.phone}&cityCode=3311&isUni=1`
this.$store.commit('updateWebVeiwUrl', url)
this.$goPage('/pages/indexEntry/webView/webView')
this.$goPage('/pages/indexEntry/theory/webView')
}else if(this.currentId==2) {
let theory = website+':91/theory/'
let token = this.$store.state.user.vuex_loginInfo.accessToken

44
pages/indexEntry/theory/webView.vue
View File

@ -0,0 +1,44 @@
<template>
<view class="pageBg">
<web-view :src="link" :webview-styles="webviewStyles" :update-title="false"></web-view>
</view>
</template>
<script>
let wv
export default {
data() {
return {
webviewStyles: {
progress: {
color: '#3877ff'
},
},
link: ''
}
},
onLoad() {
this.link = this.$store.state.webViewUrl
console.log('webview地址'+ this.$store.state.webViewUrl)
},
onReady() {
let statusBar = uni.getWindowInfo().statusBarHeight
// #ifdef APP-PLUS
let boxHeight = 0
uni.getSystemInfo({
success: res => boxHeight = res.windowHeight // 屏幕可用高度
})
var currentWebview = this.$scope
.$getAppWebview() //此对象相当于html5plus里的plus.webview.currentWebview()。在uni-app里vue页面直接使用plus.webview.currentWebview()无效
setTimeout(function() {
wv = currentWebview.children()[0]
wv.setStyle({
top: statusBar,
height: boxHeight - statusBar
})
}, 1000); //如果是页面初始化调用时，需要延时一下
// #endif
}
}
</script>

43
pages/indexEntry/webView/webView.vue
View File

@ -1,13 +1,11 @@
<template>
<view>
<!-- <topNavbar title="学员报名"></topNavbar> -->
<!-- <web-view :webview-styles="webviewStyles" src="http://192.168.1.44:92/question/?uniItem=%7B%22phone%22%3A%2218267103167%22%2C%22cityCode%22%3A%223311%22%2C%22isUni%22%3A1%7D"></web-view> -->
<web-view :webview-styles="webviewStyles" class="custom-webview" :src="link" :update-title="true"></web-view>
<!-- <iframe src="https://your-h5-url.com" frameborder="0"></iframe> -->
<view class="pageBg">
<web-view :src="link" :webview-styles="webviewStyles" :update-title="false"></web-view>
</view>
</template>
<script>
let wv
export default {
data() {
return {
@ -15,29 +13,32 @@
progress: {
color: '#3877ff'
},
width: '100vw', // 设置 WebView 宽度为100%，占满整个屏幕宽度
height: '100vh', // 设置 WebView 高度为100vh，占满整个屏幕高度
},
link: ''
}
},
onLoad() {
this.link = this.$store.state.webViewUrl
console.log('噜噜哇'+ this.$store.state.webViewUrl)
// http://192.168.1.44:92/question/?uniItem=%7B%22phone%22%3A%2218267103167%22%2C%22cityCode%22%3A%223311%22%2C%22isUni%22%3A1%7D
// uni.hideNavigationBarLoading()
console.log('webview地址'+ this.$store.state.webViewUrl)
},
onReady() {
let statusBar = uni.getWindowInfo().statusBarHeight
// #ifdef APP-PLUS
let boxHeight = 0
uni.getSystemInfo({
success: res => boxHeight = res.windowHeight // 屏幕可用高度
})
var currentWebview = this.$scope
.$getAppWebview() //此对象相当于html5plus里的plus.webview.currentWebview()。在uni-app里vue页面直接使用plus.webview.currentWebview()无效
setTimeout(function() {
wv = currentWebview.children()[0]
wv.setStyle({
top: statusBar,
height: boxHeight - statusBar
})
}, 1000); //如果是页面初始化调用时，需要延时一下
// #endif
}
}
</script>
<style>
.custom-webview::after {
content: none !important; /* 隐藏返回按钮 */
}
.iframe {
display: block;
width: 100vw;
height: 100vh;
}
</style>

3
pages/mineEntry/myOrder/detail/detail.vue
View File

@ -222,6 +222,9 @@
margin-left: 14rpx;
padding: 0 16rpx;
font-size: 24rpx;
height: 72rpx;
line-height: 72rpx;
border-radius: 8rpx;
}
}
}

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

@ -61,7 +61,7 @@
</view>
</view> -->
<!-- <view class="logout" @click="deleteTestClick" style="margin-top: 40rpx;">删除测试账号（开发用的）</view> -->
<view class="logout" @click="deleteTestClick" style="margin-top: 40rpx;">删除测试账号（开发用的）</view>
</view>
<view class="footerBtn">

4
pages/mineEntry/refund/comp/myform.vue
View File

@ -117,7 +117,7 @@
let _this = this
uni.showModal({
title: '确定要提交申请退款吗？',
content: '提交申请后，待教练和驾校审核通过即可收到退款~',
content: '提交申请后，驾校审核通过即可收到退款~',
success: async ()=> {
_this.onsubmit()
}
@ -188,7 +188,7 @@
// 去除空格
cardNumber = cardNumber.replace(/\s/g, '');
// 银行卡号一般为 12-19 位数字
const regex = /^[0-9]{12,19}$/;
const regex = /^[0-9]{10,22}$/;
return regex.test(cardNumber);
},
// 发送短信验证码

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

@ -195,9 +195,9 @@
},
onShow() {
// if(!this.vuex_cityInfo.lat) {
// this.$store.dispatch('getCity')
// }
if(!this.vuex_cityInfo.lat) {
this.$store.dispatch('getCity')
}
let token = this.$store.state.user.vuex_loginInfo.accessToken
if(token) {
this.$store.dispatch('getUserInfo')

11
pages/tabbar/learnCar/comp/subject2.vue
View File

@ -90,18 +90,17 @@
</view> -->
<!-- 预约实操训练 -->
<view class="" v-if="info.operationReservationVO&&info.operationReservationVO.length">
<view class="card" v-for="(item,index) in info.operationReservationVO" :key="index">
<view class="card" v-for="(item,index) in info.operationReservationVO" :key="index" @click.stop="$goPage('/pages/mineEntry/myAppointment/detail/detail?id='+item.reservationId)">
<view class="flex-b padTb">
<view class="lab">科目二实操训练
{{ item.reservationStatus==9?'已取消': reservationStatus[item.reservationStatus]}}</view>
<view class="date">{{ $u.timeFormat(item.joe, 'yyyy-mm-dd hh:MM:ss') }}</view>
<view class="lab">科目二实操训练</view>
<view class="date">{{ item.reservationTime }}</view>
</view>
<view class="bg">
<view class="row oneRowText">预约场地：{{item.reservationAddress}}</view>
<view class="row">预约教练：{{item.reservationCoach}}</view>
<view class="row">预约车辆：{{item.reservationCar}}</view>
<view class="row">预约时间：{{ $u.timeFormat(item.reservationTime, 'yyyy-mm-dd hh:MM:ss') }}</view>
<view class="row" v-if="item.joe">核销时间：{{ $u.timeFormat(item.joe, 'yyyy-mm-dd hh:MM:ss') }}
<view class="row">预约时间：{{ item.createTime }}</view>
<!-- <view class="row" v-if="item.joe">核销时间：{{ $u.timeFormat(item.joe, 'yyyy-mm-dd hh:MM:ss') }} -->
</view>
</view>
</view>

11
pages/tabbar/learnCar/comp/subject3.vue
View File

@ -77,17 +77,18 @@
<!-- 预约实操训练 -->
<view class="" v-if="info.operationReservationVO&&info.operationReservationVO.length">
<view class="card" v-for="(item,index) in info.operationReservationVO" :key="index">
<view class="card" v-for="(item,index) in info.operationReservationVO" :key="index" @click.stop="$goPage('/pages/mineEntry/myAppointment/detail/detail?id='+item.reservationId)">
<view class="flex-b padTb">
<view class="lab">科目三实操训练 {{ item.reservationStatus==9?'已取消': reservationStatus[item.reservationStatus]}}</view>
<view class="date">{{ $u.timeFormat(item.joe, 'yyyy-mm-dd hh:MM:ss') }}</view>
<view class="lab">科目三实操训练</view>
<!-- <view class="lab">科目三实操训练 {{ item.reservationStatus==9?'已取消': reservationStatus[item.reservationStatus]}}</view> -->
<view class="date">{{ item.reservationTime }}</view>
</view>
<view class="bg">
<view class="row oneRowText">预约场地：{{item.reservationAddress}}</view>
<view class="row">预约教练：{{item.reservationCoach}}</view>
<view class="row">预约车辆：{{item.reservationCar}}</view>
<view class="row">预约时间：{{ $u.timeFormat(item.reservationTime, 'yyyy-mm-dd hh:MM:ss') }}</view>
<view class="row" v-if="item.joe">核销时间：{{ $u.timeFormat(item.joe, 'yyyy-mm-dd hh:MM:ss') }}</view>
<view class="row">预约时间：{{ item.createTime }}</view>
<!-- <view class="row" v-if="item.joe">核销时间：{{ $u.timeFormat(item.joe, 'yyyy-mm-dd hh:MM:ss') }}</view> -->
</view>
</view>
</view>

2
pages/tabbar/learnCar/comp/topInfo.vue
View File

@ -55,7 +55,7 @@
</view> -->
</view>
<!-- v-if="dynamics.classHourReachStatus" -->
<view class="timerFlex" v-if="dynamics.classHourReachStatus">
<view class="timerFlex" v-if="dynamics.classHourReachStatus&&dynamics.confirmStatus">
<view class="link-arrow" @click="$goPage('/pages/carEntry/signature/signature?subject='+carType.id)">
<view class="txt">确认学时</view>
<u-icon name="arrow-right" color="#3776FF" :size="16"></u-icon>

7
pages/tabbar/mine/index.vue
View File

@ -72,8 +72,8 @@
{name: '我的评价', icon: require('@/static/images/mineIcon/minIcon (1).png'),url: '/pages/mineEntry/myEvaluate/myEvaluate'},
// {name: '退款申请', icon: require('@/static/images/mineIcon/minIcon (3).png'),url: '/pages/mineEntry/refund/refund'},
// {name: '变更车型', icon: require('@/static/images/mineIcon/minIcon (7).png'),url: '/pages/mineEntry/modelChange/modelChange'},
{name: '同城转校', icon: require('@/static/images/mineIcon/minIcon (5).png'),url: '/pages/mineEntry/schoolTransfer/schoolTransfer'},
// {name: '退款申请记录', icon: require('@/static/images/mineIcon/minIcon (6).png'),url: ''},
// {name: '同城转校', icon: require('@/static/images/mineIcon/minIcon (5).png'),url: '/pages/mineEntry/schoolTransfer/schoolTransfer'},
{name: '隐私政策', icon: require('@/static/images/mineIcon/minIcon (6).png'),url: ''},
{name: '关于我们', icon: require('@/static/images/mineIcon/minIcon (2).png'),url: '/pages/mineEntry/aboutUs/aboutUs'},
]
}
@ -82,6 +82,7 @@
if(this.show) this.show = false
},
methods: {
topClick() {
if(!this.vuex_userInfo.phone) {
this.$goPage('/pages/userCenter/login/login')
@ -92,6 +93,8 @@
goPage(item) {
if(item.name!='关于我们') {
// return this.$goPage('/pages/mineEntry/myForecastName/myForecastName')
// console.log(this.vuex_userInfo.applyStep)
console.log(this.vuex_userInfo.applyStep)
if(item.name=='我的订单'&&this.vuex_userInfo.applyStep>2&&this.vuex_userInfo.applyStep<6) {
return this.$goPage('/pages/mineEntry/myForecastName/myForecastName')
}

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

Side by Side

After

Width: 54  |  Height: 12  |  Size: 667 B

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

Side by Side

After

Width: 750  |  Height: 600  |  Size: 110 KiB

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

Side by Side

After

Width: 750  |  Height: 492  |  Size: 394 KiB

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

Side by Side

After

Width: 375  |  Height: 180  |  Size: 36 KiB

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

Side by Side

After

Width: 750  |  Height: 278  |  Size: 48 KiB

BIN
static/images/topBg.png
View File

Side by Side

After

Width: 750  |  Height: 278  |  Size: 48 KiB

Write Preview
Loading…
Cancel
Save