bug修复

app.js

@@ -7,7 +7,7 @@ App({
   /**
    * 全局变量
    */
-  // apiRoot: "https://wj.songlanyun.com/wjxy/api/", // 正式环境api地址
+  // apiRoot: "https://qingyunhui.songlanyun.com/qyh/api/", // 正式环境api地址
   apiRoot: 'http://192.168.0.181:8687/qyh/api/',
   // apiRoot: 'http://192.168.0.193:8687/qyh/api/',
   // apiRoot: 'http://192.168.0.232:8687/wjxy/api/', //黄理志
@@ -15,9 +15,12 @@ App({
   siteInfo: require("siteinfo.js"),
   token: "",
   // appAssetsUrl: 'https://pm.lanzhongrenli.com/qmjz/app', //静态资源服务器
-  appAssetsUrl: "https://wj.songlanyun.com/wjxy/statics/images/app", //静态资源服务器
+  // appAssetsUrl: "https://wj.songlanyun.com/wjxy/statics/images/app", //静态资源服务器
   // appAssetsUrl2: 'http://192.168.0.101:8687/wjxy/statics/images/app/images/', //静态资源服务器
-  appAssetsUrl2: "https://wj.songlanyun.com/wjxy/statics/images/app/images/", //静态资源服务器
+  // appAssetsUrl2: "https://wj.songlanyun.com/wjxy/statics/images/app/images/", //静态资源服务器
+
+  appAssetsUrl: "https://qingyunhui.songlanyun.com/statics/images/app", //静态资源服务器
+  appAssetsUrl2: "https://qingyunhui.songlanyun.com/statics/images/app/images/", //静态资源服务器
   appAssetsUrl3: "https://qingyunhui.songlanyun.com/statics/images/app/", //静态资源服务器
 
   //自定义参数

expert/agentdetail/agentdetail.wxss

@@ -163,6 +163,7 @@
 	color: #999999;
 }
 .address-h-box .word-type {
+	flex-shrink: 0;
 	font-size: 24rpx;
 	font-family: FZZhunYuan-M02S;
 	font-weight: 400;

pages/checkin/index.js

@@ -145,6 +145,12 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    if (!util.getUserId()) {
+      wx.redirectTo({
+        url: '/pages/login',
+      })
+      return
+    }
     wx.setNavigationBarTitle({
       title: '每日签到'
     });
@@ -340,12 +346,16 @@ Page({
       case '评价':
         break;
       case '分享小程序':
-        url = '/pages/home/index/index';
-        tab = true;
+        
         break;
       case '观看广告':
         break;
     }
+    if (taskName.indexOf('观看广告') != -1) {
+      console.log('showInterstitialAd')
+      // this.showInterstitialAd();
+      return
+    }
     // console.log('url', url)
     if (url == '') return;
     if (tab) {
@@ -357,6 +367,76 @@ Page({
         url: url,
       });
     }
+  },
+  //统计积分(每日小程序分享)
+    addScore: function() {
+      if(!util.getUserId()){
+        return ;
+      }
+      wx.showLoading({
+        title: '努力加载中...',
+      })
+      App._post_form('scoreStu/share', "", {
+        stuId: util.getUserId()
+      }, function(res) {
+        if (res.code === 0) {}
+      })
+    },
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+    this.addScore();
+    // console.log('分享==============');
+    return {
+      title: '每日签到',
+      path: '/pages/home/index/index',
+      desc: '',
+    }
+  },
 
+  // 广告观看完毕，获取积分
+  addWatchAds() {
+    const userId = util.getUserId();
+    let _this = this;
+    // TODO: 调用签到API
+    App._post_form(
+      'scoreStu/watchAds',
+      'application/json',
+      {
+        stuId: userId
+      },
+      async (res) => {
+        if (res.code === 0) {
+          _this.loadList();
+        }
+      }
+    );
+  },
+  /**
+   * 查看广告
+   * */ 
+  showRewardedVideoAd: function (e) {
+    this.selectComponent('.uni-rewarded-video-ad').show();
+  },
+  onadload: function (e) {
+    console.log('广告加载成功：', e)
+  },
+  onadclose: function (e) {
+    const detail = e.detail;
+    console.log("onClose-播放结束：" + detail)
+    // 用户点击了【关闭广告】按钮
+    if (detail && detail.isEnded) {
+      // 正常播放结束
+      console.log("onClose-正常播放结束：" + detail.isEnded);
+      this.addWatchAds();
+    } else {
+      // 播放中途退出
+      console.log("onClose-播放中途退出：" + detail.isEnded);
+    }
   },
+  onaderror: function (e) {
+    // 广告加载失败
+    console.log('广告加载失败：', e.detail)
+  }
 });

pages/checkin/index.wxml

@@ -49,9 +49,7 @@
         <view class="task-content">
           <view class="box">
             <image class="task-icon" wx:if="{{item.taskName=='邀请好友'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_1.png"></image>
-            <!--
             <image class="task-icon" wx:if="{{item.taskName=='观看广告'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_2.png"></image>
-            -->
             <image class="task-icon" wx:if="{{item.taskName=='参加兼职/成长会' ||  item.taskName=='参与兼职'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_3.png"></image>
             <image class="task-icon" wx:if="{{item.taskName=='每日签到'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_4.png"></image>
             <image class="task-icon" wx:if="{{item.taskName=='购买会员' ||  item.taskName=='开通会员'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_5.png"></image>
@@ -59,20 +57,24 @@
             <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>
             <view class="task-desc">{{item.desc}}</view>
           </view>
         </view>
-        <view class="task-action {{item.complete ? 'complete' : ''}}">
+        <button open-type='share' wx:if="{{item.taskName=='分享小程序' && !item.complete}}" class="task-action {{item.complete ? 'complete' : ''}}">
+            <text class="action-text">{{item.complete ? '已完成' : '去完成'}}</text>
+        </button>
+        <view class="task-action {{item.complete ? 'complete' : ''}}" wx:if="{{item.taskName!='分享小程序' || (item.taskName=='分享小程序' && item.complete)}}">
           <text class="action-text">{{item.complete ? '已完成' : '去完成'}}</text>
         </view>
       </view>
     </view>
   </view>
-</view>
+</view>
+
+<!--广告-->
+<!--<uni-ad adpid="" class="uni-rewarded-video-ad" bind:load="onadload" bind:close="onadclose" bind:error="onaderror"></uni-ad>-->

pages/checkin/index.wxss

@@ -300,6 +300,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  line-height: inherit !important;
 }
 
 .action-text {

pages/home/index/activityDetail/activityDetail.js

@@ -583,7 +583,8 @@ Page({
 		      dmoney: res.data.deductiblePrice,
 			  point: res.data.remainingPoints,
 			  actualPrice: res.data.actualPrice,
-			  usePoints: res.data.usePoints
+				usePoints: res.data.usePoints,
+				open: res.data.usePoints > 0 ? true : false
 		    })
 		    
 		  }

