dianliang/driverSchool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Lx 2025-04-09 14:36:50 +08:00
commit 69ded603ce
9 changed files with 226 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
newPages/courseDetail/assets/style/index.rpx.scss
View File

@ -2,6 +2,7 @@
background-color: rgba(242, 244, 248, 1); background-color: rgba(242, 244, 248, 1);
position: relative; position: relative;
width: 750rpx; width: 750rpx;
min-height: 100vh;
//height: 4112rpx; //height: 4112rpx;
overflow: hidden; overflow: hidden;
.group_1 { .group_1 {
@ -249,8 +250,8 @@
border-radius: 8px; border-radius: 8px;
//height: 2870rpx; //height: 2870rpx;
width: 686rpx; width: 686rpx;
position: relative; //position: relative;
margin: -30rpx 0 0 32rpx; margin: -30rpx 0 160rpx 32rpx;
.section_4 { .section_4 {
width: 148rpx; width: 148rpx;
height: 32rpx; height: 32rpx;
@ -296,6 +297,8 @@
width: 750rpx; width: 750rpx;
height: 136rpx; height: 136rpx;
margin-top: 50rpx; margin-top: 50rpx;
position: absolute;
bottom: 0;
.image-text_1 { .image-text_1 {
width: 80rpx; width: 80rpx;
height: 72rpx; height: 72rpx;

9
newPages/courseDetail/index.vue
View File

@ -35,9 +35,16 @@
<view class="block_3 flex-col"></view> <view class="block_3 flex-col"></view>
<text class="text_10">课程介绍</text> <text class="text_10">课程介绍</text>
</view> </view>
<view class="u-content"> <view class="u-content" v-if="courseDetails.remark">
<u-parse :content="courseDetails.remark"></u-parse> <u-parse :content="courseDetails.remark"></u-parse>
</view> </view>
<view class="u-content" v-else>
<u-empty
mode="list"
text="该课程没有简介..."
>
</u-empty>
</view>
</view> </view>
<view class="group_6 flex-row"> <view class="group_6 flex-row">
<view class="image-text_1 flex-col justify-between" @click="zxkf()"> <view class="image-text_1 flex-col justify-between" @click="zxkf()">

4
newPages/courseList/index.vue
View File

@ -18,14 +18,14 @@
:src="imagesUrl + '/' + item.photo" :src="imagesUrl + '/' + item.photo"
/> />
<view class="text-group_1 flex-col justify-between"> <view class="text-group_1 flex-col justify-between">
<text class="text_3">{{ item.tittle }}</text> <text class="text_3">{{ item.name }}</text>
<view class="text-wrapper_1 flex-row justify-between"> <view class="text-wrapper_1 flex-row justify-between">
<text class="text_4">￥{{ item.price }}</text> <text class="text_4">￥{{ item.price }}</text>
</view> </view>
</view> </view>
<view class="text-wrapper_3 flex-col"> <view class="text-wrapper_3 flex-col">
<view style="display: flex"> <view style="display: flex">
<text class="text_7" style="background-color: rgba(223, 235, 255, 1);padding: 5rpx 15rpx">{{ item.name }}</text> <text class="text_7" style="background-color: rgba(223, 235, 255, 1);padding: 5rpx 15rpx">{{ item.tittle }}</text>
<text class="text-wrapper_2 text_7" style="color: black;padding: 5rpx 15rpx;margin-left: 10rpx">{{ item.type }}</text> <text class="text-wrapper_2 text_7" style="color: black;padding: 5rpx 15rpx;margin-left: 10rpx">{{ item.type }}</text>
</view> </view>
</view> </view>

19
newPages/evaluate/index.vue
View File

@ -7,7 +7,9 @@
</view> </view>
<view class="group_4 flex-col"> <view class="group_4 flex-col">
<view class="list_1 flex-col" v-if="evaluate.length > 0"> <view class="list_1 flex-col" v-if="evaluate.length > 0">
<scroll-view style="height: 1400rpx;" scroll-y="true" class="itemContent" <scroll-view
:style="{ height: scrollHeight + 'px' }"
scroll-y="true" class="itemContent"
@scrolltolower="onReachBottomCus" refresher-enabled @refresherrefresh="onRefresherrefresh" @scrolltolower="onReachBottomCus" refresher-enabled @refresherrefresh="onRefresherrefresh"
:refresher-triggered="isTriggered"> :refresher-triggered="isTriggered">
<view class="list-items_1 flex-col" v-for="(item, index) in evaluate" :key="index" <view class="list-items_1 flex-col" v-for="(item, index) in evaluate" :key="index"
@ -78,6 +80,7 @@
} }
], ],
evaluate: [], evaluate: [],
scrollHeight: 0,
constants: {}, constants: {},
userId: getLocalUserInfo().id, userId: getLocalUserInfo().id,
pageNo: 1, pageNo: 1,
@ -89,6 +92,10 @@
onLoad() { onLoad() {
this.getList() this.getList()
}, },
onReady() {
// 动态计算滚动区域高度
this.calculateScrollHeight();
},
methods: { methods: {
getList() { getList() {
request({ request({
@ -128,6 +135,14 @@
this.getList() this.getList()
} }
}, },
calculateScrollHeight() {
// 获取屏幕高度
const screenHeight = uni.getSystemInfoSync().windowHeight;
// 获取顶部区域高度
const topHeight = 160;
// 计算滚动区域高度
this.scrollHeight = screenHeight - topHeight;
},
/** /**
* 下拉刷新数据 * 下拉刷新数据
*/ */
@ -154,12 +169,14 @@
<style lang='scss'> <style lang='scss'>
@import '../common/common.scss'; @import '../common/common.scss';
@import './assets/style/index.rpx.scss'; @import './assets/style/index.rpx.scss';
.empty-container { .empty-container {
display: flex; display: flex;
justify-content: center; /* 水平居中 */ justify-content: center; /* 水平居中 */
align-items: center; /* 垂直居中 */ align-items: center; /* 垂直居中 */
height: 100vh; /* 或者你需要撑满的高度 */ height: 100vh; /* 或者你需要撑满的高度 */
} }
.text-group_1 { .text-group_1 {
display: inline-block; display: inline-block;
max-width: 4em; /* 一个汉字大概占1em，3em就是三个字 */ max-width: 4em; /* 一个汉字大概占1em，3em就是三个字 */

19
newPages/examinationList/index.vue
View File

@ -1,20 +1,11 @@
<template> <template>
<view class="page flex-col"> <view class="page flex-col">
<view class="block_1 flex-row"> <view style="width: 100%;background: #f4f5f6;box-sizing: border-box;padding-top: 88px;">
<headers titles="考试结果录入">
<uni-icons type="left" color="#000000" size="22px"></uni-icons>
</headers>
</view> </view>
<view class="block_2 flex-col"> <view class="block_2 flex-col">
<view class="box_3 flex-row">
<image
class="label_1"
referrerpolicy="no-referrer"
src="/static/lanhu_kaoshijieguoluru/FigmaDDSSlicePNGacf527a62cbe7351c6472edd8f5b2814.png"
@click="handleBack()"
/>
<text class="text_1">考试结果录入</text>
</view>
<view> <view>
<scroll-view <scroll-view
class="scroll-view" class="scroll-view"
@ -118,8 +109,10 @@
<script> <script>
import {getLocalUserInfo} from '../../utils/auth'; import {getLocalUserInfo} from '../../utils/auth';
import request from '@/utils/request.js' import request from '@/utils/request.js'
import headers from "@/components/header/headers.vue";
export default { export default {
components: {headers},
data() { data() {
return { return {
loopData0: [ loopData0: [

68
newPages/newIndex/index.vue
View File

@ -22,7 +22,7 @@
</view> </view>
<view class="box_4 flex-row justify-between"> <view class="box_4 flex-row justify-between">
<view class="image-text_2 flex-row justify-between"> <view class="image-text_2 flex-row justify-between">
<u-notice-bar direction="column" duration="10000" bgColor="#e9f1ff" color="black" :text="announcement" icon="/static/lanhu_shouye2gai/FigmaDDSSlicePNGd2c17b5f24182e597acbfa50481040c1.png"></u-notice-bar> <u-notice-bar direction="column" duration="10000" bgColor="#e9f1ff" color="black" :text="textList" icon="/static/lanhu_shouye2gai/FigmaDDSSlicePNGd2c17b5f24182e597acbfa50481040c1.png"></u-notice-bar>
</view> </view>
<view class="group_3 flex-col justify-between"> <view class="group_3 flex-col justify-between">
<view class="block_5 flex-col"></view> <view class="block_5 flex-col"></view>
@ -85,61 +85,21 @@ export default {
], ],
swiperList: [], swiperList: [],
msg: "1", msg: "1",
announcement:['ceshi1111','测试111111111111111111111111111111111111111111'],
constants: {}, constants: {},
schoolList: [ schoolList: [],
// {
// imageUrl: '/static/lanhu_jiaxiaoliebiao/FigmaDDSSlicePNG530e91ec069b391e8972e9ed0aeebc58.png',
// corpName: '兄弟驾校',
// status: '未营业',
// time: '08:00-18:00',
// address: '山东省济南市历下区工业南路168号',
// features: ['有接送', '规模大']
// },
// {
// imageUrl: '/static/lanhu_jiaxiaoliebiao/FigmaDDSSlicePNG530e91ec069b391e8972e9ed0aeebc58.png',
// corpName: '兄弟驾校',
// status: '营业中',
// time: '08:00-18:00',
// address: '山东省济南市历下区工业南路168号',
// features: ['有接送', '规模大']
// },
// {
// imageUrl: '/static/lanhu_jiaxiaoliebiao/FigmaDDSSlicePNG530e91ec069b391e8972e9ed0aeebc58.png',
// corpName: '兄弟驾校',
// status: '营业中',
// time: '08:00-18:00',
// address: '山东省济南市历下区工业南路168号',
// features: ['有接送', '规模大']
// },
// {
// imageUrl: '/static/lanhu_jiaxiaoliebiao/FigmaDDSSlicePNG530e91ec069b391e8972e9ed0aeebc58.png',
// corpName: '兄弟驾校',
// status: '营业中',
// time: '08:00-18:00',
// address: '山东省济南市历下区工业南路168号',
// features: ['有接送', '规模大']
// },
// {
// imageUrl: '/static/lanhu_jiaxiaoliebiao/FigmaDDSSlicePNG530e91ec069b391e8972e9ed0aeebc58.png',
// corpName: '兄弟驾校',
// status: '营业中',
// time: '08:00-18:00',
// address: '山东省济南市历下区工业南路168号',
// features: ['有接送', '规模大']
// },
],
//下来刷新状态 //下来刷新状态
isTriggered: false, isTriggered: false,
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
total: 0, total: 0,
imageUrl: this.$imagesUrl imageUrl: this.$imagesUrl,
textList:[]
}; };
}, },
onLoad() { onLoad() {
this.getList() this.getList()
this.getSwiperList() this.getSwiperList()
this.getTextList()
}, },
methods: { methods: {
getList() { getList() {
@ -161,6 +121,24 @@ export default {
this.isTriggered = false this.isTriggered = false
}) })
}, },
/**
* 实时讯息
*/
async getTextList() {
let res = await request({
url: '/app-api/drivingSchool/text/list',
method: 'get',
params: {
pageNum: 1,
pageSize: 10000
}
})
// this.textList = res.data.records
// 将textList中的title拼接成数组赋值给textList
res.data.records.forEach(item => {
this.textList.push(item.title)
})
},
getSwiperList() { getSwiperList() {
request({ request({
url: '/drivingSchool/applet/swiper/list', url: '/drivingSchool/applet/swiper/list',

4
newPages/schoolDetail/index.vue
View File

@ -79,7 +79,7 @@
:src="imagesUrl + '/' + item.photo" :src="imagesUrl + '/' + item.photo"
/> />
<view class="text-group_2 flex-col justify-between"> <view class="text-group_2 flex-col justify-between">
<text class="text_9">{{ item.tittle }}</text> <text class="text_9">{{ item.name }}</text>
<view class="text-wrapper_2 flex-row justify-between"> <view class="text-wrapper_2 flex-row justify-between">
<text class="text_10">￥{{ item.price }}</text> <text class="text_10">￥{{ item.price }}</text>
</view> </view>
@ -90,7 +90,7 @@
<view class="text-wrapper_4 flex-col"> <view class="text-wrapper_4 flex-col">
<view style="display: flex"> <view style="display: flex">
<text class="text_13" style="background-color: rgba(223, 235, 255, 1);padding: 5rpx 15rpx">{{ <text class="text_13" style="background-color: rgba(223, 235, 255, 1);padding: 5rpx 15rpx">{{
item.name item.tittle
}} }}
</text> </text>

10
pages/login/login.vue
View File

@ -11,8 +11,8 @@
<view class="xiaoannoi"> <view class="xiaoannoi">
<u-button v-if="privacyPolicyChecked == true" text="手机号快捷登录" class="dl" :customStyle="{color:'#ffffff'}" <u-button v-if="privacyPolicyChecked == true" text="手机号快捷登录" class="dl" :customStyle="{color:'#ffffff'}"
color="#4AA76F" open-type='getPhoneNumber' @getphonenumber="getPhone"></u-button> color="#2c78f5" open-type='getPhoneNumber' @getphonenumber="getPhone"></u-button>
<u-button v-else text="手机号快捷登录" class="dl" :customStyle="{color:'#ffffff'}" color="#4AA76F" <u-button v-else text="手机号快捷登录" class="dl" :customStyle="{color:'#ffffff'}" color="#2c78f5"
@click="shibai()"></u-button> @click="shibai()"></u-button>
</view> </view>
<view class="dbottom"> <view class="dbottom">
@ -564,14 +564,14 @@ button:focus {
} }
.lan { .lan {
color: #4AA76F; color: #2c78f5;
} }
.land { .land {
font-size: 25px; font-size: 25px;
font-weight: bold; font-weight: bold;
color: #4AA76F; color: #2c78f5;
margin-bottom: 5px; margin-bottom: 5px;
} }
@ -595,6 +595,6 @@ button:focus {
border-radius: 50%; border-radius: 50%;
border: 1px solid #AAAAAA; border: 1px solid #AAAAAA;
margin-right: 5px; margin-right: 5px;
background-color: #4AA76F; background-color: #2c78f5;
} }
</style> </style>

BIN
static/imgs/idphoto.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.8 KiB