admin
2020-06-11 3bc16a1d3afee0d1ba5c39b1415309e1fe2c63a1
Merge branch 'master' of ssh://193.112.35.168:29418/flqFront
8个文件已修改
4个文件已添加
732 ■■■■ 已修改文件
AppInside/activityDetailTempPage/index.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/cloudPushOrder/cloudPushOrderManage.html 255 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/cloudPushOrder/css/base.css 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/cloudPushOrder/css/load.css 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/cloudPushOrder/css/opeCloudPushOrder.css 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/cloudPushOrder/img/icon_send.png 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/cloudPushOrder/img/icon_ydown.png 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/cloudPushOrder/js/load.js 91 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/cloudPushOrder/openCloudPushOrder.html 140 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/cloudPushOrder/openRecord.html 139 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/dataPreview/fund.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/teamBonus/teamBonusMonth.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/activityDetailTempPage/index.html
@@ -13,7 +13,7 @@
            window.onresize();
        </script>
        <script src="https://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script>
        <script src="http://img.flqapp.com/resource/js/app20200609.js"></script>
        <script src="http://img.flqapp.com/resource/js/app20200610.js"></script>
        <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
        <script src="js/layer.js"></script>
    </head>
AppInside/cloudPushOrder/cloudPushOrderManage.html
@@ -15,6 +15,12 @@
        <script src="https://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script>
        <script src="http://img.flqapp.com/resource/js/app2019112217.js"></script>
        <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
        <link href="css/load.css" rel="stylesheet" />
        <style type="text/css">
            [v-cloak] {
                display: none !important;
            }
        </style>
    </head>
    <body>
        <div id="root">
@@ -37,7 +43,7 @@
            </div>
            <!-- 云发单管理 -->
            <div v-if="selectTabType==1" class="div_cloudPushOrderManage">
            <div v-if="selectTabType==1" class="div_cloudPushOrderManage" v-cloak>
                <div class="div_top_header">
                    <div class="" style="display: -webkit-flex;">
                        <img :src="userInfo.portrait" class="headPortrait">
@@ -55,7 +61,7 @@
                    </div>
                </div>
                <!-- 云发单管理未登录 -->
                <div v-if="!isWxLogin" class="div_cloudPushOrderManage_notLogin">
                <div v-if="!isWxLogin" class="div_cloudPushOrderManage_notLogin" v-cloak>
                    <div class="div_cloudPushOrderManage_notLogin_content1">
                        <div class="login_wx" @click="loginWX()">
                            <p>登录微信</p>
@@ -113,7 +119,7 @@
                    </div>
                </div>
                <!-- 云发单管理已经登录 -->
                <div v-if="isWxLogin" class="div_cloudPushOrderManage_login">
                <div v-if="isWxLogin" class="div_cloudPushOrderManage_login" v-cloak>
                    <div class="div_cloudPushOrderManage_login_content1">
                        <div style="display: -webkit-flex; justify-content: space-between;">
                            <div>
@@ -170,7 +176,8 @@
                <div style="height: 0.2rem;"></div>
            </div>
            <div v-if="selectTabType==2" class="div_goodsLibrary">
            <!-- 发单商品库 -->
            <div v-if="selectTabType==2" class="div_goodsLibrary" v-cloak>
                <div class="div_goodsLibrary_content1">
                    <div>
                        <div style="color: #333333;font-size: 0.34rem;height: 0.34rem; display: -webkit-flex;align-items: center;margin-left: 0.25rem;margin-top: 0.23rem;">
@@ -180,7 +187,10 @@
                            官方精选1个小时内仅发送一个商品(9:00~21:00)
                        </div>
                    </div>
                    <img src="img/icon_off.png" style="width: 1.02rem;height: 0.62rem;margin-top: 0.27rem;margin-right: 0.2rem;">
                    <img v-if="!official" src="img/icon_off.png" style="width: 1.02rem;height: 0.62rem;margin-top: 0.27rem;margin-right: 0.2rem;"
                     @click="openGFRecomend">
                    <img v-else src="img/icon_on.png" style="width: 1.02rem;height: 0.62rem;margin-top: 0.27rem;margin-right: 0.2rem;"
                     @click="openGFRecomend">
                </div>
                <div class="div_goodsLibrary_content2">
