Merge remote-tracking branch 'origin/master'

pages.json

@@ -185,7 +185,7 @@
 			}
 		},
 		{
-			"path": "pages/mattersAdd/mattersAdd",
+			"path": "pages/handleAffairs/mattersAdd/mattersAdd",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -280,7 +280,7 @@
 			}
 		},
 		{
-			"path": "pages/handleAffairs/handleAffairs",
+			"path": "pages/handleAffairs/index",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -399,7 +399,7 @@
 			}
 		},
 		{
-			"path": "pages/me/meOperate",
+			"path": "pages/me/meOperate/meOperate",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -408,7 +408,7 @@
 			}
 		},
 		{
-			"path": "pages/gridQuery/gridQuery",
+			"path": "pages/handleAffairs/gridQuery/gridQuery",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -553,7 +553,7 @@
 			}
 		},
 		{
-			"path": "pages/topic/topic",
+			"path": "pages/handleAffairs/topic/topic",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -562,7 +562,7 @@
 			}
 		},
 		{
-			"path": "pages/matterAll/matterAll",
+			"path": "pages/handleAffairs/matterAll/matterAll",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -571,7 +571,7 @@
 			}
 		},
 		{
-			"path": "pages/topic/dept",
+			"path": "pages/handleAffairs/dept/dept",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -580,7 +580,7 @@
 			}
 		},
 		{
-			"path": "pages/gridQuery/mattercontent",
+			"path": "pages/handleAffairs/mattercontent/mattercontent",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",

pages/topic/dept.vue

@@ -1,9 +1,9 @@
 <template>
 	<view>
-		
+
 			<view class="btnContain">
-				<button 
-					v-for="(item,idx) in userType" 
+				<button
+					v-for="(item,idx) in userType"
 					@click="onclick(item,idx)"
 					:class="idx == currentIdx ? 'highlight' : 'not-highlight'"
 					:style="idx == 0 ? 'text-align:left' : 'text-align:right'"
@@ -11,13 +11,13 @@
 					{{item.dictLabel}}
 				</button>
 			</view>
-		
-		
+
+
 		<view>
 			<uni-grid :column="2" :square="false" :highlight="false">
 				<uni-grid-item v-for="(item, index) in dataList" :index="index" :key="index">
 						<view class="grid-item-box" @click="onMatters(item)">
-					
+
 						<text class="text">{{ item.name }}</text>
 					</view>
 				</uni-grid-item>
@@ -49,9 +49,10 @@
 		},
 		methods: {
 			onMatters(data){
+        console.log(data)
 				uni.setStorageSync('data', {department:data.name,examine:1})
 				uni.navigateTo({
-					url: '/pages/matterAll/matterAll',
+					url: '/pages/handleAffairs/matterAll/matterAll',
 				});
 			},
 			getdataList(data){
@@ -66,7 +67,7 @@
 					_that.dataList = res.data
 					console.log("9999999999999999999999",_that.dataList)
 				})
-				
+
 			},
 			onclick(row,idx) {
 				this.currentIdx = idx
@@ -160,5 +161,5 @@
 		justify-content: center;
 		padding: 15px 0;
 	}
-	
-</style>
+
+</style>

pages/handleAffairs/handleAffairs.vue

@@ -132,7 +132,7 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 			  goToMatterAllPage() {
 			        // 使用 uni-app 的路由跳转方法跳转到 matterAll 页面
 			        uni.navigateTo({
-			            url: '/pages/mattersAdd/mattersAdd'
+			            url: '/pages/handleAffairs/mattersAdd/mattersAdd'
 			        });
 			    },
 			confirm(){
@@ -142,13 +142,13 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 				console.log(this.title)
 				uni.setStorageSync('data', {title:this.title,examine:1})
 				uni.navigateTo({
-					url: '/pages/matterAll/matterAll',
+					url: '/pages/handleAffairs/matterAll/matterAll',
 				});
 			},
 			//主题导航跳转
 			topic(){
 				uni.navigateTo({
-					url: '/pages/topic/topic',
+					url: '/pages/handleAffairs/topic/topic',
 				});
 			},
 
