Merge remote-tracking branch 'origin/master' into online-reserve

@@ -17,6 +17,8 @@
 }
 }
 .nav .part .title{
 .nav .part .title{
   width: 100%;
   width: 100%;
+  overflow: hidden;
+  white-space:nowrap;
 }
 }
 .nav .part .opt{
 .nav .part .opt{
   min-width: 188rpx;
   min-width: 188rpx;

@@ -51,7 +51,6 @@
                 </view>
                 </view>
             </view>
             </view>
         </view>
         </view>
-        <image src="http://qn.colorcun.com/custom/lite/image/close.png" class="reduce-close" bindtap="close"></image>
     </view>
     </view>
 
 
 </view>
 </view>

@@ -118,12 +118,6 @@
   background: #fff;
   background: #fff;
   padding-bottom:62rpx;
   padding-bottom:62rpx;
   border-radius: 10rpx;
   border-radius: 10rpx;
-  position: fixed;
-  top: 0;
-  left:0;
-  right:0;
-  margin:50% auto;
-  z-index: 9999;
   /* overflow: hidden; */
   /* overflow: hidden; */
 }
 }
 .reduce-content-title{
 .reduce-content-title{

@@ -216,7 +216,10 @@ Page({
     this.setData({
     this.setData({
       toView: 'inToView' + _id,
       toView: 'inToView' + _id,
     });
     });
-
+    this.getClassNameFlag=false;
+    setTimeout(res=>{
+      this.getClassNameFlag=true;
+    },800)
   },
   },
   foodCardCallback(e){
   foodCardCallback(e){
     let opt = e.detail;
     let opt = e.detail;
@@ -272,7 +275,7 @@ Page({
     let activeId='';
     let activeId='';
     Object.keys(this.scrollHeightList).forEach(tid=>{
     Object.keys(this.scrollHeightList).forEach(tid=>{
       let mx=parseInt(e.detail.scrollTop)-parseInt(this.scrollHeightList[tid].top)
       let mx=parseInt(e.detail.scrollTop)-parseInt(this.scrollHeightList[tid].top)
-      if(mx>-120){
+      if(mx>-100){
         if(mx<maxMX) {
         if(mx<maxMX) {
           maxMX=mx;
           maxMX=mx;
           activeId=tid;
           activeId=tid;