yuanyiming 1 year ago
parent
commit
50571b34db
25 changed files with 29 additions and 264 deletions
  1. 1 1
      components/teaching-case/teaching-case.vue
  2. 3 2
      components/viewX-Case/viewX-Case.vue
  3. 4 9
      pages/activityPage/activityPage.vue
  4. 2 2
      pages/index/index.vue
  5. 7 3
      pages/teachingDetail/teachingDetail.vue
  6. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  7. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/teaching-case/teaching-case.js.map
  8. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/viewX-Case/viewX-Case.js.map
  9. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/activityPage/activityPage.js.map
  10. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  11. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/teachingDetail/teachingDetail.js.map
  12. 2 2
      unpackage/dist/dev/mp-weixin/common/runtime.js
  13. 1 1
      unpackage/dist/dev/mp-weixin/components/teaching-case/teaching-case.wxml
  14. 1 0
      unpackage/dist/dev/mp-weixin/components/viewX-Case/viewX-Case.js
  15. 1 1
      unpackage/dist/dev/mp-weixin/components/viewX-Case/viewX-Case.wxml
  16. 0 230
      unpackage/dist/dev/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-tag/uni-tag.js
  17. 0 6
      unpackage/dist/dev/mp-weixin/pages/activityPage/activityPage.js
  18. 1 1
      unpackage/dist/dev/mp-weixin/pages/activityPage/activityPage.wxml
  19. 1 1
      unpackage/dist/dev/mp-weixin/pages/activityPage/activityPage.wxss
  20. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  21. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/index.wxss
  22. 2 3
      unpackage/dist/dev/mp-weixin/pages/teachingDetail/teachingDetail.js
  23. 0 1
      unpackage/dist/dev/mp-weixin/pages/teachingDetail/teachingDetail.json
  24. 0 0
      unpackage/dist/dev/mp-weixin/pages/teachingDetail/teachingDetail.wxml
  25. 2 0
      unpackage/dist/dev/mp-weixin/pages/teachingDetail/teachingDetail.wxss

+ 1 - 1
components/teaching-case/teaching-case.vue

@@ -31,7 +31,7 @@
 				<button class="btn" disableEventPropagation="true" @click.stop="join">立即参与</button>
 			</view>
 			<view class="operate" v-else>
-				<view class="left">z
+				<view class="left">
 					<view class="price">¥188</view>
 					<view class="pernum">已报名123人</view>
 				</view>

+ 3 - 2
components/viewX-Case/viewX-Case.vue

@@ -4,8 +4,9 @@
 			<view class="" >
 				<slot name="title"></slot>
 			</view>
-			<view class="" style="display: flex;justify-content: flex-start; align-items: center;">
-				<slot name="lookMore"></slot>
+			<view class="" style="display: flex; align-items: center;">
+				<!-- <slot name="lookMore"></slot> -->
+				<text style="color:#999999;font-size: 14px;">查看更多</text>
 				<uni-icons type="forward" color="#ccc"></uni-icons>
 			</view>
 		</view>

+ 4 - 9
pages/activityPage/activityPage.vue

@@ -32,7 +32,7 @@
 			</template>
 		</viewX-Case>
 		
-		<viewX-Case>
+		<viewX-Case style="margin-top: 10px;">
 			<template #title>
 				<view class="title">活动推荐</view>
 			</template>
@@ -45,13 +45,7 @@
 			</template>
 		</viewX-Case>
 		
-		<!-- <uni-fab
-			:content="content"
-			:horizontal="right"
-			:vertical="vertical"
-			:direction="direction"
-			@trigger="trigger"
-		></uni-fab> -->
+		
 		
 		<uni-fab ref="fab" 
 		:pattern="pattern" 
@@ -178,9 +172,10 @@
 		
 		.title{
 				font-weight: bold;
+				// color: #999999;
 			}		
 		.lookMore{
-			color: #ccc;
+			color: #999999;
 			font-size: 14px;
 		}
 	}

+ 2 - 2
pages/index/index.vue

@@ -21,7 +21,7 @@
 							<!-- <slot name="activeTit"></slot> -->
 						</view>
 						<view class="numData">
-							<view class="proNum">74报名</view>
+							<view class="proNum">74报名</view>
 							<view class="price">¥299</view>
 						</view>
 						<button class="btn" @click.stop="gotoHd">立即报名</button>
