Merge remote-tracking branch 'origin/dev_stone' into dev_stone

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add1.html

@@ -311,13 +311,12 @@
         // });
     };
     function selectOne(id,name) {
-        console.log(id, showId, 'showId')
         $("#searchIpt").val(name);
         showId = id;
         if (typeOne == 2) {
             return
         }
-        let str = `<option value="0" label="">所有</option>`;
+        let str = `<option value="" label="">所有</option>`;
         let obj = {};
         let filterData = [];
         searchData.forEach(item=>{
@@ -340,7 +339,6 @@
         if (typeOne == 2) {
             getMallList()
         } else {
-            console.log('search')
             search()
         }
         $('#dataList').show()
@@ -356,16 +354,14 @@
         if (typeOne == 2) {
             getMallList()
         } else {
-            console.log('search')
             search()
         }
     });
     
     $('#selectTwo').change(function(e){
         selectTwoId = $(this).val();
-        console.log(selectTwoId,'kankna')
         selectTwoName = $('#selectTwo').find('option:selected').attr('label');
-        let str = `<option value="0" label="" >所有</option>`;
+        let str = `<option value="" label="" >所有</option>`;
         searchData.forEach(item=>{
             if (item.timeId == selectTwoId) {
                 str+= `<option value='${item.ticketId}' label='${item.ticketTitle}'>${item.ticketTitle}</option>`
@@ -385,7 +381,6 @@
             $("#searchIpt").attr('placeholder', '全部');
         }
         if (typeOne != 0) {
-            console.log('???')
             showId = ''; // 选中演出id
             selectTwoId = ''; // 选中演出下级的ID
             selectThreeId = ''; // 选中演出三级的ID
@@ -520,7 +515,6 @@
             }
             busiName = $("#searchIpt").val();
         }
-        console.log(showId,busiId, 'showId')
         let data = {
             "bindType": Number(typeTwo), // 兑换券/发放
             "busiType": Number(typeOne), // 业务类别
@@ -557,7 +551,6 @@
         if (sendType != 2) {
             delete data.eventLimit;
         }
-        console.log(data,'data')
         promiseMethods('/candy/coupon/mgt/add','post',JSON.stringify(data),'application/json').then(res=>{
             layer.msg('' + res);
             if (res.code != undefined && res.code != web_status.SUCCESS) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add101.html

@@ -306,7 +306,7 @@
         if (typeOne == 2) {
             return
         }
-        let str = `<option value="0" label="">所有</option>`;
+        let str = `<option value="" label="">所有</option>`;
         searchData.forEach(item=>{
             if (item.performancesId == id) {
                 str+= `<option value='${item.timeId}' label='${item.timeTitle}'>${item.timeTitle}</option>`
@@ -321,7 +321,6 @@
         if (typeOne == 2) {
             getMallList()
         } else {
-            console.log('search')
             search()
         }
         $('#dataList').show()
@@ -338,9 +337,8 @@
 
     $('#selectTwo').change(function(e){
         selectTwoId = $(this).val();
-        console.log(selectTwoId,'kankna')
         selectTwoName = $('#selectTwo').find('option:selected').attr('label');
-        let str = `<option value="0" label="" >所有</option>`;
+        let str = `<option value="" label="" >所有</option>`;
         searchData.forEach(item=>{
             if (item.timeId == selectTwoId) {
                 str+= `<option value='${item.ticketId}' label='${item.ticketTitle}'>${item.ticketTitle}</option>`
@@ -459,7 +457,6 @@
         if (sendType != 2) {
             delete data.eventLimit;
         }
-        console.log(data,'data')
         promiseMethods('/candy/coupon/mgt/add','post',JSON.stringify(data),'application/json').then(res=>{
             layer.msg('' + res);
             if (res.code != undefined && res.code != web_status.SUCCESS) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add2.html

@@ -318,7 +318,7 @@
         if (typeOne == 2) {
             return
         }
-        let str = `<option value="0" label="">所有</option>`;
+        let str = `<option value="" label="">所有</option>`;
         let obj = {};
         let filterData = [];
         searchData.forEach(item=>{
@@ -341,7 +341,6 @@
         if (typeOne == 2) {
             getMallList()
         } else {
-            console.log('search')
             search()
         }
         $('#dataList').show()
@@ -357,16 +356,14 @@
         if (typeOne == 2) {
             getMallList()
         } else {
-            console.log('search')
             search()
         }
     });
     
     $('#selectTwo').change(function(e){
         selectTwoId = $(this).val();
-        console.log(selectTwoId,'kankna')
         selectTwoName = $('#selectTwo').find('option:selected').attr('label');
-        let str = `<option value="0" label="" >所有</option>`;
+        let str = `<option value="" label="" >所有</option>`;
         searchData.forEach(item=>{
             if (item.timeId == selectTwoId) {
                 str+= `<option value='${item.ticketId}' label='${item.ticketTitle}'>${item.ticketTitle}</option>`

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add3.html

@@ -235,7 +235,7 @@
     function selectOne(id,name) {
         $("#searchIpt").val(name);
         showId = id;
-        let str = `<option value="0" label="">所有</option>`;
+        let str = `<option value="" label="">所有</option>`;
         let obj = {};
         let filterData = [];
         searchData.forEach(item=>{
@@ -252,7 +252,7 @@
         selectTwoId = ''; // 选中演出下级的ID
         selectThreeId = ''; // 选中演出三级的ID
         $('#selectTwo').empty().append(str);
-        $('#selectThree').empty().append('<option value="0" label="">所有</option>');
+        $('#selectThree').empty().append('<option value="" label="">所有</option>');
     };
     $("#searchIpt").focus(function(){
         search()
@@ -274,9 +274,8 @@
     
     $('#selectTwo').change(function(e){
         selectTwoId = $(this).val();
-        console.log(selectTwoId,'kankna')
         selectTwoName = $('#selectTwo').find('option:selected').attr('label');
-        let str = `<option value="0" label="" >所有</option>`;
+        let str = `<option value="" label="" >所有</option>`;
         searchData.forEach(item=>{
             if (item.timeId == selectTwoId) {
                 str+= `<option value='${item.ticketId}' label='${item.ticketTitle}'>${item.ticketTitle}</option>`

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add4.html

@@ -254,7 +254,6 @@
     function selectOne(id,name) {
         $("#searchIpt").val(name);
         showId = id;
-        console.log(showId, 'showId')
     };
     $("input[name=typeTwo]").change(function(e){
         typeTwo = e.target.value;
@@ -320,7 +319,6 @@
             busiName = $('#searchIpt').val();
             busiId = showId;
         }
-        console.log(showId,busiId, 'showId')
         let data = {
             "bindType": Number(typeTwo), // 兑换券/发放
             "busiType": 2, // 业务类别