@@ -156,7 +156,7 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 				console.log(item)
 				uni.setStorageSync('id', item.id)
 				uni.navigateTo({
-					url: '/pages/gridQuery/gridQuery?titleText='+item.name
+					url: '/pages/handleAffairs/gridQuery/gridQuery?titleText='+item.name
 
 				});
 			},
@@ -200,13 +200,13 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 			getmatter(item) {
 			    uni.setStorageSync('id', item.id);
 			    uni.navigateTo({
-			        url: '/pages/gridQuery/mattercontent',
+			        url: '/pages/handleAffairs/mattercontent/mattercontent',
 			    });
 			},
 			addNewItem(item) {
 
 			    uni.navigateTo({
-			        url: '/pages/mattersAdd/mattersAdd',
+			        url: '/pages/handleAffairs/mattersAdd/mattersAdd',
 			    });
 			},
 			changeTab(tab) {
@@ -219,7 +219,7 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 			dept(){
 
 				uni.navigateTo({
-					url: '/pages/topic/dept',
+					url: '/pages/handleAffairs/dept/dept',
 				});
 			}
 		}
@@ -287,7 +287,7 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 		background-color: #07C160;
 	}
 	.input-view {
-		
+
 		justify-content: space-between;
 		align-items: center;
 		/* #ifndef APP-PLUS-NVUE */

pages/matterAll/matterAll.vue

@@ -68,7 +68,7 @@
 			onclick(data){//点击详情
 				uni.setStorageSync('id', data.id);
 				uni.navigateTo({
-				    url: '/pages/gridQuery/mattercontent',
+				    url: '/pages/handleAffairs/mattercontent/mattercontent',
 				});
 			},
 			getMatters() {
@@ -84,7 +84,7 @@
 </script>
 
 <style lang="scss">
-@import './matterAll.css';
+@import 'matterAll.css';
 .container{
 	height: 100%;
 	content: '\e633';

pages/mattersAdd/mattersAdd.vue

@@ -23,25 +23,25 @@
 				</uni-forms-item>
 				<uni-forms-item name="type" label="主题类型" required label-width="30%">
 					<uni-data-select
-							
+
 						  style="width: 30%;margin: auto;"
 						  v-model="formData.type"
 						  placeholder="请选择主题类型"
-						  field="deptName as value, deptName as text"	
+						  field="deptName as value, deptName as text"
 						  :localdata="topicTypeList"
 					></uni-data-select>
 				</uni-forms-item>
 				<uni-forms-item name="department" label="所属部门" required label-width="30%">
 					<uni-data-select
-					
+
 						  style="width: 30%;margin: auto;"
 						  v-model="formData.department"
 						  placeholder="请选择所属部门"
-						  field="name as value, name as text"	
+						  field="name as value, name as text"
 						  :localdata="departmentList"
 					></uni-data-select>
 				</uni-forms-item>
-			
+
 				<uni-forms-item name="picture"  label="图片">
 					<upload :imgArr="imageList"  :fileSize="1" :limit="3" @updateImg="updateImg"></upload>
 				</uni-forms-item>
@@ -57,15 +57,15 @@
 		</uni-forms>
 	</view>
 </template>
- 
+
 <script>
-	import { 
+	import {
 		getListTopicType,
 		getListDepts ,
 	} from '@/api/me/matters/matters.js'
 	import upload from '@/components/upload/index.vue'
 	import {addsc} from '@/api/handleAffairs/matter.js'
-	
+
 	export default {
 		components: {
 			upload
@@ -108,7 +108,7 @@
 				imageList:[],
 				topicTypeList:[],
 				departmentList:[],
-			
+
 				show: false,
 				rules: {
 					title: {
@@ -166,13 +166,13 @@
 				// 			}
 				// 		]
 				// 	},
-				
+
 
 				}
 			}
 		},
 		methods: {
-		
+
 			submitForm(form) {
 			    this.$refs[form]
 			        .submit()
@@ -185,12 +185,12 @@
 			                    console.log("1111111111111", res);
 			                    if (res.confirm) {
 			                        // 用户点击确定按钮
-			                   
+
 			                    addsc(this.formData).then(response => {
 										console.log("7777777", this.formData);
 			                            this.$modal.msgSuccess("新增成功");
 			                             uni.navigateBack();
-			               
+
 			                        }).catch(error => {
 			                            console.error("新增方法出错：", error);
 			                        });
@@ -210,7 +210,7 @@
 			},
 
 
- 
+
 			// submitForm(form) {
 			// 	this.$refs[form]
 			// 		.submit()
@@ -224,8 +224,8 @@
 			// 			console.error('验证失败：', errors)
 			// 		})
 			// },
- 
-		
+
+
 			resetForm() {
 				this.$refs.form.resetFields()
 			},
@@ -247,7 +247,7 @@
 				//  this.formData.picture =this.imageList
 				 // this.formData.picture = JSON.stringify(this.imageList);
 				const pictureString = '"' + this.imageList.join('","') + '"';
-				
+
 				// 将转换后的字符串赋值给 this.formData.picture
 				this.formData.picture = pictureString;
 				// console.log("1111111111111",)
@@ -284,4 +284,4 @@
 		border-radius: 5px;
 		box-sizing: border-box;
 	}
-</style>
+</style>

pages/topic/topic.vue

@@ -1,8 +1,8 @@
 <template>
 	<view>
 		<view class="btnContain">
-			<button 
-				v-for="(item,idx) in userType" 
+			<button
+				v-for="(item,idx) in userType"
 				@click="onclick(item,idx)"
 				:class="idx == currentIdx ? 'highlight' : 'not-highlight'"
 				:style="idx == 0 ? 'text-align:left' : 'text-align:right'"
@@ -47,7 +47,7 @@
 			onMatters(data){
 				uni.setStorageSync('data', {type:data.deptName,examine:1})
 				uni.navigateTo({
-					url: '/pages/matterAll/matterAll',
+					url: '/pages/handleAffairs/matterAll/matterAll',
 				});
 			},
 			getdataList(data){
@@ -99,7 +99,7 @@
 	.highlight{
 		color:#FF673D;
 	}
-	
+
 	.btnContain{
 		position: relative;
 		width: 100%;
@@ -157,4 +157,4 @@
 		justify-content: center;
 		padding: 15px 0;
 	}
-</style>
+</style>

pages/index/index.vue

@@ -481,7 +481,7 @@
 			},
 			goBanShi() {
 				uni.navigateTo({
-					url: '/pages/handleAffairs/handleAffairs'
+					url: '/pages/handleAffairs/index'
 				});
 			},
 			//获取最新公告列表（三条未读消息）

pages/matters/matters.vue

@@ -122,7 +122,7 @@ export default {
 		},
 		fabClick(){
 			uni.navigateTo({
-				url: `../mattersAdd/mattersAdd`
+				url: `/pages/handleAffairs/mattersAdd/mattersAdd`
 			})
 		},
 		search(){
@@ -195,6 +195,6 @@ export default {
 	}
 }
 .not-favorite{
-	
+
 }
 </style>

pages/me/me.vue

@@ -30,7 +30,7 @@ export default {
 			},
 			list: [
 				{
-					id: 'me/meOperate',//id是文件路径
+					id: 'me/meOperate/meOperate',//id是文件路径
 					name: '我的积分流水',
 					open: false,
 				},

pages/me/meOperate.vue

@@ -86,5 +86,5 @@ export default {
 </script>
 
 <style>
-@import './meOperate.css';
+@import 'meOperate.css';
 </style>