@@ -192,49 +202,74 @@
                            即选即发,注重质量不追求数量,避免骚扰群友
                        </div>
                    </div>
                    <img src="img/icon_off.png" style="width: 1.02rem;height: 0.62rem;margin-top: 0.27rem;margin-right: 0.2rem;">
                    <img v-if="!custom" src="img/icon_off.png" style="width: 1.02rem;height: 0.62rem;margin-top: 0.27rem;margin-right: 0.2rem;"
                     @click="openFSGoods">
                    <img v-else src="img/icon_on.png" style="width: 1.02rem;height: 0.62rem;margin-top: 0.27rem;margin-right: 0.2rem;"
                     @click="openFSGoods">
                </div>
                <div class="div_goodsLibraryList">
                    <div class="div_item_goodsLibrary" v-for="(item, index) in goodsList">
                        <div>
                            <img v-bind:src="goodsList.img" class="goodsimg" />
                        </div>
                    <div class="div_item_goodsLibrary" v-for="(item, index) in goodsList">
                        <div class="div_goodsBG">
                            <img v-bind:src="item.goods.picUrl" class="goodsimg" />
                            <img v-if="item.goods.state==2" src="img/icon_send.png" class="topleftImg">
                            <img v-else-if="item.goods.state==1" src="img/icon_ydown.png" class="topleftImg">
                        </div>
                        <div class="div_item_rightBg">
                            <div class="div_goods_title_bg">
                                <img src="img/icon_tb.png">
                                <span class="goods_title">{{item.title}}</span>
                                <img v-if="item.goods.shopType==10" src="img/icon_tb.png">
                                <img v-else-if="item.goods.shopType==11" src="img/icon_tm.png">
                                <img v-else-if="item.goods.shopType==20" src="img/icon_jd.png">
                                <img v-else-if="item.goods.shopType==30" src="img/icon_pdd.png" style="width: 0.81rem;">
                                <img v-else-if="item.goods.shopType==40" src="img/icon_wph.png" style="width: 0.9rem;">
                                <img v-else-if="item.goods.shopType==50" src="img/icon_sn.png" style="width: 1.12rem;">
                                <span v-if="item.goods.shopType==30" class="goods_title" style="text-indent: 0.93rem;">{{item.goods.title}}</span>
                                <span v-else-if="item.goods.shopType==40" class="goods_title" style="text-indent: 1.02rem;">{{item.goods.title}}</span>
                                <span v-else-if="item.goods.shopType==50" class="goods_title" style="text-indent: 1.24rem;">{{item.goods.title}}</span>
                                <span v-else class="goods_title">{{item.goods.title}}</span>
                            </div>
                            <div class="div_goods_labels_bg">
                                <div class="div_goods_label1">&nbsp;公益宝贝&nbsp;</div>
                            <div v-if="item.goods.labels" class="div_goods_labels_bg">
                                <div class="div_goods_label1">&nbsp;{{item.goods.labels[0].content}}&nbsp;</div>
                                <div class="div_goods_label2">&nbsp;夏季爆款&nbsp;</div>
                            </div>
                            </div>
                            <div class="div_store_bg">
                                <img src="img/icon_store.png">
                                <div>{{item.store}}</div>
                                <img v-if="item.goods.shopInfo" src="img/icon_store.png">
                                <div v-if="item.goods.shopInfo">{{item.goods.shopInfo.shopName}}</div>
                            </div>
                            <div class="div_coupon_bg">
                                <div v-if="item.type==1" style="color: white;font-size: 0.24rem;font-weight: bold;width: 0.41rem;height: 0.36rem;background-color: #E5005C;display: flex;align-items: center;justify-content: center;border-radius: 0.06rem 0 0 0.06rem;">
                                <div v-if="item.goods.shopType!=40&&item.goods.hasCoupon" style="color: white;font-size: 0.24rem;font-weight: bold;width: 0.41rem;height: 0.36rem;background-color: #E5005C;display: flex;align-items: center;justify-content: center;border-radius: 0.06rem 0 0 0.06rem;">
                                    券
                                </div>
                                <div v-else style="color: white;font-size: 0.24rem;background-color: #E5005C;border-radius: 0.06rem;">
                                    &nbsp;&nbsp;2.5折&nbsp;&nbsp;
                                <div v-else-if="item.goods.shopType==40" style="color: white;font-size: 0.24rem;background-color: #E5005C;border-radius: 0.06rem;">
                                    &nbsp;&nbsp;{{item.goods.discount}}&nbsp;&nbsp;
                                </div>
                                <div v-if="item.type==1" class="coupon_money">&nbsp;¥15 &nbsp;</div>
                                <div class="fanli_title">&nbsp;&nbsp; 返¥9.9 &nbsp;&nbsp;</div>
                                <div v-if="item.goods.shopType!=40&&item.goods.hasCoupon" class="coupon_money">&nbsp;¥{{item.goods.couponInfo.amount}}
                                    &nbsp;</div>
                                <div class="fanli_title">&nbsp;&nbsp; 返{{item.goods.moneyInfo.fanliMoney}} &nbsp;&nbsp;</div>
                            </div>
                            <div class="div_payment_sales_bg">
                                <div>¥</div>
                                <div>0</div>
                                <div>¥78.9</div>
                                <div v-if="item.type==1">月销 8968</div>
                                <div v-if="item.goods.couponPrice">{{item.goods.couponPrice}}</div>
                                <div v-else>{{item.goods.zkPrice}}</div>
                                <div>¥{{item.goods.zkPrice}}</div>
                                <div v-if="item.goods.shopType!=40">月销 {{item.goods.salesCount}}</div>
                            </div>
                        </div>
                    </div>
                </div>
            </div>
            <div class="dialogmask_notOpen">
