diff --git a/components/pullDown/pullDown.vue b/components/pullDown/pullDown.vue index bddf9758..10058a23 100644 --- a/components/pullDown/pullDown.vue +++ b/components/pullDown/pullDown.vue @@ -1,20 +1,26 @@ \ No newline at end of file + .page-wraper { + display: flex; + flex-direction: column; + width: 100%; + height: 100%; + } + + .page-main { + flex: 1; + position: relative; + } + + .page-footer { + color: #fff; + line-height: 100rpx; + /* 不放大不缩小固定100rpx */ + flex: 0 0 100rpx; + background-color: #00AAFF; + } + + .container { + background-color: #f5f7fa; + /* 这里只是作为样式展示 */ + } + diff --git a/static/config.json b/static/config.json index 4a668deb..4f688e61 100644 --- a/static/config.json +++ b/static/config.json @@ -18,7 +18,7 @@ "request_url": { "name": "request_url", - "value": "http://192.168.0.106:12080/admin-api", + "value": "http://dev.ccwin-in.com:25100/api/admin-api", "dev2": "http://192.168.0.157:12080/admin-api", "chefang": "http://192.168.0.178:12080/admin-api", "chenxinming": "http://192.168.0.230:12080/admin-api", diff --git a/test/pullDownTest.vue b/test/pullDownTest.vue index e8c0d1e1..2eb67339 100644 --- a/test/pullDownTest.vue +++ b/test/pullDownTest.vue @@ -5,7 +5,7 @@ @@ -121,7 +121,7 @@ value1: '', value2: '2', mask: true, - options1: [{ + options: [{ label: '默认排序', value: 1, }, diff --git a/test/pullDownTest2.vue b/test/pullDownTest2.vue index 5d7dcc14..5cac52fa 100644 --- a/test/pullDownTest2.vue +++ b/test/pullDownTest2.vue @@ -59,7 +59,7 @@ value1: '', value2: '2', mask: true, - options1: [{ + options: [{ label: '默认排序', value: 1, },