Skip to content

W
wechatapp.shangjiadao.com
Commit 7bea5309 authored by lvtz's avatar lvtz
Browse files
Options

Merge branch 'sj-dev-v7' of git.server:wangxuelai/wechatapp.shangjiadao.com into… 

Merge branch 'sj-dev-v7' of git.server:wangxuelai/wechatapp.shangjiadao.com into branch_20191014_lvtz
parents 00d1e440 e48a842d
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 32 deletions
business/pages/organizationalmgt/index.js
View file @ 7bea5309
......@@ -56,6 +56,9 @@ Page({
sid: options.sid
});
}
if(wx.hideHomeButton){
wx.hideHomeButton();
}
},
/**
......@@ -69,7 +72,6 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function() {
console.log('有返回',this.data.sid)
const dakarole = LocalStorage.getItem('dakarole');
this.setData({
dakarole: dakarole,
......
business/pages/organizationalmgt/index.wxss
View file @ 7bea5309
......@@ -23,6 +23,7 @@ page{
margin: 27rpx auto 26rpx;
position: relative;
z-index: 20;
margin-top: 30rpx;
}
.header-box .top-box {
display: flex;
......
business/pages/organizationalmgt/pcwebsiteintroduction.wxml
View file @ 7bea5309
<!--business/pages/organizationalmgt/pcwebsiteintroduction.wxml-->
<view class='container'>
<image class="" src="{{imageRoot}}2b/organizationalmgt/pcinstroduction.png" mode="widthFix" lazy-load="false" binderror="" bindload="" />
<view class="footer" data-copycontent="{{website}}" bindtap="copyEvent">复制链接</view>
<image class="" src="{{imageRoot}}2b/organizationalmgt/pcinstroduction.png?{{imageVersion}}" mode="widthFix" lazy-load="false" binderror="" bindload="" />
<view class="footer" data-copycontent="{{website}}" bindtap="copyEvent"></view>
</view>
business/pages/organizationalmgt/pcwebsiteintroduction.wxss
View file @ 7bea5309
/* business/pages/organizationalmgt/pcwebsiteintroduction.wxss */
.container{
padding: 30rpx 0 190rpx;
padding: 30rpx 0 0rpx;
}
.container image{
display: block;
......@@ -8,7 +8,7 @@
margin: 0 auto;
}
.footer{
width:100%;
width:300rpx;
height:100rpx;
background:rgba(102,184,244,1);
font-size:28rpx;
......@@ -19,6 +19,7 @@
align-items: center;
justify-content: center;
position: fixed;
left: 0;
bottom: 0;
left: 200rpx;
top: 320rpx;
opacity: 0;
}
\ No newline at end of file
constants/constants.js
View file @ 7bea5309
......@@ -3,7 +3,7 @@ export default {
// host: 'https://qxapi.qingxiao.online/daka',
// host2: 'https://wx.m.shangjiadao.cn',
storageVersion: '4.0',
imageVersion: '20190826',
imageVersion: '20191017',
host: 'https://clock.wp53.cn',
host2: 'https://test.wp53.cn',
appId: 'wxc1246ea029394785',
......
src/components/clockitemv2/index.wxml
View file @ 7bea5309
......@@ -301,28 +301,28 @@
<view class="title-box">
<image class="iconimg" src="{{imageRoot}}2c/clockitem/teacherd.png?{{imageVersion}}" ></image>老师点评：
</view>
<view class="totalscorebox" wx:if="{{clock.review[1] && clock.review[1].method == 2}}">
<view class="score-title">综合得分</view>
<view class="score-title-dot">:</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 0}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 1)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 1, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 1}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 2)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 2, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 2}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 3)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 3, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 3}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 4)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 4, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 4}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 5)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 5, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scoreshow">{{clock.review[1].score / 5}}</view>
</view>
<image wx:if="{{clock.review[1] && clock.review[1].method == 2}}" class="activecommentflag" src="{{imageRoot}}common/activecomment.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
</view>
<view class="totalscorebox" wx:if="{{clock.review[1] && clock.review[1].method == 2}}">
<view class="score-title">综合得分</view>
<view class="score-title-dot">:</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 0}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 1)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 1, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 1}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 2)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 2, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 2}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 3)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 3, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 3}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 4)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 4, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scorestarbox" wx:if="{{clock.review[1].score / 10 >= 4}}">
<image class="{{starresolve.getStarClass(clock.review[1].score / 10, 5)}}" src="{{imageRoot}}common/{{starresolve.getStar(clock.review[1].score / 10, 5, 1)}}?{{imageVersion}}" ></image>
</view>
<view class="scoreshow">{{clock.review[1].score / 5}}</view>
</view>
<view class="activeimagebox" wx:if="{{clock.review[1] && clock.review[1].method == 2}}">
<view class="activeimageitem" hover-class="none" hover-stop-propagation="false" data-type="{{activeimg.type}}" data-fid="{{activeimg.id}}" bindtap="seeactivecomment" wx:key="index" wx:for="{{clock.review[1].flags}}" wx:for-item="activeimg">
<block wx:if="{{activeimg.type == 2}}">
......
src/components/clockitemv2/index.wxss
View file @ 7bea5309
......@@ -694,6 +694,8 @@
/* top: 6rpx; */
width: 136rpx;
height: 52rpx;
top: 0;
border-radius:0px 10rpx 0px 10rpx;
}
.teacher-commnet-detail .teacher-avator-box{
padding: 24rpx 0;
......@@ -972,7 +974,7 @@
overflow: hidden;
background:rgba(247,247,249,1);
border:1px solid rgba(213,213,213,1);
border-radius:10px;
border-radius:10rpx;
position: relative;
z-index: 2;
}
......@@ -1526,5 +1528,6 @@
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 14rpx;
}
/*互动点评图片展示样式*/
\ No newline at end of file
src/pages/websiteindex/index.js
View file @ 7bea5309
......@@ -20,6 +20,9 @@ import {
import {
getSchoolDetail
} from '../../../service/customer/schoolindex.js';
import {
userShow,
} from '../../../service/customer/themeindex.js';
import {
getFlatternDistance,
LocalStorage,
......@@ -103,7 +106,8 @@ Page({
show: false,
scoretype: 1,
},
bannerEmpty:false
bannerEmpty:false,
noUserinfo: false,
},
onLoad: function (options) { // Do some initialize when page load.
this.innerAudioContext = wx.createInnerAudioContext(); // 当前页面唯一的一个音频容器
......@@ -168,6 +172,7 @@ Page({
})
},
onShow: function () { // Do something when page show.
this.userShow();
if (this.data.needRefresh) {
this.data.clockPage = 1;
this.data.listLoading = false;
......@@ -1165,4 +1170,36 @@ Page({
formId
})
},
userShow () {
const visitor = LocalStorage.getItem('visitor');
userShow({
school_id: this.data.sid,
consumer_id: visitor && visitor.id || 0
}).then((res) => {
const {data, code} = res;
if (code == 30005) {
this.setData({
noUserinfo: true
})
}
if (code == 40016) {
this.setData({
noUserinfo: true
})
}
if (code == 200) {
if (data) {
this.setData({
// userInfo: data,
noUserinfo: false,
})
} else {
this.setData({
noUserinfo: true
})
}
}
}).then(() => {
})
},
})
\ No newline at end of file
src/pages/websiteindex/index.wxml
View file @ 7bea5309
......@@ -42,7 +42,7 @@
</block>
</view>
<block wx:if="{{sortItem.name=='course' && websiteCourses.switch==1}}">
<block wx:if="{{sortItem.name=='course' && websiteCourses.switch==1 && noUserinfo}}">
<view class="get-student" style="{{schoolInfo.sort[0].name=='course'?'margin-top:0':''}}" id="get-student-box" wx:if="{{websiteCourses}}">
<view class="booking-box">
<image class="icon-clock" src="{{imageRoot}}2c/websiteindex/icon_clock.png?{{imageVersion}}"></image>
......@@ -188,7 +188,7 @@
<sjdbottombar></sjdbottombar>
</view>
<view class="fix-bottom-btn {{!fixBtnShow ?'hide':''}}" hidden="{{websiteCourses.switch!=1 || !fixBtnShow}}" data-flag="{{1}}">
<view class="fix-bottom-btn {{!fixBtnShow ?'hide':''}}" hidden="{{websiteCourses.switch!=1 || !fixBtnShow || !noUserinfo}}" data-flag="{{1}}">
<view class="booking-box" bindtap="formBoxShow" data-flag="{{1}}">
<image class="icon-clock" src="{{imageRoot}}2c/websiteindex/icon_clock.png?{{imageVersion}}"></image>
<view class="text">立即预约，免费领取试听课</view>
......
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