Merge branch '0510ShopMusic' into test

src/views/businessManager/shopManager/shopList.vue

@@ -147,6 +147,16 @@
             <el-option label="否" value="0"></el-option>
           </el-select>
         </el-form-item>
+         <el-select
+            v-model="searchForm.courseViewType"
+            placeholder="请选择乐团收费模式"
+            clearable
+            :disabled="addDisabled"
+          >
+            <el-option label="课程收费" value="0"></el-option>
+            <el-option label="系统收费" value="1"></el-option>
+            <el-option label="云教练收费" value="2"></el-option>
+          </el-select>
         <el-form-item prop="replacementShow">
           <el-select
             v-model.trim="searchForm.replacementShow"
@@ -747,6 +757,7 @@ export default {
         clientShow: null,
         educationalShow: null,
         musicGroupShow: null,
+        courseViewType: null,
         replacementShow: null,
       },
       headers: {
@@ -1153,7 +1164,9 @@ export default {
         form.goodsList = goodsList;
         form.id = row.id;
 
-        form.courseViewType = row.courseViewType.split(',')
+        if(row.courseViewType) {
+          form.courseViewType = row.courseViewType.split(',')
+        }
 
         this.onValidGoodsStatus();
         this.getAllGoodsList();
@@ -1369,4 +1382,8 @@ export default {
   max-height: 70px;
   overflow: hidden;
 }
+
+.el-select__tags .el-tag.el-tag--info.el-tag--small.el-tag--light {
+  max-width: 95px;
+}
 </style>

src/views/businessManager/shopManager/shopOperation.vue

@@ -474,18 +474,19 @@ export default {
     onSubmit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.form.courseViewType = this.form.courseViewType.join(',')
+          let tempForm = JSON.parse(JSON.stringify(this.form))
+          tempForm.courseViewType = tempForm.courseViewType.join(',')
           if (this.pageType == "create") {
-            if (this.form.id) {
+            if (tempForm.id) {
               // 判断有没有Id，如果有则删除
-              delete this.form.id;
+              delete tempForm.id;
             }
-            this.form.status = "NO"; // 默认上架
-            goodsAdd(this.form).then((res) => {
+            tempForm.status = "NO"; // 默认上架
+            goodsAdd(tempForm).then((res) => {
               this.messageTips("添加", res);
             });
           } else if (this.pageType == "update") {
-            goodsUpdate(this.form).then((res) => {
+            goodsUpdate(tempForm).then((res) => {
               this.messageTips("修改", res);
             });
           }
@@ -725,4 +726,7 @@ export default {
   height: 120px;
   display: block;
 }
+.el-select__tags .el-tag.el-tag--info.el-tag--small.el-tag--light {
+  max-width: 95px;
+}
 </style>

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

@@ -378,8 +378,8 @@ export default {
       // 写入声部商品和辅件
       getSubjectGoods({
         subjectIds: val,
-        chargeTypeId: this.topfor.type,
-        musicGroupId: this.teamid
+        chargeTypeId: this.topfor.type
+        // musicGroupId: this.teamid
       }).then((res) => {
         if (res.code == 200) {
           if (res.data) {

src/views/teamBuild/components/teamBaseInfo.vue

@@ -64,7 +64,7 @@
           >
             <el-option label="课程收费" :value="0"></el-option>
             <el-option label="系统收费" :value="1"></el-option>
-            <el-option label="云教练收费" :value="2"></el-option>
+            <!-- <el-option label="云教练收费" :value="2"></el-option> -->
           </el-select>
         </el-form-item>