12.12 页面风格改版，增加事件详情相关概念网页跳转，增加绑定手机号功能

unpackage/dist/dev/mp-weixin/pages/invest/invest.js

@@ -361,119 +361,131 @@ const _sfc_main = {
   }
 };
 if (!Array) {
+  const _easycom_navBar2 = common_vendor.resolveComponent("navBar");
   const _easycom_ua_markdown2 = common_vendor.resolveComponent("ua-markdown");
   const _easycom_zui_progress_circle2 = common_vendor.resolveComponent("zui-progress-circle");
   const _easycom_uni_popup2 = common_vendor.resolveComponent("uni-popup");
-  (_easycom_ua_markdown2 + _easycom_zui_progress_circle2 + _easycom_uni_popup2)();
+  (_easycom_navBar2 + _easycom_ua_markdown2 + _easycom_zui_progress_circle2 + _easycom_uni_popup2)();
 }
+const _easycom_navBar = () => "../../components/navBar/navBar.js";
 const _easycom_ua_markdown = () => "../../components/ua-markdown/ua-markdown.js";
 const _easycom_zui_progress_circle = () => "../../uni_modules/zui-progress-circle/components/zui-progress-circle/zui-progress-circle.js";
 const _easycom_uni_popup = () => "../../uni_modules/uni-popup/components/uni-popup/uni-popup.js";
 if (!Math) {
-  (_easycom_ua_markdown + _easycom_zui_progress_circle + _easycom_uni_popup)();
+  (_easycom_navBar + _easycom_ua_markdown + _easycom_zui_progress_circle + _easycom_uni_popup)();
 }
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return common_vendor.e({
     a: common_assets._imports_0,
-    b: common_vendor.s("top:" + $data.menuTop + "px;line-height:" + $data.menuH + "px;"),
+    b: common_vendor.p({
+      leftText: "投资日历",
+      hideNavBg: true,
+      hideBack: true
+    }),
     c: common_assets._imports_1,
     d: $data.keywords,
     e: common_vendor.o(($event) => $data.keywords = $event.detail.value),
-    f: common_vendor.o(($event) => $options.clickSearch()),
-    g: common_vendor.s("top:" + $data.navH + "px;"),
-    h: common_vendor.t($data.selectDate),
-    i: common_assets._imports_2$3,
-    j: common_vendor.o(($event) => $options.clickSelectMonth()),
-    k: common_vendor.o(($event) => $options.clickTodayDate()),
-    l: common_vendor.f($data.weekList, (item, index, i0) => {
+    f: common_vendor.s("top:" + $data.navH + "px;"),
+    g: common_vendor.t($data.selectDate),
+    h: common_assets._imports_2$2,
+    i: common_vendor.o(($event) => $options.clickSelectMonth()),
+    j: common_vendor.o(($event) => $options.clickTodayDate()),
+    k: common_vendor.f($data.weekList, (item, index, i0) => {
       return {
         a: common_vendor.t(item),
         b: index
       };
     }),
-    m: $data.isExpand
+    l: $data.isExpand
   }, $data.isExpand ? {
-    n: common_vendor.f($data.monthDateList, (item, index, i0) => {
-      return common_vendor.e($data.selectDate != $data.todayDate ? common_vendor.e({
-        a: $data.selectDate == item.date
-      }, $data.selectDate == item.date ? {
-        b: common_vendor.t(item.day)
-      } : {
-        c: common_vendor.t(item.day),
-        d: common_vendor.n("date " + (item.isCurrentMonth ? "" : " notCurrentMonth"))
-      }) : {
-        e: common_vendor.t(item.day),
-        f: common_vendor.n("date " + (item.isToday ? "today" : item.isCurrentMonth ? "" : " notCurrentMonth"))
-      }, {
-        g: item.className
+    m: common_vendor.f($data.monthDateList, (item, index, i0) => {
+      return common_vendor.e({
+        a: item.className
       }, item.className ? common_vendor.e({
-        h: item.className == "bg-gradient-danger"
+        b: item.className == "bg-gradient-danger"
       }, item.className == "bg-gradient-danger" ? {
-        i: common_vendor.t(item.eventCount)
+        c: common_vendor.t(item.day),
+        d: common_vendor.t(item.eventCount),
+        e: common_vendor.n("item flexColumnCenter danger " + ($data.selectDate == item.date ? "select" : "")),
+        f: common_vendor.o(($event) => $options.clickSelectDate(item), index)
       } : {}, {
-        j: item.className == "bg-gradient-warning"
+        g: item.className == "bg-gradient-warning"
       }, item.className == "bg-gradient-warning" ? {
-        k: common_vendor.t(item.eventCount)
+        h: common_vendor.t(item.day),
+        i: common_vendor.t(item.eventCount),
+        j: common_vendor.n("item flexColumnCenter warning " + ($data.selectDate == item.date ? "select" : "")),
+        k: common_vendor.o(($event) => $options.clickSelectDate(item), index)
       } : {}, {
         l: item.className == "bg-gradient-info"
       }, item.className == "bg-gradient-info" ? {
-        m: common_vendor.t(item.eventCount)
+        m: common_vendor.t(item.day),
+        n: common_vendor.t(item.eventCount),
+        o: common_vendor.n("item flexColumnCenter info " + ($data.selectDate == item.date ? "select" : "")),
+        p: common_vendor.o(($event) => $options.clickSelectDate(item), index)
       } : {}, {
-        n: item.className == "bg-gradient-success"
+        q: item.className == "bg-gradient-success"
       }, item.className == "bg-gradient-success" ? {
-        o: common_vendor.t(item.eventCount)
-      } : {}) : {}, {
-        p: index,
-        q: common_vendor.o(($event) => $options.clickSelectDate(item), index)
-      });
-    }),
-    o: $data.selectDate != $data.todayDate
-  } : {
-    p: common_vendor.f($data.weekDateList, (item, index, i0) => {
-      return common_vendor.e($data.selectDate != $data.todayDate ? common_vendor.e({
-        a: $data.selectDate == item.date
-      }, $data.selectDate == item.date ? {
-        b: common_vendor.t(item.day)
-      } : {
-        c: common_vendor.t(item.day),
-        d: common_vendor.n("date " + (item.isCurrentMonth ? "" : " notCurrentMonth"))
-      }) : {
-        e: common_vendor.t(item.day),
-        f: common_vendor.n("date " + (item.isToday ? "today" : item.isCurrentMonth ? "" : " notCurrentMonth"))
+        r: common_vendor.t(item.day),
+        s: common_vendor.t(item.eventCount),
+        t: common_vendor.n("item flexColumnCenter success" + ($data.selectDate == item.date ? "select" : "")),
+        v: common_vendor.o(($event) => $options.clickSelectDate(item), index)
+      } : {}) : {
+        w: common_vendor.t(item.day),
+        x: common_vendor.n("date " + (item.isCurrentMonth ? "" : " notCurrentMonth"))
       }, {
-        g: item.className
+        y: index
+      });
+    })
+  } : {
+    n: common_vendor.f($data.weekDateList, (item, index, i0) => {
+      return common_vendor.e({
+        a: item.className
       }, item.className ? common_vendor.e({
-        h: item.className == "bg-gradient-danger"
+        b: item.className == "bg-gradient-danger"
       }, item.className == "bg-gradient-danger" ? {
-        i: common_vendor.t(item.eventCount)
+        c: common_vendor.t(item.day),
+        d: common_vendor.t(item.eventCount),
+        e: common_vendor.n("item flex1 flexColumnCenter danger " + ($data.selectDate == item.date ? "select" : "")),
+        f: common_vendor.o(($event) => $options.clickSelectDate(item), index)
       } : {}, {
-        j: item.className == "bg-gradient-warning"
+        g: item.className == "bg-gradient-warning"
       }, item.className == "bg-gradient-warning" ? {
-        k: common_vendor.t(item.eventCount)
+        h: common_vendor.t(item.day),
+        i: common_vendor.t(item.eventCount),
+        j: common_vendor.n("item flex1 flexColumnCenter warning " + ($data.selectDate == item.date ? "select" : "")),
+        k: common_vendor.o(($event) => $options.clickSelectDate(item), index)
       } : {}, {
         l: item.className == "bg-gradient-info"
       }, item.className == "bg-gradient-info" ? {
-        m: common_vendor.t(item.eventCount)
+        m: common_vendor.t(item.day),
+        n: common_vendor.t(item.eventCount),
+        o: common_vendor.n("item flex1 flexColumnCenter info " + ($data.selectDate == item.date ? "select" : "")),
+        p: common_vendor.o(($event) => $options.clickSelectDate(item), index)
       } : {}, {
-        n: item.className == "bg-gradient-success"
+        q: item.className == "bg-gradient-success"
       }, item.className == "bg-gradient-success" ? {
-        o: common_vendor.t(item.eventCount)
-      } : {}) : {}, {
-        p: common_vendor.o(($event) => $options.clickSelectDate(item), index),
-        q: index
+        r: common_vendor.t(item.day),
+        s: common_vendor.t(item.eventCount),
+        t: common_vendor.n("item flex1 flexColumnCenter success " + ($data.selectDate == item.date ? "select" : "")),
+        v: common_vendor.o(($event) => $options.clickSelectDate(item), index)
+      } : {}) : {
+        w: common_vendor.t(item.day),
+        x: common_vendor.t(item.className ? item.eventCount : ""),
+        y: common_vendor.o(($event) => $options.clickSelectDate(item), index)
+      }, {
+        z: index
       });
-    }),
-    q: $data.selectDate != $data.todayDate
+    })
   }, {
-    r: common_vendor.t($data.isExpand ? "收起" : "展开"),
-    s: $data.isExpand
+    o: common_vendor.t($data.isExpand ? "收起" : "展开"),
+    p: $data.isExpand
   }, $data.isExpand ? {
-    t: common_assets._imports_3$2
+    q: common_assets._imports_3$2
   } : {
-    v: common_assets._imports_4$1
+    r: common_assets._imports_4$1
   }, {
-    w: common_vendor.o(($event) => $options.clickExpandOrRetract()),
-    x: common_vendor.f($data.tabList, (item, index, i0) => {
+    s: common_vendor.o(($event) => $options.clickExpandOrRetract()),
+    t: common_vendor.f($data.tabList, (item, index, i0) => {
       return {
         a: common_vendor.t(item),
         b: common_vendor.n("item " + ($data.selectTab == index ? "select" : "")),
@@ -481,7 +493,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         d: common_vendor.o(($event) => $options.clickTabItem(index), index)
       };
     }),
-    y: common_vendor.f($data.stockCategoryList, (item, index, i0) => {
+    v: common_vendor.f($data.stockCategoryList, (item, index, i0) => {
       return common_vendor.e({
         a: common_vendor.t(item.primary_sector),
         b: $data.selectTopCategory == index
@@ -491,9 +503,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         e: common_vendor.o(($event) => $options.clickTopCategoryItem(index), index)
       });
     }),
-    z: $data.selectTab == 0
+    w: $data.selectTab == 0
   }, $data.selectTab == 0 ? {
-    A: common_vendor.f($data.eventList, (item, index, i0) => {
+    x: common_vendor.f($data.eventList, (item, index, i0) => {
       return common_vendor.e({
         a: common_vendor.t($data.getLocaleHourMinute(item.start_time)),
         b: common_vendor.f(5, (sitem, sindex, i1) => {
@@ -504,42 +516,36 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         c: index,
         d: common_vendor.t(item.category.event_type),
         e: common_vendor.t(item.title),
-        f: common_vendor.f(item.tags, (titem, tindex, i1) => {
-          return {
-            a: common_vendor.t(titem),
-            b: tindex
-          };
-        }),
-        g: "2cf1ca64-0-" + i0,
-        h: common_vendor.p({
+        f: "2cf1ca64-1-" + i0,
+        g: common_vendor.p({
           source: $data.replaceAnswerLabel(item.description)
         }),
-        i: item.related_concepts
+        h: item.related_concepts
       }, item.related_concepts ? {
-        j: common_vendor.f(item.related_concepts, (citem, cindex, i1) => {
+        i: common_vendor.f(item.related_concepts, (citem, cindex, i1) => {
           return {
             a: common_vendor.t(citem.name),
             b: common_vendor.t(citem.score * 100),
-            c: "2cf1ca64-1-" + i0 + "-" + i1,
+            c: "2cf1ca64-2-" + i0 + "-" + i1,
             d: common_vendor.p({
               position: citem.score,
               range: [270, 630],
               size: 26,
               ["ring-width"]: 2,
-              texture: ["#F97316", "#E3E3E3"]
+              texture: ["#F3C368", "#E3E3E3"]
             }),
             e: cindex
           };
         })
       } : {}, {
-        k: index,
-        l: common_vendor.o(($event) => $options.clickEventItem(item.id), index)
+        j: index,
+        k: common_vendor.o(($event) => $options.clickEventItem(item.id), index)
       });
     })
   } : {}, {
-    B: $data.selectTab == 1
+    y: $data.selectTab == 1
   }, $data.selectTab == 1 ? {
-    C: common_vendor.f($data.dataList, (item, index, i0) => {
+    z: common_vendor.f($data.dataList, (item, index, i0) => {
       return {
         a: common_vendor.t($data.getLocaleHourMinute(item.created_at)),
         b: common_vendor.f(5, (sitem, sindex, i1) => {
@@ -556,22 +562,22 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       };
     })
   } : {}, {
-    D: common_vendor.s("top:" + $data.contentTop + "px;"),
-    E: $data.isRefreshing,
-    F: common_vendor.o(($event) => $options.pullDownRefresh()),
-    G: common_vendor.o(($event) => $options.loadMoreData()),
-    H: common_assets._imports_5,
-    I: common_vendor.o(($event) => $options.clickPreMonth()),
-    J: common_vendor.t($data.selectMonth),
-    K: common_assets._imports_6,
-    L: common_vendor.o(($event) => $options.clickNextMonth()),
-    M: common_vendor.f($data.weekList, (item, index, i0) => {
+    A: common_vendor.s("top:" + $data.contentTop + "px;"),
+    B: $data.isRefreshing,
+    C: common_vendor.o(($event) => $options.pullDownRefresh()),
+    D: common_vendor.o(($event) => $options.loadMoreData()),
+    E: common_assets._imports_5,
+    F: common_vendor.o(($event) => $options.clickPreMonth()),
+    G: common_vendor.t($data.selectMonth),
+    H: common_assets._imports_6,
+    I: common_vendor.o(($event) => $options.clickNextMonth()),
+    J: common_vendor.f($data.weekList, (item, index, i0) => {
       return {
         a: common_vendor.t(item),
         b: index
       };
     }),
-    N: common_vendor.f($data.calendarDateList[$data.selectMonthIndex], (item, index, i0) => {
+    K: common_vendor.f($data.calendarDateList[$data.selectMonthIndex], (item, index, i0) => {
       return common_vendor.e({
         a: item.isToday || item.date == $data.selectDate
       }, item.isToday || item.date == $data.selectDate ? {
@@ -587,9 +593,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         g: common_vendor.o(($event) => $options.clickSelectDate(item), index)
       });
     }),
-    O: common_vendor.s("margin-top:" + $data.navH + "px;"),
-    P: common_vendor.sr("popup", "2cf1ca64-2"),
-    Q: common_vendor.p({
+    L: common_vendor.s("margin-top:" + $data.navH + "px;"),
+    M: common_vendor.sr("popup", "2cf1ca64-3"),
+    N: common_vendor.p({
       type: "top"
     })
   });

unpackage/dist/dev/mp-weixin/pages/invest/invest.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "",
   "enablePullDownRefresh": false,
   "usingComponents": {
+    "nav-bar": "../../components/navBar/navBar",
     "ua-markdown": "../../components/ua-markdown/ua-markdown",
     "zui-progress-circle": "../../uni_modules/zui-progress-circle/components/zui-progress-circle/zui-progress-circle",
     "uni-popup": "../../uni_modules/uni-popup/components/uni-popup/uni-popup"

unpackage/dist/dev/mp-weixin/pages/invest/invest.wxss

@@ -1,25 +1,22 @@
+page {
+  background-color: #070707;
+}
 .topBg {
   top: 0;
   left: 0;
   width: 100%;
   height: auto;
 }
-.navTitle {
-  left: 0;
-  margin: 0 23rpx;
-  font-size: 36rpx;
-  font-weight: bold;
-  color: white;
-}
 .searchC {
-  background-color: white;
+  background-color: #292929B3;
   left: 0;
   right: 0;
   margin: 20rpx 25rpx 0;
-  padding: 0 20rpx;
-  height: 75rpx;
-  border-radius: 20rpx;
-  font-size: 26rpx;
+  padding: 0 25rpx;
+  height: 70rpx;
+  border: solid 1rpx #363636;
+  border-radius: 35rpx;
+  font-size: 22rpx;
   font-weight: 500;
 }
 .searchC .icon {
@@ -40,151 +37,198 @@
   color: #F97316;
 }
 .contentC {
-  background-color: white;
   left: 0;
   right: 0;
   bottom: calc(55px + env(safe-area-inset-bottom));
-  margin-top: 22rpx;
-  border-radius: 20rpx 20rpx 0 0;
+  margin-top: 20rpx;
   overflow-y: scroll;
 }
-.contentC .todayC {
+.contentC .calendarC {
+  background: linear-gradient(-30deg, #FFF6F0 0%, #FEFEFE 100%);
+  margin: 0 25rpx;
+  border-radius: 20rpx;
+}
+.contentC .calendarC .todayC {
   padding: 12rpx 26rpx;
 }
-.contentC .todayC .todayDateC {
+.contentC .calendarC .todayC .todayDateC {
   font-size: 32rpx;
   font-weight: bold;
-  color: #222;
+  color: #CCCDD1;
 }
-.contentC .todayC .todayDateC .icon {
+.contentC .calendarC .todayC .todayDateC .icon {
   margin-left: 16rpx;
   width: 30rpx;
   height: auto;
 }
-.contentC .todayC .today {
-  background-color: #F973161A;
+.contentC .calendarC .todayC .today {
+  background-color: #F3C368;
   width: 40rpx;
   line-height: 40rpx;
   border-radius: 50%;
   font-size: 26rpx;
   font-weight: 500;
-  color: #F97316;
+  color: #070707;
   text-align: center;
 }
-.contentC .weekList .item {
+.contentC .calendarC .weekList .item {
   line-height: 40rpx;
   font-size: 24rpx;
+  font-weight: 500;
   color: #292621;
   text-align: center;
 }
-.contentC .weekDateList .item {
-  padding-top: 14rpx;
+.contentC .calendarC .weekDateList {
+  margin-top: 6rpx;
+  padding: 0 20rpx;
 }
-.contentC .weekDateList .item .date {
-  width: 40rpx;
-  line-height: 40rpx;
-  font-size: 24rpx;
-  text-align: center;
-}
-.contentC .weekDateList .item .date.today {
-  background-color: #F9731626;
+.contentC .calendarC .weekDateList .item {
+  margin-right: 16rpx;
+  padding: 10rpx 0 6rpx;
   border-radius: 5rpx;
-  color: #F97316;
 }
-.contentC .weekDateList .item .eventNum {
-  margin-top: 12rpx;
-  width: 80rpx;
-  height: 30rpx;
-  line-height: 30rpx;
-  border-radius: 5rpx;
-  font-size: 16rpx;
-  font-weight: 500;
-  color: white;
-  text-align: center;
-}
-.contentC .weekDateList .item .eventNum.danger {
-  background-color: #EB4A46;
-}
-.contentC .weekDateList .item .eventNum.warning {
-  background-color: #FD9C16;
-}
-.contentC .weekDateList .item .eventNum.info {
-  background-color: #16BBCF;
-}
-.contentC .weekDateList .item .eventNum.success {
-  background-color: #55AE59;
-}
-.contentC .monthDateList .item {
-  padding-top: 14rpx;
-  width: calc(100%/7);
-}
-.contentC .monthDateList .item .date {
-  width: 40rpx;
-  line-height: 40rpx;
+.contentC .calendarC .weekDateList .item .date {
   font-size: 24rpx;
   font-weight: bold;
-  color: #292621;
-  text-align: center;
+  color: #2A2A2A;
 }
-.contentC .monthDateList .item .date.today {
-  background-color: #F9731626;
+.contentC .calendarC .weekDateList .item .eventNum {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  margin-top: 2rpx;
+  font-size: 18rpx;
+  font-weight: bold;
+}
+.contentC .calendarC .weekDateList .item:nth-child(7n) {
+  margin-right: 0;
+}
+.contentC .calendarC .weekDateList .item.select .date {
+  color: white;
+}
+.contentC .calendarC .weekDateList .item.danger {
+  background-color: #EB4A461A;
+  color: #EB4A46;
+}
+.contentC .calendarC .weekDateList .item.select.danger {
+  background-color: #EB4A46;
+  color: white;
+}
+.contentC .calendarC .weekDateList .item.warning {
+  background-color: #FD9A141A;
+  color: #FD9A14;
+}
+.contentC .calendarC .weekDateList .item.select.warning {
+  background-color: #FD9A14;
+  color: white;
+}
+.contentC .calendarC .weekDateList .item.info {
+  background-color: #16BBCF1A;
+  color: #16BBCF;
+}
+.contentC .calendarC .weekDateList .item.select.info {
+  background-color: #16BBCF;
+  color: white;
+}
+.contentC .calendarC .weekDateList .item.success {
+  background-color: #55AE591A;
+  color: #55AE59;
+}
+.contentC .calendarC .weekDateList .item.select.success {
+  background-color: #55AE59;
+  color: white;
+}
+.contentC .calendarC .monthDateList {
+  margin-top: 6rpx;
+  padding: 0 20rpx;
+}
+.contentC .calendarC .monthDateList .item {
+  margin: 0 16rpx 20rpx 0;
+  padding: 10rpx 0 6rpx;
+  width: calc((100% - 96rpx)/7);
   border-radius: 5rpx;
-  color: #F97316;
 }
-.contentC .monthDateList .item .date.notCurrentMonth {
+.contentC .calendarC .monthDateList .item .date {
+  font-size: 26rpx;
+  font-weight: bold;
+  color: #2A2A2A;
+}
+.contentC .calendarC .monthDateList .item .date.notCurrentMonth {
   color: #999;
 }
-.contentC .monthDateList .item .eventNum {
-  margin-top: 12rpx;
-  width: 80rpx;
-  height: 30rpx;
-  line-height: 30rpx;
-  border-radius: 5rpx;
-  font-size: 16rpx;
-  font-weight: 500;
+.contentC .calendarC .monthDateList .item .eventNum {
+  margin-top: 2rpx;
+  font-size: 18rpx;
+  font-weight: bold;
+}
+.contentC .calendarC .monthDateList .item:nth-child(7n) {
+  margin-right: 0;
+}
+.contentC .calendarC .monthDateList .item.select .date {
   color: white;
-  text-align: center;
 }
-.contentC .monthDateList .item .eventNum.danger {
+.contentC .calendarC .monthDateList .item.danger {
+  background-color: #EB4A461A;
+  color: #EB4A46;
+}
+.contentC .calendarC .monthDateList .item.select.danger {
   background-color: #EB4A46;
+  color: white;
 }
-.contentC .monthDateList .item .eventNum.warning {
-  background-color: #FD9C16;
+.contentC .calendarC .monthDateList .item.warning {
+  background-color: #FD9A141A;
+  color: #FD9A14;
 }
-.contentC .monthDateList .item .eventNum.info {
+.contentC .calendarC .monthDateList .item.select.warning {
+  background-color: #FD9A14;
+  color: white;
+}
+.contentC .calendarC .monthDateList .item.info {
+  background-color: #16BBCF1A;
+  color: #16BBCF;
+}
+.contentC .calendarC .monthDateList .item.select.info {
   background-color: #16BBCF;
+  color: white;
 }
-.contentC .monthDateList .item .eventNum.success {
+.contentC .calendarC .monthDateList .item.success {
+  background-color: #55AE591A;
+  color: #55AE59;
+}
+.contentC .calendarC .monthDateList .item.select.success {
   background-color: #55AE59;
+  color: white;
 }
-.contentC .expandBgC {
+.contentC .calendarC .expandBgC {
   margin: 0 25rpx;
   border-bottom: solid 1rpx #E4E4E4;
 }
-.contentC .expandBgC .expandC {
+.contentC .calendarC .expandBgC .expandC {
   padding: 20rpx 0;
   font-size: 22rpx;
   font-weight: 500;
   color: #8A857C;
 }
-.contentC .expandBgC .expandC .arrow {
+.contentC .calendarC .expandBgC .expandC .arrow {
   margin-left: 7rpx;
   width: 15rpx;
   height: auto;
 }
+.contentC .tabC {
+  margin-top: 10rpx;
+}
 .contentC .tabC .item {
   display: inline-block;
-  padding: 0 24rpx;
+  padding: 0 27rpx;
   line-height: 70rpx;
   font-size: 32rpx;
-  color: #42485B;
+  color: #CCCDD1;
 }
 .contentC .tabC .item.select {
-  color: #F97316;
+  color: #F3C368;
 }
 .contentC .topCategoryC {
   white-space: nowrap;
-  border-bottom: solid 1rpx #E4E4E4;
 }
 .contentC .topCategoryC .item {
   display: inline-block;
@@ -192,60 +236,77 @@
   padding: 0 28rpx;
   font-size: 27rpx;
   font-weight: 500;
-  color: #42485B;
+  color: #939393;
 }
 .contentC .topCategoryC .item.select {
   font-weight: bold;
-  color: black;
+  color: #F3C368;
 }
 .contentC .topCategoryC .item.select .line {
-  background-color: #F97316;
+  background-color: #F3C368;
   left: calc((100% - 50rpx)/2);
   width: 50rpx;
   height: 2rpx;
   bottom: 0;
 }
 .eventList {
-  padding: 0 25rpx;
+  padding: 18rpx 25rpx;
 }
 .eventList .item {
-  padding: 30rpx 0;
-  border-bottom: solid 1rpx #E4E4E4;
+  background: linear-gradient(-30deg, #FFF6F0 0%, #FEFEFE 100%);
+  margin-bottom: 20rpx;
+  padding: 30rpx 20rpx;
+  border-radius: 10rpx;
 }
-.eventList .item .time {
+.eventList .item .timeStarFollowC .time {
+  margin-right: 22rpx;
   font-size: 24rpx;
   font-weight: bold;
   color: #767676;
 }
-.eventList .item .starC .starList {
+.eventList .item .timeStarFollowC .starC .starList {
   top: 0;
   left: 0;
 }
-.eventList .item .starC .icon {
+.eventList .item .timeStarFollowC .starC .icon {
   margin-right: 9rpx;
   width: 27rpx;
   height: auto;
 }
+.eventList .item .timeStarFollowC .follow {
+  background-color: #3D3D3D;
+  width: 90rpx;
+  line-height: 40rpx;
+  border-radius: 20rpx;
+  font-size: 22rpx;
+  font-weight: 500;
+  color: #F2C367;
+  text-align: center;
+}
+.eventList .item .timeStarFollowC .follow.select {
+  background-color: #F3C368;
+  color: #3D3D3D;
+}
 .eventList .item .categoryTitleC {
   margin-top: 18rpx;
 }
 .eventList .item .categoryTitleC .category {
-  background-color: #FD9A14;
-  margin-right: 10rpx;
+  background-color: #F3C368;
+  margin-right: 12rpx;
   padding: 0 12rpx;
   line-height: 40rpx;
   border-radius: 8rpx;
-  font-size: 22rpx;
+  font-size: 24rpx;
   font-weight: bold;
-  color: white;
+  color: #070707;
 }
 .eventList .item .categoryTitleC .title {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  font-size: 30rpx;
+  font-size: 28rpx;
   font-weight: bold;
-  color: #222;
+  color: #3D3D3D;
 }
 .eventList .item .labelC {
   margin-top: 12rpx;
@@ -269,16 +330,17 @@
   overflow: hidden;
   font-size: 24rpx;
   font-weight: 500;
-  color: #666;
+  color: #71675D;
 }
 .eventList .item .percentList {
   white-space: nowrap;
-  margin-top: 20rpx;
+  margin-top: 26rpx;
 }
 .eventList .item .percentList .percentItem {
   display: inline-flex;
   align-items: center;
-  background-color: #F8F8F8;
+  background-color: white;
+  box-shadow: 0 7rpx 18rpx 0 rgba(217, 217, 217, 0.28);
   margin-right: 20rpx;
   padding: 0 20rpx;
   height: 70rpx;

unpackage/dist/dev/mp-weixin/pages/invest/investDetails/investDetails.js

@@ -19,13 +19,13 @@ const _sfc_main = {
         {
           title: "全部股票",
           num: 0,
-          bgColor: "#C00000",
+          bgColor: "#D82A2A",
           color: "white"
         },
         {
           title: "大周期",
           num: 0,
-          bgColor: "#305496",
+          bgColor: "#3A5D9C",
           color: "white"
         },
         {
@@ -113,18 +113,17 @@ if (!Math) {
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return common_vendor.e({
     a: common_vendor.p({
-      leftText: "详情"
+      leftText: "事件详情",
+      hideNavBg: true
     }),
     b: common_assets._imports_0,
     c: common_vendor.f($data.categoryList, (item, index, i0) => {
-      return common_vendor.e({
+      return {
         a: common_vendor.t(item),
-        b: $data.selectCategory == index
-      }, $data.selectCategory == index ? {} : {}, {
-        c: common_vendor.n("item relative " + ($data.selectCategory == index ? "select" : "")),
-        d: index,
-        e: common_vendor.o(($event) => $options.clickCategoryItem(index), index)
-      });
+        b: common_vendor.n("item relative " + ($data.selectCategory == index ? "select" : "")),
+        c: index,
+        d: common_vendor.o(($event) => $options.clickCategoryItem(index), index)
+      };
     }),
     d: common_vendor.s("top:" + $data.navH + "px;"),
     e: $data.investDetails
@@ -165,19 +164,38 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       });
     })
   } : {}, {
-    m: $data.selectCategory == 4
-  }, $data.selectCategory == 4 ? {
-    n: common_vendor.f($data.investDetails.extracted_concepts, (item, index, i0) => {
-      return {
-        a: item.first_image,
-        b: common_vendor.t(item.name),
-        c: common_vendor.t(item.reason),
-        d: index,
-        e: common_vendor.o(($event) => _ctx.clickConceptItem(), index)
-      };
-    })
+    m: $data.selectCategory == 3
+  }, $data.selectCategory == 3 ? {
+    n: common_vendor.f(_ctx.conceptList, (item, index, i0) => {
+      return common_vendor.e({
+        a: common_vendor.t(item.concept),
+        b: item.price_info
+      }, item.price_info ? {
+        c: common_vendor.t(_ctx.getChgRateStr(item.price_info.avg_change_pct)),
+        d: common_vendor.n("chg " + (_ctx.getRateUpOrDown(item.price_info.avg_change_pct) ? "down" : "up"))
+      } : {}, {
+        e: item.price_info
+      }, item.price_info ? {
+        f: common_vendor.t(item.stock_count),
+        g: common_vendor.n("stockNum " + (_ctx.getRateUpOrDown(item.price_info.avg_change_pct) ? "down" : "up"))
+      } : {}, {
+        h: common_vendor.t(item.description),
+        i: common_vendor.f(item.stocks.slice(0, 3), (sitem, sindex, i1) => {
+          return {
+            a: common_vendor.t(sitem.stock_name),
+            b: sindex
+          };
+        }),
+        j: common_vendor.t(item.stock_count - 3),
+        k: common_vendor.o(($event) => _ctx.clickStockMore(item), index),
+        l: common_vendor.t(item.price_info ? item.price_info.trade_date : ""),
+        m: common_vendor.o(($event) => _ctx.clickHistoricalTimeline(item), index),
+        n: index
+      });
+    }),
+    o: common_assets._imports_1$2
   } : {}, {
-    o: common_vendor.s("top:" + $data.contentTop + "px;")
+    p: common_vendor.s("top:" + $data.contentTop + "px;")
   }) : {});
 }
 const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);

unpackage/dist/dev/mp-weixin/pages/invest/investDetails/investDetails.wxml

@@ -1 +1 @@
-<view><nav-bar wx:if="{{a}}" u-i="b7e6c0fc-0" bind:__l="__l" u-p="{{a}}"></nav-bar><image class="topBg absolute" src="{{b}}" mode="widthFix"></image><view class="categoryC fixed" style="{{d}}"><view wx:for="{{c}}" wx:for-item="item" wx:key="d" class="{{item.c}}" bindtap="{{item.e}}">{{item.a}} <view wx:if="{{item.b}}" class="line absolute"></view></view></view><view wx:if="{{e}}" class="contentC fixed" style="{{o}}"><view wx:if="{{f}}" class="former"><ua-markdown wx:if="{{g}}" u-i="b7e6c0fc-1" bind:__l="__l" u-p="{{g}}"/><text class="ai">（AI合成）</text></view><view wx:if="{{h}}" class="former"><ua-markdown wx:if="{{i}}" u-i="b7e6c0fc-2" bind:__l="__l" u-p="{{i}}"/></view><view wx:if="{{j}}" class="stockC"><view class="stockCategoryList flexWrap"><view wx:for="{{k}}" wx:for-item="item" wx:key="d" class="item flexColumnCenter" style="{{item.c}}"><view class="num">{{item.a}}</view><view class="title">{{item.b}}</view></view></view><view class="stockList"><view wx:for="{{l}}" wx:for-item="item" wx:key="f" class="item" bindtap="{{item.g}}"><view class="titleCorrelationC flex"><view class="title flex1">{{item.a}}</view><view class="correlation">相关度: {{item.b}}%</view></view><view wx:if="{{item.c}}" class="category">{{item.d}}</view><view class="content">{{item.e}}</view></view></view></view><view wx:if="{{m}}"><view class="conceptList"><view wx:for="{{n}}" wx:for-item="item" wx:key="d" class="item relative" bindtap="{{item.e}}"><image class="cover" src="{{item.a}}" mode="aspectFill"></image><view class="infoC absolute"><view class="title">{{item.b}}</view><view class="content relative">{{item.c}} <text class="lookDetails absolute">查看详情</text></view></view></view></view></view></view></view>
+<view><nav-bar wx:if="{{a}}" u-i="b7e6c0fc-0" bind:__l="__l" u-p="{{a}}"></nav-bar><image class="topBg absolute" src="{{b}}" mode="widthFix"></image><view class="categoryC fixed" style="{{d}}"><view wx:for="{{c}}" wx:for-item="item" wx:key="c" class="{{item.b}}" bindtap="{{item.d}}">{{item.a}}</view></view><view wx:if="{{e}}" class="contentC fixed" style="{{p}}"><view wx:if="{{f}}" class="former"><ua-markdown wx:if="{{g}}" u-i="b7e6c0fc-1" bind:__l="__l" u-p="{{g}}"/><text class="ai">（AI合成）</text></view><view wx:if="{{h}}" class="former"><ua-markdown wx:if="{{i}}" u-i="b7e6c0fc-2" bind:__l="__l" u-p="{{i}}"/></view><view wx:if="{{j}}" class="stockC"><view class="stockCategoryList flexWrap"><view wx:for="{{k}}" wx:for-item="item" wx:key="d" class="item flexColumnCenter" style="{{item.c}}"><view class="num">{{item.a}}</view><view class="title">{{item.b}}</view></view></view><view class="stockList"><view wx:for="{{l}}" wx:for-item="item" wx:key="f" class="item" bindtap="{{item.g}}"><view class="titleCorrelationC flex"><view class="title flex1">{{item.a}}</view><view class="correlation">相关度: {{item.b}}%</view></view><view wx:if="{{item.c}}" class="category">{{item.d}}</view><view class="content">{{item.e}}</view></view></view></view><view wx:if="{{m}}"><view class="conceptList"><view wx:for="{{n}}" wx:for-item="item" wx:key="n" class="item"><view class="titleChgStockNumC flex"><view class="title">{{item.a}}</view><view wx:if="{{item.b}}" class="{{item.d}}">{{item.c}}%</view><view wx:if="{{item.e}}" class="{{item.g}}">{{item.f}} 只股票</view></view><view class="content">{{item.h}}</view><view class="hotStockC flex"><view class="title">热门个股</view><view class="stockList flex"><view wx:for="{{item.i}}" wx:for-item="sitem" wx:key="b" class="stockItem">{{sitem.a}}</view><view class="more" bindtap="{{item.k}}">+{{item.j}}更多</view></view></view><view class="transactionDateHistoryTimeC flex"><view class="transactionDate flex1">交易时间：{{item.l}}</view><view class="historyTimeC flex" bindtap="{{item.m}}"><image class="icon" src="{{o}}" mode="widthFix"></image><view>历史时间轴</view></view></view></view></view></view></view></view>

unpackage/dist/dev/mp-weixin/pages/invest/investDetails/investDetails.wxss

@@ -1,3 +1,6 @@
+page {
+  background-color: #070707;
+}
 .topBg {
   top: 0;
   left: 0;
@@ -5,9 +8,8 @@
   height: auto;
 }
 .categoryC {
-  background-color: white;
   margin-top: 10rpx;
-  padding-top: 20rpx;
+  padding: 20rpx 10rpx 0;
   left: 0;
   right: 0;
   border-radius: 20rpx 20rpx 0 0;
@@ -15,27 +17,22 @@
 .categoryC .item {
   display: inline-block;
   padding: 0 30rpx;
-  line-height: 75rpx;
-  font-size: 32rpx;
+  line-height: 76rpx;
+  font-size: 27rpx;
   font-weight: 500;
-  color: #42485B;
+  color: #939393;
 }
 .categoryC .item.select {
   font-weight: bold;
-  color: #F97316;
-}
-.categoryC .item.select .line {
-  background-color: #F97316;
-  left: calc((100% - 50rpx)/2);
-  bottom: 0;
-  width: 50rpx;
-  height: 2rpx;
+  color: #F3C368;
 }
 .contentC {
-  background-color: white;
+  background: linear-gradient(-30deg, #FFF6F0 0%, #FEFEFE 100%);
   left: 0;
   right: 0;
-  bottom: 0;
+  bottom: env(safe-area-inset-bottom);
+  margin: 0 25rpx;
+  border-radius: 10rpx;
   overflow-y: scroll;
 }
 .contentC .former {
@@ -46,12 +43,12 @@
   color: #C00000;
 }
 .contentC .stockCategoryList {
-  margin-top: 18rpx;
-  padding: 0 24rpx;
+  margin-top: 30rpx;
+  padding: 0 20rpx;
 }
 .contentC .stockCategoryList .item {
-  margin: 0 20rpx 20rpx 0;
-  width: calc((100% - 40rpx)/3);
+  margin: 0 30rpx 20rpx 0;
+  width: calc((100% - 60rpx)/3);
   height: 100rpx;
   border-radius: 10rpx;
 }
@@ -108,38 +105,118 @@
   padding: 30rpx 25rpx;
 }
 .contentC .conceptList .item {
-  margin-bottom: 20rpx;
-}
-.contentC .conceptList .item .cover {
-  display: block;
-  width: 100%;
-  height: 350rpx;
+  background: linear-gradient(-30deg, #FFF6F0 0%, #FEFEFE 100%);
+  margin-bottom: 24rpx;
   border-radius: 10rpx;
 }
-.contentC .conceptList .item .infoC {
-  background: linear-gradient(to bottom, #00000080, #000);
-  padding: 20rpx 23rpx;
-  left: 0;
-  width: 100%;
-  bottom: 0;
-  border-radius: ;
+.contentC .conceptList .item .titleChgStockNumC {
+  padding: 24rpx 18rpx 0;
+}
+.contentC .conceptList .item .titleChgStockNumC .title {
+  margin-right: 20rpx;
+  font-size: 30rpx;
+  font-weight: bold;
+  color: #3D3D3D;
+}
+.contentC .conceptList .item .titleChgStockNumC .chg {
+  margin-right: 20rpx;
+  padding: 0 13rpx;
+  line-height: 40rpx;
+  border-radius: 20rpx;
+  font-size: 22rpx;
+  font-weight: bold;
   color: white;
 }
-.contentC .conceptList .item .infoC .title {
-  font-size: 26rpx;
+.contentC .conceptList .item .titleChgStockNumC .chg.up {
+  background-color: #EC3440;
+}
+.contentC .conceptList .item .titleChgStockNumC .chg.down {
+  background-color: #355422;
+}
+.contentC .conceptList .item .titleChgStockNumC .stockNum {
+  padding: 0 16rpx;
+  line-height: 36rpx;
+  border-radius: 20rpx;
+  font-size: 22rpx;
   font-weight: bold;
 }
-.contentC .conceptList .item .infoC .content {
+.contentC .conceptList .item .titleChgStockNumC .stockNum.up {
+  color: #EC3440;
+  border: solid 2rpx #EC3440;
+}
+.contentC .conceptList .item .titleChgStockNumC .stockNum.down {
+  color: #355422;
+  border: solid 2rpx #355422;
+}
+.contentC .conceptList .item .content {
+  margin-top: 26rpx;
+  padding: 0 22rpx;
+  font-size: 24rpx;
+  font-weight: 500;
+  color: #71675D;
   display: -webkit-box;
-  -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
   overflow: hidden;
-  margin-top: 10rpx;
+  text-overflow: ellipsis;
+}
+.contentC .conceptList .item .hotStockC {
+  margin-top: 30rpx;
+  padding: 0 20rpx;
+}
+.contentC .conceptList .item .hotStockC .title {
+  margin-right: 10rpx;
+  font-size: 24rpx;
+  font-weight: bold;
+  color: #936E5C;
+}
+.contentC .conceptList .item .hotStockC .stockList {
+  font-size: 22rpx;
+}
+.contentC .conceptList .item .hotStockC .stockList .stockItem {
+  background-color: #3D3D3D;
+  margin-right: 10rpx;
+  padding: 0 8rpx;
+  line-height: 36rpx;
+  border-radius: 5rpx 20rpx 5rpx 20rpx;
+  color: #EFDDD1;
+}
+.contentC .conceptList .item .hotStockC .stockList .more {
+  color: #936E5C;
+  line-height: 36rpx;
+}
+.contentC .conceptList .item .hotStockC .notVipC {
+  background-color: #3D3D3D;
+  padding: 0 21rpx 0 16rpx;
+  line-height: 36rpx;
+  border-radius: 5rpx;
+  font-size: 22rpx;
+  color: #F3C368;
+}
+.contentC .conceptList .item .hotStockC .notVipC .icon {
+  margin-right: 9rpx;
+  width: 15rpx;
+  height: auto;
+}
+.contentC .conceptList .item .transactionDateHistoryTimeC {
+  padding: 20rpx 22rpx 30rpx;
+}
+.contentC .conceptList .item .transactionDateHistoryTimeC .transactionDate {
   font-size: 20rpx;
   font-weight: 500;
-  line-height: 1.2rem;
+  color: #666;
 }
-.contentC .conceptList .item .infoC .content .lookDetails {
-  right: 0;
-  color: #F97316;
+.contentC .conceptList .item .transactionDateHistoryTimeC .historyTimeC {
+  background-color: #F3C368;
+  padding: 0 10rpx 0 15rpx;
+  line-height: 36rpx;
+  border-radius: 10rpx;
+  font-size: 22rpx;
+  font-weight: 500;
+  color: #101213;
+}
+.contentC .conceptList .item .transactionDateHistoryTimeC .historyTimeC .icon {
+  margin-right: 7rpx;
+  width: 20rpx;
+  height: auto;
 }