#

components/viewX-Case/viewX-Case.vue

@@ -5,8 +5,8 @@
 				<slot name="title"></slot>
 			</view>
 			<view class="" style="display: flex; align-items: center;">
-				<!-- <slot name="lookMore"></slot> -->
-				<text style="color:#999999;font-size: 14px;">查看更多</text>
+				<slot name="lookMore"></slot>
+				<!-- <text style="color:#999999;font-size: 14px;">查看更多</text> -->
 				<uni-icons type="forward" color="#ccc"></uni-icons>
 			</view>
 		</view>
@@ -38,7 +38,7 @@
 	.view_x_case{
 		width: 750rpx;
 		background-color: #fff;
-		// margin-top: 10px;
+		margin-bottom: 20rpx;
 		// padding-left: 25rpx;
 		.tit{
 			// margin-bottom: 15px;

pages/activityPage/activityPage.vue

@@ -22,9 +22,14 @@
 						
 						<view class="operate">
 							<view class="left">
-								<image src="../../static/logo.png"></image>
+								<view class="img">
+									<image src="../../static/jys/jys.png"></image>
+								</view>
 								<view class="user">用户名</view>
-								<view class="collection">收藏</view>
+							</view>
+							<view class="collection">
+								<uni-icons type="star" size="20"></uni-icons>
+								收藏
 							</view>
 						</view>
 					</view>
@@ -145,22 +150,40 @@
 						
 					}
 					.operate{
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						padding: 20rpx 0;
+						color: #666666;
+						// margin-bottom: 20rpx;
+						// padding-bottom: 20rpx;
 						.left{
-							image{
-								float: left;
+							display: flex;
+							// justify-content: flex-start;
+							align-items: center;
+							.img{
 								width:30px;
 								height:30px;
-								border-radius: 50%;
+								// padding-right: 20rpx;
+								margin-right: 20rpx;
+								
+								image{
+									width: 100%;
+									height: 100%;
+									border-radius: 50%;
+								}
 							}
+							
 							.user{
-								float: left;
-								padding-top: 10px;
-								padding-left: 10px;
-							}
-							.collection{
-								float: right;
-								padding-top: 10px;
+								font-size: 16px;
+								// padding-left: 15rpx;
 							}
+							
+						}
+						.collection{
+							// float: right;
+							font-size: 14px;
+							// padding-top: 10px;
 						}
 					}
 				}	

pages/index/index.vue

@@ -96,6 +96,7 @@
 			width: 750rpx;
 			height: 150px;
 			display: flex;
+			margin-bottom: 20rpx;
 			align-items: center;
 			background-color: #fff;
 			justify-content: center;

unpackage/dist/dev/mp-weixin/components/viewX-Case/viewX-Case.wxml

@@ -1 +1 @@
-<view class="view_x_case"><view class="tit"><view><slot name="title"></slot></view><view style="display:flex;align-items:center;"><text style="color:#999999;font-size:14px;">查看更多</text><uni-icons vue-id="ac8a8ffc-1" type="forward" color="#ccc" bind:__l="__l"></uni-icons></view></view><scroll-view class="scroll-view_H" scroll-x="true"><slot name="activeBlock"></slot></scroll-view><slot name="teaching"></slot></view>
+<view class="view_x_case"><view class="tit"><view><slot name="title"></slot></view><view style="display:flex;align-items:center;"><slot name="lookMore"></slot><uni-icons vue-id="ac8a8ffc-1" type="forward" color="#ccc" bind:__l="__l"></uni-icons></view></view><scroll-view class="scroll-view_H" scroll-x="true"><slot name="activeBlock"></slot></scroll-view><slot name="teaching"></slot></view>

unpackage/dist/dev/mp-weixin/components/viewX-Case/viewX-Case.wxss

@@ -27,6 +27,7 @@
 .view_x_case {
   width: 750rpx;
   background-color: #fff;
+  margin-bottom: 20rpx;
 }
 .view_x_case .tit {
   display: flex;

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

@@ -106,6 +106,9 @@ try {
     viewXCase: function () {
       return __webpack_require__.e(/*! import() | components/viewX-Case/viewX-Case */ "components/viewX-Case/viewX-Case").then(__webpack_require__.bind(null, /*! @/components/viewX-Case/viewX-Case.vue */ 210))
     },
+    uniIcons: function () {
+      return Promise.all(/*! import() | node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @dcloudio/uni-ui/lib/uni-icons/uni-icons.vue */ 224))
+    },
     teachingCase: function () {
       return __webpack_require__.e(/*! import() | components/teaching-case/teaching-case */ "components/teaching-case/teaching-case").then(__webpack_require__.bind(null, /*! @/components/teaching-case/teaching-case.vue */ 217))
     },
@@ -232,6 +235,11 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {

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

@@ -4,6 +4,7 @@
   "usingComponents": {
     "status-bar": "/components/statusBar/statusBar",
     "view-x-case": "/components/viewX-Case/viewX-Case",
+    "uni-icons": "/node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons",
     "teaching-case": "/components/teaching-case/teaching-case",
     "uni-fab": "/node-modules/@dcloudio/uni-ui/lib/uni-fab/uni-fab"
   }

unpackage/dist/dev/mp-weixin/pages/activityPage/activityPage.wxml

@@ -1 +1 @@
-<view class="activity"><status-bar vue-id="8352a600-1" item="{{navBarData}}" bind:__l="__l"></status-bar><view-x-case class="mid" vue-id="8352a600-2" bind:__l="__l" vue-slots="{{['title','lookMore','activeBlock']}}"><view class="title" slot="title">活动直播</view><view class="lookMore" slot="lookMore">查看更多</view><block><view class="activeData" wx:for="{{4}}" wx:for-item="i" wx:for-index="__i0__" wx:key="*this" slot="activeBlock"><image src="../../static/activity/bg1.png" mode="aspectFill"></image><view class="liveBroadcast"><view class="title"><view class="tag">类型</view><text>直播活动标题标题标题标题标题标题标题</text></view><view class="operate"><view class="left"><image src="../../static/logo.png"></image><view class="user">用户名</view><view class="collection">收藏</view></view></view></view></view></block></view-x-case><view-x-case style="margin-top:10px;" vue-id="8352a600-3" bind:__l="__l" vue-slots="{{['title','lookMore','activeBlock']}}"><view class="title" slot="title">活动推荐</view><view data-event-opts="{{[['tap',[['lookMore',['$event']]]]]}}" class="lookMore" bindtap="__e" slot="lookMore">查看更多</view><block><teaching-case vue-id="{{('8352a600-4-'+__i1__)+','+('8352a600-3')}}" item="{{actData}}" wx:for="{{10}}" wx:for-item="i" wx:for-index="__i1__" wx:key="*this" slot="activeBlock" bind:__l="__l"></teaching-case></block></view-x-case><uni-fab class="vue-ref" vue-id="8352a600-5" pattern="{{pattern}}" horizontal="{{horizontal}}" vertical="{{vertical}}" direction="{{direction}}" data-ref="fab" data-event-opts="{{[['^fabClick',[['fabClick']]]]}}" bind:fabClick="__e" bind:__l="__l"></uni-fab></view>
+<view class="activity"><status-bar vue-id="8352a600-1" item="{{navBarData}}" bind:__l="__l"></status-bar><view-x-case class="mid" vue-id="8352a600-2" bind:__l="__l" vue-slots="{{['title','lookMore','activeBlock']}}"><view class="title" slot="title">活动直播</view><view class="lookMore" slot="lookMore">查看更多</view><block><view class="activeData" wx:for="{{4}}" wx:for-item="i" wx:for-index="__i0__" wx:key="*this" slot="activeBlock"><image src="../../static/activity/bg1.png" mode="aspectFill"></image><view class="liveBroadcast"><view class="title"><view class="tag">类型</view><text>直播活动标题标题标题标题标题标题标题</text></view><view class="operate"><view class="left"><view class="img"><image src="../../static/jys/jys.png"></image></view><view class="user">用户名</view></view><view class="collection"><uni-icons vue-id="{{('8352a600-3-'+__i0__)+','+('8352a600-2')}}" type="star" size="20" bind:__l="__l"></uni-icons>收藏</view></view></view></view></block></view-x-case><view-x-case style="margin-top:10px;" vue-id="8352a600-4" bind:__l="__l" vue-slots="{{['title','lookMore','activeBlock']}}"><view class="title" slot="title">活动推荐</view><view data-event-opts="{{[['tap',[['lookMore',['$event']]]]]}}" class="lookMore" bindtap="__e" slot="lookMore">查看更多</view><block><teaching-case vue-id="{{('8352a600-5-'+__i1__)+','+('8352a600-4')}}" item="{{actData}}" wx:for="{{10}}" wx:for-item="i" wx:for-index="__i1__" wx:key="*this" slot="activeBlock" bind:__l="__l"></teaching-case></block></view-x-case><uni-fab class="vue-ref" vue-id="8352a600-6" pattern="{{pattern}}" horizontal="{{horizontal}}" vertical="{{vertical}}" direction="{{direction}}" data-ref="fab" data-event-opts="{{[['^fabClick',[['fabClick']]]]}}" bind:fabClick="__e" bind:__l="__l"></uni-fab></view>

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

@@ -63,20 +63,32 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.activity .mid .activeData .liveBroadcast .operate .left image {
-  float: left;
+.activity .mid .activeData .liveBroadcast .operate {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx 0;
+  color: #666666;
+}
+.activity .mid .activeData .liveBroadcast .operate .left {
+  display: flex;
+  align-items: center;
+}
+.activity .mid .activeData .liveBroadcast .operate .left .img {
   width: 30px;
   height: 30px;
+  margin-right: 20rpx;
+}
+.activity .mid .activeData .liveBroadcast .operate .left .img image {
+  width: 100%;
+  height: 100%;
   border-radius: 50%;
 }
 .activity .mid .activeData .liveBroadcast .operate .left .user {
-  float: left;
-  padding-top: 10px;
-  padding-left: 10px;
+  font-size: 16px;
 }
-.activity .mid .activeData .liveBroadcast .operate .left .collection {
-  float: right;
-  padding-top: 10px;
+.activity .mid .activeData .liveBroadcast .operate .collection {
+  font-size: 14px;
 }
 .activity .mid .activeData:nth-child(1) {
   margin-left: 15px;

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

@@ -28,6 +28,7 @@
   width: 750rpx;
   height: 150px;
   display: flex;
+  margin-bottom: 20rpx;
   align-items: center;
   background-color: #fff;
   justify-content: center;