合并分支 'lhj' 到 'master'

Lhj



查看合并请求 !6

 {
 {
   "pages": [
   "pages": [
+    "pages/qiyeyongdian/detail/detail",
     "pages/changqu/changqu",
     "pages/changqu/changqu",
     "pages/shebei/shebeidetail/shebeidetail",
     "pages/shebei/shebeidetail/shebeidetail",
-    "pages/qiyeyongdian/detail/detail",
+   
     "pages/companybox/qiyedetail/qiyedetail",
     "pages/companybox/qiyedetail/qiyedetail",
     "pages/companybox/defendetail/defendetail",
     "pages/companybox/defendetail/defendetail",
     "pages/companybox/jichuxinxi/jichuxinxi",
     "pages/companybox/jichuxinxi/jichuxinxi",

@@ -41,14 +41,28 @@ Page({
     let index = e.currentTarget.dataset.id;
     let index = e.currentTarget.dataset.id;
     index=index+1
     index=index+1
     if(index==1||index==3||index==5||index==7||index==8||index==10||index==12){
     if(index==1||index==3||index==5||index==7||index==8||index==10||index==12){
+      if(index<10){
         this.setData({
         this.setData({
-        time:"（"+"2019."+"0"+index+".01"+"-2019"+index+".31"+"）"
+          time: "（" + "2019." + "0" + index + ".01" + "-2019." +'0'+ index + ".31" + "）"
         })
         })
       }else{
       }else{
         this.setData({
         this.setData({
-        time: "（" + "2019." + "0" + index + ".01" + "-2019" + index + ".30" + "）"
+          time: "（" + "2019." + index + ".01" + "-2019." + index + ".31" + "）"
         })
         })
       }
       }
+     
+    }else{
+      if(index<10){
+        this.setData({
+          time: "（" + "2019." + "0" + index + ".01" + "-2019." + '0' + index + ".30" + "）"
+        })
+      }else{
+        this.setData({
+          time: "（" + "2019." + index + ".01" + "-2019." +  index + ".30" + "）"
+        })
+      }
+     
+    }
     this.setData({
     this.setData({
       changeColor: index-1
       changeColor: index-1
     })
     })