Skip to content

X
XBRL-PX
提交 853f0230 authored 作者: 刘旭's avatar 刘旭
浏览文件
操作

更新代码

上级 319e9296
显示空白字符变更
内嵌 并排
正在显示 包含 69 行增加 和 52 行删除
src/pages/class/components/classItem.vue
浏览文件 @ 853f0230
......@@ -38,7 +38,7 @@
:percent="percent ? percent : 0"
:show-percent="false"
:height="20"
style="margin-top: 10rpx"
style="margin-top: 10rpx; margin-left: 0"
/>
<view class="progress">
{{
......@@ -53,7 +53,7 @@
<view class="class-teacher item">
<text>班主任：</text>
<view>
<view style="flex: 1; display: flex; flex-wrap: wrap">
<view
v-for="(item, index) in classItem.Management"
:key="index"
......@@ -70,7 +70,7 @@
<view class="class-footer">
<view class="info-button" @tap="classQrCode"> 班级二维码 </view>
<view class="info-button" @tap="toAddressBook"> 班级通讯录 </view>
<view class="button" @tap="toCourseArrange"> 课程安排 </view>
<view class="button" @tap="toCourseArrange"> 课程安排</view>
</view>
</template>
</u-card>
......@@ -174,10 +174,6 @@ const toEvaluate = () => {
color: rgba(34, 34, 34, 0.9);
}
text:first-child {
width: 160rpx;
}
text:last-child {
flex: 1;
}
......@@ -205,12 +201,16 @@ const toEvaluate = () => {
color: #3b99fc;
}
}
.u-progress {
margin-left: 0;
}
.class-teacher {
display: flex;
align-items: center;
align-items: flex-start;
margin-top: 16rpx;
text {
width: 140rpx;
}
.btn {
height: 56rpx;
padding: 14rpx 36rpx 14rpx 14rpx;
......@@ -220,6 +220,7 @@ const toEvaluate = () => {
display: flex;
align-items: center;
justify-content: center;
margin: 0 12rpx 12rpx 0;
.u-image {
margin-right: 6rpx;
......
src/pages/course/components/courseItem.vue
浏览文件 @ 853f0230
......@@ -165,7 +165,7 @@
<view class="class-teacher item">
<text>班主任：</text>
<view>
<view style="display: flex; flex-wrap: wrap; flex: 1">
<u-button
v-for="(item, index) in courseItem.Management"
:key="index"
......@@ -696,8 +696,10 @@ const collapseChange = (e: any) => {
.class-teacher {
display: flex;
align-items: center;
align-items: flex-start;
text {
width: 140rpx;
}
.u-tag {
margin-right: 20rpx;
}
......
src/pages/myAttendance/components/attendanceDetailsItem.vue
浏览文件 @ 853f0230
......@@ -154,7 +154,7 @@
<view class="class-teacher item">
<text>班主任：</text>
<view>
<view style="display: flex; flex-wrap: wrap; flex: 1">
<u-button
v-for="(item, index) in courseItem.Management"
:key="index"
......@@ -678,8 +678,10 @@ const collapseChange = (e: any) => {
.class-teacher {
display: flex;
align-items: center;
align-items: flex-start;
text {
width: 140rpx;
}
.u-tag {
margin-right: 20rpx;
}
......
src/pages/myAttendance/components/myAttendanceItem.vue
浏览文件 @ 853f0230
......@@ -24,7 +24,7 @@
:percent="percent ? percent : 0"
:show-percent="false"
:height="20"
style="margin-top: 10rpx"
style="margin-top: 10rpx; margin-left: 0"
/>
<view class="progress">
{{
......@@ -39,7 +39,7 @@
<view class="myAttendance-teacher item">
<text>班主任：</text>
<view>
<view style="display: flex; flex-wrap: wrap; flex: 1">
<view
v-for="(item, index) in myAttendanceItem.Management"
:key="index"
......@@ -198,14 +198,6 @@ const collapseChange = (e: any) => {
font-weight: 400;
color: rgba(34, 34, 34, 0.9);
}
text:first-child {
width: 160rpx;
}
text:last-child {
flex: 1;
}
}
.myAttendance-progress {
......@@ -233,9 +225,11 @@ const collapseChange = (e: any) => {
.myAttendance-teacher {
display: flex;
align-items: center;
align-items: flex-start;
margin-top: 16rpx;
text {
width: 140rpx;
}
.btn {
height: 56rpx;
padding: 14rpx 36rpx 14rpx 14rpx;
......@@ -245,6 +239,7 @@ const collapseChange = (e: any) => {
display: flex;
align-items: center;
justify-content: center;
margin: 0 12rpx 12rpx 0;
.u-image {
margin-right: 6rpx;
......
src/pages/trainRegistration/components/applicationPopup.vue
浏览文件 @ 853f0230
......@@ -9,6 +9,7 @@
>
<view class="fill">
<h3 class="fill-title">填写报名信息</h3>
<scroll-view style="max-height: 760rpx" :scroll-y="true">
<u-form :label-width="240">
<u-form-item
v-show="trainItem.fsFillRiding === 'true'"
......@@ -78,7 +79,10 @@
v-model="saveData.parmeters.Model.F_LQKJ_Entity[0].FText"
type="textarea"
/></u-form-item>
<u-form-item label="证件类型" prop=""
<u-form-item
v-show="trainItem.FIdCardCheckBox === 'true'"
label="证件类型"
prop=""
><u-input
v-model="form.idCard"
type="select"
......@@ -87,12 +91,15 @@
/></u-form-item>
<u-form-item v-if="form.idCard" label="证件类型" prop=""
><u-input
v-model="saveData.parmeters.Model.F_LQKJ_Entity[0].FText1"
v-model="saveData.parmeters.Model.F_LQKJ_Entity[0].FIdcard"
:placeholder="`请输入${
form.idCard === '港澳同胞回乡证' ? '港澳同胞回乡证' : '居民身份证'
form.idCard === '港澳同胞回乡证'
? '港澳同胞回乡证'
: '居民身份证'
}`"
/></u-form-item>
</u-form>
</scroll-view>
<view style="margin-top: 30rpx">
<u-button @tap="application" type="primary" size="medium"
>报名</u-button
......@@ -206,7 +213,8 @@ const saveData: any = ref({
FNumber: "",
},
FText: "",
FText1: "",
FIdcardType: "",
FIdcard: "",
FIsRiding: false,
FIsArrangeRoom: false,
FIsCohabit: false,
......@@ -260,17 +268,26 @@ const selectConfirm = (val: any) => {
const selectConfirm1 = (val: any) => {
form.value.idCard = val[0].label;
saveData.value.parmeters.Model.F_LQKJ_Entity[0].FIdcardType;
};
// 报名
const application = async () => {
const { FNumber, FText1 } = saveData.value.parmeters.Model.F_LQKJ_Entity[0];
if (!isFText.value && !FNumber && props.trainItem.fisFillInfo === "true")
const { FStreet, FIdcard, FText } =
saveData.value.parmeters.Model.F_LQKJ_Entity[0];
if (
!isFText.value &&
!FStreet.FNumber &&
props.trainItem.fisFillInfo === "true"
)
return toast("请选择个人信息");
if (isFText.value && !FText) return toast("请填写个人信息自定义内容");
if (!form.value.idCard) return toast("请选择证件类型");
if (!FText1) return toast("证件号不能为空");
if (!uniA.$u.test.idCard(FText1) && form.value.idCard === "居民身份证")
if (!FIdcard && form.value.idCard) return toast("证件号不能为空");
if (!uniA.$u.test.idCard(FIdcard) && form.value.idCard === "居民身份证")
return toast("居民身份证格式不正确");
console.log(saveData.value.parmeters.Model.F_LQKJ_Entity[0]);
const { data: res }: any = await signUp(saveData.value);
if (res.code == 200) {
initTrain();
......
src/pagesTeach/class/components/classItem.vue
浏览文件 @ 853f0230
......@@ -27,7 +27,7 @@
:percent="percent ? percent : 0"
:show-percent="false"
:height="20"
style="margin-top: 10rpx"
style="margin-top: 10rpx; margin-left: 0"
/>
<view class="progress">
{{
......@@ -41,7 +41,7 @@
</view>
<view class="class-teacher item">
<text>班主任：</text>
<view>
<view style="display: flex; flex-wrap: wrap; flex: 1">
<view
v-for="(item, index) in classItem.Management"
:key="index"
......@@ -159,14 +159,6 @@ const toEvaluate = () => {
font-weight: 400;
color: rgba(34, 34, 34, 0.9);
}
text:first-child {
width: 160rpx;
}
text:last-child {
flex: 1;
}
}
.class-progress {
......@@ -194,8 +186,10 @@ const toEvaluate = () => {
.class-teacher {
display: flex;
align-items: center;
align-items: flex-start;
text {
width: 140rpx;
}
.btn {
height: 56rpx;
padding: 14rpx 36rpx 14rpx 14rpx;
......@@ -205,6 +199,7 @@ const toEvaluate = () => {
display: flex;
align-items: center;
justify-content: center;
margin: 0 12rpx 12rpx 0;
.u-image {
margin-right: 6rpx;
......
src/pagesTeach/setPositioning/index.vue
浏览文件 @ 853f0230
......@@ -108,7 +108,7 @@ const init = async () => {
if (res.code == 200) {
if (res.total > 10) status.value = "loadmore";
else status.value = "nomore";
positionList.value = [...positionList.value, ...res.data];
positionList.value = [...positionList.value, ...(res.data || [])];
listQuery.total = res.total;
// console.log(positionList.value)
}
......
src/pagesTeach/teachPoints/index.vue
浏览文件 @ 853f0230
......@@ -76,7 +76,7 @@ const init = async () => {
else status.value = "nomore";
teachPointsList.value = [...teachPointsList.value, ...(res.data || [])];
listQuery.total = res.total;
console.log(teachPointsList.value);
// console.log(teachPointsList.value);
} else status.value = "nomore";
};
......
src/scss/common.scss
浏览文件 @ 853f0230
......@@ -85,7 +85,12 @@
font-size: 28rpx;
}
.body > view:first-child {
flex: 1;
}
.courseware {
width: 110rpx;
display: flex;
flex-direction: column;
align-items: center;
......
vite.config.ts
浏览文件 @ 853f0230
......@@ -63,9 +63,9 @@ export default defineConfig({
proxy: {
"/k3cloud": {
// target: 'https://weixin.lingqingkeji.com:86/',
target: "http://192.168.1.168/",
// target: "http://192.168.1.66/",
// target: "http://14.29.230.199:81/",
// target: "http://192.168.1.61/",
target: "http://192.168.1.61/",
secure: false,
},
},
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论