miniprogram / volunteer · 提交

转到一个项目

作者 王智
提交 9e4da81c3ad9ca06cd7b8f12459b2e3a12a2f2b6 1 个父辈 ff240587

bug

内嵌 并排对比
正在显示 71 个修改的文件 包含 1015 行增加 和 297 行删除
1 //app.js 1 //app.js
2 App({ 2 App({
3 - onLaunch: function() { 3 + onLaunch: function () {
4 //自动更新版本 4 //自动更新版本
5 const updateManager = wx.getUpdateManager() 5 const updateManager = wx.getUpdateManager()
6 - updateManager.onCheckForUpdate(function(res) { 6 + updateManager.onCheckForUpdate(function (res) {
7 // 请求完新版本信息的回调 7 // 请求完新版本信息的回调
8 }) 8 })
9 9
10 - updateManager.onUpdateReady(function() { 10 + updateManager.onUpdateReady(function () {
11 wx.showModal({ 11 wx.showModal({
12 title: '更新提示', 12 title: '更新提示',
13 content: '新版本已经准备好，是否重启应用？', 13 content: '新版本已经准备好，是否重启应用？',
14 - success: function(res) { 14 + success: function (res) {
15 if (res.confirm) { 15 if (res.confirm) {
16 // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启 16 // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
17 updateManager.applyUpdate() 17 updateManager.applyUpdate()
@@ -21,7 +21,7 @@ App({ @@ -21,7 +21,7 @@ App({
21 21
22 }) 22 })
23 23
24 - updateManager.onUpdateFailed(function() { 24 + updateManager.onUpdateFailed(function () {
25 // 新的版本下载失败 25 // 新的版本下载失败
26 wx.showModal({ 26 wx.showModal({
27 title: '更新提示', 27 title: '更新提示',
@@ -31,7 +31,7 @@ App({ @@ -31,7 +31,7 @@ App({
31 }) 31 })
32 }, 32 },
33 33
34 - post: function(url, data, headerParams) { 34 + post: function (url, data, headerParams) {
35 wx.showNavigationBarLoading() 35 wx.showNavigationBarLoading()
36 wx.showLoading({ 36 wx.showLoading({
37 title: '加载中', 37 title: '加载中',
@@ -52,7 +52,7 @@ App({ @@ -52,7 +52,7 @@ App({
52 data: postData, 52 data: postData,
53 method: 'POST', 53 method: 'POST',
54 header: header, 54 header: header,
55 - success: function(res) { //返回取得的数据 55 + success: function (res) { //返回取得的数据
56 if (res.data.code == '20000') { 56 if (res.data.code == '20000') {
57 resolve(res.data.data); 57 resolve(res.data.data);
58 } else if (res.data.code == '10001') { //用户未登录 58 } else if (res.data.code == '10001') { //用户未登录
@@ -62,20 +62,30 @@ App({ @@ -62,20 +62,30 @@ App({
62 }) 62 })
63 63
64 } else if (res.data.code == '40000') { 64 } else if (res.data.code == '40000') {
  65 +
  66 +
  67 + if (url == '/index/second/commitAnswer') {
  68 + resolve(res.data);
  69 + } else {
65 wx.showModal({ 70 wx.showModal({
66 title: '提示', 71 title: '提示',
67 content: res.data.msg, 72 content: res.data.msg,
68 showCancel: false, 73 showCancel: false,
69 - success: function(res) { 74 + success: function (res) {
70 75
71 } 76 }
72 }) 77 })
  78 + }
  79 +
  80 +
  81 +
  82 +
73 } else if (res.data.code == '40005') { 83 } else if (res.data.code == '40005') {
74 wx.showModal({ 84 wx.showModal({
75 title: '提示', 85 title: '提示',
76 content: res.data.msg, 86 content: res.data.msg,
77 showCancel: false, 87 showCancel: false,
78 - success: function(res) { 88 + success: function (res) {
79 if (res.confirm) { 89 if (res.confirm) {
80 wx.reLaunch({ 90 wx.reLaunch({
81 url: '/pages/start/start' 91 url: '/pages/start/start'
@@ -98,7 +108,7 @@ App({ @@ -98,7 +108,7 @@ App({
98 wx.hideLoading() 108 wx.hideLoading()
99 wx.hideNavigationBarLoading() 109 wx.hideNavigationBarLoading()
100 }, 110 },
101 - fail: function(e) { 111 + fail: function (e) {
102 reject('网络出错'); 112 reject('网络出错');
103 // wx.hideLoading() 113 // wx.hideLoading()
104 wx.hideNavigationBarLoading() 114 wx.hideNavigationBarLoading()
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 "pages/start/start", 3 "pages/start/start",
4 "pages/index/index", 4 "pages/index/index",
5 "pages/my/my", 5 "pages/my/my",
  6 + "pages/mydetail/mydetail",
6 "pages/more/more", 7 "pages/more/more",
7 "pages/admin/admin", 8 "pages/admin/admin",
8 "pages/apply/apply", 9 "pages/apply/apply",

1.7 KB | 宽: | 高:

5.0 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

511 字节 | 宽: | 高:

1.3 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

361 字节 | 宽: | 高:

830 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

424 字节 | 宽: | 高:

1.1 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

475 字节 | 宽: | 高:

1.4 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

1.8 KB | 宽: | 高:

5.4 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

1.6 KB | 宽: | 高:

4.4 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

1.6 KB | 宽: | 高:

4.7 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

544 字节 | 宽: | 高:

1.6 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

471 字节 | 宽: | 高:

1.1 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

185 字节 | 宽: | 高:

672 字节 | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

508 字节 | 宽: | 高:

1.3 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

2.6 KB | 宽: | 高:

6.4 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

2.5 KB | 宽: | 高:

6.6 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

2.4 KB | 宽: | 高:

6.2 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

2.4 KB | 宽: | 高:

6.1 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

2.6 KB | 宽: | 高:

7.1 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

2.5 KB | 宽: | 高:

6.5 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

2.1 KB | 宽: | 高:

6.4 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

2.0 KB | 宽: | 高:

6.6 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

457 字节 | 宽: | 高:

1.3 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖

394 字节 | 宽: | 高:

1.1 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖
@@ -21,7 +21,8 @@ @@ -21,7 +21,8 @@
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>
24 - <button wx:if="{{list.user_status ==1}}">审核通过</button> 24 + <button style="background:#cfcfcf;box-shadow:0rpx 18rpx 38rpx 0rpx rgba(179, 179, 179, 0.42);"
  25 + wx:if="{{list.user_status ==1}}">审核已通过</button>
25 <button wx:if="{{list.user_status ==-1}}">审核不通过</button> 26 <button wx:if="{{list.user_status ==-1}}">审核不通过</button>
26 <button wx:if="{{list.user_status ==3}}" bindtap="getshengqin" data-id="{{id}}">未申请</button> 27 <button wx:if="{{list.user_status ==3}}" bindtap="getshengqin" data-id="{{id}}">未申请</button>
27 </view> 28 </view>
@@ -27,6 +27,7 @@ page { @@ -27,6 +27,7 @@ page {
27 align-items: center; 27 align-items: center;
28 margin-right: 42rpx; 28 margin-right: 42rpx;
29 } 29 }
  30 +
30 /* */ 31 /* */
31 .goods_introduce { 32 .goods_introduce {
32 height: 88rpx; 33 height: 88rpx;
@@ -68,3 +69,10 @@ page { @@ -68,3 +69,10 @@ page {
68 box-shadow: 0px 9px 19px 0px rgba(0, 116, 45, 0.42); 69 box-shadow: 0px 9px 19px 0px rgba(0, 116, 45, 0.42);
69 70
70 } 71 }
  72 +
  73 +.gray {
  74 + width: 622rpx;
  75 + height: 88rpx;
  76 + border-radius: 44rpx;
  77 +
  78 +}
@@ -15,13 +15,13 @@ Page({ @@ -15,13 +15,13 @@ Page({
15 }) 15 })
16 16
17 //全局变量 17 //全局变量
18 - app.globalData.currentTab = e.currentTarget.dataset.id; 18 + // app.globalData.currentTab = e.currentTarget.dataset.id;
19 this.getactive(); 19 this.getactive();
20 }, 20 },
21 onShow() { 21 onShow() {
22 - this.setData({  
23 - currentTab: app.globalData.currentTab  
24 - }) 22 + // this.setData({
  23 + // currentTab: app.globalData.currentTab
  24 + // })
25 25
26 let that = this; 26 let that = this;
27 that.getNewsType() 27 that.getNewsType()
@@ -40,9 +40,10 @@ Page({ @@ -40,9 +40,10 @@ Page({
40 'XX-Token': wx.getStorageSync('token') 40 'XX-Token': wx.getStorageSync('token')
41 } 41 }
42 app.post(url, head).then((res) => { 42 app.post(url, head).then((res) => {
43 - // console.log(res) 43 + console.log(res)
44 that.setData({ 44 that.setData({
45 - navbar: res 45 + navbar: res,
  46 +
46 }) 47 })
47 }).catch((err) => { 48 }).catch((err) => {
48 49
@@ -59,9 +60,11 @@ Page({ @@ -59,9 +60,11 @@ Page({
59 'XX-Token': wx.getStorageSync('token') 60 'XX-Token': wx.getStorageSync('token')
60 } 61 }
61 let params = { 62 let params = {
  63 +
62 page: that.data.currentTab 64 page: that.data.currentTab
63 - }  
64 65
  66 + }
  67 + console.log(params)
65 app.post(url, params, head).then((res) => { 68 app.post(url, params, head).then((res) => {
66 // console.log(res) 69 // console.log(res)
67 that.setData({ 70 that.setData({
@@ -2,9 +2,58 @@ const app = getApp(); @@ -2,9 +2,58 @@ const app = getApp();
2 Page({ 2 Page({
3 3
4 data: { 4 data: {
5 - list:[] 5 + list: [],
  6 + array: [],
  7 + index: 1
  8 + },
  9 + onLoad: function (options) {
  10 + wx.getLocation({
  11 + altitude: 'true',
  12 + success(res) {
  13 + console.log(res)
  14 + }
  15 + })
  16 + },
  17 +
  18 + onReady: function () {
  19 +
  20 + },
  21 +
  22 + onShow: function () {
  23 + let that = this;
  24 + that.getList();
  25 + that.get_city();
  26 +
  27 + },
  28 +
  29 + // 选择
  30 + bindPickerChange: function (e) {
  31 + console.log('picker发送选择改变，携带值为', e.detail.value)
  32 + this.setData({
  33 + index: e.detail.value
  34 + })
  35 + that.getList()
  36 +
  37 + },
  38 + // 地址获取
  39 + get_city() {
  40 + let that = this;
  41 + let url = '/index/index/cityList'
  42 + let head = {
  43 + 'XX-Token': wx.getStorageSync('token')
  44 + }
  45 +
  46 + app.post(url, {}, head).then((res) => {
  47 + console.log(res)
  48 + that.setData({
  49 + array: res.city
  50 +
  51 + })
  52 + }).catch((err) => {
6 53
  54 + })
7 }, 55 },
  56 +
8 // 志愿列表 57 // 志愿列表
9 getList() { 58 getList() {
10 let that = this; 59 let that = this;
@@ -13,10 +62,10 @@ Page({ @@ -13,10 +62,10 @@ Page({
13 'XX-Token': wx.getStorageSync('token') 62 'XX-Token': wx.getStorageSync('token')
14 } 63 }
15 let params = { 64 let params = {
16 - city: '天津' 65 + city: '天津市'
17 } 66 }
18 -  
19 - app.post(url,params, head).then((res) => { 67 + console.log(params)
  68 + app.post(url, params, head).then((res) => {
20 // console.log(res) 69 // console.log(res)
21 that.setData({ 70 that.setData({
22 list: res 71 list: res
@@ -29,38 +78,25 @@ Page({ @@ -29,38 +78,25 @@ Page({
29 78
30 // 详情页 79 // 详情页
31 getDetail(e) { 80 getDetail(e) {
32 - console.log(e) 81 + let that = this;
  82 + let url = '/index/second/checkTranStatus';
  83 + let head = {
  84 + 'XX-Token': wx.getStorageSync('token')
  85 + }
  86 + app.post(url, '', head).then((res) => {
  87 +
33 var id = e.currentTarget.dataset.id; 88 var id = e.currentTarget.dataset.id;
34 - // console.log(id)  
35 wx.navigateTo({ 89 wx.navigateTo({
36 - url: '/pages/Volunteer_detail/Volunteer_detail?id=' +id, 90 + url: '/pages/Volunteer_detail/Volunteer_detail?id=' + id,
37 }) 91 })
38 92
39 - },  
40 -  
41 -  
42 - /**  
43 - * 生命周期函数--监听页面加载  
44 - */  
45 - onLoad: function (options) { 93 + }).catch((err) => {
46 94
  95 + })
47 }, 96 },
48 97
49 - /**  
50 - * 生命周期函数--监听页面初次渲染完成  
51 - */  
52 - onReady: function () {  
53 98
54 - },  
55 99
56 - /**  
57 - * 生命周期函数--监听页面显示  
58 - */  
59 - onShow: function () {  
60 - let that =this;  
61 - that.getList();  
62 -  
63 - },  
64 100
65 /** 101 /**
66 * 生命周期函数--监听页面隐藏 102 * 生命周期函数--监听页面隐藏
1 <!-- 志愿团队 --> 1 <!-- 志愿团队 -->
2 -<view class="group_name"> 2 +<view class="group_name" bindtap="chooseLocation">
3 <image src="/imgs/didian-14.png"></image> 3 <image src="/imgs/didian-14.png"></image>
4 - <view>北京</view> 4 + <picker bindchange="bindPickerChange" value="{{index}}" range="{{array}}">
  5 + <view class="picker">
  6 + {{array[index]}}
  7 + <image class="right" src="/imgs/right.png"></image>
  8 + </view>
  9 + </picker>
5 </view> 10 </view>
6 11
  12 +
7 <view class='new_box'> 13 <view class='new_box'>
8 - <!-- <navigator wx:for='{{activity}}' wx:key="id" url='/pages/img_txt/img_txt?id={{item.id}}&status=1' hover-class="none"> -->  
9 - <view class='new_cell' data-id="{{list.id}}" bindtap="getDetail" >  
10 - <view class='new_cellmain' > 14 + <view class='new_cell' data-id="{{list.id}}" bindtap="getDetail">
  15 + <view class='new_cellmain'>
11 <view class='new_img'> 16 <view class='new_img'>
12 <image src='{{list.pic}}' mode="aspectFill" /> 17 <image src='{{list.pic}}' mode="aspectFill" />
13 -  
14 - <!-- <view class="">  
15 - <view>300</view>  
16 - <view>22</view>  
17 - </view> --> 18 + <view class="new_num">
  19 + <view> {{list.work_total_time}}小时</view>
  20 + <view>{{list.people_num}}人</view>
  21 + </view>
18 </view> 22 </view>
19 <view class='new_title'>{{list.name}}</view> 23 <view class='new_title'>{{list.name}}</view>
20 <view class='title_box'> 24 <view class='title_box'>
21 <view class='wz_box'> 25 <view class='wz_box'>
22 <text>{{list.create_time}}</text> 26 <text>{{list.create_time}}</text>
23 </view> 27 </view>
24 - <view class='word'>北京</view> 28 + <view class='word'>{{list.city}}</view>
25 </view> 29 </view>
26 </view> 30 </view>
27 </view> 31 </view>
28 - <!-- </navigator> -->  
29 -  
30 -  
31 -  
32 32
33 33
34 34
1 /* pages/Volunteer_group/Volunteer_group.wxss */ 1 /* pages/Volunteer_group/Volunteer_group.wxss */
2 -page{ 2 +page {
3 background-color: rgb(240, 240, 240); 3 background-color: rgb(240, 240, 240);
4 } 4 }
5 5
6 .group_name { 6 .group_name {
7 -padding: 0 32rpx; 7 + padding: 0 32rpx;
8 height: 88rpx; 8 height: 88rpx;
9 line-height: 88rpx; 9 line-height: 88rpx;
10 font-size: 34rpx; 10 font-size: 34rpx;
@@ -20,6 +20,13 @@ padding: 0 32rpx; @@ -20,6 +20,13 @@ padding: 0 32rpx;
20 margin-right: 16rpx; 20 margin-right: 16rpx;
21 } 21 }
22 22
  23 +.group_name .right {
  24 + width: 25rpx;
  25 + height: 30rpx;
  26 + margin-left: 16rpx;
  27 +
  28 +}
  29 +
23 /* */ 30 /* */
24 .new_box { 31 .new_box {
25 display: flex; 32 display: flex;
@@ -30,49 +37,63 @@ padding: 0 32rpx; @@ -30,49 +37,63 @@ padding: 0 32rpx;
30 margin-bottom: 24rpx; 37 margin-bottom: 24rpx;
31 font-size: 24rpx; 38 font-size: 24rpx;
32 flex-wrap: wrap; 39 flex-wrap: wrap;
33 - /* border-bottom: 2rpx solid #e6e6e6; */  
34 40
35 - } 41 +}
36 42
37 - .new_cell { 43 +.new_cell {
38 width: 48%; 44 width: 48%;
39 /* padding: 29rpx 0rpx; */ 45 /* padding: 29rpx 0rpx; */
40 - background-color: #ffffff; 46 + /* background-color: #ffffff; */
41 border-radius: 7px; 47 border-radius: 7px;
42 overflow: hidden; 48 overflow: hidden;
43 margin-top: 24rpx; 49 margin-top: 24rpx;
44 50
45 - } 51 +}
46 52
47 - .new_cell:nth-child(2n) {  
48 - /* margin: 0 0 0 10rpx;  
49 - margin-top: 24rpx; */  
50 - }  
51 53
52 - .new_cellmain { 54 +.new_cellmain {
53 overflow: hidden; 55 overflow: hidden;
54 - width: 336rpx; 56 + /* width: 336rpx; */
55 background-color: #ffffff; 57 background-color: #ffffff;
56 - border-radius: 7px;  
57 - } 58 +}
58 59
59 - .new_img { 60 +.new_img {
60 width: 336rpx; 61 width: 336rpx;
61 height: 220rpx; 62 height: 220rpx;
62 display: flex; 63 display: flex;
63 align-items: center; 64 align-items: center;
64 justify-content: center; 65 justify-content: center;
65 overflow: hidden; 66 overflow: hidden;
66 - } 67 + position: relative;
  68 +}
67 69
68 - .new_img image { 70 +.new_img image {
69 width: 100%; 71 width: 100%;
70 height: 100%; 72 height: 100%;
71 display: block; 73 display: block;
72 - }  
73 74
74 - .new_title { 75 +}
  76 +
  77 +.new_num {
75 padding: 0 16rpx; 78 padding: 0 16rpx;
  79 + width: 100%;
  80 + height: 46rpx;
  81 + color: #ffffff;
  82 + position: absolute;
  83 + left: 0;
  84 + bottom: 0;
  85 + display: flex;
  86 + justify-content: space-between;
  87 +
  88 +}
  89 +
  90 +.new_num view {
  91 + width: 100rpx;
  92 +
  93 +}
  94 +
  95 +.new_title {
  96 + padding: 0 20rpx;
76 height: 76rpx; 97 height: 76rpx;
77 overflow: hidden; 98 overflow: hidden;
78 text-overflow: ellipsis; 99 text-overflow: ellipsis;
@@ -83,17 +104,17 @@ padding: 0 32rpx; @@ -83,17 +104,17 @@ padding: 0 32rpx;
83 margin: 18rpx 0 13rpx 0; 104 margin: 18rpx 0 13rpx 0;
84 color: #292929; 105 color: #292929;
85 font-size: 28rpx; 106 font-size: 28rpx;
86 - } 107 +}
87 108
88 - .activity_title { 109 +.activity_title {
89 margin: 0 32rpx; 110 margin: 0 32rpx;
90 display: flex; 111 display: flex;
91 justify-content: space-between; 112 justify-content: space-between;
92 align-items: center; 113 align-items: center;
93 - } 114 +}
94 115
95 - .title_box {  
96 - padding: 0 16rpx; 116 +.title_box {
  117 + padding: 0 20rpx;
97 margin: 18rpx 0 13rpx 0; 118 margin: 18rpx 0 13rpx 0;
98 font-size: 24rpx; 119 font-size: 24rpx;
99 font-family: PingFang SC; 120 font-family: PingFang SC;
@@ -102,19 +123,19 @@ padding: 0 32rpx; @@ -102,19 +123,19 @@ padding: 0 32rpx;
102 display: flex; 123 display: flex;
103 align-items: center; 124 align-items: center;
104 justify-content: space-between; 125 justify-content: space-between;
105 - } 126 +}
106 127
107 - .wz_box { 128 +.wz_box {
108 overflow: hidden; 129 overflow: hidden;
109 text-overflow: ellipsis; 130 text-overflow: ellipsis;
110 white-space: nowrap; 131 white-space: nowrap;
111 - } 132 +}
112 133
113 - .title_box .word { 134 +.title_box .word {
114 max-width: 200rpx; 135 max-width: 200rpx;
115 color: #FF976A; 136 color: #FF976A;
116 font-size: 24rpx; 137 font-size: 24rpx;
117 overflow: hidden; 138 overflow: hidden;
118 text-overflow: ellipsis; 139 text-overflow: ellipsis;
119 white-space: nowrap; 140 white-space: nowrap;
120 - }  
  141 +}
@@ -2,9 +2,7 @@ @@ -2,9 +2,7 @@
2 const app = getApp(); 2 const app = getApp();
3 Page({ 3 Page({
4 4
5 - /**  
6 - * 页面的初始数据  
7 - */ 5 +
8 data: { 6 data: {
9 id: '', 7 id: '',
10 list: '' 8 list: ''
@@ -5,7 +5,9 @@ Page({ @@ -5,7 +5,9 @@ Page({
5 data: { 5 data: {
6 id: '', 6 id: '',
7 list: '', 7 list: '',
8 - answers:[] 8 + answers:[],
  9 + finaAnswer:[],
  10 + showAnswer: false
9 }, 11 },
10 12
11 onLoad: function (options) { 13 onLoad: function (options) {
@@ -36,8 +38,8 @@ Page({ @@ -36,8 +38,8 @@ Page({
36 app.post(url, params, head).then((res) => { 38 app.post(url, params, head).then((res) => {
37 console.log(res) 39 console.log(res)
38 that.setData({ 40 that.setData({
39 - list: res  
40 - 41 + list: res,
  42 + tempList:JSON.parse(JSON.stringify(res))
41 }) 43 })
42 }).catch((err) => { 44 }).catch((err) => {
43 45
@@ -47,10 +49,16 @@ Page({ @@ -47,10 +49,16 @@ Page({
47 radioChange(e){ 49 radioChange(e){
48 let tempAnswer = e.detail.value.split(','); 50 let tempAnswer = e.detail.value.split(',');
49 this.data.answers[tempAnswer[1]] = tempAnswer[0]; 51 this.data.answers[tempAnswer[1]] = tempAnswer[0];
  52 + this.data.finaAnswer[tempAnswer[1]]={
  53 + key: tempAnswer[0],
  54 + answer: tempAnswer[1]
  55 + }
  56 + this.data.list[tempAnswer[1]].choose = tempAnswer[2]
50 this.setData({ 57 this.setData({
51 - answers: this.data.answers 58 + answers: this.data.answers,
  59 + finaAnswer:this.data.finaAnswer,
  60 + list:this.data.list
52 }) 61 })
53 -  
54 }, 62 },
55 63
56 // 确认 64 // 确认
@@ -65,7 +73,9 @@ Page({ @@ -65,7 +73,9 @@ Page({
65 class_id: that.data.id, 73 class_id: that.data.id,
66 } 74 }
67 app.post(url, params, head).then((res) => { 75 app.post(url, params, head).then((res) => {
68 - if (res.code == 40000) { 76 +
  77 + if (res.code == '40000') {
  78 + let answer = res
69 wx.showModal({ 79 wx.showModal({
70 title: '提示', 80 title: '提示',
71 content: '很遗憾你没有获得学时', 81 content: '很遗憾你没有获得学时',
@@ -73,16 +83,22 @@ Page({ @@ -73,16 +83,22 @@ Page({
73 cancelText: '查看答案', 83 cancelText: '查看答案',
74 success(res) { 84 success(res) {
75 if (res.confirm) { 85 if (res.confirm) {
76 -  
77 - wx.navigateTo({  
78 - url: '/pages/getStudycontent/answer/answer', 86 + wx.redirectTo({
  87 + url: '/pages/getStudycontent/answer/answer?id='+that.data.id,
79 }) 88 })
80 - 89 + // let tempList = JSON.stringify(that.data.tempList)
  90 + // that.setData({
  91 + // showAnswer: false,
  92 + // // list: JSON.parse(tempList)
  93 + // })
81 console.log('用户点击确定') 94 console.log('用户点击确定')
82 } else if (res.cancel) { 95 } else if (res.cancel) {
83 96
84 - wx.navigateTo({  
85 - url: '/pages/getStudycontent/answer/answer', 97 + // wx.navigateTo({
  98 + // url: '/pages/getStudycontent/answer/answer',
  99 + // })
  100 + that.setData({
  101 + showAnswer: true
86 }) 102 })
87 103
88 console.log('用户点击取消') 104 console.log('用户点击取消')
@@ -104,7 +120,7 @@ Page({ @@ -104,7 +120,7 @@ Page({
104 120
105 121
106 }).catch((err) => { 122 }).catch((err) => {
107 - 123 + console.log(err)
108 }) 124 })
109 125
110 126
1 <view class="answer" wx:for="{{list}}" wx:for-index="index"> 1 <view class="answer" wx:for="{{list}}" wx:for-index="index">
2 - <view class="answer_left" wx:if="{{item.id<9}}" >0{{item.id}}</view>  
3 - <view class="answer_left" wx:else >{{item.id}}</view> 2 + <view class="answer_left" wx:if="{{item.id<9}}">0{{item.id}}</view>
  3 + <view class="answer_left" wx:else>{{item.id}}</view>
4 <view class="answer_right"> 4 <view class="answer_right">
5 <view class="answer_question">{{item.title}}</view> 5 <view class="answer_question">{{item.title}}</view>
6 <radio-group bindchange="radioChange"> 6 <radio-group bindchange="radioChange">
7 <view class="flexs" wx:for="{{item.options_array}}" wx:for-index="idx" wx:for-item="second"> 7 <view class="flexs" wx:for="{{item.options_array}}" wx:for-index="idx" wx:for-item="second">
8 <view class="answer_answer"> 8 <view class="answer_answer">
9 - <radio value="{{second+','+index}}" checked='' >{{second}}</radio> 9 + <radio value="{{second+','+index+','+idx}}" checked=''>{{second}}</radio>
  10 + <block wx:if="{{showAnswer}}">
  11 + {{answer[index]}}
  12 + <image src="/imgs/zhengque-5.png" wx:if="{{item.answer==idx}}"></image>
  13 + <image src="/imgs/cuowu-3.png" wx:if='{{item.choose==idx}}'></image>
  14 + </block>
10 </view> 15 </view>
11 - <!-- <view class="answer_answer">  
12 - <radio>有一颗高尚的心</radio> 16 +
13 </view> 17 </view>
14 - <view class="answer_answer">  
15 - <radio>有一颗高尚的心</radio> 18 + </radio-group>
  19 +
16 </view> 20 </view>
  21 +</view>
  22 +<view class="shengqin">
  23 + <button bindtap="getcomfirm">确认</button>
  24 +</view>
  25 +
  26 +<!-- 答案 -->
  27 +<!-- <view class="answer" wx:for="{{list}}" wx:for-index="index">
  28 + <view class="answer_left" wx:if="{{item.id<9}}">0{{item.id}}</view>
  29 + <view class="answer_left" wx:else>{{item.id}}</view>
  30 + <view class="answer_right">
  31 + <view class="answer_question">{{item.title}}</view>
  32 + <radio-group bindchange="radioChange">
  33 + <view class="flexs" wx:for="{{item.options_array}}" wx:for-index="idx" wx:for-item="second">
17 <view class="answer_answer"> 34 <view class="answer_answer">
18 - <radio>有一颗高尚的心</radio>  
19 - </view> --> 35 + <radio value="{{second+','+index}}" checked='{{item.choose}}'>{{second}}</radio>
  36 +
  37 + </view>
  38 +
20 </view> 39 </view>
21 </radio-group> 40 </radio-group>
22 41
23 </view> 42 </view>
24 -</view> 43 +</view> -->
25 <view class="shengqin"> 44 <view class="shengqin">
26 - <button bindtap="getcomfirm" >确认</button> 45 + <button bindtap="getcomfirm">确认</button>
27 </view> 46 </view>
@@ -29,6 +29,8 @@ page { @@ -29,6 +29,8 @@ page {
29 29
30 .answer_answer { 30 .answer_answer {
31 margin-top: 36rpx; 31 margin-top: 36rpx;
  32 + display: flex;
  33 + align-items: center;
32 } 34 }
33 .flexs{ 35 .flexs{
34 36
@@ -36,6 +38,11 @@ page { @@ -36,6 +38,11 @@ page {
36 flex-direction: column; 38 flex-direction: column;
37 39
38 } 40 }
  41 +.flexs image{
  42 + width: 28rpx;
  43 + height: 28rpx;
  44 + margin-left: 22rpx;
  45 +}
39 /*单选框样式修改 */ 46 /*单选框样式修改 */
40 47
41 /* 选中后的 背景样式 （红色背景 无边框 可根据UI需求自己修改） */ 48 /* 选中后的 背景样式 （红色背景 无边框 可根据UI需求自己修改） */
@@ -8,8 +8,8 @@ @@ -8,8 +8,8 @@
8 </swiper> 8 </swiper>
9 <!-- <view class='vold_line'></view> --> 9 <!-- <view class='vold_line'></view> -->
10 <!-- 菜单 --> 10 <!-- 菜单 -->
11 -<view class="home_menu displayB ">  
12 - <view class="home_time" bindtap="gotoNav" data-id="{{item.id}}" data-path="{{item.path}}" wx:for="{{navList}}" wx:key="id"> 11 +<view class="home_menu ">
  12 + <view class="home_time" bindtap="gotoNav" data-id="{{item.id}}" data-path="{{item.path}}" wx:for="{{navList}}" wx:key="id" >
13 <view> 13 <view>
14 <image src="{{item.icon}}" /> 14 <image src="{{item.icon}}" />
15 </view> 15 </view>
@@ -14,13 +14,16 @@ page { @@ -14,13 +14,16 @@ page {
14 14
15 /* 菜单 */ 15 /* 菜单 */
16 .home_menu { 16 .home_menu {
17 - padding-left: 70rpx;  
18 - margin-top: 40rpx; 17 + width: 608rpx;
  18 + margin: 40rpx auto;
  19 + display: flex;
19 flex-wrap: wrap; 20 flex-wrap: wrap;
20 - max-width: 605rpx; 21 + justify-content: space-between;
21 } 22 }
22 23
  24 +
23 .home_time { 25 .home_time {
  26 + padding-left: 20rpx;
24 width: 96rpx; 27 width: 96rpx;
25 font-size: 22rpx; 28 font-size: 22rpx;
26 text-align: center; 29 text-align: center;
@@ -23,6 +23,14 @@ Page({ @@ -23,6 +23,14 @@ Page({
23 23
24 }) 24 })
25 }, 25 },
  26 + // 我的个人信息
  27 + getmy() {
  28 + wx.navigateTo({
  29 + url: '/pages/mydetail/mydetail',
  30 + })
  31 +
  32 +
  33 + },
26 // 管理员 34 // 管理员
27 goamdin(e) { 35 goamdin(e) {
28 wx.navigateTo({ 36 wx.navigateTo({
@@ -66,8 +74,8 @@ Page({ @@ -66,8 +74,8 @@ Page({
66 74
67 }) 75 })
68 }, 76 },
69 -// 电子证件  
70 - getCertificate(){ 77 + // 电子证件
  78 + getCertificate() {
71 wx.navigateTo({ 79 wx.navigateTo({
72 url: '/pages/mycertificate/mycertificate', 80 url: '/pages/mycertificate/mycertificate',
73 }) 81 })
@@ -76,7 +84,7 @@ Page({ @@ -76,7 +84,7 @@ Page({
76 // 我的地址 84 // 我的地址
77 getmyAdd() { 85 getmyAdd() {
78 wx.navigateTo({ 86 wx.navigateTo({
79 - url: '/pages/myaddress/myaddress?id='+this.data.datalist.id, 87 + url: '/pages/myaddress/myaddress?id=' + this.data.datalist.id,
80 }) 88 })
81 89
82 }, 90 },
1 <view class='my_head'> 1 <view class='my_head'>
2 <image class="my_headimg" src='/imgs/card.png'></image> 2 <image class="my_headimg" src='/imgs/card.png'></image>
3 - <view class='my_headitem'> 3 + <view class='my_headitem' bindtap="getmy">
4 <view class="my_headitemtop"> 4 <view class="my_headitemtop">
5 <view class='my_headitemimg'> 5 <view class='my_headitemimg'>
6 <image src="{{datalist.avatar?datalist.avatar:'/imgs/icon_59.png'}}"></image> 6 <image src="{{datalist.avatar?datalist.avatar:'/imgs/icon_59.png'}}"></image>
@@ -27,11 +27,11 @@ @@ -27,11 +27,11 @@
27 </view> 27 </view>
28 <view class="my_activebox"> 28 <view class="my_activebox">
29 <view class="my_active"> 29 <view class="my_active">
30 - <view>300</view> 30 + <view>{{datalist.activity_num}}</view>
31 <view>活动</view> 31 <view>活动</view>
32 </view> 32 </view>
33 <view class="my_active"> 33 <view class="my_active">
34 - <view>120</view> 34 + <view>{{datalist.group_num}}</view>
35 <view>团队</view> 35 <view>团队</view>
36 </view> 36 </view>
37 <view class="my_active"> 37 <view class="my_active">
@@ -79,25 +79,22 @@ @@ -79,25 +79,22 @@
79 79
80 <!-- 完成的活动 --> 80 <!-- 完成的活动 -->
81 <view wx:elif="{{nav==3}}"> 81 <view wx:elif="{{nav==3}}">
82 - <view class="myactive_wrap"> 82 + <view class="myactive_wrap" wx:for="{{list}}">
83 <view class="myactive_time"> 83 <view class="myactive_time">
84 - <image src="/imgs/shijian-19.png"></image>2020-06-08 8:00-12:00 84 + <image src="/imgs/shijian-19.png"></image>{{item.date}}
  85 + {{ item.start_clock_time}}-{{item.end_clock_time}}
  86 +
85 </view> 87 </view>
86 <view class="myactive_list"> 88 <view class="myactive_list">
87 - <image src="/imgs/active.png"></image> 89 + <image src="{{item.activity.thumbnail}}"></image>
88 <view class="myactive_name"> 90 <view class="myactive_name">
89 - <view>[福建省]白求恩志愿者招募-志愿者</view> 91 + <view>{{item.activity_name}}</view>
90 <view class="myactive_gps"> 92 <view class="myactive_gps">
91 <image src="/imgs/didian-14.png"></image> 获得5小时工时 93 <image src="/imgs/didian-14.png"></image> 获得5小时工时
92 </view> 94 </view>
93 </view> 95 </view>
94 </view> 96 </view>
95 -  
96 </view> 97 </view>
97 -  
98 -  
99 -  
100 -  
101 </view> 98 </view>
102 99
103 100
1 { 1 {
2 - "usingComponents": {} 2 + "usingComponents": {},
  3 + "navigationBarTitleText": "上岗打卡"
3 } 4 }
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <view>下岗打卡{{list.end_clock_time}}</view> 19 <view>下岗打卡{{list.end_clock_time}}</view>
20 <view class="state" wx:if="{{list.status==0}}">未打卡</view> 20 <view class="state" wx:if="{{list.status==0}}">未打卡</view>
21 <view class="state" wx:if="{{list.status==1}}">已开始</view> 21 <view class="state" wx:if="{{list.status==1}}">已开始</view>
22 - <view class="state" wx:if="{{list.status==2}}">完成打开</view> 22 + <view class="state" wx:if="{{list.status==2}}">完成打卡</view>
23 <view class="state" wx:if="{{list.status==3}}">未完成</view> 23 <view class="state" wx:if="{{list.status==3}}">未完成</view>
24 </view> 24 </view>
25 </view> 25 </view>
@@ -27,6 +27,16 @@ @@ -27,6 +27,16 @@
27 <view>上岗打卡</view> 27 <view>上岗打卡</view>
28 <view>12:00</view> 28 <view>12:00</view>
29 </view> 29 </view>
  30 + <view class="myactivity_start" bindtap="getpunch">
  31 + <view>下岗打卡</view>
  32 + <view>12:00</view>
  33 + </view>
  34 +
  35 + <view class="myactivity_end" >
  36 + <image src="/imgs/wancheng.png"></image>
  37 + <view>已完成打卡</view>
  38 + <view>感谢您参加本次公益活动 爱上一盏灯，照亮你我他</view>
  39 + </view>
30 40
31 <view></view> 41 <view></view>
32 42
@@ -53,7 +53,32 @@ page { @@ -53,7 +53,32 @@ page {
53 53
54 .myactivity_start :nth-child(1) { 54 .myactivity_start :nth-child(1) {
55 font-size: 40rpx; 55 font-size: 40rpx;
  56 +}
  57 +
  58 +.myactivity_end {
  59 +
  60 + text-align: center;
  61 +}
  62 +
  63 +.myactivity_end image {
  64 + margin-top: 56rpx;
  65 + width: 290rpx;
  66 + height: 290rpx
  67 +}
  68 +
  69 +.myactivity_end :nth-child(2) {
  70 + margin-top: 38rpx;
  71 + font-size: 40rpx;
  72 + color: #11A94C;
  73 +}
56 74
  75 +.myactivity_end :nth-child(3) {
  76 + margin-top: 16rpx;
  77 + width: 322rpx;
  78 + font-size: 28rpx;
  79 + color: #11A94C;
  80 + margin: auto;
  81 + margin-bottom: 182rpx;
57 } 82 }
58 83
59 /* 提示 */ 84 /* 提示 */
@@ -4,87 +4,143 @@ Page({ @@ -4,87 +4,143 @@ Page({
4 4
5 data: { 5 data: {
6 textareaNum: 0, 6 textareaNum: 0,
7 - // join_reason: '', //加入理由  
8 - // id: '',  
9 - // wechat: '', //微信号  
10 - // move_phone: '' //手机号 7 + name: '',
  8 + job: '',
  9 + data: '',
  10 + time: '',
  11 + join_reason: '', //加入理由
  12 +
11 }, 13 },
12 14
13 15
14 -// // 微信号  
15 -// setwechat(e) {  
16 -// console.log(e)  
17 -// this.setData({  
18 -// wechat: e.detail.value  
19 -// }) 16 + //姓名
  17 + setname(e) {
  18 + console.log(e)
  19 + this.setData({
  20 + name: e.detail.value
  21 + })
  22 +
  23 + },
  24 + // 工作内容
  25 + setmove_job(e) {
  26 + console.log(e)
  27 +
  28 + this.setData({
  29 + job: e.detail.value
  30 + })
  31 + },
  32 + // 日期
  33 + setmove_data(e) {
  34 + console.log(e)
20 35
21 -// },  
22 -// // 手机号码  
23 -// setmove_phone(e) {  
24 -// this.setData({  
25 -// move_phone: e.detail.value  
26 -// })  
27 -// }, 36 + this.setData({
  37 + data: e.detail.value
  38 + })
  39 +
  40 + },
  41 +
  42 + // 参加时间
  43 + setmove_time(e) {
  44 + console.log(e)
  45 +
  46 + this.setData({
  47 + time: e.detail.value
  48 + })
28 49
  50 + },
29 //汇报 51 //汇报
30 textareaIn: function (e) { 52 textareaIn: function (e) {
  53 + console.log(e)
  54 +
31 this.setData({ 55 this.setData({
32 textareaNum: e.detail.cursor, 56 textareaNum: e.detail.cursor,
33 join_reason: e.detail.value 57 join_reason: e.detail.value
34 58
35 }) 59 })
36 }, 60 },
37 -// submit(e) {  
38 -// let that = this; 61 + // 图片上传
  62 + ChooseImage: function () {
  63 + var that = this
  64 + var Count = 9
  65 + wx.chooseImage({
  66 + count: Count,
  67 + success: function (res) {
  68 + console.log(res.tempFilePaths)
  69 + var i = 0;
  70 + var imageList = {};
  71 + for (i; i <= res.tempFilePaths.lengh; i++) {
  72 +
  73 + }
  74 + that.setData({
  75 + imageList: res.tempFilePaths
  76 + })
  77 + }
  78 + })
  79 + },
  80 + deleteImg: function (e) {
  81 + console.log(e.currentTarget.dataset.index)
  82 + this.data.imageList.splice(e.currentTarget.dataset.index, 1)
  83 + this.setData({
  84 + imageList: this.data.imageList
  85 + })
  86 + },
  87 +
  88 +
  89 +
  90 +
  91 +
  92 + // submit(e) {
  93 + // let that = this;
39 94
40 -// let url = '/index/second/applyTeam';  
41 -// let head = {  
42 -// 'XX-Token': wx.getStorageSync('token')  
43 -// }  
44 -// let params = {  
45 -// wx_id: that.data.wechat,  
46 -// mobile: that.data.move_phone,  
47 -// join_reason: that.data.join_reason,  
48 -// team_id: that.data.id  
49 -// } 95 + // let url = '/index/second/applyTeam';
  96 + // let head = {
  97 + // 'XX-Token': wx.getStorageSync('token')
  98 + // }
  99 + // let params = {
  100 + // name: that.data.name,
  101 + // job: that.data.job,
  102 + // data: that.data.data,
  103 + // time: that.data.time,
  104 + // join_reason: that.data.join_reason
  105 + // }
50 106
51 -// app.post(url, params, head).then((res) => { 107 + // app.post(url, params, head).then((res) => {
52 108
53 -// wx.showModal({  
54 -// title: '提示',  
55 -// content: '请仔细核对信息，确认无误！',  
56 -// confirmText: '确认提交',  
57 -// cancelText: '我再想想',  
58 -// success(res) {  
59 -// if (res.confirm) { 109 + // wx.showModal({
  110 + // title: '提示',
  111 + // content: '请仔细核对信息，确认无误！',
  112 + // confirmText: '确认提交',
  113 + // cancelText: '我再想想',
  114 + // success(res) {
  115 + // if (res.confirm) {
60 116
61 -// wx.showToast({  
62 -// title: '提交成功,等待审核',  
63 -// mask: true,  
64 -// icon: 'none',  
65 -// // duration: 2000  
66 -// })  
67 -// setTimeout(function () {  
68 -// wx.switchTab({  
69 -// url: '/pages/index/index'  
70 -// })  
71 -// }, 1000)  
72 -// console.log('用户点击确定')  
73 -// } else if (res.cancel) { 117 + // wx.showToast({
  118 + // title: '提交成功,等待审核',
  119 + // mask: true,
  120 + // icon: 'none',
  121 + // // duration: 2000
  122 + // })
  123 + // setTimeout(function () {
  124 + // wx.navigateBack({
  125 + // delta: 0,
  126 + // })
  127 + // }, 1000)
  128 + // console.log('用户点击确定')
  129 + // } else if (res.cancel) {
74 130
75 -// console.log('用户点击取消')  
76 -// }  
77 -// }  
78 -// }) 131 + // console.log('用户点击取消')
  132 + // }
  133 + // }
  134 + // })
79 135
80 136
81 -// }).catch(() => {}) 137 + // }).catch(() => {})
82 138
83 139
84 140
85 141
86 142
87 -// }, 143 + // },
88 144
89 145
90 146
1 -<!--微信号 --> 1 +<!--姓名 -->
2 <view class='apply_item'> 2 <view class='apply_item'>
3 <view>姓名</view> 3 <view>姓名</view>
4 <view class='apply_item_input'> 4 <view class='apply_item_input'>
5 - <input placeholder='请输入姓名' placeholder-class='input_p' bindinput='setwechat' value='{{wechat}}' 5 + <input placeholder='请输入姓名' placeholder-class='input_p' bindinput='setname' value='{{name}}'
6 disabled="{{page_type}}"></input> 6 disabled="{{page_type}}"></input>
7 </view> 7 </view>
8 </view> 8 </view>
9 <view class="line"> 9 <view class="line">
10 <view></view> 10 <view></view>
11 </view> 11 </view>
12 -<!--手机号码 --> 12 +<!--工作内容 -->
13 <view class='apply_item'> 13 <view class='apply_item'>
14 <view>工作内容</view> 14 <view>工作内容</view>
15 <view class='apply_item_input'> 15 <view class='apply_item_input'>
16 - <input placeholder='请输入工作内容' placeholder-class='input_p' bindinput='setmove_phone'  
17 - value='{{move_phone}}' disabled="{{page_type}}"></input> 16 + <input placeholder='请输入工作内容' placeholder-class='input_p' bindinput='setmove_job' value='{{job}}'
  17 + disabled="{{page_type}}"></input>
18 </view> 18 </view>
19 </view> 19 </view>
20 <view class="line"> 20 <view class="line">
21 <view></view> 21 <view></view>
22 </view> 22 </view>
  23 +<!--参加日期 -->
23 <view class='apply_item'> 24 <view class='apply_item'>
24 <view>参加日期</view> 25 <view>参加日期</view>
25 <view class='apply_item_input'> 26 <view class='apply_item_input'>
26 - <input placeholder='请输入参加日期' placeholder-class='input_p' bindinput='setmove_phone'  
27 - value='{{move_phone}}' disabled="{{page_type}}" maxlength="11"></input> 27 + <input placeholder='请输入参加日期' placeholder-class='input_p' bindinput='setmove_data' value='{{data}}'
  28 + disabled="{{page_type}}"></input>
28 </view> 29 </view>
29 </view> 30 </view>
30 <view class="line"> 31 <view class="line">
31 <view></view> 32 <view></view>
32 </view> 33 </view>
  34 +<!-- 参加时间 -->
33 <view class='apply_item'> 35 <view class='apply_item'>
34 <view>参加时间</view> 36 <view>参加时间</view>
35 <view class='apply_item_input'> 37 <view class='apply_item_input'>
36 - <input placeholder='请输入参加时间' placeholder-class='input_p' bindinput='setmove_phone'  
37 - value='{{move_phone}}' disabled="{{page_type}}" maxlength="11"></input> 38 + <input placeholder='请输入参加时间' placeholder-class='input_p' bindinput='setmove_time' value='{{time}}'
  39 + disabled="{{page_type}}"></input>
38 </view> 40 </view>
39 </view> 41 </view>
40 42
41 <view class="listforms"></view> 43 <view class="listforms"></view>
42 <!-- 感想汇报 --> 44 <!-- 感想汇报 -->
43 <view class="doc-listform"> 45 <view class="doc-listform">
  46 + <view>图片上传</view>
  47 +
  48 + <view class="doc-Images">
  49 + <view wx:for="{{imageList}}" wx:key="{{item}}" class="doc-ImageList">
  50 + <image src="{{item}}">
  51 + <text data-index='{{index}}' class="iconfont icon-close" style="color:rgba(0,0,0,0.3)"
  52 + bindtap="deleteImg"></text>
  53 + </image>
  54 + </view>
  55 + <button bindtap="ChooseImage" class="chooseImage">+</button>
  56 + </view>
  57 +
  58 +
  59 +
44 <view> 感想汇报</view> 60 <view> 感想汇报</view>
45 - <textarea show-confirm-bar="" placeholder="请输入内容，内容最多为500字" maxlength="500" bindinput="textareaIn" value='{{join_reason}}'> 61 + <textarea show-confirm-bar="" placeholder="请输入内容，内容最多为500字" maxlength="500" bindinput="textareaIn"
  62 + value='{{join_reason}}'>
46 <view style="position:absolute;bottom:20rpx;right:0rpx;color:gray;"><text style="color:#000;">{{textareaNum}}</text> / 500</view> 63 <view style="position:absolute;bottom:20rpx;right:0rpx;color:gray;"><text style="color:#000;">{{textareaNum}}</text> / 500</view>
47 </textarea> 64 </textarea>
48 </view> 65 </view>
@@ -57,22 +57,27 @@ @@ -57,22 +57,27 @@
57 57
58 /* */ 58 /* */
59 .doc-listform { 59 .doc-listform {
60 - padding: 0 32rpx;  
61 - padding-top: 16rpx; 60 + margin-bottom: 100rpx;
  61 + padding: 40rpx 32rpx;
  62 + font-size: 28rpx;
62 background-color: #ffffff; 63 background-color: #ffffff;
63 position: relative; 64 position: relative;
64 65
65 } 66 }
66 -.listforms{ 67 +
  68 +.listforms {
67 height: 15rpx; 69 height: 15rpx;
68 background-color: #eeeeee; 70 background-color: #eeeeee;
69 } 71 }
  72 +
70 textarea { 73 textarea {
  74 + padding: 20rpx;
71 font-size: 28rpx; 75 font-size: 28rpx;
72 margin-top: 20rpx; 76 margin-top: 20rpx;
73 width: auto; 77 width: auto;
74 border: 2rpx solid #eeeeee; 78 border: 2rpx solid #eeeeee;
75 } 79 }
  80 +
76 /* 提示 */ 81 /* 提示 */
77 .tishi_wrap { 82 .tishi_wrap {
78 padding: 24rpx 36rpx; 83 padding: 24rpx 36rpx;
@@ -103,6 +108,49 @@ textarea { @@ -103,6 +108,49 @@ textarea {
103 108
104 } 109 }
105 110
  111 +/* 图片 */
  112 +.doc-Images {
  113 + width: 100%;
  114 +}
  115 +
  116 +.chooseImage {
  117 + width: 200rpx;
  118 + height: 200rpx;
  119 + line-height: 200rpx;
  120 + text-align: center;
  121 + font-size: 80rpx;
  122 + padding: 0px !important;
  123 + margin: 20rpx 0rpx !important;
  124 + color: #ddd;
  125 + border: 1px solid #eeeeee;
  126 + display: inline-block !important;
  127 + border-radius: 0px
  128 +}
  129 +
  130 +.chooseImage::after {
  131 + border: none;
  132 +}
  133 +
  134 +.doc-ImageList {
  135 + height: 200rpx;
  136 + margin: 0 25rpx;
  137 + display: inline-block;
  138 +}
  139 +
  140 +.doc-ImageList image {
  141 + width: 200rpx;
  142 + height: 200rpx;
  143 + position: relative;
  144 + z-index: 4px;
  145 +}
  146 +
  147 +.doc-ImageList image .iconfont {
  148 + position: absolute;
  149 + z-index: 5px;
  150 + right: 0rpx;
  151 + top: 0rpx;
  152 +}
  153 +
106 .shengqin { 154 .shengqin {
107 height: 122rpx; 155 height: 122rpx;
108 background-color: #ffffff; 156 background-color: #ffffff;
@@ -92,6 +92,18 @@ Page({ @@ -92,6 +92,18 @@ Page({
92 }) 92 })
93 93
94 }, 94 },
  95 + // 选择地址
  96 + getchoose(e) {
  97 + console.log(e)
  98 + let index = e.currentTarget.dataset.index;
  99 + wx.setStorageSync('tempAdress', this.data.list[index])
  100 + wx.navigateBack({
  101 + delta: 0,
  102 + })
  103 +
  104 +
  105 + },
  106 +
95 107
96 /** 108 /**
97 * 生命周期函数--监听页面加载 109 * 生命周期函数--监听页面加载
1 -<view class="itemAddress displayB" wx:for="{{list}}" >  
2 - <view class="add_left" > 1 +<view class="itemAddress displayB" wx:for="{{list}}" data-item="{{list}}">
  2 + <view class="add_left" bindtap="getchoose" data-index='{{index}}'>
3 <view class="add_user display"> 3 <view class="add_user display">
4 <!-- <view class="user_name">{{item.name}}</view> 4 <!-- <view class="user_name">{{item.name}}</view>
5 <view class="user_phone">{{item.phone}}</view> 5 <view class="user_phone">{{item.phone}}</view>
1 -// pages/mycertificate/mycertificate.js 1 +const app =getApp()
2 Page({ 2 Page({
3 3
4 /** 4 /**
5 * 页面的初始数据 5 * 页面的初始数据
6 */ 6 */
7 data: { 7 data: {
8 - 8 + list: '',
9 }, 9 },
10 10
11 - /**  
12 - * 生命周期函数--监听页面加载  
13 - */ 11 +
14 onLoad: function (options) { 12 onLoad: function (options) {
15 13
16 }, 14 },
17 15
18 - /**  
19 - * 生命周期函数--监听页面初次渲染完成  
20 - */ 16 +
21 onReady: function () { 17 onReady: function () {
22 18
23 }, 19 },
24 20
25 - /**  
26 - * 生命周期函数--监听页面显示  
27 - */ 21 +
28 onShow: function () { 22 onShow: function () {
29 23
  24 + let that = this
  25 + that.getactive()
  26 +
30 }, 27 },
31 28
  29 + getactive() {
  30 + let that = this;
  31 + let url = '/index/second/zhengJianInfo ';
  32 + let head = {
  33 + 'XX-Token': wx.getStorageSync('token')
  34 + }
  35 +
  36 + app.post(url, '', head).then((res) => {
  37 +
  38 + console.log(res)
  39 +
  40 + this.setData({
  41 +
  42 + list: res
  43 + })
  44 + })
  45 + },
  46 +
  47 +
  48 +
  49 +
  50 +
  51 +
  52 +
  53 +
  54 +
  55 +
  56 +
  57 +
32 /** 58 /**
33 * 生命周期函数--监听页面隐藏 59 * 生命周期函数--监听页面隐藏
34 */ 60 */
@@ -3,16 +3,16 @@ @@ -3,16 +3,16 @@
3 <image src="/imgs/dianzizhengjian1.png"></image> 3 <image src="/imgs/dianzizhengjian1.png"></image>
4 <view class="mycertificate_text"> 4 <view class="mycertificate_text">
5 <view class="goods_left"> 5 <view class="goods_left">
6 - <view>姓名：张三</view>  
7 - <view>身份：医生</view>  
8 - <view>编号：007556562</view>  
9 - <view>学时：100</view> 6 + <view>姓名：{{list.name}}</view>
  7 + <view>身份：{{list.status}}</view>
  8 + <view>编号：{{list.user_num}}</view>
  9 + <view>学时：{{list.work_time}}</view>
10 </view> 10 </view>
11 - <image class="One_inch_photos" src="/imgs/u=2815405920,207947254&fm=26&gp=0.png"></image> 11 + <image class="One_inch_photos" src="{{list.avatar}}"></image>
12 </view> 12 </view>
13 13
14 </view> 14 </view>
15 -<view class="mycertificate"> 15 +<view class="mycertificate distance">
16 <image src="/imgs/dianzizhengjian.png"></image> 16 <image src="/imgs/dianzizhengjian.png"></image>
17 <view class="mycertificate_text"> 17 <view class="mycertificate_text">
18 <view class="goods_lefts"> 18 <view class="goods_lefts">
@@ -35,5 +35,5 @@ @@ -35,5 +35,5 @@
35 </view> 35 </view>
36 36
37 <view class="btn"> 37 <view class="btn">
38 - <button hover-class="none" > 将电子证件生成图片</button> 38 + <button hover-class="none"> 将电子证件生成图片</button>
39 </view> 39 </view>
@@ -7,6 +7,10 @@ page { @@ -7,6 +7,10 @@ page {
7 padding: 0 32rpx; 7 padding: 0 32rpx;
8 padding-top: 32rpx; 8 padding-top: 32rpx;
9 position: relative; 9 position: relative;
  10 +
  11 +}
  12 +.distance{
  13 +margin-bottom: 142rpx;
10 } 14 }
11 15
12 image { 16 image {
@@ -91,11 +95,15 @@ image { @@ -91,11 +95,15 @@ image {
91 } 95 }
92 96
93 .btn { 97 .btn {
94 - margin-top: 80rpx; 98 +
95 height: 122rpx; 99 height: 122rpx;
96 background-color: #ffffff; 100 background-color: #ffffff;
97 display: flex; 101 display: flex;
98 align-items: center; 102 align-items: center;
  103 + position: fixed;
  104 + left: 0;
  105 + right: 0;
  106 + bottom: 0;
99 } 107 }
100 108
101 button { 109 button {
  1 +const app = getApp();
  2 +Page({
  3 +
  4 +
  5 + data: {
  6 + name: '',
  7 +
  8 + },
  9 +
  10 +
  11 + //姓名
  12 + setname(e) {
  13 + console.log(e)
  14 + this.setData({
  15 + name: e.detail.value
  16 + })
  17 +
  18 + },
  19 +
  20 +
  21 +
  22 +
  23 +
  24 +
  25 +
  26 +
  27 + // submit(e) {
  28 + // let that = this;
  29 +
  30 + // let url = '/index/second/applyTeam';
  31 + // let head = {
  32 + // 'XX-Token': wx.getStorageSync('token')
  33 + // }
  34 + // let params = {
  35 + // name: that.data.name,
  36 + // job: that.data.job,
  37 + // data: that.data.data,
  38 + // time: that.data.time,
  39 + // join_reason: that.data.join_reason
  40 + // }
  41 +
  42 + // app.post(url, params, head).then((res) => {
  43 +
  44 + // wx.showModal({
  45 + // title: '提示',
  46 + // content: '请仔细核对信息，确认无误！',
  47 + // confirmText: '确认提交',
  48 + // cancelText: '我再想想',
  49 + // success(res) {
  50 + // if (res.confirm) {
  51 +
  52 + // wx.showToast({
  53 + // title: '提交成功,等待审核',
  54 + // mask: true,
  55 + // icon: 'none',
  56 + // // duration: 2000
  57 + // })
  58 + // setTimeout(function () {
  59 + // wx.navigateBack({
  60 + // delta: 0,
  61 + // })
  62 + // }, 1000)
  63 + // console.log('用户点击确定')
  64 + // } else if (res.cancel) {
  65 +
  66 + // console.log('用户点击取消')
  67 + // }
  68 + // }
  69 + // })
  70 +
  71 +
  72 + // }).catch(() => {})
  73 +
  74 +
  75 +
  76 +
  77 +
  78 + // },
  79 +
  80 +
  81 +
  82 +
  83 + /**
  84 + * 生命周期函数--监听页面加载
  85 + */
  86 + onLoad: function (options) {
  87 + // console.log(options)
  88 + this.setData({
  89 + id: options.id
  90 + })
  91 + },
  92 +
  93 + /**
  94 + * 生命周期函数--监听页面初次渲染完成
  95 + */
  96 + onReady: function () {
  97 +
  98 + },
  99 +
  100 + /**
  101 + * 生命周期函数--监听页面显示
  102 + */
  103 + onShow: function () {
  104 +
  105 + },
  106 +
  107 + /**
  108 + * 生命周期函数--监听页面隐藏
  109 + */
  110 + onHide: function () {
  111 +
  112 + },
  113 +
  114 + /**
  115 + * 生命周期函数--监听页面卸载
  116 + */
  117 + onUnload: function () {
  118 +
  119 + },
  120 +
  121 + /**
  122 + * 页面相关事件处理函数--监听用户下拉动作
  123 + */
  124 + onPullDownRefresh: function () {
  125 +
  126 + },
  127 +
  128 + /**
  129 + * 页面上拉触底事件的处理函数
  130 + */
  131 + onReachBottom: function () {
  132 +
  133 + },
  134 +
  135 + /**
  136 + * 用户点击右上角分享
  137 + */
  138 + onShareAppMessage: function () {
  139 +
  140 + }
  141 +})
  1 +{
  2 + "usingComponents": {},
  3 + "navigationBarTitleText": "编辑资料"
  4 +}
  1 +<!--姓名 -->
  2 +<view class='apply_item'>
  3 + <view>姓名</view>
  4 + <view class='apply_item_input'>
  5 + <input placeholder='请输入姓名' placeholder-class='input_p' bindinput='setname' value='{{name}}'
  6 + disabled="{{page_type}}">444</input>
  7 + </view>
  8 +</view>
  9 +<view class="line">
  10 + <view></view>
  11 +</view>
  12 +<!--工作内容 -->
  13 +<view class='apply_item'>
  14 + <view>工作内容</view>
  15 + <view class='apply_item_input'>
  16 + <input placeholder='请输入工作内容' placeholder-class='input_p' bindinput='setmove_job' value='{{job}}'
  17 + disabled="{{page_type}}"></input>
  18 + </view>
  19 +</view>
  20 +<view class="line">
  21 + <view></view>
  22 +</view>
  23 +
  24 +
  25 +
  26 +
  27 +<form class="shengqin" bindsubmit="submit" report-submit='true'>
  28 + <button form-type="submit">提交</button>
  29 +</form>
  1 +/* @import "../../apply//apply.wxss"; */
  2 +/* page {
  3 + background-color: rgb(240, 240, 240);
  4 +} */
  5 +
  6 +.apply_item {
  7 + color: #333;
  8 + font-size: 28rpx;
  9 + display: flex;
  10 + align-items: center;
  11 + justify-content: space-between;
  12 + /* margin: 0 32rpx; */
  13 + /* border-bottom: 1rpx solid #e6e6e6; */
  14 + padding: 30rpx 32rpx;
  15 + background-color: #ffffff;
  16 +}
  17 +
  18 +.apply_item_input {
  19 + display: flex;
  20 + align-items: center;
  21 + flex-direction: row-reverse;
  22 + width: 70%;
  23 + color: #333;
  24 + font-size: 28rpx;
  25 +}
  26 +
  27 +.apply_item_input input {
  28 + width: 100%;
  29 +}
  30 +
  31 +.apply_item_input .iconfont {
  32 + color: #ccc;
  33 +}
  34 +
  35 +.big_item .apply_item_input {
  36 + width: 60%;
  37 +}
  38 +
  39 +.apply_item_input input {
  40 + text-align: right;
  41 +}
  42 +
  43 +.input_p {
  44 + color: #ccc;
  45 + font-size: 28rpx;
  46 +}
  47 +
  48 +.line view {
  49 + margin: 0 32rpx;
  50 + background-color: #e6e6e6;
  51 + height: 1px;
  52 +}
  53 +
  54 +.line {
  55 + background-color: #ffffff;
  56 +}
  57 +
  58 +/* */
  59 +/* .doc-listform {
  60 + margin-bottom: 100rpx;
  61 + padding: 40rpx 32rpx;
  62 + font-size: 28rpx;
  63 + background-color: #ffffff;
  64 + position: relative;
  65 +
  66 +}
  67 +
  68 +.listforms {
  69 + height: 15rpx;
  70 + background-color: #eeeeee;
  71 +}
  72 +
  73 +textarea {
  74 + padding: 20rpx;
  75 + font-size: 28rpx;
  76 + margin-top: 20rpx;
  77 + width: auto;
  78 + border: 2rpx solid #eeeeee;
  79 +}
  80 +
  81 +/* 提示 */
  82 +/*
  83 +.tishi_wrap {
  84 + padding: 24rpx 36rpx;
  85 + margin: 0 32rpx;
  86 + margin-top: 40rpx;
  87 + border-radius: 8px;
  88 + background-color: #ffffff;
  89 +}
  90 +
  91 +.tishi {
  92 + display: flex;
  93 + align-items: center;
  94 + justify-content: space-between;
  95 + color: #FF4444;
  96 + font-size: 32rpx;
  97 +}
  98 +
  99 +.tishi image {
  100 + width: 28rpx;
  101 + height: 28rpx;
  102 + margin-right: 8rpx;
  103 +}
  104 +
  105 +.tishi_text {
  106 + margin-top: 16rpx;
  107 + font-size: 28rpx;
  108 + color: #7D7E80;
  109 +
  110 +} */
  111 +
  112 +/* 图片 */
  113 +/* .doc-Images {
  114 + width: 100%;
  115 +}
  116 +
  117 +.chooseImage {
  118 + width: 200rpx;
  119 + height: 200rpx;
  120 + line-height: 200rpx;
  121 + text-align: center;
  122 + font-size: 80rpx;
  123 + padding: 0px !important;
  124 + margin: 20rpx 0rpx !important;
  125 + color: #ddd;
  126 + border: 1px solid #eeeeee;
  127 + display: inline-block !important;
  128 + border-radius: 0px
  129 +}
  130 +
  131 +.chooseImage::after {
  132 + border: none;
  133 +}
  134 +
  135 +.doc-ImageList {
  136 + height: 200rpx;
  137 + margin: 0 25rpx;
  138 + display: inline-block;
  139 +}
  140 +
  141 +.doc-ImageList image {
  142 + width: 200rpx;
  143 + height: 200rpx;
  144 + position: relative;
  145 + z-index: 4px;
  146 +}
  147 +
  148 +.doc-ImageList image .iconfont {
  149 + position: absolute;
  150 + z-index: 5px;
  151 + right: 0rpx;
  152 + top: 0rpx;
  153 +} */
  154 +
  155 +.shengqin {
  156 + height: 122rpx;
  157 + background-color: #ffffff;
  158 + font-size: 32rpx;
  159 + position: fixed;
  160 + left: 0;
  161 + right: 0;
  162 + bottom: 0;
  163 + display: flex;
  164 + justify-content: center;
  165 + align-items: center;
  166 +}
  167 +
  168 +.shengqin button {
  169 + width: 622rpx;
  170 + height: 88rpx;
  171 + color: #ffffff;
  172 + border-radius: 22px;
  173 + background: linear-gradient(130deg, #2ed26e 13%, #05983e 98%);
  174 + box-shadow: 0px 9px 19px 0px rgba(0, 116, 45, 0.42);
  175 +
  176 +}
@@ -44,7 +44,10 @@ Page({ @@ -44,7 +44,10 @@ Page({
44 44
45 // 积分兑换 45 // 积分兑换
46 getbindbuy(e) { 46 getbindbuy(e) {
47 - console.log(e) 47 +
  48 + let index = e.currentTarget.dataset.index;
  49 + wx.setStorageSync('goodsInfo', this.data.list)
  50 +
48 var id =e.currentTarget.dataset.id; 51 var id =e.currentTarget.dataset.id;
49 wx.navigateTo({ 52 wx.navigateTo({
50 url: '/pages/myfeedback/myfeedback_duihuan/myfeedback_duihuan?id='+id, 53 url: '/pages/myfeedback/myfeedback_duihuan/myfeedback_duihuan?id='+id,
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 + <view wx:for="{{list.banner}}">
3 <swiper-item> 4 <swiper-item>
4 - <image src="/imgs/矩形备份.png" mode="widthFix" /> 5 + <image src="{{item}}" />
5 </swiper-item> 6 </swiper-item>
6 - 7 + </view>
7 </swiper> 8 </swiper>
8 <!-- 工时商品名称 --> 9 <!-- 工时商品名称 -->
9 <view class="goods_wrap"> 10 <view class="goods_wrap">
@@ -27,9 +28,9 @@ @@ -27,9 +28,9 @@
27 <view class="goods_line"></view> 28 <view class="goods_line"></view>
28 </view> 29 </view>
29 <view class="goods_text"> 30 <view class="goods_text">
30 - <rich-text nodes="{{}}">富文本</rich-text> 31 + <rich-text nodes="{{list.content}}"></rich-text>
31 </view> 32 </view>
32 <!-- 兑换 --> 33 <!-- 兑换 -->
33 <view class="shengqin"> 34 <view class="shengqin">
34 - <button bindtap="getbindbuy" data-id="{{id}}">积分兑换</button> 35 + <button bindtap="getbindbuy" data-index='{{index}}' data-id="{{id}}">积分兑换</button>
35 </view> 36 </view>
@@ -9,9 +9,8 @@ swiper { @@ -9,9 +9,8 @@ swiper {
9 9
10 swiper image { 10 swiper image {
11 width: 100%; 11 width: 100%;
  12 + height: 750rpx;
12 } 13 }
13 -  
14 -  
15 /* */ 14 /* */
16 .goods_wrap{ 15 .goods_wrap{
17 margin-top: 24rpx; 16 margin-top: 24rpx;
1 -const app = getApp() 1 + const app = getApp()
2 2
3 -Page({  
4 -  
5 - /**  
6 - * 页面的初始数据  
7 - */ 3 + Page({
8 data: { 4 data: {
9 - datalist:'' 5 + datalist: '',
  6 + goodsInfo: {},
  7 + count: 1,
  8 + remark:''
10 }, 9 },
11 10
12 - /**  
13 - * 生命周期函数--监听页面加载  
14 - */ 11 +
15 onLoad: function (options) { 12 onLoad: function (options) {
16 this.setData({ 13 this.setData({
17 id: options.id 14 id: options.id
18 }) 15 })
  16 + this.setData({
  17 + goodsInfo: wx.getStorageSync('goodsInfo')
  18 + })
19 }, 19 },
20 onReady: function () { 20 onReady: function () {
21 21
22 }, 22 },
23 onShow: function () { 23 onShow: function () {
24 let that = this; 24 let that = this;
25 - that.getaddress();  
26 - 25 + let tempAdress = wx.getStorageSync('tempAdress');
  26 + if (tempAdress) {
  27 + this.setData({
  28 + datalist: tempAdress
  29 + })
  30 + } else {
  31 + that.getaddress()
  32 + }
27 33
28 }, 34 },
29 35
@@ -62,23 +68,39 @@ Page({ @@ -62,23 +68,39 @@ Page({
62 let head = { 68 let head = {
63 'XX-Token': wx.getStorageSync('token') 69 'XX-Token': wx.getStorageSync('token')
64 } 70 }
65 - app.post(url, {}, head).then((res) => {  
66 - console.log(res)  
67 -  
68 -  
69 - // that.setData({  
70 - // datalist: res  
71 - // })  
72 - 71 + app.post(url, {
  72 + good_id: that.data.goodsInfo.id,
  73 + num: that.data.count,
  74 + address_id: that.data.datalist.id,
  75 + remark:that.data.remark
  76 + }, head).then((res) => {
  77 + wx.showToast({
  78 + title: '兑换成功',
  79 + })
73 80
74 }).catch((err) => { 81 }).catch((err) => {
75 82
76 }) 83 })
77 }, 84 },
78 -  
79 -  
80 -  
81 - 85 + bindNum(e) {
  86 + let type = e.currentTarget.dataset.type;
  87 + // console.log(type)
  88 + // console.log(e)
  89 + type == 'minus' ?
  90 + this.setData({
  91 + count: this.data.count == 1 ? 1 : this.data.count-1
  92 + }) :
  93 + this.setData({
  94 + count: this.data.count + 1
  95 + })
  96 + },
  97 + // 备注
  98 + bindremark(e) {
  99 + // console.log(e.detail.value)
  100 + this.setData({
  101 + remark:e.detail.value
  102 + })
  103 + },
82 104
83 /** 105 /**
84 * 生命周期函数--监听页面隐藏 106 * 生命周期函数--监听页面隐藏
@@ -114,4 +136,4 @@ Page({ @@ -114,4 +136,4 @@ Page({
114 onShareAppMessage: function () { 136 onShareAppMessage: function () {
115 137
116 } 138 }
117 -})  
  139 + })
1 <!-- 地址 --> 1 <!-- 地址 -->
2 -<view class="goods_address" wx:if="{{id==!''}}" 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>
@@ -20,12 +20,12 @@ @@ -20,12 +20,12 @@
20 <view class="goods_shop"> 20 <view class="goods_shop">
21 <view>订单信息</view> 21 <view>订单信息</view>
22 <view class="gift"> 22 <view class="gift">
23 - <image src="/imgs/shop.png"></image> 23 + <image src="{{goodsInfo.pic}}"></image>
24 <view class="gift_message"> 24 <view class="gift_message">
25 - <view class="gift_introduce">原装正品Apple AirPods Pro 主动降噪无线蓝机…</view>  
26 - <view class="gift_time"> 已选：A款</view> 25 + <view class="gift_introduce">{{goodsInfo.good_name}}</view>
  26 + <!-- <view class="gift_time"> 已选：A款</view> -->
27 <view class="gift_exchange_time"> 27 <view class="gift_exchange_time">
28 - <p>50</p>小时 28 + <p>{{goodsInfo.work_time}}</p>小时
29 </view> 29 </view>
30 </view> 30 </view>
31 </view> 31 </view>
@@ -34,24 +34,24 @@ @@ -34,24 +34,24 @@
34 <view class="shopcarts_car_tool"> 34 <view class="shopcarts_car_tool">
35 <view class="num_edit" catchtap="bindNum" data-type="minus" data-index="{{index}}" data-id="{{item.id}}">- 35 <view class="num_edit" catchtap="bindNum" data-type="minus" data-index="{{index}}" data-id="{{item.id}}">-
36 </view> 36 </view>
37 - <view class="goods_num">1</view>  
38 - <view class="num_edit" catchtap="bindNum" data-type="add" data-id="{{item.id}}" data-index="{{index}}">+ 37 + <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> 39 </view>
40 </view> 40 </view>
41 </view> 41 </view>
42 <view>订单备注：</view> 42 <view>订单备注：</view>
43 - <textarea></textarea> 43 + <textarea bindinput="bindremark" value="{{remark}}"></textarea>
44 <view class="goods_allnum"> 44 <view class="goods_allnum">
45 - <view>共1件 <p>小计:  
46 - <p style="color:#079A40;">50</p> 45 + <view>共{{count}}件 <p>小计:
  46 + <p style="color:#079A40;">{{count*goodsInfo.work_time}}</p>
47 </p> 47 </p>
48 </view> 48 </view>
49 </view> 49 </view>
50 </view> 50 </view>
51 51
52 <view class="goods_exchange"> 52 <view class="goods_exchange">
53 - <view>共1件 <p>合计:  
54 - <p style="color:#079A40;">50小时</p> 53 + <view>共{{count}}件 <p>合计:
  54 + <p style="color:#079A40;">{{count*goodsInfo.work_time}}小时</p>
55 </p> 55 </p>
56 </view> 56 </view>
57 <button bindtap="getdatalist">提交兑换申请</button> 57 <button bindtap="getdatalist">提交兑换申请</button>
@@ -117,6 +117,7 @@ page { @@ -117,6 +117,7 @@ page {
117 117
118 /* */ 118 /* */
119 textarea { 119 textarea {
  120 + padding:20rpx;
120 margin-top: 16rpx; 121 margin-top: 16rpx;
121 background-color: #f7f8fa; 122 background-color: #f7f8fa;
122 width: auto; 123 width: auto;
@@ -10,6 +10,7 @@ Page({ @@ -10,6 +10,7 @@ Page({
10 }, 10 },
11 onLoad: function (options) { 11 onLoad: function (options) {
12 12
  13 +
13 }, 14 },
14 15
15 16
@@ -27,32 +28,27 @@ Page({ @@ -27,32 +28,27 @@ Page({
27 let head = { 28 let head = {
28 'XX-Token': wx.getStorageSync('token') 29 'XX-Token': wx.getStorageSync('token')
29 } 30 }
30 - let city = '北京'  
31 31
32 - app.post(url, city, head).then((res) => { 32 + app.post(url, '', head).then((res) => {
33 33
34 console.log(res) 34 console.log(res)
35 35
36 - // if (res.code == !20000) {  
37 - // that.setData({  
38 - // list: res  
39 -  
40 - // })  
41 - // }else{  
42 - // wx.showToast({  
43 - // title: msg,  
44 - // icon:'none'  
45 - // })  
46 -  
47 - // }  
48 -  
49 - 36 + this.setData({
50 37
  38 + list: res
  39 + })
51 }) 40 })
52 -  
53 }, 41 },
54 42
  43 + // 详情页
  44 + getdetail(e) {
  45 + console.log(e)
  46 + var id = e.currentTarget.dataset.id
  47 + wx.navigateTo({
  48 + url: '/pages/Volunteer_detail/Volunteer_detail?id='+id,
  49 + })
55 50
  51 + },
56 52
57 53
58 /** 54 /**
1 -<view class="myteamBox" > 1 +<view class="myteamBox" wx:for="{{list}}" bindtap="getdetail" data-id="{{item.id}}" >
2 <view class="teamtop"> 2 <view class="teamtop">
3 <image src="/imgs/ac14.png"></image> 3 <image src="/imgs/ac14.png"></image>
4 - <view class="teamAddress">北京</view> 4 + <view class="teamAddress">{{item.city}}</view>
5 <image src="/imgs/ac15.png"></image> 5 <image src="/imgs/ac15.png"></image>
6 - <view>50人</view> 6 + <view>{{item.people_num}}人</view>
7 </view> 7 </view>
8 <view class="teambottom"> 8 <view class="teambottom">
9 - <image src="/imgs/active.png"></image> 9 + <image src="{{item.pic}}"></image>
10 <view class="teamright"> 10 <view class="teamright">
11 - <view class="teamName">河北省邯郸市丛台区白求恩第三志愿者小队</view> 11 + <view class="teamName">{{item.name}}</view>
12 <view class="teamTime"> 12 <view class="teamTime">
13 - <view>团队时长：60小时</view>  
14 - <view>我的时长：60小时</view> 13 + <view>团队时长：{{item.work_total_time}}小时</view>
  14 + <view>我的时长：{{item.my_time}}小时</view>
15 </view> 15 </view>
16 </view> 16 </view>
17 </view> 17 </view>
@@ -135,6 +135,7 @@ page { @@ -135,6 +135,7 @@ page {
135 } 135 }
136 136
137 .myanswer { 137 .myanswer {
  138 + margin-top: 24rpx;
138 padding: 24rpx 24rpx; 139 padding: 24rpx 24rpx;
139 border-radius: 7px; 140 border-radius: 7px;
140 background-color: #ffffff; 141 background-color: #ffffff;
@@ -151,6 +152,7 @@ page { @@ -151,6 +152,7 @@ page {
151 } 152 }
152 153
153 .myanswer_right { 154 .myanswer_right {
  155 + width: 434rpx;
154 display: flex; 156 display: flex;
155 flex-direction: column; 157 flex-direction: column;
156 justify-content: space-between; 158 justify-content: space-between;
@@ -249,6 +249,19 @@ @@ -249,6 +249,19 @@
249 "pathName": "pages/getStudycontent/answer/answer", 249 "pathName": "pages/getStudycontent/answer/answer",
250 "query": "id=1", 250 "query": "id=1",
251 "scene": null 251 "scene": null
  252 + },
  253 + {
  254 + "id": -1,
  255 + "name": "电子证件",
  256 + "pathName": "pages/mycertificate/mycertificate",
  257 + "query": "",
  258 + "scene": null
  259 + },
  260 + {
  261 + "id": -1,
  262 + "name": "编辑资料",
  263 + "pathName": "pages/mydetail/mydetail",
  264 + "scene": null
252 } 265 }
253 ] 266 ]
254 } 267 }