소스 검색

个案会商放开时间选择,街道选择等,并格式化格式

“hanlingqiang 1 년 전
부모
커밋
efa0993d79
6개의 변경된 파일18234개의 추가작업 그리고 246개의 파일을 삭제
  1. 17882 1
      package-lock.json
  2. 1 1
      package.json
  3. 78 42
      src/views/weibao/views/consultation/index.vue
  4. 159 105
      src/views/weibao/views/consultation/initiateConsultation.vue
  5. 111 94
      src/views/zhulao/views/circle/list.vue
  6. 3 3
      vue.config.js

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 17882 - 1
package-lock.json


+ 1 - 1
package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "axios": "^0.27.2",
-    "crypto-js": "^4.1.1",
     "core-js": "^3.6.5",
+    "crypto-js": "^4.2.0",
     "echarts": "^4.9.0",
     "image-conversion": "^2.1.1",
     "lib-flexible": "^0.3.2",

+ 78 - 42
src/views/weibao/views/consultation/index.vue

@@ -1,22 +1,47 @@
 <template>
   <div>
-    <van-nav-bar title="个案会商" @click-left="$router.back()" left-arrow fixed placeholder safe-area-inset-top />
-    <div class="box" v-if="roleIdStr==22">
+    <van-nav-bar
+      title="个案会商"
+      @click-left="$router.back()"
+      left-arrow
+      fixed
+      placeholder
+      safe-area-inset-top
+    />
+    <div class="box" v-if="roleIdStr == 22">
       <van-tabs v-model="active" @change="changetabs">
         <van-tab title="发起会商">
           <initiateConsultation @changactive="changactive"></initiateConsultation>
         </van-tab>
         <van-tab title="历史会商">
           <div class="casebox">
-            <van-list v-model="loading" :immediate-check="false" :finished="finished" finished-text="没有更多了" @load="onLoad">
-              <div class="list" v-for="item in historyList" :key="item.id" @click="$router.push({path:'/consultation/details',query:{id:item.id}})">
+            <van-list
+              v-model="loading"
+              :immediate-check="false"
+              :finished="finished"
+              finished-text="没有更多了"
+              @load="onLoad"
+            >
+              <div
+                class="list"
+                v-for="item in historyList"
+                :key="item.id"
+                @click="
+                  $router.push({ path: '/consultation/details', query: { id: item.id } })
+                "
+              >
                 <div class="img">
-                  <van-image fit="scale-down" lazy-load :src="getpics(item.pics)" alt="" />
+                  <van-image
+                    fit="scale-down"
+                    lazy-load
+                    :src="getpics(item.pics)"
+                    alt=""
+                  />
                 </div>
                 <div class="text">
-                  <p class="title">会商议题:{{item.name}}</p>
-                  <p class="mes">会商时间:{{item.workDate}}</p>
-                  <p class="date">发起单位:{{item.orgName}}</p>
+                  <p class="title">会商议题:{{ item.name }}</p>
+                  <p class="mes">会商时间:{{ item.workDate }}</p>
+                  <p class="date">发起单位:{{ item.orgName }}</p>
                 </div>
               </div>
             </van-list>
@@ -25,15 +50,26 @@
       </van-tabs>
     </div>
     <div class="casebox2" v-else>
-      <van-list v-model="loading" :immediate-check="false" :finished="finished" finished-text="没有更多了" @load="onLoad">
-        <div class="list" v-for="item in historyList" :key="item.id" @click="$router.push({path:'/consultation/details',query:{id:item.id}})">
+      <van-list
+        v-model="loading"
+        :immediate-check="false"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="onLoad"
+      >
+        <div
+          class="list"
+          v-for="item in historyList"
+          :key="item.id"
+          @click="$router.push({ path: '/consultation/details', query: { id: item.id } })"
+        >
           <div class="img">
             <van-image lazy-load fit="cover" :src="getpics(item.pics)" alt="" />
           </div>
           <div class="text">
-            <p class="title">会商议题:{{item.name}}</p>
-            <p class="mes">会商时间:{{item.workDate}}</p>
-            <p class="date">发起单位:{{item.orgName}}</p>
+            <p class="title">会商议题:{{ item.name }}</p>
+            <p class="mes">会商时间:{{ item.workDate }}</p>
+            <p class="date">发起单位:{{ item.orgName }}</p>
           </div>
         </div>
       </van-list>
