调整

apis/pagejs/activity.js

@@ -1,9 +1,10 @@
 import request from '@/apis/utils/request'
+ import requestWhite from '@/apis/utils/requestWhite'
  
 import Qs from 'qs';
 
 export function pageList(formData) {
-	return request({
+	return requestWhite({
 		url: '/open/activity/pageList',
 		data: formData,
 		method: 'post',	
@@ -12,7 +13,7 @@ export function pageList(formData) {
 }
 
 export function edit(id) {
-	return request({
+	return requestWhite({
 		url: '/open/activity/edit/'+id,
 		//data: formData,
 		method: 'get',	
@@ -23,7 +24,7 @@ export function edit(id) {
 
 
 export function notesList(id) {
-	return request({
+	return requestWhite({
 		url: '/open/activity/notesList',
 		data: {
 			activityId:id
@@ -33,3 +34,15 @@ export function notesList(id) {
 	})
 }
 
+export function myAwards(id) {
+	return request({
+		url: '/mobile/activityNote/myAwards',
+		data: {
+			activityId:id
+		},
+		method: 'post',	
+	//	header:{'Content-Type':'application/json'},
+	})
+}
+
+

apis/pagejs/cite.js

@@ -1,10 +1,11 @@
 import request from '@/apis/utils/request'
+ import requestWhite from '@/apis/utils/requestWhite'
  
 import Qs from 'qs';
 
 
 export function editBadge(id) {
-	return request({
+	return requestWhite({
 		url: '/open/cite/editBadge/'+id,
 		method: 'get',	
 	})
@@ -12,7 +13,7 @@ export function editBadge(id) {
 
 
 export function pageList(formData) {
-	return request({
+	return requestWhite({
 		url: '/open/cite/pageList',
 		data: formData,
 		method: 'post',	
@@ -27,7 +28,7 @@ export function getByType(type) {
 	}else if(type=='team'){
 		url= '/open/cite/getByTeamType';
 	}
-	return request({
+	return requestWhite({
 		url: url,
 		method: 'post',	
 	})

apis/pagejs/goods.js

@@ -1,4 +1,5 @@
 import request from '@/apis/utils/request'
+ import requestWhite from '@/apis/utils/requestWhite'
  
 import Qs from 'qs';
 

apis/pagejs/share.js

@@ -1,9 +1,10 @@
 import request from '@/apis/utils/request'
+ import requestWhite from '@/apis/utils/requestWhite'
  
 import Qs from 'qs';
 
 export function pageList(formData) {
-	return request({
+	return requestWhite({
 		url: '/open/share/pageList',
 		data: formData,
 		method: 'post',	
@@ -18,4 +19,17 @@ export function addShare(formData) {
 		method: 'post',	
 	//	header:{'Content-Type':'application/json'},
 	})
-}
+}
+
+
+export function dataList(formData) {
+	return requestWhite({
+		url: '/open/dataDictionary/dataList',
+		data: {
+			catalogName:formData
+		},
+		method: 'post',	
+	//	header:{'Content-Type':'application/json'},
+	})
+}
+

apis/pagejs/user.js

@@ -14,7 +14,14 @@ export function findByOpenId(data) {
 }
 
 
-
+export function pointsNotes(data) {
+	
+	return requestWhite({
+		method: 'post',
+		data: data,
+		url: '/mobile/points/pointsNotes'
+	})
+}
 
 export function validateCode(data) {
 	 

components/Tabbar.vue

@@ -34,7 +34,7 @@
 						selectedIconPath: "heart-fill",
 						text: '职工之家 ',
 						pagePath2:"/pages/staffHome/staffHome",
-						login:true,
+					
 					},
 				 	{
 				 		iconPath: "account",

pages/mine/issue.vue

@@ -12,9 +12,9 @@
 		</u-navbar>
 		
 		<textarea placeholder="记录点滴生活..."
-		v-model="subForm.synopsis"
+		v-model="subForm.synopsis" maxlength="200"
 		 name="" id="" cols="30" rows="10"></textarea>
-	
+		<view style="float: right;">字数限制：{{subForm.synopsis?subForm.synopsis.length:0}}/200</view>
 	  <view class="upload">
 		
 	  	<u-upload-file  ref="uUpload" :action="action"

pages/mine/mine.vue

@@ -32,16 +32,16 @@
 						</view>
 					</view>
 				</view>
-				<view class="to-homepage" v-if="false" >
-					<text class="text">个人主页</text><text>
+				<view class="to-homepage"   >
+					<text class="text" @click="gotoUrl('pages/mine/personalPage')"  >个人主页</text><text>
 						<u-icon size="32" name="arrow-right" color="#80FFFFFF"></u-icon>
 					</text>
 				</view>
 			</view>
-			<view class="grid">
-				<view class="item">
+			<view class="grid"  >
+				<view class="item"  @click="gotoUrl('pages/mine/personalPage')" >
 					<view class="amout">
-						0
+						{{plusInfo.userShare}}
 					</view>
 					<view class="text">
 						发布
@@ -49,7 +49,7 @@
 				</view>
 				<view class="item" @click="gotoUrl('pages/mine/myLike')" >
 					<view class="amout">
-						0
+						{{plusInfo.userNewsLike}}
 					</view>
 					<view class="text">
 						点赞
@@ -57,14 +57,13 @@
 				</view>
 				<view class="item" @click="gotoUrl('pages/mine/myComment')" >
 					<view class="amout">
-						0
+						{{plusInfo.userNewsComment}}
 					</view>
 					<view class="text">
 						  评论
-
 					</view>
 				</view>
-				<view class="item">
+				<view class="item"  @click="gotoUrl('pages/mine/points/points')" >
 					<view class="amout">
 						{{plusInfo.userPoints}}
 					</view>
@@ -76,7 +75,7 @@
 
 		</view>
 		<!-- 功能 -->
-		<view class="function-group group1" v-if="false">
+		<view class="function-group group1"   @click="gotoUrl('pages/mine/myWinningRecord')"  >
 			<view class="item">
 				<view class="title">
 					<view class="icon">
@@ -91,7 +90,7 @@
 				</view>
 			</view>
 
-			<view class="item">
+			<view class="item" v-if="false" >
 				<view class="title">
 					<view class="icon">
 						<img src="../../assets/img/riLine-coin-line@2x.png" alt="">

pages/mine/myWinningRecord.vue

@@ -56,15 +56,25 @@
 				</view>
 			</view>
 		</view>
-		<u-divider bg-color="#F2F4F4" border-color="#CFD2D5">已经到底了</u-divider>
+		<u-divider  v-if="list.length==recordsTotal"
+		 :isnone="!list.length" nonetext="获奖记录为空"  bg-color="#F2F4F4" border-color="#CFD2D5">已经到底了</u-divider>
 	</view>
 </template>
 
 <script>
+	import * as API from '@/apis/pagejs/user.js'
+	
 	export default {
 		data() {
 			return {
-				
+				list:[],
+				listForm:{
+					pageIndex:1,
+					typeId:"",
+					title:"",
+					pageSize:20,
+				},
+				recordsTotal:0,
 			}
 		},
 		methods: {

pages/mine/points/rankingList.vue

@@ -6,140 +6,59 @@
 			积分排行榜
 			
 		</view>
-		<view class="self" v-if="false">
+		<view class="self" v-if="top" >
 			<view class="rank">
-				105
+				 
+				<img v-if="top.rank==1" src="../../../assets/img/Gold Medal@1x.png" alt="">
+				<img v-else-if="top.rank==2" src="../../../assets/img/Silver Medal Copy@1x.png" alt="">
+				<img v-else-if="top.rank==3" src="../../../assets/img/Bronze Medal Copy@1x.png" alt="">
+				<span v-else>{{top.rank}}</span>
 			</view>
 			<view class="photo">
-				<img src="../../../assets/img/rankPhoto.png" alt="">
+				<img v-if="top.userImg" :src="top.userImg" alt="">
+				<u-avatar  v-else  size="80" ></u-avatar>
 			</view>
 			<view class="name">
-				王泽
+				{{top.userName}}
 			</view>
 			<view class="points">
-				1015积分
+				{{top.userScore}}积分
 			</view>
 		</view>
-		<view class="else"  v-if="false">
-			<view class="item">
+		
+		<view class="else" v-if="list.length" >
+			<view class="item" v-for="(item,i) in  list"  :key="i" >
 				<view class="rank">
-					<img src="../../../assets/img/Gold Medal@1x.png" alt="">
+					<img v-if="i==0" src="../../../assets/img/Gold Medal@1x.png" alt="">
+					<img v-else-if="i==1" src="../../../assets/img/Silver Medal Copy@1x.png" alt="">
+					<img v-else-if="i==2" src="../../../assets/img/Bronze Medal Copy@1x.png" alt="">
+					<span v-else>{{i+1}}</span>
+					
 				</view>
 				<view class="photo">
-					<img src="../../../assets/img/jiguang.png" alt="">
+					<img v-if="item.userImg" :src="item.userImg" alt="">
+					<u-avatar  v-else  size="80" ></u-avatar>
+					
 				</view>
 				<view class="name">
-					继广
+					{{item.userName}}
 				</view>
-				<view class="points points1">
-					2011积分
-				</view>
-			</view>
-			<view class="item">
-				<view class="rank">
-					<img src="../../../assets/img/Silver Medal Copy@1x.png" alt="">
-				</view>
-				<view class="photo">
-					<img src="../../../assets/img/dingmanrong.png" alt="">
-				</view>
-				<view class="name">
-					丁曼容
-				</view>
-				<view class="points points2">
-					2011积分
-				</view>
-			</view>
-			<view class="item">
-				<view class="rank">
-					<img src="../../../assets/img/Bronze Medal Copy@1x.png" alt="">
-				</view>
-				<view class="photo">
-					<img src="../../../assets/img/lishuyi.png" alt="">
-				</view>
-				<view class="name">
-					李书易
-				</view>
-				<view class="points points3">
-					1917积分
-				</view>
-			</view>
-			<view class="item">
-				<view class="rank">
-					4
-				</view>
-				<view class="photo">
-					<img src="../../../assets/img/jiguang.png" alt="">
-				</view>
-				<view class="name">
-					继广
-				</view>
-				<view class="points">
-					2011积分
-				</view>
-			</view>
-			<view class="item">
-				<view class="rank">
-					5
-				</view>
-				<view class="photo">
-					<img src="../../../assets/img/jiguang.png" alt="">
-				</view>
-				<view class="name">
-					继广
-				</view>
-				<view class="points">
-					2011积分
-				</view>
-			</view>
-			<view class="item">
-				<view class="rank">
-					6
-				</view>
-				<view class="photo">
-					<img src="../../../assets/img/jiguang.png" alt="">
-				</view>
-				<view class="name">
-					继广
-				</view>
-				<view class="points">
-					2011积分
-				</view>
-			</view>
-			<view class="item">
-				<view class="rank">
-					7
-				</view>
-				<view class="photo">
-					<img src="../../../assets/img/jiguang.png" alt="">
-				</view>
-				<view class="name">
-					继广
-				</view>
-				<view class="points">
-					2011积分
-				</view>
-			</view>
-			<view class="item">
-				<view class="rank">
-					8
-				</view>
-				<view class="photo">
-					<img src="../../../assets/img/jiguang.png" alt="">
-				</view>
-				<view class="name">
-					继广
-				</view>
-				<view class="points">
-					2011积分
+				<view class="points " :class="{
+					points1:i==0,
+					points2:i==1,
+					points3:i==2
+				}">
+					{{item.userScore}}积分
 				</view>
 			</view>
 			
 		</view>
-		<u-divider   :isnone="true" nonetext="统计中,敬请期待"  bg-color="#F2F4F4" border-color="#CFD2D5">已经到底了</u-divider>
+		<u-divider   :isnone="!list.length" nonetext="统计中,敬请期待"  bg-color="#F2F4F4" border-color="#CFD2D5">已经到底了</u-divider>
 	</view>
 </template>
 
 <script>
+	import * as API from '@/apis/pagejs/user.js'
 	export default {
 		data() {
 			return {
@@ -151,12 +70,45 @@
 					pageSize:20,
 				},
 				recordsTotal:0,
+				top:null,
 				
 			}
 		},
-	
+		onLoad() {
+			this.getList();
+		},
 		methods: {
-			
+			getList(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.pointsNotes({
+					year:new Date().getFullYear()
+				}).then((res) => {
+						this.list = res.data;
+						var userInfo=this.carhelp.getPersonInfo()
+						if(userInfo){
+							for(var i in this.list){
+								var item=this.list[i]
+								if(item.userId==userInfo.id){
+									this.top=item
+									this.top.rank=parseInt(i)+1;
+									break
+								}
+							}
+						}
+						
+					uni.hideLoading();
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			}
 		}
 	}
 </script>
@@ -218,7 +170,7 @@
 	   background: #fff;
 	   border-radius: 8px;
 	   padding: 24rpx 48rpx;
-	   margin: 0 32rpx 24rpx;
+	   margin: 20rpx 32rpx 24rpx;
 	   .item{
 		   display: flex;
 		   align-items: center;

pages/news/articleDetails.vue

@@ -69,7 +69,7 @@
 		</view>
 		</view>
 		
-		<view class="bottom" v-if="userInfo" >
+		<view class="bottom"  v-if="userInfo" >
 			<view class="input" @click="showMessage=true">
 				<view class="inputT">发表评论</view>
 			</view>
@@ -84,6 +84,21 @@
 				</view>
 			</view>
 		</view>
+		<view class="bottom"  v-else >
+			<view class="input" @click="issueMethod()">
+				<view class="inputT">未登录,前往登录</view>
+			</view>
+			<view class="like" :class="{
+				red:info.iLike
+			}" >
+				<view class="icon">
+					<u-icon name="thumb-up"   size="32"></u-icon>
+				</view>
+				<view class="number">
+					{{info.likesNum}}
+				</view>
+			</view>
+		</view>
 		<u-popup v-model="showMessage" border-radius="34" mode="bottom" >
 			<view class="showMessage">
 				<view class="showMessage1"><h3>发表评论</h3></view>
@@ -127,6 +142,22 @@
 		},
 	
 		methods: {
+			issueMethod(){
+				uni.showModal({
+					title:"提示",
+					content:"未登录,登录后参与评论",
+					confirmText:"前往登录",
+					showCancel:true,
+					success: function (res) {
+						if(res.confirm){
+							uni.navigateTo({
+								url:'/pages/login/index'
+							})
+						}
+					}
+				})
+				
+			},
 			newsCommentsdelete(id){
 				uni.showModal({
 					title: '提示',

pages/staffHome/activityCenter/activityDetail.vue

@@ -7,7 +7,11 @@
 		
 		
 		</view>
-		 <view class="bottom2" v-if="info.status=='77d93870-e1e1-4369-b2b6-629e8645e8d9'" >
+		<view class="bottom2" v-if="!userInfo" >
+					
+					<u-button type="info" @click="issueMethod()">未登录</u-button>
+		</view>
+		 <view class="bottom2" v-else-if="info.status=='77d93870-e1e1-4369-b2b6-629e8645e8d9'" >
 			
 			<u-button type="info">活动已过期</u-button>
 		 </view>
@@ -25,11 +29,14 @@
 	export default {
 		data() {
 			return {
+				userInfo:null,
 				id:'',
 				info:{},
 			}
 		},
 		onLoad(op){
+			this.userInfo=this.carhelp.getPersonInfo()
+			console.log(this.userInfo)
 			if(op.id){
 				this.id=op.id
 				this.getInfo()
@@ -37,6 +44,25 @@
 			
 		},
 		methods: {
+			issueMethod(){
+				uni.showModal({
+					title:"提示",
+					content:"未登录,登录后参与分享活动",
+					confirmText:"前往登录",
+					showCancel:true,
+					success: function (res) {
+						if(res.confirm){
+							uni.navigateTo({
+								url:'/pages/login/index'
+							})
+						}
+						
+					
+					}
+				})
+				
+				
+			},
 			getInfo(){
 				uni.showLoading({
 					title: "加载中",

pages/staffHome/filesonic.vue

@@ -5,9 +5,9 @@
 		<view class="image" v-if="false">
 			<u-image width="100%" height="200rpx" :src="src" border-radius="16"></u-image>
 		</view>
-		<view class="tabs"  v-if="false">
+		<view class="tabs"  >
 			<u-tabs bar-width="60" :bold="false" inactive-color="#B3B3B3" active-color="#333333" height="88"
-				:list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+				:list="tabList" :is-scroll="false" :current="current" @change="change"></u-tabs>
 		</view>
 		<!-- 分享内容 -->
 		<view class="share-content">
@@ -27,7 +27,10 @@
 					</view>
 				</view>
 				<view class="share-text">
-					{{item.synopsis}}
+					<textarea placeholder="记录点滴生活..." :auto-height="true"
+					v-model="item.synopsis" readonly maxlength="200"
+					 name="" id="" ></textarea>
+ 					
 				</view>
 				<view class="pictures" >
 					<template v-for="(pic,i2) in item.listShareFiles"  v-if="pic.url">
@@ -42,10 +45,10 @@
 					
 				</view>
 
-				<view class="tag" :class="item.activityId" >
+				<view class="tag" :class="item.activityId"   @click="issueMethod(item.activityId)" >
 					<text class="symbol">#</text>
 					<text class="text">{{item.activityName}}</text>
-					<text class="icon"   @click="gotoUrl('pages/mine/issue?id='+item.activityId)"  >
+					<text class="icon"   >
 						<u-icon size="28" color="#cccccc" name="arrow-right"></u-icon>
 					</text>
 				</view>
@@ -56,7 +59,7 @@
 		</view>
 		<u-divider  :isnone="list.length==0" nonetext="没有找到相关内容" border-color="#CFD2D5">已经到底了</u-divider>
 		
-		 <view class="bottom"  @click="gotoUrl('pages/mine/issue?nic=1')" >
+		 <view class="bottom"  @click="issueMethod()" >
 		 	<img src="../../assets/img/riFill-camera-fill@2x.png">
 		 </view>
 	</view>
@@ -64,7 +67,7 @@
 
 <script>
 	import * as API from '@/apis/pagejs/share.js'
-	
+ 	
 	export default {
 		data() {
 			return {
@@ -75,23 +78,14 @@
 				},
 				list:[],
 				recordsTotal:0,
-				tabList: [{
-					name: '全部'
-				}, {
-					name: '体育健身'
-				}, {
-					name: '摄影摄像',
-				}, {
-					name: '书法绘画',
-				}, {
-					name: '其他',
-				}],
+				tabList: [],
 				current: 0
 			}
 		},
 		onLoad(op){
 				this.carhelp.set("addShare",0);
 				this.getList()
+				this.dataList()
 		},
 		onReachBottom() {
 			if (this.list.length < this.recordsTotal) {			
@@ -107,6 +101,35 @@
 		
 		},
 		methods: {
+			issueMethod(id){
+				
+				var userInfo=this.carhelp.getPersonInfo()
+				
+				if(!userInfo){
+					uni.showModal({
+						title:"提示",
+						content:"未登录,登录后参与分享活动",
+						confirmText:"前往登录",
+						showCancel:true,
+						success: function (res) {
+							if(res.confirm){
+								uni.navigateTo({
+									url:'/pages/login/index'
+								})
+							}
+						}
+					})
+				}else{
+					if(id){
+						this.gotoUrl('pages/mine/issue?id='+id)
+					}else{
+						this.gotoUrl('pages/mine/issue?nic=1')
+					}
+				
+				}
+				
+				
+			},
 			previewImage(img,i) {
 				let imgs = [];
 				img.forEach(it=>{
@@ -123,6 +146,23 @@
 			},
 			ckItem(item){
 				
+			},
+			dataList(){
+				
+				
+				API.dataList("活动类型").then((res) => {
+				
+					this.tabList=[
+						{
+							id:'',
+							name:'全部'
+						},
+						...res.data
+					]
+					console.log()
+				}).catch(error => {
+					
+				})
 			},
 			getList(){
 				uni.showLoading({
@@ -157,6 +197,10 @@
 			},
 			change(index) {
 				this.current = index;
+			
+				this.listForm.pageIndex = 1;
+				this.listForm.type=this.tabList[index].id
+				this.getList()
 			}
 		}
 	}