From ec445933f87e4934ec08b290d7ba1a7cd1979aee Mon Sep 17 00:00:00 2001
From: pplokijuhyg <1162963624@qq.com>
Date: Mon, 6 Jan 2020 15:12:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.wxss | 16 +--
components/chooseaddr/address/address.scss | 3 +-
components/chooseaddr/address/address.wxml | 8 +-
components/chooseaddr/address/address.wxss | 86 +-----------
.../shopping/shoppingitem/shoppingitem.wxml | 6 +-
.../shopping/shoppingitem/shoppingitem.wxss | 2 +-
pages/addaddress/addaddress.js | 3 +
pages/personal/personal.scss | 123 ++++++++++--------
pages/personal/personal.wxml | 2 +-
pages/personal/personal.wxss | 2 +-
pages/shopping/shopping.wxml | 2 +-
11 files changed, 86 insertions(+), 167 deletions(-)
diff --git a/app.wxss b/app.wxss
index 6589a0a..b934552 100644
--- a/app.wxss
+++ b/app.wxss
@@ -170,7 +170,6 @@ img {
* 2. Remove the margin in Firefox and Safari.
*/
-button,
input,
optgroup,
select,
@@ -186,7 +185,6 @@ textarea {
* 1. Show the overflow in Edge.
*/
-button,
input {
/* 1 */
overflow: visible;
@@ -197,7 +195,6 @@ input {
* 1. Remove the inheritance of text transform in Firefox.
*/
-button,
select {
/* 1 */
text-transform: none;
@@ -207,19 +204,11 @@ select {
* Correct the inability to style clickable types in iOS and Safari.
*/
-button,
-[type="button"],
-[type="reset"],
-[type="submit"] {
- -webkit-appearance: button;
-}
-
/**
* Remove the inner border and padding in Firefox.
*/
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
+
[type="reset"]::-moz-focus-inner,
[type="submit"]::-moz-focus-inner {
border-style: none;
@@ -230,8 +219,7 @@ button::-moz-focus-inner,
* Restore the focus styles unset by the previous rule.
*/
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
+
[type="reset"]:-moz-focusring,
[type="submit"]:-moz-focusring {
outline: 1px dotted ButtonText;
diff --git a/components/chooseaddr/address/address.scss b/components/chooseaddr/address/address.scss
index d067c14..a272f3a 100644
--- a/components/chooseaddr/address/address.scss
+++ b/components/chooseaddr/address/address.scss
@@ -8,7 +8,7 @@
;
.left {
width: 576rpx;
- height: 119rpx;
+ // height: 119rpx;
.userinfo {
color: #333333;
font-size: 26rpx;
@@ -35,6 +35,7 @@
text-indent: 30rpx;
margin-top: 32rpx;
width: 551rpx;
+ height: 50rpx;
margin-left: 20rpx;
// display: flex;
.select {
diff --git a/components/chooseaddr/address/address.wxml b/components/chooseaddr/address/address.wxml
index 2d95edb..e5c3de4 100644
--- a/components/chooseaddr/address/address.wxml
+++ b/components/chooseaddr/address/address.wxml
@@ -8,16 +8,16 @@
邮政编码：{{youzheng}}
-
-
+
+
默认
{{address}}
-
-
+
+
设为默认
diff --git a/components/chooseaddr/address/address.wxss b/components/chooseaddr/address/address.wxss
index 3de1039..ddec365 100644
--- a/components/chooseaddr/address/address.wxss
+++ b/components/chooseaddr/address/address.wxss
@@ -1,85 +1 @@
-.address {
- width: 690rpx;
- height: 192rpx;
- border-bottom: 2rpx solid #EAEAEA;
- display: flex;
- justify-content: space-between;
- padding-bottom: 27rpx;
-}
-
-.address .left {
- width: 576rpx;
- height: 119rpx;
-}
-
-.address .left .userinfo {
- color: #333333;
- font-size: 26rpx;
- text-indent: 16xrpx;
- margin-top: 41rpx;
- display: flex;
- justify-content: space-between;
-}
-
-.address .left .userinfo .username {
- display: flex;
- flex-wrap: nowrap;
-}
-
-.address .left .userinfo .username .username1 {
- width: 140rpx;
- overflow: hidden;
-}
-
-.address .left .userinfo .username .tel {
- margin-right: 6rpx;
-}
-
-.address .left .addr {
- color: #999999;
- font-size: 24rpx;
- text-indent: 30rpx;
- margin-top: 32rpx;
- width: 551rpx;
- margin-left: 20rpx;
-}
-
-.address .left .addr .select {
- width: 26rpx;
- height: 26rpx;
- margin: auto 0;
- border-radius: 50%;
- background-color: #EAEAEA;
- float: left;
- margin-right: -14rpx;
-}
-
-.address .left .addr .selected {
- background-color: #47C877;
-}
-
-.address .left .addr .default {
- font-size: 24rpx;
- text-indent: 16rpx;
- line-height: 60rpx;
- float: left;
-}
-
-.address .left .addr .path {
- line-height: 25rpx;
-}
-
-.address .line {
- width: 2rpx;
- height: 75rpx;
- background: lightgray;
- margin: auto 0;
-}
-
-.address .right {
- color: #666666;
- font-size: 24rpx;
- line-height: 192rpx;
- margin-left: 30rpx;
- margin-right: 21rpx;
-}
+.address{width:690rpx;height:192rpx;border-bottom:2rpx solid #EAEAEA;display:flex;justify-content:space-between;padding-bottom:27rpx}.address .left{width:576rpx}.address .left .userinfo{color:#333333;font-size:26rpx;text-indent:16xrpx;margin-top:41rpx;display:flex;justify-content:space-between}.address .left .userinfo .username{display:flex;flex-wrap:nowrap}.address .left .userinfo .username .username1{width:140rpx;overflow:hidden}.address .left .userinfo .username .tel{margin-right:6rpx}.address .left .addr{color:#999999;font-size:24rpx;text-indent:30rpx;margin-top:32rpx;width:551rpx;height:50rpx;margin-left:20rpx}.address .left .addr .select{width:26rpx;height:26rpx;margin:auto 0;border-radius:50%;background-color:#EAEAEA;float:left;margin-right:-14rpx}.address .left .addr .selected{background-color:#47C877}.address .left .addr .default{font-size:24rpx;text-indent:16rpx;line-height:60rpx;float:left}.address .left .addr .path{line-height:25rpx}.address .line{width:2rpx;height:75rpx;background:#d3d3d3;margin:auto 0}.address .right{color:#666666;font-size:24rpx;line-height:192rpx;margin-left:30rpx;margin-right:21rpx}
diff --git a/components/shopping/shoppingitem/shoppingitem.wxml b/components/shopping/shoppingitem/shoppingitem.wxml
index c3ee33b..331fc06 100644
--- a/components/shopping/shoppingitem/shoppingitem.wxml
+++ b/components/shopping/shoppingitem/shoppingitem.wxml
@@ -1,8 +1,8 @@
-
-
-
+
+
+
{{shopname}}
{{shopdesc}}
diff --git a/components/shopping/shoppingitem/shoppingitem.wxss b/components/shopping/shoppingitem/shoppingitem.wxss
index 497147c..380301e 100644
--- a/components/shopping/shoppingitem/shoppingitem.wxss
+++ b/components/shopping/shoppingitem/shoppingitem.wxss
@@ -10,7 +10,7 @@
height: 26rpx;
background: rgba(234, 234, 234, 1);
border-radius: 50%;
- margin: auto 0;
+ margin: 87rpx 10rpx;
}
.selects{
background-color: #45C778;
diff --git a/pages/addaddress/addaddress.js b/pages/addaddress/addaddress.js
index 3f22062..624474c 100644
--- a/pages/addaddress/addaddress.js
+++ b/pages/addaddress/addaddress.js
@@ -230,6 +230,9 @@ Page({
title:res.data.msg,
icon:"none"
})
+ wx.navigateBack({
+ delta:1
+ })
})
})
diff --git a/pages/personal/personal.scss b/pages/personal/personal.scss
index d5bef9f..e498ec8 100644
--- a/pages/personal/personal.scss
+++ b/pages/personal/personal.scss
@@ -1,61 +1,72 @@
-.box{
- // border-top: 1rpx solid #eaeaea;
+.box {
+ // border-top: 1rpx solid #eaeaea;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ .card {
+ width: 690rpx;
+ height: 313rpx;
+ background-color: #47c877;
display: flex;
+ box-sizing: border-box;
+ padding: 50rpx;
+ font-size: 30rpx;
flex-direction: column;
- align-items: center;
-
- .card{
- width: 690rpx;
- height: 313rpx;
- background-color: #47C877;
- display: flex;
- box-sizing: border-box;
- padding: 50rpx;
- font-size: 30rpx;
- flex-direction: column;
- color: #fff;
- margin-top: 20rpx;
- .user{
- display: flex;
- align-items: center;
- .head{
- width: 80rpx;
- height: 80rpx;
- margin-right: 32rpx;
- border-radius: 50%;
- background-color: #fff;
- }
- }
- .balance{
- display: flex;
- flex-direction: column;
- margin-top: 52rpx;
- }
+ color: #fff;
+ margin-top: 20rpx;
+ .user {
+ display: flex;
+ align-items: center;
+ .head {
+ width: 80rpx;
+ height: 80rpx;
+ margin-right: 32rpx;
+ border-radius: 50%;
+ background-color: #fff;
+ }
}
- .list{
- display: flex;
- width: 690rpx;
- margin-top: 33rpx;
- flex-direction: column;
- .option{
- border: 0;
-outline: 0;
- font-weight:initial;
-
- }
- .option::after { border: none; }
- .option{
- width: 100%;
- height: 80rpx;
- margin-bottom: 15rpx;
- box-sizing: border-box;
- padding: 0 30rpx;
- box-shadow:2rpx 3rpx 16rpx 1rpx rgba(51,51,51,0.1);
- display: flex;
- align-items: center;
- justify-content: space-between;
- }
+ .balance {
+ display: flex;
+ flex-direction: column;
+ margin-top: 52rpx;
}
-
+ }
+ .list {
+ display: flex;
+ width: 690rpx;
+ margin-top: 33rpx;
+ flex-direction: column;
+
+ .option {
+ width: 100%;
+ height: 80rpx;
+ margin-bottom: 15rpx;
+ box-sizing: border-box;
+ padding: 0 30rpx;
+ box-shadow: 2rpx 3rpx 16rpx 1rpx rgba(51, 51, 51, 0.1);
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
}
-
\ No newline at end of file
+ .button {
+ width: 100%;
+ height: 80rpx;
+ margin-bottom: 15rpx;
+ box-sizing: border-box;
+ padding: 0 30rpx;
+ box-shadow: 2rpx 3rpx 16rpx 1rpx rgba(51, 51, 51, 0.1);
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ border: 0;
+ outline: 0;
+ font-size: 30rpx;
+ font-weight: initial;
+ background-color: #fff;
+ &::after {
+ border: none;
+ }
+ }
+ }
+}
diff --git a/pages/personal/personal.wxml b/pages/personal/personal.wxml
index ffb7d93..78b0456 100644
--- a/pages/personal/personal.wxml
+++ b/pages/personal/personal.wxml
@@ -18,7 +18,7 @@
地址管理
>
-