Merge remote-tracking branch 'origin/master'

whepi-ui/templates/groupBuying/groupBuyingCx.ftl

@@ -0,0 +1,40 @@
+<#assign title="团购"/>
+<#include "/home/frag.head.ftl" />
+
+<div class="page__bd">
+    <div class="weui-tab">
+        <header class="demos-header">
+            <h1 class="demos-title">团购</h1>
+        </header>
+        <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
+            <span class="weui-loadmore__tips">团购信息</span>
+            <div class="weui-media-box__bd">
+                <h3>萝卜青椒大白菜</h3>
+            </div>
+        </div>
+        <div>
+            <p style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;接口的法国红酒返回打撒借款方和德生科技发送到返回的是否合适看警方海口市</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;没有套餐</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;10</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">最新起定量(份):&nbsp;&nbsp;20</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;2020-02-11</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;2020-02-10</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;12345678912</p>
+        </div>
+        <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
+            <br/>
+            <textarea class="weui-input" autofocus="" type="text" placeholder="填写撤销原因或增补修订的内容" maxlength="200" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 20vh; width: 85%;"></textarea>
+        </div>
+        <div class="weui-btn-area"  style="display: grid;">
+            <p id="" class="weui-btn weui-btn_primary">确&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;定</p>
+        </div>
+
+
+    </div>
+<#include "/home/frag.foot.ftl" />

whepi-ui/templates/groupBuying/groupBuyingJt.ftl

@@ -0,0 +1,63 @@
+<#assign title="家庭团购"/>
+<#include "/home/frag.head.ftl" />
+
+<div class="page__bd">
+    <div class="weui-tab">
+        <header class="demos-header">
+            <h1 class="demos-title">团购</h1>
+        </header>
+        <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
+            <span class="weui-loadmore__tips">团购信息</span>
+            <div class="weui-media-box__bd">
+                <h3>青菜套餐</h3>
+            </div>
+        </div>
+        <div>
+            <p style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;接口的法国红酒返回打撒借款方和德生科技发送到返回的是否合适看警方海口市</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;没有套餐</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;10</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">最新起定量(份):&nbsp;&nbsp;20</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;2020-02-11</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;2020-02-10</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;12345678912</p>
+        </div>
+        <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
+            <span class="weui-loadmore__tips">团购信息</span>
+            <br/>
+        </div>
+
+        <#--<div style="width: 62%;margin: auto;">
+            <div style="float:left;width: 49%; text-align: center">
+                <input type="radio"  checked="checked"/>男
+            </div>
+            <div style="float:left;width: 49%; text-align: center">
+                <input type="radio"/>女
+            </div>
+        </div>-->
+        <div style="text-indent: -4.5em;width: 100%;margin: auto;">
+            <a style="float:left;width: 49%; text-align: center">当前参团: 23</a>
+            <a style="float:left;width: 49%; text-align: center">当前状态: 在团</a>
+        </div>
+        <div style="text-indent: -4.5em;width: 100%;margin: auto;">
+            <a style="float:left;width: 51%; text-align: center">我的团购: <input class="weui-input" type="text" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; width: 30px;"/></a>
+            <a style="float:left;width: 49%; text-align: center">金额: 20</a>
+        </div>
+        <div style="text-indent: 2.5em;width: 100%;margin: auto;float:left;">
+           联系电话: <input class="weui-input" type="text" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; width: 120px;" />
+        </div>
+        <div style="text-indent: 2em;">
+            <textarea class="weui-input" autofocus="" type="text" placeholder="备注:出行不方便,请送到单元门口或家门口" maxlength="200" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 10vh; width: 85%;"></textarea>
+        </div>
+        <div class="weui-btn-area"  style="display: grid;">
+            <p id="" class="weui-btn weui-btn_primary">提&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;交</p>
+        </div>
+
+
+    </div>
+<#include "/home/frag.foot.ftl" />

whepi-ui/templates/groupBuying/groupBuyingQx.ftl