@@ -242,7 +277,7 @@
                    <img src="img/icon_close.png" @click="hiddenDialog()">
                    <div class="dialog_title">未开通提醒</div>
                    <div class="dialog_content">云发单首先要登录微信,且需要购买云发单服务,完成设置后,才会自动发单/发圈。</div>
                    <div class="dialog_commit" @click="commitAddTxRecord">去开通</div>
                    <div class="dialog_commit" @click="pushOpenVip">去开通</div>
                </div>
            </div>
@@ -272,8 +307,11 @@
                </div>
            </div>
            <div v-show="selectTabType==2" class="loading-more"></div>
        </div>
    </body>
    <script src="js/load.js"></script>
    <script>
        // "http://api.flqapp.com";
@@ -281,26 +319,32 @@
        var host1 = "http://192.168.1.114:8848";
        var check = null;
        var wId = null;
        $(function() {
            var app = new Vue({
                el: '#root',
                data: {
                    selectTabType: 1,
                    page: 1,
                    openState: false, // 是否了开通云发单权限
                    isWxLogin: false, // 是否登录了微信
                    circle: false, // 朋友圈-是否开启
                    qrCodeUrl: null,
                    userInfo: {},
                    dataList: [{}, {}],
                    goodsList: [{
                        title: '牛仔外套女ins潮春秋装韩版宽松百搭春季2019新款流行港...',
                        store: '三只松鼠官方旗舰店',
                        type: 1
                    }, {
                        title: '牛仔外套女ins潮春秋装韩版宽松百搭春季2019新款流行港...',
                        store: '三只松鼠官方旗舰店',
                        type: 2
                    }, ]
                    custom: false, // 优先发送自选商品库
                    official: false, // 自动采集官方推荐
                    count: 0,
                    goodsList: [
                        //     {
                        //     goods: {
                        //         shopInfo: {
                        //             shopName: null
                        //         }
                        //     }
                        // },
                    ]
                },
                watch: {
@@ -308,14 +352,20 @@
                methods: {
                    selectTab: function(type) {
                        if (app.selectTabType == type) return;
                        $('.div_header_line_' + type).css('opacity', '1')
                        $('.div_header_' + type).css('color', '#E5005C')
                        $('.div_header_line_' + type).css('opacity', '1');
                        $('.div_header_' + type).css('color', '#E5005C');
                        $('.div_header_line_' + app.selectTabType).css('opacity', '0')
                        $('.div_header_' + app.selectTabType).css('color', '#000000')
                        $('.div_header_line_' + app.selectTabType).css('opacity', '0');
                        $('.div_header_' + app.selectTabType).css('color', '#000000');
                        app.selectTabType = type
                        document.body.scrollTop = document.documentElement.scrollTop = 0;
                        app.selectTabType = type;
                        app.stopMacloginCheck();
                        if (type == 2) { //切换到发单商品库
                            app.page = 1;
                            app.fetchGoodsList();
                        }
                    },
                    hiddenDialog: function() {
@@ -324,11 +374,11 @@
                        $('.dialogmask_wx').css('display', 'none')
                        app.stopMacloginCheck();
                    },
                    // 开通云发单
                    openCloudPushOrder: function() {
                        yesApp.jumpWeb(host1 + '/flqFront/AppInside/cloudPushOrder/openCloudPushOrder.html', null);
                    },
                    // 登录微信
                    loginWX: function() {
                        if (app.openState) {
                            app.fetchQrcodeMaclogin();
@@ -336,6 +386,29 @@
                        } else {
                            yesApp.jumpWeb(host1 + '/flqFront/AppInside/cloudPushOrder/openCloudPushOrder.html', null);
                        }
                    },
                    openGFRecomend: function() {
                        if (app.openState) {
                        } else {
                            $('.dialogmask_notOpen').css('display', 'block')
                        }
                    },
                    openFSGoods: function() {
                        if (app.openState) {
                        } else {
                            $('.dialogmask_notOpen').css('display', 'block')
                        }
                    },
                    pushOpenVip: function() {
                        $('.dialogmask_notOpen').css('display', 'none')
                        yesApp.jumpWeb(host1 + '/flqFront/AppInside/cloudPushOrder/openCloudPushOrder.html', null);
                    },
                    commitAddTxRecord: function() {
@@ -359,6 +432,7 @@
                                yesApp.hideLoading();
                                if (result.code == 0) {
                                    wid = result.data.wId;
                                    app.qrCodeUrl = result.data.qrCodeUrl;
                                    $('.dialogmask_wx').css('display', 'block');
                                    app.setMacloginCheck();
@@ -387,7 +461,7 @@
                        var uid = yesApp.getUid();
                        var params = {
                            uid: uid,
                            wId: wId
                            wId: wid
                        };
                        params = yesApp.getRequestBaseParams(params);
                        $.ajax({
@@ -420,7 +494,7 @@
                    stopMacloginCheck: function() {
                        clearInterval(check);
                    },
                    // 云发单开通信息
                    fetcCloudInfo: function() {
                        yesApp.showLoading();
                        var uid = yesApp.getUid();
@@ -458,10 +532,103 @@
                                }
                            }
                        });
                    },
                    // 发单商品库
                    fetchGoodsList: function() {
                        yesApp.showLoading();
                        var uid = yesApp.getUid();
                        var params = {
                            uid: uid,
                            page: app.page
                        };
                        params = yesApp.getRequestBaseParams(params);
                        $.ajax({
                            type: "GET",
                            data: JSON.parse(params),
                            url: host + "/fanli/api/v2/user/cloud/getGoodsList",
                            dataType: "jsonp",
                            async: false,
                            success: function(result) {
                                yesApp.hideLoading();
                                if (result.code == 0) {
                                    app.custom = result.data.custom;
                                    app.official = result.data.official;
                                    if (app.page == 1) {
                                        app.goodsList = new Array();
                                    }
                                    app.page += 1;
                                    app.count = result.data.count;
                                    var list = app.goodsList.concat(result.data.list);
                                    app.goodsList = list;
                                    if (app.count <= app.goodsList.length) {
                                        load.noMore();
                                    }
                                } else {
                                    yesApp.toast(result.msg);
                                }
                            },
                            error: function(XMLHttpRequest, textStatus, errorThrown) {
                                yesApp.hideLoading();
                                if (textStatus === 'timeout') {
                                    setTimeout(function() {}, 2000);
                                }
                            }
                        });
                    }
                }
            });
            app.fetcCloudInfo();
        });
        //(浏览器窗口上边界内容高度)
        function getDocumentTop() {
            var scrollTop = 0,
                bodyScrollTop = 0,
                documentScrollTop = 0;
            if (document.body) {
                bodyScrollTop = document.body.scrollTop;
            }
            if (document.documentElement) {
                documentScrollTop = document.documentElement.scrollTop;
            }
            scrollTop = (bodyScrollTop - documentScrollTop > 0) ? bodyScrollTop : documentScrollTop;
            console.log("scrollTop:" + scrollTop);
            return scrollTop;
        }
        //可视窗口高度(屏幕可以看见的高度)
        function getWindowHeight() {
            var windowHeight = 0;
            if (document.compatMode == "CSS1Compat") {
                windowHeight = document.documentElement.clientHeight;
            } else {
                windowHeight = document.body.clientHeight;
            }
            console.log("windowHeight:" + windowHeight);
            return windowHeight;
        }
        //滚动条滚动高度(即整个网页的高度)
        function getScrollHeight() {
            var scrollHeight = 0,
                bodyScrollHeight = 0,
                documentScrollHeight = 0;
            if (document.body) {
                bodyScrollHeight = document.body.scrollHeight;
            }
            if (document.documentElement) {
                documentScrollHeight = document.documentElement.scrollHeight;
            }
            scrollHeight = (bodyScrollHeight - documentScrollHeight > 0) ? bodyScrollHeight : documentScrollHeight;
            console.log("scrollHeight:" + scrollHeight);
            return scrollHeight;
        }
    </script>
</html>
AppInside/cloudPushOrder/css/base.css
@@ -136,6 +136,18 @@
    border-radius: 0.16rem;
    display: -webkit-flex;
}
.div_goodsBG {
    position: relative;
}
.topleftImg {
    position: absolute;
    width: 1.02rem;
    height: 1.02rem;
    top: 0.16rem;
    left: 0.16rem;
}
.goodsimg {
    width: 2.6rem;
@@ -167,7 +179,7 @@
}
.div_goods_title_bg span {
    text-indent: 2.7em;
    text-indent: 0.75rem;
    color: #333333;
    font-size: 0.26rem;
    overflow: hidden;
AppInside/cloudPushOrder/css/load.css
New file
@@ -0,0 +1,70 @@
            @keyframes rotate {
                from {
                    transform: rotate(0deg);
                }
                to {
                    transform: rotate(360deg);
                    transition: all 2s;
                }
            }
            .loading{
                display: inline;
                height: 0.21rem;
                width: 0.21rem;
                margin-top: 0.15rem;
                position: relative;
            }
            .loading div{
                position: absolute;
                height: 0.05rem;
                transform-origin: left;
                border-radius: 0.5rem;
                display: flex;
            }
            .loading div .k{
                width: 0.08rem;
                height: 0.04rem;
            }
            .loading div .s{
                width: 0.13rem;
                height: 0.04rem;
                background: #BBBBBB;
                border-radius: 0.5rem;
            }
            .loading div:nth-child(2)  {-webkit-transform: rotate(30deg);}
            .loading div:nth-child(3)  {-webkit-transform: rotate(60deg);}
            .loading div:nth-child(4)  {-webkit-transform: rotate(90deg);}
            .loading div:nth-child(5)  {-webkit-transform: rotate(120deg);}
            .loading div:nth-child(6)  {-webkit-transform: rotate(150deg);}
            .loading div:nth-child(7)  {-webkit-transform: rotate(180deg);}
            .loading div:nth-child(8)  {-webkit-transform: rotate(210deg);}
            .loading div:nth-child(9)  {-webkit-transform: rotate(240deg);}
            .loading div:nth-child(10)  {-webkit-transform: rotate(270deg);}
            .loading div:nth-child(11)  {-webkit-transform: rotate(300deg);}
            .loading div:nth-child(12)  {-webkit-transform: rotate(330deg);}
            @-webkit-keyframes load{
                0%{opacity:1;}
                100%{opacity:0;}
            }
            .loading div:nth-child(1){-webkit-animation:load 1.2s linear 0s infinite;}
            .loading div:nth-child(2){-webkit-animation:load 1.2s linear 0.1s infinite;}
            .loading div:nth-child(3){-webkit-animation:load 1.2s linear 0.2s infinite;}
            .loading div:nth-child(4){-webkit-animation:load 1.2s linear 0.3s infinite;}
            .loading div:nth-child(5){-webkit-animation:load 1.2s linear 0.4s infinite;}
            .loading div:nth-child(6){-webkit-animation:load 1.2s linear 0.5s infinite;}
            .loading div:nth-child(7){-webkit-animation:load 1.2s linear 0.6s infinite;}
            .loading div:nth-child(8){-webkit-animation:load 1.2s linear 0.7s infinite;}
            .loading div:nth-child(9){-webkit-animation:load 1.2s linear 0.8s infinite;}
            .loading div:nth-child(10){-webkit-animation:load 1.2s linear 0.9s infinite;}
            .loading div:nth-child(11){-webkit-animation:load 1.2s linear 1s infinite;}
            .loading div:nth-child(12){-webkit-animation:load 1.2s linear 1.1s infinite;}
AppInside/cloudPushOrder/css/opeCloudPushOrder.css
@@ -81,7 +81,6 @@
    margin-left: 0.2rem;
    margin-right: 0.2rem;
    border-radius: 0.2rem;
    height: 5.12rem;
    background-color: white;
}
@@ -118,7 +117,8 @@
.img_moneySelect {
    position: absolute;
    width: 0.78rem;
    height: 0.78rem;
    height: 0.78rem;
    top: 0;
    right: 0;
}
@@ -127,8 +127,9 @@
    font-size: 0.6rem;
    font-weight: bold;
    text-align: center;
    margin-top: 0.45rem;
}
    padding-top: 0.45rem;
}
.openDate {
    color: #6F4935;
AppInside/cloudPushOrder/img/icon_send.png
AppInside/cloudPushOrder/img/icon_ydown.png
AppInside/cloudPushOrder/js/load.js
New file
@@ -0,0 +1,91 @@
var load = {
    init: function() {
        if ($(".loading-more").length <= 0) {
            return;
        }
        $(".loading-more").css("visibility", "hidden");
        $(".loading-more").empty();
        $(".loading-more").css("display", "flex");
        $(".loading-more").css("justify-content", "center");
        $(".loading-more").css("align-items", "center");
        $(".loading-more").css("height", "0.8rem");
        $(".loading-more").css("font-size", "0");
        $(".loading-more").append("<div class='loading'>");
        for (var i = 1; i < 13; i++) {
            // alert('2');
            $(".loading").append("<div><span class='k'></span><span class='s'></span></div>");
        }
        $(".loading-more").append(
            "<div class='notifyContent' style='display:inline;font-size:0.3rem;margin-left:0.2rem;color:#999999'>正在加载更多数据</div>"
        )
    },
    show: function(msg) {
        if (msg != null && msg.length > 0)
            $(".loading-more").find("div").eq(1).html(msg);
        $(".loading-more").css("visibility", "visible");
    },
    hidden: function() {
        $(".loading-more").css("visibility", "hidden");
    },
    isLoading: function() {
        var visibility = $(".loading-more").css("visibility");
        if ("hidden" == visibility)
            return false;
        else
            return true;
    },
    noMore: function() {
        $(".loading-more .notifyContent").html("没有更多了");
        $(".loading-more").find(".loading").css("display", "none");
        $(".loading-more").css("visibility", "visible");
    },
    showMore: function(element, callBack) {
        if (Math.abs(load.getScrollHeight() - load.getDocumentTop() - load.getWindowHeight()) < 10) {
            if (load.isLoading())
                return;
            load.show();
            setTimeout(function() {
                callBack();
            }, 300);
        }
    },
    getDocumentTop: function() {
        var scrollTop = 0,
            bodyScrollTop = 0,
            documentScrollTop = 0;
        if (document.body) {
            bodyScrollTop = document.body.scrollTop;
        }
        if (document.documentElement) {
            documentScrollTop = document.documentElement.scrollTop;
        }
        scrollTop = (bodyScrollTop - documentScrollTop > 0) ? bodyScrollTop : documentScrollTop;
        console.log("scrollTop:" + scrollTop);
        return scrollTop;
    },
    getWindowHeight: function() {
        var windowHeight = 0;
        if (document.compatMode == "CSS1Compat") {
            windowHeight = document.documentElement.clientHeight;
        } else {
            windowHeight = document.body.clientHeight;
        }
        console.log("windowHeight:" + windowHeight);
        return windowHeight;
    },
    getScrollHeight: function() {
        var scrollHeight = 0,
            bodyScrollHeight = 0,
            documentScrollHeight = 0;
        if (document.body) {
            bodyScrollHeight = document.body.scrollHeight;
        }
        if (document.documentElement) {
            documentScrollHeight = document.documentElement.scrollHeight;
        }
        scrollHeight = (bodyScrollHeight - documentScrollHeight > 0) ? bodyScrollHeight : documentScrollHeight;
        console.log("scrollHeight:" + scrollHeight);
        return scrollHeight;
    }
};
load.init();
AppInside/cloudPushOrder/openCloudPushOrder.html
@@ -15,9 +15,14 @@
        <script src="https://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script>
        <script src="http://img.flqapp.com/resource/js/app2019112217.js"></script>
        <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
        <style type="text/css">
            [v-cloak] {
                display: none !important;
            }
        </style>
    </head>
    <body>
        <div id="root">
        <div id="root" v-cloak>
            <div class="div_header">
                <div class="div_header_title">
                    <div class="div_header_1" @click="selectTab(1)">
@@ -40,9 +45,9 @@
            <div class="div_cloudPushOrderManage">
                <div class="div_top_header">
                    <div class="" style="display: -webkit-flex;">
                        <img :src="userInfo.por" class="headPortrait">
                        <img :src="userInfo.portrait" class="headPortrait">
                        <div>
                            <div class="nickName">杰拉斯</div>
                            <div class="nickName">{{userInfo.nickName}}</div>
                            <div class="desc">开通云发单,自动分享轻松赚钱</div>
                        </div>
                    </div>
@@ -85,22 +90,22 @@
                </div>
                <div class="div_contentBG2">
                    <div style="display: -webkit-flex;">
                        <div class="div_money1">
                            <div class="moneyPrice">
                                <span style="font-size: 0.32rem;">¥</span>20.00
                    <div style="display: -webkit-flex; flex-wrap: wrap;">
                        <div class="div_item" v-for="(item, index) in listMenu" @click="touchOpenPackage(item,index)">
                            <div class="div_money1">
                                <div class="moneyPrice">
                                    <span style="font-size: 0.32rem;">¥</span>{{item.money}}
                                </div>
                                <div class="openDate">{{item.desc}}</div>
                                <img src="img/icon_money_select.png" class="img_moneySelect" :id="nameId(item,index)" style="opacity: 0;">
                            </div>
                            <div class="openDate">
                                1个月
                            </div>
                            <img src="img/icon_money_select.png" class="img_moneySelect">
                        </div>
                        <div class="div_money_normol">
                            即将开放
                        </div>
                        <div class="div_money_normol">即将开放</div>
                    </div>
                    <div class="div_open">
                    <div class="div_open" @click="openVIP">
                        立即开通
                    </div>
                    <div style="display: -webkit-flex;align-items: center;margin-top: 0.2rem;">
@@ -116,6 +121,10 @@
                        </div>
                        <img src="img/icon_back.png" style="width:0.1rem;height: 0.17rem;margin-left: 0.09rem;">
                    </div>
                    <div style="height: 0.4rem;"></div>
                </div>
                <div class="div_contentBG3">
@@ -138,16 +147,19 @@
    <script>
        // "http://api.flqapp.com";
        var host = "http://api.flqapp.com";
        var host1 = "http://192.168.1.114:8848";
        var host1 = "http://192.168.1.114:8848";
        $(function() {
            var app = new Vue({
                el: '#root',
                data: {
                    selectTabType: 1,
                    selectOpenPakeg: null,
                    isOpenCloud: false, //是否了开通云发单权限
                    isWxLogin: false, //是否登录了微信
                    userInfo: {},
                    dataList: [{}, {}]
                    dataList: [{}, {}],
                    listMenu: []
                },
                watch: {
@@ -164,12 +176,100 @@
                        app.selectTabType = type
                    },
                    touchOpenPackage: function(item, index) {
                        var id = app.nameId(item, index);
                        if (app.selectOpenPakeg == id) return;
                        $('#' + id).css('opacity', '1')
                        $('#' + app.selectOpenPakeg).css('opacity', '0')
                        app.selectOpenPakeg = id;
                    },
                    nameId: function(item, index) {
                        return index;
                    },
                    openVIP: function() {
                        if (app.selectOpenPakeg == null) {
                            yesApp.toast('请选择开通时长');
                            return;
                        }
                        var type = app.listMenu[app.selectOpenPakeg].type;
                        yesApp.showLoading();
                        var uid = yesApp.getUid();
                        var params = {
                            uid: uid,
                            type: type
                        };
                        params = yesApp.getRequestBaseParams(params);
                        $.ajax({
                            type: "GET",
                            data: JSON.parse(params),
                            url: host + "/fanli/api/v2/user/cloud/pay",
                            dataType: "jsonp",
                            async: false,
                            success: function(result) {
                                yesApp.hideLoading();
                                if (result.code == 0) {
                                    if (result.data.link.length == 0 || result.data.link == null || result.data.link == '') return;
                                    yesApp.jumpWeb(result.data.link, null);
                                } else {
                                    yesApp.toast(result.msg);
                                }
                            },
                            error: function(XMLHttpRequest, textStatus, errorThrown) {
                                yesApp.hideLoading();
                                yesApp.toast('失败了')
                                if (textStatus === 'timeout') {
                                    setTimeout(function() {}, 2000);
                                }
                            }
                        });
                    },
                    openRecord: function() {
                        yesApp.jumpWeb(host1 + '/flqFront/AppInside/cloudPushOrder/openRecord.html', null);
                    }
                }
            });
                    },
                    fetcCloudInfo: function() {
                        yesApp.showLoading();
                        var uid = yesApp.getUid();
                        var params = {
                            uid: uid,
                        };
                        params = yesApp.getRequestBaseParams(params);
                        $.ajax({
                            type: "GET",
                            data: JSON.parse(params),
                            url: host + "/fanli/api/v2/user/cloud/getCloudInfo",
                            dataType: "jsonp",
                            async: false,
                            success: function(result) {
                                yesApp.hideLoading();
                                if (result.code == 0) {
                                    app.userInfo = result.data;
                                    app.listMenu = result.data.listMenu;
                                } else {
                                    yesApp.toast(result.msg);
                                }
                            },
                            error: function(XMLHttpRequest, textStatus, errorThrown) {
                                yesApp.toast('失败了')
                                yesApp.hideLoading();
                                if (textStatus === 'timeout') {
                                    setTimeout(function() {}, 2000);
                                }
                            }
                        });
                    }
                },
            });
            app.fetcCloudInfo();
        });
    </script>
