beizhu

src/App.vue

@@ -6,26 +6,26 @@
 
 <script>
 import { createNamespacedHelpers } from "vuex";
-// const {mapState: mapcodeState,mapActions: mapcodeActions} = createNamespacedHelpers("getcode")
+const {mapState: mapcodeState,mapActions: mapcodeActions} = createNamespacedHelpers("getcode")
 
 export default {
   name: "app",
   components: {},
-  data() {
-    return {
-      logo: "./assets/logo.png"
-    };
-  },
-  // computed: {
-  //   ...mapcodeState({
-  //     uercode: s => s.uercode
-  //   })
+  // data() {
+  //   return {
+  //     logo: "./assets/logo.png"
+  //   };
   // },
+  computed: {
+    ...mapcodeState({
+      usercode: s => s.usercode
+    })
+  },
   created() {
     if (location.search && this.UrlSearch(location.search).code) {
       this.code = this.UrlSearch(location.search).code;
       this.getGetCode({
-        uercode:this.code 
+        usercode:this.code 
     })
 
     } else {
@@ -33,7 +33,7 @@ export default {
     }
   },
   methods: {
-    // ...mapcodeActions(['getGetCode']),
+    ...mapcodeActions(['getGetCode']),
     
     UrlSearch(urls) {
       let url = urls; // 获取url中"?"符后的字串
@@ -65,3 +65,13 @@ body,
   height: 100%;
 }
 </style>
+
+<style>
+.van-modal {
+  background: rgba(0, 0, 0, 0.3);
+}
+.van-dialog__message{
+  color:#535353;
+  line-height:1.6;
+}
+</style>

src/component/buildingdetailheader.vue

@@ -1,23 +0,0 @@
-<template>
-    <div class="headerbigimg">
-    <img class="bigimg" src=""/>
-    </div>
-</template>
-
-<script>
-export default {
-  name:'buildingdetail',
-}
-</script>
-
-<style lang="postcss" scoped>
-.headerbigimg{
-  width: 100%;
-  height: 211px;
-  & .bigimg{
-    width: 100%;
-  }
-}
-</style>
-
-

src/component/cityarea.vue

@@ -1,44 +0,0 @@
-<template>
-    <div class="cityarea">
-        <span class="iconfont icon-Shape1 iconarea"></span>
-        <span class="areaname">浦口区</span>
-    </div>
-</template>
-
-<script>
-export default {
-    name:'CityArea',
-}
-</script>
-
-<style lang="postcss" scoped>
-.cityarea{
-    width:72px;
-    height:27px;
-    background:rgba(0,0,0,0.39);
-    padding: 0 0 0 5px;
-    border-radius:0px 0px 25px 0px;
-    position: fixed;
-    top: 0;
-    left: 0;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-
-    .iconarea{
-        font-size: 10px !important;
-        color:rgba(255,255,255,1) !important;
-        padding-right:5px;
-    }
-
-    .areaname{
-        font-size:12px;
-        font-family:PingFangSC-Regular;
-        font-weight:400;
-        color:rgba(255,255,255,1);
-        line-height:17px;
-    }
-}
-</style>
-
-

src/pages/building/components/buildingconduction.vue → src/components/buildingconduction.vue

@@ -1,66 +1,66 @@
-<template>
-     <div class="houseconduction">
-       <div class="conduction">
-         <span class="conductiontitle">楼盘简介</span>
-       </div>
-       <hr class="line" />
-       <div class="conductioncontent">
-         <span class="conductioncharacters">项目位于江北浦口东至泰冯路，南至浦泗路，西至宁六公路，
-           北至中心路；位置不错，靠近南京大学金陵学院、东大成贤学院等；
-           邻近三号线泰冯路地铁站，周边人流大，适合投资或者自住；总价也
-           不高，户型也很舒服；项目位于江北浦口东至泰冯路，南至浦泗路，
-           西至宁六公路，北至中心路；位置不错，靠近南京大学金陵学院、
-           东大成贤学院等；邻近三号线泰冯路地铁站，周边人流大，</span>
-       </div>
-    </div>
-</template>
-
-<script>
-export default {
-    name:'BuildingConduction',
-}
-</script>
-
-<style lang="postcss" scoped>
- .houseconduction{
-    width: 100%;
-    height: auto;
-    background-color: rgba(255,255,255,1);
-    margin-bottom: 10px;
-
-   .line{
-      width:90%;
-      border: 0.5px solid #EFEFEF;
-    }
-    .conduction{
-      padding: 20px 0 18px 20px;
-
-      .conductiontitle{
-        font-size:18px;
-        font-family:PingFangSC-Regular;
-        font-weight:400;
-        color:rgba(37,38,42,1);
-        line-height:25px;
-      }
-
-    }
-
-    .conductioncontent{
-      width: 90%;
-      height: auto;
-      margin-left:5%;
-      text-align: justify;
-      padding-bottom: 20px;
-      
-      .conductioncharacters{
-        font-size:14px;
-        font-family:PingFangSC-Regular;
-        font-weight:400;
-        color:rgba(113,108,108,1);
-        line-height:23px;
-      }
-    }
-
-  }
-
-</style>
+<template>
+     <div class="houseconduction">
+       <div class="conduction">
+         <span class="conductiontitle">楼盘简介</span>
+       </div>
+       <hr class="line" />
+       <div class="conductioncontent">
+         <span class="conductioncharacters">项目位于江北浦口东至泰冯路，南至浦泗路，西至宁六公路，
+           北至中心路；位置不错，靠近南京大学金陵学院、东大成贤学院等；
+           邻近三号线泰冯路地铁站，周边人流大，适合投资或者自住；总价也
+           不高，户型也很舒服；项目位于江北浦口东至泰冯路，南至浦泗路，
+           西至宁六公路，北至中心路；位置不错，靠近南京大学金陵学院、
+           东大成贤学院等；邻近三号线泰冯路地铁站，周边人流大，</span>
+       </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name:'BuildingConduction',
+}
+</script>
+
+<style lang="postcss" scoped>
+ .houseconduction{
+    width: 100%;
+    height: auto;
+    background-color: rgba(255,255,255,1);
+    margin-bottom: 10px;
+
+   .line{
+      width:90%;
+      border: 0.5px solid #EFEFEF;
+    }
+    .conduction{
+      padding: 20px 0 18px 20px;
+
+      .conductiontitle{
+        font-size:18px;
+        font-family:PingFangSC-Regular;
+        font-weight:400;
+        color:rgba(37,38,42,1);
+        line-height:25px;
+      }
+
+    }
+
+    .conductioncontent{
+      width: 90%;
+      height: auto;
+      margin-left:5%;
+      text-align: justify;
+      padding-bottom: 20px;
+      
+      .conductioncharacters{
+        font-size:14px;
+        font-family:PingFangSC-Regular;
+        font-weight:400;
+        color:rgba(113,108,108,1);
+        line-height:23px;
+      }
+    }
+
+  }
+
+</style>

src/pages/building/components/buildingperimeter.vue → src/components/buildingperimeter.vue

@@ -1,86 +1,86 @@
-<template>
-    <div class="perimeter">
-        <div class="perimetertitle">
-            <span xlass="titlecharacters">周边配套</span>
-        </div>
-        <van-row class="user-links">
-            <van-col span="6">
-                <i class="iconfont  icon-icon-test2 icontype"></i>
-                <span class="characters">学校</span>
-            </van-col>
-            <van-col span="6">
-                <i class="iconfont icon-icon-test4 icontype"></i>
-                <span class="characters">医院</span>
-            </van-col>
-            <van-col span="6">
-                <i class="iconfont icon-icon-test1 icontype"></i>
-                <span class="characters">交通</span>
-            </van-col>
-            <van-col span="6">
-                <i class="iconfont icon-icon-test3 icontype"></i>
-                <span class="characters">商业</span>
-            </van-col>
-        </van-row>
-    </div>
-</template>
-
-<script>
-export default {
-    
-}
-</script>
-
-<style lang="postcss" scoped>
-.perimeter{
-    width: 100%;
-    height: 132px;
-    background-color: rgba(255,255,255,1);
-    margin-bottom: 15px;
-
-    .perimetertitle{
-        padding: 15px 0 15px 20px;
-        border-bottom:1px solid #EDEDED;
-
-        .titlecharacters{
-           font-size:18px;
-           font-family:PingFangSC-Regular;
-           font-weight:400;
-           color:rgba(37,38,42,1);
-           line-height:25px;
-        }
-    }
-
-    .user-links{
-        width: 100%;
-        height: 80px;
-        display: flex;
-
-        .icontype{
-            font-size: 16px!important;
-            color:#BABDC0!important;
-        }
-        
-        .linevertical{
-        border:1px solid #EDEDED;
-        }
-
-        .van-col--6{
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-          justify-content: center;
-          border-right: 0.5px solid #EDEDED;
-        }
-
-        .characters{
-            font-size:16px;
-            font-family:PingFangSC-Regular;
-            font-weight:400;
-            color:rgba(102,102,102,1);
-            line-height:22px;
-        }
-    }
-}
-</style>
-
-
+<template>
+    <div class="perimeter">
+        <div class="perimetertitle">
+            <span xlass="titlecharacters">周边配套</span>
+        </div>
+        <van-row class="user-links">
+            <van-col span="6">
+                <i class="iconfont  icon-icon-test2 icontype"></i>
+                <span class="characters">学校</span>
+            </van-col>
+            <van-col span="6">
+                <i class="iconfont icon-icon-test4 icontype"></i>
+                <span class="characters">医院</span>
+            </van-col>
+            <van-col span="6">
+                <i class="iconfont icon-icon-test1 icontype"></i>
+                <span class="characters">交通</span>
+            </van-col>
+            <van-col span="6">
+                <i class="iconfont icon-icon-test3 icontype"></i>
+                <span class="characters">商业</span>
+            </van-col>
+        </van-row>
+    </div>
+</template>
+
+<script>
+export default {
+    
+}
+</script>
+
+<style lang="postcss" scoped>
+.perimeter{
+    width: 100%;
+    height: 132px;
+    background-color: rgba(255,255,255,1);
+    margin-bottom: 15px;
+
+    .perimetertitle{
+        padding: 15px 0 15px 20px;
+        border-bottom:1px solid #EDEDED;
+
+        .titlecharacters{
+           font-size:18px;
+           font-family:PingFangSC-Regular;
+           font-weight:400;
+           color:rgba(37,38,42,1);
+           line-height:25px;
+        }
+    }
+
+    .user-links{
+        width: 100%;
+        height: 80px;
+        display: flex;
+
+        .icontype{
+            font-size: 16px!important;
+            color:#BABDC0!important;
+        }
+        
+        .linevertical{
+        border:1px solid #EDEDED;
+        }
+
+        .van-col--6{
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          border-right: 0.5px solid #EDEDED;
+        }
+
+        .characters{
+            font-size:16px;
+            font-family:PingFangSC-Regular;
+            font-weight:400;
+            color:rgba(102,102,102,1);
+            line-height:22px;
+        }
+    }
+}
+</style>
+
+

src/config/apis.js

@@ -11,6 +11,11 @@ const apiList = {
       url: '/api/lp/buildingBaseInfo/:project_id',
       method: 'get',
     },
+     //添加收藏
+     addcollect: {
+      url: '/api/lp/saveCollect/:buildingid',
+      method: 'get',
+    },
   },
   //获取楼盘相册
   buildingimage: {
@@ -26,20 +31,20 @@ const apiList = {
       method: 'get',
     },
   },
-  //添加收藏
+  //收藏信息
   collect: {
+    //添加收藏
     addcollect: {
       url: '/api/lp/saveCollect/:buildingid',
       method: 'get',
     },
-  },
   //取消收藏
-  deletecollect: {
     delete: {
       url: '/api/lp/deleteCollect/:buildingid',
       method: 'get',
     },
   },
+
   //浏览人数
   visitors: {
     add: {
@@ -86,7 +91,7 @@ const apiList = {
   //获取code
   getcode: {
     get: {
-      url: 'api/user/isLogin',
+      url: 'api/user/getUserInfo/:code',
       method: 'get',
     },
   },

src/pages/building/buildingdetail.vue

@@ -13,7 +13,8 @@
         <span class="iconline"></span>
         <div class="gotopagetype" @click="gotopagetype"><van-cell  class="clickcharacters" title="查看户型图"/><span class="iconfont icon-youfan right" ></span></div>
         <span class="iconline"></span>
-        <div class="gotopagecollect" @click="collecthouse(detail.buildingid,detail.collect)" ><span class="iconfont icon-Star collect" :class="{ active: isActive }" ></span><van-cell class="clickcharacters"  title="已收藏"/></div>
+        <div v-if="detail.collect==0" class="gotopagecollect" @click="collecthouse(detail.buildingid,detail.collect)" ><span class="iconfont icon-Star collect" :class="{ isActive: !detail.collect }" ></span><van-cell class="clickcharacters"  title="收藏"/></div>
+        <div v-if="detail.collect==1" class="gotopagecollect" @click="collecthouse(detail.buildingid,detail.collect)"  ><span class="iconfont icon-Star collect" :class="{ isActive: !detail.collect }" ></span><van-cell class="clickcharacters"  title="已收藏"/></div>
     </van-cell-group>
     <div class="housecenter">
        <div class="housename">
@@ -106,9 +107,9 @@
      
     </van-collapse>
   </div>
-    <div class="btn">
+    <!-- <div class="btn"> -->
       <van-button @click="gotoLookHouse()" size="large" >预约看房</van-button>
-    </div>
+    <!-- </div> -->
 </div>
 </template>
 
@@ -122,10 +123,6 @@ const {
   mapState: mapcollectState,
   mapActions: mapcollectActions
 } = createNamespacedHelpers("collect");
-const {
-  mapState: mapdelectState,
-  mapActions: mapdelectActions
-} = createNamespacedHelpers("delete");
 const {
   mapState: mapvisitState,
   mapActions: mapvisitActions
@@ -172,10 +169,6 @@ export default {
       collcet: s => s.collcet,
       buildingid: s => s.buildingid
     }),
-    ...mapdelectState({
-      collcet: s => s.collcet,
-      buildingid: s => s.buildingid
-    }),
     ...mapvisitState({
       browsingnum: s => s.browsingnum
     }),
@@ -204,10 +197,9 @@ export default {
     });
   },
   methods: {
-    ...mapbuildActions(["getBuilding"]),
-    ...mapcollectActions(["getAddCollect"]),
+    ...mapbuildActions(["getBuilding",'updateBuilding']),
+    ...mapcollectActions(["getAddCollect",'getDeleteCollect']),
     ...mapvisitActions(["postVisitors"]),
-    ...mapdelectActions(["getDeleteCollect"]),
     ...mapbuildActions(["numadd"]),
     ...mapareaActions(["getMap"]),
     ...maploginActions(["getJudgeLogin"]),
@@ -238,28 +230,26 @@ export default {
     collecthouse(buildingid, collect) {
       if (collect == 0) {
         //未收藏，添加收藏
-        this.getAddCollect(
-          {
-            buildingid: buildingid
-          },
+        this.getAddCollect({ buildingid: buildingid }).then(() => {
           this.$toast("收藏成功")
-        );
+          this.detail.collect = 1
+          this.updateBuilding(this.detail)
+        })
       } else {
         //已收藏，删除收藏
-        this.getDeleteCollect(
-          {
-            buildingid: buildingid
-          },
-          this.$toast("取消收藏成功"),
+        this.getDeleteCollect({ buildingid: buildingid } ).then(() => {
+          this.$toast("取消收藏成功")
           this.isActive=true
-        );
+          this.detail.collect = 0
+          this.updateBuilding(this.detail)
+        })
         //  location.reload()
       }
     },
     //浏览人数
     addvistornum(element) {
       let self = this;
-      if (!this.isopen) {
+      if (!self.isopen) {
         this.postVisitors({
           id: element.id,
           browsingnu: element.browsingnum + 1
@@ -267,12 +257,12 @@ export default {
           self.numadd({ id: element.id });
         });
       }
-      this.isopen = !this.isopen;
+      self.isopen = !this.isopen;
     },
 
     //周边配套信息
     perimeterinformation(element, tag) {
-      let self = this;
+      // let self = this;
       this.getMap({
         id: element.buildingid,
         buildingname: element.buildingname,
@@ -296,7 +286,7 @@ export default {
 };
 </script>
 
-<style scoped>
+<style >
 .van-cell:not(:last-child)::after {
   right: 15px !important;
 }
@@ -305,8 +295,9 @@ export default {
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="postcss" scoped>
 .isActive{
-  background-color: rgb(168, 168, 167) !important;
+  color: rgb(168, 168, 167) !important;
 }
+
 .context {
   width: 100%;
   height: 610px;
@@ -384,6 +375,7 @@ export default {
       flex-direction: row;
       align-items: center;
       margin-right: 30px;
+      width: 20%;
     }
 
     .right {
@@ -394,7 +386,7 @@ export default {
 
     .collect {
       font-size: 20px !important;
-      color: rgba(252, 198, 74, 1) !important;
+      color: rgba(252, 198, 74, 1);
       padding-right: 5px;
     }
 

src/pages/reservation/lookhouse.vue

@@ -162,11 +162,11 @@ export default {
       this.inside = true
       this.$router.push({
         query: {
-          project_id: this.$route.query.project_id,
+           project_id: this.$route.query.project_id,
         }
       });
       this.getHouseNameList({
-        project_id: this.$route.query.project_id,
+         project_id: this.$route.query.project_id,
       }).then(()=>{
       });
     },
@@ -219,6 +219,9 @@ export default {
 .van-hairline--top-bottom::after {
   border-width: 0;
 }
+.van-modal{
+  background-color: rgba(0,0,0,0.3)!important;
+}
 </style>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->

src/pages/transferpage/transferpage.vue

@@ -14,47 +14,45 @@ import TransferPageBg from "../../img/transferpagebg.jpg";
 import TransferPageQr from "../../img/transferpageqr.jpg";
 
 export default {
-    name:'TransferPage',
-    data () {
-        return{
-            TransferPageBg,
-            TransferPageQr
-        }
-    }
-}
+  name: "TransferPage",
+  data() {
+    return {
+      TransferPageBg,
+      TransferPageQr
+    };
+  }
+};
 </script>
 
 <style lang="postcss" scoped>
-.pageback{
-        width: 100%;
-        height: 100%;
-        /* background: url('~../../img/transferpagebg.jpg') no-repeat center center; */
-        background-position: center center;
-        background-repeat:  no-repeat;
-        background-size: 100% 100%;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
+.pageback {
+  width: 100%;
+  height: 100%;
+  /* background: url('~../../img/transferpagebg.jpg') no-repeat center center; */
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
 
-        .pagebackqr{
-        width:140px;
-        height:140px;
-        margin-bottom: 10px;
+  .pagebackqr {
+    width: 140px;
+    height: 140px;
+    margin-bottom: 10px;
 
-        .pagebackimg{
-        width: 100%;
-        height: 100%;
-    }
-    }
-     .pageback span{
-        font-size:16px;
-        font-weight:500;
-        color:rgba(255,255,255,1);
-        line-height:21px;
+    .pagebackimg {
+      width: 100%;
+      height: 100%;
     }
-    }
-    
+  }
+  .pageback span {
+    font-size: 16px;
+    font-weight: 500;
+    color: rgba(255, 255, 255, 1);
+    line-height: 21px;
+  }
+}
 </style>
 
-

src/store/building.js

@@ -29,6 +29,9 @@ export default {
           }).catch(reject)
         });
       },
+      updateBuilding({ commit }, params){
+        commit('updateBuilding', params)
+      },
       numadd({commit},params){
         commit('numadd', params)
       }

src/store/collect.js

@@ -16,7 +16,15 @@ export default {
   actions: {
     getAddCollect({ commit }, params) {
       return new Promise((resolve, reject) => {
-        request({ ...getAPI('collect.addcollect',{ buildingid: params.buildingid })}).then((data) => {
+        request({ ...getAPI('collect.addcollect', { buildingid: params.buildingid }) }).then((data) => {
+          commit('updateAddCollect', data)
+          resolve()
+        }).catch(reject)
+      });
+    },
+    getDeleteCollect({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        request({ ...getAPI('collect.delete', { buildingid: data.buildingid }) }).then((data) => {
           commit('updateAddCollect', data)
           resolve()
         }).catch(reject)

src/store/delete.js

@@ -1,26 +0,0 @@
-import request from '../utils/request'
-import getAPI from '../config/apis'
-
-export default {
-    namespaced: true,
-    state: {
-      collect: '',
-      buildingid :'',
-    },
-    mutations: {
-      updateDeleteCollect(state, collect,buildingid) {
-        state.collect = collect
-        state.buildingid = buildingid
-      }
-    },
-    actions: {
-        getDeleteCollect({ commit }, params) {
-        return new Promise((resolve, reject) => {
-          request({ ...getAPI('deletecollect.delete',{ buildingid: params.buildingid })  }).then((data) => {
-            commit('updateDeleteCollect', data)
-            resolve()            
-          }).catch(reject)
-        });
-      },
-    }
-  }

src/store/getcode.js

@@ -4,17 +4,17 @@ import getAPI from '../config/apis'
 export default {
     namespaced: true,
     state: {
-      uercode: '',
+      usercode: '',
     },
     mutations: {
-      updateGetCode(state, uercode) {
-        state.uercode = uercode
+      updateGetCode(state, usercode) {
+        state.usercode = usercode
       }
     },
     actions: {
         getGetCode({ commit }, params) {  
         return new Promise((resolve, reject) => {
-          request({ ...getAPI('getcode.get',{data: params}) }).then((data) => {
+          request({ ...getAPI('getcode.get',{code: params.usercode}) }).then((data) => {
             commit('updateGetCode', data)
             resolve()            
           }).catch(reject)

src/store/housenamelist.js

@@ -14,7 +14,7 @@ export default {
     actions: {
       getHouseNameList({ commit }, params) {
         return new Promise((resolve, reject) => {
-          request({ ...getAPI('housenamelist.getnamelist',{ buildingid: params.buildingid })}).then((data) => {
+          request({ ...getAPI('housenamelist.getnamelist',{ project_id: params.project_id })}).then((data) => {
             commit('updateHouseNameList', data)
             resolve()            
           }).catch(reject)

src/store/index.js

@@ -5,13 +5,12 @@ Vue.use(Vuex)
 
 const store = new Vuex.Store({
   modules: {
-    app: require('./app.js').default,
-    user: require('./user.js').default,
+    // app: require('./app.js').default,
+    // user: require('./user.js').default,
     building: require('./building.js').default,
     buildingimage: require('./buildingimage.js').default,
     buildingtype: require('./buildingtype.js').default,
     collect: require('./collect.js').default,
-    delete: require('./delete.js').default,
     map: require('./map.js').default,
     lookhouse: require('./lookhouse.js').default,
     housenamelist: require('./housenamelist.js').default,

src/utils/request.js

@@ -36,12 +36,12 @@ export default function request(config) {
 
       if (data.result) {
         resolve(data);
-      // } else if (data.code === 401) {
-      //   getCode(data.appid)
-      // }else if(data.code === 402) {
-      //   this.$router.push({
-      //     name: "transferpage",
-      //   });
+      } else if (data.code === 401) {
+        getCode(data.appId)
+      }else if(data.code === 402) {
+        this.$router.push({
+          name: "transferpage",
+        });
       }else {
         reject('请求数据失败');
       }

vue.config.js

@@ -1,4 +1,5 @@
 module.exports = {
+  baseUrl: './',
   css: {
     loaderOptions: {
       postcss: {
@@ -21,7 +22,6 @@ module.exports = {
     }
   },
   devServer: {
-    baseUrl:'./',
     proxy: {
       '/api': {
         target: 'http://192.168.0.166:8087', // wf