diff --git a/components/navbar/navbar.js b/components/navbar/navbar.js
index 7c3c2b6..45f28cf 100644
--- a/components/navbar/navbar.js
+++ b/components/navbar/navbar.js
@@ -15,6 +15,10 @@ Component({
type: String,
value: 'Wechat'
},
+ showLocationIf: {
+ type: Boolean,
+ value: false
+ },
back: {
type: Boolean,
value: false
@@ -26,6 +30,8 @@ Component({
},
data: {
+ array: ['A广场', 'B广场-北京西单'],
+ index: 1,
statusBarHeight: app.statusBarHeight + 'px',
navigationBarHeight: (app.statusBarHeight + 44) + 'px'
},
@@ -35,6 +41,12 @@ Component({
url: '/index/index',
})
},
+ bindPickerChange: function (e) {
+ console.log('picker发送选择改变,携带值为', e.detail.value)
+ this.setData({
+ index: e.detail.value
+ })
+ },
back: function () {
wx.navigateBack({
delta: 1
diff --git a/components/navbar/navbar.wxml b/components/navbar/navbar.wxml
index ea5e5eb..803d32f 100644
--- a/components/navbar/navbar.wxml
+++ b/components/navbar/navbar.wxml
@@ -10,5 +10,11 @@
{{text}}
+
+
+
+ {{array[index]}}
+
+
\ No newline at end of file
diff --git a/components/navbar/navbar.wxss b/components/navbar/navbar.wxss
index 426cac0..cc998dc 100644
--- a/components/navbar/navbar.wxss
+++ b/components/navbar/navbar.wxss
@@ -55,4 +55,36 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
+}
+@font-face {
+ font-family: 'iconfont'; /* project id 1353695 */
+ src: url('//at.alicdn.com/t/font_1353695_nyv2ld9xqk8.eot');
+ src: url('//at.alicdn.com/t/font_1353695_nyv2ld9xqk8.eot?#iefix') format('embedded-opentype'),
+ url('//at.alicdn.com/t/font_1353695_nyv2ld9xqk8.woff2') format('woff2'),
+ url('//at.alicdn.com/t/font_1353695_nyv2ld9xqk8.woff') format('woff'),
+ url('//at.alicdn.com/t/font_1353695_nyv2ld9xqk8.ttf') format('truetype'),
+ url('//at.alicdn.com/t/font_1353695_nyv2ld9xqk8.svg#iconfont') format('svg');
+}
+.iconfont {
+ font-family: "iconfont" !important;
+ font-size: 16px;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-daohangdizhiweizhi:before {
+ content: "\e787";
+}
+.locations{
+ font-size: 28rpx;
+ display: inline-block;
+ width: 200rpx;
+ overflow: hidden;
+ text-overflow:ellipsis;
+ white-space: nowrap;
+}
+.pick-box{
+ width: 260rpx;
+ padding-left: 20rpx;
}
\ No newline at end of file
diff --git a/index/index.js b/index/index.js
index d6b5c5a..6eac3bf 100644
--- a/index/index.js
+++ b/index/index.js
@@ -10,6 +10,7 @@ const bgColor = require("../utils/bgColor.js")
let app = getApp();
Page({
data: {
+ showLocationIf:true,
ifStoreApp: ifStoreApp,
navigationBarTitle: '首页',
navigationBarHeight,
diff --git a/index/index.wxml b/index/index.wxml
index 18468e7..40e47a6 100644
--- a/index/index.wxml
+++ b/index/index.wxml
@@ -1,4 +1,4 @@
-
+