bug修复

expert/consult/consult.wxml

@@ -151,8 +151,8 @@
     </view>
     <view class="tip">注意：行家6天未确认系统将自动取消订单</view>
   </view>
-  <view style="bottom: {{bottomLeft}}px;" class="btn-sub" bindtap="submit" wx:if="{{payPrice}}">发起预约 ({{payPrice}})元</view>
-  <view style="bottom: {{bottomLeft}}px;" class="btn-sub" bindtap="submit" wx:else>请先选择拼团方式</view>
+  <view style="bottom: {{bottomLeft + 10}}px;" class="btn-sub" bindtap="submit" wx:if="{{payPrice}}">发起预约 ({{payPrice}})元</view>
+  <view style="bottom: {{bottomLeft + 10}}px;" class="btn-sub" bindtap="submit" wx:else>请先选择拼团方式</view>
   <!-- 可约时间段 -->
   <popup2 id='popup' title='选择时间段' self="{{true}}" truecontent="{{['']}}" btn_no='' btn_ok='' bind:error="_error" bind:success="_success" data-name="popup">
     <view slot="content" wx:if="{{timeList}}" style="width: 85%;padding: 40rpx 30rpx;">

expert/detail/detail.js

@@ -88,6 +88,7 @@ Page({
   // 获取详情
   getDetail(id) {
     app._get(`expert/info/${id}`, {}, res => {
+      console.log("res.expert==>", res.expert)
       if (res.code === 0) {
         this.setData({
           detailobj: res.expert

expert/success/success.wxss

@@ -27,7 +27,7 @@ page {
 .btn1 {
 	width: 630rpx;
 	height: 88rpx;
-	background: #ffdc2f;
+	background: #2b58a5;
 	border-radius: 44rpx;
 	margin-top: 100rpx;
 	margin-left: 60rpx;
@@ -35,13 +35,14 @@ page {
 	font-family: PingFang SC, PingFang SC-Regular;
 	font-weight: 400;
 	text-align: center;
-	color: #1a1a1a;
+	color: #ffffff;
 	line-height: 88rpx;
 }
 .btn2 {
 	width: 630rpx;
 	height: 88rpx;
-	border: 1px solid #ffa836;
+	background: #c5dbff;
+	border: 1px solid #2b58a5;
 	border-radius: 45rpx;
 	margin-top: 26rpx;
 	line-height: 88rpx;
@@ -49,6 +50,6 @@ page {
 	font-family: PingFang SC, PingFang SC-Regular;
 	font-weight: 400;
 	text-align: center;
-	color: #ffa836;
+	color: #2b58a5;
 	margin-left: 60rpx;
 }

invitationCode/index.js

@@ -167,7 +167,6 @@ Page({
 			})
 	},
 	copyText() {
-		console.log("拷贝2333")
 		wx.setClipboardData({
 			data: this.data.inviteCode || '',
 			success: function(res) {
@@ -176,8 +175,8 @@ Page({
 					icon: 'none'
 				})
 			},
-			fail: function (res) {
-				console.log(res)
+			fail: function (err) {
+				console.log(err)
 				wx.showToast({
 					title: '复制失败',
 					icon: 'none'

pages/checkin/index.js

@@ -68,6 +68,13 @@ Page({
               case '观看广告':
                 v.desc = '观看广告获得积分';
                 break;
+              
+              case '分享小程序':
+                v.desc = '分享小程序可获得积分奖励';
+                break;
+              case '每日登录':
+                v.desc = '每日登录获得积分';
+                  break;
             }
             return v
           })

pages/checkin/index.wxml

@@ -58,6 +58,11 @@
             <image class="task-icon" wx:if="{{item.taskName=='学籍认证' ||  item.taskName=='完成学籍认证'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_6.png"></image>
             <image class="task-icon" wx:if="{{item.taskName=='完善资料' ||  item.taskName=='完善个人资料'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_7.png"></image>
             <image class="task-icon" wx:if="{{item.taskName=='参与活动'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_8.png"></image>
+            <image class="task-icon" wx:if="{{item.taskName=='参与活动'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_8.png"></image>
+            
+            <image class="task-icon" wx:if="{{item.taskName=='分享小程序'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_9.png"></image>
+            <image class="task-icon" wx:if="{{item.taskName=='每日登录'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_10.png"></image>
+
           </view>
           <view class="task-info">
             <view class="task-title">{{item.taskName}}</view>

pages/home/index/activityDetail/activityDetail.js

@@ -364,6 +364,7 @@ Page({
 		}
 	},
 	confirmPay() {
+		this.popup5.hidePopup();
 		this.singPay()
 	},
 	singPay() {
@@ -605,7 +606,8 @@ Page({
 			})
 		}else if(e.currentTarget.dataset.name=='popup2'){
 			wx.navigateTo({
-				url: '/pages/my/myStudy/myStudy'
+				// url: '/pages/my/myStudy/myStudy'
+				url: '/pages/my/myData/myData',
 			})
 		}else{
 			wx.navigateTo({

pages/home/index/index.wxml

@@ -13,7 +13,7 @@
             <view class='temp'>
               <form class='temp-box' report-submit='true' bindsubmit=''>
                 <view class='white-spaceone'>
-                  <image src="{{appAssetsUrl2}}new/ad.png" lazy-load="true" class='location'></image>
+                  <!--<image src="{{appAssetsUrl2}}new/ad.png" lazy-load="true" class='location'></image>-->
                   <picker mode="selector" bindchange="cityPickerChange" value="{{cityListIndex}}"
                     range="{{cityListPickerData}}" range-key="name"
                     style="display: inline-block;height: 30rpx;line-height: 10rpx;color: white;">

pages/home/index/index.wxss

@@ -607,7 +607,7 @@
   flex-direction: row;
   align-items: center;
   height: 100%;
-  margin-right: 40rpx;
+  margin-right: 10rpx;
   flex-shrink: 0;
 }
 
@@ -705,7 +705,7 @@
   display: inline-block;
   vertical-align: bottom !important;
   color: white;
-  margin: 0 5px;
+  /* margin: 0 5px; */
   max-width: 230rpx;
   text-overflow: ellipsis;
   overflow: hidden;
@@ -721,11 +721,14 @@
 .white-spaceone picker .picker .side {
   display: block;
   height: 70rpx;
+  font-weight: 700;
 }
 
 .white-spaceone .xiala {
-  width: 21rpx;
-  height: 21rpx !important;
+  /* width: 21rpx;
+  height: 21rpx !important; */
+  width: 40rpx;
+  height: 40rpx !important;
 }
 
 .white-spacetwo {

pages/home/index/partDetail/partDetail.js

@@ -148,6 +148,7 @@ Page({
     this.popup0 = this.selectComponent("#popup0");
     this.popup3 = this.selectComponent("#popup3");
     this.popup4 = this.selectComponent("#popup4");
+    this.popup5 = this.selectComponent("#popup5");
   },
   addRead() {
     app._post_form("read/num", "", {
@@ -270,6 +271,14 @@ Page({
       return;
     }
     if (util.UserLoginStatus()) {
+      this.popup3.showPopup();
+      this.setData({
+      	maskShow: true,
+      	isDjs: true,
+        timer: setInterval(that.countDown, 1000),
+        isShowPop: true
+      })
+      return
       if (
         (this.data.detail.isNeedVip && this.data.member.memberState > 0) ||
         !this.data.detail.isNeedVip
@@ -296,15 +305,15 @@ Page({
           });
           return;
         }
-        wx.showToast({
-          title: "您还不是会员，报名请联系平台客服处理",
-          icon: "none",
-          duration: 2000,
-        });
-        // this.popup.showPopup();
-        // this.setData({
-        //   maskShow: true,
+        // wx.showToast({
+        //   title: "您还不是会员，报名请联系平台客服处理",
+        //   icon: "none",
+        //   duration: 2000,
         // });
+        that.popup.showPopup();
+        that.setData({
+          maskShow: true,
+        });
       }
     }
   },
@@ -363,7 +372,8 @@ Page({
         isDjs: false,
         maskShow: false,
       });
-      this.signUp();
+      // this.signUp();
+      this.popup4.showPopup();
     }
     // if (!this.data.isDjs) {}
   },
@@ -385,6 +395,13 @@ Page({
       },
     });
   },
+  usePoints() {
+    this.setData({
+      isShowPop: false
+    })
+    this.popup.hidePopup();
+    this.signUp();
+  },
   signUp() {
     let that = this;
     wx.showLoading({
@@ -432,6 +449,8 @@ Page({
           setTimeout(() => {
             that.loadData()
           }, 500);
+        } else if (res.code == 500 && res.msg == "积分不足") {
+          that.popup5.showPopup();
         } else if (res.msg == "请完善学籍认证后进行报名操作") {
           wx.hideToast();
           that.popup2.showPopup();
@@ -482,20 +501,19 @@ Page({
     let that = this;
     if (e.currentTarget.dataset.name == "popup0") {} else if (e.currentTarget.dataset.name == "popup4") {
       if (that.data.detail.isNeedVip && that.data.member.memberState > 0) {
-        that.popup3.showPopup();
-        that.setData({
-          maskShow: true,
-          isDjs: true,
-          timer: setInterval(that.countDown, 1000),
-        });
+        // that.popup3.showPopup();
+        // that.setData({
+        //   maskShow: true,
+        //   isDjs: true,
+        //   timer: setInterval(that.countDown, 1000),
+        // });
+        this.signUp();
         console.log("会员");
       } else {
         // that.popup3.hidePopup();
-        // that.setData({
-        // 	isDjs: false,
-        // 	maskShow: false,
-        // 	time: 5
-        // })
+        that.setData({
+          isShowPop: false
+        })
         that.signUp();
         console.log("非会员");
       }
@@ -503,13 +521,16 @@ Page({
       wx.navigateTo({
         url: "/pages/my/myStudy/myStudy",
       });
+    } else if (e.currentTarget.dataset.name == "popup5") {
+      wx.navigateTo({
+        url: "/pages/checkin/index",
+      });
     } else {
       wx.navigateTo({
         url: e.currentTarget.dataset.name == "popup" ?
           "/pages/myMember/myMember" : "/pages/my/myData/myData",
       });
     }
-
     this.setData({
       maskShow: false,
     });

pages/home/index/partDetail/partDetail.wxml

@@ -155,8 +155,8 @@
         </view>
       </view>
     </view>
-    <view class="big-box {{ options && !options.stuId || detail.isNeedVip && member.memberState == 0 ? 'vipBg' : ''}}">
-      <view class="dim {{options && !options.stuId || detail.isNeedVip && member.memberState == 0 ? '' : 'showDim'}}">
+    <view class="big-box {{ detail.workStuYN ? '' : options && !options.stuId || detail.isNeedVip && member.memberState == 0 ? 'vipBg' : ''}}">
+      <view class="dim {{detail.workStuYN ? 'showDim' : options && !options.stuId || detail.isNeedVip && member.memberState == 0 ? '' : 'showDim'}}">
         <!--<image src="{{appAssetsUrl2}}new/dim.png"></image>-->
         <image src="{{appAssetsUrl3}}user-icon/user-brick.png"></image>
         <view class="tip">加入会员，即可报名兼职</view>
@@ -319,10 +319,19 @@
           <image class="code-img" src='{{detail.qrCodePicture}}' bindtap="seeBigCode" />
         </view>
       </popup2>
-      <popup2 id='popup' title='提示' content="{{['']}}" btn_no='取消' btn_ok='确认' bind:error="_error"
+      <popup2 id='popup' title='提示' content="{{['']}}" self="{{true}}" btn_no='' btn_ok='' bind:error="_error"
         bind:success="_success" data-name="popup">
-        <view slot="content" style="width: 85%;padding: 44rpx 0 38rpx 0;">该兼职需要开通VIP才能报名</view>
+        <view slot="content" style="width: 85%;padding: 44rpx 0 38rpx 0;">该兼职需要开通会员才能报名，你可以选择通过积分兑换获取本次工作机会或直接开通会员</view>
+        <view slot="btn" class="selt-btn popup-btn">
+          <button class="btn mainbg" bindtap="_success" data-name="popup">开通会员</button>
+          <button class="btn usePoints" bindtap="usePoints">使用积分（{{detail.needPoints}}积分）</button>
+        </view>
+      </popup2>
+      
+      <popup2 id='popup5' title='提示' content="{{['']}}" btn_no='取消' btn_ok='赚积分' bind:error="_error" bind:success="_success" data-name="popup5">
+        <view slot="content" style="width: 85%;padding: 44rpx 0 38rpx 0;"> 积分不足，请先赚取积分！</view>
       </popup2>
+
       <popup2 id='popup2' title='提示' content="{{['']}}" btn_no='取消' btn_ok='立即完善' bind:error="_error"
         bind:success="_success" data-name="popup2">
         <view slot="content" style="width: 85%;padding: 44rpx 0 38rpx 0;">请完善资料后进行报名操作</view>

pages/home/index/partDetail/partDetail.wxss

@@ -1163,3 +1163,18 @@ page {
   font-size: 28rpx;
   line-height: 75rpx;
 }
+
+.popup-btn{
+  display: block !important;
+  
+}
+
+.popup-btn .btn{
+  width: 90%;
+}
+.popup-btn .usePoints{
+  background: #88bb26;
+  border-radius: 35rpx;
+  color: #ffffff;
+  margin-top: 20rpx;
+}

pages/login.js

@@ -366,7 +366,7 @@ Page({
       return tools.alert("请先获取昵称信息");
     }
     if (!this.data.params.mobile) {
-      return util.alert("请获取手机号");
+      return tools.alert("请先绑定手机号");
     }
     // wx.setStorageSync("userInfo", {
     //   avatarUrl: this.data.params.memberphoto,

pages/login.wxml

@@ -74,7 +74,7 @@
             <text class="txt">邀请码</text>
           </div>
           <view class="box-right">
-            <input maxlength="30" placeholder="请填写邀请码" value="{{invitecode}}" />
+            <input maxlength="30" placeholder="请填写邀请码" value="{{invitecode}}" bindinput="inviteCodeInput"/>
           </view>
         </view>
       </view>

pages/my/index/index.wxml

@@ -42,7 +42,7 @@
                     </view>
                 </view>
                 <!-- 会员升级提示 -->
-                <view class="vip-upgrade-banner" bindtap="onVipUpgradeTap" style="background-image: url('{{appAssetsUrl3}}user-icon/vip-upgrade-bg.png');">
+                <view class="vip-upgrade-banner" bindtap="onVipUpgradeTap" style="background-image: url('{{appAssetsUrl3}}user-icon/vip-upgrade-bg.png');" wx:if="{{!isDev &&  isLogin}}">
                     <view class="vip-banner-left" wx:if="{{userInfo.memberState != 0}}">
                         <image src="{{appAssetsUrl3}}user-icon/vip-icon.png" class="upgrade-icon"></image>
                         <text class="upgrade-text">青雲慧 {{userInfo.cardno}}</text>

pages/my/myData/myData.js

@@ -27,7 +27,7 @@ Page({
 		schoolItem: [],
 		schIndex: 0,
 		isHealthy: [],
-		isHealthyIndex: 0,
+		isHealthyIndex: -1,
 		birthday: util.getNowDate(),
 		birthdayIndex: 0,
 		nowTime: util.getNowDate(),
@@ -56,7 +56,7 @@ Page({
 		},
 
 		isDev: true, //开发环境隐藏"编辑资料"页面的部分数据项
-		formNum: 0
+		formNumObj: {}
 	},
 	/**
 	 * 防止穿透
@@ -1031,7 +1031,7 @@ Page({
 			console.log(res);
 			if (res.code === 0) {
 				this.setData({
-					formNum: res.data || 0
+					formNumObj: res.data || {},
 				})
 			}
 		}, err => { }, complete => {

pages/my/myData/myData.wxml

@@ -273,7 +273,7 @@
         <view class="flex-right flex-a-center">
           <view class="section txt-color">
             <picker bindchange="bindhisChange" value="{{isHealthyIndex}}" range="{{isHealthy}}" range-key="itemname">
-              <view class="picker">{{isHealthy[isHealthyIndex].itemname}}</view>
+              <view class="picker">{{isHealthyIndex != -1 ? isHealthy[isHealthyIndex].itemname : '暂无'}}</view>
             </picker>
           </view>
           <view class="iconfont icon-xiayibu font35"></view>
@@ -295,8 +295,8 @@
   <view class="flex-btn">
     <view class="notice">
       完善所有信息可得积分奖励，完善程度
-      <text class="num">{{formNum}}</text>
-      /{{formNum && formNum > 18 ? formNum : 18}}
+      <text class="num">{{formNumObj.complete || 0}}</text>
+      /{{formNumObj.total || 0}}
     </view>
     <view class="flex-btn-view">
       <view class='cancel' bindtap='btnCancel'>取消</view>

pages/my/myInvite/myInvite.js

@@ -94,8 +94,12 @@ Page({
       myInvitationType: this.data.currentTab
     }, res => {
       if (res.code === 0) {
+        let list = res.page.list.map(v => {
+          v.inputtime = v.inputtime.slice(0, 10);
+          return v;
+        })
         this.setData({
-          list: res.page.list,
+          list: list || [],
           page: {
             total: res.page.totalCount,
             currPage: res.page.currPage,

pages/my/myInvite/myInvite.wxml

@@ -23,8 +23,8 @@
       <view class="thead-title">注册时间</view>
       <view class="thead-title">会员状态</view>
     </view>
-    <view class="tbody" wx:for="{{list}}" wx:key="{{item.id}}">
-      <view class="tbody-title name">{{item.name}}</view>
+    <view class="tbody {{index == 0 ? 'paddingTop' : ''}}" wx:for="{{list}}" wx:key="{{item.id}}">
+      <view class="tbody-title name">{{item.name || ''}}</view>
       <view class="tbody-title phonenum">{{item.phone}}</view>
       <view class="tbody-title time">{{item.inputtime}}</view>
       <view class="tbody-title status">

pages/my/myInvite/myInvite.wxss

@@ -82,12 +82,16 @@ page {
 
 .table .tbody {
   height: 80rpx;
-  padding-top: 90rpx;
+  /* padding-top: 90rpx; */
   background-color: #fff;
   font-weight: 500;
   color: #666666;
 }
 
+.table .paddingTop {
+  padding-top: 90rpx;
+}
+
 .table .tbody .tbody-title {
   line-height: 80rpx;
   font-size: 22rpx;

pages/my/myPlay/myPlay.wxml

@@ -5,8 +5,8 @@
   </view>
 </view>
 <block wx:if="{{listData.length>0}}">
-  <view class='active-view active-view-list {{typeListIndex==0?"border":""}}' wx:for="{{listData}}">
-    <view class='rel img-view img-view-item' data-id="{{item.activityId}}" bindtap='seeDetails'>
+  <view class='active-view active-view-list {{typeListIndex==0?"border":""}}'>
+    <view class='rel img-view img-view-item' data-id="{{item.activityId}}" bindtap='seeDetails' wx:for="{{listData}}">
       <view class="activity-imgs-wrap {{typeListIndex==1? 'activity-imgs-wrap-after':''}}">
         <image mode="aspectFill" src="{{item.activity.thumbnailImg}}" class='activity-imgs'></image>
         <view class="activity-imgs-over" wx:if="{{typeListIndex==1}}">

pages/my/myStudy/myStudy.wxss

@@ -314,6 +314,7 @@
   color: #fff;
   margin-left: 60rpx;
   line-height: 85rpx;
+  margin-bottom: 20rpx;
 }
 .end-btn {
   width: 146rpx;

pages/practicalExperience/practicalExperience.wxss

@@ -196,7 +196,7 @@ page {
 }
 
 .img-sex {
-  /* width: 142rpx; */
+  width: 192rpx;
   display: flex;
   /* align-items: center; */
   /* justify-content: center; */

pages/search/index.wxss

@@ -310,7 +310,8 @@ page {
   margin-top: 22rpx;
 }
 .type-sex .sub-btn.green {
-  background: #ffdc2f;
+  background: #2b58a5;
+  color: #ffffff;
 }
 
 /* 最会玩 */