Authored by 张丽霞

Url拼接type保护,review by 盖见秋

@@ -21,12 +21,20 @@ export function urlAddParamOfType(url, type='0') { @@ -21,12 +21,20 @@ export function urlAddParamOfType(url, type='0') {
21 dataString = strs[1]; 21 dataString = strs[1];
22 } 22 }
23 } 23 }
24 - var obj = JSON.parse(dataString); //由JSON字符串转换为JSON对象  
25 - obj.params.type = type + ''; // params增加type参数  
26 - let totalUrlWithType = "yohobuy=" + JSON.stringify(obj);  
27 - if (strs.length > 1) {  
28 - totalUrlWithType = strs[0] + totalUrlWithType; 24 + try {
  25 + var obj = {};
  26 + if (dataString.length > 1) {
  27 + obj = JSON.parse(dataString); //由JSON字符串转换为JSON对象
  28 + }
  29 + obj.params.type = type + ''; // params增加type参数
  30 + let totalUrlWithType = "yohobuy=" + JSON.stringify(obj);
  31 + if (strs.length > 1) {
  32 + totalUrlWithType = strs[0] + totalUrlWithType;
  33 + }
  34 +
  35 + return totalUrlWithType;
  36 + } catch (e) {
  37 +
29 } 38 }
30 39
31 - return totalUrlWithType;  
32 -}  
  40 +}
@@ -13,6 +13,7 @@ const { @@ -13,6 +13,7 @@ const {
13 SWITCH_GENDER, 13 SWITCH_GENDER,
14 JUMP_WITH_URL, 14 JUMP_WITH_URL,
15 } = require('../../constants/actionTypes').default; 15 } = require('../../constants/actionTypes').default;
  16 +import {urlAddParamOfType} from '../../../common/utils/urlHandler';
16 17
17 export function setSegment(segment) { 18 export function setSegment(segment) {
18 return { 19 return {
@@ -157,37 +158,11 @@ export function jumpWithUrl(url) { @@ -157,37 +158,11 @@ export function jumpWithUrl(url) {
157 return; 158 return;
158 } 159 }
159 //拼接type 160 //拼接type
160 - url = urlAddParamOfType(url); 161 + url = urlAddParamOfType(url, '7')
  162 +
161 ReactNative.NativeModules.YH_CommonHelper.jumpWithUrl(url); 163 ReactNative.NativeModules.YH_CommonHelper.jumpWithUrl(url);
162 return { 164 return {
163 type: JUMP_WITH_URL, 165 type: JUMP_WITH_URL,
164 payload: url 166 payload: url
165 }; 167 };
166 } 168 }
167 -  
168 -function urlAddParamOfType(url) {  
169 - let strs= new Array();  
170 - let dataString = '';  
171 - if (url.indexOf('yohobuy=') !== -1) {  
172 - strs = url.split("yohobuy=");  
173 - if (strs.length == 1) {  
174 - dataString = strs[0];  
175 - } else {  
176 - dataString = strs[1];  
177 - }  
178 - } else {  
179 - strs = url.split("yohobuy=");  
180 - if (strs.length == 1) {  
181 - dataString = strs[0];  
182 - } else {  
183 - dataString = strs[1];  
184 - }  
185 - }  
186 - var obj = JSON.parse(dataString); //由JSON字符串转换为JSON对象  
187 - obj.params.type = '7';  
188 - let totalUrlWithType = "yohobuy=" + JSON.stringify(obj);  
189 - if (strs.length > 1) {  
190 - totalUrlWithType = strs[0] + totalUrlWithType;  
191 - }  
192 - return totalUrlWithType;  
193 -}