xuqiang 4 tahun lalu
induk
melakukan
086a70ac5f
6 mengubah file dengan 22 tambahan dan 13 penghapusan
  1. 1 1
      .env.development
  2. 1 1
      .env.production
  3. 1 1
      src/App.vue
  4. 10 7
      src/pages/home.vue
  5. 8 2
      src/pages/my.vue
  6. 1 1
      src/pages/without.vue

+ 1 - 1
.env.development

@@ -1 +1 @@
-VUE_APP_BASE_URL=http://localhost:8080
+VUE_APP_BASE_URL=http://192.168.50.154:8080

+ 1 - 1
.env.production

@@ -1 +1 @@
-VUE_APP_BASE_URL=http://localhost:8080
+VUE_APP_BASE_URL=http://192.168.50.154:8080

+ 1 - 1
src/App.vue

@@ -4,7 +4,7 @@ export default {
         wx.login({
             success: res => {
                 this.$http.setToken(
-                    'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ4cTEyMzQiLCJleHAiOjE2MzkwNDM1NDAsImlhdCI6MTYzOTAzOTk0MX0.kFyDKhDI8VP9agjzEfbf_4TABOuBWBTK56-e1veJlup7Zsvv3eR29dLiJSWOFasrqkqotoB_EafpJc_UpWwang'
+                    'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ4cTEyMzQiLCJleHAiOjE2MzkwNDc3NzksImlhdCI6MTYzOTA0NDE3OX0.QqBoncwooif5MQurmL3H_chkk7T-fXYwHcj2IHmEaeX39DN7fFsKC4FkwKZQK_XRqt1uMUbRZ1tMngkxzQpvOg'
                 );
                 this.$store.dispatch('updateUserInfo');
                 // this.$http

+ 10 - 7
src/pages/home.vue

@@ -1,7 +1,9 @@
 <config>
 {
     "navigationStyle": "custom",
-     "navigationBarTextStyle": "white",
+    "navigationBarTextStyle": "white",
+    "backgroundColorTop":'#00ba64',
+    "backgroundColorBottom":'#f5f7fa',
 }
 </config>
 <template>
@@ -142,12 +144,12 @@ export default {
 <style lang="less" scoped>
 .app {
     background: #f5f7fa !important;
-    padding-bottom: 200px;
+    // padding-bottom: 200px;
     height: 100vh;
     .top-img {
         width: 100%;
         background: #00ba64;
-        height: 248px;
+        height: 246px;
         border-radius: 2px;
         .title {
             padding-left: 20px;
@@ -178,9 +180,10 @@ export default {
             }
             .money {
                 position: absolute;
+                width: 81%;
                 display: flex;
-                margin-top: 16px;
-                margin-left: 35px;
+                justify-content: space-between;
+                margin: 16px 0 0 35px;
                 .money1 {
                     .flex();
                     margin-bottom: 3px;
@@ -194,7 +197,7 @@ export default {
                     .money-img {
                         width: 11px;
                         height: 13px;
-                        margin-top: 8px;
+                        margin-top: 6px;
                     }
                 }
                 .text1 {
@@ -240,7 +243,7 @@ export default {
         background: #ffffff;
         box-shadow: 0px 2px 4px 0px rgba(1, 168, 91, 0.04);
         border-radius: 12px;
-        margin: 0 20px;
+        margin: 4px 20px 0;
         .box {
             display: flex;
             align-items: center;

+ 8 - 2
src/pages/my.vue

@@ -44,7 +44,11 @@
                     </div>
                 </div>
 
-                <div v-else class="deposit" @click="navigateTo('/pages/deposit')">
+                <div
+                    v-if="list.depositStatus !== 'PAID' && list.depositStatus !== 'REFUNDING'"
+                    class="deposit"
+                    @click="navigateTo('/pages/deposit')"
+                >
                     房租押金&nbsp;<span>¥{{ list.depositAmount }}</span
                     >&nbsp;去缴费
                     <img style="width:24px;height:24px;margin-top:1px" src="../native/icon_inter@3x.png" alt="" />
@@ -130,6 +134,9 @@ export default {
             this.list = res;
             this.$store.dispatch('updateRoomInfo');
         });
+        setTimeout(() => {
+            console.log(this.list.depositStatus);
+        }, 1000);
     },
     methods: {
         confirm() {
@@ -297,7 +304,6 @@ export default {
             font-weight: bold;
             color: #ffffff;
             line-height: 19px;
-            padding-top: 0.5px;
         }
     }
     .content1 {

+ 1 - 1
src/pages/without.vue

@@ -50,7 +50,7 @@ export default {
 .content {
     background: #f5f7fa;
     padding-top: 10px;
-    padding-bottom: 60px;
+    height: 100vh;
     .box {
         .title {
             font-weight: bold;