xhr.send

cc11e77d · 王勇霞 · bd582a83 · cc11e77d · cc11e77d · cc11e77d
Commit cc11e77d authored Mar 12, 2023 by 王勇霞
17 changed files
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@

 <head>
    <meta charset="UTF-8">
-    <title>21天"云"健身</title>
+    <title>21天“云”健身</title>
    <meta name="viewport"
        content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
    <meta name="apple-mobile-web-app-capable" content="yes" />

--- a/module/web/ajax.ts
+++ b/module/web/ajax.ts
@@ -76,7 +76,9 @@ export function ajax(options: ajaxParameterInt) {
        /**
         * POST请求设置请求头
         */
-        xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+        // xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+        xhr.setRequestHeader('Accept', 'application/json, text/plain, */*');
+        xhr.setRequestHeader('Content-Type', 'application/json;charset=UTF-8');
        if (options.headers) {
            for (let key in options.headers) {
                xhr.setRequestHeader(key, options.headers[key]);
@@ -85,7 +87,7 @@ export function ajax(options: ajaxParameterInt) {
        /**
         * 发送请求参数
         */
-        xhr.send(params);
+        xhr.send(JSON.stringify(options.data));
    }
 }


--- a/module/web/webTools.ts
+++ b/module/web/webTools.ts
@@ -10,11 +10,7 @@ let urlParams: { [key: string]: string | true };
 export function getUrlParams(key: string, refreshCache: boolean = false): string | true {
    if (urlParams && !refreshCache) return urlParams[key];
    urlParams = {};
-    let search = window.location.search;
-    try {
-        search = top.location.search;  //尝试获取顶层的链接
-    } catch (e) {
-    }
+    let search = '?' + window.location.href.split("?")[1]
    //获取链接参数
    for (let item of search.replace('?', '').split('&')) {
        let arr = item.split('=');

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
    "@babel/core": "^7.14.6",
    "@babel/preset-env": "^7.14.7",
    "ali-oss": "^4.11.4",
+    "canvas": "^2.11.0",
    "chalk": "^2.3.0",
    "co": "^4.6.0",
    "del": "^2.2.1",

--- a/released/resource/FailPanel/FailPanel.png
+++ b/released/resource/FailPanel/FailPanel.png
--- a/released/resource/GameScene/GameScene.png
+++ b/released/resource/GameScene/GameScene.png
--- a/released/resource/GameScene/gamebg.jpg
+++ b/released/resource/GameScene/gamebg.jpg
--- a/released/resource/GuidePanel/GuidePanel.png
+++ b/released/resource/GuidePanel/GuidePanel.png
--- a/released/resource/RulePanel/RulePanel.png
+++ b/released/resource/RulePanel/RulePanel.png
--- a/released/resource/StartScene/StartScene.png
+++ b/released/resource/StartScene/StartScene.png
--- a/released/resource/StartScene/startbg.jpg
+++ b/released/resource/StartScene/startbg.jpg
--- a/released/resource/SuccessPanel/SuccessPanel.png
+++ b/released/resource/SuccessPanel/SuccessPanel.png
--- a/released/resource/common/common.png
+++ b/released/resource/common/common.png
--- a/released/resource/res.json
+++ b/released/resource/res.json
--- a/src/ResJson.ts
+++ b/src/ResJson.ts
--- a/src/WebNet.ts
+++ b/src/WebNet.ts
@@ -4,11 +4,6 @@ import { GDispatcher } from "./Main";
 import { getUrlParams } from "../module/web/webTools";
 import { isFromShare, newUser } from 'duiba-utils';

-let mergeData = {
-    user_type: newUser ? '0' : '1',
-    is_from_share: isFromShare ? '0' : '1',
-}
-
 //////////////星速台接口方法集成
 /**
 * web接口枚举，mock 文件名类似aaa/homeInfo.do
@@ -79,7 +74,7 @@ export function sendWebNet(
    headers?: any,
 ): Promise<dataOut> {
    //处理下参数
-    parameter = { ...parameter, ...mergeData };
+    parameter = { ...parameter };

    return new Promise((resolve, reject) => {

@@ -123,11 +118,11 @@ export function sendWebNet(

        //网络请求
        ajax({
-            url: netName.replace("{projectId}", getProjectId()), //请求地址
+            url: netName, //请求地址
            type: isGet ? 'GET' : "POST",   //请求方式
            data: parameter || {}, //请求参数
-            dataType: "json",     // 返回值类型的设定,暂时只有json
-            async: true,   //是否异步
+            dataType: "json",// 返回值类型的设定,暂时只有json
+            async: true,//是否异步
            headers: headers,
            success: function (response) {
                //发现有些接口成功了，但是response为空
@@ -154,7 +149,7 @@ export function sendWebNet(
                );
            },
            error: function (status) {
-                if (!hideMsg) showToast("网络超时");
+                if (!hideMsg) showToast("网络开小差了, 请稍后再试");
                callback && callback(false)
                resolve({ success: false });
                console.log("接口" + netName + "：网络超时");