yuanyiming 1 anno fa
parent
commit
14d3b74dd1
53 ha cambiato i file con 205 aggiunte e 253 eliminazioni
  1. 49 11
      components/detailBlock/detailBlock.vue
  2. 1 3
      components/statusBar/statusBar.vue
  3. 38 26
      pages/message/message.vue
  4. 4 6
      pages/resource/resource.vue
  5. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  6. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/detailBlock/detailBlock.js.map
  7. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/statusBar/statusBar.js.map
  8. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/teaching-case/teaching-case.js.map
  9. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/viewX-Case/viewX-Case.js.map
  10. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card.js.map
  11. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-fab/uni-fab.js.map
  12. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-icons/uni-icons.js.map
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-search-bar/uni-search-bar.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/activityDetail/activityDetail.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/activityList/activityList.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/activityPage/activityPage.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/hd/hd.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/hdxx/hdxx.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/jys/jys.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login_three/login_three.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login_two/login_two.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/message/message.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mineActive/mineActive.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mineClass/mineClass.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mineCollect/mineCollect.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mineEdit/mineEdit.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mineSubscribe/mineSubscribe.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/publish/publish.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/resource/resource.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/teachingDetail/teachingDetail.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/teachingList/teachingList.js.map
  35. 34 13
      unpackage/dist/dev/mp-weixin/components/detailBlock/detailBlock.js
  36. 2 1
      unpackage/dist/dev/mp-weixin/components/detailBlock/detailBlock.wxml
  37. 19 0
      unpackage/dist/dev/mp-weixin/components/detailBlock/detailBlock.wxss
  38. 0 3
      unpackage/dist/dev/mp-weixin/components/statusBar/statusBar.wxss
  39. 12 12
      unpackage/dist/dev/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card.js
  40. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-tag/uni-tag.js
  41. 0 4
      unpackage/dist/dev/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-tag/uni-tag.json
  42. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-tag/uni-tag.wxml
  43. 0 126
      unpackage/dist/dev/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-tag/uni-tag.wxss
  44. 1 1
      unpackage/dist/dev/mp-weixin/pages/activityDetail/activityDetail.js
  45. 1 1
      unpackage/dist/dev/mp-weixin/pages/hd/hd.js
  46. 1 1
      unpackage/dist/dev/mp-weixin/pages/jys/jys.js
  47. 13 17
      unpackage/dist/dev/mp-weixin/pages/message/message.js
  48. 2 1
      unpackage/dist/dev/mp-weixin/pages/message/message.wxml
  49. 12 0
      unpackage/dist/dev/mp-weixin/pages/message/message.wxss
  50. 1 4
      unpackage/dist/dev/mp-weixin/pages/resource/resource.js
  51. 0 0
      unpackage/dist/dev/mp-weixin/pages/resource/resource.wxml
  52. 1 1
      unpackage/dist/dev/mp-weixin/pages/teachingDetail/teachingDetail.js
  53. 14 20
      unpackage/dist/dev/mp-weixin/project.config.json

+ 49 - 11
components/detailBlock/detailBlock.vue

@@ -9,10 +9,19 @@
 			活动形式:<text style="color: #0056a8;">线上直播</text>
 		</view>
 		<view class="cont">
-			   <view id="myElement" class="activeTit">
+			  <!-- <view id="myElement" class="activeTit">
 					教研室概况:查看更多查看更多查看更多看更多查看更多查看更多查看更多查看更多查看更多查看更多查看更多看更多查看更多查看更多查看更多查看更多
 			   </view>
-				<text class="zdwz" style="color: #0056a8;float: right;" @click="zdwz">收起</text>
+				<text class="zdwz" style="color: #0056a8;float: right;" @click="zdwz">收起</text> -->
+				<view class="content">
+					<view ref="p" class="p">
+						这是一段需要展开收起的文字,可以有很多很多的字,可能会占据很多的空间。因此,在默认情况下,我们只会显示部分文字,而把其余的部分折叠起
+						来。如果需要查看全部内容,可以点击“查看更多按钮,文字内容就会展开显示了。
+					</view>
+					<text class="btn-more" @click="qqq">
+						{{isAll?'收起':'展开'}}
+					</text>
+				</view>
 		</view>
 	</view>
 </template>
