重庆迈尖科技有限公司
2020-04-14 78209e9361b3d0eab8a03d767f144270d58a4d78
new update
4个文件已修改
2个文件已添加
125 ■■■■ 已修改文件
AppInside/orderDetail/css/style.css 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/orderDetail/img/icon_lock.png 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/orderDetail/img/icon_miandan.png 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/orderDetail/index.html 94 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/vipNew/css/stylesheet.css 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/vipNew/supvip.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/orderDetail/css/style.css
@@ -23,6 +23,7 @@
body {
    background-color: #F3F3F3;
    font-family: Arial, "Microsoft YaHei";
}
.divBody {
@@ -45,16 +46,27 @@
    width: 1.8rem;
    height: 1.8rem;
    overflow: hidden;
    position:relative;
}
.lsit img {
.imgHeader {
    width: 1.8rem;
    height: 1.8rem;
    /* -webkit-filter: blur(10px) brightness(.5);
    -moz-filter: blur(10px) brightness(.5);
    -ms-filter: blur(10px) brightness(.5);
    filter: blur(10px) brightness(.5); */
    border-radius: 0.06rem;
    z-index:0;
}
.imgHeaderLock {
    width: 1.26rem;
    height: 1.26rem;
    position:absolute;
    z-index:1;
    top: 0.27rem;
    left: 0.27rem;
}
.imgHeader_class {
@@ -110,7 +122,7 @@
.actual_payment {
    font-size: 0.24rem;
    color: #E5005C;
    color: #666666;
    padding-right: 0.15rem;
}
@@ -273,8 +285,8 @@
}
.line {
    height: 0.01rem;
    background-color: #999999;
    height: 1px;
    background-color: #e0e0e0;
    margin-top: 0.18rem;
    margin-left: 0.29rem;
    margin-right: 0.41rem;
@@ -411,7 +423,7 @@
    margin-left: 0.2rem;
    margin-right: 0.2rem;
    background-color: white;
    height: 3.28rem;
    height: 2.8rem;
    border-radius: 0.2rem;
}
@@ -440,7 +452,7 @@
    display: flex;
    display: -webkit-flex;
    align-items: center;
    border-bottom: 0.01rem solid #e0e0e0;
    border-bottom: 1px solid #e0e0e0;
}
.divFooterTitle>p {
AppInside/orderDetail/img/icon_lock.png
AppInside/orderDetail/img/icon_miandan.png
AppInside/orderDetail/index.html
@@ -15,6 +15,7 @@
                        <li>
                            <div class="div_mh_img">
                                <img class="imgHeader">
                                <img v-if="lockShow" class="imgHeaderLock" src="img/icon_lock.png">
                            </div>
                            <div class="divRight">
@@ -78,22 +79,22 @@
                <div id="divUpgradeNow" v-if="riselevel">
                    <div class="divGradeLeft">
                        <p>立即升级</p>
                        <img id="imgVip" src="img/vip_normol.png">
                        <img id="imgVip" src="img/vip_super.png">
                    </div>
                    <div class="divGradeRight">
                        <img src="img/array.png">
                        <p id="pUpperFanLi">¥0.00</p>
                    </div>
                </div>
                <!--  -->
                <!-- 券状态 -->
                <div class="div_riseLevel_bg" v-if="flqshow" :style="riseLevelCss" @click="on_useRebate">
                    <div class="riseLevelLeft">
                        <p>立即使用</p>
                        <img src="img/icon_flq.png">
                        <p>{{money.couponText}}</p>
                        <img class="imgCouponType" src="img/icon_flq.png">
                    </div>
                    <div class="riseLevelRight">
                        <img src="img/array.png">
                        <p>返利再返</p>
                        <p>{{money.couponDesc}}</p>
                    </div>
                </div>
@@ -109,9 +110,8 @@
                </div>
                <div class="spanCustomerService">
                    1.不同的会员等级可获得不同的权益;<br />
                    2.会员等级增加团队补贴也会增加;<br />
                    3.普通会员以上可享团队补贴;<br />
                    4.如果你的返利、奖金、收益有异议,请联系<a href="javascript:void()" style="text-decoration: none;color: #0068DC; " @click="kefu">人工客服</a>
                    2.会员等级增加可获得的返利、奖金、收益也会增加;<br />
                    3.如有疑问,请联系<a href="javascript:void()" style="text-decoration: none;color: #0068DC; " @click="kefu">人工客服</a>
                </div>
            </div>
        </tfoot>
@@ -177,6 +177,8 @@
<script src="http://img.flqapp.com/resource/js/app20200227.js"></script>
<script>
    // 是否需要重新刷新UI
    var isReload = false;
    var host = "http://192.168.1.253:8080";
    $(function() {
        var app = new Vue({
@@ -184,7 +186,13 @@
            data: {
                wqshow: true,
                riselevel: true,
                flqshow: false,
                flqshow: true,
                coupon: false,
                // 是否使用券
                couponUse: false,
                lockShow: false,
                couponJumpDetail: '',
                couponParams: '',
                totalRebate: {
                    marginTop: ''
                },
@@ -203,7 +211,9 @@
                    totalRebateTitle: '',
                    totalRebateDesc: '',
                    arrivalStatusTitle: '到账状态',
                    arrivalStatusDesc: ''
                    arrivalStatusDesc: '',
                    couponText: '',
                    couponDesc: ''
                },
                coupninfo: {
@@ -248,7 +258,10 @@
                on_useRebate: function() {
                    app.fetchCoupnList();
                },
                // 使用券或者查看使用详情
                fetchCoupnList: function() {
                    // 使用券
                    if (app.coupon) {
                    var orderNo = getQueryString("orderNo");
                    if (orderNo == null || orderNo.length <= 0) {
                        yesApp.toast("订单号为空");
@@ -289,6 +302,11 @@
                            }
                        }
                    });
                    }
                    //查看使用详情
                    if (app.couponUse) {
                        yesApp.jumpPage(app.couponJumpDetail, app.couponParams);
                    }
                },
                setCoupunListData: function(data) {
                    var coupninfo = {
@@ -315,7 +333,6 @@
        var sourceType = getQueryString("sourceType");
        // 立即升级
        var divUpgradeNow = $("#divUpgradeNow");
        var imgVip = $("#imgVip");
        var divPlaceholder = $("#divPlaceholder");
        if (orderNo == null || orderNo.length <= 0) {
            yesApp.toast("订单号为空");
@@ -355,12 +372,29 @@
                        //result.data.result.wq
                        app.wqshow = true;
                        if (userLevel == null || userLevel.length == 0) {
                        if (userLevel == 'superVIP' || userLevel == 'tearcher' || parseInt(result.data.result.couponType) == 2) {
                            app.riselevel = false;
                        }
                        // 是否可以使用奖励券
                        var coupon = result.data.result.coupon;
                        // 成功使用奖励券
                        var couponUse = result.data.result.couponUse;
    
                        app.flqshow = result.data.result.coupon;
                        if (!coupon && !couponUse) {
                            app.flqshow = false;
                        }
                        
                        app.coupon = coupon;
                        app.couponUse = couponUse;
                        app.couponJumpDetail = result.data.result.couponJumpDetail;
                        app.couponParams = result.data.result.couponParams;
                        if (parseInt(result.data.result.couponType) == 2) {
                            $('.imgCouponType').attr("src", 'img/icon_miandan.png');
                            $('.imgCouponType').css({
                                "width": "0.94rem"
                            })
                        }
                        if (!app.wqshow) {
                            app.totalRebate.marginTop = '0.3rem';
@@ -368,12 +402,18 @@
                        if (!app.riselevel) {
                            app.riseLevelCss.marginTop = '0.28rem';
                        }
                        // 团队订单
                        if (parseInt(result.data.result.type) == 3) {
                            app.lockShow = true;
                        }
                        var money = {
                            totalRebateTitle: result.data.result.fanLiDesc,
                            totalRebateDesc: result.data.result.fanLi,
                            arrivalStatusTitle: '到账状态',
                            arrivalStatusDesc: result.data.result.stateDesc
                            arrivalStatusDesc: result.data.result.stateDesc,
                            couponText: result.data.result.couponText,
                            couponDesc: result.data.result.couponDesc
                        }
                        app.money = money;
@@ -386,15 +426,6 @@
                            wqMoney: result.data.result.wqMoney,
                        }
                        app.wq = wq;
                        if (userLevel == 'normalVIP') {
                            imgVip.attr("src", "img/vip_normol.png");
                        } else if (userLevel == 'highVIP') {
                            imgVip.attr("src", "img/vip_senior.png");
                        }
                        //取到li层级保存
                        var html = "<li>" + $(".ulList").children("li").eq(0).html() + "</li>";
@@ -415,7 +446,7 @@
                            latest.find(".actual_payment").text(listGood.actualPay);
                            if (parseInt(result.data.result.type) == 3) {
                                latest.find(".rebate_ratio_desc").text('团队奖金');
                                latest.find(".rebate_ratio_desc").text('团队奖金:');
                                latest.find(".estimated_rebate_desc").text('团队补贴');
                                // 团队奖金
@@ -436,7 +467,7 @@
                                    "textAlign": "center"
                                });
                                latest.find(".imgHeader").css({
                                    "filter": "blur(15px)"
                                    "filter": "blur(0.19rem)"
                                });
                            } else {
@@ -566,8 +597,9 @@
                success: function(result) {
                    yesApp.hideLoading();
                    if (result.code == 0) {
                        layer.closeAll();
                        isReload = true;
                        yesApp.jumpPage(result.data.rewardDetail.jump.jumpDetail, result.data.rewardDetail.jump.params);
                        layer.closeAll();
                    } else {
                        yesApp.toast(result.msg);
@@ -575,7 +607,7 @@
                },
                error: function(XMLHttpRequest, textStatus, errorThrown) {
                    yesApp.hideLoading();
                    yesApp.toast('使用失败');
                    if (textStatus === 'timeout') {
                        yesApp.toast('请求超时');
                        setTimeout(function() {
@@ -586,5 +618,13 @@
            });
        };
    });
    var yestvcallback = {
        resume: function() {
            if (isReload) {
                window.location.reload();
            }
        }
    };
</script>
</html>
AppInside/vipNew/css/stylesheet.css
@@ -20,6 +20,7 @@
body {
    background-color: #F4E2D0;
    font-family: Arial, "Microsoft YaHei";
}
.div_topbg {
AppInside/vipNew/supvip.html
@@ -140,7 +140,7 @@
                            <img src="./img/icon_horn.png">
                        </div>
                        <div class="progress_condition">
                            以上三种条件在任意一种满足即可自动升级为【{{progress.nextLevelProgress}}】
                            以上三种条件任意一种满足即可自动升级为{{progress.nextLevelProgress}}
                        </div>
                    </div>
                    <div class="progress_condition_desc">
@@ -471,7 +471,7 @@
                    }, {
                        img: 'img/qy_newmiandan.png',
                        title: '新人免单',
                        subTitle: '0元购买还有返利',
                        subTitle: '好货精选0元购买',
                    }, {
                        img: 'img/qy_jinbi_normol.png',
                        title: '赠送金币',