theluyuan/deguodaigou
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修复

Browse Source
This commit is contained in:
pplokijuhyg 2020-01-06 15:12:30 +08:00
parent 3819a96576
commit ec445933f8
11 changed files with 86 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app.wxss
View File

@ -170,7 +170,6 @@ img {
* 2. Remove the margin in Firefox and Safari. * 2. Remove the margin in Firefox and Safari.
*/ */
button,
input, input,
optgroup, optgroup,
select, select,
@ -186,7 +185,6 @@ textarea {
* 1. Show the overflow in Edge. * 1. Show the overflow in Edge.
*/ */
button,
input { input {
/* 1 */ /* 1 */
overflow: visible; overflow: visible;
@ -197,7 +195,6 @@ input {
* 1. Remove the inheritance of text transform in Firefox. * 1. Remove the inheritance of text transform in Firefox.
*/ */
button,
select { select {
/* 1 */ /* 1 */
text-transform: none; text-transform: none;
@ -207,19 +204,11 @@ select {
* Correct the inability to style clickable types in iOS and Safari. * 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. * Remove the inner border and padding in Firefox.
*/ */
button::-moz-focus-inner,
[type="button"]::-moz-focus-inner,
[type="reset"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner,
[type="submit"]::-moz-focus-inner { [type="submit"]::-moz-focus-inner {
border-style: none; border-style: none;
@ -230,8 +219,7 @@ button::-moz-focus-inner,
* Restore the focus styles unset by the previous rule. * Restore the focus styles unset by the previous rule.
*/ */
button:-moz-focusring,
[type="button"]:-moz-focusring,
[type="reset"]:-moz-focusring, [type="reset"]:-moz-focusring,
[type="submit"]:-moz-focusring { [type="submit"]:-moz-focusring {
outline: 1px dotted ButtonText; outline: 1px dotted ButtonText;

3
components/chooseaddr/address/address.scss
View File

@ -8,7 +8,7 @@
; ;
.left { .left {
width: 576rpx; width: 576rpx;
height: 119rpx; // height: 119rpx;
.userinfo { .userinfo {
color: #333333; color: #333333;
font-size: 26rpx; font-size: 26rpx;
@ -35,6 +35,7 @@
text-indent: 30rpx; text-indent: 30rpx;
margin-top: 32rpx; margin-top: 32rpx;
width: 551rpx; width: 551rpx;
height: 50rpx;
margin-left: 20rpx; margin-left: 20rpx;
// display: flex; // display: flex;
.select { .select {

8
components/chooseaddr/address/address.wxml
View File

@ -8,16 +8,16 @@
</view> </view>
<view>邮政编码：{{youzheng}}</view> <view>邮政编码：{{youzheng}}</view>
</view> </view>
<view class="addr" wx:if="{{isdefault=='1'}}"> <view class="addr" wx:if="{{isdefault=='1'}}" bindtap="setdefault">
<view class="select selected" bindtap="setdefault"></view> <view class="select selected"></view>
<!-- <view class="default"></view> --> <!-- <view class="default"></view> -->
<view class="path"> <view class="path">
<text>默认</text> <text>默认</text>
{{address}} {{address}}
</view> </view>
</view> </view>
<view class="addr" wx:else> <view bindtap="setdefault" class="addr" wx:else>
<view class="select" bindtap="setdefault"></view> <view class="select"></view>
<!-- <view class="default"></view> --> <!-- <view class="default"></view> -->
<view class="path"> <view class="path">
<text>设为默认</text> <text>设为默认</text>

86
components/chooseaddr/address/address.wxss
View File

@ -1,85 +1 @@
.address { .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}
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;
}

6
components/shopping/shoppingitem/shoppingitem.wxml
View File

@ -1,8 +1,8 @@
<view class="shoppingitem"> <view class="shoppingitem">
<view class="select {{select ? 'selects':''}}" bind:tap="sel"></view> <view style="height: 200rpx;width:46rpx" bind:tap="sel">
<view class="pic"> <view class="select {{select ? 'selects':''}}"></view>
<image src="{{pic}}"></image>
</view> </view>
<image src="{{pic}}" class="pic"></image>
<view class="shopinfo"> <view class="shopinfo">
<view class="shopname">{{shopname}}</view> <view class="shopname">{{shopname}}</view>
<view class="shopdesc">{{shopdesc}}</view> <view class="shopdesc">{{shopdesc}}</view>

2
components/shopping/shoppingitem/shoppingitem.wxss
View File

@ -10,7 +10,7 @@
height: 26rpx; height: 26rpx;
background: rgba(234, 234, 234, 1); background: rgba(234, 234, 234, 1);
border-radius: 50%; border-radius: 50%;
margin: auto 0; margin: 87rpx 10rpx;
} }
.selects{ .selects{
background-color: #45C778; background-color: #45C778;

3
pages/addaddress/addaddress.js
View File

@ -230,6 +230,9 @@ Page({
title:res.data.msg, title:res.data.msg,
icon:"none" icon:"none"
}) })
wx.navigateBack({
delta:1
})
}) })
}) })

45
pages/personal/personal.scss
View File

@ -1,13 +1,13 @@
.box{ .box {
// border-top: 1rpx solid #eaeaea; // border-top: 1rpx solid #eaeaea;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
.card{ .card {
width: 690rpx; width: 690rpx;
height: 313rpx; height: 313rpx;
background-color: #47C877; background-color: #47c877;
display: flex; display: flex;
box-sizing: border-box; box-sizing: border-box;
padding: 50rpx; padding: 50rpx;
@ -15,10 +15,10 @@
flex-direction: column; flex-direction: column;
color: #fff; color: #fff;
margin-top: 20rpx; margin-top: 20rpx;
.user{ .user {
display: flex; display: flex;
align-items: center; align-items: center;
.head{ .head {
width: 80rpx; width: 80rpx;
height: 80rpx; height: 80rpx;
margin-right: 32rpx; margin-right: 32rpx;
@ -26,36 +26,47 @@
background-color: #fff; background-color: #fff;
} }
} }
.balance{ .balance {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-top: 52rpx; margin-top: 52rpx;
} }
} }
.list{ .list {
display: flex; display: flex;
width: 690rpx; width: 690rpx;
margin-top: 33rpx; margin-top: 33rpx;
flex-direction: column; flex-direction: column;
.option{
border: 0;
outline: 0;
font-weight:initial;
} .option {
.option::after { border: none; }
.option{
width: 100%; width: 100%;
height: 80rpx; height: 80rpx;
margin-bottom: 15rpx; margin-bottom: 15rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 0 30rpx; padding: 0 30rpx;
box-shadow:2rpx 3rpx 16rpx 1rpx rgba(51,51,51,0.1); box-shadow: 2rpx 3rpx 16rpx 1rpx rgba(51, 51, 51, 0.1);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.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;
} }
} }
}
}

2
pages/personal/personal.wxml
View File

@ -18,7 +18,7 @@
<view>地址管理</view> <view>地址管理</view>
<view>></view> <view>></view>
</view> </view>
<button class="option" open-type="contact"> <button class="button" open-type="contact">
<view>在线客服</view> <view>在线客服</view>
<!-- <view><text style="font-size:28rpx;color:#999;">非会员 </text>></view> --> <!-- <view><text style="font-size:28rpx;color:#999;">非会员 </text>></view> -->
</button> </button>

2
pages/personal/personal.wxss
View File

@ -1 +1 @@
.box{display:flex;flex-direction:column;align-items:center}.box .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}.box .card .user{display:flex;align-items:center}.box .card .user .head{width:80rpx;height:80rpx;margin-right:32rpx;border-radius:50%;background-color:#fff}.box .card .balance{display:flex;flex-direction:column;margin-top:52rpx}.box .list{display:flex;width:690rpx;margin-top:33rpx;flex-direction:column}.box .list .option{border:0;outline:0;font-weight:initial}.box .list .option::after{border:none}.box .list .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} .box{display:flex;flex-direction:column;align-items:center}.box .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}.box .card .user{display:flex;align-items:center}.box .card .user .head{width:80rpx;height:80rpx;margin-right:32rpx;border-radius:50%;background-color:#fff}.box .card .balance{display:flex;flex-direction:column;margin-top:52rpx}.box .list{display:flex;width:690rpx;margin-top:33rpx;flex-direction:column}.box .list .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}.box .list .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}.box .list .button::after{border:none}

2
pages/shopping/shopping.wxml
View File

@ -15,7 +15,7 @@
<view class="left"> <view class="left">
<view bind:tap="call" class="select {{all ? 'selects':''}}"></view> <view bind:tap="call" class="select {{all ? 'selects':''}}"></view>
<text bind:tap="call" class="selectall">全选</text> <text bind:tap="call" class="selectall">全选</text>
<text class="pri">${{price}}</text> <text class="pri">￥{{price}}</text>
</view> </view>
<view class="right"> <view class="right">
<text class="del" bind:tap="del">删除</text> <text class="del" bind:tap="del">删除</text>