diff --git a/components/ui-calendar/ui-calendar.js b/components/ui-calendar/ui-calendar.js
index b15ca70..871dc22 100644
--- a/components/ui-calendar/ui-calendar.js
+++ b/components/ui-calendar/ui-calendar.js
@@ -36,7 +36,7 @@ Component({
attached: function () {
- console.log(this.data.statistics);
+ // console.log(this.data.statistics);
// debugger
},
methods: {
diff --git a/components/ui-calendar/ui-calendar.wxss b/components/ui-calendar/ui-calendar.wxss
index 06cd15c..972d7d3 100644
--- a/components/ui-calendar/ui-calendar.wxss
+++ b/components/ui-calendar/ui-calendar.wxss
@@ -78,19 +78,17 @@
/* 有挂牌数量日期 */
.active-back-two .item_view {
- background: linear-gradient(to left, #FFCC00 0%, #FFCC00 50%, #ffffff 50%, #ffffff 100%);
+ background: linear-gradient(to left, #ffffff 0%, #ffffff 50%, #37F492 50%, #37F492 100%);
}
/* 有拍卖数量日期 */
.active-back-three .item_view {
- /* background: linear-gradient(to left, #ffffff 0%, #ffffff 50%, #37F492 50%, #37F492 100%); */
- background: linear-gradient(to left, #ffffff 0%, #ffffff 50%, #37F492 50%, #37F492 100%);
+ background: linear-gradient(to left, #FFCC00 0%, #FFCC00 50%, #ffffff 50%, #ffffff 100%);
}
/* 两个数量都有 */
.active-back-four .item_view {
background: linear-gradient(to right, #FFCC00 0%, #FFCC00 50%, #37F492 50%, #37F492 100%);
- /* background: linear-gradient(to left, #37F492 0%, #37F492 50%, #FFCC00 50%, #FFCC00 100%); */
}
.item_view.selected {
diff --git a/pages/calendar/calendar.js b/pages/calendar/calendar.js
index a40fce0..02d6bb9 100644
--- a/pages/calendar/calendar.js
+++ b/pages/calendar/calendar.js
@@ -36,7 +36,7 @@ Page({
calendarSelectedDate: new Date().toString(),
calendarSelectedDateStr: '',
region: ["500000", "500100","500104"],
- cityName: '重庆市',
+ cityName: '',
timeValue: '',
year: '',
month: '',
@@ -213,7 +213,7 @@ Page({
year: moment().format('YYYY'),
month:moment().format('MM'),
timer : moment().format('YYYY-MM-DD'),
- calendarDisplayTime: moment().format('YYYY-MM-DD'),
+ calendarDisplayTime: moment().format('YYYY-MM-DD')
})
this.onShow();
},
diff --git a/pages/calendar/calendar.wxml b/pages/calendar/calendar.wxml
index 9d928b5..8905ca8 100644
--- a/pages/calendar/calendar.wxml
+++ b/pages/calendar/calendar.wxml
@@ -21,7 +21,7 @@
当前选择
- {{cityName}}
+ {{cityName?cityName:"重庆市"}}
diff --git a/utils/api.js b/utils/api.js
index 8247c66..643a93d 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -91,8 +91,8 @@ const API = {
//字典
getDict:(data)=>request(GET, `dict/type/${data}`),
//日历
- getLandlistedList:(data) => request(GET, `applets/landlisted/list?annoDate=${data.annoDate}&city=${data.city}`),//挂牌
- getLandlistedList2:(data) => request(GET, `applets/landlisted/list?auctionDate=${data.auctionDate}&city=${data.city}`),//拍卖
+ getLandlistedList:(data) => request(GET, `applets/landlisted/list?annoDate=${data.annoDate}&canton=${data.canton}`),//挂牌
+ getLandlistedList2:(data) => request(GET, `applets/landlisted/list?auctionDate=${data.auctionDate}&canton=${data.canton}`),//拍卖
getLandDetail:(data) => request(GET, `applets/landlisted/${data}`),//通过ID获取详情
getPreSaleDetailList:(data) => request(GET, `applets/blocks/getPreSaleDetailList?landListedId=${data.landListedId}`),//查询预售明细列表
getPreSaleTotal:(data) => request(GET, `applets/blocks/getPreSaleTotal?landListedId=${data.landListedId}`),//销售情况统计