@@ -25,14 +34,15 @@
 				type:Object,
 				default (){
 					return{
-						isshow:0    //0教研室 1 活动
+						isshow:0   //0教研室 1 活动
+						
 					}
 				}
 			}
 		},
 		data() {
 			return {
-				
+				isAll:false
 			};
 		},
 		methods:{
@@ -42,12 +52,23 @@
 				      const element = res[0];
 				      element.style.webkitLineClamp = '4'; // 修改行数限制为 2
 				    });
+			},
+			qqq(){
+				this.isAll=!this.isAll
+				if(this.isAll){
+					this.$refs.p.$el.classList.add('is-expanded')
+					console.log(this.$refs.p.$el.classList);
+				}else{
+					this.$refs.p.$el.classList.remove('is-expanded')
+					console.log(this.$refs.p.$el.classList);
+				}
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
+	
 	.detailBlock{
 		background-color: #ffffff;
 		border-radius: 10rpx;
@@ -59,12 +80,25 @@
 		.cont{
 			color: #999999;
 			margin-bottom: 10px;
-			.content {
-			  // .zdwz{
-				 //  position: absolute;
-				 //  right: 0;
-				 //  bottom: 0;
-			  // }
+			.content{
+				// display: flex;
+			}
+			.content .p{
+				width: 90%;
+				display:block;
+				overflow:hidden;
+				text-overflow:ellipsis;
+				white-space:nowrap;
+				// flex-grow: 1;
+				// flex-wrap: wrap;
+				// padding-right: 50rpx;
+				/*设置文字溢出时显示省略号*/
+				
+			}
+			.content .p.is-expanded{
+				overflow:visible;
+				white-space:normal;
+				/*文字溢出时不再显示省略号*/
 			}
 		
 			.activeTit{
@@ -75,7 +109,11 @@
 				-webkit-box-orient: vertical;
 				-webkit-line-clamp:2;/*设置 需要显示的行数*/
 			}
-				
+			.btn-more{
+				float: right;
+				transform: translate(0,-100%);
+				color: #0056a8;
+			}	
 		}
 	}
 </style>

+ 1 - 3
components/statusBar/statusBar.vue

@@ -65,9 +65,7 @@
 
 <style lang="scss">
 		.statusBar{
-			// position: fixed;
-			// background-color: #FFFFFF;
-			background-color: #000;
+			// background-color: #000;
 		}
 		.nav{
 			width: 750rpx;

+ 38 - 26
pages/message/message.vue

@@ -56,32 +56,16 @@
 			</view>
 		</view>
 		
-		<!-- <view class="mesItem" @click="goToMesDetail(2)">
-			<view class="leftBox">
-				<view class="mesImg">
-					<image src="../../static/message/system.svg" mode=""></image>
-				</view>
-				<view class="mesBrief">
-					<view class="tit">系统通知</view>
-					<view class="newMessage">已加入xxxxxx教研室</view>
-				</view>
+		<view class="content">
+			<view ref="p" class="p">
+				这是一段需要展开收起的文字,可以有很多很多的字,可能会占据很多的空间。因此,在默认情况下,我们只会显示部分文字,而把其余的部分折叠起
+				来。如果需要查看全部内容,可以点击“查看更多按钮,文字内容就会展开显示了。
 			</view>
-			<view class="mesTime">07-12</view>
-			<view class="newMessage"></view>
+			<text class-="btn-more" @click="qqq">
+				{{isAll?'收起':'更多'}}
+			</text>
 		</view>
-		<view class="mesItem" @click="goToMesDetail(3)">
-			<view class="leftBox">
-				<view class="mesImg">
-					<image src="../../static/message/subscribe.svg" mode=""></image>
-				</view>
-				<view class="mesBrief">
-					<view class="tit">订阅消息</view>
-					<view class="newMessage">xxx教研室更新了课程</view>
-				</view>
-			</view>
-			<view class="mesTime">07-12</view>
-			<view class="newMessage"></view>
-		</view> -->
+		
 	</view>
 </template>
 
@@ -91,7 +75,9 @@
 			return {
 				navbarData:{
 					title:'消息'
-				}
+				},
+				isAll:false,
+				aaa:'rerererererererere'
 			};
 		},
 		methods: {
@@ -100,11 +86,37 @@
 					url: '/pages/hdxx/hdxx'
 				});
 			},
-		},
+			qqq(){
+				this.isAll=!this.isAll
+				if(this.isAll){
+					this.$refs.p.$el.classList.add('is-expanded')
+					console.log(this.$refs.p.$el.classList);
+				}else{
+					this.$refs.p.$el.classList.remove('is-expanded')
+					console.log(this.$refs.p.$el.classList);
+				}
+			}
+		}
 	}
 </script>
 
 <style lang="scss">
