积分相关显示调整

apis/pagejs/user.js

@@ -77,3 +77,21 @@ export function changeData(data) {
 		url: url
 	})
 }
+
+export function addFeedback(data) {
+	var url='/mobile/feedback/addFeedback';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}
+
+export function myPointsNotes(data) {
+	var url='/mobile/points/myPointsNotes';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}

apis/utils/index.js

@@ -392,11 +392,5 @@ export const isJSON = (str) => {
 }
 
 
-const prefix = 'jp-employment-kfq_'+process.car.NODE_ENV;
- 
-export const get = key => uni.getStorageInfoSync(prefix+key) 
-
-export const set = (key, value) => uni.setStorageInfoSync(prefix+key, value) 
-
 
 

apis/utils/init.js

@@ -12,8 +12,8 @@ var openId = carhelp.getOpenId();
 
 var app = {
 	init: function() {
-		 
-		if(isWeiXin()|| !(process.env.NODE_ENV === "development") ){
+		// isWeiXin()|| 
+		if(!(process.env.NODE_ENV === "development") ){
 			if (isWeiXin()) {
 				if (checkOpenId) {
 					if (!openId) {

apis/weixin.js

@@ -66,4 +66,12 @@ export function checkSubscribe(data) {
 		data: data,
 		method: 'post',
 	})
+}
+
+export function addPoint(data) {
+	return request({
+		url: '/mobile/points/addPoint',
+		data: data,
+		method: 'post',
+	})
 }

components/ShareServer.vue

@@ -0,0 +1,162 @@
+<template>
+	<div></div>
+</template>
+
+<script>
+
+	import wx from 'weixin-js-sdk'
+	import * as API_WeiXin from '@/apis/weixin'
+
+	export default {
+		name: 'Share',
+		props: {
+			 
+		},
+		data() {
+			return {
+				id:'',
+				title:'',
+				url:'',
+				isLoading: false,
+				nowItem: {
+					shareTitle: '',
+					shareImg: '',
+					shareDescription: ''
+				}
+			}
+		},
+		created() {},
+		methods: {
+			 addPoint(){
+				 API_WeiXin.addPoint({
+					 id:this.id,
+					 pointCode:"70007"
+				 }).then(response => {
+					 
+				 })
+			 },
+			
+			//获取微信jssdk配置信息
+			get_wx_config() {
+				
+				this.isLoading = true;
+				API_WeiXin.getConfig(window.location.href.split("#")[0]).then(response => {
+					this.isLoading = false;
+
+					var wxconfig = response.wxConfig;
+					console.log(wxconfig.nonceStr)
+					this.wxConfig = wxconfig;
+					wx.config({
+						debug: true, // 开启调试模式,
+						appId: wxconfig.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
+						timestamp: wxconfig.timestamp, // 必填，生成签名的时间戳
+						nonceStr: wxconfig.nonceStr, // 必填，生成签名的随机串
+						signature: wxconfig.signature, // 必填，签名，见附录1
+						jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage', 
+						'onMenuShareQQ', 'onMenuShareQZone','updateAppMessageShareData','updateTimelineShareData'] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+					});
+					wx.error(function(res){
+						 console.log(res)
+						  console.log("error")
+					  // config信息验证失败会执行 error 函数，如签名过期导致验证失败，具体错误信息可以打开 config 的debug模式查看，也可以在返回的 res 参数中查看，对于 SPA 可以在这里更新签名。
+					});
+					
+					//this.wxShare()
+				}).catch(error => {
+					this.isLoading = false;
+					
+				})
+			},
+			setUrl(url){
+				this.url=process.car.IMG_URL+"railroad-phone/#"+url;
+			},
+			setTitle(text,id){
+				this.title=text;
+				this.id=id;
+				this.wxShare() 
+				
+			},
+			//微信分享自定义
+			wxShare() {
+				var userInfo=this.carhelp.getPersonInfo()
+				//var img=require("@/assets/img/logo.png")
+				var img=""
+				var title="[微官网]"+this.title
+			//	var desc=
+				let joinUrl = this.url;
+				console.log(img);
+				console.log(title);
+				console.log(joinUrl);
+				var _this = this;
+				
+				wx.ready(function() {
+					wx.checkJsApi({
+					  jsApiList:  ['onMenuShareTimeline', 'onMenuShareAppMessage', 
+						'onMenuShareQQ', 'onMenuShareQZone','updateAppMessageShareData','updateTimelineShareData'], // 需要检测的 JS 接口列表，所有 JS 接口列表见附录2,
+					  success: function(res) {
+					 console.log(res)
+					 console.log("1111")
+					  }
+					});
+					
+					wx.updateTimelineShareData({
+						title: title,
+					//	desc:desc ,
+						link: joinUrl,
+						 imgUrl: img,
+						success: function() {
+							if(userInfo){
+								//_this.addPoint()
+							}
+							// 设置成功
+							_this.$emit("wxShare",null);
+						}
+					})
+					wx.updateAppMessageShareData({
+						title: title,
+					//	desc:desc ,
+						link: joinUrl,
+						 imgUrl: img,
+						success: function() {
+							if(userInfo){
+								//_this.addPoint()
+							}
+							// 设置成功
+							_this.$emit("wxShare",null);
+						}
+					})
+					wx.onMenuShareAppMessage({
+						title: title,
+					//	desc:desc ,
+						link: joinUrl,
+						 imgUrl: img,
+						success: function() {
+							if(userInfo){
+								//_this.addPoint()
+							}
+							// 设置成功
+							_this.$emit("wxShare",null);
+						}
+					})
+					wx.onMenuShareTimeline({
+						title: title,
+						//desc:desc ,
+						link: joinUrl,
+						 imgUrl: img,
+						success: function() {
+							// 设置成功
+							_this.$emit("wxShare",null);
+						}
+					})
+				});
+			}
+		},
+		mounted() {
+			this.url=window.location.href;
+			this.get_wx_config();
+		},
+	}
+</script>
+
+<style>
+</style>

config/.env.dev.js

@@ -3,8 +3,8 @@ const UNI_APP = {
 	BASE_URL: 'http://36.134.122.108:8086/railroad-server/',
 	IMG_URL:"http://www.jsrailway.com.cn/",
 	//BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
-	// 'http://192.168.77.162:8080/charging-station/' ,
-	//BASE_URL:'http://192.168.77.162:8086/railroad-server/',
+	
+	BASE_URL:'http://192.168.77.162:8081/railroad-server/',
 	//BASE_URL:'http://192.168.77.222:8086/railroad-server/',
 	
 	NODE_ENV :"dev",
@@ -13,7 +13,7 @@ const UNI_APP = {
 	//openId:"oK9Wr57rAcNzihDN2PEdptprT0As", 
 	// openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
 	openId:"oBEnI6GDWCRQqn_xlyPlCYFY8Amg",//zkx
-	openId:"19612",
+	//openId:"123456",
 	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
 	//openId:"oK9Wr5zv8lvirni3txbxRkmpg8d0",//
 	

config/.env.js

@@ -1,4 +1,11 @@
-(function() {  
+import {
+	getUrlParam,
+	getWeixinRedirectURI,
+	isWeiXin
+} from '@/apis/utils'
+(
+
+function() {  
     const NODE_ENV = 'dev'; // dev:开发环境 | test:测试环境  
     let ENV_VAR = null;  
 	 
@@ -25,6 +32,9 @@
 		} 
       
     }  
+	if(isWeiXin()){
+			ENV_VAR = require('./.env.prod.js'); 
+	}
 
     if (ENV_VAR) {  
 		process.car = {};  

manifest.json

@@ -17,7 +17,9 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Share" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -43,7 +45,14 @@
             /* ios打包配置 */
             "ios" : {},
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx1052afafacae1c63",
+                        "UniversalLinks" : ""
+                    }
+                }
+            }
         }
     },
     /* 快应用特有相关 */

pages/homePage/homePage.vue

@@ -213,7 +213,7 @@
 						if(item.url){
 							this.list.push({
 								id:item.id,
-								image:item.url,
+								image: process.car.IMG_URL+item.url,
 								title:item.title
 							})
 						}

pages/mine/feedback.vue

@@ -3,14 +3,17 @@
 		<u-navbar title="意见反馈"></u-navbar>
 		<view class="main">
 			<textarea name="" id="" 
-			v-model="subForm.content"
+			v-model="subForm.opinion" maxlength="200"
 			cols="30" rows="10" placeholder="填写反馈内容（必填）"></textarea>
 		
-			<u-upload  :form-data="formData" :header="header" :action="action"
+			<u-upload   ref="uUpload" 
+			name="photoFile"
+			  :max-size="50 * 1024 * 1024"
+			:form-data="formData" :header="header" :action="action"
 			:file-list="fileList" upload-text=""></u-upload>
 
 			<input type="text" 
-			 v-model="subForm.telephone"
+			 v-model="subForm.phone"
 			placeholder="请留下联系方式，方便我们与您取得联系" />
 		</view>
 
@@ -32,9 +35,9 @@
 					
 				},
 				subForm: {
-					content: '',
-					imgUrl: '',
-					telephone: ''
+					opinion: '',
+					photoUrl: '',
+					phone: ''
 				}
 			}
 		},onLoad() {
@@ -61,7 +64,7 @@
 		methods: {
 			//表单检测
 			checkFrom() {
-				if (!this.subForm.content) {
+				if (!this.subForm.opinion) {
 				
 					uni.showToast({
 						title: "请输入内容"
@@ -71,52 +74,32 @@
 					return true;
 				}
 			},
+			
 			//提交
 			submit() {
-				if (this.checkFrom()) {
-					uni.showModal({
-						title: '提示',
-						content: '提交成功',
-						showCancel:false,
-						success: res=>{
-							if (res.confirm) {
-								uni.navigateBack({
-									
-								})
-							} else if (res.cancel) {
-								//('用户点击取消');
-							}
-						}
-					});
-				}
-			},
-			//提交
-			submit2() {
 				let files = [];
 								// 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
-								files = this.$refs.uUpload.lists.filter(val => {
-									return val.progress == 100;
-								})
+								files = this.$refs.uUpload.lists
 								// 如果您不需要进行太多的处理，直接如下即可
 								// files = this.$refs.uUpload.lists;
 				
-				//(files);
+				console.log(files);
 					
-				var imgUrl=files.map(item=>{
-					return item.response.data;
+				var photoUrl=files.map(item=>{
+					return item.response.data.fileUrl;
 				})
-				//(imgUrl);
-				this.subForm.imgUrl = imgUrl.join(',');
+				console.log(photoUrl);
+				this.subForm.photoUrl = photoUrl.join(',');
 				
 			
 				if (this.checkFrom()) {
-					this.subForm.picUrl = this.listPic.join(',');
+					//this.subForm.picUrl = this.listPic.join(',');
 					uni.showLoading({
 						title: "加载中",
 						mask: true,
 					})
 					
-					API.feedback(this.subForm).then(response => {
+					API.addFeedback(this.subForm).then(response => {
 						
 						uni.hideLoading()
 						uni.showModal({

pages/mine/mine.vue

@@ -34,7 +34,7 @@
 				</view>
 				<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>
+						<u-icon size="32" name="arrow-right"></u-icon>
 					</text>
 				</view>
 			</view>
@@ -63,8 +63,9 @@
 						  评论
 					</view>
 				</view>
-				<view class="item"  @click="gotoUrl('pages/mine/points/points')" >
-					<view class="amout">
+				<view class="item"  >
+					<!-- // -->
+					<view class="amout" @click="gotoUrl('pages/mine/points/points')" >
 						{{plusInfo.userPoints}}
 					</view>
 					<view class="text">

pages/mine/myWinningRecord.vue

@@ -3,13 +3,13 @@
 		<u-navbar title="获奖记录"  >
 		</u-navbar>
 		<view class="main">
-			<view class="winning-box">
+			<view class="winning-box"  v-for="(item,i) in list"  :key="i" >
 				<view class="item">
 					<view class="title">
 						活动：
 					</view>
 					<view class="value">
-						2023年度春季职工运动会
+						{{item.name}}
 					</view>
 				</view>
 				<view class="item">
@@ -17,44 +17,19 @@
 						奖励：
 					</view>
 					<view class="value highlight">
-						品牌羽毛球拍*2
+						{{item.prize}}
 					</view>
 				</view>
 				<view class="else">
 					<view class="state">
-					  已结束
+					  {{item.status}}
 					</view>
 					<view class="date">
-						2020-12-30
-					</view>
-				</view>
-			</view>
-			<view class="winning-box">
-				<view class="item">
-					<view class="title">
-						活动：
-					</view>
-					<view class="value">
-						2023年度春季职工运动会
-					</view>
-				</view>
-				<view class="item">
-					<view class="title">
-						奖励：
-					</view>
-					<view class="value highlight">
-						品牌羽毛球拍*2
-					</view>
-				</view>
-				<view class="else">
-					<view class="state">
-					  已结束
-					</view>
-					<view class="date">
-						2020-12-30
+						{{item.date}}
 					</view>
 				</view>
 			</view>
+			
 		</view>
 		<u-divider  v-if="list.length==recordsTotal"
 		 :isnone="!list.length" nonetext="获奖记录为空"  bg-color="#F2F4F4" border-color="#CFD2D5">已经到底了</u-divider>
@@ -62,7 +37,7 @@
 </template>
 
 <script>
-	import * as API from '@/apis/pagejs/user.js'
+	import * as API from '@/apis/pagejs/activity.js'
 	
 	export default {
 		data() {
@@ -70,15 +45,47 @@
 				list:[],
 				listForm:{
 					pageIndex:1,
-					typeId:"",
-					title:"",
+					
 					pageSize:20,
 				},
 				recordsTotal:0,
 			}
 		},
+		onLoad(op){
+		
+			this.getList()
+		},
+		onReachBottom() {
+			if (this.list.length < this.recordsTotal) {			
+				this.myLoadmore();
+			}
+		},
 		methods: {
-			
+			myLoadmore(){
+				this.listForm.pageIndex += 1;
+				this.getList();
+			},
+			getList(){
+				
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.myAwards(this.listForm).then((res) => {
+					uni.hideLoading();
+					this.list = [
+						...this.list,
+						...res.data.data
+					];
+					this.recordsTotal = res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			}
 		}
 	}
 </script>

pages/mine/personalPage.vue

@@ -1,34 +1,41 @@
 <template>
 	<view>
+		<u-navbar v-show="false" ref="refNavbar" >
+			
+		</u-navbar>
+		
 		<view class="header">
 			<!-- 导航 -->
 			<view :class="flag?'sticky':'navbar'">
-				<view class="back">
-					<u-icon name="arrow-left" size="40"></u-icon>
+				<view class="back" style="font-size: 32rpx;" @click="back()">
+					<u-icon name="arrow-left" size="40"></u-icon>返回
 				</view>
 				<view class="title">
 					个人主页
 				</view>
-				<view class="camera">
+				<view class="camera" @click="issueMethod()" >
 					<u-icon name="camera-fill" size="48"></u-icon>
 				</view>
 			</view>
 			<!-- 个人信息 -->
 			<view class="person-infos">
 				 <view class="photo">
-				 	<img src="../../assets/img/shareP.png" alt="">
+				 	
+					<img v-if="userInfo.headImg" :src="userInfo.headImg" alt="">
+					
+					<u-avatar  v-else  size="120" ></u-avatar>
 				 </view>
 				<view class="infos">
 					<view class="name">
-						王泽
+						{{userInfo.name}}
 					</view>
 					<view class="department-position">
-						<view class="department">
+						<view class="department" v-if="userInfo.orgName">
 							<view class="icon">
 								<img src="../../assets/img/department2.png" alt="">
 							</view>
 							<view class="text">
-								采购部
+								{{userInfo.orgName}}
 							</view>
 						</view>
 						<view class="position">
@@ -46,7 +53,7 @@
 			<view class="grid">
 				<view class="item">
 					<view class="amout">
-						999
+						{{plusInfo.userShare}}
 					</view>
 					<view class="text">
 						发布
@@ -54,7 +61,7 @@
 				</view>
 				<view class="item">
 					<view class="amout">
-						999
+						{{plusInfo.userNewsLike}}
 					</view>
 					<view class="text">
 						点赞
@@ -62,7 +69,7 @@
 				</view>
 				<view class="item">
 					<view class="amout">
-						999
+						{{plusInfo.userNewsComment}}
 					</view>
 					<view class="text">
 						评论
@@ -73,79 +80,119 @@
 		</view>
 		<!-- 分享 -->
 		<view class="share">
-			<view class="item">
-				<view class="date">
-					<view class="day">
-						15
-					</view>
-					<view class="year-month">
-						2023.1
-					</view>
-				</view>
-				<view class="content">
-					<view class="title">
-						周末去参加了公司组织的羽毛球赛~
-					</view>
-					<view class="photos">
-						<img src="../../assets/img/sharePic2.png" alt="">
-						<img src="../../assets/img/sharePic3.png" alt="">
-						
-					</view>
-				</view>
-				
-			</view>
-			<view class="item">
+			<view class="item"  v-for="(item,i) in list" :key="i" >
 				<view class="date">
 					<view class="day">
-						15
+						{{day(item.createTime)}}
 					</view>
 					<view class="year-month">
-						2023.1
+						{{yearmonth(item.createTime)}}
 					</view>
 				</view>
 				<view class="content">
 					<view class="title">
-						周末去参加了公司组织的羽毛球赛~
+						<textarea placeholder="记录点滴生活..." :auto-height="true"
+						v-model="item.synopsis" readonly maxlength="200"
+						 name="" id="" ></textarea>
 					</view>
 					<view class="photos">
-						<img src="../../assets/img/sharePic2.png" alt="">
-						<img src="../../assets/img/sharePic3.png" alt="">
-						<img src="../../assets/img/sharePic3.png" alt="">
-					</view>
-				</view>
-				
-			</view>
-			<view class="item">
-				<view class="date">
-					<view class="day">
-						15
-					</view>
-					<view class="year-month">
-						2023.1
-					</view>
-				</view>
-				<view class="content">
-					<view class="title">
-						打工人必备！提高工作效率的电脑快捷键。~
+						<template v-for="(pic,i2) in item.listShareFiles"  v-if="pic.url">
+							<img   v-if="pic.isPic" :key="i2"
+							@click="previewImage(item.listShareFiles,i2)"
+							:src="pic.url" alt="">
+							
+							<video v-else :key="i2" :src="pic.url"
+							                    enable-danmu danmu-btn controls></video>
+						</template>
 					</view>
-					
 				</view>
 				
 			</view>
 		</view>
-		<u-divider border-color="#CFD2D5">已经到底了</u-divider>
+		<u-divider  :isnone="list.length==0" nonetext="没有找到相关内容" border-color="#CFD2D5">已经到底了</u-divider>
+		
 	</view>
 </template>
 
 <script>
+	import * as API from '@/apis/pagejs/user.js'
+	import * as API_share from '@/apis/pagejs/share.js'
+	
 	export default {
 		data() {
 			return {
 				flag: false,
 				scrollTop: "",
+				plusInfo:{},
+				userInfo:{},
+				listForm:{
+					pageIndex:1,
+					pageSize:20,
+					queryStatus:1
+				},
+				list:[],
+				recordsTotal:0,
+			}
+		},
+		onLoad() {
+			this.carhelp.set("addShare",0);
+			this.init()
+			this.getList()
+		},
+		onShow(){
+			this.findByOpenId()
+			if(	this.carhelp.get("addShare")){
+				this.listForm.pageIndex=1;
+				this.getList()
+			}
+		},
+		onReachBottom() {
+			if (this.list.length < this.recordsTotal) {			
+				this.myLoadmore();
 			}
 		},
 		methods: {
+			day(time){
+				if(time){
+					
+					return time.substring(8,10)
+				}else
+				return''
+			},
+			yearmonth(time){
+				if(time){
+					
+					return time.substring(0,7).replace('-','.')
+				}else
+				return''
+			},
+			issueMethod(id){
+				
+				this.gotoUrl('pages/mine/issue?nic=1')
+			},
+			init(){
+				this.plusInfo=this.carhelp.getPersonInfoPlus();
+				this.userInfo=this.carhelp.getPersonInfo();
+				
+			},
+			findByOpenId(){
+				API.findByOpenId({
+					noerror:true,
+					openId: this.carhelp.getOpenId(),
+					
+				}).then((response) => {
+					
+					this.carhelp.setPersonInfo(response.data.regUser);
+					this.carhelp.setPersonInfoPlus(response.data)
+					this.init();
+				}).catch(error => {
+					uni.hideLoading();
+					
+				})
+			},
+			back(){
+				this.$refs.refNavbar.goBack()
+			},
 			onPageScroll(e) {
 				this.scrollTop = e.scrollTop;
 				console.log(this.scrollTop);
@@ -157,6 +204,49 @@
 				}
 			
 			
+			},previewImage(img,i) {
+				let imgs = [];
+				img.forEach(it=>{
+					imgs.push(it.url)
+				})
+				
+				
+				uni.previewImage({
+					indicator:"default",
+					loop:true,
+					urls: imgs,
+					current: i
+				})
+			},getList(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API_share.pageList(this.listForm).then((res) => {
+					this.carhelp.set("addShare",0);
+					uni.hideLoading();
+					//this.list=response.data.data
+					if(this.listForm.pageIndex==1){
+						this.list = res.data.data;
+					}else{
+						this.list = [
+							...this.list,
+							...res.data.data
+						];
+					}
+					this.recordsTotal = res.data.recordsTotal;
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			myLoadmore(){
+				this.listForm.pageIndex += 1;
+				this.getList();
 			},
 		}
 	}

pages/mine/points/points.vue

@@ -8,15 +8,15 @@
 		<view class="background">
 			<view class="points">
 				<view class="number">
-					2779
+					{{plusInfo.userPoints}}
 				</view>
 				<view class="unit">
 					积分
 				</view>
 			</view>
-			<view class="rank" v-if="this.current==0">
+			<view class="rank" v-if="this.current==0" @click="gotoUrl('pages/mine/points/rankingList')">
 				<view class="img"><img src="../../../assets/img/riFill-bar-chart-2-fill@1x.png" alt=""></view>
-				<view class="text">积分排名105名</view>
+				<view class="text">积分排名{{top&&top.userSortNo?'第'+top.rank+'名':''}}</view>
 				<view><u-icon name="arrow-right" color="#fff" size="28"></u-icon></view>
 			</view>
 			<view class="rank" v-if="this.current==1">
@@ -28,24 +28,24 @@
 		</view>
 		
 		<view class="record">
-			<view class="tabs">
-				<u-tabs bar-width="100" inactive-color="#bbbbbb" active-color="#101010" :list="list" :is-scroll="false" :current="current" @change="change" ></u-tabs>
+			<view class="tabs" v-if="false">
+				<u-tabs bar-width="100" inactive-color="#bbbbbb" active-color="#101010" :list="tablist" :is-scroll="false" :current="current" @change="change" ></u-tabs>
 			</view>
 			<view class="get" v-if="this.current==0" >
-				<view class="total">
+				<!-- <view class="total">
 					6月获取278
-				</view>
-				<view class="each" v-for="item in 7">
+				</view> -->
+				<view class="each" v-for="(item,i) in list" :key="i">
 					<view class="way-date">
 						<view class="way">
-							点赞获得积分
+							{{item.source}}
 						</view>
 						<view class="date">
-							2022-06-15 01:58
+							{{item.createTime}}
 						</view>
 					</view>
 					<view class="number">
-						+2
+						{{item.score?"+"+item.score:item.score}}
 					</view>
 				</view>
 				
@@ -55,7 +55,7 @@
 		    		<view class="month">
 		    			6月
 		    		</view>
-					<view class="details" v-for="item in 2">
+					<view class="details" v-for="(item,i) in 2"  :key="i">
 						<view class="picture">
 							<img src="../../../assets/img/riLine-gift-2-line@1x.png" alt="">
 						</view>
@@ -79,7 +79,7 @@
 					<view class="month">
 						5月
 					</view>
-					<view class="details" v-for="item in 2">
+					<view class="details"  v-for="(item,i) in 2"  :key="i">
 						<view class="picture">
 							<img src="../../../assets/img/riLine-gift-2-line@1x.png" alt="">
 						</view>
@@ -101,26 +101,91 @@
 		    </view>
 		
 		</view>
-		<u-divider bg-color="#F2F4F4" border-color="#CFD2D5">已经到底了</u-divider>
+		<u-divider  :isnone="list.length==0" 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: [{
+				plusInfo:{},
+				userInfo:{},
+				tablist: [{
 					name: '积分获取'
 				}, {
 					name: '积分兑换'
 				}],
-				current: 0
+				listForm:{
+					pageIndex:1,
+					pageSize:20,
+				},
+				recordsTotal:0,
+				list:[],
+				current: 0,
+				top:null,
+			}
+		},
+		onLoad() {
+			this.plusInfo=this.carhelp.getPersonInfoPlus();
+			this.userInfo=this.carhelp.getPersonInfo();
+				this.getList()
+				this.pointsNotes()
+		},
+		onReachBottom() {
+			if (this.list.length < this.recordsTotal) {			
+				this.myLoadmore();
 			}
 		},
 		methods: {
+			pointsNotes(){
+				API.pointsNotes({
+					pageIndex:1,
+					pageSize:0,
+				}).then((res) => {
+						
+					
+						if(res.data.myPoint){
+							this.top=res.data.myPoint
+							this.top.rank=parseInt(res.data.myPoint.userSortNo)
+						}
+						
+					uni.hideLoading();
+					
+				}).catch(error => {
+					
+				})
+			},
+			myLoadmore(){
+				this.listForm.pageIndex += 1;
+				this.getList();
+			},
 			change(index) {
 				this.current = index;
+			},
+			getList(){
+				
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.myPointsNotes(this.listForm).then((res) => {
+					uni.hideLoading();
+					this.list = [
+						...this.list,
+						...res.data.data
+					];
+					this.recordsTotal = res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
 			}
 		}
 	}

pages/mine/points/rankingList.vue

@@ -75,28 +75,38 @@
 			}
 		},
 		onLoad() {
+			this.listForm.year=new Date().getFullYear()
 			this.getList();
 		},
+		onReachBottom() {
+			if (this.list.length < this.recordsTotal) {			
+				this.myLoadmore();
+			}
+		},
 		methods: {
+			myLoadmore(){
+				this.listForm.pageIndex += 1;
+				this.getList();
+			},
 			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
-								}
+				API.pointsNotes(this.listForm).then((res) => {
+						
+						this.list = [
+							...this.list,
+							...res.data.pointsList.data
+						];
+						this.recordsTotal = res.data.pointsList.recordsTotal;
+						
+ 						if(res.data.myPoint){
+							this.top=res.data.myPoint
+							if(res.data.myPoint.userSortNo){
+								this.top.rank=parseInt(res.data.myPoint.userSortNo)
+								
 							}
 						}
 						

pages/news/articleDetails.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
 		<u-navbar></u-navbar>
+		  <share-server ref="share"   ></share-server>
 	<!-- 新闻内容 -->
 	    <view class="content">
 	    	<view class="title">
@@ -23,12 +24,12 @@
 	    	
 	    
 	    </view>
-		<!-- <view class="picture">
-			<img src="../../assets/img/articlePic.png" alt="">
-			<view class="pic-title">
-				鲍威尔称美联储应“迅速”行动以收紧政策
-			</view>
-		</view> -->
+		
+		<view class="picture" v-if="info.pic">
+			<img :src="info.pic" style="width: 100%;" alt="">
+			
+		</view>
+		
 		</view>
 		<!-- 评论 -->
 		<view class="comment" v-if="info.title&&info.listComment&&info.listComment.length"   >
@@ -101,10 +102,10 @@
 		</view>
 		<u-popup v-model="showMessage" border-radius="34" mode="bottom" >
 			<view class="showMessage">
-				<view class="showMessage1"><h3>发表评论</h3></view>
+				<view class="showMessage1"><h3>发表评论({{content.length}}/50)</h3></view>
 				<view class="showMessage2">
-					<textarea name="" id=""
-					v-model="content"
+					<textarea name="" id=""   style="  width:100%"
+					v-model="content" maxlength="50"
 					cols="30" rows="5" placeholder="填写内容"></textarea>
 				</view>
 				<view class="showMessage3">
@@ -119,8 +120,12 @@
 
 <script>
 	import * as API from '@/apis/pagejs/news.js'
+	import ShareServer from '@/components/ShareServer.vue'
 	
 	export default {
+		components: {
+		  ShareServer
+		},
 		data() {
 			return {
 				id:"",
@@ -263,10 +268,16 @@
 					userId:userId
 				}).then((res) => {
 					
+					
 					if(bl){
 						uni.hideLoading();
 					}
 					this.info=res.data;
+					
+					this.$refs.share.setUrl("/pages/news/articleDetails?id="+this.id);
+					
+					this.$refs.share.setTitle(this.info.title,this.id);
+					
 					this.$nextTick(()=>{
 					    var list =document.getElementsByClassName("news-content")[0].getElementsByTagName("img");
 						

pages/staffHome/activityCenter/activityCenter.vue

@@ -8,6 +8,9 @@
 					<view class="have-used" v-if="item.status=='77d93870-e1e1-4369-b2b6-629e8645e8d9'" >
 						<img src="../../../assets/img/overdue.png" alt="">
 					</view>
+					<view class="have-used" v-if="item.status=='eaab19ae-893f-40e7-b730-85a13af00137'" >
+						<img src="../../../assets/img/overend.png" alt="">
+					</view>
 			 	</view>
 			 	<view class="pictures">
 			 		<img v-if="item.pic1" @click="previewImage(item.pic1)"  :src="item.pic1" alt="">
@@ -72,7 +75,7 @@
 					indicator:"default",
 					loop:true,
 					urls: imgs,
-					current: i
+					current: 0
 				})
 			},
 			ckItem(item){

pages/staffHome/activityCenter/activityDetail.vue

@@ -10,6 +10,10 @@
 		<view class="bottom2" v-if="!userInfo" >
 					
 					<u-button type="info" @click="issueMethod()">未登录</u-button>
+		</view>
+		<view class="bottom2" v-else-if="info.status=='eaab19ae-893f-40e7-b730-85a13af00137'" >
+					
+					<u-button type="info">活动未开始</u-button>
 		</view>
 		 <view class="bottom2" v-else-if="info.status=='77d93870-e1e1-4369-b2b6-629e8645e8d9'" >