@@ -41,16 +77,16 @@
   </div>
 </template>
 <script>
-import { consultationPage } from '../../api/index.js'
-import initiateConsultation from './initiateConsultation.vue'
+import { consultationPage } from "../../api/index.js";
+import initiateConsultation from "./initiateConsultation.vue";
 export default {
   components: { initiateConsultation },
   data() {
     return {
-      bgimg: require('../../assets/newsbg.png'),
-      roleIdStr: JSON.parse(sessionStorage.getItem('userInfo')).roleIdStr,
+      bgimg: require("../../assets/newsbg.png"),
+      roleIdStr: JSON.parse(sessionStorage.getItem("userInfo")).roleIdStr,
       active: 0,
-      value: '',
+      value: "",
       loading: false,
       finished: false,
       planform: {
@@ -63,52 +99,52 @@ export default {
       },
       planformList: [],
       historyList: [],
-    }
+    };
   },
   activated() {
-    this.consultationPage()
+    this.consultationPage();
   },
   methods: {
     onLoad() {
-      this.consultationPage()
+      this.consultationPage();
     },
     changactive(v) {
-      console.log(v)
-      this.active = 1
-      this.historyform.pageNum = 1
-      this.consultationPage()
+      console.log(v);
+      this.active = 1;
+      this.historyform.pageNum = 1;
+      this.consultationPage();
     },
     changetabs() {},
     async consultationPage() {
-      const res = await consultationPage(this.historyform)
-      this.loading = false
+      const res = await consultationPage(this.historyform);
+      this.loading = false;
       if (this.historyform.pageNum == 1) {
-        this.historyList = res.data.records
+        this.historyList = res.data.records;
       } else {
-        this.historyList = this.historyList.concat(res.data.records)
+        this.historyList = this.historyList.concat(res.data.records);
       }
       if (this.historyList.length >= res.data.total) {
-        this.finished = true
+        this.finished = true;
       } else {
-        this.historyform.pageNum++
-        this.finished = false
+        this.historyform.pageNum++;
+        this.finished = false;
       }
     },
     getpics(item) {
-      if (!item) return this.bgimg
-      var url = ''
-      var arr = item.split(',')
+      if (!item) return this.bgimg;
+      var url = "";
+      var arr = item.split(",");
       arr.forEach((item) => {
-        if (item.indexOf('.jpg') || item.indexOf('.png')) {
-          url = arr[0].replace('/cgpimage/', '/cgpimage/240x240/')
+        if (item.indexOf(".jpg") || item.indexOf(".png")) {
+          url = arr[0].replace("/cgpimage/", "/cgpimage/240x240/");
 
-          return
+          return;
         }
-      })
-      return url
+      });
+      return url;
     },
   },
-}
+};
 </script>
 <style lang="scss" scoped>
 .box {
@@ -161,4 +197,4 @@ export default {
     }
   }
 }
-</style>
+</style>

+ 159 - 105
src/views/weibao/views/consultation/initiateConsultation.vue

@@ -5,34 +5,66 @@
         <van-row class="cell">
           <van-col span="6">会商议题:</van-col>
           <van-col span="18">
-            <van-field v-model="form.name" :rules="[{ required: true}]" placeholder="请输入会商议题" />
+            <van-field
+              v-model="form.name"
+              :rules="[{ required: true }]"
+              placeholder="请输入会商议题"
+            />
           </van-col>
         </van-row>
         <van-row class="cell">
           <van-col span="6">会商时间:</van-col>
           <van-col span="18" @click="clickdateshow">
             <!-- {{form.workDate?form.workDate:'请选择'}} -->
-            <van-field v-model="form.workDate" :rules="[{ required: true}]" placeholder="请选择会商时间" disabled />
+            <van-field
+              v-model="form.workDate"
+              :rules="[{ required: true }]"
+              placeholder="请选择会商时间"
+            />
           </van-col>
           <van-popup v-model="dateshow" position="bottom" :style="{ height: '50%' }">
