diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index be7656c..28cbcca 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.6.21" + const versionNum = "1.6.22" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/subpages/heart/components/noticeNew/noticeNew.wxml b/subpages/heart/components/noticeNew/noticeNew.wxml index 90bdad4..9e0908f 100644 --- a/subpages/heart/components/noticeNew/noticeNew.wxml +++ b/subpages/heart/components/noticeNew/noticeNew.wxml @@ -3,8 +3,10 @@ {{item.departure}} 到 {{item.destination}} - 出发时间：{{item.departureTime}} - + + {{item.status == 0 ? '进行中' : '已结束'}} + 出发时间：{{item.departureTime}} + diff --git a/subpages/heart/components/noticeNew/noticeNew.wxss b/subpages/heart/components/noticeNew/noticeNew.wxss index 86dfa0f..3c2cefd 100644 --- a/subpages/heart/components/noticeNew/noticeNew.wxss +++ b/subpages/heart/components/noticeNew/noticeNew.wxss @@ -23,6 +23,24 @@ justify-content: space-between; height: 80rpx; } +.bottom-left { + display: flex; + align-items: flex-end; + justify-content: flex-start; +} +.notice-tag { + font-size: 26rpx; + font-family: PingFang SC; + font-weight: 500; + margin-right: 10rpx; + white-space: nowrap; +} +.tag-0 { + color: #00A066; +} +.tag-1 { + color: #E30000; +} .notice-time { font-size: 26rpx; font-family: PingFang SC; diff --git a/subpages/heart/pages/groupBuyDetail/groupBuyDetail.wxml b/subpages/heart/pages/groupBuyDetail/groupBuyDetail.wxml index 3ff7107..27bf080 100644 --- a/subpages/heart/pages/groupBuyDetail/groupBuyDetail.wxml +++ b/subpages/heart/pages/groupBuyDetail/groupBuyDetail.wxml @@ -23,6 +23,12 @@ + + 取货方式 + + {{details.pickupMethod == 1 ? '包邮' : '自提'}} + + 截止时间 diff --git a/subpages/heart/pages/groupBuyList/groupBuyList.wxml b/subpages/heart/pages/groupBuyList/groupBuyList.wxml index 0656895..370ad79 100644 --- a/subpages/heart/pages/groupBuyList/groupBuyList.wxml +++ b/subpages/heart/pages/groupBuyList/groupBuyList.wxml @@ -13,10 +13,10 @@ - {{item.groupBuyTitle}} + {{item.pickupMethod == 1 ? '【包邮】' : item.pickupMethod == 2 ? '【自提】' : ''}}{{item.groupBuyTitle}} - - 置顶 + + 置顶 {{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 f3a235f..3588112 100644 --- a/subpages/heart/pages/groupBuyList/groupBuyList.wxss +++ b/subpages/heart/pages/groupBuyList/groupBuyList.wxss @@ -74,7 +74,8 @@ page { } .notice-bottom { display: flex; - align-items: flex-end; + flex-direction: column; + align-items: flex-start; justify-content: space-between; margin-top: 16rpx; } diff --git a/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml b/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml index 019c10f..2cb1262 100644 --- a/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml +++ b/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml @@ -18,14 +18,14 @@ - {{item.groupBuyTitle}} + {{item.pickupMethod == 1 ? '【包邮】' : item.pickupMethod == 2 ? '【自提】' : ''}}{{item.groupBuyTitle}} {{item.groupBuyStatus == '0' ? '团购中' : item.groupBuyStatus == '4' ? '已截团' : item.groupBuyStatus == '5' ? '已结束' : '已取消'}} {{item.groupBuyPublishTime}} 评价 - + diff --git a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.js b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.js index 3d033fc..8e93528 100644 --- a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.js +++ b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.js @@ -25,6 +25,7 @@ Page({ } ], //groupBuyNumber, groupBuyPrice 团购价格人数（最多五条） groupBuyImg: [], //团购图片（最多三张） + pickupMethod: 0, //取货方式：1-包邮，2-自提 }, violationsCount: 0, //内容审核计数 isConReview: false, //内容审核标志 @@ -166,11 +167,18 @@ Page({ 'dataForm.groupBuyEndTime': this.data.dataForm.groupBuyEndTime || getTimestamp() }) }, + //选择取货方式 + pickupMethodChange (e) { + this.setData({ + 'dataForm.pickupMethod': parseInt(e.detail.value) + }) + }, //发布 submitApply () { if (this.data.lock) { return false } + console.log(this.data.dataForm.pickupMethod) if (!this.data.dataForm.groupBuyTitle) { this.showToast("请填标题") return false @@ -179,6 +187,10 @@ Page({ this.showToast("标题限制在50字以内") return false } + if (!this.data.dataForm.pickupMethod) { + this.showToast("请选择取货方式") + return false + } if (!this.data.dataForm.groupBuyEndTime) { this.showToast("请填写截止时间") return false diff --git a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml index c7ca9b3..9106483 100644 --- a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml +++ b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml @@ -35,16 +35,23 @@ - + + + 取货方式 + + 包邮 + 自提 + + 截止时间 {{dataForm.groupBuyEndTime||'请选择时间'}} - + 联系电话 - + 发布 diff --git a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxss b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxss index d0bcac5..00db9c6 100644 --- a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxss +++ b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxss @@ -175,4 +175,15 @@ page { right: -10rpx; width: 40rpx; height: 40rpx; +} + +.apply-item .radio-group { + height: 100%; + display: flex; + align-items: center; + color: #999; + font-size: 28rpx; + } +.apply-item .radio-group radio + radio { + margin-left: 20rpx; } \ No newline at end of file diff --git a/subpages/oneKeyService/images/jubaojilu.png b/subpages/oneKeyService/images/jubaojilu.png index 075572f..ba88681 100644 Binary files a/subpages/oneKeyService/images/jubaojilu.png and b/subpages/oneKeyService/images/jubaojilu.png differ diff --git a/subpages/oneKeyService/images/reportissue.png b/subpages/oneKeyService/images/reportissue.png deleted file mode 100644 index f63b2ab..0000000 Binary files a/subpages/oneKeyService/images/reportissue.png and /dev/null differ diff --git a/subpages/oneKeyService/pages/moduleList/moduleList.wxml b/subpages/oneKeyService/pages/moduleList/moduleList.wxml index 4b312c5..43f2705 100644 --- a/subpages/oneKeyService/pages/moduleList/moduleList.wxml +++ b/subpages/oneKeyService/pages/moduleList/moduleList.wxml @@ -52,7 +52,7 @@ button-left="560" button-width="178" button-height="178" - img-url="/subpages/oneKeyService/images/reportissue.png" + img-url="{{item.imgUrl}}" bindmovebtnCallBack="toReportIssue" data-code="{{item.categoryCode}}" wx:elif="{{item.categoryType == 'module_category_type_button'}}"> diff --git a/subpages/oneKeyService/pages/reportIssue/reportIssue.json b/subpages/oneKeyService/pages/reportIssue/reportIssue.json index 0c1f258..e1bcc17 100644 --- a/subpages/oneKeyService/pages/reportIssue/reportIssue.json +++ b/subpages/oneKeyService/pages/reportIssue/reportIssue.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "我要举报", + "navigationBarTitleText": "我要上访", "usingComponents": { "notice": "../../compontents/notice/notice" } diff --git a/subpages/oneKeyService/pages/reportIssue/reportIssue.wxml b/subpages/oneKeyService/pages/reportIssue/reportIssue.wxml index c63a4bf..8210199 100644 --- a/subpages/oneKeyService/pages/reportIssue/reportIssue.wxml +++ b/subpages/oneKeyService/pages/reportIssue/reportIssue.wxml @@ -4,22 +4,22 @@ - 举报的问题 - + 上访内容描述 + - 举报方式 + 是否匿名 - 匿名举报 + 是 - 实名举报 + 否