作者 王智

Merge branch 'master' into volun

@@ -61,7 +61,7 @@ Page({ @@ -61,7 +61,7 @@ Page({
61 } 61 }
62 let params = { 62 let params = {
63 63
64 - page: that.data.currentTab 64 + type_id: that.data.currentTab
65 65
66 } 66 }
67 console.log(params) 67 console.log(params)
@@ -71,7 +71,6 @@ Page({ @@ -71,7 +71,6 @@ Page({
71 list: res 71 list: res
72 }) 72 })
73 }).catch((err) => { 73 }).catch((err) => {
74 -  
75 }) 74 })
76 75
77 }, 76 },
@@ -77,13 +77,21 @@ Page({ @@ -77,13 +77,21 @@ Page({
77 'XX-Token': wx.getStorageSync('token') 77 'XX-Token': wx.getStorageSync('token')
78 } 78 }
79 79
80 - 80 +
  81 + var num=that.data.list.length;
  82 + var answer=new Object;
  83 + for(var i=0;i<num;i++){
  84 + answer[that.data.list[i].id]=that.data.list[i].choose;
  85 + }
  86 + var answer_str=JSON.stringify(answer);
  87 + console.log(answer);
  88 + console.log(answer_str);
  89 + console.log(params)
81 90
82 let params = { 91 let params = {
83 class_id: that.data.id, 92 class_id: that.data.id,
  93 + answer_info:answer_str
84 } 94 }
85 -  
86 - console.log(params)  
87 app.post(url, params, head).then((res) => { 95 app.post(url, params, head).then((res) => {
88 96
89 if (that.data.answers == '') { 97 if (that.data.answers == '') {
1 -{  
2 - "description": "项目配置文件",  
3 - "packOptions": {  
4 - "ignore": []  
5 - },  
6 - "setting": {  
7 - "urlCheck": false,  
8 - "es6": true,  
9 - "enhance": false,  
10 - "postcss": true,  
11 - "preloadBackgroundData": false,  
12 - "minified": true,  
13 - "newFeature": true,  
14 - "coverView": true,  
15 - "nodeModules": false,  
16 - "autoAudits": false,  
17 - "showShadowRootInWxmlPanel": true,  
18 - "scopeDataCheck": false,  
19 - "uglifyFileName": true,  
20 - "checkInvalidKey": true,  
21 - "checkSiteMap": true,  
22 - "uploadWithSourceMap": true,  
23 - "compileHotReLoad": false,  
24 - "useMultiFrameRuntime": false,  
25 - "useApiHook": true,  
26 - "babelSetting": {  
27 - "ignore": [],  
28 - "disablePlugins": [],  
29 - "outputPath": ""  
30 - },  
31 - "useIsolateContext": true,  
32 - "useCompilerModule": true,  
33 - "userConfirmedUseCompilerModuleSwitch": false,  
34 - "packNpmManually": false,  
35 - "packNpmRelationList": []  
36 - },  
37 - "compileType": "miniprogram",  
38 - "libVersion": "2.8.3",  
39 - "appid": "wx7a3bf4e0796c070a",  
40 - "projectname": "zhiyuanzhe",  
41 - "cloudfunctionTemplateRoot": "",  
42 - "watchOptions": {  
43 - "ignore": []  
44 - },  
45 - "debugOptions": {  
46 - "hidedInDevtools": []  
47 - },  
48 - "scripts": {},  
49 - "simulatorType": "wechat",  
50 - "simulatorPluginLibVersion": {},  
51 - "condition": {  
52 - "search": {  
53 - "current": -1,  
54 - "list": []  
55 - },  
56 - "conversation": {  
57 - "current": -1,  
58 - "list": []  
59 - },  
60 - "plugin": {  
61 - "current": -1,  
62 - "list": []  
63 - },  
64 - "game": {  
65 - "current": -1,  
66 - "list": []  
67 - },  
68 - "gamePlugin": {  
69 - "current": -1,  
70 - "list": []  
71 - },  
72 - "miniprogram": {  
73 - "current": -1,  
74 - "list": [  
75 - {  
76 - "id": 0,  
77 - "name": "工作计划表",  
78 - "pathName": "pages/word_report/word_report",  
79 - "query": "id=17&status=1",  
80 - "scene": null  
81 - },  
82 - {  
83 - "id": -1,  
84 - "name": "pages/myteam/myteam",  
85 - "pathName": "pages/myteam/myteam",  
86 - "query": "",  
87 - "scene": null  
88 - },  
89 - {  
90 - "id": 2,  
91 - "name": "我的培训",  
92 - "pathName": "pages/mytrain/mytrain",  
93 - "query": "",  
94 - "scene": null  
95 - },  
96 - {  
97 - "id": -1,  
98 - "name": "pages/Online_regulations/Online_regulations",  
99 - "pathName": "pages/Online_regulations/Online_regulations",  
100 - "query": "",  
101 - "scene": null  
102 - },  
103 - {  
104 - "id": 4,  
105 - "name": "学习内容",  
106 - "pathName": "pages/getStudycontent/getStudycontent",  
107 - "query": "",  
108 - "scene": null  
109 - },  
110 - {  
111 - "id": -1,  
112 - "name": "pages/apply/apply",  
113 - "pathName": "pages/apply/apply",  
114 - "query": "",  
115 - "scene": null  
116 - },  
117 - {  
118 - "id": -1,  
119 - "name": "pages/Volunteer_detail/Volunteer_detail",  
120 - "pathName": "pages/Volunteer_detail/Volunteer_detail",  
121 - "query": "",  
122 - "scene": null  
123 - },  
124 - {  
125 - "id": 7,  
126 - "name": "志愿回馈",  
127 - "pathName": "pages/myfeedback/myfeedback",  
128 - "query": "",  
129 - "scene": null  
130 - },  
131 - {  
132 - "id": -1,  
133 - "name": "pages/myaddress/myaddress",  
134 - "pathName": "pages/myaddress/myaddress",  
135 - "query": "",  
136 - "scene": null  
137 - },  
138 - {  
139 - "id": 9,  
140 - "name": "志愿动态",  
141 - "pathName": "pages/Volunteer_dynamic/Volunteer_dynamic",  
142 - "query": "",  
143 - "scene": null  
144 - },  
145 - {  
146 - "id": -1,  
147 - "name": "pages/guanlitiaoli/guanlitiaoli",  
148 - "pathName": "pages/guanlitiaoli/guanlitiaoli",  
149 - "query": "",  
150 - "scene": null  
151 - },  
152 - {  
153 - "id": -1,  
154 - "name": "pages/mycertificate/mycertificate",  
155 - "pathName": "pages/mycertificate/mycertificate",  
156 - "query": "",  
157 - "scene": null  
158 - },  
159 - {  
160 - "id": 12,  
161 - "name": "申请加入",  
162 - "pathName": "pages/Volunteer_group/active/active",  
163 - "query": "",  
164 - "scene": null  
165 - },  
166 - {  
167 - "id": -1,  
168 - "name": "志愿团队",  
169 - "pathName": "pages/Volunteer_group/Volunteer_group",  
170 - "query": "",  
171 - "scene": null  
172 - },  
173 - {  
174 - "id": -1,  
175 - "name": "我的地址列表",  
176 - "pathName": "pages/myaddress/myaddress",  
177 - "query": "",  
178 - "scene": null  
179 - },  
180 - {  
181 - "id": -1,  
182 - "name": "我的收货地址",  
183 - "pathName": "pages/myaddcompile/myaddcompile",  
184 - "query": "",  
185 - "scene": null  
186 - },  
187 - {  
188 - "id": -1,  
189 - "name": "我的团队",  
190 - "pathName": "pages/myteam/myteam",  
191 - "query": "",  
192 - "scene": null  
193 - },  
194 - {  
195 - "id": 18,  
196 - "name": "商品详情",  
197 - "pathName": "pages/myfeedback/myfeedback_active/myfeedback_active",  
198 - "query": "",  
199 - "scene": null  
200 - },  
201 - {  
202 - "id": -1,  
203 - "name": "积分兑换",  
204 - "pathName": "pages/myfeedback/myfeedback_duihuan/myfeedback_duihuan",  
205 - "query": "",  
206 - "scene": null  
207 - },  
208 - {  
209 - "id": -1,  
210 - "name": "光荣排行",  
211 - "pathName": "pages/guangrongpaihang/guangrongpaihang",  
212 - "query": "",  
213 - "scene": null  
214 - },  
215 - {  
216 - "id": -1,  
217 - "name": "我的活动",  
218 - "pathName": "pages/myactivity/myactivity",  
219 - "query": "",  
220 - "scene": null  
221 - },  
222 - {  
223 - "id": -1,  
224 - "name": "pages/myactivity/myactivity_active/myactivity_active",  
225 - "pathName": "pages/myactivity/myactivity_active/myactivity_active",  
226 - "query": "",  
227 - "scene": null  
228 - },  
229 - {  
230 - "id": -1,  
231 - "name": "答题详情",  
232 - "pathName": "pages/getStudycontent/answer/answer",  
233 - "query": "",  
234 - "scene": null  
235 - },  
236 - {  
237 - "id": 23,  
238 - "name": "在线培训",  
239 - "pathName": "pages/Online_regulations/Online_regulations",  
240 - "query": "",  
241 - "scene": null  
242 - },  
243 - {  
244 - "id": 24,  
245 - "name": "学习内容",  
246 - "pathName": "pages/getStudycontent/getStudycontent",  
247 - "query": "",  
248 - "scene": null  
249 - },  
250 - {  
251 - "id": -1,  
252 - "name": "dati ",  
253 - "pathName": "pages/getStudycontent/answer/answer",  
254 - "query": "id=1",  
255 - "scene": null  
256 - },  
257 - {  
258 - "id": -1,  
259 - "name": "电子证件",  
260 - "pathName": "pages/mycertificate/mycertificate",  
261 - "query": "",  
262 - "scene": null  
263 - },  
264 - {  
265 - "id": -1,  
266 - "name": "编辑资料",  
267 - "pathName": "pages/mydetail/mydetail",  
268 - "query": "",  
269 - "scene": null  
270 - },  
271 - {  
272 - "id": -1,  
273 - "name": "工时兑换",  
274 - "pathName": "pages/myfeedback/myfeedback_list/myfeedback_list",  
275 - "query": "",  
276 - "scene": null  
277 - },  
278 - {  
279 - "id": -1,  
280 - "name": "我的资料",  
281 - "pathName": "pages/mydetail/mydetail",  
282 - "query": "",  
283 - "scene": null  
284 - },  
285 - {  
286 - "id": -1,  
287 - "name": "更多志愿者",  
288 - "pathName": "pages/more/more",  
289 - "query": "",  
290 - "scene": null  
291 - },  
292 - {  
293 - "id": -1,  
294 - "name": "志愿动态详情",  
295 - "pathName": "pages/getNewsInfo/getNewsInfo",  
296 - "query": "",  
297 - "scene": null  
298 - },  
299 - {  
300 - "id": -1,  
301 - "name": "审核状态",  
302 - "pathName": "pages/result/result",  
303 - "query": "",  
304 - "scene": null  
305 - }  
306 - ]  
307 - }  
308 - }  
309 -}