2022114提交

api/cms.js

@@ -15,4 +15,8 @@ const addBlogViews = async ({ id }) => {
 	const res = await request.get({ url: `/cms/blog/cms/addBlogViews/${id}` });
 	return res.data;
 }
-export default { getTypeList, getArticleList, getArticleDetail, addBlogViews };
+const getsublist = async ({ alias }) => {
+	const res = await request.get({ url: `/api/cms/type/sublist/${alias}` });
+	return res.data;
+}
+export default { getTypeList, getArticleList, getArticleDetail, addBlogViews, getsublist };

env.js

@@ -1,10 +1,10 @@
 const ENV_API_URL = {
 	development: {
-		// url: 'https://fuyu.scapp.cn/wx-api/api',
-		url: 'http://192.168.0.70:7070/api',
+		url: 'https://fuyu.scapp.cn/wx-api/api',
+		// url: 'http://192.168.0.70:7070/api',
 		imgUrl: 'https://fuyu.scapp.cn/static/wxa/',
-		// fileUrl: 'https://fuyu.scapp.cn'
-		fileUrl: 'http://192.168.0.71'
+		fileUrl: 'https://fuyu.scapp.cn'
+		// fileUrl: 'http://192.168.0.71'
 	},
 	production: {
 		url: 'https://fuyu.scapp.cn/wx-api/api',

pages.json

@@ -31,6 +31,12 @@
 				"navigationBarTitleText": "核酸检测登记"
 			}
 		},
