fix

business/pages/circleindex/index.js

@@ -1212,7 +1212,6 @@ Page({
       id: this.data.circleInfo.id,
       title: this.data.circleInfo.title
     }])
-    console.log(classes, 'classes');
     url = `/business/pages/themeeditor/index?tid=0&sid=${this.data.sid}&classes=${encodeURIComponent(classes)}&editType=${createtype}`;
     wx.navigateTo({
       url: `${url}`

business/pages/classservice/rollcalldetail.js

@@ -110,27 +110,48 @@ Page({
     })
   },
   createRiliTheme() {
+    const classes = JSON.stringify([{
+      id: this.data.schedulesDetail.class_id,
+      title: this.data.schedulesDetail.class.title
+    }])
+    const url = `/business/pages/themeeditor/index?tid=0&sid=${this.data.sid}&classes=${encodeURIComponent(classes)}&editType=2`;
     wx.navigateTo({
-      url: `/business/pages/calendarthemeeditor/index?id=${this.data.schedulesDetail.class_id}&tid=0&sid=${this.data.sid}`
-    })
+      url: `${url}`
+    });
     this.setData({
       modalshow: false,
       modelHideClass: false
     })
   },
   createNormalTheme() {
+    // wx.navigateTo({
+    //   url: `/business/pages/themeeditor/index?id=${this.data.schedulesDetail.class_id}&tid=0&sid=${this.data.sid}`
+    // })
+    const classes = JSON.stringify([{
+      id: this.data.schedulesDetail.class_id,
+      title: this.data.schedulesDetail.class.title
+    }])
+    const url = `/business/pages/themeeditor/index?tid=0&sid=${this.data.sid}&classes=${encodeURIComponent(classes)}&editType=1`;
     wx.navigateTo({
-      url: `/business/pages/themeeditor/index?id=${this.data.schedulesDetail.class_id}&tid=0&sid=${this.data.sid}`
-    })
+      url: `${url}`
+    });
     this.setData({
       modalshow: false,
       modelHideClass: false
     })
   },
   createUnlockTheme() {
+    // wx.navigateTo({
+    //   url: `/business/pages/themeeditorlock/index?id=${this.data.schedulesDetail.class_id}&tid=0&sid=${this.data.sid}`
+    // })
+    const classes = JSON.stringify([{
+      id: this.data.schedulesDetail.class_id,
+      title: this.data.schedulesDetail.class.title
+    }])
+    const url = `/business/pages/themeeditor/index?tid=0&sid=${this.data.sid}&classes=${encodeURIComponent(classes)}&editType=3`;
     wx.navigateTo({
-      url: `/business/pages/themeeditorlock/index?id=${this.data.schedulesDetail.class_id}&tid=0&sid=${this.data.sid}`
-    })
+      url: `${url}`
+    });
     this.setData({
       modalshow: false,
       modelHideClass: false

business/pages/themeeditor/index.js

@@ -68,6 +68,7 @@ Page({
     id: 0,
     tid: 0,
     sid: 0,
+    submitBtnShow: true,
     calendarparams: {
       type: 0, // 0无限制 1录音 2视频 3照片
       title: '',
@@ -1150,9 +1151,10 @@ Page({
     const {
       show,
       src
-    } = e.detail
+    } = e.detail;
     this.setData({
-      'audioStatus.show': show
+      'audioStatus.show': show,
+      submitBtnShow: !show,
     })
   },
   pushVoice(e) {
@@ -1952,6 +1954,7 @@ Page({
     })
     setSelectedDays(data);
     this.setData({
+      submitBtnShow: false,
       calenderShow: true
     })
   },
@@ -2000,13 +2003,15 @@ Page({
     this.setData({
       calenderShow: false,
       selectRestDays: days,
-      weeks:_weeks
+      weeks:_weeks,
+      submitBtnShow: true
     })
   },
   hiddeCalender(e) {
     const flag = e.target.dataset.id == "hidde" ? true : false;
     if (flag) {
       this.setData({
+        submitBtnShow: true,
         calenderShow: false
       })
     }

business/pages/themeeditor/index.wxml

@@ -338,7 +338,7 @@
     <sound-recording sid="{{sid}}" show="{{audioStatus.show}}" bind:addVoice="addVoice" bind:pushVoice="pushVoice">
     </sound-recording>
   </view>
-  <cover-view class="form-fixbtn" bindtap="saveTheme" wx:if="{{!audioStatus.show}}">发布</cover-view>
+  <cover-view class="form-fixbtn" bindtap="saveTheme" wx:if="{{submitBtnShow}}">发布</cover-view>
 </view>
 <view class="modal-dialog" wx:if="{{changesubjectCountInputShow}}">
   <view class="modal-mask"></view>

constants/constants.js

   export default {
   imageRoot: 'https://cdn.img.shangjiadao.cn/qingxiao/dakav2/images/',
-  // host: 'https://qxapi.qingxiao.online/daka',
-  // host2: 'https://wx.m.shangjiadao.cn',
+  host: 'https://qxapi.qingxiao.online/daka',
+  host2: 'https://wx.m.shangjiadao.cn',
   storageVersion: '5.0',
   imageVersion: '20200420',
-  host: 'https://clock.wp53.cn',
-  host2: 'https://test.wp53.cn',
+  // host: 'https://clock.wp53.cn',
+  // host2: 'https://test.wp53.cn',
   appId: 'wxc1246ea029394785',
   miniProgram: {
     clock: 'wxdeee20e52a1fd7ee'

src/pages/calendarthemeindex/index.js

@@ -2703,7 +2703,7 @@ Page({
   },
   goWebsiteIndex(){
     wx.navigateTo({
-      url: `/src/pages/websiteindex/index?sid=${this.data.sid}`,
+      url: `/src/pages/websiteindex/index?sid=${this.data.themeSelect.school_id}`,
     })
   },
   // 防止悬浮窗滚动页面滚动，无特殊意义

src/pages/growthrecord/index.js

@@ -404,7 +404,7 @@ Page({
     const visitor = LocalStorage.getItem('visitor');
     let initShareObj = {
       title: `${this.data.userInfo.nickname}的成长记录`,
-      path: `/src/pages/growthrecord/index?consumerId=${this.data.consumerId}sid=${this.data.sid}&w=${app.globalData.currentSchoolStudentId}`
+      path: `/src/pages/growthrecord/index?consumerId=${this.data.consumerId}&sid=${this.data.sid}&w=${app.globalData.currentSchoolStudentId}`
     }
     let shareObj = {
 
@@ -464,6 +464,7 @@ Page({
         }
       }
     }
+    console.log(shareObj.path,shareObj.title,'分享参数')
     return {
       title: shareObj.title,
       path: shareObj.path,

src/pages/morethemeindex/index.js

@@ -2743,7 +2743,7 @@ Page({
   },
   goWebsiteIndex(){
     wx.navigateTo({
-      url: `/src/pages/websiteindex/index?sid=${this.data.sid}`,
+      url: `/src/pages/websiteindex/index?sid=${this.data.moreTheme.school_id}`,
     })
   },
   showSelectClass(){
@@ -2790,11 +2790,6 @@ Page({
       })
     }
   },
-  goWebsiteindex(){
-    wx.navigateTo({
-      url: `/src/pages/websiteindex/index?sid=${this.data.sid}&tabIndex=${this.data.moreTheme.jump_type}`,
-    })
-  },
   goSharemoretheme(){
     wx.navigateTo({
       url: `/src/pages/sharemoretheme/index?tid=${this.data.moreTheme.id}`,

src/pages/themeindex/index.js

@@ -2384,7 +2384,7 @@ Page({
   },
   goWebsiteIndex(){
     wx.navigateTo({
-      url: `/src/pages/websiteindex/index?sid=${this.data.sid}`,
+      url: `/src/pages/websiteindex/index?sid=${this.data.themeSelect.school_id}`,
     })
   },
   videoErrorCallback (e) {

src/pages/websiteindex/index.js

@@ -118,7 +118,8 @@ Page({
     egSubjectUrl: 'https://cdn.img.shangjiadao.cn/qingxiao/dakav2/images/2c/websiteindex/eg/eg_task.png',
 
     bannerStatus: 0,
-    currentSwiper: 0,//当前banner轮播的第几章图片
+    currentSwiper: 0,//当前banner轮播的index
+    currentSwiperAd: 0,//当前Ad轮播的index
     name: '',
     clockList: '',
     tid: 6,
@@ -324,16 +325,6 @@ Page({
   },
   onReady: function () { // Do something when page ready
     let that = this;
-    wx.createSelectorQuery().select('.banner-box').boundingClientRect(function (rect) {
-      rect.height; // 节点高度
-    }).exec(function (res) {
-      that.headerHeight = res[0].height;
-    })
-    // wx.createSelectorQuery().select('.nav-custombox').boundingClientRect(function(rect){
-    //   rect.height; // 节点高度
-    // }).exec(function(res){
-    //   that.navHeight = res[0].height;
-    // })
   },
   onShow: function () { // Do something when page show.
     wxLogin().then((res) => {
@@ -347,9 +338,9 @@ Page({
       this.clockListGet();
     }
     this.data.needRefresh = false,
-      this.setData({
-        fixBtnShow: false
-      })
+    this.setData({
+      fixBtnShow: false
+    })
   },
   onHide: function () { // Do something when page hide.
     // this.innerAudioContext.pause();
@@ -482,6 +473,11 @@ Page({
       currentSwiper: e.detail.current
     });
   },
+  swiperChangeAd (e){
+    this.setData({
+      currentSwiperAd: e.detail.current
+    });
+  },
   goBannerVideoPlay() {
     wx.navigateTo({
       url: `/src/pages/websiteindex/bannervideo?video=${this.data.schoolInfo.banner.src[0]}&sid=${this.data.sid}`,
@@ -1026,11 +1022,12 @@ Page({
           websitehomeEmpty: data && data.banner ? false : true
         },()=>{
           if(that.data.schoolInfo.intro && that.data.schoolInfo.module_switch.orgdesc){
-            wx.createSelectorQuery().select('.business-instro .desc-box .content').boundingClientRect(function (rect) {
+            wx.createSelectorQuery().select('.contentMock').boundingClientRect(function (rect) {
               rect.height; // 节点高度
             }).exec(function (res) {
+              console.log(res,'高度')
               let contectHeight = res[0].height;
-              if(contectHeight>59){
+              if(contectHeight>60){
                 that.setData({
                   btnmore_isVisible: true,
                 })
@@ -1048,6 +1045,39 @@ Page({
             }).catch(()=>{
             })
           }
+
+          const query = wx.createSelectorQuery().in(this)
+          var innerTitle = this.data.schoolInfo.notice;
+          if(innerTitle){
+            if (innerTitle.length < 7) {
+              that.setData({
+                isShow: true,
+              })
+            }
+            setTimeout(function () {
+              query.selectAll('.hh-title').fields({
+                size: true,
+              }).exec(function (res) {
+                var view_w = res[0][0].width;
+                query.selectAll('.none_text').fields({
+                  size: true,
+                }).exec(function (r) {
+                  if (r[1][0].width > view_w) {
+                    that.setData({
+                      isS: true,
+                      text_w: parseInt(r[1][0].width)
+                    })
+                  }
+                  that.setData({
+                    isShow: true,
+                  })
+                })
+              })
+            }, 100)
+          }
+          
+
+
           
         })
       }

src/pages/websiteindex/index.wxml

@@ -40,9 +40,12 @@
         </block>
         <view class="notice-box" wx:if="{{schoolInfo.notice}}">
             <image class="icon-label" src="{{imageRoot}}2c/websiteindex/icon_notice.png?{{imageVersion}}"></image>
-            <view class="text">{{schoolInfo.notice}}</view>
-
-            <!-- <image class="icon-arr" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image> -->
+            <view class="hh-title text"  style="{{isS?'--marqueeWidth--:-'+text_w/18+'em':''}}">
+                <view  class='{{isS?"title-scroll":""}}'>{{schoolInfo.notice}}</view>
+            </view>
+            <view class="hh_none">
+                <view class='none_text'>{{schoolInfo.notice}}</view>
+            </view>
         </view>
     </view>
 
@@ -114,11 +117,14 @@
             <!-- 广告banner -->
             <block wx:if="{{sortItem.name=='adCarousel' && schoolInfo.module_switch.adCarousel}}">
                 <view class="section-wrap section-ad" wx:if="{{adsTotal>0}}">
-                    <swiper indicator-dots="{{false}}" autoplay="{{true}}" circular="{{true}}" style="height:180rpx;"> 
+                    <swiper indicator-dots="{{false}}" autoplay="{{true}}" circular="{{true}}" style="height:180rpx;" bindchange="swiperChangeAd"> 
                         <swiper-item wx:for="{{adsList}}" wx:key="index">
                             <image class="cover" src="{{filter.imagify(item.cover)}}" mode="aspectFill" data-url="{{item.location}}" bindtap="jumpAdUrl"/>
                         </swiper-item>
                     </swiper>
+                    <view class="banner-numbox" wx:if="{{adsList.length>1}}">
+                        <view class="dot {{currentSwiperAd==index? 'active': ''}}" wx:for="{{adsList}}" wx:key="index"></view>
+                    </view>
                 </view>
                 <view class="section-wrap section-ad" wx:else>
                     <swiper indicator-dots="{{false}}" autoplay="{{true}}" circular="{{true}}" style="height:180rpx;"> 
@@ -171,6 +177,7 @@
                     </view>
                     
                     <view class="desc-box" wx:if="{{schoolInfo.intro}}">
+                        <view class="content contentMock">{{schoolInfo.intro}}</view>
                         <view class="content {{infoexpanded?'extended':''}}">{{schoolInfo.intro}}</view>
                         <view class="expend-box" bindtap="expandSchoolInfo" wx:if="{{btnmore_isVisible}}">{{infoexpanded?'向下展开':'向上收起'}}
                             <image class="icon-arr {{infoexpanded?'':'icon-arr-trans'}}" src="{{imageRoot}}2c/websiteindex/icon_arrdown_yellow.png?{{imageVersion}}"></image>

src/pages/websiteindex/index.wxss

@@ -867,6 +867,15 @@ page{
   font-size: 26rpx;
   color: #666;
   line-height: 40rpx;
+  word-break: break-all;
+}
+.business-instro .desc-box .contentMock{
+  position: absolute;
+  left: 0;
+  width: 100%;
+  opacity: 0;
+  z-index: -9;
+  word-break: break-all;
 }
 .business-instro .desc-box .content.extended{
   max-height: 120rpx;
@@ -1109,9 +1118,64 @@ page{
   width: 100%;
   height: 180rpx;
   padding: 0;
+  position: relative;
 }
 .section-ad .cover{
   width: 100%;
   height: 100%;
   border-radius: 20rpx;
 }
+.section-ad .banner-numbox{
+  position: absolute;
+  bottom: 20rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  display: flex;
+  align-items: center;
+  line-height: 1;
+}
+.section-ad .banner-numbox .dot{
+  width: 8rpx;
+  height: 8rpx;
+  border-radius: 50%;
+  background: rgba(255,255,255,.4);
+  margin-right: 10rpx;
+}
+.section-ad .banner-numbox .dot.active{
+  background: #fff;
+}
+
+.hh-title {
+  white-space: nowrap;
+  overflow: hidden;
+  width: 100%;
+}
+.title-scroll {
+  animation-name: around;
+  animation-iteration-count: infinite;
+  animation-timing-function: linear;
+  animation-duration: 10s;
+  width: max-content;
+}
+
+@keyframes around {
+  from {
+    margin-left: 100%;
+  }
+
+  to {
+    /* var接受传入的变量 */
+    margin-left: var(--marqueeWidth--);
+  }
+}
+.hh_none {
+  top: -10000px;
+  opacity: 0;
+  position: fixed;
+}
+
+.none_text {
+  display: inline-block;
+  font-size: 36rpx;
+  white-space: nowrap;
+}
\ No newline at end of file

src/pages/websiteindex/subjectlist.wxss

@@ -16,6 +16,7 @@ page {
   background: #fff;
   margin-bottom: 20rpx;
   color: #999;
+  border-radius: 20rpx;
 }
 .subject-list .list-item:last-of-type {
   margin-bottom: 0;