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

重庆迈尖科技有限公司

2020-04-28 c7d1513889f095716352078ad235d65b728d1ee6

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

 AppInside/orderDetail/index.html

@@ -193,7 +193,7 @@
        // 是否需要重新刷新UI

        var isReload = false;
        // "http://api.flqapp.com";

        var host = "http://192.168.1.253:8080";

        var host = "http://api.flqapp.com";

        $(function() {

            var app = new Vue({

                el: '#container',


 AppInside/vip/index.html

@@ -5,7 +5,6 @@
        <title>超级会员</title>
        <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
        <link rel="stylesheet" href="css/page.css" type="text/css" />
        <link rel="stylesheet" href="css/load.css" type="text/css" />
        <script>
            window.onresize = function() {
                document.documentElement.style.fontSize = document.documentElement.clientWidth / 7.5 + 'px';
@@ -306,7 +305,6 @@
        <script src="https://apps.bdimg.com/libs/jquery/2.1.4/jquery.min.js"></script>
        <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
        <script src="http://img.flqapp.com/resource/js/app2019112217.js"></script>
        <script src="js/load.js"></script>
    </body>
    <script>
        $(function() {

 AppInside/vip/invite_code_apply.html

@@ -64,7 +64,7 @@
                </div>
                <div class="content">
                    1.邀请码可帮助好友激活邀请功能；<br>
                    2.好友通过你的邀请码激活邀请功能后，将成为你的直接粉丝，未来产生的订单你都有奖金；<br>
                    2.好友通过你的邀请码激活邀请功能后，将成为你的直接粉丝，未来产生的订单你都有团队收益；<br>
                    3.邀请码具有唯一性。
                </div>
            </div>
@@ -79,13 +79,13 @@
            </div>

            <div style="font-weight: bold;color: #666666;font-size: 0.3rem;margin: 0 auto;text-align: center;margin-top:0.3rem;">
                <span>当前直接粉丝</span>
                <span>当前有效直接粉丝</span>
                <span style="color: #FF1F79;font-size: 0.6rem;">{{num}}</span>
                <span>人</span>
            </div>

            <div class="btn" v-if="num<limit" v-on:click="apply">
                邀请{{limit}}个直接粉丝可申请专属邀请码
                邀请{{limit}}个有效直接粉丝可申请专属邀请码
            </div>

            <div  v-else class="btn" v-on:click="apply">
@@ -128,7 +128,7 @@
                            yesApp.jumpPageWithFinishCurrentPage({activity:'com.yeshi.ec.rebate.myapplication.ui.mine.MyInviteCodeActivity',controller:'InviteCodeUpdateController'},{})
                         } else {
                            //邀请好友
                            yesApp.toast("直接粉丝不足，无法申请");
                            yesApp.toast("有效直接粉丝不足，无法申请");
                        }
                    }
                }

 AppInside/vipNew/supvip.html

@@ -370,7 +370,7 @@
    <script type="text/javascript">

        $(function() {
            // "http://api.flqapp.com";

            var host = 'http://192.168.1.253:8080';

            var host = 'http://api.flqapp.com';

            var app = new Vue({

                el: "#root",

                data: {

@@ -715,7 +715,7 @@
                                highVIP = result.data.highVIP;

                                superVIP = result.data.superVIP;
                                
                                if (result.data.tearcherWX.length == null || result.data.tearcherWX == null) {
                                if (result.data.tearcherWX.length == 0 || result.data.tearcherWX == null) {
                                    app.viewHide = false;
                                    $('.div_contactmentor_upgrademember_bg').css('justify-content','center')
                                    $('.div_upgrademember').css('margin-left','0')