Merge branch 'dev/v4.9.36_tsz' of qmx/jy into release/v4.9.36

src/jfw/modules/app/src/web/templates/dataExport/dataExport.html

@@ -951,7 +951,13 @@
                     break
                 }
                 var str = industry[i].split("_")[1] !== '其他' ? industry[i].split("_")[1] : industry[i];
-                arr.push(str)
+                if(str) {
+                  if(industry[i] === '其他_其他') {
+                    arr.push('其他')
+                  } else {
+                    arr.push(str)
+                  }
+                }
             }
             $("#industry").text(arr.toString().replace(/,/g, " "));
             $(".confirm").hide();
@@ -1343,7 +1349,7 @@
                 city = localStorage.city;
             }
             if (localStorage.industry !== undefined && localStorage.industry !== "") {
-                industry = localStorage.industry;
+                industry = localStorage.industry.replace(/其他_其他/g, '其他');
             }
             if (localStorage.buyclass !== undefined && localStorage.buyclass !== "") {
                 var text = JSON.parse(localStorage.buyclass) == [] ? '全部' : JSON.parse(localStorage.buyclass).toString()

src/jfw/modules/app/src/web/templates/dataExport/dataExport_industry.html

@@ -165,7 +165,7 @@
                     <li>
                       <dl>
                         <dt>其他</dt>
-                        <dd data-value="其他">其他</dd>
+                        <dd data-value="其他_其他">其他</dd>
                       </dl>
                     </li>
                 </ul>

src/web/templates/weixin/dataExport/dataExport.html

@@ -975,7 +975,13 @@
                     break
                 }
                 var str = industry[i].split("_")[1] !== '其他' ? industry[i].split("_")[1] : industry[i];
-                arr.push(str)
+                if(str) {
+                  if(industry[i] === '其他_其他') {
+                    arr.push('其他')
+                  } else {
+                    arr.push(str)
+                  }
+                }
             }
             $("#industry").text(arr.toString().replace(/,/g," "));
             $(".confirm").hide();
@@ -1351,7 +1357,7 @@
                 city = localStorage.city;
             }
             if(localStorage.industry!==undefined&&localStorage.industry!==""){
-                industry = localStorage.industry;
+                industry = localStorage.industry.replace(/其他_其他/g, '其他');
             }
             if(localStorage.buyclass !== undefined && localStorage.buyclass!== ""){
                 var text =  JSON.parse(localStorage.buyclass) == [] ? '全部' : JSON.parse(localStorage.buyclass).toString()

src/web/templates/weixin/dataExport/dataExport_industry.html

@@ -164,7 +164,7 @@
                     <li>
                       <dl>
                         <dt>其他</dt>
-                        <dd data-value="其他">其他</dd>
+                        <dd data-value="其他_其他">其他</dd>
                       </dl>
                     </li>
                 </ul>