Merge branch 'feature-private' into 'PrivateRelease'

、Feature private

See merge request crowd-2019/crowd-test-service-front!177

src/components/cheat/ProjectAdd.vue

@@ -249,7 +249,7 @@
   import Apis from '@/js/api.js'
   import {notify} from '@/constants/index'
   import {
-    getAllPlatformTypes,
+    getAllApplicationTypes,
     getAllServiceTypes,
     getGreenChannelAddProjectExcelTemplateFile,
     storageGet
@@ -610,7 +610,7 @@
                 })
             },
             setPlatformType() {
-                getAllPlatformTypes().then((res) => {
+              getAllApplicationTypes().then((res) => {
                     this.platforms = res
                 })
             },

src/components/commons/Footer2.0.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="footer-nav">
     <div class="container">
-      <el-row style="height: 120px">
+      <el-row>
         <el-col :span="5" class="nav-logo-block">
           <div class="nav-title-wrapper">
             <img :src="logo_white" alt="logo" class="nav-logo">

src/components/commons/Header2.0.vue

@@ -71,6 +71,7 @@
         </div>
     </div>
   </div>
+
 </template>
 
 <script>

src/components/project/Project.vue

@@ -314,7 +314,7 @@
     ensureEndProject,
     getAllFields,
     getAllInstitutions,
-    getAllPlatformTypes,
+    getAllApplicationTypes,
     getAllServiceTypes,
     getFormalTimeFromDate,
     getProvinceCodeByProvinceName,
@@ -987,7 +987,8 @@
         })
       },
       setPlatformType() {
-        getAllPlatformTypes().then((res) => {
+        getAllApplicationTypes().then((res) => {
+          console.log(res)
           this.platforms = res
         })
       },

src/components/project/ProjectCreate.vue

@@ -150,7 +150,7 @@
   import {
     getAllFields,
     getAllInstitutions,
-    getAllPlatformTypes,
+    getAllApplicationTypes,
     getAllServiceTypes,
     getProvinceNameByProvinceCode,
     storageGet
@@ -530,7 +530,7 @@
         })
     },
     setPlatforms () {
-        getAllPlatformTypes().then((res) => {
+        getAllApplicationTypes().then((res) => {
             this.platforms = res
         })
     },

src/js/index.js

@@ -58,7 +58,6 @@ import {
   getAllAgencies,
   getAllAgencyResourceTypes,
   getAllInstitutions,
-  getAllPlatformTypes,
   getAllFields,
   getAllReportTypes,
   getAllServiceTypes,
@@ -208,8 +207,7 @@ export {
   getAllAgencyResourceTypes,
   //TODO 可以使用 需要重构 获取所有区域管理员
   getAllInstitutions,
-  //TODO 目前使用本地数据 需要修改 获取所有测试平台类型
-  getAllPlatformTypes,
+
   getAllFields,
   //TODO 目前使用本地数据 需要修改 获取所有报告类型
   getAllReportTypes,
@@ -564,7 +562,7 @@ export const defaultValue = {
 // }
 //
 // //获取所有平台类型
-// export const getAllPlatformTypes = () => {
+// export const getAllApplicationTypes = () => {
 //   return ['ANDROID', 'IOS', 'WEB']
 //   //return Http.get(Apis.GENERAL.GET_ALL_ABILITIES)
 // }