@@ -106,7 +106,7 @@
 			}
 		}
 		.mid{
-			margin: 20px 0;
+			margin: 10px 0;
 			.activeData{
 				width: 290rpx;
 				display: inline-block;

+ 7 - 3
pages/teachingDetail/teachingDetail.vue

@@ -10,7 +10,7 @@
 				<view class="cardTop">
 					<view class="title">xxx虚拟教室</view>
 					<view class="">
-						<uni-icons type="star" size="30" color="#ffffff"></uni-icons>
+						<uni-icons type="star" size="30" color="#ffffff" style="margin-right: 20rpx;"></uni-icons>
 						<uni-icons type="folder-add" size="30" color="#ffffff"></uni-icons>
 					</view>
 				</view>
@@ -22,8 +22,10 @@
 				</view>
 				<view class="tag col">
 					<view class="">教研标签:</view>
-					<view class="">
-						<uni-tag :inverted="true" text="标签" />
+					<view class="" style="display: flex;">
+						<view class="" style="font-size: 14px;color: #00b2b6; border: 1px #00b2b6 solid;padding: 2rpx 10rpx;border-radius: 5rpx;">
+							类型标签
+						</view>
 					</view>
 				</view>
 			</view>
@@ -136,10 +138,12 @@
 					justify-content: space-between;
 					.title{
 						font-weight: bold;
+						font-size: 20px;
 					}
 				}
 				.col{
 					margin-bottom: 10rpx;
+					font-weight: 100;
 				}
 				.tag{
 					display: flex;

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/teaching-case/teaching-case.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/viewX-Case/viewX-Case.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/activityPage/activityPage.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/teachingDetail/teachingDetail.js.map


+ 2 - 2
unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -105,11 +105,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"components/statusBar/statusBar":1,"components/teaching-case/teaching-case":1,"components/viewX-Case/viewX-Case":1,"node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons":1,"node-modules/@dcloudio/uni-ui/lib/uni-search-bar/uni-search-bar":1,"node-modules/@dcloudio/uni-ui/lib/uni-fab/uni-fab":1,"components/detailBlock/detailBlock":1,"node-modules/@dcloudio/uni-ui/lib/uni-tag/uni-tag":1,"node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card":1};
+/******/ 		var cssChunks = {"components/statusBar/statusBar":1,"components/teaching-case/teaching-case":1,"components/viewX-Case/viewX-Case":1,"node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons":1,"node-modules/@dcloudio/uni-ui/lib/uni-search-bar/uni-search-bar":1,"node-modules/@dcloudio/uni-ui/lib/uni-fab/uni-fab":1,"components/detailBlock/detailBlock":1,"node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"components/statusBar/statusBar":"components/statusBar/statusBar","components/teaching-case/teaching-case":"components/teaching-case/teaching-case","components/viewX-Case/viewX-Case":"components/viewX-Case/viewX-Case","node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons":"node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons","node-modules/@dcloudio/uni-ui/lib/uni-search-bar/uni-search-bar":"node-modules/@dcloudio/uni-ui/lib/uni-search-bar/uni-search-bar","node-modules/@dcloudio/uni-ui/lib/uni-fab/uni-fab":"node-modules/@dcloudio/uni-ui/lib/uni-fab/uni-fab","components/detailBlock/detailBlock":"components/detailBlock/detailBlock","node-modules/@dcloudio/uni-ui/lib/uni-tag/uni-tag":"node-modules/@dcloudio/uni-ui/lib/uni-tag/uni-tag","node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card":"node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"components/statusBar/statusBar":"components/statusBar/statusBar","components/teaching-case/teaching-case":"components/teaching-case/teaching-case","components/viewX-Case/viewX-Case":"components/viewX-Case/viewX-Case","node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons":"node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons","node-modules/@dcloudio/uni-ui/lib/uni-search-bar/uni-search-bar":"node-modules/@dcloudio/uni-ui/lib/uni-search-bar/uni-search-bar","node-modules/@dcloudio/uni-ui/lib/uni-fab/uni-fab":"node-modules/@dcloudio/uni-ui/lib/uni-fab/uni-fab","components/detailBlock/detailBlock":"components/detailBlock/detailBlock","node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card":"node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

+ 1 - 1
unpackage/dist/dev/mp-weixin/components/teaching-case/teaching-case.wxml

@@ -1 +1 @@
-<view data-event-opts="{{[['tap',[['gotoTeDetail',['$event']]]]]}}" class="teaching_case" bindtap="__e"><view class="img"><image src="../../static/yym/Rectangle23.png" mode="aspectFill"></image></view><view class="right"><view class="title"><view class="tag">类型</view><block wx:if="{{!item.btn}}"><text>这是教研标题这是教研标题这是教研标题</text></block><block wx:else><text>这是活动活动活动活动活动活动活动活动活动</text></block></view><view class="introduce">查看详情查看详情查看详情查看详情查看详情查看详情查看详情查看详情查看详情查看详情</view><block wx:if="{{!item.btn}}"><view class="operate"><view class="left"><view class="opr" style="padding-right:25rpx;"><uni-icons vue-id="5d7caaa0-1" type="star" size="22" bind:__l="__l"></uni-icons><text>收藏</text></view><view class="opr"><uni-icons vue-id="5d7caaa0-2" type="cloud-download" size="22" bind:__l="__l"></uni-icons><text>订阅</text></view></view><button class="btn" disableEventPropagation="true" data-event-opts="{{[['tap',[['join',['$event']]]]]}}" catchtap="__e">立即参与</button></view></block><block wx:else><view class="operate"><view class="left">z<view class="price">¥188</view><view class="pernum">已报名123人</view></view><button data-event-opts="{{[['tap',[['actApply',['$event']]]]]}}" class="btn" catchtap="__e">立即报名</button></view></block></view></view>
+<view data-event-opts="{{[['tap',[['gotoTeDetail',['$event']]]]]}}" class="teaching_case" bindtap="__e"><view class="img"><image src="../../static/yym/Rectangle23.png" mode="aspectFill"></image></view><view class="right"><view class="title"><view class="tag">类型</view><block wx:if="{{!item.btn}}"><text>这是教研标题这是教研标题这是教研标题</text></block><block wx:else><text>这是活动活动活动活动活动活动活动活动活动</text></block></view><view class="introduce">查看详情查看详情查看详情查看详情查看详情查看详情查看详情查看详情查看详情查看详情</view><block wx:if="{{!item.btn}}"><view class="operate"><view class="left"><view class="opr" style="padding-right:25rpx;"><uni-icons vue-id="5d7caaa0-1" type="star" size="22" bind:__l="__l"></uni-icons><text>收藏</text></view><view class="opr"><uni-icons vue-id="5d7caaa0-2" type="cloud-download" size="22" bind:__l="__l"></uni-icons><text>订阅</text></view></view><button class="btn" disableEventPropagation="true" data-event-opts="{{[['tap',[['join',['$event']]]]]}}" catchtap="__e">立即参与</button></view></block><block wx:else><view class="operate"><view class="left"><view class="price">¥188</view><view class="pernum">已报名123人</view></view><button data-event-opts="{{[['tap',[['actApply',['$event']]]]]}}" class="btn" catchtap="__e">立即报名</button></view></block></view></view>

+ 1 - 0
unpackage/dist/dev/mp-weixin/components/viewX-Case/viewX-Case.js

@@ -167,6 +167,7 @@ exports.default = void 0;
 //
 //
 //
+//
 var _default = {
   name: "view_x_case",
   data: function data() {

+ 1 - 1
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;justify-content:flex-start;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>
+<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>

File diff suppressed because it is too large
+ 0 - 230
unpackage/dist/dev/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-tag/uni-tag.js


+ 0 - 6
unpackage/dist/dev/mp-weixin/pages/activityPage/activityPage.js

@@ -232,12 +232,6 @@ exports.default = void 0;
 //
 //
 //
-//
-//
-//
-//
-//
-//
 var _default = {
   data: function data() {
     return {

+ 1 - 1
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 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"><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>

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

@@ -85,7 +85,7 @@
   font-weight: bold;
 }
 .activity .lookMore {
-  color: #ccc;
+  color: #999999;
   font-size: 14px;
 }
 

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


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

@@ -38,7 +38,7 @@
   border-radius: 10px;
 }
 .content .mid.data-v-57280228 {
-  margin: 20px 0;
+  margin: 10px 0;
 }
 .content .mid .activeData.data-v-57280228 {
   width: 290rpx;

+ 2 - 3
unpackage/dist/dev/mp-weixin/pages/teachingDetail/teachingDetail.js

@@ -44,9 +44,6 @@ try {
     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))
     },
-    uniTag: function () {
-      return __webpack_require__.e(/*! import() | node-modules/@dcloudio/uni-ui/lib/uni-tag/uni-tag */ "node-modules/@dcloudio/uni-ui/lib/uni-tag/uni-tag").then(__webpack_require__.bind(null, /*! @dcloudio/uni-ui/lib/uni-tag/uni-tag.vue */ 250))
-    },
     detailBlock: function () {
       return __webpack_require__.e(/*! import() | components/detailBlock/detailBlock */ "components/detailBlock/detailBlock").then(__webpack_require__.bind(null, /*! @/components/detailBlock/detailBlock.vue */ 257))
     },
@@ -198,6 +195,8 @@ exports.default = void 0;
 //
 //
 //
+//
+//
 var _default = {
   data: function data() {
     return {

+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/teachingDetail/teachingDetail.json

@@ -4,7 +4,6 @@
   "usingComponents": {
     "status-bar": "/components/statusBar/statusBar",
     "uni-icons": "/node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons",
-    "uni-tag": "/node-modules/@dcloudio/uni-ui/lib/uni-tag/uni-tag",
     "detail-block": "/components/detailBlock/detailBlock"
   }
 }

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/teachingDetail/teachingDetail.wxml


+ 2 - 0
unpackage/dist/dev/mp-weixin/pages/teachingDetail/teachingDetail.wxss

@@ -56,9 +56,11 @@
 }
 .teachingDetail .backPic .card .cardTop .title {
   font-weight: bold;
+  font-size: 20px;
 }
 .teachingDetail .backPic .card .col {
   margin-bottom: 10rpx;
+  font-weight: 100;
 }
 .teachingDetail .backPic .card .tag {
   display: flex;

Some files were not shown because too many files changed in this diff