bug修改

@@ -36,6 +36,8 @@
     "pages/myfeedback/myfeedback",
     "pages/myfeedback/myfeedback",
     "pages/myfeedback/myfeedback_active/myfeedback_active",
     "pages/myfeedback/myfeedback_active/myfeedback_active",
     "pages/myfeedback/myfeedback_duihuan/myfeedback_duihuan",
     "pages/myfeedback/myfeedback_duihuan/myfeedback_duihuan",
+    "pages/myfeedback/myfeedback_list/myfeedback_list",
+    "pages/myfeedback_lists/myfeedback_lists",
     "pages/mycertificate/mycertificate",
     "pages/mycertificate/mycertificate",
     "pages/myaddress/myaddress",
     "pages/myaddress/myaddress",
     "pages/myaddcompile/myaddcompile"
     "pages/myaddcompile/myaddcompile"

-
-page{
+page {
 
 
     background-color: rgb(240, 240, 240);
     background-color: rgb(240, 240, 240);
 }
 }
+
 .goods_index {
 .goods_index {
     padding: 20rpx 0;
     padding: 20rpx 0;
 }
 }
 
 
 /* 导航条开始 */
 /* 导航条开始 */
 .navbar {
 .navbar {
-    padding        : 0 62rpx;
+    padding: 0 62rpx;
     display: flex;
     display: flex;
     justify-content: space-around;
     justify-content: space-around;
     /* background  : linear-gradient(136deg,#4e8fff 2%, #55c2fa); */
     /* background  : linear-gradient(136deg,#4e8fff 2%, #55c2fa); */
@@ -51,16 +51,16 @@ page{
 }
 }
 
 
 /* 导航条结束 */
 /* 导航条结束 */
-.goods_groups{
+.goods_groups {
     padding: 0 72rpx;
     padding: 0 72rpx;
-height: 88rpx;
-line-height: 88rpx;
-display:flex;
-justify-content: space-between;
-color: #323233;
-font-size: 28rpx;
+    height: 88rpx;
+    line-height: 88rpx;
+    display: flex;
+    justify-content: space-between;
+    color: #323233;
+    font-size: 28rpx;
 }
 }
-.goods_groups view{
 
 
-    
-}
+.goods_groups view {
+    width: 25%;
+}

@@ -88,7 +88,12 @@ Page({
     })
     })
 
 
   },
   },
