Эх сурвалжийг харах

Merge pull request #238 from tron/lock/release-2.16.0/SCRM-4268

Lock/release 2.16.0/scrm 4268
Tron 1 жил өмнө
parent
commit
7ffc5a93a5

+ 4 - 4
src/components/wx-points-auth/wx-points-auth.vue

@@ -27,7 +27,7 @@ export default {
     props: {
         bottom: {
             type: String,
-            default: '-38px',
+            default: '54px',
         },
         background: {
             type: String,
@@ -184,12 +184,12 @@ export default {
     }
 }
 </script>
-<style>
+<style scoped>
 .box {
     position: absolute;
     z-index: 10000;
-    width: calc(100vw - 74px);
-    padding: 8px 12px 8px 24px;
+    width: calc(100vw - 84px);
+    padding: 8px 20px;
     height: 80px;
     left: 24px;
     border-radius: 4px;

+ 2 - 1
src/pages/parkingFee/parkingFee.vue

@@ -128,7 +128,7 @@
             </div>
           </div>
           <div class="parkingFee-top">
-            <wx-points-auth ref="wxPointsAuth"></wx-points-auth>
+            
             <div class="top_content">
               <div class="title_box">
                 <span class="btn">缴费说明</span>
@@ -147,6 +147,7 @@
             <div class="top_down" @click="top_display" v-else><van-icon name="arrow-up" /></div>
           </div>
         </div>
+        <wx-points-auth ref="wxPointsAuth"></wx-points-auth>
       </div>
     </scroll-view>
     <plate-number ref="plateKeyboard" :noDisBtn="[32, 33, 34,35, 36, 37]" :carType="carType" :active="active" :ind="ind" :numArr="numArr" @carnoArr="updateCarno"></plate-number>