jip

project/src/canvas/game/scripts/copyJs.js

@@ -6,8 +6,8 @@ var fs = require("fs");
 //     fs.readFileSync("./output.js")
 // )
 // var endPath = 'D:/duibaGame/测试项目0527/taobaominiTest/client/pages/index1/';
-var endPath = "C:/Users/Duiba/Desktop/work/雅顿/new_taobao/taobao_mini/client/pages/pagecanvas/"
-// var endPath = '/Applications/DUIBA-TAOBAO/YD/new_taobao/taobao_mini/client/pages/pagecanvas/';
+// var endPath = "C:/Users/Duiba/Desktop/work/雅顿/new_taobao/taobao_mini/client/pages/pagecanvas"
+var endPath = '/Applications/DUIBA-TAOBAO/YD/new_taobao/taobao_mini/client/pages/pagecanvas/';
 
 
 var version = Math.round(new Date().getTime() / 1000);

taobao_mini/client/components/comMissionModal/comMissionModal.js

@@ -61,6 +61,7 @@ Component({
     // if (this.data.missionsList.length !== prevData.missionsList.length) {
     //   this.setData({ missionsList: this.props.missionsList })
     // }
+    if (this.props.refresh) this.getMissionList()
   },
 
   methods: {

taobao_mini/client/components/goodsModal/goodsModal.axml

@@ -22,6 +22,7 @@
     </scroll-view>
   </view>
 
-  <!-- 倒计时 -->
+  <!-- 倒计时 
   <count-down-modal a:if="{{isShowCountdown && task.taskType == 'browseGoods'}}" percent="{{percent}}" usePercent="{{usePercent}}" styleType="{{'01'}}" />
+  -->
 </view>
\ No newline at end of file

taobao_mini/client/md.js

@@ -5,8 +5,8 @@ export function clickStat (activityId, type) {
   API.clickStat({activityId: activityId, type: type})
     .then(res => {
       const { success, message, data } = res
-      if (!success) { console.warn(res); commonToast(res && res.message) }
+      if (!success) { console.warn(res) }
       else console.log(`%c打点成功--${type}`, 'color:#e06a82;font-size:12px;font-weight:bold;text-shadow:1px 1px rgba(0,0,0,0.2)')
     })
-    .catch(res => { console.warn(res); commonToast(res && res.message); }) || {};
+    .catch(res => { console.warn(res) }) || {}
 }
\ No newline at end of file

taobao_mini/client/pages/goodsPage/goodsPage.js

@@ -93,8 +93,8 @@ Page({
   },
   
   //任务完成
-  async onCompleteTask(taskType,itemId) {
-    console.log(taskType,itemId)
+  async onCompleteTask(taskType, itemId) {
+    console.log(taskType, itemId)
     const { activityId } = app
     switch(taskType) {
       case 'collectGoods':
@@ -111,7 +111,7 @@ Page({
         let browsResult = await API.doBrowseGoodsTask({ activityId, itemId }).catch(res => {
           res && commonToast(res)
         }) || {}
-        console.log(browsResult)
+        console.log('%c--------完成浏览任务\n' + '-----yd.doBrowseGoodsTask\n', ConsoleStyle, browsResult.data)
         if(browsResult.success) {
           commonToast('任务完成')
         }

taobao_mini/client/pages/homePage/homePage.axml

@@ -128,4 +128,4 @@
 <newuser-modal a:if="{{newUserModalVisible}}" onModalClose="closeNewUserModal"></newuser-modal>
 <rewards-modal a:if="{{rewardsModalVisible}}" onModalClose="closeRewardsModal"></rewards-modal>
 <prizes-modal a:if="{{prizesModalVisible}}" onModalClose="closePrizesModal"></prizes-modal>
-<mission-modal a:if="{{missionModalVisible}}" onModalClose="closeMissionModal" onRefreshGameInfo="getGameInfo"></mission-modal>
+<mission-modal a:if="{{missionModalVisible}}" refresh="{{missionRefresh}}" onModalClose="closeMissionModal" onRefreshGameInfo="getGameInfo"></mission-modal>

taobao_mini/client/pages/homePage/homePage.js

@@ -14,11 +14,8 @@ Page({
   },
 
   // 视频地址列表 - 存储播放时常
-  videoSrcArr: [
-    { url: 'https://cloud.video.taobao.com/play/u/20446068/p/1/e/6/t/1/239271757987.mp4', timeStamp: 0, totalTime: 0, completed: false },
-    { url: 'https://cloud.video.taobao.com/play/u/20446068/p/1/e/6/t/1/239271757987.mp4', timeStamp: 0, totalTime: 0, completed: false },
-    { url: 'https://cloud.video.taobao.com/play/u/20446068/p/1/e/6/t/1/239271757987.mp4', timeStamp: 0, totalTime: 0, completed: false }
-  ],
+  // 'https://cloud.video.taobao.com/play/u/20446068/p/1/e/6/t/1/239271757987.mp4'
+  videoSrcArr: [],
   // 视频记录 flag
   timeStampCountFlag: false,
   // 视频记录 ms - 增量
@@ -172,7 +169,12 @@ Page({
           data.videoUrlArr.forEach((item, index) => {
             // 获取视频 视频封面 视频小封面
             this.videoSrcArr[index] = {
-              url: item.videoUrl, timeStamp: 0, totalTime: 0, completed: false
+              // url: item.videoUrl, timeStamp: 0, totalTime: 0, completed: false
+
+              // test - code
+              url: 'https://cloud.video.taobao.com/play/u/20446068/p/1/e/6/t/1/239271757987.mp4', timeStamp: 0, totalTime: 0, completed: false
+              // test - code
+
             }
             this.videoImgSrcSmallArr[index] = item.mainImage
           })
@@ -298,7 +300,10 @@ Page({
   onReady() { this.videoCtx = my.createVideoContext('videoCtx') },
 
   // 页面显示
-  onShow() { if (this.userLogin) this.getGameInfo() },
+  onShow() {
+    if (this.userLogin) this.getGameInfo()
+    this.setData({ missionRefresh: true })
+  },
 
   // 获取 游戏门票 抽奖次数 今日是否首次登陆
   getGameInfo () {

taobao_mini/client/pages/myprize/myprize.js

@@ -195,6 +195,9 @@ Page({
         // }, 5000);
 
         const { success, data, message } = res;
+
+        console.log('%c--------领取实物奖品\n' + '-----yd.receiveObjectPrize\n', ConsoleStyle, data)
+
         if (success && data) {
           commonToast('领取成功')
         } else {

taobao_mini/client/pages/pagecanvas/output.js

@@ -15247,7 +15247,7 @@ exports.Star = Star;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.config = void 0;
 exports.config = {
-    time: 120,
+    time: 12,
     first: 1000,
     second: 2000,
     third: 3000,

taobao_mini/client/pages/turnTablePage/turnTablePage.js

@@ -101,10 +101,12 @@ Page({
       return
     }
     
+    // const { success, data } = await API.lottery({ activityId: this.activityId }).catch(res => {
     const { success, data } = await API.drawLotteryPrize({ activityId: this.activityId, prizeDataType: 3 }).catch(res => {
       commonToast(res && res.message)
       return
     }) || {}
+    console.log('%c--------领取实物奖品\n' + '-----yd.receiveObjectPrize\n', ConsoleStyle, data)
 
     // test code -
     // let success = true