修改接口签名传参判断条件

新增接口签名
2024-04-25 18:28:40 +08:00 · 2024-04-25 17:59:48 +08:00
72 changed files with 4264 additions and 7 deletions
--- a/view/molistar/activity/gift_changer/.vscode/settings.json
+++ b/view/molistar/activity/gift_changer/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "liveServer.settings.port": 5501
+}
--- a/view/molistar/activity/gift_changer/css/index.css
+++ b/view/molistar/activity/gift_changer/css/index.css
--- a/view/molistar/activity/gift_changer/css/index.scss
+++ b/view/molistar/activity/gift_changer/css/index.scss
--- a/view/molistar/activity/gift_changer/css/swiper-bundle.min.css
+++ b/view/molistar/activity/gift_changer/css/swiper-bundle.min.css
--- a/view/molistar/activity/gift_changer/images/add.png
+++ b/view/molistar/activity/gift_changer/images/add.png
--- a/view/molistar/activity/gift_changer/images/add_put.png
+++ b/view/molistar/activity/gift_changer/images/add_put.png
--- a/view/molistar/activity/gift_changer/images/but.png
+++ b/view/molistar/activity/gift_changer/images/but.png
--- a/view/molistar/activity/gift_changer/images/but_active.png
+++ b/view/molistar/activity/gift_changer/images/but_active.png
--- a/view/molistar/activity/gift_changer/images/del.png
+++ b/view/molistar/activity/gift_changer/images/del.png
--- a/view/molistar/activity/gift_changer/images/div_active.png
+++ b/view/molistar/activity/gift_changer/images/div_active.png
--- a/view/molistar/activity/gift_changer/images/gxn.png
+++ b/view/molistar/activity/gift_changer/images/gxn.png
--- a/view/molistar/activity/gift_changer/images/header.png
+++ b/view/molistar/activity/gift_changer/images/header.png
--- a/view/molistar/activity/gift_changer/images/laba.png
+++ b/view/molistar/activity/gift_changer/images/laba.png
--- a/view/molistar/activity/gift_changer/images/left_but.png
+++ b/view/molistar/activity/gift_changer/images/left_but.png
--- a/view/molistar/activity/gift_changer/images/line.png
+++ b/view/molistar/activity/gift_changer/images/line.png
--- a/view/molistar/activity/gift_changer/images/lines.png
+++ b/view/molistar/activity/gift_changer/images/lines.png
--- a/view/molistar/activity/gift_changer/images/luzi.png
+++ b/view/molistar/activity/gift_changer/images/luzi.png
--- a/view/molistar/activity/gift_changer/images/luzi.svga
+++ b/view/molistar/activity/gift_changer/images/luzi.svga
--- a/view/molistar/activity/gift_changer/images/mixFail.png
+++ b/view/molistar/activity/gift_changer/images/mixFail.png
--- a/view/molistar/activity/gift_changer/images/nojilu.png
+++ b/view/molistar/activity/gift_changer/images/nojilu.png
--- a/view/molistar/activity/gift_changer/images/pt_tab.png
+++ b/view/molistar/activity/gift_changer/images/pt_tab.png
--- a/view/molistar/activity/gift_changer/images/pt_tab_active.png
+++ b/view/molistar/activity/gift_changer/images/pt_tab_active.png
--- a/view/molistar/activity/gift_changer/images/qipao.png
+++ b/view/molistar/activity/gift_changer/images/qipao.png
--- a/view/molistar/activity/gift_changer/images/qipao2.png
+++ b/view/molistar/activity/gift_changer/images/qipao2.png
--- a/view/molistar/activity/gift_changer/images/qipao3.png
+++ b/view/molistar/activity/gift_changer/images/qipao3.png
--- a/view/molistar/activity/gift_changer/images/qipao_bad.png
+++ b/view/molistar/activity/gift_changer/images/qipao_bad.png
--- a/view/molistar/activity/gift_changer/images/record.png
+++ b/view/molistar/activity/gift_changer/images/record.png
--- a/view/molistar/activity/gift_changer/images/record_icon.png
+++ b/view/molistar/activity/gift_changer/images/record_icon.png
--- a/view/molistar/activity/gift_changer/images/reduce.png
+++ b/view/molistar/activity/gift_changer/images/reduce.png
--- a/view/molistar/activity/gift_changer/images/refining.png
+++ b/view/molistar/activity/gift_changer/images/refining.png
--- a/view/molistar/activity/gift_changer/images/refining_close.png
+++ b/view/molistar/activity/gift_changer/images/refining_close.png
--- a/view/molistar/activity/gift_changer/images/refining_ok.png
+++ b/view/molistar/activity/gift_changer/images/refining_ok.png
--- a/view/molistar/activity/gift_changer/images/right_but.png
+++ b/view/molistar/activity/gift_changer/images/right_but.png
--- a/view/molistar/activity/gift_changer/images/rule.png
+++ b/view/molistar/activity/gift_changer/images/rule.png
--- a/view/molistar/activity/gift_changer/images/rule1.png
+++ b/view/molistar/activity/gift_changer/images/rule1.png
--- a/view/molistar/activity/gift_changer/images/rule_icon.png
+++ b/view/molistar/activity/gift_changer/images/rule_icon.png
--- a/view/molistar/activity/gift_changer/images/shuaxin.png
+++ b/view/molistar/activity/gift_changer/images/shuaxin.png
--- a/view/molistar/activity/gift_changer/images/step1.png
+++ b/view/molistar/activity/gift_changer/images/step1.png
--- a/view/molistar/activity/gift_changer/images/step2.png
+++ b/view/molistar/activity/gift_changer/images/step2.png
--- a/view/molistar/activity/gift_changer/images/step3.png
+++ b/view/molistar/activity/gift_changer/images/step3.png
--- a/view/molistar/activity/gift_changer/images/step4.png
+++ b/view/molistar/activity/gift_changer/images/step4.png
--- a/view/molistar/activity/gift_changer/images/step_but.png
+++ b/view/molistar/activity/gift_changer/images/step_but.png
--- a/view/molistar/activity/gift_changer/images/title.png
+++ b/view/molistar/activity/gift_changer/images/title.png
--- a/view/molistar/activity/gift_changer/images/topK.png
+++ b/view/molistar/activity/gift_changer/images/topK.png
--- a/view/molistar/activity/gift_changer/images/travel/back.png
+++ b/view/molistar/activity/gift_changer/images/travel/back.png
--- a/view/molistar/activity/gift_changer/images/wenhao.png
+++ b/view/molistar/activity/gift_changer/images/wenhao.png
--- a/view/molistar/activity/gift_changer/images/xs_bad.png
+++ b/view/molistar/activity/gift_changer/images/xs_bad.png
--- a/view/molistar/activity/gift_changer/images/xs_but.png
+++ b/view/molistar/activity/gift_changer/images/xs_but.png
--- a/view/molistar/activity/gift_changer/images/xs_but_active.png
+++ b/view/molistar/activity/gift_changer/images/xs_but_active.png
--- a/view/molistar/activity/gift_changer/images/xs_cold.png
+++ b/view/molistar/activity/gift_changer/images/xs_cold.png
--- a/view/molistar/activity/gift_changer/images/xs_fail.png
+++ b/view/molistar/activity/gift_changer/images/xs_fail.png
--- a/view/molistar/activity/gift_changer/images/xs_header.png
+++ b/view/molistar/activity/gift_changer/images/xs_header.png
--- a/view/molistar/activity/gift_changer/images/xs_left_but.png
+++ b/view/molistar/activity/gift_changer/images/xs_left_but.png
--- a/view/molistar/activity/gift_changer/images/xs_line.png
+++ b/view/molistar/activity/gift_changer/images/xs_line.png
--- a/view/molistar/activity/gift_changer/images/xs_lines.png
+++ b/view/molistar/activity/gift_changer/images/xs_lines.png
--- a/view/molistar/activity/gift_changer/images/xs_luzi.png
+++ b/view/molistar/activity/gift_changer/images/xs_luzi.png
--- a/view/molistar/activity/gift_changer/images/xs_luzi.svga
+++ b/view/molistar/activity/gift_changer/images/xs_luzi.svga
--- a/view/molistar/activity/gift_changer/images/xs_right_but.png
+++ b/view/molistar/activity/gift_changer/images/xs_right_but.png
--- a/view/molistar/activity/gift_changer/images/xs_rule_state.png
+++ b/view/molistar/activity/gift_changer/images/xs_rule_state.png
--- a/view/molistar/activity/gift_changer/images/xs_rule_state1.png
+++ b/view/molistar/activity/gift_changer/images/xs_rule_state1.png
--- a/view/molistar/activity/gift_changer/images/xs_shuaxin.png
+++ b/view/molistar/activity/gift_changer/images/xs_shuaxin.png
--- a/view/molistar/activity/gift_changer/images/xs_success.png
+++ b/view/molistar/activity/gift_changer/images/xs_success.png
--- a/view/molistar/activity/gift_changer/images/xs_tab.png
+++ b/view/molistar/activity/gift_changer/images/xs_tab.png
--- a/view/molistar/activity/gift_changer/images/xs_tab_active.png
+++ b/view/molistar/activity/gift_changer/images/xs_tab_active.png
--- a/view/molistar/activity/gift_changer/images/xs_topK.png
+++ b/view/molistar/activity/gift_changer/images/xs_topK.png
--- a/view/molistar/activity/gift_changer/images/xuxian1.png
+++ b/view/molistar/activity/gift_changer/images/xuxian1.png
--- a/view/molistar/activity/gift_changer/images/xuxian2.png
+++ b/view/molistar/activity/gift_changer/images/xuxian2.png
--- a/view/molistar/activity/gift_changer/images/xuxian3.png
+++ b/view/molistar/activity/gift_changer/images/xuxian3.png
--- a/view/molistar/activity/gift_changer/index.html
+++ b/view/molistar/activity/gift_changer/index.html
@@ -0,0 +1,256 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>魔法小屋</title>
+    <link rel="stylesheet" href="../../common/css/reset.css">
+    <link rel="stylesheet" href="./css/swiper-bundle.min.css">
+    <link rel="stylesheet" href="./css/index.css?v=1.20">
+</head>
+
+<body>
+    <!-- 用戶首次進入引導遮罩 -->
+    <div class="guide_mask"></div>
+    <!-- 引導層內容 -->
+    <div class="step_wrap">
+        <div class="step1">
+            <img class="step_tips" src="./images/step1.png" alt="">
+            <img class="step_but" src="./images/step_but.png" alt="">
+        </div>
+        <div class="step2">
+            <img class="step_tips" src="./images/step2.png" alt="">
+            <img class="xuxian_qp" src="./images/xuxian1.png" alt="">
+            <img class="xuxian_bar" src="./images/xuxian1.png" alt="">
+            <img class="step_but" src="./images/step_but.png" alt="">
+        </div>
+        <div class="step3">
+            <img class="step_tips" src="./images/step3.png" alt="">
+            <img class="step_but" src="./images/step_but.png" alt="">
+            <img class="xuxian_c" src="./images/xuxian2.png" alt="">
+        </div>
+        <div class="step4">
+            <img class="step_tips" src="./images/step4.png" alt="">
+            <img class="xuxian_c" src="./images/xuxian3.png" alt="">
+            <!-- 合成成功 -->
+            <div class="success_wrap">
+                <div class="qipao3">
+                    <img src="http://img.uat.lecheng163.com/FszzQQxFvTSutMLHqh9mzi2XkJqx?imageslim" alt="">
+                </div>
+                <span>妳已成功合成禮物“<b>契約魔法棒</b>” </span>
+                <p>已發入背包中，請註意查收~</p>
+            </div>
+            <!-- 合成失敗 -->
+            <div class="bad_wrap">
+                <div class="qipao_bad"></div>
+                <span>魔法爐出現大故障，煉制失敗了 </span>
+                <p>請下次再試~</p>
+            </div>
+        </div>
+    </div>
+
+    <!-- 頂部返回 -->
+    <div class="back"><img src="./images/travel/back.png" alt=""></div>
+    <!-- 頭部部分 -->
+    <div class="head_wrap">
+        <div class="header">
+            <img src="./images/title.png" class="title" alt="">
+            <img src="./images/record_icon.png" class="record_icon" alt="">
+            <img src="./images/rule_icon.png" class="rule_icon" alt="">
+            <img src="./images/left_but.png" alt="" class="left_but">
+            <div class="left_text">上一款</div>
+            <div class="right_text">下一款</div>
+            <img src="./images/right_but.png" alt="" class="right_but">
+            <div class="notice">
+                <img src="./images/laba.png" alt="">
+                <ul>
+                    <!-- <li><span class="sp1">小小小小小鵝 </span> 合成了<span class="sp2">4544</span>鉆的<b>迪迦奧特曼</b></li> -->
+                </ul>
+            </div>
+            <div class="luzi">
+                <div class="luzis"></div>
+            </div>
+            <div class="tab_wrap" style="display: none;">
+                <div class="tab_item"><img src="./images/pt_tab_active.png" alt=""></div>
+                <div class="tab_item"><img src="./images/xs_tab.png" alt=""></div>
+            </div>
+            <div class="qipao">
+                <img src="" alt="">
+
+                <p></p>
+            </div>
+            <div class="but"></div>
+        </div>
+    </div>
+    <!-- 進度部分 -->
+    <div class="speed_rogress">
+        <div class="speed_rogress_top">
+            <span>當前進度</span>
+            <div class="bar_wrap speed">
+                <div>
+                    <img src="./images/xs_lines.png" class="xs_border" alt="">
+                    <img src="./images/line.png" class="line" alt="">
+                </div>
+            </div>
+            <p>1223/3345</p>
+            <img src="./images/wenhao.png" alt="" class="wenhao">
+        </div>
+        <p class="ps">進度值已滿，趕快點擊煉制吧~/進度值達到滿值時即可合成禮物哦~</p>
+    </div>
+    <!-- 底部背包 -->
+    <div class="bottom">
+        <div class="b_Top">
+            <p>投入背包禮物，增加進度值</p>
+            <img src="./images/shuaxin.png" alt="">
+        </div>
+        <div class="swiper">
+            <div class="swiper-wrapper">
+                <div class="not">
+                    <div>
+                        <p>當前暫無多余背包禮物，</p>
+                        <p>無法煉制合成禮物哦~</p>
+                    </div>
+                </div>
+                <!-- <div class="swiper-slide">
+                    <div>
+                        <img src="https://img1.baidu.com/it/u=3791046847,364441755&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500"
+                            alt="">
+                        <span>5</span>
+                        <p>5200鉆</p>
+                        <strong>1<b>/2</b></strong>
+                    </div>
+                </div>
+            </div>
+            //如果需要分頁器
+            <div class="swiper-pagination"></div> -->
+            </div>
+            <!-- <span class="diamonds">當前背包禮物總價值：<b></b>鉆</span> -->
+        </div>
+    </div>
+    <!-- 合成完畢 恭喜妳 -->
+    <div class="gxn">
+        <div class="gxn_in">
+            <div class="qb">
+                <img src="" alt="">
+            </div>
+            <p>妳已成功合成禮物“<b>迪迦奧特曼</b>”</p>
+            <span>已發入背包中，請註意查收~</span>
+        </div>
+    </div>
+    <!-- 確認取消煉制彈窗 -->
+    <div class="refining">
+        <div class="refining_in">
+            <p>確認選擇這些背包禮物進行煉制嗎？</p>
+            <div>
+                <img class="close" src="./images/refining_close.png" alt="">
+                <img class="ok" src="./images/refining_ok.png" alt="">
+            </div>
+        </div>
+    </div>
+    <!-- 添加減少彈框 -->
+    <div class="investment" style="z-index: 99;">
+        <div class="investment_in">
+            <!-- <img src="./images/del.png" alt="" class="closeBut"> -->
+            <p class="title">選擇投入：</p>
+            <div class="qipao">
+                <img src="" alt="">
+                <span></span>
+            </div>
+            <div class="num">
+                <img class="reduce" src="./images/reduce.png" alt="">
+                <input type="number" value="0" onkeyup="value=(value.replace(/\D/g,'')==''?'':parseInt(value))">
+                <img class="add" src="./images/add.png" alt="">
+            </div>
+            <div class="but"></div>
+        </div>
+    </div>
+    <!-- 超出弹窗提醒 -->
+    <div class="investment2" style="z-index: 100;">
+        <div class="investment_in">
+            <p>投入禮物的價值將<b>高於</b>合成所需價值，確認繼續投入嗎?</p>
+            <img class="close" src="./images/refining_close.png" alt="">
+            <img class="ok" src="./images/refining_ok.png" alt="">
+        </div>
+    </div>
+
+    <!-- 規則寶典 -->
+    <div class="rule">
+        <div class="rule_in"></div>
+        <img src="./images/del.png" alt="">
+    </div>
+    <!-- 無記錄彈窗 -->
+    <div class="not_record">
+        <div class="not_record_in"></div>
+    </div>
+    <!-- 有記錄彈窗-->
+    <div class="record">
+        <div class="record_in">
+            <ul>
+                <!-- <li>
+                    <img class="tx"
+                        src="https://img0.baidu.com/it/u=1942253063,3807598283&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500"
+                        alt="">
+                    <span>迪迦禮物</span>
+                    <div class="time_m">06-18</div>
+                    <div class="time_d">12:08</div>
+                </li> -->
+            </ul>
+        </div>
+        <img class="del" src="./images/del.png" alt="">
+    </div>
+
+    <!-- 限時屋未開啟彈窗 -->
+    <div class="xs_close">
+        <div class="xs_cold"></div>
+        <img class="del" src="./images/del.png" alt="">
+    </div>
+    <!-- 限時屋規則說明 -->
+    <div class="xs_rule">
+        <div class="rule_state"></div>
+        <img class="del" src="./images/del.png" alt="">
+    </div>
+    <!-- 限時屋合成成功彈窗 -->
+    <div class="xs_success">
+        <div class="success_in">
+            <div class="qipao3">
+                <img src="" alt="">
+            </div>
+            <span>妳已成功合成禮物“<b></b>” </span>
+            <p>已發入背包中，請註意查收~</p>
+        </div>
+        <img class="del" src="./images/del.png" alt="">
+    </div>
+    <!-- 限時屋合成失敗彈窗 -->
+    <div class="xs_fail">
+        <div class="fail_in">
+            <div class="qipao3">
+                <img src="" alt="">
+            </div>
+            <span>魔法爐出現了小故障，煉制成了“<b></b>” </span>
+            <p>已發入背包中，請註意查收~</p>
+        </div>
+        <img class="del" src="./images/del.png" alt="">
+    </div>
+    <!-- 限時屋合成糟糕彈窗 -->
+    <div class="xs_bad">
+        <div class="bad_in">
+            <div class="qipao_bad"></div>
+            <span>魔法爐出現大故障，煉制失敗了 </span>
+            <p>請下次再試~</p>
+        </div>
+        <img class="del" src="./images/del.png" alt="">
+    </div>
+</body>
+
+</html>
+<script type="text/javascript" src="../../common/js/svga.min.js"></script>
+<script src="../../common/js/flexible.js"></script>
+<script src="../../common/js/jquery-3.2.1.min.js"></script>
+<script src="../../common/js/common2.js"></script>
+<script src="../../common/js/layer.js"></script>
+<script src="../../common/js/vconsole.min.js"></script>
+<script src="../../common/js/route-constant.js"></script>
+<script src="./js/swiper-bundle.min.js"></script>
+<script src="./js/index.js?v=1.20"></script>
--- a/view/molistar/activity/gift_changer/js/index.js
+++ b/view/molistar/activity/gift_changer/js/index.js
--- a/view/molistar/activity/gift_changer/js/swiper-bundle.min.js
+++ b/view/molistar/activity/gift_changer/js/swiper-bundle.min.js
--- a/view/molistar/common/js/common2.js
+++ b/view/molistar/common/js/common2.js
@@ -1084,7 +1084,7 @@ function networkRequest(reqObj = {}, type) {
    });
    promise.then((val) => {
        // setTimeout(function () {
-        const sign = objectToQueryString(Object.assign({}, params));
+        const sign = objectToQueryString(Object.assign({}, params), reqObj);
        pubHeader.pub_sign = sign;

        if (!reqObj.headers || typeof reqObj.headers !== 'object') {
@@ -1107,8 +1107,12 @@ function networkRequest(reqObj = {}, type) {
            },
            beforeSend: function (xhr) {
                if (reqObj.type.toLowerCase() == 'post') {
-                    let newSerializeStr = $.param(reqObj.data);
-                    reqObj.data = newSerializeStr
+                    // console.log(reqObj.contentType);
+                    if (!reqObj.contentType) {
+                        reqObj.data = objToParam(reqObj.data)
+                        console.log('1111', reqObj.data);
+                    }
+
                }
            },
        });
@@ -1118,9 +1122,8 @@ function networkRequest(reqObj = {}, type) {
    });

 }
-function objectToQueryString(obj) {
-    console.log(obj);
-    if (JSON.stringify(obj) == "{}") {
+function objectToQueryString(obj, objAll) {
+    if (JSON.stringify(obj) == "{}" || objAll.contentType) {
        var str = 'key=rpbs6us1m8r2j9g6u06ff2bo18orwaya'
    } else {
        var str = Object.keys(obj)
@@ -1129,8 +1132,9 @@ function objectToQueryString(obj) {
            .join('&');
        str += '&key=rpbs6us1m8r2j9g6u06ff2bo18orwaya'
    }
-    console.log("str", str);
+    console.log(str);
    md5Value = $.md5(str)
+    console.log(md5Value);
    return md5Value
 }
 // 控制body是否可以滑动
Author	SHA1	Message	Date
dragon	77b2755523	修改接口签名传参判断条件	2024-04-25 18:28:40 +08:00
dragon	096a7d98da	新增接口签名	2024-04-25 17:59:48 +08:00