bug修复

activity/activity/release.wxml

@@ -26,7 +26,7 @@
         </view>
         <view class="info-box">
           <view class="address">{{item.address}}</view>
-          <view class="free">潮兼职免费</view>
+          <view class="free">会员免费</view>
         </view>
       </view>
     </view>

expert/agentdetail/agentdetail.wxml

@@ -66,7 +66,7 @@
 				<i class="iconfont1 icon-dizhi icon-home-dizhi"></i>
 				<view class="address-word">{{item.address}}</view>
 			</view>
-			<view class="word-type" wx:if="{{item.isNeedVip == 0}}">潮兼职免费</view>
+			<view class="word-type" wx:if="{{item.isNeedVip == 0}}">会员免费</view>
 		</view>
 	</view>
 	<block wx:if="{{dataList.length<=0 && load}}">

orderRecord/index.wxml

@@ -11,7 +11,7 @@
         <view class="orderNo">支付时间：<text class="text">{{item.payTime}}</text></view>
         <!--<view class="orderPrice"></view>-->
         <view class="orderNo actually">价格：<text class="price">￥<text>{{item.price}}</text>元</text></view>
-        <view class="orderNo">积分抵扣：<text class="text"><text>{{item.pointsDeduction}}</text></text></view>
+        <view class="orderNo">积分抵扣：<text class="text"><text>{{item.usePoints}}</text></text></view>
         <view class="orderNo actually">实付：<text class="price">￥<text>{{item.actuallyPaid}}</text>元</text></view>
       </view>
     </view>

pages/checkin/index.js

