Merge remote-tracking branch 'origin/master'

pages/tab/my.vue

@@ -253,6 +253,7 @@ import {articleList, getOssUrl, userArticleList} from "../../api/article";
 				numtwo: 0,
 				tipMsg: "",
         openId: '',
+        share: false,
 			};
 		},
     onShow(){
@@ -284,6 +285,9 @@ import {articleList, getOssUrl, userArticleList} from "../../api/article";
         })
       }
       this.articleImg = []
+      if (options.share != null) {
+        this.share = options.share;
+      }
     },
 		methods: {
       /**

pagesArticle/articleDetail.vue

@@ -157,8 +157,10 @@ export default{
       //设置上级评论id 加这个逻辑是为了保证永远只有两层结构
       if (value.parentId == null){
         //点击的第一层评论
+        console.log('1`11111111')
         this.parentId = value.businessId
       } else {
+        console.log('222222222222')
         //点击的第二层评论
         this.parentId = value.parentId
       }

pagesArticle/components/articleItem.vue

 <template>
 	<view class="item">
 		<view class="left">
-			<image @click="gotoUserInfo(info)" :src="info.memAvatar" mode="aspectFill"></image>
+			<image :src="info.memAvatar" mode="aspectFill"></image>
 		</view>
 		<view class="center">
 			<template>
 				<view class="name">
-					<text @click="gotoUserInfo(info)">{{info.memNickName}}</text>
+					<text>{{info.memNickName}}</text>
 					<image v-if="info.gender != '男'" class="gender" :src="baseUrl+'/user/famale.png'" mode="">
 					</image>
 					<image v-else class="gender" :src="baseUrl+'/user/male.png'" mode=""></image>
@@ -20,7 +20,7 @@
 			<view class="content">
 				<template v-if="info.content">
 					<u-read-more ref="uReadMore" :shadowStyle="shadowStyle" :toggle="true" color="#415C9E" :textIndent="0" showHeight="126rpx">
-						<view @click="gotoDetail(info)" style="font-size: 28rpx;color: #333333;">
+						<view style="font-size: 28rpx;color: #333333;">
 							<view class="" style="line-height: 1.5;">
 								{{info.content}}
 							</view>
@@ -114,12 +114,6 @@
 			select() {
 				this.$emit("selectShare", this.info)
 			},
-      //查看动态详情
-			gotoDetail(item) {
-        uni.navigateTo({
-          url: '/pagesArticle/articleDetail?userId=' + item.userId
-        })
-			},
       //查看用户详情
       gotoUserInfo(item) {
 				uni.navigateTo({

pagesArticle/publishArticle.vue

 <template>
 	<view :class="['bigBox']">
-		<view class="box">
-			<textarea style="width: 100%;height: 260rpx;" v-model="content" :maxlength="-1" :auto-height="false"
-				:showConfirmBar="false" :adjust-position="false" @focus="focusFn" :focus="focus" @blur="blurFn"
-				border="none" placeholder="分享生活、表达思考、提出困惑..."></textarea>
-			<view class="upload">
-				<u-upload :fileList="fileList" accept="image" uploadIcon="plus" :capture="['album', 'camera']"
-					@afterRead="afterRead" @delete="deletePic" width="200rpx" height="200rpx" multiple :maxCount="9"
-					:previewFullImage="true"></u-upload>
-			</view>
-			<view class="bot" :style="{'bottom':heightFn}">
-				<view class="btn">
-					<view class="l">
-
-					</view>
-					<view class="r" @click="submit">
-						发布
-					</view>
-				</view>
-			</view>
-		</view>
+    <view class="box">
+    <textarea style="width: 100%;height: 260rpx;" v-model="content" :maxlength="250" :auto-height="false"
+              :showConfirmBar="false" :adjust-position="false" @focus="focusFn" :focus="focus" @blur="blurFn"
+              border="none" placeholder="分享生活、表达思考、提出困惑..."></textarea>
+      <view class="upload">
+        <u-upload :fileList="fileList" accept="image" uploadIcon="plus" :capture="['album', 'camera']"
+                  @afterRead="afterRead" @delete="deletePic" width="200rpx" height="200rpx" multiple :maxCount="4"
+                  :previewFullImage="true"></u-upload>
+      </view>
+      <view class="bot" :style="{'bottom':heightFn}">
+        <view class="btn">
+          <view class="l">
+          </view>
+          <view class="r" @click="submit">
+            发布
+          </view>
+        </view>
+      </view>
+    </view>
 
     <ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" @confirm="confirm"></ELM>
     <ELM ref="elmPay" :msg="tipMsg" :isConfirm="isPayConfirm" @confirm="payConfirm"></ELM>

pagesUser/component/Item.vue

@@ -86,7 +86,7 @@
 
 		</view>
 		<view class="right" v-if="userInfoId == userId">
-      <u-tag v-if="info.examStatus === '0'" plain plainFill text="未审核" type="info"/>
+      <u-tag v-if="info.examStatus === '0'" plain plainFill text="审核中" type="info"/>
       <u-tag v-if="info.examStatus === '1'" plain plainFill text="审核通过" type="success"/>
       <u-tag @click="showRemarks(info)" v-if="info.examStatus === '2' || info.examStatus === '3'" plain plainFill text="未通过" type="error"/>
 		</view>