调整

App.vue

@@ -11,7 +11,7 @@
 	export default {
 		onLaunch: function() {
 			console.log('App Launch')
-			document.title="微官网"
+			document.title="荆州市地方铁路有限公司微官网"
 			
 		},
 		 

components/ShareServer.vue

@@ -81,7 +81,7 @@
 				var userInfo=this.carhelp.getPersonInfo()
 				var img=process.car.IMG_URL+"railroad-phone/"+require("@/assets/img/logo.png")
 				
-				var title="[微官网]"+this.title
+				var title="[荆州市地方铁路有限公司微官网]"+this.title
 			//	var desc=
 				let joinUrl = this.url;
 				console.log(img);

main.js

@@ -16,7 +16,6 @@ if (IS_ALI) {
 import mixin from './apis/utils/mixin.js'
 import carhelpStudent from './apis/utils/mixin-student.js'
 
-
 Vue.prototype.carhelp = mixin
 Vue.prototype.carhelpStudent = carhelpStudent
 

pages.json

@@ -9,28 +9,28 @@
 		{
 			"path": "pages/homePage/homePage",
 			"style": {
-				"navigationBarTitleText": "",
+				//"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
 			"path": "pages/staffHome/staffHome",
 			"style": {
-				"navigationBarTitleText": "",
+				//"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
 			"path": "pages/mine/mine",
 			"style": {
-				"navigationBarTitleText": "",
+				//"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
 			"path": "pages/login/index",
 			"style": {
-				"navigationBarTitleText": "",
+				//"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
 
@@ -39,7 +39,7 @@
             "path" : "pages/news/news",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -48,7 +48,7 @@
             "path" : "pages/news/articleDetails",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -57,7 +57,7 @@
             "path" : "pages/staffHome/commend",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -66,7 +66,7 @@
             "path" : "pages/staffHome/teamHonor/teamHonor",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -75,7 +75,7 @@
             "path" : "pages/staffHome/teamHonor/badgeDetails",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -84,7 +84,7 @@
             "path" : "pages/staffHome/filesonic",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -94,7 +94,7 @@
             "path" : "pages/staffHome/activityCenter/activityCenter",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -103,7 +103,7 @@
             "path" : "pages/staffHome/activityCenter/activityDetail",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -112,7 +112,7 @@
             "path" : "pages/staffHome/activityReward/activityReward",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -121,7 +121,7 @@
             "path" : "pages/staffHome/activityReward/rewardDetail",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -130,7 +130,7 @@
             "path" : "pages/search/search",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -139,7 +139,7 @@
             "path" : "pages/search/searchResult",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -150,7 +150,7 @@
 		    "path" : "pages/mine/cropImage",
 		    "style" :                                                                                    
 		    {
-		        "navigationBarTitleText": "",
+		        //"navigationBarTitleText": "",
 		        "enablePullDownRefresh": false
 		    }
 		    
@@ -159,7 +159,7 @@
             "path" : "pages/mine/personalPage",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -168,7 +168,7 @@
             "path" : "pages/mine/issue",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -177,7 +177,7 @@
             "path" : "pages/mine/myLike",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -186,7 +186,7 @@
             "path" : "pages/mine/myComment",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -195,7 +195,7 @@
             "path" : "pages/mine/myWinningRecord",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -206,7 +206,7 @@
             "path" : "pages/mine/points/points",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -215,7 +215,7 @@
             "path" : "pages/mine/points/rankingList",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -224,7 +224,7 @@
             "path" : "pages/mine/points/pointsExchange/pointsExchange",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -233,7 +233,7 @@
             "path" : "pages/mine/points/pointsExchange/prizeDetails",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -242,7 +242,7 @@
             "path" : "pages/mine/points/pointsExchange/orderDetails",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -251,7 +251,7 @@
             "path" : "pages/mine/data",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -260,7 +260,7 @@
             "path" : "pages/mine/phone",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -269,7 +269,7 @@
             "path" : "pages/mine/result",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -278,7 +278,7 @@
             "path" : "pages/mine/feedback",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -287,15 +287,17 @@
             "path" : "pages/login/login",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                //"navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
         }
-    ],
+    ],
+
+	
 	"globalStyle": {
 		"navigationStyle": "custom", // 隐藏系统导航栏
-		"navigationBarTitleText": "加载中...",
+		"navigationBarTitleText": "荆州市地方铁路有限公司微官网",
 		"enablePullDownRefresh": false
 	},
 	"uniIdRouter": {}

pages/homePage/homePage.vue

@@ -53,9 +53,9 @@
 					<img src="../../assets/img/djdt.png" alt="">
 					<view class="grid-text">党建动态</view>
 				</u-grid-item>
-				<u-grid-item  @click="ckList(noticeList[4],'法制宣传')"  >
+				<u-grid-item  @click="ckList(noticeList[4],'法治宣传')"  >
 					<img src="../../assets/img/fzxc.png" alt="">
-					<view class="grid-text">法制宣传</view>
+					<view class="grid-text">法治宣传</view>
 				</u-grid-item>
 				<u-grid-item  @click="ckList(noticeList[8],'纪检监察')">
 					<img src="../../assets/img/jjjc.png" alt="">

pages/mine/issue.vue

@@ -4,7 +4,7 @@
 			<view class="slot-wrap"
 			 :class="{
 				 'slot-wrap-a':true,
-				 'slot-wrap-b':subForm.synopsis&&itemshare.label
+				 'slot-wrap-b':subForm.synopsis
 			 }"
 			 @click="selectvideo()">		 
 				 	发布		
@@ -140,12 +140,15 @@
 				this.showshare=true;
 			},
 			selectvideo(){
-				if(this.subForm.synopsis&&this.itemshare.label){
+				if(this.subForm.synopsis){
 					
 				}else{
 					return
 				}
-				this.subForm.activityId=this.listshare[this.itemshare.value].id;
+				if(this.itemshare.label){
+					this.subForm.activityId=this.listshare[this.itemshare.value].id;
+				}
+				
 				var lists = this.$refs.uUpload.lists;
 				console.log(lists)
 				var urls=[]
@@ -275,6 +278,7 @@
 
 uni-textarea{
 	width: 100%;
+	
 	text-indent: 28rpx;
 	padding-top:28rpx;
 	font-family: Microsoft Yahei;

pages/mine/personalPage.vue

@@ -95,7 +95,7 @@
 				<view class="content">
 					<view class="title">
 						<textarea placeholder="记录点滴生活..." :auto-height="true"
-						v-model="item.synopsis" readonly maxlength="200"
+						v-model="item.synopsis"  maxlength="200"  readonly
 						 name="" id="" ></textarea>
 					</view>
 					<view class="photos">
@@ -256,6 +256,12 @@
 </script>
 
 <style scoped lang="scss">
+	uni-textarea{
+		width: 500rpx;
+		text-indent: 28rpx;
+		padding-top:28rpx;
+		font-family: Microsoft Yahei;
+	}
 	page{
 		background-color: #fff;
 		padding-bottom: 50px;
@@ -292,6 +298,7 @@
 			}
 			
 		}
+		
 		// 个人信息
 		.person-infos{
 			margin-top: 32rpx;

pages/mine/points/points.vue

@@ -7,11 +7,12 @@
 		</u-navbar>
 		<u-modal v-model="showPointsRuleBl" title="积分规则" >
 			<view class="showPointsRuleClass">
-				<view>登陆微官网一分</view>
-				<view>点赞一分</view>
-				<view>分享一分</view>
-				<view>登陆微官网一分</view>
-				<view>每天上限为4分</view>
+				<view>登陆微官网 +1分</view>
+				<view>点赞 +1分</view>
+				<view>分享 +1分</view>
+				<view>评论 +1分(需要审核通过)</view>
+				<view>空间发布 +1分(需要审核通过)</view>
+				<view>每天上限为5分</view>
 			</view>
 		</u-modal>
 
@@ -207,6 +208,9 @@
 </script>
 
 <style lang="scss" scoped>
+	.showPointsRuleClass{
+		padding: 0 20px
+	}
 	/deep/.u-slot-content {
 		display: block;
 		text-align: right !important;

pages/staffHome/activityCenter/activityCenter.vue

@@ -1,6 +1,10 @@
 <template>
 	<view>
 		<u-navbar title="活动中心"></u-navbar>
+		<view class="tabs"  >
+			<u-tabs bar-width="60" :bold="false" inactive-color="#B3B3B3" active-color="#333333" height="88"
+				:list="tabList" :is-scroll="false" :current="current" @change="change"></u-tabs>
+		</view>
 		<view class="main">
 			 <view class="activity-item"  v-for="(item,i) in list" :key="i">
 			 	<view class="title">
@@ -45,6 +49,7 @@
 
 <script>
 	import * as API from '@/apis/pagejs/activity.js'
+	import * as API_share from '@/apis/pagejs/share.js'
 	
 	export default {
 		data() {
@@ -54,13 +59,16 @@
 					pageSize:20,
 					
 				},
+				current: 0,
 				list:[],
 				recordsTotal:0,
+					tabList: [],
 			}
 		},
 		onLoad(op){
 		
 			this.getList()
+			this.dataList()
 		},
 		onReachBottom() {
 			if (this.list.length < this.recordsTotal) {			
@@ -68,6 +76,23 @@
 			}
 		},
 		methods: {
+			dataList(){
+				
+				
+				API_share.dataList("活动类型").then((res) => {
+				
+					this.tabList=[
+						{
+							id:'',
+							name:'全部'
+						},
+						...res.data
+					]
+					
+				}).catch(error => {
+					
+				})
+			},
 			previewImage(pic) {
 				let imgs = [pic];
 				
@@ -88,6 +113,13 @@
 				this.listForm.pageIndex += 1;
 				this.getList();
 			},
+			change(index) {
+				this.current = index;
+			
+				this.listForm.pageIndex = 1;
+				this.listForm.typeId=this.tabList[index].id
+				this.getList()
+			},
 			getList(){
 				uni.showLoading({
 					title: "加载中",

pages/staffHome/filesonic.vue

@@ -5,10 +5,7 @@
 		<view class="image" v-if="false">
 			<u-image width="100%" height="200rpx" :src="src" border-radius="16"></u-image>
 		</view>
-		<view class="tabs"  >
-			<u-tabs bar-width="60" :bold="false" inactive-color="#B3B3B3" active-color="#333333" height="88"
-				:list="tabList" :is-scroll="false" :current="current" @change="change"></u-tabs>
-		</view>
+		
 		<!-- 分享内容 -->
 		<view class="share-content">
 			<view class="item"  v-for="(item,i) in list" :key="i" @click="ckItem(item)">
@@ -44,14 +41,23 @@
 					
 					
 				</view>
-
-				<view class="tag" :class="item.activityId"   @click="issueMethod(item.activityId)" >
+				<view class="tag"
+				 v-if="!item.activityId"
+				 :class="item.activityId"   >
+					<text class="status" style="color: red;" v-if="item.status!=1">[{{item.status==0?'审核中':''}}{{item.status==2?'审核不通过':''}}]</text>
+					
+				</view>
+				<view class="tag" v-else
+				 :class="item.activityId"   @click="issueMethod(item.activityId)" >
 					<text class="status" style="color: red;" v-if="item.status!=1">[{{item.status==0?'审核中':''}}{{item.status==2?'审核不通过':''}}]</text>
-					<text class="symbol">#</text>
-					<text class="text">{{item.activityName}}</text>
-					<text class="icon"   >
-						<u-icon size="28" color="#cccccc" name="arrow-right"></u-icon>
-					</text>
+					<template>
+						
+						<text class="symbol">#</text>
+						<text class="text">{{item.activityName}}</text>
+						<text class="icon"   >
+							<u-icon size="28" color="#cccccc" name="arrow-right"></u-icon>
+						</text>
+					</template>
 				</view>
 			</view>
 			
@@ -86,7 +92,7 @@
 		onLoad(op){
 				this.carhelp.set("addShare",0);
 				this.getList()
-				this.dataList()
+				//this.dataList()
 		},
 		onReachBottom() {
 			if (this.list.length < this.recordsTotal) {