py 2 年 前
親
コミット
c1df89d995

+ 3 - 1
common/css/common.css

@@ -391,7 +391,9 @@ image {
 .pl-24 {
 	padding-left: 24rpx;
 }
-
+.pr-24 {
+	padding-right: 24rpx;
+}
 /* 外边距 */
 .m-24{
 	margin: 24rpx;

+ 5 - 7
pages-school/add-circle.vue

@@ -1,27 +1,22 @@
 <template>
 	<view class="add-circle-box iPhone-bottom flex-common-css box-border-box">
 		<Nav title='发圈子' bgckgroundBox='#fff'></Nav>
-		
 		<view class="scroll-view-css box-border-box ptp-24">
 			<view class="bgc-f box-border-box p-32">
 				<view class="fs-34 fw-600 mb-20">内容描述 <span class='fs-34 fc-9 fw-400'>(必填)</span></view>
-				<textarea v-model="fromData.content" class=" fs-24" :maxlength='500' placeholder='这一刻说些什么'></textarea>
+				<textarea v-model="fromData.content" class="textarea-class fs-24" :maxlength='500' placeholder='这一刻说些什么'></textarea>
 			</view>
 			<view class="bgc-f mb-20">
-				<EnUpload v-model="fromData.image" ></EnUpload>
+				<EnUpload v-model="fromData.image" number='9'></EnUpload>
 			</view>
-			
 			<view class="bgc-f box-border-box p-32 flex-justify-space align-items-center" @click="openPop()">
 				<view class="fs-34 fw-600">{{typeName}}</view>
 				<image class="right-icon" src="@/static/img/toRight.png" mode=""></image>
 			</view>
 		</view>
-		
 		<view class="box-border-box p-32" @click="save()">
 			<view class="b-bottom text-align-center fs-32 fw-600 fc-f">发布</view>
 		</view>
-		
-		
 		<uni-popup ref="popup" type="bottom" background-color="#fff">
 			<view class="pop-box box-border-box p-24">
 				<view class="head-pop flex-justify-space align-items-center mb-24">
@@ -118,6 +113,9 @@
 </script>
 
 <style scoped lang="scss">
+	.textarea-class{
+		width: 100%;
+	}
 	.add-circle-box{
 		.b-bottom{
 			width: 686rpx;

+ 322 - 243
pages-school/circle-info.vue

@@ -4,7 +4,8 @@
 			<Nav :leftShow='false' :customNav='true' bgckgroundBox='transparent'>
 				<template>
 					<view slot="custom" class="display-flex ">
-						<image class="nav-img" @click="toBack()" src="@/static/img/takeout/bg-back.png" mode="scaleToFill"></image>
+						<image class="nav-img" @click="toBack()" src="@/static/img/takeout/bg-back.png"
+							mode="scaleToFill"></image>
 						<view class="info-nav display-flex">
 							<image :src="obj.head_img" mode=""></image>
 							<view class="">
@@ -16,115 +17,123 @@
 				</template>
 			</Nav>
 		</view>
-		
-		
-		
+
 		<scroll-view scroll-y="true" class="scroll-view-css" @scrolltolower="scrolltolower">
-			
-				<view class="box-border-box mb-26" v-if="obj.image.length > 0">
-					<swiper class="swiper mb-32 " circular indicator-dots indicator-active-color="#4FB3EF" :autoplay="true" :interval="3000" :duration="500">
-						<swiper-item v-for="(item,i) in obj.image" :key="i">
-							<image  class="swiper-item" :src="item" mode="aspectFill"></image>
-						</swiper-item>
-					</swiper>
-				</view>
-				<view class="box-border-box bz-box bgc-f b-b-F9F9F9 mt-24">
-					<view class="fs-30 fw-600 mb-32">{{obj.content||''}}</view>
-					<view class="card-4 flex-wrap-wrap">
-						<view class="">{{obj.school_name||''}}</view>
-						<view class="">{{obj.topic_name||''}}</view>
-					</view>
-				</view>
-				
-				<view v-if="list.length == 0" class="scroll-view-css">
-					<EnBlank :customSrc='true'>
-						<template v-slot:blankImg>
-							<image class="black-custom-img" src="@/static/img/common/no-order.png" mode=""></image>
-						</template>
-					</EnBlank>
+			<view class="box-border-box mb-26" v-if="obj.image.length > 0">
+				<swiper class="swiper mb-32 " circular indicator-dots indicator-active-color="#4FB3EF" :autoplay="true"
+					:interval="3000" :duration="500">
+					<swiper-item v-for="(item,i) in obj.image" :key="i">
+						<image class="swiper-item" :src="item" mode="aspectFit" @click="lookImg(i,item)"></image>
+					</swiper-item>
+				</swiper>
+			</view>
+			<view class="box-border-box bz-box bgc-f b-b-F9F9F9 mt-24">
+				<view class="fs-30 fw-600 mb-32">{{obj.content||''}}</view>
+				<view class="card-4 flex-wrap-wrap">
+					<view class="">{{obj.school_name||''}}</view>
+					<view class="">{{obj.topic_name||''}}</view>
 				</view>
-				
-				<view v-else class="pop-box pop-msg box-border-box p-24">
-					<view class=" box-border-box plr-24">
-						<view class="list-box flex-justify-space" v-for="(item,i) in list" :key="i"> 
-							<image class="list-box-img" src="@/static/img/my/bg.png" mode="scaleToFill"></image>
-							<view class="flex-1 p-b-20">
-								<view class=" flex-justify-space">
-									<view class=" b-b-F9F9F9 mr-20">
-										<view class="fs-28 fw-400 fc-9 mb-8 align-items-center">
-											{{item.nickname}} 
-											<span v-if="item.is_author == 1" class='only-box text-align-center fs-24 fc-41ABF5 ml-10'>作者</span>
-											<view class="ml-10" v-if="item.is_self == 1" @click="delInfo(item)">
-												<uni-icons  type="trash" size="18"></uni-icons>
-											</view>
-										</view>
-										<view class="fs-30 fw-400 mb-8" @click.stop="openInput(1,item)">
-											{{item.content}}
+			</view>
+			<view v-if="list.length == 0" class="scroll-view-css">
+				<EnBlank :customSrc='true'>
+					<template v-slot:blankImg>
+						<image class="black-custom-img" src="@/static/img/common/no-order.png" mode=""></image>
+					</template>
+				</EnBlank>
+			</view>
+			<view v-else class="pop-box pop-msg box-border-box p-24">
+				<view class=" box-border-box plr-24">
+					<view class="list-box flex-justify-space" v-for="(item,i) in list" :key="i">
+						<image class="list-box-img" src="@/static/img/my/bg.png" mode="scaleToFill"></image>
+						<view class="flex-1 p-b-20">
+							<view class=" flex-justify-space">
+								<view class=" b-b-F9F9F9 mr-20">
+									<view class="fs-28 fw-400 fc-9 mb-8 align-items-center">
+										{{item.nickname}}
+										<span v-if="item.is_author == 1"
+											class='only-box text-align-center fs-24 fc-41ABF5 ml-10'>作者</span>
+										<view class="ml-10" v-if="item.is_self == 1" @click="delInfo(item)">
+											<uni-icons type="trash" size="18"></uni-icons>
 										</view>
-										<view class="fs-24 fw-400 fc-9 mb-8">{{item.created_date}}</view>	
 									</view>
-									<view class="display-flex" @click.stop="handUp(2,item)">
-										<uni-icons type="hand-up" size="20" :color="item.is_like==1?'#FD5C02':'#999'"></uni-icons>
-										<view class="fs-24 fw-400 mt-5" :class="item.is_like==1?'fc-FD5C02':'fc-9'">{{item.like}}</view>
+									<view class="fs-30 fw-400 mb-8" @click.stop="openInput(1,item)">
+										{{item.content}}
 									</view>
+									<view class="fs-24 fw-400 fc-9 mb-8">{{item.created_date}}</view>
 								</view>
-								
-								<view v-if="item.isOpen" class="fs-24 fc-6 text-align-center mb-12" @click="openReply(1,item)">展开更多评论</view>
-								
-								<!-- 回复 -->
-								<view class="mb-16" v-if="item.replyList.length > 0">
-									<view class="list-box flex-justify-space" v-for="(info,index) in item.replyList" :key="index">
-										<image class="list-box-img" src="@/static/img/my/bg.png" mode="scaleToFill"></image>
-										<view class="flex-1">
-											<view class=" flex-justify-space">
-												<view class=" b-b-F9F9F9 mr-20">
-													<view class="fs-28 fw-400 fc-9 mb-8 align-items-center">
-														{{info.nickname}} 
-														<span v-if="info.is_author == 1" class='only-box text-align-center fs-24 fc-41ABF5 ml-10'>作者</span>
-														<view class="ml-10" v-if="info.is_self == 1" @click="delInfo(info)">
-															<uni-icons  type="trash" size="18"></uni-icons>
-														</view>
-													</view>
-													<view class="fs-30 fw-400 mb-8"  @click.stop="openInput(2,info)">
-														{{info.content}}
+								<view class="display-flex" @click.stop="handUp(2,item)">
+									<uni-icons type="hand-up" size="20"
+										:color="item.is_like==1?'#FD5C02':'#999'"></uni-icons>
+									<view class="fs-24 fw-400 mt-5" :class="item.is_like==1?'fc-FD5C02':'fc-9'">
+										{{item.like}}</view>
+								</view>
+							</view>
+							<view v-if="item.isOpen" class="fs-24 fc-6 text-align-center mb-12"
+								@click="openReply(1,item)">展开更多评论</view>
+							<!-- 回复 -->
+							<view class="mb-16" v-if="item.replyList.length > 0">
+								<view class="list-box flex-justify-space" v-for="(info,index) in item.replyList"
+									:key="index">
+									<image class="list-box-img" src="@/static/img/my/bg.png" mode="scaleToFill"></image>
+									<view class="flex-1">
+										<view class=" flex-justify-space">
+											<view class=" b-b-F9F9F9 mr-20">
+												<view class="fs-28 fw-400 fc-9 mb-8 align-items-center">
+													{{info.nickname}}
+													<span v-if="info.is_author == 1"
+														class='only-box text-align-center fs-24 fc-41ABF5 ml-10'>作者</span>
+													<view class="ml-10" v-if="info.is_self == 1" @click="delInfo(info)">
+														<uni-icons type="trash" size="18"></uni-icons>
 													</view>
-													<view class="fs-24 fw-400 fc-9 mb-8">{{info.created_date}}</view>		
 												</view>
-												<view class="display-flex" @click.stop="handUp(2,info)">
-													<uni-icons type="hand-up" size="20" :color="info.is_like==1?'#FD5C02':'#999'"></uni-icons>
-													<view class="fs-24 fw-400 mt-5" :class="info.is_like==1?'fc-FD5C02':'fc-9'">{{info.like}}</view>
+												<view class="fs-30 fw-400 mb-8" @click.stop="openInput(2,info)">
+													{{info.content}}
 												</view>
+												<view class="fs-24 fw-400 fc-9 mb-8">{{info.created_date}}</view>
+											</view>
+											<view class="display-flex" @click.stop="handUp(2,info)">
+												<uni-icons type="hand-up" size="20"
+													:color="info.is_like==1?'#FD5C02':'#999'"></uni-icons>
+												<view class="fs-24 fw-400 mt-5"
+													:class="info.is_like==1?'fc-FD5C02':'fc-9'">{{info.like}}</view>
 											</view>
 										</view>
 									</view>
-									<view v-if="item.replyList.length < item.count" class="fs-24 fc-6 text-align-center mb-12" @click="openReply(2,item)">展开更多评论</view>
 								</view>
-								
+								<view v-if="item.replyList.length < item.count"
+									class="fs-24 fc-6 text-align-center mb-12" @click="openReply(2,item)">展开更多评论</view>
 							</view>
+
 						</view>
 					</view>
 				</view>
-			
+			</view>
+
 		</scroll-view>
-		
-		<view class="card-5 flex-justify-space box-border-box boder-b-t">		
-			<view class="input-box-box fs-28 fc-9 mr-20" @click.stop="openInput(0,'')">友善评论,文明发言</view>
-			<view class="flex-1 display-flex">
+
+		<view class="card-5 align-items-center flex-justify-space box-border-box boder-b-t">
+			<!-- <view class="input-box-box fs-28 fc-9 mr-20" @click.stop="openInput(0,'')">友善评论,文明发言</view> -->
+			<input class="fs-input" :focus='focus' v-model="msgData.content" @click.stop="openInput(0,'')" type="text" @focus='inputFocus(true)' @blur='inputFocus(false)'/>
+			<view class="display-flex" v-if="!inputRightType">
 				<view class="align-items-center mr-20" @click.stop="handUp(1,obj)">
 					<uni-icons type="hand-up" size="22" :color="obj.is_like==1?'#FD5C02':'#999'"></uni-icons>
-					<view class="fs-24 " :class="obj.is_like==1?'fc-FD5C02':'fc-9'">{{obj.like}}</view>
+					<view :class="obj.is_like==1?'fc-FD5C02':'fc-9'">
+						点赞
+					</view>
+					<!-- <view class="fs-24 " :class="obj.is_like==1?'fc-FD5C02':'fc-9'">{{obj.like}}</view> -->
 				</view>
 				<view class="align-items-center" @click.stop="openRepot(obj)">
 					<image src="@/static/img/school/info.png" mode=""></image>
 					<view class="fs-24 fc-9">举报</view>
-				</view> 
+				</view>
 			</view>
-			
+			<image v-else class="wh64" @click.stop="save()" src="@/static/img/school/fs.png" mode=""></image>
 		</view>
-		
+
 		<uni-popup ref="popup" type="bottom">
-			<view class="pop-input">
-				<view class="head-pop flex-justify-space align-items-center mb-24 box-border-box p-24">
+			<view class="pop-input align-items-center">
+				<input class="fs-input" focus type="text" />
+				<!-- 				<view class="head-pop flex-justify-space align-items-center mb-24 box-border-box p-24">
 					<view class="fs-28 fw-600 fc-41ABF5"></view>
 					<view class="fs-36 fc-0 fw-600">评论</view>
 					<uni-icons @click="closeInput()" type="closeempty" size="24"></uni-icons>
@@ -137,10 +146,10 @@
 				</view>
 				<view class="box-border-box p-24">
 					<view class="save-box" @click.stop="save()">评论</view>
-				</view>
+				</view> -->
 			</view>
 		</uni-popup>
-		
+
 		<uni-popup ref="popupRepot" type="bottom">
 			<view class="pop-box pop-h-30 box-border-box p-24">
 				<view class="head-pop flex-justify-space align-items-center mb-24">
@@ -149,7 +158,8 @@
 					<view class="fs-28 fw-600 fc-41ABF5">确定</view>
 				</view>
 				<view class="scroll-view-css">
-					<textarea style="height: 100%;" v-model="reportData.content" class=" fs-24" :maxlength='50' placeholder='请输入举报内容'></textarea>
+					<textarea style="height: 100%;" v-model="reportData.content" class=" fs-24" :maxlength='50'
+						placeholder='请输入举报内容'></textarea>
 				</view>
 				<view @click.stop="closePop(2)" class="b-bottom text-align-center fs-32 fw-600 fc-f">确认举报</view>
 			</view>
@@ -159,37 +169,49 @@
 
 <script>
 	import EnBlank from "@/components/en-utils/en-blank/en-blank";
-	import {alumnInfo,getRemarkList,setAlumniLike,delRemark,setCreateRemark,setRemarkLike,alumniReport} from '@/api/alumni.js';
+	import {
+		alumnInfo,
+		getRemarkList,
+		setAlumniLike,
+		delRemark,
+		setCreateRemark,
+		setRemarkLike,
+		alumniReport
+	} from '@/api/alumni.js';
 	import tools from "@/service/tools";
 	export default {
-		components:{EnBlank},
-		data(){
-			return{
-				isAJAX:false,
-				news_id:'',
-				obj:{
-					image:[],
+		components: {
+			EnBlank
+		},
+		data() {
+			return {
+				inputRightType: false,
+				isAJAX: false,
+				news_id: '',
+				obj: {
+					image: [],
 				},
-				list:[],
-				page:1,
-				total:0,
-				
+				list: [],
+				page: 1,
+				total: 0,
+
 				// 发起评论
-				msgData:{
-					news_id:'',
-					remark_id:'',
-					content:'',
-					reply_id:'',
+				msgData: {
+					news_id: '',
+					remark_id: '',
+					content: '',
+					reply_id: '',
 				},
 				// 回复评论
-				replyData:{
-					page:1,
+				replyData: {
+					page: 1,
 				},
 				// 举报
-				reportData:{
-					news_id:'',
-					content:'',
+				reportData: {
+					news_id: '',
+					content: '',
 				},
+				focus: false
 			}
 		},
 		onLoad(e) {
@@ -198,31 +220,47 @@
 			this.getInfo();
 			this.getList();
 		},
-		methods:{
-			toBack(){
+		methods: {
+			inputFocus(type) {
+				this.inputRightType = type
+				if(!type) {
+					this.focus = false
+				}
+				this.$forceUpdate()
+			},
+			lookImg(i, item) {
+				tools.lookBigImg(i, item)
+			},
+			toBack() {
 				tools.leftClick()
 			},
-			getInfo(){
-				alumnInfo({news_id:this.news_id}).then((res)=>{
-					if(res.code === 1){
+			getInfo() {
+				alumnInfo({
+					news_id: this.news_id
+				}).then((res) => {
+					if (res.code === 1) {
 						this.obj = res.data;
 					}
 				})
 			},
-			scrolltolower(){
-				if(this.list.length < this.total){
+			scrolltolower() {
+				if (this.list.length < this.total) {
 					this.page += 1;
 					this.getList();
 				}
 			},
-			getList(){
-				getRemarkList({news_id:this.news_id,remark_id:0,page:this.page}).then((res)=>{
-					if(res.code === 1){
-						this.list = [...this.list,...res.data.items];
+			getList() {
+				getRemarkList({
+					news_id: this.news_id,
+					remark_id: 0,
+					page: this.page
+				}).then((res) => {
+					if (res.code === 1) {
+						this.list = [...this.list, ...res.data.items];
 						this.total = res.data.total;
-						this.list.forEach((v)=>{
+						this.list.forEach((v) => {
 							v.replyList = [];
-							if(v.count > 0){
+							if (v.count > 0) {
 								v.isOpen = true;
 							}
 						})
@@ -230,153 +268,167 @@
 				})
 			},
 			// 获取回复列表
-			openReply(type,item){
+			openReply(type, item) {
 				// type 1获取其他 2加载更多
-				if(this.isAJAX){
+				if (this.isAJAX) {
 					return
 				}
 				this.isAJAX = true;
-				if(type == 1){
+				if (type == 1) {
 					item.replyList = [];
 					this.replyData.page = 1;
-				}else{
+				} else {
 					this.replyData.page += 1;
 				}
-			
-				getRemarkList({news_id:item.news_id,remark_id:item.id,page:this.replyData.page}).then((res)=>{
-					if(res.code === 1){
+
+				getRemarkList({
+					news_id: item.news_id,
+					remark_id: item.id,
+					page: this.replyData.page
+				}).then((res) => {
+					if (res.code === 1) {
 						this.isAJAX = false;
-						item.replyList = [...item.replyList,...res.data.items];
+						item.replyList = [...item.replyList, ...res.data.items];
 						item.isOpen = false;
-					}else{
+					} else {
 						this.isAJAX = false;
 						tools.error(res.msg)
 					}
 				})
 			},
-			
+
 			// 点赞
-			handUp(type,item){
-				if(this.isAJAX){
+			handUp(type, item) {
+				if (this.isAJAX) {
 					return
 				}
 				this.isAJAX = true;
-				let is_like = item.is_like == 1?0:1;
-				if(type == 1){
+				let is_like = item.is_like == 1 ? 0 : 1;
+				if (type == 1) {
 					// 点赞贴子
-					setAlumniLike({news_id:item.news_id,is_like:is_like}).then((res)=>{
-						this.handUpFun(res,item,is_like)
+					setAlumniLike({
+						news_id: item.news_id,
+						is_like: is_like
+					}).then((res) => {
+						this.handUpFun(res, item, is_like)
 					})
-				}else{
+				} else {
 					// 点赞评论
-					setRemarkLike({news_id:item.news_id,is_like:is_like,remark_id:item.id}).then((res)=>{
-						this.handUpFun(res,item,is_like)
+					setRemarkLike({
+						news_id: item.news_id,
+						is_like: is_like,
+						remark_id: item.id
+					}).then((res) => {
+						this.handUpFun(res, item, is_like)
 					})
 				}
 			},
 			// 点赞公共回复
-			handUpFun(res,item,is_like){
-				if(res.code === 1){
+			handUpFun(res, item, is_like) {
+				if (res.code === 1) {
 					item.is_like = is_like;
-					if(is_like == 0){
+					if (is_like == 0) {
 						item.like -= 1
-					}else{
+					} else {
 						item.like += 1
 					}
 					this.isAJAX = false;
 					tools.success(res.msg);
-				}else{
+				} else {
 					this.isAJAX = false;
 					tools.error(res.msg);
 				}
 			},
-			
-			openInput(type,item){
-				if(type == 0){
+
+			openInput(type, item) {
+				if (type == 0) {
 					this.msgData.remark_id = 0;
-				}else if(type == 1){
+				} else if (type == 1) {
 					this.msgData.remark_id = item.id;
 					this.msgData.reply_id = item.m_id;
-				}else{
+				} else {
 					this.msgData.remark_id = item.remark_id;
 					this.msgData.reply_id = item.m_id;
 				}
-				this.$refs.popup.open();
+				this.focus = true
+				// this.$refs.popup.open();
 			},
-			closeInput(){
+			closeInput() {
 				this.$refs.popup.close();
 				this.msgData.remark_id = '';
 				this.msgData.content = '';
 				this.msgData.reply_id = '';
 			},
-			save(){
-				if(this.isAJAX){
+			save() {
+				if (this.isAJAX) {
 					return
 				}
 				this.isAJAX = true;
-				setCreateRemark(this.msgData).then((res)=>{
-					if(res.code == 1){
+				setCreateRemark(this.msgData).then((res) => {
+					if (res.code == 1) {
 						tools.success('评论成功')
-						setTimeout(()=>{
+						setTimeout(() => {
 							this.isAJAX = false;
 							this.closeInput()
 							this.list = [];
 							this.page = 1;
 							this.getList();
-						},1500)
-					}else{
+						}, 1500)
+					} else {
 						this.isAJAX = false;
 						tools.error(res.msg)
 					}
 				})
 			},
-			
-			
-			delInfo(item){
-				if(this.isAJAX){
+
+
+			delInfo(item) {
+				if (this.isAJAX) {
 					return
 				}
 				this.isAJAX = true;
-				delRemark({remark_id:item.id}).then((res)=>{
-					if(res.code === 1){
+				delRemark({
+					remark_id: item.id
+				}).then((res) => {
+					if (res.code === 1) {
 						tools.success('删除成功')
-						setTimeout(()=>{
+						setTimeout(() => {
 							this.isAJAX = false;
 							this.list = [];
 							this.page = 1;
 							this.getList();
-						},1500)
-					}else{
+						}, 1500)
+					} else {
 						this.isAJAX = false;
 						tools.error(res.msg)
 					}
 				})
 			},
-			
+
 			// 打开举报
-			openRepot(item){
+			openRepot(item) {
 				this.reportData.news_id = item.news_id;
 				this.$refs.popupRepot.open();
 			},
 			// 举报
-			closePop(type){
-				if(type === 1){
+			closePop(type) {
+				if (type === 1) {
 					this.reportData.news_id = '';
 					this.reportData.content = '';
 					this.$refs.popupRepot.close();
-				}else{
-					if(this.isAJAX){
+				} else {
+					if (this.isAJAX) {
 						return
 					}
 					this.isAJAX = true;
-					alumniReport(this.reportData).then((res)=>{
-						if(res.code === 1){
+					alumniReport(this.reportData).then((res) => {
+						if (res.code === 1) {
 							tools.success(res.msg)
-							setTimeout(()=>{
+							setTimeout(() => {
 								this.isAJAX = false;
 								this.closePop(1);
-							},1000)
-						}else{
+							}, 1000)
+						} else {
 							tools.error(res.msg);
 							this.isAJAX = false;;
 						}
@@ -388,43 +440,63 @@
 </script>
 
 <style scoped lang="scss">
-	.circle-info-box{
-		
-		.boder-b-t{
+	.fs-input{
+		flex: 1;
+		margin: 0 32rpx 0 0;
+		height: 72rpx;
+		line-height: 72rpx;
+		background: #F2F2F2;
+		border-radius: 200rpx;
+		box-sizing: border-box;
+		padding: 0 24rpx;
+	}
+	.wh64{
+		width: 68rpx;
+		height: 68rpx;
+	}
+	.input-box-box {
+		width: 436rpx;
+		height: 72rpx;
+		line-height: 72rpx;
+		background: #F2F2F2;
+		border-radius: 200rpx;
+		box-sizing: border-box;
+		padding: 0 24rpx;
+	}
+
+	.circle-info-box {
+
+		.boder-b-t {
 			border-top: 1rpx solid #F2F2F2;
 		}
-		
-		.card-5{
-			padding: 20rpx 24rpx 0 24rpx;
-			image{
+
+		.card-5 {
+			padding: 20rpx 24rpx 20rpx 24rpx;
+
+			image {
 				width: 40rpx;
 				height: 40rpx;
 				margin-right: 8rpx;
-				
-			}
-			.input-box-box{
-				width: 436rpx;
-				height: 72rpx;
-				line-height: 72rpx;
-				background: #F2F2F2;
-				border-radius: 200rpx;
-				box-sizing: border-box;
-				padding: 0 24rpx;
+
 			}
 		}
-		.w348{
+
+		.w348 {
 			width: 348rpx;
 		}
-		.nav-box{
+
+		.nav-box {
 			z-index: 99;
 			padding-bottom: 10rpx;
-			.nav-img{
+
+			.nav-img {
 				width: 56rpx;
 				height: 56rpx;
 				margin-right: 30rpx;
 			}
-			.info-nav{
-				image{
+
+			.info-nav {
+				image {
 					width: 64rpx;
 					height: 64rpx;
 					border-radius: 50%;
@@ -432,19 +504,23 @@
 				}
 			}
 		}
-		.swiper{
+
+		.swiper {
 			width: 100%rpx;
 			height: 920rpx;
-			.swiper-item{
+
+			.swiper-item {
 				width: 100%;
 				height: 920rpx;
-				background-color: skyblue;
+				// background-color: skyblue;
 			}
 		}
-		.bz-box{
+
+		.bz-box {
 			padding: 0 32rpx 20rpx 32rpx;
-			.card-4{
-				view{
+
+			.card-4 {
+				view {
 					padding: 4rpx 16rpx;
 					background: #F2F2F2;
 					border-radius: 200rpx;
@@ -455,79 +531,82 @@
 				}
 			}
 		}
-		
-		.pop-input{
-			z-index: 100;
+
+		.pop-input {
 			width: 100%;
-			height: 70vh;
+			height: auto;
 			background-color: #fff;
-			bottom: 0;
-			left: 0;
 			border-top: 1rpx solid #ccc;
-			border-radius: 20rpx 20rpx 0 0;
-			display: flex;
-			flex-direction: column;
-			.save-box{
-				text-align: center;
-				line-height: 88rpx;
-				font-weight: 600;
-				font-size: 32rpx;
-				color: #FFFFFF;
-				width: 100%;
-				height: 80rpx;
-				border-radius: 200rpx;
-				background: linear-gradient( 105deg, #57CAFF 0%, #41ABF5 100%);
-			}
+			padding: 9rpx 24rpx 9rpx 32rpx;
+			box-sizing: border-box;
+			// .save-box{
+			// 	text-align: center;
+			// 	line-height: 88rpx;
+			// 	font-weight: 600;
+			// 	font-size: 32rpx;
+			// 	color: #FFFFFF;
+			// 	width: 100%;
+			// 	height: 80rpx;
+			// 	border-radius: 200rpx;
+			// 	background: linear-gradient( 105deg, #57CAFF 0%, #41ABF5 100%);
+			// }
 		}
-		
-		.pop-box{
-			
+
+		.pop-box {
+
 			width: 100%;
 			height: 50vh;
 			background-color: #fff;
 			border-radius: 24rpx 24rpx 0rpx 0rpx;
 			display: flex;
 			flex-direction: column;
-			.item-box{
+
+			.item-box {
 				width: 100%;
 				height: 92rpx;
-				
+
 				border-radius: 200rpx;
 				line-height: 92rpx;
 				text-align: center;
 				margin-bottom: 24rpx;
 			}
 		}
-		.pop-msg{
+
+		.pop-msg {
+
 			// height: 70vh;
-			.head-pop{
+			.head-pop {
 				padding-bottom: 34rpx !important;
 				border-bottom: 1rpx solid #F2F2F2;
 			}
-			.list-box{
-				.list-box-img{
+
+			.list-box {
+				.list-box-img {
 					width: 80rpx;
 					height: 80rpx;
 					border-radius: 50%;
 					margin-right: 16rpx;
 				}
-				.only-box{
+
+				.only-box {
 					padding: 4rpx 16rpx;
-					background: rgba(65,171,245,0.1);
+					background: rgba(65, 171, 245, 0.1);
 					border-radius: 8rpx 8rpx 8rpx 8rpx;
 				}
-				.msg-img{
+
+				.msg-img {
 					width: 144rpx;
 					height: 144rpx;
 					border-radius: 12rpx;
-					margin-right:5rpx;
+					margin-right: 5rpx;
 					margin-bottom: 5rpx;
 				}
-					
-				.msg-img:nth-child(3n){
+
+				.msg-img:nth-child(3n) {
 					margin-right: 0rpx;
 				}
-				.msg-img-1{
+
+				.msg-img-1 {
 					width: 100rpx !important;
 					height: 100rpx !important;
 				}

+ 38 - 19
pages-school/school-circle.vue

@@ -1,24 +1,28 @@
 <template>
 	<view class="school-circle iPhone-bottom flex-common-css box-border-box ">
 		<image class="circle-add" src="@/static/img/school/add.png" mode="" @click="add()"></image>
-
 		<view class="bg-box"></view>
-
 		<Nav :leftShow='false' :customNav='true' bgckgroundBox='transparent'>
 			<template>
-				<view slot="custom" class="align-items-center">
-					<uni-icons type="left" size="20" @click="toBack()"></uni-icons>
-					<view class="w-390 text-overflow-ellipsis-one fs-36 fw-400">{{schoolData.school_name}}</view>
+				<view slot="custom" class="align-items-center flex-justify-center navCustom">
+					<view class="align-items-center nav-left" @click="toBack()">
+						<uni-icons type="left" size="20"></uni-icons>
+						<view class="fs-34">
+							返回
+						</view>
+					</view>
+					<view class="nav-title w-390 text-overflow-ellipsis-one text-align-center fs-36 fw-400">
+						{{schoolData.school_name}}</view>
 				</view>
 			</template>
 		</Nav>
-
-		<view class="ts-box mt-24 align-items-center box-border-box plr-12 mb-20">
-			<image src="@/static/img/school/ts.png" mode=""></image>
-			<view class="fs-26 fw-400 fc-FB3D03">{{alumni_str}}</view>
+		<view class="pl-24 pr-24 box-border-box">
+			<view class="ts-box mt-24 align-items-center box-border-box plr-12 mb-20">
+				<image src="@/static/img/school/ts.png" mode=""></image>
+				<view class="fs-26 fw-400 fc-FB3D03">{{alumni_str}}</view>
+			</view>
 		</view>
-
-		<view class="nav-box display-flex box-border-box mb-20">
+		<view class="nav-box display-flex mb-20 pl-24 pr-24 box-border-box">
 			<view class="nav-item view-nowrap" @click="selectTopicId(item.id)"
 				:class="fromData.topic_id == item.id?'h130':'bgc-f'" v-for="(item,i) in classList" :key="i">
 				<image v-if="item.id == 0" class="nav-icon" src="@/static/img/school/icon.png" mode=""></image>
@@ -29,8 +33,7 @@
 				</image>
 			</view>
 		</view>
-
-		<view class="flex-justify-space type-box mb-24">
+		<view class="flex-justify-space type-box mb-24 pl-24 pr-24 box-border-box">
 			<view class="display-flex">
 				<view @click="selectOrderBuy(1)" class="box-1" :class="fromData.orderBy == 1?'box-s':''">最新</view>
 				<view @click="selectOrderBuy(2)" class="box-1" :class="fromData.orderBy == 2?'box-s':''">最热</view>
@@ -48,7 +51,7 @@
 			</EnBlank>
 		</view>
 
-		<scroll-view v-else scroll-y="true" class="scroll-view-css" @scrolltolower="scrolltolower">
+		<scroll-view v-else scroll-y="true" class="scroll-view-css pl-24 pr-24 box-border-box bgc-F5F4F9" @scrolltolower="scrolltolower">
 			<view class="card-box box-border-box p-24 bgc-f flex-justify-space" v-for="(item,i) in list" :key="i"
 				@click.stop="toDet(item)">
 				<image class="card-head" :src="item.head_img" mode="scaleToFill"></image>
@@ -92,11 +95,11 @@
 							<uni-icons type="hand-up" size="22" :color="item.is_like==1?'#FD5C02':'#999'"></uni-icons>
 							<view class="fs-24 " :class="item.is_like==1?'fc-FD5C02':'fc-9'">{{item.like}}</view>
 						</view>
-						<view class="align-items-center" @click.stop="openMsg(item,0)">
+						<view class="align-items-center">
 							<image class="info-img" src="@/static/img/school/info.png" mode=""></image>
 							<view class="fs-24 fc-9">{{item.remark}}</view>
 						</view>
-						<image @click.stop="openRepot(item)" class="dian-img" src="@/static/img/school/dian.png"
+						<image @click.stop="openRepot(item)" class="info-img" src="@/static/img/school/dian.png"
 							mode=""></image>
 					</view>
 				</view>
@@ -640,10 +643,26 @@
 </script>
 <style>
 	body {
-		background: #fff;
+		background: linear-gradient(to bottom, #F5F4F9, #fff padding-bottom: env(safe-area-inset-bottom));
 	}
 </style>
 <style scoped lang="scss">
+	.navCustom {
+		position: relative;
+		width: 100%;
+	}
+
+	.nav-left {
+		position: absolute;
+		left: 0;
+	}
+
+	.nav-title {
+		// position: absolute;
+		// left: 50%;
+		// top: 20rpx;
+	}
+
 	.label-box {
 		padding: 0 12rpx;
 		height: 38rpx;
@@ -672,8 +691,8 @@
 	}
 
 	.school-circle {
-		padding-left: 24rpx;
-		padding-right: 24rpx;
+		// padding-left: 24rpx;
+		// padding-right: 24rpx;
 		position: relative;
 
 		.pop-h-20 {

+ 123 - 121
service/ajax.js

@@ -1,66 +1,68 @@
 import tools from "@/service/tools";
 
 
-let BASE_URL  = process.uniEnv.baseUrl;
+let BASE_URL = process.uniEnv.baseUrl;
 
 
 /**
  * post请求封装
  */
 export const request = (url, method, data, show = false) => {
-  let token=uni.getStorageSync('token')
-  data.token = token;
-  data.m_id = uni.getStorageSync('m_id')
-  if (show) {
-    tools.showLoading();
-  }
-  if (data === undefined) {
-    data = {};
-  }
-  return new Promise((resolve, reject) => {
-    // 封装主体:网络请求
-    uni.request({
-      url:BASE_URL+  url,
-      data: data,
-      method: method || 'post',
-      header: {
-        'content-type': 'application/json',
-        'hversion': '1.0',
-        'Authorization': token
-      },
-      success: (res) => {
-        if (res.statusCode === 200) {
-          tools.hideLoading();
-          if (res.data.code * 1 === 401) {
-            uni.clearStorageSync()
-			setTimeout(()=>{
-				uni.reLaunch({
-				  url: '/pages/login/index'
-				});
-			},500)
-           
-          } else if (res.data.code * 1 === 403) {
-           tools.error('请求过快!!')
-          }else {
-            resolve(res.data)
-          }
-        }else if(res.statusCode === 401){
-          uni.clearStorageSync()
-          uni.reLaunch({
-            url: '/pages/login/index'
-          });
-        } else{
-          tools.error('网络错误!!')
-        }
-      },
-      fail: (err) => {
-        tools.error('网络错误!!')
-        // 返回错误消息
-        reject(err)
-        tools.hideLoading();
-      }
-    })
-  })
+	let token = uni.getStorageSync('token')
+	data.token = token;
+	data.m_id = uni.getStorageSync('m_id')
+	if (show) {
+		tools.showLoading();
+	}
+	if (data === undefined) {
+		data = {};
+	}
+	return new Promise((resolve, reject) => {
+		// 封装主体:网络请求
+		uni.request({
+			url: BASE_URL + url,
+			data: data,
+			method: method || 'post',
+			header: {
+				'content-type': 'application/json',
+				'hversion': '1.0',
+				'Authorization': token
+			},
+			success: (res) => {
+				if (res.statusCode === 200) {
+					tools.hideLoading();
+					if (res.data.code * 1 === 401) {
+						uni.clearStorageSync()
+						setTimeout(() => {
+							uni.reLaunch({
+								url: '/pages/login/index'
+							});
+						}, 500)
+
+					} else if (res.data.code * 1 === 403) {
+						resolve(res.data)
+						tools.error('请求过快!!')
+					} else {
+						resolve(res.data)
+					}
+				} else if (res.statusCode === 401) {
+					uni.clearStorageSync()
+					uni.reLaunch({
+						url: '/pages/login/index'
+					});
+				} else {
+					resolve(res.data)
+					tools.error('网络错误!!')
+				}
+			},
+			fail: (err) => {
+				tools.error('网络错误!!')
+				// 返回错误消息
+				reject(err)
+				tools.hideLoading();
+			}
+		})
+	})
 }
 
 /**
@@ -68,76 +70,76 @@ export const request = (url, method, data, show = false) => {
  */
 
 export const uploadImage = (filePath, imageName, data) => {
-  tools.showLoading();
-  return new Promise((resolve, reject) => {
-    uni.uploadFile({
-      url: BASE_URL + '/api/common/upload',
-      // header: {
-      // 	'Authorization': JSON.parse(uni.getStorageSync('userInfo')).token
-      // },
-      filePath: filePath,
-      name: imageName,
-      formData: data,
-      success: (res) => {
-        tools.hideLoading();
-        resolve(res)
-      },
-      fail(err) {
-        tools.hideLoading();
-        reject(err)
-      }
-    });
-  })
+	tools.showLoading();
+	return new Promise((resolve, reject) => {
+		uni.uploadFile({
+			url: BASE_URL + '/api/common/upload',
+			// header: {
+			// 	'Authorization': JSON.parse(uni.getStorageSync('userInfo')).token
+			// },
+			filePath: filePath,
+			name: imageName,
+			formData: data,
+			success: (res) => {
+				tools.hideLoading();
+				resolve(res)
+			},
+			fail(err) {
+				tools.hideLoading();
+				reject(err)
+			}
+		});
+	})
 }
 
 
 export const uploadFile = (url, file) => {
-  tools.showLoading();
-  let token = uni.getStorageSync('token') || '';
-  // data.app_version = plus.runtime.version;
-  // console.log('请求地址-----------------------')
-  // console.log(BASE_URL + url)
-  // console.log('请求参数-----------------------')
-  // console.log(data)
-  console.log(file)
-  return new Promise((resolve, reject) => {
-    // 封装主体:网络请求
-    console.log(BASE_URL + url)
-    uni.uploadFile({
-      url: BASE_URL + url, //仅为示例,非真实的接口地址
-      filePath: file,
-      name: 'file',
-      header: {
-        'content-type': 'application/json',
-        'apikey': '01ABA77B8BA6F26243D85B5A50FFB88624951C7B3A4078B3F9971983E667D5B8',
-        'hversion': '1.0',
-        'Authorization': token
-      },
-      success: (res) => {
-        tools.hideLoading();
-        if (res.statusCode === 200) {
-          // console.log('应答信息-----------------------')
-          res.data = JSON.parse(res.data)
-          // console.log(res.data); // 控制台显示数据信息
-          if (res.data.code * 1 === 401) {
-            uni.reLaunch({
-              url: '/pages/login/login'
-            });
-          } else {
-            resolve(res.data)
-          }
-        } else {
-          tools.error('网络错误!!')
-        }
-      },
-      fail: (err) => {
-        tools.error('网络错误!!')
-        // 返回错误消息
-        reject(err)
-        tools.hideLoading();
-      }
-    });
+	tools.showLoading();
+	let token = uni.getStorageSync('token') || '';
+	// data.app_version = plus.runtime.version;
+	// console.log('请求地址-----------------------')
+	// console.log(BASE_URL + url)
+	// console.log('请求参数-----------------------')
+	// console.log(data)
+	console.log(file)
+	return new Promise((resolve, reject) => {
+		// 封装主体:网络请求
+		console.log(BASE_URL + url)
+		uni.uploadFile({
+			url: BASE_URL + url, //仅为示例,非真实的接口地址
+			filePath: file,
+			name: 'file',
+			header: {
+				'content-type': 'application/json',
+				'apikey': '01ABA77B8BA6F26243D85B5A50FFB88624951C7B3A4078B3F9971983E667D5B8',
+				'hversion': '1.0',
+				'Authorization': token
+			},
+			success: (res) => {
+				tools.hideLoading();
+				if (res.statusCode === 200) {
+					// console.log('应答信息-----------------------')
+					res.data = JSON.parse(res.data)
+					// console.log(res.data); // 控制台显示数据信息
+					if (res.data.code * 1 === 401) {
+						uni.reLaunch({
+							url: '/pages/login/login'
+						});
+					} else {
+						resolve(res.data)
+					}
+				} else {
+					tools.error('网络错误!!')
+				}
+			},
+			fail: (err) => {
+				tools.error('网络错误!!')
+				// 返回错误消息
+				reject(err)
+				tools.hideLoading();
+			}
+		});
 
-  })
+	})
 
-}
+}

+ 1 - 0
service/tools.js

@@ -18,6 +18,7 @@ tools.sortNumber = function (a, b) {
 
 // 查看大图
 tools.lookBigImg = function(i,value){
+	console.log(value, '111111111111');
 	let list = []
 	if(typeof(value) === 'string'){
 		list.push(value)

BIN
static/img/school/dian.png


BIN
static/img/school/fs.png