Skip to content

tjty-app
tjty-app
Commit 2cb18979 authored by LiZongLin's avatar LiZongLin
Browse files
Options

Merge branch 'dev' of http://gitlab.91isoft.com:90/wyf/tjty-app into dev

parents a2cab1ce c1fa22c1
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 22 deletions
tjty-app/pages_course/tjty_course_application/application.vue
View file @ 2cb18979
...@@ -85,13 +85,13 @@ import { ...@@ -85,13 +85,13 @@ import {
{ {
minLength: 2, minLength: 2,
maxLength: 16, maxLength: 16,
errorMessage: '姓名长度在 {minLength} 到 {maxLength} 个汉字或字母', errorMessage: '姓名长度在 {minLength} 到 {maxLength} 个汉字和字母',
}, },
{ {
validateFunction: function(rule, value, data, callback) { validateFunction: function(rule, value, data, callback) {
let nameReg = /^[A-z]{2,16}$|^[\u4E00-\u9FA5]{2,16}$/ let nameReg = /^[\u4E00-\u9FA5_a-zA-Z]{2,16}$/
if (!nameReg.test(value)) { if (!nameReg.test(value)) {
callback('姓名只能输入汉字或字母，请重新填写') callback('姓名只能输入汉字和字母，请重新填写')
} }
return true return true
} }
......
tjty-app/pages_course/tjty_course_appointment/appointment.vue
View file @ 2cb18979
...@@ -2,12 +2,21 @@ ...@@ -2,12 +2,21 @@
<view class="appoint"> <view class="appoint">
<view class="appoint-card"> <view class="appoint-card">
<swiper circular indicator-dots> <swiper circular v-if="bannerlist.length>1" :indicator-dots="indicatorDot" autoplay="true" interval="3000" duration="500">
<swiper-item v-for="(item,i) in bannerlist ":key="i" > <swiper-item v-for="(item,i) in bannerlist ":key="i" >
<image :src="item"></image> <image :src="item"></image>
</swiper-item> </swiper-item>
</swiper> </swiper>
<swiper circular v-else :indicator-dots="indicatorDots" autoplay="true" interval="3000" duration="500">
<swiper-item v-for="(item,i) in bannerlist ":key="i" >
<image :src="item"></image>
</swiper-item>
</swiper>
<!-- <image :src="appoin.bannerImage" style="border-radius:16px 16px 0 0 " mode=""></image> --> <!-- <image :src="appoin.bannerImage" style="border-radius:16px 16px 0 0 " mode=""></image> -->
<view class="info"> <view class="info">
<view class="item">课程名称:<view class="item_c">{{appoin.courseName|ellipsis}}</view></view> <view class="item">课程名称:<view class="item_c">{{appoin.courseName|ellipsis}}</view></view>
...@@ -36,8 +45,10 @@ ...@@ -36,8 +45,10 @@
return{ return{
bannerlist:[], bannerlist:[],
appoin:{}, appoin:{},
Idscourse: '' Idscourse: '' ,
indicatorDot:true,
indicatorDots:false,
} }
}, },
...@@ -50,6 +61,8 @@ ...@@ -50,6 +61,8 @@
return value return value
} }
}, },
methods: { methods: {
getappoin(id){ getappoin(id){
......
tjty-app/pages_course/tjty_course_course/course.vue
View file @ 2cb18979
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="margin-left: 45%;margin-bottom: 20px;" @tap="more" v-show="total >= queryParams.pageNum * queryParams.pageSize">加载更多~</view> <view style="margin-left: 40%;margin-bottom: 20px;color: #666666;" @tap="more" v-show="total >= queryParams.pageNum * queryParams.pageSize">加载更多~</view>
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="margin-left: 45%;margin-bottom: 20px;" @tap="more" v-show="total >= queryParams.pageNum * queryParams.pageSize">加载更多~</view> <view style="margin-left: 40%;margin-bottom: 20px;color: #666666;" @tap="more" v-show="total >= queryParams.pageNum * queryParams.pageSize">加载更多~</view>
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="margin-left: 45%;margin-bottom: 20px;" @tap="more" v-show="total >= queryParams.pageNum * queryParams.pageSize">加载更多~</view> <view style="margin-left: 40%;margin-bottom: 20px;color: #666666;" @tap="more" v-show="total >= queryParams.pageNum * queryParams.pageSize">加载更多~</view>
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="margin-left: 45%;margin-bottom: 20px;" @tap="more" v-show="total >= queryParams.pageNum * queryParams.pageSize">加载更多~</view> <view style="margin-left: 40%;margin-bottom: 20px;color: #666666;" @tap="more" v-show="total >= queryParams.pageNum * queryParams.pageSize">加载更多~</view>
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="margin-left: 45%;margin-bottom: 20px;" @tap="more" v-show="total >= queryParams.pageNum * queryParams.pageSize">加载更多~</view> <view style="margin-left: 40%;margin-bottom: 20px;color: #666666;" @tap="more" v-show="total >= queryParams.pageNum * queryParams.pageSize">加载更多~</view>
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
......
tjty-app/pages_my/my/my.vue
View file @ 2cb18979
...@@ -215,6 +215,7 @@ ...@@ -215,6 +215,7 @@
height: 299px; height: 299px;
position: relative; position: relative;
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden;
.home{ .home{
......
tjty-app/pages_my/my_course/myCourse.vue
View file @ 2cb18979
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<view class="item">上课地点:&nbsp;&nbsp;{{item.mechanismAddress|ellipsis}}</view> <view class="item">上课地点:&nbsp;&nbsp;{{item.mechanismAddress|ellipsis}}</view>
</view> </view>
</view> </view>
<view style="margin-left: 35%;margin-bottom: 20px;" @tap="more" v-show="total >= queryParams.pageNum * queryParams.pageSize">点击加载更多...</view> <view style="margin-left: 40%;margin-bottom: 20px;color: #666666;margin-top: 20px;" @tap="more" v-show="total >= queryParams.pageNum * queryParams.pageSize">加载更多~</view>
</view> </view>
</template> </template>
......
tjty-app/pages_new_media/tity_message_consult/tity_message_consult.vue
View file @ 2cb18979
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
<uni-forms ref="form" :modelValue="personnel" label-position="top"> <uni-forms ref="form" :modelValue="personnel" label-position="top">
<uni-forms-item name="consultContent"> <uni-forms-item name="consultContent">
<uni-easyinput type="textarea" :inputBorder="false" v-model="personnel.consultContent" <uni-easyinput type="textarea" :inputBorder="false" v-model="personnel.consultContent"
placeholder="请输入留言内容" :trim="both" @focus="contentFlag = false" /> placeholder="请输入留言内容" :trim="both" @focus="contentFlag = false" maxlength="140" />
<view v-if="contentFlag" class="contentVerify">内容不能为空格或回车</view> <view v-if="contentFlag" class="contentVerify">内容不能为空格或回车</view>
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="姓名" :required="true" name="nickName"> <uni-forms-item label="姓名" :required="true" name="nickName">
<uni-easyinput :inputBorder="false" type="text" v-model="personnel.nickName" <uni-easyinput :inputBorder="false" type="text" v-model="personnel.nickName" maxlength="16"
maxlength="10" placeholder="请输入姓名" /> placeholder="请输入姓名" />
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="手机号" :required="true" name="phone"> <uni-forms-item label="手机号" :required="true" name="phone">
<uni-easyinput :inputBorder="false" type="text" v-model="personnel.phone" maxlength="11" <uni-easyinput :inputBorder="false" type="text" v-model="personnel.phone" maxlength="11"
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
contentFlag: false, contentFlag: false,
url: '', url: '',
personnel: { personnel: {
consultType:'', consultType: '',
consultContent: '', consultContent: '',
nickName: '', nickName: '',
phone: '', phone: '',
...@@ -88,12 +88,13 @@ ...@@ -88,12 +88,13 @@
{ {
validateFunction: function(rule, value, data, callback) { validateFunction: function(rule, value, data, callback) {
console.log("姓名--》", value) console.log("姓名--》", value)
// 只能输入字母或者汉字，二选一
let nameReg =/^[\u4E00-\u9FA5]{2,16}$|^[a-zA-Z]{2,16}$/ // let nameReg =/^[\u4E00-\u9FA5]{2,16}$|^[a-zA-Z]{2,16}$/
// let nameReg2 =// // 只能输入字母或者汉字，字母和汉字可以混一起
let nameReg = /^[a-zA-Z \u4E00-\u9FA5]{2,16}$/
if (!nameReg.test(value)) { if (!nameReg.test(value)) {
callback('姓名只能输入汉字或者大小写字母，请重新填写') callback('姓名只能输入汉字或者大小写字母，请重新填写')
} }
return true return true
} }
......
tjty-app/pages_new_media/tity_upload_port/tity_upload_port.vue
View file @ 2cb18979
...@@ -116,7 +116,8 @@ ...@@ -116,7 +116,8 @@
// 活动需要的作品形式（1--图片， 2--视频） // 活动需要的作品形式（1--图片， 2--视频）
fileType: '1', fileType: '1',
url: 'https://www.aiwanyundong.com/api/tjt-activity/picture/addPicture', // url: 'https://www.aiwanyundong.com/api/tjt-activity/picture/addPicture',
url: 'https://www.aiwanyundong.com/stage-api/tjt-activity/picture/addPicture',
clearIcon: '../../static/upload-img-icons/conteng_icon_del.png', clearIcon: '../../static/upload-img-icons/conteng_icon_del.png',
selectfile: 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cmVjdCB4PSIuMjUiIHk9Ii4yNSIgd2lkdGg9IjYzLjUiIGhlaWdodD0iNjMuNSIgcng9IjMuNzUiIGZpbGw9IiNGMkYyRjIiIHN0cm9rZT0iI0YyRjJGMiIgc3Ryb2tlLXdpZHRoPSIuNSIvPjxyZWN0IHg9IjE2IiB5PSIzMSIgd2lkdGg9IjMyIiBoZWlnaHQ9IjIiIHJ4PSIxIiBmaWxsPSIjQkZCRkJGIi8+PHJlY3QgeD0iMzMiIHk9IjE2IiB3aWR0aD0iMzIiIGhlaWdodD0iMiIgcng9IjEiIHRyYW5zZm9ybT0icm90YXRlKDkwIDMzIDE2KSIgZmlsbD0iI0JGQkZCRiIvPjwvc3ZnPg==', selectfile: 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cmVjdCB4PSIuMjUiIHk9Ii4yNSIgd2lkdGg9IjYzLjUiIGhlaWdodD0iNjMuNSIgcng9IjMuNzUiIGZpbGw9IiNGMkYyRjIiIHN0cm9rZT0iI0YyRjJGMiIgc3Ryb2tlLXdpZHRoPSIuNSIvPjxyZWN0IHg9IjE2IiB5PSIzMSIgd2lkdGg9IjMyIiBoZWlnaHQ9IjIiIHJ4PSIxIiBmaWxsPSIjQkZCRkJGIi8+PHJlY3QgeD0iMzMiIHk9IjE2IiB3aWR0aD0iMzIiIGhlaWdodD0iMiIgcng9IjEiIHRyYW5zZm9ybT0icm90YXRlKDkwIDMzIDE2KSIgZmlsbD0iI0JGQkZCRiIvPjwvc3ZnPg==',
VideoOfImagesShow: true, // 页面图片或视频数量超出后，拍照按钮隐藏 VideoOfImagesShow: true, // 页面图片或视频数量超出后，拍照按钮隐藏
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment