From f5f4be7e73c5646fae0ccadbaaf0ef0c5f2b37da Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期三, 05 七月 2023 10:49:35 +0800
Subject: [PATCH] no message

---
 public/html/freebuy.html |  174 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 139 insertions(+), 35 deletions(-)

diff --git a/public/html/freebuy.html b/public/html/freebuy.html
index 2e898bd..6cd9029 100644
--- a/public/html/freebuy.html
+++ b/public/html/freebuy.html
@@ -40,10 +40,7 @@
             margin: auto; max-width: 800px; font-size: .28rem; overflow: hidden; position: relative; z-index: 1;
             overflow: hidden;
         }
-        #appMain:before {
-            content: "";display: block;position: absolute;top: 0;left: -20%;height: 3.88rem;width: 140%;background: linear-gradient(90deg,#fbe7e2,#fbe7e2) no-repeat;background-size: 100%;
-            border-radius: 0 0 50% 50%;z-index: -1;
-        }
+    
        
         .h3bt {
             width: 1.66rem;
@@ -55,12 +52,14 @@
         .act_header{
             z-index: 200; width: 100%; background: no-repeat top; background-size: 100% auto;
             display: flex; align-items: center; justify-content: space-between;
-            position: fixed;background: linear-gradient(90deg, #fbe7e2 0%, #fbe7e2 100%) 0% 0% / 100%;
+            background: linear-gradient(#FF451F, #fbe7e2);
              color: #fff;
             max-width: 800px;
         }
         .act_header .centent{
             text-align: center;
+           
+            padding-top: 0.6rem;
         }
         .act_header .centent img{
             width:100%;
@@ -158,7 +157,7 @@
 
 
         .list-section{
-            display: -webkit-flex;display: flex;-webkit-flex-wrap: wrap;flex-wrap: wrap;-webkit-justify-content: space-between;justify-content: space-between;padding: 0 1.87%;margin-top: 0.6rem;
+            display: -webkit-flex;display: flex;-webkit-flex-wrap: wrap;flex-wrap: wrap;-webkit-justify-content: space-between;justify-content: space-between;padding: 0 1.87%;margin-top: 0.05rem;
         }
         .list-section .listTmp{
             width: 49%;background: #fff;border-radius: .08rem;margin-bottom: .14rem;box-sizing: border-box;
@@ -234,7 +233,6 @@
     .sort {
         background-color: #ea2424;
         border-radius: .2rem .2rem 0 0;
-        margin-top: 0.8rem;
         }
 
 .sort-list {
@@ -285,20 +283,45 @@
 .sort-list>li span i.arrow-active {
     border-color: #f2f2f2 transparent transparent
 }
+.appback
+{
+    width: 100%;
+    height: 0.5rem;
+    position: absolute;
+    top: 0.5rem;
+    left: 0.4rem;
+}
+.appback-img
+{
+    height: 100%;
+}
+.box
+        {
+            position:absolute;
+            width: 100%;
+            height: 100%;
+            background: url(https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/h5loading.gif) no-repeat fixed top;
+            background-size: 70px 70px;
+        }
+        .list{
+            position: relative;
+            top: 0;
+            width: 100%;
+        }
     </style>
 </head>
 
-<body >
-    
+<body style="background: #fbe7e2;">
+    <div class="box">
+        <div class="list">
+    <div id="appMain" >
+        <div class="appback">
+            <image v-on:click="topBack()" class="appback-img" src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/h5return_backIcon.png"></image>
+        </div>
     <header class="act_header">
         <div></div>
         <div class="centent"><img src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/xinrengoubanner.png" alt=""></div>
-        <div class="share">
-            <!-- <a href="">鍒嗕韩</a> -->
-        </div>
     </header>
-    <div id="appMain" >
-    <div :style="{ height: (twoNav && twoNav.length > 0) ? '2.3rem' : '2.3rem'}"></div>
     <div class="sort">
         <ul class="sort-list">
           <li v-for="item in fristOrderSort" v-bind:class="{'sort-active': item.number == sortNumber}"
@@ -349,6 +372,8 @@
             <span class="swiper-notification" aria-live="assertive" aria-atomic="true"></span>
     </div>
    
+</div>
+    </div>
 </div>
 </body>
 
@@ -410,16 +435,104 @@
             activeTwo:undefined,
             loading:true,
             isUniReady:false,
-            plat:'dy',
+            plat:'tb',
             posturl:"http://dfg.shop.com"
             //posturl:"http://appapitest.ushopvip.com"
             //posturl:"http://dfgapp.ushopvip.com"
         },
         methods: {
+            topBack:function()
+            {
+                uni.postMessage({
+                      data: {
+                         action: 'back'
+                      }
+                     });
+            },
+            touch:function()
+            {
+                const box = document.querySelector('.box')
+                const list = document.querySelector('.list');
+                // 鎸変笅灞忓箷鐨勪綅缃�
+                let touchStartPosition = 0
+            
+                // touchstart浜嬩欢
+                box.addEventListener('touchstart', function (e) {
+                    let touch = e.touches[0]
+                    touchStartPosition = touch.pageY
+                })
+                // touchmove浜嬩欢
+                box.addEventListener('touchmove', function (e) {
+                   
+                    let touch = e.touches[0]
+                    // 鍒楄〃鐨則op鍊肩瓑浜庡垪琛ㄧ浉瀵逛簬box鐨勫亸绉婚噺+婊戝姩鐨勮窛绂�
+                    let pySize= list.offsetTop + touch.pageY - touchStartPosition;
+                    if(pySize>=110)
+                    {
+                      return;
+                    }
+                    if(pySize<0)
+                    {
+                        return;
+                    }
+                    var scroll = document.getElementsByClassName('contscore')
+                        var srollPos = $('.contscore').scrollTop(); //婊氬姩鏉¤窛椤堕儴璺濈(椤甸潰瓒呭嚭绐楀彛鐨勯珮搴�)
+                    if(srollPos>0)
+                    {
+                        return;
+                    }
+                    list.style.top =pySize + 'px';
+                    // 瀹炵幇骞虫粦鐨勬粦鍔�
+                    touchStartPosition = touch.pageY
+                })
+                // touchend浜嬩欢
+                box.addEventListener('touchend', function (e) {
+                    let top = list.offsetTop
+                    if (top > 70) {
+                        // 鍦ㄦ澶勮皟鐢ㄥ埛鏂板悗鐨勫洖璋�
+                        console.log('鍒锋柊');
+                        location.reload();
+                    }
+                    if(top<0)
+                    {
+                        list.style.top=0;
+                    }
+                    if (top > 0) {
+                        // 閫氳繃瀹氭椂鍣ㄥ钩婊戠殑灏唋ist鐨則op = 0
+                        let timer = setInterval(() => {
+                            top=top-5;
+                        list.style.top = top + 'px'
+                        if (top <= 0) {
+                            list.style.top=0;
+                            clearInterval(timer)
+                        }
+                        },1)
+                    }
+                })
+            },
+            Infoformat: function(info){
+            let formatObj = info.replace(/\%/g,"%25")
+            formatObj = info.replace(/\#/g,"%23")
+            formatObj = info.replace(/\&/g,"%26")
+            formatObj = info.replace(/\?/g,"%3F")
+            return formatObj;
+            },
             targetItem:function(item){
-                uni.navigateTo({
-                  url: '/pages/goods/goodsDetail?id=' + item.goodsId+'&frompage=freebuy'
-                });
+                switch(this.plat)
+                {
+                    case "tb":
+                        uni.navigateTo({
+                            url: '/pages/goods/goodsDetail?id=' + item.goodsId+'&frompage=freebuy'
+                        });
+                        break;
+                    case "dy":
+                        var itemsStr=this.Infoformat(JSON.stringify(item));
+                        uni.navigateTo({
+                            url: '/pages/goods/goodsDetail?sourcefrom=freebuy&info=' + itemsStr+'&frompage=freebuy'
+                        });
+                        break;
+                }
+              
                 /* if(this.isUniReady)
                 {
                     uni.postMessage({
@@ -431,23 +544,13 @@
                 } */
             },
             handleSort: function(item) {
-                if(this.sortNumber == item.number) {
-                    if(item.min === item.max) {
-                    return;
-                    }
-                    if(item.bool) {
-                    this.sortId = item.min;
-                    item.bool = false;
-                    } else {
-                    this.sortId = item.max;
-                    item.bool = true;
-                    }
-                } else {
-                    item.bool = true;
+                if(this.sortNumber != item.number) {
+                    this.loading=true;
+                    this.lists=[];
+                    this.getgoodsSwitch(item.number);
                     this.sortNumber = item.number;
-                    this.sortId = item.max;
+                    this.plat=item.number;
                 }
-                this.getgoodsSwitch(item.number);
             },
             getUrlPar:function(name)
             {
@@ -471,7 +574,7 @@
                                 pageSize:40,
                             }
                             }).done(function(res){
-                            _this.lists=[].concat(_this.lists,res.data.list);
+                            _this.lists=[].concat([],res.data.list);
                             _this.loading = false;
                      })
             },
@@ -491,7 +594,7 @@
                                 pageSize:40,
                             }
                             }).done(function(res){
-                            _this.lists=[].concat(_this.lists,res.data.list);
+                            _this.lists=[].concat([],res.data.list);
                             _this.loading = false;
                      })
             },
@@ -548,6 +651,7 @@
         mounted: function () {
             this.getIsSd();
             var that=this;
+            this.touch();
             document.addEventListener('UniAppJSBridgeReady', function() {
             that.isUniReady=true;
             });

--
Gitblit v1.9.3