Shannon_mu 2 rokov pred
rodič
commit
5695120ea1

+ 1 - 3
login/public/index.html

@@ -15,9 +15,7 @@
   <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
   <link rel="stylesheet" href="//at.alicdn.com/t/font_830376_qzecyukz0s.css">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico" type="image/x-icon" />
-  <!-- <title>智慧社区管理平台</title> -->
-  <!-- 演示用 -->
-  <title>智慧园区管理平台</title>
+  <title>智慧社区管理平台</title>
 </head>
 
 <body>

+ 2 - 6
login/src/views/Login/index.vue

@@ -1,14 +1,10 @@
 <template>
     <div class="login-wrap">
         <div class="logo" :class="{ logoleave: jumpAnimate }">
-            <!-- <img src="@assets/img/icon_logo2.png" /> -->
-            <!-- 演示用 -->
-            <!-- <img class="logoys" src="@assets/img/icon_logo2cs.png" /> -->
+            <img src="@assets/img/icon_logo2.png" />
         </div>
         <div class="login-title">
-            <!-- <h1 class="title-name">智慧社区管理平台</h1> -->
-            <!-- 演示用 -->
-            <h1 class="title-name">智慧园区管理平台</h1>
+            <h1 class="title-name">智慧社区管理平台</h1>
             <p class="title-lang">SMART COMMUNITY MANAGEMENT PLATFORM</p>
         </div>
         <div class="ms-login ms-login1" :class="{ 'ms-login1leave': jumpAnimate }" v-show="!isSelectTenant">

+ 2 - 6
login/src/views/NewNav/index.vue

@@ -2,14 +2,10 @@
     <div class="nav-wrap">
         <div class="top">
             <div class="top_png">
-                <!-- <p>智慧社区管理平台</p> -->
-                <!-- 演示用 -->
-                <p>智慧园区管理平台</p>
+                <p>智慧社区管理平台</p>
             </div>
             <div class="lfet-right">
-                <!-- <div class="logo"></div> -->
-                <!-- 演示用 -->
-                <div></div>
+                <div class="logo"></div>
                 <div style="display: flex">
                     <div class="tenantName" @click="toggleTenant">{{ tenantName }}</div>
                     <div class="logout" @click="logout"></div>

+ 2 - 6
operationSupport/src/components/common/Sidebar.vue

@@ -1,9 +1,7 @@
 <template>
     <div class="sidebar" :style="collapse ? 'width:85px' : 'width:220px'">
         <div class="logo" v-if="!collapse">
-            <!-- <img style="width: rem(90); height: rem(24)" src="@/assets/img/img_logo2.png"/> -->
-            <!-- 演示用 -->
-            <img  src="@/assets/img/icon_logo2cs.png" />
+            <img  src="@/assets/img/img_logo2.png"/>
             <div class="title"><span class="point"></span>{{ $store.getters['getThisDetai'].name || sessSetThisDetai }}</div>
         </div>
         <div class="logo shrink" v-else>
@@ -132,9 +130,7 @@ export default {
         border-bottom: 1px solid #2a335c;
         margin-bottom: rem(25);
         img {
-            // <!-- 演示用 -->
-            width: rem(24);
-            // width: rem(90);
+            width: rem(90);
             height: rem(24);
             display: inline-block;
             vertical-align: middle;

+ 3 - 0
operationSupport/src/views/payService/propertyFee/stepPage/details.vue

@@ -9,6 +9,9 @@
                             <template v-if="item.slot == 'assetsArea' && thisItem['chargeType'] == 4">
                                 {{ !!thisItem['parkingDetail'] ? thisItem['parkingDetail'] : '--' }}
                             </template>
+                            <template v-else-if="item.slot == 'assetsArea' && (thisItem['chargeType'] == 2 ||  thisItem['chargeType'] == 3)">
+                                {{ !!thisItem['quantity'] ? thisItem['quantity'] : '--' }}
+                            </template>
                             <template v-else-if="item.slot == 'chargeMode'">
                                 {{ !!chargeModeValue[thisItem[item.prop]] ? chargeModeValue[thisItem[item.prop]] : '--' }}
                             </template>