Merge branch 'dev_kid' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev_kid

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/school/list.html

@@ -33,7 +33,7 @@
                     <ul>
                         <li>
                             <label>学校名称：</label>
-                            <input type="text" name="activityTitle"/>
+                            <input id="schoolName" type="text" name="name"/>
                         </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
@@ -104,6 +104,8 @@
                 headers:{"Content-Type":"application/json;charset=UTF-8"},
                 data: JSON.stringify(postData),
                 success:function(e) {
+                     $("pull-right button[type=refresh]").click();
+                    refreshItem();
                     $(".layui-layer-close1").click();
                 }
             })
@@ -115,6 +117,8 @@
                 headers:{"Content-Type":"application/json;charset=UTF-8"},
                 data: JSON.stringify(postData),
                 success:function(e) {
+                     $("pull-right button[type=refresh]").click();
+                    refreshItem();
                     $(".layui-layer-close1").click();
                 }
             })
@@ -124,6 +128,7 @@
         $(".layui-layer-close1").click();
     }
     $("#button-open-10").click(function(){
+        $("#schoolName").val('');
         $('.editCon').val('');
         layer.open({
             type: 1,

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userList/list.html

@@ -42,6 +42,7 @@
     //     // modalName: "订单",
     $(function() {
         var options = {
+            updateUrl: smilePrefix + "/smileDetail",
             url: smilePrefix + "/list",
             columns: [{
                 checkbox: true
@@ -115,7 +116,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.mid + '\')"><i class="fa fa-edit"></i>查看</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="goDetail(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看</a> ');
                         return actions.join('');
                     }
                 }]
@@ -124,6 +125,10 @@
 
         console.log(options)
     });
+    function goDetail (id) {
+        var url = ctx+'local/smileDetail?id=' + id;
+        $.modal.openTab("用户详情", url);
+    }
     // var updateFlag = [[${@permission.hasPermi('sweet:integralActivity:create')}]];
     // var isOnlineFlag = [[${@permission.hasPermi('sweet:integralActivity:isOnline')}]];
     // var drawListFlag = [[${@permission.hasPermi('sweet:integralActivityDraw:list')}]];

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userPendingList/list.html

@@ -12,7 +12,7 @@
                     <ul>
                         <li>
                             <label>手机号：</label>
-                            <input type="text" name="activityTitle"/>
+                            <input type="text" name="phone"/>
                         </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/list.html

@@ -125,16 +125,7 @@
                 },
                 {
                     field: 'status',
-                    title: '状态',
-                    formatter: function (value, row, index) {
-                        if (value == 1) {
-                            return '通过';
-                        } else if (value == 2) {
-                            return '拒绝';
-                        } else {
-                            return '待审核';
-                        }
-                    }
+                    title: '状态'
                 },
                 {
                     title: '操作',

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -197,7 +197,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             List<ShowAgentVo> showAgentVoList = new ArrayList<>();
             List<ShowTicketVo> showTicketVoList = new ArrayList<>();
             List<SmileAgent> smileAgents = getSmileAgentsByProId(performancesId);
-            if (smileAgents != null) {
+            if (smileAgents == null) {
                 return AjaxResult.warn("该演出未开启代理票种");
             }
             Map<String, SmileAgent> map = getSmileAgentMap(smileAgents);
@@ -360,7 +360,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                 }
             }
 //            if (userDataAgentVo.getCommission().compareTo(new BigDecimal(0)) != 0) {
-                userDataAgentVos.add(userDataAgentVo);
+            userDataAgentVos.add(userDataAgentVo);
 //            }
         }
         userData.setUid(smileUser.getUid());