Merge remote-tracking branch 'origin/master'

whepi-doc/creatYeWeiHui.sql

@@ -8,7 +8,7 @@ CREATE TABLE tp_user  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (user_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '用户ID临时表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '用户ID临时表';
 
 -- 在临时表插入user_id,之后直接使用插入的user_id
 insert into tp_user

whepi-doc/group.sql

@@ -17,7 +17,7 @@ create table jm_buy (
     INDEX user_id(user_id) USING BTREE
 )
 ENGINE = InnoDB
-DEFAULT CHARSET = utf8
+DEFAULT CHARSET = utf8mb4
 COMMENT = '居民团购表'
 ;
 
@@ -41,6 +41,6 @@ create table jm_tuangou (
     INDEX uptown_id(uptown_id) USING BTREE
 )
 ENGINE = InnoDB
-DEFAULT CHARSET = utf8
+DEFAULT CHARSET = utf8mb4
 COMMENT = '团购表'
 ;

whepi-doc/login.sql

@@ -15,7 +15,7 @@ create table sys_user
   update_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新日期',
   primary key ( user_id ),
   UNIQUE INDEX `login_name`(`login_name`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT = '用户资料';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT = '用户资料';
 
 -- insert into sys_user
 -- select ur.user_id,'账户','密码',ur.role_id as user_type,uo.nick_name,'Y',now(),now() from sys_uptown_home uh
@@ -40,7 +40,7 @@ create table sys_user_open
   create_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '建立时间',
   update_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新日期',
   primary key ( user_id, open_id )
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT = '用户open';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT = '用户open';
 
 -- ----------------------------
 -- Table structure for sys_user_role
@@ -56,7 +56,7 @@ CREATE TABLE sys_user_role  (
   user_update 	bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update 	datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (ur_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '用户角色关系表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '用户角色关系表';
 
 -- ----------------------------
 -- Table structure for sys_owner
@@ -72,7 +72,7 @@ CREATE TABLE sys_owner  (
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (owner_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '业委会表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '业委会表';
 
 -- ----------------------------
 -- Table structure for sys_owner_linkman
@@ -88,7 +88,7 @@ CREATE TABLE sys_owner_linkman  (
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (owner_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '业委会联系人表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '业委会联系人表';
 
 -- ----------------------------
 -- Table structure for sys_uptown_home
@@ -106,7 +106,7 @@ CREATE TABLE sys_uptown_home  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (house_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '小区家庭表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '小区家庭表';
 
 -- ----------------------------
 -- Table structure for sys_area
@@ -121,7 +121,7 @@ CREATE TABLE sys_area  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (area_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '省市区表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '省市区表';
 
 -- ----------------------------
 -- Table structure for sys_area_street
@@ -134,7 +134,7 @@ CREATE TABLE sys_area_street  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (street_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '区街道表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '区街道表';
 
 -- ----------------------------
 -- Table structure for sys_area_com
@@ -147,7 +147,7 @@ CREATE TABLE sys_area_com  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (com_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '街道社区表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '街道社区表';
 
 -- ----------------------------
 -- Table structure for sys_uptown
@@ -164,7 +164,7 @@ CREATE TABLE sys_uptown  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (uptown_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '小区表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '小区表';
 
 DROP TABLE IF EXISTS sys_uptown_unit;
 CREATE TABLE sys_uptown_unit  (
@@ -176,7 +176,7 @@ CREATE TABLE sys_uptown_unit  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (unit_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '栋,单元信息表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '栋,单元信息表';
 
 DROP TABLE IF EXISTS sys_uptown_house;
 CREATE TABLE sys_uptown_house  (
@@ -187,4 +187,4 @@ CREATE TABLE sys_uptown_house  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (house_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '门牌信息表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '门牌信息表';

whepi-doc/mrsb.sql

@@ -19,7 +19,7 @@ CREATE TABLE ms_report  (
   user_update       bigint(20) NOT NULL DEFAULT 0                           COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (report_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '每日上报表'
+) ENGINE = InnoDB default charset=utf8mb4 comment = '每日上报表'
 
 
 -- ----------------------------
@@ -53,4 +53,4 @@ CREATE TABLE ms_suspected  (
   user_update       bigint(20) NOT NULL DEFAULT 0                           COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (suspected_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '家庭疑似表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '家庭疑似表';

whepi-doc/task.sql

@@ -22,7 +22,7 @@ create table qz_task (
     INDEX user_id(user_id) USING BTREE
 )
 ENGINE = InnoDB
-DEFAULT CHARSET = utf8
+DEFAULT CHARSET = utf8mb4
 COMMENT = '家庭求助表'
 ;
 
@@ -42,4 +42,4 @@ CREATE TABLE qz_task_reply (
     time_update       datetime(0)   NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
     PRIMARY KEY (reply_id) USING BTREE,
     INDEX task_id(task_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '家庭求助回复表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '家庭求助回复表';

whepi-doc/whepi.sql

@@ -28,6 +28,6 @@ create table tb_user
   primary key ( user_id )
 )
   ENGINE=InnoDB
-  DEFAULT CHARSET=utf8
+  DEFAULT CHARSET=utf8mb4
   COMMENT = '用户资料'
 ;

whepi-doc/xgfy.sql

@@ -17,7 +17,7 @@ CREATE TABLE ow_owner  (
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (owner_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '业委会';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '业委会';
 -- ----------------------------
 -- Table structure for re_health_sign
 -- ----------------------------
@@ -36,7 +36,7 @@ CREATE TABLE re_health_sign  (
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (sign_id) USING BTREE,
   INDEX resident_id(resident_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '健康签到表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '健康签到表';
 
 -- ----------------------------
 -- Table structure for re_help
@@ -55,7 +55,7 @@ CREATE TABLE re_help  (
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (help_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '家庭求助表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '家庭求助表';
 
 -- ----------------------------
 -- Table structure for re_help_reply
@@ -71,7 +71,7 @@ CREATE TABLE re_help_reply  (
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (reply_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '家庭求助回复表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '家庭求助回复表';
 
 -- ----------------------------
 -- Table structure for re_resident
@@ -95,7 +95,7 @@ CREATE TABLE re_resident  (
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (resident_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '居民表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '居民表';
 
 -- ----------------------------
 -- Table structure for sh_shop
@@ -119,7 +119,7 @@ CREATE TABLE sh_shop  (
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (shop_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '商店信息';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '商店信息';
 
 -- ----------------------------
 -- Table structure for sh_shop_mat
@@ -136,7 +136,7 @@ CREATE TABLE sh_shop_mat  (
   user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (mat_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '商店物资信息';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '商店物资信息';
 
 -- ----------------------------
 -- Table structure for sys_file
@@ -153,4 +153,4 @@ CREATE TABLE sys_file  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (file_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '附件上传表';
+) ENGINE = InnoDB default charset=utf8mb4 comment = '附件上传表';

whepi-ui/templates/groupBuying/groupBuyingCx.ftl

@@ -3,38 +3,97 @@
 
 <div class="page__bd">
     <div class="weui-tab">
-        <header class="demos-header">
-            <h1 class="demos-title">团购</h1>
-        </header>
+<#--        <header class="demos-header">-->
+<#--            <h1 class="demos-title">团购</h1>-->
+<#--        </header>-->
+        <div class="weui-btn-area" style="display: flex; flex-direction: row;">
+            <a class="weui-btn weui-btn_primary" href="javascript:goback();" style="width: 25vw; height: 6vh; line-height: 6vh;">返回</a>
+            <div style="width: 65%;"></div>
+        </div>
         <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
             <span class="weui-loadmore__tips">团购信息</span>
             <div class="weui-media-box__bd">
-                <h3>萝卜青椒大白菜</h3>
+                <h3>${ tgItem.tgTitle }</h3>
             </div>
         </div>
         <div>
-            <p style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;接口的法国红酒返回打撒借款方和德生科技发送到返回的是否合适看警方海口市</p>
+            <p style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;${ tgItem.tgSupplier }</p>
             &nbsp;
-            <p style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;没有套餐</p>
+            <p style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;${ tgItem.tgGoods }</p>
             &nbsp;
-            <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;10</p>
+            <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;${ tgItem.tgPrice }</p>
             &nbsp;
-            <p style="text-indent: -0em;margin-left: 2em;">最新起定量(份):&nbsp;&nbsp;20</p>
+            <p style="text-indent: -0em;margin-left: 2em;">最新起定量(份):&nbsp;&nbsp;${ tgItem.tgMinNum }</p>
             &nbsp;
-            <p style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;2020-02-11</p>
+            <p id="cx_p_endTime" style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;</p>
             &nbsp;
-            <p style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;2020-02-10</p>
+            <p id="cx_p_deliverTime"style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;</p>
             &nbsp;
-            <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;12345678912</p>
+            <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;${ tgItem.tgPhoneNumber }</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>
+            <textarea id="cx_remark" 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>
+            <a id="cx_sure" class="weui-btn weui-btn_primary">确&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;定</a>
         </div>
 
 
     </div>
-<#include "/home/frag.foot.ftl" />
+</div>
+<#include "/home/frag.foot.ftl" />
+<script>
+    var userId = ${userId};
+    var tgItem = ${tgItemJson};
+
+    var operation = ${operation};
+
+
+    $('#cx_p_endTime').append(tgItem.tgEndTime);
+    $('#cx_p_deliverTime').append(tgItem.tgDeliverTime);
+
+    if (tgItem.remark.length > 0) {
+        $('#cx_remark').val(tgItem.remark);
+    }
+
+    $('#cx_sure').on('click', function () {
+        console.log("确定");
+        let inputValue = $('#cx_remark').val();
+        if (inputValue.length <= 0){
+            $.alert('请输入内容');
+            return;
+        }
+
+        let sendData = {
+            jmId: tgItem.jmId,
+            remark: inputValue
+        };
+
+        if (operation === 'cancel') {
+            sendData.status = 4;
+        }
+
+        $.ajax({
+            url: '/yeweihui/groupBuyingCx/remark/add.json',
+            type: 'post',
+            data: sendData,
+            success: function (data) {
+                if (data.success) {
+                    $.alert("操作成功");
+                    window.location.href = "/yeweihui/groupBuyingXx.html?jmId=" + tgItem.jmId + "&userId=" + userId;
+                }
+                else  {
+                    $.alert("操作失败");
+                }
+            },
+            error: function () {
+                $.alert("网络异常");
+            }
+        });
+    });
+
+    function goback() {
+        window.location.href = "/yeweihui/groupBuyingXx.html?jmId=" + tgItem.jmId + "&userId=" + userId;
+    }
+</script>

whepi-ui/templates/groupBuying/groupBuyingXx.ftl

@@ -2,53 +2,131 @@
 <#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 class="weui-tab">
+<#--        <header class="demos-header">-->
+<#--            <h1 class="demos-title">团购</h1>-->
+<#--        </header>-->
+        <div class="weui-btn-area" style="display: flex; flex-direction: row;">
+            <a class="weui-btn weui-btn_primary" href="javascript:goback();" style="width: 25vw; height: 6vh; line-height: 6vh;">返回</a>
+            <div style="width: 65%;"></div>
         </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 class="weui-loadmore weui-loadmore_line" style="width: 100%">
+            <span class="weui-loadmore__tips">团购信息</span>
+            <div class="weui-media-box__bd">
+                <h3>${ tgItem.tgTitle }</h3>
+            </div>
+        </div>
+        <div>
 
+        <p style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;${ tgItem.tgSupplier }</p>
+        &nbsp;
+        <p style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;${ tgItem.tgGoods }</p>
+        &nbsp;
+        <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;${ tgItem.tgPrice }</p>
+        &nbsp;
+        <p style="text-indent: -0em;margin-left: 2em;">最新起定量(份):&nbsp;&nbsp;${ tgItem.tgMinNum }</p>
+        &nbsp;
+        <p id="p_endTime" style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;</p>
+        &nbsp;
+        <p id="p_deliverTime" style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;</p>
+        &nbsp;
+        <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;${ tgItem.tgPhoneNumber }</p>
+        </div>
+        <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
+            <span class="weui-loadmore__tips">参团情况</span>
+            <div class="weui-cells__title">当前参团${ tgItem.currentNum }/${ tgItem.tgMinNum }</div>
+        </div>
+        <#if isMine=='mine' && tgItem.tgStatus==1>
+            <div class="weui-btn-area">
+                <p id="gb_zb" class="weui-btn weui-btn_primary">增补修订</p>
+                <p id="gb_qx" class="weui-btn weui-btn_primary">取消团购</p>
+                <p id="gb_wc" class="weui-btn weui-btn_primary">完成团购</p>
+                <p id="gb_ck" class="weui-btn weui-btn_primary">查看参团信息</p>
+            </div>
+        </#if>
+        <#if isMine!='mine' && tgItem.tgStatus==1>
+            <div class="weui-btn-area">
+                <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
+                    <span class="weui-loadmore__tips">参团状态</span>
+                    <div class="weui-cells__title">在团</div>
+                </div>
+            </div>
+        </#if>
+        <#if tgItem.tgStatus==2>
+            <div class="weui-btn-area">
+                <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
+                    <span class="weui-loadmore__tips">参团状态</span>
+                    <div class="weui-cells__title">发货</div>
+                </div>
+            </div>
+        </#if>
+        <#if tgItem.tgStatus==3>
+            <div class="weui-btn-area">
+                <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
+                    <span class="weui-loadmore__tips">参团状态</span>
+                    <div class="weui-cells__title">完成</div>
+                </div>
+            </div>
+        </#if>
+        <#if tgItem.tgStatus==4>
+            <div class="weui-btn-area">
+                <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
+                    <span class="weui-loadmore__tips">参团状态</span>
+                    <div class="weui-cells__title">取消</div>
+                </div>
+            </div>
+        </#if>
+    </div>
 </div>
+
 <#include "/home/frag.foot.ftl" />
 
-    <script>
-        $('#zb').on('click', function () {
-            window.location.href = "/groupBuying/groupBuyingCx.html"
-        });
+<script>
+
+    var userId = ${userId};
+    var tgItem = ${tgItemJson};
 
+    $('#p_endTime').append(tgItem.tgEndTime);
+    $('#p_deliverTime').append(tgItem.tgDeliverTime);
 
+    $('#gb_zb').on('click', function () {
+        window.location.href = "/yeweihui/groupBuyingCx.html?operation=remark&jmId=" + tgItem.jmId + "&userId=" + userId;
+    });
+
+    $('#gb_qx').on('click', function () {
+        window.location.href = "/yeweihui/groupBuyingCx.html?operation=cancel&jmId=" + tgItem.jmId + "&userId=" + userId;
+    });
+
+    $('#gb_wc').on('click', function () {
+        let sendData = {
+            jmId: tgItem.jmId,
+            status: 3
+        };
+        $.ajax({
+            url: '/yeweihui/groupBuyingCx/remark/add.json',
+            type: 'post',
+            data: sendData,
+            success: function (data) {
+                if (data.success) {
+                    $.alert("操作成功");
+                    goback();
+                }
+                else  {
+                    $.alert("操作失败");
+                }
+            },
+            error: function () {
+                $.alert("网络异常");
+            }
+        });
+    });
 
+    $('#gb_ck').on('click', function () {
+        console.log("查看");
+    });
 
-    </script>
+    function goback() {
+        window.location.href = "/yeweihui/home.html?show=tuangou&userId=" + userId;
+    }
+</script>

whepi-ui/templates/home/ribao.ftl

@@ -53,7 +53,7 @@
                     <input id="suspectedId" type="text" hidden="hidden" value=""/>
                     <div style="height: 5vh; line-height: 5vh;margin-left: 2vw;">病情描述</div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 30%;">是否确诊</div>
+                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 70%;">是否确诊新冠肺炎</div>
                         <input id="switchQuezhen" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
                     </div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">

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-ui/templates/yeweihui/tuangou.ftl

@@ -47,6 +47,9 @@
 <#--                                <div style="width: 15%; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">在团</div>-->
 <#--                            </div>-->
 <#--                        </a>-->
+                        <div class="weui-loadmore weui-loadmore_line">
+                            <span class="weui-loadmore__tips">暂无数据</span>
+                        </div>
                     </div>
                     <div class="weui-btn-area">
                         <a id="tg_publish" class="weui-btn weui-btn_primary">
@@ -77,14 +80,9 @@
                         <div style="width: 15%; text-align: center;">状态</div>
                     </div>
                     <div id="tg_list2" class="weui-panel__bd">
-<#--                        <a href="javascript:void(0);" style="color: grey;">-->
-<#--                            <div style="display: flex; flex-direction: row; text-align: center; font-size: small; line-height: 5vh;">-->
-<#--                                <div style="width: 40%; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">蔬菜套餐，猪肉牛肉金针菇等</div>-->
-<#--                                <div style="width: 15%; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">24/100</div>-->
-<#--                                <div style="width: 30%; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">02/02 14:30</div>-->
-<#--                                <div style="width: 15%; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">在团</div>-->
-<#--                            </div>-->
-<#--                        </a>-->
+                        <div class="weui-loadmore weui-loadmore_line">
+                            <span class="weui-loadmore__tips">暂无数据</span>
+                        </div>
                     </div>
                     <div class="weui-btn-area">
                         <a id="tg_publish" class="weui-btn weui-btn_primary">

whepi-ui/templates/yeweihui/tuangou.js

@@ -3,11 +3,28 @@ function tuangou_init(tt) {
         window.location.href = "/yeweihui/tgPublish.html?userId=" + $('#userId').val();
     });
 
+    $('#tg_btnQZ1').on('click', function () {
+        getListData();
+    });
+
+    $('#tg_btnQZ2').on('click', function () {
+        getMyPbListData();
+    });
+
+    getListData();
+    getMyPbListData();
+};
+
+function getListData() {
+
+    let searchTitle = $('#tg_searchNum1').val();
+
     $.ajax({
         url: '/yeweihui/tuangou/list/query.json',
         type: 'post',
         data: {
-            userId: $('#userId').val()
+            userId: $('#userId').val(),
+            title: searchTitle
         },
         success: function (data) {
             if (data.success) {
@@ -22,11 +39,18 @@ function tuangou_init(tt) {
         }
     });
 
+}
+
+function getMyPbListData() {
+
+    let searchTitle = $('#tg_searchNum2').val();
+
     $.ajax({
         url: '/yeweihui/tuangou/mylist/query.json',
         type: 'post',
         data: {
-            userId: $('#userId').val()
+            userId: $('#userId').val(),
+            title: searchTitle
         },
         success: function (data) {
             if (data.success) {
@@ -40,7 +64,8 @@ function tuangou_init(tt) {
             $.alert("网络异常");
         }
     });
-};
+
+}
 
 function makeList(list) {
     $('#tg_list1').empty();
@@ -116,9 +141,9 @@ function makeMyPublishList(list) {
 }
 
 function tgItemSelect(jmId) {
-    console.log(jmId);
+    window.location.href = "/yeweihui/groupBuyingXx.html?jmId=" + jmId + "&userId=" + $('#userId').val();
 }
 
 function tgMyItemSelect(jmId) {
-    console.log(jmId);
+    window.location.href = "/yeweihui/groupBuyingXx.html?jmId=" + jmId + "&userId=" + $('#userId').val();
 }

whepi-web/src/main/java/com/bofeng/dao/JmTuangouDao.java

@@ -20,4 +20,11 @@ public interface JmTuangouDao extends BaseMapper<JmTuangou> {
 
     List<JmTuangou> queryTuangouListByUserIdAndTitle (@Param("userId") Long userId, @Param("title") String title);
 
+    JmTuangou selectJmTuangouByJmId(@Param("JmId") Long JmId);
+
+    Integer updateRemarkByJmId(@Param("JmId") Long JmId, @Param("remark") String remark);
+
+    Integer updateStatusByJmId(@Param("JmId") Long JmId, @Param("status") Long status);
+
+    Integer updateStatusRemarkByJmId(@Param("JmId") Long JmId, @Param("status") Long status, @Param("remark") String remark);
 }

whepi-web/src/main/java/com/bofeng/entity/JmTuangou.java

@@ -68,7 +68,7 @@ public class JmTuangou implements Serializable {
     /**
      * 预计送货时间
      */
-    @JsonFormat(pattern = "MM-dd HH:mm", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date tgDeliverTime;
 
     @TableField(exist = false)

whepi-web/src/main/java/com/bofeng/service/JmTuangouService.java

@@ -75,4 +75,19 @@ public class JmTuangouService {
         }
         return jmTuangouDao.queryTuangouListByUserIdAndTitle(userId, title);
     }
+
+    public JmTuangou queryByJmId(Long jmId) {
+        return jmTuangouDao.selectJmTuangouByJmId(jmId);
+    }
+
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public Integer updateRemarkByJmId(Long jmId, Long status, String remark) {
+        if (status == 0) {
+            return jmTuangouDao.updateRemarkByJmId(jmId, remark);
+        }
+        if (remark.equals("")) {
+
+        }
+        return jmTuangouDao.updateStatusRemarkByJmId(jmId, status, remark);
+    }
 }

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

@@ -274,6 +274,52 @@ public class YeWeiHuiController {
         return new ModelAndView("/yeweihui/tgPublish.ftl", model);
     }
 
+    @GetMapping("/yeweihui/groupBuyingCx.html")
+    public ModelAndView groupBuyingCx(@Pd(name = "jmId") Long jmId, @Pd(name = "userId") Long userId, @Pd(name = "operation") String operation, ModelMap model) throws JsonProcessingException {
+
+        JmTuangou item = jmTuangouService.queryByJmId(jmId);
+        model.put("tgItemJson", new JsonWapper(item));
+        model.put("tgItem", item);
+
+        model.put("userId", "\""+userId+"\"");
+
+        model.put("operation", "\""+operation+"\"");
+
+        return new ModelAndView("/groupBuying/groupBuyingCx.ftl", model);
+    }
+
+    @GetMapping("/yeweihui/groupBuyingXx.html")
+    public ModelAndView groupBuyingXx(@Pd(name = "jmId") Long jmId, @Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
+
+        JmTuangou item = jmTuangouService.queryByJmId(jmId);
+
+        if (item.getUserId().equals(userId)) {
+            model.put("isMine", "mine");
+        }
+        else {
+            model.put("isMine", "notMine");
+        }
+
+        model.put("userId", "\""+userId+"\"");
+        model.put("tgItemJson", new JsonWapper(item));
+        model.put("tgItem", item);
+
+        return new ModelAndView("/groupBuying/groupBuyingXx.ftl", model);
+    }
+
+    @PostMapping("/yeweihui/groupBuyingCx/remark/add.json")
+    public Model groupBuyingCxRemarkAdd(@Pd(name = "jmId") Long jmId, @Pd(name = "status", required = false, defaultValue = "0") Long status, @Pd(name = "remark", required = false) String remark) {
+
+        Integer success = jmTuangouService.updateRemarkByJmId(jmId, status, remark);
+
+        if (success == 1) {
+            return Model.newSuccess("操作成功");
+        }
+        else {
+            return Model.newFail("操作失败");
+        }
+    }
+
     @PostMapping("/yeweihui/tgPublish.json")
     public Model tuangouPublish(JmTuangou jmTuangou) {
 

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

@@ -43,7 +43,7 @@ endpoints:
 #  whitelabel.enabled: false
 
 spring:
-  profiles.active: guojing
+  profiles.active: lll
 
   application:
     name: bofeng-web

whepi-web/src/main/resources/mapper/JmTuangouMapper.xml

@@ -25,4 +25,24 @@
         from jm_tuangou a
         where user_id=#{userId} and tg_title like concat('%', #{title}, '%')
     </select>
+
+    <select id="selectJmTuangouByJmId" resultType="com.bofeng.entity.JmTuangou">
+
+        select a.*, (select count(1) from jm_buy where jm_id=a.jm_id) as currentNum
+        from jm_tuangou a
+        where jm_id=#{JmId}
+
+    </select>
+
+    <update id="updateRemarkByJmId">
+        update jm_tuangou set remark=#{remark} where jm_id=#{JmId}
+    </update>
+
+    <update id="updateStatusByJmId">
+        update jm_tuangou set tg_status=#{status} where jm_id=#{JmId}
+    </update>
+
+    <update id="updateStatusRemarkByJmId">
+        update jm_tuangou set tg_status=#{status},remark=#{remark} where jm_id=#{JmId}
+    </update>
 </mapper>