miniprogram / volunteer · 提交

转到一个项目

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

Merge branch 'master' into sgj

内嵌 并排对比
正在显示 37 个修改的文件 包含 938 行增加 和 128 行删除
... ... @@ -38,6 +38,7 @@
"pages/myfeedback/myfeedback_active/myfeedback_active",
"pages/myfeedback/myfeedback_duihuan/myfeedback_duihuan",
"pages/myfeedback/myfeedback_list/myfeedback_list",
"pages/myfeedback/myfeedback_detail/myfeedback_detail",
"pages/myfeedback_lists/myfeedback_lists",
"pages/mycertificate/mycertificate",
"pages/myaddress/myaddress",
... ...
... ... @@ -7,7 +7,8 @@ Page({
*/
data: {
id:'',
list:''
list:'',
shi:''
},
... ... @@ -24,7 +25,10 @@ Page({
}
app.post(url,d, head).then((res) => {
console.log(res)
let shi = res.content
shi = shi.replace(/\<img/gi, '<img style="width:100%;height:auto" ')
that.setData({
shi: shi,
list: res
})
... ... @@ -33,8 +37,6 @@ Page({
})
},
getshengqin(e) {
var id =e.currentTarget.dataset.id
console.log(e)
... ...
... ... @@ -17,7 +17,7 @@
<view bindtap="getadd">详情介绍</view>
<view class="goods_line"></view>
</view>
<rich-text nodes="{{list.content}}"></rich-text>
<rich-text nodes="{{shi}}"></rich-text>
<view class="shengqin">
<button wx:if="{{list.user_status ==0}}">未审核</button>
... ... @@ -28,8 +28,7 @@
</view>
<button open-type='share'>
<view class="btn-item" style="background: url('/imgs/shares.png') no-repeat center;background-size: cover;"
bindtap="change_cover" data-id="2">
<view class="btn-item" style="background: url('https://ftp.bmp.ovh/imgs/2020/10/549450bf92e9e194.png') no-repeat center;background-size: cover;">
</view>
</button>
\ No newline at end of file
... ...
page{
page {
background-color: rgb(240, 240, 240);
}
.goods_index {
padding: 20rpx 32rpx;
}
... ... @@ -56,7 +56,7 @@ page{
.goods_wrap {
width: 334rpx;
margin-top: 24rpx;
padding-bottom:24rpx ;
padding-bottom: 24rpx;
border-radius: 7px;
background-color: #ffffff;
overflow: hidden;
... ... @@ -69,10 +69,15 @@ page{
}
.goods_name {
height: 72rpx;
padding: 0 16rpx;
margin-top: 16rpx;
font-size: 26rpx;
color: #3E3E3F;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
.goods_time {
... ...
... ... @@ -609,7 +609,7 @@ Page({
record_name.push(obj.record_name);
record_phone.push(obj.record_phone);
}
let url = 'index/member_center/submit_form';
// let url = 'index/member_center/submit_form';
let head = {
'XX-Token': wx.getStorageSync('token')
}
... ... @@ -646,7 +646,6 @@ Page({
reverse_card: that.data.reverse_card,
photo: that.data.photo
}
app.post(url, params, head).then((res) => {
wx.showModal({
title: '请仔细核对信息，确认无误！',
... ... @@ -655,6 +654,9 @@ Page({
cancelText:'我再想想',
success(res) {
if (res.confirm) {
let url = 'index/member_center/submit_form';
app.post(url, params, head).then((res) => {
wx.showToast({
title: '提交成功,等待审核',
... ... @@ -668,6 +670,11 @@ Page({
})
}, 1000)
console.log('用户点击确定')
}).catch((err) => {})
} else if (res.cancel) {
console.log('用户点击取消')
... ... @@ -676,7 +683,6 @@ Page({
})
}).catch((err) => {})
} else {
wx.showToast({
title: err,
... ...
... ... @@ -4,7 +4,7 @@
<view class="newinfo_list">
<view class="goods_title">{{list.activity_name}}</view>
<view class="goods_name">
<image src="/imgs/zhiyuan1.png"></image> {{list.author}}
<image src="/imgs/zhiyuan1.png"></image> {{list.author==null?'':'list.author'}}
<image class="goods_time" src="/imgs/zhiyuan2.png"></image>{{list.create_time}}
</view>
<view class="newinfo_text">
... ... @@ -16,8 +16,6 @@
<button open-type='share'>
<view class="btn-item" style="background: url('/imgs/shares.png') no-repeat center;background-size: cover;"
bindtap="change_cover" data-id="2">
<view class="btn-item" style="background: url('https://ftp.bmp.ovh/imgs/2020/10/549450bf92e9e194.png') no-repeat center;background-size: cover;">
</view>
</button>
\ No newline at end of file
... ...
... ... @@ -7,13 +7,16 @@ Page({
*/
data: {
id: '',
list: ''
list: '',
shi:''
},
onLoad: function (options) {
// console.log(options)
this.setData({
id: options.id
})
},
onReady: function () {
... ... @@ -50,10 +53,16 @@ Page({
}
app.post(url, params, head).then((res) => {
console.log(res)
let shi = res.content
shi = shi.replace(/\<img/gi, '<img style="width:100%;height:auto" ')
that.setData({
shi: shi,
list: res
})
}).catch((err) => {
})
... ...
... ... @@ -7,17 +7,18 @@
<image src="/imgs/zhiyuan3.png"></image> {{list.author}}
<image style="margin-left:64rpx" src="/imgs/zhiyuan4.png"></image> {{list.work_time}}
</view>
<rich-text nodes="{{list.content}}"></rich-text>
<rich-text nodes="{{shi}}"></rich-text>
</view>
<view class="answer" >
<view class="answer">
<view hover-class="none" bindtap="getanswer" wx:if="{{list.user_status==0}}">去答题</view>
<button style="background: #cfcfcf;" wx:if="{{list.user_status==1}}">已答题</button>
</view>
<button open-type="share">
<view class="btn-item" style="background: url('/imgs/shares.png') no-repeat center;background-size: cover;"
<view class="btn-item"
style="background: url('https://ftp.bmp.ovh/imgs/2020/10/549450bf92e9e194.png') no-repeat center;background-size: cover;"
bindtap="change_cover" data-id="2">
</view>
</button>
\ No newline at end of file
... ...
... ... @@ -24,6 +24,13 @@
color: #5D5D5D;
}
rich-text img {
width: 100%;
height: auto;
}
.answer {
width: 100%;
... ... @@ -36,7 +43,7 @@
}
.answer view{
.answer view {
margin: auto;
width: 622rpx;
height: 88rpx;
... ... @@ -58,6 +65,7 @@
/* box-shadow: 0px 9px 19px 0px rgba(0, 116, 45, 0.42); */
}
/* 分享 */
.btn-item {
width: 100rpx;
... ... @@ -77,4 +85,4 @@
position: fixed;
bottom: 144rpx;
right: 32rpx;
}
\ No newline at end of file
}
\ No newline at end of file
... ...
... ... @@ -52,7 +52,7 @@
</block>
<view class="btn-item"
style="background: url('/imgs/shares.png') no-repeat center;background-size: cover;"
style="background: url('https://ftp.bmp.ovh/imgs/2020/10/549450bf92e9e194.png') no-repeat center;background-size: cover;"
bindtap="change_cover" data-id="2"></view>
</view>
... ...
page{
page {
background-color: rgb(240, 240, 240);
}
.new_box {
display: flex;
justify-content: space-between;
... ... @@ -44,8 +44,12 @@ page{
}
.new_title {
white-space: nowrap;
text-overflow: ellipsis;
/* white-space: nowrap; */
/* text-overflow: ellipsis; */
height: 72rpx;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
padding: 0 16rpx;
margin: 18rpx 0 13rpx 0;
... ... @@ -83,10 +87,12 @@ page{
text-overflow: ellipsis;
white-space: nowrap;
}
text{
text {
color: #FF976A;
}
.tabbar {
width: 100%;
height: 100rpx;
... ...
... ... @@ -62,7 +62,38 @@ Page({
]
},
//
// 轮播图
getcarousel(e) {
console.log(e)
var id = e.currentTarget.dataset.id
var type = e.currentTarget.dataset.type
if (type == 1) {
wx.navigateTo({
url: '/pages/Volunteer_detail/Volunteer_detail?id=' + id + '&status=1',
})
} else if (type == 2) {
wx.navigateTo({
url: '/pages/getStudycontent/getStudycontent?id=' + id + '&status=1',
})
} else if (type == 3) {
wx.navigateTo({
url: '/pages/guanlitiaoli/guanlitiaoli?id=' + id + '&status=1',
})
} else if (type == 4) {
wx.navigateTo({
url: '/pages/getNewsInfo/getNewsInfo?id=' + id + '&status=1',
})
} else if (type == 5) {
wx.navigateTo({
url: '/pages/img_txt/img_txt?id=' + id + '&status=1',
})
}
},
getdatalist() {
let that = this;
let url = 'index/index/index';
... ...
<!-- 轮播图 -->
<swiper indicator-dots="true" indicator-color='#8C9194' indicator-active-color='#ffffff' class="slide-image">
<navigator wx:for="{{datalist.slide}}" wx:key="id" hover-class="none"
url='/pages/img_txt/img_txt?id={{item.activity_id}}&status=1'>
<view wx:for="{{datalist.slide}}" data-id="{{item.activity_id}}" data-type="{{item.type}}" bindtap="getcarousel">
<swiper-item>
<image src="{{item.image}}" mode="aspectFill" />
</swiper-item>
</navigator>
</view>
</swiper>
<!-- <view class='vold_line'></view> -->
<!-- 菜单 -->
<view class="home_menu ">
... ... @@ -27,8 +27,8 @@
</navigator>
</view>
<view class='volunteerbox'>
<view class='volunteercell' wx:for='{{datalist.volunteer}}' wx:key="index" id='{{item.user_id}}' wx:if="{{index<=3}}"
bindtap="getother">
<view class='volunteercell' wx:for='{{datalist.volunteer}}' wx:key="index" id='{{item.user_id}}'
wx:if="{{index<=3}}" bindtap="getother">
<view class='cell_top'>
<view class='cellimg'>
<image src='{{item.photo?item.photo:"https://volunteer.cnpu.org/imgs/wode_02@2x.png"}}'
... ...
... ... @@ -203,6 +203,8 @@ Page({
*/
onLoad: function (options) {
wx.hideShareMenu()
this.getdatalist();
},
/**
... ...
... ... @@ -7,7 +7,7 @@
</view>
<view class="my_headitemname">
<view class='word'>{{datalist.user_nickname}}</view>
<view class="word1">{{datalist.status}}<image src="/imgs/more_gray.png"></image>
<view class="word1" >{{datalist.status}} <image wx:if="{{datalist!==''}}" src="/imgs/more_gray.png"></image>
</view>
<view class='star_box'>
<image src="/imgs/xingxing_weixuanzhong_icon@2x.png" mode='scaleToFill' wx:if='{{datalist.level>0}}'>
... ... @@ -37,9 +37,7 @@
<view>{{datalist.work_time}}</view>
<view>工时</view>
</view>
</view>
</view>
<!--我的活动 -->
... ...
... ... @@ -10,7 +10,7 @@ Page({
id: '',
latitude: '',
longitude: '',
time: ''
time: '',
},
onLoad: function (options) {
... ... @@ -29,10 +29,11 @@ Page({
onShow: function () {
let that = this;
that.getList();
that.getaddredss()
// 获取经纬度
wx.getLocation({
success: function (res) {
console.log(res);
console.log(res)
that.setData({
latitude: res.latitude,
longitude: res.longitude
... ... @@ -65,7 +66,6 @@ Page({
}
// console.log(d)
app.post(url, d, head).then((res) => {
// console.log(res)
that.setData({
list: res
})
... ... @@ -127,13 +127,27 @@ Page({
})
},
// 获取当前地址
getaddredss() {
let that = this;
let url = '/index/second/clockInfo';
let head = {
'XX-Token': wx.getStorageSync('token')
}
let d = {
id: that.data.id
}
app.post(url, d, head).then((res) => {
that.setData({
adddress: res
})
}).catch((err) => {
})
},
// 提示
... ... @@ -143,9 +157,6 @@ Page({
})
},
onHide: function () {
},
... ...
... ... @@ -2,13 +2,13 @@ const app = getApp()
Page({
data: {
region: [],
name: '',
address: '',
phone: '',
wx_id: '',
mail: '',
isDefault: '',
region: [],//
name: '',//姓名
address: '',//
phone: '',//
wx_id: '',//
mail: '',//
isDefault: '',//
id: ''
},
onLoad: function (options) {
... ... @@ -34,7 +34,7 @@ Page({
that.setData({
region: answer,
id: res.is,
id: res.id,
name: res.name,
address: res.address,
phone: res.tel,
... ... @@ -54,7 +54,11 @@ Page({
})
},
//保存
//保存 修改
bindsave(e) {
let that = this;
... ... @@ -62,6 +66,7 @@ Page({
'XX-Token': wx.getStorageSync('token')
}
let params = {
id:that.data.id,
name: that.data.name, //姓名
province: that.data.region[0], //省
city: that.data.region[1], //市
... ... @@ -83,6 +88,7 @@ Page({
if (that.data.id) {
let url = '/index/second/editAddress';
app.post(url, params, head).then((res) => {
console.log(res)
wx.showToast({
title: '修改成功',
mask: true,
... ... @@ -103,7 +109,6 @@ Page({
title: '保存成功',
mask: true,
icon: 'none',
// duration: 2000
})
setTimeout(function () {
wx.reLaunch({
... ...
... ... @@ -11,7 +11,21 @@ Page({
},
onLoad: function (options) {
},
onReady: function () {
},
onShow: function () {
let that = this;
that.getList();
},
//列表
getList() {
// return
... ... @@ -24,22 +38,17 @@ Page({
console.log(res)
that.setData({
list: res
})
}).catch((err) => {
})
},
// 删除
bindDelete(e) {
var that = this
var id = e.currentTarget.dataset.id;
let url = '/index/second/deleteAddress';
let head = {
'XX-Token': wx.getStorageSync('token')
... ... @@ -48,7 +57,6 @@ Page({
address_id: id
}
// console.log(params)
wx.showModal({
title: '提示',
content: '确定删除该地址吗？',
... ... @@ -68,16 +76,13 @@ Page({
console.log('用户点击取消')
}
}
})
},
// 编辑
bindCompile(e) {
// console.log(e)
var id = e.currentTarget.dataset.id
// console.log(id)
wx.navigateTo({
url: '/pages/myaddcompile/myaddcompile?id=' + id,
})
... ... @@ -105,30 +110,8 @@ Page({
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log(options)
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
let that = this;
that.getList();
},
/**
* 生命周期函数--监听页面隐藏
... ...
const app =getApp()
const app = getApp()
Page({
/**
... ... @@ -6,6 +6,7 @@ Page({
*/
data: {
list: '',
active: ''
},
... ... @@ -22,11 +23,11 @@ Page({
onShow: function () {
let that = this
that.getactive()
that.getList()
},
getactive() {
getList() {
let that = this;
let url = '/index/second/zhengJianInfo ';
let head = {
... ... @@ -45,12 +46,65 @@ Page({
},
// 生成图片
getPic(e) {
console.log(e)
var type = e.currentTarget.dataset.type
let that = this;
let url = '/index/second/zhengJianPic ';
let head = {
'XX-Token': wx.getStorageSync('token')
}
let params = {
type: type
}
app.post(url, params, head).then((res) => {
console.log(res)
// this.setData({
// active: res.url
// })
wx.downloadFile({
url: res.url,
success: (res) => {
wx.saveImageToPhotosAlbum({
filePath: res.tempFilePath,
success: (r) => {
wx.showToast({
title: '保存成功',
mask: true,
duration: 1000
})
}
})
}
})
})
},
//保存海报到本地
// save_poster() {
// wx.downloadFile({
// url: this.data.active,
// success: (res) => {
// wx.saveImageToPhotosAlbum({
// filePath: res.tempFilePath,
// success: (r) => {
// wx.showToast({
// title: '保存成功',
// mask: true,
// duration: 1000
// })
// }
// })
// }
// })
// },
... ...
<!-- 电子证件 -->
<view class="mycertificate">
<image src="/imgs/dianzizhengjian1.png"></image>
<image wx:if="{{list.status=='志愿者(待学习)'}}" src="http://volunteer.w.bronet.cn/imgs/idcard2.png"></image>
<image wx:else src="/imgs/dianzizhengjian1.png"></image>
<view class="mycertificate_text">
<view class="goods_left">
<view>姓名：{{list.name}}</view>
<view>身份：{{list.status}}</view>
<view>编号：{{list.user_num}}</view>
<view>学时：{{list.work_time}}</view>
<view>学时：{{list.work_time==null?'':'list.work_time'}}</view>
</view>
<image class="One_inch_photos" src="{{list.avatar}}"></image>
</view>
</view>
<view class="mycertificate distance">
<image src="/imgs/dianzizhengjian.png"></image>
<image wx:if="{{list.status=='志愿者(待学习)'}}" src="http://volunteer.w.bronet.cn/imgs/idcard1.png"></image>
<image wx:else src="/imgs/dianzizhengjian.png"></image>
<view class="mycertificate_text">
<view class="goods_lefts">
<image class="logo" src="/imgs/dianzizhengjian2.png"></image>
<image class="logo" src="https://ftp.bmp.ovh/imgs/2020/10/6ce74d64f7aa1e53.png"></image>
<view>白求恩志愿者</view>
</view>
<image class="erweima" src="/imgs/dianzizhengjian3.png"></image>
<image class="erweima" src="https://ftp.bmp.ovh/imgs/2020/10/fa5e66b52e2ccb82.jpg"></image>
</view>
... ... @@ -34,6 +37,8 @@
<view class="good_typeface">4. 如实体证件丢失请及时联系白求恩志愿者中心补办</view>
</view>
<view class="btn">
<button hover-class="none"> 将电子证件生成图片</button>
<view class="btn" wx:if="{{list.status!=='志愿者(待学习)'}}">
<!-- <button hover-class="none"> 将电子证件生成图片</button> -->
<view class="generate" bindtap="getPic" data-type="{{1}}">生成正面图片</view>
<view class="generate" bindtap="getPic" data-type="{{2}}">生成背面图片</view>
</view>
\ No newline at end of file
... ...
... ... @@ -9,8 +9,9 @@ page {
position: relative;
}
.distance{
margin-bottom: 142rpx;
.distance {
margin-bottom: 260rpx;
}
image {
... ... @@ -29,7 +30,6 @@ image {
left: 0;
top: 0;
display: flex;
justify-content: space-between;
... ... @@ -95,22 +95,26 @@ image {
}
.btn {
height: 122rpx;
padding-top: 21rpx;
height: 240rpx;
background-color: #ffffff;
display: flex;
align-items: center;
box-sizing: border-box;
/* display: flex; */
/* align-items: center; */
position: fixed;
left: 0;
right: 0;
bottom: 0;
}
button {
width: 622rpx;
.generate {
margin-bottom: 21rpx;
width: 100%;
height: 88rpx;
text-align: center;
line-height: 88rpx;
background: linear-gradient(130deg, #2ed26e 13%, #05983e 98%);
border-radius: 44px;
/* border-radius: 44px; */
color: #ffffff;
box-shadow: 0px 18px 38px 0px rgba(0, 116, 45, 0.42);
/* box-shadow: 0px 18px 38px 0px rgba(0, 116, 45, 0.42); */
}
\ No newline at end of file
... ...
... ... @@ -36,7 +36,7 @@
<view>可用工时</view>
</view>
<view class="my_active">
<view>{{datalist.user.work_time}}</view>
<view>{{datalist.user.work_time==null?'0':'datalist.user.work_time'}}</view>
<view>累计总共工时</view>
</view>
<view class="my_active">
... ...
page {
background-color: rgb(240, 240, 240);
}
/* 轮播图 */
swiper {
height: 750rpx;
}
swiper image {
width: 100%;
height: 750rpx;
}
/* */
.goods_wrap{
margin-top: 24rpx;
background-color: #ffffff;
padding: 24rpx 32rpx;
}
.goods_time {
height: 66rpx;
color: #21AE58;
font-size: 28rpx;
}
.goods_name {
line-height: 50rpx;
font-size: 36rpx;
font-weight: 500;
}
.goods_wrap p{
font-size: 44rpx;
}
.margin{
margin-bottom: 48rpx;
}
/* */
.goods_introduce {
height: 88rpx;
display: flex;
justify-content: center;
align-items: center;
font-size: 28rpx;
color: #969799;
}
.goods_introduce :nth-child(2) {
margin: 0 32rpx;
}
.goods_line {
width: 100rpx;
height: 2rpx;
background-color: #969799;
}
.goods_text{
margin-bottom: 150rpx;
}
/*兑换 */
.shengqin {
height: 120rpx;
background-color: #ffffff;
font-size: 32rpx;
position: fixed;
left: 0;
right: 0;
bottom: 0;
display: flex;
align-items: center;
}
.shengqin button {
width: 622rpx;
color: #ffffff;
border-radius: 22px;
background: linear-gradient(130deg, #2ed26e 13%, #05983e 98%);
box-shadow: 0px 9px 19px 0px rgba(0, 116, 45, 0.42);
}
\ No newline at end of file
... ...
const app = getApp();
Page({
/**
* 页面的初始数据
*/
data: {
id: ''
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
// console.log(options)
this.setData({
id: options.id,
list: ''
})
},
onReady: function () {
},
onShow: function () {
let that = this;
that.getList();
},
onHide: function () {
},
// 详情
getList() {
let that = this;
let url = '/index/second/orderInfo';
let head = {
'XX-Token': wx.getStorageSync('token')
}
let d = {
id: that.data.id
}
app.post(url, d, head).then((res) => {
console.log(res)
that.setData({
list: res
})
}).catch((err) => {
})
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
... ...
{
"usingComponents": {},
"navigationBarTitleText": "志愿礼物详情"
}
\ No newline at end of file
... ...
<!-- 轮播图 -->
<swiper indicator-dots="true" indicator-color='#8C9194' indicator-active-color='#ffffff' class="slide-image">
<view wx:for="{{list.good.banner}}">
<swiper-item>
<image src="{{item}}" />
</swiper-item>
</view>
</swiper>
<!-- 工时商品名称 -->
<view class="goods_wrap">
<!-- <view class="goods_time">需要工时<p>{{list.work_time}}</p>小时</view> -->
<view class="goods_name">{{list.good.good_name}} </view>
</view>
<!-- 兑换数量 -->
<view class="goods_wrap">
<!-- <view class="displayB margin">
<view>订单状态</view>
<view>{{list.expend}}</view>
</view> -->
<view class="displayB margin">
<view>兑换工时</view>
<view>{{list.expend}}</view>
</view>
<view class="displayB">
<view>订单编号</view>
<view>{{list.order_sn}}</view>
</view>
</view>
<view class="goods_introduce" >
<view class="goods_line"></view>
<view bindtap="getadd">产品详情</view>
<view class="goods_line"></view>
</view>
<view class="goods_text" >
<rich-text nodes="{{list.good.content}}"></rich-text>
</view>
<view class="goods_text" wx:if="{{list.reason}}">
<rich-text nodes="{{list.reason}}"></rich-text>
</view>
<!-- <view class="shengqin">
<button bindtap="getbindbuy" data-index='{{index}}' data-id="{{id}}">积分兑换</button>
</view> -->
\ No newline at end of file
... ...
page {
background-color: rgb(240, 240, 240);
}
/* 轮播图 */
swiper {
height: 750rpx;
}
swiper image {
width: 100%;
height: 750rpx;
}
/* */
.goods_wrap {
margin-top: 24rpx;
font-size: 28rpx;
background-color: #ffffff;
padding: 24rpx 32rpx;
color: #333333;
}
.goods_time {
height: 66rpx;
color: #21AE58;
font-size: 28rpx;
}
.goods_name {
line-height: 50rpx;
font-size: 36rpx;
font-weight: 500;
}
.goods_wrap p {
font-size: 44rpx;
}
.margin {
margin-bottom: 48rpx;
}
/* */
.goods_introduce {
height: 88rpx;
display: flex;
justify-content: center;
align-items: center;
font-size: 28rpx;
color: #969799;
}
.goods_introduce :nth-child(2) {
margin: 0 32rpx;
}
.goods_line {
width: 100rpx;
height: 2rpx;
background-color: #969799;
}
.goods_text {
padding: 0 32rpx;
margin-bottom: 150rpx;
}
.picture {
width: 100%;
height: 290rpx;
}
/*兑换 */
/* .shengqin {
height: 120rpx;
background-color: #ffffff;
font-size: 32rpx;
position: fixed;
left: 0;
right: 0;
bottom: 0;
display: flex;
align-items: center;
}
.shengqin button {
width: 622rpx;
color: #ffffff;
border-radius: 22px;
background: linear-gradient(130deg, #2ed26e 13%, #05983e 98%);
box-shadow: 0px 9px 19px 0px rgba(0, 116, 45, 0.42);
} */
\ No newline at end of file
... ...
... ... @@ -3,7 +3,8 @@
<image class="goods_tubiao" src="/imgs/dizhigreen.png"></image>
<view>
<view>姓名：{{datalist.name}} {{datalist.tel}}</view>
<view class="goods_add">地址：{{datalist.province}}{{datalist.city}}{{datalist.district}}{{datalist.address}}</view>
<view class="goods_add">地址：{{datalist.province}}{{datalist.city}}{{datalist.district}}{{datalist.address}}
</view>
</view>
<image class="goods_tubiao1" src="/imgs/right.png"></image>
</view>
... ...
{
"usingComponents": {}
"usingComponents": {},
"navigationBarTitleText": "工时兑换"
}
\ No newline at end of file
... ...
... ... @@ -40,8 +40,15 @@ Page({
})
},
// 详情页
getdetail(e) {
var id = e.currentTarget.dataset.id
console.log(e)
wx.navigateTo({
url: '/pages/myfeedback/myfeedback_detail/myfeedback_detail?id=' + id,
})
},
onLoad: function (options) {
... ...
<view class="navbar">
<view class="item {{nav==0?'choose':''}}" bindtap="bindNav" data-nav="{{0}}">待审核</view>
<view class="item {{nav==1?'choose':''}}" bindtap="bindNav" data-nav="{{1}}">已发放志愿礼品</view>
<view class="item {{nav==1?'choose':''}}" bindtap="bindNav" data-nav="{{1}}">已发放</view>
<view class="item {{nav==2?'choose':''}}" bindtap="bindNav" data-nav="{{2}}">已拒绝</view>
</view>
<!--待审核 -->
<view wx:if="{{nav==0}}">
<view class="list" wx:for="{{list.data}}">
<view class="list" wx:for="{{list.data}}" bindtap="getdetail" data-id="{{item.id}}">
<view>
<image src="{{item.pic}}"></image>
</view>
<view class="list_right">
<view>{{item.good_name}}</view>
<view wx:if="{{item.status==0}}">待审核</view>
<!-- <view wx:if="{{item.status==1}}">在审核</view> -->
<view class="list_real" wx:if="{{item.is_real==1}}">真实物品</view>
<view class="list_real" wx:else>虚拟物品</view>
<view class="list_status" wx:if="{{item.status==0}}">待审核</view>
</view>
</view>
</view>
<view wx:else>
<view class="list" wx:for="{{list.data}}">
<!--已发放 -->
<view wx:if="{{nav==1}}">
<view class="list" wx:for="{{list.data}}" bindtap="getdetail" data-id="{{item.id}}">
<view>
<image src="{{item.pic}}"></image>
</view>
<view class="list_right">
<view>{{item.good_name}}</view>
<view class="list_real" wx:if="{{item.is_real==1}}">真实物品</view>
<view class="list_real" wx:else>虚拟物品</view>
<view class="list_status" wx:if="{{item.status==1}}">已发放</view>
</view>
</view>
<!-- <view wx:if="{{item.status==0}}">待审核</view> -->
<view wx:if="{{item.status==1}}">已发放</view>
</view>
<!-- 已拒绝 -->
<view wx:else>
<view class="list" wx:for="{{list.data}}" bindtap="getdetail" data-id="{{item.id}}">
<view>
<image src="{{item.pic}}"></image>
</view>
<view class="list_right">
<view>{{item.good_name}}</view>
<view class="list_real" wx:if="{{item.is_real==1}}">真实物品</view>
<view class="list_real" wx:else>虚拟物品</view>
<view class="list_status" wx:if="{{item.status==1}}">已拒绝</view>
</view>
</view>
... ...
... ... @@ -31,7 +31,6 @@ page {
.navbar .item.choose {
color: black;
/* background: linear-gradient(136deg, #4e8fff 2%, #55c2fa); */
}
.navbar .item.choose:after {
... ... @@ -76,12 +75,19 @@ page {
font-size: 28rpx;
font-family: PingFangSC, PingFangSC-Regular;
font-weight: 400;
text-align: left;
color: #323233;
line-height: 40rpx;
}
.list_right :nth-child(2) {
.list_real {
height: 80rpx;
font-size: 28rpx;
font-family: PingFangSC, PingFangSC-Regular;
font-weight: 400;
color: #7D7E80;
}
.list_status {
text-align: right;
color: #21AE58;
font-size: 32rpx;
... ...
{
"description": "项目配置文件",
"packOptions": {
"ignore": []
},
"setting": {
"urlCheck": false,
"es6": true,
"enhance": false,
"postcss": true,
"preloadBackgroundData": false,
"minified": true,
"newFeature": true,
"coverView": true,
"nodeModules": false,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": true,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
"useMultiFrameRuntime": false,
"useApiHook": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"useIsolateContext": true,
"useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": []
},
"compileType": "miniprogram",
"libVersion": "2.8.3",
"appid": "wx7a3bf4e0796c070a",
"projectname": "zhiyuanzhe",
"cloudfunctionTemplateRoot": "",
"watchOptions": {
"ignore": []
},
"debugOptions": {
"hidedInDevtools": []
},
"scripts": {},
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": {
"search": {
"current": -1,
"list": []
},
"conversation": {
"current": -1,
"list": []
},
"plugin": {
"current": -1,
"list": []
},
"game": {
"current": -1,
"list": []
},
"gamePlugin": {
"current": -1,
"list": []
},
"miniprogram": {
"current": 28,
"list": [
{
"id": 0,
"name": "工作计划表",
"pathName": "pages/word_report/word_report",
"query": "id=17&status=1",
"scene": null
},
{
"id": -1,
"name": "pages/myteam/myteam",
"pathName": "pages/myteam/myteam",
"query": "",
"scene": null
},
{
"id": 2,
"name": "我的培训",
"pathName": "pages/mytrain/mytrain",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/Online_regulations/Online_regulations",
"pathName": "pages/Online_regulations/Online_regulations",
"query": "",
"scene": null
},
{
"id": 4,
"name": "学习内容",
"pathName": "pages/getStudycontent/getStudycontent",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/apply/apply",
"pathName": "pages/apply/apply",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/Volunteer_detail/Volunteer_detail",
"pathName": "pages/Volunteer_detail/Volunteer_detail",
"query": "",
"scene": null
},
{
"id": 7,
"name": "志愿回馈",
"pathName": "pages/myfeedback/myfeedback",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/myaddress/myaddress",
"pathName": "pages/myaddress/myaddress",
"query": "",
"scene": null
},
{
"id": 9,
"name": "志愿动态",
"pathName": "pages/Volunteer_dynamic/Volunteer_dynamic",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/guanlitiaoli/guanlitiaoli",
"pathName": "pages/guanlitiaoli/guanlitiaoli",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/mycertificate/mycertificate",
"pathName": "pages/mycertificate/mycertificate",
"query": "",
"scene": null
},
{
"id": 12,
"name": "申请加入",
"pathName": "pages/Volunteer_group/active/active",
"query": "",
"scene": null
},
{
"id": -1,
"name": "志愿团队",
"pathName": "pages/Volunteer_group/Volunteer_group",
"query": "",
"scene": null
},
{
"id": -1,
"name": "我的地址列表",
"pathName": "pages/myaddress/myaddress",
"query": "",
"scene": null
},
{
"id": -1,
"name": "我的收货地址",
"pathName": "pages/myaddcompile/myaddcompile",
"query": "",
"scene": null
},
{
"id": -1,
"name": "我的团队",
"pathName": "pages/myteam/myteam",
"query": "",
"scene": null
},
{
"id": 18,
"name": "商品详情",
"pathName": "pages/myfeedback/myfeedback_active/myfeedback_active",
"query": "",
"scene": null
},
{
"id": -1,
"name": "积分兑换",
"pathName": "pages/myfeedback/myfeedback_duihuan/myfeedback_duihuan",
"query": "",
"scene": null
},
{
"id": -1,
"name": "光荣排行",
"pathName": "pages/guangrongpaihang/guangrongpaihang",
"query": "",
"scene": null
},
{
"id": -1,
"name": "我的活动",
"pathName": "pages/myactivity/myactivity",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/myactivity/myactivity_active/myactivity_active",
"pathName": "pages/myactivity/myactivity_active/myactivity_active",
"query": "",
"scene": null
},
{
"id": -1,
"name": "答题详情",
"pathName": "pages/getStudycontent/answer/answer",
"query": "",
"scene": null
},
{
"id": 23,
"name": "在线培训",
"pathName": "pages/Online_regulations/Online_regulations",
"query": "",
"scene": null
},
{
"id": 24,
"name": "学习内容",
"pathName": "pages/getStudycontent/getStudycontent",
"query": "",
"scene": null
},
{
"id": -1,
"name": "dati ",
"pathName": "pages/getStudycontent/answer/answer",
"query": "id=1",
"scene": null
},
{
"id": -1,
"name": "电子证件",
"pathName": "pages/mycertificate/mycertificate",
"query": "",
"scene": null
},
{
"id": -1,
"name": "编辑资料",
"pathName": "pages/mydetail/mydetail",
"query": "",
"scene": null
},
{
"id": -1,
"name": "工时兑换",
"pathName": "pages/myfeedback/myfeedback_list/myfeedback_list",
"query": "",
"scene": null
},
{
"id": -1,
"name": "我的资料",
"pathName": "pages/mydetail/mydetail",
"query": "",
"scene": null
},
{
"id": -1,
"name": "更多志愿者",
"pathName": "pages/more/more",
"query": "",
"scene": null
},
{
"id": -1,
"name": "志愿动态详情",
"pathName": "pages/getNewsInfo/getNewsInfo",
"query": "",
"scene": null
},
{
"id": -1,
"name": "审核状态",
"pathName": "pages/result/result",
"query": "",
"scene": null
},
{
"id": 33,
"name": "志愿礼物详情",
"pathName": "pages/myfeedback/myfeedback_detail/myfeedback_detail",
"query": "",
"scene": null
},
{
"id": -1,
"name": "我的志愿回馈",
"pathName": "pages/myfeedback_lists/myfeedback_lists",
"query": "",
"scene": null
}
]
}
}
}
\ No newline at end of file
... ...