Browse Source

时间选择、订阅推送列表

TANGSHIZHE 4 years ago
parent
commit
39dcdca838

+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/css/subscribe.css

@@ -1720,7 +1720,7 @@ html, body {
     display: none;
     display: none;
     position: absolute;
     position: absolute;
     top: -2px;
     top: -2px;
-    right: -4px;
+    right: 22px;
     background-color: #FE737A;
     background-color: #FE737A;
     width: 8px;
     width: 8px;
     height: 8px;
     height: 8px;

+ 3 - 0
src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html

@@ -81,6 +81,9 @@
         display: flex;
         display: flex;
         justify-content: space-between;
         justify-content: space-between;
     }
     }
+    .vip_openDialog .van-hairline--top::after{
+        border-top-width: 0;
+    }
     .vip_openDialog .van-button.van-button--default{
     .vip_openDialog .van-button.van-button--default{
         flex: none;
         flex: none;
         width: 2.16rem;
         width: 2.16rem;

+ 3 - 8
src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -78,7 +78,8 @@
             height: 100%;
             height: 100%;
         }
         }
        .app-layout-content-b {
        .app-layout-content-b {
-            height: calc(100vh - 89px);
+            height: calc(100vh - 70px);
+            /* height: auto; */
             overflow: hidden;
             overflow: hidden;
        }
        }
        #dropDownItemGroup .van-dropdown-item__content {
        #dropDownItemGroup .van-dropdown-item__content {
@@ -140,7 +141,7 @@
                         </p>
                         </p>
                     </div>
                     </div>
                 </div> -->
                 </div> -->
-                    <van-dropdown-menu style="width: auto;overflow-x: auto;">
+                    <van-dropdown-menu style="width: auto;overflow-x: auto;"  :close-on-click-outside="false">
                         <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" :title="tagText.timeText"  ref="dateItem" @open="open" @close="close">
                         <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" :title="tagText.timeText"  ref="dateItem" @open="open" @close="close">
                             <date-component :key="setTimer.datetimer" @cancel="cancel" @confirm="confirm" :selectdate="selectDate"/>
                             <date-component :key="setTimer.datetimer" @cancel="cancel" @confirm="confirm" :selectdate="selectDate"/>
                         </van-dropdown-item>
                         </van-dropdown-item>
@@ -1130,12 +1131,6 @@ function hasNoData() {
           if (obj.ca_isvisit == 1) {
           if (obj.ca_isvisit == 1) {
               visited = "visited"
               visited = "visited"
           }
           }
-          var collecnum = 0
-          if(obj.collection == 1) {
-            collecnum = 1
-          } else {
-            collecnum = 1
-          }
           if (showAd && index == 3 && !closeAdvert) {//广告位
           if (showAd && index == 3 && !closeAdvert) {//广告位
               var ad = $("#advertscript").html()
               var ad = $("#advertscript").html()
               if (ad != "") {
               if (ad != "") {

+ 2 - 2
src/web/staticres/common-module/collection/js/date-mobile.js

@@ -9,7 +9,7 @@ var dateComponentTemplate = `<div class="j-container">
     <van-field @focus="getEndFocus" v-model="dateTimePickerState.endPlaceHolder" placeholder="结束时间"></van-field>
     <van-field @focus="getEndFocus" v-model="dateTimePickerState.endPlaceHolder" placeholder="结束时间"></van-field>
     </div>
     </div>
 </div>
 </div>
-<van-popup v-model="datePicker.startshow" :safe-area-inset-bottom="true" get-container="#date-picker-other-box" round position="bottom" :style="{ height: '43%' }">
+<van-popup v-model="datePicker.startshow" :safe-area-inset-bottom="true" get-container="#date-picker-other-box" round position="bottom" :style="{ height: '46%' }">
     <div class="j-container">
     <div class="j-container">
       <div class="j-header">
       <div class="j-header">
         <div class="headertitle">
         <div class="headertitle">
@@ -43,7 +43,7 @@ var dateComponentTemplate = `<div class="j-container">
       </div>
       </div>
     </div>
     </div>
   </van-popup>
   </van-popup>
-  <van-popup v-model="datePicker.endshow" :safe-area-inset-bottom="true" get-container="#date-picker-other-box" round position="bottom" :style="{ height: '43%' }">
+  <van-popup v-model="datePicker.endshow" :safe-area-inset-bottom="true" get-container="#date-picker-other-box" round position="bottom" :style="{ height: '46%' }">
     <div class="j-container">
     <div class="j-container">
       <div class="j-header">
       <div class="j-header">
         <div class="headertitle">
         <div class="headertitle">

+ 3 - 0
src/web/templates/frontRouter/wx/collection/sess/ent_portrait.html

@@ -88,6 +88,9 @@
         display: flex;
         display: flex;
         justify-content: space-between;
         justify-content: space-between;
     }
     }
+    .vip_openDialog .van-hairline--top::after{
+        border-top-width: 0;
+    }
     .vip_openDialog .van-button.van-button--default{
     .vip_openDialog .van-button.van-button--default{
         flex: none;
         flex: none;
         width: 2.16rem;
         width: 2.16rem;

+ 1 - 4
src/web/templates/weixin/historypush.html

@@ -523,9 +523,6 @@
             color: #fff;
             color: #fff;
             text-decoration: none;
             text-decoration: none;
         }
         }
-        .iosMeau{
-            height: 100%;
-        }
        #dropDownItemGroup .van-dropdown-item__content {
        #dropDownItemGroup .van-dropdown-item__content {
          max-height: 70vh;
          max-height: 70vh;
        }
        }
@@ -589,7 +586,7 @@
                 </p>
                 </p>
             </div>
             </div>
         </div> -->
         </div> -->
-        <van-dropdown-menu style="width: auto;overflow-x: auto;" :class="{iosMeau:iosMeauStyle==true}">
+        <van-dropdown-menu style="width: auto;overflow-x: auto;" :close-on-click-outside="false">
             <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" :title="tagText.timeText"  ref="dateItem" id="showDatePicker" @open="open" @close="close">
             <van-dropdown-item get-container="#dropDownItemGroup" :lazy-render="false" :title="tagText.timeText"  ref="dateItem" id="showDatePicker" @open="open" @close="close">
                 <date-component :key="setTimer.datetimer" ref="datecom" @cancel="cancel" @confirm="confirm" :selectdate="selectDate"/>
                 <date-component :key="setTimer.datetimer" ref="datecom" @cancel="cancel" @confirm="confirm" :selectdate="selectDate"/>
             </van-dropdown-item>
             </van-dropdown-item>