miniprogram / volunteer · 提交

转到一个项目

作者 sgj
提交 7068fccc4196c2f4d474f15e13b4402f8747eb84 1 个父辈 c54b9d3f

bug fix

内嵌 并排对比
正在显示 9 个修改的文件 包含 487 行增加 和 14 行删除
@@ -19,6 +19,22 @@ @@ -19,6 +19,22 @@
19 </view> 19 </view>
20 <rich-text nodes="{{shi}}"></rich-text> 20 <rich-text nodes="{{shi}}"></rich-text>
21 21
  22 +
  23 +<view class="main">
  24 + <view class='memberbox' >
  25 + <view class='title'>已成功报名人员</view>
  26 + <view class='member' wx:for='{{list.join}}' wx:key='index'>
  27 + <view class="top">
  28 + <image src='{{item.photo}}' mode="aspectFill" />
  29 + <text>{{item.name}}</text>
  30 + </view>
  31 + </view>
  32 + </view>
  33 +</view>
  34 +
  35 +
  36 +
  37 +
22 <view class="shengqin"> 38 <view class="shengqin">
23 <button wx:if="{{list.user_status ==0}}">未审核</button> 39 <button wx:if="{{list.user_status ==0}}">未审核</button>
24 <button style="background:#cfcfcf;box-shadow:0rpx 18rpx 38rpx 0rpx rgba(179, 179, 179, 0.42);" 40 <button style="background:#cfcfcf;box-shadow:0rpx 18rpx 38rpx 0rpx rgba(179, 179, 179, 0.42);"
@@ -97,3 +97,81 @@ page { @@ -97,3 +97,81 @@ page {
97 bottom: 144rpx; 97 bottom: 144rpx;
98 right: 32rpx; 98 right: 32rpx;
99 } 99 }
  100 + .main{
  101 + display: flex;
  102 + justify-content: center;
  103 + }
  104 + .memberbox {
  105 + width: 94%;
  106 + display: flex;
  107 + flex-wrap: wrap;
  108 + margin-top: 20rpx;
  109 + }
  110 +
  111 + .memberbox .title {
  112 + width: 100%;
  113 + color: #333;
  114 + font-size: 32rpx;
  115 + font-weight: bold;
  116 + padding: 0 0 0 13rpx;
  117 + box-sizing: border-box;
  118 + margin-bottom: 20rpx;
  119 + position: relative;
  120 + }
  121 +
  122 + .memberbox .title::after {
  123 + position: absolute;
  124 + content: '';
  125 + top: 50%;
  126 + transform: translateY(-50%);
  127 + left: 0;
  128 + width: 4rpx;
  129 + height: 32rpx;
  130 + background: #21ae59;
  131 + }
  132 +
  133 + .member {
  134 + width: 200rpx;
  135 + margin-bottom: 20rpx;
  136 + display: flex;
  137 + flex-wrap: wrap;
  138 + justify-content: center;
  139 + margin-right: 42rpx;
  140 + }
  141 +
  142 + .member:nth-child(3n + 1) {
  143 + margin-right: 0;
  144 + }
  145 +
  146 + .member .top {
  147 + width: 100%;
  148 + display: flex;
  149 + align-items: center;
  150 + }
  151 +
  152 + .member .top image {
  153 + width: 76rpx;
  154 + height: 76rpx;
  155 + border-radius: 50%;
  156 + margin-right: 18rpx;
  157 + }
  158 +
  159 + .member .top text {
  160 + font-size: 28rpx;
  161 + font-family: PingFang SC;
  162 + font-weight: 500;
  163 + color: rgba(51, 51, 51, 1);
  164 + }
  165 +
  166 + .member .duty {
  167 + width: 100%;
  168 + font-size: 26rpx;
  169 + font-family: PingFang SC;
  170 + font-weight: 500;
  171 + color: rgba(153, 153, 153, 1);
  172 + overflow: hidden;
  173 + text-overflow: ellipsis;
  174 + white-space: nowrap;
  175 + margin-top: 16rpx;
  176 + }
  177 +
