Merge branch '商学院'

components/My_accessory/index.wxml

@@ -7,6 +7,6 @@
         <view class="title line-1">{{item.document}}</view>
         <view class="time">{{item.createdate}}</view>
     </view>
-    <van-button wx:if="{{butType=='商学院'}}" type="info" data-item="{{item}}" custom-class='v-but' data-type="{{item.fileType=='video'?'播放':'下载'}}" catchtap="{{item.fileType=='video'?'callback':'butClick'}}">{{item.fileType=='video'?'播放':'下载'}}</van-button>
+    <van-button wx:if="{{butType=='商学院'}}" type="info" data-item="{{item}}" custom-class='v-but' data-type="{{item.fileType=='video'?'播放':'下载'}}" catchtap="{{item.fileType=='video'?'callback':'butClick'}}">{{item.fileType=='video'?'选择':'下载'}}</van-button>
     <van-button wx:else type="{{butType==='下载'||butType==='播放'?'info':'danger'}}" data-item="{{item}}" data-type="{{butType}}" custom-class='v-but' catchtap="butClick">{{butType}}</van-button>
 </navigator>

pages/college/detail.wxml

@@ -11,7 +11,7 @@
     </view>
 </navigator>
 <!-- 描述 -->
-<navigator url="#" class="describe bsae-box">
+<navigator wx:if="{{detailData.notes}}" url="#" class="describe bsae-box">
     <view class="title">描述</view>
     <view class="multi-line">{{detailData.notes}}</view>
 </navigator>

pages/college/index.scss

@@ -19,12 +19,12 @@ page{
     }
 
     .explian {
-        width: 370rpx;
+        flex: 1;
+        width: 0;
         height: 100%;
         margin-left: 30rpx;
 
         .title {
-            height: 40rpx;
             line-height: 40rpx;
             font-size: 28rpx;
             font-family: PingFang SC-Bold, PingFang SC;

pages/college/index.wxml

@@ -14,9 +14,9 @@
     <navigator url="#" class="course my-card" wx:for="{{list}}" data-item="{{item}}" bindtap="toDetail">
         <van-image width="160rpx" height="120rpx" custom-class='cover-img' lazy-load fit='cover' src="{{item.cover||'https://img.yzcdn.cn/vant/cat.jpeg'}}" />
         <view class="explian">
-            <view class="title line-1">{{item.title}}</view>
-            <view class="details line-1">{{item.notes}}</view>
-            <view class="read line-1">{{item.readcount}}</view>
+            <view class="title line-2">{{item.title}}</view>
+            <view class="details line-1">{{item.notes||'暂无描述'}}</view>
+            <!-- <view class="read line-1">{{item.readcount}}</view> -->
         </view>
     </navigator>
     <My_empty wx:if="{{list.length==0}}" />