+		{
+			"path": "pages/illness/vaccines",
+			"style": {
+				"navigationBarTitleText": "疫苗接种点"
+			}
+		},
 		{
 			"path": "pages/illness/receive",
 			"style": {

pages/illness/index.vue

@@ -11,7 +11,7 @@
 					</uni-list-chat>
 				</view>
 			</uni-list>
-			<text v-else class="chat-custom-text msgText">请完善成员信息 / 家庭成员审核中</text>
+			<text v-if="list.length <= 0 && task !== null" class="chat-custom-text msgText">请完善成员信息 / 家庭成员审核中</text>
 		</uni-section>
 	</view>
 </template>

pages/illness/vaccines.vue

@@ -0,0 +1,54 @@
+<template>
+	<view class="container">
+		<uni-card :title="istitle" class="cardBox">
+			<uni-list border class="list">
+				<uni-list-item v-for="(item, index) in dataList" :key="index" :note="item.note" :ellipsis="1" :title="item.title" link clickable  @click="listItemBtn(item)" ></uni-list-item>
+			</uni-list>
+			<uni-load-more :status="more" />
+		</uni-card>
+	</view>
+</template>
+
+<script>
+	import request from '../../api/cms.js';
+	export default {
+		onLoad: function (option) {
+			
+		},
+		data() {
+			return {
+				dataList: [],
+				more: 'more',
+				page: 0,
+				size: 20
+			}
+		},
+		async mounted() {
+			await this.getList();
+		},
+		methods: {
+			listItemBtn(e) {
+				uni.navigateTo({ url: `/pages/details/index?id=${e.id}` });
+			},
+			// 查询列表函数
+			async getList() {
+				this.page += 1;
+				this.more = 'loading';
+				const res = await request.getArticleList({ pageNum: this.page, pageSize: this.size, typeName: 'jzdcx' });
+				this.dataList.push(...res.rows)
+				// 根据总数 算页数  如果当前页 = 总页数就是没有数据  否则就是上拉加载
+				this.more = this.page >= Math.ceil(res.total / this.size) ? 'noMore' : 'more';
+			},
+		},
+		// 页面生命周期中onReachBottom（页面滚动到底部的事件）
+		onReachBottom() {
+			if(this.more != 'noMore') {
+				this.more = 'more';
+				this.getList();
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

pages/policy/index.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<view class="top">
 			<view class="search">
-				<uni-easyinput class="uni-input" prefixIcon="search" v-model="searchVal" placeholder="请输入您要查询的政策名称"></uni-easyinput>
+				<uni-easyinput class="uni-input" prefixIcon="search" v-model="searchVal" placeholder="请输入您要查询的名称"></uni-easyinput>
 				<button class="searchBtn" type="default" size="mini" @click="searchBtn">搜索</button>
 			</view>
 		</view>
@@ -30,7 +30,7 @@
 			// this.init();
 		},
 		async mounted() {
-			this.getPolicyList({ typeName: 'policy' });
+			this.getPolicyList({ typeName: 'fczs' });
 		},
 		methods: {
 			// 列表点击函数
@@ -51,7 +51,7 @@
 			searchBtn() {
 				if(!this.searchVal || this.searchVal == '') return;
 				this.reset();
-				this.getPolicyList({ title: this.searchVal, typeName: 'policy' });
+				this.getPolicyList({ title: this.searchVal, typeName: 'fczs' });
 			},
 			reset() {
 				this.page = 0;

pages/property/butler.vue

@@ -1,38 +1,43 @@
 <template>
-	<view class="container">
-		<view class="box">
-			<view class="imgBox" v-for="(item, index) in dataList" :key="index">
-				<image class="imgs" mode="scaleToFill" :src="filesUrl + item.blogPic"></image>
-				<text class="name">张曦汐</text>
+	<view class="container" :style="{ backgroundImage: `url(${hgjbj})` }">
+		<uni-section v-for="item in dataList" titleFontSize="16px"  class="sectionBox" :title="item.name" type="line">
+			<view class="box">
+				<view class="imgBox" v-for="(i, index) in item.data" :key="index" @click="btn(i)">
+					<image class="imgs" mode="scaleToFill" :src="filesUrl + i.blogPic"></image>
+					<text class="name">{{ i.title }}</text>
+					<text class="name">{{ i.blogDesc }}</text>
+				</view>
 			</view>
-		</view>
+		</uni-section>
 	</view>
 </template>
 
 <script>
 	import request from '../../api/cms.js';
 	import { BASE_URL } from '../../env.js';
+	import requestLogin from '../../api/login.js';
 	export default {
 		data() {
 			return {
 				filesUrl: BASE_URL.fileUrl,
-				dataList: []
+				dataList: [],
+				hgjbj: ''
 			}
 		},
 		onShow: function() {},
 		async mounted() {
-			this.getPolicyList({ typeName: 'policy' });
+			const config = await requestLogin.getJson();
+			const { hgjbj } = config.data;
+			this.hgjbj = hgjbj;
+			const res = await request.getsublist({ alias: 'hgjfc' });
+			this.dataList = await Promise.all(res.data.map(async e => {
+				const aliasData = await request.getArticleList({ pageNum: 1, pageSize: 100, typeName: e.alias });
+				return { name: e.typeName, alias: e.alias, data: aliasData.rows };
+			}))
 		},
 		methods: {
-			// 列表点击函数
-			listItemBtn(e) {
-				return;
-				uni.navigateTo({ url: `/pages/details/index?id=${e.id}` })
-			},
-			// 搜索函数
-			async getPolicyList(e) {
-				const res = await request.getArticleList({ pageNum: 1, pageSize: 100, typeName: 'hgjfc' });
-				this.dataList = res.rows;
+			btn(e) {
+				// uni.navigateTo({ url: `/pages/details/index?id=${e.id}` })
 			}
 		}
 	}
@@ -43,7 +48,7 @@
 		width: 100%;
 		height: 100vh;
 		overflow-y: auto;
-		background-color: darkred;
+		background-size: 100% 100%;
 	}
 	.box {
 		display: flex;
@@ -53,12 +58,13 @@
 		width: 30%;
 		height: 36vw;
 		margin-left: 2.5%;
-		margin-top: 20px;
+		margin-top: 5px;
 	}
 	.imgs {
 		display: block;
 		width: 100%;
 		height: 90%;
+		border: 2px solid #CD7F32;
 	}
 	.name {
 		width: 100%;
@@ -66,4 +72,14 @@
 		text-align: center;
 		color: #fff;
 	}
+	.uni-section {
+		background-color: transparent !important;
+		margin-top: 20px;
+	}
+	.uni-section-header {
+		padding: 0 10px !important;
+	}
+	.uni-section__content-title {
+		color: #fff !important;
+	}
 </style>

pages/report/double.vue

@@ -11,7 +11,7 @@
 				<video controls v-if="item.type == 'video' && formData[item.name]" class="uploadVideo" :src="filesUrl + formData[item.name]"></video>
 			</uni-forms-item>
 		</uni-forms>
-		<button class="btn" type="primary" @click="submitForm">提交</button>
+		<button :disabled="btnText == '已报道'" class="btn" type="primary" @click="submitForm">{{ btnText }}</button>
 	</view>
 </template>
 
@@ -21,6 +21,7 @@
 	export default {
 		data() {
 			return {
+				btnText: '提交',
 				baseUrl: BASE_URL.url,
 				filesUrl: BASE_URL.fileUrl,
 				formData: {},
@@ -40,15 +41,8 @@
 		async mounted() {
 			const res = await request.getDyStatus();
 			if (res.data) {
-				uni.showToast({
-					title: '不能重复报道',
-					icon: 'error',
-					duration: 2000,
-				});
-				setTimeout(() => {
-					uni.navigateBack();
-				}, 1000)
-				return;
+				this.formData = { ...res.data, sex: String(res.data.sex), reportType: String(res.data.reportType) };;
+				this.btnText = '已报道';
 			}
 			await this.setDict();
 		},

pages/report/index.vue

@@ -6,7 +6,7 @@
 				<uni-data-checkbox v-model="formData[item.name]" v-if="item.formatter && item.type == 'checkbox'" :multiple="item.multiple || false" :localdata="item.dict" />
 			</uni-forms-item>
 		</uni-forms>
-		<button class="btn" type="primary" @click="submitForm">提交</button>
+		<button :disabled="btnText == '已报道'" class="btn" type="primary" @click="submitForm">{{ btnText }}</button>
 	</view>
 </template>
 
@@ -15,6 +15,7 @@
 	export default {
 		data() {
 			return {
+				btnText: '提交',
 				formData: {},
 				fileds: [
 					{ name: 'name', title: '姓名' },
@@ -29,15 +30,8 @@
 		async mounted() {
 			const res = await request.getGbStatus();
 			if (res.data) {
-				uni.showToast({
-					title: '不能重复报道',
-					icon: 'error',
-					duration: 2000,
-				});
-				setTimeout(() => {
-					uni.navigateBack();
-				}, 1000)
-				return;
+				this.formData = { ...res.data, sex: String(res.data.sex), jianrensanzhang: String(res.data.jianrensanzhang) };
+				this.btnText = '已报道';
 			}
 			await this.setDict();
 		},

unpackage/dist/build/mp-weixin/app.json

@@ -5,6 +5,7 @@
     "pages/service/index",
     "pages/policy/index",
     "pages/illness/index",
+    "pages/illness/vaccines",
     "pages/illness/receive",
     "pages/illness/testingRoom",
     "pages/details/index",

unpackage/dist/build/mp-weixin/pages/illness/vaccines.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "疫苗接种点",
+  "usingComponents": {
+    "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card",
+    "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
+    "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item",
+    "uni-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more"
+  }
+}

unpackage/dist/build/mp-weixin/pages/property/butler.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "红管家风采展示",
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section"
+  }
 }

unpackage/dist/build/mp-weixin/pages/property/butler.wxss

@@ -1 +1 @@
-.container{width:100%;height:100vh;overflow-y:auto;background-color:#8b0000}.box{display:flex;flex-wrap:wrap}.imgBox{width:30%;height:36vw;margin-left:2.5%;margin-top:20px}.imgs{display:block;width:100%;height:90%}.name{width:100%;display:block;text-align:center;color:#fff}
+.container{width:100%;height:100vh;overflow-y:auto;background-size:100% 100%}.box{display:flex;flex-wrap:wrap}.imgBox{width:30%;height:36vw;margin-left:2.5%;margin-top:5px}.imgs{display:block;width:100%;height:90%;border:2px solid #cd7f32}.name{width:100%;display:block;text-align:center;color:#fff}.uni-section{background-color:initial!important;margin-top:20px}.uni-section-header{padding:0 10px!important}.uni-section__content-title{color:#fff!important}

unpackage/dist/dev/mp-weixin/app.json

@@ -5,6 +5,7 @@
     "pages/service/index",
     "pages/policy/index",
     "pages/illness/index",
+    "pages/illness/vaccines",
     "pages/illness/receive",
     "pages/illness/testingRoom",
     "pages/details/index",

unpackage/dist/dev/mp-weixin/pages/illness/vaccines.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarTitleText": "疫苗接种点",
+  "usingComponents": {
+    "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card",
+    "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
+    "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item",
+    "uni-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/property/butler.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "红管家风采展示",
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section"
+  }
 }

unpackage/dist/dev/mp-weixin/pages/property/butler.wxss

@@ -3,7 +3,7 @@
 	width: 100%;
 	height: 100vh;
 	overflow-y: auto;
-	background-color: darkred;
+	background-size: 100% 100%;
 }
 .box {
 	display: flex;
@@ -13,12 +13,13 @@
 	width: 30%;
 	height: 36vw;
 	margin-left: 2.5%;
-	margin-top: 20px;
+	margin-top: 5px;
 }
 .imgs {
 	display: block;
 	width: 100%;
 	height: 90%;
+	border: 2px solid #CD7F32;
 }
 .name {
 	width: 100%;
@@ -26,4 +27,14 @@
 	text-align: center;
 	color: #fff;
 }
+.uni-section {
+	background-color: transparent !important;
+	margin-top: 20px;
+}
+.uni-section-header {
+	padding: 0 10px !important;
+}
+.uni-section__content-title {
+	color: #fff !important;
+}
 

unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,8 +1,7 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": [],
-    "include": []
+    "ignore": []
   },
   "setting": {
     "urlCheck": false,
@@ -10,20 +9,28 @@
     "postcss": true,
     "minified": false,
     "newFeature": true,
-    "bigPackageSizeSupport": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    }
+    "bigPackageSizeSupport": true
   },
   "compileType": "miniprogram",
-  "libVersion": "2.26.1",
+  "libVersion": "",
   "appid": "wxfb8ee68c5e9a63e8",
   "projectname": "Applet",
-  "condition": {},
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": -1,
+      "list": []
+    }
   }
 }