Merge branch '03/03Lebao' into test

src/utils/searchArray.js

@@ -178,6 +178,7 @@ export const goodsType = [
   { value: 'ACCESSORIES', label: '辅件' },
   { value: 'TEACHING', label: '教材' },
   { value: 'STAFF', label: '教谱' },
+  { value: 'OTHER', label: '其它' },
 ]
 
 export const classStatus = [

src/views/resetTeaming/modals/subject-preview.vue

@@ -11,7 +11,7 @@
 			<div class="yunTrain">
 				<img :src="trainBg" />
 				<div class="toolText">
-					<p class="toolTitle">器乐练习云教练
+					<p class="toolTitle">乐器练习云教练
 						<i class="icon_video" @click="videoStatus = true"></i>
 					</p>
 					<p class="toolDate">有效期说明：自开课之日起6个月内有效</p>
@@ -489,12 +489,12 @@ export default {
                                 let childGoodsNameList = []
                                 if(tempItem.childGoodsList && tempItem.childGoodsList.length > 0) {
                                     tempItem.childGoodsList.forEach(child => {
-                                        if(child.type == "ACCESSORIES") {
+                                        if(child.type != "INSTRUMENT" && child.type != "OTHER") {
                                             childGoodsNameList.push(child.name)
                                         }
                                     })
 
-                                    tempItem.childGoodsNames = childGoodsNameList.join(',')
+                                    tempItem.childGoodsNames = childGoodsNameList.join('、')
                                 }
                                 this.instrumentResult.push(tempItem)
                                 tempInstrument.push(tempItem)

src/views/teamBuild/components/soundSetComponents/soundSetCore.vue

@@ -693,7 +693,7 @@ export default {
   padding: 20px;
 }
 .soundBtnFixed {
-  top: 86px;
+  top: 125px;
   left: 250px; // 205
   width: 100%;
   position: fixed;