diff --git a/components/indexCom/dataChild/index.js b/components/indexCom/dataChild/index.js
index 3859563..63ddc63 100644
--- a/components/indexCom/dataChild/index.js
+++ b/components/indexCom/dataChild/index.js
@@ -110,9 +110,36 @@ Component({
                 intervalSel: e.currentTarget.dataset.index
             })
         },
-        dynamic(){
+        getKey(val){
+            switch (val) {
+                case "入库数据":
+                    return -1
+                case "新闻数据":
+                    return 1
+                case "论坛数据":
+                    return 2
+                case "微信数据":
+                    return 5
+                case "评论数据":
+                    return 3
+                case "微博数据":
+                    return 4
+                case "短视频数据":
+                    return 6
+                case "其他数据":
+                    return 7
+                default:
+                return null
+            }
+        },
+     
+        dynamic(e){
+            var value=e.currentTarget.id
+            var key=this.getKey(value)
+            // wx.setStorageSync('sQuDao',key)
+            // console.log(key)
           wx.navigateTo({
-            url: "/pages/index/total/tatal" 
+            url: "/pages/index/total/tatal?keys="+key
           })
         },
     }
diff --git a/components/indexCom/dataChild/index.wxml b/components/indexCom/dataChild/index.wxml
index 5f83e33..5f90135 100644
--- a/components/indexCom/dataChild/index.wxml
+++ b/components/indexCom/dataChild/index.wxml
@@ -27,11 +27,11 @@
             </view>
         </view>
         <view class="total">
-            <view class="total_content" wx:for="{{totallist}}" wx:key="url" bindtap="dynamic">
+            <view class="total_content" wx:for="{{totallist}}" wx:key="url" id='{{item.text}}' bindtap="dynamic">
                 <view class="content_img">
                     <image src="{{imageUrl+item.url}}" style="width: 100%;height: 100%;"></image>
                 </view>
-                <view class="content_text">
+                <view class="content_text" >
                     <view class="total_text">{{item.text}}</view>
                     <view class="total_num">{{item.num}}</view>
                 </view>
diff --git a/pages/index/total/tatal.js b/pages/index/total/tatal.js
index 6fe39c1..7c40823 100644
--- a/pages/index/total/tatal.js
+++ b/pages/index/total/tatal.js
@@ -1,7 +1,6 @@
 // pages/index/total/tatal.js
 const app =getApp();
 // Page({
-
 //     /**
 //      * 页面的初始数据
 //      */
@@ -40,7 +39,10 @@ const app =getApp();
 //      * 生命周期函数--监听页面加载
 //      */
 //     onLoad(options) {
-
+        
+       
+//         console.log("aaa",options);
+        
 //     },
 
 //     /**
@@ -96,7 +98,9 @@ Component({
   data: {
     content: {},
   },
+ 
   methods: {
+     
       // modalChoose(e) {
       //     let id = e.currentTarget.dataset.id; //获取点击的id
       //     app.globalData.request({
@@ -162,10 +166,12 @@ Component({
         let sTimeType = wx.getStorageSync("sTimeType") || 34;
         let sStartTime = wx.getStorageSync("sStartTime") || '';
         let sEndTime = wx.getStorageSync("sEndTime") || '';
-        this.getData(sTimeType, sStartTime, sEndTime);
+        this.getData(sTimeType, sStartTime, sEndTime); 
+        
     }
 
 },
+
 methods: {
   aa(){
     wx.reLaunch({
@@ -181,27 +187,39 @@ methods: {
       this.getData(sTimeType, sStartTime, sEndTime);
   },
  getData(sTimeType, sStartTime, sEndTime){
+<<<<<<< HEAD
   // wx.showToast({
   //     title: '加载中',
   //     icon: 'loading',
   //     duration: 300000
   // })
+=======
+  wx.showToast({
+      title: '加载中',
+      icon: 'loading',
+      duration: 300000
+  })
+//   let key = ele.key
+>>>>>>> a5e666062e5c9f1de9f6e8af179d1fd3a010a6b2
   app.globalData.request({
     action: 'getHomeList0528',
     sType: 'Home',
     sTimeType:sTimeType,
     sStartTime:sStartTime,
     sEndTime:sEndTime,
+<<<<<<< HEAD
     // sQuDao:key
+=======
+    // sQuDao:wx.getStorageSync('sQuDao')
+>>>>>>> a5e666062e5c9f1de9f6e8af179d1fd3a010a6b2
 }).then(res => {
   const data= res[0];
   const _source = []
-
 //   for (let i = 0 ;i<res.length;i++){
 //     data.push(res[i])
 // }
-  // res.forEach(ele =>{
-  //   let obj = {
+// res.forEach(ele =>{
+//   let obj = {
   //     sourcetime:data._source.sourcetime,
   //     title:data._source.title,
   //     user_author:data._source.user_author,
@@ -209,12 +227,11 @@ methods: {
   //   }
   //   _source.push(obj)
   // })
-
     this.setData({
       content:data._source
      
     });
-    console.log('9999',data)
+    // console.log('9999',data)
     // console.log('9999',arr)
 });
   setTimeout(() =>{
@@ -222,4 +239,4 @@ methods: {
   },500) 
  },
 },
-})
\ No newline at end of file
+})      
\ No newline at end of file