Browse Source

求助2月5号

guojing 5 năm trước cách đây
mục cha
commit
e45f2d8964

+ 3 - 3
whepi-ui/templates/home/home.ftl

@@ -62,9 +62,9 @@
         ribao_cancel();
         ribao_commit();
 
-        var msReport = ${msReport};
-        $('#ribao_safety_num').val(msReport.safetyNum);
-        ribaoInitialization(msReport.reportId);
+        <#--var msReport = ${msReport};-->
+        <#--$('#ribao_safety_num').val(msReport.safetyNum);-->
+        <#--ribaoInitialization(msReport.reportId);-->
         /*submit_back();*/
         familyClick();
 

+ 3 - 3
whepi-ui/templates/home/qiuzhu.ftl

@@ -189,7 +189,7 @@
                                 <a class="weui-btn weui-btn_default" onclick="qzBackHome();">返回</a>
                             </div>
                             <div class="weui-btn-area">
-                                <a class="weui-btn weui-btn_primary" onclick="HomeStatus();" id="isHiddenStyle"
+                                <a class="weui-btn weui-btn_primary" onclick="HomeStatus();" id="isHiddenStyle12"
                                    style="display: none">完成</a>
                             </div>
                         </div>
@@ -324,9 +324,9 @@
                     console.log(data);
                     //判断该求助是否完成  来判断按钮是否展示
                     if (data.data.length > 0 && data.data[0].taskStatus == 2) {
-                        $('#isHiddenStyle')[0].style.display = '';
+                        $('#isHiddenStyle12')[0].style.display = '';
                     } else {
-                        $('#isHiddenStyle')[0].style.display = 'none';
+                        $('#isHiddenStyle12')[0].style.display = 'none';
                     }
 
                     if (data.data.length > 0) {

+ 1 - 1
whepi-web/src/main/java/com/bofeng/service/QzTaskService.java

@@ -51,7 +51,7 @@ public class QzTaskService {
     qzTak.setTimeCreate(new DateTime());
     qzTak.setUserUpdate(userId);
     qzTak.setTimeUpdate(new DateTime());
-    return qzTaskDao.insert(qzTak);
+    return 1;
   }
 
 

+ 2 - 2
whepi-web/src/main/java/com/bofeng/wx/controller/ShopMatController.java

@@ -34,12 +34,12 @@ public class ShopMatController {
     private ShShopMatService shShopMatService;
 
 
-    @GetMapping("/shop/home.html")
+   /* @GetMapping("/shop/home.html")
     public ModelAndView home(ModelMap model) {
         //UserOpen userOpen = homeService.getUserOpen();
         model.put("user", new JsonWapper("{\"www\": \"er\"}"));
         return new ModelAndView("/shop/home.ftl", model);
-    }
+    }*/
 
 
     //商品的新增

+ 2 - 2
whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java

@@ -96,9 +96,9 @@ public class YeWeiHuiController {
     @PostMapping("/yeweihui/qiuzhu/queryTasksByStatus.json")
     public Model queryTasksByStatus(@Pd(name = "status") Integer status) {
 
-        List<QzTask> taskList = qzTaskService.queryQzTask(status);
+       // List<QzTask> taskList = qzTaskService.queryQzTask(status);
 
-        return Model.newSuccess(taskList);
+        return Model.newSuccess(null);
     }
 
         @PostMapping("/yeweihui/qiuzhu/reply/add.json")

+ 1 - 1
whepi-web/src/main/resources/application-dev.yml

@@ -22,7 +22,7 @@ yvan:
   upload_domain: /static
   wechat:
     #测试帐号
-    token: yuliang
+    token: guojing
     appID: wxa3991865de920847
     appsecret: 4ac7ffba92e934f944a9d78ecc1807b5
 

+ 2 - 1
whepi-web/src/main/resources/mapper/QzTaskReplyDao.xml

@@ -4,7 +4,8 @@
 
 
     <select id="taskQuery" resultType="com.bofeng.entity.QzTaskReply">
-     select a.task_title,a.remark,b.time_update,c.nick_name,b.reply_content
+     select a.task_title,a.remark,b.time_update,c.nick_name,b.reply_content,
+     a.task_id,a.task_status
      from qz_task a
      INNER JOIN qz_task_reply b on a.task_id=b.task_id
      left JOIN sys_user_open c on c.user_id=b.user_id