Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/course/courseprice-form.vue

@@ -255,6 +255,16 @@
             this.priceObj.courseObj.CourseId = res.Data.CourseId;
             this.priceObj.courseObj.OriginalPrice = res.Data.OriginalPrice;
             this.priceObj.courseObj.SellPrice = res.Data.SellPrice;
+            this.priceObj.courseObj.B2CRatio = res.Data.B2CRatio;
+            this.priceObj.courseObj.B2CReNewRatio = res.Data.B2CReNewRatio;
+            this.priceObj.courseObj.B2BRebateRatio = res.Data.B2BRebateRatio;
+            this.priceObj.courseObj.B2BReNewRatio = res.Data.B2BReNewRatio;
+            this.priceObj.courseObj.SchoolRebateRatio = res.Data.SchoolRebateRatio;
+            this.priceObj.courseObj.SchoolReNewRatio = res.Data.SchoolReNewRatio;
+            this.priceObj.courseObj.TransIntroductceRatio = res.Data.TransIntroductceRatio;
+            this.priceObj.courseObj.TransIntroductceReNewRatio = res.Data.TransIntroductceReNewRatio;
+            this.priceObj.courseObj.InnerRecommendRatio = res.Data.InnerRecommendRatio;
+            this.priceObj.courseObj.InnerRecommendReNewRatio = res.Data.InnerRecommendReNewRatio;
           });
           queryCoursePreferentialList({
             CourseId: this.saveObj.CourseId
@@ -302,8 +312,8 @@
         }
 
         this.$refs.SellPrice.validate();
-        this.$refs.B2BPrice.validate();
-        if (!this.$refs.SellPrice.hasError && !this.$refs.B2BPrice.hasError) {
+
+        if (!this.$refs.SellPrice.hasError) {
           this.saveCourseLoading = true;
           saveCoursePreferential(this.priceObj)
             .then(res => {

src/pages/sale/finishTask.vue

@@ -150,7 +150,9 @@
     methods: {
       //兑换奖品
       exchangeKudo(item) {
+        console.log(item,"item");
         var postMsg = {
+          Id:item.Id,
           CustomerId: item.CustomerId,
           ExchangeCode: item.ExchangeCode
         };