+	
+	.content .p{
+		display:block;
+		overflow:hidden;
+		text-overflow:ellipsis;
+		white-space:nowrap;
+		/*设置文字溢出时显示省略号*/
+		
+	}
+	.content .p.is-expanded{
+		overflow:visible;
+		white-space:normal;
+		/*文字溢出时不再显示省略号*/
+	}
+	
+	
 	.messBox {
 		background: #fff;
 		display: flex;

+ 4 - 6
pages/resource/resource.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="resource" :style="{height:swiper+'px'}">
+	<view class="resource">
 		<statusBar :item="navBarData"></statusBar>
 		<view class="search">
 			<uni-search-bar bgColor="#f0f2f5" placeholder="搜索" cancelButton="none" clearButton="none" :focus="true"></uni-search-bar>
@@ -18,7 +18,7 @@
 		
 		<swiper class="scroll-view-height" :style="{height:swiper+'px'}" @change="swipeIndex" :current="current" :duration="300">
 		    <swiper-item>
-				<scroll-view scroll-y="true" :style="{height:swiper-10+'px'}">
+				<scroll-view scroll-y="true" :style="{height:swiper-20+'px'}">
 					<view class="contBox">
 						<view class="cont" v-for="i in 10">
 							<image src="../../static/yym/Rectangle 1918.png" mode=""></image>
@@ -35,7 +35,7 @@
 		    </swiper-item>
 			
 		    <swiper-item>
-				<scroll-view scroll-y="true" :style="{height:swiper-10+'px'}">
+				<scroll-view scroll-y="true" :style="{height:swiper+'px'}">
 					<view class="contBox">
 						<view class="cont" v-for="i in 10">
 							<image src="../../static/yym/Rectangle 1918.png" mode=""></image>
@@ -71,7 +71,6 @@ export default {
 				info2:'info2',
 				yun:'yun',
 				
-				isOK:false,  //用户协议是否勾选
 				swiper:0
 
 
@@ -113,11 +112,10 @@ export default {
 		// console.log(this.navheight);
 		console.log(this.tabBarHeight);
 		if(this.navheight){
-			this.swiper=this.screenHeight-this.navheight-100
+			this.swiper=this.screenHeight-this.navheight-140
 		}else{
 			this.swiper=this.screenHeight-this.customBar-150			
 		}
-		// log
 	}
 };
 </script>

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


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


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/statusBar/statusBar.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/node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card.js.map


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


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


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


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


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/activityList/activityList.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/hd/hd.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/hdxx/hdxx.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/jys/jys.js.map


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


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


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


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


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


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


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


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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 34 - 13
unpackage/dist/dev/mp-weixin/components/detailBlock/detailBlock.js


+ 2 - 1
unpackage/dist/dev/mp-weixin/components/detailBlock/detailBlock.wxml

@@ -1 +1,2 @@
-<view class="detailBlock"><block wx:if="{{!item.isShow}}"><view class="tit">教研室详情</view></block><block wx:else><view class="tit">活动详情</view></block><view class="cont">会议时间:<text>10月7日上午八点(周日)</text></view><view class="cont">活动形式:<text style="color:#0056a8;">线上直播</text></view><view class="cont"><view class="activeTit" id="myElement">教研室概况:查看更多查看更多查看更多看更多查看更多查看更多查看更多查看更多查看更多查看更多查看更多看更多查看更多查看更多查看更多查看更多</view><text data-event-opts="{{[['tap',[['zdwz',['$event']]]]]}}" class="zdwz" style="color:#0056a8;float:right;" bindtap="__e">收起</text></view></view>
+<view class="detailBlock"><block wx:if="{{!item.isShow}}"><view class="tit">教研室详情</view></block><block wx:else><view class="tit">活动详情</view></block><view class="cont">会议时间:<text>10月7日上午八点(周日)</text></view><view class="cont">活动形式:<text style="color:#0056a8;">线上直播</text></view><view class="cont"><view class="content"><view data-ref="p" class="p vue-ref">这是一段需要展开收起的文字,可以有很多很多的字,可能会占据很多的空间。因此,在默认情况下,我们只会显示部分文字,而把其余的部分折叠起
+					来。如果需要查看全部内容,可以点击“查看更多按钮,文字内容就会展开显示了。</view><text data-event-opts="{{[['tap',[['qqq',['$event']]]]]}}" class="btn-more" bindtap="__e">{{''+(isAll?'收起':'展开')+''}}</text></view></view></view>

+ 19 - 0
unpackage/dist/dev/mp-weixin/components/detailBlock/detailBlock.wxss

@@ -37,6 +37,19 @@
   color: #999999;
   margin-bottom: 10px;
 }
