From 01c464f9b1cdb31de77f31b4e7b9e7beeba6a720 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Wed, 20 Jan 2021 09:17:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E8=B4=AD=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/toRegister/toRegister.js | 2 +- .../pages/groupBuyDetail/groupBuyDetail.js | 10 ++- .../pages/groupBuyDetail/groupBuyDetail.wxml | 9 +++ .../pages/groupBuyList/groupBuyList.wxml | 2 +- .../pages/groupBuyList/groupBuyList.wxss | 3 + .../pages/groupBuyListMy/groupBuyListMy.wxml | 2 +- .../pages/groupBuyListMy/groupBuyListMy.wxss | 3 + .../pages/groupBuyPublish/groupBuyPublish.js | 62 +++++++++---------- .../groupBuyPublish/groupBuyPublish.wxml | 12 ++-- utils/config.js | 4 +- 10 files changed, 66 insertions(+), 43 deletions(-) diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index df2cdb4..601188b 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.6.17" + const versionNum = "1.6.18" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/subpages/heart/pages/groupBuyDetail/groupBuyDetail.js b/subpages/heart/pages/groupBuyDetail/groupBuyDetail.js index b28aab0..1084010 100644 --- a/subpages/heart/pages/groupBuyDetail/groupBuyDetail.js +++ b/subpages/heart/pages/groupBuyDetail/groupBuyDetail.js @@ -208,14 +208,18 @@ Page({ if (this.data.lock) { return false } - //状态0：进行中 5：已结束 10：已取消 - if (e.currentTarget.dataset.groupbuystatus != 0) { + //状态0：进行中 4: 已截至 5：已结束 10：已取消 + if (e.currentTarget.dataset.groupbuystatus != 0 && e.currentTarget.dataset.groupbuystatus != 4) { return false } //提交 报名状态0：报名 10：取消报名 let status = 0 //当前 报名状态0：未报名 1：已报名 2：交易已确认 - if (e.currentTarget.dataset.status == 1) { + if (e.currentTarget.dataset.status == 0) { + if (e.currentTarget.dataset.groupbuystatus == 4) { + return + } + } else if (e.currentTarget.dataset.status == 1) { status = 10 } else if (e.currentTarget.dataset.status == 2) { return diff --git a/subpages/heart/pages/groupBuyDetail/groupBuyDetail.wxml b/subpages/heart/pages/groupBuyDetail/groupBuyDetail.wxml index 04d24d5..3ff7107 100644 --- a/subpages/heart/pages/groupBuyDetail/groupBuyDetail.wxml +++ b/subpages/heart/pages/groupBuyDetail/groupBuyDetail.wxml @@ -23,6 +23,12 @@ + + 截止时间 + + {{details.groupBuyEndTime}} + + 报名人数 @@ -31,6 +37,9 @@ + + + diff --git a/subpages/heart/pages/groupBuyList/groupBuyList.wxml b/subpages/heart/pages/groupBuyList/groupBuyList.wxml index 5bb3a0b..2c4516c 100644 --- a/subpages/heart/pages/groupBuyList/groupBuyList.wxml +++ b/subpages/heart/pages/groupBuyList/groupBuyList.wxml @@ -14,7 +14,7 @@ 置顶 - {{item.groupBuyStatus == '0' ? '团购中' : '已结束'}} + {{item.groupBuyStatus == '0' ? '团购中' : item.groupBuyStatus == '4' ?'已截团' : item.groupBuyStatus == '5' ?'已结束' : '已取消'}} {{item.groupBuyPublishTime}} diff --git a/subpages/heart/pages/groupBuyList/groupBuyList.wxss b/subpages/heart/pages/groupBuyList/groupBuyList.wxss index 1d96b99..45625bf 100644 --- a/subpages/heart/pages/groupBuyList/groupBuyList.wxss +++ b/subpages/heart/pages/groupBuyList/groupBuyList.wxss @@ -89,6 +89,9 @@ page { .tag-5 { color: #E30000; } +.tag-4 { + color: #7561E0; +} .tag-10 { color: #999999; } diff --git a/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml b/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml index 0c2f57b..3788a27 100644 --- a/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml +++ b/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml @@ -21,7 +21,7 @@ {{item.groupBuyTitle}} - {{item.groupBuyStatus == '0' ? '团购中' : item.groupBuyStatus == '5' ? '已结束' : '已取消'}} + {{item.groupBuyStatus == '0' ? '团购中' : item.groupBuyStatus == '4' ? '已截团' : item.groupBuyStatus == '5' ? '已结束' : '已取消'}} {{item.groupBuyPublishTime}} 评价 diff --git a/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxss b/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxss index 90d6e8c..0d39923 100644 --- a/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxss +++ b/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxss @@ -135,6 +135,9 @@ page { .tag-0 { color: #00A066; } + .tag-4 { + color: #7561E0; + } .tag-5 { color: #E30000; } diff --git a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.js b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.js index e60b9fb..3d033fc 100644 --- a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.js +++ b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.js @@ -16,7 +16,7 @@ Page({ id: '', //主键 更新时携带 groupBuyTitle: '', //标题 groupBuyContent: '', //内容 - // groupBuyTime: '', //团购时间 + groupBuyEndTime: '', //截止时间 groupBuyMobile: '', //手机 groupBuyPriceNumber: [ { @@ -140,32 +140,32 @@ Page({ 'dataForm.groupBuyPriceNumber': this.data.dataForm.groupBuyPriceNumber }) }, - // pickerCancel () { - // console.log('取消日期选择') - // this.setData({ - // showPicker: false, - // 'dataForm.groupBuyTime': '' - // }) - // }, - // pickerConfirm (e) { - // console.log('选择日期', e.detail.time) - // if (e.detail.time < getTimestamp()) { - // this.showToast("团购时间应该大于当前时间") - // } else { - // this.setData({ - // showPicker: false, - // 'dataForm.groupBuyTime': e.detail.time - // }) - // } - // }, - // //日期选择插件显示入口 - // selectTime (e) { - // this.data.showPicker = !this.data.showPicker - // this.setData({ - // showPicker: this.data.showPicker, - // 'dataForm.groupBuyTime': this.data.dataForm.groupBuyTime || getTimestamp() - // }) - // }, + pickerCancel () { + console.log('取消日期选择') + this.setData({ + showPicker: false, + 'dataForm.groupBuyEndTime': '' + }) + }, + pickerConfirm (e) { + console.log('选择日期', e.detail.time) + if (e.detail.time < getTimestamp()) { + this.showToast("截止时间应该大于当前时间") + } else { + this.setData({ + showPicker: false, + 'dataForm.groupBuyEndTime': e.detail.time + }) + } + }, + //日期选择插件显示入口 + selectTime (e) { + this.data.showPicker = !this.data.showPicker + this.setData({ + showPicker: this.data.showPicker, + 'dataForm.groupBuyEndTime': this.data.dataForm.groupBuyEndTime || getTimestamp() + }) + }, //发布 submitApply () { if (this.data.lock) { @@ -179,10 +179,10 @@ Page({ this.showToast("标题限制在50字以内") return false } - // if (!this.data.dataForm.groupBuyTime) { - // this.showToast("请填写团购时间") - // return false - // } + if (!this.data.dataForm.groupBuyEndTime) { + this.showToast("请填写截止时间") + return false + } if (!this.data.dataForm.groupBuyContent) { this.showToast("请填写团购内容") return false diff --git a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml index eaebf86..c7ca9b3 100644 --- a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml +++ b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml @@ -35,7 +35,11 @@ - + + + 截止时间 + {{dataForm.groupBuyEndTime||'请选择时间'}} + 联系电话 @@ -49,8 +53,8 @@ - + + + diff --git a/utils/config.js b/utils/config.js index d2e0a8b..e11d713 100644 --- a/utils/config.js +++ b/utils/config.js @@ -6,8 +6,8 @@ module.exports = { }; function BASEURL() { - // return 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api/api/' // 锦水测试环境 - return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 + return 'https://epdc-jinan-test.elinkservice.cn/js/epdc-api/api/' // 锦水测试环境 + // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 // return 'http://192.168.43.8:9094/epdc-api/api/' }