Merge branch '03/03GRADE' into jenkins

dist/static/css/chunk-21fe3f07.1a65d67e.css

@@ -1 +0,0 @@
-.titleCell[data-v-1b30cdc2]{display:inline-block}.tableWrap[data-v-1b30cdc2]{margin-top:20px}.qrcode[data-v-1b30cdc2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.qrcode img[data-v-1b30cdc2]{width:200px;height:200px;margin:0 auto}.code-url[data-v-1b30cdc2]{font-size:18px;text-align:center;padding:15px 15px 0 15px}

dist/static/css/chunk-39b56bac.b68ae044.css

@@ -0,0 +1 @@
+.titleCell[data-v-380fc0d2]{display:inline-block}.tableWrap[data-v-380fc0d2]{margin-top:20px}.qrcode[data-v-380fc0d2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.qrcode img[data-v-380fc0d2]{width:200px;height:200px;margin:0 auto}.code-url[data-v-380fc0d2]{font-size:18px;text-align:center;padding:15px 15px 0 15px}

src/views/teamBuild/modals/change-voice.vue

@@ -473,10 +473,12 @@ export default {
         console.log(data, "fetchDetail");
         if (data) {
           this.$set(this.form, "type", this.item.kitGroupPurchaseType);
-          console.log(this.form.type,'fetchDetail')
-          this.originalAccessoriesPrice = data.changeAccessoriesPrice;
-          this.originalMusicalPrice = data.changeMusicalPrice;
-          this.originalCourseFee = data.changeCourseFee;
+          this.originalAccessoriesPrice = data.originalAccessoriesPrice;
+          this.originalMusicalPrice = data.originalMusicalPrice;
+          if(this.item.kitGroupPurchaseType == 'GROUP'){
+            this.originalCourseFee = data.originalCourseFee;  // 改为原乐器分润
+          }
+
           this.originalMusicalGoods =
             data.changeMusicalGoods && data.changeMusicalGoods.name;
           this.originalAccessoriesGoods = (data.changeAccessoriesGoods || [])