Commit fdd6cd45 authored by lvtz's avatar lvtz

fix

parent 70492ceb
...@@ -337,6 +337,11 @@ Page({ ...@@ -337,6 +337,11 @@ Page({
url: `/business/pages/orgpotentialcustomer/index?sid=${this.data.sid}`, url: `/business/pages/orgpotentialcustomer/index?sid=${this.data.sid}`,
}); });
}, },
toStaticCenter (){
wx.navigateTo({
url: '/business/pages/helpcenter/detail?alias=pay',
})
},
// 待处理更多 // 待处理更多
toMoreDeal() { toMoreDeal() {
wx.navigateTo({ wx.navigateTo({
......
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<image class="item-icon" src="{{imageRoot}}2b/deskcenternew/menu/icon_points.png?{{imageVersion}}"/> <image class="item-icon" src="{{imageRoot}}2b/deskcenternew/menu/icon_points.png?{{imageVersion}}"/>
<view class="item-title">积分</view> <view class="item-title">积分</view>
</view> </view>
<view class="item" bindtap=""> <view class="item" bindtap="toStaticCenter">
<image class="item-icon" src="{{imageRoot}}2b/deskcenternew/menu/icon_statics.png?{{imageVersion}}"/> <image class="item-icon" src="{{imageRoot}}2b/deskcenternew/menu/icon_statics.png?{{imageVersion}}"/>
<view class="item-title">数据中心</view> <view class="item-title">数据中心</view>
</view> </view>
......
...@@ -72,6 +72,8 @@ Page({ ...@@ -72,6 +72,8 @@ Page({
// }) // })
// }, // },
goRecharge () { goRecharge () {
console.log('充值'); wx.navigateTo({
url: '/business/pages/helpcenter/detail?alias=pay',
})
} }
}) })
\ No newline at end of file
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="box"> <view class="box">
<view class="line-item" bindtap='goRecharge'> <view class="line-item" bindtap='goRecharge'>
<view class="item-label">套餐续费</view> <view class="item-label">套餐续费</view>
<view class="right"> <view class="right" >
<view class="expiretime" wx:if="{{schoolInfo.expire_time}}">{{schoolInfo.expire_time}}到期</view> <view class="expiretime" wx:if="{{schoolInfo.expire_time}}">{{schoolInfo.expire_time}}到期</view>
<view class="expiretime" wx:else>长期有效</view> <view class="expiretime" wx:else>长期有效</view>
<image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image> <image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
......
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
<image class="icon-imglabel" src="{{imageRoot}}2c/websiteindex/img.png?{{imageVersion}}"></image> <image class="icon-imglabel" src="{{imageRoot}}2c/websiteindex/img.png?{{imageVersion}}"></image>
</view> --> </view> -->
<view class="item-content"> <view class="item-content">
<view class="item-title">{{rawData[item].title}} {{filter.jsonParse(rawData[item].content)[0].type}}</view> <view class="item-title">{{rawData[item].title}}</view>
<view class="item-info" wx:if="{{type!=1}}"> <!-- <view class="item-info">
<image class="avatar" src="{{filter.imagify(rawData[item].school_teacher.avatar, 'image/resize,w_160/format,jpg')}}" wx:if="{{rawData[item].school_teacher.avatar}}"></image> <image class="avatar" src="{{filter.imagify(rawData[item].school_teacher.avatar, 'image/resize,w_160/format,jpg')}}" wx:if="{{rawData[item].school_teacher.avatar}}"></image>
<image class="avatar" src="https://cdn.img.shangjiadao.cn/qingxiao/biz/image/defaultavatar.png" wx:else></image> <image class="avatar" src="https://cdn.img.shangjiadao.cn/qingxiao/biz/image/defaultavatar.png" wx:else></image>
<view class="name">{{rawData[item].school_teacher.nickname ? rawData[item].school_teacher.nickname: '未知'}}</view> <view class="name">{{rawData[item].school_teacher.nickname ? rawData[item].school_teacher.nickname: '未知'}}</view>
</view> </view> -->
</view> </view>
</view> </view>
</view> </view>
......
...@@ -923,16 +923,20 @@ Page({ ...@@ -923,16 +923,20 @@ Page({
data data
} = res; } = res;
if (code == 200) { if (code == 200) {
console.log(data,code,"___________________________")
if (data) { if (data) {
// const myLocation = LocalStorage.getItem('myLocation'); // const myLocation = LocalStorage.getItem('myLocation');
data.banner = data.banner ? JSON.parse(data.banner) : ''; data.banner = data.banner ? JSON.parse(data.banner) : '';
data.tags = data.tags ? JSON.parse(data.tags) : ''; data.tags = data.tags ? JSON.parse(data.tags) : '';
data.module_switch = data.module_switch ? JSON.parse(data.module_switch): {"clocklist":true,"classmoments":true,"onlineclass":true}; data.module_switch = data.module_switch ? JSON.parse(data.module_switch): {"clocklist":true,"classmoments":true,"onlineclass":true};
let dataSort = ''; let dataSort = '';
// 机构信息/banner图片或视频/体验课 不参与排序 固定位置 // 机构信息/banner图片或视频/体验课 不参与排序 固定位置
if (data.sort) { if (data.sort) {
// dataSort = JSON.parse(data.sort); dataSort = JSON.parse(data.sort,'++++++++++++++++++');
console.log(data.sort,dataSort)
let removeItem1 = dataSort.findIndex( item => item.name=="banner"); let removeItem1 = dataSort.findIndex( item => item.name=="banner");
dataSort.splice(removeItem1,1); dataSort.splice(removeItem1,1);
let removeItem2 = dataSort.findIndex( item => item.name=="schoolinfo"); let removeItem2 = dataSort.findIndex( item => item.name=="schoolinfo");
...@@ -952,6 +956,7 @@ Page({ ...@@ -952,6 +956,7 @@ Page({
]; ];
}else{ }else{
console.log('怎么就进这里了')
this.schoolInfoGet() this.schoolInfoGet()
this.setData({ this.setData({
websitehomeEmpty: true, websitehomeEmpty: true,
...@@ -964,6 +969,7 @@ Page({ ...@@ -964,6 +969,7 @@ Page({
schoolInfo: data ? data : '', schoolInfo: data ? data : '',
websitehomeEmpty: data && data.banner ? false : true websitehomeEmpty: data && data.banner ? false : true
},()=>{ },()=>{
console.log(this.data.schoolInfo,'xuexiaoxinxi ')
if(that.data.schoolInfo.banner.type=='video'){ if(that.data.schoolInfo.banner.type=='video'){
wxGetImageInfo({src: videoPoster(that.data.schoolInfo.banner.src[0])}).then((res)=>{ wxGetImageInfo({src: videoPoster(that.data.schoolInfo.banner.src[0])}).then((res)=>{
let w=750, initratio, bannerVideoH; let w=750, initratio, bannerVideoH;
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<view class="icon-box"> <view class="icon-box">
<image class="icon" src="{{localImageRoot}}2c/websiteindex/website_address.png?{{imageVersion}}"></image> <image class="icon" src="{{localImageRoot}}2c/websiteindex/website_address.png?{{imageVersion}}"></image>
</view> </view>
<view class="address" wx:if="{{schoolInfo.distance}}"> <view class="address" wx:if="{{schoolInfo.longitude}}">
<view class="main">{{schoolInfo.location_address}}</view> <view class="main">{{schoolInfo.location_address}}</view>
<view class="other" wx:if="{{schoolInfo.address}}">{{schoolInfo.address}}</view> <view class="other" wx:if="{{schoolInfo.address}}">{{schoolInfo.address}}</view>
</view> </view>
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<view class="section-wrap section-teacher" wx:if="{{teacherTotal>0 && schoolInfo.module_switch.teacher}}"> <view class="section-wrap section-teacher" wx:if="{{teacherTotal>0 && schoolInfo.module_switch.teacher}}">
<view class="box-title"> <view class="box-title">
<view class="title">名师风采<view class="text">({{teacherTotal}})</view></view> <view class="title">名师风采<view class="text">({{teacherTotal}})</view></view>
<view class="right" bindtap="toMoreList" data-type="schoolteacher"> <view class="right" bindtap="toMoreList" data-type="schoolteacher" wx:if="{{teacherTotal>5}}">
更多<image class="icon-arr" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image> 更多<image class="icon-arr" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image>
</view> </view>
</view> </view>
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
</view> </view>
</block> </block>
<!-- 学校介绍 --> <!-- 学校介绍 -->
<view class="section-wrap business-instro" id="business-info" wx:if="{{sortItem.name=='orgdesc' && schoolInfo.module_switch.orgdesc}}"> <view class="section-wrap business-instro" id="business-info" wx:if="{{sortItem.name=='orgdesc' && schoolInfo.module_switch.orgdesc && (schoolInfo.intro || schoolInfoList.length>0)}}">
<view class="box-title"> <view class="box-title">
<view class="title">学校介绍</view> <view class="title">学校介绍</view>
<view class="right" bindtap="toMoreList" data-type="schoolinfo1" wx:if="{{schoolInfoList.length>0}}"> <view class="right" bindtap="toMoreList" data-type="schoolinfo1" wx:if="{{schoolInfoList.length>0}}">
......
...@@ -237,6 +237,10 @@ page{ ...@@ -237,6 +237,10 @@ page{
font-size: 22rpx; font-size: 22rpx;
color: #999; color: #999;
padding-top: 15rpx; padding-top: 15rpx;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
} }
.schoolinfo-box .address-box .icon-mobile{ .schoolinfo-box .address-box .icon-mobile{
width: 50rpx; width: 50rpx;
......
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