From 866bc6023189debc6f47bfa7881a6465be1c4f21 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 14 Oct 2020 23:54:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=82=AC=E7=BC=B4=E5=8D=95?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addGroupBuySetting.html                   |   9 +-
 .../addGroupBuySetting/addGroupBuySetting.js  |  10 +-
 .../groupBuySettingManage.html                |   5 +-
 .../groupBuySettingManage.js                  | 100 +++++++++---------
 .../pages/property/printOweFee/printOweFee.js |   2 +-
 5 files changed, 66 insertions(+), 60 deletions(-)

diff --git a/public/components/goods/addGroupBuySetting/addGroupBuySetting.html b/public/components/goods/addGroupBuySetting/addGroupBuySetting.html
index f3d1d07f8..9c95a3da1 100644
--- a/public/components/goods/addGroupBuySetting/addGroupBuySetting.html
+++ b/public/components/goods/addGroupBuySetting/addGroupBuySetting.html
@@ -17,8 +17,8 @@
               <div class="form-group row">
                 <label class="col-sm-2 col-form-label">拼团简介</label>
                 <div class="col-sm-10">
-                  <input v-model="addGroupBuySettingInfo.groupBuyDesc" type="text" placeholder="必填，请填写拼团简介"
-                    class="form-control">
+                  <textarea v-model="addGroupBuySettingInfo.groupBuyDesc" class="form-control"
+                    placeholder="必填，请填写拼团简介"></textarea>
                 </div>
               </div>
               <div class="form-group row">
@@ -26,20 +26,21 @@
                 <div class="col-sm-10">
                   <input v-model="addGroupBuySettingInfo.validHours" type="text" placeholder="必填，请填写拼团时效"
                     class="form-control">
+
                 </div>
               </div>
               <div class="form-group row">
                 <label class="col-sm-2 col-form-label">开始时间</label>
                 <div class="col-sm-10">
                   <input v-model="addGroupBuySettingInfo.startTime" type="text" placeholder="必填，请填写开始时间"
-                    class="form-control">
+                    class="form-control addStartTime">
                 </div>
               </div>
               <div class="form-group row">
                 <label class="col-sm-2 col-form-label">结束时间</label>
                 <div class="col-sm-10">
                   <input v-model="addGroupBuySettingInfo.endTime" type="text" placeholder="必填，请填写结束时间"
-                    class="form-control">
+                    class="form-control addEndTime">
                 </div>
               </div>
 
