diff --git a/app.js b/app.js index 1ed57c4..2fb2154 100644 --- a/app.js +++ b/app.js @@ -2,9 +2,6 @@ App({ onLaunch() { // 展示本地存储能力 - const logs = wx.getStorageSync('logs') || [] - logs.unshift(Date.now()) - wx.setStorageSync('logs', logs) // 登录 wx.login({ diff --git a/app.json b/app.json index fb804a6..1b0f381 100644 --- a/app.json +++ b/app.json @@ -1,8 +1,21 @@ { "pages":[ "pages/index/index", - "pages/logs/logs" + "pages/ltjm/ltjm", + "pages/liaotian/liaotian" ], + "tabBar":{ + "color": "#f00", + "selectedColor": "#0f0", + "backgroundColor": "#fff", + "list":[{ + "pagePath": "pages/index/index", + "text": "首页" + },{ + "pagePath": "pages/liaotian/liaotian", + "text": "聊天" + }] + }, "window":{ "backgroundTextStyle":"light", "navigationBarBackgroundColor": "#fff", diff --git a/images/定位.png b/images/定位.png new file mode 100644 index 0000000..77a40b1 Binary files /dev/null and b/images/定位.png differ diff --git a/package.json b/package.json index f4ed081..963ce56 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "dependencies": { - "@vant/weapp": "^1.6.8" + "@vant/weapp": "^1.6.8", + "tim-wx-sdk": "^2.10.1" } } diff --git a/pages/index/index.js b/pages/index/index.js index fbdc216..0eff0a9 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -1,7 +1,53 @@ // index.js // 获取应用实例 const app = getApp() - +import im from "../../utils/im.js" Page({ - + data: { + longitude: "117.85", + latitude: "36.3950", + map: '', + markes: [{ + id: 1, + longitude: "117.85", + latitude: "36.3950", + iconPath: "../../images/定位.png", + width:50, + height: 50 + + }, + { + id: 1, + longitude: "117.86", + latitude: "36.3950", + iconPath: "../../images/定位.png", + width:50, + height: 50, + callout:{ + content:"添加好友", + color: "#fff", + bgColor: "#f00", + padding:5, + display: 'ALWAYS' + } + + }, + { + id: 1, + longitude: "117.85", + latitude: "36.3850", + iconPath: "../../images/定位.png", + width:50, + height: 50 + + }] + }, + onLoad() { + // console.log("load") + // this.setData({ + // map: wx.createMapContext('map') + // }) + console.log(im) + // console.log(this.data.map) + } }) diff --git a/pages/index/index.json b/pages/index/index.json index 8835af0..a66c7ff 100644 --- a/pages/index/index.json +++ b/pages/index/index.json @@ -1,3 +1,4 @@ { - "usingComponents": {} + "usingComponents": {}, + "navigationBarTitleText":"首页" } \ No newline at end of file diff --git a/pages/index/index.scss b/pages/index/index.scss index a886d4b..bd177ee 100644 --- a/pages/index/index.scss +++ b/pages/index/index.scss @@ -1,7 +1,3 @@ -.map{ - width: 100%; - height: 100%; -} page{ width: 100%; height: 100%; @@ -9,4 +5,8 @@ page{ .container{ width: 100%; height: 100%; + .map{ + width: 100%; + height: 100%; + } } \ No newline at end of file diff --git a/pages/index/index.wxml b/pages/index/index.wxml index f473bea..a4d9c4a 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 91ac0d3..fadd7ea 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1,8 +1,3 @@ -.map { - width: 100%; - height: 100%; -} - page { width: 100%; height: 100%; @@ -12,3 +7,8 @@ page { width: 100%; height: 100%; } + +.container .map { + width: 100%; + height: 100%; +} diff --git a/pages/liaotian/liaotian.js b/pages/liaotian/liaotian.js new file mode 100644 index 0000000..53b4d02 --- /dev/null +++ b/pages/liaotian/liaotian.js @@ -0,0 +1,7 @@ +Page({ + tiaozhuan(){ + wx.navigateTo({ + url:"/pages/ltjm/ltjm" + }) + } +}) \ No newline at end of file diff --git a/pages/liaotian/liaotian.json b/pages/liaotian/liaotian.json new file mode 100644 index 0000000..c8777fb --- /dev/null +++ b/pages/liaotian/liaotian.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "聊天" +} \ No newline at end of file diff --git a/pages/liaotian/liaotian.scss b/pages/liaotian/liaotian.scss new file mode 100644 index 0000000..46bd797 --- /dev/null +++ b/pages/liaotian/liaotian.scss @@ -0,0 +1,37 @@ +page{ +} +.box{ + width: 750rpx; + padding: 23rpx; + overflow: hidden; + box-sizing: border-box; + .user{ + box-sizing: border-box; + width: 704rpx; + height: 131rpx; + // background-color: #0f0; + display: flex; + border-bottom: 1rpx solid #EEEEEE; + align-items: center; + .head{ + width: 84rpx; + height: 84rpx; + border-radius: 10rpx; + margin-right: 18rpx; + background-color: #0f0; + } + .info{ + display: flex; + flex-direction: column; + justify-content: space-around; + .name{ + font-size: 30rpx; + color:#333; + } + .text{ + font-size: 20rpx; + color: #999; + } + } + } +} diff --git a/pages/liaotian/liaotian.wxml b/pages/liaotian/liaotian.wxml new file mode 100644 index 0000000..cc2be73 --- /dev/null +++ b/pages/liaotian/liaotian.wxml @@ -0,0 +1,9 @@ + + + + + name + texttexttext + + + \ No newline at end of file diff --git a/pages/liaotian/liaotian.wxss b/pages/liaotian/liaotian.wxss new file mode 100644 index 0000000..4522b21 --- /dev/null +++ b/pages/liaotian/liaotian.wxss @@ -0,0 +1,39 @@ +.box { + width: 750rpx; + padding: 23rpx; + overflow: hidden; + box-sizing: border-box; +} + +.box .user { + box-sizing: border-box; + width: 704rpx; + height: 131rpx; + display: flex; + border-bottom: 1rpx solid #EEEEEE; + align-items: center; +} + +.box .user .head { + width: 84rpx; + height: 84rpx; + border-radius: 10rpx; + margin-right: 18rpx; + background-color: #0f0; +} + +.box .user .info { + display: flex; + flex-direction: column; + justify-content: space-around; +} + +.box .user .info .name { + font-size: 30rpx; + color: #333; +} + +.box .user .info .text { + font-size: 20rpx; + color: #999; +} diff --git a/pages/logs/logs.js b/pages/logs/logs.js deleted file mode 100644 index 3c7cb60..0000000 --- a/pages/logs/logs.js +++ /dev/null @@ -1,15 +0,0 @@ -// logs.js -const util = require('../../utils/util.js') - -Page({ - data: { - logs: [] - }, - onLoad() { - this.setData({ - logs: (wx.getStorageSync('logs') || []).map(log => { - return util.formatTime(new Date(log)) - }) - }) - } -}) diff --git a/pages/logs/logs.json b/pages/logs/logs.json deleted file mode 100644 index 3ee76c1..0000000 --- a/pages/logs/logs.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "navigationBarTitleText": "查看启动日志", - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/logs/logs.wxml b/pages/logs/logs.wxml deleted file mode 100644 index b5a85ac..0000000 --- a/pages/logs/logs.wxml +++ /dev/null @@ -1,6 +0,0 @@ - - - - {{index + 1}}. {{log}} - - diff --git a/pages/logs/logs.wxss b/pages/logs/logs.wxss deleted file mode 100644 index 94d4b88..0000000 --- a/pages/logs/logs.wxss +++ /dev/null @@ -1,8 +0,0 @@ -.log-list { - display: flex; - flex-direction: column; - padding: 40rpx; -} -.log-item { - margin: 10rpx; -} diff --git a/pages/ltjm/ltjm.js b/pages/ltjm/ltjm.js new file mode 100644 index 0000000..e63fcce --- /dev/null +++ b/pages/ltjm/ltjm.js @@ -0,0 +1,3 @@ +Page({ + +}) \ No newline at end of file diff --git a/pages/ltjm/ltjm.json b/pages/ltjm/ltjm.json new file mode 100644 index 0000000..0a77525 --- /dev/null +++ b/pages/ltjm/ltjm.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "实时聊天" +} \ No newline at end of file diff --git a/pages/ltjm/ltjm.scss b/pages/ltjm/ltjm.scss new file mode 100644 index 0000000..e69de29 diff --git a/pages/ltjm/ltjm.wxml b/pages/ltjm/ltjm.wxml new file mode 100644 index 0000000..356657d --- /dev/null +++ b/pages/ltjm/ltjm.wxml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/project.config.json b/project.config.json index 3baee0b..2ad437e 100644 --- a/project.config.json +++ b/project.config.json @@ -1,73 +1,80 @@ { - "description": "项目配置文件", - "packOptions": { - "ignore": [] - }, - "setting": { - "bundle": false, - "userConfirmedBundleSwitch": false, - "urlCheck": true, - "scopeDataCheck": false, - "coverView": true, - "es6": true, - "postcss": true, - "compileHotReLoad": false, - "preloadBackgroundData": false, - "minified": true, - "autoAudits": false, - "newFeature": false, - "uglifyFileName": false, - "uploadWithSourceMap": true, - "useIsolateContext": true, - "nodeModules": false, - "enhance": false, - "useCompilerModule": true, - "userConfirmedUseCompilerModuleSwitch": false, - "useMultiFrameRuntime": true, - "useApiHook": true, - "useApiHostProcess": false, - "showShadowRootInWxmlPanel": true, - "enableEngineNative": false, - "minifyWXSS": true, - "packNpmManually": true, - "packNpmRelationList": [ - { - "packageJsonPath": "./package.json", - "miniprogramNpmDistDir": "./" - } - ] - }, - "compileType": "miniprogram", - "libVersion": "2.0.4", - "appid": "wx932dd04d3a7e7341", - "projectname": "%E6%88%BF%E8%BD%A6", - "debugOptions": { - "hidedInDevtools": [] - }, - "scripts": {}, - "staticServerOptions": { - "baseURL": "", - "servePath": "" - }, - "isGameTourist": false, - "condition": { - "search": { - "list": [] + "description": "项目配置文件", + "packOptions": { + "ignore": [] }, - "conversation": { - "list": [] + "setting": { + "urlCheck": false, + "es6": true, + "enhance": false, + "postcss": true, + "preloadBackgroundData": false, + "minified": true, + "newFeature": false, + "coverView": true, + "nodeModules": true, + "autoAudits": false, + "showShadowRootInWxmlPanel": true, + "scopeDataCheck": false, + "uglifyFileName": false, + "checkInvalidKey": true, + "checkSiteMap": true, + "uploadWithSourceMap": true, + "compileHotReLoad": false, + "useMultiFrameRuntime": true, + "useApiHook": true, + "useApiHostProcess": false, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" + }, + "enableEngineNative": false, + "bundle": false, + "useIsolateContext": true, + "useCompilerModule": true, + "userConfirmedUseCompilerModuleSwitch": false, + "userConfirmedBundleSwitch": false, + "packNpmManually": true, + "packNpmRelationList": [ + { + "packageJsonPath": "./package.json", + "miniprogramNpmDistDir": "./" + } + ], + "minifyWXSS": true }, - "game": { - "list": [] + "compileType": "miniprogram", + "libVersion": "2.0.4", + "appid": "wx0ae1f549a7384633", + "projectname": "%E6%88%BF%E8%BD%A6", + "debugOptions": { + "hidedInDevtools": [] }, - "plugin": { - "list": [] + "scripts": {}, + "staticServerOptions": { + "baseURL": "", + "servePath": "" }, - "gamePlugin": { - "list": [] - }, - "miniprogram": { - "list": [] + "isGameTourist": false, + "condition": { + "search": { + "list": [] + }, + "conversation": { + "list": [] + }, + "game": { + "list": [] + }, + "plugin": { + "list": [] + }, + "gamePlugin": { + "list": [] + }, + "miniprogram": { + "list": [] + } } - } } \ No newline at end of file diff --git a/utils/im.js b/utils/im.js new file mode 100644 index 0000000..5bb38b7 --- /dev/null +++ b/utils/im.js @@ -0,0 +1,11 @@ +import TIM from '../miniprogram_npm/tim-wx-sdk/index.js'; +let options = { + SDKAppID: 0 // 接入时需要将0替换为您的即时通信 IM 应用的 SDKAppID +}; +// 创建 SDK 实例,`TIM.create()`方法对于同一个 `SDKAppID` 只会返回同一份实例 +let tim = TIM.create(options); // SDK 实例通常用 tim 表示 +// 设置 SDK 日志输出级别,详细分级请参见 setLogLevel 接口的说明 +tim.setLogLevel(0); // 普通级别,日志量较多,接入时建议使用 +// tim.setLogLevel(1); // release 级别,SDK 输出关键信息,生产环境时建议使用 +// 注册腾讯云即时通信 IM 上传插件 +export default tim; \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index bd102bb..97d1080 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6,3 +6,8 @@ version "1.6.8" resolved "https://registry.npmjs.org/@vant/weapp/-/weapp-1.6.8.tgz#948ae16fba07c5a2054c52783f22aaf6a04453e1" integrity sha512-CvRgAZdGUtJKEnd2wmjw3oaRYXBq/YqerFTmf19cTd3G9+vRR67nSXPMUNQEoPPSm7LZo6gF6Xk/5pYx4Q4C0Q== + +tim-wx-sdk@^2.10.1: + version "2.10.1" + resolved "https://registry.npmjs.org/tim-wx-sdk/-/tim-wx-sdk-2.10.1.tgz#945a3e638239c856ea0cadb79b4374ed806d9fb0" + integrity sha512-sf/dDupxwuRy6PiYFvTKvbJsAtw4JwF21i6wiV4LzSKqPebtGMh9RNk89D5YNneLaXY102gT6Uj1Z3qU8HbDkg==