</html>
AppInside/cloudPushOrder/openRecord.html
@@ -15,9 +15,15 @@
        <script src="https://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script>
        <script src="http://img.flqapp.com/resource/js/app2019112217.js"></script>
        <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
        <link href="css/load.css" rel="stylesheet" />
        <style type="text/css">
            [v-cloak] {
                display: none !important;
            }
        </style>
    </head>
    <body>
        <div id="root">
        <div id="root" style="display: none;">
            <div class="div_header">
                <div class="div_header_title">
                    <div class="div_header_1" @click="selectTab(1)">
@@ -36,7 +42,6 @@
                    <div class="div_header_line_2"></div>
                </div>
            </div>
            <div class="div_openRecord">开通记录</div>
            <!-- 云发单管理 -->
@@ -44,42 +49,49 @@
                <div class="div_list">
                    <div class="div_item" v-for="(item, index) in dataList">
                        <div class="div_item_left">
                                <img src="img/icon_record.png" style="width: 0.7rem;height: 0.7rem;margin-left: 0.16rem;margin-top: 0.39rem;">
                                <div >
                                    <div style="color: #333333;font-size: 0.28rem;height: 0.28rem;display: -webkit-flex;align-items: center;margin-top: 0.3rem;margin-left: 0.24rem;">
                                        成功开通 1个月
                                    </div>
                                    <div style="color: #E5005C;font-size: 0.36rem;height: 0.28rem;font-weight: bold; display: -webkit-flex;align-items: center;margin-top: 0.28rem;margin-left: 0.22rem;">
                                        ¥20.00
                                    </div>
                            <img src="img/icon_record.png" style="width: 0.7rem;height: 0.7rem;margin-left: 0.16rem;margin-top: 0.39rem;">
                            <div>
                                <div style="color: #333333;font-size: 0.28rem;height: 0.28rem;display: -webkit-flex;align-items: center;margin-top: 0.3rem;margin-left: 0.24rem;">
                                    {{item.desc}}
                                </div>
                                <div style="color: #E5005C;font-size: 0.36rem;height: 0.28rem;font-weight: bold; display: -webkit-flex;align-items: center;margin-top: 0.28rem;margin-left: 0.22rem;">
                                    ¥{{item.money}}
                                </div>
                            </div>
                        </div>
                        <div style="color: #666666;font-size: 0.24rem;height: 0.18rem;display: -webkit-flex;align-items: center;margin-top: 0.35rem;margin-right: 0.2rem;">
                            2020.02.02 20:00
                        </div>
                            {{item.createTime}}
                        </div>
                        <div class="line"></div>
                    </div>
                </div>
            </div>
            <div class="loading-more"></div>
        </div>
    </body>
    <script src="js/load.js"></script>
    <script>
        // "http://api.flqapp.com";
        var host = "http://api.flqapp.com";
        var host1 = "http://192.168.1.114:8848";
        var page = 1;
        $(function() {
            var app = new Vue({
                el: '#root',
                data: {
                    selectTabType: 1,
                    isOpenCloud: false, //是否了开通云发单权限
                    isWxLogin: false, //是否登录了微信
                    userInfo: {},
                    dataList: [{}, {}]
                    dataList: [{}, {}],
                    count: 0
                },
                watch: {
                    dataList: function(val) {
                        $('#root').css('display', 'block');
                    }
                },
                methods: {
                    selectTab: function(type) {
@@ -92,9 +104,98 @@
                        app.selectTabType = type
                    },
                    fetchOrderRecord: function() {
                        yesApp.showLoading();
                        var uid = yesApp.getUid();
                        var params = {
                            uid: uid,
                            page: page,
                        };
                        params = yesApp.getRequestBaseParams(params);
                        $.ajax({
                            type: "GET",
                            data: JSON.parse(params),
                            url: host + "/fanli/api/v2/user/cloud/getOrderRecord",
                            dataType: "jsonp",
                            async: false,
                            success: function(result) {
                                load.hidden();
                                yesApp.hideLoading();
                                if (result.code == 0) {
                                    if (page == 1) {
                                        app.dataList = new Array();
                                    }
                                    page += 1;
                                    app.count = result.data.count;
                                    var list = app.dataList.concat(result.data.list);
                                    app.dataList = list;
                                    if (app.count <= app.dataList.length) {
                                        load.noMore();
                                    }
                                } else {
                                    yesApp.toast(result.msg);
                                }
                            },
                            error: function(XMLHttpRequest, textStatus, errorThrown) {
                                load.hidden();
                                yesApp.hideLoading();
                                if (textStatus === 'timeout') {
                                    setTimeout(function() {}, 2000);
                                }
                            }
                        });
                    },
                }
            });
            app.fetchOrderRecord();
        });
        //(浏览器窗口上边界内容高度)
        function getDocumentTop() {
            var scrollTop = 0,
                bodyScrollTop = 0,
                documentScrollTop = 0;
            if (document.body) {
                bodyScrollTop = document.body.scrollTop;
            }
            if (document.documentElement) {
                documentScrollTop = document.documentElement.scrollTop;
            }
            scrollTop = (bodyScrollTop - documentScrollTop > 0) ? bodyScrollTop : documentScrollTop;
            console.log("scrollTop:" + scrollTop);
            return scrollTop;
        }
        //可视窗口高度(屏幕可以看见的高度)
        function getWindowHeight() {
            var windowHeight = 0;
            if (document.compatMode == "CSS1Compat") {
                windowHeight = document.documentElement.clientHeight;
            } else {
                windowHeight = document.body.clientHeight;
            }
            console.log("windowHeight:" + windowHeight);
            return windowHeight;
        }
        //滚动条滚动高度(即整个网页的高度)
        function getScrollHeight() {
            var scrollHeight = 0,
                bodyScrollHeight = 0,
                documentScrollHeight = 0;
            if (document.body) {
                bodyScrollHeight = document.body.scrollHeight;
            }
            if (document.documentElement) {
                documentScrollHeight = document.documentElement.scrollHeight;
            }
            scrollHeight = (bodyScrollHeight - documentScrollHeight > 0) ? bodyScrollHeight : documentScrollHeight;
            console.log("scrollHeight:" + scrollHeight);
            return scrollHeight;
        }
    </script>
