Merge branch 'master' of http://git.lcpcp.cc/root/lcoco

components/en-utils/en-popup/en-drawer.vue

@@ -1,5 +1,5 @@
 <template>
-  <view >
+  <view  @touchmove.stop.prevent="moveHandle">
     <uni-drawer ref="drawer"  :type="type" :width="drawerWidth" mask-background-color="rgba(0,0,0,0.4)">
         <slot name="drawerInfo">
 
@@ -42,6 +42,9 @@ export default {
     }
   },
   methods: {
+    moveHandle() {
+      return false
+    },
     open(){
       this.$refs.drawer.open()
     },
@@ -76,4 +79,4 @@ export default {
   }
 }
 
-</style>
+</style>

components/en-utils/en-popup/en-popup.vue

@@ -1,12 +1,9 @@
 <template>
-  <view >
-    <uni-popup ref="popup" @change="setTabBar" type="bottom" :mask-background-color="maskBackgroundColor">
+  <view  @touchmove.stop.prevent="moveHandle">
+    <uni-popup ref="popup"  @change="setTabBar" type="bottom" :mask-background-color="maskBackgroundColor">
       <view class="popup-box" v-show="showTop">
         <view class="popup-title" @click="close">
-          <view class="popup-close">
-            <image class="popup-close-img" src="/static/img/common/close.png" mode="widthFix" ></image>
-          </view>
-
+          <image class="popup-close" src="@/static/img/pay/gb-p.png"></image>
         </view>
         <slot name="popupInfo"></slot>
       </view>
@@ -28,20 +25,27 @@ export default {
     }
   },
   data() {
-    return {}
+    return {
+      popupShow:false
+    }
   },
   watch: {},
   mounted() {
 
   },
   methods: {
+    moveHandle() {
+      return false
+    },
     open(){
       this.$refs.popup.open('bottom')
     },
     setTabBar(e){
       if(e.show){
+        this.popupShow = true;
         uni.hideTabBar()
       }else {
+        this.popupShow = false;
         uni.showTabBar()
       }
     },
@@ -53,22 +57,22 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.popupShow {
+  overflow: hidden;
+  position: fixed;
+}
 .popup-box{
   background: #FFFFFF;
-  border-radius: 30rpx 30rpx 0 0;
+  border-radius: 20rpx 20rpx 0 0;
   box-shadow: 0px -8px 20px 0px rgba(0,0,0,0.04);
-  padding: 42rpx 32rpx calc(16rxp + env(safe-area-inset-bottom));
-  z-index: 999999;
+  padding: 28rpx 32rpx 50rpx 32rpx;
+  z-index: 100;
   .popup-title{
-    padding: 20rpx 0;
-    width: 100%;
+    padding: 20rpx;
     .popup-close{
-      width: 72rpx;
-      margin: auto;
-      border-radius: 30rpx;
-      .popup-close-img{
-        width: 72rpx;
-      }
+      margin: 0 auto;
+      width: 82rpx;
+      height: 10rpx;
     }
   }
 }

pages.json

@@ -183,7 +183,7 @@
     "list": [
       {
         "name": "列表调试",
-        "path": "pages/login/index",
+        "path": "pages/index/index",
         "query": ""
       }
     ]