样式调整

src/main/resources/mappings/modules/order/ShopOrderMapper.xml

@@ -2559,7 +2559,7 @@
         left join cm_order co on cso.orderId = co.orderId
         left join bp_order_userinfo bou on bou.orderId = cso.orderId
         <if test="productName != null and productName != ''">
-            LEFT JOIN cm_order_product cop ON co.orderID = cop.orderID
+            LEFT JOIN cm_order_product cop ON cso.shopOrderId = cop.shopOrderId
             LEFT JOIN product p ON cop.productID = p.productID
         </if>
         LEFT JOIN user u ON u.userID = cso.userID
@@ -2594,7 +2594,7 @@
                 AND cso.shopStatus = #{status}
             </if>
             <if test="productName != null and productName != ''">
-                and p.name like CONCAT('%',#{productName},'%')
+                and (p.name like CONCAT('%',#{productName},'%') OR p.aliasName LIKE CONCAT('%',#{productName},'%'))
             </if>
             <if test="receiptStatus != null and receiptStatus != ''">
                 AND cso.receiptStatus = #{receiptStatus}

src/main/webapp/WEB-INF/views/modules/userNew/cmClubSales.jsp

@@ -35,10 +35,10 @@
             </div>
             <div class="box-tabmain">
                 <div class="box-tabs" id="clubTabs">
-                    <a class="box-tabs-li active" href="javascript: void(0);" data-type="4">全年</a>
+                    <a class="box-tabs-li" href="javascript: void(0);" data-type="4">全年</a>
                     <a class="box-tabs-li" href="javascript: void(0);" data-type="3">半年</a>
                     <a class="box-tabs-li" href="javascript: void(0);" data-type="2">月</a>
-                    <a class="box-tabs-li" href="javascript: void(0);" data-type="1">日</a>
+                    <a class="box-tabs-li active" href="javascript: void(0);" data-type="1">日</a>
                 </div>
                 <div class="box-time" id="clubDate">
                     <div class="time-input">
@@ -85,10 +85,10 @@
                 </div>
                 <div class="box-tabmain-b">
                     <div class="box-tabs" id="clubRemarkTabs">
-                        <a class="box-tabs-li active" href="javascript: void(0);" data-type="4">全年</a>
+                        <a class="box-tabs-li" href="javascript: void(0);" data-type="4">全年</a>
                         <a class="box-tabs-li" href="javascript: void(0);" data-type="3">半年</a>
                         <a class="box-tabs-li" href="javascript: void(0);" data-type="2">月</a>
-                        <a class="box-tabs-li" href="javascript: void(0);" data-type="1">日</a>
+                        <a class="box-tabs-li active" href="javascript: void(0);" data-type="1">日</a>
                     </div>
                 </div>
             </div>

src/main/webapp/static/modules/cmClubSales/cmClubSales.js

@@ -8,9 +8,9 @@ $(function(){
     // 机构搜索关键词初始化时间
     getclubActiveDate();
     // 第一次执行查所有
-    getClubSalesEacthsData(0,4);
-    getClubSalesEacthsData(1,4);
-    getClubSalesEacthsData(2,4);
+    getClubSalesEacthsData(0,1);
+    getClubSalesEacthsData(1,1);
+    getClubSalesEacthsData(2,1);
     // 点击筛选新注册机构统计数据
     $('#clubTabs').children("a").each(function (index) {
         $(this).click(function () {