Merge branch 'master' of ssh://193.112.35.168:29418/flqAdmin

admin

2020-05-06 98e652dd4c3af96c802689fe5382db589ca97c7d

Merge branch 'master' of ssh://193.112.35.168:29418/flqAdmin

 childPath/charts/dinDan/moneyWeiQuan.html

@@ -53,7 +53,7 @@
    // 图标设置
    var option = {
        // 表格标题
        title: { text: '金额-维权' },
        title: { text: '金额-售后' },
        // 坐标系
        grid: { show: true },
        // 提示框

 childPath/charts/dinDan/numFenLei.html

@@ -179,7 +179,7 @@
                        child: [
                            { key: ["fanliOrderNum"], value: "自购订单", check: true },
                            { key: ["shareOrderNum"], value: "分享订单", check: true },
                            { key: ["inviteOrderNum"], value: "邀请订单", check: true },
                            { key: ["inviteOrderNum"], value: "团队订单", check: true },
                        ],
                        input: { type: "number", num: 0 },
                    },

 childPath/charts/dinDan/numWeiQuan.html

@@ -5,7 +5,7 @@
        <meta charset="UTF-8">
        <meta http-equiv="X-UA-Compatible" content="chrome=1"/>
        <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
        <title>下单数-维权</title>
        <title>下单数-售后</title>
        <link rel="stylesheet" type="text/css" href="../../../css/doui.min.css"/>
        <script src="../../../js/doui.min.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../../js/requestHost.js" type="text/javascript" charset="utf-8"></script>
@@ -53,7 +53,7 @@
    // 图标设置
    var option = {
        // 表格标题
        title: { text: '维权' },
        title: { text: '售后' },
        // 坐标系
        grid: { show: true },
        // 提示框

 childPath/dingDan/dingDan.html

@@ -258,7 +258,7 @@
                                            }
                                        }
                                        
                                        thatTr.td[6].value = "订单维权#"+ mo[i].weiQuanState+"#"+ drawbackMoney   ; thatTr.td[6]["class"] = "font-red"; 
                                        thatTr.td[6].value = "订单售后#"+ mo[i].weiQuanState+"#"+ drawbackMoney   ; thatTr.td[6]["class"] = "font-red"; 
                                    }
                                    else if (thatTr.td[6].key == 4) { thatTr.td[6].value = "已失效"; thatTr.td[6]["class"] = "font-gray"; }
                                    


 childPath/dingDan/dingDan_taoBao_wq.html

@@ -5,7 +5,7 @@
        <meta charset="utf-8" />
        <meta http-equiv="X-UA-Compatible" content="chrome=1"/>
        <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
        <title>淘宝维权订单</title>
        <title>淘宝售后订单</title>
        <link rel="stylesheet" type="text/css" href="../../css/doui.min.css"/>
        <script src="../../js/doui.min.js" type="text/javascript" charset="utf-8"></script>
        <script src="../../js/requestHost.js" type="text/javascript" charset="utf-8"></script>
@@ -87,12 +87,12 @@
                                            { title: "商品标题", key:mo[i].goodsName, value: mo[i].goodsName},
                                            { title: "订单号", key: mo[i].orderId, value: mo[i].orderId },
                                            { title: "子订单号", key: mo[i].orderItemId, value: mo[i].orderItemId },
                                            { title: "维权金额", key: mo[i].money, value: "￥"+ mo[i].money },
                                            { title: "售后金额", key: mo[i].money, value: "￥"+ mo[i].money },
                                            { title: "返还给商家金额", key: mo[i].fanMoney, value: "￥"+ mo[i].fanMoney},
                                            { title: "维权状态", key: mo[i].state, value: mo[i].state },
                                            { title: "售后状态", key: mo[i].state, value: mo[i].state },
                                            { title: "结算时间", key: mo[i].jieSuanTime, value: mo[i].jieSuanTime },
                                            { title: "维权时间", key: mo[i].weiQuanTime, value: mo[i].weiQuanTime },
                                            { title: "维权完成时间", key: mo[i].weiQuanFinishTime, value:mo[i].weiQuanFinishTime },
                                            { title: "售后时间", key: mo[i].weiQuanTime, value: mo[i].weiQuanTime },
                                            { title: "售后完成时间", key: mo[i].weiQuanFinishTime, value:mo[i].weiQuanFinishTime },
                                            { title: "本地创建时间", key: mo[i].createTime, value: mo[i].createTime },
                                            { title: "本地更新时间", key: mo[i].updateTime, value: mo[i].updateTime },
                                        ],
