Merge branch 'dev' of https://git.oa00.com/xiaowen/swsWecat into dev

components/indexCom/eventChild/index.js

@@ -86,6 +86,20 @@ Component({
             this.setData({
                 intervalSel: e.currentTarget.dataset.index
             })
+        },
+        getdata(){
+            wx.request({
+                url: 'http://cloud.sws010.com/api/v7.ashx',
+                method:'post',
+                success:(res)=>{
+                    console.log(res)
+                    this.setData({
+                        questes:res.data
+                    })
+                  },
+              })
+
+
         }
         
     }

components/indexCom/eventChild/index.wxml

@@ -19,7 +19,7 @@
         </view>
 
     </view>
-    <view class="content" wx:for="{{content}}" wx:key="index" data-quest='{{item}}'>
+    <view class="content" wx:for="{{content}}" wx:key="index" data-quest='{{item}}' >
         <view class="content_event">
             <view class="content_pinpai">{{item.time}}
             </view>

components/indexCom/portraitChild/index.js

@@ -69,7 +69,7 @@ Component({
                 //  right:6,
                 name: 'Access From',
                 type: 'pie',
-                radius: ['76', '40'],
+                radius: ['66', '40'],
                 avoidLabelOverlap: false,
                 
                 itemStyle: {

components/indexCom/soundChild/index.js

@@ -12,10 +12,10 @@ Component({
            
             legend: {
                 icon: 'rectangle',//data图标样式
-                itemWidth: 10,//data图标大小
-                itemHeight: 10,
+                itemWidth: 8,//data图标大小
+                itemHeight: 8,
                 textStyle: {
-                    fontSize: 9
+                    fontSize: 8
                 },
               data: ['微博', '其他','短视频', '微信','APP', '论坛', '新闻'],
           },
@@ -58,7 +58,7 @@ Component({
             xAxis: [
               {
                 type: 'category',
-                data: ['长安', '大众', '丰田', '吉利', '哈佛'],
+                data: ['长安', '大众', '丰田', '吉利', '哈佛',],
                 axisTick:{
                     show:false   //去除刻度线
                 },
@@ -74,6 +74,8 @@ Component({
                 }
               }
             ],
+          
+    
             series: [
               {
                 name: '微博',
@@ -209,10 +211,10 @@ Component({
            
             legend: {
                 icon: 'rectangle',//data图标样式
-                itemWidth: 10,//data图标大小
-                itemHeight: 10,
+                itemWidth: 8,//data图标大小
+                itemHeight: 8,
                 textStyle: {
-                    fontSize: 9
+                    fontSize: 8
                 },
               data: ['微博', '其他','短视频', '微信','APP', '论坛', '新闻'],
           },