Merge branch 'tipsMode' into test

src/js/index.js

@@ -5,7 +5,7 @@ require('./../css/popup.css');
 var Promise = require("bluebird");
 
 
-//tipsMode: 提示信息模式  1 为多个提示信息， 2 为单个
+//tipsMode: 提示信息模式  1 为单个， 2 为多个(只有传2时为多个)
 
 const $ = require("jquery");
 const { post,config,getUrlArgObject,openNewWin } = require('./promise.js');
@@ -78,7 +78,7 @@ function getTreatment() {
 
 function getTipsInfo() {
   let tipsInfoList =  getUrlArgObject('tipsInfoList')&&JSON.parse(getUrlArgObject('tipsInfoList')) || []
-  if(+tipsMode === 1) {
+  if(tipsMode == 2) {
     return post(config.informationMore, {conceptIntorduces:tipsInfoList})
   } else {
     return post(config.information,{name:getUrlArgObject('tipsName'),type:getUrlArgObject('tipsType'), position: 1})
@@ -99,7 +99,7 @@ function getPageInfo() {
     const treatResult = treatInfo.data || {}
     let tipsResult = []
     if(tipsInfo.data) {
-      if(+tipsMode === 1) {
+      if(tipsMode == '2') {
           tipsResult = tipsInfo.data
       } else {
           tipsResult.push(tipsInfo.data)

src/js/indexHorizontal.js

@@ -75,7 +75,7 @@ function getTreatment() {
 function getTipsInfo() {
   let tipsInfoList =  getUrlArgObject('tipsInfoList')&&JSON.parse(getUrlArgObject('tipsInfoList')) || []
   
-  if(+tipsMode === 1) {
+  if(tipsMode == '2') {
     return post(config.informationMore, {conceptIntorduces:tipsInfoList})
   } else {
     return post(config.information,{name:getUrlArgObject('tipsName'),type:getUrlArgObject('tipsType'), position: 1})
@@ -93,7 +93,7 @@ function getPageInfo() {
     const treatResult = treatInfo.data || {}
     let tipsResult = []
     if(tipsInfo.data) {
-      if(+tipsMode === 1) {
+      if(tipsMode == '2') {
           tipsResult = tipsInfo.data
       } else {
           tipsResult.push(tipsInfo.data)