提交

app.js

@@ -6,9 +6,11 @@ App({
       this.baseUrl = "https://bigdata.smcic.net"
     }
     let _this = this;
+    wx.showLoading()
     wx.request({
       url: this.baseUrl + '/sys-config',
       success: function (res) {
+        wx.hideLoading()
         if (res.statusCode !== 200) return wx.showToast({
           title: '请重启小程序',
           icon: "error"
@@ -16,7 +18,11 @@ App({
         let data = res.data || [];
         for (let i = 0; i < data.length; i++) {
           const d = data[i];
-          _this.introduce[d.name] = d.value;
+          _this.introduce[d.topic + '_' + d.name] = {
+            value: d.value,
+            name: d.topic,
+            content_desc: d.content_desc
+          };
         }
       },
       fail: function (err) {

pages/home/components/topic/topic.js

@@ -67,28 +67,14 @@ Component({
       value: ""
     },
   },
-  // created(){
-  //   console.log("实例刚刚被创建时执行")
-  // },
-  // attached(){
-  //   console.log("实例进入页面节点树时执行")
-  // },
-  // ready() {
-  // console.log("组件布局完成后执行", this.data.title)
-  // },
-  // moved(){
-  //   console.log("组件实例被移动到节点树另一个位置时执行")
-  // },
-  // detached(){
-  //   console.log("组件实例被从页面节点树移除时执行")
-  // },
-
   /**
    * 组件的初始数据
    */
   data: {
     error: "",
     detail: "",
+    nameTitle:"",
+    diglogTitle: "",
     headData: {},
     contrast: [],
     all: [],
@@ -350,9 +336,11 @@ Component({
     },
     showDetail: function (e) {
       let introduce = e.currentTarget.dataset.introduce || "";
-      console.log(introduce)
+      let detail = app.introduce[this.data.title + "_" + introduce] || {}
+      console.log(introduce,this)
       this.setData({
-        detail: app.introduce[introduce] || ""
+        detail: (detail.value || ""),
+        diglogTitle:  (detail.content_desc || "")
       })
     }
   }

pages/home/components/topic/topic.wxml

@@ -7,10 +7,12 @@
       <view wx:if="{{headData.total_pv != -1}}" data-introduce="total_pv" bindtap="showDetail" class="topicItem">
         总浏览量 <text wx:if="{{select == 1}}" class="show">?</text> ：
       </view>
-      <view wx:if="{{headData.total_digg != -1}}" data-introduce="total_digg" bindtap="showDetail" class="topicItem">总点赞数
+      <view wx:if="{{headData.total_digg != -1}}" data-introduce="total_digg" bindtap="showDetail" class="topicItem">
+        总点赞数
         <text wx:if="{{select == 1}}" class="show">?</text> ：
       </view>
-      <view wx:if="{{headData.total_comment != -1}}" data-introduce="total_forward" bindtap="showDetail" class="topicItem">总转发量
+      <view wx:if="{{headData.total_comment != -1}}" data-introduce="total_forward" bindtap="showDetail"
+        class="topicItem">总转发量
         <text wx:if="{{select == 1}}" class="show">?</text> ：
       </view>
       <view wx:if="{{headData.live_digg != -1}}" data-introduce="live_digg" bindtap="showDetail" class="topicItem">直播点赞数
@@ -33,7 +35,7 @@
       </view>
       <view class="topicItem topicItemRigh">
         <view wx:if="{{headData.live_uv != -1}}" data-introduce="live_uv" bindtap="showDetail">直播观看人数 <text
-          wx:if="{{select == 1}}" class="show">?</text> ：</view>
+            wx:if="{{select == 1}}" class="show">?</text> ：</view>
       </view>
       <view wx:if="{{headData.live_digg != -1}}" data-introduce="live_digg" bindtap="showDetail" class="topicItem">直播评论数
         <text wx:if="{{select == 1}}" class="show">?</text> ：
@@ -134,17 +136,23 @@
       <view>{{detail}}</view>
     </mp-dialog>
   </cover-view> -->
-  <cover-view wx:if="{{detail}}" class="modolBg">
-    <cover-view class="local_dialog">
-      <cover-view class="local_dialog_title">
-        <cover-view class="local_dialog_close" bindtap="showDetail">
-          <cover-view class="local_dialog_close_left"></cover-view>
-          <cover-view class="local_dialog_close_right"></cover-view>
-        </cover-view>
+<cover-view wx:if="{{detail !== ''}}" class="modolBg">
+  <cover-view class="local_dialog">
+    <cover-view class="local_dialog_title">
+      <cover-view class="local_dialog_close" bindtap="showDetail">
+        <cover-view class="local_dialog_close_left"></cover-view>
+        <cover-view class="local_dialog_close_right"></cover-view>
       </cover-view>
-      <cover-view class="local_dialog_body">
+      <cover-view class="title">
+        {{diglogTitle}}
+      </cover-view>
+    </cover-view>
+    <cover-view class="local_dialog_body">
+      <cover-view
+        style="padding-right:5px;white-space:pre-wrap;line-height: 1.5em;width:490rpx;margin: 0 auto;overflow:visible">
         {{detail}}
       </cover-view>
     </cover-view>
   </cover-view>
+</cover-view>
 <!-- <mp-toptips msg="{{detail}}" type="info" show="{{detail !== ''}}"></mp-toptips> -->

pages/home/components/topic/topic.wxss

@@ -83,16 +83,15 @@
 .local_dialog {
   top: 50%;
   left: 50%;
-  width: 500rpx;
+  width: 600rpx;
   position: absolute;
   border-radius: 1em;
-  background-image: url("https://bigdata.smcic.net/data/bg12345.jpg");
-  background-size: 100% 100%;
+  background-color: #eee;
   transform: translate(-50%, -50%);
 }
 
 .local_dialog_title {
-  height: 1.5em;
+  position: relative;
   text-align: right;
   padding: 8px 15px;
   margin-bottom: 1rpx;
@@ -100,11 +99,20 @@
 }
 
 .local_dialog_close {
-  display: inline-block;
+  float: right;
   position: relative;
   width: 1.5em;
   height: 1.5em;
 }
+.local_dialog_title .title {
+  font-size: 16px;
+  height: 25px;
+  white-space: pre-wrap;
+  text-align: center;
+  line-height: 25px;
+  color: #121212;
+  text-align: center;
+}
 
 .local_dialog_close_left,
 .local_dialog_close_right {
@@ -121,9 +129,11 @@
 }
 
 .local_dialog_body {
+  max-height: 60vh;
+  overflow-y: scroll;
   padding: 8px 15px 15px 15px;
   white-space: normal;
-  line-height: 1.5em;
+  line-height: 2em;
   font-size: 14px;
   color: #222;
 }

pages/home/home.wxml

@@ -12,14 +12,15 @@
           </view>
         </button>
       </picker> -->
-      <button bindtap="bindPickerChange" style="color: #fff;width:90%;background-color: #1989fa;" class="mini-btn"
+      <view bindtap="bindPickerChange" style="color: #fff;width:90%;background-color: #1989fa;" class="mini-btn btn"
         type="default" size="mini">
         <view class="iconType">
-          <mp-icon class="icon" wx:if="{{select == 1}}" type="field" icon="back" color="#fff" size="{{8}}"></mp-icon>
+          <mp-icon class="icon" wx:if="{{select == 1}}" type="field" icon="back" color="#fff" size="{{11}}"></mp-icon>
           <text class="title">{{activityList[select]}}</text>
-          <mp-icon class="icon" wx:if="{{select == 0}}" type="field" icon="arrow" color="#fff" size="{{10}}"></mp-icon>
+          <mp-icon class="icon" wx:if="{{select == 0}}" type="field" icon="arrow" color="#fff" size="{{14}}">
+          </mp-icon>
         </view>
-      </button>
+      </view>
     </view>
     <view class="btnGrounp">
       <tab tabList="{{tabList}}" type="{{type}}" bindchangeBar="changeBar"></tab>

pages/home/home.wxss

@@ -25,22 +25,25 @@
   vertical-align: middle;
   padding: 14px 0;
   display: inline-block;
-  vertical-align: middle;
 }
 
 .activity .btnGrounp {
   width: 520rpx;
   vertical-align: middle;
   display: inline-block;
-  vertical-align: middle;
 }
-
+.btn{
+  border-radius: 10rpx;
+  text-align: center;
+  font-size: 18px;
+}
+.iconType{
+}
 .iconType .title{
   display: inline-block;
-  vertical-align: middle;
   margin: 0 3px;
 }
-.iconType .icon{
+.icon{
   display: inline-block;
-  vertical-align: middle;
+  vertical-align: 2px;
 }

pages/sonTopic/sonTopic.js

@@ -7,6 +7,7 @@ Page({
    */
   data: {
     detail: "",
+    diglogTitle: "",
     select: 1,
     userSort: [],
     sonTitle: "",
@@ -343,11 +344,12 @@ Page({
     this.getWeibo({ topic_name: second_name, time: "30d", type: "yangshi", season: app.select - 0 + 1 });
   },
   showDetail: function (e) {
-    if(app.select - 0 != 1) return;
     let introduce = e.currentTarget.dataset.introduce || "";
-    console.log(introduce)
+    let detail = app.introduce[introduce] || {}
+    console.log(introduce,detail)
     this.setData({
-      detail: app.introduce[introduce] || ""
+      detail: detail.value || "",
+      diglogTitle:  detail.content_desc || ""
     })
   }
 })

pages/sonTopic/sonTopic.wxml

@@ -125,9 +125,15 @@
         <cover-view class="local_dialog_close_left"></cover-view>
         <cover-view class="local_dialog_close_right"></cover-view>
       </cover-view>
+      <cover-view class="title">
+        {{diglogTitle}}
+      </cover-view>
     </cover-view>
     <cover-view class="local_dialog_body">
-      {{detail}}
+      <cover-view
+        style="padding-right:5px;white-space:pre-wrap;line-height: 1.5em;width:500rpx;margin: 0 auto;overflow:visible">
+        {{detail}}
+      </cover-view>
     </cover-view>
   </cover-view>
 </cover-view>

pages/sonTopic/sonTopic.wxss

@@ -53,30 +53,43 @@
   z-index: 1;
   background-color: rgba(0,0,0,.5);
 }
-.local_dialog{
-  top:50%;
+
+.local_dialog {
+  top: 50%;
   left: 50%;
-  width: 500rpx;
-  padding: 5px 10px;
+  width: 600rpx;
   position: absolute;
   border-radius: 1em;
-  background-color: #fff;
+  background-color: #eee;
   transform: translate(-50%, -50%);
 }
-.local_dialog_title{
-  width: 100%;
-  height: 1.5em;
+
+.local_dialog_title {
+  position: relative;
   text-align: right;
+  padding: 8px 15px;
+  margin-bottom: 1rpx;
   line-height: 1.5em;
 }
-.local_dialog_close{
-  display: inline-block;
+
+.local_dialog_close {
+  float: right;
   position: relative;
   width: 1.5em;
   height: 1.5em;
 }
+.local_dialog_title .title {
+  font-size: 16px;
+  height: 25px;
+  white-space: pre-wrap;
+  text-align: center;
+  line-height: 25px;
+  color: #121212;
+  text-align: center;
+}
+
 .local_dialog_close_left,
-.local_dialog_close_right{
+.local_dialog_close_right {
   position: absolute;
   width: 100%;
   height: 1rpx;
@@ -84,13 +97,17 @@
   top: 50%;
   transform: rotate(45deg);
 }
-.local_dialog_close_right{
+
+.local_dialog_close_right {
   transform: rotate(135deg);
 }
-.local_dialog_body{
-  white-space:normal;
-  line-height: 1.5em;
-  padding: 10px 0;
+
+.local_dialog_body {
+  max-height: 60vh;
+  overflow-y: scroll;
+  padding: 8px 15px 15px 15px;
+  white-space: normal;
+  line-height: 2em;
   font-size: 14px;
   color: #222;
-}
+}