miniprogram / jinghaiprogram · 提交

转到一个项目

作者 lihongjuan
提交 6627af34dcd058bac05ad198649c308d97ac1cb0 1 个父辈 32f66cf0

1

内嵌 并排对比
正在显示 10 个修改的文件 包含 111 行增加 和 315 行删除
@@ -79,7 +79,7 @@ page { @@ -79,7 +79,7 @@ page {
79 text-overflow: ellipsis; 79 text-overflow: ellipsis;
80 white-space: nowrap; 80 white-space: nowrap;
81 text-align: right; 81 text-align: right;
82 - margin-right: 24rpx; 82 + /* margin-right: 24rpx; */
83 } 83 }
84 84
85 .plan { 85 .plan {
1 -// pages/logining/logining.js 1 +// pages/backpeopledetail/backpeopledetail.js
2 const app = getApp() 2 const app = getApp()
3 Page({ 3 Page({
4 4
@@ -6,341 +6,93 @@ Page({ @@ -6,341 +6,93 @@ Page({
6 * 页面的初始数据 6 * 页面的初始数据
7 */ 7 */
8 data: { 8 data: {
9 - protectarr: [],  
10 - office: '',  
11 - address: '',  
12 - is_business: 0,  
13 - ishandbook: 0,  
14 - materials: [],  
15 - time: '请选择营业时间',  
16 - town: [],  
17 - townname: '请选择所属社区',  
18 - townindex: 0,  
19 - town_id: '',  
20 - name: '',  
21 - phone: '',  
22 - description: ''  
23 -  
24 - 9 + id: '',
  10 + peopledetail: '',
  11 + uintid: '',
  12 + unitname: '',
  13 + office:''
25 }, 14 },
26 15
27 /** 16 /**
28 * 生命周期函数--监听页面加载 17 * 生命周期函数--监听页面加载
29 */ 18 */
30 - onLoad: function(options) {  
31 - this.gettail()  
32 - },  
33 -  
34 - bindTimeChange: function(e) {  
35 - console.log('picker发送选择改变，携带值为', e.detail.value)  
36 - this.setData({  
37 - time: e.detail.value  
38 - })  
39 - },  
40 -  
41 - // 是否营业中  
42 - selsy() {  
43 -  
44 - this.setData({  
45 - is_business: 1  
46 - })  
47 - },  
48 - selsn() {  
49 - this.setData({  
50 - is_business: 2  
51 - })  
52 - },  
53 -  
54 - // 是否收到疫情防控指南  
55 - selsyk() { 19 + onLoad: function (options) {
  20 + console.log(options)
56 this.setData({ 21 this.setData({
57 - ishandbook: 1 22 + id: options.id
58 }) 23 })
59 - },  
60 - selsnk() {  
61 - this.setData({  
62 - ishandbook: 2  
63 - })  
64 - },  
65 24
66 - // 输入姓名  
67 - entername(e) {  
68 - this.setData({  
69 - name: e.detail.value  
70 - })  
71 - },  
72 -  
73 - // 输入电话号  
74 - enterphone(e) {  
75 - this.setData({  
76 - phone: e.detail.value  
77 - }) 25 + this.getdetail()
  26 +
78 }, 27 },
79 -  
80 - //获取登记详情  
81 - gettail() { 28 + getdetail(){
82 let that = this; 29 let that = this;
83 - var url = '/api/office/office_detail'; 30 + var url = '/api/office/office_admin_detail';
84 var params = { 31 var params = {
85 - office_token: wx.getStorageSync('office_token'),  
86 - 32 + admin_token: wx.getStorageSync("usertoken"),
  33 + office_id: this.data.id
87 } 34 }
88 app.post(url, params, "post").then((res) => { 35 app.post(url, params, "post").then((res) => {
89 console.log(res); 36 console.log(res);
90 - that.setData({  
91 - protectarr: res.materials  
92 - })  
93 - that.data.protectarr.forEach(function(value, index, array) {  
94 - value.sel = false  
95 - })  
96 - that.setData({  
97 - office: res.office,  
98 - protectarr: that.data.protectarr,  
99 - address: res.office.address,  
100 - name:res.office.leader,  
101 - phone:res.office.mobile,  
102 - town_id:res.office.town_id,  
103 - townname: res.office.town_name,  
104 - is_business:res.office.is_business  
105 - })  
106 -  
107 - that.getsocietylist()  
108 -  
109 - console.log(that.data.protectarr)  
110 -  
111 -  
112 -  
113 - }).catch((err) => {  
114 37
115 - })  
116 - },  
117 -  
118 - // 获取社区列表  
119 - getsocietylist() {  
120 - let that = this;  
121 - var url = '/api/index/town';  
122 - var params = {  
123 - type: 2,  
124 - pid: that.data.office.town_pid  
125 -  
126 - }  
127 - app.post(url, params).then((res) => {  
128 - console.log(res);  
129 that.setData({ 38 that.setData({
130 - town: res.town 39 + office:res.office
131 }) 40 })
132 - 41 +
133 42
134 43
135 }).catch((err) => { 44 }).catch((err) => {
136 45
137 }) 46 })
138 -  
139 - },  
140 - bindtownrChange(e) {  
141 - console.log(e.detail.value)  
142 - this.setData({  
143 - townindex: e.detail.value,  
144 - townname: this.data.town[e.detail.value].name,  
145 - town_id: this.data.town[e.detail.value].id  
146 - })  
147 }, 47 },
148 48
149 49
150 - // 选择防疫物资  
151 - selprotect(e) {  
152 - let that = this;  
153 - let index = e.currentTarget.dataset.index;  
154 - let id = e.currentTarget.dataset.id  
155 - this.data.protectarr.forEach(function(value, indexk, array) {  
156 - if (index == indexk) {  
157 - value.sel = !value.sel;  
158 - if (value.sel == true) {  
159 - that.data.materials.push(value.id)  
160 - } else {  
161 - that.data.materials.forEach(function(value, indexk, array) {  
162 - if (id == value) {  
163 - that.data.materials.splice(indexk, 1)  
164 - }  
165 -  
166 - })  
167 - }  
168 - }  
169 -  
170 - })  
171 - this.setData({  
172 - protectarr: this.data.protectarr,  
173 - materials: this.data.materials  
174 - })  
175 - console.log(that.data.materials)  
176 - },  
177 -  
178 - // 输入地址  
179 - enteraddress() {  
180 - this.setData({  
181 - address: ''  
182 - })  
183 - },  
184 - enterplace(e) {  
185 - this.setData({  
186 - address: e.detail.value  
187 - })  
188 - },  
189 -  
190 - // 存在的困难  
191 - entertext(e) {  
192 - this.setData({  
193 - description: e.detail.value  
194 - })  
195 - },  
196 -  
197 - // 点击完成  
198 - finish() {  
199 - let that = this;  
200 - var url = '/api/office/office_submit';  
201 - if (that.data.address == '') {  
202 - wx.showToast({  
203 - title: '请输入地址',  
204 - icon: "none"  
205 - })  
206 - return false  
207 - }  
208 - if (that.data.name == '') {  
209 - wx.showToast({  
210 - title: '请输入负责人',  
211 - icon: 'none'  
212 - })  
213 - return false  
214 - }  
215 -  
216 - if (that.data.phone == '') {  
217 - wx.showToast({  
218 - title: '请输入联系电话',  
219 - icon: 'none'  
220 - })  
221 - return false  
222 - }  
223 -  
224 - if (that.data.phone != '') {  
225 - if (!(/^1[3456789]\d{9}$/.test(that.data.phone))) {  
226 - wx.showToast({  
227 - title: '请输入正确手机号',  
228 - icon: 'none'  
229 - })  
230 - return false;  
231 - }  
232 - }  
233 - if (that.data.town_id == '') {  
234 - wx.showToast({  
235 - title: '请选择所属社区',  
236 - icon: 'none'  
237 - })  
238 - return false  
239 - }  
240 - if (that.data.is_business == 0) {  
241 - wx.showToast({  
242 - title: '请选择营业状态',  
243 - icon: 'none'  
244 - })  
245 - return false  
246 - }  
247 - if (that.data.time == '请选择营业时间') {  
248 - wx.showToast({  
249 - title: '请选择营业时间',  
250 - icon: 'none'  
251 - })  
252 - return false  
253 - }  
254 - if (that.data.ishandbook == 0) {  
255 - wx.showToast({  
256 - title: '请选择是否收到疫情指控',  
257 - icon: 'none'  
258 - })  
259 - return false  
260 - }  
261 -  
262 - var params = {  
263 - office_token: wx.getStorageSync('office_token'),  
264 - new_address: that.data.address,  
265 - town_id: that.data.town_id,  
266 - leader: that.data.name,  
267 - mobile: that.data.phone,  
268 - is_hours: that.data.is_business,  
269 - hours: that.data.time,  
270 - materials: that.data.materials.join(","),  
271 - is_receive: that.data.ishandbook,  
272 - description: that.data.description  
273 - }  
274 - app.post(url, params, "post").then((res) => {  
275 - console.log(res);  
276 - wx.showToast({  
277 - title: '提交成功',  
278 - icon: 'none',  
279 -  
280 - })  
281 - // wx.showToast({  
282 - // title: '提交成功',  
283 - // icon:'none',  
284 - // duration:1500  
285 - // })  
286 - setTimeout(function() {  
287 - wx.navigateTo({  
288 - url: '/pages/businessoffice/businessoffice',  
289 - })  
290 - }, 1500)  
291 -  
292 -  
293 - }).catch((err) => {  
294 -  
295 - })  
296 - },  
297 -  
298 /** 50 /**
299 * 生命周期函数--监听页面初次渲染完成 51 * 生命周期函数--监听页面初次渲染完成
300 */ 52 */
301 - onReady: function() { 53 + onReady: function () {
302 54
303 }, 55 },
304 56
305 /** 57 /**
306 * 生命周期函数--监听页面显示 58 * 生命周期函数--监听页面显示
307 */ 59 */
308 - onShow: function() { 60 + onShow: function () {
309 61
310 }, 62 },
311 63
312 /** 64 /**
313 * 生命周期函数--监听页面隐藏 65 * 生命周期函数--监听页面隐藏
314 */ 66 */
315 - onHide: function() { 67 + onHide: function () {
316 68
317 }, 69 },
318 70
319 /** 71 /**
320 * 生命周期函数--监听页面卸载 72 * 生命周期函数--监听页面卸载
321 */ 73 */
322 - onUnload: function() { 74 + onUnload: function () {
323 75
324 }, 76 },
325 77
326 /** 78 /**
327 * 页面相关事件处理函数--监听用户下拉动作 79 * 页面相关事件处理函数--监听用户下拉动作
328 */ 80 */
329 - onPullDownRefresh: function() { 81 + onPullDownRefresh: function () {
330 82
331 }, 83 },
332 84
333 /** 85 /**
334 * 页面上拉触底事件的处理函数 86 * 页面上拉触底事件的处理函数
335 */ 87 */
336 - onReachBottom: function() { 88 + onReachBottom: function () {
337 89
338 }, 90 },
339 91
340 /** 92 /**
341 * 用户点击右上角分享 93 * 用户点击右上角分享
342 */ 94 */
343 - onShareAppMessage: function() { 95 + onShareAppMessage: function () {
344 96
345 } 97 }
346 }) 98 })
1 <view class="box"> 1 <view class="box">
2 -  
3 - <view class="title">登记中</view>  
4 <!--基本信息--> 2 <!--基本信息-->
5 <view class="topbox"> 3 <view class="topbox">
6 <view class="topboxitem flextwo"> 4 <view class="topboxitem flextwo">
@@ -9,8 +7,9 @@ @@ -9,8 +7,9 @@
9 </view> 7 </view>
10 <view class="topboxitem flextwo"> 8 <view class="topboxitem flextwo">
11 <view class="boxitemleft">地址</view> 9 <view class="boxitemleft">地址</view>
12 - <view class="boxitemleft itemright" bindtap="enteraddress">  
13 - <input placeholder='请输入地址' value="{{address}}" bindinput="enterplace" /> 10 + <view class="boxitemleft itemright" >
  11 + {{office.address}}
  12 + <!-- <input placeholder='请输入地址' value="{{address}}" bindinput="enterplace" /> -->
14 </view> 13 </view>
15 </view> 14 </view>
16 <view class="topboxitem flextwo"> 15 <view class="topboxitem flextwo">
@@ -31,8 +30,9 @@ @@ -31,8 +30,9 @@
31 <view class="itemname commonone">负责人</view> 30 <view class="itemname commonone">负责人</view>
32 <view class="flexone"> 31 <view class="flexone">
33 <view class="commontwo seltype"> 32 <view class="commontwo seltype">
34 -  
35 - <input placeholder="请填写负责人姓名" placeholder-class="commontwo" bindinput="entername" /> 33 + {{office.leader}}
  34 +<!--
  35 + <input placeholder="请填写负责人姓名" placeholder-class="commontwo" bindinput="entername" value="name"/> -->
36 </view> 36 </view>
37 37
38 </view> 38 </view>
@@ -41,8 +41,8 @@ @@ -41,8 +41,8 @@
41 <view class="itemname commonone">联系电话</view> 41 <view class="itemname commonone">联系电话</view>
42 <view class="flexone"> 42 <view class="flexone">
43 <view class="commontwo seltype"> 43 <view class="commontwo seltype">
44 -  
45 - <input placeholder="请填写联系电话" placeholder-class="commontwo" bindinput="enterphone" /> 44 + {{office.mobile}}
  45 + <!-- <input placeholder="请填写联系电话" placeholder-class="commontwo" bindinput="enterphone" value="phone"/> -->
46 </view> 46 </view>
47 47
48 48
@@ -51,23 +51,23 @@ @@ -51,23 +51,23 @@
51 <view class="useboxitem flextwo" bindtap="selectcompany"> 51 <view class="useboxitem flextwo" bindtap="selectcompany">
52 <view class="itemname commonone">所属社区</view> 52 <view class="itemname commonone">所属社区</view>
53 53
54 - <picker bindchange="bindtownrChange" value="{{townindex}}" range="{{town}}" range-key='name'> 54 +
55 55
56 <view class="flexone"> 56 <view class="flexone">
57 <view class="commontwo seltype"> 57 <view class="commontwo seltype">
58 58
59 - {{townname}} 59 + {{office.town_name}}
60 60
61 61
62 <!-- <input placeholder="请填写工作单位" placeholder-class="commontwo" bindinput="entercompany" value="{{companyname}}" /> --> 62 <!-- <input placeholder="请填写工作单位" placeholder-class="commontwo" bindinput="entercompany" value="{{companyname}}" /> -->
63 </view> 63 </view>
64 64
65 - <view class="yourow you"> 65 + <!-- <view class="yourow you">
66 <image src="/img/yourow.png"></image> 66 <image src="/img/yourow.png"></image>
67 - </view> 67 + </view> -->
68 </view> 68 </view>
69 69
70 - </picker> 70 +
71 </view> 71 </view>
72 72
73 <view class="useboxitem flextwo"> 73 <view class="useboxitem flextwo">
@@ -76,14 +76,14 @@ @@ -76,14 +76,14 @@
76 <view class="selleft flexone"> 76 <view class="selleft flexone">
77 <view class="selleftitem selzuo flexone" bindtap="selsy"> 77 <view class="selleftitem selzuo flexone" bindtap="selsy">
78 <view class="sellefitemimg"> 78 <view class="sellefitemimg">
79 - <image src="/img/sel.png" wx:if="{{is_business==1}}"></image> 79 + <image src="/img/sel.png" wx:if="{{office.is_hours==1}}"></image>
80 <image src="/img/nosel.png" wx:else></image> 80 <image src="/img/nosel.png" wx:else></image>
81 </view> 81 </view>
82 <view class="selname">是</view> 82 <view class="selname">是</view>
83 </view> 83 </view>
84 <view class="selleftitem flexone " bindtap="selsn"> 84 <view class="selleftitem flexone " bindtap="selsn">
85 <view class="sellefitemimg"> 85 <view class="sellefitemimg">
86 - <image src="/img/sel.png" wx:if="{{is_business==2}}"></image> 86 + <image src="/img/sel.png" wx:if="{{office.is_hours==2}}"></image>
87 <image src="/img/nosel.png" wx:else></image> 87 <image src="/img/nosel.png" wx:else></image>
88 </view> 88 </view>
89 <view class="selname">否</view> 89 <view class="selname">否</view>
@@ -97,17 +97,15 @@ @@ -97,17 +97,15 @@
97 <view class="flexone"> 97 <view class="flexone">
98 <view class="commontwo"> 98 <view class="commontwo">
99 99
100 - <picker mode="time" value="{{time}}" start="00:00" end="24:59" bindchange="bindTimeChange"> 100 +
101 <view class="picker"> 101 <view class="picker">
102 - {{time}} 102 + {{office.hours}}
103 </view> 103 </view>
104 - </picker> 104 +
105 <!-- <input placeholder="请填写工作单位" placeholder-class="commontwo" bindinput="entercompany" value="{{companyname}}" /> --> 105 <!-- <input placeholder="请填写工作单位" placeholder-class="commontwo" bindinput="entercompany" value="{{companyname}}" /> -->
106 </view> 106 </view>
107 107
108 - <view class="yourow you">  
109 - <image src="/img/yourow.png"></image>  
110 - </view> 108 +
111 </view> 109 </view>
112 </view> 110 </view>
113 111
@@ -124,14 +122,14 @@ @@ -124,14 +122,14 @@
124 <view class="selleft flexone"> 122 <view class="selleft flexone">
125 <view class="selleftitem selzuo flexone" bindtap="selsyk"> 123 <view class="selleftitem selzuo flexone" bindtap="selsyk">
126 <view class="sellefitemimg"> 124 <view class="sellefitemimg">
127 - <image src="/img/sel.png" wx:if="{{ishandbook==1}}"></image> 125 + <image src="/img/sel.png" wx:if="{{office.is_receive==1}}"></image>
128 <image src="/img/nosel.png" wx:else></image> 126 <image src="/img/nosel.png" wx:else></image>
129 </view> 127 </view>
130 <view class="selname">是</view> 128 <view class="selname">是</view>
131 </view> 129 </view>
132 <view class="selleftitem flexone " bindtap="selsnk"> 130 <view class="selleftitem flexone " bindtap="selsnk">
133 <view class="sellefitemimg"> 131 <view class="sellefitemimg">
134 - <image src="/img/sel.png" wx:if="{{ishandbook==2}}"></image> 132 + <image src="/img/sel.png" wx:if="{{office.is_receive==2}}"></image>
135 <image src="/img/nosel.png" wx:else></image> 133 <image src="/img/nosel.png" wx:else></image>
136 </view> 134 </view>
137 <view class="selname">否</view> 135 <view class="selname">否</view>
@@ -143,7 +141,8 @@ @@ -143,7 +141,8 @@
143 <view class="useboxitem "> 141 <view class="useboxitem ">
144 <view class="itemname commonone have">存在的困难</view> 142 <view class="itemname commonone have">存在的困难</view>
145 <view class="flexone difficult"> 143 <view class="flexone difficult">
146 - <textarea placeholder='请输入存在的困难' bindinput="entertext"/> 144 + {{office.description}}
  145 + <!-- <textarea placeholder='请输入存在的困难' bindinput="entertext" value="{{description}}"/> -->
147 </view> 146 </view>
148 </view> 147 </view>
149 148
@@ -151,6 +150,11 @@ @@ -151,6 +150,11 @@
151 </view> 150 </view>
152 151
153 <view class="finish flexthree"> 152 <view class="finish flexthree">
154 - <view class="finishbtn" bindtap="finish">完成</view> 153 + <view class="finishbtn" bindtap="finish" wx:if="{{office.status!=2}}">完成</view>
  154 + </view>
  155 +</view>
  156 +
  157 + <view class="footerbox flextwo">
  158 + <view class="footerboxitem fotleft" bindtap="tongguo">通过</view>
  159 + <view class="footerboxitem fotright" bindtap="bohui">驳回</view>
155 </view> 160 </view>
156 -</view>  
@@ -12,7 +12,7 @@ page { @@ -12,7 +12,7 @@ page {
12 .box { 12 .box {
13 width: 750rpx; 13 width: 750rpx;
14 height: 100%; 14 height: 100%;
15 - background: linear-gradient(180deg, rgba(28, 143, 255, 1) 0%, rgba(249, 249, 249, 1) 100%); 15 + /* background: linear-gradient(180deg, rgba(28, 143, 255, 1) 0%, rgba(249, 249, 249, 1) 100%); */
16 opacity: 1; 16 opacity: 1;
17 overflow-y: scroll; 17 overflow-y: scroll;
18 } 18 }
@@ -174,16 +174,44 @@ page { @@ -174,16 +174,44 @@ page {
174 border-radius: 10rpx; 174 border-radius: 10rpx;
175 } 175 }
176 .difficult{ 176 .difficult{
177 - width:686rpx;  
178 - 177 + width:647rpx;
179 border:1rpx solid #f5f5f5; 178 border:1rpx solid #f5f5f5;
180 border-radius: 20rpx; 179 border-radius: 20rpx;
181 - margin-top:20rpx;  
182 color:#8c9198; 180 color:#8c9198;
183 font-size:24rpx; 181 font-size:24rpx;
  182 + padding: 20rpx 20rpx;
  183 + box-sizing: border-box;
  184 + margin-top:20rpx;
  185 + /* height:302rpx; */
184 } 186 }
185 -.difficult textarea{  
186 - width:100%;  
187 - height:302rpx;  
188 - padding: 20rpx; 187 +.fotleft{
  188 + width:200rpx;
  189 + height:80rpx;
  190 + color:#fff;
  191 + font-size: 28rpx;
  192 + text-align: center;
  193 + line-height: 80rpx;
  194 + border-radius: 40rpx;
  195 + background: #1C8FFF;
  196 +}
  197 +.fotright{
  198 + width:200rpx;
  199 + height:80rpx;
  200 + color:#fff;
  201 + font-size: 28rpx;
  202 + text-align: center;
  203 + line-height: 80rpx;
  204 + border-radius: 40rpx;
  205 + background: #BDC4CE;
  206 +}
  207 +.footerbox{
  208 +
  209 + width:750rpx;
  210 +
  211 + padding: 32rpx 56rpx;
  212 + box-sizing: border-box;
  213 + background: #fff;
  214 + position: fixed;
  215 + bottom:0;
  216 + left:0;
189 } 217 }
@@ -42,7 +42,14 @@ Page({ @@ -42,7 +42,14 @@ Page({
42 42
43 }) 43 })
44 }, 44 },
45 - 45 +// 进入详情页
  46 + detail(e){
  47 + console.log(888)
  48 + let id=e.currentTarget.dataset.id;
  49 + wx.navigateTo({
  50 + url: '/pages/businessdetail/businessdetail?id='+id,
  51 + })
  52 + },
46 selnav(e){ 53 selnav(e){
47 this.setData({ 54 this.setData({
48 sel:e.currentTarget.dataset.index 55 sel:e.currentTarget.dataset.index
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 10
11 11
12 <view class="box" wx:else> 12 <view class="box" wx:else>
13 - <view class="commonpadding" wx:for="{{loginlist}}" wx:key="" bindtap="businessdetail" data-id="{{item.id}}"> 13 + <view class="commonpadding" wx:for="{{loginlist}}" wx:key="" bindtap="detail" data-id="{{item.id}}">
14 <view class="statetop flextwo"> 14 <view class="statetop flextwo">
15 <view class="bname">{{item.name}}</view> 15 <view class="bname">{{item.name}}</view>
16 <!-- wx:if="{{item.status==1}}" --> 16 <!-- wx:if="{{item.status==1}}" -->
@@ -78,6 +78,7 @@ image { @@ -78,6 +78,7 @@ image {
78 align-items: center; 78 align-items: center;
79 color: #bdc4ce; 79 color: #bdc4ce;
80 font-size: 24rpx; 80 font-size: 24rpx;
  81 + margin-top:10rpx;
81 } 82 }
82 83
83 /* 处理中 */ 84 /* 处理中 */
@@ -99,16 +99,20 @@ Page({ @@ -99,16 +99,20 @@ Page({
99 protectarr:that.data.protectarr, 99 protectarr:that.data.protectarr,
100 address:res.office.address, 100 address:res.office.address,
101 name:res.office.leader, 101 name:res.office.leader,
102 - phone:res.office.mobile, 102 + phone:res.office.mobile,
103 town_id:res.office.town_id, 103 town_id:res.office.town_id,
104 townname: res.office.town_name, 104 townname: res.office.town_name,
105 ishandbook: res.office.is_receive, 105 ishandbook: res.office.is_receive,
106 description: res.office.description, 106 description: res.office.description,
107 - materials: res.materials.split(","),  
108 - is_business:res.office.is_hours,  
109 - ishandbook:res.office.is_receive 107 + // materials: res.materials.split(","),
  108 + is_business:res.office.is_hours,
  109 + ishandbook:res.office.is_receive,
  110 + time: res.office.hours,
110 111
111 }) 112 })
  113 + let materials=res.office.materials.split(",");
  114 + console.log(materials)
  115 + console.log(typeof(materials))
112 116
113 that.getsocietylist() 117 that.getsocietylist()
114 118
@@ -151,6 +151,6 @@ @@ -151,6 +151,6 @@
151 </view> 151 </view>
152 152
153 <view class="finish flexthree"> 153 <view class="finish flexthree">
154 - <view class="finishbtn" bindtap="finish">完成</view> 154 + <view class="finishbtn" bindtap="finish" wx:if="{{office.status!=2}}">完成</view>
155 </view> 155 </view>
156 </view> 156 </view>
@@ -174,7 +174,7 @@ page { @@ -174,7 +174,7 @@ page {
174 border-radius: 10rpx; 174 border-radius: 10rpx;
175 } 175 }
176 .difficult{ 176 .difficult{
177 - width:686rpx; 177 + width:647rpx;
178 178
179 border:1rpx solid #f5f5f5; 179 border:1rpx solid #f5f5f5;
180 border-radius: 20rpx; 180 border-radius: 20rpx;