From 5836cda754a3ce3d7024a58877473f0e18a97b2a Mon Sep 17 00:00:00 2001 From: zdx <731335498@qq.com> Date: Wed, 30 Dec 2020 15:57:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=B8=AA=E4=BA=BA=E4=B8=AD?= =?UTF-8?q?=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 2 +- pages/home/index.js | 2 +- pages/mall/mall_address/mall_address.wxss | 2 +- pages/user/index.wxml | 10 +++--- .../user/setting/aboutAdvice/aboutAdvice.wxml | 5 ++- .../user/setting/aboutAdvice/aboutAdvice.wxss | 31 ++++++++++++------- pages/user/setting/aboutMine/aboutMine.wxml | 10 +++--- pages/user/setting/aboutUs/aboutUs.js | 6 +++- pages/user/setting/aboutUs/aboutUs.wxml | 3 +- project.config.json | 23 ++++++++++++++ 10 files changed, 67 insertions(+), 27 deletions(-) diff --git a/app.json b/app.json index 5c09a89..0feab07 100644 --- a/app.json +++ b/app.json @@ -1,7 +1,7 @@ { "pages": [ - "pages/user/index", "pages/welcome/index", + "pages/user/index", "pages/config/config", "pages/company/index", "pages/company/search/search", diff --git a/pages/home/index.js b/pages/home/index.js index 691ca70..25990aa 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -86,7 +86,7 @@ Page({ */ goMall(e) { console.log('1111') - wx.switchTab({ + wx.navigateTo({ url: '/pages/mall/index', }) } diff --git a/pages/mall/mall_address/mall_address.wxss b/pages/mall/mall_address/mall_address.wxss index fb9fafd..fd525cb 100644 --- a/pages/mall/mall_address/mall_address.wxss +++ b/pages/mall/mall_address/mall_address.wxss @@ -117,7 +117,7 @@ height: 90rpx; margin: 20rpx 0; text-align: center; - background: #224bf6; + background: #378fff; font-size: 30rpx; color: white; border-radius: 60rpx; diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 376f5ac..afbac32 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -65,9 +65,9 @@ 我的购物车 - + 客服服务 @@ -91,12 +91,12 @@ 区块链证书 - + 企获客广场 - + @@ -106,4 +106,4 @@ - + \ No newline at end of file diff --git a/pages/user/setting/aboutAdvice/aboutAdvice.wxml b/pages/user/setting/aboutAdvice/aboutAdvice.wxml index 276fab6..3a35737 100644 --- a/pages/user/setting/aboutAdvice/aboutAdvice.wxml +++ b/pages/user/setting/aboutAdvice/aboutAdvice.wxml @@ -1 +1,4 @@ -yijian \ No newline at end of file + + + 确认提交 + \ No newline at end of file diff --git a/pages/user/setting/aboutAdvice/aboutAdvice.wxss b/pages/user/setting/aboutAdvice/aboutAdvice.wxss index b664d44..b65a5d8 100644 --- a/pages/user/setting/aboutAdvice/aboutAdvice.wxss +++ b/pages/user/setting/aboutAdvice/aboutAdvice.wxss @@ -1,17 +1,26 @@ -.item { +.content { + width: 100%; display: flex; - flex-direction: row; - justify-content: flex-start; + flex-direction: column; + justify-content: center; align-items: center; box-sizing: border-box; - padding: 30rpx 30rpx; - color: #333; - font-weight: 400; - background-color: #fff; - border-top: #f7f7f7 solid 1rpx; } -.item image { - width: 50rpx; - margin-right: 10rpx; +.content textarea { + width: 100%; + min-height: 500rpx; + background-color: #fff; + padding: 30rpx; + box-sizing: border-box; +} + +.content>view { + background-color: #378fff; + color: #fff; + font-size: 30rpx; + font-weight: 500; + padding: 20rpx 200rpx; + border-radius: 60rpx; + margin-top: 30rpx; } \ No newline at end of file diff --git a/pages/user/setting/aboutMine/aboutMine.wxml b/pages/user/setting/aboutMine/aboutMine.wxml index c49c851..5c6b5b9 100644 --- a/pages/user/setting/aboutMine/aboutMine.wxml +++ b/pages/user/setting/aboutMine/aboutMine.wxml @@ -43,7 +43,7 @@ - 当前选择: {{date}} + {{date}} @@ -53,10 +53,10 @@ 所在区域 - - 当前选择：{{region[0]}}，{{region[1]}}，{{region[2]}} - - + + {{region[0]}}-{{region[1]}}-{{region[2]}} + + diff --git a/pages/user/setting/aboutUs/aboutUs.js b/pages/user/setting/aboutUs/aboutUs.js index 28f0b32..1247b29 100644 --- a/pages/user/setting/aboutUs/aboutUs.js +++ b/pages/user/setting/aboutUs/aboutUs.js @@ -1,3 +1,7 @@ Page({ - data: {} + data: { + nodes: { + + } + } }) \ No newline at end of file diff --git a/pages/user/setting/aboutUs/aboutUs.wxml b/pages/user/setting/aboutUs/aboutUs.wxml index 3a6ecdd..9d2f568 100644 --- a/pages/user/setting/aboutUs/aboutUs.wxml +++ b/pages/user/setting/aboutUs/aboutUs.wxml @@ -1 +1,2 @@ -关于我们 \ No newline at end of file + + \ No newline at end of file diff --git a/project.config.json b/project.config.json index 132abac..80c856d 100644 --- a/project.config.json +++ b/project.config.json @@ -113,6 +113,29 @@ "pathName": "pages/home/index", "query": "orderid=20201229132338964625", "scene": null + }, + { + "name": "pages/user/setting/setting", + "pathName": "pages/user/setting/setting", + "query": "", + "scene": null + }, + { + "name": "pages/user/setting/aboutMine/aboutMine", + "pathName": "pages/user/setting/aboutMine/aboutMine", + "query": "", + "scene": null + }, + { + "name": "pages/user/setting/aboutAdvice/aboutAdvice", + "pathName": "pages/user/setting/aboutAdvice/aboutAdvice", + "query": "", + "scene": null + }, + { + "name": "pages/user/setting/aboutUs/aboutUs", + "pathName": "pages/user/setting/aboutUs/aboutUs", + "scene": null } ] }