Commit 5b855600 by 赵雅纹

Merge branch 'feature-zyw-sc' into 'dev_7.1.0'

Feature zyw sc

See merge request !118
parents 7ea623ed 0ef6c5c7
...@@ -4,6 +4,7 @@ const wxService = require('../../utils/wxService') ...@@ -4,6 +4,7 @@ const wxService = require('../../utils/wxService')
const utils = require('../../utils/util') const utils = require('../../utils/util')
const envInfo = require('../../config/index').envInfo const envInfo = require('../../config/index').envInfo
import { Integer } from '../../utils/integerDigitalConvertion' import { Integer } from '../../utils/integerDigitalConvertion'
const { memberId } = wx.getStorageSync('_baseUserInfo')
wxService.page({ wxService.page({
/** /**
...@@ -22,7 +23,8 @@ wxService.page({ ...@@ -22,7 +23,8 @@ wxService.page({
cardUrl:'', cardUrl:'',
pagePath:'', pagePath:'',
contentList:[], contentList:[],
currentShareContent: null currentShareContent: null,
contentPermission: false,
}, },
// 点击切换 // 点击切换
...@@ -51,6 +53,24 @@ wxService.page({ ...@@ -51,6 +53,24 @@ wxService.page({
this.data.currentShareContent = null; this.data.currentShareContent = null;
}, },
// 发布内容权限
getContentPermission() {
wxService.post(`/merchant/contentMobileTerminal/getReleasePermissions`, {
userId: memberId,
plus: 0,
level: 0
}).then(res => {
if (!res) return false
const { result, data } = res.data
if (result == 0) {
this.setData({
contentPermission: data
})
}
}).finally(() => {
})
},
// 获取分类 // 获取分类
getCategoryList(){ getCategoryList(){
wxService.post(`/merchant/contentMobileTerminal/gatClassify`).then(res => { wxService.post(`/merchant/contentMobileTerminal/gatClassify`).then(res => {
...@@ -71,7 +91,6 @@ wxService.page({ ...@@ -71,7 +91,6 @@ wxService.page({
// 获取发现内容 // 获取发现内容
getContentList(classifyId){ getContentList(classifyId){
const { memberId } = wx.getStorageSync('_baseUserInfo')
wxService.post(`/merchant/contentMobileTerminal/getContentList?pageNum=${this.data.pageNum}&pageSize=${this.data.pageSize}`, { wxService.post(`/merchant/contentMobileTerminal/getContentList?pageNum=${this.data.pageNum}&pageSize=${this.data.pageSize}`, {
classifyId: classifyId, classifyId: classifyId,
userId: memberId userId: memberId
......
...@@ -25,6 +25,11 @@ ...@@ -25,6 +25,11 @@
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<block wx:if="{{contentPermission}}">
<navigator open-type="navigate" url="/subPackage/page/pages/grassCommunity/grassCommunity">
<view class="add">+</view>
</navigator>
</block>
<card-modal <card-modal
show-card-modal="{{showCardModal}}" show-card-modal="{{showCardModal}}"
card-title="{{cardTitle}}" card-title="{{cardTitle}}"
......
...@@ -53,6 +53,19 @@ scroll-view{ ...@@ -53,6 +53,19 @@ scroll-view{
text-align: center; text-align: center;
color: #aaaaaa; color: #aaaaaa;
} }
.add{
width: 82rpx;
height: 82rpx;
background-color: rgba(203, 60, 60, 1);
border-radius: 50%;
line-height:82rpx;
text-align: center;
font-size: 60rpx;
color: #ffffff;
position: fixed;
right: 22rpx;
bottom: 35rpx;
}
......
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