py hace 2 años
padre
commit
63e04ff3d3

+ 6 - 1
pages-address/edit-add.vue

@@ -135,7 +135,12 @@
 							uni.navigateBack({
 								delta: 1
 							});
-							uni.setStorageSync('isConfirmAddressFlag',true);
+							let addressData = {
+								flag: true,
+								is_default: this.fromData.is_default,
+								id: this.fromData.id
+							}
+							uni.setStorageSync('isConfirmAddressFlag',addressData);
 						},1500)
 					}else{
 						tools.error(res.msg);

+ 4 - 3
pages-my/my-publish.vue

@@ -30,7 +30,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="text-overflow-ellipsis-t item-content fs-30 fc-3 mb-16">
+					<view class="item-content fs-30 fc-3 mb-16">
 						{{item.content}}
 					</view>
 					<view class="item-img-box mb-20 align-items-center flex-wrap-wrap">
@@ -486,8 +486,9 @@
 
 <style lang="scss" scoped>
 	.item-content {
-		max-width: 558rpx;
-		white-space: nowrap;
+		width: 558rpx;
+		// white-space: nowrap;
+		word-wrap: break-word;
 	}
 
 	.content-box {

+ 8 - 0
pages-order/express-info.vue

@@ -212,6 +212,14 @@
 						点击查看
 					</view>
 				</view>
+				<view class="display-flex flex-justify-space mb-26" v-if="infoData.order_status == 4">
+					<view class="fs-28 fc-9">
+						完成时间
+					</view>
+					<view class="fs-28 fc-3 w-480 text-align-right">
+						{{infoData.finish_time}}
+					</view>
+				</view>
 				<view class="display-flex flex-justify-space mb-26">
 					<view class="fs-28 fc-9">
 						备注

+ 8 - 0
pages-order/takeout-info.vue

@@ -203,6 +203,14 @@
 						{{infoData.pay_type_str}}
 					</view>
 				</view>
+				<view class="display-flex flex-justify-space mb-26" v-if="infoData.order_status == 7">
+					<view class="fs-28 fc-9">
+						完成时间
+					</view>
+					<view class="fs-28 fc-3 w-480 text-align-right">
+						{{infoData.finish_time}}
+					</view>
+				</view>
 				<view class="display-flex flex-justify-space mb-26">
 					<view class="fs-28 fc-9">
 						备注

+ 738 - 728
pages-school/circle-info.vue

@@ -1,161 +1,171 @@
 <template>
-  <view class="circle-info-box iPhone-bottom flex-common-css box-border-box bgc-f">
-    <view class="nav-box bgc-f">
-      <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>
-            <view class="info-nav display-flex">
-              <image :src="obj.head_img" mode=""></image>
-              <view class="pb-5">
-                <view class="fs-28 fw-600 w348 text-overflow-ellipsis-one">{{obj.nickname||''}}</view>
-                <view class="fs-20 fc-9 fw-400 mb-10">{{obj.created_date||''}}</view>
-              </view>
-            </view>
-          </view>
-        </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="aspectFit" @click="lookImg(i,item)"></image>
-          </swiper-item>
-        </swiper>
-      </view>
-      <view class="box-border-box bz-box bgc-f b-b-F9F9F9 mt-24 mb-32">
-        <view class="fs-30 fw-600 mb-32 item-content">{{obj.content||''}}</view>
-        <view class="card-4 flex-wrap-wrap">
-          <view class="label-box align-items-center mr-20 b-rad-200 bgc-F2F2F2">
-            <image class="wz mr-8" src="@/static/img/my/wz-two.png" mode=""></image>
-            <view class="fs-24 fc-9">
-              {{obj.school_name||''}}
-            </view>
-          </view>
-          <view class="label-box align-items-center b-rad-200 bgc-F2F2F2">
-            <image class="wz mr-8" src="@/static/img/my/ht.png" mode=""></image>
-            <view class="fs-24 fc-9">
-              {{obj.topic_name||''}}
-            </view>
-          </view>
-        </view>
-      </view>
-      <view class="fs-32 fc-3 fw-600 mb-16 plr-32 box-border-box">
-        评论<text class="fs-24 fc-9">({{obj.remark}})</text>
-      </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="item.head_img" 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>
-                  <view class="fs-30 fw-400 mb-8" @click.stop="openInput(1,item,i,i)">
-                    {{item.content}}
-                  </view>
-                  <view class="align-items-center mb-8">
-                    <view class="fs-24 fw-400 fc-9">{{item.created_date}}</view>
-                    <uni-icons class="ml-10" v-if="item.is_self == 1" @click="delInfo(item, i, 1, i)" type="trash"
-                      size="18" color="#BFBFBF"></uni-icons>
-                  </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>
-              </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.count > 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">
-                          <view class="">
-                            {{info.nickname}}
-                          </view>
-                          <span v-if="info.is_author == 1"
-                            class='only-box text-align-center fs-24 fc-41ABF5 ml-10'>作者</span>
-                        </view>
-                        <view class="fs-30 fw-400 mb-8" @click.stop="openInput(2,info,index,i)">
-                          {{info.content}}
-                        </view>
-                        <view class="align-items-center mb-8">
-                          <view class="fs-24 fw-400 fc-9 ">{{info.created_date}}</view>
-                          <uni-icons type="trash" size="18" class="ml-10" v-if="info.is_self == 1"
-                            @click="delInfo(info, index, 2 ,i)" color="#BFBFBF"></uni-icons>
-                        </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>
-                <view v-if="item.replyList.length>0 && item.replyList.length < item.count  && item.count > 10"
-                  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 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,'','','')"
+	<view class="circle-info-box iPhone-bottom flex-common-css box-border-box bgc-f">
+		<view class="nav-box bgc-f">
+			<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>
+						<view class="info-nav display-flex">
+							<image :src="obj.head_img" mode=""></image>
+							<view class="pb-5">
+								<view class="fs-28 fw-600 w348 text-overflow-ellipsis-one">{{obj.nickname||''}}</view>
+								<view class="fs-20 fc-9 fw-400 mb-10">{{obj.created_date||''}}</view>
+							</view>
+						</view>
+					</view>
+				</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="aspectFit" @click="lookImg(i,item)"></image>
+					</swiper-item>
+				</swiper>
+			</view>
+			<view class="box-border-box bz-box bgc-f b-b-F9F9F9 mt-24 mb-32">
+				<view class="fs-30 fw-600 mb-32 item-content">{{obj.content||''}}</view>
+				<view class="card-4 flex-wrap-wrap">
+					<view class="label-box align-items-center mr-20 b-rad-200 bgc-F2F2F2">
+						<image class="wz mr-8" src="@/static/img/my/wz-two.png" mode=""></image>
+						<view class="fs-24 fc-9">
+							{{obj.school_name||''}}
+						</view>
+					</view>
+					<view class="label-box align-items-center b-rad-200 bgc-F2F2F2">
+						<image class="wz mr-8" src="@/static/img/my/ht.png" mode=""></image>
+						<view class="fs-24 fc-9">
+							{{obj.topic_name||''}}
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="fs-32 fc-3 fw-600 mb-16 plr-32 box-border-box">
+				评论<text class="fs-24 fc-9">({{obj.remark}})</text>
+			</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="item.head_img" 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>
+									<view class="fs-30 fw-400 mb-8" @click.stop="openInput(1,item,i,i)">
+										{{item.content}}
+									</view>
+									<view class="align-items-center mb-8">
+										<view class="fs-24 fw-400 fc-9">{{item.created_date}}</view>
+										<uni-icons class="ml-10" v-if="item.is_self == 1"
+											@click="delInfo(item, i, 1, i)" type="trash" size="18"
+											color="#BFBFBF"></uni-icons>
+									</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>
+							</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.count > 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">
+													<view class="">
+														{{info.nickname}}
+													</view>
+													<span v-if="info.is_author == 1"
+														class='only-box text-align-center fs-24 fc-41ABF5 ml-10'>作者</span>
+												</view>
+												<view class="fs-30 fw-400 mb-8" @click.stop="openInput(2,info,index,i)">
+													{{info.content}}
+												</view>
+												<view class="align-items-center mb-8">
+													<view class="fs-24 fw-400 fc-9 ">{{info.created_date}}</view>
+													<uni-icons type="trash" size="18" class="ml-10"
+														v-if="info.is_self == 1" @click="delInfo(info, index, 2 ,i)"
+														color="#BFBFBF"></uni-icons>
+												</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>
+								<view
+									v-if="item.replyList.length>0 && item.replyList.length < item.count  && item.count > 10"
+									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 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)' /> -->
-      <!-- 			<textarea class="fs-input fs-36 fc-3" :focus='focus' v-model="msgData.content"
+			<!-- 			<textarea class="fs-input fs-36 fc-3" :focus='focus' v-model="msgData.content"
 				@click.stop="openInput(0,'','','')" @focus='inputFocus(true)' @blur='inputFocus(false)' auto-height /> -->
