bug修复

expert/agentdetail/agentdetail.wxml

@@ -1,6 +1,6 @@
 <view>
 	<view class="item" wx:if="{{isSchool}}">
-		<image src="{{obj.agentPhoto ? obj.agentPhoto : appAssetsUrl2 + 'wjxy/login.png'}}" class='img'></image>
+		<image src="{{obj.agentPhoto ? obj.agentPhoto : '/assets/images/logo.jpg'}}" class='img'></image>
 		<view class="info-box">
 			<view class="name-box">
 				<view>{{obj.showName}}</view>
@@ -14,7 +14,7 @@
 		</view>
 	</view>
 	<view class="item" wx:else>
-		<image mode="aspectFill" src="{{activeInfo.memberphoto ? activeInfo.memberphoto : appAssetsUrl2 + 'wjxy/login.png' }}" class='img'></image>
+		<image mode="aspectFill" src="{{activeInfo.memberphoto ? activeInfo.memberphoto : '/assets/images/logo.jpg' }}" class='img'></image>
 		<view class="info-box">
 			<view class="name-box">
 				<view>{{activeInfo.name}}</view>

expert/detail/detail.wxss

@@ -45,12 +45,12 @@ page {
 .time {
   /* width: 153rpx; */
   height: 57rpx;
-  background: #ffdc2f;
+  background: #2b58a5;
   border-radius: 29rpx;
   font-size: 28rpx;
   font-family: PingFang SC, PingFang SC-Regular;
   font-weight: 400;
-  color: #000;
+  color: #ffffff;
   text-align: center;
   line-height: 57rpx;
   padding: 0 22rpx;
@@ -301,11 +301,11 @@ page {
   position: fixed;
   /* width: 690rpx; */
   width: 100%;
-  padding: 0 30rpx;
+  padding: 0 30rpx 20rpx 30rpx;
   box-sizing: border-box;
   display: flex;
   justify-content: space-between;
-  height: 85rpx;
+  height: 105rpx;
 }
 .share-btn {
   position: absolute;
@@ -354,7 +354,7 @@ page {
 .i-know {
   width: 500rpx;
   height: 80rpx;
-  background: #ffdc2f;
+  background: #2b58a5;
   border-radius: 40rpx;
   text-align: center;
   line-height: 80rpx;

invitationCode/index.js

@@ -167,13 +167,21 @@ Page({
 			})
 	},
 	copyText() {
+		console.log("拷贝2333")
 		wx.setClipboardData({
-			data: this.data.user.inviteCode || '',
+			data: this.data.inviteCode || '',
 			success: function(res) {
 				wx.showToast({
 					title: '已复制邀请码',
 					icon: 'none'
 				})
+			},
+			fail: function (res) {
+				console.log(res)
+				wx.showToast({
+					title: '复制失败',
+					icon: 'none'
+				})
 			}
 		})
 	}

meet/meet/detail.wxss

@@ -450,6 +450,7 @@ page {
   padding-bottom: constant(safe-area-inset-bottom);
   padding-bottom: env(safe-area-inset-bottom);
   background-color: #fff;
+  padding-bottom: 20rpx;
 }
 
 .footer .btn-box {
@@ -462,15 +463,15 @@ page {
   /* width: 220rpx; */
   flex: 1;
   height: 85rpx;
-  background: #fffae1;
-  border: 1rpx solid #ffa836;
+  background: #c5dbff;
+  border: 1rpx solid #2b58a5;
   border-radius: 44rpx;
   text-align: center;
   line-height: 85rpx;
   font-size: 30rpx;
   font-family: "PingFang SC, PingFang SC-Regular";
   font-weight: 400;
-  color: #ffa836;
+  color: #2b58a5;
   box-sizing: border-box;
   margin-right: 20rpx;
 }
@@ -480,14 +481,14 @@ page {
 }
 
 .footer .orange-btn {
-  background: #ffa022;
-  color: #1a1a1a;
+  background: #2b58a5;
+  color: #ffffff;
   border: none;
 }
 
 .footer .yellow-btn {
-  background: #ffdc2f;
-  color: #1a1a1a;
+  background: #7fa5e7;
+  color: #ffffff;
   border: none;
 }
 

pages/checkin/index.js

@@ -336,6 +336,12 @@ Page({
       case '参与活动':
         url = '/pages/experience/index/index';
         break;
+      case '评价':
+        break;
+      case '分享小程序':
+        url = '/pages/home/index/index';
+        tab = true;
+        break;
       case '观看广告':
         break;
     }

pages/home/index/activityDetail/activityDetail.js

@@ -369,6 +369,7 @@ Page({
 	singPay() {
 		let that = this;
 		let money = that.data.open ? that.data.actualPrice : that.data.detail.money
+		console.log(money)
 		if(money == 0) {
 			return that.signUp()
 		}
@@ -472,7 +473,7 @@ Page({
 				  icon: "none",
 				  duration: 1500,
 				});
-				that.popup5.hidePopup();
+				// that.popup5.hidePopup();
 				that.popup3.showPopup();
 				// setTimeout(()=>{
 				// 	wx.redirectTo({

pages/home/index/activityDetail/activityDetail.wxml

@@ -62,7 +62,7 @@
       <!-- 个人信息 -->
       <view class="user-box">
         <image mode="aspectFill"
-          src="{{schoolInfo.memberphoto ? schoolInfo.memberphoto : appAssetsUrl2 + 'wjxy/login.png'}}"
+          src="{{schoolInfo.memberphoto ? schoolInfo.memberphoto : '/assets/images/logo.jpg'}}"
           lazy-load="{{true}}" class="user-img" />
         <view class="user-right">
           <view>

pages/home/index/index.js

@@ -956,4 +956,27 @@ Page({
       });
     }
   },
+
+  showRewardedVideoAd: function (e) {
+    this.selectComponent('.uni-rewarded-video-ad').show();
+  },
+  onadload: function (e) {
+    console.log('广告加载成功：', e)
+  },
+  onadclose: function (e) {
+    const detail = e.detail
+    // 用户点击了【关闭广告】按钮
+    if (detail && detail.isEnded) {
+      // 正常播放结束
+      console.log("onClose-正常播放结束：" + detail.isEnded);
+    } else {
+      // 播放中途退出
+      console.log("onClose-播放中途退出：" + detail.isEnded);
+    }
+  },
+  onaderror: function (e) {
+    // 广告加载失败
+    console.log('广告加载失败：', e.detail)
+  }
+
 });

pages/home/index/partDetail/partDetail.js

@@ -354,6 +354,7 @@ Page({
   },
   // 我已知晓
   know() {
+    if (this.data.isDjs) return;
     this.popup3.hidePopup();
     this.loadData();
     if (this.data.isShowPop) {
@@ -435,6 +436,11 @@ Page({
           wx.hideToast();
           that.popup2.showPopup();
         }
+        if (res.code != 0) {
+          that.setData({
+            isShowPop: true,
+          });
+        }
       }
     );
   },

pages/home/index/partDetail/partDetail.wxss

@@ -31,6 +31,7 @@ page {
   color: #ffffff;
   text-align: center;
   padding-top: 2rpx;
+  box-sizing: border-box;
 }
 .text-bao {
   font-size: 30rpx;
@@ -47,6 +48,9 @@ page {
   color: #4c441e;
   /* margin-top: 4rpx; */
 }
+.left{
+  flex-shrink: 0;
+}
 .btn-box {
   display: flex;
   justify-content: space-between;
@@ -230,7 +234,8 @@ page {
   color: #ffffff;
 }
 .greybg {
-  width: 358rpx;
+  /* width: 358rpx; */
+  box-sizing: border-box !important;
 }
 
 .big-box {
@@ -972,6 +977,9 @@ page {
   margin-top: 32rpx;
   border-top: 1px solid #e6e6e6;
 }
+.left-t-r {
+  flex-shrink: 0;
+}
 .left-t-r i {
   font-size: 50rpx;
 }

pages/login.js

@@ -53,7 +53,10 @@ Page({
         memberId: options.memberId,
       });
     }
-
+    wx.showLoading({
+      title: "加载中...",
+      mobile: true,
+    });
     wx.login({
       success(res) {
         App._post_form(
@@ -62,6 +65,7 @@ Page({
           code: res.code,
         },
           (data) => {
+            wx.hideLoading();
             if (data.code == 0) {
               wx.setStorageSync("openid", data.data.openid);
               wx.setStorageSync("session_key", data.data.session_key);
@@ -329,7 +333,7 @@ Page({
       inviteCode: this.data.inviteCode,
       memberPhoto: this.data.params.memberphoto,
       mobile: this.data.params.mobile,
-      name: his.data.params.vipname,
+      name: this.data.params.vipname,
       openid: wx.getStorageSync("openid"),
       // shortMessageCode: this.data.code,
     };
@@ -396,6 +400,7 @@ Page({
       filePath: res.detail.avatarUrl,
       name: 'file',
       success: (res) => {
+        // console.log("上传成功", res)
         const newData = JSON.parse(res.data)
         if (newData.code == '000000') {
           that.setData({
@@ -404,7 +409,8 @@ Page({
           wx.hideLoading();
         }
       },
-      fail() {
+      fail(err) {
+        // console.log("上传失败", err)
         wx.hideLoading();
       },
     });

pages/login.wxml

@@ -1,7 +1,7 @@
 <view class='content'>
   <view class="app-title">青雲慧小程序</view>
-  <image src="{{appAssetsUrl2}}wjxy/login.png" class="li1" bindtap="toHome" />
-  <!-- <image src="/assets/images/login.png" class="li1" bindtap="toHome" /> -->
+  <!--<image src="{{appAssetsUrl2}}wjxy/login.png" class="li1" bindtap="toHome" />-->
+  <image src="/assets/images/logo.jpg" class="li1" bindtap="toHome" />
   <!-- <view class="invitation-code">
 		<text>邀请码 </text> 
 		<input value="{{inviteCode}}" class="weui-input" bindinput="inviteCodeInput" placeholder="请输入邀请码" />
@@ -64,7 +64,7 @@
             <text class="txt">手机号</text>
           </div>
           <view class="box-right">
-            <text>{{telInput || '请点击按钮'}}</text>
+            <text>{{params.mobile || '请点击按钮'}}</text>
             <button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">绑定手机号</button>
           </view>
         </view>

pages/login.wxss

@@ -1308,14 +1308,14 @@ page {
 }
 
 .btn-submit {
-  background: #ffdc2f !important;
+  background: #2b58a5 !important;
   font-size: 32rpx;
   box-shadow: 0px 0px 8rpx 0px rgba(6, 6, 6, 0.14);
   display: flex;
   justify-content: center;
   align-items: center;
-  color: #1a1a1a !important;
-  border: 1px solid #ffdc2f !important;
+  color: #ffffff !important;
+  border: 1px solid #2b58a5 !important;
   width: 630rpx;
   height: 91rpx;
   border-radius: 46rpx;
@@ -1493,8 +1493,8 @@ page {
   margin-left: 20rpx;
   border-radius: 10rpx;
   font-size: 24rpx;
-  background-color: #ffdc2f;
-  color: #000;
+  background-color: #2b58a5;
+  color: #ffffff;
 }
 
 .login-popup .user-info-box .func-box .avatarBtn {
@@ -1520,5 +1520,6 @@ page {
 .login-popup .user-info-box .custom-style {
   margin: 70rpx auto 30rpx;
   width: 400rpx;
-  background-color: #ffdc2f;
+  background-color: #2b58a5 !important;
+  color: #ffffff !important;
 }

pages/match/details/index.wxss

@@ -37,6 +37,11 @@
 .publish-info .iconfont1{
     font-size: 30rpx;
     margin-right: 5rpx;
+    flex-shrink: 0;
+}
+
+.publish-time{
+  flex-shrink: 0;
 }
 
 .content-section {

pages/match/index.js

@@ -1,5 +1,6 @@
 // pages/match/index.js
 const app = getApp();
+var util = require("../../utils/util.js");
 
 Page({
 
@@ -20,6 +21,7 @@ Page({
     imglist: [],
     current: 0,
     activeTitle: false,
+    nodata: util.nodata(),
   },
 
   /**
@@ -112,7 +114,7 @@ Page({
 
     // 调用API获取赛事数据
     const params = {
-      pageNum: this.data.pageNum,
+      page: this.data.pageNum,
       pageSize: this.data.pageSize
     };
     
@@ -126,7 +128,7 @@ Page({
       if (res.code === 0) {
         // 处理返回的数据
         const newList = res.page.list || [];
-        const total = res.page.totalPage || 0;
+        const total = res.page.totalCount || 0;
         
         // 如果是第一页，直接设置数据；否则追加数据
         const matchList = this.data.pageNum === 1 ? newList : [...this.data.matchList, ...newList];

pages/match/index.wxml

@@ -26,6 +26,11 @@
                     <view class="item-desc">{{item.introduction || ''}}</view>
                 </view>
             </view>
+            <block wx:if="{{matchList.length<=0}}">
+                <view class='tc h100'>
+                    <image src="{{nodata}}" class='nodata-img'></image>
+                </view>
+            </block>
         </view>
     </view>
 </view>

pages/my/index/index.js

@@ -49,7 +49,14 @@ Page({
       statusBarHeight: height + "px"
     });
   },
-
+  onLogin() {
+    if (!this.data.isLogin) {
+      wx.navigateTo({
+        url: '/pages/login',
+      })
+      return false
+    }
+  },
   /**
    * 客服点击事件
    */
@@ -82,9 +89,9 @@ Page({
    */
   onAvatarTap() {
     if (!this.data.isLogin) {
-      wx.navigateTo({
-        url: '/pages/login',
-      })
+      // wx.navigateTo({
+      //   url: '/pages/login',
+      // })
       return false
     }
     wx.navigateTo({
@@ -190,6 +197,12 @@ Page({
    * 积分点击事件
    */
   onPointsTap() {
+    if (!this.data.isLogin) {
+      wx.navigateTo({
+        url: '/pages/login',
+      })
+      return false
+    }
     wx.navigateTo({
       url: "/pointExchange/pages/center/center?totalScore=" + this.data.totalScore,
     });

pages/my/index/index.wxml

@@ -16,9 +16,9 @@
         <!-- 用户信息区域 -->
         <view class="head">
             <view class="user-info-container">
-                <view class="user-basic-info">
+                <view class="user-basic-info" bindtap="onLogin">
                     <view class="avatar-section">
-                        <image src='{{userInfo.memberphoto?userInfo.memberphoto:(appAssetsUrl+"images/bz1_nor.png")}}' class="user-avatar" bindtap="onAvatarTap"></image>
+                        <image src='{{userInfo.memberphoto?userInfo.memberphoto:("/assets/images/logo.jpg")}}' class="user-avatar" bindtap="onAvatarTap"></image>
                     </view>
                     <view class="user-details" wx:if="{{isLogin}}">
                         <view class="user-name-row" bindtap="onAvatarTap">
@@ -34,7 +34,7 @@
                             </view>
                         </view>
                     </view>
-                    <view wx:if="{{!isLogin}}" bindtap="toLogin">点击登录</view>
+                    <view wx:if="{{!isLogin}}">点击登录</view>
                     <view class="qr-code-section" bindtap="onQRCodeTap" wx:if="{{isLogin}}">
                         <!-- <image src="{{appAssetsUrl2}}my/qrcode-icon.png" class="qr-icon"></image> -->
                         <image src='{{appAssetsUrl3}}user-icon/inviteCode.png' class="qr-icon"></image>
@@ -81,7 +81,7 @@
             <view class="registration-cards">
                 <image src="{{appAssetsUrl3}}user-icon/user-job-icon.png" class="card-icon" bindtap="onJobRegistrationTap"></image>
                 <image src="{{appAssetsUrl3}}user-icon/user-activity-icon.png" class="card-icon" bindtap="onActivityRegistrationTap"></image>
-                <image src="{{appAssetsUrl3}}user-icon/user-activity-icon.png" class="card-icon" bindtap="seeMeet"></image>
+                <image src="{{appAssetsUrl3}}user-icon/appointment-icon.png" class="card-icon" bindtap="seeMeet"></image>
             </view>
         </view>
         <!-- 功能菜单列表 -->

pages/my/index/index.wxss

@@ -315,6 +315,7 @@
   border: 1rpx solid #5790f7;
   border-radius: 32rpx;
   justify-content: center;
+  box-sizing: border-box;
 }
 
 .points-action {
@@ -366,7 +367,7 @@
 }
 
 .card-icon {
-  width: 200rpx;
+  width: 210rpx;
   height: 113rpx;
 }
 

pages/my/myData/myData.wxml

@@ -296,7 +296,7 @@
     <view class="notice">
       完善所有信息可得积分奖励，完善程度
       <text class="num">{{formNum}}</text>
-      /13
+      /{{formNum && formNum > 18 ? formNum : 18}}
     </view>
     <view class="flex-btn-view">
       <view class='cancel' bindtap='btnCancel'>取消</view>

pages/my/myStudy/myStudy.js

@@ -268,7 +268,7 @@ Page({
           .boundingClientRect((rect) => {
             let height = rect.height;
             that.setData({
-              tipHeight: height,
+              tipHeight: height + 10,
             });
           })
           .exec();
@@ -279,7 +279,7 @@ Page({
           .boundingClientRect((rect) => {
             let height = rect.height;
             that.setData({
-              tipHeight: height,
+              tipHeight: height + 10,
             });
           })
           .exec();

pages/my/myStudy/myStudy.wxss

@@ -170,6 +170,7 @@
   font-weight: 400;
   color: #1a1a1a;
   color: #fff;
+
 }
 .input-label {
   font-size: 28rpx;
@@ -346,6 +347,7 @@
   z-index: 10;
   width: 100%;
   background: #fff;
+  padding-bottom: 20rpx;
 }
 .noBtr{
 border-top: none !important;

pages/myMember/myMember.js

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

pages/myMember/myMember.wxml

@@ -18,7 +18,7 @@
           <view class="icon-box">
             <image class='micon img-icon' style="width:30rpx;height:28rpx;margin-right:2rpx;" src='{{appAssetsUrl3}}user-icon/icon_11.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">

pages/quality/detail/index.js

@@ -9,6 +9,7 @@ Page({
    */
   data: {
     appAssetsUrl2: app.appAssetsUrl2,
+    appAssetsUrl3: app.appAssetsUrl3,
     user: {},
     popup2: null,
     detail: {},

pages/quality/detail/index.wxml

@@ -16,7 +16,8 @@
   </view>
   <view class="big-box {{ user && !user.id || (user.memberState == 0 && detail.memberApply) ? 'vipBg' : ''}}">
     <view class="dim {{user && !user.id ||  (user.memberState == 0 && detail.memberApply) ? '' : 'showDim'}}">
-      <image src="{{appAssetsUrl2}}new/dim.png"></image>
+      <!--<image src="{{appAssetsUrl2}}new/dim.png"></image>-->
+      <image src="{{appAssetsUrl3}}user-icon/user-brick.png"></image>
       <view class="tip">加入会员，即可报名</view>
     </view>
     <view class="goods-content">

pages/search/index.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "青雲慧生长",
+  "navigationBarTitleText": "青创生长",
   "navigationBarTextStyle": "black",
   "enablePullDownRefresh": true
 }

pointExchange/pages/center/center.wxml

@@ -14,7 +14,7 @@
 			<scroll-view class="card" scroll-y bindscrolltolower="bindscrolltolower">
 				<view class="item" wx:for="{{listData}}">
 					<view class="box">
-						<image wx:if="{{item.scoreEvent=='完善资料' ||  item.scoreEvent=='完善个人资料'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon1.png"></image>
+						<image wx:if="{{item.scoreEvent=='完善资料' ||  item.scoreEvent=='完善个人资料' ||  item.scoreEvent=='学籍认证'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon1.png"></image>
 						<image wx:if="{{item.scoreEvent=='分享小程序'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon2.png"></image>
 						<image wx:if="{{item.scoreEvent=='每日登录'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon3.png"></image>
 						<image wx:if="{{item.scoreEvent=='成功邀请好友' ||  item.scoreEvent=='邀请好友'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon4.png"></image>
@@ -23,6 +23,9 @@
 						<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=='看广告得积分'}}" mode="widthFix" src="/assets/images/icon/icon_2.png"></image>
+
 						<view class="left">
 							<view class="title">{{item.scoreEvent}}</view>
 							<view class="time">{{item.createTime}}</view>

workbench/service/service.wxss

@@ -193,20 +193,20 @@ page {
 .footer .btn {
   width: 320rpx;
   height: 85rpx;
-  background: #fffae1;
-  border: 1rpx solid #ffa836;
+  background: #c5dbff;
+  border: 1rpx solid #2b58a5;
   border-radius: 44rpx;
   text-align: center;
   line-height: 85rpx;
   font-size: 30rpx;
   font-family: 'PingFang SC, PingFang SC-Regular';
   font-weight: 400;
-  color: #ffa836;
+  color: #2b58a5;
 }
 
 .footer .other-btn {
-  background: #ffa022;
-  color: #1a1a1a;
+  background: #2b58a5;
+  color: #ffffff;
 }
 
 .footer .text {

workbench/work/work.wxss

@@ -85,12 +85,11 @@ page {
   width: 153rpx;
   height: 57rpx;
   margin-left: auto;
-  background: #ffdc2f;
+  background: #2b58a5;
   border-radius: 29rpx;
   font-size: 28rpx;
   font-family: 'PingFang SC, PingFang SC-Regular';
   font-weight: 400;
-  color: #1a1a1a;
   color: #fff;
   line-height: 57rpx;
   text-align: center;