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

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

@@ -172,7 +172,7 @@
             <ul id="dataList" style="position: absolute;"></ul>
         </div>
         <select name="bindType" id="selectTwo" placeholder="请选择场次">
-            <option value="">所有111</option>
+            <option value="">所有</option>
         </select>
         <select name="bindType" id="selectThree" placeholder="请选择票种">
             <option value="">所有</option>
@@ -559,9 +559,14 @@
         }
         console.log(data,'data')
         promiseMethods('/candy/coupon/mgt/add','post',JSON.stringify(data),'application/json').then(res=>{
-            layer.msg('创建成功！');
-            $.operate.successTabCallback(res);
-            closeItem();
+            layer.msg('' + res);
+            if (res.code != undefined && res.code != web_status.SUCCESS) {
+                $.modal.alertWarning(res.msg);
+                return [];
+            } else if (res.code == web_status.SUCCESS) {
+                $.operate.successTabCallback(res);
+                closeItem();
+            }
         })
     }
     function promiseMethods(url,type,data,contentType) {

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

@@ -267,9 +267,16 @@
         promiseMethods(ctx+'kylin/base/performance/status','get',data,'application/x-www-form-urlencoded').then(res=>{
             if (res.value.length>0) {
                 searchData = res.value;
-                searchData.forEach((item,index)=>{
-                    str+= `<li class="selectData" onclick="selectOne('${item.performancesId}','${item.title}')">${item.title}</li>`
-                })
+                let obj = {};
+                searchData.reduce((cur,next) => {
+                    if (!obj[next.performancesId]) {
+                        obj[next.performancesId] = true
+                        str+= `<li class="selectData" onclick="selectOne('${next.performancesId}','${next.title}')">${next.title}</li>`
+                    }
+                },[]) //设置cur默认类型为数组，并且初始值为空的数组
+                // searchData.forEach((item,index)=>{
+                //     str+= `<li class="selectData" onclick="selectOne('${item.performancesId}','${item.title}')">${item.title}</li>`
+                // })
                 $('#dataList').html(str);
             } else {
                 $('#dataList').html('<li style="width:100%;text-align:center;color:#ccc;">--- 暂无数据 ---</li>');
@@ -454,10 +461,14 @@
         }
         console.log(data,'data')
         promiseMethods('/candy/coupon/mgt/add','post',JSON.stringify(data),'application/json').then(res=>{
-            console.log(res)
-            layer.msg('创建成功！');
-            $.operate.successTabCallback(res);
-            closeItem();
+            layer.msg('' + res);
+            if (res.code != undefined && res.code != web_status.SUCCESS) {
+                $.modal.alertWarning(res.msg);
+                return [];
+            } else if (res.code == web_status.SUCCESS) {
+                $.operate.successTabCallback(res);
+                closeItem();
+            }
         })
     }
     function promiseMethods(url,type,data,contentType) {

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

@@ -560,9 +560,14 @@
             delete data.eventLimit;
         }
         promiseMethods('/candy/coupon/mgt/add','post',JSON.stringify(data),'application/json').then(res=>{
-            layer.msg('创建成功！');
-            $.operate.successTabCallback(res);
-            closeItem();
+            layer.msg('' + res);
+            if (res.code != undefined && res.code != web_status.SUCCESS) {
+                $.modal.alertWarning(res.msg);
+                return [];
+            } else if (res.code == web_status.SUCCESS) {
+                $.operate.successTabCallback(res);
+                closeItem();
+            }
         })
     }
     function promiseMethods(url,type,data,contentType) {

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

@@ -333,16 +333,14 @@
             "redeemValidity": Number($('#ticketTime').val()) // 兑换有效期
         }
         promiseMethods('/candy/coupon/mgt/add','post',JSON.stringify(data),'application/json').then(res=>{
-            layer.msg('创建成功！');
-            let data = {
-                pageSize: 10,
-                pageNum: 1,
-                orderByColumn: 'createdAt',
-                isAsc: 'desc',
-                couType: 3
+            layer.msg('' + res);
+            if (res.code != undefined && res.code != web_status.SUCCESS) {
+                $.modal.alertWarning(res.msg);
+                return [];
+            } else if (res.code == web_status.SUCCESS) {
+                $.operate.successTabCallback(res);
+                closeItem();
             }
-            $.operate.successTabCallback(res);
-            closeItem();
         })
     }
     function promiseMethods(url,type,data,contentType) {

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

@@ -352,9 +352,14 @@
             delete data.eventLimit;
         }
         promiseMethods('/candy/coupon/mgt/add','post',JSON.stringify(data),'application/json').then(res=>{
-            layer.msg('创建成功！');
-            $.operate.successTabCallback(res);
-            closeItem();
+            layer.msg('' + res);
+            if (res.code != undefined && res.code != web_status.SUCCESS) {
+                $.modal.alertWarning(res.msg);
+                return [];
+            } else if (res.code == web_status.SUCCESS) {
+                $.operate.successTabCallback(res);
+                closeItem();
+            }
         })
     }
     function promiseMethods(url,type,data,contentType) {