-      <view class="display-flex flex-shrink0">
-        <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="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>
-      <!-- <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="text-align-right mb-20 fs-30 fc-41ABF5" @click.stop="save()">
-          发送
-        </view>
-        <textarea class="fs-input fs-28 fc-3" :focus='focus' v-model="msgData.content" placeholder='友善评论,文明发言'
-          maxlength="100" placeholder-class='fs-28 fc-9 fw-600' @focus='inputFocus(true)' @blur='inputFocus(false)'
-          @keyboardheightchange='keyboardheightchange' />
-        <view :style="[{'height': KeyboardHeight +'px'}]"> </view>
-        <!-- 				<input class="fs-input" focus type="text" />
+			<view class="display-flex flex-shrink0">
+				<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="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>
+			<!-- <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="text-align-right mb-20 fs-30 fc-41ABF5" @click.stop="save()">
+					发送
+				</view>
+				<textarea class="fs-input fs-28 fc-3" :focus='focus' v-model="msgData.content" placeholder='友善评论,文明发言'
+					maxlength="100" placeholder-class='fs-28 fc-9 fw-600' @focus='inputFocus(true)'
+					@blur='inputFocus(false)' @keyboardheightchange='keyboardheightchange' />
+				<view :style="[{'height': KeyboardHeight +'px'}]"> </view>
+				<!-- 				<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>
@@ -171,582 +181,582 @@
 				<view class="box-border-box p-24">
 					<view class="save-box" @click.stop="save()">评论</view>
 				</view> -->
-      </view>
-    </uni-popup>
-
-    <uni-popup ref="popupRepot" type="bottom">
-      <view class="pop-box pop-h-30 box-border-box p-24" :style="'bottom:'+KeyboardHeight+'px;'">
-        <view class="head-pop flex-justify-space align-items-center mb-24">
-          <uni-icons @click.stop="closePop(1)" type="closeempty" size="24"></uni-icons>
-          <view class="fs-36 fc-0 fw-600">请输入举报内容</view>
-          <view class="fs-28 fw-600 fc-41ABF5" @click.stop="closePop(2)">确定</view>
-        </view>
-        <view class="scroll-view-css">
-          <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 fc-3 fw-600 fc-f">确认举报</view> -->
-      </view>
-    </uni-popup>
-  </view>
+			</view>
+		</uni-popup>
+
+		<uni-popup ref="popupRepot" type="bottom">
+			<view class="pop-box pop-h-30 box-border-box p-24" :style="'bottom:'+KeyboardHeight+'px;'">
+				<view class="head-pop flex-justify-space align-items-center mb-24">
+					<uni-icons @click.stop="closePop(1)" type="closeempty" size="24"></uni-icons>
+					<view class="fs-36 fc-0 fw-600">请输入举报内容</view>
+					<view class="fs-28 fw-600 fc-41ABF5" @click.stop="closePop(2)">确定</view>
+				</view>
+				<view class="scroll-view-css">
+					<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 fc-3 fw-600 fc-f">确认举报</view> -->
+			</view>
+		</uni-popup>
+	</view>
 </template>
 
 <script>