@@ -120,12 +120,12 @@
                    { title: "商品标题", width: "", orderUp: "", orderDown: "" },
                    { title: "订单号", width: "", orderUp: "", orderDown: "" },
                    { title: "子订单号", width: "", orderUp: "", orderDown: "" },
                    { title: "维权金额", width: "", orderUp: "", orderDown: "" },
                    { title: "售后金额", width: "", orderUp: "", orderDown: "" },
                    { title: "返还给商家金额", width: "", orderUp: "", orderDown: "" },
                    { title: "维权状态", width: "", orderUp: "", orderDown: "" },
                    { title: "售后状态", width: "", orderUp: "", orderDown: "" },
                    { title: "结算时间", width: "", orderUp: "", orderDown: "" },
                    { title: "维权时间", width: "", orderUp: "", orderDown: "" },
                    { title: "维权完成时间", width: "", orderUp: "", orderDown: "" },
                    { title: "售后时间", width: "", orderUp: "", orderDown: "" },
                    { title: "售后完成时间", width: "", orderUp: "", orderDown: "" },
                    { title: "本地创建时间", width: "", orderUp: "", orderDown: "" },
                    { title: "本地更新时间", width: "", orderUp: "", orderDown: "" }
                ]

 childPath/shenHe/shopOrder2.html

@@ -180,7 +180,7 @@
                            "提现金额与订单所产生的金额不符，请核对后再试",
                            "账户资金异常，请进一步核实后申请提现",
                            "转账异常，请核实绑定的收款账户信息是否准确",
                            "结算异常，提现资金存在维权订单，请等待一周后再试",
                            "结算异常，提现资金存在售后订单，请等待一周后再试",
                            "账户涉嫌违规，禁止提现",
                            "订单或资金中存在异常风险，180天后待订单风险消除时再查验资金提现，如有疑问请联系客服。"
                        ],

 childPath/shenHe/tiXian2.html

@@ -236,7 +236,7 @@
                            "提现金额与订单所产生的金额不符，请核对后再试",
                            "账户资金异常，请进一步核实后申请提现",
                            "转账异常，请核实绑定的收款账户信息是否准确",
                            "结算异常，提现资金存在维权订单，请等待一周后再试",
                            "结算异常，提现资金存在售后订单，请等待一周后再试",
                            "账户涉嫌违规，禁止提现",
                            "订单或资金中存在异常风险，30天后待订单风险消除时再查验资金提现，如有疑问请联系客服。",
                            "订单或资金中存在异常风险，60天后待订单风险消除时再查验资金提现，如有疑问请联系客服。",

 childPath/user/friend.html

@@ -58,7 +58,7 @@
                list: [
                    { key: "1", value: "直接粉丝" },
                    { key: "2", value: "间接粉丝" },
                    { key: "0", value: "上级BOSS" },
                    { key: "0", value: "直接邀请人" },
                ],
            });
            // 筛选项

 menu.json

@@ -267,7 +267,7 @@
                        "child": []

                    },

                    {

                        "value": "淘宝维权订单记录", "href": "childPath/dingDan/dingDan_taoBao_wq.html",

                        "value": "淘宝售后订单记录", "href": "childPath/dingDan/dingDan_taoBao_wq.html",

                        "child": []

                    },

                    {


 window/0phone/tiXian.html

@@ -186,7 +186,7 @@
                        "提现金额与订单所产生的金额不符，请核对后再试",
                        "账户资金异常，请进一步核实后申请提现",
                        "转账异常，请核实绑定的收款账户信息是否准确",
                        "结算异常，提现资金存在维权订单，请等待一周后再试",
                        "结算异常，提现资金存在售后订单，请等待一周后再试",
                        "账户涉嫌违规，禁止提现",
                        "订单或资金中存在异常风险，30天后待订单风险消除时再查验资金提现，如有疑问请联系客服。",
                        "订单或资金中存在异常风险，60天后待订单风险消除时再查验资金提现，如有疑问请联系客服。",

 window/0phone/tiXian23.html

@@ -182,7 +182,7 @@
                        "提现金额与订单所产生的金额不符，请核对后再试",
                        "账户资金异常，请进一步核实后申请提现",
                        "转账异常，请核实绑定的收款账户信息是否准确",
                        "结算异常，提现资金存在维权订单，请等待一周后再试",
                        "结算异常，提现资金存在售后订单，请等待一周后再试",
                        "账户涉嫌违规，禁止提现",
                    ],
                },

 window/mobileAdmin/js/helpCenter_editData.js

@@ -204,8 +204,7 @@
            // 返回上一页，且重新请求列表
            setTimeout(function()
            {
                pageReplaceUrl("helpCenter.html");
				
                goListPage();
            }, 500);
        }
    });