Compare commits

...

36 Commits

Author SHA1 Message Date
97aa1dca0c 玩啥那 2020-01-14 15:27:11 +08:00
67682de4c7 完善 2020-01-14 15:25:22 +08:00
5f652d6183 换系统 2020-01-14 09:56:18 +08:00
73d560e0c6 半完成 2020-01-11 17:37:29 +08:00
8e623028c4 提现 2020-01-08 15:51:23 +08:00
3fcdf4ce6c 修复 2020-01-08 15:18:51 +08:00
a342e22c8b 添加图片 2020-01-07 16:25:41 +08:00
703988e2db 添加图片 2020-01-07 08:56:10 +08:00
28e29a2a53 完成 2020-01-06 15:37:47 +08:00
ec445933f8 修复 2020-01-06 15:12:30 +08:00
3819a96576 index 2020-01-06 14:32:56 +08:00
9e65d5d6e4 $ 2020-01-03 15:39:23 +08:00
00e1b237e1 完成 2020-01-02 18:21:37 +08:00
2ca773a987 首页汇率 2020-01-02 14:29:44 +08:00
d2bdc02fc9 欧元 2020-01-02 14:28:07 +08:00
4152f5ffb6 添加支付宝微信验证 2020-01-02 08:40:37 +08:00
c0907aaa5c 登陆 2019-12-30 14:42:51 +08:00
fe9beef904 佣金 2019-12-30 11:39:55 +08:00
6c2e1acd4a 提现 2019-12-30 09:40:07 +08:00
1088d64c93 体现 2019-12-30 09:05:39 +08:00
17591d9e31 充值 2019-12-30 08:40:11 +08:00
c43448f961 充值 2019-12-28 16:31:20 +08:00
3f513f121a 订单 2019-12-28 14:27:57 +08:00
4140d8e8d6 余额 2019-12-28 10:13:48 +08:00
fa782d2a51 修改 2019-12-26 09:13:34 +08:00
01d1215d5d 搜索 2019-12-24 21:54:49 +08:00
ef6a5868f1 提交 2019-12-24 18:06:31 +08:00
6576aef374 完成 2019-12-24 16:48:20 +08:00
f9ef1a34bd 部分 2019-12-24 16:32:27 +08:00
68a7aea72c Merge branch 'master' of http://git.luyuan.tk/pplokijuhyg/deguodaigou into pplok 2019-12-24 15:02:17 +08:00
a10a1b0c08 登陆提示 2019-12-24 14:53:06 +08:00
843ba1f20e 标题 2019-12-24 14:47:52 +08:00
bb92c57227 半完成 2019-12-24 14:08:26 +08:00
92f0dd4c46 完成 2019-12-23 17:24:26 +08:00
7dd0d87e46 一半 2019-12-23 16:53:54 +08:00
9a53bca281 换系统 2019-12-23 10:04:09 +08:00
355 changed files with 8123 additions and 2340 deletions

View File

@ -70,3 +70,5 @@
- pages/member/member 会员商品 <br>
- member/membertop 会员商品顶部的字
- member/membershop 单个商品
- pages/deposit/deposit 提现
- pages/commission/commission 当前佣金

View File

