elink-star
/
epdc-resident-mp-js
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

拼团购增加截止时间；

feature/point
ZhaoTongYao 5 years ago
parent
f02d6e3056
commit
01c464f9b1
10 changed files with 66 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pages/toRegister/toRegister.js
  2. 10
      subpages/heart/pages/groupBuyDetail/groupBuyDetail.js
  3. 9
      subpages/heart/pages/groupBuyDetail/groupBuyDetail.wxml
  4. 2
      subpages/heart/pages/groupBuyList/groupBuyList.wxml
  5. 3
      subpages/heart/pages/groupBuyList/groupBuyList.wxss
  6. 2
      subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml
  7. 3
      subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxss
  8. 62
      subpages/heart/pages/groupBuyPublish/groupBuyPublish.js
  9. 12
      subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml
  10. 4
      utils/config.js

2
pages/toRegister/toRegister.js
View File

@ -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

10
subpages/heart/pages/groupBuyDetail/groupBuyDetail.js
View File

@ -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

9
subpages/heart/pages/groupBuyDetail/groupBuyDetail.wxml
View File

@ -23,6 +23,12 @@
</block>
</view>
</view>
<view class="apply-item">
<view class="item-title">截止时间</view>
<view class="item-content">
{{details.groupBuyEndTime}}
</view>
</view>
<view class="apply-item">
<view class="item-title">报名人数</view>
<view class="item-content item-mobile">
@ -31,6 +37,9 @@
<block wx:if="{{details.groupBuyStatus == 0}}">
<image src="../../images/{{details.signUpStatus == 0 ? 'signup' : (details.signUpStatus == 1 ? 'unsignup' : 'signed2')}}.png"/>
</block>
<block wx:elif="{{details.groupBuyStatus == 4}}">
<image src="../../images/{{details.signUpStatus == 1 ? 'unsignup' : 'signed2'}}.png" wx:if="{{details.signUpStatus != 0}}"/>
</block>
<block wx:else>
<image src="../../images/signed2.png" wx:if="{{details.signUpStatus != 0}}"/>
</block>

2
subpages/heart/pages/groupBuyList/groupBuyList.wxml
View File

@ -14,7 +14,7 @@
<view class="notice-bottom">
<view class="bottom-left">
<view class="notice-tag tag-5" wx:if="{{item.topFlag == '1'}}">置顶</view>
<view class="notice-tag tag-{{item.groupBuyStatus}}">{{item.groupBuyStatus == '0' ? '团购中' : '已结束'}}</view>
<view class="notice-tag tag-{{item.groupBuyStatus}}">{{item.groupBuyStatus == '0' ? '团购中' : item.groupBuyStatus == '4' ?'已截团' : item.groupBuyStatus == '5' ?'已结束' : '已取消'}}</view>
<view class="notice-time">{{item.groupBuyPublishTime}}</view>
</view>
</view>

3
subpages/heart/pages/groupBuyList/groupBuyList.wxss
View File

@ -89,6 +89,9 @@ page {
.tag-5 {
color: #E30000;
}
.tag-4 {
color: #7561E0;
}
.tag-10 {
color: #999999;
}

2
subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml
View File

@ -21,7 +21,7 @@
<view class="notice-title">{{item.groupBuyTitle}}</view>
<view class="notice-bottom">
<view class="bottom-left">
<view class="notice-tag tag-{{item.groupBuyStatus}}">{{item.groupBuyStatus == '0' ? '团购中' : item.groupBuyStatus == '5' ? '已结束' : '已取消'}}</view>
<view class="notice-tag tag-{{item.groupBuyStatus}}">{{item.groupBuyStatus == '0' ? '团购中' : item.groupBuyStatus == '4' ? '已截团' : item.groupBuyStatus == '5' ? '已结束' : '已取消'}}</view>
<view class="notice-time">{{item.groupBuyPublishTime}}</view>
</view>
<view class="evaluate" wx:if="{{item.isEvaluation == '0'}}" data-id="{{item.id}}" catchtap="toEvaluate">评价</view>

3
subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxss
View File

@ -135,6 +135,9 @@ page {
.tag-0 {
color: #00A066;
}
.tag-4 {
color: #7561E0;
}
.tag-5 {
color: #E30000;
}

62
subpages/heart/pages/groupBuyPublish/groupBuyPublish.js
View File

@ -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

12
subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml
View File

@ -35,7 +35,11 @@
<view class="add" data-index="{{index}}" bindtap="minusPriceItem" wx:else><image src="../../images/minus.png" /></view>
</view>
</view>
</view>
<view class="apply-item">
<view class="item-title">截止时间</view>
<view class="select-time" bindtap="selectTime">{{dataForm.groupBuyEndTime||'请选择时间'}}</view>
</view>
<view class="apply-item">
<view class="item-title">联系电话</view>
<input type="text" class="item-content" maxlength="20" placeholder="请输入联系电话" value="{{dataForm.groupBuyMobile}}" bindinput="onInputGroupBuyMobile"></input>
@ -49,8 +53,8 @@
<wux-actionsheet id="wux-actionsheet" />
<!-- <view wx:if="{{showPicker}}">
<date-time-picker bind:cancel="pickerCancel" bind:confirm="pickerConfirm" init-time="{{dataForm.groupBuyTime}}"></date-time-picker>
</view> -->
<view wx:if="{{showPicker}}">
<date-time-picker bind:cancel="pickerCancel" bind:confirm="pickerConfirm" init-time="{{dataForm.groupBuyEndTime}}"></date-time-picker>
</view>
<notice bind:close="closeDialog" bind:confirm="confirmDialog" dialogVisible="{{dialogVisible}}" title="发布成功" content="" confirmText="知道了"></notice>

4
utils/config.js
View File

@ -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/'
}

Write Preview
Loading…
Cancel
Save