Merge branch 'master' of http://115.29.66.169:10080/qingyunhui/app

pages/checkin/index.js

@@ -35,37 +35,10 @@ Page({
           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]);
+          // 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
-          //       }
-          //     })
-          //   }]
-          // })
         }
       })
   },
@@ -223,8 +196,7 @@ Page({
       });
     }
     let date1 = `${year}${month + 1 > 9 ? month + 1 : '0' + (month + 1)}${today > 9 ? today : '0' + today}`
-
-    console.log('date1', date1)
+    // console.log('date1', date1)
     // console.log('aaa', calendarDays, this.data.checkedDates.includes(today))
     this.setData({
       calendarDays,
@@ -292,31 +264,54 @@ Page({
    * 处理任务点击
    */
   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'
-    // });
-
+    // console.log('handleTaskClick', e.currentTarget.dataset.item);
+    let item = e.currentTarget.dataset.item || {};
+    if (item.complete) return;
+    let url = '';
+    const taskName = item.taskName;
+    let tab = false;
     // 根据不同任务跳转到不同页面
-    switch (taskId) {
-      case 1:
-      case 4:
-        // 邀请好友
-        this.inviteFriend();
+    switch (taskName) {
+      case '邀请好友':
+        url = '/invitationCode/index';
+        break;
+      case '参与兼职':
+      case '参加兼职/成长会':
+        url = '/pages/practicalExperience/practicalExperience';
+        tab = true;
+        break;
+      case '每日签到':
+        this.handleCheckin();
+        break;
+      case '购买会员':
+      case '开通会员':
+        url = '/pages/myMember/myMember';
+        break;
+      case '学籍认证':
+      case '完成学籍认证':
+        url = '/pages/my/myStudy/myStudy';
         break;
-      case 2:
-        // 观看广告
-        this.watchAd();
+      case '完善资料':
+      case '完善个人资料':
+        url = '/pages/my/myData/myData';
         break;
-      case 3:
-        // 参与课程
-        this.joinCourse();
+      case '参与活动':
+        url = '/pages/experience/index/index';
+        break;
+      case '观看广告':
         break;
     }
+    // console.log('url', url)
+    if (url == '') return;
+    if (tab) {
+      wx.switchTab({
+        url: url,
+      });
+    } else {
+      wx.navigateTo({
+        url: url,
+      });
+    }
+
   },
 });

pages/home/index/partDetail/partDetail.wxss

@@ -739,6 +739,7 @@ page {
   display: flex;
   flex-direction: row;
   align-items: center;
+  flex-shrink: 0;
 }
 
 .price .p2 {

pages/my/index/index.wxml

@@ -1,8 +1,8 @@
 <!-- pages/my/index/index.wxml -->
-<view class="mycontent" style="background-image: url('/assets/images/user-icon/user-bg.png');">
+<view class="mycontent" style="background: url('/assets/images/user-icon/user-bg.png');">
     <!-- 自定义导航栏 -->
     <view class="custom-navbar"
-        style="background-image: url('/assets/images/user-icon/user-bg1.png');padding-top:{{statusBarHeightTop}}">
+        style="background: url('/assets/images/user-icon/user-bg1.png');padding-top:{{statusBarHeightTop}}">
         <view class="navbar-content" style="padding-top:{{statusBarHeightTop}}">
             <view class="navbar-left">
                 <view class="customer-service" bindtap="onCustomerServiceTap">
@@ -50,7 +50,7 @@
                 </view>
                 <!-- 会员升级提示 -->
                 <view class="vip-upgrade-banner" bindtap="onVipUpgradeTap"
-                    style="background-image: url('/assets/images/user-icon/vip-upgrade-bg.png');">
+                    style="background: url('/assets/images/user-icon/vip-upgrade-bg.png');">
                     <view class="vip-banner-left" wx:if="{{userInfo.memberState != 0}}">
                         <image src="/assets/images/user-icon/vip-icon.png" class="upgrade-icon"></image>
                         <text class="upgrade-text">青雲慧 {{userInfo.cardno}}</text>

pages/my/index/index.wxss

@@ -3,7 +3,7 @@
   min-height: calc(100vh - 4rpx);
   background-size: 100% 100%;
   background-repeat: no-repeat;
-  background-color: #f7f8fa;
+  /* background-color: #f7f8fa; */
   box-sizing: border-box;
 }
 

pages/myMember/myMember.wxml

@@ -16,7 +16,7 @@
         <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>
+          <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>
@@ -113,7 +113,7 @@
   <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">

pages/myMember/myMember.wxss

@@ -99,6 +99,7 @@ page {
   box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.03);
   /* background-color: #ccc; */
   background-color: #ffffff;
+  border-radius: 20rpx;
 }
 
 .menutop .mine > view > view {
@@ -421,16 +422,16 @@ page {
 .btn {
   width: 90%;
   margin: 15rpx auto;
-  background: #ffdc2f;
-  color: #1a1a1a;
-  color: #fff;
+  background: #2b58a5;
+  color: #ffffff;
   padding: 0 25rpx;
   box-sizing: border-box;
-  height: 91rpx;
-  line-height: 91rpx;
+  height: 85rpx;
+  line-height: 85rpx;
   text-align: center;
   border-radius: 46px;
   transition: all 0.5s;
+  font-size: 30rpx;
 }
 
 .btn-gary {
@@ -440,8 +441,8 @@ page {
   color: white;
   padding: 0 25rpx;
   box-sizing: border-box;
-  height: 91rpx;
-  line-height: 91rpx;
+  height: 85rpx;
+  line-height: 85rpx;
   text-align: center;
   border-radius: 46px;
   transition: all 0.5s;