-            <van-datetime-picker @confirm="dateConfirm" @cancel="dateshow=false" v-model="workDate" type="date" :min-date="minDate" :max-date="maxDate" :columns-order="[ 'year','month', 'day']"
-              :formatter="formatter" />
+            <van-datetime-picker
+              @confirm="dateConfirm"
+              @cancel="dateshow = false"
+              v-model="workDate"
+              type="date"
+              :min-date="minDate"
+              :max-date="maxDate"
+              :columns-order="['year', 'month', 'day']"
+              :formatter="formatter"
+            />
           </van-popup>
         </van-row>
         <van-row class="cell">
           <van-col span="6">会商地址:</van-col>
           <van-col span="18">
-            <van-field v-model="form.streetName" @click="clickstreetShow" :rules="[{ required: true}]" placeholder="请选择街道" disabled />
+            <van-field
+              v-model="form.streetName"
+              @click="clickstreetShow"
+              :rules="[{ required: true }]"
+              placeholder="请选择街道"
+            />
           </van-col>
           <!-- <van-col span="18" @click="streetshowPopup">{{form.streetName?form.streetName:'请选择'}}</van-col> -->
           <van-popup v-model="streetShow" position="bottom" :style="{ height: '50%' }">
-            <van-picker default-index="2" show-toolbar :columns="streetList" @confirm="onConfirm" @cancel="streetShow=false" value-key="name" />
+            <van-picker
+              default-index="2"
+              show-toolbar
+              :columns="streetList"
+              @confirm="onConfirm"
+              @cancel="streetShow = false"
+              value-key="name"
+            />
           </van-popup>
         </van-row>
         <van-row class="cell">
           <van-col span="6">详细地址:</van-col>
           <van-col span="18">
-            <van-field v-model="form.address" :rules="[{ required: true}]" placeholder="请输入详细地址" />
+            <van-field
+              v-model="form.address"
+              :rules="[{ required: true }]"
+              placeholder="请输入详细地址"
+            />
           </van-col>
         </van-row>
         <van-row class="cell">
@@ -44,16 +76,27 @@
         <van-row class="cell">
           <van-col span="6">参与单位:</van-col>
           <van-col span="18">
-            <van-field v-model="form.participateOrgName" :rules="[{ required: true}]" @click="ownerShow=true" placeholder="请选择参与单位" disabled />
+            <van-field
+              v-model="form.participateOrgName"
+              :rules="[{ required: true }]"
+              @click="ownerShow = true"
+              placeholder="请选择参与单位"
+            />
             <van-popup v-model="ownerShow" position="bottom" :style="{ height: '50%' }">
               <div class="popup">
                 <div class="btn">
-                  <div @click="ownerShow=false" class="cancle">取消</div>
+                  <div @click="ownerShow = false" class="cancle">取消</div>
                   <div @click="ownerConfirm" class="confirm">确定</div>
                 </div>
                 <van-checkbox-group class="group" v-model="result">
                   <van-cell-group>
-                    <van-cell v-for="(item,index) in orgform" clickable :key="index" :title="item.name" @click="toggle(item,index)">
+                    <van-cell
+                      v-for="(item, index) in orgform"
+                      clickable
+                      :key="index"
+                      :title="item.name"
+                      @click="toggle(item, index)"
+                    >
                       <template #right-icon>
                         <van-checkbox :name="item.name" ref="checkboxes" />
                       </template>
@@ -67,13 +110,24 @@
         <van-row class="cell">
           <van-col span="6">会商内容:</van-col>
           <van-col span="18">
-            <van-field class="textarea" v-model="form.content" :rules="[{ required: true}]" rows="1" type="textarea" placeholder="请输入活动详情" />
+            <van-field
+              class="textarea"
+              v-model="form.content"
+              :rules="[{ required: true }]"
+              rows="1"
+              type="textarea"
+              placeholder="请输入活动详情"
+            />
           </van-col>
         </van-row>
         <vanUploader :text="'图片'" ref="vanimg" @getfileList="getfileList"></vanUploader>
-        <vanUploader :text="'视频'" ref="vanvideo" @getfileList="getfileList"></vanUploader>
+        <vanUploader
+          :text="'视频'"
+          ref="vanvideo"
+          @getfileList="getfileList"
+        ></vanUploader>
       </div>
-      <div style="text-align:center;">
+      <div style="text-align: center">
         <van-button native-type="submit">确 定</van-button>
       </div>
     </van-form>
@@ -86,8 +140,8 @@ import {
   uploadImage,
   getStreetList,
   organizationList,
-} from '../../api/index.js'
-import vanUploader from '../../components/vanUploader.vue'
+} from "../../api/index.js";
+import vanUploader from "../../components/vanUploader.vue";
 export default {
   components: { vanUploader },
   data() {
@@ -103,178 +157,178 @@ export default {
         fileList: [],
       },
       dateshow: false,
-      appendFile: '',
+      appendFile: "",
       workDate: new Date(),
       minDate: new Date(2020, 0, 1),
       maxDate: new Date(),
-      orglist: '',
-      positionSearch: '',
+      orglist: "",
+      positionSearch: "",
       serviceTarget: [],
       childList: [],
-      id: '',
+      id: "",
       orgform: {},
       result: [],
       resultId: [],
       pics: [],
       videos: [],
-    }
+    };
   },
   created() {
-    this.getStreetList()
-    this.organizationDetail()
-    this.organizationList()
+    this.getStreetList();
+    this.organizationDetail();
+    this.organizationList();
   },
   methods: {
     getfileList(v, index) {
       if (index == undefined) {
         if (
-          v.indexOf('.png') != -1 ||
-          v.indexOf('.jpg') != -1 ||
-          v.indexOf('.jpeg') != -1
+          v.indexOf(".png") != -1 ||
+          v.indexOf(".jpg") != -1 ||
+          v.indexOf(".jpeg") != -1
         ) {
-          this.pics.push(v)
+          this.pics.push(v);
         } else {
-          this.videos.push(v)
+          this.videos.push(v);
         }
       } else {
-        if (v == '图片') {
-          this.pics.splice(index, 1)
+        if (v == "图片") {
+          this.pics.splice(index, 1);
         } else {
-          this.videos.splice(index, 1)
+          this.videos.splice(index, 1);
         }
       }
     },
     clickdateshow() {
-      if (this.id) return
-      this.dateshow = !this.dateshow
+      if (this.id) return;
+      this.dateshow = !this.dateshow;
     },
     clickstreetShow() {
-      if (this.id) return
-      this.streetShow = !this.streetShow
+      if (this.id) return;
+      this.streetShow = !this.streetShow;
     },
     async getStreetList() {
-      const res = await getStreetList()
-      this.streetList = res.data
+      const res = await getStreetList();
+      this.streetList = res.data;
     },
     async organizationList() {
-      const res = await organizationList()
-      this.orgform = res.data
+      const res = await organizationList();
+      this.orgform = res.data;
     },
     toggle(item) {
       if (this.result.indexOf(String(item.name)) == -1) {
-        this.result.push(String(item.name))
-        this.resultId.push(String(item.id))
+        this.result.push(String(item.name));
+        this.resultId.push(String(item.id));
       } else {
-        var index = this.result.indexOf(String(item.name))
-        var id = this.resultId.indexOf(String(item.name))
-        this.result.splice(index, 1)
-        this.resultId.splice(id, 1)
+        var index = this.result.indexOf(String(item.name));
+        var id = this.resultId.indexOf(String(item.name));
+        this.result.splice(index, 1);
+        this.resultId.splice(id, 1);
       }
     },
     async organizationDetail() {
-      const res = await organizationDetail({ id: '' })
-      this.orglist = res.data
+      const res = await organizationDetail({ id: "" });
+      this.orglist = res.data;
     },
     onConfirm(value) {
-      this.form.streetName = value.name
-      this.form.areaId = value.id
-      this.streetShow = false
+      this.form.streetName = value.name;
+      this.form.areaId = value.id;
+      this.streetShow = false;
     },
     ownerConfirm() {
-      this.form.participateOrgName = this.result.join(',')
-      this.form.participateOrgId = this.resultId.join(',')
-      this.ownerShow = false
+      this.form.participateOrgName = this.result.join(",");
+      this.form.participateOrgId = this.resultId.join(",");
+      this.ownerShow = false;
     },
     dateConfirm(v) {
-      this.form.workDate = this.timeFormat(v)
-      this.dateshow = false
+      this.form.workDate = this.timeFormat(v);
+      this.dateshow = false;
     },
     onConfirmPicker(value) {
-      this.serviceTarget.push(value.name)
-      this.$set(this.form, 'helpChildren', this.serviceTarget.join(','))
-      this.childList = []
-      this.positionSearch = ''
+      this.serviceTarget.push(value.name);
+      this.$set(this.form, "helpChildren", this.serviceTarget.join(","));
+      this.childList = [];
+      this.positionSearch = "";
     },
     async consultationSave() {
       if (this.pics.length == 0) {
-        this.$toast.fail('请选择至少一张图片')
-        return
+        this.$toast.fail("请选择至少一张图片");
+        return;
       }
-      this.form.pics = this.pics.join(',')
-      this.form.videos = this.videos.join(',')
-      var data = JSON.parse(JSON.stringify(this.form))
-      data.workDate = data.workDate + ' 00:00:00'
-      const res = await consultationSave(data)
-      if (res.code == '0000') {
-        this.$toast.success('成功')
-        this.$emit('changactive', 1)
-        this.form = { pics: [], videos: [] }
-        this.pics = []
-        this.videos = []
-        this.$refs.vanimg.childrenClear()
-        this.$refs.vanvideo.childrenClear()
+      this.form.pics = this.pics.join(",");
+      this.form.videos = this.videos.join(",");
+      var data = JSON.parse(JSON.stringify(this.form));
+      data.workDate = data.workDate + " 00:00:00";
+      const res = await consultationSave(data);
+      if (res.code == "0000") {
+        this.$toast.success("成功");
+        this.$emit("changactive", 1);
+        this.form = { pics: [], videos: [] };
+        this.pics = [];
+        this.videos = [];
+        this.$refs.vanimg.childrenClear();
+        this.$refs.vanvideo.childrenClear();
       }
     },
     showPopup() {
-      this.show = true
+      this.show = true;
     },
     getPositionList() {},
     async afterRead(file) {
-      file.status = 'uploading'
-      file.message = '上传中...'
-      let formDate = new FormData()
+      file.status = "uploading";
+      file.message = "上传中...";
+      let formDate = new FormData();
       //添加入参
-      formDate.append('file', file.file)
-      const res = await uploadImage(formDate)
-      if (res.code == '0000') {
-        file.status = 'success'
-        file.message = '成功'
+      formDate.append("file", file.file);
+      const res = await uploadImage(formDate);
+      if (res.code == "0000") {
+        file.status = "success";
+        file.message = "成功";
         this.form.fileList.push({
           url: res.data,
           type: file.file.type,
-        })
+        });
         // 上传图片 设置col高度
         if (this.form.fileList.length % 2 == 0) {
-          var index = 3.2 * (this.form.fileList.length / 2 + 1) + 'rem'
-          this.$refs.boxlist.style.height = index
+          var index = 3.2 * (this.form.fileList.length / 2 + 1) + "rem";
+          this.$refs.boxlist.style.height = index;
         }
       } else {
-        file.status = 'failed'
-        file.message = '上传失败'
+        file.status = "failed";
+        file.message = "上传失败";
       }
     },
     deleteUploader(v, index) {
-      console.log(index)
-      this.form.fileList.splice(index.index, 1)
+      console.log(index);
+      this.form.fileList.splice(index.index, 1);
     },
     formatter(type, val) {
-      if (type === 'year') {
-        return val + '年'
+      if (type === "year") {
+        return val + "年";
       }
-      if (type === 'month') {
-        return val + '月'
+      if (type === "month") {
+        return val + "月";
       }
-      if (type === 'day') {
-        return val + '日'
+      if (type === "day") {
+        return val + "日";
       }
-      return val
+      return val;
     },
     timeFormat(time) {
       // 时间格式化 2019-09-08
-      let year = time.getFullYear()
-      let month = time.getMonth() + 1
+      let year = time.getFullYear();
+      let month = time.getMonth() + 1;
       if (month < 10) {
-        month = '0' + month
+        month = "0" + month;
       }
 
-      let day = time.getDate()
+      let day = time.getDate();
       if (day < 10) {
-        day = '0' + day
+        day = "0" + day;
       }
-      return year + '-' + month + '-' + day
+      return year + "-" + month + "-" + day;
     },
   },
-}
+};
 </script>
 <style lang="scss" scoped>
 .case {
@@ -411,4 +465,4 @@ export default {
     font-weight: bold;
   }
 }
-</style>
+</style>

+ 111 - 94
src/views/zhulao/views/circle/list.vue

@@ -1,107 +1,125 @@
 <template>
   <div>
-    <van-nav-bar title="商户列表" @click-left="$router.back()" left-arrow fixed placeholder safe-area-inset-top />
+    <van-nav-bar
+      title="商户列表"
+      @click-left="$router.back()"
+      left-arrow
+      fixed
+      placeholder
+      safe-area-inset-top
+    />
     <div class="page_list">
-        <div v-for="(item,index) in merList" :key="index">
-            <div class="item_bg" @click="detailTap(item.id)">
-                <div class="top_bg">
-                    <div class="name">{{item.name}}</div>
-                    <div class="distance_bg">
-                    <van-image class="distance_icon" :src="require('../../assets/images/elderly/location.png')" />
-                    <span class="dis_text">{{item.distance| distanceConversion}}</span>
-                    </div>
-                </div>
-                <div class="judge_bg">
-                    <div  v-for="(starItem,starIndex) in starTotal" :key="starIndex">
-                        <van-image class="star_icon" :src="item.score > starIndex ? require('../../assets/images/elderly/xx.png') : require('../../assets/images/elderly/collection.png')" />
-                    </div>
-                </div>
-                <div class="address_bg">
-                    <van-image class="location_icon" :src="require('../../assets/images/elderly/icondistance.png')" />
-                    <div>{{item.detailedAddress}}</div>
-                </div>
+      <div v-for="(item, index) in merList" :key="index">
+        <div class="item_bg" @click="detailTap(item.id)">
+          <div class="top_bg">
+            <div class="name">{{ item.name }}</div>
+            <div class="distance_bg">
+              <van-image
+                class="distance_icon"
+                :src="require('../../assets/images/elderly/location.png')"
+              />
+              <span class="dis_text">{{ item.distance | distanceConversion }}</span>
             </div>
+          </div>
+          <div class="judge_bg">
+            <div v-for="(starItem, starIndex) in starTotal" :key="starIndex">
+              <van-image
+                class="star_icon"
+                :src="
+                  item.score > starIndex
+                    ? require('../../assets/images/elderly/xx.png')
+                    : require('../../assets/images/elderly/collection.png')
+                "
+              />
+            </div>
+          </div>
+          <div class="address_bg">
+            <van-image
+              class="location_icon"
+              :src="require('../../assets/images/elderly/icondistance.png')"
+            />
+            <div>{{ item.detailedAddress }}</div>
+          </div>
         </div>
+      </div>
     </div>
   </div>
 </template>
 <script>
-import { serverAPI } from '../../../../utils/vaildInterfacefn.js'
-import {institutions_search} from '../../api/index.js'
+import { serverAPI } from "../../../../utils/vaildInterfacefn.js";
+import { institutions_search } from "../../api/index.js";
 export default {
-    data() {
-        return {
-            merList:[],
-            starTotal:5,
-            radius:0,
-            longitude:'',
-            latitude:'',
-            categoryId:''
-
-        }
-    },
-    filters: {
-      distanceConversion(num) {
-        var dis
-        if (num >= 5000) {
-            dis = '>5km'
-        } else if (num >= 1000 && num < 10000) {
-            dis = (num / 1000).toFixed(2) + 'km'
-        } else {
-            dis = num + 'm'
-        }
-        return dis
+  data() {
+    return {
+      merList: [],
+      starTotal: 5,
+      radius: 0,
+      longitude: "",
+      latitude: "",
+      categoryId: "",
+    };
+  },
+  filters: {
+    distanceConversion(num) {
+      var dis;
+      if (num >= 5000) {
+        dis = ">5km";
+      } else if (num >= 1000 && num < 10000) {
+        dis = (num / 1000).toFixed(2) + "km";
+      } else {
+        dis = num + "m";
       }
+      return dis;
     },
-    mounted() {
+  },
+  mounted() {},
+  created() {
+    this.longitude = this.$route.query.longitude;
+    this.latitude = this.$route.query.latitude;
+    this.radius = this.$route.query.radius;
+    this.categoryId = this.$route.query.categoryId;
+    this.getInstitutions_search();
+  },
+  methods: {
+    async getInstitutions_search() {
+      //自己平台接口调用方式;
+      // var institutionSearch = await institutions_search({
+      //   radius: this.radius,
+      //   institutionalTypeList: this.categoryId,
+      //   lat: this.latitude,
+      //   lng: this.longitude,
+      //   pageNum: 1,
+      //   pageSize: 10,
+      // });
+      // 爱山东平台接口调用方式
+      var institutionSearch = await serverAPI(
+        "zpsmzjjgss",
+        {
+          radius: this.radius,
+          institutionalTypeList: this.categoryId,
+          lat: this.latitude,
+          lng: this.longitude,
+          pageNum: 1,
+          pageSize: 10,
+        },
+        false
+      );
+
+      let merListTemp = [];
+      institutionSearch.rows.forEach((e) => {
+        // e.distance = util.getDistance(this.data.latitude,this.data.longitude,e.lat,e.lng)
+        e.score = 4;
+        merListTemp.push(e);
+      });
+      this.merList = merListTemp;
     },
-    created() {
-        this.longitude = this.$route.query.longitude
-        this.latitude = this.$route.query.latitude
-        this.radius = this.$route.query.radius
-        this.categoryId = this.$route.query.categoryId
-        this.getInstitutions_search()
+    detailTap(id) {
+      console.log("商户id");
+      console.log(id);
+      this.$router.push({ path: "/detail", query: { institutionsId: id } });
     },
-    methods: {
-        async getInstitutions_search() {
-        // 自己平台接口调用方式 
-          // var institutionSearch = await institutions_search({
-          //     "radius": this.radius,
-          //     "institutionalTypeList":this.categoryId,
-          //     "lat": this.latitude,
-          //     "lng": this.longitude,
-          //     "pageNum":1,
-          //     'pageSize':10
-          // })
-          // 爱山东平台接口调用方式 
-          var institutionSearch = await serverAPI(
-            'zpsmzjjgss',
-            {
-              radius: this.radius,
-              institutionalTypeList:this.categoryId,
-              lat: this.latitude,
-              lng: this.longitude,
-              pageNum:1,
-              pageSize:10
-            },
-            false
-          )
-
-            let merListTemp=[]
-            institutionSearch.rows.forEach((e) => {
-                // e.distance = util.getDistance(this.data.latitude,this.data.longitude,e.lat,e.lng)
-                e.score = 4
-                merListTemp.push(e)
-            });
-           this.merList =merListTemp
-        },
-        detailTap(id) {
-            console.log('商户id')
-            console.log(id)
-            this.$router.push({path:'/detail',query:{institutionsId:id}})
-        }
-    }
-}
+  },
+};
 </script>
 <style lang="scss" scoped>
 .page_list {
@@ -127,11 +145,11 @@ export default {
   align-items: center;
 }
 .name {
-  flex: .8;
+  flex: 0.8;
   font-size: 30px;
 }
 .distance_bg {
-  flex: .2;
+  flex: 0.2;
 }
 .distance_icon {
   width: 30px;
@@ -171,5 +189,4 @@ export default {
   height: 30px;
   margin-right: 6px;
 }
-
-</style>
+</style>

+ 3 - 3
vue.config.js

@@ -15,7 +15,7 @@ function getEntry() {
                 template: "public/index.html",
                 // 在 dist/index.html 的输出
                 filename: "index.html",
-                title: projectname,
+                title: projectname == 'weibao' ? '未成年人保护' : '助老',
                 chunks: ["chunk-vendors", "chunk-common", "index"]
             }
         };
@@ -66,8 +66,8 @@ module.exports = {
         },
         proxy: {
             [process.env.VUE_APP_BASE_API]: {
-                // target: 'https://web.poteviohealth.com/pmgw/',
-                target: 'https://test.poteviohealth.com/pmgw/',
+                target: 'https://web.poteviohealth.com/pmgw/',
+                // target: 'https://test.poteviohealth.com/pmgw/',
                 // target: 'http://localhost:12017/',
                 changeOrigin: true,
                 secure: false,

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.