miniprogram / volunteer · 提交

转到一个项目

作者 sgj
提交 15f0d1d65412113d940a350d17d0bcbc6fa0bf0d 2 个父辈 3dae7f05 731ebc11

Merge branch 'master' into sgj

内嵌 并排对比
正在显示 37 个修改的文件 包含 945 行增加 和 135 行删除
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
38 "pages/myfeedback/myfeedback_active/myfeedback_active", 38 "pages/myfeedback/myfeedback_active/myfeedback_active",
39 "pages/myfeedback/myfeedback_duihuan/myfeedback_duihuan", 39 "pages/myfeedback/myfeedback_duihuan/myfeedback_duihuan",
40 "pages/myfeedback/myfeedback_list/myfeedback_list", 40 "pages/myfeedback/myfeedback_list/myfeedback_list",
  41 + "pages/myfeedback/myfeedback_detail/myfeedback_detail",
41 "pages/myfeedback_lists/myfeedback_lists", 42 "pages/myfeedback_lists/myfeedback_lists",
42 "pages/mycertificate/mycertificate", 43 "pages/mycertificate/mycertificate",
43 "pages/myaddress/myaddress", 44 "pages/myaddress/myaddress",
@@ -7,7 +7,8 @@ Page({ @@ -7,7 +7,8 @@ Page({
7 */ 7 */
8 data: { 8 data: {
9 id:'', 9 id:'',
10 - list:'' 10 + list:'',
  11 + shi:''
11 12
12 }, 13 },
13 14
@@ -24,7 +25,10 @@ Page({ @@ -24,7 +25,10 @@ Page({
24 } 25 }
25 app.post(url,d, head).then((res) => { 26 app.post(url,d, head).then((res) => {
26 console.log(res) 27 console.log(res)
  28 + let shi = res.content
  29 + shi = shi.replace(/\<img/gi, '<img style="width:100%;height:auto" ')
27 that.setData({ 30 that.setData({
  31 + shi: shi,
28 list: res 32 list: res
29 }) 33 })
30 34
@@ -33,8 +37,6 @@ Page({ @@ -33,8 +37,6 @@ Page({
33 }) 37 })
34 }, 38 },
35 39
36 -  
37 -  
38 getshengqin(e) { 40 getshengqin(e) {
39 var id =e.currentTarget.dataset.id 41 var id =e.currentTarget.dataset.id
40 console.log(e) 42 console.log(e)
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <view bindtap="getadd">详情介绍</view> 17 <view bindtap="getadd">详情介绍</view>
18 <view class="goods_line"></view> 18 <view class="goods_line"></view>
19 </view> 19 </view>
20 -<rich-text nodes="{{list.content}}"></rich-text> 20 +<rich-text nodes="{{shi}}"></rich-text>
21 21
22 <view class="shengqin"> 22 <view class="shengqin">
23 <button wx:if="{{list.user_status ==0}}">未审核</button> 23 <button wx:if="{{list.user_status ==0}}">未审核</button>
@@ -28,8 +28,7 @@ @@ -28,8 +28,7 @@
28 </view> 28 </view>
29 29
30 <button open-type='share'> 30 <button open-type='share'>
31 - <view class="btn-item" style="background: url('/imgs/shares.png') no-repeat center;background-size: cover;"  
32 - bindtap="change_cover" data-id="2">  
33 - </view> 31 + <view class="btn-item" style="background: url('https://ftp.bmp.ovh/imgs/2020/10/549450bf92e9e194.png') no-repeat center;background-size: cover;">
  32 + </view>
34 33
35 </button> 34 </button>
1 -  
2 -page{ 1 +page {
3 2
4 background-color: rgb(240, 240, 240); 3 background-color: rgb(240, 240, 240);
5 } 4 }
  5 +
6 .goods_index { 6 .goods_index {
7 padding: 20rpx 32rpx; 7 padding: 20rpx 32rpx;
8 } 8 }
@@ -56,7 +56,7 @@ page{ @@ -56,7 +56,7 @@ page{
56 .goods_wrap { 56 .goods_wrap {
57 width: 334rpx; 57 width: 334rpx;
58 margin-top: 24rpx; 58 margin-top: 24rpx;
59 - padding-bottom:24rpx ; 59 + padding-bottom: 24rpx;
60 border-radius: 7px; 60 border-radius: 7px;
61 background-color: #ffffff; 61 background-color: #ffffff;
62 overflow: hidden; 62 overflow: hidden;
@@ -69,10 +69,15 @@ page{ @@ -69,10 +69,15 @@ page{
69 } 69 }
70 70
71 .goods_name { 71 .goods_name {
  72 + height: 72rpx;
72 padding: 0 16rpx; 73 padding: 0 16rpx;
73 margin-top: 16rpx; 74 margin-top: 16rpx;
74 font-size: 26rpx; 75 font-size: 26rpx;
75 color: #3E3E3F; 76 color: #3E3E3F;
  77 + display: -webkit-box;
  78 + -webkit-box-orient: vertical;
  79 + -webkit-line-clamp: 2;
  80 + overflow: hidden;
76 } 81 }
77 82
78 .goods_time { 83 .goods_time {
@@ -609,7 +609,7 @@ Page({ @@ -609,7 +609,7 @@ Page({
609 record_name.push(obj.record_name); 609 record_name.push(obj.record_name);
610 record_phone.push(obj.record_phone); 610 record_phone.push(obj.record_phone);
611 } 611 }
612 - let url = 'index/member_center/submit_form'; 612 + // let url = 'index/member_center/submit_form';
613 let head = { 613 let head = {
614 'XX-Token': wx.getStorageSync('token') 614 'XX-Token': wx.getStorageSync('token')
615 } 615 }
@@ -646,7 +646,6 @@ Page({ @@ -646,7 +646,6 @@ Page({
646 reverse_card: that.data.reverse_card, 646 reverse_card: that.data.reverse_card,
647 photo: that.data.photo 647 photo: that.data.photo
648 } 648 }
649 - app.post(url, params, head).then((res) => {  
650 649
651 wx.showModal({ 650 wx.showModal({
652 title: '请仔细核对信息，确认无误！', 651 title: '请仔细核对信息，确认无误！',
@@ -655,6 +654,9 @@ Page({ @@ -655,6 +654,9 @@ Page({
655 cancelText:'我再想想', 654 cancelText:'我再想想',
656 success(res) { 655 success(res) {
657 if (res.confirm) { 656 if (res.confirm) {
  657 + let url = 'index/member_center/submit_form';
  658 +
  659 + app.post(url, params, head).then((res) => {
658 660
659 wx.showToast({ 661 wx.showToast({
660 title: '提交成功,等待审核', 662 title: '提交成功,等待审核',
@@ -668,6 +670,11 @@ Page({ @@ -668,6 +670,11 @@ Page({
668 }) 670 })
669 }, 1000) 671 }, 1000)
670 console.log('用户点击确定') 672 console.log('用户点击确定')
  673 +
  674 +
  675 +
  676 + }).catch((err) => {})
  677 +
671 } else if (res.cancel) { 678 } else if (res.cancel) {
672 679
673 console.log('用户点击取消') 680 console.log('用户点击取消')
@@ -676,7 +683,6 @@ Page({ @@ -676,7 +683,6 @@ Page({
676 }) 683 })
677 684
678 685
679 - }).catch((err) => {})  
680 } else { 686 } else {
681 wx.showToast({ 687 wx.showToast({
682 title: err, 688 title: err,
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <view class="newinfo_list"> 4 <view class="newinfo_list">
5 <view class="goods_title">{{list.activity_name}}</view> 5 <view class="goods_title">{{list.activity_name}}</view>
6 <view class="goods_name"> 6 <view class="goods_name">
7 - <image src="/imgs/zhiyuan1.png"></image> {{list.author}} 7 + <image src="/imgs/zhiyuan1.png"></image> {{list.author==null?'':'list.author'}}
8 <image class="goods_time" src="/imgs/zhiyuan2.png"></image>{{list.create_time}} 8 <image class="goods_time" src="/imgs/zhiyuan2.png"></image>{{list.create_time}}
9 </view> 9 </view>
10 <view class="newinfo_text"> 10 <view class="newinfo_text">
@@ -16,8 +16,6 @@ @@ -16,8 +16,6 @@
16 16
17 17
18 <button open-type='share'> 18 <button open-type='share'>
19 - <view class="btn-item" style="background: url('/imgs/shares.png') no-repeat center;background-size: cover;"  
20 - bindtap="change_cover" data-id="2"> 19 + <view class="btn-item" style="background: url('https://ftp.bmp.ovh/imgs/2020/10/549450bf92e9e194.png') no-repeat center;background-size: cover;">
21 </view> 20 </view>
22 -  
23 </button> 21 </button>
@@ -7,13 +7,16 @@ Page({ @@ -7,13 +7,16 @@ Page({
7 */ 7 */
8 data: { 8 data: {
9 id: '', 9 id: '',
10 - list: '' 10 + list: '',
  11 + shi:''
11 }, 12 },
12 onLoad: function (options) { 13 onLoad: function (options) {
13 // console.log(options) 14 // console.log(options)
14 this.setData({ 15 this.setData({
15 id: options.id 16 id: options.id
16 }) 17 })
  18 +
  19 +
17 }, 20 },
18 21
19 onReady: function () { 22 onReady: function () {
@@ -50,10 +53,16 @@ Page({ @@ -50,10 +53,16 @@ Page({
50 } 53 }
51 app.post(url, params, head).then((res) => { 54 app.post(url, params, head).then((res) => {
52 console.log(res) 55 console.log(res)
  56 +
  57 + let shi = res.content
  58 + shi = shi.replace(/\<img/gi, '<img style="width:100%;height:auto" ')
53 that.setData({ 59 that.setData({
  60 + shi: shi,
54 list: res 61 list: res
55 -  
56 }) 62 })
  63 +
  64 +
  65 +
57 }).catch((err) => { 66 }).catch((err) => {
58 67
59 }) 68 })
@@ -7,17 +7,18 @@ @@ -7,17 +7,18 @@
7 <image src="/imgs/zhiyuan3.png"></image> {{list.author}} 7 <image src="/imgs/zhiyuan3.png"></image> {{list.author}}
8 <image style="margin-left:64rpx" src="/imgs/zhiyuan4.png"></image> {{list.work_time}} 8 <image style="margin-left:64rpx" src="/imgs/zhiyuan4.png"></image> {{list.work_time}}
9 </view> 9 </view>
10 - <rich-text nodes="{{list.content}}"></rich-text> 10 + <rich-text nodes="{{shi}}"></rich-text>
11 </view> 11 </view>
12 12
13 13
14 -<view class="answer" > 14 +<view class="answer">
15 <view hover-class="none" bindtap="getanswer" wx:if="{{list.user_status==0}}">去答题</view> 15 <view hover-class="none" bindtap="getanswer" wx:if="{{list.user_status==0}}">去答题</view>
16 <button style="background: #cfcfcf;" wx:if="{{list.user_status==1}}">已答题</button> 16 <button style="background: #cfcfcf;" wx:if="{{list.user_status==1}}">已答题</button>
17 17
18 </view> 18 </view>
19 <button open-type="share"> 19 <button open-type="share">
20 - <view class="btn-item" style="background: url('/imgs/shares.png') no-repeat center;background-size: cover;" 20 + <view class="btn-item"
  21 + style="background: url('https://ftp.bmp.ovh/imgs/2020/10/549450bf92e9e194.png') no-repeat center;background-size: cover;"
21 bindtap="change_cover" data-id="2"> 22 bindtap="change_cover" data-id="2">
22 </view> 23 </view>
23 </button> 24 </button>
@@ -24,6 +24,13 @@ @@ -24,6 +24,13 @@
24 color: #5D5D5D; 24 color: #5D5D5D;
25 } 25 }
26 26
  27 +rich-text img {
  28 +
  29 + width: 100%;
  30 + height: auto;
  31 +
  32 +
  33 +}
27 34
28 .answer { 35 .answer {
29 width: 100%; 36 width: 100%;
@@ -36,7 +43,7 @@ @@ -36,7 +43,7 @@
36 43
37 } 44 }
38 45
39 -.answer view{ 46 +.answer view {
40 margin: auto; 47 margin: auto;
41 width: 622rpx; 48 width: 622rpx;
42 height: 88rpx; 49 height: 88rpx;
@@ -58,6 +65,7 @@ @@ -58,6 +65,7 @@
58 /* box-shadow: 0px 9px 19px 0px rgba(0, 116, 45, 0.42); */ 65 /* box-shadow: 0px 9px 19px 0px rgba(0, 116, 45, 0.42); */
59 66
60 } 67 }
  68 +
61 /* 分享 */ 69 /* 分享 */
62 .btn-item { 70 .btn-item {
63 width: 100rpx; 71 width: 100rpx;
@@ -77,4 +85,4 @@ @@ -77,4 +85,4 @@
77 position: fixed; 85 position: fixed;
78 bottom: 144rpx; 86 bottom: 144rpx;
79 right: 32rpx; 87 right: 32rpx;
80 - }  
  88 +}
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 </block> 52 </block>
53 53
54 <view class="btn-item" 54 <view class="btn-item"
55 - style="background: url('/imgs/shares.png') no-repeat center;background-size: cover;" 55 + style="background: url('https://ftp.bmp.ovh/imgs/2020/10/549450bf92e9e194.png') no-repeat center;background-size: cover;"
56 bindtap="change_cover" data-id="2"></view> 56 bindtap="change_cover" data-id="2"></view>
57 57
58 </view> 58 </view>
1 -  
2 -page{ 1 +page {
3 background-color: rgb(240, 240, 240); 2 background-color: rgb(240, 240, 240);
4 } 3 }
  4 +
5 .new_box { 5 .new_box {
6 display: flex; 6 display: flex;
7 justify-content: space-between; 7 justify-content: space-between;
@@ -44,8 +44,12 @@ page{ @@ -44,8 +44,12 @@ page{
44 } 44 }
45 45
46 .new_title { 46 .new_title {
47 - white-space: nowrap;  
48 - text-overflow: ellipsis; 47 + /* white-space: nowrap; */
  48 + /* text-overflow: ellipsis; */
  49 + height: 72rpx;
  50 + display: -webkit-box;
  51 + -webkit-box-orient: vertical;
  52 + -webkit-line-clamp: 2;
49 overflow: hidden; 53 overflow: hidden;
50 padding: 0 16rpx; 54 padding: 0 16rpx;
51 margin: 18rpx 0 13rpx 0; 55 margin: 18rpx 0 13rpx 0;
@@ -83,10 +87,12 @@ page{ @@ -83,10 +87,12 @@ page{
83 text-overflow: ellipsis; 87 text-overflow: ellipsis;
84 white-space: nowrap; 88 white-space: nowrap;
85 } 89 }
86 -text{ 90 +
  91 +text {
87 92
88 color: #FF976A; 93 color: #FF976A;
89 } 94 }
  95 +
90 .tabbar { 96 .tabbar {
91 width: 100%; 97 width: 100%;
92 height: 100rpx; 98 height: 100rpx;
@@ -127,4 +133,4 @@ text{ @@ -127,4 +133,4 @@ text{
127 color: #97a0a8; 133 color: #97a0a8;
128 text-align: center; 134 text-align: center;
129 margin-top: 50rpx; 135 margin-top: 50rpx;
130 -} 136 +}
@@ -62,7 +62,38 @@ Page({ @@ -62,7 +62,38 @@ Page({
62 ] 62 ]
63 63
64 }, 64 },
65 - // 65 +
  66 + // 轮播图
  67 + getcarousel(e) {
  68 + console.log(e)
  69 + var id = e.currentTarget.dataset.id
  70 + var type = e.currentTarget.dataset.type
  71 + if (type == 1) {
  72 + wx.navigateTo({
  73 + url: '/pages/Volunteer_detail/Volunteer_detail?id=' + id + '&status=1',
  74 + })
  75 + } else if (type == 2) {
  76 + wx.navigateTo({
  77 + url: '/pages/getStudycontent/getStudycontent?id=' + id + '&status=1',
  78 + })
  79 + } else if (type == 3) {
  80 + wx.navigateTo({
  81 + url: '/pages/guanlitiaoli/guanlitiaoli?id=' + id + '&status=1',
  82 + })
  83 + } else if (type == 4) {
  84 + wx.navigateTo({
  85 + url: '/pages/getNewsInfo/getNewsInfo?id=' + id + '&status=1',
  86 + })
  87 + } else if (type == 5) {
  88 + wx.navigateTo({
  89 + url: '/pages/img_txt/img_txt?id=' + id + '&status=1',
  90 + })
  91 + }
  92 +
  93 +
  94 +
  95 + },
  96 +
66 getdatalist() { 97 getdatalist() {
67 let that = this; 98 let that = this;
68 let url = 'index/index/index'; 99 let url = 'index/index/index';
1 <!-- 轮播图 --> 1 <!-- 轮播图 -->
2 <swiper indicator-dots="true" indicator-color='#8C9194' indicator-active-color='#ffffff' class="slide-image"> 2 <swiper indicator-dots="true" indicator-color='#8C9194' indicator-active-color='#ffffff' class="slide-image">
3 - <navigator wx:for="{{datalist.slide}}" wx:key="id" hover-class="none"  
4 - url='/pages/img_txt/img_txt?id={{item.activity_id}}&status=1'> 3 + <view wx:for="{{datalist.slide}}" data-id="{{item.activity_id}}" data-type="{{item.type}}" bindtap="getcarousel">
5 <swiper-item> 4 <swiper-item>
6 <image src="{{item.image}}" mode="aspectFill" /> 5 <image src="{{item.image}}" mode="aspectFill" />
7 </swiper-item> 6 </swiper-item>
8 - </navigator> 7 + </view>
9 </swiper> 8 </swiper>
  9 +
10 <!-- <view class='vold_line'></view> --> 10 <!-- <view class='vold_line'></view> -->
11 <!-- 菜单 --> 11 <!-- 菜单 -->
12 <view class="home_menu "> 12 <view class="home_menu ">
@@ -27,8 +27,8 @@ @@ -27,8 +27,8 @@
27 </navigator> 27 </navigator>
28 </view> 28 </view>
29 <view class='volunteerbox'> 29 <view class='volunteerbox'>
30 - <view class='volunteercell' wx:for='{{datalist.volunteer}}' wx:key="index" id='{{item.user_id}}' wx:if="{{index<=3}}"  
31 - bindtap="getother"> 30 + <view class='volunteercell' wx:for='{{datalist.volunteer}}' wx:key="index" id='{{item.user_id}}'
  31 + wx:if="{{index<=3}}" bindtap="getother">
32 <view class='cell_top'> 32 <view class='cell_top'>
33 <view class='cellimg'> 33 <view class='cellimg'>
34 <image src='{{item.photo?item.photo:"https://volunteer.cnpu.org/imgs/wode_02@2x.png"}}' 34 <image src='{{item.photo?item.photo:"https://volunteer.cnpu.org/imgs/wode_02@2x.png"}}'
@@ -203,6 +203,8 @@ Page({ @@ -203,6 +203,8 @@ Page({
203 */ 203 */
204 onLoad: function (options) { 204 onLoad: function (options) {
205 wx.hideShareMenu() 205 wx.hideShareMenu()
  206 + this.getdatalist();
  207 +
206 }, 208 },
207 209
208 /** 210 /**
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 </view> 7 </view>
8 <view class="my_headitemname"> 8 <view class="my_headitemname">
9 <view class='word'>{{datalist.user_nickname}}</view> 9 <view class='word'>{{datalist.user_nickname}}</view>
10 - <view class="word1">{{datalist.status}}<image src="/imgs/more_gray.png"></image> 10 + <view class="word1" >{{datalist.status}} <image wx:if="{{datalist!==''}}" src="/imgs/more_gray.png"></image>
11 </view> 11 </view>
12 <view class='star_box'> 12 <view class='star_box'>
13 <image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>0}}'> 13 <image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>0}}'>
@@ -37,9 +37,7 @@ @@ -37,9 +37,7 @@
37 <view>{{datalist.work_time}}</view> 37 <view>{{datalist.work_time}}</view>
38 <view>工时</view> 38 <view>工时</view>
39 </view> 39 </view>
40 -  
41 </view> 40 </view>
42 -  
43 </view> 41 </view>
44 42
45 <!--我的活动 --> 43 <!--我的活动 -->
@@ -10,7 +10,7 @@ Page({ @@ -10,7 +10,7 @@ Page({
10 id: '', 10 id: '',
11 latitude: '', 11 latitude: '',
12 longitude: '', 12 longitude: '',
13 - time: '' 13 + time: '',
14 }, 14 },
15 15
16 onLoad: function (options) { 16 onLoad: function (options) {
@@ -29,17 +29,18 @@ Page({ @@ -29,17 +29,18 @@ Page({
29 onShow: function () { 29 onShow: function () {
30 let that = this; 30 let that = this;
31 that.getList(); 31 that.getList();
  32 + that.getaddredss()
32 // 获取经纬度 33 // 获取经纬度
33 wx.getLocation({ 34 wx.getLocation({
34 success: function (res) { 35 success: function (res) {
35 - console.log(res); 36 + console.log(res)
36 that.setData({ 37 that.setData({
37 latitude: res.latitude, 38 latitude: res.latitude,
38 longitude: res.longitude 39 longitude: res.longitude
39 }) 40 })
40 }, 41 },
41 }) 42 })
42 - 43 +
43 // 获取时间点 44 // 获取时间点
44 var time = util.formathour(new Date()); 45 var time = util.formathour(new Date());
45 this.setData({ 46 this.setData({
@@ -65,7 +66,6 @@ Page({ @@ -65,7 +66,6 @@ Page({
65 } 66 }
66 // console.log(d) 67 // console.log(d)
67 app.post(url, d, head).then((res) => { 68 app.post(url, d, head).then((res) => {
68 - // console.log(res)  
69 that.setData({ 69 that.setData({
70 list: res 70 list: res
71 }) 71 })
@@ -127,13 +127,27 @@ Page({ @@ -127,13 +127,27 @@ Page({
127 }) 127 })
128 128
129 }, 129 },
  130 + // 获取当前地址
  131 + getaddredss() {
130 132
  133 + let that = this;
  134 + let url = '/index/second/clockInfo';
  135 + let head = {
  136 + 'XX-Token': wx.getStorageSync('token')
  137 + }
  138 + let d = {
  139 + id: that.data.id
131 140
  141 + }
  142 + app.post(url, d, head).then((res) => {
  143 + that.setData({
  144 + adddress: res
  145 + })
132 146
  147 + }).catch((err) => {
133 148
134 -  
135 -  
136 - 149 + })
  150 + },
137 151
138 152
139 // 提示 153 // 提示
@@ -143,9 +157,6 @@ Page({ @@ -143,9 +157,6 @@ Page({
143 }) 157 })
144 }, 158 },
145 159
146 -  
147 -  
148 -  
149 onHide: function () { 160 onHide: function () {
150 161
151 }, 162 },
@@ -2,13 +2,13 @@ const app = getApp() @@ -2,13 +2,13 @@ const app = getApp()
2 Page({ 2 Page({
3 3
4 data: { 4 data: {
5 - region: [],  
6 - name: '',  
7 - address: '',  
8 - phone: '',  
9 - wx_id: '',  
10 - mail: '',  
11 - isDefault: '', 5 + region: [],//
  6 + name: '',//姓名
  7 + address: '',//
  8 + phone: '',//
  9 + wx_id: '',//
  10 + mail: '',//
  11 + isDefault: '',//
12 id: '' 12 id: ''
13 }, 13 },
14 onLoad: function (options) { 14 onLoad: function (options) {
@@ -34,7 +34,7 @@ Page({ @@ -34,7 +34,7 @@ Page({
34 34
35 that.setData({ 35 that.setData({
36 region: answer, 36 region: answer,
37 - id: res.is, 37 + id: res.id,
38 name: res.name, 38 name: res.name,
39 address: res.address, 39 address: res.address,
40 phone: res.tel, 40 phone: res.tel,
@@ -54,7 +54,11 @@ Page({ @@ -54,7 +54,11 @@ Page({
54 }) 54 })
55 }, 55 },
56 56
57 - //保存 57 +
  58 +
  59 +
  60 +
  61 + //保存 修改
58 bindsave(e) { 62 bindsave(e) {
59 let that = this; 63 let that = this;
60 64
@@ -62,6 +66,7 @@ Page({ @@ -62,6 +66,7 @@ Page({
62 'XX-Token': wx.getStorageSync('token') 66 'XX-Token': wx.getStorageSync('token')
63 } 67 }
64 let params = { 68 let params = {
  69 + id:that.data.id,
65 name: that.data.name, //姓名 70 name: that.data.name, //姓名
66 province: that.data.region[0], //省 71 province: that.data.region[0], //省
67 city: that.data.region[1], //市 72 city: that.data.region[1], //市
@@ -83,6 +88,7 @@ Page({ @@ -83,6 +88,7 @@ Page({
83 if (that.data.id) { 88 if (that.data.id) {
84 let url = '/index/second/editAddress'; 89 let url = '/index/second/editAddress';
85 app.post(url, params, head).then((res) => { 90 app.post(url, params, head).then((res) => {
  91 + console.log(res)
86 wx.showToast({ 92 wx.showToast({
87 title: '修改成功', 93 title: '修改成功',
88 mask: true, 94 mask: true,
@@ -103,7 +109,6 @@ Page({ @@ -103,7 +109,6 @@ Page({
103 title: '保存成功', 109 title: '保存成功',
104 mask: true, 110 mask: true,
105 icon: 'none', 111 icon: 'none',
106 - // duration: 2000  
107 }) 112 })
108 setTimeout(function () { 113 setTimeout(function () {
109 wx.reLaunch({ 114 wx.reLaunch({
@@ -11,7 +11,21 @@ Page({ @@ -11,7 +11,21 @@ Page({
11 11
12 }, 12 },
13 13
  14 + onLoad: function (options) {
  15 +
  16 + },
  17 +
  18 +
  19 + onReady: function () {
  20 +
  21 + },
  22 +
  23 +
  24 + onShow: function () {
  25 + let that = this;
  26 + that.getList();
14 27
  28 + },
15 //列表 29 //列表
16 getList() { 30 getList() {
17 // return 31 // return
@@ -24,22 +38,17 @@ Page({ @@ -24,22 +38,17 @@ Page({
24 console.log(res) 38 console.log(res)
25 that.setData({ 39 that.setData({
26 list: res 40 list: res
27 -  
28 }) 41 })
29 }).catch((err) => { 42 }).catch((err) => {
30 43
31 }) 44 })
32 -  
33 }, 45 },
34 46
35 -  
36 // 删除 47 // 删除
37 bindDelete(e) { 48 bindDelete(e) {
38 49
39 var that = this 50 var that = this
40 var id = e.currentTarget.dataset.id; 51 var id = e.currentTarget.dataset.id;
41 -  
42 -  
43 let url = '/index/second/deleteAddress'; 52 let url = '/index/second/deleteAddress';
44 let head = { 53 let head = {
45 'XX-Token': wx.getStorageSync('token') 54 'XX-Token': wx.getStorageSync('token')
@@ -48,7 +57,6 @@ Page({ @@ -48,7 +57,6 @@ Page({
48 address_id: id 57 address_id: id
49 } 58 }
50 // console.log(params) 59 // console.log(params)
51 -  
52 wx.showModal({ 60 wx.showModal({
53 title: '提示', 61 title: '提示',
54 content: '确定删除该地址吗？', 62 content: '确定删除该地址吗？',
@@ -68,16 +76,13 @@ Page({ @@ -68,16 +76,13 @@ Page({
68 console.log('用户点击取消') 76 console.log('用户点击取消')
69 } 77 }
70 } 78 }
71 -  
72 -  
73 }) 79 })
74 -  
75 -  
76 -  
77 }, 80 },
78 // 编辑 81 // 编辑
79 bindCompile(e) { 82 bindCompile(e) {
  83 + // console.log(e)
80 var id = e.currentTarget.dataset.id 84 var id = e.currentTarget.dataset.id
  85 + // console.log(id)
81 wx.navigateTo({ 86 wx.navigateTo({
82 url: '/pages/myaddcompile/myaddcompile?id=' + id, 87 url: '/pages/myaddcompile/myaddcompile?id=' + id,
83 }) 88 })
@@ -105,30 +110,8 @@ Page({ @@ -105,30 +110,8 @@ Page({
105 }, 110 },
106 111
107 112
108 - /**  
109 - * 生命周期函数--监听页面加载  
110 - */  
111 - onLoad: function (options) {  
112 113
113 - console.log(options)  
114 114
115 - },  
116 -  
117 - /**  
118 - * 生命周期函数--监听页面初次渲染完成  
119 - */  
120 - onReady: function () {  
121 -  
122 - },  
123 -  
124 - /**  
125 - * 生命周期函数--监听页面显示  
126 - */  
127 - onShow: function () {  
128 - let that = this;  
129 - that.getList();  
130 -  
131 - },  
132 115
133 /** 116 /**
134 * 生命周期函数--监听页面隐藏 117 * 生命周期函数--监听页面隐藏
1 -const app =getApp() 1 +const app = getApp()
2 Page({ 2 Page({
3 3
4 /** 4 /**
@@ -6,6 +6,7 @@ Page({ @@ -6,6 +6,7 @@ Page({
6 */ 6 */
7 data: { 7 data: {
8 list: '', 8 list: '',
  9 + active: ''
9 }, 10 },
10 11
11 12
@@ -22,11 +23,11 @@ Page({ @@ -22,11 +23,11 @@ Page({
22 onShow: function () { 23 onShow: function () {
23 24
24 let that = this 25 let that = this
25 - that.getactive() 26 + that.getList()
26 27
27 }, 28 },
28 29
29 - getactive() { 30 + getList() {
30 let that = this; 31 let that = this;
31 let url = '/index/second/zhengJianInfo '; 32 let url = '/index/second/zhengJianInfo ';
32 let head = { 33 let head = {
@@ -45,12 +46,65 @@ Page({ @@ -45,12 +46,65 @@ Page({
45 }, 46 },
46 47
47 48
  49 + // 生成图片
  50 + getPic(e) {
  51 + console.log(e)
  52 + var type = e.currentTarget.dataset.type
  53 + let that = this;
  54 + let url = '/index/second/zhengJianPic ';
  55 + let head = {
  56 + 'XX-Token': wx.getStorageSync('token')
  57 + }
  58 + let params = {
  59 + type: type
  60 + }
48 61
  62 + app.post(url, params, head).then((res) => {
  63 + console.log(res)
  64 + // this.setData({
  65 + // active: res.url
  66 + // })
  67 + wx.downloadFile({
  68 + url: res.url,
  69 + success: (res) => {
  70 + wx.saveImageToPhotosAlbum({
  71 + filePath: res.tempFilePath,
  72 + success: (r) => {
  73 + wx.showToast({
  74 + title: '保存成功',
  75 + mask: true,
  76 + duration: 1000
  77 + })
  78 + }
  79 + })
  80 + }
  81 + })
49 82
50 83
51 84
52 85
  86 + })
  87 + },
53 88
  89 + //保存海报到本地
  90 + // save_poster() {
  91 + // wx.downloadFile({
  92 + // url: this.data.active,
  93 + // success: (res) => {
  94 + // wx.saveImageToPhotosAlbum({
  95 + // filePath: res.tempFilePath,
  96 + // success: (r) => {
  97 + // wx.showToast({
  98 + // title: '保存成功',
  99 + // mask: true,
  100 + // duration: 1000
  101 + // })
  102 + // }
  103 + // })
  104 + // }
  105 + // })
  106 +
  107 + // },
54 108
55 109
56 110
1 <!-- 电子证件 --> 1 <!-- 电子证件 -->
2 <view class="mycertificate"> 2 <view class="mycertificate">
3 - <image src="/imgs/dianzizhengjian1.png"></image> 3 + <image wx:if="{{list.status=='志愿者(待学习)'}}" src="http://volunteer.w.bronet.cn/imgs/idcard2.png"></image>
  4 + <image wx:else src="/imgs/dianzizhengjian1.png"></image>
4 <view class="mycertificate_text"> 5 <view class="mycertificate_text">
5 <view class="goods_left"> 6 <view class="goods_left">
6 <view>姓名：{{list.name}}</view> 7 <view>姓名：{{list.name}}</view>
7 <view>身份：{{list.status}}</view> 8 <view>身份：{{list.status}}</view>
8 <view>编号：{{list.user_num}}</view> 9 <view>编号：{{list.user_num}}</view>
9 - <view>学时：{{list.work_time}}</view> 10 + <view>学时：{{list.work_time==null?'':'list.work_time'}}</view>
10 </view> 11 </view>
11 <image class="One_inch_photos" src="{{list.avatar}}"></image> 12 <image class="One_inch_photos" src="{{list.avatar}}"></image>
12 </view> 13 </view>
13 14
14 </view> 15 </view>
15 <view class="mycertificate distance"> 16 <view class="mycertificate distance">
16 - <image src="/imgs/dianzizhengjian.png"></image> 17 + <image wx:if="{{list.status=='志愿者(待学习)'}}" src="http://volunteer.w.bronet.cn/imgs/idcard1.png"></image>
  18 + <image wx:else src="/imgs/dianzizhengjian.png"></image>
  19 +
17 <view class="mycertificate_text"> 20 <view class="mycertificate_text">
18 <view class="goods_lefts"> 21 <view class="goods_lefts">
19 - <image class="logo" src="/imgs/dianzizhengjian2.png"></image> 22 + <image class="logo" src="https://ftp.bmp.ovh/imgs/2020/10/6ce74d64f7aa1e53.png"></image>
20 <view>白求恩志愿者</view> 23 <view>白求恩志愿者</view>
21 </view> 24 </view>
22 - <image class="erweima" src="/imgs/dianzizhengjian3.png"></image> 25 + <image class="erweima" src="https://ftp.bmp.ovh/imgs/2020/10/fa5e66b52e2ccb82.jpg"></image>
23 </view> 26 </view>
24 27
25 28
@@ -34,6 +37,8 @@ @@ -34,6 +37,8 @@
34 <view class="good_typeface">4. 如实体证件丢失请及时联系白求恩志愿者中心补办</view> 37 <view class="good_typeface">4. 如实体证件丢失请及时联系白求恩志愿者中心补办</view>
35 </view> 38 </view>
36 39
37 -<view class="btn">  
38 - <button hover-class="none"> 将电子证件生成图片</button> 40 +<view class="btn" wx:if="{{list.status!=='志愿者(待学习)'}}">
  41 + <!-- <button hover-class="none"> 将电子证件生成图片</button> -->
  42 + <view class="generate" bindtap="getPic" data-type="{{1}}">生成正面图片</view>
  43 + <view class="generate" bindtap="getPic" data-type="{{2}}">生成背面图片</view>
39 </view> 44 </view>
@@ -7,10 +7,11 @@ page { @@ -7,10 +7,11 @@ page {
7 padding: 0 32rpx; 7 padding: 0 32rpx;
8 padding-top: 32rpx; 8 padding-top: 32rpx;
9 position: relative; 9 position: relative;
10 - 10 +
11 } 11 }
12 -.distance{  
13 -margin-bottom: 142rpx; 12 +
  13 +.distance {
  14 + margin-bottom: 260rpx;
14 } 15 }
15 16
16 image { 17 image {
@@ -29,7 +30,6 @@ image { @@ -29,7 +30,6 @@ image {
29 left: 0; 30 left: 0;
30 top: 0; 31 top: 0;
31 display: flex; 32 display: flex;
32 -  
33 justify-content: space-between; 33 justify-content: space-between;
34 34
35 35
@@ -95,22 +95,26 @@ image { @@ -95,22 +95,26 @@ image {
95 } 95 }
96 96
97 .btn { 97 .btn {
98 -  
99 - height: 122rpx; 98 + padding-top: 21rpx;
  99 + height: 240rpx;
100 background-color: #ffffff; 100 background-color: #ffffff;
101 - display: flex;  
102 - align-items: center; 101 + box-sizing: border-box;
  102 + /* display: flex; */
  103 + /* align-items: center; */
103 position: fixed; 104 position: fixed;
104 left: 0; 105 left: 0;
105 right: 0; 106 right: 0;
106 bottom: 0; 107 bottom: 0;
107 } 108 }
108 109
109 -button {  
110 - width: 622rpx; 110 +.generate {
  111 + margin-bottom: 21rpx;
  112 + width: 100%;
111 height: 88rpx; 113 height: 88rpx;
  114 + text-align: center;
  115 + line-height: 88rpx;
112 background: linear-gradient(130deg, #2ed26e 13%, #05983e 98%); 116 background: linear-gradient(130deg, #2ed26e 13%, #05983e 98%);
113 - border-radius: 44px; 117 + /* border-radius: 44px; */
114 color: #ffffff; 118 color: #ffffff;
115 - box-shadow: 0px 18px 38px 0px rgba(0, 116, 45, 0.42); 119 + /* box-shadow: 0px 18px 38px 0px rgba(0, 116, 45, 0.42); */
116 } 120 }
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 <view>可用工时</view> 36 <view>可用工时</view>
37 </view> 37 </view>
38 <view class="my_active"> 38 <view class="my_active">
39 - <view>{{datalist.user.work_time}}</view> 39 + <view>{{datalist.user.work_time==null?'0':'datalist.user.work_time'}}</view>
40 <view>累计总共工时</view> 40 <view>累计总共工时</view>
41 </view> 41 </view>
42 <view class="my_active"> 42 <view class="my_active">
  1 +page {
  2 + background-color: rgb(240, 240, 240);
  3 +}
  4 +
  5 +/* 轮播图 */
  6 +swiper {
  7 + height: 750rpx;
  8 +}
  9 +
  10 +swiper image {
  11 + width: 100%;
  12 + height: 750rpx;
  13 +}
  14 +/* */
  15 +.goods_wrap{
  16 + margin-top: 24rpx;
  17 + background-color: #ffffff;
  18 + padding: 24rpx 32rpx;
  19 +
  20 +}
  21 +.goods_time {
  22 + height: 66rpx;
  23 + color: #21AE58;
  24 + font-size: 28rpx;
  25 +}
  26 +
  27 +.goods_name {
  28 + line-height: 50rpx;
  29 + font-size: 36rpx;
  30 + font-weight: 500;
  31 +
  32 +}
  33 +.goods_wrap p{
  34 + font-size: 44rpx;
  35 +}
  36 +.margin{
  37 + margin-bottom: 48rpx;
  38 +}
  39 +/* */
  40 +.goods_introduce {
  41 + height: 88rpx;
  42 + display: flex;
  43 + justify-content: center;
  44 + align-items: center;
  45 + font-size: 28rpx;
  46 + color: #969799;
  47 +}
  48 +
  49 +.goods_introduce :nth-child(2) {
  50 + margin: 0 32rpx;
  51 +}
  52 +
  53 +.goods_line {
  54 + width: 100rpx;
  55 + height: 2rpx;
  56 + background-color: #969799;
  57 +}
  58 +.goods_text{
  59 +
  60 + margin-bottom: 150rpx;
  61 +}
  62 +/*兑换 */
  63 +.shengqin {
  64 + height: 120rpx;
  65 + background-color: #ffffff;
  66 + font-size: 32rpx;
  67 + position: fixed;
  68 + left: 0;
  69 + right: 0;
  70 + bottom: 0;
  71 + display: flex;
  72 + align-items: center;
  73 +}
  74 +.shengqin button {
  75 + width: 622rpx;
  76 + color: #ffffff;
  77 + border-radius: 22px;
  78 + background: linear-gradient(130deg, #2ed26e 13%, #05983e 98%);
  79 + box-shadow: 0px 9px 19px 0px rgba(0, 116, 45, 0.42);
  80 +
  81 +}
  1 +const app = getApp();
  2 +Page({
  3 +
  4 + /**
  5 + * 页面的初始数据
  6 + */
  7 + data: {
  8 +
  9 + id: ''
  10 + },
  11 +
  12 + /**
  13 + * 生命周期函数--监听页面加载
  14 + */
  15 + onLoad: function (options) {
  16 +
  17 + // console.log(options)
  18 + this.setData({
  19 + id: options.id,
  20 + list: ''
  21 + })
  22 +
  23 + },
  24 +
  25 +
  26 + onReady: function () {
  27 +
  28 + },
  29 +
  30 +
  31 + onShow: function () {
  32 + let that = this;
  33 + that.getList();
  34 +
  35 +
  36 + },
  37 +
  38 + onHide: function () {
  39 +
  40 + },
  41 +
  42 + // 详情
  43 + getList() {
  44 +
  45 + let that = this;
  46 + let url = '/index/second/orderInfo';
  47 + let head = {
  48 + 'XX-Token': wx.getStorageSync('token')
  49 + }
  50 + let d = {
  51 + id: that.data.id
  52 + }
  53 + app.post(url, d, head).then((res) => {
  54 + console.log(res)
  55 + that.setData({
  56 + list: res
  57 + })
  58 +
  59 + }).catch((err) => {
  60 +
  61 + })
  62 + },
  63 +
  64 +
  65 +
  66 +
  67 +
  68 +
  69 +
  70 +
  71 +
  72 + /**
  73 + * 生命周期函数--监听页面卸载
  74 + */
  75 + onUnload: function () {
  76 +
  77 + },
  78 +
  79 + /**
  80 + * 页面相关事件处理函数--监听用户下拉动作
  81 + */
  82 + onPullDownRefresh: function () {
  83 +
  84 + },
  85 +
  86 + /**
  87 + * 页面上拉触底事件的处理函数
  88 + */
  89 + onReachBottom: function () {
  90 +
  91 + },
  92 +
  93 + /**
  94 + * 用户点击右上角分享
  95 + */
  96 + onShareAppMessage: function () {
  97 +
  98 + }
  99 +})
  1 +{
  2 + "usingComponents": {},
  3 + "navigationBarTitleText": "志愿礼物详情"
  4 +}
  1 +<!-- 轮播图 -->
  2 +<swiper indicator-dots="true" indicator-color='#8C9194' indicator-active-color='#ffffff' class="slide-image">
  3 + <view wx:for="{{list.good.banner}}">
  4 + <swiper-item>
  5 + <image src="{{item}}" />
  6 + </swiper-item>
  7 + </view>
  8 +</swiper>
  9 +<!-- 工时商品名称 -->
  10 +<view class="goods_wrap">
  11 + <!-- <view class="goods_time">需要工时<p>{{list.work_time}}</p>小时</view> -->
  12 + <view class="goods_name">{{list.good.good_name}} </view>
  13 +</view>
  14 +<!-- 兑换数量 -->
  15 +<view class="goods_wrap">
  16 + <!-- <view class="displayB margin">
  17 + <view>订单状态</view>
  18 + <view>{{list.expend}}</view>
  19 + </view> -->
  20 + <view class="displayB margin">
  21 + <view>兑换工时</view>
  22 + <view>{{list.expend}}</view>
  23 + </view>
  24 + <view class="displayB">
  25 + <view>订单编号</view>
  26 + <view>{{list.order_sn}}</view>
  27 + </view>
  28 +</view>
  29 +
  30 +<view class="goods_introduce" >
  31 + <view class="goods_line"></view>
  32 + <view bindtap="getadd">产品详情</view>
  33 + <view class="goods_line"></view>
  34 +</view>
  35 +<view class="goods_text" >
  36 + <rich-text nodes="{{list.good.content}}"></rich-text>
  37 +</view>
  38 +<view class="goods_text" wx:if="{{list.reason}}">
  39 + <rich-text nodes="{{list.reason}}"></rich-text>
  40 +</view>
  41 +
  42 +
  43 +
  44 +
  45 +<!-- <view class="shengqin">
  46 + <button bindtap="getbindbuy" data-index='{{index}}' data-id="{{id}}">积分兑换</button>
  47 +</view> -->
  1 +page {
  2 + background-color: rgb(240, 240, 240);
  3 +}
  4 +
  5 +/* 轮播图 */
  6 +swiper {
  7 + height: 750rpx;
  8 +}
  9 +
  10 +swiper image {
  11 + width: 100%;
  12 + height: 750rpx;
  13 +}
  14 +
  15 +/* */
  16 +.goods_wrap {
  17 + margin-top: 24rpx;
  18 + font-size: 28rpx;
  19 + background-color: #ffffff;
  20 + padding: 24rpx 32rpx;
  21 + color: #333333;
  22 +
  23 +}
  24 +
  25 +.goods_time {
  26 + height: 66rpx;
  27 + color: #21AE58;
  28 + font-size: 28rpx;
  29 +}
  30 +
  31 +.goods_name {
  32 + line-height: 50rpx;
  33 + font-size: 36rpx;
  34 + font-weight: 500;
  35 +
  36 +}
  37 +
  38 +.goods_wrap p {
  39 + font-size: 44rpx;
  40 +}
  41 +
  42 +.margin {
  43 + margin-bottom: 48rpx;
  44 +}
  45 +
  46 +/* */
  47 +.goods_introduce {
  48 + height: 88rpx;
  49 + display: flex;
  50 + justify-content: center;
  51 + align-items: center;
  52 + font-size: 28rpx;
  53 + color: #969799;
  54 +}
  55 +
  56 +.goods_introduce :nth-child(2) {
  57 + margin: 0 32rpx;
  58 +}
  59 +
  60 +.goods_line {
  61 + width: 100rpx;
  62 + height: 2rpx;
  63 + background-color: #969799;
  64 +}
  65 +
  66 +.goods_text {
  67 + padding: 0 32rpx;
  68 + margin-bottom: 150rpx;
  69 +}
  70 +
  71 +.picture {
  72 + width: 100%;
  73 + height: 290rpx;
  74 +}
  75 +
  76 +
  77 +/*兑换 */
  78 +/* .shengqin {
  79 + height: 120rpx;
  80 + background-color: #ffffff;
  81 + font-size: 32rpx;
  82 + position: fixed;
  83 + left: 0;
  84 + right: 0;
  85 + bottom: 0;
  86 + display: flex;
  87 + align-items: center;
  88 +}
  89 +.shengqin button {
  90 + width: 622rpx;
  91 + color: #ffffff;
  92 + border-radius: 22px;
  93 + background: linear-gradient(130deg, #2ed26e 13%, #05983e 98%);
  94 + box-shadow: 0px 9px 19px 0px rgba(0, 116, 45, 0.42);
  95 +
  96 +} */
1 <!-- 地址 --> 1 <!-- 地址 -->
2 -<view class="goods_address" wx:if="{{datalist}}" bindtap="getchooseaddress"> 2 +<view class="goods_address" wx:if="{{datalist}}" bindtap="getchooseaddress">
3 <image class="goods_tubiao" src="/imgs/dizhigreen.png"></image> 3 <image class="goods_tubiao" src="/imgs/dizhigreen.png"></image>
4 <view> 4 <view>
5 <view>姓名：{{datalist.name}} {{datalist.tel}}</view> 5 <view>姓名：{{datalist.name}} {{datalist.tel}}</view>
6 - <view class="goods_add">地址：{{datalist.province}}{{datalist.city}}{{datalist.district}}{{datalist.address}}</view> 6 + <view class="goods_add">地址：{{datalist.province}}{{datalist.city}}{{datalist.district}}{{datalist.address}}
  7 + </view>
7 </view> 8 </view>
8 <image class="goods_tubiao1" src="/imgs/right.png"></image> 9 <image class="goods_tubiao1" src="/imgs/right.png"></image>
9 </view> 10 </view>
@@ -35,12 +36,12 @@ @@ -35,12 +36,12 @@
35 <view class="num_edit" catchtap="bindNum" data-type="minus" data-index="{{index}}" data-id="{{item.id}}">- 36 <view class="num_edit" catchtap="bindNum" data-type="minus" data-index="{{index}}" data-id="{{item.id}}">-
36 </view> 37 </view>
37 <view class="goods_num">{{count}}</view> 38 <view class="goods_num">{{count}}</view>
38 - <view class="num_edit" catchtap="bindNum" data-type="add" data-index="{{index}}" data-id="{{item.id}}">+ 39 + <view class="num_edit" catchtap="bindNum" data-type="add" data-index="{{index}}" data-id="{{item.id}}">+
39 </view> 40 </view>
40 </view> 41 </view>
41 </view> 42 </view>
42 <view>订单备注：</view> 43 <view>订单备注：</view>
43 - <textarea bindinput="bindremark" value="{{remark}}"></textarea> 44 + <textarea bindinput="bindremark" value="{{remark}}"></textarea>
44 <view class="goods_allnum"> 45 <view class="goods_allnum">
45 <view>共{{count}}件 <p>小计: 46 <view>共{{count}}件 <p>小计:
46 <p style="color:#079A40;">{{count*goodsInfo.work_time}}</p> 47 <p style="color:#079A40;">{{count*goodsInfo.work_time}}</p>
1 { 1 {
2 - "usingComponents": {} 2 + "usingComponents": {},
  3 + "navigationBarTitleText": "工时兑换"
3 } 4 }
@@ -40,8 +40,15 @@ Page({ @@ -40,8 +40,15 @@ Page({
40 }) 40 })
41 }, 41 },
42 42
  43 + // 详情页
  44 + getdetail(e) {
  45 + var id = e.currentTarget.dataset.id
  46 + console.log(e)
  47 + wx.navigateTo({
  48 + url: '/pages/myfeedback/myfeedback_detail/myfeedback_detail?id=' + id,
  49 + })
43 50
44 - 51 + },
45 52
46 onLoad: function (options) { 53 onLoad: function (options) {
47 54
1 <view class="navbar"> 1 <view class="navbar">
2 <view class="item {{nav==0?'choose':''}}" bindtap="bindNav" data-nav="{{0}}">待审核</view> 2 <view class="item {{nav==0?'choose':''}}" bindtap="bindNav" data-nav="{{0}}">待审核</view>
3 - <view class="item {{nav==1?'choose':''}}" bindtap="bindNav" data-nav="{{1}}">已发放志愿礼品</view> 3 + <view class="item {{nav==1?'choose':''}}" bindtap="bindNav" data-nav="{{1}}">已发放</view>
  4 + <view class="item {{nav==2?'choose':''}}" bindtap="bindNav" data-nav="{{2}}">已拒绝</view>
4 </view> 5 </view>
5 - 6 +<!--待审核 -->
6 <view wx:if="{{nav==0}}"> 7 <view wx:if="{{nav==0}}">
7 - <view class="list" wx:for="{{list.data}}"> 8 + <view class="list" wx:for="{{list.data}}" bindtap="getdetail" data-id="{{item.id}}">
8 <view> 9 <view>
9 <image src="{{item.pic}}"></image> 10 <image src="{{item.pic}}"></image>
10 </view> 11 </view>
11 <view class="list_right"> 12 <view class="list_right">
12 <view>{{item.good_name}}</view> 13 <view>{{item.good_name}}</view>
13 -  
14 - <view wx:if="{{item.status==0}}">待审核</view>  
15 - <!-- <view wx:if="{{item.status==1}}">在审核</view> --> 14 + <view class="list_real" wx:if="{{item.is_real==1}}">真实物品</view>
  15 + <view class="list_real" wx:else>虚拟物品</view>
  16 + <view class="list_status" wx:if="{{item.status==0}}">待审核</view>
16 </view> 17 </view>
17 </view> 18 </view>
18 </view> 19 </view>
19 -<view wx:else>  
20 - <view class="list" wx:for="{{list.data}}"> 20 +<!--已发放 -->
  21 +<view wx:if="{{nav==1}}">
  22 + <view class="list" wx:for="{{list.data}}" bindtap="getdetail" data-id="{{item.id}}">
21 <view> 23 <view>
22 <image src="{{item.pic}}"></image> 24 <image src="{{item.pic}}"></image>
23 </view> 25 </view>
24 <view class="list_right"> 26 <view class="list_right">
25 <view>{{item.good_name}}</view> 27 <view>{{item.good_name}}</view>
  28 + <view class="list_real" wx:if="{{item.is_real==1}}">真实物品</view>
  29 + <view class="list_real" wx:else>虚拟物品</view>
  30 + <view class="list_status" wx:if="{{item.status==1}}">已发放</view>
  31 + </view>
  32 + </view>
26 33
27 - <!-- <view wx:if="{{item.status==0}}">待审核</view> -->  
28 - <view wx:if="{{item.status==1}}">已发放</view> 34 +</view>
  35 +<!-- 已拒绝 -->
  36 +<view wx:else>
  37 + <view class="list" wx:for="{{list.data}}" bindtap="getdetail" data-id="{{item.id}}">
  38 + <view>
  39 + <image src="{{item.pic}}"></image>
  40 + </view>
  41 + <view class="list_right">
  42 + <view>{{item.good_name}}</view>
  43 + <view class="list_real" wx:if="{{item.is_real==1}}">真实物品</view>
  44 + <view class="list_real" wx:else>虚拟物品</view>
  45 + <view class="list_status" wx:if="{{item.status==1}}">已拒绝</view>
29 </view> 46 </view>
30 </view> 47 </view>
31 48
@@ -31,7 +31,6 @@ page { @@ -31,7 +31,6 @@ page {
31 .navbar .item.choose { 31 .navbar .item.choose {
32 color: black; 32 color: black;
33 /* background: linear-gradient(136deg, #4e8fff 2%, #55c2fa); */ 33 /* background: linear-gradient(136deg, #4e8fff 2%, #55c2fa); */
34 -  
35 } 34 }
36 35
37 .navbar .item.choose:after { 36 .navbar .item.choose:after {
@@ -76,12 +75,19 @@ page { @@ -76,12 +75,19 @@ page {
76 font-size: 28rpx; 75 font-size: 28rpx;
77 font-family: PingFangSC, PingFangSC-Regular; 76 font-family: PingFangSC, PingFangSC-Regular;
78 font-weight: 400; 77 font-weight: 400;
79 - text-align: left;  
80 color: #323233; 78 color: #323233;
81 line-height: 40rpx; 79 line-height: 40rpx;
82 } 80 }
83 81
84 -.list_right :nth-child(2) { 82 +.list_real {
  83 + height: 80rpx;
  84 + font-size: 28rpx;
  85 + font-family: PingFangSC, PingFangSC-Regular;
  86 + font-weight: 400;
  87 + color: #7D7E80;
  88 +}
  89 +
  90 +.list_status {
85 text-align: right; 91 text-align: right;
86 color: #21AE58; 92 color: #21AE58;
87 font-size: 32rpx; 93 font-size: 32rpx;
  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": 28,
  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 + "id": 33,
  308 + "name": "志愿礼物详情",
  309 + "pathName": "pages/myfeedback/myfeedback_detail/myfeedback_detail",
  310 + "query": "",
  311 + "scene": null
  312 + },
  313 + {
  314 + "id": -1,
  315 + "name": "我的志愿回馈",
  316 + "pathName": "pages/myfeedback_lists/myfeedback_lists",
  317 + "query": "",
  318 + "scene": null
  319 + }
  320 + ]
  321 + }
  322 + }
  323 +}