sws
/
carInsightSystem_wxapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dd-7' of git.oa00.com:xiaowen/swsWecat into dd-7

Browse Source 
* 'dd-7' of git.oa00.com:xiaowen/swsWecat:
  w

# Conflicts:
#	pages/index/Salesranking/Salesranking.wxss
dev
liuyongli 3 years ago
parent 036601accc 4ec99013c8
commit c5cb3cefc6
4 changed files with 57 additions and 246 deletions
Show Stats Download Patch File Download Diff File

2
components/timecomponent/index.js
Unescape View File

@ -73,14 +73,12 @@ Component({
},
onInput(event) {
let dt = moment(event.detail).format("YYYY-MM-DD");
this.setData({
dt: dt
});
},
onInput1(event) {
let dt = moment(event.detail).format("YYYY-MM-DD");
this.setData({
dt1: dt,
});

123
pages/index/Salesranking/Salesranking.js
Unescape View File

@ -13,15 +13,11 @@ Page({
showChart:true,
// select: false,
grade_value1: "",
grade_name1: '按级别',
grade_name2: '按价格',
grade_name3: '按能源',
grade_name4: '列表展示',
grades4: ['列表展示', '图表展示'],
Stats1:1,
Stats2:2,
Stats3:3,
Stats4:4,
grade_value2: "",
grade_value3: "",
grade_value4: 0,
grades4: [{text:'列表展示',value:0},
{text:'图表展示',value:1}],
num:0,
num1:false,
//弹出框
@ -184,10 +180,10 @@ Page({
app.globalData.request({
action: 'getEnergy',
}).then(res => {
let arr = [{name:"全部能源",value:""}]
let arr = [{text:"全部能源",value:""}]
res.forEach(ele => {
let obj = {
name: ele.value,
text: ele.value,
value: ele.key
}
arr.push(obj)
@ -200,10 +196,10 @@ Page({
app.globalData.request({
action: 'getPrice',
}).then(res => {
let arr = [{name:"全部价格",value:""}]
let arr = [{text:"全部价格",value:""}]
res.forEach(ele => {
let obj = {
name: ele.value,
text: ele.value,
value: ele.key
}
arr.push(obj)
@ -238,71 +234,6 @@ Page({
this.data.builds = e.detail.val
}
},
getBox(num){
switch(num){
case 1:
return "top-noselected";
case 2:
return "top-selected";
case 3:
return "top-selecteds"
}
},
getFont(num){
switch(num){
case 1:
return "notitle";
case 2:
return "title";
case 3:
return "titles"
}
},
//点击下拉
bindShowMsg(e) {
var id = e.currentTarget.id
if (id == 1) {
this.data.Stats1=3
this.setData({
select1: !this.data.select1,
select2: false,
select3: false,
select4: false,
box1:this.getBox(this.data.Stats1),
font1:this.getFont(this.data.Stats1)
})
} else if (id == 2) {
this.data.Stats2=3
this.setData({
select2: !this.data.select2,
select1: false,
select3: false,
select4: false,
box2:this.getBox(this.data.Stats2),
font2:this.getFont(this.data.Stats2)
})
} else if (id == 3) {
this.data.Stats3=3
this.setData({
select3: !this.data.select3,
select2: false,
select1: false,
select4: false,
box3:this.getBox(this.data.Stats3),
font3:this.getFont(this.data.Stats3)
})
} else if (id == 4) {
this.data.Stats4=3
this.setData({
select4: !this.data.select4,
select1: false,
select3: false,
select2: false,
box4:this.getBox(this.data.Stats4),
font4:this.getFont(this.data.Stats4)
})
}
},
// 按级别
mySelect1(e) {
iPageIndex=1
@ -315,52 +246,33 @@ Page({
},
// 按价格
mySelect2(e) {
var name = e.currentTarget.dataset.name.name
var value = e.currentTarget.dataset.name.value
iPageIndex=1
iPageSize = 20
this.data.Stats2=3
this.setData({
ranking:[],
grade_name2: name,
select2: false,
sPriceType: value,
box2:this.getBox(this.data.Stats2),
font2:this.getFont(this.data.Stats2)
ranking:[],
sPriceType: e.detail,
})
this.getTrend()
},
// 按能源
mySelect3(e) {
var name = e.currentTarget.dataset.name.name
var value = e.currentTarget.dataset.name.value
iPageIndex=1
iPageSize = 20
this.data.Stats3=3
this.setData({
ranking:[],
grade_name3: name,
select3: false,
sEnergyType: value,
box3:this.getBox(this.data.Stats3),
font3:this.getFont(this.data.Stats3)
sEnergyType: e.detail,
})
this.getTrend()
},
// 列表展示
mySelect4(e) {
var name = e.currentTarget.dataset.name
this.data.Stats4=3
iPageIndex=1
iPageSize = 20
this.setData({
ranking:[],
grade_name4: name,
select4: false,
a: name != "列表展示",
box4:this.getBox(this.data.Stats4),
font4:this.getFont(this.data.Stats4)
a: e.detail != 0
})
this.getTrend()
},
// 全部
all(){
@ -369,9 +281,10 @@ Page({
this.data.num++
let dj=this.data.num%2==0
this.setData({
grade_name1: '全部级别',
grade_name2: '全部价格',
grade_name3: '全部能源',
ranking:[],
grade_value1: "",
grade_value2: "",
grade_value3: "",
sSpec: '',
sPriceType: '',
sEnergyType: '',

57
pages/index/Salesranking/Salesranking.wxml
Unescape View File

@ -24,63 +24,24 @@
<van-dropdown-menu custom-class="dropdown-menu" active-color="#027AFF;">
<van-dropdown-item value="{{ grade_value1 }}" options="{{ grades1 }}" bind:change="mySelect1"/>
</van-dropdown-menu>
<!-- <view class="box_title">
<view class="{{box1}}" id="1" bindtap="bindShowMsg">
<text class="{{font1}}">{{grade_name1}}</text>
<text class="timeIcon">▼</text>
</view>
</view> -->
<!-- 下拉需要显示的列表 -->
<!-- <view class="select_box" wx:if="{{select1}}">
<view wx:for="{{grades1}}" wx:key="unique">
<view class="select_one" bindtap="mySelect1" data-name="{{item}}">{{item.name}}</view>
</view>
</view> -->
</view>
<view class="top">
<!-- 下拉框 -->
<view class="box_title">
<view class="{{box2}}" id="2" bindtap="bindShowMsg">
<text class="{{font2}}">{{grade_name2}}</text>
<text class="timeIcon">▼</text>
</view>
</view>
<!-- 下拉需要显示的列表 -->
<view class="select_box" wx:if="{{select2}}">
<view wx:for="{{grades2}}" wx:key="unique">
<view class="select_one" bindtap="mySelect2" data-name="{{item}}">{{item.name}}</view>
</view>
</view>
<van-dropdown-menu>
<van-dropdown-item value="{{ grade_value2 }}" options="{{ grades2 }}" bind:change="mySelect2"/>
</van-dropdown-menu>
</view>
<view class="top">
<!-- 下拉框 -->
<view class="box_title">
<view class="{{box3}}" id="3" bindtap="bindShowMsg">
<text class="{{font3}}">{{grade_name3}}</text>
<text class="timeIcon">▼</text>
</view>
</view>
<!-- 下拉需要显示的列表 -->
<view class="select_box" wx:if="{{select3}}">
<view wx:for="{{grades3}}" wx:key="unique">
<view class="select_one" bindtap="mySelect3" data-name="{{item}}">{{item.name}}</view>
</view>
</view>
<van-dropdown-menu>
<van-dropdown-item value="{{ grade_value3 }}" options="{{ grades3}}" bind:change="mySelect3"/>
</van-dropdown-menu>
</view>
<view class="top">
<!-- 下拉框 -->
<view class="box_title">
<view class="{{box4}}" id="4" bindtap="bindShowMsg">
<text class="{{font4}}">{{grade_name4}}</text>
<text class="timeIcon">▼</text>
</view>
</view>
<!-- 下拉需要显示的列表 -->
<view class="select_box" wx:if="{{select4}}">
<view wx:for="{{grades4}}" wx:key="unique">
<view class="select_one" bindtap="mySelect4" data-name="{{item}}">{{item}}</view>
</view>
</view>
<van-dropdown-menu>
<van-dropdown-item value="{{ grade_value4 }}" options="{{ grades4 }}" bind:change="mySelect4"/>
</van-dropdown-menu>
</view>
</scroll-view>
<view class="list">

121
pages/index/Salesranking/Salesranking.wxss
Unescape View File

@ -278,97 +278,36 @@
color: #333333;
}
/* 下拉框 */
/* 没选中 */
.top-noselected {
width: 150rpx;
height: 60rpx;
/* display: flex;
align-items: center;
justify-content: space-between; */
border: 1px solid #f9f9f9;
padding: 0 10rpx;
font-size: 24rpx;
background-color: #ffffff;
}
/* 选中 */
.top-selecteds {
width: 150rpx;
height: 60rpx;
display: flex;
/* margin-top: 10rpx; */
/* float: right; */
align-items: center;
justify-content: space-between;
border: 1px solid #027AFF;
padding: 0 10rpx;
font-size: 24rpx;
background-color: #fff;
}
/* 选择中 */
.top-selected {
width: 150rpx;
height: 60rpx;
display: flex;
align-items: center;
justify-content: space-between;
border: 1px solid #F9F9F9;
padding: 0 10rpx;
font-size: 24rpx;
background-color: #027AFF;
}
.title {
color: #fff;
font-size: 24rpx
}
.titles {
color: #027AFF;
font-size: 24rpx
}
.notitle {
color: #000;
font-size: 24rpx
}
/* 下拉内容 */
.select_box {
background-color: #fff;
/* padding: 0 20rpx; */
width: 100%;
float: inline-end;
position: fixed;
right: 0;
z-index: 99;
overflow: hidden;
text-align: center;
animation: myfirst 0.5s;
font-size: 24rpx;
}
.select_one {
padding-left: 20rpx;
width: 100%;
height: 60rpx;
position: relative;
line-height: 60rpx;
}
/* 下拉过度效果 */
@keyframes myfirst {
from {
height: 0rpx;
}
to {
height: 210rpx;
}
}
/* 下拉内容 */
.select_box {
background-color: #fff;
/* padding: 0 20rpx; */
width: 100%;
float:inline-end;
position:fixed;
right: 0;
z-index: 99;
overflow: hidden;
text-align:center;
animation: myfirst 0.5s;
font-size: 24rpx;
}
.select_one {
padding-left: 20rpx;
width: 100%;
height: 60rpx;
position: relative;
line-height: 60rpx;
}
/* 下拉过度效果 */
@keyframes myfirst {
from {
height: 0rpx;
}
to {
height: 210rpx;
}
}
.loading {
position: relative;
bottom: 5rpx;

Write Preview
Loading…
Cancel
Save