</html>
AppInside/dataPreview/fund.html
@@ -634,8 +634,8 @@
                            totalFanLiMoney: totalFanLiMoney,
                            totalShareMoney: totalShareMoney,
                            totalInviteMoney: totalInviteMoney,
                            monthSettleMoney: monthSettleMoney,
                            lastMonthSettleMoney: lastMonthSettleMoney,
                            monthUnRecievedMoney: monthSettleMoney,
                            totalUnRecievedMoney: lastMonthSettleMoney,
                            notSettleMoney: notSettleMoney,
                            'todayPredict.totalMoney': todayPredict_totalMoney,
@@ -652,7 +652,7 @@
                            'monthPredict.teamMoney': monthPredict_teamMoney,
                            'monthPredict.teamNum': monthPredict_teamNum,
                        };
                        yesApp.toast(JSON.stringify(params))
                        params = yesApp.getRequestBaseParams(params);
                        $.ajax({
AppInside/teamBonus/teamBonusMonth.html
@@ -16,7 +16,7 @@
        <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
        <script src="js/laydate/laydate.js" type="text/javascript" charset="utf-8"></script>
    </head>
    <body id="body" style="display: none;">
    <body id="body" v-cloak>
        <div id="root">
            <div class="div_item_bg">
                <div class="items" v-for="(item, index) in dataList">
@@ -143,9 +143,7 @@
                    dataList: []
                },
                watch: {
                    dataList: function(val) {
                        $('#body').css('display', 'block');
                    }
                },
                methods: {
                    touchDate: function() {