+.detailBlock .cont .content .p {
+  width: 90%;
+  display: block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  /*设置文字溢出时显示省略号*/
+}
+.detailBlock .cont .content .p.is-expanded {
+  overflow: visible;
+  white-space: normal;
+  /*文字溢出时不再显示省略号*/
+}
 .detailBlock .cont .activeTit {
   display: -webkit-box;
   word-break: break-all;
@@ -46,4 +59,10 @@
   -webkit-line-clamp: 2;
   /*设置 需要显示的行数*/
 }
+.detailBlock .cont .btn-more {
+  float: right;
+  -webkit-transform: translate(0, -100%);
+          transform: translate(0, -100%);
+  color: #0056a8;
+}
 

+ 0 - 3
unpackage/dist/dev/mp-weixin/components/statusBar/statusBar.wxss

@@ -24,9 +24,6 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
-.statusBar {
-  background-color: #000;
-}
 .nav {
   width: 750rpx;
   background-color: #FFFFFF;

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


+ 0 - 1
unpackage/dist/dev/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-tag/uni-tag.js

@@ -1 +0,0 @@
-Component({})

+ 0 - 4
unpackage/dist/dev/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-tag/uni-tag.json

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

+ 0 - 1
unpackage/dist/dev/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-tag/uni-tag.wxml

@@ -1 +0,0 @@
-<block wx:if="{{text}}"><text data-event-opts="{{[['tap',[['onClick',['$event']]]]]}}" class="{{['uni-tag',classes]}}" style="{{(customStyle)}}" bindtap="__e">{{text}}</text></block>

+ 0 - 126
unpackage/dist/dev/mp-weixin/node-modules/@dcloudio/uni-ui/lib/uni-tag/uni-tag.wxss

@@ -1,126 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.uni-tag {
-  line-height: 14px;
-  font-size: 12px;
-  font-weight: 200;
-  padding: 4px 7px;
-  color: #fff;
-  border-radius: 3px;
-  background-color: #8f939c;
-  border-width: 1rpx;
-  border-style: solid;
-  border-color: #8f939c;
-}
-.uni-tag--default {
-  font-size: 12px;
-}
-.uni-tag--default--inverted {
-  color: #8f939c;
-  border-color: #8f939c;
-}
-.uni-tag--small {
-  padding: 2px 5px;
-  font-size: 12px;
-  border-radius: 2px;
-}
-.uni-tag--mini {
-  padding: 1px 3px;
-  font-size: 12px;
-  border-radius: 2px;
-}
-.uni-tag--primary {
-  background-color: #2979ff;
-  border-color: #2979ff;
-  color: #fff;
-}
-.uni-tag--success {
-  color: #fff;
-  background-color: #18bc37;
-  border-color: #18bc37;
-}
-.uni-tag--warning {
-  color: #fff;
-  background-color: #f3a73f;
-  border-color: #f3a73f;
-}
-.uni-tag--error {
-  color: #fff;
-  background-color: #e43d33;
-  border-color: #e43d33;
-}
-.uni-tag--primary--inverted {
-  color: #2979ff;
-  border-color: #2979ff;
-}
-.uni-tag--success--inverted {
-  color: #18bc37;
-  border-color: #18bc37;
-}
-.uni-tag--warning--inverted {
-  color: #f3a73f;
-  border-color: #f3a73f;
-}
-.uni-tag--error--inverted {
-  color: #e43d33;
-  border-color: #e43d33;
-}
-.uni-tag--inverted {
-  background-color: #fff;
-}
-.uni-tag--circle {
-  border-radius: 15px !important;
-}
-.uni-tag--mark {
-  border-top-left-radius: 0 !important;
-  border-bottom-left-radius: 0 !important;
-  border-top-right-radius: 15px !important;
-  border-bottom-right-radius: 15px !important;
-}
-.uni-tag--disabled {
-  opacity: 0.5;
-}
-.uni-tag-text {
-  color: #fff;
-  font-size: 14px;
-}
-.uni-tag-text--primary {
-  color: #2979ff;
-}
-.uni-tag-text--success {
-  color: #18bc37;
-}
-.uni-tag-text--warning {
-  color: #f3a73f;
-}
-.uni-tag-text--error {
-  color: #e43d33;
-}
-.uni-tag-text--small {
-  font-size: 12px;
-}
-

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/activityDetail/activityDetail.js

@@ -107,7 +107,7 @@ try {
       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))
     },
     detailBlock: function () {
-      return __webpack_require__.e(/*! import() | components/detailBlock/detailBlock */ "components/detailBlock/detailBlock").then(__webpack_require__.bind(null, /*! @/components/detailBlock/detailBlock.vue */ 257))
+      return __webpack_require__.e(/*! import() | components/detailBlock/detailBlock */ "components/detailBlock/detailBlock").then(__webpack_require__.bind(null, /*! @/components/detailBlock/detailBlock.vue */ 250))
     },
   }
 } catch (e) {

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/hd/hd.js

@@ -104,7 +104,7 @@ try {
       return __webpack_require__.e(/*! import() | components/statusBar/statusBar */ "components/statusBar/statusBar").then(__webpack_require__.bind(null, /*! @/components/statusBar/statusBar.vue */ 203))
     },
     uniCard: function () {
-      return __webpack_require__.e(/*! import() | node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card */ "node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card").then(__webpack_require__.bind(null, /*! @dcloudio/uni-ui/lib/uni-card/uni-card.vue */ 264))
+      return __webpack_require__.e(/*! import() | node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card */ "node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card").then(__webpack_require__.bind(null, /*! @dcloudio/uni-ui/lib/uni-card/uni-card.vue */ 257))
     },
   }
 } catch (e) {

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/jys/jys.js

@@ -104,7 +104,7 @@ try {
       return __webpack_require__.e(/*! import() | components/statusBar/statusBar */ "components/statusBar/statusBar").then(__webpack_require__.bind(null, /*! @/components/statusBar/statusBar.vue */ 203))
     },
     uniCard: function () {
-      return __webpack_require__.e(/*! import() | node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card */ "node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card").then(__webpack_require__.bind(null, /*! @dcloudio/uni-ui/lib/uni-card/uni-card.vue */ 264))
+      return __webpack_require__.e(/*! import() | node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card */ "node-modules/@dcloudio/uni-ui/lib/uni-card/uni-card").then(__webpack_require__.bind(null, /*! @dcloudio/uni-ui/lib/uni-card/uni-card.vue */ 257))
     },
   }
 } catch (e) {

+ 13 - 17
unpackage/dist/dev/mp-weixin/pages/message/message.js

@@ -235,28 +235,14 @@ exports.default = void 0;
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
 var _default = {
   data: function data() {
     return {
       navbarData: {
         title: '消息'
-      }
+      },
+      isAll: false,
+      aaa: 'rerererererererere'
     };
   },
   methods: {
@@ -264,6 +250,16 @@ var _default = {
       uni.navigateTo({
         url: '/pages/hdxx/hdxx'
       });
+    },
+    qqq: function qqq() {
+      this.isAll = !this.isAll;
+      if (this.isAll) {
+        this.$refs.p.$el.classList.add('is-expanded');
+        console.log(this.$refs.p.$el.classList);
+      } else {
+        this.$refs.p.$el.classList.remove('is-expanded');
+        console.log(this.$refs.p.$el.classList);
+      }
     }
   }
 };