@ -1,6 +1,8 @@
{
"pages": [
"pages/index/index",
"pages/share/share",
"pages/commission/commission",
"pages/login/login",
"pages/search/search",
"pages/shopping/shopping",
@ -20,11 +22,11 @@
"pages/sales1/sales1",
"pages/sales2/sales2",
"pages/member/member",
"pages/deposit/deposit",
"pages/yue/yue",
"pages/yongjin/yongjin",
"pages/yongjin/yongjin"
"pages/share/share"
],
"window": {
"backgroundTextStyle": "light",
@ -35,16 +37,27 @@
"tabBar": {
"list": [{
"pagePath": "pages/index/index",
"text": "首页"
"text": "首页",
"iconPath":"/utils/img/index.png",
"selectedIconPath":"/utils/img/indexs.png"
}, {
"pagePath": "pages/classify/classify",
"text": "分类"
"text": "分类",
"iconPath":"/utils/img/classify.png",
"selectedIconPath":"/utils/img/classifys.png"
}, {
"pagePath": "pages/shopping/shopping",
"text": "购物车"
"text": "购物车",
"iconPath":"/utils/img/shopping.png",
"selectedIconPath":"/utils/img/shoppings.png"
}, {
"pagePath": "pages/personal/personal",
"text": "我的"
"text": "我的",
"iconPath":"/utils/img/personal.png",
"selectedIconPath":"/utils/img/personals.png"
}]
},
"style": "v2",

713
app.wxss
View File

@ -1,357 +1,356 @@
/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
/* Document
========================================================================== */
/**
* 1. Correct the line height in all browsers.
* 2. Prevent adjustments of font size after orientation changes in iOS.
*/
html {
line-height: 1; /* 1 */
-webkit-text-size-adjust: 100%; /* 2 */
}
/* Sections
========================================================================== */
/**
* Remove the margin in all browsers.
*/
body {
margin: 0;
}
/**
* Render the `main` element consistently in IE.
*/
main {
display: block;
}
/**
* Correct the font size and margin on `h1` elements within `section` and
* `article` contexts in Chrome, Firefox, and Safari.
*/
h1 {
font-size: 2em;
margin: 0.67em 0;
}
/* Grouping content
========================================================================== */
/**
* 1. Add the correct box sizing in Firefox.
* 2. Show the overflow in Edge and IE.
*/
hr {
box-sizing: content-box; /* 1 */
height: 0; /* 1 */
overflow: visible; /* 2 */
}
/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/
pre {
font-family: monospace, monospace; /* 1 */
font-size: 1em; /* 2 */
}
/* Text-level semantics
========================================================================== */
/**
* Remove the gray background on active links in IE 10.
*/
a {
background-color: transparent;
}
/**
* 1. Remove the bottom border in Chrome 57-
* 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
*/
abbr[title] {
border-bottom: none; /* 1 */
text-decoration: underline; /* 2 */
text-decoration: underline dotted; /* 2 */
}
/**
* Add the correct font weight in Chrome, Edge, and Safari.
*/
b,
strong {
font-weight: bolder;
}
/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/
code,
kbd,
samp {
font-family: monospace, monospace; /* 1 */
font-size: 1em; /* 2 */
}
/**
* Add the correct font size in all browsers.
*/
small {
font-size: 80%;
}
/**
* Prevent `sub` and `sup` elements from affecting the line height in
* all browsers.
*/
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sub {
bottom: -0.25em;
}
sup {
top: -0.5em;
}
/* Embedded content
========================================================================== */
/**
* Remove the border on images inside links in IE 10.
*/
img {
border-style: none;
}
/* Forms
========================================================================== */
/**
* 1. Change the font styles in all browsers.
* 2. Remove the margin in Firefox and Safari.
*/
button,
input,
optgroup,
select,
textarea {
font-family: inherit; /* 1 */
font-size: 100%; /* 1 */
line-height: 1; /* 1 */
margin: 0; /* 2 */
}
/**
* Show the overflow in IE.
* 1. Show the overflow in Edge.
*/
button,
input {
/* 1 */
overflow: visible;
}
/**
* Remove the inheritance of text transform in Edge, Firefox, and IE.
* 1. Remove the inheritance of text transform in Firefox.
*/
button,
select {
/* 1 */
text-transform: none;
}
/**
* 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;
padding: 0;
}
/**
* 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;
}
/**
* Correct the padding in Firefox.
*/
fieldset {
padding: 0.35em 0.75em 0.625em;
}
/**
* 1. Correct the text wrapping in Edge and IE.
* 2. Correct the color inheritance from `fieldset` elements in IE.
* 3. Remove the padding so developers are not caught out when they zero out
* `fieldset` elements in all browsers.
*/
legend {
box-sizing: border-box; /* 1 */
color: inherit; /* 2 */
display: table; /* 1 */
max-width: 100%; /* 1 */
padding: 0; /* 3 */
white-space: normal; /* 1 */
}
/**
* Add the correct vertical alignment in Chrome, Firefox, and Opera.
*/
progress {
vertical-align: baseline;
}
/**
* Remove the default vertical scrollbar in IE 10+.
*/
textarea {
overflow: auto;
}
/**
* 1. Add the correct box sizing in IE 10.
* 2. Remove the padding in IE 10.
*/
[type="checkbox"],
[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
}
/**
* Correct the cursor style of increment and decrement buttons in Chrome.
*/
[type="number"]::-webkit-inner-spin-button,
[type="number"]::-webkit-outer-spin-button {
height: auto;
}
/**
* 1. Correct the odd appearance in Chrome and Safari.
* 2. Correct the outline style in Safari.
*/
[type="search"] {
-webkit-appearance: textfield; /* 1 */
outline-offset: -2px; /* 2 */
}
/**
* Remove the inner padding in Chrome and Safari on macOS.
*/
[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
/**
* 1. Correct the inability to style clickable types in iOS and Safari.
* 2. Change font properties to `inherit` in Safari.
*/
::-webkit-file-upload-button {
-webkit-appearance: button; /* 1 */
font: inherit; /* 2 */
}
/* Interactive
========================================================================== */
/*
* Add the correct display in Edge, IE 10+, and Firefox.
*/
details {
display: block;
}
/*
* Add the correct display in all browsers.
*/
summary {
display: list-item;
}
/* Misc
========================================================================== */
/**
* Add the correct display in IE 10+.
*/
template {
display: none;
}
/**
* Add the correct display in IE 10.
*/
[hidden] {
display: none;
}
image {
background-size: cover;
background-image: url("http://luyuan.tk/static/images/TIM%E5%9B%BE%E7%89%8720191214113605.jpg");
}
/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
/* Document
========================================================================== */
/**
* 1. Correct the line height in all browsers.
* 2. Prevent adjustments of font size after orientation changes in iOS.
*/
.towline {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}
html {
line-height: 1; /* 1 */
-webkit-text-size-adjust: 100%; /* 2 */
}
/* Sections
========================================================================== */
/**
* Remove the margin in all browsers.
*/
body {
margin: 0;
}
/**
* Render the `main` element consistently in IE.
*/
main {
display: block;
}
/**
* Correct the font size and margin on `h1` elements within `section` and
* `article` contexts in Chrome, Firefox, and Safari.
*/
h1 {
font-size: 2em;
margin: 0.67em 0;
}
/* Grouping content
========================================================================== */
/**
* 1. Add the correct box sizing in Firefox.
* 2. Show the overflow in Edge and IE.
*/
hr {
box-sizing: content-box; /* 1 */
height: 0; /* 1 */
overflow: visible; /* 2 */
}
/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/
pre {
font-family: monospace, monospace; /* 1 */
font-size: 1em; /* 2 */
}
/* Text-level semantics
========================================================================== */
/**
* Remove the gray background on active links in IE 10.
*/
a {
background-color: transparent;
}
/**
* 1. Remove the bottom border in Chrome 57-
* 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
*/
abbr[title] {
border-bottom: none; /* 1 */
text-decoration: underline; /* 2 */
text-decoration: underline dotted; /* 2 */
}
/**
* Add the correct font weight in Chrome, Edge, and Safari.
*/
b,
strong {
font-weight: bolder;
}
/**
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/
code,
kbd,
samp {
font-family: monospace, monospace; /* 1 */
font-size: 1em; /* 2 */
}
/**
* Add the correct font size in all browsers.
*/
small {
font-size: 80%;
}
/**
* Prevent `sub` and `sup` elements from affecting the line height in
* all browsers.
*/
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sub {
bottom: -0.25em;
}
sup {
top: -0.5em;
}
/* Embedded content
========================================================================== */
/**
* Remove the border on images inside links in IE 10.
*/
img {
border-style: none;
}
/* Forms
========================================================================== */
/**
* 1. Change the font styles in all browsers.
* 2. Remove the margin in Firefox and Safari.
*/
input,
optgroup,
select,
textarea {
font-family: inherit; /* 1 */
font-size: 100%; /* 1 */
line-height: 1; /* 1 */
margin: 0; /* 2 */
}
/**
* Show the overflow in IE.
* 1. Show the overflow in Edge.
*/
input {
/* 1 */
overflow: visible;
}
/**
* Remove the inheritance of text transform in Edge, Firefox, and IE.
* 1. Remove the inheritance of text transform in Firefox.
*/
select {
/* 1 */
text-transform: none;
}
/**
* Correct the inability to style clickable types in iOS and Safari.
*/
/**
* Remove the inner border and padding in Firefox.
*/
[type="reset"]::-moz-focus-inner,
[type="submit"]::-moz-focus-inner {
border-style: none;
padding: 0;
}
/**
* Restore the focus styles unset by the previous rule.
*/
[type="reset"]:-moz-focusring,
[type="submit"]:-moz-focusring {
outline: 1px dotted ButtonText;
}
/**
* Correct the padding in Firefox.
*/
fieldset {
padding: 0.35em 0.75em 0.625em;
}
/**
* 1. Correct the text wrapping in Edge and IE.
* 2. Correct the color inheritance from `fieldset` elements in IE.
* 3. Remove the padding so developers are not caught out when they zero out
* `fieldset` elements in all browsers.
*/
legend {
box-sizing: border-box; /* 1 */
color: inherit; /* 2 */
display: table; /* 1 */
max-width: 100%; /* 1 */
padding: 0; /* 3 */
white-space: normal; /* 1 */
}
/**
* Add the correct vertical alignment in Chrome, Firefox, and Opera.
*/
progress {
vertical-align: baseline;
}
/**
* Remove the default vertical scrollbar in IE 10+.
*/
textarea {
overflow: auto;
}
/**
* 1. Add the correct box sizing in IE 10.
* 2. Remove the padding in IE 10.
*/
[type="checkbox"],
[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
}
/**
* Correct the cursor style of increment and decrement buttons in Chrome.
*/
[type="number"]::-webkit-inner-spin-button,
[type="number"]::-webkit-outer-spin-button {
height: auto;
}
/**
* 1. Correct the odd appearance in Chrome and Safari.
* 2. Correct the outline style in Safari.
*/
[type="search"] {
-webkit-appearance: textfield; /* 1 */
outline-offset: -2px; /* 2 */
}
/**
* Remove the inner padding in Chrome and Safari on macOS.
*/
[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
/**
* 1. Correct the inability to style clickable types in iOS and Safari.
* 2. Change font properties to `inherit` in Safari.
*/
::-webkit-file-upload-button {
-webkit-appearance: button; /* 1 */
font: inherit; /* 2 */
}
/* Interactive
========================================================================== */
/*
* Add the correct display in Edge, IE 10+, and Firefox.
*/
details {
display: block;
}
/*
* Add the correct display in all browsers.
*/
summary {
display: list-item;
}
/* Misc
========================================================================== */
/**
* Add the correct display in IE 10+.
*/
template {
display: none;
}
/**
* Add the correct display in IE 10.
*/
[hidden] {
display: none;
}
image {
background-size: cover;
/* background-image: url("http://luyuan.tk/static/images/TIM%E5%9B%BE%E7%89%8720191214113605.jpg"); */
}

View File

@ -1,31 +1,31 @@
// components/addaddress/shuru/shuru.js
Component({
/**
* 组件的属性列表
*/
properties: {
left: String,
right: String,
ifarrow: Boolean,
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
get(e){
// console.log(e)
this.triggerEvent('myevent', e.detail.value)
},
choose(e){
}
}
// components/addaddress/shuru/shuru.js
Component({
/**
* 组件的属性列表
*/
properties: {
left: String,
right: String,
ifarrow: Boolean,
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
get(e){
// console.log(e)
this.triggerEvent('myevent', e.detail.value)
},
choose(e){
}
}
})

View File

@ -1,4 +1,4 @@
{
"component": true,
"usingComponents": {}
{
"component": true,
"usingComponents": {}
}

View File

@ -25,11 +25,10 @@
color: #333333;
}
.arrow {
width: 14rpx;
width: 21rpx;
height: 25rpx;
background-color: #999999;
margin: auto 0;
margin-left: 27rpx;
margin-left: 20rpx;
}
}
}

View File

@ -2,7 +2,7 @@
<view class="left">{{left}}</view>
<view class="right"wx:if="{{ifarrow}}" bindtap="choose">
<text class="shurupla1">{{right}}</text>
<view class="arrow"></view>
<image class="arrow" src="../../../utils/img/right.png"></image>
</view>
<view class="right" wx:else>
<input type="text" placeholder-class="shurupla" class="shuru1" placeholder="{{right}}" value="" bindinput="get" no="0" data-left="{{left}}"/>

View File

@ -1,41 +1 @@
.shuru {
width: 670rpx;
height: 100rpx;
border-bottom: 2rpx solid #E8E8E8;
margin: 0 auto;
display: flex;
justify-content: space-between;
line-height: 100rpx;
font-size: 28rpx;
}
.shuru .left {
color: #333333;
}
.shuru .right {
margin: auto 0;
display: flex;
}
.shuru .right .shuru1 {
width: 280rpx;
text-align: right;
}
.shuru .right .shurupla {
color: #999999;
font-size: 28rpx;
}
.shuru .right .shurupla1 {
color: #333333;
}
.shuru .right .arrow {
width: 14rpx;
height: 25rpx;
background-color: #999999;
margin: auto 0;
margin-left: 27rpx;
}
.shuru{width:670rpx;height:100rpx;border-bottom:2rpx solid #E8E8E8;margin:0 auto;display:flex;justify-content:space-between;line-height:100rpx;font-size:28rpx}.shuru .left{color:#333333}.shuru .right{margin:auto 0;display:flex}.shuru .right .shuru1{width:280rpx;text-align:right}.shuru .right .shurupla{color:#999999;font-size:28rpx}.shuru .right .shurupla1{color:#333333}.shuru .right .arrow{width:21rpx;height:25rpx;margin:auto 0;margin-left:20rpx}

View File

@ -1,23 +1,23 @@
// components/chooseaddr/addradd/addradd.js
Component({
/**
* 组件的属性列表
*/
properties: {
text: String
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
// components/chooseaddr/addradd/addradd.js
Component({
/**
* 组件的属性列表
*/
properties: {
text: String
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

View File

@ -1,4 +1,4 @@
{
"component": true,
"usingComponents": {}
{
"component": true,
"usingComponents": {}
}

View File

@ -1,35 +1,35 @@
// components/chooseaddr/address/address.js
Component({
/**
* 组件的属性列表
*/
properties: {
username:String,
tel:String,
address:String,
isdefault:String,
youzheng:String,
addressid:String
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
del(){
// console.log("del")
this.triggerEvent('delete')
},
setdefault(){
this.triggerEvent('default',this.data.addressid)
}
}
})
// components/chooseaddr/address/address.js
Component({
/**
* 组件的属性列表
*/
properties: {
username:String,
tel:String,
address:String,
isdefault:String,
youzheng:String,
addressid:String
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
del(){
// console.log("del")
this.triggerEvent('delete')
},
setdefault(){
this.triggerEvent('default',this.data.addressid)
}
}
})

View File

@ -1,4 +1,4 @@
{
"component": true,
"usingComponents": {}
{
"component": true,
"usingComponents": {}
}

View File

@ -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 {
@ -59,7 +60,7 @@
}
.path {
// float: left;
line-height: 25rpx;
// line-height: 25rpx;
}
}
}

View File

@ -1,30 +1,30 @@
<view class="address">
<view class="left">
<view class="userinfo">
<view class="username">
<view class="username1">{{username}}</view>
<view class="tel">{{tel}}</view>
</view>
<view>邮政编码:{{youzheng}}</view>
</view>
<view class="addr" wx:if="{{isdefault=='1'}}">
<view class="select selected" bindtap="setdefault"></view>
<!-- <view class="default"></view> -->
<view class="path">
<text>默认</text>
{{address}}
</view>
</view>
<view class="addr" wx:else>
<view class="select" bindtap="setdefault"></view>
<!-- <view class="default"></view> -->
<view class="path">
<text>设为默认</text>
{{address}}
</view>
</view>
</view>
<view class="line"></view>
<view class="right" bindtap="del">删除</view>
<view class="address">
<view class="left">
<view class="userinfo">
<view class="username">
<view class="username1">{{username}}</view>
<view class="tel">{{tel}}</view>
</view>
<view>邮政编码:{{youzheng}}</view>
</view>
<view class="addr" wx:if="{{isdefault=='1'}}" bindtap="setdefault">
<view class="select selected"></view>
<!-- <view class="default"></view> -->
<view class="path">
<text>默认</text>
{{address}}
</view>
</view>
<view bindtap="setdefault" class="addr" wx:else>
<view class="select"></view>
<!-- <view class="default"></view> -->
<view class="path">
<text>设为默认</text>
{{address}}
</view>
</view>
</view>
<view class="line"></view>
<view class="right" bindtap="del">删除</view>
</view>

View File

@ -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 .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}

View File

@ -48,13 +48,20 @@
display: flex;
align-items: center;
justify-content: space-between;
> text:first-child {
font-size: 30rpx;
> view:first-child {
// font-size: 30rpx;
color: #dec499;
}
> text:last-child {
// > text:last-child {
// font-size: 22rpx;
// color: #999;
// }
> view {
font-size: 22rpx;
color: #999;
>text{
font-size: 20rpx;
}
}
}
}

View File

@ -5,8 +5,8 @@
<view class="introduce">
<text class="towline">{{item.goods_name}}</text>
<view>
<text>¥{{item.shop_price}}</text>
<text>加入购物车</text>
<view>€{{item.shop_price_eur}}<text>(¥{{item.shop_price}})</text></view>
<view>加入购物车</view>
</view>
</view>
</view>

View File

@ -1 +1 @@
.list{padding-left:20rpx;width:572rpx;box-sizing:border-box;height:100vh}.list .commodity{width:552rpx;display:flex;align-items:center}.list .commodity .content{width:552rpx;height:100%;display:flex;align-items:center;border-bottom:2rpx solid #eaeaea;padding:30rpx 0}.list .commodity .content .imgthumb{width:105rpx;height:105rpx;margin-left:40rpx;background-color:#333}.list .commodity .content .introduce{width:336rpx;margin-left:40rpx;display:flex;flex-direction:column}.list .commodity .content .introduce .towline{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}.list .commodity .content .introduce>text{font-size:22rpx;color:#333;margin-bottom:22rpx}.list .commodity .content .introduce>view{display:flex;align-items:center;justify-content:space-between}.list .commodity .content .introduce>view>text:first-child{font-size:30rpx;color:#dec499}.list .commodity .content .introduce>view>text:last-child{font-size:22rpx;color:#999}
.list{padding-left:20rpx;width:572rpx;box-sizing:border-box;height:100vh}.list .commodity{width:552rpx;display:flex;align-items:center}.list .commodity .content{width:552rpx;height:100%;display:flex;align-items:center;border-bottom:2rpx solid #eaeaea;padding:30rpx 0}.list .commodity .content .imgthumb{width:105rpx;height:105rpx;margin-left:40rpx;background-color:#333}.list .commodity .content .introduce{width:336rpx;margin-left:40rpx;display:flex;flex-direction:column}.list .commodity .content .introduce .towline{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}.list .commodity .content .introduce>text{font-size:22rpx;color:#333;margin-bottom:22rpx}.list .commodity .content .introduce>view{display:flex;align-items:center;justify-content:space-between}.list .commodity .content .introduce>view>view:first-child{color:#dec499}.list .commodity .content .introduce>view>view{font-size:22rpx;color:#999}.list .commodity .content .introduce>view>view>text{font-size:20rpx}

View File

@ -1,16 +1,17 @@
Component({
properties: {
types: Array
types: Array,
ids: Number
},
data: {
id: 0
},
methods: {
select(a) {
// console.log(this.data.a.target.dataset.id)
// console.log(a.target.dataset.id)
this.setData({
id: a.target.dataset.id
ids: a.target.dataset.id
})
this.triggerEvent("select",{id:a.target.dataset.id})
}

View File

@ -8,7 +8,7 @@
font-size: 28rpx;
color: #333;
border-bottom: 2rpx solid #eaeaea;
line-height: 97rpx;
line-height: 95rpx;
font-weight: bold;
text-align: center;
box-sizing: border-box;

View File

@ -1,5 +1,6 @@
<scroll-view class="navigation" scroll-y="{{true}}" bind:tap="select" >
<view wx:for="{{types}}" data-id="{{index}}" class="{{id == index?'on' : ''}}">{{item.name}}</view>
<!-- {{ids}} -->
<view wx:for="{{types}}" data-id="{{item.id}}" class="{{ids == item.id?'on' : ''}}">{{item.name}}</view>
<!-- <view data-id="0" class="{{id == 0?'on' : ''}}">热门商品</view>
<view data-id="1" class="{{id == 1?'on' : ''}}">美容健身</view>
<view data-id="2" class="{{id == 2?'on' : ''}}">美容健身</view>

View File

@ -1 +1 @@
.navigation{width:188rpx;border-right:2rpx solid #eaeaea;max-height:100vh}.navigation view{height:97rpx;font-size:28rpx;color:#333;border-bottom:2rpx solid #eaeaea;line-height:97rpx;font-weight:bold;text-align:center;box-sizing:border-box}.navigation .on{border-left:5rpx solid #56CC84;color:#56CC84}
.navigation{width:188rpx;border-right:2rpx solid #eaeaea;max-height:100vh}.navigation view{height:97rpx;font-size:28rpx;color:#333;border-bottom:2rpx solid #eaeaea;line-height:95rpx;font-weight:bold;text-align:center;box-sizing:border-box}.navigation .on{border-left:5rpx solid #56CC84;color:#56CC84}

View File

@ -4,7 +4,8 @@ Component({
title:String,
id:String,
price:String,
shopid:String
shopid:String,
shoppriceeur:String
},
data: {},
methods: {

View File

@ -39,13 +39,20 @@
display: flex;
align-items: center;
justify-content: space-between;
> text:first-child {
font-size: 30rpx;
> view:first-child {
// font-size: 30rpx;
color: #dec499;
}
> text:last-child {
// > text:last-child {
// font-size: 22rpx;
// color: #999;
// }
> view {
font-size: 22rpx;
color: #999;
>text{
font-size: 20rpx;
}
}
}
}

View File

@ -5,8 +5,8 @@
<text class="towline">{{title}}</text>
<view>
<text>¥{{price}}</text>
<text>加入购物车</text>
<view>€{{shoppriceeur}}<text>(¥{{price}})</text></view>
<view>加入购物车</view>
</view>
</view>
</view>

View File

@ -1 +1 @@
.commodity{width:623rpx;height:143rpx;margin-top:32rpx;display:flex;align-items:center}.commodity .content{width:614rpx;height:100%;display:flex;align-items:center;box-shadow:0 0 24rpx 0 rgba(227,227,227,0.4)}.commodity .content .imgthumb{width:105rpx;height:105rpx;margin-left:40rpx;background-color:#333}.commodity .content .introduce{width:410rpx;margin-left:40rpx;display:flex;flex-direction:column}.commodity .content .introduce>text{font-size:26rpx;color:#333;margin-bottom:22rpx;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}.commodity .content .introduce>view{display:flex;align-items:center;justify-content:space-between}.commodity .content .introduce>view>text:first-child{font-size:30rpx;color:#dec499}.commodity .content .introduce>view>text:last-child{font-size:22rpx;color:#999}.commodity .decorate{width:9rpx;height:102rpx;background-color:#3fb66e}
.commodity{width:623rpx;height:143rpx;margin-top:32rpx;display:flex;align-items:center}.commodity .content{width:614rpx;height:100%;display:flex;align-items:center;box-shadow:0 0 24rpx 0 rgba(227,227,227,0.4)}.commodity .content .imgthumb{width:105rpx;height:105rpx;margin-left:40rpx;background-color:#333}.commodity .content .introduce{width:410rpx;margin-left:40rpx;display:flex;flex-direction:column}.commodity .content .introduce>text{font-size:26rpx;color:#333;margin-bottom:22rpx;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}.commodity .content .introduce>view{display:flex;align-items:center;justify-content:space-between}.commodity .content .introduce>view>view:first-child{color:#dec499}.commodity .content .introduce>view>view{font-size:22rpx;color:#999}.commodity .content .introduce>view>view>text{font-size:20rpx}.commodity .decorate{width:9rpx;height:102rpx;background-color:#3fb66e}

View File

@ -1,6 +1,7 @@
Component({
properties: {
list:Array
list:Array,
huilv:String
},
data: {
},

View File

@ -1,12 +1,18 @@
.list {
width: 623rpx;
margin-top: 36rpx;
.title {
font-size: 30rpx;
color: #333;
font-weight: bold;
margin-left: 32rpx;
width: 623rpx;
margin-top: 36rpx;
.title {
font-size: 30rpx;
color: #333;
font-weight: bold;
margin-left: 32rpx;
// margin-bottom: 32rpx;
display: flex;
align-items: center;
justify-content: space-between;
> text:last-child {
font-size: 24rpx;
color: #666;
}
}
}
}

View File

@ -1,4 +1,7 @@
<view class="list">
<text class="title">热门商品</text>
<commodity wx:for="{{list}}" title="{{item.goods_name}}" price="{{item.shop_price}}" img="{{item.image}}" shopid="{{item.goods_id}}"></commodity>
</view>
<view class="list">
<view class="title">
<text>热门商品</text>
<text>实时汇率€1=¥{{huilv}}</text>
</view>
<commodity wx:for="{{list}}" title="{{item.goods_name}}" price="{{item.shop_price}}" img="{{item.image}}" shopid="{{item.goods_id}}" shoppriceeur="{{item.shop_price_eur}}"></commodity>
</view>

View File

@ -1 +1 @@
.list{width:623rpx;margin-top:36rpx}.list .title{font-size:30rpx;color:#333;font-weight:bold;margin-left:32rpx}
.list{width:623rpx;margin-top:36rpx}.list .title{font-size:30rpx;color:#333;font-weight:bold;margin-left:32rpx;display:flex;align-items:center;justify-content:space-between}.list .title>text:last-child{font-size:24rpx;color:#666}

View File

@ -4,5 +4,11 @@ Component({
data: {
},
methods: {
search(a){
console.log(a)
wx.navigateTo({
url:"/pages/search/search?key=" + a.detail.value
})
}
}
})

View File

@ -9,7 +9,7 @@
>image{
width: 42rpx;
height: 42rpx;
background-color: #000;
// background-color: #000;
margin-left: 40rpx;
margin-top: 17rpx;
}

View File

@ -1,4 +1,4 @@
<view class="search">
<image></image>
<input type="text" placeholder="输入您要搜索的产品" />
<image src="../../../utils/img/search.png"></image>
<input type="text" confirm-type="search " bindconfirm="search" placeholder="输入您要搜索的产品" />
</view>

View File

@ -1 +1 @@
.search{width:613rpx;height:76rpx;margin-top:30rpx;box-sizing:border-box;border-radius:15rpx;display:flex;border:1rpx solid #c6c6c6}.search>image{width:42rpx;height:42rpx;background-color:#000;margin-left:40rpx;margin-top:17rpx}.search>input{height:30rpx;width:480rpx;margin-top:20rpx;margin-left:17rpx;font-size:30rpx}
.search{width:613rpx;height:76rpx;margin-top:30rpx;box-sizing:border-box;border-radius:15rpx;display:flex;border:1rpx solid #c6c6c6}.search>image{width:42rpx;height:42rpx;margin-left:40rpx;margin-top:17rpx}.search>input{height:30rpx;width:480rpx;margin-top:20rpx;margin-left:17rpx;font-size:30rpx}

View File

@ -1,23 +1,35 @@
// components/member/membershop/membershop.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})
// components/member/membershop/membershop.js
Component({
/**
* 组件的属性列表
*/
properties: {
img: String,
name: String,
price: String,
oprice: String,
gid:String
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
nav(){
console.log(this.data.gid)
wx.navigateTo({
url:"/pages/product/product?shopid=" + this.data.gid,
fail(a){
console.log(a)
}
})
}
}
})

View File

@ -1,4 +1,4 @@
{
"component": true,
"usingComponents": {}
{
"component": true,
"usingComponents": {}
}

View File

@ -3,13 +3,13 @@
height: 557rpx;
background-color: #FBFBFB;
.pic {
width: 113rpx;
width: 256rpx;
height: 256rpx;
background-color: white;
margin: 0 auto;
position: relative;
top: 64rpx;
left: 121rpx;
left: 64rpx;
}
.shopname {
width: 273rpx;
@ -26,5 +26,19 @@
text-align: center;
font-size: 30rpx;
color: #09BB07;
>view:last-child{
font-size: 24rpx;
}
}
.towline {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}
}

View File

@ -1,6 +1,5 @@
<view class="membershop">
<image class="pic"></image>
<view class="shopname">产品名产品名产品名
产品名产品名</view>
<view class="pri">$123</view>
<view class="membershop" bind:tap="nav">
<image class="pic" src="{{img}}"></image>
<view class="shopname towline">{{name}}</view>
<view class="pri"><view>€{{oprice}}</view><view>¥{{price}}</view></view>
</view>

View File

@ -1,33 +1 @@
.membershop {
width: 373rpx;
height: 557rpx;
background-color: #FBFBFB;
}
.membershop .pic {
width: 113rpx;
height: 256rpx;
background-color: white;
margin: 0 auto;
position: relative;
top: 64rpx;
left: 121rpx;
}
.membershop .shopname {
width: 273rpx;
color: #333333;
font-size: 30rpx;
text-align: center;
position: relative;
top: 111rpx;
margin: 0 auto;
}
.membershop .pri {
position: relative;
top: 127rpx;
text-align: center;
font-size: 30rpx;
color: #09BB07;
}
.membershop{width:373rpx;height:557rpx;background-color:#FBFBFB}.membershop .pic{width:256rpx;height:256rpx;background-color:white;margin:0 auto;position:relative;top:64rpx;left:64rpx}.membershop .shopname{width:273rpx;color:#333333;font-size:30rpx;text-align:center;position:relative;top:111rpx;margin:0 auto}.membershop .pri{position:relative;top:127rpx;text-align:center;font-size:30rpx;color:#09BB07}.membershop .pri>view:last-child{font-size:24rpx}.membershop .towline{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}

View File

@ -1,23 +1,23 @@
// components/member/membertop/membertop.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})
// components/member/membertop/membertop.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

View File

@ -1,4 +1,4 @@
{
"component": true,
"usingComponents": {}
{
"component": true,
"usingComponents": {}
}

View File

@ -1,3 +1,3 @@
<view class="membertop">
购买下方商品成为会员
<view class="membertop">
购买下方商品成为会员
</view>

View File

@ -1,9 +1,9 @@
.membertop {
width: 100%;
height: 86rpx;
border-top: 2rpx solid #E8E8E8;
color: #999999;
font-size: 24rpx;
line-height: 86rpx;
text-indent: 30rpx;
}
.membertop {
width: 100%;
height: 86rpx;
border-top: 2rpx solid #E8E8E8;
color: #999999;
font-size: 24rpx;
line-height: 86rpx;
text-indent: 30rpx;
}

View File

@ -1,10 +1,67 @@
import bin from "../../../utils/bin"
Component({
properties: {},
properties: {
num: String,
cprice: String,
freight: String,
goods: Array,
gid: String,
type:String
},
data: {},
methods: {
todetail() {
wx.navigateTo({
url: "/pages/undetermined/undetermined"
shouhuo(){
bin.getuserid().then((id)=>{
bin.request({
url:"User/orderConfirm",
urldata:{
user_id:id,
order_id:this.data.gid
}
}).then((res)=>{
console.log(res)
this.triggerEvent('shua', { bubbles: true,composed: true })
})
})
},
cancel() {
bin.getuserid().then((id) => {
bin.request({
url: "User/cancelOrder",
urldata: {
user_id: id,
order_id: this.data.gid
}
}).then((res) => {
console.log(res)
this.triggerEvent('shua', { bubbles: true,composed: true })
})
})
},
pay(){
bin.getuserid().then((id)=>{
bin.request({
url:"Cart/getWXPayData",
urldata:{
user_id:id,
order_id:this.data.gid
}
}).then((res)=>{
console.log(res)
wx.requestPayment({
timeStamp:res.data.result.wdata.timeStamp + "",
nonceStr:res.data.result.wdata.nonceStr,
package:res.data.result.wdata.package,
signType:"MD5",
paySign:res.data.result.wdata.sign,
complete(){
this.triggerEvent('shua', { bubbles: true,composed: true })
}
})
})
})
}
}

View File

@ -9,7 +9,7 @@
.image {
width: 141rpx;
height: 150rpx;
background-color: #000;
// background-color: #000;
margin-left: 34rpx;
}
.introduce {

View File

@ -1,14 +1,16 @@
<view class="commodity" bindtap="todetail">
<message></message>
<view class="aggregate">
共计1件商品 合计:
<text>¥29.80</text>
(含运费¥0.00)
</view>
<view class="operation">
<view class="button">评价</view>
<view class="button hlight">评价</view>
</view>
</view>
<view class="commodity">
<message wx:for="{{goods}}" title="{{item.goods_name}}" spec="{{item.spec_key_name}}" price="{{item.goods_price}}" num="{{item.goods_num}}" image="{{item.image}}"></message>
<view class="aggregate">
共计{{num}}件商品 合计:
<text>¥{{cprice}}</text>
(含运费¥{{freight}})
</view>
<view class="operation" wx:if="{{type == 1}}">
<view class="button" catch:tap="cancel">取消订单</view>
<view class="button hlight" catch:tap="pay">立即付款</view>
</view>
<view class="operation" wx:if="{{type == 3}}">
<!-- <view class="button" catch:tap="cancel">取消订单</view> -->
<view class="button hlight" catch:tap="shouhuo">确认收货</view>
</view>
</view>

View File

@ -1 +1 @@
.commodity{margin-top:20rpx;background-color:#fff}.commodity .message{padding:35rpx;display:flex;align-items:center;border-bottom:1rpx solid #F2F2F2}.commodity .message .image{width:141rpx;height:150rpx;background-color:#000;margin-left:34rpx}.commodity .message .introduce{margin-left:32rpx;height:120rpx;display:flex;flex-direction:column;justify-content:space-between;width:362rpx}.commodity .message .introduce .title{font-size:28rpx;color:#333}.commodity .message .introduce .count{font-size:24rpx;color:#999;display:flex}.commodity .message .introduce .count>view{margin-right:27rpx}.commodity .message .parameter{width:150rpx;height:120rpx;display:flex;flex-direction:column;justify-content:space-between;align-items:flex-end}.commodity .aggregate{display:flex;box-sizing:border-box;padding:30rpx;justify-content:flex-end;font-size:22rpx;color:#999;height:78rpx;border-bottom:1rpx solid #F2F2F2}.commodity .aggregate>text{color:#333;margin:0 5rpx}.commodity .operation{height:84rpx;display:flex;justify-content:flex-end;padding:0 30rpx;align-items:center}.commodity .operation .button{width:133rpx;height:51rpx;border:2rpx solid #999999;border-radius:26rpx;text-align:center;font-size:22rpx;color:#999999;line-height:51rpx;margin-right:8rpx}.commodity .operation .hlight{border:2rpx solid #47c877;color:#47C877}
.commodity{margin-top:20rpx;background-color:#fff}.commodity .message{padding:35rpx;display:flex;align-items:center;border-bottom:1rpx solid #F2F2F2}.commodity .message .image{width:141rpx;height:150rpx;margin-left:34rpx}.commodity .message .introduce{margin-left:32rpx;height:120rpx;display:flex;flex-direction:column;justify-content:space-between;width:362rpx}.commodity .message .introduce .title{font-size:28rpx;color:#333}.commodity .message .introduce .count{font-size:24rpx;color:#999;display:flex}.commodity .message .introduce .count>view{margin-right:27rpx}.commodity .message .parameter{width:150rpx;height:120rpx;display:flex;flex-direction:column;justify-content:space-between;align-items:flex-end}.commodity .aggregate{display:flex;box-sizing:border-box;padding:30rpx;justify-content:flex-end;font-size:22rpx;color:#999;height:78rpx;border-bottom:1rpx solid #F2F2F2}.commodity .aggregate>text{color:#333;margin:0 5rpx}.commodity .operation{height:84rpx;display:flex;justify-content:flex-end;padding:0 30rpx;align-items:center}.commodity .operation .button{width:133rpx;height:51rpx;border:2rpx solid #999999;border-radius:26rpx;text-align:center;font-size:22rpx;color:#999999;line-height:51rpx;margin-right:8rpx}.commodity .operation .hlight{border:2rpx solid #47c877;color:#47C877}

View File

@ -1,5 +1,10 @@
Component({
properties: {
title:String,
spec:String,
price:String,
num:String,
image:String
},
data: {
},

View File

@ -1,3 +1,14 @@
.towline {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}
.message {
padding: 35rpx;
display: flex;
@ -6,7 +17,7 @@ border-bottom: 1rpx solid #F2F2F2;
.image {
width: 141rpx;
height: 150rpx;
background-color: #000;
// background-color: #000;
margin-left: 34rpx;
}
.introduce {

View File

@ -1,14 +1,14 @@
<view class="message">
<image class="image"></image>
<image class="image" src="{{image}}"></image>
<view class="introduce">
<view class="title">001|德国双心药房版 胶原蛋白美容口服液养颜</view>
<view class="title towline">{{title}}</view>
<view class="count">
<view>30只</view>
<view>1.0356kg</view>
<view>{{spec}}</view>
<!-- <view>1.0356kg</view> -->
</view>
</view>
<view class="parameter">
<view class="price">¥29.80</view>
<view class="num">x2</view>
<view class="price">¥{{price}}</view>
<view class="num">x{{num}}</view>
</view>
</view>

View File

@ -1 +1 @@
.message{padding:35rpx;display:flex;align-items:center;border-bottom:1rpx solid #F2F2F2}.message .image{width:141rpx;height:150rpx;background-color:#000;margin-left:34rpx}.message .introduce{margin-left:32rpx;height:120rpx;display:flex;flex-direction:column;justify-content:space-between;width:362rpx}.message .introduce .title{font-size:28rpx;color:#333}.message .introduce .count{font-size:24rpx;color:#999;display:flex}.message .introduce .count>view{margin-right:27rpx}.message .parameter{width:150rpx;height:120rpx;display:flex;flex-direction:column;justify-content:space-between;align-items:flex-end}
.towline{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}.message{padding:35rpx;display:flex;align-items:center;border-bottom:1rpx solid #F2F2F2}.message .image{width:141rpx;height:150rpx;margin-left:34rpx}.message .introduce{margin-left:32rpx;height:120rpx;display:flex;flex-direction:column;justify-content:space-between;width:362rpx}.message .introduce .title{font-size:28rpx;color:#333}.message .introduce .count{font-size:24rpx;color:#999;display:flex}.message .introduce .count>view{margin-right:27rpx}.message .parameter{width:150rpx;height:120rpx;display:flex;flex-direction:column;justify-content:space-between;align-items:flex-end}

View File

@ -1,8 +1,114 @@
import bin from "../../../utils/bin"
Component({
properties: {
index:Number
},
data: {
},
methods: {
receivingw(a){
// receiving
wx.navigateTo({
url: "/pages/receiving/receiving?id=" + a.target.dataset.id
})
},
receivings(a){
console.log(a)
wx.navigateTo({
url: "/pages/undetermined/undetermined?id=" + a.target.dataset.id
})
},
todetail(a) {
console.log(a)
// return ;
wx.navigateTo({
url: "/pages/particulars/particulars?id=" + a.target.dataset.id
})
},
getorder(res){
bin.request({
url:"User/getOrderList",
urldata:{
user_id:res,
type:"WAITPAY",
page:"0"
}
}).then((r)=>{
console.log(r)
this.setData({
WAITPAY:r.data.result
})
})
bin.request({
url:"User/getOrderList",
urldata:{
user_id:res,
type:"WAITSEND",
page:"0"
}
}).then((r)=>{
console.log(r)
this.setData({
WAITSEND:r.data.result
})
})
bin.request({
url:"User/getOrderList",
urldata:{
user_id:res,
type:"WAITRECEIVE",
page:"0"
}
}).then((r)=>{
console.log(r)
this.setData({
WAITRECEIVE:r.data.result
})
})
bin.request({
url:"User/getOrderList",
urldata:{
user_id:res,
type:"FINISH",
page:"0"
}
}).then((r)=>{
console.log(r)
this.setData({
FINISH:r.data.result
})
})
bin.request({
url:"User/getOrderList",
urldata:{
user_id:res,
type:"AFTERSALE",
page:"0"
}
}).then((r)=>{
console.log(r)
this.setData({
AFTERSALE:r.data.result
})
})
},
getlist(){
bin.getuserid().then((res)=>{
this.getorder(res)
})
} ,
receiving(){
},
shua(){
console.log(123)
this.getlist()
}
},
ready(){
this.getlist()
}
})

View File

@ -1,9 +1,17 @@
<van-tabs class="tab" swipe-threshold="5">
<van-tab title="待付款">
<commodity></commodity>
</van-tab>
<van-tab title="代发货"></van-tab>
<van-tab title="待收货"> </van-tab>
<van-tab title="已完成"> </van-tab>
<van-tab title="售后"> </van-tab>
</van-tabs>
<van-tabs class="tab" swipe-threshold="5" active="{{index}}">
<van-tab title="待付款" bind:tap="todetail">
<commodity bind:shua="shua" wx:for="{{WAITPAY}}" wx:for-index="j" wx:key="{{j}}" data-id="{{item.order_id}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}" gid="{{item.order_id}}" type="1"></commodity>
</van-tab>
<van-tab title="待发货" bind:tap="receivings">
<commodity bind:shua="shua" wx:for="{{WAITSEND}}" wx:for-index="j" wx:key="{{j}}" data-id="{{item.order_id}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
</van-tab>
<van-tab title="待收货" bind:tap="receivingw">
<commodity bind:shua="shua" wx:for="{{WAITRECEIVE}}" wx:for-index="j" wx:key="{{j}}" type="3" data-id="{{item.order_id}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" gid="{{item.order_id}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
</van-tab>
<van-tab title="已完成" bind:tap="receivingw">
<commodity bind:shua="shua" wx:for="{{FINISH}}" wx:for-index="j" wx:key="{{j}}" data-id="{{item.order_id}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
</van-tab>
<van-tab title="售后">
<commodity bind:shua="shua" wx:for="{{AFTERSALE}}" wx:for-index="j" wx:key="{{j}}" data-id="{{item.order_id}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
</van-tab>
</van-tabs>

View File

@ -0,0 +1,26 @@
// components/orderconfirm/orderyf/orderyf.js
Component({
/**
* 组件的属性列表
*/
properties: {
title: String,
placeholder: String
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
input(a) {
this.triggerEvent("input",{value:a.detail.value})
}
}
})

View File

@ -0,0 +1,4 @@
{
"component": true,
"usingComponents": {}
}

View File

@ -0,0 +1,21 @@
.orderyf {
width: 690rpx;
height: 96rpx;
line-height: 96rpx;
display: flex;
border-bottom: 2rpx solid #EAEAEA;
margin: 0 auto;
justify-content: space-between;
font-size: 28rpx;
align-items: center;
.left {
margin-left: 31rpx
}
.right {
margin-right: 20rpx;
width: 450rpx;
height: 35rpx;
font-size: 25rpx;
text-align: right;
}
}

View File

@ -0,0 +1,4 @@
<view class="orderyf">
<view class="left">{{title}}</view>
<input class="right" bindinput="input" placeholder="{{placeholder}}"></input>
</view>

View File

@ -0,0 +1 @@
.orderyf{width:690rpx;height:96rpx;line-height:96rpx;display:flex;border-bottom:2rpx solid #EAEAEA;margin:0 auto;justify-content:space-between;font-size:28rpx;align-items:center}.orderyf .left{margin-left:31rpx}.orderyf .right{margin-right:20rpx;width:450rpx;height:35rpx;font-size:25rpx;text-align:right}

View File

@ -1,23 +1,27 @@
// components/orderconfirm/orderagreement/orderagreement.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})
// components/orderconfirm/orderagreement/orderagreement.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
s:false
},
/**
* 组件的方法列表
*/
methods: {
a(){
this.setData({
s:!this.data.s
})
}
}
})

View File

@ -1,4 +1,4 @@
{
"component": true,
"usingComponents": {}
{
"component": true,
"usingComponents": {}
}

View File

@ -16,4 +16,7 @@
margin-right: 25rpx;
margin-left: 31rpx;
}
.selects{
background-color: #47C877;
}
}

View File

@ -1,4 +1,4 @@
<view class="agree">
<view class="select"></view>
<text>同意使用条款和隐私政策</text>
<view class="agree" bind:tap="a">
<view class="select {{s?'selects':''}}"></view>
<text>同意使用条款和隐私政策</text>
</view>

View File

@ -1,18 +1 @@
.agree {
width: 690rpx;
line-height: 96rpx;
display: flex;
margin: 0 auto;
color: #999999;
font-size: 26rpx;
}
.agree .select {
width: 26rpx;
height: 26rpx;
margin: auto 0;
border-radius: 50%;
background-color: #EAEAEA;
margin-right: 25rpx;
margin-left: 31rpx;
}
.agree{width:690rpx;line-height:96rpx;display:flex;margin:0 auto;color:#999999;font-size:26rpx}.agree .select{width:26rpx;height:26rpx;margin:auto 0;border-radius:50%;background-color:#EAEAEA;margin-right:25rpx;margin-left:31rpx}.agree .selects{background-color:#47C877}

View File

@ -1,27 +1,28 @@
// components/orderconfirm/orderbottom/orderbottom.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
sub() {
wx.navigateTo({
url: "/pages/order/order"
})
}
}
// components/orderconfirm/orderbottom/orderbottom.js
Component({
/**
* 组件的属性列表
*/
properties: {
price:String
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
sub() {
// wx.navigateTo({
// url: "/pages/order/order"
// })
this.triggerEvent("sub")
}
}
})

View File

@ -1,4 +1,4 @@
{
"component": true,
"usingComponents": {}
{
"component": true,
"usingComponents": {}
}

View File

@ -1,7 +1,7 @@
<view class="bottom">
<view class="left">
<text>总计</text>
<text class="pri">$0.00</text>
</view>
<view class="right" bindtap="sub">结算</view>
<view class="bottom">
<view class="left">
<text>总计</text>
<text class="pri">${{price}}</text>
</view>
<view class="right" bindtap="sub">结算</view>
</view>

View File

@ -1,24 +1,24 @@
.bottom {
width: 100%;
height: 99rpx;
line-height: 99rpx;
display: flex;
justify-content: space-between;
border-top: 2rpx solid #EAEAEA;
font-size: 28rpx;
}
.bottom .left {
margin-left: 59rpx;
}
.bottom .left .pri {
color: #E0C79D;
font-size: 26rpx;
margin-left: 19rpx;
}
.bottom .right {
color: #4CC97D;
margin-right: 38rpx;
}
.bottom {
width: 100%;
height: 99rpx;
line-height: 99rpx;
display: flex;
justify-content: space-between;
border-top: 2rpx solid #EAEAEA;
font-size: 28rpx;
}
.bottom .left {
margin-left: 59rpx;
}
.bottom .left .pri {
color: #E0C79D;
font-size: 26rpx;
margin-left: 19rpx;
}
.bottom .right {
color: #4CC97D;
margin-right: 38rpx;
}

View File

@ -1,27 +1,30 @@
// components/orderconfirm/orderchooseaddr/orderchooseaddr.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
choose() {
wx.navigateTo({
url: "/pages/chooseaddr/chooseaddr"
})
}
}
// components/orderconfirm/orderchooseaddr/orderchooseaddr.js
Component({
/**
* 组件的属性列表
*/
properties: {
name:String,
number:String,
phone:String,
addr:String
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
choose() {
wx.navigateTo({
url: "/pages/chooseaddr/chooseaddr"
})
}
}
})

View File

@ -1,4 +1,4 @@
{
"component": true,
"usingComponents": {}
{
"component": true,
"usingComponents": {}
}

View File

@ -1,12 +1,12 @@
<view class="orderchooseaddr" bindtap="choose">
<view class="left">
<view class="userinfo">
<text class="username">于于宇 15698857895</text>
<text>邮政编码:677467</text>
</view>
<view class="addr">
中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区
</view>
</view>
<view class="right"></view>
<view class="orderchooseaddr" bindtap="choose">
<view class="left">
<view class="userinfo">
<text class="username">{{name == "" ? "请选择地址" :name}} {{phone}}</text>
<text>邮政编码:{{number}}</text>
</view>
<view class="addr">
{{addr}}
</view>
</view>
<view class="right"></view>
</view>

View File

@ -1,37 +1,37 @@
.orderchooseaddr {
width: 690rpx;
height: 148rpx;
margin: 0 auto;
border-bottom: 2rpx solid #EAEAEA;
display: flex;
justify-content: space-between;
}
.orderchooseaddr .left {
width: 572rpx;
height: 80rpx;
}
.orderchooseaddr .left .userinfo {
color: #333333;
font-size: 26rpx;
text-indent: 30rpx;
margin-top: 41rpx;
display: flex;
justify-content: space-between;
}
.orderchooseaddr .left .addr {
color: #999999;
font-size: 24rpx;
text-indent: 30rpx;
margin-top: 32rpx;
}
.orderchooseaddr .right {
width: 17rpx;
height: 30rpx;
background-color: #D3D3D3;
margin: auto 0;
margin-right: 19rpx;
}
.orderchooseaddr {
width: 690rpx;
height: 148rpx;
margin: 0 auto;
border-bottom: 2rpx solid #EAEAEA;
display: flex;
justify-content: space-between;
}
.orderchooseaddr .left {
width: 572rpx;
height: 80rpx;
}
.orderchooseaddr .left .userinfo {
color: #333333;
font-size: 26rpx;
text-indent: 30rpx;
margin-top: 41rpx;
display: flex;
justify-content: space-between;
}
.orderchooseaddr .left .addr {
color: #999999;
font-size: 24rpx;
text-indent: 30rpx;
margin-top: 32rpx;
}
.orderchooseaddr .right {
width: 17rpx;
height: 30rpx;
background-color: #D3D3D3;
margin: auto 0;
margin-right: 19rpx;
}

View File

@ -1,23 +1,36 @@
// components/orderconfirm/orderchooseway/orderchooseway.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})
// components/orderconfirm/orderchooseway/orderchooseway.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
id:0
},
/**
* 组件的方法列表
*/
methods: {
a(a){
// console.log(a)
this.setData({
id:0
})
this.triggerEvent("tab",{id:0})
},
b(){
this.setData({
id:1
})
this.triggerEvent("tab",{id:1})
}
}
})

View File

@ -1,4 +1,4 @@
{
"component": true,
"usingComponents": {}
{
"component": true,
"usingComponents": {}
}

View File

@ -1,10 +1,10 @@
<view class="chooseway">
<view class="item item1">
<view class="select selected"></view>
<text class="way">快递配送</text>
</view>
<view class="item">
<view class="select"></view>
<text class="way">到店自取</text>
</view>
<view class="chooseway" >
<view class="item item1" bind:tap="a">
<view class="select {{id == 0 ? 'selected' : ''}}"></view>
<text class="way">快递配送</text>
</view>
<view class="item" bind:tap="b">
<view class="select {{id == 1 ? 'selected' : ''}}"></view>
<text class="way">到店自取</text>
</view>
</view>

View File

@ -1,35 +1,35 @@
.chooseway {
width: 690rpx;
height: 96rpx;
line-height: 96rpx;
display: flex;
border-bottom: 2rpx solid #EAEAEA;
margin: 0 auto;
}
.chooseway .item {
display: flex;
margin-right: 90rpx;
}
.chooseway .item .select {
width: 26rpx;
height: 26rpx;
margin: auto 0;
border-radius: 50%;
background-color: #EAEAEA;
}
.chooseway .item .selected {
background-color: #47C877;
}
.chooseway .item .way {
color: #333333;
font-size: 26rpx;
text-indent: 17rpx;
}
.chooseway .item1 {
margin-left: 31rpx;
}
.chooseway {
width: 690rpx;
height: 96rpx;
line-height: 96rpx;
display: flex;
border-bottom: 2rpx solid #EAEAEA;
margin: 0 auto;
}
.chooseway .item {
display: flex;
margin-right: 90rpx;
}
.chooseway .item .select {
width: 26rpx;
height: 26rpx;
margin: auto 0;
border-radius: 50%;
background-color: #EAEAEA;
}
.chooseway .item .selected {
background-color: #47C877;
}
.chooseway .item .way {
color: #333333;
font-size: 26rpx;
text-indent: 17rpx;
}
.chooseway .item1 {
margin-left: 31rpx;
}

View File

@ -1,23 +1,26 @@
// components/orderconfirm/ordershopinfo/ordershopinfo.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})
// components/orderconfirm/ordershopinfo/ordershopinfo.js
Component({
/**
* 组件的属性列表
*/
properties: {
title:String,
spec:String,
price:String,
img:String
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

View File

@ -1,6 +1,6 @@
{
"component": true,
"usingComponents": {
}
{
"component": true,
"usingComponents": {
}
}

View File

@ -1,13 +1,13 @@
<view class="shopinfo">
<image class="pic"></image>
<image class="pic" src="{{img}}"></image>
<view class="right">
<view class="shopname">产品产品产品产品产品产品产品产品产品产品产品产品产品</view>
<view class="shopname">{{title}}</view>
<view class="down">
<view class="shopdesc">
<text class="size">规格10ml</text>
<text> 0.04kg</text>
<text class="size">{{spec}}</text>
<!-- <text> 0.04kg</text> -->
</view>
<view class="pri">¥657</view>
<view class="pri">¥{{price}}</view>
</view>
</view>
</view>

View File

@ -1,49 +1,49 @@
.shopinfo {
width: 690rpx;
height: 218rpx;
border-bottom: 2rpx solid #EAEAEA;
margin: 0 auto;
display: flex;
justify-content: center;
}
.shopinfo .pic {
width: 150rpx;
height: 163rpx;
background-color: #EAEAEA;
margin-right: 40rpx;
}
.shopinfo .right {
width: 402rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 6rpx;
}
.shopinfo .right .shopname {
font-size: 28rpx;
font-weight: bold;
line-height: 39rpx;
}
.shopinfo .right .down {
margin-bottom: 50rpx;
display: flex;
justify-content: space-between;
}
.shopinfo .right .down .shopdesc {
color: #666666;
font-size: 24rpx;
}
.shopinfo .right .down .shopdesc .size {
margin-right: 20rpx;
}
.shopinfo .right .down .pri {
color: #E1C89F;
font-size: 28rpx;
}
.shopinfo {
width: 690rpx;
height: 218rpx;
border-bottom: 2rpx solid #EAEAEA;
margin: 0 auto;
display: flex;
justify-content: center;
}
.shopinfo .pic {
width: 150rpx;
height: 163rpx;
background-color: #EAEAEA;
margin-right: 40rpx;
}
.shopinfo .right {
width: 402rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 6rpx;
}
.shopinfo .right .shopname {
font-size: 28rpx;
font-weight: bold;
line-height: 39rpx;
}
.shopinfo .right .down {
margin-bottom: 50rpx;
display: flex;
justify-content: space-between;
}
.shopinfo .right .down .shopdesc {
color: #666666;
font-size: 24rpx;
}
.shopinfo .right .down .shopdesc .size {
margin-right: 20rpx;
}
.shopinfo .right .down .pri {
color: #E1C89F;
font-size: 28rpx;
}

View File

@ -1,23 +1,23 @@
// components/orderconfirm/orderyf/orderyf.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})
// components/orderconfirm/orderyf/orderyf.js
Component({
/**
* 组件的属性列表
*/
properties: {
price:String
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

View File

@ -1,4 +1,4 @@
{
"component": true,
"usingComponents": {}
{
"component": true,
"usingComponents": {}
}

View File

@ -1,4 +1,4 @@
<view class="orderyf">
<view class="left">运费</view>
<view class="right">¥16</view>
<view class="orderyf">
<view class="left">运费</view>
<view class="right">¥{{price}}</view>
</view>

View File

@ -1,18 +1,18 @@
.orderyf {
width: 690rpx;
height: 96rpx;
line-height: 96rpx;
display: flex;
border-bottom: 2rpx solid #EAEAEA;
margin: 0 auto;
justify-content: space-between;
font-size: 28rpx;
}
.orderyf .left {
margin-left: 31rpx;
}
.orderyf .right {
margin-right: 20rpx;
}
.orderyf {
width: 690rpx;
height: 96rpx;
line-height: 96rpx;
display: flex;
border-bottom: 2rpx solid #EAEAEA;
margin: 0 auto;
justify-content: space-between;
font-size: 28rpx;
}
.orderyf .left {
margin-left: 31rpx;
}
.orderyf .right {
margin-right: 20rpx;
}

View File

@ -0,0 +1,40 @@
// components/orderconfirm/orderyf/orderyf.js
Component({
/**
* 组件的属性列表
*/
properties: {
price: String
},
/**
* 组件的初始数据
*/
data: {
date: "",
start:""
},
created(){
this.setData({
date:this.getCurTime(),
start:this.getCurTime()
})
},
/**
* 组件的方法列表
*/
methods: {
bindDateChange: function (e) {
console.log('picker发送选择改变携带值为', e.detail.value)
this.setData({
date: e.detail.value
})
this.triggerEvent("input",{date:e.detail.value})
},
getCurTime() {
var date = new Date();
return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate();
}
}
})

View File

@ -0,0 +1,4 @@
{
"component": true,
"usingComponents": {}
}

View File

@ -0,0 +1,17 @@
.orderyf {
width: 690rpx;
height: 96rpx;
line-height: 96rpx;
display: flex;
border-bottom: 2rpx solid #EAEAEA;
margin: 0 auto;
justify-content: space-between;
font-size: 28rpx;
.left {
margin-left: 31rpx
}
.right {
margin-right: 20rpx;
;
}
}

View File

@ -0,0 +1,6 @@
<picker mode="date" value="{{date}}" bindchange="bindDateChange" start="{{start}}">
<view class="orderyf">
<view class="left">收货时间</view>
<view class="right">{{date == "" ? '请选择提货时间': date}}</view>
</view>
</picker>

View File

@ -0,0 +1,18 @@
.orderyf {
width: 690rpx;
height: 96rpx;
line-height: 96rpx;
display: flex;
border-bottom: 2rpx solid #EAEAEA;
margin: 0 auto;
justify-content: space-between;
font-size: 28rpx;
}
.orderyf .left {
margin-left: 31rpx;
}
.orderyf .right {
margin-right: 20rpx;
}

View File

@ -1,5 +1,13 @@
Component({
properties: {
num:String,
price:String,
cprice:String,
number:String,
time:String,
text:String,
goods:Array,
ziti:String
},
data: {
},

View File

@ -1,24 +1,24 @@
<view class="content">
<message></message>
<message wx:for="{{goods}}" wx:for-index="j" wx:key="{{j}}" image="{{item.image}}" title="{{item.goods_name}}" spec="{{item.spec_ley_name}}" price="{{item.goods_price}}" num="{{item.goods_price}}"></message>
<view class="aggregate">
共计1件商品 合计:
<text>¥29.80</text>
(含运费¥0.00)
共计{{num}}件商品 合计:
<text>¥{{price}}</text>
(含运费¥{{cprice}})
</view>
<view class="message">
<text>订单编号</text>
<text>123456789123456789</text>
<text>{{number}}</text>
</view>
<view class="message">
<text>下单时间</text>
<text>2018-10-01 18:00:06</text>
<text>{{time}}</text>
</view>
<view class="message">
<text>配送方式</text>
<text>快递 免邮</text>
<text>{{ziti == 1?"自提":"快递"}} </text>
</view>
<view class="leave">
<text>备注:</text>
<input type="text" placeholder="填写你需要对我们说的" />
<input type="text" placeholder="{{text}}" />
</view>
</view>

View File

@ -1,5 +1,8 @@
Component({
properties: {
name:String,
phone:String,
addr:String
},
data: {
},

View File

@ -1,10 +1,10 @@
<view class="orderchooseaddr">
<view class="left">
<view class="userinfo">
<text class="username">于于宇 15698857895</text>
<text class="username">{{name}} {{phone}}</text>
<text></text>
</view>
<view class="addr">中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区</view>
<view class="addr">{{addr}}</view>
</view>
<view class="right"></view>
</view>

View File

@ -5,7 +5,7 @@
.image {
width: 171rpx;
height: 168rpx;
background-color: #000;
// background-color: #000;
}
.message {
margin-left: 24rpx;

View File

@ -1 +1 @@
.merchandise{padding:46rpx 32rpx;display:flex;border-bottom:20rpx solid #fbfbfb}.merchandise .image{width:171rpx;height:168rpx;background-color:#000}.merchandise .message{margin-left:24rpx}.merchandise .message .title{font-size:26rpx;color:#333;width:491rpx;margin-bottom:9rpx}.merchandise .message .brief{font-size:22rpx;color:#999;margin-bottom:26rpx}.merchandise .message .price{font-size:28rpx;color:#ff4e6c}
.merchandise{padding:46rpx 32rpx;display:flex;border-bottom:20rpx solid #fbfbfb}.merchandise .image{width:171rpx;height:168rpx}.merchandise .message{margin-left:24rpx}.merchandise .message .title{font-size:26rpx;color:#333;width:491rpx;margin-bottom:9rpx}.merchandise .message .brief{font-size:22rpx;color:#999;margin-bottom:26rpx}.merchandise .message .price{font-size:28rpx;color:#ff4e6c}

View File

@ -12,7 +12,8 @@ Component({
gid:Number,
num:Number,
select:Boolean,
index:Number
index:Number,
oprice:String
},
/**
@ -28,7 +29,7 @@ Component({
methods: {
rm() {
if (this.data.num == 0) {
if (this.data.num < 2) {
return
} else {
@ -39,9 +40,10 @@ Component({
url:"Cart/updateNum",
urldata:{
id:this.data.gid,
num:this.data.num - 1
num:this.data.num
}
}).then((res)=>{
this.triggerEvent('gai', {id:this.data.gid,num:this.data.num})
})
@ -55,10 +57,10 @@ Component({
url:"Cart/updateNum",
urldata:{
id:this.data.gid,
num:this.data.num + 1
num:this.data.num
}
}).then((res)=>{
this.triggerEvent('gai', {id:this.data.gid,num:this.data.num})
})
},
sel(){

View File

@ -1,4 +1,4 @@
{
"component": true,
"usingComponents": {}
{
"component": true,
"usingComponents": {}
}

View File

@ -1,16 +1,19 @@
<view class="shoppingitem">
<view class="select {{select ? 'selects':''}}" bind:tap="sel"></view>
<view class="pic">
<image src="{{pic}}"></image>
<view style="height: 200rpx;width:46rpx" bind:tap="sel">
<view class="select {{select ? 'selects':''}}"></view>
</view>
<image src="{{pic}}" class="pic"></image>
<view class="shopinfo">
<view class="shopname">{{shopname}}</view>
<view class="shopdesc">{{shopdesc}}</view>
<view class="price">${{price}}</view>
<view class="price">
<view>€{{oprice}}</view>
<view>¥{{price}}</view>
</view>
</view>
<view class="numberset">
<view class="reverse" bind:tap="rm">-</view>
<view class="num">{{num}}</view>
<view class="add" bind:tap="add">+</view>
</view>
</view>
</view>

View File

@ -1,6 +1,6 @@
.shoppingitem {
width: 639rpx;
height: 186rpx;
/* height: 186rpx; */
display: flex;
justify-content: space-between;
}
@ -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;
@ -59,8 +59,13 @@
font-size: 32rpx;
font-weight: bold;
text-decoration: underline;
display: flex;
align-items: center;
}
.price >view:last-child{
margin-left: 10rpx;
font-size: 20rpx;
}
.numberset {
width: 85rpx;
height: 186rpx;
@ -73,13 +78,14 @@
}
.reverse {
width: 23rpx;
height: 23rpx;
width: 63rpx;
height: 63rpx;
/* background-color: #97DFB4; */
margin: 0 auto;
margin-top: 20rpx;
line-height: 23rpx;
/* margin-top: 20rpx; */
line-height: 63rpx;
font-size: 46rpx;
text-align: center;
}
.num {
@ -89,10 +95,12 @@
}
.add {
width: 23rpx;
height: 23rpx;
width: 63rpx;
height: 63rpx;
/* background-color: #242424; */
margin: 0 auto;
margin-bottom: 17rpx;
line-height: 23rpx;
/* margin-bottom: 17rpx; */
font-size: 46rpx;
line-height: 63rpx;
text-align: center;
}

View File

@ -1,23 +1,27 @@
// components/yue/yongjintop/yongjintop.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})
// components/yue/yongjintop/yongjintop.js
Component({
/**
* 组件的属性列表
*/
properties: {
name:String,
img:String,
A:String,
B:String,
C:String
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})

View File

@ -1,4 +1,4 @@
{
"component": true,
"usingComponents": {}
{
"component": true,
"usingComponents": {}
}

Some files were not shown because too many files have changed in this diff Show More