Browse Source

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

yangfeng 1 year ago
parent
commit
3d1dd6082f

+ 1 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html

@@ -285,7 +285,7 @@
                             d = d.split("_")[1];
                           }
                         } else {
-                            d = "";
+                            d = industry[i];
                         }
                         industryHtml += "<span>" + d + "&nbsp</span>";
                     }

+ 1 - 1
src/web/templates/pc/orderDetail.html

@@ -330,7 +330,7 @@
                           d = d.split("_")[1];
                         }
                     } else {
-                        d = "";
+                        d = industry[i];
                     }
                     industryHtml += "<span>" + d + "</span>";
                 }

+ 1 - 1
src/web/templates/weixin/dataExport/dataExport_toOrderDetail.html

@@ -182,7 +182,7 @@
                             d = d.split("_")[1];
                           }
                         } else {
-                            d = "";
+                            d = industry[i];
                         }
                         industryHtml += "<span>" + d + "&nbsp</span>";
                     }