frontend-uniapp / Civil-Affairs-Bureau-WeChar

Commit 41aaed9e9f9af0ad5011d68fc4122df38a101bc4

Authored by 起风了
2 parents a9c5bb83 e3296b98

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

Inline Side-by-side
Showing 5 changed files with 75 additions and 39 deletions
manifest.json
  View file @41aaed9
1 1 {
2 2 "name" : "数字民政服务平台",
3   - "appid" : "__UNI__E8DBEA9",
  3 + "appid" : "__UNI__F8D20B4",
4 4 "description" : "",
5 5 "versionName" : "1.0.2",
6 6 "versionCode" : "100",
... ...
pages/declaration/declarationListdetail.vue
  View file @41aaed9
... ... @@ -6,8 +6,8 @@
6 6 <view class="message-list">
7 7 <view class="titleall-box">
8 8 <view class="titleall-left">
9   - <view class="titleall-left-line"></view>基本信息
10   - </view>
  9 + <view class="titleall-left-line"></view>基本信息
  10 + </view>
11 11 </view>
12 12 <view class="info-box">
13 13 <view class="info-box-list">
... ...
pages/receiptRegistration/organization.vue
  View file @41aaed9
... ... @@ -71,11 +71,15 @@
71 71 </view>
72 72 <view class="info-box">
73 73 <view class="info-box-list">
74   - <view class="serve">
75   - <view class="serve-title">其他信息</view>
  74 + <view>
  75 + <view class="serve-title" style="font-size: 25rpx;color: #909090;">其他信息</view>
  76 + <textarea v-model="form.reportRecord" placeholder="请输入"
  77 + placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
  78 + style="margin-top: 20rpx;"></textarea>
76 79 <view>
77   - <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
78   - v-model="form.reportRecord" placeholder="请输入" style="text-align: right;" />
  80 +
  81 + <!-- <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
  82 + v-model="form.reportRecord" placeholder="请输入" style="text-align: right;" /> -->
79 83 </view>
80 84 </view>
81 85 </view>
... ... @@ -275,7 +279,8 @@
275 279 var minute = now.getMinutes(); //获取当前分钟数(0-59)
276 280 var second = now.getSeconds(); //获取当前秒数(0-59)
277 281 this.form.reportTime = year + "-" + (month < 10 ? "0" + month : month) + "-" + (day < 10 ? "0" + day :
278   - day) + " " + (hour < 10 ? "0" + hour : hour) + ":" + (minute < 10 ? "0" + minute : minute) + ":" + (
  282 + day) + " " + (hour < 10 ? "0" + hour : hour) + ":" + (minute < 10 ? "0" + minute : minute) + ":" +
  283 + (
279 284 second < 10 ? "0" + second : second);
280 285 },
281 286 register() {
... ...
pages/receiptRegistration/receiptRegistration.scss
  View file @41aaed9
... ... @@ -123,6 +123,7 @@
123 123 .serve-title {
124 124 font-size: 25rpx;
125 125 color: #909090;
  126 + width: 25%;
126 127 }
127 128 .serve-right {
128 129 font-size: 25rpx;
... ...
pages/receiptRegistration/townShip.vue
  View file @41aaed9
... ... @@ -4,16 +4,21 @@
4 4 <view class="content">
5 5 <view class="top-box" @click="gopath('/pages/receiptRegistration/receiptRegistrationList')">
6 6 <view>上报历史</view>
7   - <view class="top-box-img"><image src="../../static/right2.png"></image></view>
  7 + <view class="top-box-img">
  8 + <image src="../../static/right2.png"></image>
  9 + </view>
  10 + </view>
  11 + <view class="titleall-left">
  12 + <view class="titleall-left-line"></view>我要上报
8 13 </view>
9   - <view class="titleall-left"><view class="titleall-left-line"></view>我要上报</view>
10 14 <view class="message-list">
11 15 <view class="info-box">
12 16 <view class="info-box-list">
13 17 <view class="serve">
14 18 <view class="serve-title">发生地点</view>
15 19 <view>
16   - <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.incidentLocation" placeholder="请输入" style="text-align: right;"/>
  20 + <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
  21 + v-model="form.incidentLocation" placeholder="请输入" style="text-align: right;" />
17 22 </view>
18 23 </view>
19 24 </view>
... ... @@ -23,7 +28,8 @@
23 28 <view class="serve">
24 29 <view class="serve-title">儿童姓名</view>
25 30 <view>
26   - <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.childName" placeholder="请输入" style="text-align: right;"/>
  31 + <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
  32 + v-model="form.childName" placeholder="请输入" style="text-align: right;" />
27 33 </view>
28 34 </view>
29 35 </view>
... ... @@ -46,7 +52,8 @@
46 52 <view class="serve">
47 53 <view class="serve-title">儿童年龄</view>
48 54 <view>
49   - <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.age" placeholder="请输入" style="text-align: right;"/>
  55 + <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
  56 + v-model="form.age" placeholder="请输入" style="text-align: right;" />
50 57 </view>
51 58 </view>
52 59 </view>
... ... @@ -56,30 +63,45 @@
56 63 <view class="serve">
57 64 <view class="serve-title">报告原因</view>
58 65 <view>
59   - <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.reportReason" placeholder="请输入" style="text-align: right;"/>
  66 + <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
  67 + v-model="form.reportReason" placeholder="请输入" style="text-align: right;" />
60 68 </view>
61 69 </view>
62 70 </view>
63 71 </view>
64 72 <view class="info-box">
65 73 <view class="info-box-list">
66   - <view class="serve">
  74 + <view>
  75 + <view class="serve-title" style="font-size: 25rpx;color: #909090;">其他信息</view>
  76 + <textarea v-model="form.reportRecord" placeholder="请输入"
  77 + placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
  78 + style="margin-top: 20rpx;"></textarea>
  79 + <!-- <view>
  80 + <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
  81 + v-model="form.reportRecord" placeholder="请输入" style="text-align: right;" />
  82 + </view> -->
  83 + </view>
  84 + <!-- <view class="serve">
67 85 <view class="serve-title">其他信息</view>
68 86 <view>
69   - <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.reportRecord" placeholder="请输入" style="text-align: right;"/>
  87 + <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
  88 + v-model="form.reportRecord" placeholder="请输入" style="text-align: right;" />
70 89 </view>
71   - </view>
  90 + </view> -->
72 91 </view>
73 92 </view>
74 93 </view>
75   - <view class="titleall-left"><view class="titleall-left-line"></view>报告人信息</view>
  94 + <view class="titleall-left">
  95 + <view class="titleall-left-line"></view>报告人信息
  96 + </view>
76 97 <view class="message-list">
77 98 <view class="info-box">
78 99 <view class="info-box-list">
79 100 <view class="serve">
80 101 <view class="serve-title">姓名</view>
81 102 <view>
82   - <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.reporterName" placeholder="请输入" style="text-align: right;"/>
  103 + <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
  104 + v-model="form.reporterName" placeholder="请输入" style="text-align: right;" />
83 105 </view>
84 106 </view>
85 107 </view>
... ... @@ -89,7 +111,8 @@
89 111 <view class="serve">
90 112 <view class="serve-title">与儿童关系</view>
91 113 <view>
92   - <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.relationshipWithChild" placeholder="请输入" style="text-align: right;"/>
  114 + <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
  115 + v-model="form.relationshipWithChild" placeholder="请输入" style="text-align: right;" />
93 116 </view>
94 117 </view>
95 118 </view>
... ... @@ -99,7 +122,8 @@
99 122 <view class="serve">
100 123 <view class="serve-title">电话</view>
101 124 <view>
102   - <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.phone" placeholder="请输入" style="text-align: right;"/>
  125 + <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
  126 + v-model="form.phone" placeholder="请输入" style="text-align: right;" />
103 127 </view>
104 128 </view>
105 129 </view>
... ... @@ -122,7 +146,8 @@
122 146 <view class="serve">
123 147 <view class="serve-title">职业</view>
124 148 <view>
125   - <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.reporterOccupation" placeholder="请输入" style="text-align: right;"/>
  149 + <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
  150 + v-model="form.reporterOccupation" placeholder="请输入" style="text-align: right;" />
126 151 </view>
127 152 </view>
128 153 </view>
... ... @@ -132,31 +157,33 @@
132 157 <view class="serve">
133 158 <view class="serve-title">单位名称</view>
134 159 <view>
135   - <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;" v-model="form.reporterOrganizationName" placeholder="请输入" style="text-align: right;"/>
  160 + <input placeholder-style="color:#3d3d3d;font-weight: bold;font-size: 25rpx;"
  161 + v-model="form.reporterOrganizationName" placeholder="请输入"
  162 + style="text-align: right;" />
136 163 </view>
137 164 </view>
138 165 </view>
139 166 </view>
140 167 </view>
141 168 <view class="page-footer">
142   - <view class="footer-buy">
143   - <view class="cart-add" @click="register">
144   - <image src="../../static/btn5.png"></image>
145   - <text>立即上报</text>
146   - </view>
147   - </view>
  169 + <view class="footer-buy">
  170 + <view class="cart-add" @click="register">
  171 + <image src="../../static/btn5.png"></image>
  172 + <text>立即上报</text>
  173 + </view>
  174 + </view>
148 175 </view>
149   -
150   - </view>
  176 +
151 177 </view>
152 178 </view>
  179 + </view>
153 180 </template>
154 181  
155 182 <script>
156 183 export default {
157 184 data() {
158 185 return {
159   - form:{
  186 + form: {
160 187 reportTime: "",
161 188 reportPlatform: "",
162 189 incidentLocation: "",
... ... @@ -181,10 +208,10 @@
181 208 index: 0
182 209 };
183 210 },
184   - methods:{
  211 + methods: {
185 212 gopath(e) {
186 213 uni.navigateTo({
187   - url:e
  214 + url: e
188 215 })
189 216 },
190 217 // 选择性别
... ... @@ -207,15 +234,18 @@
207 234 var hour = now.getHours(); //获取当前小时数(0-23)
208 235 var minute = now.getMinutes(); //获取当前分钟数(0-59)
209 236 var second = now.getSeconds(); //获取当前秒数(0-59)
210   - 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);
  237 + this.form.reportTime = year + "-" + (month < 10 ? "0" + month : month) + "-" + (day < 10 ? "0" + day :
  238 + day) + " " + (hour < 10 ? "0" + hour : hour) + ":" + (minute < 10 ? "0" + minute : minute) + ":" +
  239 + (
  240 + second < 10 ? "0" + second : second);
211 241 },
212   - register(){
  242 + register() {
213 243 this.getTime();
214 244 this.form.filingType = '个人';
215 245 this.form.reportType = '强制报告';
216 246 this.API.addRegistration(this.form).then(res => {
217 247 console.log(res)
218   - if (res.code == 200 ) {
  248 + if (res.code == 200) {
219 249 uni.showToast({
220 250 icon: 'success',
221 251 title: '上报成功'
... ... @@ -227,7 +257,7 @@
227 257 }, 800)
228 258 }
229 259 })
230   -
  260 +
231 261 }
232 262 }
233 263 }
... ... @@ -235,4 +265,4 @@
235 265  
236 266 <style scoped lang="scss">
237 267 @import 'receiptRegistration.scss';
238 268 -</style>
  269 +</style>
239 270 \ No newline at end of file
... ...