重庆迈尖科技有限公司
2020-04-15 4361cd724a4e20e305d18ae6f0a7e9e8cb22f1d3
new info
4个文件已修改
2个文件已添加
204 ■■■■■ 已修改文件
AppInside/orderDetail/css/style.css 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/orderDetail/index.html 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/vipNew/css/stylesheet.css 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/vipNew/img/icon_teambouns.png 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/vipNew/img/icon_teamfenhong.png 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/vipNew/supvip.html 148 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AppInside/orderDetail/css/style.css
@@ -67,6 +67,7 @@
    z-index:1;
    top: 0.27rem;
    left: 0.27rem;
    opacity: 0;
}
.imgHeader_class {
AppInside/orderDetail/index.html
@@ -15,7 +15,7 @@
                        <li>
                            <div class="div_mh_img">
                                <img class="imgHeader">
                                <img v-if="lockShow" class="imgHeaderLock" src="img/icon_lock.png">
                                <img class="imgHeaderLock" src="img/icon_lock.png">
                            </div>
                            <div class="divRight">
@@ -187,10 +187,9 @@
                wqshow: true,
                riselevel: true,
                flqshow: true,
                coupon: false,
                coupon: false,
                // 是否使用券
                couponUse: false,
                lockShow: false,
                couponJumpDetail: '',
                couponParams: '',
                totalRebate: {
@@ -212,7 +211,7 @@
                    totalRebateDesc: '',
                    arrivalStatusTitle: '到账状态',
                    arrivalStatusDesc: '',
                    couponText: '',
                    couponText: '',
                    couponDesc: ''
                },
@@ -346,7 +345,7 @@
        }
        // 请求数据
        function fetchReBateInfo() {
            // yesApp.showLoading();
            yesApp.showLoading();
            var params = {
                uid: uid,
                orderNo: orderNo,
@@ -362,6 +361,7 @@
                dataType: "jsonp",
                async: false,
                success: function(result) {
                    yesApp.hideLoading();
                    if (result.code == 0) {
                        $("#container").css("display", "block");
@@ -383,19 +383,19 @@
                        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"
                            })
                        }
                        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';
                        }
@@ -404,15 +404,15 @@
                        }
                        // 团队订单
                        if (parseInt(result.data.result.type) == 3) {
                            app.lockShow = true;
                        }
                            $('.imgHeaderLock').css('opacity','1');
                        }
                        var money = {
                            totalRebateTitle: result.data.result.fanLiDesc,
                            totalRebateDesc: result.data.result.fanLi,
                            arrivalStatusTitle: '到账状态',
                            arrivalStatusDesc: result.data.result.stateDesc,
                            couponText: result.data.result.couponText,
                            couponText: result.data.result.couponText,
                            couponDesc: result.data.result.couponDesc
                        }
