miniprogram / jinghaiprogram · 提交

转到一个项目

作者 lihongjuan
提交 161f8541013fc8f092643de72b70c4e72028c1c9 1 个父辈 6627af34

1

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