更改了倒计时

@@ -18,13 +18,16 @@ Page({
     city_id: '',
     city_id: '',
     pin_id: '',
     pin_id: '',
     shortnameCity: '',
     shortnameCity: '',
+    home_form: '', // 从首页搜索过来
   },
   },
   onLoad: function (options) {
   onLoad: function (options) {
     let that = this
     let that = this
     console.log(options);
     console.log(options);
+
     that.setData({
     that.setData({
-      kw: options.kw || '',
-      searchValue: options.kw || '',
+      // kw: options.kw || '',
+      // searchValue: options.kw || '',
+      home_form: options.home || '',
     })
     })
   },
   },
   onShow: function () {
   onShow: function () {
@@ -35,7 +38,10 @@ Page({
       })
       })
     }
     }
     console.log(this.data.city_id);
     console.log(this.data.city_id);
+    let home_form = that.data.home_form
+    if (home_form == '') {
       that.getmoreList()
       that.getmoreList()
+    }
   },
   },
   goback() {
   goback() {
     wx.navigateBack()
     wx.navigateBack()
@@ -148,17 +154,15 @@ Page({
     that.setData({
     that.setData({
       kw: kw
       kw: kw
     })
     })
-    // console.log(kw);
+    console.log(kw);
     that.getmoreList()
     that.getmoreList()
   },
   },
   getInput(e) {
   getInput(e) {
-    console.log(e);
     let that = this
     let that = this
     let kw = e.detail.value
     let kw = e.detail.value
     that.setData({
     that.setData({
       kw: kw
       kw: kw
     })
     })
-    that.getmoreList()
   },
   },
   changed4S(e) { // 去4sd店
   changed4S(e) { // 去4sd店
     let that = this
     let that = this

@@ -71,7 +71,7 @@ Page({
         klist: data,
         klist: data,
         time_data: data.time_num,
         time_data: data.time_num,
         content: data.content,
         content: data.content,
-        time: data.time_num * 1000,
+        time: data.time_num,
         content2: that.text(data.say)
         content2: that.text(data.say)
       })
       })
       WxParse.wxParse('content', 'html', that.data.content, that, 5);
       WxParse.wxParse('content', 'html', that.data.content, that, 5);

@@ -92,7 +92,8 @@
         display: flex;
         display: flex;
 
 
         .card_left {
         .card_left {
-          flex: 1;
+          // flex: 1;
+          width: 60%;
           align-items: center;
           align-items: center;
           line-height: 55rpx;
           line-height: 55rpx;
 
 
@@ -161,7 +162,8 @@
         }
         }
 
 
         .card_right {
         .card_right {
-          flex: 1;
+          // flex: 1;
+          width: 40%;
           align-items: center;
           align-items: center;
           line-height: 55rpx;
           line-height: 55rpx;
           padding-left: 20rpx;
           padding-left: 20rpx;

@@ -82,7 +82,7 @@
   display: flex;
   display: flex;
 }
 }
 .container .cards .card .card_box .card_left {
 .container .cards .card .card_box .card_left {
-  flex: 1;
+  width: 60%;
   align-items: center;
   align-items: center;
   line-height: 55rpx;
   line-height: 55rpx;
 }
 }
@@ -137,7 +137,7 @@
   line-height: 63rpx;
   line-height: 63rpx;
 }
 }
 .container .cards .card .card_box .card_right {
 .container .cards .card .card_box .card_right {
-  flex: 1;
+  width: 40%;
   align-items: center;
   align-items: center;
   line-height: 55rpx;
   line-height: 55rpx;
   padding-left: 20rpx;
   padding-left: 20rpx;

@@ -120,7 +120,7 @@ Page({
   },
   },
   goSearch() {
   goSearch() {
     wx.navigateTo({
     wx.navigateTo({
-      url: '/pages/search/search?S4_num=1'
+      url: '/pages/Vmore4SList/Vmore4SList?home=1'
     })
     })
   },
   },
   addLoveCared() { // 去添加车辆
   addLoveCared() { // 去添加车辆
@@ -303,6 +303,9 @@ Page({
         url: 'api/index2/indexUnder',
         url: 'api/index2/indexUnder',
       })
       })
       console.log(data, "4SD店列表");
       console.log(data, "4SD店列表");
+      if (data.length == 0) { // 如果是空数组，你调用的是【推荐4s店】这个接口
+        that.getCitied()
+      }
       that.setData({
       that.setData({
         index4S: data
         index4S: data
       })
       })
@@ -321,7 +324,6 @@ Page({
     let id = e.currentTarget.dataset.id
     let id = e.currentTarget.dataset.id
     let token = wx.getStorageSync('token')
     let token = wx.getStorageSync('token')
     if (token) {
     if (token) {
-
       try {
       try {
         const {
         const {
           data
           data
@@ -646,6 +648,8 @@ Page({
         default:
         default:
           break;
           break;
       }
       }
+    } else {
+      a.popTest('该4s店暂未运营')
     }
     }
   },
   },