-  import EnBlank from "@/components/en-utils/en-blank/en-blank";
-  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: [],
-        },
-        list: [],
-        page: 1,
-        total: 0,
-
-        // 发起评论
-        msgData: {
-          news_id: '',
-          remark_id: '',
-          content: '',
-          reply_id: '',
-        },
-        // 回复评论
-        replyData: {
-          page: 1,
-        },
-        // 举报
-        reportData: {
-          news_id: '',
-          content: '',
-        },
-        focus: false,
-        msgType: 0, // 消息类型
-        msgIndex: 0, // 列表一级索引
-        msgI: 0,
-        KeyboardHeight: 0, // 键盘高度
-        // showKeyNum: 0, //键盘打开的次数
-        remark: ''
-      }
-    },
-    onLoad(e) {
-      this.news_id = e.news_id;
-      this.msgData.news_id = e.news_id;
-      this.getInfo();
-      this.getList();
-      uni.onKeyboardHeightChange(res => {
-        console.log('log', res);
-        this.KeyboardHeight = res.height
-      })
-    },
-    onUnload() {
-      const circleDataUp = {}
-      alumnInfo({
-        news_id: this.news_id
-      }).then((res) => {
-        if (res.code === 1) {
-          circleDataUp.news_id = res.data.news_id
-          circleDataUp.like = res.data.like
-          circleDataUp.remark = res.data.remark
-          circleDataUp.heat = res.data.heat
-          circleDataUp.is_like = res.data.is_like
-          uni.$emit('circleDataUp', circleDataUp)
-        }
-      })
-      // const circleDataUp = {
-      // 	news_id: this.obj.news_id,
-      // 	like: this.obj.like,
-      // 	remark: list.length,
-      // 	heat: this.obj.heat
-      // }
-      console.log("监听页面卸载");
-    },
-    methods: {
-      // keyboardheightchange(e) {
-      // 	this.keyboardHeight = e.detail.height;
-      // 	console.log(this.keyboardHeight, '1111111111');
-      // 	this.showKeyNum++;
-      // 	setTimeout(() => {
-      // 		uni.pageScrollTo({
-      // 			scrollTop: 2000
-      // 		});
-      // 	}, 200)
-      // },
-      // hideBorad() {
-      // 	this.showKeyNum = 2;
-      // 	this.keyboardHeight = 0;
-      // },
-      inputFocus(type) {
-        if (!type) {
-          this.focus = false
-          // this.hideBorad()
-        }
-        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) {
-            this.obj = res.data;
-          } else {
-            tools.error(res.msg)
-            setTimeout(() => {
-              uni.navigateBack({
-                delta: 1
-              })
-            }, 1500)
-          }
-        })
-      },
-      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];
-            this.total = res.data.total;
-            this.list.forEach((v) => {
-              v.replyList = [];
-              if (v.count > 0) {
-                v.isOpen = true;
-              }
-            })
-          }
-        })
-      },
-      // 获取回复列表
-      openReply(type, item) {
-        // type 1获取其他 2加载更多
-        if (this.isAJAX) {
-          return
-        }
-        this.isAJAX = true;
-        if (type == 1) {
-          item.replyList = [];
-          this.replyData.page = 1;
-        } 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) {
-            this.isAJAX = false;
-            item.replyList = [...item.replyList, ...res.data.items];
-            item.isOpen = false;
-          } else {
-            this.isAJAX = false;
-            tools.error(res.msg)
-          }
-        })
-      },
-
-      // 点赞
-      handUp(type, item) {
-        if (this.isAJAX) {
-          return
-        }
-        this.isAJAX = true;
-        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)
-          })
-        } else {
-          // 点赞评论
-          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) {
-          item.is_like = is_like;
-          if (is_like == 0) {
-            item.like -= 1
-          } else {
-            item.like += 1
-          }
-          this.isAJAX = false;
-          tools.success(res.msg);
-        } else {
-          this.isAJAX = false;
-          tools.error(res.msg);
-        }
-      },
-      openInput(type, item, index, i) {
-        console.log(index, i, '$$$$$$$$$$$$$$$$$');
-        this.msgIndex = index
-        this.msgType = type
-        this.msgI = i
-        if (type == 0) {
-          this.msgData.remark_id = 0;
-        } else if (type == 1) {
-          this.msgData.remark_id = item.id;
-          this.msgData.reply_id = item.m_id;
-        } else {
-          this.msgData.remark_id = item.remark_id;
-          this.msgData.reply_id = item.m_id;
-        }
-        this.$refs.popup.open();
-        setTimeout(() => {
-          this.focus = true
-          // this.$forceUpdate()
-        }, 500);
-
-        // console.log(this.focus, '是否聚焦');
-      },
-      closeInput() {
-        this.$refs.popup.close();
-        this.msgData.remark_id = '';
-        this.msgData.content = '';
-        this.msgData.reply_id = '';
-      },
-      save() {
-        if (this.isAJAX) {
-          return
-        }
-        this.isAJAX = true;
-        setCreateRemark(this.msgData).then((res) => {
-          if (res.code == 1) {
-            tools.success('评论成功')
-            setTimeout(() => {
-              this.isAJAX = false;
-              this.closeInput()
-              console.log(this.msgType)
-              if (this.msgType == 0) {
-                this.list.unshift(res.data)
-                this.$forceUpdate()
-              } else if (this.msgType == 1) {
-                let replyList = []
-                  ++this.list[this.msgI].count
-                console.log(this.list[this.msgIndex], '二级');
-                if (this.list[this.msgIndex].replyList) {
-                  this.list[this.msgIndex].replyList.push(res.data)
-                } else {
-                  this.list[this.msgIndex].replyList = replyList
-                  this.list[this.msgIndex].replyList.push(res.data)
-                  this.$forceUpdate()
-                }
-              } else {
-                console.log(this.list[this.msgIndex]);
-                ++this.list[this.msgI].count
-                this.list[this.msgI].replyList.push(res.data)
-                this.$forceUpdate()
-              }
-              console.log(this.list[this.msgIndex]);
-              this.msgIndex = 0
-              this.msgType = 0
-              this.msgI = 0
-              // this.list = [];
-              // this.page = 1;
-              // this.getList();
-              this.getInfo();
-
-              // remark
-            }, 1500)
-          } else {
-            this.isAJAX = false;
-            tools.error(res.msg)
-          }
-        })
-      },
-      delInfo(item, index, type, i) {
-        if (this.isAJAX) {
-          return
-        }
-        this.isAJAX = true;
-        delRemark({
-          remark_id: item.id
-        }).then((res) => {
-          if (res.code === 1) {
-            tools.success('删除成功')
-            setTimeout(() => {
-              this.isAJAX = false;
-              console.log(this.list[i], '88888888888888888');
-              --this.list[i].count
-              if (type == 1) {
-                this.list.splice(index, 1)
-              } else {
-                this.list[i].replyList.splice(index, 1)
-              }
-              // this.list = [];
-              // this.page = 1;
-              // this.getList();
-              this.getInfo();
-            }, 1500)
-          } else {
-            this.isAJAX = false;
-            tools.error(res.msg)
-          }
-        })
-      },
-
-      // 打开举报
-      openRepot(item) {
-        this.reportData.news_id = item.news_id;
-        this.$refs.popupRepot.open();
-      },
-      // 举报
-      closePop(type) {
-        if (type === 1) {
-          this.reportData.news_id = '';
-          this.reportData.content = '';
-          this.$refs.popupRepot.close();
-        } else {
-          if (this.isAJAX) {
-            return
-          }
-          this.isAJAX = true;
-          alumniReport(this.reportData).then((res) => {
-            if (res.code === 1) {
-              tools.success(res.msg)
-              setTimeout(() => {
-                this.isAJAX = false;
-                this.closePop(1);
-              }, 1000)
-            } else {
-              tools.error(res.msg);
-              this.isAJAX = false;;
-            }
-          })
-        }
-      },
-    },
-  }
+	import EnBlank from "@/components/en-utils/en-blank/en-blank";
+	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: [],
+				},
+				list: [],
+				page: 1,
+				total: 0,
+
+				// 发起评论
+				msgData: {
+					news_id: '',
+					remark_id: '',
+					content: '',
+					reply_id: '',
+				},
+				// 回复评论
+				replyData: {
+					page: 1,
+				},
+				// 举报
+				reportData: {
+					news_id: '',
+					content: '',
+				},
+				focus: false,
+				msgType: 0, // 消息类型
+				msgIndex: 0, // 列表一级索引
+				msgI: 0,
+				KeyboardHeight: 0, // 键盘高度
+				// showKeyNum: 0, //键盘打开的次数
+				remark: ''
+			}
+		},
+		onLoad(e) {
+			this.news_id = e.news_id;
+			this.msgData.news_id = e.news_id;
+			this.getInfo();
+			this.getList();
+			uni.onKeyboardHeightChange(res => {
+				console.log('log', res);
+				this.KeyboardHeight = res.height
+			})
+		},
+		onUnload() {
+			const circleDataUp = {}
+			alumnInfo({
+				news_id: this.news_id
+			}).then((res) => {
+				if (res.code === 1) {
+					circleDataUp.news_id = res.data.news_id
+					circleDataUp.like = res.data.like
+					circleDataUp.remark = res.data.remark
+					circleDataUp.heat = res.data.heat
+					circleDataUp.is_like = res.data.is_like
+					uni.$emit('circleDataUp', circleDataUp)
+				}
+			})
+			// const circleDataUp = {
+			// 	news_id: this.obj.news_id,
+			// 	like: this.obj.like,
+			// 	remark: list.length,
+			// 	heat: this.obj.heat
+			// }
+			console.log("监听页面卸载");
+		},
+		methods: {
+			// keyboardheightchange(e) {
+			// 	this.keyboardHeight = e.detail.height;
+			// 	console.log(this.keyboardHeight, '1111111111');
+			// 	this.showKeyNum++;
+			// 	setTimeout(() => {
+			// 		uni.pageScrollTo({
+			// 			scrollTop: 2000
+			// 		});
+			// 	}, 200)
+			// },
+			// hideBorad() {
+			// 	this.showKeyNum = 2;
+			// 	this.keyboardHeight = 0;
+			// },
+			inputFocus(type) {
+				if (!type) {
+					this.focus = false
+					// this.hideBorad()
+				}
+				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) {
+						this.obj = res.data;
+					} else {
+						tools.error(res.msg)
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1
+							})
+						}, 1500)
+					}
+				})
+			},
+			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];
+						this.total = res.data.total;
+						this.list.forEach((v) => {
+							v.replyList = [];
+							if (v.count > 0) {
+								v.isOpen = true;
+							}
+						})
+					}
+				})
+			},
+			// 获取回复列表
+			openReply(type, item) {
+				// type 1获取其他 2加载更多
+				if (this.isAJAX) {
+					return
+				}
+				this.isAJAX = true;
+				if (type == 1) {
+					item.replyList = [];
+					this.replyData.page = 1;
+				} 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) {
+						this.isAJAX = false;
+						item.replyList = [...item.replyList, ...res.data.items];
+						item.isOpen = false;
+					} else {
+						this.isAJAX = false;
+						tools.error(res.msg)
+					}
+				})
+			},
+
+			// 点赞
+			handUp(type, item) {
+				if (this.isAJAX) {
+					return
+				}
+				this.isAJAX = true;
+				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)
+					})
+				} else {
+					// 点赞评论
+					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) {
+					item.is_like = is_like;
+					if (item.is_like == 0 && item.like > 0) {
+						item.like -= 1
+					} else {
+						item.like += 1
+					}
+					this.isAJAX = false;
+					tools.success(res.msg);
+				} else {
+					this.isAJAX = false;
+					tools.error(res.msg);
+				}
+			},
+			openInput(type, item, index, i) {
+				console.log(index, i, '$$$$$$$$$$$$$$$$$');
+				this.msgIndex = index
+				this.msgType = type
+				this.msgI = i
+				if (type == 0) {
+					this.msgData.remark_id = 0;
+				} else if (type == 1) {
+					this.msgData.remark_id = item.id;
+					this.msgData.reply_id = item.m_id;
+				} else {
+					this.msgData.remark_id = item.remark_id;
+					this.msgData.reply_id = item.m_id;
+				}
+				this.$refs.popup.open();
+				setTimeout(() => {
+					this.focus = true
+					// this.$forceUpdate()
+				}, 500);
+
+				// console.log(this.focus, '是否聚焦');
+			},
+			closeInput() {
+				this.$refs.popup.close();
+				this.msgData.remark_id = '';
+				this.msgData.content = '';
+				this.msgData.reply_id = '';
+			},
+			save() {
+				if (this.isAJAX) {
+					return
+				}
+				this.isAJAX = true;
+				setCreateRemark(this.msgData).then((res) => {
+					if (res.code == 1) {
+						tools.success('评论成功')
+						setTimeout(() => {
+							this.isAJAX = false;
+							this.closeInput()
+							console.log(this.msgType)
+							if (this.msgType == 0) {
+								this.list.unshift(res.data)
+								this.$forceUpdate()
+							} else if (this.msgType == 1) {
+								let replyList = []
+									++this.list[this.msgI].count
+								console.log(this.list[this.msgIndex], '二级');
+								if (this.list[this.msgIndex].replyList) {
+									this.list[this.msgIndex].replyList.push(res.data)
+								} else {
+									this.list[this.msgIndex].replyList = replyList
+									this.list[this.msgIndex].replyList.push(res.data)
+									this.$forceUpdate()
+								}
+							} else {
+								console.log(this.list[this.msgIndex]);
+								++this.list[this.msgI].count
+								this.list[this.msgI].replyList.push(res.data)
+								this.$forceUpdate()
+							}
+							console.log(this.list[this.msgIndex]);
+							this.msgIndex = 0
+							this.msgType = 0
+							this.msgI = 0
+							// this.list = [];
+							// this.page = 1;
+							// this.getList();
+							this.getInfo();
+
+							// remark
+						}, 1500)
+					} else {
+						this.isAJAX = false;
+						tools.error(res.msg)
+					}
+				})
+			},
+			delInfo(item, index, type, i) {
+				if (this.isAJAX) {
+					return
+				}
+				this.isAJAX = true;
+				delRemark({
+					remark_id: item.id
+				}).then((res) => {
+					if (res.code === 1) {
+						tools.success('删除成功')
+						setTimeout(() => {
+							this.isAJAX = false;
+							console.log(this.list[i], '88888888888888888');
+							--this.list[i].count
+							if (type == 1) {
+								this.list.splice(index, 1)
+							} else {
+								this.list[i].replyList.splice(index, 1)
+							}
+							// this.list = [];
+							// this.page = 1;
+							// this.getList();
+							this.getInfo();
+						}, 1500)
+					} else {
+						this.isAJAX = false;
+						tools.error(res.msg)
+					}
+				})
+			},
+
+			// 打开举报
+			openRepot(item) {
+				this.reportData.news_id = item.news_id;
+				this.$refs.popupRepot.open();
+			},
+			// 举报
+			closePop(type) {
+				if (type === 1) {
+					this.reportData.news_id = '';
+					this.reportData.content = '';
+					this.$refs.popupRepot.close();
+				} else {
+					if (this.isAJAX) {
+						return
+					}
+					this.isAJAX = true;
+					alumniReport(this.reportData).then((res) => {
+						if (res.code === 1) {
+							tools.success(res.msg)
+							setTimeout(() => {
+								this.isAJAX = false;
+								this.closePop(1);
+							}, 1000)
+						} else {
+							tools.error(res.msg);
+							this.isAJAX = false;;
+						}
+					})
+				}
+			},
+		},
+	}
 </script>
 
 <style scoped lang="scss">
