Merge remote-tracking branch 'origin/lvtz_clock' into wxl-develop

business/pages/exchangebusiness/index.wxss

@@ -107,6 +107,9 @@
 }
 .boxwrap .leftbox .schoolname.short{
   width: 350rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 .boxwrap .currenttag {
   background-color: #35BAFD;

business/pages/organizationalmgt/index.wxss

@@ -18,8 +18,8 @@ page{
   width:702rpx;
   background:#fff;
   border-radius: 20rpx;
-  padding: 32rpx 32rpx 25rpx 32rpx;
-  padding-top: 56rpx;
+  padding: 32rpx 32rpx 28rpx 32rpx;
+  padding-top: 40rpx;
   margin: 27rpx auto  26rpx;
   position: relative;
   z-index: 20;
@@ -28,8 +28,8 @@ page{
 .header-box .top-box {
   display: flex;
   align-items: center;
-  padding-bottom: 22rpx;
-  border-bottom: 1px solid rgba(0,0,0,.05);
+  padding-bottom: 30rpx;
+  border-bottom: 1px solid #eee;
 }
 .header-box .top-box .logo-box{
   width:120rpx;
@@ -53,7 +53,7 @@ page{
   font-size: 22rpx;
   text-align: center;
   display: inline-block;
-  padding: 0 7rpx;
+  padding: 0 14rpx;
 }
 .header-box .top-box .info-box .roletag.teacher {
   color: #FF9F49;
@@ -67,7 +67,11 @@ page{
   color:rgba(0,0,0,1);
   line-height:1;
   padding-bottom: 26rpx;
-  word-break: break-all;
+  max-width: 450rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+
 }
 .header-box .top-box .info-box .list-box {
   display: flex;
@@ -96,7 +100,7 @@ page{
   font-weight:400;
   color:rgba(130,130,130,1);
   line-height:1;
-  padding-top: 25rpx;
+  padding-top: 28rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -105,7 +109,7 @@ page{
   color: #666666;
   font-size: 22rpx;
   max-width: 450rpx;
-  line-height: 1.5;
+  line-height: 1;
   word-break: break-all;
 }
 .header-box .nick-name .rolechangebox {
@@ -121,7 +125,6 @@ page{
 .header-box .nick-name .icon{
   width: 24rpx;
   height: 24rpx;
-  margin-right: 14rpx;
   border-radius: 50%;
 }
 .line-box{
@@ -134,8 +137,20 @@ page{
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 36rpx 30rpx 34rpx 30rpx;
+  padding: 30rpx 24rpx;
   border-bottom: 1px solid rgba(0,0,0,.05);
+  position: relative;
+}
+.line-box .line::after{
+  content: '';
+  width: calc(100% - 24rpx);
+  background: #eee;
+  position: absolute;
+  bottom: 0;
+  right: 0;
+}
+.line-box .line:last-of-type::after{
+  display: none;
 }
 .line-box .line .left{
   font-size:26rpx;
@@ -149,7 +164,7 @@ page{
 .line-box .line .left .icon{
   width: 40rpx;
   height: 40rpx;
-  margin-right: 22rpx;
+  margin-right: 16rpx;
 }
 .line-box .line .left .message-icon{
   width: 31rpx;

business/pages/organizationalmgt/newinfo.js

@@ -523,8 +523,7 @@ Page({
         if (res.code == 200) { // 成功的操作
           if (this.data.sid == 0) { // 新增的操作
             wx.redirectTo({
-              url: `/business/pages/deskcenter/themetemplate?sid=${res.data.id}`
-              // url: `/business/pages/organizationalmgt/qxknow?sid=${res.data.id}`
+              url: `/business/pages/organizationalmgt/qxknow?sid=${res.data.id}`
             });
           } else {
             wx.showToast({

business/pages/organizationalmgt/qxknow.js

@@ -4,14 +4,9 @@ import {
 var app = getApp();
 Page({
   data: {
-    imgList: [
-      "https://cdn.img.shangjiadao.cn/qingxiao/bargain/images/case/gif1.gif",
-      "https://cdn.img.shangjiadao.cn/qingxiao/bargain/images/case/code.png",
-      "https://cdn.img.shangjiadao.cn/qingxiao/bargain/images/case/idea.png",
-      "https://cdn.img.shangjiadao.cn/qingxiao/bargain/images/case/gif2.gif",
-      "https://cdn.img.shangjiadao.cn/qingxiao/bargain/images/case/gif3.gif",
-      "https://cdn.img.shangjiadao.cn/qingxiao/bargain/images/case/pic_03.png"
-    ],
+    imageRoot: app.globalData.imageRoot,
+    localImageRoot: "../../../images/",
+    imageVersion: app.globalData.imageVersion,
     sid: 0
   },
 

business/pages/organizationalmgt/qxknow.wxml

 <view class="container">
   <view class="btn-jump" bindtap="bindJumpEvent">跳过</view>
   <view class="desc-box">
-      <image class="desc-img" wx:for="{{imgList}}" wx:key="index" src="{{item}}" mode="widthFix"></image>
+      <image class="desc-img" wx:key="index" src="{{imageRoot}}qxknow/img_01.png?{{imageVersion}}" mode="widthFix"></image>
+      <image class="desc-img" wx:key="index" src="{{imageRoot}}qxknow/img_02.png?{{imageVersion}}" mode="widthFix"></image>
+      <image class="desc-img" wx:key="index" src="{{imageRoot}}qxknow/img_03.png?{{imageVersion}}" mode="widthFix"></image>
+      <image class="desc-img" wx:key="index" src="{{imageRoot}}qxknow/img_04.png?{{imageVersion}}" mode="widthFix"></image>
   </view>
   <view class="submitbtn-box">
     <view class="submitbtn" bindtap="toCreate">创建作业打卡</view>

src/components/brickLayout/index.wxss

@@ -22,7 +22,7 @@
 }
 .list-item .video-image{
   width: 100%;
-  border-radius: 20rpx;
+  border-radius: 10rpx;
   display: block;
 }
 .list-item .top-fix{

src/pages/websiteindex/index.js

@@ -42,7 +42,8 @@ import {
   wxChooseLocation,
   wxOpenSetting,
   wxGetImageInfo,
-  wxLogin
+  wxLogin,
+  wxOpenLocation,
 } from '../../../utilities/wxApi.js';
 var app = getApp();
 Page({
@@ -1500,7 +1501,7 @@ Page({
     })
     websitesubjectGet({
       page: 1,
-      perPage: 3,
+      perPage: 4,
       school_id: this.data.sid,
     }).then((res) => {
       const { code, data } = res;
@@ -1544,5 +1545,23 @@ Page({
       default:
         break;
     }
+  },
+  makenavigate(){
+    let addressInfo = this.data.schoolInfo? this.data.schoolInfo: this.data.schoolDetail;
+    wxOpenLocation({
+      latitude: Number(addressInfo.latitude),
+      longitude: Number(addressInfo.longitude),
+      address: addressInfo.location_address,
+      name: addressInfo.address
+    })
+  },
+  jumpAdUrl (e){
+    const { url } = e.currentTarget.dataset;
+    if( !url ) {
+      return
+    }
+    wx.navigateTo({
+      url: '/'+url
+    })
   }
 })
\ No newline at end of file

src/pages/websiteindex/index.wxss

@@ -202,6 +202,7 @@ page{
   position: relative;
   padding: 0 10rpx;
   margin: 5rpx;
+  border-radius: 6rpx;
 }
 .schoolinfo-box .address-box{
   padding: 25rpx 0;
@@ -859,6 +860,7 @@ page{
 .business-instro .desc-box{
   padding: 0 24rpx;
   position: relative;
+  margin-top: -10rpx;
 }
 .business-instro .desc-box .content{
   font-size: 26rpx;
@@ -1037,7 +1039,7 @@ page{
   min-width: 130rpx;
   height: 130rpx;
   margin-right: 20rpx;
-  border-radius: 20rpx;
+  border-radius: 10rpx;
   overflow: hidden;
 }
 .subject-list .list-item .cover-box .cover{
@@ -1100,6 +1102,7 @@ page{
   color: #222;
   line-height: 37rpx;
   padding: 12rpx 0 3rpx;
+  font-weight: bold;
 }
 .section-ad{
   width: 100%;
@@ -1109,4 +1112,5 @@ page{
 .section-ad .cover{
   width: 100%;
   height: 100%;
-}
\ No newline at end of file
+  border-radius: 20rpx;
+}

src/pages/websiteindex/momentvideo.wxml

@@ -32,7 +32,7 @@
             bindtransition="swipertransition"
             bindanimationfinish="swiperanimationfinish"
         > 
-            <block wx:for="{{playList}}" wx:for-index="playindex" wx:for-item="playitem" wx:key="{{playindex}}" style="position: relative">
+            <block wx:for="{{playList}}" wx:for-index="playindex" wx:for-item="playitem" wx:key="playindex" style="position: relative">
                 <swiper-item>
                     <!-- <view class="video-box-wrapper" wx-if="{{playitem.type==2}}">
                         <view class="video-box-wrapper">

src/pages/websiteindex/onlineclassroomindex.js

@@ -491,22 +491,22 @@ Page({
           showPassWordTip:true,
           passWord: ''
         })
-        wx.showToast({
-          title: '密码错误',
-          icon: 'none',
-          duration: 2000
-        })
+        // wx.showToast({
+        //   title: '密码错误',
+        //   icon: 'none',
+        //   duration: 2000
+        // })
       }
     }).catch((res)=>{
       this.setData({
         showPassWordTip:true,
         passWord: ''
       })
-      wx.showToast({
-        title: '密码错误',
-        icon: 'none',
-        duration: 2000
-      })
+      // wx.showToast({
+      //   title: '密码错误',
+      //   icon: 'none',
+      //   duration: 2000
+      // })
     })
   },
   goWebsiteIndex(){

src/pages/websiteindex/onlineclassroomindex.wxml

@@ -119,11 +119,11 @@
                         </view>
                         <view class="info-box">
                             <view class="title">{{item.title}}</view>
-                            <view class="count-box">
-                                <view class="count-item" wx:if="{{item.content && item.content.properties.duration}}">
+                            <view class="count-box" wx:if="{{item.content}}">
+                                <view class="count-item" wx:if="{{item.content.properties.duration}}">
                                     <image class="icon" src="{{imageRoot}}2c/websiteindex/onlinecourse/icon_time.png"/>{{filter.Mathceil(item.content.properties.duration/60)}}分钟
                                 </view>
-                                <view class="count-item" wx:if="{{item.content && item.content.type==2 || item.content.type==3}}">
+                                <view class="count-item" wx:if="{{item.content.type==2 || item.content.type==3}}">
                                     <block wx:if="{{item.visitor}}">
                                         <block wx:if="{{filter.toFix(item.visitor.learned_time/item.content.properties.duration,2)>=1}}">已学完</block>
                                         <block wx:else>已学{{filter.toFix(item.visitor.learned_time/item.content.properties.duration,2)*100}}%</block>

src/pages/websiteindex/onlineclassroomindex.wxss

@@ -452,7 +452,7 @@
     font-weight: 600;
     color:#222;
     line-height: 1;
-    max-width: 450rpx;
+    max-width: 400rpx;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -566,7 +566,7 @@
 
 .content-box .search-box{
     display: flex;
-    margin: 0 26rpx 0 24rpx;
+    margin: 0 26rpx 20rpx 24rpx;
     align-items: center;
     justify-content: space-between;
 }

src/pages/websiteindex/onlineclassroomplay.wxml

@@ -91,7 +91,7 @@
                     <view class="coursecounttext">已更新{{coursesDetail.type==1?'1': coursesDetail.sub_courses_count}}期</view>
                 </view>
             </view>
-            <image class="shareicon" bindtap="ShowShareDailog" src="{{imageRoot}}2c/onlineclass/shareicon.png?{{imageVersion}}"></image>
+            <image class="shareicon" bindtap="ShowShareDailog" src="{{imageRoot}}2c/onlineclass/shareicon.png?{{imageVersion}}" wx:if="{{coursesDetail.share_switch==1}}"></image>
         </view>
     </view>
     <view class="divideline"></view>

src/pages/websiteindex/onlineclassroomplay.wxss

@@ -445,7 +445,7 @@
     font-weight: 600;
     color:#222;
     line-height: 1;
-    max-width: 450rpx;
+    max-width: 400rpx;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -1002,11 +1002,11 @@
 .catlog-dailog .content .title-box .title{
     font-size: 32rpx;
     font-family:PingFangSC-Regular,PingFang SC;
-    font-weight:400;
     color:#222;
     display: flex;
     align-items: center;
     line-height: 45rpx;
+    font-weight: bold;
 }
 .catlog-dailog .content .title-box .right{
     display: flex;

src/pages/websiteindex/subjectlist.wxss

@@ -24,7 +24,7 @@ page {
   min-width: 130rpx;
   height: 130rpx;
   margin-right: 20rpx;
-  border-radius: 20rpx;
+  border-radius: 10rpx;
   overflow: hidden;
 }
 .subject-list .list-item .cover-box .cover{

src/pages/websiteindex/teacherdetail.wxss

@@ -18,6 +18,7 @@
 }
 .list-box .list-item .avatar {
   width: 88rpx;
+  min-width: 88rpx;
   height: 88rpx;
   margin-right: 14rpx;
   border-radius: 50%;
@@ -39,16 +40,20 @@
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  font-weight: bold;
 }
 .list-box .list-item .main .line .label {
-  height: 30rpx;
+  height: 36rpx;
   font-size: 22rpx;
   background: #f7f7f7;
-  line-height: 30rpx;
+  line-height: 36rpx;
   padding: 0 10rpx;
   margin-left: 14rpx;
   border-radius: 6rpx;
+  max-width: 150rpx;
+  overflow: hidden;
   white-space: nowrap;
+  text-overflow: ellipsis;
 }
 .list-box .list-item .main .line .bg {
   font-size: 22rpx;
@@ -98,10 +103,11 @@
   content: "";
   width: 100%;
   height: 1px;
-  background: #eeeeee;
+  background: #eee;
   position: absolute;
   left: 0;
   top: 0;
+  transform: scaleY(.5);
 }
 video{
   width: 100%;

src/pages/websiteindex/teacherlist.wxss

@@ -23,6 +23,7 @@ page {
 }
 .list-box .list-item .avatar {
   width: 88rpx;
+  min-width: 88rpx;
   height: 88rpx;
   margin-right: 14rpx;
   border-radius: 50%;
@@ -40,20 +41,23 @@ page {
   font-size: 32rpx;
   color: #222;
   line-height: 1;
-  max-width: 300rpx;
+  max-width: 200rpx;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
 }
 .list-box .list-item .main .line .label {
-  height: 30rpx;
+  height: 36rpx;
   font-size: 22rpx;
   background: #f7f7f7;
-  line-height: 30rpx;
+  line-height: 36rpx;
   padding: 0 10rpx;
   margin-left: 14rpx;
   border-radius: 6rpx;
+  max-width: 150rpx;
+  overflow: hidden;
   white-space: nowrap;
+  text-overflow: ellipsis;
 }
 .list-box .list-item .main .line .bg {
   font-size: 22rpx;