Browse Source

添加阿里渠道

limengbo 4 years ago
parent
commit
9488d9e496
5 changed files with 42 additions and 19 deletions
  1. 1 1
      config/dev.env.js
  2. 1 1
      config/prod.env.js
  3. 18 11
      src/api/skill.js
  4. 7 5
      src/pages/skill/Skill.vue
  5. 15 1
      src/store/modules/skill.js

+ 1 - 1
config/dev.env.js

@@ -18,7 +18,7 @@ module.exports = {
   XYYF_API: '"http://xyyf-api.ai160.com"',
   EFUN_API: '"http://ott80-api.ai160.com"',
   OPPO_API: '"http://xxtbfd-api.ai160.com"',
-  BAIDU_API: '"http://bd-audioskill.efunbox.cn:81"'
+  BAIDU_API: '"http://bd-audioskill.efunbox.cn:81/audio"'
 }
 
 

+ 1 - 1
config/prod.env.js

@@ -7,5 +7,5 @@ module.exports = {
   XYYF_API: '"http://xyyf-api.ai160.com"',
   EFUN_API: '"http://ott80-api.ai160.com"',
   OPPO_API: '"http://xxtbfd-api.ai160.com"',
-  BAIDU_API: '"https://baidu-audio-skill.ai160.com"'
+  BAIDU_API: '"https://baidu-audio-skill.ai160.com/audio"'
 }

+ 18 - 11
src/api/skill.js

@@ -78,15 +78,6 @@ export function getSkillData (params) {
       params
     })
   } else {
-    // return service({
-    //   url: `${process.env.ali_API}/statistics`,
-    //   method: 'get',
-    //   params: {
-    //     skillId: params.skillId,
-    //     startDate: params.startDate,
-    //     endDate: params.endDate,
-    //   }
-    // })
     console.log(123123123,params)
     return service({
       url: `${process.env.XYYF_API}/statistics`,
@@ -121,7 +112,7 @@ export function getOppoData (params) {
 export function getBaiduCourseList (subjectEnum) {
  
   return service({
-    url: `${process.env.BAIDU_API}/audio/statistics/getSimpleCourseList`,
+    url: `${process.env.BAIDU_API}/statistics/getSimpleCourseList`,
     method: 'get',
     params: {
       subjectEnum
@@ -135,7 +126,7 @@ export function getBaiduData (params) {
  
   console.log(123123123,params)
   return service({
-    url: `${process.env.BAIDU_API}/audio/statistics/simpleCourse`,
+    url: `${process.env.BAIDU_API}/statistics/simpleCourse`,
     method: 'get',
     params: {
       courseId: params.classId,
@@ -147,3 +138,19 @@ export function getBaiduData (params) {
 
 }
 
+export function getAliData (params) {
+ 
+  console.log(123123123,params)
+  return service({
+    url: `${process.env.ali_API}/statistics`,
+    method: 'get',
+    params: {
+      skillId: params.skillId,
+      startDate: params.startDate,
+      endDate: params.endDate,
+    }
+  })
+
+
+}
+

+ 7 - 5
src/pages/skill/Skill.vue

@@ -44,12 +44,12 @@
           <el-form-item
             class="pruductForm-skill"
             prop="classId"
-            label="年级选择"
+            label="产品包选择"
             v-if="skillParams.skillId === 0 || skillParams.skillId === 3"
-            :rules="[{ required: true, message: '请选择年级', trigger: 'blur' }]"
+            :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"
@@ -240,7 +240,7 @@ export default {
       channelList: "",
       skillChanneList: [
         { title: "百度-小度在家", code: "BAIDU" },
-        // { title: "阿里-天猫精灵", code: "ALI" },
+        { title: "阿里-天猫精灵", code: "ALI" },
         { title: "百度-义方小学堂", code: "XYYF" },
         { title: "OPPO-小学同步辅导", code: "6001" }
 
@@ -278,7 +278,9 @@ export default {
           this.$store.dispatch("getOppoData", this.skillParams);
           } else if(this.skillParams.skillId === 0 || this.skillParams.skillId === 3){
           this.$store.dispatch("getBaiduData", this.skillParams);
-          }else{
+          } else if(this.skillParams.channel === 'ALI') {
+          this.$store.dispatch("getAliData", this.skillParams);
+          } else{
           this.$store.dispatch("getSkillData", this.skillParams);
           }
         } else {

+ 15 - 1
src/store/modules/skill.js

@@ -2,7 +2,8 @@ import {
   getSkillList,
   getSkillData,
   getOppoData,
-  getBaiduData
+  getBaiduData,
+  getAliData
 } from '../../api/skill'
 
 const skill = {
@@ -75,6 +76,19 @@ const skill = {
         })
       })
     },
+    getAliData({commit}, data) {
+      return new Promise((resolve, reject) => {
+        getAliData(data).then(res => {
+          console.log(res.data)
+          if (res.code == 200) {
+            resolve(res.data);
+            commit('GET_SKILL_DATA', res.data)
+          }
+        }).catch(error => {
+          reject(error);
+        })
+      })
+    },
     getBaiduData({
       commit
     },data) {