-  .item-content {
-    word-wrap: break-word;
-  }
-
-  .label-box {
-    padding: 0 12rpx;
-    height: 38rpx;
-    line-height: 38rpx;
-  }
-
-  .wz {
-    width: 32rpx;
-    height: 32rpx;
-  }
-
-  .fs-input {
-    flex: 1;
-    width: 100%;
-    height: 170rpx !important;
-    // line-height: 72rpx;
-    background: #F2F2F2;
-    border-radius: 20rpx;
-    box-sizing: border-box;
-    padding: 20rpx 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 {
-      height: 98rpx;
-      padding: 9rpx 24rpx 9rpx 32rpx;
-
-      image {
-        width: 40rpx;
-        height: 40rpx;
-        margin-right: 8rpx;
-
-      }
-    }
-
-    .w348 {
-      width: 348rpx;
-    }
-
-    .nav-box {
-      z-index: 99;
-      padding-bottom: 10rpx;
-
-      .nav-img {
-        width: 56rpx;
-        height: 56rpx;
-        margin-right: 30rpx;
-      }
-
-      .info-nav {
-        image {
-          width: 64rpx;
-          height: 64rpx;
-          border-radius: 50%;
-          margin-right: 20rpx;
-        }
-      }
-    }
-
-    .swiper {
-      width: 100%rpx;
-      height: 920rpx;
-
-      .swiper-item {
-        width: 100%;
-        height: 920rpx;
-        // background-color: skyblue;
-      }
-    }
-
-    .bz-box {
-      padding: 0 32rpx 20rpx 32rpx;
-
-      .card-4 {
-        // view {
-        // 	padding: 4rpx 16rpx;
-        // 	background: #F2F2F2;
-        // 	border-radius: 200rpx;
-        // 	font-size: 24rpx;
-        // 	color: #999;
-        // 	margin-right: 20rpx;
-        // 	margin-bottom: 10rpx;
-        // }
-      }
-    }
-
-    .pop-input {
-      width: 100%;
-      height: auto;
-      background-color: #fff;
-      border-top: 1rpx solid #ccc;
-      padding: 15rpx 24rpx;
-      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 {
-
-      width: 100%;
-      height: 50vh;
-      background-color: #fff;
-      border-radius: 24rpx 24rpx 0rpx 0rpx;
-      display: flex;
-      flex-direction: column;
-
-      .item-box {
-        width: 100%;
-        height: 92rpx;
-
-        border-radius: 200rpx;
-        line-height: 92rpx;
-        text-align: center;
-        margin-bottom: 24rpx;
-      }
-    }
-
-    .pop-msg {
-
-      // height: 70vh;
-      .head-pop {
-        padding-bottom: 34rpx !important;
-        border-bottom: 1rpx solid #F2F2F2;
-      }
-
-      .list-box {
-        .list-box-img {
-          width: 80rpx;
-          height: 80rpx;
-          border-radius: 50%;
-          margin-right: 16rpx;
-        }
-
-        .only-box {
-          padding: 4rpx 16rpx;
-          background: rgba(65, 171, 245, 0.1);
-          border-radius: 8rpx 8rpx 8rpx 8rpx;
-        }
-
-        .msg-img {
-          width: 144rpx;
-          height: 144rpx;
-          border-radius: 12rpx;
-          margin-right: 5rpx;
-          margin-bottom: 5rpx;
-        }
-
-        .msg-img:nth-child(3n) {
-          margin-right: 0rpx;
-        }
-
-        .msg-img-1 {
-          width: 100rpx !important;
-          height: 100rpx !important;
-        }
-      }
-    }
-  }
-</style>
+	.item-content {
+		word-wrap: break-word;
+	}
+
+	.label-box {
+		padding: 0 12rpx;
+		height: 38rpx;
+		line-height: 38rpx;
+	}
+
+	.wz {
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.fs-input {
+		flex: 1;
+		width: 100%;
+		height: 170rpx !important;
+		// line-height: 72rpx;
+		background: #F2F2F2;
+		border-radius: 20rpx;
+		box-sizing: border-box;
+		padding: 20rpx 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 {
+			height: 98rpx;
+			padding: 9rpx 24rpx 9rpx 32rpx;
+
+			image {
+				width: 40rpx;
+				height: 40rpx;
+				margin-right: 8rpx;
+
+			}
+		}
+
+		.w348 {
+			width: 348rpx;
+		}
+
+		.nav-box {
+			z-index: 99;
+			padding-bottom: 10rpx;
+
+			.nav-img {
+				width: 56rpx;
+				height: 56rpx;
+				margin-right: 30rpx;
+			}
+
+			.info-nav {
+				image {
+					width: 64rpx;
+					height: 64rpx;
+					border-radius: 50%;
+					margin-right: 20rpx;
+				}
+			}
+		}
+
+		.swiper {
+			width: 100%rpx;
+			height: 920rpx;
+
+			.swiper-item {
+				width: 100%;
+				height: 920rpx;
+				// background-color: skyblue;
+			}
+		}
+
+		.bz-box {
+			padding: 0 32rpx 20rpx 32rpx;
+
+			.card-4 {
+				// view {
+				// 	padding: 4rpx 16rpx;
+				// 	background: #F2F2F2;
+				// 	border-radius: 200rpx;
+				// 	font-size: 24rpx;
+				// 	color: #999;
+				// 	margin-right: 20rpx;
+				// 	margin-bottom: 10rpx;
+				// }
+			}
+		}
+
+		.pop-input {
+			width: 100%;
+			height: auto;
+			background-color: #fff;
+			border-top: 1rpx solid #ccc;
+			padding: 15rpx 24rpx;
+			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 {
+
+			width: 100%;
+			height: 50vh;
+			background-color: #fff;
+			border-radius: 24rpx 24rpx 0rpx 0rpx;
+			display: flex;
+			flex-direction: column;
+
+			.item-box {
+				width: 100%;
+				height: 92rpx;
+
+				border-radius: 200rpx;
+				line-height: 92rpx;
+				text-align: center;
+				margin-bottom: 24rpx;
+			}
+		}
+
+		.pop-msg {
+
+			// height: 70vh;
+			.head-pop {
+				padding-bottom: 34rpx !important;
+				border-bottom: 1rpx solid #F2F2F2;
+			}
+
+			.list-box {
+				.list-box-img {
+					width: 80rpx;
+					height: 80rpx;
+					border-radius: 50%;
+					margin-right: 16rpx;
+				}
+
+				.only-box {
+					padding: 4rpx 16rpx;
+					background: rgba(65, 171, 245, 0.1);
+					border-radius: 8rpx 8rpx 8rpx 8rpx;
+				}
+
+				.msg-img {
+					width: 144rpx;
+					height: 144rpx;
+					border-radius: 12rpx;
+					margin-right: 5rpx;
+					margin-bottom: 5rpx;
+				}
+
+				.msg-img:nth-child(3n) {
+					margin-right: 0rpx;
+				}
+
+				.msg-img-1 {
+					width: 100rpx !important;
+					height: 100rpx !important;
+				}
+			}
+		}
+	}
+</style>

+ 2 - 2
pages-school/school-circle.vue

@@ -70,7 +70,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="card-2 fs-30 fw-400 mb-16 text-overflow-ellipsis" style="width: 560rpx;">
+					<view class="card-2 fs-30 fw-400 mb-16" style="width: 560rpx;">
 						{{item.content}}
 					</view>
 					<view class="card-3 flex-wrap-wrap mb-32" style="width: 560rpx;">
@@ -659,7 +659,7 @@
 </style>
 <style scoped lang="scss">
 	.card-2{
-		white-space: nowrap;
+		word-wrap: break-word;
 	}
 	.navCustom {
 		position: relative;

+ 1 - 1
pages-takeout/confirm-mod/select-address.vue

@@ -70,7 +70,7 @@
 					if(res.code === 1){
 						this.list = res.data;
 						let isConfirmAddressFlag = uni.getStorageSync('isConfirmAddressFlag');
-						if (isConfirmAddressFlag && AddressId) {
+						if (isConfirmAddressFlag.flag && AddressId) {
 							let item = ''
 							res.data.forEach((v,k) => {
 								if(v.id == AddressId){

+ 15 - 23
pages-takeout/confirm-order.vue

@@ -2,7 +2,6 @@
 	<view class="confirm-order-box iPhone-bottom flex-common-css box-border-box">
 		<view class="bg-box"></view>
 		<Nav title='提交订单' bgckgroundBox='transparent'></Nav>
-
 		<view class="scroll-view-css box-border-box p-24">
 			<view class="box-card box-border-box mb-20 bgc-f">
 				<view class="box-input box-border-box p-b-20 mb-20" @click="selectFun(2)">
@@ -31,10 +30,7 @@
 							v-for="(item,i) in fromData.pickup_code" :key="i">{{item}}</view>
 					</view>
 				</view>
-
 			</view>
-
-
 			<view class="box-card box-border-box bgc-f mb-20">
 				<view class="mb-32 b-b-F9F9F9">
 					<view class="flex-justify-space mb-28" v-for="(item,i) in cardData.goods_list" :key="i">
@@ -64,8 +60,6 @@
 						class="fw-600 fc-0 fs-44">{{((cardData.total_price - quanMoney) < 0?'0':(cardData.total_price - quanMoney)||0).toFixed(2)}}</span>
 				</view>
 			</view>
-
-
 			<view class="box-card box-border-box bgc-f mb-20">
 				<view class="flex-justify-space b-b-F9F9F9  mb-24">
 					<view class="fs-28 fw-600 w158 mr-12">备注</view>
@@ -73,9 +67,6 @@
 				</view>
 				<view class="p-b-20"></view>
 			</view>
-
-
-
 			<view class="box-card box-border-box mb-20 bgc-f flex-justify-space">
 				<view class="fs-28 fw-600 w158">支付方式</view>
 				<view class="wx-box display-flex">
@@ -84,7 +75,6 @@
 				</view>
 			</view>
 		</view>
-
 		<view class="bottom-box box-border-box p-24">
 			<view class="flex-justify-space">
 				<view class="align-items-flex-end box-1">
@@ -95,8 +85,6 @@
 				<view class="text-align-center box-2 fs-32 fc-f fw-600" @click="toSave()">立即支付</view>
 			</view>
 		</view>
-
-
 		<Coupon ref="coupon" @giveCouPon='giveCouPon'></Coupon>
 		<SelectAddress ref="selectAddress" @giveAddress='giveAddress'></SelectAddress>
 		<Time ref="selectTime" @giveTime='giveTime'></Time>
@@ -116,14 +104,11 @@
 	import {
 		getShopIngList
 	} from '@/api/shopping.js'
-
-
 	import tools from "@/service/tools";
 	import Coupon from './confirm-mod/dryClean-coupon.vue';
 	import SelectAddress from './confirm-mod/select-address.vue';
 	import Time from './confirm-mod/time.vue';
 	import EditCode from './confirm-mod/edit-code.vue';
-
 	export default {
 		components: {
 			Coupon,
@@ -165,10 +150,13 @@
 		},
 		onShow() {
 			let isConfirmAddressFlag = uni.getStorageSync('isConfirmAddressFlag');
-			if (isConfirmAddressFlag) {
-				this.selectFun(2);
+			if (isConfirmAddressFlag.flag) {
+				this.selectFun(2,isConfirmAddressFlag);
 			}
 		},
+		onUnload() {
+			uni.removeStorageSync('isConfirmAddressFlag')
+		},
 		methods: {
 			// 获取购物车
 			getCard() {
@@ -195,7 +183,7 @@
 				})
 			},
 
-			selectFun(type) {
+			selectFun(type,addressData) {
 				if (type === 1) {
 					// 选择优惠券
 					this.$refs.coupon.getList(this.type, this.fromData.coupon_id);
@@ -204,7 +192,12 @@
 					if (this.addressData.id) {
 						this.$refs.selectAddress.id = this.addressData.id;
 					}
-					this.$refs.selectAddress.getList(this.addressData.id);
+					if (addressData && addressData.is_default == 1) {
+						this.$refs.selectAddress.id = addressData.id;
+						this.$refs.selectAddress.getList(addressData.id);
+					} else {
+						this.$refs.selectAddress.getList();
+					}
 				} else if (type === 3) {
 					// 选择时间
 					this.$refs.selectTime.getList();
@@ -228,26 +221,22 @@
 				if (!this.fromData.address_id) {
 					return tools.error('请先选择地址')
 				}
-				
 				let flag = false;
 				flag = this.fromData.pickup_code.every(item => item)
 				if (!flag) {
 					return tools.error('请先输入取件码')
 				}
-				
 				let codeRule = /^[A-Za-z0-9-]+$/
 				let flagRule = this.fromData.pickup_code.every((item) => {return codeRule.test(item)});
 				if(!flagRule){
 					return tools.error('请输入正确的取件码')	
 				}
-				
 				if (this.isAJAX) {
 					return
 				}
 				this.isAJAX = true;
 				this.fromData.school_id = uni.getStorageSync('school_id');
 				this.fromData.site_id = uni.getStorageSync('site_id');
-
 				getExpressCreate(this.fromData).then((res) => {
 					if (res.code === 1) {
 						getExpressPay({
@@ -262,6 +251,7 @@
 									signType: ret.data.wx_pay.signType, //固定值
 									paySign: ret.data.wx_pay.paySign, //签名
 									success: (ren) => {
+										uni.removeStorageSync('isConfirmAddressFlag')
 										tools.success("支付成功");
 										this.isAJAX = false;
 										setTimeout(() => {
@@ -273,6 +263,7 @@
 										}, 1000)
 									},
 									fail: (err) => {
+										uni.removeStorageSync('isConfirmAddressFlag')
 										this.isAJAX = false;
 										tools.error("支付失败");
 										setTimeout(() => {
@@ -285,6 +276,7 @@
 									},
 								});
 							} else {
+								uni.removeStorageSync('isConfirmAddressFlag')
 								this.isAJAX = false;
 								tools.error("支付失败");
 								setTimeout(() => {

+ 18 - 6
pages-takeout/goods-order.vue

@@ -78,7 +78,8 @@
 			<view class="box-card box-border-box bgc-f mb-20">
 				<view class="flex-justify-space b-b-F9F9F9">
 					<view class="fs-28 fw-600 w158 mr-12">备注</view>
-					<input v-model="fromData.note" class="flex-1 text-align-right fs-28" type="text" placeholder="请填写你的备注">
+					<input v-model="fromData.note" class="flex-1 text-align-right fs-28" type="text"
+						placeholder="请填写你的备注">
 				</view>
 				<!-- <view class="fs-28 fw-600 mb-16">平台将通过服务通知向你推送最新动态</view>
 				<view class="p-16 bgc-F3F4F6 b-rad-12 tz-an-f">
@@ -192,10 +193,14 @@
 		},
 		onShow() {
 			let isConfirmAddressFlag = uni.getStorageSync('isConfirmAddressFlag');
-			if (isConfirmAddressFlag) {
-				this.selectFun(2);
+			console.log("支付完后走了咩",isConfirmAddressFlag);
+			if (isConfirmAddressFlag.flag) {
+				this.selectFun(2, isConfirmAddressFlag);
 			}
 		},
+		onUnload() {
+			uni.removeStorageSync('isConfirmAddressFlag')
+		},
 		methods: {
 			getDeliveryMoney(shop_id) {
 				// 获取外卖配送费
@@ -233,8 +238,7 @@
 					}
 				})
 			},
-
-			selectFun(type) {
+			selectFun(type, addressData) {
 				if (type === 1) {
 					// 选择优惠券
 					this.$refs.coupon.getList(this.type, this.fromData.coupon_id, this.fromData.shop_id);
@@ -243,7 +247,12 @@
 					if (this.addressData.id) {
 						this.$refs.selectAddress.id = this.addressData.id;
 					}
-					this.$refs.selectAddress.getList();
+					if (addressData && addressData.is_default == 1) {
+						this.$refs.selectAddress.id = addressData.id;
+						this.$refs.selectAddress.getList(addressData.id);
+					} else {
+						this.$refs.selectAddress.getList();
+					}
 				} else if (type === 3) {
 					// 选择时间
 					this.$refs.selectTime.getList(this.fromData.shop_id);
@@ -299,6 +308,7 @@
 									signType: ret.data.wx_pay.signType, //固定值
 									paySign: ret.data.wx_pay.paySign, //签名
 									success: (ren) => {
+										uni.removeStorageSync('isConfirmAddressFlag')
 										tools.success("支付成功");
 										this.isAJAX = false;
 										setTimeout(() => {
@@ -309,6 +319,7 @@
 										}, 1000)
 									},
 									fail: (err) => {
+										uni.removeStorageSync('isConfirmAddressFlag')
 										this.isAJAX = false;
 										tools.error("支付失败");
 										setTimeout(() => {
@@ -320,6 +331,7 @@
 									},
 								});
 							} else {
+								uni.removeStorageSync('isConfirmAddressFlag')
 								this.isAJAX = false;
 								tools.error("支付失败");
 								setTimeout(() => {

+ 38 - 27
pages-takeout/takeout.vue

@@ -109,8 +109,8 @@
 							<image class="black-custom-img" src="@/static/img/common/no-order.png" mode=""></image>
 						</template>
 					</EnBlank>
-					<view v-else class="goos-list-box box-border-box p-24 display-flex" v-for="(item,i) in listData" :key='i'
-						@click="toShop(item)">
+					<view v-else class="goos-list-box box-border-box p-24 display-flex" v-for="(item,i) in listData"
+						:key='i' @click="toShop(item)">
 						<view class="left-img-box">
 							<image class="left-img" :src="item.shop_logo" mode="aspectFill"></image>
 							<view class="status-box fc-f" v-if="item.status != 1">
@@ -168,6 +168,9 @@
 	import {
 		getTakeaway
 	} from "@/api/category.js"
+	import {
+	  shopInfo
+	} from "@/api/shop.js"
 	import tools from "@/service/tools";
 	export default {
 		components: {
@@ -185,9 +188,6 @@
 				listData: [],
 				navList: []
 			}
-		},
-		onShow() {
-
 		},
 		mounted() {
 			this.shopTop()
@@ -225,8 +225,18 @@
 				console.log('触底');
 			},
 			toShop(item) {
-				uni.navigateTo({
-					url: `/pages-takeout/shop?shop_id=` + item.shop_id
+				const operate_id = uni.getStorageSync('operate_id')
+				shopInfo({
+					operate_id: operate_id,
+					shop_id: item.shop_id
+				}).then((res) => {
+					if (res.code == 1) {
+						uni.navigateTo({
+							url: '/pages-takeout/shop?shop_id=' + item.shop_id
+						})
+					} else {
+						tools.error(res.msg)
+					}
 				})
 			},
 			shopTop() {
@@ -366,29 +376,30 @@
 					box-sizing: border-box;
 					padding: 16rpx;
 
-				.left-img-box {
-					width: 140rpx;
-					height: 140rpx;
-					margin-right: 14rpx;
-					position: relative;
-
-					.left-img {
+					.left-img-box {
 						width: 140rpx;
 						height: 140rpx;
-						border-radius: 12rpx;
-					}
-					.status-box{
-						position: absolute;
-						bottom: 0;
-						left: 0;
-						width: 100%;
-						padding: 10rpx 0;
-						text-align: center;
-						background: rgba(0,0,0, 0.5);
-						font-size: 20rpx;
-						border-radius: 0 0 12rpx 12rpx;
+						margin-right: 14rpx;
+						position: relative;
+
+						.left-img {
+							width: 140rpx;
+							height: 140rpx;
+							border-radius: 12rpx;
+						}
+
+						.status-box {
+							position: absolute;
+							bottom: 0;
+							left: 0;
+							width: 100%;
+							padding: 10rpx 0;
+							text-align: center;
+							background: rgba(0, 0, 0, 0.5);
+							font-size: 20rpx;
+							border-radius: 0 0 12rpx 12rpx;
+						}
 					}
-				}
 
 					.right-box {}
 				}

+ 0 - 3
pages/index/index.vue

@@ -259,10 +259,8 @@
         noticeList: [],
         bannerList: [],
         seckillGoodsList: [],
-
         typeList: [], //分类数组
         category_id: 0, //分类id
-
         goodsList: [],
         total: 0,
         page: 1,
@@ -299,7 +297,6 @@
       // 		},
       // 	})
       // }
-
       let school_id = uni.getStorageSync('school_id');
       let operate_id = uni.getStorageSync('operate_id');
       let school_name = uni.getStorageSync('school_name');