no message

.env.js

@@ -3,8 +3,8 @@ let ENV_CONFIG = null;
 
 if (nodeEnv === 'development') {
     //开发环境
-    ENV_CONFIG = require('.env.prod.js');
-	// ENV_CONFIG = require('.env.dev.js');
+    // ENV_CONFIG = require('.env.prod.js');
+	ENV_CONFIG = require('.env.dev.js');
 } else {
     //生产环境
     ENV_CONFIG = require('.env.prod.js');

App.vue

@@ -1,31 +1,39 @@
 <script>
-export default {
-  onLaunch: function () {
-    // console.log("App Launch");
-  },
-  onShow: function () {
-    // console.log("App Show");
-  },
-  onHide: function () {
-    // console.log("App Hide");
-  },
-};
+	export default {
+		onLaunch: function() {
+			// console.log("App Launch");
+		},
+		onShow: function() {
+			// console.log("App Show");
+			// 开启小程序原生右上角分享按钮
+			// uni.showShareMenu({
+			// 	// https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/share.html
+			// 	withShareTicket: true,
+			// 	menus: ['shareAppMessage', 'shareTimeline'] //开启转发好友和转发朋友圈按钮
+			// });
+		},
+		onHide: function() {
+			// console.log("App Hide");
+		},
+	};
 </script>
 
 <style>
-/*每个页面公共css */
-@import "./common/css/common";
+	/*每个页面公共css */
+	@import "./common/css/common";
 
 
-checkbox .wx-checkbox-input {
-  border-radius: 50% !important;
-}
-checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-  background: linear-gradient(129deg, #f0695b 0%, #ed301d 100%);
-  border: 1px solid rgb(239, 74, 57);
-  box-shadow: 0px 2px 3px rgba(239, 74, 57, 0.16);
-}
-uni-checkbox:not([disabled]) .uni-checkbox-input:hover {
-  border-color: #d1d1d1;
-}
-</style>
+	checkbox .wx-checkbox-input {
+		border-radius: 50% !important;
+	}
+
+	checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+		background: linear-gradient(129deg, #f0695b 0%, #ed301d 100%);
+		border: 1px solid rgb(239, 74, 57);
+		box-shadow: 0px 2px 3px rgba(239, 74, 57, 0.16);
+	}
+
+	uni-checkbox:not([disabled]) .uni-checkbox-input:hover {
+		border-color: #d1d1d1;
+	}
+</style>

common/css/common.css

@@ -462,11 +462,13 @@ image {
 .p-t-20 {
 	padding-top: 20rpx;
 }
+.p-t-80 {
+	padding-top: 80rpx;
+}
 
 .pb-5 {
 	padding-bottom: 5rpx;
 }
-
 .pb-10 {
 	padding-bottom: 10rpx;
 }

common/js/share.js

@@ -0,0 +1,24 @@
+export default {
+	created() {
+		//#ifdef MP-WEIXIN
+		wx.showShareMenu({
+			withShareTicket: true,
+			menus: ["shareAppMessage", "shareTimeline"],
+		});
+		//#endif
+	},
+	onShareAppMessage(res) {
+		// 发送给朋友
+		return {
+			// title: "your title", 
+			// imageUrl: "your image",
+		};
+	},
+	onShareTimeline(res) {
+		// 分享到朋友圈
+		return {
+			// title: "your title",
+			// imageUrl: "your image",
+		};
+	},
+};

main.js

@@ -12,13 +12,15 @@ Vue.use(router)
 import Vue from 'vue'
 import store from './store'
 import Nav from './components/en-utils/en-nav/en-nav.vue'
-
+import share from './common/js/share.js'
+Vue.mixin(share)
 Vue.component('Nav', Nav)
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({
 	...App,
-	store
+	store,
+	share
 })
 // app.$mount()
 
@@ -43,4 +45,4 @@ export function createApp() {
 		app,
 	}
 }
-// #endif
+// #endif

manifest.json

@@ -99,7 +99,7 @@
             "https" : false,
             "proxy" : {
                 "/api" : {
-                    "target" : "https://userapi.sjzkeji.com",
+                    "target" : "https://test-userapi.sjzkeji.com",
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {

pages-my/comment.vue

@@ -13,11 +13,11 @@
               <view class="fs-24 fc-9 mb-16">
                 {{item.created_date}}
               </view>
-              <view class="fs-30 fc-3 msg-class text-overflow-ellipsis">
+              <view class="fs-30 fc-3 text-overflow-ellipsis" :class="item.news_id ==0?'msg-class-tow':'msg-class'">
                 {{item.msg}}
               </view>
             </view>
-            <image class="right-img" :src="item.image[0]" mode="aspectFill"></image>
+            <image v-if="item.news_id !=0 " class="right-img" :src="item.image[0]" mode="aspectFill"></image>
           </view>
         </view>
       </view>
@@ -112,6 +112,10 @@
     max-width: 420rpx;
     word-wrap: break-word;
   }
+  .msg-class-tow{
+	  word-break: break-all;
+	  word-wrap: break-word;
+  }
   .content-box {
     padding: 24rpx 24rpx 0;
   }

pages-my/my-publish.vue

@@ -1,6 +1,15 @@
 <template>
 	<view class="flex-common-css">
 		<Nav title="我的发布" titleColor="#333" bgckgroundBox='#fff'></Nav>
+		<view class="tab-box flex-justify-around bgc-f ">
+			<view class="tab-but flex-1 flex-direction align-items-center" v-for="(item, index) in tabList" :key="index"
+				@click="tabStitle(item.status)">
+				<view class="fs-32 mb-18" :class="status==item.status?'fc-41ABF5':'fc-3'">
+					{{item.name}}
+				</view>
+				<view v-show="status==item.status" class="tab-hr bgc-41ABF5"></view>
+			</view>
+		</view>
 		<scroll-view :scroll-y="true" class="scroll-view-css content-box box-sizing-border"
 			@scrolltolower="scrolltolower">
 			<view v-if="listData.length <= 0" class="scroll-view-css">
@@ -207,6 +216,17 @@
 		},
 		data() {
 			return {
+				tabList: [{
+					name: '已发布',
+					status: 1
+				}, {
+					name: '审核中',
+					status: 0
+				}, {
+					name: '审核失败',
+					status: 2
+				}, ],
+				status: 1,
 				listData: [],
 				isShowIpnut: false,
 				// 一级评论
@@ -238,18 +258,28 @@
 			this.alumnMyAlumni()
 		},
 		methods: {
+			tabStitle(status) {
+				if (this.status != status) {
+					this.status = status
+					this.page = 1;
+					this.listData = [];
+					this.alumnMyAlumni()
+				}
+			},
 			goToUrl(item) {
-				alumnInfo({
-					news_id: item.news_id
-				}).then((res) => {
-					if (res.code === 1) {
-						uni.navigateTo({
-							url: "/pages-school/circle-info?news_id=" + item.news_id
-						})
-					} else {
-						tools.error(res.msg)
-					}
-				})
+				if (this.status == 1) {
+					alumnInfo({
+						news_id: item.news_id
+					}).then((res) => {
+						if (res.code === 1) {
+							uni.navigateTo({
+								url: "/pages-school/circle-info?news_id=" + item.news_id
+							})
+						} else {
+							tools.error(res.msg)
+						}
+					})
+				}
 			},
 			alumniDelClick(item) {
 				// 删除帖子
@@ -474,6 +504,7 @@
 			},
 			alumnMyAlumni() {
 				alumnMyAlumni({
+					status: this.status,
 					page: this.page
 				}).then((res) => {
 					if (res.code == 1) {
@@ -489,6 +520,16 @@
 </script>
 
 <style lang="scss" scoped>
+	.tab-box {
+		padding: 22rpx 0 4rpx 0;
+	}
+
+	.tab-hr {
+		width: 40rpx;
+		height: 4rpx;
+		border-radius: 2rpx;
+	}
+
 	.item-content {
 		width: 558rpx;
 		// white-space: nowrap;

pages-my/user-info.vue

@@ -3,8 +3,11 @@
 		<Nav title="个人资料" titleColor="#333" bgckgroundBox='#fff'></Nav>
 		<scroll-view :scroll-y="true" class="scroll-view-css">
 			<view class="user-img-box b-rad-50" @click="goToUrl(0)">
-				<image class="user-img b-rad-50" :src="userInfoData.head_img" mode=""></image>
-				<image v-if="setType == 0" class="set-iimg" src="@/static/img/my/pen.png" mode=""></image>
+				<image class="user-img b-rad-50" :src="userInfoData.head_img" mode="aspectFill"></image>
+				<image class="set-iimg" src="@/static/img/my/pen.png" mode=""></image>
+			</view>
+			<view class="text-align-center" v-if="userInfoData.trace_status == 0 || userInfoData.trace_status == 2">
+				{{userInfoData.trace_status == 0?'头像审核中，请耐心等待':userInfoData.trace_status == 2?'上传头像违规，请重新上传':''}}
 			</view>
 			<view class="item-info-box box-border-box">
 				<view class="item-box mb-32 flex-justify-space box-border-box">
@@ -88,7 +91,7 @@
 			},
 			goToUrl(type) {
 				if (type === 0) {
-					if (this.setType == 0) {
+					if (this.userInfoData.trace_status != 0) {
 						uni.chooseImage({
 							count: 1,
 							sizeType: ["compressed", "camera"],
@@ -154,7 +157,7 @@
 		width: 144rpx;
 		height: 144rpx;
 		position: relative;
-		margin: 98rpx auto 80rpx;
+		margin: 98rpx auto 0;
 	}
 
 	.user-img {
@@ -171,7 +174,7 @@
 	}
 
 	.item-info-box {
-		padding: 0 0 0 32rpx;
+		padding: 80rpx 0 0 32rpx;
 
 		.item-box {
 			padding: 0 32rpx 32rpx 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 fc-41ABF5" @click="lookFinishImage(infoData.finish_image)">
+						点击查看
+					</view>
+				</view>
 				<view class="display-flex flex-justify-space mb-26" v-if="infoData.order_status == 7">
 					<view class="fs-28 fc-9">
 						完成时间
@@ -277,6 +285,9 @@
 			})
 		},
 		methods: {
+			lookFinishImage(img) {
+				tools.lookBigImg(1,img)
+			},
 			contactShop(phone) {
 				uni.makePhoneCall({
 					phoneNumber: phone, // 电话号码

pages-school/add-circle.vue

@@ -13,6 +13,9 @@
 			</view>
 			<view class="bgc-f mb-20">
 				<EnUpload v-model="fromData.image" number='9'></EnUpload>
+				<view class='fc-ED301D pl-24 p-b-20 box-border-box'>
+					提示:如您上传图片，帖子将会进入内容安全审核
+				</view>
 			</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>

pages/index/index.vue

@@ -19,7 +19,6 @@
 		<view class="index-search box-border-box mt-4" @click="toUrl(1)"
 			:style="[{'top': BarH + 'px','background':bgckgroundSearch}]">
 			<view class="index-search-box box-border-box align-items-center">
-				<!-- <uni-icons type="search" size="20" color="#000"></uni-icons> -->
 				<image class="wh32" src="@/static/img/index/ss.png" mode=""></image>
 				<view class="fs-28 fc-9 ml-10">搜索店铺名称或者商品名称</view>
 				<view class="fs-28 fc-f index-search-box-buttom">搜索</view>
@@ -72,12 +71,12 @@
 								:key="i" @click="toShop(item)">
 								<image class="xsms-box-list-item-img-1 mb-4" :src="item.goods_image" mode="aspectFill">
 								</image>
-								<view class="text-overflow-ellipsis-one fs-26 mb-4">{{item.goods_name}}</view>
+								<view class="text-overflow-ellipsis-one fs-26 mb-32">{{item.goods_name}}</view>
 								<view class="mb-4">
 									<span class="fs-20 fw-b fc-FB3D03">￥</span><span
 										class="fs-32 fw-b fc-FB3D03">{{item.seckill_money}}</span>
 								</view>
-								<view class="fs-20 fc-9 text-line-through">￥{{item.line_price}}</view>
+								<!-- <view class="fs-20 fc-9 text-line-through">￥{{item.line_price}}</view> -->
 								<image class="xsms-box-list-item-img-2" src="@/static/img/index/index-q.png"
 									mode="scaleToFill"></image>
 							</view>
@@ -375,7 +374,7 @@
 					if (res.code == 1) {
 						this.navList.forEach((v, k) => {
 							v.appletAudit = 0
-							if (v.type == 8 || v.type == 7 || v.type == 9 || v.type == 10 || v.type == 11) {
+							if (v.type == 8 || v.type == 9 || v.type == 10 || v.type == 11) {
 								v.appletAudit = res.data
 							}
 						})

pages/me/index.vue

@@ -4,7 +4,7 @@
 		<image class="bg-box" src="@/static/img/my/bg.png" mode=""></image>
 		<view class="user-box align-items-center" @click="goToUrl(0)">
 			<view class="user-img-box mr-24">
-				<image v-if="userInfoData.head_img" class="user-img b-rad-50" :src="userInfoData.head_img" mode="">
+				<image v-if="userInfoData.head_img" class="user-img b-rad-50" :src="userInfoData.head_img" mode="aspectFill">
 				</image>
 				<image v-else class="user-img b-rad-50" src="@/static/img/my/user-img.png" mode=""></image>
 				<image class="set-iimg" src="@/static/img/my/pen.png" mode=""></image>