20221201版本提交：添加服务签到功能

api/report.js

@@ -31,4 +31,20 @@ const getCommunity = async () => {
 	const res = await request.get({ url: `/wx/addr/community` });
 	return res.data;
 }
-export default { getDict, submitgb, submitdy, getDyStatus, getGbStatus, getCommunity, updatedy, updategb };
+// 签到 
+// 查询是否是党员
+const getisdy = async () => {
+	const res = await request.get({ url: `/dangjian/is-dangyuan` });
+	return res.data;
+}
+// 查询是否签到
+const getqdstatus = async () => {
+	const res = await request.get({ url: `/dangjian/clockin-status` });
+	return res.data;
+}
+// 签到
+const clockin = async (data) => {
+	const res = await request.post({ url: `/dangjian/clockin`, data });
+	return res.data;
+}
+export default { getDict, submitgb, submitdy, getDyStatus, getGbStatus, getCommunity, updatedy, updategb, getisdy, getqdstatus, clockin };

env.js

@@ -1,4 +1,9 @@
 const ENV_API_URL = {
+	// development: {
+	// 	url: 'http://172.17.116.208:7070/api',
+	// 	imgUrl: 'https://fuyu.cc-lotus.info/static/wxa',
+	// 	fileUrl: 'http://172.17.116.208:80'
+	// },
 	development: {
 		url: 'https://fuyu.cc-lotus.info/wx-api/api',
 		imgUrl: 'https://fuyu.cc-lotus.info/static/wxa',

pages.json

@@ -164,6 +164,12 @@
 				"navigationBarTitleText": "党员“双报到”"
 			}
 		},
