merge

@@ -146,7 +146,7 @@ const _pageArticleContent = (articleContent, isApp, gender) => {
                             } else {
                             } else {
                                 callArtGoodGroup(++ii, len2);
                                 callArtGoodGroup(++ii, len2);
                             }
                             }
-                            
+
                         } else {
                         } else {
                             contents.push(build);
                             contents.push(build);
                             joinContentFunc(++i, len);
                             joinContentFunc(++i, len);

@@ -1520,7 +1520,7 @@ let getProductAsyncData = (data) => {
                 finalResult.isStudent = data.isStudent;
                 finalResult.isStudent = data.isStudent;
                 return finalResult;
                 return finalResult;
             });
             });
-            
+
         });
         });
 
 
     });
     });