diff --git a/public/components/goods/addGroupBuySetting/addGroupBuySetting.js b/public/components/goods/addGroupBuySetting/addGroupBuySetting.js
index a13b64ab9..204b1202e 100644
--- a/public/components/goods/addGroupBuySetting/addGroupBuySetting.js
+++ b/public/components/goods/addGroupBuySetting/addGroupBuySetting.js
@@ -17,6 +17,14 @@
         },
         _initMethod: function () {
 
+            vc.initDateTime('addStartTime', function (_value) {
+                $that.addGroupBuySettingInfo.startTime = _value;
+            });
+
+            vc.initDateTime('addEndTime', function (_value) {
+                $that.addGroupBuySettingInfo.endTime = _value;
+            });
+
         },
         _initEvent: function () {
             vc.on('addGroupBuySetting', 'openAddGroupBuySettingModal', function () {
@@ -106,7 +114,7 @@
                 }
 
                 vc.http.apiPost(
-                    'groupBuySetting.saveGroupBuySetting',
+                    '/groupBuy/saveGroupBuySetting',
                     JSON.stringify(vc.component.addGroupBuySettingInfo),
                     {
                         emulateJSON: true
diff --git a/public/pages/goods/groupBuySettingManage/groupBuySettingManage.html b/public/pages/goods/groupBuySettingManage/groupBuySettingManage.html
index 58f166b16..1780fd4b0 100644
--- a/public/pages/goods/groupBuySettingManage/groupBuySettingManage.html
+++ b/public/pages/goods/groupBuySettingManage/groupBuySettingManage.html
@@ -83,10 +83,7 @@
                                         <button class="btn-white btn btn-xs"
                                             v-on:click="_openEditGroupBuySettingModel(groupBuySetting)">修改</button>
                                     </div>
-                                    <div class="btn-group">
-                                        <button class="btn-white btn btn-xs"
-                                            v-on:click="_openDeleteGroupBuySettingModel(groupBuySetting)">删除</button>
-                                    </div>
+                                    
                                 </td>
 
                             </tr>
diff --git a/public/pages/goods/groupBuySettingManage/groupBuySettingManage.js b/public/pages/goods/groupBuySettingManage/groupBuySettingManage.js
index c4f80ee31..aad5abfcc 100644
--- a/public/pages/goods/groupBuySettingManage/groupBuySettingManage.js
+++ b/public/pages/goods/groupBuySettingManage/groupBuySettingManage.js
@@ -1,85 +1,85 @@
 /**
     入驻小区
 **/
-(function(vc){
+(function (vc) {
     var DEFAULT_PAGE = 1;
     var DEFAULT_ROWS = 10;
     vc.extends({
-        data:{
-            groupBuySettingManageInfo:{
-                groupBuySettings:[],
-                total:0,
-                records:1,
-                moreCondition:false,
-                settingId:'',
-                conditions:{
-                    groupBuyName:'',
-validHours:'',
-settingId:'',
+        data: {
+            groupBuySettingManageInfo: {
+                groupBuySettings: [],
+                total: 0,
+                records: 1,
+                moreCondition: false,
+                settingId: '',
+                conditions: {
+                    groupBuyName: '',
+                    validHours: '',
+                    settingId: '',
 
                 }
             }
         },
-        _initMethod:function(){
+        _initMethod: function () {
             vc.component._listGroupBuySettings(DEFAULT_PAGE, DEFAULT_ROWS);
         },
-        _initEvent:function(){
-            
-            vc.on('groupBuySettingManage','listGroupBuySetting',function(_param){
-                  vc.component._listGroupBuySettings(DEFAULT_PAGE, DEFAULT_ROWS);
+        _initEvent: function () {
+
+            vc.on('groupBuySettingManage', 'listGroupBuySetting', function (_param) {
+                vc.component._listGroupBuySettings(DEFAULT_PAGE, DEFAULT_ROWS);
             });
-             vc.on('pagination','page_event',function(_currentPage){
-                vc.component._listGroupBuySettings(_currentPage,DEFAULT_ROWS);
+            vc.on('pagination', 'page_event', function (_currentPage) {
+                vc.component._listGroupBuySettings(_currentPage, DEFAULT_ROWS);
             });
         },
-        methods:{
-            _listGroupBuySettings:function(_page, _rows){
+        methods: {
+            _listGroupBuySettings: function (_page, _rows) {
 
                 vc.component.groupBuySettingManageInfo.conditions.page = _page;
                 vc.component.groupBuySettingManageInfo.conditions.row = _rows;
                 var param = {
-                    params:vc.component.groupBuySettingManageInfo.conditions
-               };
+                    params: vc.component.groupBuySettingManageInfo.conditions
+                };
 
-               //发送get请求
-               vc.http.apiGet('groupBuySetting.listGroupBuySettings',
-                             param,
-                             function(json,res){
-                                var _groupBuySettingManageInfo=JSON.parse(json);
-                                vc.component.groupBuySettingManageInfo.total = _groupBuySettingManageInfo.total;
-                                vc.component.groupBuySettingManageInfo.records = _groupBuySettingManageInfo.records;
-                                vc.component.groupBuySettingManageInfo.groupBuySettings = _groupBuySettingManageInfo.data;
-                                vc.emit('pagination','init',{
-                                     total:vc.component.groupBuySettingManageInfo.records,
-                                     currentPage:_page
-                                 });
-                             },function(errInfo,error){
-                                console.log('请求失败处理');
-                             }
-                           );
+                //发送get请求
+                vc.http.apiGet('/groupBuy/queryGroupBuySetting',
+                    param,
+                    function (json, res) {
+                        var _groupBuySettingManageInfo = JSON.parse(json);
+                        vc.component.groupBuySettingManageInfo.total = _groupBuySettingManageInfo.total;
+                        vc.component.groupBuySettingManageInfo.records = _groupBuySettingManageInfo.records;
+                        vc.component.groupBuySettingManageInfo.groupBuySettings = _groupBuySettingManageInfo.data;
+                        vc.emit('pagination', 'init', {
+                            total: vc.component.groupBuySettingManageInfo.records,
+                            currentPage: _page
+                        });
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
             },
-            _openAddGroupBuySettingModal:function(){
-                vc.emit('addGroupBuySetting','openAddGroupBuySettingModal',{});
+            _openAddGroupBuySettingModal: function () {
+                vc.emit('addGroupBuySetting', 'openAddGroupBuySettingModal', {});
             },
-            _openEditGroupBuySettingModel:function(_groupBuySetting){
-                vc.emit('editGroupBuySetting','openEditGroupBuySettingModal',_groupBuySetting);
+            _openEditGroupBuySettingModel: function (_groupBuySetting) {
+                vc.emit('editGroupBuySetting', 'openEditGroupBuySettingModal', _groupBuySetting);
             },
-            _openDeleteGroupBuySettingModel:function(_groupBuySetting){
-                vc.emit('deleteGroupBuySetting','openDeleteGroupBuySettingModal',_groupBuySetting);
+            _openDeleteGroupBuySettingModel: function (_groupBuySetting) {
+                vc.emit('deleteGroupBuySetting', 'openDeleteGroupBuySettingModal', _groupBuySetting);
             },
-            _queryGroupBuySettingMethod:function(){
+            _queryGroupBuySettingMethod: function () {
                 vc.component._listGroupBuySettings(DEFAULT_PAGE, DEFAULT_ROWS);
 
             },
-            _moreCondition:function(){
-                if(vc.component.groupBuySettingManageInfo.moreCondition){
+            _moreCondition: function () {
+                if (vc.component.groupBuySettingManageInfo.moreCondition) {
                     vc.component.groupBuySettingManageInfo.moreCondition = false;
-                }else{
+                } else {
                     vc.component.groupBuySettingManageInfo.moreCondition = true;
                 }
             }
 
-             
+
         }
     });
 })(window.vc);
diff --git a/public/pages/property/printOweFee/printOweFee.js b/public/pages/property/printOweFee/printOweFee.js
index 55c942ef0..0f436405a 100644
--- a/public/pages/property/printOweFee/printOweFee.js
+++ b/public/pages/property/printOweFee/printOweFee.js
@@ -19,7 +19,7 @@
 
             let _fees = vc.getData('java110_printFee');
             $that.printPayFeeInfo.fees = _fees
-            $that.printPayFeeInfo.feeTime = vc.dateTimeFormat(new Date());
+            $that.printPayFeeInfo.feeTime = vc.dateTimeFormat(new Date().getTime());
 
             $that.printPayFeeInfo.communityName = vc.getCurrentCommunity().name;