@@ -0,0 +1,47 @@
+<#assign title="家庭团购"/>
+<#include "/home/frag.head.ftl" />
+
+<div class="page__bd">
+    <div class="weui-tab">
+        <header class="demos-header">
+            <h1 class="demos-title">团购</h1>
+        </header>
+        <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
+            <span class="weui-loadmore__tips">团购信息</span>
+            <div class="weui-media-box__bd">
+                <h3>青菜套餐</h3>
+            </div>
+        </div>
+        <div>
+            <p style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;接口的法国红酒返回打撒借款方和德生科技发送到返回的是否合适看警方海口市</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;没有套餐</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;10</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">最新起定量(份):&nbsp;&nbsp;20</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;2020-02-11</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;2020-02-10</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;12345678912</p>
+        </div>
+        <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
+        </div>
+
+        <div style="text-indent: -4.5em;width: 100%;margin: auto;">
+            <a style="float:left;width: 49%; text-align: center">当前参团: 23</a>
+            <a style="float:left;width: 49%; text-align: center;color: red">当前状态: 取消</a>
+        </div>
+        <div style="text-indent: -4.5em;width: 100%;margin: auto;">
+            <a style="float:left;width: 51%; text-align: center">我的团购: 2</a>
+            <a style="float:left;width: 49%; text-align: center">金额: 20</a>
+        </div>
+        <br/>
+        <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
+        </div>
+        <li style="color: red">非常抱歉通知您,因团购数量不足,取消本次团购</li>
+
+    </div>
+<#include "/home/frag.foot.ftl" />

whepi-ui/templates/groupBuying/groupBuyingXx.ftl

@@ -0,0 +1,54 @@
+<#assign title="团购"/>
+<#include "/home/frag.head.ftl" />
+
+<div class="page__bd">
+<div class="weui-tab">
+    <header class="demos-header">
+        <h1 class="demos-title">团购</h1>
+    </header>
+    <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
+        <span class="weui-loadmore__tips">团购信息</span>
+        <div class="weui-media-box__bd">
+            <h3>萝卜青椒大白菜</h3>
+        </div>
+    </div>
+    <div>
+
+    <p style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;接口的法国红酒返回打撒借款方和德生科技发送到返回的是否合适看警方海口市</p>
+    &nbsp;
+    <p style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;没有套餐</p>
+    &nbsp;
+    <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;10</p>
+    &nbsp;
+    <p style="text-indent: -0em;margin-left: 2em;">最新起定量(份):&nbsp;&nbsp;20</p>
+    &nbsp;
+    <p style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;2020-02-11</p>
+    &nbsp;
+    <p style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;2020-02-10</p>
+    &nbsp;
+    <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;12345678912</p>
+    </div>
+    <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
+        <span class="weui-loadmore__tips">参团情况</span>
+        <div class="weui-cells__title">当前参团43/100</div>
+    </div>
+
+    <div class="weui-btn-area">
+        <p id="zb" class="weui-btn weui-btn_primary">增补修订</p>
+        <p id="qc" class="weui-btn weui-btn_primary">取消团购</p>
+        <p id="wc" class="weui-btn weui-btn_primary">完成团购</p>
+        <p id="ck" class="weui-btn weui-btn_primary">查看参团信息</p>
+    </div>
+
+</div>
+<#include "/home/frag.foot.ftl" />
+
+    <script>
+        $('#zb').on('click', function () {
+            window.location.href = "/groupBuying/groupBuyingCx.html"
+        });
+
+
+
+
+    </script>

whepi-ui/templates/home/frag.foot.ftl

@@ -13,4 +13,4 @@
 <script src="${s3('/jquery-weui/1.2.1/js/jquery-weui.min.js')}"></script>
 <script src="${s3('/jquery-weui/1.2.1/js/swiper.min.js')}"></script>
 <script src="${s3('/jquery-weui/1.2.1/js/city-picker.min.js')}"></script>
-<script src="https://www.w3cways.com/demo/vconsole/vconsole.min.js?v=2.2.0"></script>
+<#--<script src="https://www.w3cways.com/demo/vconsole/vconsole.min.js?v=2.2.0"></script>-->

whepi-ui/templates/yeweihui/home.ftl

@@ -13,9 +13,9 @@
         </div>
         <div id="tab2" class="weui-tab__bd-item">
             <#include "/yeweihui/qiuzhu.ftl" /></div>
-        <div id="tab3" class="weui-tab__bd-item">
-            <#include "/yeweihui/tuangou.ftl" />
-        </div>
+        <#--<div id="tab3" class="weui-tab__bd-item">-->
+            <#--<#include "/yeweihui/tuangou.ftl" />-->
+        <#--</div>-->
     <#--<div id="tab3" class="weui-tab__bd-item">-->
     <#--<h1>页面三</h1> </div>-->
     <#--<div id="tab4" class="weui-tab__bd-item">-->

whepi-web/src/main/java/com/bofeng/wx/controller/GroupBuyingController.java

