diff --git a/App.vue b/App.vue index 8b029a8..b6a64d6 100644 --- a/App.vue +++ b/App.vue @@ -46,11 +46,11 @@ } - .content { - padding: 20rpx 28.5rpx; - background-color: #F4F4F4; - min-height: 100vh; - } + // .content { + // padding: 20rpx 28.5rpx; + // background-color: #F4F4F4; + // min-height: 100vh; + // } .more-jt { display: flex; diff --git a/components/index/planting.vue b/components/index/planting.vue index f803708..54d111f 100644 --- a/components/index/planting.vue +++ b/components/index/planting.vue @@ -1,72 +1,11 @@ @@ -77,6 +16,22 @@ const props = defineProps({ userInfo: Object }) + // 获取位置 + const getPositionFn = () => { + uni.getLocation({ + type: 'gcj02', + geocode: true, + isHighAccuracy: true, + success: function(res) { + uni.request({ + url: `https://restapi.amap.com/v3/geocode/regeo?output=JSON&location=${res.longitude},${res.latitude}&key=b0c21bc6b220aa882bad8ffb6bce8829&radius=1000&extensions=all`, + success: (res) => { + console.log(res) + } + }) + } + }); + } const userInfo = reactive(props.userInfo) @@ -116,56 +71,5 @@ } - .card { - position: relative; - width: 693.93rpx; - margin: auto; - background-color: #fff; - box-sizing: border-box; - border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx; - margin-bottom: 40rpx; - - .card-li { - // margin-bottom: 17rpx; - } - - .tit { - display: flex; - font-size: 33.29rpx; - font-weight: bold; - // background-color: red; - justify-content: space-between; - } - } - } - - .bottom { - width: 750rpx; - height: 150rpx; - background-color: #EAF2EF; - position: fixed; - bottom: 0; - display: flex; - align-items: center; - justify-content: center; - - .add-btn { - width: 238.32rpx; - height: 84.11rpx; - border: #34D190 1px solid; - border-radius: 42.06rpx 42.06rpx 42.06rpx 42.06rpx; - display: flex; - align-items: center; - color: #00A15E; - font-size: 33.29rpx; - font-weight: bold; - justify-content: center; - margin-right: 20rpx; - } - - .add { - background-color: #00A15E; - color: white; - } } \ No newline at end of file diff --git a/components/plant/landInfo.vue b/components/plant/landInfo.vue index 2fb2ea2..c9c3d79 100644 --- a/components/plant/landInfo.vue +++ b/components/plant/landInfo.vue @@ -40,6 +40,7 @@ + diff --git a/manifest.json b/manifest.json index 4b74c91..7c9e18b 100644 --- a/manifest.json +++ b/manifest.json @@ -1,77 +1,97 @@ { - "name": "test", - "appid": "__UNI__B1D7CFE", - "description": "", - "versionName": "1.0.0", - "versionCode": "100", - "transformPx": false, - /* 5+App特有相关 */ - "app-plus": { - "usingComponents": true, - "nvueStyleCompiler": "uni-app", - "compilerVersion": 3, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - /* 模块配置 */ - "modules": {}, - /* 应用发布信息 */ - "distribute": { - /* android打包配置 */ - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "minSdkVersion": 21 - }, - /* ios打包配置 */ - "ios": { - "dSYMs": false - }, - /* SDK配置 */ - "sdkConfigs": { - "ad": {} - } - } - }, - /* 快应用特有相关 */ - "quickapp": {}, - /* 小程序特有相关 */ - "mp-weixin": { - "appid": "", - "setting": { - "urlCheck": false - }, - "usingComponents": true - }, - "mp-alipay": { - "usingComponents": true - }, - "mp-baidu": { - "usingComponents": true - }, - "mp-toutiao": { - "usingComponents": true - }, - "uniStatistics": { - "enable": false - }, - "vueVersion": "3" -} \ No newline at end of file + "name" : "test", + "appid" : "__UNI__D087881", + "description" : "", + "versionName" : "1.0.1", + "versionCode" : "100", + "transformPx" : false, + /* 5+App特有相关 */ + "app-plus" : { + "usingComponents" : true, + "nvueStyleCompiler" : "uni-app", + "compilerVersion" : 3, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + /* 模块配置 */ + "modules" : { + "Geolocation" : {}, + "Maps" : {}, + "LivePusher" : {} + }, + /* 应用发布信息 */ + "distribute" : { + /* android打包配置 */ + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "minSdkVersion" : 21 + }, + /* ios打包配置 */ + "ios" : { + "dSYMs" : false + }, + /* SDK配置 */ + "sdkConfigs" : { + "ad" : {}, + "geolocation" : { + "amap" : { + "name" : "amapC2GgorTaY", + "__platform__" : [ "android" ], + "appkey_ios" : "b0c21bc6b220aa882bad8ffb6bce8829", + "appkey_android" : "b0c21bc6b220aa882bad8ffb6bce8829" + } + }, + "maps" : { + "amap" : { + "name" : "amapC2GgorTaY", + "appkey_ios" : "b0c21bc6b220aa882bad8ffb6bce8829", + "appkey_android" : "b0c21bc6b220aa882bad8ffb6bce8829" + } + } + } + } + }, + /* 快应用特有相关 */ + "quickapp" : {}, + /* 小程序特有相关 */ + "mp-weixin" : { + "appid" : "", + "setting" : { + "urlCheck" : false + }, + "usingComponents" : true + }, + "mp-alipay" : { + "usingComponents" : true + }, + "mp-baidu" : { + "usingComponents" : true + }, + "mp-toutiao" : { + "usingComponents" : true + }, + "uniStatistics" : { + "enable" : false + }, + "vueVersion" : "3" +} diff --git a/pages.json b/pages.json index 742aa21..a30608d 100644 --- a/pages.json +++ b/pages.json @@ -332,23 +332,50 @@ "navigationBarTextStyle": "black" } }, - - - + // 和撒旦发射点恢复健康快点发货速度较快 { - "path": "pages/test/index", + "path": "pages/addLand/addLand", "style": { - "navigationBarTitleText": "uni-app", - "enablePullDownRefresh": true + "navigationBarTitleText": "添加土地信息", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#F4F4F4", + "navigationBarTextStyle": "black" + } + }, + { + "path": "pages/updatePassword/updatePassword", + "style": { + "navigationBarTitleText": "密码修改", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#F4F4F4", + "navigationBarTextStyle": "black" + } + }, + { + "path": "pages/index/massif", + "style": { + "navigationBarTitleText": "地块", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#F4F4F4", + "navigationBarTextStyle": "black" + } + }, + { + "path": "pages/index/personal", + "style": { + "navigationStyle": "custom" } }, { - "path": "pages/test/index1", + "path": "pages/Login/login", "style": { - "navigationBarTitleText": "uni-app", - "enablePullDownRefresh": true + "navigationStyle": "custom" } } + + + + ], "globalStyle": { "navigationBarTextStyle": "black", @@ -356,6 +383,31 @@ "navigationBarBackgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8" }, + "tabBar": { + "color": "#B3B3B3", + "selectedColor": "#272822", + "borderStyle": "white", + "backgroundColor": "#EBF1EF", + "list": [{ + "pagePath": "pages/index/index", + "text": "首页", + "iconPath": "static/tabs-icon/home.png", + "selectedIconPath": "static/img/DK.png" + }, + { + "pagePath": "pages/index/massif", + "text": "地块", + "iconPath": "static/img/SJ (1).png", + "selectedIconPath": "static/img/SJ (1).png" + }, + { + "pagePath": "pages/index/personal", + "text": "我的", + "iconPath": "static/img/WD.png", + "selectedIconPath": "static/img/WD.png" + } + ] + }, "uniIdRouter": {} } \ No newline at end of file diff --git a/pages/Login/login.vue b/pages/Login/login.vue new file mode 100644 index 0000000..31c27d0 --- /dev/null +++ b/pages/Login/login.vue @@ -0,0 +1,101 @@ + + + + + \ No newline at end of file diff --git a/pages/addLand/addLand.vue b/pages/addLand/addLand.vue new file mode 100644 index 0000000..a39501e --- /dev/null +++ b/pages/addLand/addLand.vue @@ -0,0 +1,200 @@ + + + + + \ No newline at end of file diff --git a/pages/detail/plant.vue b/pages/detail/plant.vue index 1f304ed..0bfdfc8 100644 --- a/pages/detail/plant.vue +++ b/pages/detail/plant.vue @@ -1,152 +1,12 @@ diff --git a/pages/index/index.vue b/pages/index/index.vue index a0a7d33..501a044 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,141 +1,380 @@ - \ No newline at end of file diff --git a/pages/index/massif.vue b/pages/index/massif.vue new file mode 100644 index 0000000..ed96798 --- /dev/null +++ b/pages/index/massif.vue @@ -0,0 +1,157 @@ + + + + + \ No newline at end of file diff --git a/pages/index/personal.vue b/pages/index/personal.vue new file mode 100644 index 0000000..c01462e --- /dev/null +++ b/pages/index/personal.vue @@ -0,0 +1,121 @@ + + + + + \ No newline at end of file diff --git a/pages/poultry/histroyFeed.vue b/pages/poultry/histroyFeed.vue index ee81625..fac5936 100644 --- a/pages/poultry/histroyFeed.vue +++ b/pages/poultry/histroyFeed.vue @@ -1,44 +1,5 @@