作者 李洪娟

合并分支 'lhj' 到 'master'

Lhj



查看合并请求 !6
1 { 1 {
2 "pages": [ 2 "pages": [
  3 + "pages/qiyeyongdian/detail/detail",
3 "pages/changqu/changqu", 4 "pages/changqu/changqu",
4 "pages/shebei/shebeidetail/shebeidetail", 5 "pages/shebei/shebeidetail/shebeidetail",
5 - "pages/qiyeyongdian/detail/detail", 6 +
6 "pages/companybox/qiyedetail/qiyedetail", 7 "pages/companybox/qiyedetail/qiyedetail",
7 "pages/companybox/defendetail/defendetail", 8 "pages/companybox/defendetail/defendetail",
8 "pages/companybox/jichuxinxi/jichuxinxi", 9 "pages/companybox/jichuxinxi/jichuxinxi",
@@ -41,13 +41,27 @@ Page({ @@ -41,13 +41,27 @@ Page({
41 let index = e.currentTarget.dataset.id; 41 let index = e.currentTarget.dataset.id;
42 index=index+1 42 index=index+1
43 if(index==1||index==3||index==5||index==7||index==8||index==10||index==12){ 43 if(index==1||index==3||index==5||index==7||index==8||index==10||index==12){
44 - this.setData({  
45 - time:"("+"2019."+"0"+index+".01"+"-2019"+index+".31"+")"  
46 - }) 44 + if(index<10){
  45 + this.setData({
  46 + time: "(" + "2019." + "0" + index + ".01" + "-2019." +'0'+ index + ".31" + ")"
  47 + })
  48 + }else{
  49 + this.setData({
  50 + time: "(" + "2019." + index + ".01" + "-2019." + index + ".31" + ")"
  51 + })
  52 + }
  53 +
47 }else{ 54 }else{
48 - this.setData({  
49 - time: "(" + "2019." + "0" + index + ".01" + "-2019" + index + ".30" + ")"  
50 - }) 55 + if(index<10){
  56 + this.setData({
  57 + time: "(" + "2019." + "0" + index + ".01" + "-2019." + '0' + index + ".30" + ")"
  58 + })
  59 + }else{
  60 + this.setData({
  61 + time: "(" + "2019." + index + ".01" + "-2019." + index + ".30" + ")"
  62 + })
  63 + }
  64 +
51 } 65 }
52 this.setData({ 66 this.setData({
53 changeColor: index-1 67 changeColor: index-1