smartcase
/
auto-sales-wechat
ウォッチ 1
お気に入りに登録 0
フォーク 0
コード 課題 0 プルリクエスト 0 リリース 0 アクティビティ
ソースを参照

beizhu

陈冉 6 年 前
親
6c87557df8
コミット
9d427ec099
共有9 個のファイルを変更した、142 個の追加 と 107 個の削除を含む
分割表示 差分情報を表示
  1. 1
    0
      babel.config.js
  2. 0
    1
      public/index.html
  3. 1
    1
      src/config/apis.js
  4. 17
    2
      src/main.js
  5. 21
    3
      src/pages/building/buildingdetail.vue
  6. 33
    33
      src/pages/building/buildingimage.vue
  7. 59
    60
      src/pages/building/perimetertype.vue
  8. 6
    6
      src/pages/transferpage/transferpage.vue
  9. 4
    1
      vue.config.js

+ 1
- 0
babel.config.js ファイルの表示 

@@ -2,4 +2,5 @@ module.exports = {
2 2 
   presets: [
3 3 
     '@vue/app'
4 4 
   ],
5 
+
5 6 
 }

+ 0
- 1
public/index.html ファイルの表示 

@@ -3,7 +3,6 @@
3 3 
   <head>
4 4 
     <meta charset="utf-8">
5 5 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 
-    <!-- <meta name="viewport" content="width=device-width,initial-scale=1.0"> -->
7 6 
     <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
8 7 
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
9 8 
     <link rel="stylesheet" href="//at.alicdn.com/t/font_666494_3y8olbksjs5.css"/>

+ 1
- 1
src/config/apis.js ファイルの表示 