-
+  // 我的志愿回馈
+  getmyfeedback() {
+    wx.navigateTo({
+      url: '/pages/myfeedback_lists/myfeedback_lists',
+    })
+  },
   // 管理条例
   // 管理条例
   getRule(e) {
   getRule(e) {
     wx.navigateTo({
     wx.navigateTo({

@@ -120,7 +120,7 @@
 		<view class='iconfont icon-xiangyou'></view>
 		<view class='iconfont icon-xiangyou'></view>
 
 
 	</view>
 	</view>
-	<view class='my_item' bindtap="getfeedback">
+	<view class='my_item' bindtap="getmyfeedback">
 		<view class='my_itemletf'>
 		<view class='my_itemletf'>
 			<view class='iconfont '>
 			<view class='iconfont '>
 				<image src="/imgs/ac11.png"></image>
 				<image src="/imgs/ac11.png"></image>

@@ -66,7 +66,7 @@ Page({
         })
         })
     },
     },
 
 
-    // 打卡
+    // 上岗打卡
     getpunch() {
     getpunch() {
 
 
         let that = this;
         let that = this;
@@ -83,9 +83,35 @@ Page({
         console.log(d)
         console.log(d)
         app.post(url, d, head).then((res) => {
         app.post(url, d, head).then((res) => {
             console.log(res)
             console.log(res)
-            // that.setData({
-            //     list: res
-            // })
+            wx.showToast({
+              title: '打卡成功',
+            })
+
+        }).catch((err) => {
+
+        })
+
+    },
+
+    // 下岗打卡
+    getEnd() {
+
+        let that = this;
+        let url = '/index/second/endClock';
+        let head = {
+            'XX-Token': wx.getStorageSync('token')
+        }
+        let d = {
+            id: that.data.id,
+            
+
+        }
+        console.log(d)
+        app.post(url, d, head).then((res) => {
+            console.log(res)
+            wx.showToast({
+                title: '打卡成功',
+              })
 
 
         }).catch((err) => {
         }).catch((err) => {
 
 

@@ -10,29 +10,26 @@
     <view class="myactivity_wrap">
     <view class="myactivity_wrap">
         <view class="myactivity_starttime">
         <view class="myactivity_starttime">
             <view>上岗打卡{{list.start_clock_time}}</view>
             <view>上岗打卡{{list.start_clock_time}}</view>
-            <view class="state" wx:if="{{list.status==0}}">未打卡</view>
-            <view class="state" wx:if="{{list.status==1}}">已开始</view>
-            <view class="state" wx:if="{{list.status==2}}">完成打开</view>
-            <view class="state" wx:if="{{list.status==3}}">未完成</view>
+            <view class="state">{{list.user_start_text}}   {{list.start_status}}</view>
+            <!-- <view class="state" wx:if="{{list.status==1}}">已开始</view>
+            <view class="state" wx:if="{{list.status==2}}">完成打卡</view>
+            <view class="state" wx:if="{{list.status==3}}">未完成</view> -->
         </view>
         </view>
         <view class="myactivity_starttime">
         <view class="myactivity_starttime">
             <view>下岗打卡{{list.end_clock_time}}</view>
             <view>下岗打卡{{list.end_clock_time}}</view>
-            <view class="state" wx:if="{{list.status==0}}">未打卡</view>
-            <view class="state" wx:if="{{list.status==1}}">已开始</view>
-            <view class="state" wx:if="{{list.status==2}}">完成打卡</view>
-            <view class="state" wx:if="{{list.status==3}}">未完成</view>
+            <view class="state">{{list.user_end_text}}  {{list.end_status}}</view>
         </view>
         </view>
     </view>
     </view>
-    <view class="myactivity_start" bindtap="getpunch">
+    <view class="myactivity_start" bindtap="getpunch" wx:if="{{list.status==0}}">
         <view>上岗打卡</view>
         <view>上岗打卡</view>
         <view>12:00</view>
         <view>12:00</view>
     </view>
     </view>
-    <view class="myactivity_start" bindtap="getpunch">
+    <view class="myactivity_start" bindtap="getEnd" wx:if="{{list.status==1}}">
         <view>下岗打卡</view>
         <view>下岗打卡</view>
         <view>12:00</view>
         <view>12:00</view>
     </view>
     </view>
 
 
-    <view class="myactivity_end" >
+    <view class="myactivity_end" wx:if="{{list.status==2}}">
         <image src="/imgs/wancheng.png"></image>
         <image src="/imgs/wancheng.png"></image>
         <view>已完成打卡</view>
         <view>已完成打卡</view>
         <view>感谢您参加本次公益活动 爱上一盏灯，照亮你我他</view>
         <view>感谢您参加本次公益活动 爱上一盏灯，照亮你我他</view>

@@ -74,9 +74,17 @@
                 address_id: that.data.datalist.id,
                 address_id: that.data.datalist.id,
                 remark:that.data.remark
                 remark:that.data.remark
             }, head).then((res) => {
             }, head).then((res) => {
+                console.log(res)
                 wx.showToast({
                 wx.showToast({
                     title: '兑换成功',
                     title: '兑换成功',
                 })
                 })
+                setTimeout(function () {
+                    wx.navigateTo({
+                      url: '/pages/myfeedback/myfeedback_list/myfeedback_list'
+                    })
+                  }, 1000)
+
+
 
 
             }).catch((err) => {
             }).catch((err) => {
 
 

+// pages/myfeedback/myfeedback_list/myfeedback_list.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+    getanswer() {
+        wx.navigateTo({
+            url: '/pages/myfeedback_lists/myfeedback_lists',
+        })
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+{
+  "usingComponents": {}
+}

+<view class="list">
+    <image src="/imgs/dingdanliebaio.png"></image>
+    <view class="list_post">
+        <view class="list_status">兑换申请提交成功 待审核</view>
+        <view class="list_num">
+            <image src="/imgs/dingdan.png"></image> 订单编号：12345678910
+        </view>
+        <view class="list_num">
+            <image src="/imgs/dingdan1.png"></image> 兑换时间：2020-02-21 13:0
+        </view>
+    </view>
+</view>
+
+
+<view class="answer" bindtap="getanswer">
+    <button hover-class="none">我的兑换记录</button>
+</view>

+.list {
+    margin: 24rpx 32rpx;
+
+
+}
+
+.list image {
+    width: 100%;
+    height: 446rpx;
+
+}
+
+.list_post {
+    margin-top: -402rpx;
+
+
+}
+
+.list_status {
+    margin-bottom: 114rpx;
+    font-size: 48rpx;
+    font-family: PingFangSC, PingFangSC-Semibold;
+    font-weight: 600;
+    text-align: center;
+    line-height: 98rpx;
+    color: #ffffff;
+}
+.list_num{
+    margin-left: 40rpx;
+    margin-bottom: 48rpx;
+    color: #969799;
+    display: flex;
+    align-items: center;
+}
+.list_num image{
+    width: 44rpx;
+    height: 44rpx;
+    margin-right: 16rpx;
+  
+}
+.answer {
+    width: 100%;
+    height: 122rpx;
+    position: fixed;
+    bottom: 0;
+    box-shadow: 0px -6px 15px 0px rgba(0, 67, 26, 0.06);
+    display: flex;
+    align-items: center;
+
+}
+
+button {
+    width: 622rpx;
+    height: 88rpx;
+    color: #ffffff;
+    font-size: 32rpx;
+    background: linear-gradient(130deg, #2ed26e 13%, #05983e 98%);
+    border-radius: 22px;
+    box-shadow: 0px 9px 19px 0px rgba(0, 116, 45, 0.42);
+}

+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        nav: 0,
+        list: ''
+    },
+
+    bindNav(e) {
+        var nav = e.currentTarget.dataset.nav
+        console.log(nav)
+        this.setData({
+            nav
+        })
+        this.getList();
+    },
+
+    // 列表
+    getList() {
+
+        let that = this;
+        let url = '/index/second/orderList';
+        let head = {
+            'XX-Token': wx.getStorageSync('token')
+        }
+        let d = {
+            type: that.data.nav
+        }
+        app.post(url, d, head).then((res) => {
+            console.log(res)
+            that.setData({
+                list: res
+            })
+
+        }).catch((err) => {
+
+        })
+    },
+
+
+
+
+    onLoad: function (options) {
+
+    },
+
+
+    onReady: function () {
+
+    },
+
+    onShow: function () {
+        let that = this;
+        that.getList();
+
+
+    },
+
+
+    onHide: function () {
+
+    },
+
+
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "我的志愿回馈"
+}

+<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>
+
+<view wx:if="{{nav==0}}">
+    <view class="list" wx:for="{{list.data}}">
+        <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>
+    </view>
+</view>
+<view wx:else>
+    <view class="list" wx:for="{{list.data}}">
+        <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>
+    </view>
+
+</view>

+page {
+    background-color: rgb(240, 240, 240);
+}
+
+/* 导航条开始 */
+.navbar {
+    height: 88rpx;
+    padding: 0 62rpx;
+    display: flex;
+    justify-content: space-around;
+    /* background  : linear-gradient(136deg,#4e8fff 2%, #55c2fa); */
+    background-color: #ffffff;
+    font-size: 30rpx;
+    color: #969799;
+    border-radius: 2px 0px 0px 2px;
+
+}
+
+.navbar .item {
+    width: 346rpx;
+    height: 64rpx;
+    line-height: 66rpx;
+    font-size: 24rpx;
+    position: relative;
+    text-align: center;
+    /* background-color: #FFC909; */
+    /* border-radius   : 19px; */
+
+}
+
+.navbar .item.choose {
+    color: black;
+    /* background: linear-gradient(136deg, #4e8fff 2%, #55c2fa); */
+
+}
+
+.navbar .item.choose:after {
+    content: "";
+    display: block;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    width: 80rpx;
+    height: 6rpx;
+    background: #21AE58;
+    margin: 0 auto;
+}
+
+.list {
+    margin: 24rpx 34rpx;
+    padding: 24rpx;
+    display: flex;
+    justify-content: space-between;
+    background-color: #ffffff;
+    border-radius: 24rpx;
+
+}
+
+.list image {
+    width: 240rpx;
+    height: 240rpx;
+
+}
+
+.list_right {
+    padding: 24rpx;
+    width: 374rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+
+.list_right :nth-child(1) {
+    height: 80rpx;
+    font-size: 28rpx;
+    font-family: PingFangSC, PingFangSC-Regular;
+    font-weight: 400;
+    text-align: left;
+    color: #323233;
+    line-height: 40rpx;
+}
+
+.list_right :nth-child(2) {
+    text-align: right;
+    color: #21AE58;
+    font-size: 32rpx;
+
+}

@@ -261,6 +261,13 @@
                     "id": -1,
                     "id": -1,
                     "name": "编辑资料",
                     "name": "编辑资料",
                     "pathName": "pages/mydetail/mydetail",
                     "pathName": "pages/mydetail/mydetail",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "工时兑换",
+                    "pathName": "pages/myfeedback/myfeedback_list/myfeedback_list",
                     "scene": null
                     "scene": null
                 }
                 }
             ]
             ]