Merge branch 'hotfix/h5接口地址修复'

zhaojs

2023-06-10 30026db9cde628f6a3367da45e3906158fb49494

 public/html/freebuy.html

@@ -16,7 +16,7 @@
    <meta content="telephone=no,email=no" name="format-detection">
    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
    <script type="text/javascript" src="https://public.ffquan.cn/lib/jquery-1.12.4.min.js"></script>
    <script type="text/javascript" src="https://public.ffquan.cn/lib/vue/vue@2.6.11.min.js"></script>
    <script type="text/javascript" src="https://cdn.staticfile.org/vue/2.6.11/vue.min.js"></script>
    <script type="text/javascript" src="https://public.ffquan.cn/lib/vue-lazyload.js"></script>
    <script type="text/javascript" src="https://public.ffquan.cn/lib/swiper/js/swiper.min.js"></script>
    <script type="text/javascript" src="https://public.ffquan.cn/lib/taobaoCode/taobaoCode.js?v=1.2.1"></script>
@@ -218,7 +218,7 @@
        }

        .loading{
            line-height: 1rem; text-align: center; font-size: .3rem; color: #999;
            line-height: 2rem; text-align: center; font-size: .3rem; color: #999;
        }
        .sys{
            width: 100%;
@@ -244,8 +244,9 @@
    </header>
   
    <div :style="{ height: (twoNav && twoNav.length > 0) ? '2.3rem' : '2.3rem'}"></div>
    
    <div v-if="!loading" style="min-height: 100vh;" class=" swiper-container swiper-container-initialized swiper-container-horizontal swiper-container-free-mode swiper-container-ios">
    <div v-if="loading" v-else class="loading">加载中...</div>

    <div v-else style="min-height: 100vh; background: #fbe7e2;" class=" swiper-container swiper-container-initialized swiper-container-horizontal swiper-container-free-mode swiper-container-ios">
            <div class="swiper-wrapper" style="transform: translate3d(0px, 0px, 0px);">
                <div class="swiper-slide list-section">
                            <div class="listTmp " v-for="(data,key) in lists" :key="key" v-on:click="targetItem(data)">
@@ -253,10 +254,9 @@
                                        <img :src="data.mainPic + '_310x310.jpg'" class="fadeIn " height="200" width="200">
                                    </div>
                                    <div class="productInfo">
                                        <div class="title">
                                            <div class="shoplabel ">
                                                <img src="">
                                            </div>
                                        
                                         <div class="title">
                                           
                                            <span>{{data.dtitle}}</span>
                                        </div>
                                        
@@ -285,8 +285,7 @@
            <div class="swiper-pagination"></div>
            <span class="swiper-notification" aria-live="assertive" aria-atomic="true"></span>
    </div>
    <div v-else class="loading">加载中...</div>

   
</div>
</body>

@@ -294,14 +293,17 @@
<script src="https://polyfill.io/v2/polyfill.min.js?features=IntersectionObserver"></script>
<script>
    (function(){
        var size = (document.body.clientWidth || document.documentElement.clientWidth);
        var size1=document.body.clientWidth;
        var size2=document.documentElement.clientWidth;
        var size=size1<=0?size2:size1;
        size=size<=0?400:size;
        document.documentElement.style.fontSize = (size > 750 ? 750 : size) / 7.5 + 'px';
    })();

    Vue.use(VueLazyload, {
        preLoad: 1.3,//
        error: 'https://sr.ffquan.cn/cms_pic/20200622/bro7s7f6vrkd3jat4ujg0.png',
        loading: 'https://sr.ffquan.cn/cms_pic/20200612/brhjkf76vrkcrfpi79eg0.png',
      //  loading: 'https://sr.ffquan.cn/cms_pic/20200612/brhjkf76vrkcrfpi79eg0.png',
        attempt: 1
    })
    new Vue({
@@ -318,13 +320,16 @@
            active:0,
            twoNav:false,
            activeTwo:undefined,
            loading:false,
            loading:true,
            isUniReady:false
        },
        methods: {
           
            targetItem:function(item){
                if(this.isUniReady)
                uni.navigateTo({
                  url: '/pages/goods/goodsDetail?id=' + item.goodsId+'&frompage=freebuy'
                });
                /* if(this.isUniReady)
                {
                    uni.postMessage({
                      data: {
@@ -332,7 +337,7 @@
                         data:item
                      }
                     });
                }
                } */
            },
            
            getUrlPar:function(name)
@@ -351,8 +356,8 @@
                        "token":_this.getUrlPar("token")
                    },
                    //url:'http://dfg.shop.com/index.php/api/user/check_isfirst_free', 
                   //url:'http://dfgapp.ushopvip.com/api/user/check_isfirst_free',
                   url:'http://appapitest.ushopvip.com/api/user/check_isfirst_free', 
                   url:'http://dfgapp.ushopvip.com/api/user/check_isfirst_free',
                   //url:'http://appapitest.ushopvip.com/api/user/check_isfirst_free', 
                   type:"post",
                    dataType:"json",
                    data:{
@@ -370,20 +375,11 @@
                            type:"post",
                                dataType:"json",
                            data:{
                                nineCid:1,
                                page: 1,
                                pageSize:20,
                                pageSize:40,
                            }
                            }).done(function(res){
                                    var newlist=[];
                                    res.data.list.map(function(r,k){
                                        var buprice=r.actualPrice-r.topFanli;
                                        if(buprice<=3)
                                        {
                                            newlist.push(r);
                                        }
                            })
                            _this.lists=[].concat(_this.lists,newlist);
                            _this.lists=[].concat(_this.lists,res.data.list);
                            _this.loading = false;
                     })
                    }