Skip to content

tjty-app
tjty-app
Commit c13aa574 authored by 王宝峰's avatar 王宝峰
Browse files
Options

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

 Conflicts:
	tjty-app/pages_new_media/tity_new_media/tity_new_media.vue
parents db0219b5 b454c8c7
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 107 deletions
tjty-app/pages_course/tjty_course_application/application.vue
View file @ c13aa574
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
<view class="Info"> <view class="Info">
<uni-forms ref="form" border :model="formInfo" :modelValue="formInfo"> <uni-forms ref="form" border :model="formInfo" :modelValue="formInfo">
<uni-forms-item label="姓名" required name="name"> <uni-forms-item label="姓名" required name="name">
<uni-easyinput :inputBorder="false" v-model="formInfo.name" placeholder="请输入姓名" <uni-easyinput :inputBorder="false" v-model="formInfo.name" placeholder="请输入姓名"
:clearable="false"></uni-easyinput> maxlength="16" learable="false"></uni-easyinput>
</uni-forms-item> </uni-forms-item>
<uni-forms-item label="性别" required name="sex"> <uni-forms-item label="性别" required name="sex">
<picker @change="sexPickerChange" :value="index" :range="array" range-key="name"> <picker @change="sexPickerChange" :value="index" :range="array" range-key="name">
......
tjty-app/pages_course/tjty_course_appointment/appointment.vue
View file @ c13aa574
...@@ -115,8 +115,8 @@ ...@@ -115,8 +115,8 @@
.appoint-card-ainfo{ .appoint-card-ainfo{
// margin: ; // margin: ;
margin-left: 50px; // margin-left: 50px;
padding: 5% 5% 0 5%;
font-size: 16px; font-size: 16px;
font-family: Source Han Sans CN, Source Han Sans CN-Regular; font-family: Source Han Sans CN, Source Han Sans CN-Regular;
font-weight: 400; font-weight: 400;
......
tjty-app/pages_course/tjty_course_course/course.vue
View file @ c13aa574
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="bottomAdd" v-show="total >= max" @tap="more">查看更多</view> <view style="margin-left: 35%;margin-bottom: 20px;" @tap="more" v-show="total >= queryParams.pageNum * queryParams.pageSize">点击加载更多...</view>
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="margin-left: 35%;margin-bottom: 20px;" @tap="more" v-show="total >= queryParams.pageNum * queryParams.pageSize">点击加载更多...</view>
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
...@@ -131,6 +132,7 @@ ...@@ -131,6 +132,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="margin-left: 35%;margin-bottom: 20px;" @tap="more" v-show="total >= queryParams.pageNum * queryParams.pageSize">点击加载更多...</view>
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
...@@ -170,6 +172,7 @@ ...@@ -170,6 +172,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="margin-left: 35%;margin-bottom: 20px;" @tap="more" v-show="total >= queryParams.pageNum * queryParams.pageSize">点击加载更多...</view>
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
...@@ -210,6 +213,7 @@ ...@@ -210,6 +213,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="margin-left: 35%;margin-bottom: 20px;" @tap="more" v-show="total >= queryParams.pageNum * queryParams.pageSize">点击加载更多...</view>
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </swiper-item>
...@@ -242,7 +246,8 @@ ...@@ -242,7 +246,8 @@
}, },
data() { data() {
return { return {
max:5, max:10,
f:10,
// token:uni.getStorageSync("token"), // token:uni.getStorageSync("token"),
onMore: true, onMore: true,
loadStatus:'loading', loadStatus:'loading',
...@@ -334,15 +339,11 @@ ...@@ -334,15 +339,11 @@
onLoad() { onLoad() {
this.login() this.login()
this.list(1, this.queryParams.pageNum) this.list(1, this.queryParams.pageNum)
// this.getList() // this.getList()
}, },
// onReachBottom(){ //上拉触底函数
// if(!this.isLoadMore){ //此处判断，上锁，防止重复请求
// this.isLoadMore=true
// this.page+=1
// this.list()
// }},
methods: { methods: {
more() { more() {
...@@ -376,30 +377,6 @@ ...@@ -376,30 +377,6 @@
} }
}, },
//下拉刷新
// refresh() {
// this.triggered = true;
// //重置关键数据
// this.queryParams.pageNum = 1
// this.total = 0
// // this.queryParams.pageSize = 10
// this.isloading = false
// this.ByTypelist = []
// this.onMore = true
// //重新发起数据请求
// this.list()
// // this.triggered = false
// setTimeout(() => {
// this.triggered = false
// }, 1000);
// },
//获取更新token //获取更新token
getWXUserCode() { getWXUserCode() {
console.log(this.token); console.log(this.token);
...@@ -419,40 +396,11 @@ ...@@ -419,40 +396,11 @@
} }
}); });
}, },
// ReachBottom() {
// if (this.queryParams.pageNum * this.queryParams.pageSize >= this.total)
// return uni.$showMsg('数据加载完毕！')
// // if (this.isloading) return
// //让页码自增1
// this.queryParams.pageNum += 1
// console.log(this.queryParams.pageNum)
// // 重新获取列表数据
// this.flag = false
// this.list(this.type, this.queryParams.pageNum)
// },
// lowerBottom() {
// // console.log('触底加载更多');
// if (this.isloading) return
// if (!this.onMore) {
// uni.showToast({
// title: '没有更多数据了',
// icon: "none"
// })
// return
// }
// this.queryParams.pageNum += 1
// this.list(id,this.queryParams.pageNum)
// },
toAppoint(item) { toAppoint(item) {
uni.navigateTo({ uni.navigateTo({
url: '/pages_course/tjty_course_appointment/appointment?id=' + item.courseId url: '/pages_course/tjty_course_appointment/appointment?id=' + item.courseId
}) })
}, },
// 获取标题区域宽度，和每个子元素节点的宽度以及元素距离左边栏的距离 // 获取标题区域宽度，和每个子元素节点的宽度以及元素距离左边栏的距离
getScrollW() { getScrollW() {
const query = uni.createSelectorQuery().in(this); const query = uni.createSelectorQuery().in(this);
...@@ -710,7 +658,7 @@ ...@@ -710,7 +658,7 @@
.bottomAdd { .bottomAdd {
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-left: 50%;
color: rgb(94, 94, 94); color: rgb(94, 94, 94);
padding-bottom: 10px; padding-bottom: 10px;
} }
......
tjty-app/pages_my/myActicity/myActivity.vue
View file @ c13aa574
...@@ -25,14 +25,16 @@ ...@@ -25,14 +25,16 @@
<view class="info"> <view class="info">
<view class="question"> <view class="question">
<text>{{item.activityName}}</text> <text>{{item.activityName}}</text>
<view class="item1"> <!-- <view class="item1"> -->
<image class="image-status" src="../../static/oper-icon/content_tag_weikaishi@2x.png" <image class="image-status" src="../../static/oper-icon/content_tag_weikaishi@2x.png"
v-if="item.activityStatus==='0'"></image> v-if="item.activityStatus==='0'"></image>
<image class="image-status" src="../../static/oper-icon/content_tag_jinxingzhong@2x.png" <image class="image-status" src="../../static/oper-icon/content_tag_jinxingzhong@2x.png"
v-else-if="item.activityStatus==='1'"></image> v-else-if="item.activityStatus==='1'"></image>
<image class="image-status" src="../../static/oper-icon/content_tag_yijieshu@2x.png" v-else> <image class="image-status" src="../../static/oper-icon/content_tag_yijieshu@2x.png" v-else>
</image> </image>
</view>
<!-- </view> -->
</view> </view>
<dividerface></dividerface> <dividerface></dividerface>
...@@ -67,6 +69,10 @@ ...@@ -67,6 +69,10 @@
import { import {
getMyActivitySignupByWechatId getMyActivitySignupByWechatId
} from "@/api/myActivity.js"; } from "@/api/myActivity.js";
import {
getSinInInfo
} from "@/api/activity.js";
import { import {
userInfo userInfo
} from 'os'; } from 'os';
...@@ -77,6 +83,7 @@ ...@@ -77,6 +83,7 @@
status: 1, status: 1,
myActivitylist: [], myActivitylist: [],
total: 0, total: 0,
signInList: []
} }
}, },
computed: { computed: {
...@@ -84,7 +91,9 @@ ...@@ -84,7 +91,9 @@
}, },
onLoad() { onLoad() {
this.wechatId = this.userInfo.wechatId this.wechatId = this.userInfo.wechatId
this.getList(this.wechatId) this.getList(this.wechatId)
// this.getlista(this.wechatId,this.activityId)
}, },
methods: { methods: {
getList(wechatId) { getList(wechatId) {
...@@ -96,6 +105,14 @@ ...@@ -96,6 +105,14 @@
console.log(this.total) console.log(this.total)
}); });
}, },
// getlista(wechatId,activityId){
// getSinInInfo(wechatId,activityId).then(response=>{
// console.log("jkbnj",response)
// this.signInList =[...this.signInList, ...response.rows] || []
// })
// },
goActivity(type, wechatId, activityId) { goActivity(type, wechatId, activityId) {
if (type === '1') { if (type === '1') {
...@@ -114,9 +131,15 @@ ...@@ -114,9 +131,15 @@
}, },
goDetail(type, wechatId, activityId){ goDetail(type, wechatId, activityId){
if(type==='2'){ if(type==='2'){
uni.navigateTo({ // uni.navigateTo({
url: `/pages_events/tjty_ans_detail/tjty_ans_detail?activityId=${activityId}` // url: `/pages_events/tjty_ans_detail/tjty_ans_detail?activityId=${activityId}`
// })
getSinInInfo(wechatId,activityId).then(response=>{
console.log("jkbnj",response)
this.signInList =response.data
}) })
} }
else{ else{
uni.navigateTo({ uni.navigateTo({
...@@ -146,7 +169,18 @@ ...@@ -146,7 +169,18 @@
border-radius: 16px; border-radius: 16px;
box-shadow: 0px 3px 10px 0px #dddddd; box-shadow: 0px 3px 10px 0px #dddddd;
.image-status {
position: relative;
// top: -120rpx;
left: 82%;
width: 120rpx;
height: 120rpx;
z-index: 4;
}
// :nth-child(1) { // :nth-child(1) {
...@@ -161,7 +195,17 @@ ...@@ -161,7 +195,17 @@
color: #333333; color: #333333;
line-height: 36px; line-height: 36px;
.question {
margin-top: 5%;
margin: 2% 18% 0 5%;
min-height: 72px;
height: auto;
line-height: 30px;
font-size: 18px;
font-family: Source Han Sans CN, Source Han Sans CN-Regular;
}
.item { .item {
...@@ -178,35 +222,26 @@ ...@@ -178,35 +222,26 @@
} }
.item1 { .item1 {
// padding: 5% 5%; padding: 5% 5%;
// font-size: 35rpx; font-size: 35rpx;
// font-family: Source Han Sans CN, Source Han Sans CN-Regular; font-family: Source Han Sans CN, Source Han Sans CN-Regular;
// font-weight: 200; font-weight: 200;
// color: #333333; color: #333333;
.image-status { // .image-status {
position: relative; // position: relative;
top: -60rpx; // top: -90rpx;
left: 98%; // left: 98%;
width: 120rpx; // width: 120rpx;
height: 120rpx; // height: 120rpx;
z-index: 9; // z-index: 9;
} // }
} }
} }
.question {
margin-top: 5%;
margin: 2% 15% 0 5%;
min-height: 72px;
height: auto;
line-height: 30px;
font-size: 18px;
font-family: Source Han Sans CN, Source Han Sans CN-Regular;
}
} }
......
tjty-app/pages_my/my_course/myCourse.vue
View file @ c13aa574
...@@ -23,6 +23,7 @@ ...@@ -23,6 +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> </view>
</template> </template>
...@@ -38,7 +39,7 @@ import { userInfo } from 'os' ...@@ -38,7 +39,7 @@ import { userInfo } from 'os'
export default { export default {
data(){ data(){
return{ return{
max:10,
wechatId:"", wechatId:"",
AppointmentList:[], AppointmentList:[],
queryParams: { queryParams: {
...@@ -69,6 +70,22 @@ import { userInfo } from 'os' ...@@ -69,6 +70,22 @@ import { userInfo } from 'os'
} }
}, },
methods:{ methods:{
more() {
this.max += 10; //每次点击加1条
if (this.queryParams.pageNum * this.queryParams.pageSize >= this.total)
return uni.$showMsg('数据加载完毕！')
// if (this.isloading) return
//让页码自增1
this.queryParams.pageNum += 1
console.log(this.queryParams.pageNum)
// 重新获取列表数据
this.flag = false
this.getList(this.wechatId, this.queryParams.pageNum)
},
getList(wechatId,pageNum) { getList(wechatId,pageNum) {
listByWid(wechatId,pageNum).then(response => { listByWid(wechatId,pageNum).then(response => {
console.log(response) console.log(response)
...@@ -142,5 +159,8 @@ import { userInfo } from 'os' ...@@ -142,5 +159,8 @@ import { userInfo } from 'os'
height: 334rpx; height: 334rpx;
} }
} }
</style> </style>
\ No newline at end of file
tjty-app/pages_new_media/tity_new_media/tity_new_media.vue
View file @ c13aa574
<template> <template>
<view> <view>
<noData v-if="flag == 0"></noData> <noData v-if="flag == 0"></noData>
<uni-card class="newMedia-card-main" v-if="flag == 1"> <uni-card class="newMedia-card-main" v-if="flag == 1">
<text class="title-text">{{!issue.titleName ? '--' : issue.titleName}}</text> <text class="title-text">{{!issue.titleName ? '--' : issue.titleName}}</text>
<view class="message-view"> <view class="message-view">
<text style="color: #3B7CDE">{{!issueBranch ? "--" : issueBranch}}</text> <text style="color: #3B7CDE">{{!issueBranch ? "--" : issueBranch}}</text>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
detail: '', detail: '',
pushTime: '', pushTime: '',
base_url: 'https://www.aiwanyundong.com/api', base_url: 'https://www.aiwanyundong.com/api',
// base_url: 'http://192.168.0.97:8080', // base_url: 'http://192.168.0.97:8080',
flag: '', flag: '',
// 查询参数 // 查询参数
isloading: false, isloading: false,
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
/* margin-bottom: 166px; */ /* margin-bottom: 166px; */
transform: translateX(-12rpx); transform: translateX(-12rpx);
} }
.newMedia-button-view { .newMedia-button-view {
display: flex; display: flex;
/* margin-bottom: 50rpx; */ /* margin-bottom: 50rpx; */
......
tjty-app/pages_service/tjty_customer/tjty_customer.vue
View file @ c13aa574
...@@ -13,11 +13,13 @@ ...@@ -13,11 +13,13 @@
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<noData v-if="customerList.length === 0" :style="fullHeight"></noData> <noData v-if="!customerListLength" :style="fullHeight"></noData>
<!-- 选项卡内容轮播滑动显示，current为当前第几个swiper子项 --> <!-- 选项卡内容轮播滑动显示，current为当前第几个swiper子项 -->
<swiper @change="change" :current="isActive" class="swiper-content" :style="fullHeight" <!-- <swiper @change="change" :current="isActive" class="swiper-content" :style="fullHeight"
v-if="customerList.length !== 0"> v-if="customerList.length !== 0">
<swiper-item class="swiperitem-content"> <swiper-item class="swiperitem-content"> -->
<view class="swiper-content" :style="fullHeight" v-if="customerList.length !== 0">
<view class="swiperitem-content">
<scroll-view scroll-y style="height: 100%;" @scrolltolower="lowerBottom" lower-threshold="150px" <scroll-view scroll-y style="height: 100%;" @scrolltolower="lowerBottom" lower-threshold="150px"
refresher-enabled="true" @refresherrefresh="refresh" :refresher-triggered="triggered"> refresher-enabled="true" @refresherrefresh="refresh" :refresher-triggered="triggered">
<view class="nav_item"> <view class="nav_item">
...@@ -32,8 +34,11 @@ ...@@ -32,8 +34,11 @@
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
</swiper-item> </view>
</swiper> </view>
<!-- </swiper-item>
</swiper> -->
<view class="nav_item_bottom"> <view class="nav_item_bottom">
<button style="background-color:#3b7cde; color:white;" @click="goPhoneBtn(phoneNumber)">咨询电话</button> <button style="background-color:#3b7cde; color:white;" @click="goPhoneBtn(phoneNumber)">咨询电话</button>
<button type="primary" @click="gotoMessageConsult">留言咨询</button> <button type="primary" @click="gotoMessageConsult">留言咨询</button>
...@@ -74,6 +79,7 @@ ...@@ -74,6 +79,7 @@
}, },
data() { data() {
return { return {
customerListLength: 1,
// token:uni.getStorageSync("token"), // token:uni.getStorageSync("token"),
triggered: false, //自定义下拉刷新状态 triggered: false, //自定义下拉刷新状态
isActive: 0, isActive: 0,
...@@ -174,7 +180,7 @@ ...@@ -174,7 +180,7 @@
// this.triggered = false // this.triggered = false
setTimeout(() => { setTimeout(() => {
this.triggered = false this.triggered = false
}, 1000); }, 3000);
}, },
//触底加载更多 //触底加载更多
lowerBottom() { lowerBottom() {
...@@ -198,7 +204,8 @@ ...@@ -198,7 +204,8 @@
console.log(response); console.log(response);
console.log("response", response); console.log("response", response);
this.customerList = [...this.customerList, ...response.rows] this.customerList = [...this.customerList, ...response.rows]
console.log("this.customerList->", this.customerList) // console.log("this.customerList->", this.customerList)
this.customerListLength = response.rows.length
if (this.customerList.length >= response.total) { if (this.customerList.length >= response.total) {
this.onMore = false this.onMore = false
} }
...@@ -350,7 +357,7 @@ ...@@ -350,7 +357,7 @@
min-height: calc(100% - 10%); min-height: calc(100% - 10%);
padding: 5rpx; padding: 5rpx;
height: auto; height: auto;
padding-bottom: 15%; padding-bottom: 20%;
.customer-item { .customer-item {
margin: 20rpx 5%; margin: 20rpx 5%;
......
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