@@ -91,7 +91,7 @@ const apiList = {
91 91 
   //获取code
92 92 
   getcode: {
93 93 
     get: {
94 
-      url: 'api/wx/getUserInfo/:code',
94 
+      url: '/api/wx/getUserInfo/:code',
95 95 
       method: 'get',
96 96 
     },
97 97 
   },

+ 17
- 2
src/main.js ファイルの表示 

@@ -4,12 +4,27 @@ import 'vant/lib/vant-css/index.css'
4 4 
 import App from './App.vue'
5 5 
 import router from './router'
6 6 
 import store from './store'
7 
-import AMap from 'vue-amap'
8 7 
 import VueAwesomeSwiper from 'vue-awesome-swiper'
9 8 
 import 'swiper/dist/css/swiper.css'
10 9 
 import moment from 'moment/moment'
11 10 
 import preview from 'vue-photo-preview'
12 11 
 import 'vue-photo-preview/dist/skin.css'
12 
+import AMap from "vue-amap";
13 
+AMap.initAMapApiLoader({
14 
+  key: "73df496773bd9a021d44d32d6e272fb5", //自己申请
15 
+  plugin: [
16 
+    "AMap.Autocomplete",
17 
+    "AMap.PlaceSearch",
18 
+    "AMap.Scale",
19 
+    "AMap.OverView",
20 
+    "AMap.ToolBar",
21 
+    "AMap.MapType",
22 
+    "AMap.PolyEditor",
23 
+    "AMap.CircleEditor",
24 
+    "AMap.Geolocation",
25 
+    "AMap.Geocoder"
26 
+  ]
27 
+});
13 28
14 29
15 30 
 
@@ -23,8 +38,8 @@ Vue.filter('moment', function (value, formatString) {
23 38
24 39
25 40
26 
-Vue.use(Vant)
27 41 
 Vue.use(AMap)
42 
+Vue.use(Vant)
28 43 
 Vue.use(VueAwesomeSwiper)
29 44 
 Vue.use(preview)
30 45

+ 21
- 3
src/pages/building/buildingdetail.vue ファイルの表示 

@@ -15,8 +15,8 @@
15 15 
           <span class="iconline"></span>
16 16 
           <div class="gotopagetype" @click="gotopagetype"><span class="clickcharacters">查看户型图</span><span class="iconfont icon-youfan right" ></span></div>
17 17 
           <span class="iconline"></span>
18 
-          <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><span class="clickcharacters">收藏</span></div>
19 
-          <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><span class="clickcharacters">已收藏</span></div>
18 
+          <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><span class="collectcharacters">收藏</span></div>
19 
+          <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><span class="collectcharacters">已收藏</span></div>
20 20 
       </div>
21 21 
       <div class="housecenter">
22 22 
         <div class="housename">

@@ -93,6 +93,7 @@
93 93 
         <div class="dynamicstitle">
94 94 
           <span class="titlecharacters">相关动态</span>
95 95 
         </div>
96 
+        <hr class="line" />
96 97 
       <van-collapse v-model="activeName"  accordion >
97 98 
         <div v-for="list in detail.buildingDynamicLst" :key="list.id" @click="addvistornum(list)">
98 99 
           <van-collapse-item>

@@ -298,7 +299,7 @@ export default {
298 299 
   right: 15px !important;
299 300 
 }
300 301 
 .van-collapse-item__content{
301 
-  padding: 0 15px
302 
+  padding: 10px 15px
302 303 
 }
303 304 
 </style>
304 305 
 

@@ -403,12 +404,24 @@ export default {
403 404 
     }
404 405
405 406 
     .gotopagecollect {
407 
+      width: 20%;
406 408 
       height: 100%;
407 409 
       display: flex;
408 410 
       flex-direction: row;
409 411 
       align-items: center;
410 412 
       margin-right: 30px;
411 413 
       justify-content: center;
414 
+
415 
+      .collectcharacters{
416 
+        width: 60%;
417 
+        padding: 0 !important;
418 
+        font-size: 14px;
419 
+        font-family: PingFangSC-Regular;
420 
+        font-weight: 400;
421 
+        color: rgba(102, 102, 102, 1);
422 
+        line-height: 20px;
423 
+        text-align: center;
424 
+      }
412 425 
     }
413 426
414 427 
     .right {

@@ -615,6 +628,11 @@ export default {
615 628 
     height: auto;
616 629 
     background-color: rgba(255, 255, 255, 1);
617 630
631 
+    .line {
632 
+      width: 90%;
633 
+      border: 0.5px solid #efefef;
634 
+    }
635 
+
618 636 
     .dynamicstitle {
619 637 
       padding: 15px 0 10px 20px;
620 638

+ 33
- 33
src/pages/building/buildingimage.vue ファイルの表示 

@@ -5,7 +5,7 @@
5 5 
       <div class="houseimage">
6 6 
         <swiper :options="swiperOption" ref="mySwiper" class="slidewrapper">
7 7 
           <swiper-slide class="slideimg" v-for="(list1, index1) in detail.imageLst1" :key="index1" >
8 
-            <img class="lazyimage" :src="list1.fileurl" preview/>
8 
+            <img class="lazyimage" :src="list1.fileurl" @click="viewpicture1(list1)"/>
9 9 
             <div class="houseindex">
10 10 
               <span class="imagetype">{{list1.name}}</span>
11 11 
               <div class="imageindex" >

@@ -27,7 +27,7 @@
27 27 
             </div>
28 28 
           </swiper-slide>
29 29 
           <swiper-slide class="slideimg" v-for="(list2, index2) in detail.imageLst2" :key="index2" >
30 
-              <img class="lazyimage" :src="list2.fileurl" preview/>
30 
+              <img class="lazyimage" :src="list2.fileurl"  @click="viewpicture2(list2)"/>
31 31 
               <div class="houseindex">
32 32 
                 <span class="imagetype">{{list2.name}}</span>
33 33 
                 <div class="imageindex">

@@ -49,7 +49,7 @@
49 49 
             </div>
50 50 
           </swiper-slide>
51 51 
           <swiper-slide class="slideimg" v-for="(list3, index3) in detail.imageLst3" :key="index3" >
52 
-            <img class="lazyimage" :src="list3.fileurl" preview/>
52 
+            <img class="lazyimage" :src="list3.fileurl" @click="viewpicture3(list3)"/>
53 53 
             <div class="houseindex">
54 54 
               <span class="imagetype">{{list3.name}}</span>
55 55 
               <div class="imageindex">

@@ -71,7 +71,7 @@
71 71 
             </div>
72 72 
           </swiper-slide>
73 73 
           <swiper-slide class="slideimg" v-for="(list4, index4) in detail.imageLst4" :key="index4" >
74 
-            <img class="lazyimage" :src="list4.fileurl" preview/>
74 
+            <img class="lazyimage" :src="list4.fileurl" @click="viewpicture4(list4)"/>
75 75 
             <div class="houseindex">
76 76 
               <span class="imagetype">{{list4.name}}</span>
77 77 
               <div class="imageindex">

@@ -93,7 +93,7 @@
93 93 
             </div>
94 94 
           </swiper-slide>
95 95 
           <swiper-slide class="slideimg" v-for="(list5, index5) in detail.imageLst5" :key="index5">
96 
-            <img class="lazyimage" :src="list5.fileurl"  preview/>
96 
+            <img class="lazyimage" :src="list5.fileurl" @click="viewpicture5(list5)"/>
97 97 
             <div class="houseindex">
98 98 
               <span class="imagetype">{{list5.name}}</span>
99 99 
               <div class="imageindex">

@@ -123,7 +123,7 @@
123 123 
       </div>
124 124 
     </div>
125 125 
   <!-- <div class="bigimages"> -->
126 
-   <!-- <big-images v-if="imgLook.state" :fileurl='imgLook.fileurl' @close='imgLook.state=false'></big-images> -->
126 
+   <big-images v-if="imgLook.state" :fileurl='imgLook.fileurl' @close='imgLook.state=false'></big-images>
127 127 
   <!-- </div> -->
128 128 
   </div>
129 129 
 </template>

@@ -131,7 +131,7 @@
131 131 
 <script>
132 132 
 import { mapState, mapActions } from "vuex";
133 133 
 import bottomDrawing from "../../img/bottomdrawing.jpg";
134 
-// import BigImages from '../../components/bigimages.vue'
134 
+import BigImages from '../../components/bigimages.vue'
135 135
136 136 
 export default {
137 137 
   name: "BuildingImage",

@@ -150,15 +150,15 @@ export default {
150 150 
         speed: 500,
151 151 
       },
152 152 
       isactive: false,
153 
-      // imgLook:{
154 
-      //   state:false,
155 
-      //   fileurl:''
156 
-      // }
153 
+      imgLook:{
154 
+        state:false,
155 
+        fileurl:''
156 
+      }
157 157 
     };
158 158 
   },
159 159 
   components: {
160 160 
     "vue-headful": () => import("vue-headful"),
161 
-    // 'BigImages':BigImages,
161 
+    'BigImages':BigImages,
162 162 
   },
163 163 
   computed: {
164 164 
     ...mapState({

@@ -170,7 +170,7 @@ export default {
170 170 
   },
171 171 
   created() {
172 172 
     this.getBuildingimage({ buildingid: this.$route.query.id }).then(() => {
173 
-      this.$previewRefresh()
173 
+      // this.$previewRefresh()
174 174 
       this.showPage = true;
175 175 
       this.lists = this.detail.imageTypeLst;
176 176 
       this.lists.forEach((curr, index) => {

@@ -268,26 +268,26 @@ export default {
268 268 
     this.swiperOption = { ...config };
269 269 
   },
270 270 
   methods: {
271 
-    // viewpicture1(list1){
272 
-    //   this.imgLook.state = true
273 
-    //   this.imgLook.fileurl = list1.fileurl
274 
-    // },
275 
-    // viewpicture2(list2){
276 
-    //   this.imgLook.state = true
277 
-    //   this.imgLook.fileurl = list2.fileurl
278 
-    // },
279 
-    //   viewpicture3(list3){
280 
-    //   this.imgLook.state = true
281 
-    //   this.imgLook.fileurl = list3.fileurl
282 
-    // },
283 
-    //   viewpicture4(list4){
284 
-    //   this.imgLook.state = true
285 
-    //   this.imgLook.fileurl = list4.fileurl
286 
-    // },
287 
-    //   viewpicture5(list5){
288 
-    //   this.imgLook.state = true
289 
-    //   this.imgLook.fileurl = list5.fileurl
290 
-    // },
271 
+    viewpicture1(list1){
272 
+      this.imgLook.state = true
273 
+      this.imgLook.fileurl = list1.fileurl
274 
+    },
275 
+    viewpicture2(list2){
276 
+      this.imgLook.state = true
277 
+      this.imgLook.fileurl = list2.fileurl
278 
+    },
279 
+      viewpicture3(list3){
280 
+      this.imgLook.state = true
281 
+      this.imgLook.fileurl = list3.fileurl
282 
+    },
283 
+      viewpicture4(list4){
284 
+      this.imgLook.state = true
285 
+      this.imgLook.fileurl = list4.fileurl
286 
+    },
287 
+      viewpicture5(list5){
288 
+      this.imgLook.state = true
289 
+      this.imgLook.fileurl = list5.fileurl
290 
+    },
291 291 
     ...mapActions(["getBuildingimage"]),
292 292 
     toggle(ind, detail) {
293 293 
       let list = [];

+ 59
- 60
src/pages/building/perimetertype.vue ファイルの表示 

@@ -3,6 +3,7 @@
3 3 
             <vue-headful title="周边配套"  />
4 4 
           <!-- <div class="mapId">
5 5 
             <el-amap vid="amapDemo" :zoom="zoom" :center="center" id='mapcointainer'></el-amap>
6 
+
6 7 
           </div> -->
7 8 
             <div class="mapId">
8 9 
                 <div id="mapcointainer"></div>

@@ -38,112 +39,110 @@
38 39 
 </template>
39 40
40 41 
 <script>
41 
-
42 42 
 // import { lazyAmapApiLoaderInstanse } from "vue-amap";
43 
-
43 
+// import AMap from "vue-amap";
44 44 
 let map;
45 45 
 let routerParams;
46 
-let marker;
47 46 
 export default {
48 47 
   name: "perimetertype",
49 
-  data(){
50 
-      return{
51 
-        keyword:String,
52 
-        shows:false,
53 
-      }
48 
+  data() {
49 
+    return {
50 
+      keyword: String,
51 
+      shows: false,
52 
+    };
54 53 
   },
55 54 
   components: {
56 55 
     "vue-headful": () => import("vue-headful")
57 56 
   },
58 57 
   created() {
59 
-    // 取到路由带过来的参数
58 
+    // 取到路由带过来的参数
60 59 
     routerParams = this.$route.query;
61 60 
   },
62 61 
   mounted() {
63 
-    this.init();
62 
+    this.init();
64 63 
   },
65 64 
   methods: {
66 65 
     //    ...mapareaActions(["getMap"]),
67 66 
     init() {
68 
-       map = new AMap.Map("mapcointainer", {
67 
+      map = new AMap.Map("mapcointainer", {
69 68 
         resizeEnable: true,
70 69 
         zoom: 15,
71 70 
         center: [routerParams.lng, routerParams.lat],
72 71 
         scrollWheel: false
73 72 
       });
74 
-       AMap.plugin(['AMap.ToolBar','AMap.Scale'],
75 
-         ()=>{
76 
-             map.addControl(new AMap.ToolBar());
77 
-           map.addControl(new AMap.Scale());
78 
-        });
79 
-      marker = new AMap.Marker({
73 
+      AMap.plugin(["AMap.ToolBar", "AMap.Scale"], () => {
74 
+        map.addControl(new AMap.ToolBar());
75 
+        map.addControl(new AMap.Scale());
76 
+      });
77 
+      new AMap.Marker({
80 78 
         position: [routerParams.lng, routerParams.lat],
81 79 
         title: "routerParams.buildingname",
82 80 
         map: map
83 81 
       });
84 82 
       this.searchAround(routerParams.tag);
85 
-        if(routerParams.tag=="学校"){
86 
-          this.shows = 1;
87 
-        }else if(routerParams.tag=="医院"){
88 
-          this.shows = 2;
89 
-        }else if(routerParams.tag=="交通"){
90 
-          this.shows = 3;
91 
-        }else if(routerParams.tag=="商业"){
92 
-          this.shows = 4;
93 
-        }
83 
+      if (routerParams.tag == "学校") {
84 
+        this.shows = 1;
85 
+      } else if (routerParams.tag == "医院") {
86 
+        this.shows = 2;
87 
+      } else if (routerParams.tag == "交通") {
88 
+        this.shows = 3;
89 
+      } else if (routerParams.tag == "商业") {
90 
+        this.shows = 4;
91 
+      }
94 92 
     },
95 93
96 
-    searchAround(keywords){
97 
-        AMap.service(["AMap.PlaceSearch"], ()=> {
94 
+    searchAround(keywords) {
95 
+      AMap.service(["AMap.PlaceSearch"], () => {
98 96 
         var placeSearch = new AMap.PlaceSearch({
99 
-            pageSize: 200, // 单页显示结果条数
100 
-            pageIndex: 1, // 页码
101 
-            type:keywords,
102 
-            map: map, // 展现结果的地图实例
97 
+          pageSize: 200, // 单页显示结果条数
98 
+          pageIndex: 1, // 页码
99 
+          type: keywords,
100 
+          map: map // 展现结果的地图实例
103 101 
         });
104 102 
         //关键字查询
105 103 
         var cpoint = [routerParams.lng, routerParams.lat]; //中心点坐标
106 
-        placeSearch.searchNearBy(keywords, cpoint, 3000, (status, result)=> {
107 
-
108 
-        });
109 
-    });
104 
+        placeSearch.searchNearBy(
105 
+          keywords,
106 
+          cpoint,
107 
+          5000,
108 
+          () => {}
109 
+        );
110 
+      });
110 111 
     },
111 
-    searchContent (val) {
112 
-        map = new AMap.Map("mapcointainer", {
112 
+    searchContent(val) {
113 
+      map = new AMap.Map("mapcointainer", {
113 114 
         resizeEnable: true,
114 115 
         zoom: 15,
115 116 
         center: [routerParams.lng, routerParams.lat],
116 117 
         scrollWheel: false
117 118 
       });
118 
-       AMap.plugin(['AMap.ToolBar','AMap.Scale'],
119 
-         ()=>{
120 
-          map.addControl(new AMap.ToolBar());
121 
-          map.addControl(new AMap.Scale());
122 
-        });
123 
-      marker = new AMap.Marker({
119 
+      AMap.plugin(["AMap.ToolBar", "AMap.Scale"], () => {
120 
+        map.addControl(new AMap.ToolBar());
121 
+        map.addControl(new AMap.Scale());
122 
+      });
123 
+      new AMap.Marker({
124 124 
         position: [routerParams.lng, routerParams.lat],
125 125 
         title: "routerParams.buildingname",
126 126 
         map: map
127 127 
       });
128 
-        this.searchAround(val);
129 
-        if(val=="学校"){
130 
-           this.shows = 1;
131 
-        }else if(val=="医院"){
132 
-         this.shows = 2;
133 
-        }else if(val=="交通"){
134 
-         this.shows = 3;
135 
-        }else if(val=="商业"){
136 
-         this.shows = 4;
137 
-        }
138 
-
139 
-    },
128 
+      this.searchAround(val);
129 
+      if (val == "学校") {
130 
+        this.shows = 1;
131 
+      } else if (val == "医院") {
132 
+        this.shows = 2;
133 
+      } else if (val == "交通") {
134 
+        this.shows = 3;
135 
+      } else if (val == "商业") {
136 
+        this.shows = 4;
137 
+      }
138 
+    }
140 139 
   }
141 140 
 };
142 141 
 </script>
143 142
144 143 
 <style lang="postcss" scoped>
145 
-.to_active{
146 
-    color:rgba(59,153,252,1)!important;
144 
+.to_active {
145 
+  color: rgba(59, 153, 252, 1) !important;
147 146 
 }
148 147 
 .context {
149 148 
   width: 100%;

@@ -154,7 +153,7 @@ export default {
154 153 
   .mapId {
155 154 
     width: 100%;
156 155 
     /* height: 587px; */
157 
-    flex:1;
156 
+    flex: 1;
158 157
159 158 
     #mapcointainer {
160 159 
       width: 100%;

@@ -187,7 +186,7 @@ export default {
187 186
188 187 
         .icontype {
189 188 
           font-size: 16px !important;
190 
-          color: #babdc0 ;
189 
+          color: #babdc0;
191 190 
         }
192 191 
       }
193 192 
     }

+ 6
- 6
src/pages/transferpage/transferpage.vue ファイルの表示 

@@ -2,8 +2,8 @@
2 2 
 <div class="pageback">
3 3 
   <img class="bgimg" :src="TransferPageBg"/>
4 4 
     <div class="pagebackqr">
5 
-       <!-- <img class="pagebackimg" :src="TransferPageQr"> -->
6 
-       <img class="pagebackimg" :src="qjyxQr">
5 
+       <img class="pagebackimg" :src="TransferPageQr">
6 
+       <!-- <img class="pagebackimg" :src="qjyxQr"> -->
7 7 
     </div>
8 8 
     <div class="pagecharacters">
9 9 
       <span class="joinpage">长按关注“千锦荟”公众号</span>

@@ -16,16 +16,16 @@
16 16
17 17 
 <script>
18 18 
 import TransferPageBg from "../../img/transferpagebg.jpg";
19 
-// import TransferPageQr from "../../img/transferpageqr.jpg";
20 
-import qjyxQr from "../../img/qjyxqr.jpg"
19 
+import TransferPageQr from "../../img/transferpageqr.jpg";
20 
+// import qjyxQr from "../../img/qjyxqr.jpg"
21 21
22 22 
 export default {
23 23 
   name: "transferpage",
24 24 
   data() {
25 25 
     return {
26 26 
       TransferPageBg,
27 
-      // TransferPageQr
28 
-      qjyxQr,
27 
+      TransferPageQr
28 
+      // qjyxQr,
29 29 
     };
30 30 
   }
31 31 
 };

+ 4
- 1
vue.config.js ファイルの表示 

@@ -1,4 +1,7 @@
1 1 
 module.exports = {
2 
+  // externals: {
3 
+  //   AMap: 'AMap'
4 
+  // },
2 5 
   baseUrl: './',
3 6 
   css: {
4 7 
     loaderOptions: {
 
@@ -34,5 +37,5 @@ module.exports = {
34 37 
     },
35 38 
     // compress: true,
36 39 
     disableHostCheck: true,   // That solved it
37 
-  }
40 
+  },
38 41 
 }