gai

project/src/canvas/game/output.js

@@ -2431,7 +2431,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.destroyNetData = exports.getTbData = exports.sendTbNet = exports.TbNetName = void 0;
 var ctrls_1 = __webpack_require__(/*! ../module/ctrls */ "./module/ctrls/index.ts");
-var Ins_1 = __webpack_require__(/*! ./Ins */ "./src/Ins.ts");
 var Main_1 = __webpack_require__(/*! ./Main */ "./src/Main.ts");
 var TbNetName;
 (function (TbNetName) {
@@ -2469,8 +2468,6 @@ function sendTbNet(netName, parameter, callback, hideMsg) {
             fetchAsync(url)
                 .then(function (data) {
                 dataRecord[netName] = data;
-                if (!hideMsg && !data.success)
-                    ctrls_1.showToast(data.message || "网络异常");
                 callback && callback(data.success, data);
                 resolve(data);
                 console.log("\n%c[ mock ]\n"
@@ -2487,8 +2484,6 @@ function sendTbNet(netName, parameter, callback, hideMsg) {
             Main_1.GDispatcher.removeEventListener(netName, fun);
             var d = e.data;
             dataRecord[netName] = d;
-            if (!hideMsg && !d.success)
-                Ins_1.Ins.showToast(d.message || "网络超时");
             callback && callback(d.success, d);
             resolve(d);
             console.log("\n%c[ request ]\n"

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

@@ -2433,7 +2433,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.destroyNetData = exports.getTbData = exports.sendTbNet = exports.TbNetName = void 0;
 var ctrls_1 = __webpack_require__(/*! ../module/ctrls */ "./module/ctrls/index.ts");
-var Ins_1 = __webpack_require__(/*! ./Ins */ "./src/Ins.ts");
 var Main_1 = __webpack_require__(/*! ./Main */ "./src/Main.ts");
 var TbNetName;
 (function (TbNetName) {
@@ -2471,8 +2470,6 @@ function sendTbNet(netName, parameter, callback, hideMsg) {
             fetchAsync(url)
                 .then(function (data) {
                 dataRecord[netName] = data;
-                if (!hideMsg && !data.success)
-                    ctrls_1.showToast(data.message || "网络异常");
                 callback && callback(data.success, data);
                 resolve(data);
                 console.log("\n%c[ mock ]\n"
@@ -2489,8 +2486,6 @@ function sendTbNet(netName, parameter, callback, hideMsg) {
             Main_1.GDispatcher.removeEventListener(netName, fun);
             var d = e.data;
             dataRecord[netName] = d;
-            if (!hideMsg && !d.success)
-                Ins_1.Ins.showToast(d.message || "网络超时");
             callback && callback(d.success, d);
             resolve(d);
             console.log("\n%c[ request ]\n"

project/src/canvas/game/src/TaoBaoNet.ts

@@ -158,7 +158,7 @@ export function sendTbNet(
                     //记录数据
                     dataRecord[netName] = data;
                     //统一错误信息提示
-                    if (!hideMsg && !data.success) showToast(data.message || "网络异常")
+                    // if (!hideMsg && !data.success) showToast(data.message || "网络异常")
                     //回调
                     callback && callback(data.success, data);
                     resolve(data)
@@ -190,7 +190,7 @@ export function sendTbNet(
             //记录数据
             dataRecord[netName] = d;
             //统一错误信息提示，d.data为了区分网络超时
-            if (!hideMsg && !d.success) Ins.showToast(d.message || "网络超时")
+            // if (!hideMsg && !d.success) Ins.showToast(d.message || "网络超时")
             //执行回调
             callback && callback(d.success, d);
             resolve(d)

taobao_mini/client/app.js

@@ -27,7 +27,8 @@ App({
    */
   handleQuery(query) {
     const { activityId } = query;
-    this.activityId = activityId || '5f8022919da671f3b6d5fb14';
+    // this.activityId = activityId || '5f81841def5071b132fd5e21'; //赵然
+    this.activityId = activityId || '5f8022919da671f3b6d5fb14'; //小婷
   }
 
 });

taobao_mini/client/pages/pagecanvas/output.js

@@ -2433,7 +2433,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.destroyNetData = exports.getTbData = exports.sendTbNet = exports.TbNetName = void 0;
 var ctrls_1 = __webpack_require__(/*! ../module/ctrls */ "./module/ctrls/index.ts");
-var Ins_1 = __webpack_require__(/*! ./Ins */ "./src/Ins.ts");
 var Main_1 = __webpack_require__(/*! ./Main */ "./src/Main.ts");
 var TbNetName;
 (function (TbNetName) {
@@ -2471,8 +2470,6 @@ function sendTbNet(netName, parameter, callback, hideMsg) {
             fetchAsync(url)
                 .then(function (data) {
                 dataRecord[netName] = data;
-                if (!hideMsg && !data.success)
-                    ctrls_1.showToast(data.message || "网络异常");
                 callback && callback(data.success, data);
                 resolve(data);
                 console.log("\n%c[ mock ]\n"
@@ -2489,8 +2486,6 @@ function sendTbNet(netName, parameter, callback, hideMsg) {
             Main_1.GDispatcher.removeEventListener(netName, fun);
             var d = e.data;
             dataRecord[netName] = d;
-            if (!hideMsg && !d.success)
-                Ins_1.Ins.showToast(d.message || "网络超时");
             callback && callback(d.success, d);
             resolve(d);
             console.log("\n%c[ request ]\n"

taobao_mini/client/pages/pagecanvas/pagecanvas.js

@@ -337,6 +337,7 @@ Page({
      * 登录接口
      */
     async login() {
+        my.showLoading();
         const {
             nickName,
             avatar
@@ -348,10 +349,12 @@ Page({
             userNick: nickName,
             avatar
         }).catch(res => {
+            my.hideLoading();
             commonToast(res && res.message);
         }) || {};
 
         if (success) {
+            my.hideLoading();
             app.openId = data.openId;
             this.getActivityBaseInfoById();
         }