Merge branch 'master' of http://gogs.efunbox.cn/LImengbo/efunbox_resources-web

src/api/skill.js

@@ -137,7 +137,7 @@ export function getBaiduData (params) {
     url: `${process.env.BAIDU_API}/statistics/simpleCourse`,
     method: 'get',
     params: {
-      courseId: params.classId,
+      // courseId: params.classId,
       startDate: params.startDate,
       endDate: params.endDate,
     }

src/pages/skill/Skill.vue

@@ -41,15 +41,15 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
+          <!-- <el-form-item
             class="pruductForm-skill"
             prop="classId"
             label="产品包选择"
             v-if="skillParams.skillId === 0 || skillParams.skillId === 3"
             :rules="[{ required: true, message: '请选择产品包', trigger: 'blur' }]"
           >
-          <!-- 兼容小度在家和学有义方不同的返回内容 -->
-            <el-select v-model="skillParams.classId" placeholder="请选择产品包" style="width:160px">
+           兼容小度在家和学有义方不同的返回内容 
+             <el-select v-model="skillParams.classId" placeholder="请选择产品包" style="width:160px">
               <el-option
                 v-for="item in baiduCourseList"
                 :key="item.id"
@@ -57,7 +57,7 @@
                 :value="item.id"
               ></el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item class="dateForm-skill" name="data" label="查询日期" style="display:flex">
             <el-date-picker
               style="width:140px"
@@ -428,7 +428,9 @@ export default {
           if(this.skillParams.channel === '6001'){
           this.$store.dispatch("getOppoData", this.skillParams);
           } else if(this.skillParams.skillId === 0 || this.skillParams.skillId === 3){
-          this.$store.dispatch("getBaiduData", this.skillParams);
+          // this.$store.dispatch("getBaiduData", this.skillParams);
+          this.$store.dispatch("getSkillData", this.skillParams);
+
           } else if(this.skillParams.channel === 'ALI') {
           this.$store.dispatch("getAliData", this.skillParams);
           } else{