+ 2 - 1
unpackage/dist/dev/mp-weixin/pages/message/message.wxml

@@ -1 +1,2 @@
-<view class="messBox"><status-bar vue-id="7ac9e6a0-1" item="{{navbarData}}" bind:__l="__l"></status-bar><view class="mesItem"><view data-event-opts="{{[['tap',[['goToMesDetail',['$event']]]]]}}" class="leftBox" bindtap="__e"><view class="mesImg"><image src="../../static/message/notice.svg" mode="aspectFill"></image></view><view class="mesBrief"><view class="tit">活动通知</view><view class="breif">活动报名成功</view></view></view><view class="right"><view class="newMessage"></view><view class="mesTime">07-12</view></view></view><view class="mesItem"><view class="leftBox"><view class="mesImg"><image src="../../static/message/system.svg" mode></image></view><view class="mesBrief"><view class="tit">系统通知</view><view class="breif">已加入xxxxxx教研室</view></view></view><view class="right"><view class="newMessage"></view><view class="mesTime">07-12</view></view></view><view class="mesItem"><view class="leftBox"><view class="mesImg"><image src="../../static/message/subscribe.svg" mode></image></view><view class="mesBrief"><view class="tit">订阅消息</view><view class="breif">xxx教研室更新了课程</view></view></view><view class="right"><view class="newMessage"></view><view class="mesTime">07-12</view></view></view></view>
+<view class="messBox"><status-bar vue-id="7ac9e6a0-1" item="{{navbarData}}" bind:__l="__l"></status-bar><view class="mesItem"><view data-event-opts="{{[['tap',[['goToMesDetail',['$event']]]]]}}" class="leftBox" bindtap="__e"><view class="mesImg"><image src="../../static/message/notice.svg" mode="aspectFill"></image></view><view class="mesBrief"><view class="tit">活动通知</view><view class="breif">活动报名成功</view></view></view><view class="right"><view class="newMessage"></view><view class="mesTime">07-12</view></view></view><view class="mesItem"><view class="leftBox"><view class="mesImg"><image src="../../static/message/system.svg" mode></image></view><view class="mesBrief"><view class="tit">系统通知</view><view class="breif">已加入xxxxxx教研室</view></view></view><view class="right"><view class="newMessage"></view><view class="mesTime">07-12</view></view></view><view class="mesItem"><view class="leftBox"><view class="mesImg"><image src="../../static/message/subscribe.svg" mode></image></view><view class="mesBrief"><view class="tit">订阅消息</view><view class="breif">xxx教研室更新了课程</view></view></view><view class="right"><view class="newMessage"></view><view class="mesTime">07-12</view></view></view><view class="content"><view data-ref="p" class="p vue-ref">这是一段需要展开收起的文字,可以有很多很多的字,可能会占据很多的空间。因此,在默认情况下,我们只会显示部分文字,而把其余的部分折叠起
+			来。如果需要查看全部内容,可以点击“查看更多按钮,文字内容就会展开显示了。</view><text class-="btn-more" data-event-opts="{{[['tap',[['qqq',['$event']]]]]}}" bindtap="__e">{{''+(isAll?'收起':'更多')+''}}</text></view></view>

