Merge branch 'dev_ren' into 'master'

1.7

See merge request !30

src/api/website/industryApplication/index.js

@@ -13,7 +13,7 @@ import fetch from 'utils/fetch';
  * 获取所有行业应用类型
  * @param {Object} indexShow
  */
-export function getAllApplicationType(obj){
+export function getAllApplicationType(obj) {
   return fetch({
     url: '/api/website/industryApplicationType/app/unauth/getAll',
     method: 'get',
@@ -25,7 +25,7 @@ export function getAllApplicationType(obj){
  * 分页获取所有行业应用类型
  * @param {Object} obj
  */
-export function getListApplicationType(obj){
+export function getListApplicationType(obj) {
   return fetch({
     url: '/api/website/industryApplicationType/getList',
     method: 'get',
@@ -37,7 +37,7 @@ export function getListApplicationType(obj){
  * 新增或更新行业应用类型
  * @param {Object} obj
  */
-export function addUpdateApplicationType(obj){
+export function addUpdateApplicationType(obj) {
   return fetch({
     url: '/api/website/industryApplicationType/addUpdate',
     method: 'post',
@@ -49,7 +49,7 @@ export function addUpdateApplicationType(obj){
  * 分页获取行业应用信息
  * @param {Object} obj
  */
-export function getListApplicationInfo(obj){
+export function getListApplicationInfo(obj) {
   return fetch({
     url: '/api/website/industryApplicationInfo/getList',
     method: 'get',
@@ -61,7 +61,7 @@ export function getListApplicationInfo(obj){
  * 新增或更新行业应用信息
  * @param {Object} obj
  */
-export function addUpdateApplicationInfo(obj){
+export function addUpdateApplicationInfo(obj) {
   return fetch({
     url: '/api/website/industryApplicationInfo/addUpdate',
     method: 'post',
@@ -73,10 +73,10 @@ export function addUpdateApplicationInfo(obj){
  * 新增或更新交易保障
  * @param {Object} obj
  */
-export function addUpdateProtection(obj){
+export function addUpdateProtection(obj) {
   return fetch({
-        url: "/api/website/commonInfo/addUpdate",
-        method: "post",
+    url: '/api/website/commonInfo/addUpdate',
+    method: 'post',
     data: obj
   })
 }
@@ -85,10 +85,10 @@ export function addUpdateProtection(obj){
  * 获取分页的交易保障
  * @param {Object} obj
  */
-export function getListProtections(obj){
+export function getListProtections(obj) {
   return fetch({
-        url: "/api/website/commonInfo/getAll",
-        method: "get",
+    url: '/api/website/commonInfo/getAll?type=1',
+    method: 'get',
     param: obj
   })
 }