@@ -17,10 +17,10 @@ Page({ @@ -17,10 +17,10 @@ Page({
17 ], 17 ],
18 time_arr: [ "上午", "下午", "全天"], 18 time_arr: [ "上午", "下午", "全天"],
19 19
20 - t_arr: { //选择日期数组 20 + t_arr:[{ //选择日期数组
21 data: '', 21 data: '',
22 time: '' 22 time: ''
23 - }, 23 + }],
24 z_arr: [ //申请入住数组 24 z_arr: [ //申请入住数组
25 { 25 {
26 date: '' 26 date: ''
@@ -422,12 +422,12 @@ Page({ @@ -422,12 +422,12 @@ Page({
422 change_time(e) { 422 change_time(e) {
423 console.log(e) 423 console.log(e)
424 424
425 - // let index = Number(e.currentTarget.dataset.index) 425 + let index = Number(e.currentTarget.dataset.index)
426 let zindex = e.detail.value 426 let zindex = e.detail.value
427 console.log(e.detail.value) 427 console.log(e.detail.value)
428 this.setData({ 428 this.setData({
429 select_time:this.data.time_arr[zindex], 429 select_time:this.data.time_arr[zindex],
430 - [`t_arr[${index}].time`]: this.data.time_arr[zindex] 430 + // [`t_arr[${zindex}].time`]: this.data.time_arr[zindex]
431 }) 431 })
432 // this.judge_status(1, index) 432 // this.judge_status(1, index)
433 }, 433 },
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 <picker mode="selector" value="{{item.time}}" bindchange="change_time" range="{{time_arr}}" data-index="{{index}}" 69 <picker mode="selector" value="{{item.time}}" bindchange="change_time" range="{{time_arr}}" data-index="{{index}}"
70 disabled="{{status}}"> 70 disabled="{{status}}">
71 <view class="right"> 71 <view class="right">
72 - <text>{{item.time?item.time:'请选择'}}</text> 72 + <text>{{select_time?select_time:'请选择'}}</text>
73 <image src="/imgs/right.png" /> 73 <image src="/imgs/right.png" />
74 </view> 74 </view>
75 </picker> 75 </picker>
@@ -183,7 +183,7 @@ page { @@ -183,7 +183,7 @@ page {
183 .my_itemletf .time { 183 .my_itemletf .time {
184 width: 34rpx; 184 width: 34rpx;
185 height: 32rpx; 185 height: 32rpx;
186 - margin-right: 30rpx; 186 + margin-right:18rpx;
187 left: 0; 187 left: 0;
188 } 188 }
189 189
@@ -202,6 +202,7 @@ page { @@ -202,6 +202,7 @@ page {
202 } 202 }
203 203
204 .my_itemletf .icon-gongzhang { 204 .my_itemletf .icon-gongzhang {
205 - color: #44cbee; 205 + color:#2FAF5C;
  206 + margin-right: 20rpx;
206 } 207 }
207 208
@@ -12,6 +12,12 @@ Page({ @@ -12,6 +12,12 @@ Page({
12 }, 12 },
13 onLoad: function (options) { 13 onLoad: function (options) {
14 }, 14 },
  15 + goActivity(e){
  16 + var id=e.currentTarget.dataset.id
  17 + wx.navigateTo({
  18 + url: '/pages/img_txt/img_txt'+'?status=1&id='+id,
  19 + })
  20 + },
15 21
16 onReady: function () { 22 onReady: function () {
17 }, 23 },
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 </view> 35 </view>
36 <!--打卡已完成 --> 36 <!--打卡已完成 -->
37 <view wx:elif="{{navs==2}}"> 37 <view wx:elif="{{navs==2}}">
38 - <view class="myactive_wrap" wx:for="{{list}}"> 38 + <view bindtap="goActivity" data-id="{{item.id}}" class="myactive_wrap" wx:for="{{list}}">
39 <view class="myactive_time"> 39 <view class="myactive_time">
40 <image src="/imgs/shijian-19.png"></image>{{item.date}} 40 <image src="/imgs/shijian-19.png"></image>{{item.date}}
41 {{ item.start_clock_time}}-{{item.end_clock_time}} 41 {{ item.start_clock_time}}-{{item.end_clock_time}}
@@ -59,14 +59,14 @@ @@ -59,14 +59,14 @@
59 </view> 59 </view>
60 <!--待提交报告 --> 60 <!--待提交报告 -->
61 <view wx:elif="{{nav==2}}"> 61 <view wx:elif="{{nav==2}}">
62 - <view class="myactive_wrap" wx:for="{{datalist}}"> 62 + <view bindtap="goActivity" data-id="{{item.id}}" class="myactive_wrap" wx:for="{{datalist}}">
63 <view class="myactive_time"> 63 <view class="myactive_time">
64 <image src="/imgs/shijian-19.png"></image>{{item.start_time}} 64 <image src="/imgs/shijian-19.png"></image>{{item.start_time}}
65 <block wx:if="{{item.start_clock_time}}"> 65 <block wx:if="{{item.start_clock_time}}">
66 {{ item.start_clock_time==null?'':item.start_clock_time}}-{{item.end_clock_time==null?"":item.end_clock_time}} 66 {{ item.start_clock_time==null?'':item.start_clock_time}}-{{item.end_clock_time==null?"":item.end_clock_time}}
67 </block> 67 </block>
68 </view> 68 </view>
69 - <view class="myactive_list"> 69 + <view bindtap="goActivity" data-id="{{item.id}}" class="myactive_list">
70 <image src="{{item.thumbnail}}"></image> 70 <image src="{{item.thumbnail}}"></image>
71 <view class="myactive_name"> 71 <view class="myactive_name">
72 <view>{{item.activity_name}}</view> 72 <view>{{item.activity_name}}</view>
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 81
82 <!-- 完成的活动 --> 82 <!-- 完成的活动 -->
83 <view wx:elif="{{nav==3}}"> 83 <view wx:elif="{{nav==3}}">
84 - <view class="myactive_wrap" wx:for="{{datalist}}"> 84 + <view bindtap="goActivity" data-id="{{item.id}}" class="myactive_wrap" wx:for="{{datalist}}">
85 <view class="myactive_time"> 85 <view class="myactive_time">
86 <image src="/imgs/shijian-19.png"></image>{{item.start_time}} 86 <image src="/imgs/shijian-19.png"></image>{{item.start_time}}
87 {{ item.start_clock_time}}-{{item.end_clock_time}} 87 {{ item.start_clock_time}}-{{item.end_clock_time}}
@@ -29,13 +29,22 @@ @@ -29,13 +29,22 @@
29 29
30 <view class="goods_introduce" > 30 <view class="goods_introduce" >
31 <view class="goods_line"></view> 31 <view class="goods_line"></view>
32 - <view bindtap="getadd">产品详情</view> 32 + <view bindtap="getadd">备注信息</view>
33 <view class="goods_line"></view> 33 <view class="goods_line"></view>
34 </view> 34 </view>
  35 +
35 <view class="goods_text" > 36 <view class="goods_text" >
36 - <rich-text nodes="{{list.good.content}}"></rich-text> 37 + <rich-text nodes="{{list.remark}}"></rich-text>
37 </view> 38 </view>
38 -<view class="goods_text" wx:if="{{list.reason}}"> 39 +
  40 +
  41 +<view wx:if="{{list.status=='-1'}}" class="goods_introduce" >
  42 + <view class="goods_line"></view>
  43 + <view bindtap="getadd">拒绝原因</view>
  44 + <view class="goods_line"></view>
  45 +</view>
  46 +
  47 +<view class="goods_text" wx:if="{{list.status=='-1'}}">
39 <rich-text nodes="{{list.reason}}"></rich-text> 48 <rich-text nodes="{{list.reason}}"></rich-text>
40 </view> 49 </view>
41 50
  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": true,
  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 + "list": []
  66 + },
  67 + "gamePlugin": {
  68 + "current": -1,
  69 + "list": []
  70 + },
  71 + "miniprogram": {
  72 + "current": -1,
  73 + "list": [
  74 + {
  75 + "id": 0,
  76 + "name": "工作计划表",
  77 + "pathName": "pages/word_report/word_report",
  78 + "query": "id=17&status=1",
  79 + "scene": null
  80 + },
  81 + {
  82 + "id": -1,
  83 + "name": "pages/myteam/myteam",
  84 + "pathName": "pages/myteam/myteam",
  85 + "query": "",
  86 + "scene": null
  87 + },
  88 + {
  89 + "id": 2,
  90 + "name": "我的培训",
  91 + "pathName": "pages/mytrain/mytrain",
  92 + "query": "",
  93 + "scene": null
  94 + },
  95 + {
  96 + "id": -1,
  97 + "name": "pages/Online_regulations/Online_regulations",
  98 + "pathName": "pages/Online_regulations/Online_regulations",
  99 + "query": "",
  100 + "scene": null
  101 + },
  102 + {
  103 + "id": 4,
  104 + "name": "学习内容",
  105 + "pathName": "pages/getStudycontent/getStudycontent",
  106 + "query": "",
  107 + "scene": null
  108 + },
  109 + {
  110 + "id": -1,
  111 + "name": "pages/apply/apply",
  112 + "pathName": "pages/apply/apply",
  113 + "query": "",
  114 + "scene": null
  115 + },
  116 + {
  117 + "id": -1,
  118 + "name": "pages/Volunteer_detail/Volunteer_detail",
  119 + "pathName": "pages/Volunteer_detail/Volunteer_detail",
  120 + "query": "",
  121 + "scene": null
  122 + },
  123 + {
  124 + "id": 7,
  125 + "name": "志愿回馈",
  126 + "pathName": "pages/myfeedback/myfeedback",
  127 + "query": "",
  128 + "scene": null
  129 + },
  130 + {
  131 + "id": -1,
  132 + "name": "pages/myaddress/myaddress",
  133 + "pathName": "pages/myaddress/myaddress",
  134 + "query": "",
  135 + "scene": null
  136 + },
  137 + {
  138 + "id": 9,
  139 + "name": "志愿动态",
  140 + "pathName": "pages/Volunteer_dynamic/Volunteer_dynamic",
  141 + "query": "",
  142 + "scene": null
  143 + },
  144 + {
  145 + "id": -1,
  146 + "name": "pages/guanlitiaoli/guanlitiaoli",
  147 + "pathName": "pages/guanlitiaoli/guanlitiaoli",
  148 + "query": "",
  149 + "scene": null
  150 + },
  151 + {
  152 + "id": -1,
  153 + "name": "pages/mycertificate/mycertificate",
  154 + "pathName": "pages/mycertificate/mycertificate",
  155 + "query": "",
  156 + "scene": null
  157 + },
  158 + {
  159 + "id": 12,
  160 + "name": "申请加入",
  161 + "pathName": "pages/Volunteer_group/active/active",
  162 + "query": "",
  163 + "scene": null
  164 + },
  165 + {
  166 + "id": -1,
  167 + "name": "志愿团队",
  168 + "pathName": "pages/Volunteer_group/Volunteer_group",
  169 + "query": "",
  170 + "scene": null
  171 + },
  172 + {
  173 + "id": -1,
  174 + "name": "我的地址列表",
  175 + "pathName": "pages/myaddress/myaddress",
  176 + "query": "",
  177 + "scene": null
  178 + },
  179 + {
  180 + "id": -1,
  181 + "name": "我的收货地址",
  182 + "pathName": "pages/myaddcompile/myaddcompile",
  183 + "query": "",
  184 + "scene": null
  185 + },
  186 + {
  187 + "id": -1,
  188 + "name": "我的团队",
  189 + "pathName": "pages/myteam/myteam",
  190 + "query": "",
  191 + "scene": null
  192 + },
  193 + {
  194 + "id": 18,
  195 + "name": "商品详情",
  196 + "pathName": "pages/myfeedback/myfeedback_active/myfeedback_active",
  197 + "query": "",
  198 + "scene": null
  199 + },
  200 + {
  201 + "id": -1,
  202 + "name": "积分兑换",
  203 + "pathName": "pages/myfeedback/myfeedback_duihuan/myfeedback_duihuan",
  204 + "query": "",
  205 + "scene": null
  206 + },
  207 + {
  208 + "id": -1,
  209 + "name": "光荣排行",
  210 + "pathName": "pages/guangrongpaihang/guangrongpaihang",
  211 + "query": "",
  212 + "scene": null
  213 + },
  214 + {
  215 + "id": -1,
  216 + "name": "我的活动",
  217 + "pathName": "pages/myactivity/myactivity",
  218 + "query": "",
  219 + "scene": null
  220 + },
  221 + {
  222 + "id": -1,
  223 + "name": "pages/myactivity/myactivity_active/myactivity_active",
  224 + "pathName": "pages/myactivity/myactivity_active/myactivity_active",
  225 + "query": "",
  226 + "scene": null
  227 + },
  228 + {
  229 + "id": -1,
  230 + "name": "答题详情",
  231 + "pathName": "pages/getStudycontent/answer/answer",
  232 + "query": "",
  233 + "scene": null
  234 + },
  235 + {
  236 + "id": 23,
  237 + "name": "在线培训",
  238 + "pathName": "pages/Online_regulations/Online_regulations",
  239 + "query": "",
  240 + "scene": null
  241 + },
  242 + {
  243 + "id": 24,
  244 + "name": "学习内容",
  245 + "pathName": "pages/getStudycontent/getStudycontent",
  246 + "query": "",
  247 + "scene": null
  248 + },
  249 + {
  250 + "id": -1,
  251 + "name": "dati ",
  252 + "pathName": "pages/getStudycontent/answer/answer",
  253 + "query": "id=1",
  254 + "scene": null
  255 + },
  256 + {
  257 + "id": -1,
  258 + "name": "电子证件",
  259 + "pathName": "pages/mycertificate/mycertificate",
  260 + "query": "",
  261 + "scene": null
  262 + },
  263 + {
  264 + "id": -1,
  265 + "name": "编辑资料",
  266 + "pathName": "pages/mydetail/mydetail",
  267 + "query": "",
  268 + "scene": null
  269 + },
  270 + {
  271 + "id": -1,
  272 + "name": "工时兑换",
  273 + "pathName": "pages/myfeedback/myfeedback_list/myfeedback_list",
  274 + "query": "",
  275 + "scene": null
  276 + },
  277 + {
  278 + "id": -1,
  279 + "name": "我的资料",
  280 + "pathName": "pages/mydetail/mydetail",
  281 + "query": "",
  282 + "scene": null
  283 + },
  284 + {
  285 + "id": -1,
  286 + "name": "更多志愿者",
  287 + "pathName": "pages/more/more",
  288 + "query": "",
  289 + "scene": null
  290 + },
  291 + {
  292 + "id": -1,
  293 + "name": "志愿动态详情",
  294 + "pathName": "pages/getNewsInfo/getNewsInfo",
  295 + "query": "",
  296 + "scene": null
  297 + },
  298 + {
  299 + "id": -1,
  300 + "name": "审核状态",
  301 + "pathName": "pages/result/result",
  302 + "query": "",
  303 + "scene": null
  304 + },
  305 + {
  306 + "id": 33,
  307 + "name": "志愿礼物详情",
  308 + "pathName": "pages/myfeedback/myfeedback_detail/myfeedback_detail",
  309 + "query": "",
  310 + "scene": null
  311 + },
  312 + {
  313 + "id": -1,
  314 + "name": "我的志愿回馈",
  315 + "pathName": "pages/myfeedback_lists/myfeedback_lists",
  316 + "query": "",
  317 + "scene": null
  318 + },
  319 + {
  320 + "id": -1,
  321 + "name": "pages/myactivity/myactivity_report/myactivity_report",
  322 + "pathName": "pages/myactivity/myactivity_report/myactivity_report",
  323 + "query": "",
  324 + "scene": null
  325 + },
  326 + {
  327 + "id": -1,
  328 + "name": "pages/1/1",
  329 + "pathName": "pages/1/1",
  330 + "query": "",
  331 + "scene": null
  332 + },
  333 + {
  334 + "id": 37,
  335 + "name": "pages/enroll/enroll",
  336 + "pathName": "pages/enroll/enroll",
  337 + "query": "id=63",
  338 + "scene": null
  339 + },
  340 + {
  341 + "id": -1,
  342 + "name": "pages/enroll/enroll",
  343 + "pathName": "pages/enroll/enroll",
  344 + "query": "",
  345 + "scene": null
  346 + },
  347 + {
  348 + "id": 39,
  349 + "name": "志愿者登记表",
  350 + "pathName": "pages/apply/apply",
  351 + "query": "id=153&is_submit=1",
  352 + "scene": null
  353 + },
  354 + {
  355 + "id": -1,
  356 + "name": "登记报名",
  357 + "pathName": "pages/enroll/enroll",
  358 + "scene": null
  359 + }
  360 + ]
  361 + }
  362 + }
  363 +}