+ 12 - 0
unpackage/dist/dev/mp-weixin/pages/message/message.wxss

@@ -24,6 +24,18 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.content .p {
+  display: block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  /*设置文字溢出时显示省略号*/
+}
+.content .p.is-expanded {
+  overflow: visible;
+  white-space: normal;
+  /*文字溢出时不再显示省略号*/
+}
 .messBox {
   background: #fff;
   display: flex;

+ 1 - 4
unpackage/dist/dev/mp-weixin/pages/resource/resource.js

@@ -239,8 +239,6 @@ var _default = {
       //类名
       info2: 'info2',
       yun: 'yun',
-      isOK: false,
-      //用户协议是否勾选
       swiper: 0
     };
   },
@@ -278,11 +276,10 @@ var _default = {
     // console.log(this.navheight);
     console.log(this.tabBarHeight);
     if (this.navheight) {
-      this.swiper = this.screenHeight - this.navheight - 100;
+      this.swiper = this.screenHeight - this.navheight - 140;
     } else {
       this.swiper = this.screenHeight - this.customBar - 150;
     }
-    // log
   }
 };
 exports.default = _default;

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


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

@@ -45,7 +45,7 @@ try {
       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))
     },
     detailBlock: function () {
-      return __webpack_require__.e(/*! import() | components/detailBlock/detailBlock */ "components/detailBlock/detailBlock").then(__webpack_require__.bind(null, /*! @/components/detailBlock/detailBlock.vue */ 257))
+      return __webpack_require__.e(/*! import() | components/detailBlock/detailBlock */ "components/detailBlock/detailBlock").then(__webpack_require__.bind(null, /*! @/components/detailBlock/detailBlock.vue */ 250))
     },
   }
 } catch (e) {

+ 14 - 20
unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,7 +1,8 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": false,
@@ -9,28 +10,21 @@
     "postcss": false,
     "minified": false,
     "newFeature": true,
-    "bigPackageSizeSupport": true
+    "bigPackageSizeSupport": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "ignoreUploadUnusedFiles": true
   },
   "compileType": "miniprogram",
-  "libVersion": "",
+  "libVersion": "3.1.3",
   "appid": "wxcb284ff05d9ea544",
   "projectname": "kklbWe",
-  "condition": {
-    "search": {
-      "current": -1,
-      "list": []
-    },
-    "conversation": {
-      "current": -1,
-      "list": []
-    },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": -1,
-      "list": []
-    }
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }

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