Merge branch 'master' of http://39.98.150.180/frontend-uniapp/Civil-Affairs-Bureau-WeChar

起风了
2 parents a9c5bb83 e3296b98
Showing 5 changed files with 75 additions and 39 deletions
manifest.json
pages/declaration/declarationListdetail.vue
pages/receiptRegistration/organization.vue
pages/receiptRegistration/receiptRegistration.scss
pages/receiptRegistration/townShip.vue
 {
     "name" : "数字民政服务平台",
-    "appid" : "__UNI__E8DBEA9",
+    "appid" : "__UNI__F8D20B4",
     "description" : "",
     "versionName" : "1.0.2",
     "versionCode" : "100",
@@ -6,8 +6,8 @@
 				<view class="message-list">
 					<view class="titleall-box">
 						<view class="titleall-left">
-							<view class="titleall-left-line"></view>基本信息
-						</view>
+							<view class="titleall-left-line"></view>基本信息  
+						</view> 
 					</view>
 					<view class="info-box">
 						<view class="info-box-list">
@@ -71,11 +71,15 @@
 				</view>
 				<view class="info-box">
 					<view class="info-box-list">
-						<view class="serve">
-							<view class="serve-title">其他信息</view>
+						<view>
+							<view class="serve-title" style="font-size: 25rpx;color: #909090;">其他信息</view>
+							<textarea v-model="form.reportRecord" placeholder="请输入"
+								placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
+								style="margin-top: 20rpx;"></textarea>
 							<view>
-								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
-									v-model="form.reportRecord" placeholder="请输入" style="text-align: right;" />
+
+								<!-- <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
+									v-model="form.reportRecord" placeholder="请输入" style="text-align: right;" /> -->
 							</view>
 						</view>
 					</view>
@@ -275,7 +279,8 @@
 				var minute = now.getMinutes(); //获取当前分钟数(0-59)
 				var second = now.getSeconds(); //获取当前秒数(0-59)
 				this.form.reportTime = year + "-" + (month < 10 ? "0" + month : month) + "-" + (day < 10 ? "0" + day :
-					day) + " " + (hour < 10 ? "0" + hour : hour) + ":" + (minute < 10 ? "0" + minute : minute) + ":" + (
+						day) + " " + (hour < 10 ? "0" + hour : hour) + ":" + (minute < 10 ? "0" + minute : minute) + ":" +
+					(
 						second < 10 ? "0" + second : second);
 			},
 			register() {
@@ -123,6 +123,7 @@
 				.serve-title {
 					font-size: 25rpx;
 					color: #909090;
+					width: 25%;
 				}
 				.serve-right {
 					font-size: 25rpx;
@@ -4,16 +4,21 @@
 		<view class="content">
 			<view class="top-box" @click="gopath('/pages/receiptRegistration/receiptRegistrationList')">
 				<view>上报历史</view>
-				<view class="top-box-img"><image src="../../static/right2.png"></image></view>
+				<view class="top-box-img">
+					<image src="../../static/right2.png"></image>
+				</view>
+			</view>
+			<view class="titleall-left">
+				<view class="titleall-left-line"></view>我要上报
 			</view>
-			<view class="titleall-left"><view class="titleall-left-line"></view>我要上报</view>
 			<view class="message-list">
 				<view class="info-box">
 					<view class="info-box-list">
 						<view class="serve">
 							<view class="serve-title">发生地点</view>
 							<view>
-								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.incidentLocation" placeholder="请输入" style="text-align: right;"/>
+								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
+									v-model="form.incidentLocation" placeholder="请输入" style="text-align: right;" />
 							</view>
 						</view>
 					</view>
@@ -23,7 +28,8 @@
 						<view class="serve">
 							<view class="serve-title">儿童姓名</view>
 							<view>
-								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.childName" placeholder="请输入" style="text-align: right;"/>
+								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
+									v-model="form.childName" placeholder="请输入" style="text-align: right;" />
 							</view>
 						</view>
 					</view>
@@ -46,7 +52,8 @@
 						<view class="serve">
 							<view class="serve-title">儿童年龄</view>
 							<view>
-								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.age"  placeholder="请输入" style="text-align: right;"/>
+								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
+									v-model="form.age" placeholder="请输入" style="text-align: right;" />
 							</view>
 						</view>
 					</view>
@@ -56,30 +63,45 @@
 						<view class="serve">
 							<view class="serve-title">报告原因</view>
 							<view>
-								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.reportReason"  placeholder="请输入" style="text-align: right;"/>
+								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
+									v-model="form.reportReason" placeholder="请输入" style="text-align: right;" />
 							</view>
 						</view>
 					</view>
 				</view>
 				<view class="info-box">
 					<view class="info-box-list">
-						<view class="serve">
+						<view>
+							<view class="serve-title" style="font-size: 25rpx;color: #909090;">其他信息</view>
+							<textarea v-model="form.reportRecord" placeholder="请输入"
+								placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
+								style="margin-top: 20rpx;"></textarea>
+							<!-- <view>
+								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
+									v-model="form.reportRecord" placeholder="请输入" style="text-align: right;" />
+							</view> -->
+						</view>
+						<!-- <view class="serve">
 							<view class="serve-title">其他信息</view>
 							<view>
-								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.reportRecord"  placeholder="请输入" style="text-align: right;"/>
+								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
+									v-model="form.reportRecord" placeholder="请输入" style="text-align: right;" />
 							</view>
-						</view>
+						</view> -->
 					</view>
 				</view>
 			</view>
-			<view class="titleall-left"><view class="titleall-left-line"></view>报告人信息</view>
+			<view class="titleall-left">
+				<view class="titleall-left-line"></view>报告人信息
+			</view>
 			<view class="message-list">
 				<view class="info-box">
 					<view class="info-box-list">
 						<view class="serve">
 							<view class="serve-title">姓名</view>
 							<view>
-								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.reporterName" placeholder="请输入" style="text-align: right;"/>
+								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
+									v-model="form.reporterName" placeholder="请输入" style="text-align: right;" />
 							</view>
 						</view>
 					</view>
@@ -89,7 +111,8 @@
 						<view class="serve">
 							<view class="serve-title">与儿童关系</view>
 							<view>
-								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.relationshipWithChild" placeholder="请输入" style="text-align: right;"/>
+								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
+									v-model="form.relationshipWithChild" placeholder="请输入" style="text-align: right;" />
 							</view>
 						</view>
 					</view>
@@ -99,7 +122,8 @@
 						<view class="serve">
 							<view class="serve-title">电话</view>
 							<view>
-								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.phone" placeholder="请输入" style="text-align: right;"/>
+								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
+									v-model="form.phone" placeholder="请输入" style="text-align: right;" />
 							</view>
 						</view>
 					</view>
@@ -122,7 +146,8 @@
 						<view class="serve">
 							<view class="serve-title">职业</view>
 							<view>
-								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.reporterOccupation"  placeholder="请输入" style="text-align: right;"/>
+								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
+									v-model="form.reporterOccupation" placeholder="请输入" style="text-align: right;" />
 							</view>
 						</view>
 					</view>
@@ -132,31 +157,33 @@
 						<view class="serve">
 							<view class="serve-title">单位名称</view>
 							<view>
-								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.reporterOrganizationName"  placeholder="请输入" style="text-align: right;"/>
+								<input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
+									v-model="form.reporterOrganizationName" placeholder="请输入"
+									style="text-align: right;" />
 							</view>
 						</view>
 					</view>
 				</view>
 			</view>
 			<view class="page-footer">
-			  <view class="footer-buy">
-			    <view class="cart-add" @click="register">
-					<image src="../../static/btn5.png"></image>
-			      <text>立即上报</text>
-			    </view>
-			  </view>
+				<view class="footer-buy">
+					<view class="cart-add" @click="register">
+						<image src="../../static/btn5.png"></image>
+						<text>立即上报</text>
+					</view>
+				</view>
 			</view>
-			
-		</view>
+
 		</view>
 	</view>
+	</view>
 </template>
 <script>
 	export default {
 		data() {
 			return {
-				form:{
+				form: {
 					reportTime: "",
 					reportPlatform: "",
 					incidentLocation: "",
@@ -181,10 +208,10 @@
 				index: 0
 			};
 		},
-		methods:{
+		methods: {
 			gopath(e) {
 				uni.navigateTo({
-					url:e
+					url: e
 				})
 			},
 			// 选择性别
@@ -207,15 +234,18 @@
 				var hour = now.getHours(); //获取当前小时数(0-23)
 				var minute = now.getMinutes(); //获取当前分钟数(0-59)
 				var second = now.getSeconds(); //获取当前秒数(0-59)
-				this.form.reportTime = year + "-" + (month<10?"0"+month:month) + "-" + (day<10?"0"+day:day) + " " + (hour<10?"0"+hour:hour) + ":" + (minute<10?"0"+minute:minute) + ":" + (second<10?"0"+second:second);
+				this.form.reportTime = year + "-" + (month < 10 ? "0" + month : month) + "-" + (day < 10 ? "0" + day :
+						day) + " " + (hour < 10 ? "0" + hour : hour) + ":" + (minute < 10 ? "0" + minute : minute) + ":" +
+					(
+						second < 10 ? "0" + second : second);
 			},
-			register(){
+			register() {
 				this.getTime();
 				this.form.filingType = '个人';
 				this.form.reportType = '强制报告';
 				this.API.addRegistration(this.form).then(res => {
 					console.log(res)
-					if (res.code == 200 ) {
+					if (res.code == 200) {
 						uni.showToast({
 							icon: 'success',
 							title: '上报成功'
@@ -227,7 +257,7 @@
 						}, 800)
 					}
 				})
-				
+
 			}
 		}
 	}
@@ -235,4 +265,4 @@
 <style scoped lang="scss">
 	@import 'receiptRegistration.scss';
 -</style>
+</style>
 \ No newline at end of file