瀏覽代碼

Merge branch 'newVersion' into dev

mo 2 年之前
父節點
當前提交
59df88f7ca

+ 2 - 1
src/components/col-cropper/cropper.tsx

@@ -204,7 +204,8 @@ export default defineComponent({
               ref="cropperRef"
               img={this.options.img}
               info={true}
-              autoCrop={this.options.autoCrop}
+              autoCrop={true}
+              centerBox={true}
               autoCropWidth={this.options.autoCropWidth}
               full={this.options.full}
               outputType={this.options.outputType}

+ 3 - 1
src/views/muiscDetial/index.tsx

@@ -651,7 +651,7 @@ export default defineComponent({
                       </div>
                     ) : null}
 
-                    <div class={classes.otherMusic}>
+                   {state.musicList.length>0&&<div class={classes.otherMusic}>
                       <div class={classes.videoNav}>
                         <h5>TA的曲谱</h5>
                         <div
@@ -674,7 +674,9 @@ export default defineComponent({
                         })}
                       </div>
                     </div>
+                      }
                   </div>
+
                 </div>
                 {/* <img src={state.imgUrl} alt="" /> */}
               </div>

+ 2 - 0
src/views/videoDetailList/videoDetail.tsx

@@ -380,6 +380,7 @@ export default defineComponent({
                   </div> */}
                 </div>
               </div>
+              {state.otherVideoList.length>0&&
               <div class={styles.otherCourse}>
                 <h2>其他课程</h2>
                 <div>
@@ -398,6 +399,7 @@ export default defineComponent({
                   {/* videoDetailItem */}
                 </div>
               </div>
+              }
             </div>
           </div>
           <ElDialog