chengjunhui 1 giorno fa
parent
commit
7f471bf815

+ 165 - 261
pages/checkin/index.js

@@ -9,11 +9,7 @@ Page({
   data: {
     appAssetsUrl: App.appAssetsUrl,
     appAssetsUrl2: App.appAssetsUrl2,
-    userInfo: {
-      avatar: 'https://thirdwx.qlogo.cn/mmopen/vi_32/Q0j4TwGTfTLt5DDw9rFVYB2D8bYlMOVqVTdJ2y7WRzVBJy5s3ib5K8nIHQ8iaJrGvEJmjwP3QrhEEHgPnIiccRJvA/132',
-      nickname: '刘微雪',
-      points: 2000
-    },
+    userInfo: {},
     currentDate: new Date(),
     currentYear: new Date().getFullYear(),
     currentMonth: new Date().getMonth() + 1,
@@ -22,103 +18,69 @@ Page({
     isCheckedToday: false, // 今天是否已签到
     weekdays: ['一', '二', '三', '四', '五', '六', '日'],
     calendarDays: [],
-    tasks: [
-      {
-        id: 1,
-        icon: '/assets/images/user-icon/user1.png',
-        title: '邀请好友',
-        desc: '邀请成功可获得积分奖励',
-        status: '去完成'
-      },
-      {
-        id: 2,
-        icon: '/assets/images/user-icon/user2.png',
-        title: '观看广告',
-        desc: '观看广告可获得积分奖励',
-        count: '(0/3)',
-        status: '去完成'
-      },
-      {
-        id: 3,
-        icon: '/assets/images/user-icon/user3.png',
-        title: '参与课程',
-        desc: '邀请成功可获得积分奖励',
-        status: '去完成'
-      },
-      {
-        id: 4,
-        icon: '/assets/images/user-icon/user4.png',
-        title: '邀请好友',
-        desc: '邀请成功可获得积分奖励',
-        status: '去完成'
-      }
-    ]
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    wx.setNavigationBarTitle({
-      title: '每日签到'
-    });
-    // this.loadCheckinHistory();
-    // this.initCalendar();
-    this.getUserInfo();
-    // this.getCheckDate();
+    tasks: [],
+    totalScore: 0
   },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-    // 页面显示时重新加载签到状态
-    this.loadCheckinHistory();
-    this.initCalendar();
+  loadList() {
+    let that = this;
+    wx.showLoading({
+      title: '努力加载中...',
+    })
+    App._post_form('scoreTask/list', '', {
+      stuId: util.getUserId()
+    },
+      function (res) {
+        if (res.code == 0 && res.data) {
+          // console.log(res);
+          let list = res.data.dayTask ? [...res.data.dayTask] : [];
+          let list1 = res.data.infiniteTask ? [...res.data.infiniteTask] : [];
+          let list2 = res.data.singleTask ? [...res.data.singleTask] : [];
+          console.log([...list, ...list1, ...list2]);
+          that.setData({
+            tasks: [...list, ...list1, ...list2]
+          })
+          // that.setData({
+          //   list: [{
+          //     name: '单次任务',
+          //     children: res.data.singleTask.map(item => {
+          //       return {
+          //         taskName: item.taskName,
+          //         taskScore: item.taskScore
+          //       }
+          //     })
+          //   }, {
+          //     name: '每日任务',
+          //     children: res.data.dayTask.map(item => {
+          //       return {
+          //         taskName: item.taskName,
+          //         taskScore: item.taskScore
+          //       }
+          //     })
+          //   }, {
+          //     name: '不限次任务',
+          //     children: res.data.infiniteTask.map(item => {
+          //       return {
+          //         taskName: item.taskName,
+          //         taskScore: item.taskScore
+          //       }
+          //     })
+          //   }]
+          // })
+        }
+      })
   },
-
-  /**
-   * 下拉刷新
-   */
-  onPullDownRefresh: function () {
-    this.loadCheckinHistory();
-    this.initCalendar();
-    this.getUserInfo();
-    wx.stopPullDownRefresh();
+  onPointsTap() {
+    wx.navigateTo({
+      url: "/pointExchange/pages/center/center?totalScore=" + this.data.totalScore,
+    });
   },
-
   /**
-   * 加载签到历史记录
-   */
-  loadCheckinHistory () {
-    // const currentDate = new Date();
-    // const year = currentDate.getFullYear();
-    // const month = currentDate.getMonth() + 1;
-    // const storageKey = `checkin_${year}_${month}`;
-
-    // // 从本地存储加载当月签到记录
-    // let checkedDates = wx.getStorageSync(storageKey) || [];
-
-    // // 确保数据是数组格式
-    // if (!Array.isArray(checkedDates)) {
-    //   checkedDates = [];
-    // }
-
-    // // 过滤掉无效的日期(大于当月最大天数)
-    // const daysInMonth = new Date(year, month, 0).getDate();
-    // checkedDates = checkedDates.filter(day => day >= 1 && day <= daysInMonth);
-
-    // this.setData({
-    //   checkedDates
-    // });
-
-    // TODO: 这里可以调用API从服务器获取签到记录
-    this.getCheckinHistoryFromServer();
-  },
-  //获取用户信息
-  getUserInfo () {
+      * 查询用户数据根据id
+      */
+  getUserInfo() {
     let _this = this;
     let id = util.getUserId();
+    let openid = wx.getStorageSync("openid");
     if (id) {
       let parm = {
         id,
@@ -128,12 +90,13 @@ Page({
         "application/json",
         JSON.stringify(parm),
         function (res) {
-          console.log(res);
+          // console.log(res);
           if (res.code === 0) {
             wx.setStorageSync("USER", res.member);
             _this.setData({
               userInfo: res.member,
             });
+            // _this.loadUser()
           } else {
             wx.removeStorageSync("USER");
             wx.navigateTo({
@@ -142,34 +105,81 @@ Page({
           }
         }
       );
+    } else {
+      wx.navigateTo({
+        url: '/pages/login',
+      })
     }
   },
-  // 获取已签到日期
-  getCheckDate () {
-    App._get(
-      '/scoreStu/list',
-      { stuId: util.getUserId() }).then(res => {
-      });
+
+  loadData() {
+    let that = this;
+    App._post_form('scoreStu/totalScore', '', {
+      stuId: util.getUserId()
+    },
+      function (res) {
+        if (res.code == 0) {
+          that.setData({
+            totalScore: res.data
+          })
+        }
+      })
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    wx.setNavigationBarTitle({
+      title: '每日签到'
+    });
+    this.loadData();
+    this.getUserInfo();
+    this.loadList();
   },
+
   /**
-   * 从服务器获取签到历史(备用)
+   * 生命周期函数--监听页面显示
    */
-  getCheckinHistoryFromServer () {
+  onShow: async function () {
+    // 页面显示时重新加载签到状态
+    await this.getCheckinHistoryFromServer();
+    this.loadData();
+    this.initCalendar();
+  },
+
+  /**
+   * 下拉刷新
+   */
+  onPullDownRefresh: async function () {
+    await this.getCheckinHistoryFromServer();
+    this.loadData();
+    this.initCalendar();
+    this.getUserInfo();
+    wx.stopPullDownRefresh();
+  },
+
+  /**
+   * 从服务器获取签到历史
+   */
+  getCheckinHistoryFromServer() {
     const userId = util.getUserId();
+    wx.showLoading({
+      title: '加载中...',
+      mask: true
+    });
     if (!userId) return;
-
     App._get(
-      '/scoreStu/list',
-      {
-        stuId: userId,
-      },
+      'user/dayList/' + userId,
+      {},
       (res) => {
+        wx.hideLoading();
         if (res.code === 0) {
-          let data = res.data.map(v => {
-            return parseInt(v.substr(6, 2));
-          })
+          // let data = res.data.map(v => {
+          //   return parseInt(v.substr(6, 2));
+          // })
           this.setData({
-            checkedDates: data
+            checkedDates: res.data || []
           });
           this.initCalendar();
         }
@@ -180,7 +190,7 @@ Page({
   /**
    * 初始化日历
    */
-  initCalendar () {
+  initCalendar() {
     // 使用当前系统时间
     const date = new Date();
     const year = date.getFullYear();
@@ -204,26 +214,30 @@ Page({
 
     // 添加当月日期
     for (let day = 1; day <= daysInMonth; day++) {
+      let date1 = `${year}${month + 1 > 9 ? month + 1 : '0' + (month + 1)}${day > 9 ? day : '0' + day}`
       calendarDays.push({
         day: day,
         isEmpty: false,
         isToday: day === today,
-        isChecked: this.data.checkedDates.includes(day)
+        isChecked: this.data.checkedDates.includes(date1)
       });
     }
-    console.log('aaa', calendarDays, this.data.checkedDates.includes(26))
+    let date1 = `${year}${month + 1 > 9 ? month + 1 : '0' + (month + 1)}${today > 9 ? today : '0' + today}`
+
+    console.log('date1', date1)
+    // console.log('aaa', calendarDays, this.data.checkedDates.includes(today))
     this.setData({
       calendarDays,
       currentYear: year,
       currentMonth: month + 1,
       today: today,
-      isCheckedToday: this.data.checkedDates.includes(today)
+      isCheckedToday: this.data.checkedDates.includes(date1)
     });
   },
   /**
    * 立即签到
    */
-  handleCheckin () {
+  handleCheckin() {
     if (this.data.isCheckedToday) {
       wx.showToast({
         title: '今日已签到',
@@ -243,106 +257,33 @@ Page({
   /**
    * 执行签到操作
    */
-  performCheckin () {
+  performCheckin() {
     const userId = util.getUserId();
     const currentDate = new Date();
-    // TODO: 调用签到API
-    // App._post_form(
-    //   '/api/scoreStu/dailyLogin',
-    //   'application/json',
-    //   {
-    //     userId: userId,
-    //   },
-    //   (res) => {
-    //     if (res.code === 0) {
-    //       this.updateCheckinSuccess(res.data.points || 10);
-    //     } else {
-    //       wx.hideLoading();
-    //       wx.showToast({
-    //         title: res.message || '签到失败',
-    //         icon: 'none'
-    //       });
-    //     }
-    //   }
-    // );
-
-    // 模拟成功签到
-    // setTimeout(() => {
-    this.updateCheckinSuccess(10);
-    // }, 1000);
-  },
-
-  /**
-   * 更新签到成功状态
-   */
-  updateCheckinSuccess (points = 10) {
-    // wx.hideLoading();
-
-    // const today = this.data.today;
-    // const checkedDates = [...this.data.checkedDates, today];
-    // const calendarDays = this.data.calendarDays.map(item => {
-    //   if (item.day === today) {
-    //     return { ...item, isChecked: true };
-    //   }
-    //   return item;
-    // });
-
-    // // 保存到本地存储
-    // const currentDate = new Date();
-    // const year = currentDate.getFullYear();
-    // const month = currentDate.getMonth() + 1;
-    // const storageKey = `checkin_${year}_${month}`;
-    // wx.setStorageSync(storageKey, checkedDates);
-
-    // this.setData({
-    //   checkedDates,
-    //   calendarDays,
-    //   isCheckedToday: true,
-    //   'userInfo.points': this.data.userInfo.points + points
-    // });
-
-    // wx.showToast({
-    //   title: `签到成功,获得${points}积分`,
-    //   icon: 'success'
-    // });
-
-    // 统计积分(每日登录)
-    // this.addScore();
-    if (!util.getUserId()) {
-      return;
-    }
     let _this = this;
+    // TODO: 调用签到API
     App._post_form(
-      'scoreStu/dailySign',
-      '', {
-      stuId: util.getUserId(),
-    },
-      function (res) {
-        // 积分统计完成
-        wx.showToast({
-          title: `签到成功,获得${points}积分`,
-          icon: 'success'
-        });
-        _this.loadCheckinHistory();
-        _this.initCalendar();
-      }
-    );
-  },
-
-  /**
-   * 统计积分(每日登录)
-   */
-  addScore: function () {
-    if (!util.getUserId()) {
-      return;
-    }
-    App._post_form(
-      'scoreStu/dailyLogin/dailySign',
-      '', {
-      stuId: util.getUserId(),
-    },
-      function (res) {
-        // 积分统计完成
+      'user/dailySign',
+      'application/json',
+      {
+        stuId: userId
+      },
+      async (res) => {
+        if (res.code === 0) {
+          // 积分统计完成
+          wx.showToast({
+            title: `签到成功`,
+            icon: 'success'
+          });
+          await _this.getCheckinHistoryFromServer();
+          _this.initCalendar();
+        } else {
+          wx.hideLoading();
+          wx.showToast({
+            title: res.message || '签到失败',
+            icon: 'none'
+          });
+        }
       }
     );
   },
@@ -350,14 +291,16 @@ Page({
   /**
    * 处理任务点击
    */
-  handleTaskClick (e) {
-    const taskId = e.currentTarget.dataset.id;
-    const task = this.data.tasks.find(t => t.id == taskId);
+  handleTaskClick(e) {
+    console.log('handleTaskClick', e);
+    return;
+    // const taskId = e.currentTarget.dataset.id;
+    // const task = this.data.tasks.find(t => t.id == taskId);
 
-    wx.showToast({
-      title: `点击了${task.title}`,
-      icon: 'none'
-    });
+    // wx.showToast({
+    //   title: `点击了${task.title}`,
+    //   icon: 'none'
+    // });
 
     // 根据不同任务跳转到不同页面
     switch (taskId) {
@@ -376,43 +319,4 @@ Page({
         break;
     }
   },
-
-  /**
-   * 邀请好友
-   */
-  inviteFriend () {
-    wx.showModal({
-      title: '邀请好友',
-      content: '邀请好友注册可获得积分奖励',
-      confirmText: '立即邀请',
-      success: (res) => {
-        if (res.confirm) {
-          // 实现邀请逻辑
-          wx.showToast({
-            title: '邀请功能开发中',
-            icon: 'none'
-          });
-        }
-      }
-    });
-  },
-
-  /**
-   * 观看广告
-   */
-  watchAd () {
-    wx.showToast({
-      title: '广告功能开发中',
-      icon: 'none'
-    });
-  },
-
-  /**
-   * 参与课程
-   */
-  joinCourse () {
-    wx.navigateTo({
-      url: '/pages/home/index/courseDetail/courseDetail'
-    });
-  }
 });

+ 24 - 21
pages/checkin/index.wxml

@@ -8,57 +8,60 @@
       </view>
     </view>
     <view class="points-info">
-      <view class="points-number">{{userInfo.totalPoints||0}}</view>
+      <view class="points-number" bindtap="onPointsTap">{{totalScore||0}}</view>
       <view class="points-label">我的积分</view>
     </view>
   </view>
-
   <!-- 签到标题和月份 -->
   <view class="checkin-header">
     <view class="checkin-title">每日签到</view>
     <view class="month-info">{{currentYear}}.{{currentMonth}}月</view>
   </view>
-
   <!-- 日历组件 -->
   <view class="calendar-container">
     <!-- 星期标题 -->
     <view class="weekdays">
       <view class="weekday" wx:for="{{weekdays}}" wx:key="index">{{item}}</view>
     </view>
-
     <!-- 日期网格 -->
     <view class="calendar-grid">
-      <view
-        class="calendar-day {{item.isEmpty ? 'empty' : ''}} {{item.isToday ? 'today' : ''}} {{item.isChecked ? 'checked' : ''}}"
-        wx:for="{{calendarDays}}" wx:key="index">
+      <view class="calendar-day {{item.isEmpty ? 'empty' : ''}} {{item.isToday && !item.isChecked ? 'today' : ''}} {{item.isChecked ? 'checked' : ''}}" wx:for="{{calendarDays}}" wx:key="index">
         <view class="day-number" wx:if="{{!item.isEmpty}}">{{item.day}}</view>
-        <view class="check-dot" wx:if="{{item.isChecked && !item.isEmpty}}"></view>
+        <view class="check-dot" wx:if="{{item.isChecked && !item.isEmpty}}">√</view>
       </view>
     </view>
-  </view>
-
-  <!-- 签到按钮 -->
-  <view class="checkin-btn-container">
-    <button class="checkin-btn {{isCheckedToday ? 'disabled' : ''}}" bindtap="handleCheckin"
-      disabled="{{isCheckedToday}}">
-      {{isCheckedToday ? '今日已签到' : '立即签到'}}
-    </button>
+         <!-- 签到按钮 -->
+     <view class="checkin-btn-container">
+       <button class="checkin-btn {{isCheckedToday ? 'disabled' : ''}}" bindtap="handleCheckin" disabled="{{isCheckedToday}}">{{
+        isCheckedToday ? '今日已签到' : '立即签到'
+       }}</button>
+     </view>
   </view>
 
   <!-- 积分任务 -->
   <view class="tasks-section">
     <view class="tasks-title">积分任务</view>
     <view class="tasks-list">
-      <view class="task-item" wx:for="{{tasks}}" wx:key="id" bindtap="handleTaskClick" data-id="{{item.id}}">
+      <view class="task-item" wx:for="{{tasks}}" wx:key="id" bindtap="handleTaskClick" data-item="{{item}}">
         <view class="task-content">
-          <image class="task-icon" src="{{item.icon || appAssetsUrl2 + 'new/user.png'}}" mode="aspectFit"></image>
+          <!-- <image class="task-icon" src="{{item.icon || appAssetsUrl2 + 'new/user.png'}}" mode="aspectFit"></image> -->
+          <!--<view class="box">
+            <image class="task-icon" wx:if="{{item.taskName=='完善资料'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon1.png"></image>
+            <image class="task-icon" wx:if="{{item.taskName=='分享小程序'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon2.png"></image>
+            <image class="task-icon" wx:if="{{item.taskName=='每日登录'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon3.png"></image>
+            <image class="task-icon" wx:if="{{item.taskName=='成功邀请好友'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon4.png"></image>
+            <image class="task-icon" wx:if="{{item.taskName=='购买会员'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon5.png"></image>
+            <image class="task-icon" wx:if="{{item.taskName=='参加兼职/成长会'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon6.png"></image>
+            <image class="task-icon" wx:if="{{item.taskName=='评价'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon7.png"></image>
+            <image class="task-icon" wx:if="{{item.taskName=='商城兑换'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon8.png"></image>
+          </view>-->
           <view class="task-info">
-            <view class="task-title">{{item.title}} {{item.count || ''}}</view>
+            <view class="task-title">{{item.taskName}}</view>
             <view class="task-desc">{{item.desc}}</view>
           </view>
         </view>
-        <view class="task-action">
-          <text class="action-text">{{item.status}}</text>
+        <view class="task-action {{item.complete ? 'complete' : ''}}">
+          <text class="action-text">{{item.complete ? '已完成' : '去完成'}}</text>
         </view>
       </view>
     </view>

+ 67 - 23
pages/checkin/index.wxss

@@ -1,6 +1,10 @@
 /* pages/checkin/index.wxss */
 .checkin-container {
-  background: linear-gradient(180deg, #e8f4fd 0%, #f0f8ff 30%, #f8f9fc 60%);
+  /* background: #ffffff; */
+  /* opacity: 0.56; */
+  background: linear-gradient(0deg, #f6f2f9 70%, #d2e6ff 93%);
+  /* border-radius: 50%; */
+  /* filter: blur(30rpx); */
   min-height: 100vh;
   padding: 0 32rpx;
 }
@@ -50,8 +54,8 @@
 }
 
 .points-label {
-  font-size: 24rpx;
-  color: #999;
+  font-size: 28rpx;
+  color: #1a1a1a;
   margin-top: 8rpx;
 }
 
@@ -60,13 +64,18 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: 32rpx;
+  /* margin-bottom: 32rpx; */
+  background: #c5e1ff;
+  border-radius: 40rpx 40rpx 0px 0px;
+  box-shadow: 0px 29rpx 29rpx 0px #c5e1ff inset;
+  padding: 32rpx 30rpx;
+  box-sizing: border-box;
 }
 
 .checkin-title {
-  font-size: 36rpx;
-  font-weight: 600;
-  color: #333;
+  font-size: 32rpx;
+  font-weight: 700;
+  color: #1e5abf;
 }
 
 .month-info {
@@ -77,7 +86,7 @@
 /* 日历容器 */
 .calendar-container {
   background: #fff;
-  border-radius: 24rpx;
+  border-radius: 0 0 40rpx 40rpx;
   padding: 32rpx;
   margin-bottom: 40rpx;
   box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.08);
@@ -143,12 +152,16 @@
 }
 
 .check-dot {
-  width: 12rpx;
-  height: 12rpx;
+  width: 22rpx;
+  height: 22rpx;
+  line-height: 22rpx;
   background: #4a90e2;
   border-radius: 50%;
   position: absolute;
-  bottom: 8rpx;
+  bottom: 0rpx;
+  font-size: 15rpx;
+  color: #ffffff;
+  text-align: center;
 }
 
 .calendar-day.today .check-dot {
@@ -157,22 +170,23 @@
 
 /* 签到按钮 */
 .checkin-btn-container {
-  margin-bottom: 48rpx;
+  margin-bottom: 10rpx;
 }
 
 .checkin-btn {
   width: 100%;
-  height: 96rpx;
-  background: linear-gradient(135deg, #4a90e2 0%, #357abd 100%);
+  height: 80rpx;
+  background: #2b58a5 !important;
   border: none;
   border-radius: 48rpx;
-  color: #fff !important;
-  font-size: 32rpx;
-  font-weight: 600;
+  color: #ffffff !important;
+  font-size: 26rpx;
+  font-weight: 400;
   display: flex;
   align-items: center;
   justify-content: center;
-  box-shadow: 0 8rpx 24rpx rgba(74, 144, 226, 0.3);
+  /* box-shadow: 0 8rpx 24rpx rgba(74, 144, 226, 0.3); */
+
 }
 
 .checkin-btn.disabled {
@@ -192,14 +206,29 @@
 
 .tasks-title {
   font-size: 36rpx;
-  font-weight: 600;
-  color: #333;
+  font-weight: 700;
+  color: #1a1a1a;
   margin-bottom: 24rpx;
+  display: inline-block;
+  position: relative;
+}
+
+.tasks-title::after {
+  display: block;
+  content: "";
+  position: absolute;
+  top: -3%;
+  right: -3%;
+  width: 30rpx;
+  height: 30rpx;
+  background-color: #005eff42;
+  border-radius: 50%;
+  z-index: 1;
 }
 
 .tasks-list {
-  background: #fff;
-  border-radius: 24rpx;
+  /* background: #fff; */
+  /* border-radius: 24rpx; */
   overflow: hidden;
   box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.08);
 }
@@ -209,8 +238,10 @@
   align-items: center;
   justify-content: space-between;
   padding: 32rpx;
-  border-bottom: 1rpx solid #f0f0f0;
+  background: #fff;
   transition: background-color 0.2s ease;
+  margin-bottom: 20rpx;
+  border-radius: 20rpx;
 }
 
 .task-item:hover {
@@ -219,6 +250,7 @@
 
 .task-item:last-child {
   border-bottom: none;
+  margin-bottom: 0;
 }
 
 .task-content {
@@ -257,10 +289,22 @@
   background: linear-gradient(135deg, #e3f2fd 0%, #bbdefb 100%);
   border-radius: 32rpx;
   box-shadow: 0 2rpx 8rpx rgba(74, 144, 226, 0.2);
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
 .action-text {
   font-size: 26rpx;
   color: #4a90e2;
   font-weight: 500;
+}
+
+.task-action.complete{
+  background: #999999;
+
+}
+
+.task-action.complete .action-text{
+  color: #ffffff;
 }

+ 17 - 10
pages/my/index/index.js

@@ -11,16 +11,10 @@ Page({
     appAssetsUrl2: app.appAssetsUrl2,
     statusBarHeightTop: 0,
     statusBarHeight: 0,
-    userInfo: {
-      id: '02032',
-      name: '刘筱亭',
-      avatar: '',
-      gender: 'female', // 'male' 或 'female'
-      isVip: true,
-      points: '9989425'
-    },
+    userInfo: {},
     isLogin: false,
     isDev: false,
+    totalScore: 0,
   },
 
   toLogin() {
@@ -123,13 +117,25 @@ Page({
       });
     }
   },
-
+  loadData() {
+    let that = this;
+    app._post_form('scoreStu/totalScore', '', {
+      stuId: util.getUserId()
+    },
+      function (res) {
+        if (res.code == 0) {
+          that.setData({
+            totalScore: res.data
+          })
+        }
+      })
+  },
   /**
    * 积分点击事件
    */
   onPointsTap() {
     wx.navigateTo({
-      url: "/pages/my/integral/integral?id=" + this.data.userInfo.id,
+      url: "/pointExchange/pages/center/center?totalScore=" + this.data.totalScore,
     });
   },
   /**
@@ -315,6 +321,7 @@ Page({
    */
   onShow() {
     let _this = this;
+    this.loadData();
     _this.env();
     if (util.getUserId()) {
       _this.PushVipInfo();

+ 2 - 2
pages/my/index/index.wxml

@@ -32,7 +32,7 @@
                         </view>
                         <view class="user-id-row">
                             <text class="user-id">ID: {{userInfo.id || ''}}</text>
-                            <view class="check-in" wx:if="{{userInfo.isVip}}">
+                            <view class="check-in" bindtap="onDailySignTap">
                                 <text>签到</text>
                             </view>
                         </view>
@@ -70,7 +70,7 @@
                 <image src="/assets/images/user-icon/user-brick.png" class="points-icon"></image>
                 <view class="points-info" bindtap="onPointsTap">
                     <text class="points-label">我的积分</text>
-                    <text class="points-value">{{userInfo.totalPoints || 0}}</text>
+                    <text class="points-value">{{totalScore || 0}}</text>
                 </view>
             </view>
             <view class="points-right" bindtap="onPointsTask">

+ 2 - 2
pages/myMember/myMember.js

@@ -333,7 +333,7 @@ Page({
     }
     if (!this.data.agree) {
       wx.showToast({
-        title: "请先勾选并同意《青雲慧会员协议》",
+        title: "请先勾选并同意《无界校园会员协议》",
         icon: "none",
       });
       return;
@@ -372,7 +372,7 @@ Page({
     this.height();
     this.data.params.id = util.getUserId();
     wx.setNavigationBarTitle({
-      title: "青雲慧",
+      title: "无界",
     });
     this.getVipSelect();
 	

+ 21 - 25
pages/myMember/myMember.wxml

@@ -1,8 +1,8 @@
 <!-- pages/myMember/myMember.wxml -->
 <!-- 会员说明 -->
 <import src="../../wxParse/wxParse.wxml" />
-<view>
-  <view class="menutop">
+<view class="pages" style="background-image: url('/assets/images/user-icon/user-bg.png');">
+  <view class="menutop" style="background-image: url('/assets/images/user-icon/user-bg1.png');background-repeat: no-repeat; background-size: 100% 451rpx;">
     <view style="width:100%;height:{{statusBarHeight}}"></view>
     <view class="diy-top {{activeTitle?'activeTitle':''}}" style="height:{{statusBarHeight}}">
       <view class="diy-menu" style="margin-top:{{statusBarMH}};height:{{stHeight}}" bindtap="goback">
@@ -15,15 +15,11 @@
       <view>
         <view class="name">{{detail.vipname}}</view>
         <view class="info-item">
-          <view class="icon-box">
-            <image class='micon img-icon' style="width:36rpx;height:30rpx;margin-right:2rpx;" src='{{appAssetsUrl}}/images/my/diamonds.png'></image>
-          </view>
-          <text class="name-text">{{detail.memberState == 0 ? '普通用户' : '青雲慧会员'}}</text>
+          <view class="icon-box"><image class='micon img-icon' style="width:36rpx;height:30rpx;margin-right:2rpx;" src='{{appAssetsUrl}}/images/my/diamonds.png'></image></view>
+          <text class="name-text">{{detail.memberState == 0 ? '普通会员' : '无界生长'}}</text>
         </view>
         <view class="info-item">
-          <view class="icon-box">
-            <image class='micon' style="width:25rpx;height:22rpx;" src='{{appAssetsUrl}}/images/my/calendar.png'></image>
-          </view>
+          <view class="icon-box"><image class='micon' style="width:25rpx;height:22rpx;" src='{{appAssetsUrl}}/images/my/calendar.png'></image></view>
           <text wx:if="{{detail.memberState == 0}}">到期时间:未开通</text>
           <text wx:if="{{detail.memberState == 1}}">到期时间:{{detail.expireTime}}</text>
           <text wx:if="{{detail.memberState == 2}}">到期时间:终生有效</text>
@@ -32,9 +28,7 @@
 
         <!-- <view>到期时间:{{detail.memberState == 0 ? '未开通' : detail.expireTime}}</view> -->
         <view class="info-item">
-          <view class="icon-box">
-            <image class='micon' style="width:28rpx;height:22rpx;" src='{{appAssetsUrl}}/images/my/cardNo.png'></image>
-          </view>
+          <view class="icon-box"><image class='micon' style="width:28rpx;height:22rpx;" src='{{appAssetsUrl}}/images/my/cardNo.png'></image></view>
           <text>卡号:{{detail.cardno}}</text>
         </view>
       </view>
@@ -43,7 +37,7 @@
       </view>
     </view>
 
-    <!-- <view class="vip-box">
+    <view class="vip-box">
       <view class="{{currentImg == 1 ? 'active-line vip-item' : 'vip-item'}}" style="background: url({{appAssetsUrl2}}wjxy/mine/yearBg.png) no-repeat;background-size: 100% 100%;" data-currentImg="1" bindtap="changeVip">
         <icon class="icon-small" type="success" size="23" color="#EABC77" class="{{currentImg == 1 ? 'succ-icon' : ''}}" wx:if="{{currentImg == 1}}"></icon>
         <view class="icon-box">
@@ -68,7 +62,7 @@
           <text class="unit">元</text>
         </text>
       </view>
-    </view> -->
+    </view>
   </view>
 
   <image wx:if="{{false}}" mode="widthFix" src="{{appAssetsUrl}}/images/my/vip-title1.png" class="title-image"></image>
@@ -110,27 +104,29 @@
   <image wx:if="{{false}}" mode="widthFix" src="{{appAssetsUrl}}/images/my/vip-title2.png" class="title-image"></image>
   <!-- <view class="illustrate">权益说明</view> -->
   <view class="desc-text">
-    <template is="wxParse" data="{{wxParseData:memberNotice.nodes}}" class="partime-detail-info" />
+	  <template is="wxParse" data="{{wxParseData:memberNotice.nodes}}" class="partime-detail-info" />
   </view>
-
+  
   <!-- style="height:{{bottomLeft + botCheck + 40}}px;" botCheck -->
-  <view class="bbb" style="height:{{ detail.memberState == 2 ? bottomLeft + 40 : bottomLeft + 50}}px;">
-    <!-- style="bottom:{{botCheck + bottomLeft + 10}}px" -->
-    <!-- <checkbox-group bindchange="checkboxChange" wx:if="{{detail.memberState != 2}}" class="Agreement">
+  <view class="bbb" style="height:{{ detail.memberState == 2 ? bottomLeft + 40 : bottomLeft + 50 + 40}}px;">
+	  <!-- style="bottom:{{botCheck + bottomLeft + 10}}px" -->
+  <checkbox-group bindchange="checkboxChange" wx:if="{{detail.memberState != 2}}" class="Agreement">
     <view class='check-box'>
       <checkbox value="value" checked="true" />
-      <text bindtap="toMembershipAgreement" class="font30" style="vertical-align: middle;">已阅读并同意<text style="color: #00A8FF;">《青雲慧会员协议》</text></text>
+      <text bindtap="toMembershipAgreement" class="font30" style="vertical-align: middle;">已阅读并同意<text style="color: #00A8FF;">《无界校园会员协议》</text></text>
     </view>
-  </checkbox-group> -->
-    <!-- <view class="pwo" id="bot-box">
+  </checkbox-group>
+  <view class="pwo" id="bot-box">
     <view class='up-view'>
+      <!-- 立即升级按钮 -->
       <view class="{{agree ? 'btn' : 'btn-gary'}}" bindtap='upgrade' wx:if="{{detail.memberState == 0}}">立即开通</view>
+      <view class="{{agree ? 'btn' : 'btn-gary'}}" bindtap='upgrade' wx:if="{{detail.memberState == 3}}">立即开通</view>
       <view class="{{agree ? 'btn' : 'btn-gary'}}" bindtap='upgrade' wx:if="{{detail.memberState == 1}}">立即升级 <text>补差价 ¥{{wgFillInfo.lifelongPrice - wgFillInfo.perYearPrice}}</text></view>
+      <!-- <view class="life" wx:if="{{detail.memberState == 2}}">恭喜您,已经是终身会员了</view> -->
     </view>
-  </view> -->
-    <view class='btn' wx:if="{{detail.memberState != 2}}">相关权益请联系客服开通</view>
-    <view class="life" style="bottom:{{bottomLeft}}px;" wx:if="{{detail.memberState == 2}}">恭喜您,已经是终身会员了</view>
   </view>
+  <view class="life" style="bottom:{{bottomLeft}}px;" wx:if="{{detail.memberState == 2}}">恭喜您,已经是终身会员了</view>
+</view>
   <popup2 id="popup2" title="确认购买" bind:error="_error2" bind:success="_success2" data-name="popup" self="true">
     <view class="buy-content" slot="content">
       <view class="vip-price">会员价格:<text class="red-price">{{memberPoints.money}}</text>元</view>

+ 5 - 2
pages/myMember/myMember.wxss

@@ -56,7 +56,10 @@
 
 .all-view {
 }
-
+.pages{
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
 page {
   background: #fff;
   padding-bottom: 245rpx;
@@ -485,7 +488,7 @@ page {
 	position: fixed;
 	background-color: white;
 	z-index: 99999;
-	bottom: 40rpx;
+	bottom: 0;
 	width: 750rpx;
 }
 .Agreement {

+ 156 - 96
pages/myMember/myMember1.wxml

@@ -2,102 +2,162 @@
 <!-- 会员说明 -->
 <import src="../../wxParse/wxParse.wxml" />
 <view>
-	<view class="menutop">
-		<view style="width:100%;height:{{statusBarHeight}}"></view>
-		<view class="diy-top {{activeTitle?'activeTitle':''}}" style="height:{{statusBarHeight}}">
-			<view class="diy-menu" style="margin-top:{{statusBarMH}};height:{{stHeight}}" bindtap="goback">
-				<image src="{{appAssetsUrl}}/updata/arrows.png" class="arrowico" />
-				<view class="diy-title">我的会员卡</view>
-			</view>
-		</view>
-		<view class="diy-bottom" style="background-image: url({{appAssetsUrl}}/images/my/vipCard.png);">
-			<!-- <view class="iconfont icon-huiyuan vipcolor"></view> -->
-			<view class="diy-btop">
-				<image mode="aspectFill" src="{{detail.memberphoto?detail.memberphoto:(appAssetsUrl+'/images/bz1_nor.png')}}" class="bavatar" />
-				<view class="userinfo">
-					<view class="name">{{detail.vipname}}</view>
-					<view class="uwrap">
-						<image src="{{appAssetsUrl}}/updata/avatar.png" mode="widthFix" class="uico" />
-						<view class="username">{{detail.vipYN?'黄金会员':'非会员'}}</view>
-						<view class="cardno">卡号:{{detail.cardno}}</view>
-					</view>
-				</view>
-			</view>
-			<view class="diy-bbom">
-				<text wx:if="{{detail.vipYN}}">到期时间:{{detail.endtime}}</text>
-				<text wx:if="{{!detail.vipYN}}">未开通</text>
-			</view>
-		</view>
-	</view>
-	<view class="vip-check" style="background-image: url({{appAssetsUrl}}/images/my/vip-desc-bg.png);">
-		<view class="left">
-			<image src="{{appAssetsUrl}}/updata/avatar.png" mode="widthFix" />
-			<text class="title">黄金会员</text>
-		</view>
-		<view class="right">
-			¥<text class="num">300</text>元/年
-		</view>
-	</view>
-	<image mode="widthFix" src="{{appAssetsUrl}}/images/my/vip-title1.png" class="title-image"></image>
-	<view class="desc-image-box">
-		<view class="desc-image">
-			<image mode="widthFix" src="{{appAssetsUrl}}/images/my/vip-desc-item1.png"></image>
-			<text>充值送积分</text>
-		</view>
-		<view class="desc-image">
-			<image mode="widthFix" src="{{appAssetsUrl}}/images/my/vip-desc-item2.png"></image>
-			<text>优质兼职</text>
-		</view>
-		<view class="desc-image">
-			<image mode="widthFix" src="{{appAssetsUrl}}/images/my/vip-desc-item3.png"></image>
-			<text>课程折扣</text>
-		</view>
-		<view class="desc-image">
-			<image mode="widthFix" src="{{appAssetsUrl}}/images/my/vip-desc-item4.png"></image>
-			<text>沙龙活动</text>
-		</view>
-	</view>
-	<image mode="widthFix" src="{{appAssetsUrl}}/images/my/vip-title2.png" class="title-image"></image>
-	<view class="desc-text">
-		<view>充值送积分:充值会员成功立即赠送积分,积分可用于在积分商城兑换物品</view>
-		<view>优质兼职:VIP会员专享优质兼职报名。</view>
-		<view>课程折扣:购买学习成长课程,享受会员价格优惠。</view>
-		<view>沙龙活动:优质的沙龙活动仅限会员报名。</view>
-	</view>
-	<!-- <view class="flex-bet-wrap">
-		<view class='vipitem {{avtive==item.itemcode?"vipitemactive":""}}' wx:for="{{list}}" wx:key="item" wx:for-index="i"
-			wx:for-item="item" data-id="{{item.guid}}" data-code="{{item.itemcode}}" bindtap='tab'>
-			<view class="iconfont icon-xuanzhong xuanzhongs" wx:if="{{avtive==item.itemcode}}"></view>
-			<view class="iconfont icon-huiyuan vipico"></view>
-			<view class='tip'>
-				<image src="{{appAssetsUrl}}/updata/avatar.png" class="vipicos" />
-				{{i===0?"黄金会员":"钻石会员"}}
-			</view>
-			<view class='price'>
-				<text>¥</text>
-				{{item.itemname}}
-				<text>元</text>
-			</view>
-			<view class='remark'>{{item.attribute4}}</view>
-		</view>
-	</view> -->
-	<view style="height: calc({{bottomLeft}}px + 200rpx);"></view>
-	<view class="pwo" style="height: calc({{bottomLeft}}px + 200rpx);">
-		<view class='up-view'>
-			<checkbox-group bindchange="checkboxChange" class="Agreement">
-				<view class='check-box'>
-					<checkbox value="value" />
-					<text bindtap="toMembershipAgreement" class="font30" style="vertical-align: middle;">已阅读并同意<text
-							style="color: #00A8FF;">《青雲慧会员协议》</text></text>
-				</view>
-			</checkbox-group>
-			<!-- 立即升级按钮 -->
-			<view wx:if="{{agree}}" class='btn' bindtap='upgrade'>立即开通 / 立即续费</view>
-			<view wx:if="{{!agree}}" class='btn-gary' bindtap='upgrade'>立即开通 / 立即续费</view>
-			<view style="height: {{bottomLeft}}px"></view>
-		</view>
-	</view>
+  <view class="menutop">
+    <view style="width:100%;height:{{statusBarHeight}}"></view>
+    <view class="diy-top {{activeTitle?'activeTitle':''}}" style="height:{{statusBarHeight}}">
+      <view class="diy-menu" style="margin-top:{{statusBarMH}};height:{{stHeight}}" bindtap="goback">
+        <text class="iconfont icon-xiayibu font35 right-icon"></text>
+        <!-- <image src="{{appAssetsUrl}}/updata/arrows.png" class="arrowico" /> -->
+        <view class="diy-title">我的会员卡</view>
+      </view>
+    </view>
+    <view class="mine">
+      <view>
+        <view class="name">{{detail.vipname}}</view>
+        <view class="info-item">
+          <view class="icon-box">
+            <image class='micon img-icon' style="width:36rpx;height:30rpx;margin-right:2rpx;" src='{{appAssetsUrl}}/images/my/diamonds.png'></image>
+          </view>
+          <text class="name-text">{{detail.memberState == 0 ? '普通用户' : '青雲慧会员'}}</text>
+        </view>
+        <view class="info-item">
+          <view class="icon-box">
+            <image class='micon' style="width:25rpx;height:22rpx;" src='{{appAssetsUrl}}/images/my/calendar.png'></image>
+          </view>
+          <text wx:if="{{detail.memberState == 0}}">到期时间:未开通</text>
+          <text wx:if="{{detail.memberState == 1}}">到期时间:{{detail.expireTime}}</text>
+          <text wx:if="{{detail.memberState == 2}}">到期时间:终生有效</text>
+          <text wx:if="{{detail.memberState == 3}}">到期时间:{{detail.expireTime}}</text>
+        </view>
+
+        <!-- <view>到期时间:{{detail.memberState == 0 ? '未开通' : detail.expireTime}}</view> -->
+        <view class="info-item">
+          <view class="icon-box">
+            <image class='micon' style="width:28rpx;height:22rpx;" src='{{appAssetsUrl}}/images/my/cardNo.png'></image>
+          </view>
+          <text>卡号:{{detail.cardno}}</text>
+        </view>
+      </view>
+      <view>
+        <image class="auter" src="{{detail.memberphoto?detail.memberphoto:(appAssetsUrl+'/images/bz1_nor.png')}}"></image>
+      </view>
+    </view>
+
+    <!-- <view class="vip-box">
+      <view class="{{currentImg == 1 ? 'active-line vip-item' : 'vip-item'}}" style="background: url({{appAssetsUrl2}}wjxy/mine/yearBg.png) no-repeat;background-size: 100% 100%;" data-currentImg="1" bindtap="changeVip">
+        <icon class="icon-small" type="success" size="23" color="#EABC77" class="{{currentImg == 1 ? 'succ-icon' : ''}}" wx:if="{{currentImg == 1}}"></icon>
+        <view class="icon-box">
+          <image class="vip-img" src="{{appAssetsUrl2}}wjxy/mine/vip-icon.png"></image>
+          <text>年度VIP会员</text>
+        </view>
+        <text>
+          <text class="unit">¥</text>
+          <text class="price">{{wgFillInfo.perYearPrice}}</text>
+          <text class="unit">元</text>
+        </text>
+      </view>
+      <view class="{{ currentImg == 2 ? 'vip-item lifelongBg active-line' : 'vip-item lifelongBg'}}" style="background: url({{appAssetsUrl2}}wjxy/mine/lifelongBg.png) no-repeat;background-size: 100% 100%;" data-currentImg="2" bindtap="changeVip">
+        <icon class="icon-small" type="success" size="23" color="#EABC77" class="{{currentImg == 2 ? 'succ-icon' : ''}}" wx:if="{{currentImg == 2}}"></icon>
+        <view class="icon-box">
+          <image class="vip-img" src="{{appAssetsUrl2}}wjxy/mine/vip-icon.png"></image>
+          <text>终身VIP会员</text>
+        </view>
+        <text>
+          <text class="unit">¥</text>
+          <text class="price">{{wgFillInfo.lifelongPrice}}</text>
+          <text class="unit">元</text>
+        </text>
+      </view>
+    </view> -->
+  </view>
+
+  <image wx:if="{{false}}" mode="widthFix" src="{{appAssetsUrl}}/images/my/vip-title1.png" class="title-image"></image>
+  <view wx:if="{{false}}" class="desc-image-box">
+    <view class="desc-image">
+      <image mode="widthFix" src="{{appAssetsUrl}}/images/my/vip-desc-item1.png"></image>
+      <text>充值送积分</text>
+    </view>
+    <view class="desc-image">
+      <image mode="widthFix" src="{{appAssetsUrl}}/images/my/vip-desc-item2.png"></image>
+      <text>优质兼职</text>
+    </view>
+    <view class="desc-image">
+      <image mode="widthFix" src="{{appAssetsUrl}}/images/my/vip-desc-item3.png"></image>
+      <text>课程折扣</text>
+    </view>
+    <view class="desc-image">
+      <image mode="widthFix" src="{{appAssetsUrl}}/images/my/vip-desc-item4.png"></image>
+      <text>沙龙活动</text>
+    </view>
+  </view>
+  <view class="work" wx:if="{{0}}">
+    <view class="title">会员权益</view>
+    <view class="item">
+      <view class="work-item">
+        <image src="{{appAssetsUrl2}}wjxy/mine/integral.png"></image>
+        <text>充值送积分</text>
+      </view>
+      <view class="work-item">
+        <image src="{{appAssetsUrl2}}wjxy/mine/partTime-work.png"></image>
+        <text>优质兼职</text>
+      </view>
+      <view class="work-item">
+        <image src="{{appAssetsUrl2}}wjxy/mine/activity-work.png"></image>
+        <text>免费活动</text>
+      </view>
+    </view>
+  </view>
+  <image wx:if="{{false}}" mode="widthFix" src="{{appAssetsUrl}}/images/my/vip-title2.png" class="title-image"></image>
+  <!-- <view class="illustrate">权益说明</view> -->
+  <view class="desc-text">
+    <template is="wxParse" data="{{wxParseData:memberNotice.nodes}}" class="partime-detail-info" />
+  </view>
+
+  <!-- style="height:{{bottomLeft + botCheck + 40}}px;" botCheck -->
+  <view class="bbb" style="height:{{ detail.memberState == 2 ? bottomLeft + 40 : bottomLeft + 50}}px;">
+    <!-- style="bottom:{{botCheck + bottomLeft + 10}}px" -->
+    <!-- <checkbox-group bindchange="checkboxChange" wx:if="{{detail.memberState != 2}}" class="Agreement">
+    <view class='check-box'>
+      <checkbox value="value" checked="true" />
+      <text bindtap="toMembershipAgreement" class="font30" style="vertical-align: middle;">已阅读并同意<text style="color: #00A8FF;">《青雲慧会员协议》</text></text>
+    </view>
+  </checkbox-group> -->
+    <!-- <view class="pwo" id="bot-box">
+    <view class='up-view'>
+      <view class="{{agree ? 'btn' : 'btn-gary'}}" bindtap='upgrade' wx:if="{{detail.memberState == 0}}">立即开通</view>
+      <view class="{{agree ? 'btn' : 'btn-gary'}}" bindtap='upgrade' wx:if="{{detail.memberState == 1}}">立即升级 <text>补差价 ¥{{wgFillInfo.lifelongPrice - wgFillInfo.perYearPrice}}</text></view>
+    </view>
+  </view> -->
+    <view class='btn' wx:if="{{detail.memberState != 2}}">相关权益请联系客服开通</view>
+    <view class="life" style="bottom:{{bottomLeft}}px;" wx:if="{{detail.memberState == 2}}">恭喜您,已经是终身会员了</view>
+  </view>
+  <popup2 id="popup2" title="确认购买" bind:error="_error2" bind:success="_success2" data-name="popup" self="true">
+    <view class="buy-content" slot="content">
+      <view class="vip-price">会员价格:<text class="red-price">{{memberPoints.money}}</text>元</view>
+      <view class="integral">剩余积分:{{memberPoints.remainingPoints}}</view>
+      <view class="use-box">
+        <view class="use-integral">
+          <view>使用 {{memberPoints.usePoints}} 积分</view>
+          <view class="deduction">抵扣 {{memberPoints.deductiblePrice}} 元</view>
+        </view>
+        <switch bindchange="switchChange" />
+      </view>
+    </view>
+    <view class="btn-box" slot="btn">
+      <button class="btn" bindtap="confirmPay" wx:if="{{(isDeductiblePrice&&memberPoints.actualPrice==0)||!isDeductiblePrice&&memberPoints.money==0}}">免费购买</button>
+      <button class="btn" bindtap="confirmPay" wx:else>确认支付{{isDeductiblePrice ? memberPoints.actualPrice : memberPoints.money}}元</button>
+      <view class="interval-box"></view>
+    </view>
+  </popup2>
+
+  <popup3 id="popup3" title="支付成功" btn_no="取消" btn_ok="确定" bind:error="_error" bind:success="_success" data-name="popup">
+    <view class="pay-content" slot="content">
+      <icon class="icon-box-img" type="success" size="60"></icon>
+      <text>恭喜您支付成功,</text>
+      <text>获得 {{integral}} 积分!</text>
+    </view>
+  </popup3>
 </view>
 <!-- <button class="custCare" open-type="contact" session-from="sessionFrom" style="bottom: calc(205rpx + {{bottomLeft}}px);">
-	<image mode="aspectFill" src="{{appAssetsUrl}}/images/custCare.png"></image>
+  <image mode="aspectFill" src="{{appAssetsUrl}}/images/custCare.png"></image>
 </button> -->

+ 1 - 0
pointExchange/pages/center/center.wxml

@@ -22,6 +22,7 @@
 						<image wx:if="{{item.scoreEvent=='参加兼职/成长会'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon6.png"></image>
 						<image wx:if="{{item.scoreEvent=='评价'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon7.png"></image>
 						<image wx:if="{{item.scoreEvent=='商城兑换'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon8.png"></image>
+						<image wx:if="{{item.scoreEvent=='每日签到'}}" mode="widthFix" src="/assets/images/pointExchange/task-icon9.png"></image>
 						<view class="left">
 							<view class="title">{{item.scoreEvent}}</view>
 							<view class="time">{{item.createTime}}</view>