+		{
+			"path": "pages/report/service",
+			"style": {
+				"navigationBarTitleText": "服务签到"
+			}
+		},
 		{
 			"path": "pages/recruit/index",
 			"style": {

pages/report/service.vue

@@ -0,0 +1,186 @@
+<template>
+	<view class="container">
+		<uni-card v-if="isdy == 0">
+			<uni-section title="您还不能签到" type="line">
+				<text class="msg">您需要进行党员或下沉干部报到后，才能进行签到。</text>
+			</uni-section>
+		</uni-card>
+		<uni-forms v-else ref="baseForm" :modelValue="formData" :rules="rules" :label-width="80">
+			<uni-forms-item v-for="item in fileds" :label="item.title" :name="item.name"  :key="item.name" required>
+				<uni-easyinput v-if="!item.formatter && !item.type" type="text" v-model="formData[item.name]" :placeholder="`请输入${item.title}`" />
+				<uni-data-checkbox v-model="formData[item.name]" v-if="item.formatter && item.type == 'checkbox'" :multiple="item.multiple || false" :localdata="item.dict" />
+				<uni-data-select v-model="formData[item.name]" v-if="item.formatter && item.type == 'select'" :localdata="item.dict"></uni-data-select>
+				<view class="upVideo" v-if="item.type == 'upload' && !formData[item.name]" @click="upVideo">
+					<uni-icons color="#cacaca" class="videoIcon" type="videocam" size="30"></uni-icons>
+				</view>
+				<uni-data-select v-model="formData[item.name]" v-if="item.type == 'picker'" :localdata="item.dict" placeholder="请选择社区"></uni-data-select>
+				 <image class="uploadVideo" v-if="item.type == 'upload' && formData[item.name]" :mode="item.mode" :src="filesUrl + formData[item.name]"></image>
+				<!-- <video controls v-if="item.type == 'video' && formData[item.name]" class="uploadVideo" :src="filesUrl + formData[item.name]"></video> -->
+			</uni-forms-item>
+		</uni-forms>
+		<button v-if="isdy != 0" :disabled="formData && formData.userId" class="btn" type="primary" @click="submitForm">{{ btnText }}</button>
+	</view>
+</template>
+
+<script>
+	import request from '../../api/report.js';
+	import { BASE_URL } from '../../env.js';
+	export default {
+		data() {
+			return {
+				pickerList: [],
+				pickerValue: '',
+				pickerName: '',
+				indicatorStyle: `height: 50px`,
+				visible: false,
+				btnText: '签到',
+				baseUrl: BASE_URL.url,
+				filesUrl: BASE_URL.fileUrl,
+				formData: {},
+				fileds: [
+					{ name: 'deptId', title: '报到社区', type: 'picker' },
+					{ name: 'description', title: '报到内容' },
+					{ name: 'photo', title: '上传照片', type: 'upload' },
+				],
+				rules: {
+					photo: {
+						rules:[{ required: true, errorMessage: '请上传照片' }]
+					},
+					description: {
+						rules:[{ required: true, errorMessage: '请填写报到内容' }]
+					},
+					deptId: {
+						rules:[{ required: true, errorMessage: '请选择报到社区' }]
+					},
+				},
+				isdy: 1
+			}
+		},
+		async mounted() {
+			const isdy = await request.getisdy();
+			this.isdy = isdy.data;
+			if (isdy && isdy.data == 0) {
+				return;
+			}
+			const getCommunity = await request.getCommunity();
+			this.pickerList = getCommunity.rows;
+			await this.setDict();
+			const is_status = await request.getqdstatus();
+			if (is_status.data) {
+				this.formData = is_status.data;
+				this.btnText = '已签到'
+			}
+		},
+		onShow() {},
+		methods: {
+			// 社区选择改变
+			bindChange(e) {
+				console.log(e, '社区选择改变')
+			},
+			// 选择社区
+			pickerClick() {
+				console.log('选择社区')
+				this.visible = true;
+			},
+			async setDict() {
+				this.fileds = await Promise.all(this.fileds.map(async e => {
+					if (e.name == 'deptId') e.dict = this.pickerList.map(e => ({ ...e, text: e.deptName, value: e.deptId }));
+					if (e.formatter && e.formatter.includes('dict')) {
+						const dictType = e.formatter.split(':')[1];
+						const res = await request.getDict(dictType);
+						if (res.code == 200) e.dict = res.data.map(l => ({ ...l, value: l.dictValue, text: l.dictLabel }));
+					}
+					return e;
+				}));
+			},
+			async upVideo() {
+				const _this = this;
+				const token = uni.getStorageSync('token');
+				uni.chooseImage({
+					count: 1,
+					success: async (chooseImageRes) => {
+						wx.showLoading({
+							title: '上传中'
+						})
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						uni.uploadFile({
+							url: BASE_URL.url + '/activity/photo',
+							name: 'file',
+							header: {
+								'Authorization': `Bearer ${token}`
+							},
+							filePath: tempFilePaths[0],
+							success: (uploadFileRes) => {
+								const obj = JSON.parse(uploadFileRes.data);
+								_this.$set(_this.formData, 'photo', obj.imgUrl);
+							},
+							fail(e) {
+								console.log(e)
+								wx.showToast({
+									title: '上传失败'
+								})
+							},
+							complete() {
+								wx.hideLoading();
+							}
+						});
+					}
+				});
+			},
+			submitForm() {
+				this.$refs.baseForm.validate().then(async valid=>{
+					const res = await request.clockin(this.formData);
+					if (res.code == 200) {
+						uni.showToast({
+							title: '签到成功',
+							icon: 'success',
+							duration: 2000,
+						});
+						setTimeout(() => {
+							uni.navigateBack();
+						}, 1000)
+					}
+				}).catch(err =>{
+					console.log('表单错误信息：', err);
+				})
+			}
+		},
+		// 页面生命周期中onReachBottom（页面滚动到底部的事件）
+		onReachBottom() {}
+	}
+</script>
+
+<style>
+	.uni-forms {
+		width: 90%;
+		margin: 10px auto;
+	}
+	.btn {
+		width: 90%;
+		margin: 0 auto;
+	}
+	.upVideo {
+		width: 100px;
+		height: 100px;
+		border: 1px solid #cacaca;
+		border-radius: 12px;
+	}
+	.videoIcon {
+		display: block;
+		text-align: center;
+		line-height: 100px;
+	}
+	.uploadVideo {
+		width: 100px;
+		height: 100px;
+	}
+	.pickerItem {
+		text-indent: 0.5em;
+		border: 1px solid #e8e8e8;
+		line-height: 2.5em;
+	}
+	.msg {
+		color: red;
+		font-size: 12px;
+	}
+</style>

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

@@ -27,6 +27,7 @@
     "pages/property/butler",
     "pages/report/index",
     "pages/report/double",
+    "pages/report/service",
     "pages/recruit/index",
     "pages/recruit/details"
   ],

unpackage/dist/build/mp-weixin/pages/activity/index.wxss

@@ -1 +1 @@
-.slot-box{position:relative}.slot-image{width:50px;height:50px}.status{position:absolute;left:0;top:0;font-size:12px;color:#fff;background:#999}.slot-body{width:70%;margin-left:10px}.slot-title{font-size:1.2em;font-weight:600;color:#000;line-height:2em}.slot-text{font-size:14px;color:#999;line-height:3em}.footerIcon{line-height:3em}
+.slot-box{position:relative}.slot-image{width:80px;height:80px}.status{position:absolute;left:0;top:0;font-size:12px;color:#fff;background:#999}.slot-body{width:70%;margin-left:10px}.slot-title{font-size:1.2em;font-weight:600;color:#000;line-height:2em}.slot-text{font-size:14px;color:#999;line-height:3em}.footerIcon{line-height:3em}

unpackage/dist/build/mp-weixin/pages/report/double.json

@@ -1,6 +1,8 @@
 {
   "navigationBarTitleText": "党员“双报到”",
   "usingComponents": {
+    "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card",
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
     "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
     "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",

unpackage/dist/build/mp-weixin/pages/report/double.wxss

@@ -1 +1 @@
-.uni-forms{width:90%;margin:10px auto}.btn{width:90%;margin:0 auto}.upVideo{width:100px;height:100px;border:1px solid #cacaca;border-radius:12px}.videoIcon{display:block;text-align:center;line-height:100px}.uploadVideo{width:100px;height:100px}
+.uni-forms{width:90%;margin:10px auto}.btn{width:90%;margin:0 auto}.upVideo{width:100px;height:100px;border:1px solid #cacaca;border-radius:12px}.videoIcon{display:block;text-align:center;line-height:100px}.uploadVideo{width:100px;height:100px}.pickerItem{text-indent:.5em;border:1px solid #e8e8e8;line-height:2.5em}.msg{color:red;font-size:12px}

unpackage/dist/build/mp-weixin/pages/report/index.json

@@ -1,9 +1,12 @@
 {
   "navigationBarTitleText": "下沉干部报到",
   "usingComponents": {
+    "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card",
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
     "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
     "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
-    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox"
+    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
+    "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select"
   }
 }

unpackage/dist/build/mp-weixin/pages/report/service.json

@@ -0,0 +1,13 @@
+{
+  "navigationBarTitleText": "服务签到",
+  "usingComponents": {
+    "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card",
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
+    "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}

unpackage/dist/build/mp-weixin/pages/report/service.wxss

@@ -0,0 +1 @@
+.uni-forms{width:90%;margin:10px auto}.btn{width:90%;margin:0 auto}.upVideo{width:100px;height:100px;border:1px solid #cacaca;border-radius:12px}.videoIcon{display:block;text-align:center;line-height:100px}.uploadVideo{width:100px;height:100px}.pickerItem{text-indent:.5em;border:1px solid #e8e8e8;line-height:2.5em}.msg{color:red;font-size:12px}

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

@@ -15,7 +15,8 @@
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
-    }
+    },
+    "enhance": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.27.0",

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

@@ -27,6 +27,7 @@
     "pages/property/butler",
     "pages/report/index",
     "pages/report/double",
+    "pages/report/service",
     "pages/recruit/index",
     "pages/recruit/details"
   ],

unpackage/dist/dev/mp-weixin/pages/report/service.json

@@ -0,0 +1,13 @@
+{
+  "navigationBarTitleText": "服务签到",
+  "usingComponents": {
+    "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card",
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
+    "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/report/service.wxss

@@ -0,0 +1,34 @@
+
+.uni-forms {
+	width: 90%;
+	margin: 10px auto;
+}
+.btn {
+	width: 90%;
+	margin: 0 auto;
+}
+.upVideo {
+	width: 100px;
+	height: 100px;
+	border: 1px solid #cacaca;
+	border-radius: 12px;
+}
+.videoIcon {
+	display: block;
+	text-align: center;
+	line-height: 100px;
+}
+.uploadVideo {
+	width: 100px;
+	height: 100px;
+}
+.pickerItem {
+	text-indent: 0.5em;
+	border: 1px solid #e8e8e8;
+	line-height: 2.5em;
+}
+.msg {
+	color: red;
+	font-size: 12px;
+}
+

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

@@ -1,30 +1,36 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": [],
-    "include": []
+    "ignore": []
   },
   "setting": {
     "urlCheck": false,
-    "es6": true,
+    "es6": false,
     "postcss": true,
-    "minified": true,
+    "minified": false,
     "newFeature": true,
-    "bigPackageSizeSupport": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "enhance": true
+    "bigPackageSizeSupport": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
-  "appid": "wx6cc481d94edbe039",
+  "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": []
+    }
   }
 }