pages/home/index/activityDetail/activityDetail.wxml

@@ -219,7 +219,7 @@
           <!--  -->
           <view class="content-jifen">
             <!-- wx:if="{{point > 0}}"-->
-            <view class="jifen-box">
+            <view class="jifen-box" wx:if="{{usePoints > 0}}">
               <view class="jifen-box-left">
                 <image class="jifen-icon" src="{{appAssetsUrl3}}home/icon_8.png" mode=""></image>
                 <view class="left">

pages/myMember/myMember.wxml

@@ -137,7 +137,7 @@
     <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-box" wx:if="{{memberPoints.usePoints && memberPoints.usePoints>0}}">
         <view class="use-integral">
           <view>使用 <text class="red-price">{{memberPoints.usePoints}}</text> 积分,</view>
           <view class="deduction">抵扣 {{memberPoints.deductiblePrice}} 元</view>

pointExchange/pages/center/center.wxml

@@ -23,8 +23,11 @@
 						<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=='活动报名抵扣的积分' || 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>
+						<image wx:if="{{item.scoreEvent=='活动报名抵扣的积分' || item.scoreEvent=='会员升级抵扣的积分' || item.scoreEvent=='兼职报名抵扣的积分'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_13.png"></image>
+						<image wx:if="{{item.scoreEvent=='看广告得积分' || item.scoreEvent=='观看广告'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_14.png"></image>
+
+						<image wx:if="{{item.scoreEvent=='取消活动返还积分'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_11.png"></image>
+						<image wx:if="{{item.scoreEvent=='取消兼职返还积分'}}" mode="widthFix" src="{{appAssetsUrl3}}task-icon/icon_12.png"></image>
 
 						<view class="left">
 							<view class="title">{{item.scoreEvent}}</view>