Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

app.json

@@ -6,8 +6,7 @@
     "pages/brandSearch/index",
     "pages/varComm/index",
     "pages/mine/index",
-    "pages/logs/logs",
-    "pages/index/event/event"
+    "pages/logs/logs"
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -51,7 +50,7 @@
   },
   "sitemapLocation": "sitemap.json",
   "usingComponents": {
-    "ec-canvas": "../ec-canvas/ec-canvas",
+    "ec-canvas": "/ec-canvas/ec-canvas",
     "van-button": "@vant/weapp/button/index",
     "van-tabbar": "@vant/weapp/tabbar/index",
     "van-tabbar-item": "@vant/weapp/tabbar-item/index",

app.wxss

@@ -2,7 +2,11 @@
 .container {
   height: 100%;
   width: 100%;
+  background-color: #f9f9f9;
 } 
 page{
     padding-bottom: 100px;
 }
+.van-tab {
+  height: 100px !important;
+}

components/indexCom/eventChild/index.js

@@ -0,0 +1,28 @@
+Component({
+    data: {
+        actived:0,
+        timelist: ['二十四小时', '最近七天', '最近三十天', '自定义'],
+        questes: [
+            {
+              tip: '比亚迪宋MAX紧凑型mpv你看了不...',
+              title: '72.45',
+              subtitle: '媒体测评',
+            },
+            {
+                tip: '比亚迪宋MAX紧凑型mpv你看了不...',
+                title: '72.45',
+                subtitle: '媒体测评',
+              }
+        ]
+
+    },
+    methods: {
+        timetap(){
+            console.log('dd',intervalSel)
+            this.setData({
+                intervalSel: e.currentTarget.dataset.value
+            })
+        }
+        
+    }
+})

components/indexCom/eventChild/index.json

@@ -0,0 +1,3 @@
+{
+    "component": true
+}

components/indexCom/eventChild/index.wxml

@@ -0,0 +1,37 @@
+<view>
+    <view class="timelist">
+        <text wx:for="{{timelist}}" class="{{index === intervalSel?'active':''}}" data-index="{{index}}" bindtap="priceSel">{{item}}
+        </text>
+    </view>
+    <view class="list_event" style="background-image: url('/images/sj_beijin.png');">
+        <view class="event_title">热点事件</view>
+        <view wx:for="{{questes}}" wx:key="index" data-quest='{{item}}'>
+            <view class="event_text">
+                <view class="text_title">{{item.tip}}
+                </view>
+                <view class="text_num">{{item.title}}
+                </view>
+            </view>
+            <view class="event_text">
+                <view class="text_pinpai">关联品牌：{{item.subtitle}}
+                </view>
+                <view class="text_pinpai">影响力
+                </view>
+            </view>
+        </view>
+
+    </view>
+    <view class="content">
+        <view class="text_pinpai">2022-04-29 23:02:01
+        </view>
+        <view class="text_title">谁说国产没有高性能SUV这3款国产SUV
+        </view>
+        <view class="content_text">
+            <view class="content_pinpai">作者：明哥飞扬
+            </view>
+            <view class="content_pinpai">媒体：新浪微博
+            </view>
+        </view>
+
+    </view>
+</view>

components/indexCom/eventChild/index.wxss

@@ -0,0 +1,73 @@
+.timelist {
+    margin: 32rpx;
+    display: grid;
+    grid-template-columns: repeat(4,1fr);
+    grid-gap: 16rpx;
+    background-color: #fff;
+}
+
+.timelist text {
+    text-align: center;
+    background: #FAFBFD;
+    border-radius: 4rpx;
+    color: #999999;
+    font-size: 24rpx;
+    padding: 16rpx 0rpx;
+}
+
+.timelist .active {
+    color: #027AFF;
+    border-radius: 4rpx;
+}
+/* 热点事件 */
+.list_event{
+    margin: 0 32rpx;
+    background-size: cover;
+    width: 686rpx;
+    height: 616rpx;
+    border-radius: 8rpx;
+    
+}
+.event_title{
+    font-size: 36rpx;
+    padding: 32rpx;
+}
+
+.event_text{
+    display: flex;
+    justify-content : space-between;
+    padding: 0rpx 32rpx;
+}
+.text_title{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: 500rpx;
+}
+.text_num{
+    color: #FF343F;
+}
+.text_pinpai{
+    color: #999999;
+    font-size: 24rpx;
+}
+/* 文章 */
+.content{
+    margin: 24rpx 32rpx;
+    background-color: #ffffff;
+    width: 686rpx;
+    height: 248rpx;
+    border-radius: 24rpx;
+    padding: 0rpx 32rpx;
+}
+.content_text{
+    display: flex;
+    justify-content : space-between;
+    /* padding: 0rpx 32rpx; */
+
+}
+.content_pinpai{
+    color: #999999;
+    font-size: 24rpx;
+
+}

pages/brandSearch/index.wxss

@@ -1,6 +1,3 @@
-.view-page {
-
-}
 .container {
     width: 100%;
 }

pages/index/index.js

@@ -11,7 +11,7 @@ Page({
       },
       {
         text: '事件',
-        component: 'data-child'
+        component: 'event-child'
       },
       {
         text: '传播媒体',

pages/index/index.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
-      "data-child": "../../components/indexCom/dataChild/index"
+      "data-child": "../../components/indexCom/dataChild/index",
+      "event-child":"../../components/indexCom/eventChild/index"
   }
 }

pages/index/index.wxml

@@ -1,8 +1,9 @@
 <!--index.wxml-->
 <view class="container">
-  <van-tabs class="menu-tabs" active="{{ active }}">
+  <van-tabs class="menu-tabs" active="{{ active }}" ellipsis="{{false}}" animated="{{true}}">
     <van-tab wx:for="{{navData}}" title="{{item.text}}">
       <data-child wx:if="{{item.component === 'data-child'}}"></data-child>
+      <event-child wx:if="{{item.component === 'event-child'}}"></event-child>
     </van-tab>
   </van-tabs>
   <tabbar />

pages/index/index.wxss

@@ -4,7 +4,10 @@
   height: 100%;
   
 }