@@ -0,0 +1,47 @@
+package com.bofeng.wx.controller;
+
+import com.beust.jcommander.internal.Maps;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.Map;
+
+@RestController
+public class GroupBuyingController {
+    @GetMapping("/groupBuying/groupBuyingXx.html")
+    public ModelAndView groupBuyingXx(ModelMap model) {
+        Map<String, Object> queryParam = Maps.newLinkedHashMap();
+        queryParam.put("userId", "12345677");
+        queryParam.put("statistics", "M");
+
+        return new ModelAndView("/groupBuying/groupBuyingXx.ftl", model);
+    }
+    @GetMapping("/groupBuying/groupBuyingCx.html")
+    public ModelAndView groupBuyingCx(ModelMap model) {
+        Map<String, Object> queryParam = Maps.newLinkedHashMap();
+        queryParam.put("userId", "12345677");
+        queryParam.put("statistics", "M");
+
+        return new ModelAndView("/groupBuying/groupBuyingCx.ftl", model);
+    }
+
+    @GetMapping("/groupBuying/groupBuyingJt.html")
+    public ModelAndView groupBuyingJt(ModelMap model) {
+        Map<String, Object> queryParam = Maps.newLinkedHashMap();
+        queryParam.put("userId", "12345677");
+        queryParam.put("statistics", "M");
+
+        return new ModelAndView("/groupBuying/groupBuyingJt.ftl", model);
+    }
+
+    @GetMapping("/groupBuying/groupBuyingQx.html")
+    public ModelAndView groupBuyingQx(ModelMap model) {
+        Map<String, Object> queryParam = Maps.newLinkedHashMap();
+        queryParam.put("userId", "12345677");
+        queryParam.put("statistics", "M");
+
+        return new ModelAndView("/groupBuying/groupBuyingQx.ftl", model);
+    }
+}

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

@@ -52,7 +52,7 @@ public class YeWeiHuiController {
     private RbMapper rbMapper;
 
     @GetMapping("/yeweihui/home.html")
-    public ModelAndView yeweihui(ModelMap model,@RequestParam(value = "userId") Long userId, @RequestParam(value = "show", required = false, defaultValue = "-") String show) {
+    public ModelAndView yeweihui(ModelMap model,@RequestParam(value = "userId") Long userId, @RequestParam(value = "showQZ", required = false, defaultValue = "-") String showQZ) {
 
 //        List<QzTask> taskList = qzTaskService.selectAll(1225321682867105793L);
 //        List<sysUptownUnit> rbList = rbService.selectAll(1225321682867105793L);
@@ -61,7 +61,7 @@ public class YeWeiHuiController {
         model.put("taskList", YvanUtil.toJsonPretty(taskList));
         model.put("rbList", YvanUtil.toJsonPretty(rbList));
         model.put("user_id", "\""+userId+"\"");
-        model.put("show", "\""+show+"\"");
+        model.put("showQZ", "\""+showQZ+"\"");
 
         return new ModelAndView("/yeweihui/home.ftl", model);
     }
@@ -187,7 +187,7 @@ public class YeWeiHuiController {
         return new ModelAndView("/yeweihui/ribaohuiz.ftl", model);
     }
 
-    @GetMapping("/epi/yeweihui/ribaohuiz")
+    @GetMapping("/yeweihui/ribaohuiz")
     public Model<Map<String, Object>> yeweihuiRibaohuiz(Long userCreate,String reportDate) {
 //        Long userCreate = 1225321682867105793L;
 
@@ -215,7 +215,7 @@ public class YeWeiHuiController {
     }
 
     @ApiOperation("导出家庭上报明细")
-    @GetMapping("/epi/yeweihui/exportRiBao")
+    @GetMapping("/yeweihui/exportRiBao")
     @SneakyThrows
     public void exportRiBao(@Pd(name = "userId") Long userId,
                             @Pd(name = "date") String date,

whepi-web/src/main/resources/application-maoyunfeng.yml

@@ -63,7 +63,10 @@ spring:
     #driverClassName: com.mysql.jdbc.Driver
     #url: jdbc:mysql://localhost:3306/bofeng_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
     driverClassName: net.sf.log4jdbc.DriverSpy
+#    url: jdbc:log4jdbc:mysql://39.99.148.1:3306/whepi?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
     url: jdbc:log4jdbc:mysql://39.99.148.1:3306/whepi_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+#    username: whepi
+#    password: hust!2020epi
     username: whepi_test
     password: 123456