Commit c42bdc62 authored by 罗林杰's avatar 罗林杰

修改bug

parent fd48e0ad
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<view class="right" v-if="userInfoId == userId"> <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 v-if="info.examStatus === '1'" plain plainFill text="审核通过" type="success"/>
<u-tag v-if="info.examStatus === '2' || info.examStatus === '3'" plain plainFill text="未通过" type="error"/> <u-tag @click="showRemarks(info)" v-if="info.examStatus === '2' || info.examStatus === '3'" plain plainFill text="未通过" type="error"/>
</view> </view>
<!-- <view class="right">--> <!-- <view class="right">-->
<!-- 右上角的三个点--> <!-- 右上角的三个点-->
...@@ -103,12 +103,15 @@ ...@@ -103,12 +103,15 @@
<!-- @select="selectClick" @close="show = false" :show="show"></u-action-sheet>--> <!-- @select="selectClick" @close="show = false" :show="show"></u-action-sheet>-->
<!-- 登录弹窗--> <!-- 登录弹窗-->
<!-- <login @change="getToLogin" :isLoginPop="isLoginPop" class="my-select"></login>--> <!-- <login @change="getToLogin" :isLoginPop="isLoginPop" class="my-select"></login>-->
<ELM ref="elm" :msg="tipMsg" :isCancel="false" :isConfirm="isConfirm" @confirm="confirm"></ELM>
</view> </view>
</template> </template>
<script> <script>
import imageAdaptation from '@/components/images-adaptation/imageAdaptation.vue' import imageAdaptation from '@/components/images-adaptation/imageAdaptation.vue'
import xzjReadMore from "@/components/xzj-readMore/xzj-readMore.vue" import xzjReadMore from "@/components/xzj-readMore/xzj-readMore.vue"
import ELM from '@/components/elm-toast/index.vue';
export default { export default {
name:'ArticleItem', name:'ArticleItem',
options: { options: {
...@@ -116,7 +119,8 @@ ...@@ -116,7 +119,8 @@
}, },
components: { components: {
imageAdaptation, imageAdaptation,
xzjReadMore xzjReadMore,
ELM
}, },
props: { props: {
info: { info: {
...@@ -160,6 +164,8 @@ ...@@ -160,6 +164,8 @@
imgLayout2: [220, 220], imgLayout2: [220, 220],
imgLayout3: [160, 160], imgLayout3: [160, 160],
show: false, show: false,
tipMsg: '',
isConfirm: false,
userInfoId: uni.getStorageSync('userInfo').businessId, userInfoId: uni.getStorageSync('userInfo').businessId,
//右上角三个点的操作项 //右上角三个点的操作项
list: [{ list: [{
...@@ -280,6 +286,15 @@ ...@@ -280,6 +286,15 @@
} }
this.show = true; this.show = true;
},
showRemarks(info){
const remarks = JSON.parse(info.remarks)
this.tipMsg = remarks[0].msg;
this.isConfirm = true;
this.$refs.elm.showDialog();
},
confirm(){
this.isConfirm = false;
} }
} }
} }
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
import ItemVue from './component/Item.vue'; import ItemVue from './component/Item.vue';
import empty from '@/components/empty.vue'; import empty from '@/components/empty.vue';
import {topicList} from "../api/topic"; import {topicList} from "../api/topic";
import {articleList, like, userArticleList} from "../api/article"; import {articleList, getOssUrl, like, userArticleList} from "../api/article";
import {getCity, getValue} from "../common/options"; import {getCity, getValue} from "../common/options";
import {calculateAge, parseDate} from "../common"; import {calculateAge, parseDate} from "../common";
export default { export default {
...@@ -111,12 +111,14 @@ export default { ...@@ -111,12 +111,14 @@ export default {
const list = res.data.data const list = res.data.data
list.forEach(item => { list.forEach(item => {
//处理头像 //处理头像
if (item.memAvatar !== null && item.memAvatar !== ''){ if (item.avatarId !== null){
item.memAvatar = item.memAvatar.replace(/\\/g, '/') getOssUrl(item.avatarId).then(imgRes => {
//必须要用单独的变量接 不然会有bug
if (imgRes.data.data != null) {
imgRes.data.data = imgRes.data.data.replace(/\\/g, "/");
item.memAvatar = imgRes.data.data
} }
//处理动态照片 })
if (item.url !== null && item.url !== ''){
item.url = item.url.replace(/\\/g, '/').split(',')
} }
//处理性别 //处理性别
if (item.memSex !== null && item.memSex !== ''){ if (item.memSex !== null && item.memSex !== ''){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment