wujingjing
2024-08-12 a2410e6dd7dfe33133e709e43b06b3bb7852d4b1
地图
已修改10个文件
已添加5个文件
127 ■■■■ 文件已修改
miniprogram/components/chat-components/summary/map/map.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/components/chat-components/summary/map/map.scss 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/components/chat-components/summary/map/map.ts 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/components/chat-components/summary/map/map.wxml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/components/chat-components/summary/summaryWrapper.json 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/components/chat-components/summary/summaryWrapper.ts 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/components/chat-components/summary/summaryWrapper.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/components/chat-components/summary/testData.ts 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/libs/amap/amap-wx.130.js 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/login/login.ts 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/my/my.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/my/my.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/question/question.ts 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/pages/question/question.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/utils/http.ts 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
miniprogram/components/chat-components/summary/map/map.json
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,4 @@
{
  "component": true,
  "usingComponents": {}
}
miniprogram/components/chat-components/summary/map/map.scss
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1 @@
/* components/chat-components/summary/map/map.wxss */
miniprogram/components/chat-components/summary/map/map.ts
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
// components/chat-components/summary/map/map.ts
import { uuid } from '@/utils/uuid';
// var amapFile = require('@/libs/amap/amap-wx.130.js');//如:..­/..­/libs/amap-wx.js
Component({
  /**
   * ç»„件的属性列表
   */
  properties: {
    data: Object
  },
  /**
   * ç»„件的初始数据
   */
  data: {
    mapId: uuid()
  },
  /**
   * ç»„件的方法列表
   */
  methods: {
  },
  lifetimes: {
    ready() {
      setTimeout(() => {
        // var myAmapFun = new amapFile.AMapWX({key:'3627ed9deaac2622e26a7169f0c36b1b'});
        // return;
        let mapId = this.data.mapId;
        let mapContext = wx.createMapContext(mapId, this)
        if (this.data.data.maxx == null || this.data.data.maxy == null || this.data.data.minx == null || this.data.data.miny == null) {
          return;
        }
        mapContext.setBoundary({
          southwest: {
            longitude: this.data.data.minx,
            latitude: this.data.data.miny,
          },
          northeast: {
            longitude: this.data.data.maxx,
            latitude: this.data.data.maxy
          }
        })
      }, 300);
    }
  }
})
miniprogram/components/chat-components/summary/map/map.wxml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1 @@
<map id="{{mapId}}"></map>
miniprogram/components/chat-components/summary/summaryWrapper.json
@@ -6,7 +6,9 @@
    "deviceLastValue":"deviceLastValue/deviceLastValue",
    "recordsetTable":"recordsetTable/recordsetTable",
    "webUrl":"webUrl/webUrl",
    "amisPage":"amisPage/amisPage"
    "amisPage":"amisPage/amisPage",
    "mapCom":"map/map"
miniprogram/components/chat-components/summary/summaryWrapper.ts
@@ -1,5 +1,5 @@
import { chatComProps } from "../common";
import { ALARM_TEST_DATA, LAST_VALUE_TEST_DATA, SUMMARY_TEST_DATA,ALL_VALUE_TEST_DATA, HTML_URL_TEST_DATA } from "./testData";
import { ALARM_TEST_DATA, LAST_VALUE_TEST_DATA, SUMMARY_TEST_DATA,ALL_VALUE_TEST_DATA, HTML_URL_TEST_DATA, MAP_TEST_DATA } from "./testData";
import { SummaryAnswerType } from "./types";
// components/chat-components/summary/summaryWrapper.ts
@@ -21,7 +21,7 @@
   */
  data: {
    summaryList: [],
    testData: ALL_VALUE_TEST_DATA,
    testData: MAP_TEST_DATA,
    SummaryAnswerType
  },
miniprogram/components/chat-components/summary/summaryWrapper.wxml
@@ -7,6 +7,6 @@
    <deviceLastValue wx:elif="{{item.type===SummaryAnswerType.DeviceLastValue}}" data="{{item}}"></deviceLastValue>
    <webUrl wx:elif="{{item.type===SummaryAnswerType.Url}}" data="{{item}}"></webUrl>
    <amisPage wx:elif="{{item.type===SummaryAnswerType.AmisPage}}" data="{{item}}"></amisPage>
    <mapCom wx:elif="{{item.type===SummaryAnswerType.Map}}" data="{{item}}"></mapCom>
  </view>
</view>
miniprogram/components/chat-components/summary/testData.ts
@@ -2870,10 +2870,13 @@
  "full_url": false
}]
export const MAP_TEST_DATA = [{ "maxx": 122.12, "maxy": 31.53, "minx": 120.51, "miny": 30.4, "type": "map", "title": "地图测试", "values": [{ "posx": 121, "posy": 31, "type": "point", "color": "FF0000", "title": "五一广场压力:200" }] }]
// æ±‡æ€»æ•°æ®
export const ALL_VALUE_TEST_DATA = [
  ...HTML_URL_TEST_DATA,
  ...SUMMARY_TEST_DATA,
  ...ALARM_TEST_DATA,
  ...LAST_VALUE_TEST_DATA,
  ...MAP_TEST_DATA
]
miniprogram/libs/amap/amap-wx.130.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
function AMapWX(a){this.key=a.key;this.requestConfig={key:a.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};this.MeRequestConfig={key:a.key,serviceName:"https://restapi.amap.com/rest/me"}}
AMapWX.prototype.getWxLocation=function(a,b){wx.getLocation({type:"gcj02",success:function(c){c=c.longitude+","+c.latitude;wx.setStorage({key:"userLocation",data:c});b(c)},fail:function(c){wx.getStorage({key:"userLocation",success:function(d){d.data&&b(d.data)}});a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
AMapWX.prototype.getMEKeywordsSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.keywords&&(d.keywords=b.keywords);b.city&&(d.city=b.city);b.filter&&(d.filter=b.filter);b.sortrule&&(d.sortrule=b.sortrule);b.pageNum&&(d.pageNum=b.pageNum);b.pageSize&&(d.pageSize=b.pageSize);b.sig&&(d.sig=
b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/local",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
AMapWX.prototype.getMEIdSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.id&&(d.id=b.id);b.sig&&(d.sig=b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/id",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&
0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
AMapWX.prototype.getMEPolygonSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.keywords&&(d.keywords=b.keywords);b.polygon&&(d.polygon=b.polygon);b.filter&&(d.filter=b.filter);b.sortrule&&(d.sortrule=b.sortrule);b.pageNum&&(d.pageNum=b.pageNum);b.pageSize&&(d.pageSize=b.pageSize);
b.sig&&(d.sig=b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/polygon",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
AMapWX.prototype.getMEaroundSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.keywords&&(d.keywords=b.keywords);b.center&&(d.center=b.center);b.radius&&(d.radius=b.radius);b.filter&&(d.filter=b.filter);b.sortrule&&(d.sortrule=b.sortrule);b.pageNum&&(d.pageNum=b.pageNum);b.pageSize&&
(d.pageSize=b.pageSize);b.sig&&(d.sig=b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/around",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
AMapWX.prototype.getGeo=function(a){var b=this.requestConfig,c=a.options;b={key:this.key,extensions:"all",s:b.s,platform:b.platform,appname:this.key,sdkversion:b.sdkversion,logversion:b.logversion};c.address&&(b.address=c.address);c.city&&(b.city=c.city);c.batch&&(b.batch=c.batch);c.sig&&(b.sig=c.sig);wx.request({url:"https://restapi.amap.com/v3/geocode/geo",data:b,method:"GET",header:{"content-type":"application/json"},success:function(d){(d=d.data)&&d.status&&"1"===d.status?a.success(d):a.fail({errCode:"0",
errMsg:d})},fail:function(d){a.fail({errCode:"0",errMsg:d.errMsg||""})}})};
AMapWX.prototype.getRegeo=function(a){function b(d){var e=c.requestConfig;wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:c.key,location:d,extensions:"all",s:e.s,platform:e.platform,appname:c.key,sdkversion:e.sdkversion,logversion:e.logversion},method:"GET",header:{"content-type":"application/json"},success:function(g){if(g.data.status&&"1"==g.data.status){g=g.data.regeocode;var h=g.addressComponent,f=[],k=g.roads[0].name+"\u9644\u8fd1",m=d.split(",")[0],n=d.split(",")[1];if(g.pois&&
g.pois[0]){k=g.pois[0].name+"\u9644\u8fd1";var l=g.pois[0].location;l&&(m=parseFloat(l.split(",")[0]),n=parseFloat(l.split(",")[1]))}h.provice&&f.push(h.provice);h.city&&f.push(h.city);h.district&&f.push(h.district);h.streetNumber&&h.streetNumber.street&&h.streetNumber.number?(f.push(h.streetNumber.street),f.push(h.streetNumber.number)):f.push(g.roads[0].name);f=f.join("");a.success([{iconPath:a.iconPath,width:a.iconWidth,height:a.iconHeight,name:f,desc:k,longitude:m,latitude:n,id:0,regeocodeData:g}])}else a.fail({errCode:g.data.infocode,
errMsg:g.data.info})},fail:function(g){a.fail({errCode:"0",errMsg:g.errMsg||""})}})}var c=this;a.location?b(a.location):c.getWxLocation(a,function(d){b(d)})};
AMapWX.prototype.getWeather=function(a){function b(g){var h="base";a.type&&"forecast"==a.type&&(h="all");wx.request({url:"https://restapi.amap.com/v3/weather/weatherInfo",data:{key:d.key,city:g,extensions:h,s:e.s,platform:e.platform,appname:d.key,sdkversion:e.sdkversion,logversion:e.logversion},method:"GET",header:{"content-type":"application/json"},success:function(f){if(f.data.status&&"1"==f.data.status)if(f.data.lives){if((f=f.data.lives)&&0<f.length){f=f[0];var k={city:{text:"\u57ce\u5e02",data:f.city},
weather:{text:"\u5929\u6c14",data:f.weather},temperature:{text:"\u6e29\u5ea6",data:f.temperature},winddirection:{text:"\u98ce\u5411",data:f.winddirection+"\u98ce"},windpower:{text:"\u98ce\u529b",data:f.windpower+"\u7ea7"},humidity:{text:"\u6e7f\u5ea6",data:f.humidity+"%"}};k.liveData=f;a.success(k)}}else f.data.forecasts&&f.data.forecasts[0]&&a.success({forecast:f.data.forecasts[0]});else a.fail({errCode:f.data.infocode,errMsg:f.data.info})},fail:function(f){a.fail({errCode:"0",errMsg:f.errMsg||""})}})}
function c(g){wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:d.key,location:g,extensions:"all",s:e.s,platform:e.platform,appname:d.key,sdkversion:e.sdkversion,logversion:e.logversion},method:"GET",header:{"content-type":"application/json"},success:function(h){if(h.data.status&&"1"==h.data.status){h=h.data.regeocode;if(h.addressComponent)var f=h.addressComponent.adcode;else h.aois&&0<h.aois.length&&(f=h.aois[0].adcode);b(f)}else a.fail({errCode:h.data.infocode,errMsg:h.data.info})},
fail:function(h){a.fail({errCode:"0",errMsg:h.errMsg||""})}})}var d=this,e=d.requestConfig;a.city?b(a.city):d.getWxLocation(a,function(g){c(g)})};
AMapWX.prototype.getPoiAround=function(a){function b(e){e={key:c.key,location:e,s:d.s,platform:d.platform,appname:c.key,sdkversion:d.sdkversion,logversion:d.logversion};a.querytypes&&(e.types=a.querytypes);a.querykeywords&&(e.keywords=a.querykeywords);wx.request({url:"https://restapi.amap.com/v3/place/around",data:e,method:"GET",header:{"content-type":"application/json"},success:function(g){if(g.data.status&&"1"==g.data.status){if((g=g.data)&&g.pois){for(var h=[],f=0;f<g.pois.length;f++){var k=0==
f?a.iconPathSelected:a.iconPath;h.push({latitude:parseFloat(g.pois[f].location.split(",")[1]),longitude:parseFloat(g.pois[f].location.split(",")[0]),iconPath:k,width:22,height:32,id:f,name:g.pois[f].name,address:g.pois[f].address})}a.success({markers:h,poisData:g.pois})}}else a.fail({errCode:g.data.infocode,errMsg:g.data.info})},fail:function(g){a.fail({errCode:"0",errMsg:g.errMsg||""})}})}var c=this,d=c.requestConfig;a.location?b(a.location):c.getWxLocation(a,function(e){b(e)})};
AMapWX.prototype.getStaticmap=function(a){function b(e){c.push("location="+e);a.zoom&&c.push("zoom="+a.zoom);a.size&&c.push("size="+a.size);a.scale&&c.push("scale="+a.scale);a.markers&&c.push("markers="+a.markers);a.labels&&c.push("labels="+a.labels);a.paths&&c.push("paths="+a.paths);a.traffic&&c.push("traffic="+a.traffic);e="https://restapi.amap.com/v3/staticmap?"+c.join("&");a.success({url:e})}var c=[];c.push("key="+this.key);var d=this.requestConfig;c.push("s="+d.s);c.push("platform="+d.platform);
c.push("appname="+d.appname);c.push("sdkversion="+d.sdkversion);c.push("logversion="+d.logversion);a.location?b(a.location):this.getWxLocation(a,function(e){b(e)})};
AMapWX.prototype.getInputtips=function(a){var b=Object.assign({},this.requestConfig);a.location&&(b.location=a.location);a.keywords&&(b.keywords=a.keywords);a.type&&(b.type=a.type);a.city&&(b.city=a.city);a.citylimit&&(b.citylimit=a.citylimit);wx.request({url:"https://restapi.amap.com/v3/assistant/inputtips",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.tips&&a.success({tips:c.data.tips})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||
""})}})};
AMapWX.prototype.getDrivingRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);a.strategy&&(b.strategy=a.strategy);a.waypoints&&(b.waypoints=a.waypoints);a.avoidpolygons&&(b.avoidpolygons=a.avoidpolygons);a.avoidroad&&(b.avoidroad=a.avoidroad);wx.request({url:"https://restapi.amap.com/v3/direction/driving",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&a.success({paths:c.data.route.paths,
taxi_cost:c.data.route.taxi_cost||""})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
AMapWX.prototype.getWalkingRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);wx.request({url:"https://restapi.amap.com/v3/direction/walking",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&a.success({paths:c.data.route.paths})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
AMapWX.prototype.getTransitRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);a.strategy&&(b.strategy=a.strategy);a.city&&(b.city=a.city);a.cityd&&(b.cityd=a.cityd);wx.request({url:"https://restapi.amap.com/v3/direction/transit/integrated",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&(c=c.data.route,a.success({distance:c.distance||"",taxi_cost:c.taxi_cost||
"",transits:c.transits}))},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
AMapWX.prototype.getRidingRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);wx.request({url:"https://restapi.amap.com/v3/direction/riding",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&a.success({paths:c.data.route.paths})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};module.exports.AMapWX=AMapWX;
miniprogram/pages/login/login.ts
@@ -83,7 +83,6 @@
        });
        return;
      }
      console.log(this.data.phoneNumber);
      const isValid = verifyPhone(this.data.phoneNumber)
      console.log(isValid);
      
miniprogram/pages/my/my.js
@@ -13,7 +13,7 @@
  methods:{
    logout(){
      clearStorage();
      wx.redirectTo({
      wx.reLaunch({
        url: '/pages/login/login',
      })
    }
@@ -21,6 +21,10 @@
  pageLifetimes: {
    show() {
      this.setData({
        userName:getStorage('username'),
        phoneNumber:app.globalData.user.phoneNum
      })
      if (typeof this.getTabBar === 'function' &&
        this.getTabBar()) {
        this.getTabBar().setData({
miniprogram/pages/my/my.wxml
@@ -4,7 +4,7 @@
  <view>
    <view class="flex-items-center">
      <text class="ywicon icon-morentouxiang bg-gray-300 rounded-full text-gray-500 mr-20" style="font-size: 73rpx;"></text>
      <text class="font25 font-bold">{{userName}}</text>
      <text class="font32 font-bold">{{userName}}</text>
    </view>
    <fui-list marginTop="40">
      <fui-list-cell highlight="{{false}}">账号名
miniprogram/pages/question/question.ts
@@ -7,10 +7,6 @@
  roleImageMap
} from "@/model/chat/types";
import {
  CHAT_GROUP_DATA,
  TEST_DATA
} from "./testData";
import {
  TAB_BAR_HEIGHT
} from "@/custom-tab-bar/constants";
import {
@@ -502,6 +498,11 @@
    this.getHistoryGroupData();
    this.getSampleList();
  },
  onShow(){
    this.setData({
      userName:getStorage('username')
    })
  },
  async onRouteDone() {
    const sectionAId = app.globalData.sectionAId;
@@ -530,6 +531,7 @@
    app.globalData.sectionAId = '';
    app.globalData.sectionB = null;
  }
  // pageLifetimes: {
  //   show() {
miniprogram/pages/question/question.wxml
@@ -64,7 +64,7 @@
      <view class="p-15 flex flex-col justify-between" style="background-color: #e8f0fd;">
        <view class="flex-items-center">
          <text class="ywicon icon-morentouxiang bg-gray-300 rounded-full font60 text-gray-500 mr-20"></text>
          <text class="font25 font-bold">{{userName}}</text>
          <text class="font27 font-bold">{{userName}}</text>
        </view>
        <view class="flex-items-center justify-between mt-20">
          <van-button class="" color="#000000" custom-style="font-size:20rpx;height:50rpx" round size="small" icon="plus" bind:tap="newChatRoomClick">新建聊天室</van-button>
miniprogram/utils/http.ts
@@ -20,7 +20,7 @@
  if (!session) {
    // æ—¢ç„¶ç”¨æˆ·éœ€è¦é‡æ–°è¿›è¡Œç™»å½•,就需要把之前用户存储的信息(过期的 token) è¿›è¡Œæ¸…除
    clearStorage()
    wx.redirectTo({
    wx.reLaunch({
      url: '/pages/login/login'
    })
  }