wyl

components/option/text.js

@@ -1,3 +1,4 @@
+// 超出长度转换长度
 export function doStr(str, n) {
     let totalCount = 0;
     let txt = "";
@@ -16,4 +17,57 @@ export function doStr(str, n) {
         }
     }
     return txt;
-  }
+  }
+  //时间往前推移半年
+  export function times(val){
+        var month = val.substring(0, 4) //获取年份
+        var bYear = val.substring(val.length - 2, val.length - 1) == "0" //是否为带零的月份
+        var year1 = val.substring(val.length - 1, val.length) //获取月份最后一个数
+        var year2 = val.substring(val.length - 2, val.length) //获取整个月份
+        var time, months, years
+        if (bYear) {
+            if (parseInt(year1) < 6) {
+                months = parseInt(month - 1)
+                if (parseInt(year1) < 3) {
+                    years = "0" + ((12 - (6 - parseInt(year1))) + 1)
+                } else {
+                    years = (12 - (6 - parseInt(year1))) + 1
+                }
+            } else {
+                months = month
+                years = "0" + ((parseInt(year1) - 6) + 1)
+            }
+        } else {
+            months = month
+            years = "0" + (parseInt(year2) - 6 + 1)
+        }
+        time = months + '-' + years
+        return time
+    }
+  //时间往前推移一年
+  export function  times2(val){
+        var month=val.substring(0,4)  //获取年份
+        var bYear=val.substring(val.length-2,val.length-1)=="0"//是否为带零的月份
+        var year1=val.substring(val.length-1,val.length) //获取月份最后一个数
+        var year2=val.substring(val.length-2,val.length) //获取整个月份
+        var time,months,years
+            if(parseInt(year1)==1){
+                months=parseInt(month-2)
+                years="12"
+            }else{
+                if(bYear){
+                    months=parseInt(month-1)
+                    years="0"+(parseInt(year1)-1)
+                }else{
+                    if(year2==10){
+                        years="09"
+                        months=parseInt(month-1)
+                    }else{
+                        months=parseInt(month-1)
+                        years=(parseInt(year1)-1)
+                    }
+                }
+            }
+        time=months+'-'+years
+        return time
+      }

pages/index/Brandsales/Brandsales.js

@@ -1,7 +1,7 @@
 // pages/index/Rankdetail/Rankdetail.js
 var newtime=new Date();
 const app = getApp();
-import moment from "moment"
+import {times2} from "../../../components/option/text"
 Page({
     /**
      * 页面的初始数据
@@ -10,7 +10,7 @@ Page({
         end:newtime.toLocaleDateString(),
         show:false,
         date:wx.getStorageSync('newTime'),
-        date2:wx.getStorageSync('newTime'),
+        date2:times2(wx.getStorageSync('newTime')),
         currentDate: new Date().getTime(),
         minDate: new Date().getTime(),
         ranking: [],
@@ -20,33 +20,7 @@ Page({
           value1:e.detail
 })
 },
-  times(val){
+getData(carName,sStartTime=times2(wx.getStorageSync('newTime')),sEndTime=wx.getStorageSync('newTime')){
-            var month=val.substring(0,4)  //获取年份
-            var bYear=val.substring(val.length-2,val.length-1)=="0"//是否为带零的月份
-            var year1=val.substring(val.length-1,val.length) //获取月份最后一个数
-            var year2=val.substring(val.length-2,val.length) //获取整个月份
-            var time,months,years
-                if(parseInt(year1)==1){
-                    months=parseInt(month-2)
-                    years="12"
-                }else{
-                    if(bYear){
-                        months=parseInt(month-1)
-                        years="0"+(parseInt(year1)-1)
-                    }else{
-                        if(year2==10){
-                            years="09"
-                            months=parseInt(month-1)
-                        }else{
-                            months=parseInt(month-1)
-                            years=(parseInt(year1)-1)
-                        }
-                    }
-                }
-            time=months+'-'+years
-            return time
-          },
-getData(carName,sStartTime=this.times(wx.getStorageSync('newTime')),sEndTime=wx.getStorageSync('newTime')){
   app.globalData.request({
     action: 'getCheZhuCarSeriesListHome',
     sType: 'Marketing',
@@ -126,10 +100,7 @@ showPopup() {
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-        // console.log("这是时间",this.res.ranking)
-       console.log("123",this.options.carName)
      this.getData(this.options.carName)
-        
     },
     /**
      * 生命周期函数--监听页面初次渲染完成

pages/index/Salesranking/Salesranking.js

@@ -270,12 +270,13 @@ Page({
         var value = e.currentTarget.dataset.name.value
         iPageIndex=1
         iPageSize = 20
+        var fonts=value!=""
         this.setData({
             ranking:[],
             grade_name1: name,
             sSpec: value,
             select1: false,
-            fontSize:select1?top-selected:top-noselected
+            fontSize:fonts 
         })
         this.getTrend()
     },

pages/index/Salesranking/Salesranking.wxml

@@ -19,8 +19,8 @@
                 </view>
                 <view class="top">
                     <!-- 下拉框 -->
-                    <view class="top-selected" id="1" bindtap="bindShowMsg">
+                    <view class="{{fontSize?'top-noselected':'top-selected'}}" id="1" bindtap="bindShowMsg">
-                        <text class="title">{{grade_name1}}</text>
+                        <text class="{{fontSize?'notitle':'title'}}">{{grade_name1}}</text>
                         <text class="timeIcon">▼</text>
                     </view>
                     <!-- 下拉需要显示的列表 -->

pages/index/Salesranking/Vehicletype/Vehicletype.js

@@ -312,31 +312,7 @@ Component({
             })
         },
         //弹出框
-        times(val) {
+        
-            var month = val.substring(0, 4) //获取年份
-            var bYear = val.substring(val.length - 2, val.length - 1) == "0" //是否为带零的月份
-            var year1 = val.substring(val.length - 1, val.length) //获取月份最后一个数
-            var year2 = val.substring(val.length - 2, val.length) //获取整个月份
-            var time, months, years
-            if (bYear) {
-                if (parseInt(year1) < 6) {
-                    months = parseInt(month - 1)
-                    if (parseInt(year1) < 3) {
-                        years = "0" + ((12 - (6 - parseInt(year1))) + 1)
-                    } else {
-                        years = (12 - (6 - parseInt(year1))) + 1
-                    }
-                } else {
-                    months = month
-                    years = "0" + ((parseInt(year1) - 6) + 1)
-                }
-            } else {
-                months = month
-                years = "0" + (parseInt(year2) - 6 + 1)
-            }
-            time = months + '-' + years
-            return time
-        },
         popup(e) {
             let duration = this.data.duration
             let models = e.currentTarget.dataset.car