-.menu-tabs .van-tab{
+.menu-tabs .van-tabs__nav{
+  background-color: #006BFF;/* 标签背景颜色 */
+}
+.menu-tabs .van-tab {
   color: #98CDFF; /* 字体颜色 */
   background-color: #006BFF;/* 标签背景颜色 */
  }
@@ -17,129 +20,4 @@
   background: transparent;
  }
 
-.nav {
-  /* 设置tab-nav宽高度 */
-  height: 80rpx;
-  width: 100%;
-  /* 假如您需要并排放置两个带边框的框，
-  可通过将 box-sizing 设置为 "border-box"。 */
-  box-sizing: border-box;
-  overflow: hidden;
-  /* 居中 */
-  line-height: 80rpx;
-  background: #006BFF;
-  font-size: 28rpx;
-  color: rgba(250, 242, 242, 0.973);
-  /* 规定段落中的文本不进行换行： */
-  white-space: nowrap;
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 99;
-}
-
-.nav-item {
-  width: 20%;
-  display: inline-block;
-  text-align: center;
-}
-
-.nav-item.active {
-  color: rgb(255, 255, 255);
-  font-size: 38rpx;
-}
-
-.tab-box {
-  background: rgb(255, 255, 255);
-  /* 这里设置成nav的高度 */
-  padding-top: 80rpx;
-  height: 100%;
-  box-sizing: border-box;
-}
-
-.tab-content {
-  /* 裁剪 div 元素中内容的左/右边缘 - 如果溢出元素的内容区域的话： */
-  overflow-y: scroll;
-}
-
-
-
-.main {
-  background-color: #F9F9F9;
-  min-height: 100vh;
-}
 
-.mat_title {
-  color: #999999;
-  font-size: 24rpx;
-  margin-bottom: 16rpx;
-}
-
-.mat_num {
-  font-weight: 900;
-  font-size: 28rpx;
-}
-
-.mat_image {
-  width: 100rpx;
-  height: 100rpx;
-  /* background: linear-gradient(180deg, #FFB17C 0%, #FFDBC3 100%); */
-  border-radius: 8rpx;
-}
-
-.mat_top {
-  padding: 16rpx;
-  display: flex;
-  justify-content: space-between; 
-}
-
-.mat_bottom {
-  width: 328rpx;
-  height: 76rpx;
-  border-radius: 0rpx 0rpx 10rpx 10rpx;
-  font-size: 28rpx;
-  font-family: PingFangSC-Semibold, PingFang SC;
-  font-weight: 600;
-  color: #333333;
-  line-height: 28rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.mat_card {
-  background-color: white;
-  width: 300rpx;
-  height: 404rpx;
-  margin: 10rpx 15rpx;
-  border-radius: 16rpx;
-  margin-bottom: 32rpx;
-}
-
-.mat{
-  width: 686rpx;
-  padding-top: 24rpx;
-  margin-left: 32rpx;
-  margin-right: 32rpx;
-  /* min-height: 100vh; */
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
-}
-van-tabs {
-  color: #000;
-  width: 100%;
-  height: 50rpx;
-  line-height: 50rpx;
-  background-color: #027AFF;
-}
-van-tab {
-  background: #bb5050;
-  width: 50rpx;
-  height: 40rpx;
-}
-.van-tab__pane van-tab__pane--active{
-  background: #bb5050;
-  width: 50rpx;
-  height: 40rpx;
-}

project.private.config.json

@@ -2,7 +2,9 @@
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
     "projectname": "swsWecat",
     "setting": {
-        "compileHotReLoad": true
+        "compileHotReLoad": true,
+        "urlCheck": false
     },
-    "condition": {}
+    "condition": {},
+    "libVersion": "2.14.1"
 }