diff --git a/app.wxss b/app.wxss index 795c926..ec67156 100644 --- a/app.wxss +++ b/app.wxss @@ -458,13 +458,13 @@ button.weui-btn_primary::after { button[type="primary"] { color: #ffffff; - background-color: #027aff; + background-color: var(--color-yc); } .button-hover[type="primary"] { color: #ffffff; /* opacity: 0.8; */ - background-color: #1f6bbf; + background-color: var(--color-ych); } button[disabled][type="primary"] { diff --git a/pages/addressBook/index.wxml b/pages/addressBook/index.wxml index bc6b4d3..4a2669f 100644 --- a/pages/addressBook/index.wxml +++ b/pages/addressBook/index.wxml @@ -2,7 +2,7 @@ - + 暂无收货地址 diff --git a/pages/enroll/index.js b/pages/enroll/index.js index 5cf2f38..613466c 100644 --- a/pages/enroll/index.js +++ b/pages/enroll/index.js @@ -84,21 +84,22 @@ Page({ header: app.globalData.headers, data: formData, success: function (res) { - // wx.redirectTo({ - // url: "../success/index?applyType=" + that.data.applyType - // }); - wx.showToast({ - icon: "success", - title: "报名成功", - duration: 3000, - success(){ - that.setData({ - inputUserName:'', - phoneNumber:'', - btnLoading: false - }) - } - }); + wx.redirectTo({ + url: "../success/index?applyType=0" + // + that.data.applyType + }); + // wx.showToast({ + // icon: "success", + // title: "报名成功", + // duration: 3000, + // success(){ + // that.setData({ + // inputUserName:'', + // phoneNumber:'', + // btnLoading: false + // }) + // } + // }); } }) diff --git a/pages/home/index.json b/pages/home/index.json index 19d83a6..b8b09d2 100644 --- a/pages/home/index.json +++ b/pages/home/index.json @@ -1,4 +1,4 @@ { - "navigationBarBackgroundColor":"#027AFF", + "navigationBarBackgroundColor":"#0dcc91", "navigationBarTextStyle": "white" } \ No newline at end of file diff --git a/pages/makeInfo/index.wxml b/pages/makeInfo/index.wxml index f1aa99c..cf00f06 100644 --- a/pages/makeInfo/index.wxml +++ b/pages/makeInfo/index.wxml @@ -21,10 +21,10 @@ - + - + diff --git a/pages/makeInfoSure/index.wxss b/pages/makeInfoSure/index.wxss index 7942dc7..2d66aaf 100644 --- a/pages/makeInfoSure/index.wxss +++ b/pages/makeInfoSure/index.wxss @@ -31,4 +31,7 @@ page{ } .mt36{ margin-top:36px; +} +.wx-list-li { + padding: 16px 10px; } \ No newline at end of file diff --git a/pages/me/index.json b/pages/me/index.json index 2a7f884..cd02d77 100644 --- a/pages/me/index.json +++ b/pages/me/index.json @@ -1,5 +1,5 @@ { - "navigationBarBackgroundColor":"#027AFF", + "navigationBarBackgroundColor":"#0dcc91", "backgroundColor": "#fff", "navigationBarTextStyle":"white", "navigationBarTitleText": "我的" diff --git a/pages/me/index.wxml b/pages/me/index.wxml index 4bea277..34939cc 100644 --- a/pages/me/index.wxml +++ b/pages/me/index.wxml @@ -12,7 +12,12 @@ + {{user.userName}} + + + + diff --git a/pages/myInfo/index.wxml b/pages/myInfo/index.wxml index 3076e82..ce8ab9f 100644 --- a/pages/myInfo/index.wxml +++ b/pages/myInfo/index.wxml @@ -28,7 +28,12 @@ 用户名 - {{user.userName != null ? user.userName : ''}} + + {{user.userName}} + + + 去设置 + @@ -80,7 +85,7 @@ - 实名认证 + 实名认证 去认证 diff --git a/pages/success/index.js b/pages/success/index.js index b72b10a..7b65dc8 100644 --- a/pages/success/index.js +++ b/pages/success/index.js @@ -18,7 +18,7 @@ Page({ var that = this; if (that.data.applyType == 0) { - wx.navigateTo({ + wx.switchTab({ url: "../index/index" }); } else {