Commit 00d1e440 authored by lvtz's avatar lvtz

fix

parent f825da41
<!--src/pages/organizationalmgt/index.wxml-->
<wxs src="../../../filter/index.wxs" module="filter" />
<view class="container">
<view class="blue-box"></view>
<image class="blue-box" src="{{imageRoot}}2b/organizationalmgt/header_bg.png?{{imageVersion}}"></image>
<view class="header-box">
<view class="top-box" bindtap="gobusinessinfo">
<view class="logo-box">
......
......@@ -10,20 +10,17 @@ page{
.blue-box{
width: 100%;
height: 230rpx;
background:rgba(53,186,253,1);
border-radius:0 0 50rpx 50rpx;
position: absolute;
left: 0;
top: 0;
}
.header-box{
width:702rpx;
background:rgba(255,255,255,1);
border-radius:20rpx;
background:#fff;
border-radius: 20rpx;
padding: 32rpx 32rpx 25rpx 32rpx;
padding-top: 56rpx;
margin: 0 auto;
margin-bottom: 26rpx;
margin: 27rpx auto 26rpx;
position: relative;
z-index: 20;
}
......
......@@ -34,8 +34,8 @@ Page({
tid: 6,
audioStorage: {},
schoolInfo: '',
latitude: '',
longitude: '',
// latitude: '',
// longitude: '',
websiteCourses: '',
tabList: ['全部', '学员动态', '机构介绍'],
tabIndex: 0,
......@@ -80,29 +80,29 @@ Page({
this.websitehomeGet()
this.websitecourseshowGet()
this.websiteintrosGet();
const myLocation = LocalStorage.getItem('myLocation');
// const myLocation = LocalStorage.getItem('myLocation');
const that = this;
if (myLocation) {
this.setData({
latitude: Number(myLocation.split('-')[0]),
longitude: Number(myLocation.split('-')[1]),
})
} else {
wx.getLocation({
type: 'wgs84',
success(res) {
const {
latitude,
longitude
} = res;
LocalStorage.setItem('myLocation', latitude + '-' + longitude)
that.setData({
latitude: latitude,
longitude: longitude,
})
}
})
}
// if (myLocation) {
// this.setData({
// latitude: Number(myLocation.split('-')[0]),
// longitude: Number(myLocation.split('-')[1]),
// })
// } else {
// wx.getLocation({
// type: 'wgs84',
// success(res) {
// const {
// latitude,
// longitude
// } = res;
// LocalStorage.setItem('myLocation', latitude + '-' + longitude)
// that.setData({
// latitude: latitude,
// longitude: longitude,
// })
// }
// })
// }
wx.login({
success(res) {
const sessionCode = res.code;
......@@ -290,7 +290,7 @@ Page({
let _tabList = ['全部', '学员动态', '机构介绍'];
if (data) {
_tabList = ['全部']
data.distance = getFlatternDistance(this.data.latitude, this.data.longitude, Number(data.latitude), Number(data.longitude));
// data.distance = getFlatternDistance(this.data.latitude, this.data.longitude, Number(data.latitude), Number(data.longitude));
data.banner = data.banner ? JSON.parse(data.banner) : '';
data.sort = data.sort ? JSON.parse(data.sort) : [{
name: 'schoolinfo',
......
......@@ -6,7 +6,7 @@
</view>
<view class="address-box">
<image class="map-icon" src="{{imageRoot}}2c/websiteindex/map-icon.png" lazy-load="false" binderror="" bindload=""></image>
<text wx:if="{{latitude&&longitude&&schoolInfo}}" class="distance" selectable="false" space="false" decode="false">距离{{schoolInfo.distance}}公里</text>
<!-- <text wx:if="{{latitude&&longitude&&schoolInfo}}" class="distance" selectable="false" space="false" decode="false">距离{{schoolInfo.distance}}公里</text> -->
<text>{{schoolInfo.location_address?schoolInfo.location_address:schoolDetail.address}}</text>
</view>
</view>
......
......@@ -1130,12 +1130,19 @@
.detail-mediacontent {
/* margin-bottom: 30rpx; */
}
.detail-mediacontent .bigimgbox{
margin-bottom: 15rpx;
}
.detail-mediacontent .bigimgbox:last-of-type{
margin-bottom: 0;
}
.detail-mediacontent .imgbox{
position: relative;
}
.detail-mediacontent .imgbox .img{
width: 100%;
border-radius: 8rpx;
display: block;
}
.detail-mediacontent .video-play-icon-box{
width: 80rpx;
......
......@@ -5,11 +5,18 @@
.container {
width: 100%;
overflow-x: hidden;
padding-top: 96rpx;
}
/* 选择班级 */
.circle-select-wrap{
background: rgba(73,73,73,1);
padding-bottom: 30rpx;
/* padding-bottom: 30rpx; */
position:fixed;
top:0;
left:0;
width:100%;
z-index:10;
}
.circle-select-wrap2{
background: rgba(73,73,73,.9)
......@@ -88,10 +95,9 @@
width: 100%;
height: 453rpx;
background: #343434;
/* background: linear-gradient(rgba(52,52,52,1) 240rpx, rgba(52,52,52,.8) 300rpx, rgba(52,52,52,.5) 350rpx, rgba(52,52,52,0) 380rpx, rgba(52,52,52,0) 100%); */
border-radius: 30rpx 30rpx 0 0;
/* border-radius: 30rpx 30rpx 0 0; */
position: relative;
margin-top: -30rpx;
/* margin-top: -30rpx; */
padding: 23rpx 20rpx;
}
.header-box::after{
......
......@@ -95,7 +95,7 @@ page{
font-size: 30rpx;
color:rgba(84,84,84,1);
letter-spacing: 2rpx;
font-weight: 700;
font-weight: 500;
width: 544rpx;
/* overflow: hidden;
text-overflow:ellipsis;
......
......@@ -109,14 +109,14 @@ Page({
let user = LocalStorage.getItem('user');
let dakarole = LocalStorage.getItem('dakarole');
if (dakarole == 1) { // 有B端登录状态下并且角色是校长的情况
wx.showLoading({
title: '数据加载中'
})
// wx.showLoading({
// title: '数据加载中'
// })
schoolList({
page: 1,
perPage: 100
}).then((res) => {
wx.hideLoading();
// wx.hideLoading();
if (res.code == 200) {
this.setData({
schoolList: res.data.list
......@@ -125,14 +125,14 @@ Page({
this.data.isAuth = res.data.total > 0 ? true : false
}
}).catch(() => {
wx.hideLoading();
// wx.hideLoading();
})
} else if (dakarole == 2) { // 角色是老师的情况下
schoolList({
page: 1,
perPage: 100
}).then((res) => {
wx.hideLoading();
// wx.hideLoading();
if (res.code == 200) {
this.setData({
schoolList: res.data.list,
......@@ -141,7 +141,7 @@ Page({
this.data.isAuth = res.data.total > 0 ? true : false
}
}).catch(() => {
wx.hideLoading();
// wx.hideLoading();
})
}
if (this.data.sid != 0) {
......
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