@@ -11,7 +11,6 @@ Page({
     appAssetsUrl2: App.appAssetsUrl2,
     appAssetsUrl3: App.appAssetsUrl3,
     userInfo: {},
-    currentDate: new Date(),
     currentYear: new Date().getFullYear(),
     currentMonth: new Date().getMonth() + 1,
     checkedDates: [], // 已签到日期，从服务器或本地存储加载
@@ -113,7 +112,8 @@ Page({
             });
             // _this.loadUser()
           } else {
-            wx.removeStorageSync("USER");
+            // wx.removeStorageSync("USER");
+            wx.clearStorage();
             wx.navigateTo({
               url: "/pages/login",
             });
@@ -160,7 +160,6 @@ Page({
     // 页面显示时重新加载签到状态
     await this.getCheckinHistoryFromServer();
     this.loadData();
-    this.initCalendar();
   },
 
   /**
@@ -169,7 +168,6 @@ Page({
   onPullDownRefresh: async function () {
     await this.getCheckinHistoryFromServer();
     this.loadData();
-    this.initCalendar();
     this.getUserInfo();
     wx.stopPullDownRefresh();
   },
@@ -189,14 +187,14 @@ Page({
       {},
       (res) => {
         wx.hideLoading();
-        if (res.code === 0) {
+        if (res.code === 0 && res.data) {
           // let data = res.data.map(v => {
           //   return parseInt(v.substr(6, 2));
           // })
           this.setData({
-            checkedDates: res.data || []
+            checkedDates: res.data.history || []
           });
-          this.initCalendar();
+          this.initCalendar(res.data.current);
         }
       }
     );
@@ -205,9 +203,9 @@ Page({
   /**
    * 初始化日历
    */
-  initCalendar() {
+  initCalendar(dates = null) {
     // 使用当前系统时间
-    const date = new Date();
+    const date = dates ? new Date(dates) : new Date();
     const year = date.getFullYear();
     const month = date.getMonth();
     const today = date.getDate();
@@ -273,7 +271,6 @@ Page({
    */
   performCheckin() {
     const userId = util.getUserId();
-    const currentDate = new Date();
     let _this = this;
     // TODO: 调用签到API
     App._post_form(
@@ -290,10 +287,7 @@ Page({
             icon: 'success'
           });
           await _this.getCheckinHistoryFromServer();
-          this.loadList();
-          wx.nextTick(() => {
-            _this.initCalendar();
-          })
+          _this.loadList();
         } else {
           wx.hideLoading();
           wx.showToast({

pages/experience/index/index.wxml

@@ -70,7 +70,7 @@
                     </view>
                     <view class="address-word">地址: {{item.address}}</view>
                   </view>
-                  <!-- <view class="active-type" wx:if="{{item.isNeedVip == 1}}">潮兼职免费</view> -->
+                  <!-- <view class="active-type" wx:if="{{item.isNeedVip == 1}}">会员免费</view> -->
                 </view>
                 <view class="num-price">
                   <view class="num" style="color:#999999;">

pages/home/index/activityDetail/activityDetail.js

@@ -316,10 +316,14 @@ Page({
 		  )
 	},
 	submit() {
+		// console.log('submit', this.data.detail.statusName)
 		 // this.popup4.showPopup();
 		//报名满了
 		if(this.data.detail.statusName != '报名中'){
-			
+			wx.showToast({
+				title: `活动${this.data.detail.statusName}`,
+				icon: 'none'
+			})
 			return ;
 		}
 		
@@ -377,6 +381,7 @@ Page({
 		
 		wx.showLoading({
 			title: '提交中...',
+			mask: true,
 		})
 		
 		let isDeductiblePrice = that.data.open ? 1 : 0
@@ -387,10 +392,18 @@ Page({
 			isDeductiblePrice: isDeductiblePrice
 		}, function(res) {
 			if (res.code === 0) {
-		
+				wx.hideLoading();
+				if (!res.map) {
+					wx.showToast({
+						title: "支付参数获取失败",
+						icon: "none",
+						duration: 1500,
+					});
+					return;
+				}
 				wx.showActionSheet({
 				  itemList: ["微信支付"],
-				  success: (response) => {
+					success: (response) => {
 				    if (response.tapIndex === 0) {
 				      wx.showLoading({
 				        title: "正在处理...",
@@ -408,14 +421,15 @@ Page({
 				              title: "正在处理...",
 				              mask: true,
 				            });
-				            console.log(result, 11111111);
+				            // console.log(result, 11111111);
 				            wx.hideLoading();
 							that.popup3.showPopup();
 				            wx.showModal({
 				              title: "温馨提示",
 				              content: "报名成功！",
 				              showCancel: false,
-				            });
+							});
+							// that.loadData();
 							// setTimeout(()=>{
 							// 	wx.redirectTo({
 							// 		url: '/pages/my/myPlay/myPlay',
@@ -485,7 +499,8 @@ Page({
 			}else if(res.msg == '请完善资料后进行报名操作'){
 				wx.hideToast();
 				that.popup2.showPopup();
-			}else if(res.msg.indexOf('冻结阶段') > -1){
+			} else if (res.msg.indexOf('冻结阶段') > -1) {
+				console.log(res.msg)
 				wx.hideToast();
 				wx.showToast({
 					title: res.msg,

pages/home/index/activityDetail/activityDetail.wxml

@@ -38,7 +38,7 @@
         </view>
         <view class="list">活动时间：{{detail.startTime}} — {{detail.endTime}}</view>
         <view class="list" bindtap="goLocal">
-          <i style="font-size:35rpx;" class="iconfont icon-dizhi icon-act-dizhi"></i>
+          <i style="font-size:35rpx;" class="iconfont1 icon-dizhi icon-act-dizhi"></i>
           <view class="address-word">地址：{{detail.address}}</view>
           <i class="iconfont1 icon-jinrujiantouxiao righticon"></i>
         </view>
@@ -176,7 +176,7 @@
       <popup2 id='popup4' title='提示' isCancel="{{true}}" content="{{['']}}" btn_no='继续支付' btn_ok='查看会员权益'
         bind:error2="_error2" bind:error="_error" bind:success="_success" data-name="popup4" data-cancel="1">
         <view slot="content" style="width: 85%;padding: 44rpx 0 38rpx 0;">
-          <view class="msg-tip1">活动为潮兼职免费</view>
+          <view class="msg-tip1">活动为会员免费</view>
           <!-- <view class="msg-tip2">是否开通/升级会员</view> -->
         </view>
       </popup2>

pages/home/index/index.js

@@ -687,7 +687,8 @@ Page({
         if (res.code === 0) {
           wx.setStorageSync("USER", res.member);
         } else {
-          wx.removeStorageSync("USER");
+          // wx.removeStorageSync("USER");
+          wx.clearStorage();
           // wx.reLaunch({
           //   url: '/pages/login',
           // })

pages/home/index/partDetail/partDetail.js

@@ -347,7 +347,7 @@ Page({
   //倒计时
   countDown() {
     var that = this;
-    if (that.data.time <= 0) {
+    if (that.data.time <= 1) {
       this.setData({
         isDjs: false,
         time: 5,
@@ -499,7 +499,7 @@ Page({
   //确认事件
   _success(e) {
     let that = this;
-    if (e.currentTarget.dataset.name == "popup0") {} else if (e.currentTarget.dataset.name == "popup4") {
+    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({
@@ -514,7 +514,12 @@ Page({
         that.setData({
           isShowPop: false
         })
-        that.signUp();
+        // console.log("非会员", that.data.detail.isNeedVip);
+        if (that.data.detail.isNeedVip) {
+          that.popup.showPopup();
+        } else {
+          that.signUp();
+        }
         console.log("非会员");
       }
     } else if (e.currentTarget.dataset.name == "popup2") {

pages/home/index/partDetail/partDetail.wxml

@@ -70,7 +70,7 @@
         <view style="margin-top:16rpx;" class="list-address-box" bindtap="goLocal">
           <!-- detail.address -->
           <view class="list">
-            <i class="iconfont icon-dizhi icon-home-dizhi icon-address"></i>
+            <i class="iconfont1 icon-dizhi icon-home-dizhi icon-address"></i>
             <view class="address-w">{{detail.address}}</view>
           </view>
           <i class="iconfont1 icon-jinrujiantouxiao righticon"></i>

pages/my/index/index.js

@@ -362,7 +362,8 @@ Page({
             });
             // _this.loadUser()
           } else {
-            wx.removeStorageSync("USER");
+            // wx.removeStorageSync("USER");
+            wx.clearStorage();
             wx.navigateTo({
               url: "/pages/login",
             });

pages/my/index/index.wxml

@@ -52,7 +52,9 @@
                         <text class="upgrade-text">升级会员立享更多权益</text>
                     </view>
                     <view class="vip-banner-right">
-                        <text class="upgrade-btn">{{ userInfo.memberState == 0 ? '开通会员' : '升级会员' }}</text>
+                        <text class="upgrade-btn" wx:if="{{userInfo.memberState == 0}}">开通会员</text>
+                        <text class="upgrade-btn" wx:if="{{userInfo.memberState == 1}}">升级会员</text>
+                        <text class="upgrade-btn" wx:if="{{userInfo.memberState == 2}}">已是终身会员</text>
                         <text class="iconfont icon-jiantou righticon"></text>
                     </view>
                 </view>
@@ -116,7 +118,7 @@
             </view>
             <view class="menu-item" bindtap="handleWork" wx:if="{{userInfo.memberRoleStatus == 3 || userInfo.memberRoleStatus == 4 || userInfo.memberRoleStatus == 5}}">
                 <view class="menu-left">
-                    <image src="{{appAssetsUrl3}}user-icon/icon_5.png" class="menu-icon"></image>
+                    <image src="{{appAssetsUrl3}}user-icon/icon_13.png" class="menu-icon"></image>
                     <text class="menu-text">行家工作台</text>
                 </view>
                 <text class="iconfont icon-jiantou righticon"></text>

pages/my/index1/index.js

@@ -447,7 +447,8 @@ Page({
             });
             // _this.loadUser()
           } else {
-            wx.removeStorageSync("USER");
+            // wx.removeStorageSync("USER");
+            wx.clearStorage();
             wx.navigateTo({
               url: "/pages/login",
             });

pages/my/index1/index.wxml

@@ -47,7 +47,7 @@
           <view class="tip">
             <text wx:if="{{User.memberState == 0}}">升级享受更多权益</text>
             <text wx:if="{{User.memberState == 1}}">有效期：{{User.expireTime}}</text>
-            <text wx:if="{{User.memberState == 2}}">有效期：终生有效</text>
+            <text wx:if="{{User.memberState == 2}}">有效期：终身有效</text>
             <text wx:if="{{User.memberState == 3}}">有效期：{{User.expireTime}}</text>
             <!-- <text>{{User.memberState == 0 ?'升级会员立享更多权益': User.expireTime ? ('有效期：' + User.expireTime) : ''}}</text> -->
             <!-- <text>有效期：2022年4月14日</text> -->

pages/myMember/myMember.js

@@ -106,7 +106,8 @@ Page({
               });
             }
           } else {
-            wx.removeStorageSync("USER");
+            // wx.removeStorageSync("USER");
+            wx.clearStorage();
             wx.navigateTo({
               url: "/pages/login",
             });

pages/myMember/myMember.wxml

@@ -26,7 +26,7 @@
           </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 == 2}}">到期时间：终身有效</text>
           <text wx:if="{{detail.memberState == 3}}">到期时间：{{detail.expireTime}}</text>
         </view>
 

pages/myMember/myMember1.wxml

@@ -26,7 +26,7 @@
           </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 == 2}}">到期时间：终身有效</text>
           <text wx:if="{{detail.memberState == 3}}">到期时间：{{detail.expireTime}}</text>
         </view>
 

pointExchange/pages/center/center.js

@@ -14,8 +14,7 @@ Page({
 		nodata: util.nodata(),
 		params: {
 			pageNum: 1,
-			pageSize: 10,
-			stuId: util.getUserId()
+			pageSize: 15
 		},
 		total:{
 			currPage: 0,
@@ -40,6 +39,7 @@ Page({
 		this.loadList();
 	},
 	loadList(isRefresh) {
+		// console.log("util.getUserId()", util.getUserId())
 		let that = this;
 		if (!isRefresh && this.data.noMore) {
 			wx.showToast({
@@ -53,7 +53,8 @@ Page({
 			noMore: isRefresh ? false : this.data.noMore,
 			params: {
 				...this.data.params,
-				pageNum: isRefresh?1:this.data.params.pageNum+1
+				pageNum: isRefresh ? 1 : this.data.params.pageNum + 1,
+				stuId: util.getUserId()
 			}
 		})
 		wx.showLoading({

pointExchange/pages/center/center.wxml

@@ -23,7 +23,7 @@
 						<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="{{appAssetsUrl3}}task-icon/task-icon9.png"></image>
-						<image wx:if="{{item.scoreEvent=='活动报名抵扣的积分'}}" mode="widthFix" src="/assets/images/icon/icon_1.png"></image>
+						<image wx:if="{{item.scoreEvent=='活动报名抵扣的积分' || item.scoreEvent=='会员升级抵扣的积分' || item.scoreEvent=='兼职报名抵扣的积分'}}" mode="widthFix" src="/assets/images/icon/icon_1.png"></image>
 						<image wx:if="{{item.scoreEvent=='看广告得积分'}}" mode="widthFix" src="/assets/images/icon/icon_2.png"></image>
 
 						<view class="left">