1

project/src/canvas/game/output.js

@@ -2108,6 +2108,7 @@ var initLottie_1 = __webpack_require__(/*! ./initLottie */ "./src/initLottie.ts"
 exports.GDispatcher = new FYGE.EventDispatcher();
 var Main = (function () {
     function Main(canvas) {
+        console.warn = function () { };
         var sysInfo;
         if (my) {
             FYGE.initedByCanvas(canvas);

project/src/canvas/game/released/output.js

@@ -2110,6 +2110,7 @@ var initLottie_1 = __webpack_require__(/*! ./initLottie */ "./src/initLottie.ts"
 exports.GDispatcher = new FYGE.EventDispatcher();
 var Main = (function () {
     function Main(canvas) {
+        console.warn = function () { };
         var sysInfo;
         if (my) {
             FYGE.initedByCanvas(canvas);

project/src/canvas/game/src/Main.ts

@@ -28,7 +28,7 @@ export class Main {
     private requestID;
     private _pause: boolean;
     constructor(canvas: HTMLCanvasElement) {
-        // console.warn=function(){}
+        console.warn=function(){}
         var sysInfo;
         //@ts-ignore 存在my就初始化
         if (my) {

taobao_mini/client/app.js

@@ -8,7 +8,7 @@ cloud.init({
 App({
   requestType: 'cloud', // yapi，cloud: 云函数
   // requestType: 'yapi', // yapi，cloud: 云函数
-  cloudName: 'floor', // 主云函数项目名 base clientTemplate2C
+  cloudName: 'bubbleSurviva', // 主云函数项目名 base clientTemplate2C
   cloud,
   tbcc,
   onLaunch(options) {
@@ -24,9 +24,7 @@ App({
    */
   handleQuery(query) {
     const { activityId } = query;
-    // this.activityId = activityId || '5f505873738989c8b356e284';
-    this.activityId = activityId || '5f5c687685a74964233cd5ff';
-    // this.activityId = activityId || '5f5759b2114fbb8f6d91245c';//商家创建的测试环境活
+    this.activityId = activityId || '5f34e1c4964f9706aa7d803c';
   }
 
 });

taobao_mini/client/app.json

 {
     "pages": [
-        "pages/index/index",
         "pages/pagecanvas/pagecanvas",
+        "pages/index/index",
         "pages/pageshop/pageshop"
     ],
     "window": {

taobao_mini/client/pages/pagecanvas/output.js

@@ -2110,6 +2110,7 @@ var initLottie_1 = __webpack_require__(/*! ./initLottie */ "./src/initLottie.ts"
 exports.GDispatcher = new FYGE.EventDispatcher();
 var Main = (function () {
     function Main(canvas) {
+        console.warn = function () { };
         var sysInfo;
         if (my) {
             FYGE.initedByCanvas(canvas);

taobao_mini/client/pages/pagecanvas/pagecanvas.js

 'use strict';
 
 import { Main } from './output';
-//import API from '../../api';
+import API from '../../api';
+const app = getApp();
+const { tbcc } = app;
+const { commonToast, getAuthUserInfo, navigateToOutside, getSystemInfo } = tbcc.tb;
+
+console.log(tbcc);
+const checkSystem = async () => {
+  const { version } = await getSystemInfo();
+  console.log('version', version);
+  return tbcc.utils.versionCompare(version, '9.8.0');
+}
 
 Page({
   data: {},
 
   onLoad(props) {
     this.setData(this.data || {});
+
+    checkSystem().then(r => {
+      if (!r) {
+        my.showToast({
+          content: "请升级最新版本的淘宝",
+          duration: 5000
+        });
+      }
+    });
+
   },
 
   onReady() {
     console.log('on ready')
-    // let main = this.spark_startEngine(); //main.addEventListener....
+    //授权和登录先搞
+    //     this.getAuth();
+  },
+
+  init() {
+    console.log('do init');
+    this.spark_startEngine();
   },
 
   spark_startEngine() {
@@ -39,7 +65,12 @@ Page({
 
   onCanvasReady() {
     console.log('onCanvasReady')
-    this.spark_startEngine();
+    //授权和登录先搞
+    checkSystem().then(r => {
+      if (r) {
+        this.getAuth();
+      }
+    });
   },
 
   postMessage(netName, data) {
@@ -64,21 +95,16 @@ Page({
       switch (netName) {
         case "mine.getAppData":
           //获取信息
-          let tmpApp = getApp();
-          console.log('app信息', tmpApp);
           data = {
             success: true,
             data: {
-              activityId: tmpApp.activityId,
-              //|| "5e7c40e98564b57d7fb95812",
-              nickName: tmpApp.nickName,
-              avatar: tmpApp.avatar,
-              openId: tmpApp.openId,
-              isFocusShop: tmpApp.isFollow || false
+              activityId: app.activityId,
+              nickName: app.nickName,
+              avatar: app.avatar,
+              openId: app.openId
             }
           };
           break;
-
         case 'test':
           console.log('测试一下', parameter.hint);
           break;
@@ -86,8 +112,6 @@ Page({
 
       this.postMessage(netName, data);
     } else {
-      var app = getApp(); //获取后端接口
-
       const {
         function: fc
       } = app.cloud;
@@ -118,6 +142,35 @@ Page({
       this.main.pause();
       this.main.dispatchGlobalEvent("onHide");
     }
-  }
+  },
+
+  /**
+   * 获取用户授权信息
+   */
+  async getAuth() {
+    const userInfo = await getAuthUserInfo().catch(err => {
+      console.log('未授权成功', err);
+    });
+    if (userInfo) {
+      console.log('userInfo', userInfo);
+      const { nickName, avatar } = userInfo;
+      app.nickName = nickName;
+      app.avatar = avatar;
+      this.login();
+    }
+  },
+  /**
+   * 登录接口
+   */
+  async login() {
+    const { nickName, avatar } = app;
+    const { success } = await API.login({ userNick: nickName, avatar }).catch(res => {
+      commonToast(res && res.message);
+    }) || {};
+
+    if (success) {
+      this.init();
+    }
+  },
 
 });
\ No newline at end of file