@@ -467,7 +467,7 @@
                                    "textAlign": "center"
                                });
                                latest.find(".imgHeader").css({
                                    "filter": "blur(0.19rem)"
                                    "-webkit-filter": "blur(0.19rem)"
                                });
                            } else {
@@ -487,6 +487,7 @@
                    }
                },
                error: function(XMLHttpRequest, textStatus, errorThrown) {
                    yesApp.hideLoading();
                    if (textStatus === 'timeout') {
                        alert('請求超時');
                        setTimeout(function() {
@@ -599,8 +600,8 @@
                    if (result.code == 0) {
                        isReload = true;
                        yesApp.jumpPage(result.data.rewardDetail.jump.jumpDetail, result.data.rewardDetail.jump.params);
                        layer.closeAll();
                        layer.closeAll();
                    } else {
                        yesApp.toast(result.msg);
                    }
AppInside/vipNew/css/stylesheet.css
@@ -237,14 +237,14 @@
.div_upgradeprogress {
    background-color: #151313;
    width: 100%;
    height: 8.1rem;
    height: 8.3rem;
}
.div_upgradeprogress_whitebg {
    background-color: #FFFFFF;
    margin-left: 0.2rem;
    margin-right: 0.2rem;
    height: 7.6rem;
    height: 7.8rem;
    border-radius: 0.2rem;
}
@@ -500,7 +500,7 @@
    margin-top: 0.2rem;
    margin-left: 0.2rem;
    margin-right: 0.2rem;
    height: 5.2rem;
    height: 7.2rem;
    border-radius: 0.2rem;
    background-color: #FFFFFF;
}
@@ -583,7 +583,7 @@
.makesave_contrast_desc1 {
    color: #333333;
    font-size: 0.26rem;
    font-size: 0.2rem;
    padding-top: 0.1rem;
}
@@ -618,7 +618,7 @@
    margin-left: 0.2rem;
    margin-right: 0.2rem;
    background-color: #FFFFFF;
    height: 14.4rem;
    height: 10.5rem;
    border-radius: 0.2rem;
}
@@ -686,7 +686,7 @@
.div_common_problem_normol_3 {
    margin-left: 0.2rem;
    margin-right: 0.2rem;
    height: 1.8rem;
    height: 1.3rem;
    background-color: #FFF8F1;
    font-size: 0.3rem;
    padding-left: 0.15rem;
AppInside/vipNew/img/icon_teambouns.png
AppInside/vipNew/img/icon_teamfenhong.png
AppInside/vipNew/supvip.html
@@ -44,13 +44,13 @@
            </div>
            <div class="div_provinceearn">
                <div class="div_sehnzhuan">
                    <p v-if="vip==false">错过省赚</p>
                    <p v-if="vip==false">错过赚省</p>
                    <p v-else>赚省统计</p>
                </div>
                <div class="div_provinceearn_yellowbg">
                    <div v-if="vip==false" class="div_provinceearn_title">未升级超级会员</div>
                    <div v-else class="div_provinceearn_title">您已经是超级会员</div>
                    <div v-else class="div_provinceearn_title"></div>
                    <div class="div_provinceearn_botom">
                        <div class="div_provinceearn_savemoney">
                            <div class="provinceearn_savemoney_Title" v-if="vip==false">
@@ -124,7 +124,7 @@
                    <div>
                        <div class="" style="display: flex; justify-content: space-between;">
                            <div class="div_upgradeprogress_set" style="margin-left: 0.62rem;">
                                直接+间接粉丝:
                                有效直接+间接粉丝:
                            </div>
                            <div class="div_upgradeprogress_set" style="margin-right: 0.62rem;">
                                {{progress.finishDirectFans}}+{{progress.finishInDirectFans}}/{{progress.totalDirectFans}}+{{progress.totalInDirectFans}}人
@@ -140,13 +140,13 @@
                            <img src="./img/icon_horn.png">
                        </div>
                        <div class="progress_condition">
                            以上三种条件任意一种满足即可自动升级为{{progress.nextLevelProgress}}
                            {{progress.nextLevelProgress}}
                        </div>
                    </div>
                    <div class="progress_condition_desc">
                        1.返利/分享订单、直接/间接粉丝都是从注册板栗快省日起开始统计;<br>
                        2.实付款≥1元的订单为有效可被统计订单;<br>
                        3.至少产生过1笔分享或返利订单的粉丝为有效可被统计粉丝(退款为失效);
                        1.统计时间:返利/分享订单、直接/间接粉丝都是以注册板栗快省之日起开始计算;<br>
                        2.订单:实付款≥1元且已到账的订单 <br>
                        3.有效粉丝:产生过一笔实付款≥1元且已确认收货的订单的粉丝
                    </div>
                </div>
            </div>
@@ -161,16 +161,16 @@
                    </div>
                </div>
                <div class="div_quanyi_title">
                    <div class="div_quanyi_actived" @click="clickactived" :style="bgColor.styleactived">
                    <div class="div_quanyi_actived" @click="changeVipInfo(1)" :style="bgColor.styleactived">
                        快省达人
                    </div>
                    <div class="div_quanyi_vipPre1" @click="clickvipPre1" :style="bgColor.stylevipPre1">
                    <div class="div_quanyi_vipPre1" @click="changeVipInfo(2)" :style="bgColor.stylevipPre1">
                        普通会员
                    </div>
                    <div class="div_quanyi_vipPre2" @click="clickvipPre2" :style="bgColor.stylevipPre2">
                    <div class="div_quanyi_vipPre2" @click="changeVipInfo(3)" :style="bgColor.stylevipPre2">
                        高级会员
                    </div>
                    <div class="div_quanyi_vip" @click="clickvip" :style="bgColor.stylevip">
                    <div class="div_quanyi_vip" @click="changeVipInfo(4)" :style="bgColor.stylevip">
                        超级会员
                    </div>
                </div>
@@ -216,7 +216,7 @@
                                返利奖励券
                            </div>
                            <div class="invite_text_desc">
                                让好友返利订单,返利再返30%以上
                                让好友返利订单,返利再返佣金的47.5%
                            </div>
                        </div>
                        <div @click="invite(1)" class="div_invite_share">
@@ -232,7 +232,7 @@
                                红包
                            </div>
                            <div class="invite_text_desc">
                                让好友获得红包,可提现客购物
                                让好友获得红包,可提现可购物
                            </div>
                        </div>
                        <div @click="invite(2)" class="div_invite_share">
@@ -258,7 +258,7 @@
                    </div>
                    <div class="makesave_contrast_desc">
                        <div class="makesave_contrast_desc1">
                            ¥100+¥52.5
                            ¥100+¥52.5
                        </div>
                        <div class="makesave_contrast_desc2">
                            佣金+平台补贴
@@ -266,13 +266,14 @@
                    </div>
                    <div class="makesave_contrast_desc">
                        <div class="makesave_contrast_desc1">
                            ¥100+¥115
                            ¥100+¥115
                        </div>
                        <div class="makesave_contrast_desc2">
                            佣金+平台补贴
                        </div>
                    </div>
                </div>
                <div class="makesave_contrast_body_bg">
                    <div class="makesave_contrast_body_title">
                        <img src="img/icon_jiangjin.png">
@@ -280,7 +281,7 @@
                    </div>
                    <div class="makesave_contrast_desc">
                        <div class="makesave_contrast_desc1">
                            ¥100+¥52.5
                            ¥100+¥52.5
                        </div>
                        <div class="makesave_contrast_desc2">
                            佣金+平台补贴
@@ -288,24 +289,53 @@
                    </div>
                    <div class="makesave_contrast_desc">
                        <div class="makesave_contrast_desc1">
                            ¥100+¥115
                            ¥100+¥115
                        </div>
                        <div class="makesave_contrast_desc2">
                            佣金+平台补贴
                        </div>
                    </div>
                </div>
                <div class="makesave_contrast_body_bg">
                    <div class="makesave_contrast_body_title">
                        <img src="img/icon_teambouns.png">
                        <div>团队奖金</div>
                    </div>
                    <div class="makesave_contrast_butie_desc2">
                        直接粉丝+¥7.5<br />
                        间接粉丝+¥2.5
                    </div>
                    <div class="makesave_contrast_butie_desc2">
                        同快省达人
                    </div>
                </div>
                <div class="makesave_contrast_body_bg">
                    <div class="makesave_contrast_body_title">
                        <img src="img/icon_butie.png">
                        <div>团队补贴</div>
                    </div>
                    <div class="makesave_contrast_butie_desc2">
                        直接粉丝+¥15<br />
                        间接粉丝+¥2.5
                    </div>
                    <div class="makesave_contrast_butie_desc2">
                        直接粉丝+¥30<br />
                        间接粉丝+¥10
                    </div>
                </div>
                <div class="makesave_contrast_body_bg">
                    <div class="makesave_contrast_body_title">
                        <img src="img/icon_teamfenhong.png">
                        <div>团队分红</div>
                    </div>
                    <div class="makesave_contrast_butie_desc1">
                        ---
                    </div>
                    <div class="makesave_contrast_butie_desc2">
                        直接粉丝+¥22.5<br />
                        间接粉丝+¥7.5
                        无限代分红
                    </div>
                </div>
            </div>
@@ -316,44 +346,35 @@
                </div>
                <div style="height: 0.08rem;"></div>
                <div class="div_common_problem_selct">
                    Q:返利真的高?<br />
                    A:全网稍微对比研究一下就知道咯~
                    Q:返利真的高?<br />
                    A:全网稍微对比研究一下就知道咯~
                </div>
                <div class="div_common_problem_normol">
                    Q:30张奖励券怎么用?<br />
                    A:奖励券是邀请利器哦,助力你邀请好友
                    Q:奖励券怎么用?<br />
                    A:奖励券是邀请利器哦,助力你邀请好友
                </div>
                <div class="div_common_problem_selct">
                    Q:团队补贴只有进入超级会员V1阶段后才有?<br />
                    A:是的!
                    Q:快省达人也有团队补贴吗?<br />
                    A:是的,团队补贴会随着会员阶段提升而升高。
                </div>
                <div class="div_common_problem_normol">
                    Q:成为超级会员三个条件都要满足吗?<br />
                    A:不是,仅需满足其中一个条件即可。
                </div>
                <div class="div_common_problem_selct">
                    Q:达到超级会员V1阶段会自动升级权益吗?<br />
                    A:会,满足V1、V2系统自动升级到对应权益。
                </div>
                <div class="div_common_problem_normol_1">
                    Q:达到超级会员V3阶段会自动升级权益吗?<br />
                    A:不会,需要手动申请审核通过后成为超级会员。
                </div>
                <div class="div_common_problem_normol_2">
                    Q:只有自己成为超级会员后才可以培养超级会员
                    吗?<br />
                    A:是的。
                    Q:达到普通、高级会员阶段会自动升级吗?<br />
                    A:是的。且能自动获得对应权益。
                </div>
                <div class="div_common_problem_normol">
                    Q:我不会培养超级会员怎么办?<br />
                    A:不用担心,在我的-导师微信与其取得联系。
                    Q:满足超级会员条件后会自动升级吗?<br />
                    A:不会,需要手动申请。
                </div>
                <div class="div_common_problem_normol_3">
                    <div style="height: 1.0E-5rem;">
                    </div>
                    <div style="margin-top: 0.22rem;">
                        Q:还有超级会员相关问题?<br />
                        A:请查看本页顶部超级会员相关规则,或<a href="javascript:void()" style="text-decoration: none;" @click="kefu">人工<br>客服</a>
                        Q:还有升级会员相关问题?<br />
                        A:请查看本页顶部《升级规则》或联系<a href="javascript:void()" style="text-decoration: none;" @click="kefu">人工客服</a>
                    </div>
                </div>
            </div>
@@ -528,6 +549,7 @@
                        } else if (this.level == 'vipApply') {
                        } else if (this.level == 'vip') {
                            yesApp.toast('资深导师是邀请制,你暂未满足邀请条件')
                        } else if (this.level == 'tearcherApply') {
@@ -583,8 +605,35 @@
                        yesApp.copyText(app.tearcherWX + '')
                        yesApp.toast('复制成功')
                        this.hiddenDialog();
                    },
                    changeVipInfo: function(type) {
                        if (type == 1) {
                            app.clickactived()
                        } else if (type == 2) {
                            if (app.level == 'noActive' || app.level == 'actived') {
                            } else {
                                app.clickvipPre1()
                            }
                        } else if (type == 3) {
                            if (app.level == 'noActive' || app.level == 'actived' || app.level == 'vipPre1') {
                            } else {
                                app.clickvipPre2()
                            }
                        } else if (type == 4) {
                            if (app.level == 'noActive' || app.level == 'actived' || app.level == 'vipPre1' || app.level == 'vipPre2'
                            || app.level == 'vipApply') {
                            } else {
                                app.clickvip()
                            }
                        }
                    },
                    // 点击快省达人
                    clickactived: function() {
                        var bgColor = this.bgColor;
                        var qylist = this.quanYiList;
@@ -609,7 +658,8 @@
                        app.bgColor = bgColor;
                        app.quanYiList = qylist
                    },
                    },
                    // 点击普通会员
                    clickvipPre1: function() {
                        var bgColor = app.bgColor;
                        var qylist = app.quanYiList;
@@ -634,7 +684,8 @@
                        app.bgColor = bgColor;
                        app.quanYiList = qylist
                    },
                    },
                    // 点击高级会员
                    clickvipPre2: function() {
                        var bgColor = app.bgColor;
                        var qylist = app.quanYiList;
@@ -659,7 +710,8 @@
                        app.bgColor = bgColor;
                        app.quanYiList = qylist
                    },
                    },
                    // 点击超级会员
                    clickvip: function() {
                        var bgColor = app.bgColor;
                        var qylist = app.quanYiList;
@@ -794,7 +846,7 @@
                                if (level === 'actived') {
                                    viplogos = 'img/icon_actived.png';
                                    nextlevel = '升级普通会员';
                                    nextLevelProgress = '普通会员';
                                    nextLevelProgress = '以上三种条件任意一种满足即可自动升级为普通会员';
                                    supVip = false;
                                    app.bgColor.styleactived.backgroundColor = '#333333';
@@ -811,7 +863,7 @@
                                    viplogos = 'img/icon_vipPre1.png';
                                    nextlevel = '升级高级会员';
                                    nextLevelProgress = '高级会员';
                                    nextLevelProgress = '以上三种条件任意一种满足即可自动升级为高级会员';
                                    supVip = false;
                                    app.bgColor.stylevipPre1.backgroundColor = '#333333';
@@ -829,7 +881,7 @@
                                    viplogos = 'img/icon_vipPre2.png';
                                    nextlevel = '升级超级会员';
                                    nextLevelProgress = '超级会员';
                                    nextLevelProgress = '以上三种条件任意一种满足即可手动申请升级为超级会员';
                                    supVip = false;
                                    app.bgColor.stylevipPre2.backgroundColor = '#333333';
@@ -849,7 +901,7 @@
                                } else if (level === 'vipApply') {
                                    viplogos = 'img/icon_vip_invalid.png';
                                    nextlevel = '审核将在48小时内完成';
                                    nextLevelProgress = '超级会员';
                                    nextLevelProgress = '以上三种条件任意一种满足即可手动申请升级为超级会员';
                                    supVip = false;
                                    app.bgColor.stylevipPre2.backgroundColor = '#333333';