修改bug

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/store/info.html

@@ -237,7 +237,7 @@
     // var r = window.location.search.substr(1).match(reg);
     // console.log(r, storeId, '取到没')
     let storeId = storeInfo.storeId;
-    if (storeInfo.status == 3 || storeInfo.status == 2) {
+    if (storeInfo.status == 3 || storeInfo.status == 2 || storeInfo.status == 5) {
         $(".content_footer").hide();
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/activityList.html

@@ -217,7 +217,7 @@
             $("button[name=refresh]").click()
 	    })
         function goToStore_list (name, id, time) {
-            $.modal.openTab(name, prefix2 + "/activityStoreList?id=" + id + '&time=' + time)
+            $.modal.openTab(name, prefix2 + "/activityStoreList?id=" + id + '&time=' + time + '&name=' + name)
         }
         function onCheck (row, $element) {
             rowData = row;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/activityStoreList.html

@@ -114,11 +114,16 @@
         $(function () { // promiseMethods('', 'post', data);
             let name = 'id';
             let time = 'time';
+            let activityName = '';
+            let aName = 'name';
             var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
             var reg2 = new RegExp("(^|&)"+ time +"=([^&]*)(&|$)");
+            var reg3 = new RegExp("(^|&)"+ aName +"=([^&]*)(&|$)");
             var r = window.location.search.substr(1).match(reg);
             var r2 = window.location.search.substr(1).match(reg2);
+            var r3 = window.location.search.substr(1).match(reg3);
             let times = unescape(r2[2])
+            activityName = decodeURI(r3[2]);
             if (r) {
                 $("#marketId").val(unescape(r[2]));
             }
@@ -156,7 +161,7 @@
                                 title: '操作',
                                 align: 'center',
                                 formatter: function (value, row, index) {
-                                    return `<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="goDetail('${row.storeName}','${row.storeId}', '${times}', '${unescape(r[2])}')">查看详情</a>`
+                                    return `<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="goDetail('${activityName}','${row.storeId}', '${times}', '${unescape(r[2])}')">查看详情</a>`
                                 }
                             }]
                     };