From 9a53bca28114e8d87bab9f1d58f4c54b3057aab7 Mon Sep 17 00:00:00 2001
From: pplokijuhyg <1162963624@qq.com>
Date: Mon, 23 Dec 2019 10:04:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 144 +++---
app.json | 102 ++---
components/addaddress/shuru/shuru.js | 60 +--
components/addaddress/shuru/shuru.json | 6 +-
components/addaddress/shuru/shuru.scss | 62 +--
components/addaddress/shuru/shuru.wxml | 20 +-
components/addaddress/shuru/shuru.wxss | 74 ++--
components/chooseaddr/addradd/addradd.js | 44 +-
components/chooseaddr/addradd/addradd.json | 6 +-
components/chooseaddr/addradd/addradd.wxss | 20 +-
components/chooseaddr/address/address.js | 70 +--
components/chooseaddr/address/address.json | 6 +-
components/chooseaddr/address/address.scss | 156 +++----
components/chooseaddr/address/address.wxml | 58 +--
components/chooseaddr/address/address.wxss | 170 +++----
components/classify/list/index.js | 26 +-
components/classify/list/index.json | 10 +-
components/classify/list/index.scss | 126 +++---
components/classify/list/index.wxml | 74 ++--
components/classify/navigation/index.js | 34 +-
components/classify/navigation/index.json | 10 +-
components/classify/navigation/index.scss | 38 +-
components/classify/navigation/index.wxml | 20 +-
components/index/list/commodity/index.js | 34 +-
components/index/list/commodity/index.json | 4 +-
components/index/list/commodity/index.scss | 116 ++---
components/index/list/commodity/index.wxml | 26 +-
components/index/list/index.js | 16 +-
components/index/list/index.json | 10 +-
components/index/list/index.scss | 22 +-
components/index/list/index.wxml | 6 +-
components/index/search/index.js | 14 +-
components/index/search/index.json | 4 +-
components/index/search/index.scss | 44 +-
components/index/search/index.wxml | 6 +-
components/member/membershop/membershop.js | 46 +-
components/member/membershop/membershop.json | 6 +-
components/member/membershop/membershop.scss | 58 +--
components/member/membershop/membershop.wxml | 10 +-
components/member/membershop/membershop.wxss | 66 +--
components/member/membertop/membertop.js | 46 +-
components/member/membertop/membertop.json | 6 +-
components/member/membertop/membertop.scss | 16 +-
components/member/membertop/membertop.wxml | 4 +-
components/member/membertop/membertop.wxss | 18 +-
components/order/commodity/index.js | 20 +-
components/order/commodity/index.json | 10 +-
components/order/commodity/index.scss | 160 +++----
components/order/commodity/index.wxml | 26 +-
components/order/message/index.js | 14 +-
components/order/message/index.json | 4 +-
components/order/message/index.scss | 78 ++--
components/order/message/index.wxml | 26 +-
components/order/tab/index.js | 14 +-
components/order/tab/index.json | 14 +-
components/order/tab/index.scss | 4 +-
components/order/tab/index.wxml | 16 +-
components/order/tab/index.wxss | 2 +-
.../orderagreement/orderagreement.js | 46 +-
.../orderagreement/orderagreement.json | 6 +-
.../orderagreement/orderagreement.scss | 36 +-
.../orderagreement/orderagreement.wxml | 6 +-
.../orderagreement/orderagreement.wxss | 36 +-
.../orderconfirm/orderbottom/orderbottom.js | 53 +--
.../orderconfirm/orderbottom/orderbottom.json | 6 +-
.../orderconfirm/orderbottom/orderbottom.scss | 40 +-
.../orderconfirm/orderbottom/orderbottom.wxml | 12 +-
.../orderconfirm/orderbottom/orderbottom.wxss | 48 +-
.../orderchooseaddr/orderchooseaddr.js | 52 +--
.../orderchooseaddr/orderchooseaddr.json | 6 +-
.../orderchooseaddr/orderchooseaddr.scss | 64 +--
.../orderchooseaddr/orderchooseaddr.wxml | 22 +-
.../orderchooseaddr/orderchooseaddr.wxss | 74 ++--
.../orderchooseway/orderchooseway.js | 46 +-
.../orderchooseway/orderchooseway.json | 6 +-
.../orderchooseway/orderchooseway.scss | 58 +--
.../orderchooseway/orderchooseway.wxml | 18 +-
.../orderchooseway/orderchooseway.wxss | 70 +--
.../ordershopinfo/ordershopinfo.js | 49 ++-
.../ordershopinfo/ordershopinfo.json | 10 +-
.../ordershopinfo/ordershopinfo.scss | 82 ++--
.../ordershopinfo/ordershopinfo.wxml | 24 +-
.../ordershopinfo/ordershopinfo.wxss | 98 ++---
components/orderconfirm/orderyf/orderyf.js | 46 +-
components/orderconfirm/orderyf/orderyf.json | 6 +-
components/orderconfirm/orderyf/orderyf.scss | 32 +-
components/orderconfirm/orderyf/orderyf.wxml | 6 +-
components/orderconfirm/orderyf/orderyf.wxss | 36 +-
components/particulars/content/index.js | 14 +-
components/particulars/content/index.json | 10 +-
components/particulars/content/index.scss | 74 ++--
components/particulars/content/index.wxml | 46 +-
components/particulars/logistics/index.js | 50 +--
components/particulars/logistics/index.json | 10 +-
components/particulars/logistics/index.scss | 32 +-
components/particulars/logistics/index.wxml | 6 +-
.../particulars/orderchooseaddr/index.js | 14 +-
.../particulars/orderchooseaddr/index.json | 4 +-
.../particulars/orderchooseaddr/index.scss | 70 +--
.../particulars/orderchooseaddr/index.wxml | 18 +-
components/particulars/submit/index.js | 14 +-
components/particulars/submit/index.json | 4 +-
components/particulars/submit/index.scss | 56 +--
components/particulars/submit/index.wxml | 12 +-
components/search/hot/index.js | 14 +-
components/search/hot/index.json | 4 +-
components/search/hot/index.scss | 42 +-
components/search/hot/index.wxml | 8 +-
components/search/hot/index.wxss | 2 +-
components/seles/merchandises/index.js | 14 +-
components/seles/merchandises/index.json | 8 +-
components/seles/merchandises/index.scss | 54 +--
components/seles/merchandises/index.wxml | 14 +-
.../shopping/shoppingitem/shoppingitem.js | 136 +++---
.../shopping/shoppingitem/shoppingitem.json | 6 +-
.../shopping/shoppingitem/shoppingitem.wxml | 32 +-
.../shopping/shoppingitem/shoppingitem.wxss | 194 ++++----
components/yue/share/share.js | 46 +-
components/yue/share/share.json | 6 +-
components/yue/share/share.scss | 138 +++---
components/yue/share/share.wxml | 58 +--
components/yue/share/share.wxss | 156 +++----
components/yue/yongjintop/yongjintop.js | 46 +-
components/yue/yongjintop/yongjintop.json | 6 +-
components/yue/yongjintop/yongjintop.scss | 110 ++---
components/yue/yongjintop/yongjintop.wxml | 50 +--
components/yue/yongjintop/yongjintop.wxss | 126 +++---
components/yue/yuedetail/yuedetail.js | 46 +-
components/yue/yuedetail/yuedetail.json | 6 +-
components/yue/yuedetail/yuedetail.scss | 44 +-
components/yue/yuedetail/yuedetail.wxml | 12 +-
components/yue/yuedetail/yuedetail.wxss | 54 +--
components/yue/yuetitle/yuetitle.js | 46 +-
components/yue/yuetitle/yuetitle.json | 6 +-
components/yue/yuetitle/yuetitle.scss | 10 +-
components/yue/yuetitle/yuetitle.wxml | 4 +-
components/yue/yuetitle/yuetitle.wxss | 12 +-
components/yue/yuetop/yuetop.js | 46 +-
components/yue/yuetop/yuetop.json | 6 +-
components/yue/yuetop/yuetop.scss | 44 +-
components/yue/yuetop/yuetop.wxml | 12 +-
components/yue/yuetop/yuetop.wxss | 50 +--
doc/bin.md | 62 +--
pages/accomplish/accomplish.scss | 6 +-
pages/addaddress/addaddress.js | 338 +++++++-------
pages/addaddress/addaddress.json | 16 +-
pages/addaddress/addaddress.scss | 32 +-
pages/addaddress/addaddress.wxml | 82 ++--
pages/addaddress/addaddress.wxss | 38 +-
pages/chooseaddr/chooseaddr.js | 316 +++++++-------
pages/chooseaddr/chooseaddr.json | 10 +-
pages/chooseaddr/chooseaddr.scss | 18 +-
pages/chooseaddr/chooseaddr.wxml | 26 +-
pages/chooseaddr/chooseaddr.wxss | 18 +-
pages/classify/classify.js | 194 ++++----
pages/classify/classify.scss | 12 +-
pages/classify/classify.wxml | 6 +-
pages/index/index.scss | 18 +-
pages/member/member.js | 130 +++---
pages/member/member.json | 10 +-
pages/member/member.scss | 20 +-
pages/member/member.wxml | 62 +--
pages/member/member.wxss | 24 +-
pages/message/message.scss | 108 ++---
pages/order/order.scss | 18 +-
pages/orderconfirm/orderconfirm.js | 133 +++++-
pages/orderconfirm/orderconfirm.json | 20 +-
pages/orderconfirm/orderconfirm.scss | 12 +-
pages/orderconfirm/orderconfirm.wxml | 21 +-
pages/orderconfirm/orderconfirm.wxss | 10 +-
pages/particulars/particulars.scss | 14 +-
pages/personal/personal.js | 234 +++++-----
pages/personal/personal.scss | 104 ++---
pages/personal/personal.wxml | 84 ++--
pages/product/product.js | 219 +++++-----
pages/product/product.scss | 72 +--
pages/product/product.wxml | 46 +-
pages/receiving/receiving.scss | 14 +-
pages/sales1/sales1.scss | 96 ++--
pages/sales2/sales2.scss | 66 +--
pages/search/search.scss | 14 +-
pages/share/share.js | 130 +++---
pages/share/share.json | 10 +-
pages/share/share.scss | 12 +-
pages/share/share.wxml | 28 +-
pages/share/share.wxss | 14 +-
pages/shopping/shopping.js | 413 ++++++++++--------
pages/shopping/shopping.json | 12 +-
pages/shopping/shopping.wxml | 48 +-
pages/shopping/shopping.wxss | 108 ++---
pages/status/status.scss | 22 +-
pages/undetermined/undetermined.js | 148 +++----
pages/undetermined/undetermined.scss | 10 +-
pages/undetermined/undetermined.wxml | 6 +-
pages/yongjin/yongjin.js | 130 +++---
pages/yongjin/yongjin.json | 12 +-
pages/yongjin/yongjin.scss | 12 +-
pages/yongjin/yongjin.wxml | 34 +-
pages/yongjin/yongjin.wxss | 14 +-
pages/yue/yue.js | 46 +-
pages/yue/yue.json | 14 +-
pages/yue/yue.scss | 14 +-
pages/yue/yue.wxml | 36 +-
pages/yue/yue.wxss | 14 +-
utils/bin.js | 123 +++---
205 files changed, 4897 insertions(+), 4734 deletions(-)
diff --git a/README.md b/README.md
index 26c9883..95ae4be 100644
--- a/README.md
+++ b/README.md
@@ -1,72 +1,72 @@
-# 德国代购小程序
-
-### 目录结构
-- commponents 组件
-- page 页面
-- utils 插件
- - [bin.js](./doc/bin.md)
-- doc 文档存放
-## 页面路由
-- pages/index/index 首页
-- pages/shopping/shopping 购物车
- 组件
- - index/search 顶部搜索框
- - index/list 商品列表
- - index/lsit/commodity 商品单条
- - index/shopping/shoppingitem 购物车商品信息
-- pages/search/search 搜索页
- 组件
- - index/search 顶部搜索框
- - search/hot 热门上搜索列表
-- pages/classify/classify 分类页
- 组件
- - classify/list 右侧商品列表
- - classify/navigation 左侧导航列表
-- pages/product/product 商品页
-- pages/personal/personal 我的页面
-- pages/message/message 个人信息
-- pages/orderconfirm/orderconfirm 确认订单
- 组件
- - orderconfirm/agreement 同意协议
- - orderconfirm/bottom 订单确认底部
- - orderconfirm/chooseaddr 选择地址
- - orderconfirm/chooseway 选择方式
- - orderconfirm/ordershopinfo 顶部的商品信息
- - orderconfirm/orderyf 运费
-- pages/order/order 订单列表
- 组件
- - order/tab 切换列表
- - order/commodity 商品信息操作
- - order/message 商品信息
-
-- pages/chooseaddr/chooseaddr 选择地址
- - chooseaddr/address 地址列表（单个）
- - chooseaddr/addradd 添加按钮
-
-- pages/addaddress/addaddress 添加地址
- - addaddress/shuru 添加地址的输入的每一项
-- pages/particulars/particulars 待付款
- - particulars/orderchooseaddr 地址
- - particulars/content 中间所有
- - particulars/submit 支付
-- pages/undetermined/undetermined 代发货
- - particulars/orderchooseaddr 地址
- - particulars/content 中间所有
-- pages/receiving/receiving 待收货
- - particulars/orderchooseaddr 地址
- - particulars/content 中间所有
-- pages/status/status 物流信息
- - order/message 商品信息
- - particulars/logistics 物流信息
-- pages/receiving/receiving 已完成
- - particulars/orderchooseaddr 地址
- - particulars/content 中间所有
- - particulars/logistics 物流信息
-- pages/sales1/sales1 退货1
- - sales/merchandises 商品信息
-- pages/sales2/sales2 退货3
- - sales/merchandises 商品信息
-
-- pages/member/member 会员商品
- - member/membertop 会员商品顶部的字
- - member/membershop 单个商品
+# 德国代购小程序
+
+### 目录结构
+- commponents 组件
+- page 页面
+- utils 插件
+ - [bin.js](./doc/bin.md)
+- doc 文档存放
+## 页面路由
+- pages/index/index 首页
+- pages/shopping/shopping 购物车
+ 组件
+ - index/search 顶部搜索框
+ - index/list 商品列表
+ - index/lsit/commodity 商品单条
+ - index/shopping/shoppingitem 购物车商品信息
+- pages/search/search 搜索页
+ 组件
+ - index/search 顶部搜索框
+ - search/hot 热门上搜索列表
+- pages/classify/classify 分类页
+ 组件
+ - classify/list 右侧商品列表
+ - classify/navigation 左侧导航列表
+- pages/product/product 商品页
+- pages/personal/personal 我的页面
+- pages/message/message 个人信息
+- pages/orderconfirm/orderconfirm 确认订单
+ 组件
+ - orderconfirm/agreement 同意协议
+ - orderconfirm/bottom 订单确认底部
+ - orderconfirm/chooseaddr 选择地址
+ - orderconfirm/chooseway 选择方式
+ - orderconfirm/ordershopinfo 顶部的商品信息
+ - orderconfirm/orderyf 运费
+- pages/order/order 订单列表
+ 组件
+ - order/tab 切换列表
+ - order/commodity 商品信息操作
+ - order/message 商品信息
+
+- pages/chooseaddr/chooseaddr 选择地址
+ - chooseaddr/address 地址列表（单个）
+ - chooseaddr/addradd 添加按钮
+
+- pages/addaddress/addaddress 添加地址
+ - addaddress/shuru 添加地址的输入的每一项
+- pages/particulars/particulars 待付款
+ - particulars/orderchooseaddr 地址
+ - particulars/content 中间所有
+ - particulars/submit 支付
+- pages/undetermined/undetermined 代发货
+ - particulars/orderchooseaddr 地址
+ - particulars/content 中间所有
+- pages/receiving/receiving 待收货
+ - particulars/orderchooseaddr 地址
+ - particulars/content 中间所有
+- pages/status/status 物流信息
+ - order/message 商品信息
+ - particulars/logistics 物流信息
+- pages/receiving/receiving 已完成
+ - particulars/orderchooseaddr 地址
+ - particulars/content 中间所有
+ - particulars/logistics 物流信息
+- pages/sales1/sales1 退货1
+ - sales/merchandises 商品信息
+- pages/sales2/sales2 退货3
+ - sales/merchandises 商品信息
+
+- pages/member/member 会员商品
+ - member/membertop 会员商品顶部的字
+ - member/membershop 单个商品
diff --git a/app.json b/app.json
index 221ebf0..7351910 100644
--- a/app.json
+++ b/app.json
@@ -1,52 +1,52 @@
-{
- "pages": [
- "pages/index/index",
- "pages/login/login",
- "pages/search/search",
- "pages/shopping/shopping",
- "pages/classify/classify",
- "pages/product/product",
- "pages/personal/personal",
- "pages/message/message",
- "pages/orderconfirm/orderconfirm",
- "pages/order/order",
- "pages/chooseaddr/chooseaddr",
- "pages/addaddress/addaddress",
- "pages/particulars/particulars",
- "pages/undetermined/undetermined",
- "pages/receiving/receiving",
- "pages/status/status",
- "pages/accomplish/accomplish",
- "pages/sales1/sales1",
- "pages/sales2/sales2",
- "pages/member/member",
- "pages/yue/yue",
-
- "pages/yongjin/yongjin",
-
- "pages/share/share"
- ],
- "window": {
- "backgroundTextStyle": "light",
- "navigationBarBackgroundColor": "#fff",
- "navigationBarTitleText": "WeChat",
- "navigationBarTextStyle": "black"
- },
- "tabBar": {
- "list": [{
- "pagePath": "pages/index/index",
- "text": "首页"
- }, {
- "pagePath": "pages/classify/classify",
- "text": "分类"
- }, {
- "pagePath": "pages/shopping/shopping",
- "text": "购物车"
- }, {
- "pagePath": "pages/personal/personal",
- "text": "我的"
- }]
- },
- "style": "v2",
- "sitemapLocation": "sitemap.json"
+{
+ "pages": [
+ "pages/index/index",
+ "pages/login/login",
+ "pages/search/search",
+ "pages/shopping/shopping",
+ "pages/classify/classify",
+ "pages/product/product",
+ "pages/personal/personal",
+ "pages/message/message",
+ "pages/orderconfirm/orderconfirm",
+ "pages/order/order",
+ "pages/chooseaddr/chooseaddr",
+ "pages/addaddress/addaddress",
+ "pages/particulars/particulars",
+ "pages/undetermined/undetermined",
+ "pages/receiving/receiving",
+ "pages/status/status",
+ "pages/accomplish/accomplish",
+ "pages/sales1/sales1",
+ "pages/sales2/sales2",
+ "pages/member/member",
+ "pages/yue/yue",
+
+ "pages/yongjin/yongjin",
+
+ "pages/share/share"
+ ],
+ "window": {
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTitleText": "WeChat",
+ "navigationBarTextStyle": "black"
+ },
+ "tabBar": {
+ "list": [{
+ "pagePath": "pages/index/index",
+ "text": "首页"
+ }, {
+ "pagePath": "pages/classify/classify",
+ "text": "分类"
+ }, {
+ "pagePath": "pages/shopping/shopping",
+ "text": "购物车"
+ }, {
+ "pagePath": "pages/personal/personal",
+ "text": "我的"
+ }]
+ },
+ "style": "v2",
+ "sitemapLocation": "sitemap.json"
}
\ No newline at end of file
diff --git a/components/addaddress/shuru/shuru.js b/components/addaddress/shuru/shuru.js
index 31c74ae..d6ffa62 100644
--- a/components/addaddress/shuru/shuru.js
+++ b/components/addaddress/shuru/shuru.js
@@ -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){
+
+ }
+ }
})
\ No newline at end of file
diff --git a/components/addaddress/shuru/shuru.json b/components/addaddress/shuru/shuru.json
index e8cfaaf..011372e 100644
--- a/components/addaddress/shuru/shuru.json
+++ b/components/addaddress/shuru/shuru.json
@@ -1,4 +1,4 @@
-{
- "component": true,
- "usingComponents": {}
+{
+ "component": true,
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/components/addaddress/shuru/shuru.scss b/components/addaddress/shuru/shuru.scss
index fc757f7..961ffbf 100644
--- a/components/addaddress/shuru/shuru.scss
+++ b/components/addaddress/shuru/shuru.scss
@@ -1,32 +1,32 @@
-.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;
- .left {
- color: #333333;
- }
- .right {
- margin: auto 0;
- display: flex;
- .shuru1 {
- width: 280rpx;
- text-align: right;
- }
- .shurupla {
- color: #999999;
- font-size: 28rpx;
- }
- .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;
+ .left {
+ color: #333333;
+ }
+ .right {
+ margin: auto 0;
+ display: flex;
+ .shuru1 {
+ width: 280rpx;
+ text-align: right;
+ }
+ .shurupla {
+ color: #999999;
+ font-size: 28rpx;
+ }
+ .arrow {
+ width: 14rpx;
+ height: 25rpx;
+ background-color: #999999;
+ margin: auto 0;
+ margin-left: 27rpx;
+ }
+ }
}
\ No newline at end of file
diff --git a/components/addaddress/shuru/shuru.wxml b/components/addaddress/shuru/shuru.wxml
index 91863f4..11f4176 100644
--- a/components/addaddress/shuru/shuru.wxml
+++ b/components/addaddress/shuru/shuru.wxml
@@ -1,11 +1,11 @@
-
- {{left}}
-
- {{right}}
-
-
-
-
-
-
+
+ {{left}}
+
+ {{right}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/addaddress/shuru/shuru.wxss b/components/addaddress/shuru/shuru.wxss
index ed30fdb..9f2a5bd 100644
--- a/components/addaddress/shuru/shuru.wxss
+++ b/components/addaddress/shuru/shuru.wxss
@@ -1,37 +1,37 @@
-.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 .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 .arrow {
+ width: 14rpx;
+ height: 25rpx;
+ background-color: #999999;
+ margin: auto 0;
+ margin-left: 27rpx;
+}
diff --git a/components/chooseaddr/addradd/addradd.js b/components/chooseaddr/addradd/addradd.js
index 683e157..ba4694a 100644
--- a/components/chooseaddr/addradd/addradd.js
+++ b/components/chooseaddr/addradd/addradd.js
@@ -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: {
+
+ }
})
\ No newline at end of file
diff --git a/components/chooseaddr/addradd/addradd.json b/components/chooseaddr/addradd/addradd.json
index e8cfaaf..011372e 100644
--- a/components/chooseaddr/addradd/addradd.json
+++ b/components/chooseaddr/addradd/addradd.json
@@ -1,4 +1,4 @@
-{
- "component": true,
- "usingComponents": {}
+{
+ "component": true,
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/components/chooseaddr/addradd/addradd.wxss b/components/chooseaddr/addradd/addradd.wxss
index fa3e6b6..f602ea9 100644
--- a/components/chooseaddr/addradd/addradd.wxss
+++ b/components/chooseaddr/addradd/addradd.wxss
@@ -1,11 +1,11 @@
-.btn {
- width: 650rpx;
- height: 98rpx;
- background: #09BB07;
- border-radius: 10rpx;
- margin: 0 auto;
- font-size: 36rpx;
- color: white;
- line-height: 98rpx;
- text-align: center;
+.btn {
+ width: 650rpx;
+ height: 98rpx;
+ background: #09BB07;
+ border-radius: 10rpx;
+ margin: 0 auto;
+ font-size: 36rpx;
+ color: white;
+ line-height: 98rpx;
+ text-align: center;
}
\ No newline at end of file
diff --git a/components/chooseaddr/address/address.js b/components/chooseaddr/address/address.js
index b0b287d..5dee1fb 100644
--- a/components/chooseaddr/address/address.js
+++ b/components/chooseaddr/address/address.js
@@ -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)
+ }
+ }
+})
diff --git a/components/chooseaddr/address/address.json b/components/chooseaddr/address/address.json
index e8cfaaf..011372e 100644
--- a/components/chooseaddr/address/address.json
+++ b/components/chooseaddr/address/address.json
@@ -1,4 +1,4 @@
-{
- "component": true,
- "usingComponents": {}
+{
+ "component": true,
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/components/chooseaddr/address/address.scss b/components/chooseaddr/address/address.scss
index 5eb2c50..d067c14 100644
--- a/components/chooseaddr/address/address.scss
+++ b/components/chooseaddr/address/address.scss
@@ -1,79 +1,79 @@
-.address {
- width: 690rpx;
- height: 192rpx;
- border-bottom: 2rpx solid #EAEAEA;
- display: flex;
- justify-content: space-between;
- padding-bottom: 27rpx;
- ;
- .left {
- width: 576rpx;
- height: 119rpx;
- .userinfo {
- color: #333333;
- font-size: 26rpx;
- text-indent: 16xrpx;
- margin-top: 41rpx;
- display: flex;
- justify-content: space-between;
- .username{
- display: flex;
- flex-wrap: nowrap;
- .username1{
- width: 140rpx;
- overflow: hidden;
- }
- .tel{
- margin-right: 6rpx;
-
- }
- }
- }
- .addr {
- color: #999999;
- font-size: 24rpx;
- text-indent: 30rpx;
- margin-top: 32rpx;
- width: 551rpx;
- margin-left: 20rpx;
- // display: flex;
- .select {
- width: 26rpx;
- height: 26rpx;
- margin: auto 0;
- border-radius: 50%;
- background-color: #EAEAEA;
- float: left;
- margin-right: -14rpx;
-
- }
- .selected {
- background-color: #47C877;
- }
- .default {
- // margin-left: 12rpx;
- font-size: 24rpx;
- text-indent: 16rpx;
- line-height: 60rpx;
- float: left;
- }
- .path {
- // float: left;
- line-height: 25rpx;
- }
- }
- }
- .line {
- width: 2rpx;
- height: 75rpx;
- background: rgba(211, 211, 211, 1);
- margin: auto 0;
- }
- .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;
+ ;
+ .left {
+ width: 576rpx;
+ height: 119rpx;
+ .userinfo {
+ color: #333333;
+ font-size: 26rpx;
+ text-indent: 16xrpx;
+ margin-top: 41rpx;
+ display: flex;
+ justify-content: space-between;
+ .username{
+ display: flex;
+ flex-wrap: nowrap;
+ .username1{
+ width: 140rpx;
+ overflow: hidden;
+ }
+ .tel{
+ margin-right: 6rpx;
+
+ }
+ }
+ }
+ .addr {
+ color: #999999;
+ font-size: 24rpx;
+ text-indent: 30rpx;
+ margin-top: 32rpx;
+ width: 551rpx;
+ margin-left: 20rpx;
+ // display: flex;
+ .select {
+ width: 26rpx;
+ height: 26rpx;
+ margin: auto 0;
+ border-radius: 50%;
+ background-color: #EAEAEA;
+ float: left;
+ margin-right: -14rpx;
+
+ }
+ .selected {
+ background-color: #47C877;
+ }
+ .default {
+ // margin-left: 12rpx;
+ font-size: 24rpx;
+ text-indent: 16rpx;
+ line-height: 60rpx;
+ float: left;
+ }
+ .path {
+ // float: left;
+ line-height: 25rpx;
+ }
+ }
+ }
+ .line {
+ width: 2rpx;
+ height: 75rpx;
+ background: rgba(211, 211, 211, 1);
+ margin: auto 0;
+ }
+ .right {
+ color: #666666;
+ font-size: 24rpx;
+ line-height: 192rpx;
+ margin-left: 30rpx;
+ margin-right: 21rpx;
+ }
}
\ No newline at end of file
diff --git a/components/chooseaddr/address/address.wxml b/components/chooseaddr/address/address.wxml
index d1f0050..2d95edb 100644
--- a/components/chooseaddr/address/address.wxml
+++ b/components/chooseaddr/address/address.wxml
@@ -1,30 +1,30 @@
-
-
-
-
- {{username}}
- {{tel}}
-
-
- 邮政编码：{{youzheng}}
-
-
-
-
-
- 默认
- {{address}}
-
-
-
-
-
-
- 设为默认
- {{address}}
-
-
-
-
- 删除
+
+
+
+
+ {{username}}
+ {{tel}}
+
+
+ 邮政编码：{{youzheng}}
+
+
+
+
+
+ 默认
+ {{address}}
+
+
+
+
+
+
+ 设为默认
+ {{address}}
+
+
+
+
+ 删除
\ No newline at end of file
diff --git a/components/chooseaddr/address/address.wxss b/components/chooseaddr/address/address.wxss
index da90370..3de1039 100644
--- a/components/chooseaddr/address/address.wxss
+++ b/components/chooseaddr/address/address.wxss
@@ -1,85 +1,85 @@
-.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;
+ 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;
+}
diff --git a/components/classify/list/index.js b/components/classify/list/index.js
index f4ed197..85211af 100644
--- a/components/classify/list/index.js
+++ b/components/classify/list/index.js
@@ -1,14 +1,14 @@
-Component({
- properties: {
- list:Array
- },
- data: {},
- methods: {
- todetail(a) {
- console.log(a)
- wx.navigateTo({
- url: "/pages/product/product?shopid=" + a.currentTarget.dataset.id
- })
- }
- }
+Component({
+ properties: {
+ list:Array
+ },
+ data: {},
+ methods: {
+ todetail(a) {
+ console.log(a)
+ wx.navigateTo({
+ url: "/pages/product/product?shopid=" + a.currentTarget.dataset.id
+ })
+ }
+ }
})
\ No newline at end of file
diff --git a/components/classify/list/index.json b/components/classify/list/index.json
index 8a8e987..289b9d9 100644
--- a/components/classify/list/index.json
+++ b/components/classify/list/index.json
@@ -1,6 +1,6 @@
-{
- "component": true,
- "usingComponents": {
-
- }
+{
+ "component": true,
+ "usingComponents": {
+
+ }
}
\ No newline at end of file
diff --git a/components/classify/list/index.scss b/components/classify/list/index.scss
index 7e93e1b..58cf53f 100644
--- a/components/classify/list/index.scss
+++ b/components/classify/list/index.scss
@@ -1,63 +1,63 @@
-.list {
- padding-left: 20rpx;
- width: 572rpx;
- box-sizing: border-box;
- height: 100vh;
- .commodity {
- width: 552rpx;
- // height: 143rpx;
- // margin-top: 32rpx;
- display: flex;
- align-items: center;
- .content {
- width: 552rpx;
- height: 100%;
- display: flex;
- align-items: center;
- // box-shadow: 0 0 24rpx 0 rgba(227, 227, 227, 0.4);
- border-bottom: 2rpx solid #eaeaea;
- padding: 30rpx 0;
- .imgthumb {
- width: 105rpx;
- height: 105rpx;
- margin-left: 40rpx;
- background-color: #333;
- }
- .introduce {
- width: 336rpx;
- margin-left: 40rpx;
- display: flex;
- flex-direction: column;
- .towline {
- overflow: hidden;
-
- text-overflow: ellipsis;
-
- display: -webkit-box;
-
- -webkit-box-orient: vertical;
-
- -webkit-line-clamp: 2;
- }
- > text {
- font-size: 22rpx;
- color: #333;
- margin-bottom: 22rpx;
- }
- > view {
- display: flex;
- align-items: center;
- justify-content: space-between;
- > text:first-child {
- font-size: 30rpx;
- color: #dec499;
- }
- > text:last-child {
- font-size: 22rpx;
- color: #999;
- }
- }
- }
- }
- }
-}
+.list {
+ padding-left: 20rpx;
+ width: 572rpx;
+ box-sizing: border-box;
+ height: 100vh;
+ .commodity {
+ width: 552rpx;
+ // height: 143rpx;
+ // margin-top: 32rpx;
+ display: flex;
+ align-items: center;
+ .content {
+ width: 552rpx;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ // box-shadow: 0 0 24rpx 0 rgba(227, 227, 227, 0.4);
+ border-bottom: 2rpx solid #eaeaea;
+ padding: 30rpx 0;
+ .imgthumb {
+ width: 105rpx;
+ height: 105rpx;
+ margin-left: 40rpx;
+ background-color: #333;
+ }
+ .introduce {
+ width: 336rpx;
+ margin-left: 40rpx;
+ display: flex;
+ flex-direction: column;
+ .towline {
+ overflow: hidden;
+
+ text-overflow: ellipsis;
+
+ display: -webkit-box;
+
+ -webkit-box-orient: vertical;
+
+ -webkit-line-clamp: 2;
+ }
+ > text {
+ font-size: 22rpx;
+ color: #333;
+ margin-bottom: 22rpx;
+ }
+ > view {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ > text:first-child {
+ font-size: 30rpx;
+ color: #dec499;
+ }
+ > text:last-child {
+ font-size: 22rpx;
+ color: #999;
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/components/classify/list/index.wxml b/components/classify/list/index.wxml
index 7e4a67b..0677ed2 100644
--- a/components/classify/list/index.wxml
+++ b/components/classify/list/index.wxml
@@ -1,38 +1,38 @@
-
-
-
-
-
- {{item.goods_name}}
-
- ￥{{item.shop_price}}
- 加入购物车
-
-
-
-
-
+
+
+
+
+
+ {{item.goods_name}}
+
+ ￥{{item.shop_price}}
+ 加入购物车
+
+
+
+
+
\ No newline at end of file
diff --git a/components/classify/navigation/index.js b/components/classify/navigation/index.js
index e036c8f..5be40b4 100644
--- a/components/classify/navigation/index.js
+++ b/components/classify/navigation/index.js
@@ -1,18 +1,18 @@
-Component({
- properties: {
- types: Array
- },
- 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
- })
- this.triggerEvent("select",{id:a.target.dataset.id})
- }
- }
+Component({
+ properties: {
+ types: Array
+ },
+ 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
+ })
+ this.triggerEvent("select",{id:a.target.dataset.id})
+ }
+ }
})
\ No newline at end of file
diff --git a/components/classify/navigation/index.json b/components/classify/navigation/index.json
index 8a8e987..289b9d9 100644
--- a/components/classify/navigation/index.json
+++ b/components/classify/navigation/index.json
@@ -1,6 +1,6 @@
-{
- "component": true,
- "usingComponents": {
-
- }
+{
+ "component": true,
+ "usingComponents": {
+
+ }
}
\ No newline at end of file
diff --git a/components/classify/navigation/index.scss b/components/classify/navigation/index.scss
index 10fbd9d..2d45484 100644
--- a/components/classify/navigation/index.scss
+++ b/components/classify/navigation/index.scss
@@ -1,20 +1,20 @@
-.navigation {
- width: 188rpx;
- // margin-right: 2rpx;
- border-right: 2rpx solid #eaeaea;
- max-height: 100vh;
- 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;
- }
- .on{
- border-left: 5rpx solid #56CC84;
- color:#56CC84;
- }
+.navigation {
+ width: 188rpx;
+ // margin-right: 2rpx;
+ border-right: 2rpx solid #eaeaea;
+ max-height: 100vh;
+ 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;
+ }
+ .on{
+ border-left: 5rpx solid #56CC84;
+ color:#56CC84;
+ }
}
\ No newline at end of file
diff --git a/components/classify/navigation/index.wxml b/components/classify/navigation/index.wxml
index 1630e75..6e2d6f0 100644
--- a/components/classify/navigation/index.wxml
+++ b/components/classify/navigation/index.wxml
@@ -1,11 +1,11 @@
-
- {{item.name}}
-
+
+ {{item.name}}
+
\ No newline at end of file
diff --git a/components/index/list/commodity/index.js b/components/index/list/commodity/index.js
index 24cbade..f5ca40a 100644
--- a/components/index/list/commodity/index.js
+++ b/components/index/list/commodity/index.js
@@ -1,18 +1,18 @@
-Component({
- properties: {
- img:String,
- title:String,
- id:String,
- price:String,
- shopid:String
- },
- data: {},
- methods: {
- gotodetail(e) {
- console.log(e.currentTarget.dataset.id)
- wx.navigateTo({
- url: "/pages/product/product?shopid="+e.currentTarget.dataset.id
- })
- }
- }
+Component({
+ properties: {
+ img:String,
+ title:String,
+ id:String,
+ price:String,
+ shopid:String
+ },
+ data: {},
+ methods: {
+ gotodetail(e) {
+ console.log(e.currentTarget.dataset.id)
+ wx.navigateTo({
+ url: "/pages/product/product?shopid="+e.currentTarget.dataset.id
+ })
+ }
+ }
})
\ No newline at end of file
diff --git a/components/index/list/commodity/index.json b/components/index/list/commodity/index.json
index fba482a..bd71109 100644
--- a/components/index/list/commodity/index.json
+++ b/components/index/list/commodity/index.json
@@ -1,3 +1,3 @@
-{
- "component": true
+{
+ "component": true
}
\ No newline at end of file
diff --git a/components/index/list/commodity/index.scss b/components/index/list/commodity/index.scss
index 6c82ae4..5b5dc8c 100644
--- a/components/index/list/commodity/index.scss
+++ b/components/index/list/commodity/index.scss
@@ -1,58 +1,58 @@
-.commodity {
- width: 623rpx;
- height: 143rpx;
- margin-top: 32rpx;
- display: flex;
- align-items: center;
- .content {
- width: 614rpx;
- height: 100%;
- display: flex;
- align-items: center;
- box-shadow: 0 0 24rpx 0 rgba(227, 227, 227, 0.4);
- .imgthumb {
- width: 105rpx;
- height: 105rpx;
- margin-left: 40rpx;
- background-color: #333;
- }
- .introduce {
- width: 410rpx;
- margin-left: 40rpx;
- display: flex;
- flex-direction: column;
- > 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;
- }
- > view {
- display: flex;
- align-items: center;
- justify-content: space-between;
- > text:first-child {
- font-size: 30rpx;
- color: #dec499;
- }
- > text:last-child {
- font-size: 22rpx;
- color: #999;
- }
- }
- }
- }
- .decorate {
- width: 9rpx;
- height: 102rpx;
- background-color: #3fb66e;
- }
-}
+.commodity {
+ width: 623rpx;
+ height: 143rpx;
+ margin-top: 32rpx;
+ display: flex;
+ align-items: center;
+ .content {
+ width: 614rpx;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ box-shadow: 0 0 24rpx 0 rgba(227, 227, 227, 0.4);
+ .imgthumb {
+ width: 105rpx;
+ height: 105rpx;
+ margin-left: 40rpx;
+ background-color: #333;
+ }
+ .introduce {
+ width: 410rpx;
+ margin-left: 40rpx;
+ display: flex;
+ flex-direction: column;
+ > 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;
+ }
+ > view {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ > text:first-child {
+ font-size: 30rpx;
+ color: #dec499;
+ }
+ > text:last-child {
+ font-size: 22rpx;
+ color: #999;
+ }
+ }
+ }
+ }
+ .decorate {
+ width: 9rpx;
+ height: 102rpx;
+ background-color: #3fb66e;
+ }
+}
diff --git a/components/index/list/commodity/index.wxml b/components/index/list/commodity/index.wxml
index 8890d91..7f84e81 100644
--- a/components/index/list/commodity/index.wxml
+++ b/components/index/list/commodity/index.wxml
@@ -1,14 +1,14 @@
-
-
-
-
- {{title}}
-
-
- ￥{{price}}
- 加入购物车
-
-
-
-
+
+
+
+
+ {{title}}
+
+
+ ￥{{price}}
+ 加入购物车
+
+
+
+
\ No newline at end of file
diff --git a/components/index/list/index.js b/components/index/list/index.js
index 82a621a..ac32c19 100644
--- a/components/index/list/index.js
+++ b/components/index/list/index.js
@@ -1,9 +1,9 @@
-Component({
- properties: {
- list:Array
- },
- data: {
- },
- methods: {
- }
+Component({
+ properties: {
+ list:Array
+ },
+ data: {
+ },
+ methods: {
+ }
})
\ No newline at end of file
diff --git a/components/index/list/index.json b/components/index/list/index.json
index 7f8058e..463b976 100644
--- a/components/index/list/index.json
+++ b/components/index/list/index.json
@@ -1,6 +1,6 @@
-{
- "component": true,
- "usingComponents": {
- "commodity":"./commodity/index"
- }
+{
+ "component": true,
+ "usingComponents": {
+ "commodity":"./commodity/index"
+ }
}
\ No newline at end of file
diff --git a/components/index/list/index.scss b/components/index/list/index.scss
index aae32e5..dc22751 100644
--- a/components/index/list/index.scss
+++ b/components/index/list/index.scss
@@ -1,12 +1,12 @@
-.list {
- width: 623rpx;
- margin-top: 36rpx;
- .title {
- font-size: 30rpx;
- color: #333;
- font-weight: bold;
- margin-left: 32rpx;
- // margin-bottom: 32rpx;
- }
-
+.list {
+ width: 623rpx;
+ margin-top: 36rpx;
+ .title {
+ font-size: 30rpx;
+ color: #333;
+ font-weight: bold;
+ margin-left: 32rpx;
+ // margin-bottom: 32rpx;
+ }
+
}
\ No newline at end of file
diff --git a/components/index/list/index.wxml b/components/index/list/index.wxml
index e4ff091..c223504 100644
--- a/components/index/list/index.wxml
+++ b/components/index/list/index.wxml
@@ -1,4 +1,4 @@
-
- 热门商品
-
+
+ 热门商品
+
\ No newline at end of file
diff --git a/components/index/search/index.js b/components/index/search/index.js
index 035c745..3512440 100644
--- a/components/index/search/index.js
+++ b/components/index/search/index.js
@@ -1,8 +1,8 @@
-Component({
- properties: {
- },
- data: {
- },
- methods: {
- }
+Component({
+ properties: {
+ },
+ data: {
+ },
+ methods: {
+ }
})
\ No newline at end of file
diff --git a/components/index/search/index.json b/components/index/search/index.json
index 32640e0..1edff93 100644
--- a/components/index/search/index.json
+++ b/components/index/search/index.json
@@ -1,3 +1,3 @@
-{
- "component": true
+{
+ "component": true
}
\ No newline at end of file
diff --git a/components/index/search/index.scss b/components/index/search/index.scss
index e1dee72..2b2eb3e 100644
--- a/components/index/search/index.scss
+++ b/components/index/search/index.scss
@@ -1,23 +1,23 @@
-.search{
- width: 613rpx;
- height: 76rpx;
- margin-top: 30rpx;
- box-sizing: border-box;
- border-radius: 15rpx;
- display: flex;
- border:1rpx solid rgba(198,198,198,1);
- >image{
- width: 42rpx;
- height: 42rpx;
- background-color: #000;
- margin-left: 40rpx;
- margin-top: 17rpx;
- }
- >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 rgba(198,198,198,1);
+ >image{
+ width: 42rpx;
+ height: 42rpx;
+ background-color: #000;
+ margin-left: 40rpx;
+ margin-top: 17rpx;
+ }
+ >input{
+ height: 30rpx;
+ width: 480rpx;
+ margin-top: 20rpx;
+ margin-left: 17rpx;
+ font-size: 30rpx;
+ }
}
\ No newline at end of file
diff --git a/components/index/search/index.wxml b/components/index/search/index.wxml
index 3129295..8583369 100644
--- a/components/index/search/index.wxml
+++ b/components/index/search/index.wxml
@@ -1,4 +1,4 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/components/member/membershop/membershop.js b/components/member/membershop/membershop.js
index d64d27e..58126b2 100644
--- a/components/member/membershop/membershop.js
+++ b/components/member/membershop/membershop.js
@@ -1,23 +1,23 @@
-// components/member/membershop/membershop.js
-Component({
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
- /**
- * 组件的初始数据
- */
- data: {
-
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
-
- }
-})
+// components/member/membershop/membershop.js
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/components/member/membershop/membershop.json b/components/member/membershop/membershop.json
index e8cfaaf..011372e 100644
--- a/components/member/membershop/membershop.json
+++ b/components/member/membershop/membershop.json
@@ -1,4 +1,4 @@
-{
- "component": true,
- "usingComponents": {}
+{
+ "component": true,
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/components/member/membershop/membershop.scss b/components/member/membershop/membershop.scss
index 9cc74c5..4dddb12 100644
--- a/components/member/membershop/membershop.scss
+++ b/components/member/membershop/membershop.scss
@@ -1,30 +1,30 @@
-.membershop {
- width: 373rpx;
- height: 557rpx;
- background-color: #FBFBFB;
- .pic {
- width: 113rpx;
- height: 256rpx;
- background-color: white;
- margin: 0 auto;
- position: relative;
- top: 64rpx;
- left: 121rpx;
- }
- .shopname {
- width: 273rpx;
- color: #333333;
- font-size: 30rpx;
- text-align: center;
- position: relative;
- top: 111rpx;
- margin: 0 auto;
- }
- .pri {
- position: relative;
- top: 127rpx;
- text-align: center;
- font-size: 30rpx;
- color: #09BB07;
- }
+.membershop {
+ width: 373rpx;
+ height: 557rpx;
+ background-color: #FBFBFB;
+ .pic {
+ width: 113rpx;
+ height: 256rpx;
+ background-color: white;
+ margin: 0 auto;
+ position: relative;
+ top: 64rpx;
+ left: 121rpx;
+ }
+ .shopname {
+ width: 273rpx;
+ color: #333333;
+ font-size: 30rpx;
+ text-align: center;
+ position: relative;
+ top: 111rpx;
+ margin: 0 auto;
+ }
+ .pri {
+ position: relative;
+ top: 127rpx;
+ text-align: center;
+ font-size: 30rpx;
+ color: #09BB07;
+ }
}
\ No newline at end of file
diff --git a/components/member/membershop/membershop.wxml b/components/member/membershop/membershop.wxml
index 6afcf67..eb83286 100644
--- a/components/member/membershop/membershop.wxml
+++ b/components/member/membershop/membershop.wxml
@@ -1,6 +1,6 @@
-
-
- 产品名产品名产品名
-产品名产品名
-$123
+
+
+ 产品名产品名产品名
+产品名产品名
+$123
\ No newline at end of file
diff --git a/components/member/membershop/membershop.wxss b/components/member/membershop/membershop.wxss
index dcf8b68..da3eb5d 100644
--- a/components/member/membershop/membershop.wxss
+++ b/components/member/membershop/membershop.wxss
@@ -1,33 +1,33 @@
-.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: 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;
+}
diff --git a/components/member/membertop/membertop.js b/components/member/membertop/membertop.js
index f4a4222..5eb4e52 100644
--- a/components/member/membertop/membertop.js
+++ b/components/member/membertop/membertop.js
@@ -1,23 +1,23 @@
-// components/member/membertop/membertop.js
-Component({
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
- /**
- * 组件的初始数据
- */
- data: {
-
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
-
- }
-})
+// components/member/membertop/membertop.js
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/components/member/membertop/membertop.json b/components/member/membertop/membertop.json
index e8cfaaf..011372e 100644
--- a/components/member/membertop/membertop.json
+++ b/components/member/membertop/membertop.json
@@ -1,4 +1,4 @@
-{
- "component": true,
- "usingComponents": {}
+{
+ "component": true,
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/components/member/membertop/membertop.scss b/components/member/membertop/membertop.scss
index bbfb8a3..44d5fa4 100644
--- a/components/member/membertop/membertop.scss
+++ b/components/member/membertop/membertop.scss
@@ -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;
}
\ No newline at end of file
diff --git a/components/member/membertop/membertop.wxml b/components/member/membertop/membertop.wxml
index 8f1218a..2f8b731 100644
--- a/components/member/membertop/membertop.wxml
+++ b/components/member/membertop/membertop.wxml
@@ -1,3 +1,3 @@
-
- 购买下方商品成为会员
+
+ 购买下方商品成为会员
\ No newline at end of file
diff --git a/components/member/membertop/membertop.wxss b/components/member/membertop/membertop.wxss
index 8601b13..99c51e5 100644
--- a/components/member/membertop/membertop.wxss
+++ b/components/member/membertop/membertop.wxss
@@ -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;
+}
diff --git a/components/order/commodity/index.js b/components/order/commodity/index.js
index 8cd65c8..6f82273 100644
--- a/components/order/commodity/index.js
+++ b/components/order/commodity/index.js
@@ -1,11 +1,11 @@
-Component({
- properties: {},
- data: {},
- methods: {
- todetail() {
- wx.navigateTo({
- url: "/pages/undetermined/undetermined"
- })
- }
- }
+Component({
+ properties: {},
+ data: {},
+ methods: {
+ todetail() {
+ wx.navigateTo({
+ url: "/pages/undetermined/undetermined"
+ })
+ }
+ }
})
\ No newline at end of file
diff --git a/components/order/commodity/index.json b/components/order/commodity/index.json
index 9800f6a..acd0b95 100644
--- a/components/order/commodity/index.json
+++ b/components/order/commodity/index.json
@@ -1,6 +1,6 @@
-{
- "component": true,
- "usingComponents": {
- "message":"../message/index"
- }
+{
+ "component": true,
+ "usingComponents": {
+ "message":"../message/index"
+ }
}
\ No newline at end of file
diff --git a/components/order/commodity/index.scss b/components/order/commodity/index.scss
index e558039..2ed9def 100644
--- a/components/order/commodity/index.scss
+++ b/components/order/commodity/index.scss
@@ -1,81 +1,81 @@
-.commodity {
- margin-top: 20rpx;
- background-color: #fff;
- .message {
- padding: 35rpx;
- display: flex;
- align-items: center;
- border-bottom: 1rpx solid #F2F2F2;
- .image {
- width: 141rpx;
- height: 150rpx;
- background-color: #000;
- margin-left: 34rpx;
- }
- .introduce {
- margin-left: 32rpx;
- height: 120rpx;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- width: 362rpx;
- .title {
- font-size: 28rpx;
- color: #333;
- }
- .count {
- font-size: 24rpx;
- color: #999;
- display: flex;
- > view {
- margin-right: 27rpx;
- }
- }
- }
- .parameter {
- width: 150rpx;
- height: 120rpx;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- align-items: flex-end;
- }
- }
- .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;
-
- >text{
- color: #333;
- margin: 0 5rpx;
- }
- }
- .operation{
- height: 84rpx;
- display: flex;
- justify-content: flex-end;
- padding:0 30rpx;
- align-items: center;
- .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;
- }
- .hlight{
- border:2rpx solid rgba(71,200,119,1);
- color: #47C877;
- }
- }
+.commodity {
+ margin-top: 20rpx;
+ background-color: #fff;
+ .message {
+ padding: 35rpx;
+ display: flex;
+ align-items: center;
+ border-bottom: 1rpx solid #F2F2F2;
+ .image {
+ width: 141rpx;
+ height: 150rpx;
+ background-color: #000;
+ margin-left: 34rpx;
+ }
+ .introduce {
+ margin-left: 32rpx;
+ height: 120rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ width: 362rpx;
+ .title {
+ font-size: 28rpx;
+ color: #333;
+ }
+ .count {
+ font-size: 24rpx;
+ color: #999;
+ display: flex;
+ > view {
+ margin-right: 27rpx;
+ }
+ }
+ }
+ .parameter {
+ width: 150rpx;
+ height: 120rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: flex-end;
+ }
+ }
+ .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;
+
+ >text{
+ color: #333;
+ margin: 0 5rpx;
+ }
+ }
+ .operation{
+ height: 84rpx;
+ display: flex;
+ justify-content: flex-end;
+ padding:0 30rpx;
+ align-items: center;
+ .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;
+ }
+ .hlight{
+ border:2rpx solid rgba(71,200,119,1);
+ color: #47C877;
+ }
+ }
}
\ No newline at end of file
diff --git a/components/order/commodity/index.wxml b/components/order/commodity/index.wxml
index 1f117a5..37ed100 100644
--- a/components/order/commodity/index.wxml
+++ b/components/order/commodity/index.wxml
@@ -1,14 +1,14 @@
-
-
-
- 共计1件商品 合计:
- ￥29.80
- (含运费￥0.00)
-
-
- 评价
-
- 评价
-
-
+
+
+
+ 共计1件商品 合计:
+ ￥29.80
+ (含运费￥0.00)
+
+
+ 评价
+
+ 评价
+
+
\ No newline at end of file
diff --git a/components/order/message/index.js b/components/order/message/index.js
index 9f59aa7..c0c906a 100644
--- a/components/order/message/index.js
+++ b/components/order/message/index.js
@@ -1,8 +1,8 @@
-Component({
- properties: {
- },
- data: {
- },
- methods: {
- }
+Component({
+ properties: {
+ },
+ data: {
+ },
+ methods: {
+ }
})
\ No newline at end of file
diff --git a/components/order/message/index.json b/components/order/message/index.json
index 32640e0..1edff93 100644
--- a/components/order/message/index.json
+++ b/components/order/message/index.json
@@ -1,3 +1,3 @@
-{
- "component": true
+{
+ "component": true
}
\ No newline at end of file
diff --git a/components/order/message/index.scss b/components/order/message/index.scss
index cfa585f..33478f7 100644
--- a/components/order/message/index.scss
+++ b/components/order/message/index.scss
@@ -1,40 +1,40 @@
-.message {
- padding: 35rpx;
-display: flex;
-align-items: center;
-border-bottom: 1rpx solid #F2F2F2;
-.image {
- width: 141rpx;
- height: 150rpx;
- background-color: #000;
- margin-left: 34rpx;
-}
-.introduce {
- margin-left: 32rpx;
- height: 120rpx;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- width: 362rpx;
- .title {
- font-size: 28rpx;
- color: #333;
- }
- .count {
- font-size: 24rpx;
- color: #999;
- display: flex;
- > view {
- margin-right: 27rpx;
- }
- }
-}
-.parameter {
- width: 150rpx;
- height: 120rpx;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- align-items: flex-end;
-}
+.message {
+ padding: 35rpx;
+display: flex;
+align-items: center;
+border-bottom: 1rpx solid #F2F2F2;
+.image {
+ width: 141rpx;
+ height: 150rpx;
+ background-color: #000;
+ margin-left: 34rpx;
+}
+.introduce {
+ margin-left: 32rpx;
+ height: 120rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ width: 362rpx;
+ .title {
+ font-size: 28rpx;
+ color: #333;
+ }
+ .count {
+ font-size: 24rpx;
+ color: #999;
+ display: flex;
+ > view {
+ margin-right: 27rpx;
+ }
+ }
+}
+.parameter {
+ width: 150rpx;
+ height: 120rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: flex-end;
+}
}
\ No newline at end of file
diff --git a/components/order/message/index.wxml b/components/order/message/index.wxml
index 055d05c..b8fe674 100644
--- a/components/order/message/index.wxml
+++ b/components/order/message/index.wxml
@@ -1,14 +1,14 @@
-
-
-
- 001|德国双心药房版 胶原蛋白美容口服液养颜
-
- 30只
- 1.0356kg
-
-
-
- ￥29.80
- x2
-
+
+
+
+ 001|德国双心药房版 胶原蛋白美容口服液养颜
+
+ 30只
+ 1.0356kg
+
+
+
+ ￥29.80
+ x2
+
\ No newline at end of file
diff --git a/components/order/tab/index.js b/components/order/tab/index.js
index 9f59aa7..c0c906a 100644
--- a/components/order/tab/index.js
+++ b/components/order/tab/index.js
@@ -1,8 +1,8 @@
-Component({
- properties: {
- },
- data: {
- },
- methods: {
- }
+Component({
+ properties: {
+ },
+ data: {
+ },
+ methods: {
+ }
})
\ No newline at end of file
diff --git a/components/order/tab/index.json b/components/order/tab/index.json
index e37cddb..7047382 100644
--- a/components/order/tab/index.json
+++ b/components/order/tab/index.json
@@ -1,8 +1,8 @@
-{
- "component": true,
- "usingComponents": {
- "commodity": "../commodity",
- "van-tab": "../utils/dist/tab/index",
- "van-tabs": "../utils/dist/tabs/index"
- }
+{
+ "component": true,
+ "usingComponents": {
+ "commodity": "../commodity",
+ "van-tab": "../utils/dist/tab/index",
+ "van-tabs": "../utils/dist/tabs/index"
+ }
}
\ No newline at end of file
diff --git a/components/order/tab/index.scss b/components/order/tab/index.scss
index 5003c84..2ba65f7 100644
--- a/components/order/tab/index.scss
+++ b/components/order/tab/index.scss
@@ -1,3 +1,3 @@
-.tab {
- width: 750rpx;
+.tab {
+ width: 750rpx;
}
\ No newline at end of file
diff --git a/components/order/tab/index.wxml b/components/order/tab/index.wxml
index 332394c..9d5d671 100644
--- a/components/order/tab/index.wxml
+++ b/components/order/tab/index.wxml
@@ -1,9 +1,9 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/order/tab/index.wxss b/components/order/tab/index.wxss
index 77cc1ab..1b2c919 100644
--- a/components/order/tab/index.wxss
+++ b/components/order/tab/index.wxss
@@ -1 +1 @@
-.tab{width:750rpx}
+.tab{width:750rpx}
diff --git a/components/orderconfirm/orderagreement/orderagreement.js b/components/orderconfirm/orderagreement/orderagreement.js
index 8dca30f..fdb2c09 100644
--- a/components/orderconfirm/orderagreement/orderagreement.js
+++ b/components/orderconfirm/orderagreement/orderagreement.js
@@ -1,23 +1,23 @@
-// components/orderconfirm/orderagreement/orderagreement.js
-Component({
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
- /**
- * 组件的初始数据
- */
- data: {
-
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
-
- }
-})
+// components/orderconfirm/orderagreement/orderagreement.js
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/components/orderconfirm/orderagreement/orderagreement.json b/components/orderconfirm/orderagreement/orderagreement.json
index e8cfaaf..011372e 100644
--- a/components/orderconfirm/orderagreement/orderagreement.json
+++ b/components/orderconfirm/orderagreement/orderagreement.json
@@ -1,4 +1,4 @@
-{
- "component": true,
- "usingComponents": {}
+{
+ "component": true,
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/components/orderconfirm/orderagreement/orderagreement.scss b/components/orderconfirm/orderagreement/orderagreement.scss
index c504b7f..d9afcaa 100644
--- a/components/orderconfirm/orderagreement/orderagreement.scss
+++ b/components/orderconfirm/orderagreement/orderagreement.scss
@@ -1,19 +1,19 @@
-.agree {
- width: 690rpx;
- // height: 96rpx;
- line-height: 96rpx;
- display: flex;
- // border-bottom: 2rpx solid #EAEAEA;
- margin: 0 auto;
- color: #999999;
- font-size: 26rpx;
- .select {
- width: 26rpx;
- height: 26rpx;
- margin: auto 0;
- border-radius: 50%;
- background-color: #EAEAEA;
- margin-right: 25rpx;
- margin-left: 31rpx;
- }
+.agree {
+ width: 690rpx;
+ // height: 96rpx;
+ line-height: 96rpx;
+ display: flex;
+ // border-bottom: 2rpx solid #EAEAEA;
+ margin: 0 auto;
+ color: #999999;
+ font-size: 26rpx;
+ .select {
+ width: 26rpx;
+ height: 26rpx;
+ margin: auto 0;
+ border-radius: 50%;
+ background-color: #EAEAEA;
+ margin-right: 25rpx;
+ margin-left: 31rpx;
+ }
}
\ No newline at end of file
diff --git a/components/orderconfirm/orderagreement/orderagreement.wxml b/components/orderconfirm/orderagreement/orderagreement.wxml
index 6826993..9f0314d 100644
--- a/components/orderconfirm/orderagreement/orderagreement.wxml
+++ b/components/orderconfirm/orderagreement/orderagreement.wxml
@@ -1,4 +1,4 @@
-
-
- 同意使用条款和隐私政策
+
+
+ 同意使用条款和隐私政策
\ No newline at end of file
diff --git a/components/orderconfirm/orderagreement/orderagreement.wxss b/components/orderconfirm/orderagreement/orderagreement.wxss
index 2b38057..6f4346f 100644
--- a/components/orderconfirm/orderagreement/orderagreement.wxss
+++ b/components/orderconfirm/orderagreement/orderagreement.wxss
@@ -1,18 +1,18 @@
-.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;
+}
diff --git a/components/orderconfirm/orderbottom/orderbottom.js b/components/orderconfirm/orderbottom/orderbottom.js
index 5462fff..d9589b3 100644
--- a/components/orderconfirm/orderbottom/orderbottom.js
+++ b/components/orderconfirm/orderbottom/orderbottom.js
@@ -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")
+ }
+ }
})
\ No newline at end of file
diff --git a/components/orderconfirm/orderbottom/orderbottom.json b/components/orderconfirm/orderbottom/orderbottom.json
index e8cfaaf..011372e 100644
--- a/components/orderconfirm/orderbottom/orderbottom.json
+++ b/components/orderconfirm/orderbottom/orderbottom.json
@@ -1,4 +1,4 @@
-{
- "component": true,
- "usingComponents": {}
+{
+ "component": true,
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/components/orderconfirm/orderbottom/orderbottom.scss b/components/orderconfirm/orderbottom/orderbottom.scss
index 4dfedd2..ce55a30 100644
--- a/components/orderconfirm/orderbottom/orderbottom.scss
+++ b/components/orderconfirm/orderbottom/orderbottom.scss
@@ -1,21 +1,21 @@
-.bottom {
- width: 100%;
- height: 99rpx;
- line-height: 99rpx;
- display: flex;
- justify-content: space-between;
- border-top: 2rpx solid #EAEAEA;
- font-size: 28rpx;
- .left {
- margin-left: 59rpx;
- .pri {
- color: #E0C79D;
- font-size: 26rpx;
- margin-left: 19rpx;
- }
- }
- .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;
+ .left {
+ margin-left: 59rpx;
+ .pri {
+ color: #E0C79D;
+ font-size: 26rpx;
+ margin-left: 19rpx;
+ }
+ }
+ .right {
+ color: #4CC97D;
+ margin-right: 38rpx;
+ }
}
\ No newline at end of file
diff --git a/components/orderconfirm/orderbottom/orderbottom.wxml b/components/orderconfirm/orderbottom/orderbottom.wxml
index b985565..6f31486 100644
--- a/components/orderconfirm/orderbottom/orderbottom.wxml
+++ b/components/orderconfirm/orderbottom/orderbottom.wxml
@@ -1,7 +1,7 @@
-
-
- 总计
- $0.00
-
- 结算
+
+
+ 总计
+ ${{price}}
+
+ 结算
\ No newline at end of file
diff --git a/components/orderconfirm/orderbottom/orderbottom.wxss b/components/orderconfirm/orderbottom/orderbottom.wxss
index 9e956e8..018636b 100644
--- a/components/orderconfirm/orderbottom/orderbottom.wxss
+++ b/components/orderconfirm/orderbottom/orderbottom.wxss
@@ -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;
+}
diff --git a/components/orderconfirm/orderchooseaddr/orderchooseaddr.js b/components/orderconfirm/orderchooseaddr/orderchooseaddr.js
index 5ff1b48..723ccf0 100644
--- a/components/orderconfirm/orderchooseaddr/orderchooseaddr.js
+++ b/components/orderconfirm/orderchooseaddr/orderchooseaddr.js
@@ -1,27 +1,27 @@
-// components/orderconfirm/orderchooseaddr/orderchooseaddr.js
-Component({
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
- /**
- * 组件的初始数据
- */
- data: {
-
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
- choose() {
- wx.navigateTo({
- url: "/pages/chooseaddr/chooseaddr"
- })
- }
- }
+// components/orderconfirm/orderchooseaddr/orderchooseaddr.js
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+ choose() {
+ wx.navigateTo({
+ url: "/pages/chooseaddr/chooseaddr"
+ })
+ }
+ }
})
\ No newline at end of file
diff --git a/components/orderconfirm/orderchooseaddr/orderchooseaddr.json b/components/orderconfirm/orderchooseaddr/orderchooseaddr.json
index e8cfaaf..011372e 100644
--- a/components/orderconfirm/orderchooseaddr/orderchooseaddr.json
+++ b/components/orderconfirm/orderchooseaddr/orderchooseaddr.json
@@ -1,4 +1,4 @@
-{
- "component": true,
- "usingComponents": {}
+{
+ "component": true,
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/components/orderconfirm/orderchooseaddr/orderchooseaddr.scss b/components/orderconfirm/orderchooseaddr/orderchooseaddr.scss
index c1a73e4..8591980 100644
--- a/components/orderconfirm/orderchooseaddr/orderchooseaddr.scss
+++ b/components/orderconfirm/orderchooseaddr/orderchooseaddr.scss
@@ -1,33 +1,33 @@
-.orderchooseaddr {
- width: 690rpx;
- height: 148rpx;
- margin: 0 auto;
- border-bottom: 2rpx solid #EAEAEA;
- display: flex;
- justify-content: space-between;
- .left {
- width: 572rpx;
- height: 80rpx;
- .userinfo {
- color: #333333;
- font-size: 26rpx;
- text-indent: 30rpx;
- margin-top: 41rpx;
- display: flex;
- justify-content: space-between;
- }
- .addr {
- color: #999999;
- font-size: 24rpx;
- text-indent: 30rpx;
- margin-top: 32rpx;
- }
- }
- .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;
+ .left {
+ width: 572rpx;
+ height: 80rpx;
+ .userinfo {
+ color: #333333;
+ font-size: 26rpx;
+ text-indent: 30rpx;
+ margin-top: 41rpx;
+ display: flex;
+ justify-content: space-between;
+ }
+ .addr {
+ color: #999999;
+ font-size: 24rpx;
+ text-indent: 30rpx;
+ margin-top: 32rpx;
+ }
+ }
+ .right {
+ width: 17rpx;
+ height: 30rpx;
+ background-color: #D3D3D3;
+ margin: auto 0;
+ margin-right: 19rpx;
+ }
}
\ No newline at end of file
diff --git a/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxml b/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxml
index c9d3167..ebc95b7 100644
--- a/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxml
+++ b/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxml
@@ -1,12 +1,12 @@
-
-
-
- 于于宇 15698857895
- 邮政编码：677467
-
-
- 中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区
-
-
-
+
+
+
+ 于于宇 15698857895
+ 邮政编码：677467
+
+
+ 中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区
+
+
+
\ No newline at end of file
diff --git a/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxss b/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxss
index 1559bfa..f822871 100644
--- a/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxss
+++ b/components/orderconfirm/orderchooseaddr/orderchooseaddr.wxss
@@ -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;
+}
diff --git a/components/orderconfirm/orderchooseway/orderchooseway.js b/components/orderconfirm/orderchooseway/orderchooseway.js
index 948c101..50308f8 100644
--- a/components/orderconfirm/orderchooseway/orderchooseway.js
+++ b/components/orderconfirm/orderchooseway/orderchooseway.js
@@ -1,23 +1,23 @@
-// components/orderconfirm/orderchooseway/orderchooseway.js
-Component({
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
- /**
- * 组件的初始数据
- */
- data: {
-
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
-
- }
-})
+// components/orderconfirm/orderchooseway/orderchooseway.js
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/components/orderconfirm/orderchooseway/orderchooseway.json b/components/orderconfirm/orderchooseway/orderchooseway.json
index e8cfaaf..011372e 100644
--- a/components/orderconfirm/orderchooseway/orderchooseway.json
+++ b/components/orderconfirm/orderchooseway/orderchooseway.json
@@ -1,4 +1,4 @@
-{
- "component": true,
- "usingComponents": {}
+{
+ "component": true,
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/components/orderconfirm/orderchooseway/orderchooseway.scss b/components/orderconfirm/orderchooseway/orderchooseway.scss
index 505d799..e49c812 100644
--- a/components/orderconfirm/orderchooseway/orderchooseway.scss
+++ b/components/orderconfirm/orderchooseway/orderchooseway.scss
@@ -1,30 +1,30 @@
-.chooseway {
- width: 690rpx;
- height: 96rpx;
- line-height: 96rpx;
- display: flex;
- border-bottom: 2rpx solid #EAEAEA;
- margin: 0 auto;
- .item {
- display: flex;
- margin-right: 90rpx;
- .select {
- width: 26rpx;
- height: 26rpx;
- margin: auto 0;
- border-radius: 50%;
- background-color: #EAEAEA;
- }
- .selected {
- background-color: #47C877;
- }
- .way {
- color: #333333;
- font-size: 26rpx;
- text-indent: 17rpx;
- }
- }
- .item1 {
- margin-left: 31rpx;
- }
+.chooseway {
+ width: 690rpx;
+ height: 96rpx;
+ line-height: 96rpx;
+ display: flex;
+ border-bottom: 2rpx solid #EAEAEA;
+ margin: 0 auto;
+ .item {
+ display: flex;
+ margin-right: 90rpx;
+ .select {
+ width: 26rpx;
+ height: 26rpx;
+ margin: auto 0;
+ border-radius: 50%;
+ background-color: #EAEAEA;
+ }
+ .selected {
+ background-color: #47C877;
+ }
+ .way {
+ color: #333333;
+ font-size: 26rpx;
+ text-indent: 17rpx;
+ }
+ }
+ .item1 {
+ margin-left: 31rpx;
+ }
}
\ No newline at end of file
diff --git a/components/orderconfirm/orderchooseway/orderchooseway.wxml b/components/orderconfirm/orderchooseway/orderchooseway.wxml
index b125024..1243e4e 100644
--- a/components/orderconfirm/orderchooseway/orderchooseway.wxml
+++ b/components/orderconfirm/orderchooseway/orderchooseway.wxml
@@ -1,10 +1,10 @@
-
-
-
- 快递配送
-
-
-
- 到店自取
-
+
+
+
+ 快递配送
+
+
+
+ 到店自取
+
\ No newline at end of file
diff --git a/components/orderconfirm/orderchooseway/orderchooseway.wxss b/components/orderconfirm/orderchooseway/orderchooseway.wxss
index 144fa56..3bf16d4 100644
--- a/components/orderconfirm/orderchooseway/orderchooseway.wxss
+++ b/components/orderconfirm/orderchooseway/orderchooseway.wxss
@@ -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;
+}
diff --git a/components/orderconfirm/ordershopinfo/ordershopinfo.js b/components/orderconfirm/ordershopinfo/ordershopinfo.js
index f4cf637..05a5a25 100644
--- a/components/orderconfirm/ordershopinfo/ordershopinfo.js
+++ b/components/orderconfirm/ordershopinfo/ordershopinfo.js
@@ -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: {
+
+ }
+})
diff --git a/components/orderconfirm/ordershopinfo/ordershopinfo.json b/components/orderconfirm/ordershopinfo/ordershopinfo.json
index 33d83c1..933abf0 100644
--- a/components/orderconfirm/ordershopinfo/ordershopinfo.json
+++ b/components/orderconfirm/ordershopinfo/ordershopinfo.json
@@ -1,6 +1,6 @@
-{
- "component": true,
- "usingComponents": {
-
- }
+{
+ "component": true,
+ "usingComponents": {
+
+ }
}
\ No newline at end of file
diff --git a/components/orderconfirm/ordershopinfo/ordershopinfo.scss b/components/orderconfirm/ordershopinfo/ordershopinfo.scss
index 1e3c375..c74f0bb 100644
--- a/components/orderconfirm/ordershopinfo/ordershopinfo.scss
+++ b/components/orderconfirm/ordershopinfo/ordershopinfo.scss
@@ -1,42 +1,42 @@
-.shopinfo {
- width: 690rpx;
- height: 218rpx;
- border-bottom: 2rpx solid #EAEAEA;
- margin: 0 auto;
- display: flex;
- justify-content: center;
- .pic {
- width: 150rpx;
- height: 163rpx;
- background-color: #EAEAEA;
- margin-right: 40rpx;
- }
- .right {
- width: 402rpx;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- margin-top: 6rpx;
- .shopname {
- font-size: 28rpx;
- font-weight: bold;
- line-height: 39rpx;
- }
- .down {
- margin-bottom: 50rpx;
- display: flex;
- justify-content: space-between;
- .shopdesc {
- color: #666666;
- font-size: 24rpx;
- .size {
- margin-right: 20rpx;
- }
- }
- .pri {
- color: #E1C89F;
- font-size: 28rpx;
- }
- }
- }
+.shopinfo {
+ width: 690rpx;
+ height: 218rpx;
+ border-bottom: 2rpx solid #EAEAEA;
+ margin: 0 auto;
+ display: flex;
+ justify-content: center;
+ .pic {
+ width: 150rpx;
+ height: 163rpx;
+ background-color: #EAEAEA;
+ margin-right: 40rpx;
+ }
+ .right {
+ width: 402rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ margin-top: 6rpx;
+ .shopname {
+ font-size: 28rpx;
+ font-weight: bold;
+ line-height: 39rpx;
+ }
+ .down {
+ margin-bottom: 50rpx;
+ display: flex;
+ justify-content: space-between;
+ .shopdesc {
+ color: #666666;
+ font-size: 24rpx;
+ .size {
+ margin-right: 20rpx;
+ }
+ }
+ .pri {
+ color: #E1C89F;
+ font-size: 28rpx;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/components/orderconfirm/ordershopinfo/ordershopinfo.wxml b/components/orderconfirm/ordershopinfo/ordershopinfo.wxml
index 9e55863..cc8f5ce 100644
--- a/components/orderconfirm/ordershopinfo/ordershopinfo.wxml
+++ b/components/orderconfirm/ordershopinfo/ordershopinfo.wxml
@@ -1,13 +1,13 @@
-
-
-
- 产品产品产品产品产品产品产品产品产品产品产品产品产品
-
-
- 规格10ml
- 0.04kg
-
- ￥657
-
-
+
+
+
+ {{title}}
+
+
+ {{spec}}
+
+
+ ￥{{price}}
+
+
\ No newline at end of file
diff --git a/components/orderconfirm/ordershopinfo/ordershopinfo.wxss b/components/orderconfirm/ordershopinfo/ordershopinfo.wxss
index 3febb91..16b6e91 100644
--- a/components/orderconfirm/ordershopinfo/ordershopinfo.wxss
+++ b/components/orderconfirm/ordershopinfo/ordershopinfo.wxss
@@ -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;
+}
diff --git a/components/orderconfirm/orderyf/orderyf.js b/components/orderconfirm/orderyf/orderyf.js
index fb835e8..7f2e603 100644
--- a/components/orderconfirm/orderyf/orderyf.js
+++ b/components/orderconfirm/orderyf/orderyf.js
@@ -1,23 +1,23 @@
-// components/orderconfirm/orderyf/orderyf.js
-Component({
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
- /**
- * 组件的初始数据
- */
- data: {
-
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
-
- }
-})
+// components/orderconfirm/orderyf/orderyf.js
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ price:String
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/components/orderconfirm/orderyf/orderyf.json b/components/orderconfirm/orderyf/orderyf.json
index e8cfaaf..011372e 100644
--- a/components/orderconfirm/orderyf/orderyf.json
+++ b/components/orderconfirm/orderyf/orderyf.json
@@ -1,4 +1,4 @@
-{
- "component": true,
- "usingComponents": {}
+{
+ "component": true,
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/components/orderconfirm/orderyf/orderyf.scss b/components/orderconfirm/orderyf/orderyf.scss
index 95c2833..5e3c2af 100644
--- a/components/orderconfirm/orderyf/orderyf.scss
+++ b/components/orderconfirm/orderyf/orderyf.scss
@@ -1,17 +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;
- ;
- }
+.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;
+ ;
+ }
}
\ No newline at end of file
diff --git a/components/orderconfirm/orderyf/orderyf.wxml b/components/orderconfirm/orderyf/orderyf.wxml
index 25ae3c3..56ecc9f 100644
--- a/components/orderconfirm/orderyf/orderyf.wxml
+++ b/components/orderconfirm/orderyf/orderyf.wxml
@@ -1,4 +1,4 @@
-
- 运费
- ￥16
+
+ 运费
+ ￥{{price}}
\ No newline at end of file
diff --git a/components/orderconfirm/orderyf/orderyf.wxss b/components/orderconfirm/orderyf/orderyf.wxss
index a63eeb0..fd167e0 100644
--- a/components/orderconfirm/orderyf/orderyf.wxss
+++ b/components/orderconfirm/orderyf/orderyf.wxss
@@ -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;
+}
diff --git a/components/particulars/content/index.js b/components/particulars/content/index.js
index 9f59aa7..c0c906a 100644
--- a/components/particulars/content/index.js
+++ b/components/particulars/content/index.js
@@ -1,8 +1,8 @@
-Component({
- properties: {
- },
- data: {
- },
- methods: {
- }
+Component({
+ properties: {
+ },
+ data: {
+ },
+ methods: {
+ }
})
\ No newline at end of file
diff --git a/components/particulars/content/index.json b/components/particulars/content/index.json
index 5be3fa1..40feb93 100644
--- a/components/particulars/content/index.json
+++ b/components/particulars/content/index.json
@@ -1,6 +1,6 @@
-{
- "component": true,
- "usingComponents": {
- "message":"../../order/message/index"
- }
+{
+ "component": true,
+ "usingComponents": {
+ "message":"../../order/message/index"
+ }
}
\ No newline at end of file
diff --git a/components/particulars/content/index.scss b/components/particulars/content/index.scss
index 37e2d83..ca3000e 100644
--- a/components/particulars/content/index.scss
+++ b/components/particulars/content/index.scss
@@ -1,38 +1,38 @@
-.content {
- background-color: #fff;
- width: 750rpx;
- // height: ;
- padding-bottom: 33rpx;
-
- .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;
-
- > text {
- color: #333;
- margin: 0 5rpx;
- }
- }
- .message {
- display: flex;
- padding: 0 30rpx;
- justify-content: space-between;
- font-size: 26rpx;
- color: #333;
- align-items: center;
- height: 77rpx;
- border-bottom: 1rpx solid #f2f2f2;
- }
- .leave {
- display: flex;
- height: 77rpx;
- padding: 0 30rpx;
- align-items: center;
- }
+.content {
+ background-color: #fff;
+ width: 750rpx;
+ // height: ;
+ padding-bottom: 33rpx;
+
+ .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;
+
+ > text {
+ color: #333;
+ margin: 0 5rpx;
+ }
+ }
+ .message {
+ display: flex;
+ padding: 0 30rpx;
+ justify-content: space-between;
+ font-size: 26rpx;
+ color: #333;
+ align-items: center;
+ height: 77rpx;
+ border-bottom: 1rpx solid #f2f2f2;
+ }
+ .leave {
+ display: flex;
+ height: 77rpx;
+ padding: 0 30rpx;
+ align-items: center;
+ }
}
\ No newline at end of file
diff --git a/components/particulars/content/index.wxml b/components/particulars/content/index.wxml
index 308ea30..fbc9389 100644
--- a/components/particulars/content/index.wxml
+++ b/components/particulars/content/index.wxml
@@ -1,24 +1,24 @@
-
-
-
- 共计1件商品 合计:
- ￥29.80
- (含运费￥0.00)
-
-
- 订单编号
- 123456789123456789
-
-
- 下单时间
- 2018-10-01 18:00:06
-
-
- 配送方式
- 快递 免邮
-
-
- 备注：
-
-
+
+
+
+ 共计1件商品 合计:
+ ￥29.80
+ (含运费￥0.00)
+
+
+ 订单编号
+ 123456789123456789
+
+
+ 下单时间
+ 2018-10-01 18:00:06
+
+
+ 配送方式
+ 快递 免邮
+
+
+ 备注：
+
+
\ No newline at end of file
diff --git a/components/particulars/logistics/index.js b/components/particulars/logistics/index.js
index ceed45d..f3dc1b4 100644
--- a/components/particulars/logistics/index.js
+++ b/components/particulars/logistics/index.js
@@ -1,26 +1,26 @@
-Component({
- properties: {
- },
- data: {
- steps: [
- {
- text: '步骤一',
- desc: '描述信息'
- },
- {
- text: '步骤二',
- desc: '描述信息'
- },
- {
- text: '步骤三',
- desc: '描述信息'
- },
- {
- text: '步骤四',
- desc: '描述信息'
- }
- ]
- },
- methods: {
- }
+Component({
+ properties: {
+ },
+ data: {
+ steps: [
+ {
+ text: '步骤一',
+ desc: '描述信息'
+ },
+ {
+ text: '步骤二',
+ desc: '描述信息'
+ },
+ {
+ text: '步骤三',
+ desc: '描述信息'
+ },
+ {
+ text: '步骤四',
+ desc: '描述信息'
+ }
+ ]
+ },
+ methods: {
+ }
})
\ No newline at end of file
diff --git a/components/particulars/logistics/index.json b/components/particulars/logistics/index.json
index 0cc7584..8b9e338 100644
--- a/components/particulars/logistics/index.json
+++ b/components/particulars/logistics/index.json
@@ -1,6 +1,6 @@
-{
- "component": true,
- "usingComponents": {
- "van-steps": "../utils/dist/steps/index"
- }
+{
+ "component": true,
+ "usingComponents": {
+ "van-steps": "../utils/dist/steps/index"
+ }
}
\ No newline at end of file
diff --git a/components/particulars/logistics/index.scss b/components/particulars/logistics/index.scss
index d8b2e1b..5e68c1c 100644
--- a/components/particulars/logistics/index.scss
+++ b/components/particulars/logistics/index.scss
@@ -1,17 +1,17 @@
-.logistics{
- margin-top: 20rpx;
- background-color: #fff;
- .title{
- height: 84rpx;
- font-size: 28rpx;
- color: #333;
- line-height: 84rpx;
- border-bottom: 2rpx solid #e5e5e5;
- padding-left: 29rpx;
- box-sizing: border-box;
- }
- .schedule{
- width: 650rpx;
- margin-left: 50rpx;
- }
+.logistics{
+ margin-top: 20rpx;
+ background-color: #fff;
+ .title{
+ height: 84rpx;
+ font-size: 28rpx;
+ color: #333;
+ line-height: 84rpx;
+ border-bottom: 2rpx solid #e5e5e5;
+ padding-left: 29rpx;
+ box-sizing: border-box;
+ }
+ .schedule{
+ width: 650rpx;
+ margin-left: 50rpx;
+ }
}
\ No newline at end of file
diff --git a/components/particulars/logistics/index.wxml b/components/particulars/logistics/index.wxml
index 78789dc..aae2b18 100644
--- a/components/particulars/logistics/index.wxml
+++ b/components/particulars/logistics/index.wxml
@@ -1,4 +1,4 @@
-
- 物流追踪
-
+
+ 物流追踪
+
\ No newline at end of file
diff --git a/components/particulars/orderchooseaddr/index.js b/components/particulars/orderchooseaddr/index.js
index 9f59aa7..c0c906a 100644
--- a/components/particulars/orderchooseaddr/index.js
+++ b/components/particulars/orderchooseaddr/index.js
@@ -1,8 +1,8 @@
-Component({
- properties: {
- },
- data: {
- },
- methods: {
- }
+Component({
+ properties: {
+ },
+ data: {
+ },
+ methods: {
+ }
})
\ No newline at end of file
diff --git a/components/particulars/orderchooseaddr/index.json b/components/particulars/orderchooseaddr/index.json
index 32640e0..1edff93 100644
--- a/components/particulars/orderchooseaddr/index.json
+++ b/components/particulars/orderchooseaddr/index.json
@@ -1,3 +1,3 @@
-{
- "component": true
+{
+ "component": true
}
\ No newline at end of file
diff --git a/components/particulars/orderchooseaddr/index.scss b/components/particulars/orderchooseaddr/index.scss
index 55f825c..c50382c 100644
--- a/components/particulars/orderchooseaddr/index.scss
+++ b/components/particulars/orderchooseaddr/index.scss
@@ -1,35 +1,35 @@
-.orderchooseaddr {
- background-color: #fff;
- width: 750rpx;
- height: 148rpx;
- margin: 0 auto;
- border-bottom: 20rpx solid #fbfbfb;
- display: flex;
- justify-content: space-between;
- .left {
- width: 572rpx;
- height: 80rpx;
- .userinfo {
- color: #333333;
- font-size: 26rpx;
- text-indent: 30rpx;
- margin-top: 41rpx;
- display: flex;
- justify-content: space-between;
- }
- .addr {
- color: #999999;
- font-size: 24rpx;
- text-indent: 30rpx;
- margin-top: 32rpx;
- }
- }
- .right {
- width: 17rpx;
- height: 30rpx;
- background-color: #d3d3d3;
- margin: auto 0;
- margin-right: 19rpx;
- }
-}
-
+.orderchooseaddr {
+ background-color: #fff;
+ width: 750rpx;
+ height: 148rpx;
+ margin: 0 auto;
+ border-bottom: 20rpx solid #fbfbfb;
+ display: flex;
+ justify-content: space-between;
+ .left {
+ width: 572rpx;
+ height: 80rpx;
+ .userinfo {
+ color: #333333;
+ font-size: 26rpx;
+ text-indent: 30rpx;
+ margin-top: 41rpx;
+ display: flex;
+ justify-content: space-between;
+ }
+ .addr {
+ color: #999999;
+ font-size: 24rpx;
+ text-indent: 30rpx;
+ margin-top: 32rpx;
+ }
+ }
+ .right {
+ width: 17rpx;
+ height: 30rpx;
+ background-color: #d3d3d3;
+ margin: auto 0;
+ margin-right: 19rpx;
+ }
+}
+
diff --git a/components/particulars/orderchooseaddr/index.wxml b/components/particulars/orderchooseaddr/index.wxml
index 02ae52f..2d66d94 100644
--- a/components/particulars/orderchooseaddr/index.wxml
+++ b/components/particulars/orderchooseaddr/index.wxml
@@ -1,10 +1,10 @@
-
-
-
- 于于宇 15698857895
-
-
- 中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区
-
-
+
+
+
+ 于于宇 15698857895
+
+
+ 中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区
+
+
\ No newline at end of file
diff --git a/components/particulars/submit/index.js b/components/particulars/submit/index.js
index 9f59aa7..c0c906a 100644
--- a/components/particulars/submit/index.js
+++ b/components/particulars/submit/index.js
@@ -1,8 +1,8 @@
-Component({
- properties: {
- },
- data: {
- },
- methods: {
- }
+Component({
+ properties: {
+ },
+ data: {
+ },
+ methods: {
+ }
})
\ No newline at end of file
diff --git a/components/particulars/submit/index.json b/components/particulars/submit/index.json
index 32640e0..1edff93 100644
--- a/components/particulars/submit/index.json
+++ b/components/particulars/submit/index.json
@@ -1,3 +1,3 @@
-{
- "component": true
+{
+ "component": true
}
\ No newline at end of file
diff --git a/components/particulars/submit/index.scss b/components/particulars/submit/index.scss
index c109a19..e4717f2 100644
--- a/components/particulars/submit/index.scss
+++ b/components/particulars/submit/index.scss
@@ -1,29 +1,29 @@
-.payment {
- width: 750rpx;
- height: 98rpx;
- position: fixed;
- bottom: 0;
- display: flex;
- justify-content: space-between;
- background-color: #fff;
- align-items: center;
- .price {
- font-size: 34rpx;
- margin-left: 74rpx;
- .title {
- color: #333;
- }
- .counts{
- color: #ff3838;
- }
- }
- .submit {
- width: 250rpx;
- height: 98rpx;
- background-color: #47c877;
- font-size: 30rpx;
- color: #fff;
- line-height: 98rpx;
- text-align: center;
- }
+.payment {
+ width: 750rpx;
+ height: 98rpx;
+ position: fixed;
+ bottom: 0;
+ display: flex;
+ justify-content: space-between;
+ background-color: #fff;
+ align-items: center;
+ .price {
+ font-size: 34rpx;
+ margin-left: 74rpx;
+ .title {
+ color: #333;
+ }
+ .counts{
+ color: #ff3838;
+ }
+ }
+ .submit {
+ width: 250rpx;
+ height: 98rpx;
+ background-color: #47c877;
+ font-size: 30rpx;
+ color: #fff;
+ line-height: 98rpx;
+ text-align: center;
+ }
}
\ No newline at end of file
diff --git a/components/particulars/submit/index.wxml b/components/particulars/submit/index.wxml
index 61671c9..cc01508 100644
--- a/components/particulars/submit/index.wxml
+++ b/components/particulars/submit/index.wxml
@@ -1,7 +1,7 @@
-
-
- 总付款：
- ￥29
-
- 立即支付
+
+
+ 总付款：
+ ￥29
+
+ 立即支付
\ No newline at end of file
diff --git a/components/search/hot/index.js b/components/search/hot/index.js
index 9f59aa7..c0c906a 100644
--- a/components/search/hot/index.js
+++ b/components/search/hot/index.js
@@ -1,8 +1,8 @@
-Component({
- properties: {
- },
- data: {
- },
- methods: {
- }
+Component({
+ properties: {
+ },
+ data: {
+ },
+ methods: {
+ }
})
\ No newline at end of file
diff --git a/components/search/hot/index.json b/components/search/hot/index.json
index 32640e0..1edff93 100644
--- a/components/search/hot/index.json
+++ b/components/search/hot/index.json
@@ -1,3 +1,3 @@
-{
- "component": true
+{
+ "component": true
}
\ No newline at end of file
diff --git a/components/search/hot/index.scss b/components/search/hot/index.scss
index f6b3ef9..2c0c06d 100644
--- a/components/search/hot/index.scss
+++ b/components/search/hot/index.scss
@@ -1,22 +1,22 @@
-.hot {
- display: flex;
- align-items: center;
- flex-direction: column;
- .title {
- font-size: 34rpx;
- color: #333;
- font-weight: bold;
- width: 415rpx;
- height: 61rpx;
- line-height: 61rpx;
- text-align: center;
- background-image: linear-gradient(to right, #fff, #ecfff8, #fff);
- margin-top: 53rpx;
- margin-bottom: 38rpx;
- }
- .word{
- font-size: 30rpx;
- color: #999;
- margin-bottom: 55rpx;
- }
+.hot {
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ .title {
+ font-size: 34rpx;
+ color: #333;
+ font-weight: bold;
+ width: 415rpx;
+ height: 61rpx;
+ line-height: 61rpx;
+ text-align: center;
+ background-image: linear-gradient(to right, #fff, #ecfff8, #fff);
+ margin-top: 53rpx;
+ margin-bottom: 38rpx;
+ }
+ .word{
+ font-size: 30rpx;
+ color: #999;
+ margin-bottom: 55rpx;
+ }
}
\ No newline at end of file
diff --git a/components/search/hot/index.wxml b/components/search/hot/index.wxml
index 1842cb4..c2ed592 100644
--- a/components/search/hot/index.wxml
+++ b/components/search/hot/index.wxml
@@ -1,5 +1,5 @@
-
- 热门搜索
- 化妆品
- 化妆品
+
+ 热门搜索
+ 化妆品
+ 化妆品
\ No newline at end of file
diff --git a/components/search/hot/index.wxss b/components/search/hot/index.wxss
index e142220..cea1c39 100644
--- a/components/search/hot/index.wxss
+++ b/components/search/hot/index.wxss
@@ -1 +1 @@
-.hot{display:flex;align-items:center;flex-direction:column}.hot .title{font-size:34rpx;color:#333;font-weight:bold;width:415rpx;height:61rpx;line-height:61rpx;text-align:center;background-image:linear-gradient(to right, #fff, #ecfff8, #fff);margin-top:53rpx;margin-bottom:38rpx}.hot .word{font-size:30rpx;color:#999;margin-bottom:55rpx}
+.hot{display:flex;align-items:center;flex-direction:column}.hot .title{font-size:34rpx;color:#333;font-weight:bold;width:415rpx;height:61rpx;line-height:61rpx;text-align:center;background-image:linear-gradient(to right, #fff, #ecfff8, #fff);margin-top:53rpx;margin-bottom:38rpx}.hot .word{font-size:30rpx;color:#999;margin-bottom:55rpx}
diff --git a/components/seles/merchandises/index.js b/components/seles/merchandises/index.js
index 9f59aa7..c0c906a 100644
--- a/components/seles/merchandises/index.js
+++ b/components/seles/merchandises/index.js
@@ -1,8 +1,8 @@
-Component({
- properties: {
- },
- data: {
- },
- methods: {
- }
+Component({
+ properties: {
+ },
+ data: {
+ },
+ methods: {
+ }
})
\ No newline at end of file
diff --git a/components/seles/merchandises/index.json b/components/seles/merchandises/index.json
index 78013bd..de3af2d 100644
--- a/components/seles/merchandises/index.json
+++ b/components/seles/merchandises/index.json
@@ -1,5 +1,5 @@
-{
- "component": true,
- "usingComponents": {
- }
+{
+ "component": true,
+ "usingComponents": {
+ }
}
\ No newline at end of file
diff --git a/components/seles/merchandises/index.scss b/components/seles/merchandises/index.scss
index 145d073..0894589 100644
--- a/components/seles/merchandises/index.scss
+++ b/components/seles/merchandises/index.scss
@@ -1,28 +1,28 @@
-.merchandise {
- padding: 46rpx 32rpx;
- display: flex;
- border-bottom: 20rpx solid #fbfbfb;
- .image {
- width: 171rpx;
- height: 168rpx;
- background-color: #000;
- }
- .message {
- margin-left: 24rpx;
- .title {
- font-size: 26rpx;
- color: #333;
- width: 491rpx;
- margin-bottom: 9rpx;
- }
- .brief {
- font-size: 22rpx;
- color: #999;
- margin-bottom: 26rpx;
- }
- .price {
- font-size: 28rpx;
- color: #ff4e6c;
- }
- }
+.merchandise {
+ padding: 46rpx 32rpx;
+ display: flex;
+ border-bottom: 20rpx solid #fbfbfb;
+ .image {
+ width: 171rpx;
+ height: 168rpx;
+ background-color: #000;
+ }
+ .message {
+ margin-left: 24rpx;
+ .title {
+ font-size: 26rpx;
+ color: #333;
+ width: 491rpx;
+ margin-bottom: 9rpx;
+ }
+ .brief {
+ font-size: 22rpx;
+ color: #999;
+ margin-bottom: 26rpx;
+ }
+ .price {
+ font-size: 28rpx;
+ color: #ff4e6c;
+ }
+ }
}
\ No newline at end of file
diff --git a/components/seles/merchandises/index.wxml b/components/seles/merchandises/index.wxml
index 2d0a289..195503f 100644
--- a/components/seles/merchandises/index.wxml
+++ b/components/seles/merchandises/index.wxml
@@ -1,8 +1,8 @@
-
-
-
- 雅诗兰黛肌透修护密集精华眼膜 4对棕色瓶修护 真空眼膜
- 肌透眼膜4片
- ￥820.00
-
+
+
+
+ 雅诗兰黛肌透修护密集精华眼膜 4对棕色瓶修护 真空眼膜
+ 肌透眼膜4片
+ ￥820.00
+
\ No newline at end of file
diff --git a/components/shopping/shoppingitem/shoppingitem.js b/components/shopping/shoppingitem/shoppingitem.js
index a04744f..a127a30 100644
--- a/components/shopping/shoppingitem/shoppingitem.js
+++ b/components/shopping/shoppingitem/shoppingitem.js
@@ -1,69 +1,69 @@
-// components/shopping/shoppingitem/shoppingitem.js
-import {request} from "../../../utils/bin"
-Component({
- /**
- * 组件的属性列表
- */
- properties: {
- shopname: String,
- shopdesc: String,
- price: Number,
- pic: String,
- gid:Number,
- num:Number,
- select:Boolean,
- index:Number
- },
-
- /**
- * 组件的初始数据
- */
- data: {
-
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
- rm() {
-
- if (this.data.num == 0) {
-
- return
- } else {
- this.setData({
- num: this.data.num - 1
- })
- request({
- url:"Cart/updateNum",
- urldata:{
- id:this.data.gid,
- num:this.data.num - 1
- }
- }).then((res)=>{
-
- })
-
- }
- },
- add() {
- this.setData({
- num: this.data.num + 1
- })
- request({
- url:"Cart/updateNum",
- urldata:{
- id:this.data.gid,
- num:this.data.num + 1
- }
- }).then((res)=>{
-
- })
- },
- sel(){
- this.triggerEvent('sel', {index:this.data.index,select:this.data.select})
- }
-
- }
+// components/shopping/shoppingitem/shoppingitem.js
+import {request} from "../../../utils/bin"
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ shopname: String,
+ shopdesc: String,
+ price: Number,
+ pic: String,
+ gid:Number,
+ num:Number,
+ select:Boolean,
+ index:Number
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+ rm() {
+
+ if (this.data.num < 2) {
+
+ return
+ } else {
+ this.setData({
+ num: this.data.num - 1
+ })
+ request({
+ url:"Cart/updateNum",
+ urldata:{
+ id:this.data.gid,
+ num:this.data.num
+ }
+ }).then((res)=>{
+
+ })
+
+ }
+ },
+ add() {
+ this.setData({
+ num: this.data.num + 1
+ })
+ request({
+ url:"Cart/updateNum",
+ urldata:{
+ id:this.data.gid,
+ num:this.data.num
+ }
+ }).then((res)=>{
+
+ })
+ },
+ sel(){
+ this.triggerEvent('sel', {index:this.data.index,select:this.data.select})
+ }
+
+ }
})
\ No newline at end of file
diff --git a/components/shopping/shoppingitem/shoppingitem.json b/components/shopping/shoppingitem/shoppingitem.json
index e8cfaaf..011372e 100644
--- a/components/shopping/shoppingitem/shoppingitem.json
+++ b/components/shopping/shoppingitem/shoppingitem.json
@@ -1,4 +1,4 @@
-{
- "component": true,
- "usingComponents": {}
+{
+ "component": true,
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/components/shopping/shoppingitem/shoppingitem.wxml b/components/shopping/shoppingitem/shoppingitem.wxml
index 2003d55..24e4918 100644
--- a/components/shopping/shoppingitem/shoppingitem.wxml
+++ b/components/shopping/shoppingitem/shoppingitem.wxml
@@ -1,16 +1,16 @@
-
-
-
-
-
-
- {{shopname}}
- {{shopdesc}}
- ${{price}}
-
-
- -
- {{num}}
- +
-
-
+
+
+
+
+
+
+ {{shopname}}
+ {{shopdesc}}
+ ${{price}}
+
+
+ -
+ {{num}}
+ +
+
+
diff --git a/components/shopping/shoppingitem/shoppingitem.wxss b/components/shopping/shoppingitem/shoppingitem.wxss
index ca6a41f..03fbea8 100644
--- a/components/shopping/shoppingitem/shoppingitem.wxss
+++ b/components/shopping/shoppingitem/shoppingitem.wxss
@@ -1,98 +1,98 @@
-.shoppingitem {
- width: 639rpx;
- height: 186rpx;
- display: flex;
- justify-content: space-between;
-}
-
-.select {
- width: 26rpx;
- height: 26rpx;
- background: rgba(234, 234, 234, 1);
- border-radius: 50%;
- margin: auto 0;
-}
-.selects{
- background-color: #45C778;
-}
-.pic {
- /* width: 222rpx;
- height: 222rpx; */
- width: 186rpx;
- height: 186rpx;
- background-color: bisque;
-}
-
-.pic>image {
- width: 100%;
- height: 100%;
-}
-
-.shopinfo {
- width: 186rpx;
-}
-
-.shopname {
- color: #333333;
- font-size: 26rpx;
- font-weight: bold;
- margin-bottom: 18rpx;
- margin-top: 20rpx;
- text-overflow: ellipsis;
- overflow: hidden;
-
- display: -webkit-box;
-
- -webkit-box-orient: vertical;
-
- -webkit-line-clamp: 2;
-}
-
-.shopdesc {
- color: #666666;
- font-size: 22rpx;
- margin-bottom: 20rpx;
-}
-
-.price {
- color: #D1D1D1;
- font-size: 32rpx;
- font-weight: bold;
- text-decoration: underline;
-}
-
-.numberset {
- width: 85rpx;
- height: 186rpx;
- border: 1px solid rgba(233, 233, 233, 1);
- border-radius: 10px;
- margin-top: 11rpx;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
-}
-
-.reverse {
- width: 23rpx;
- height: 23rpx;
- /* background-color: #97DFB4; */
- margin: 0 auto;
- margin-top: 20rpx;
- line-height: 23rpx;
- font-size: 46rpx;
-}
-
-.num {
- color: #242424;
- font-size: 30rpx;
- text-align: center;
-}
-
-.add {
- width: 23rpx;
- height: 23rpx;
- /* background-color: #242424; */
- margin: 0 auto;
- margin-bottom: 17rpx;
- line-height: 23rpx;
+.shoppingitem {
+ width: 639rpx;
+ height: 186rpx;
+ display: flex;
+ justify-content: space-between;
+}
+
+.select {
+ width: 26rpx;
+ height: 26rpx;
+ background: rgba(234, 234, 234, 1);
+ border-radius: 50%;
+ margin: auto 0;
+}
+.selects{
+ background-color: #45C778;
+}
+.pic {
+ /* width: 222rpx;
+ height: 222rpx; */
+ width: 186rpx;
+ height: 186rpx;
+ background-color: bisque;
+}
+
+.pic>image {
+ width: 100%;
+ height: 100%;
+}
+
+.shopinfo {
+ width: 186rpx;
+}
+
+.shopname {
+ color: #333333;
+ font-size: 26rpx;
+ font-weight: bold;
+ margin-bottom: 18rpx;
+ margin-top: 20rpx;
+ text-overflow: ellipsis;
+ overflow: hidden;
+
+ display: -webkit-box;
+
+ -webkit-box-orient: vertical;
+
+ -webkit-line-clamp: 2;
+}
+
+.shopdesc {
+ color: #666666;
+ font-size: 22rpx;
+ margin-bottom: 20rpx;
+}
+
+.price {
+ color: #D1D1D1;
+ font-size: 32rpx;
+ font-weight: bold;
+ text-decoration: underline;
+}
+
+.numberset {
+ width: 85rpx;
+ height: 186rpx;
+ border: 1px solid rgba(233, 233, 233, 1);
+ border-radius: 10px;
+ margin-top: 11rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+}
+
+.reverse {
+ width: 23rpx;
+ height: 23rpx;
+ /* background-color: #97DFB4; */
+ margin: 0 auto;
+ margin-top: 20rpx;
+ line-height: 23rpx;
+ font-size: 46rpx;
+}
+
+.num {
+ color: #242424;
+ font-size: 30rpx;
+ text-align: center;
+}
+
+.add {
+ width: 23rpx;
+ height: 23rpx;
+ /* background-color: #242424; */
+ margin: 0 auto;
+ margin-bottom: 17rpx;
+ line-height: 23rpx;
}
\ No newline at end of file
diff --git a/components/yue/share/share.js b/components/yue/share/share.js
index 4b85dd0..fd400ec 100644
--- a/components/yue/share/share.js
+++ b/components/yue/share/share.js
@@ -1,23 +1,23 @@
-// components/yue/yongjintop/yongjintop.js
-Component({
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
- /**
- * 组件的初始数据
- */
- data: {
-
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
-
- }
-})
+// components/yue/yongjintop/yongjintop.js
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/components/yue/share/share.json b/components/yue/share/share.json
index e8cfaaf..011372e 100644
--- a/components/yue/share/share.json
+++ b/components/yue/share/share.json
@@ -1,4 +1,4 @@
-{
- "component": true,
- "usingComponents": {}
+{
+ "component": true,
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/components/yue/share/share.scss b/components/yue/share/share.scss
index c03a3b1..2e49bca 100644
--- a/components/yue/share/share.scss
+++ b/components/yue/share/share.scss
@@ -1,70 +1,70 @@
-.box {
- width: 690rpx;
- margin: 0 auto;
- padding-bottom: 41rpx;
- border-bottom: 2rpx solid #EEEEEE;
- .img {
- width: 40rpx;
- height: 39rpx;
- background-color: #999999;
- float: right;
- }
- .yongjintop {
- width: 317rpx;
- // height: 196rpx;
- margin-top: 71rpx;
- margin-left: 30rpx;
- display: flex;
- .photo {
- width: 130rpx;
- height: 130rpx;
- background-color: gold;
- margin-bottom: 52rpx;
- border-radius: 90%;
- }
- .tel {
- color: #333333;
- font-size: 28rpx;
- margin-top: 33rpx;
- margin-left: 35rpx;
- .mingpian {
- font-size: 24rpx;
- color: #999999;
- margin-top: 18rpx;
- }
- }
- }
-}
-
-.mid {
- width: 100%;
- height: 175rpx;
- border-bottom: 20rpx solid #FBFBFB;
- // justify-content: space-around;
- color: #333333;
- font-size: 28rpx;
- text-align: center;
- .midbox {
- width: 478rpx;
- height: 175rpx;
- display: flex;
- justify-content: space-between;
- margin: 0 auto;
- }
- .way {
- margin-top: 46rpx;
- margin-bottom: 14rpx;
- }
- .money {
- font-size: 24rpx;
- }
- .money1 {
- color: #F81F1F;
- }
- .line {
- width: 2rpx;
- height: 60rpx;
- margin: auto 0;
- background-color: #EEEEEE;
- }
+.box {
+ width: 690rpx;
+ margin: 0 auto;
+ padding-bottom: 41rpx;
+ border-bottom: 2rpx solid #EEEEEE;
+ .img {
+ width: 40rpx;
+ height: 39rpx;
+ background-color: #999999;
+ float: right;
+ }
+ .yongjintop {
+ width: 317rpx;
+ // height: 196rpx;
+ margin-top: 71rpx;
+ margin-left: 30rpx;
+ display: flex;
+ .photo {
+ width: 130rpx;
+ height: 130rpx;
+ background-color: gold;
+ margin-bottom: 52rpx;
+ border-radius: 90%;
+ }
+ .tel {
+ color: #333333;
+ font-size: 28rpx;
+ margin-top: 33rpx;
+ margin-left: 35rpx;
+ .mingpian {
+ font-size: 24rpx;
+ color: #999999;
+ margin-top: 18rpx;
+ }
+ }
+ }
+}
+
+.mid {
+ width: 100%;
+ height: 175rpx;
+ border-bottom: 20rpx solid #FBFBFB;
+ // justify-content: space-around;
+ color: #333333;
+ font-size: 28rpx;
+ text-align: center;
+ .midbox {
+ width: 478rpx;
+ height: 175rpx;
+ display: flex;
+ justify-content: space-between;
+ margin: 0 auto;
+ }
+ .way {
+ margin-top: 46rpx;
+ margin-bottom: 14rpx;
+ }
+ .money {
+ font-size: 24rpx;
+ }
+ .money1 {
+ color: #F81F1F;
+ }
+ .line {
+ width: 2rpx;
+ height: 60rpx;
+ margin: auto 0;
+ background-color: #EEEEEE;
+ }
}
\ No newline at end of file
diff --git a/components/yue/share/share.wxml b/components/yue/share/share.wxml
index 48259f2..9739c98 100644
--- a/components/yue/share/share.wxml
+++ b/components/yue/share/share.wxml
@@ -1,30 +1,30 @@
-
-
-
-
-
- 156***578
- 我的名片
-
-
-
-
-
-
- 昨日收益
-
- 657.00
- RMB
-
-
-
-
- 昨日收益
-
- 657.00
- RMB
-
-
-
-
+
+
+
+
+
+ 156***578
+ 我的名片
+
+
+
+
+
+
+ 昨日收益
+
+ 657.00
+ RMB
+
+
+
+
+ 昨日收益
+
+ 657.00
+ RMB
+
+
+
+
\ No newline at end of file
diff --git a/components/yue/share/share.wxss b/components/yue/share/share.wxss
index b10bfdf..13fc361 100644
--- a/components/yue/share/share.wxss
+++ b/components/yue/share/share.wxss
@@ -1,78 +1,78 @@
-.box {
- width: 690rpx;
- margin: 0 auto;
- padding-bottom: 41rpx;
- border-bottom: 2rpx solid #EEEEEE;
-}
-
-.box .img {
- width: 40rpx;
- height: 39rpx;
- background-color: #999999;
- float: right;
-}
-
-.box .yongjintop {
- width: 317rpx;
- margin-top: 71rpx;
- margin-left: 30rpx;
- display: flex;
-}
-
-.box .yongjintop .photo {
- width: 130rpx;
- height: 130rpx;
- background-color: gold;
- margin-bottom: 52rpx;
- border-radius: 90%;
-}
-
-.box .yongjintop .tel {
- color: #333333;
- font-size: 28rpx;
- margin-top: 33rpx;
- margin-left: 35rpx;
-}
-
-.box .yongjintop .tel .mingpian {
- font-size: 24rpx;
- color: #999999;
- margin-top: 18rpx;
-}
-
-.mid {
- width: 100%;
- height: 175rpx;
- border-bottom: 20rpx solid #FBFBFB;
- color: #333333;
- font-size: 28rpx;
- text-align: center;
-}
-
-.mid .midbox {
- width: 478rpx;
- height: 175rpx;
- display: flex;
- justify-content: space-between;
- margin: 0 auto;
-}
-
-.mid .way {
- margin-top: 46rpx;
- margin-bottom: 14rpx;
-}
-
-.mid .money {
- font-size: 24rpx;
-}
-
-.mid .money1 {
- color: #F81F1F;
-}
-
-.mid .line {
- width: 2rpx;
- height: 60rpx;
- margin: auto 0;
- background-color: #EEEEEE;
-}
+.box {
+ width: 690rpx;
+ margin: 0 auto;
+ padding-bottom: 41rpx;
+ border-bottom: 2rpx solid #EEEEEE;
+}
+
+.box .img {
+ width: 40rpx;
+ height: 39rpx;
+ background-color: #999999;
+ float: right;
+}
+
+.box .yongjintop {
+ width: 317rpx;
+ margin-top: 71rpx;
+ margin-left: 30rpx;
+ display: flex;
+}
+
+.box .yongjintop .photo {
+ width: 130rpx;
+ height: 130rpx;
+ background-color: gold;
+ margin-bottom: 52rpx;
+ border-radius: 90%;
+}
+
+.box .yongjintop .tel {
+ color: #333333;
+ font-size: 28rpx;
+ margin-top: 33rpx;
+ margin-left: 35rpx;
+}
+
+.box .yongjintop .tel .mingpian {
+ font-size: 24rpx;
+ color: #999999;
+ margin-top: 18rpx;
+}
+
+.mid {
+ width: 100%;
+ height: 175rpx;
+ border-bottom: 20rpx solid #FBFBFB;
+ color: #333333;
+ font-size: 28rpx;
+ text-align: center;
+}
+
+.mid .midbox {
+ width: 478rpx;
+ height: 175rpx;
+ display: flex;
+ justify-content: space-between;
+ margin: 0 auto;
+}
+
+.mid .way {
+ margin-top: 46rpx;
+ margin-bottom: 14rpx;
+}
+
+.mid .money {
+ font-size: 24rpx;
+}
+
+.mid .money1 {
+ color: #F81F1F;
+}
+
+.mid .line {
+ width: 2rpx;
+ height: 60rpx;
+ margin: auto 0;
+ background-color: #EEEEEE;
+}
diff --git a/components/yue/yongjintop/yongjintop.js b/components/yue/yongjintop/yongjintop.js
index 4b85dd0..fd400ec 100644
--- a/components/yue/yongjintop/yongjintop.js
+++ b/components/yue/yongjintop/yongjintop.js
@@ -1,23 +1,23 @@
-// components/yue/yongjintop/yongjintop.js
-Component({
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
- /**
- * 组件的初始数据
- */
- data: {
-
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
-
- }
-})
+// components/yue/yongjintop/yongjintop.js
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/components/yue/yongjintop/yongjintop.json b/components/yue/yongjintop/yongjintop.json
index e8cfaaf..011372e 100644
--- a/components/yue/yongjintop/yongjintop.json
+++ b/components/yue/yongjintop/yongjintop.json
@@ -1,4 +1,4 @@
-{
- "component": true,
- "usingComponents": {}
+{
+ "component": true,
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/components/yue/yongjintop/yongjintop.scss b/components/yue/yongjintop/yongjintop.scss
index 237d90d..a7f3fa5 100644
--- a/components/yue/yongjintop/yongjintop.scss
+++ b/components/yue/yongjintop/yongjintop.scss
@@ -1,56 +1,56 @@
-.box {
- width: 690rpx;
- margin: 0 auto;
- padding-bottom: 41rpx;
- border-bottom: 2rpx solid #EEEEEE;
- .yongjintop {
- width: 152rpx;
- height: 196rpx;
- margin: 0 auto;
- margin-top: 40rpx;
- .photo {
- width: 130rpx;
- height: 130rpx;
- background-color: gold;
- margin-bottom: 44rpx;
- border-radius: 90%;
- }
- .tel {
- color: #333333;
- font-size: 28rpx;
- }
- }
-}
-
-.mid {
- width: 100%;
- height: 175rpx;
- border-bottom: 20rpx solid #FBFBFB;
- // justify-content: space-around;
- color: #333333;
- font-size: 28rpx;
- text-align: center;
- .midbox {
- width: 478rpx;
- height: 175rpx;
- display: flex;
- justify-content: space-between;
- margin: 0 auto;
- }
- .way {
- margin-top: 46rpx;
- margin-bottom: 14rpx;
- }
- .money {
- font-size: 24rpx;
- }
- .money1 {
- color: #F81F1F;
- }
- .line {
- width: 2rpx;
- height: 60rpx;
- margin: auto 0;
- background-color: #EEEEEE;
- }
+.box {
+ width: 690rpx;
+ margin: 0 auto;
+ padding-bottom: 41rpx;
+ border-bottom: 2rpx solid #EEEEEE;
+ .yongjintop {
+ width: 152rpx;
+ height: 196rpx;
+ margin: 0 auto;
+ margin-top: 40rpx;
+ .photo {
+ width: 130rpx;
+ height: 130rpx;
+ background-color: gold;
+ margin-bottom: 44rpx;
+ border-radius: 90%;
+ }
+ .tel {
+ color: #333333;
+ font-size: 28rpx;
+ }
+ }
+}
+
+.mid {
+ width: 100%;
+ height: 175rpx;
+ border-bottom: 20rpx solid #FBFBFB;
+ // justify-content: space-around;
+ color: #333333;
+ font-size: 28rpx;
+ text-align: center;
+ .midbox {
+ width: 478rpx;
+ height: 175rpx;
+ display: flex;
+ justify-content: space-between;
+ margin: 0 auto;
+ }
+ .way {
+ margin-top: 46rpx;
+ margin-bottom: 14rpx;
+ }
+ .money {
+ font-size: 24rpx;
+ }
+ .money1 {
+ color: #F81F1F;
+ }
+ .line {
+ width: 2rpx;
+ height: 60rpx;
+ margin: auto 0;
+ background-color: #EEEEEE;
+ }
}
\ No newline at end of file
diff --git a/components/yue/yongjintop/yongjintop.wxml b/components/yue/yongjintop/yongjintop.wxml
index 6a3d8ab..9d99fcc 100644
--- a/components/yue/yongjintop/yongjintop.wxml
+++ b/components/yue/yongjintop/yongjintop.wxml
@@ -1,26 +1,26 @@
-
-
-
- 156***578
-
-
-
-
-
- 昨日收益
-
- 657.00
- RMB
-
-
-
-
- 昨日收益
-
- 657.00
- RMB
-
-
-
-
+
+
+
+ 156***578
+
+
+
+
+
+ 昨日收益
+
+ 657.00
+ RMB
+
+
+
+
+ 昨日收益
+
+ 657.00
+ RMB
+
+
+
+
\ No newline at end of file
diff --git a/components/yue/yongjintop/yongjintop.wxss b/components/yue/yongjintop/yongjintop.wxss
index 9dea15c..d984e1c 100644
--- a/components/yue/yongjintop/yongjintop.wxss
+++ b/components/yue/yongjintop/yongjintop.wxss
@@ -1,63 +1,63 @@
-.box {
- width: 690rpx;
- margin: 0 auto;
- padding-bottom: 41rpx;
- border-bottom: 2rpx solid #EEEEEE;
-}
-
-.box .yongjintop {
- width: 152rpx;
- height: 196rpx;
- margin: 0 auto;
- margin-top: 40rpx;
-}
-
-.box .yongjintop .photo {
- width: 130rpx;
- height: 130rpx;
- background-color: gold;
- margin-bottom: 44rpx;
- border-radius: 90%;
-}
-
-.box .yongjintop .tel {
- color: #333333;
- font-size: 28rpx;
-}
-
-.mid {
- width: 100%;
- height: 175rpx;
- border-bottom: 20rpx solid #FBFBFB;
- color: #333333;
- font-size: 28rpx;
- text-align: center;
-}
-
-.mid .midbox {
- width: 478rpx;
- height: 175rpx;
- display: flex;
- justify-content: space-between;
- margin: 0 auto;
-}
-
-.mid .way {
- margin-top: 46rpx;
- margin-bottom: 14rpx;
-}
-
-.mid .money {
- font-size: 24rpx;
-}
-
-.mid .money1 {
- color: #F81F1F;
-}
-
-.mid .line {
- width: 2rpx;
- height: 60rpx;
- margin: auto 0;
- background-color: #EEEEEE;
-}
+.box {
+ width: 690rpx;
+ margin: 0 auto;
+ padding-bottom: 41rpx;
+ border-bottom: 2rpx solid #EEEEEE;
+}
+
+.box .yongjintop {
+ width: 152rpx;
+ height: 196rpx;
+ margin: 0 auto;
+ margin-top: 40rpx;
+}
+
+.box .yongjintop .photo {
+ width: 130rpx;
+ height: 130rpx;
+ background-color: gold;
+ margin-bottom: 44rpx;
+ border-radius: 90%;
+}
+
+.box .yongjintop .tel {
+ color: #333333;
+ font-size: 28rpx;
+}
+
+.mid {
+ width: 100%;
+ height: 175rpx;
+ border-bottom: 20rpx solid #FBFBFB;
+ color: #333333;
+ font-size: 28rpx;
+ text-align: center;
+}
+
+.mid .midbox {
+ width: 478rpx;
+ height: 175rpx;
+ display: flex;
+ justify-content: space-between;
+ margin: 0 auto;
+}
+
+.mid .way {
+ margin-top: 46rpx;
+ margin-bottom: 14rpx;
+}
+
+.mid .money {
+ font-size: 24rpx;
+}
+
+.mid .money1 {
+ color: #F81F1F;
+}
+
+.mid .line {
+ width: 2rpx;
+ height: 60rpx;
+ margin: auto 0;
+ background-color: #EEEEEE;
+}
diff --git a/components/yue/yuedetail/yuedetail.js b/components/yue/yuedetail/yuedetail.js
index 21548d0..be367cd 100644
--- a/components/yue/yuedetail/yuedetail.js
+++ b/components/yue/yuedetail/yuedetail.js
@@ -1,23 +1,23 @@
-// components/yue/yuedetail/yuedetai;.js
-Component({
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
- /**
- * 组件的初始数据
- */
- data: {
-
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
-
- }
-})
+// components/yue/yuedetail/yuedetai;.js
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/components/yue/yuedetail/yuedetail.json b/components/yue/yuedetail/yuedetail.json
index e8cfaaf..011372e 100644
--- a/components/yue/yuedetail/yuedetail.json
+++ b/components/yue/yuedetail/yuedetail.json
@@ -1,4 +1,4 @@
-{
- "component": true,
- "usingComponents": {}
+{
+ "component": true,
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/components/yue/yuedetail/yuedetail.scss b/components/yue/yuedetail/yuedetail.scss
index 90c43e1..9f5bc4a 100644
--- a/components/yue/yuedetail/yuedetail.scss
+++ b/components/yue/yuedetail/yuedetail.scss
@@ -1,23 +1,23 @@
-.yuedetail {
- width: 100%;
- height: 100rpx;
- border-bottom: 2rpx solid #EEEEEE;
- display: flex;
- justify-content: space-between;
- .left {
- font-size: 28rpx;
- margin-left: 30rpx;
- .date {
- color: #666666;
- }
- .time {
- color: #999999;
- margin-top: 5rpx;
- }
- }
- .right {
- color: #333333;
- font-size: 36rpx;
- margin-right: 30rpx;
- }
+.yuedetail {
+ width: 100%;
+ height: 100rpx;
+ border-bottom: 2rpx solid #EEEEEE;
+ display: flex;
+ justify-content: space-between;
+ .left {
+ font-size: 28rpx;
+ margin-left: 30rpx;
+ .date {
+ color: #666666;
+ }
+ .time {
+ color: #999999;
+ margin-top: 5rpx;
+ }
+ }
+ .right {
+ color: #333333;
+ font-size: 36rpx;
+ margin-right: 30rpx;
+ }
}
\ No newline at end of file
diff --git a/components/yue/yuedetail/yuedetail.wxml b/components/yue/yuedetail/yuedetail.wxml
index 68defd8..74002d8 100644
--- a/components/yue/yuedetail/yuedetail.wxml
+++ b/components/yue/yuedetail/yuedetail.wxml
@@ -1,7 +1,7 @@
-
-
- 2017-02-21
- 17:23:25
-
- -1234.00
+
+
+ 2017-02-21
+ 17:23:25
+
+ -1234.00
\ No newline at end of file
diff --git a/components/yue/yuedetail/yuedetail.wxss b/components/yue/yuedetail/yuedetail.wxss
index 13e5fec..d2de32d 100644
--- a/components/yue/yuedetail/yuedetail.wxss
+++ b/components/yue/yuedetail/yuedetail.wxss
@@ -1,27 +1,27 @@
-.yuedetail {
- width: 100%;
- height: 100rpx;
- border-bottom: 2rpx solid #EEEEEE;
- display: flex;
- justify-content: space-between;
-}
-
-.yuedetail .left {
- font-size: 28rpx;
- margin-left: 30rpx;
-}
-
-.yuedetail .left .date {
- color: #666666;
-}
-
-.yuedetail .left .time {
- color: #999999;
- margin-top: 5rpx;
-}
-
-.yuedetail .right {
- color: #333333;
- font-size: 36rpx;
- margin-right: 30rpx;
-}
+.yuedetail {
+ width: 100%;
+ height: 100rpx;
+ border-bottom: 2rpx solid #EEEEEE;
+ display: flex;
+ justify-content: space-between;
+}
+
+.yuedetail .left {
+ font-size: 28rpx;
+ margin-left: 30rpx;
+}
+
+.yuedetail .left .date {
+ color: #666666;
+}
+
+.yuedetail .left .time {
+ color: #999999;
+ margin-top: 5rpx;
+}
+
+.yuedetail .right {
+ color: #333333;
+ font-size: 36rpx;
+ margin-right: 30rpx;
+}
diff --git a/components/yue/yuetitle/yuetitle.js b/components/yue/yuetitle/yuetitle.js
index 40b90a3..d6a0391 100644
--- a/components/yue/yuetitle/yuetitle.js
+++ b/components/yue/yuetitle/yuetitle.js
@@ -1,23 +1,23 @@
-// components/yue/yuetitle/yuetitle.js
-Component({
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
- /**
- * 组件的初始数据
- */
- data: {
-
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
-
- }
-})
+// components/yue/yuetitle/yuetitle.js
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/components/yue/yuetitle/yuetitle.json b/components/yue/yuetitle/yuetitle.json
index e8cfaaf..011372e 100644
--- a/components/yue/yuetitle/yuetitle.json
+++ b/components/yue/yuetitle/yuetitle.json
@@ -1,4 +1,4 @@
-{
- "component": true,
- "usingComponents": {}
+{
+ "component": true,
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/components/yue/yuetitle/yuetitle.scss b/components/yue/yuetitle/yuetitle.scss
index 89aec91..9ab746f 100644
--- a/components/yue/yuetitle/yuetitle.scss
+++ b/components/yue/yuetitle/yuetitle.scss
@@ -1,6 +1,6 @@
-.yuetitle {
- color: #333333;
- font-size: 28rpx;
- font-weight: bold;
- margin-left: 31rpx;
+.yuetitle {
+ color: #333333;
+ font-size: 28rpx;
+ font-weight: bold;
+ margin-left: 31rpx;
}
\ No newline at end of file
diff --git a/components/yue/yuetitle/yuetitle.wxml b/components/yue/yuetitle/yuetitle.wxml
index 52c6bd1..b70a4e1 100644
--- a/components/yue/yuetitle/yuetitle.wxml
+++ b/components/yue/yuetitle/yuetitle.wxml
@@ -1,3 +1,3 @@
-
- 累计消费
+
+ 累计消费
\ No newline at end of file
diff --git a/components/yue/yuetitle/yuetitle.wxss b/components/yue/yuetitle/yuetitle.wxss
index f5d80e7..ecdf979 100644
--- a/components/yue/yuetitle/yuetitle.wxss
+++ b/components/yue/yuetitle/yuetitle.wxss
@@ -1,6 +1,6 @@
-.yuetitle {
- color: #333333;
- font-size: 28rpx;
- font-weight: bold;
- margin-left: 31rpx;
-}
+.yuetitle {
+ color: #333333;
+ font-size: 28rpx;
+ font-weight: bold;
+ margin-left: 31rpx;
+}
diff --git a/components/yue/yuetop/yuetop.js b/components/yue/yuetop/yuetop.js
index 15af03f..0ec4954 100644
--- a/components/yue/yuetop/yuetop.js
+++ b/components/yue/yuetop/yuetop.js
@@ -1,23 +1,23 @@
-// components/yue/yuetop/yuetop.js
-Component({
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
- /**
- * 组件的初始数据
- */
- data: {
-
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
-
- }
-})
+// components/yue/yuetop/yuetop.js
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/components/yue/yuetop/yuetop.json b/components/yue/yuetop/yuetop.json
index e8cfaaf..011372e 100644
--- a/components/yue/yuetop/yuetop.json
+++ b/components/yue/yuetop/yuetop.json
@@ -1,4 +1,4 @@
-{
- "component": true,
- "usingComponents": {}
+{
+ "component": true,
+ "usingComponents": {}
}
\ No newline at end of file
diff --git a/components/yue/yuetop/yuetop.scss b/components/yue/yuetop/yuetop.scss
index d893248..bb32b07 100644
--- a/components/yue/yuetop/yuetop.scss
+++ b/components/yue/yuetop/yuetop.scss
@@ -1,23 +1,23 @@
-.yuetop {
- width: 690rpx;
- // height: 189rpx;
- margin: 0 auto;
- border-bottom: 2rpx solid #EEEEEE;
- .all {
- color: #333333;
- font-size: 28rpx;
- padding-top: 63rpx;
- padding-bottom: 25rpx;
- }
- .money {
- color: #333333;
- font-size: 48rpx;
- font-weight: 500;
- padding-bottom: 37rpx;
- .chong {
- color: #09BB07;
- font-size: 26rpx;
- margin-left: 35rpx;
- }
- }
+.yuetop {
+ width: 690rpx;
+ // height: 189rpx;
+ margin: 0 auto;
+ border-bottom: 2rpx solid #EEEEEE;
+ .all {
+ color: #333333;
+ font-size: 28rpx;
+ padding-top: 63rpx;
+ padding-bottom: 25rpx;
+ }
+ .money {
+ color: #333333;
+ font-size: 48rpx;
+ font-weight: 500;
+ padding-bottom: 37rpx;
+ .chong {
+ color: #09BB07;
+ font-size: 26rpx;
+ margin-left: 35rpx;
+ }
+ }
}
\ No newline at end of file
diff --git a/components/yue/yuetop/yuetop.wxml b/components/yue/yuetop/yuetop.wxml
index bbe15c9..5f710cd 100644
--- a/components/yue/yuetop/yuetop.wxml
+++ b/components/yue/yuetop/yuetop.wxml
@@ -1,7 +1,7 @@
-
- 总资产
-
- 615.96
- 充值
-
+
+ 总资产
+
+ 615.96
+ 充值
+
\ No newline at end of file
diff --git a/components/yue/yuetop/yuetop.wxss b/components/yue/yuetop/yuetop.wxss
index dc3d68c..6f393b5 100644
--- a/components/yue/yuetop/yuetop.wxss
+++ b/components/yue/yuetop/yuetop.wxss
@@ -1,25 +1,25 @@
-.yuetop {
- width: 690rpx;
- margin: 0 auto;
- border-bottom: 2rpx solid #EEEEEE;
-}
-
-.yuetop .all {
- color: #333333;
- font-size: 28rpx;
- padding-top: 63rpx;
- padding-bottom: 25rpx;
-}
-
-.yuetop .money {
- color: #333333;
- font-size: 48rpx;
- font-weight: 500;
- padding-bottom: 37rpx;
-}
-
-.yuetop .money .chong {
- color: #09BB07;
- font-size: 26rpx;
- margin-left: 35rpx;
-}
+.yuetop {
+ width: 690rpx;
+ margin: 0 auto;
+ border-bottom: 2rpx solid #EEEEEE;
+}
+
+.yuetop .all {
+ color: #333333;
+ font-size: 28rpx;
+ padding-top: 63rpx;
+ padding-bottom: 25rpx;
+}
+
+.yuetop .money {
+ color: #333333;
+ font-size: 48rpx;
+ font-weight: 500;
+ padding-bottom: 37rpx;
+}
+
+.yuetop .money .chong {
+ color: #09BB07;
+ font-size: 26rpx;
+ margin-left: 35rpx;
+}
diff --git a/doc/bin.md b/doc/bin.md
index 1501ae5..41a4777 100644
--- a/doc/bin.md
+++ b/doc/bin.md
@@ -1,31 +1,31 @@
-# bin.js
-## 引入方式
-模块导入
-## request 方法
-对于wx.request()的简单封装
-request(object)
-返回值类型 promise
-除url必须 其余都为可选 详细参数查阅 [微信开发者文档](https://developers.weixin.qq.com/miniprogram/dev/api/network/request/wx.request.html)
-```
-object
-{
- url，访问地址 必须
- method,请求方式
- header,附加header头
- dataType,返回类型
- responseType,类型
- complete 成功失败都执行的回调函数
-}
-```
-```
-request({
- url:"https://api.luyaun.tk/getlist",
- method:"GET"
-}).then((res)=>{
- 请求成功执行方法
-},(rej)=>{
- 请求失败执行方法
-}).catch((ree)=>{
- 执行错误时调用方法
-})
-```
+# bin.js
+## 引入方式
+模块导入
+## request 方法
+对于wx.request()的简单封装
+request(object)
+返回值类型 promise
+除url必须 其余都为可选 详细参数查阅 [微信开发者文档](https://developers.weixin.qq.com/miniprogram/dev/api/network/request/wx.request.html)
+```
+object
+{
+ url，访问地址 必须
+ method,请求方式
+ header,附加header头
+ dataType,返回类型
+ responseType,类型
+ complete 成功失败都执行的回调函数
+}
+```
+```
+request({
+ url:"https://api.luyaun.tk/getlist",
+ method:"GET"
+}).then((res)=>{
+ 请求成功执行方法
+},(rej)=>{
+ 请求失败执行方法
+}).catch((ree)=>{
+ 执行错误时调用方法
+})
+```
diff --git a/pages/accomplish/accomplish.scss b/pages/accomplish/accomplish.scss
index c3672b3..0f04cbf 100644
--- a/pages/accomplish/accomplish.scss
+++ b/pages/accomplish/accomplish.scss
@@ -1,4 +1,4 @@
-.box{}
-page{
- background-color: #fbfbfb;
+.box{}
+page{
+ background-color: #fbfbfb;
}
\ No newline at end of file
diff --git a/pages/addaddress/addaddress.js b/pages/addaddress/addaddress.js
index e59c6e7..2592024 100644
--- a/pages/addaddress/addaddress.js
+++ b/pages/addaddress/addaddress.js
@@ -1,170 +1,170 @@
-// pages/addaddress/addaddress.js
-import { request } from "../../utils/bin"
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- canshu: [],
- no: 0,
- userid:"",
- show: false,
- arealist:[],
- area:["请选择","请选择","请选择"]
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- request({
- url: "User/getArea",
- urldata:{
- parent_id:0
- },
- }).then((res)=>{
- console.log(res)
- this.setData({
- arealist:res.data.result
- })
- console.log(this.data.arealist)
- })
-
- },
- bindPickerChange(e) {
- console.log(e)
- },
- showPopup() {
- this.setData({ show: true });
- },
-
- onClose() {
- this.setData({ show: false });
- },
- onMyEvent(e) {
- console.log(e)
- for (let i = 0; i < 8; i++) {
- if (i == e.currentTarget.dataset.no) {
- this.data.canshu[i] = e.detail
- }
-
- }
-
- console.log(this.data.canshu)
- },
- choose(e){
- console.log(e.currentTarget.dataset.id,e.currentTarget.dataset.name,e.currentTarget.dataset)
- let type=parseInt(e.currentTarget.dataset.type)
- request({
- url: "User/getArea",
- urldata:{
- parent_id:e.currentTarget.dataset.id
- },
- }).then((res)=>{
- console.log(res)
- if(res.data.result.length){
- this.setData({
- arealist1:res.data.result
- })
- // this.data.area[type]=e.currentTarget.dataset.name
-
- console.log(this.data.area,123)
-
- }
- // for(let i in this.data.area){
- // if(i==type){
- // this.data.area[i]=e.currentTarget.dataset.name
- // }
- // }
- this.data.area[0]=e.currentTarget.dataset.name
-
- console.log(this.data.area,this.data.arealist)
- })
- },
- save() {
- // wx.navigateTo({
- // url: "/pages/chooseaddr/chooseaddr"
- // })
- request({
- url: "User/validateOpenid",
- }).then((res)=>{
- console.log(res,1452)
- this.setData({
- userid:res.data.data.user_id
- })
- request({
- url: "User/addAddress",
- urldata:{
- user_id:this.data.userid
- },
- method:"POST",
- data: {
- address: "Wesrdtfyguhijkl",
- city: "339",
- consignee: "srdtfyguhijokl",
- country: 1,
- district: "361",
- is_default: 0,
- mobile: "19953879035",
- province: "338",
- twon: 0,
- user_id: "9",
- zipcode: "271103",
- }
- }).then((res)=>{
- console.log(res)
- })
- })
-
-
- },
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
+// pages/addaddress/addaddress.js
+import { request } from "../../utils/bin"
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ canshu: [],
+ no: 0,
+ userid:"",
+ show: false,
+ arealist:[],
+ area:["请选择","请选择","请选择"]
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ request({
+ url: "User/getArea",
+ urldata:{
+ parent_id:0
+ },
+ }).then((res)=>{
+ console.log(res)
+ this.setData({
+ arealist:res.data.result
+ })
+ console.log(this.data.arealist)
+ })
+
+ },
+ bindPickerChange(e) {
+ console.log(e)
+ },
+ showPopup() {
+ this.setData({ show: true });
+ },
+
+ onClose() {
+ this.setData({ show: false });
+ },
+ onMyEvent(e) {
+ console.log(e)
+ for (let i = 0; i < 8; i++) {
+ if (i == e.currentTarget.dataset.no) {
+ this.data.canshu[i] = e.detail
+ }
+
+ }
+
+ console.log(this.data.canshu)
+ },
+ choose(e){
+ console.log(e.currentTarget.dataset.id,e.currentTarget.dataset.name,e.currentTarget.dataset)
+ let type=parseInt(e.currentTarget.dataset.type)
+ request({
+ url: "User/getArea",
+ urldata:{
+ parent_id:e.currentTarget.dataset.id
+ },
+ }).then((res)=>{
+ console.log(res)
+ if(res.data.result.length){
+ this.setData({
+ arealist1:res.data.result
+ })
+ // this.data.area[type]=e.currentTarget.dataset.name
+
+ console.log(this.data.area,123)
+
+ }
+ // for(let i in this.data.area){
+ // if(i==type){
+ // this.data.area[i]=e.currentTarget.dataset.name
+ // }
+ // }
+ this.data.area[0]=e.currentTarget.dataset.name
+
+ console.log(this.data.area,this.data.arealist)
+ })
+ },
+ save() {
+ // wx.navigateTo({
+ // url: "/pages/chooseaddr/chooseaddr"
+ // })
+ request({
+ url: "User/validateOpenid",
+ }).then((res)=>{
+ console.log(res,1452)
+ this.setData({
+ userid:res.data.data.user_id
+ })
+ request({
+ url: "User/addAddress",
+ urldata:{
+ user_id:this.data.userid
+ },
+ method:"POST",
+ data: {
+ address: "Wesrdtfyguhijkl",
+ city: "339",
+ consignee: "srdtfyguhijokl",
+ country: 1,
+ district: "361",
+ is_default: 0,
+ mobile: "19953879035",
+ province: "338",
+ twon: 0,
+ user_id: "9",
+ zipcode: "271103",
+ }
+ }).then((res)=>{
+ console.log(res)
+ })
+ })
+
+
+ },
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
})
\ No newline at end of file
diff --git a/pages/addaddress/addaddress.json b/pages/addaddress/addaddress.json
index c1acb45..8f85ac7 100644
--- a/pages/addaddress/addaddress.json
+++ b/pages/addaddress/addaddress.json
@@ -1,9 +1,9 @@
-{
- "usingComponents": {
- "shuru": "/components/addaddress/shuru/shuru",
- "addradd": "/components/chooseaddr/addradd/addradd",
- "van-popup": "../utils/dist/popup/index",
- "van-tab": "../utils/dist/tab/index",
- "van-tabs": "../utils/dist/tabs/index"
- }
+{
+ "usingComponents": {
+ "shuru": "/components/addaddress/shuru/shuru",
+ "addradd": "/components/chooseaddr/addradd/addradd",
+ "van-popup": "../utils/dist/popup/index",
+ "van-tab": "../utils/dist/tab/index",
+ "van-tabs": "../utils/dist/tabs/index"
+ }
}
\ No newline at end of file
diff --git a/pages/addaddress/addaddress.scss b/pages/addaddress/addaddress.scss
index 8838d9a..2e666c7 100644
--- a/pages/addaddress/addaddress.scss
+++ b/pages/addaddress/addaddress.scss
@@ -1,17 +1,17 @@
-.addaddress {
- background-color: white;
- .btn1 {
- position: fixed;
- bottom: 102rpx;
- left: 50rpx;
- }
- .choose{
- width:100%;
- height: 500rpx;
- .item{
- text-indent: 15rpx;
- line-height: 70rpx;
-
- }
- }
+.addaddress {
+ background-color: white;
+ .btn1 {
+ position: fixed;
+ bottom: 102rpx;
+ left: 50rpx;
+ }
+ .choose{
+ width:100%;
+ height: 500rpx;
+ .item{
+ text-indent: 15rpx;
+ line-height: 70rpx;
+
+ }
+ }
}
\ No newline at end of file
diff --git a/pages/addaddress/addaddress.wxml b/pages/addaddress/addaddress.wxml
index de905ea..10fc108 100644
--- a/pages/addaddress/addaddress.wxml
+++ b/pages/addaddress/addaddress.wxml
@@ -1,42 +1,42 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/addaddress/addaddress.wxss b/pages/addaddress/addaddress.wxss
index 51f2592..dcd308e 100644
--- a/pages/addaddress/addaddress.wxss
+++ b/pages/addaddress/addaddress.wxss
@@ -1,19 +1,19 @@
-.addaddress {
- background-color: white;
-}
-
-.addaddress .btn1 {
- position: fixed;
- bottom: 102rpx;
- left: 50rpx;
-}
-
-.addaddress .choose {
- width: 100%;
- height: 500rpx;
-}
-
-.addaddress .choose .item {
- text-indent: 15rpx;
- line-height: 70rpx;
-}
+.addaddress {
+ background-color: white;
+}
+
+.addaddress .btn1 {
+ position: fixed;
+ bottom: 102rpx;
+ left: 50rpx;
+}
+
+.addaddress .choose {
+ width: 100%;
+ height: 500rpx;
+}
+
+.addaddress .choose .item {
+ text-indent: 15rpx;
+ line-height: 70rpx;
+}
diff --git a/pages/chooseaddr/chooseaddr.js b/pages/chooseaddr/chooseaddr.js
index fce44fd..ea6b672 100644
--- a/pages/chooseaddr/chooseaddr.js
+++ b/pages/chooseaddr/chooseaddr.js
@@ -1,159 +1,159 @@
-// pages/chooseaddr/chooseaddr.js
-import { request } from "../../utils/bin"
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- addresslist:[],
- userid:""
-
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function(options) {
- request({
- url: "User/validateOpenid",
- }).then((res)=>{
- this.setData({
- userid:res.data.data.user_id
- })
- request({
- url: "User/getAddressList",
- urldata:{
- user_id:this.data.userid
- },
- }).then((res)=>{
- console.log(res)
- this.setData({
- addresslist:res.data.result
- })
- })
- })
-
- },
- add() {
- wx.navigateTo({
- url: "/pages/addaddress/addaddress"
- })
- },
- // user_id/8/id/215
- delete(e){
- let t=this
- wx.showModal({
- title: '确认',
- content: '要删除这个地址吗？',
- success(){
-
-
- console.log(e.currentTarget.dataset.id)
-
- request({
- url: "User/validateOpenid",
- }).then((res)=>{
- t.setData({
- userid:res.data.data.user_id
- })
- request({
- url: "User/del_address",
- urldata:{
- user_id:res.data.data.user_id,
- id:e.currentTarget.dataset.id
- },
- }).then((res)=>{
- console.log(res)
- request({
- url: "User/getAddressList",
- urldata:{
- user_id:t.data.userid
- },
- }).then((res)=>{
- console.log(res)
- t.setData({
- addresslist:res.data.result
- })
- })
- })
- })
-
-
-
-
- }
- })
- },
- setdefault(e){
- console.log(e.currentTarget.dataset.id)
- request({
- url: "User/setDefaultAddress",
- urldata:{
- user_id:this.data.userid,
- address_id:e.currentTarget.dataset.id
- },
- }).then((res)=>{
- console.log(res)
- request({
- url: "User/getAddressList",
- urldata:{
- user_id:this.data.userid
- },
- }).then((res)=>{
- console.log(res)
- this.setData({
- addresslist:res.data.result
- })
- })
- })
- },
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function() {
-
- }
+// pages/chooseaddr/chooseaddr.js
+import { request } from "../../utils/bin"
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ addresslist:[],
+ userid:""
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function(options) {
+ request({
+ url: "User/validateOpenid",
+ }).then((res)=>{
+ this.setData({
+ userid:res.data.data.user_id
+ })
+ request({
+ url: "User/getAddressList",
+ urldata:{
+ user_id:this.data.userid
+ },
+ }).then((res)=>{
+ console.log(res)
+ this.setData({
+ addresslist:res.data.result
+ })
+ })
+ })
+
+ },
+ add() {
+ wx.navigateTo({
+ url: "/pages/addaddress/addaddress"
+ })
+ },
+ // user_id/8/id/215
+ delete(e){
+ let t=this
+ wx.showModal({
+ title: '确认',
+ content: '要删除这个地址吗？',
+ success(){
+
+
+ console.log(e.currentTarget.dataset.id)
+
+ request({
+ url: "User/validateOpenid",
+ }).then((res)=>{
+ t.setData({
+ userid:res.data.data.user_id
+ })
+ request({
+ url: "User/del_address",
+ urldata:{
+ user_id:res.data.data.user_id,
+ id:e.currentTarget.dataset.id
+ },
+ }).then((res)=>{
+ console.log(res)
+ request({
+ url: "User/getAddressList",
+ urldata:{
+ user_id:t.data.userid
+ },
+ }).then((res)=>{
+ console.log(res)
+ t.setData({
+ addresslist:res.data.result
+ })
+ })
+ })
+ })
+
+
+
+
+ }
+ })
+ },
+ setdefault(e){
+ console.log(e.currentTarget.dataset.id)
+ request({
+ url: "User/setDefaultAddress",
+ urldata:{
+ user_id:this.data.userid,
+ address_id:e.currentTarget.dataset.id
+ },
+ }).then((res)=>{
+ console.log(res)
+ request({
+ url: "User/getAddressList",
+ urldata:{
+ user_id:this.data.userid
+ },
+ }).then((res)=>{
+ console.log(res)
+ this.setData({
+ addresslist:res.data.result
+ })
+ })
+ })
+ },
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function() {
+
+ }
})
\ No newline at end of file
diff --git a/pages/chooseaddr/chooseaddr.json b/pages/chooseaddr/chooseaddr.json
index f7744d4..5874c1a 100644
--- a/pages/chooseaddr/chooseaddr.json
+++ b/pages/chooseaddr/chooseaddr.json
@@ -1,6 +1,6 @@
-{
- "usingComponents": {
- "address": "/components/chooseaddr/address/address",
- "addradd": "/components/chooseaddr/addradd/addradd"
- }
+{
+ "usingComponents": {
+ "address": "/components/chooseaddr/address/address",
+ "addradd": "/components/chooseaddr/addradd/addradd"
+ }
}
\ No newline at end of file
diff --git a/pages/chooseaddr/chooseaddr.scss b/pages/chooseaddr/chooseaddr.scss
index 3684fe8..1bd8a5c 100644
--- a/pages/chooseaddr/chooseaddr.scss
+++ b/pages/chooseaddr/chooseaddr.scss
@@ -1,10 +1,10 @@
-.chooseaddress {
- .addr {
- margin-left: 30rpx;
- }
- .btn1 {
- position: fixed;
- bottom: 149rpx;
- left: 50rpx;
- }
+.chooseaddress {
+ .addr {
+ margin-left: 30rpx;
+ }
+ .btn1 {
+ position: fixed;
+ bottom: 149rpx;
+ left: 50rpx;
+ }
}
\ No newline at end of file
diff --git a/pages/chooseaddr/chooseaddr.wxml b/pages/chooseaddr/chooseaddr.wxml
index 0dc24d1..d7dafd5 100644
--- a/pages/chooseaddr/chooseaddr.wxml
+++ b/pages/chooseaddr/chooseaddr.wxml
@@ -1,14 +1,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/chooseaddr/chooseaddr.wxss b/pages/chooseaddr/chooseaddr.wxss
index ef5eca4..495ca45 100644
--- a/pages/chooseaddr/chooseaddr.wxss
+++ b/pages/chooseaddr/chooseaddr.wxss
@@ -1,9 +1,9 @@
-.chooseaddress .addr {
- margin-left: 30rpx;
-}
-
-.chooseaddress .btn1 {
- position: fixed;
- bottom: 149rpx;
- left: 50rpx;
-}
+.chooseaddress .addr {
+ margin-left: 30rpx;
+}
+
+.chooseaddress .btn1 {
+ position: fixed;
+ bottom: 149rpx;
+ left: 50rpx;
+}
diff --git a/pages/classify/classify.js b/pages/classify/classify.js
index 20abaf0..b64786f 100644
--- a/pages/classify/classify.js
+++ b/pages/classify/classify.js
@@ -1,98 +1,98 @@
-// pages/classify/classify.js
-import { request } from "../../utils/bin"
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- type: [],
- list:[]
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function(options) {
- request({
- url: "Goods/goodsCategoryList",
- data: {
- parent_id: 2
- }
- }).then((res) => {
- // console.log(res)
- this.setData({
- type: res.data.result
- })
- this.select({detail:{id:res.data.result[0].id}})
- console.log(this.data.type, 150)
- })
-
- },
- select(a){
- // console.log(a)
- // a.detail.id
- request({
- url:'Goods/goodsList',
- urldata:{
- id:a.detail.id,
- sort:'shop_price',
- sort_asc:'desc',
- p:0
- }
- }).then((res)=>{
- console.log(res)
- this.setData({
- list:res.data.result.goods_list
- })
- })
- },
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function() {
-
- }
+// pages/classify/classify.js
+import { request } from "../../utils/bin"
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ type: [],
+ list:[]
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function(options) {
+ request({
+ url: "Goods/goodsCategoryList",
+ data: {
+ parent_id: 2
+ }
+ }).then((res) => {
+ // console.log(res)
+ this.setData({
+ type: res.data.result
+ })
+ this.select({detail:{id:res.data.result[0].id}})
+ console.log(this.data.type, 150)
+ })
+
+ },
+ select(a){
+ // console.log(a)
+ // a.detail.id
+ request({
+ url:'Goods/goodsList',
+ urldata:{
+ id:a.detail.id,
+ sort:'shop_price',
+ sort_asc:'desc',
+ p:0
+ }
+ }).then((res)=>{
+ console.log(res)
+ this.setData({
+ list:res.data.result.goods_list
+ })
+ })
+ },
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function() {
+
+ }
})
\ No newline at end of file
diff --git a/pages/classify/classify.scss b/pages/classify/classify.scss
index 4b5efaf..4b27f83 100644
--- a/pages/classify/classify.scss
+++ b/pages/classify/classify.scss
@@ -1,7 +1,7 @@
-.box{
- width: 750rpx;
- display: flex;
- border-top: 1rpx solid #eaeaea;
-
-
+.box{
+ width: 750rpx;
+ display: flex;
+ border-top: 1rpx solid #eaeaea;
+
+
}
\ No newline at end of file
diff --git a/pages/classify/classify.wxml b/pages/classify/classify.wxml
index 9f392af..b25d1b3 100644
--- a/pages/classify/classify.wxml
+++ b/pages/classify/classify.wxml
@@ -1,4 +1,4 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.scss b/pages/index/index.scss
index 912df96..56f5a7d 100644
--- a/pages/index/index.scss
+++ b/pages/index/index.scss
@@ -1,9 +1,9 @@
-.box {
- border-top: #eaeaea solid 1rpx;
- width: 750rpx;
- // overflow: hidden;
- display: flex;
- align-items: center;
- flex-direction: column;
-
-}
+.box {
+ border-top: #eaeaea solid 1rpx;
+ width: 750rpx;
+ // overflow: hidden;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+
+}
diff --git a/pages/member/member.js b/pages/member/member.js
index 3775f74..ad3beca 100644
--- a/pages/member/member.js
+++ b/pages/member/member.js
@@ -1,66 +1,66 @@
-// pages/member/member.js
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
-
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
+// pages/member/member.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
})
\ No newline at end of file
diff --git a/pages/member/member.json b/pages/member/member.json
index b5fde8d..72cca76 100644
--- a/pages/member/member.json
+++ b/pages/member/member.json
@@ -1,6 +1,6 @@
-{
- "usingComponents": {
- "membertop": "/components/member/membertop/membertop",
- "membershop": "/components/member/membershop/membershop"
- }
+{
+ "usingComponents": {
+ "membertop": "/components/member/membertop/membertop",
+ "membershop": "/components/member/membershop/membershop"
+ }
}
\ No newline at end of file
diff --git a/pages/member/member.scss b/pages/member/member.scss
index bb44bb1..9d3a92a 100644
--- a/pages/member/member.scss
+++ b/pages/member/member.scss
@@ -1,11 +1,11 @@
-.membershops {
- display: flex;
- flex-wrap: wrap;
- .membershop {
- // margin-right: 4rpx;
- margin-bottom: 4rpx;
- }
- .membershop:nth-child(odd) {
- margin-right: 4rpx;
- }
+.membershops {
+ display: flex;
+ flex-wrap: wrap;
+ .membershop {
+ // margin-right: 4rpx;
+ margin-bottom: 4rpx;
+ }
+ .membershop:nth-child(odd) {
+ margin-right: 4rpx;
+ }
}
\ No newline at end of file
diff --git a/pages/member/member.wxml b/pages/member/member.wxml
index d33b4e3..37da2d0 100644
--- a/pages/member/member.wxml
+++ b/pages/member/member.wxml
@@ -1,32 +1,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/member/member.wxss b/pages/member/member.wxss
index 3a9a73a..02df188 100644
--- a/pages/member/member.wxss
+++ b/pages/member/member.wxss
@@ -1,12 +1,12 @@
-.membershops {
- display: flex;
- flex-wrap: wrap;
-}
-
-.membershops .membershop {
- margin-bottom: 4rpx;
-}
-
-.membershops .membershop:nth-child(odd) {
- margin-right: 4rpx;
-}
+.membershops {
+ display: flex;
+ flex-wrap: wrap;
+}
+
+.membershops .membershop {
+ margin-bottom: 4rpx;
+}
+
+.membershops .membershop:nth-child(odd) {
+ margin-right: 4rpx;
+}
diff --git a/pages/message/message.scss b/pages/message/message.scss
index 258f4c3..efd56df 100644
--- a/pages/message/message.scss
+++ b/pages/message/message.scss
@@ -1,54 +1,54 @@
-.box {
- // border-top: 1rpx solid #eaeaea;
- display: flex;
- flex-direction: column;
- align-items: center;
- .list {
- width: 650rpx;
- .information {
- margin-top: 43rpx;
- display: flex;
- flex-direction: column;
- font-size: 28rpx;
- color: #333;
- border-bottom: 1rpx solid #eaeaea;
- justify-content: space-between;
- > input {
- height: 28rpx;
- font-size: 28rpx;
- color: #333;
- }
- }
- }
- .upload{
- width: 650rpx;
- margin-top: 42rpx;
- .title{
- font-size: 26rpx;
- color: #999;
- }
- .files{
- margin-top: 42rpx;
- width: 195rpx;
- height: 195rpx;
- box-shadow:2rpx 3rpx 16rpx 1rpx rgba(51,51,51,0.1);
- >image{
- width: 50rpx;
- height: 41rpx;
- background-color: #000;
- margin: 77rpx 73rpx;
- }
- }
- }
- .submit{
- margin-top: 295rpx;
- width: 650rpx;
- height: 98rpx;
- background-color: #47C877;
- border-radius: 49rpx;
- font-size: 36rpx;
- line-height: 98rpx;
- text-align: center;
- color: #fff;
- }
-}
+.box {
+ // border-top: 1rpx solid #eaeaea;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ .list {
+ width: 650rpx;
+ .information {
+ margin-top: 43rpx;
+ display: flex;
+ flex-direction: column;
+ font-size: 28rpx;
+ color: #333;
+ border-bottom: 1rpx solid #eaeaea;
+ justify-content: space-between;
+ > input {
+ height: 28rpx;
+ font-size: 28rpx;
+ color: #333;
+ }
+ }
+ }
+ .upload{
+ width: 650rpx;
+ margin-top: 42rpx;
+ .title{
+ font-size: 26rpx;
+ color: #999;
+ }
+ .files{
+ margin-top: 42rpx;
+ width: 195rpx;
+ height: 195rpx;
+ box-shadow:2rpx 3rpx 16rpx 1rpx rgba(51,51,51,0.1);
+ >image{
+ width: 50rpx;
+ height: 41rpx;
+ background-color: #000;
+ margin: 77rpx 73rpx;
+ }
+ }
+ }
+ .submit{
+ margin-top: 295rpx;
+ width: 650rpx;
+ height: 98rpx;
+ background-color: #47C877;
+ border-radius: 49rpx;
+ font-size: 36rpx;
+ line-height: 98rpx;
+ text-align: center;
+ color: #fff;
+ }
+}
diff --git a/pages/order/order.scss b/pages/order/order.scss
index ffb81b1..8694a2b 100644
--- a/pages/order/order.scss
+++ b/pages/order/order.scss
@@ -1,9 +1,9 @@
-.box {
- display: flex;
- flex-direction: column;
- align-items: center;
- width: 100%;
-}
-page {
- background-color: #efefef;
-}
+.box {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ width: 100%;
+}
+page {
+ background-color: #efefef;
+}
diff --git a/pages/orderconfirm/orderconfirm.js b/pages/orderconfirm/orderconfirm.js
index fa9dc45..fde7963 100644
--- a/pages/orderconfirm/orderconfirm.js
+++ b/pages/orderconfirm/orderconfirm.js
@@ -1,23 +1,110 @@
-// pages/orderconfirm/orderconfirm.js
-Component({
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
- /**
- * 组件的初始数据
- */
- data: {
-
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
-
- }
-})
+// pages/order/order.js
+import bin from "../../utils/bin"
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ list: {}
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ bin.getusetid().then((res) => {
+ bin.request({
+ url: "Cart/cart2",
+ urldata: {
+ user_id: res
+ }
+ }).then((res) => {
+ console.log(res)
+ this.setData({
+ list: res.data.result
+ })
+ })
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ },
+ sub() {
+ bin.getusetid().then((res) => {
+ bin.request({
+ url: "Cart/cart3",
+ urldata: {
+ act: "",
+ submit_order: "",
+ user_id: res,
+ address_id: this.data.list.addressList.address_id,
+ user_money: 0,
+ pay_points: 0,
+ couponTypeSelect: 1,
+ coupon_id: 0,
+ pay_code: "weixin",
+ couponCode: ""
+ }
+ }).then((r) => {
+ console.log(r)
+ let { timeStamp, nonceStr, signType, sign } = r.data.data.wdata
+ // timeStamp = timeStamp
+ timeStamp = timeStamp.toString()
+ console.log(timeStamp)
+ wx.requestPayment({
+ timeStamp, nonceStr, package:r.data.data.wdata.package, signType, paySign:sign,
+ success(res) {console.log("成功")},
+ fail(res) {console.log(res)}
+ })
+ })
+ })
+
+ }
+})
\ No newline at end of file
diff --git a/pages/orderconfirm/orderconfirm.json b/pages/orderconfirm/orderconfirm.json
index 0f67a0a..a4e369c 100644
--- a/pages/orderconfirm/orderconfirm.json
+++ b/pages/orderconfirm/orderconfirm.json
@@ -1,11 +1,11 @@
-{
- "component": true,
- "usingComponents": {
- "shopinfo": "/components/orderconfirm/ordershopinfo/ordershopinfo",
- "chooseway": "/components/orderconfirm/orderchooseway/orderchooseway",
- "chooseaddr": "/components/orderconfirm/orderchooseaddr/orderchooseaddr",
- "orderyf": "/components/orderconfirm/orderyf/orderyf",
- "agree": "/components/orderconfirm/orderagreement/orderagreement",
- "bottom": "/components/orderconfirm/orderbottom/orderbottom"
- }
+{
+ "component": true,
+ "usingComponents": {
+ "shopinfo": "/components/orderconfirm/ordershopinfo/ordershopinfo",
+ "chooseway": "/components/orderconfirm/orderchooseway/orderchooseway",
+ "chooseaddr": "/components/orderconfirm/orderchooseaddr/orderchooseaddr",
+ "orderyf": "/components/orderconfirm/orderyf/orderyf",
+ "agree": "/components/orderconfirm/orderagreement/orderagreement",
+ "bottom": "/components/orderconfirm/orderbottom/orderbottom"
+ }
}
\ No newline at end of file
diff --git a/pages/orderconfirm/orderconfirm.scss b/pages/orderconfirm/orderconfirm.scss
index 711fb93..76c6434 100644
--- a/pages/orderconfirm/orderconfirm.scss
+++ b/pages/orderconfirm/orderconfirm.scss
@@ -1,7 +1,7 @@
-.orderconfirm {
- .bottom {
- width: 100%;
- position: fixed;
- bottom: 0;
- }
+.orderconfirm {
+ .bottom {
+ width: 100%;
+ position: fixed;
+ bottom: 0;
+ }
}
\ No newline at end of file
diff --git a/pages/orderconfirm/orderconfirm.wxml b/pages/orderconfirm/orderconfirm.wxml
index 22ec3be..c2cfa17 100644
--- a/pages/orderconfirm/orderconfirm.wxml
+++ b/pages/orderconfirm/orderconfirm.wxml
@@ -1,11 +1,12 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/orderconfirm/orderconfirm.wxss b/pages/orderconfirm/orderconfirm.wxss
index 2dc1eca..563fb5f 100644
--- a/pages/orderconfirm/orderconfirm.wxss
+++ b/pages/orderconfirm/orderconfirm.wxss
@@ -1,5 +1,5 @@
-.orderconfirm .bottom {
- width: 100%;
- position: fixed;
- bottom: 0;
-}
+.orderconfirm .bottom {
+ width: 100%;
+ position: fixed;
+ bottom: 0;
+}
diff --git a/pages/particulars/particulars.scss b/pages/particulars/particulars.scss
index 2a0dd97..8844a8b 100644
--- a/pages/particulars/particulars.scss
+++ b/pages/particulars/particulars.scss
@@ -1,7 +1,7 @@
-.box {
-
-
-}
-page {
- background-color: #fbfbfb;
-}
+.box {
+
+
+}
+page {
+ background-color: #fbfbfb;
+}
diff --git a/pages/personal/personal.js b/pages/personal/personal.js
index c4b67fa..1920bea 100644
--- a/pages/personal/personal.js
+++ b/pages/personal/personal.js
@@ -1,118 +1,118 @@
-// pages/personal/personal.js.
-import {request} from "../../utils/bin"
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- openid:"",
- username:"啦啦啦"
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function(options) {
-
- },
- toorder() {
- wx.navigateTo({
- url: "/pages/order/order"
- })
- },
- toaddress() {
- wx.navigateTo({
- url: "/pages/chooseaddr/chooseaddr"
- })
- },
- toserver() {
- // wx.navigateTo({
- // url: "/pages/order/order"
- // })
- },
- tomember() {
- wx.navigateTo({
- url: "/pages/member/member"
- })
- },
- toorder() {
- wx.navigateTo({
- url: "/pages/order/order"
- })
- },
- toyue() {
- wx.navigateTo({
- url: "/pages/yue/yue"
- })
- },
-
- toyongjin() {
- wx.navigateTo({
- url: "/pages/yongjin/yongjin"
- })
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- login(){
- if(this.data.openid == ""){
- wx.navigateTo({
- url:"/pages/login/login"
- })
- }
- },
- onReady: function() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function() {
- this.setData({
- openid:wx.getStorageSync("openid")
- })
- request({
- url:"User/validateOpenid"
- }).then((res)=>{
- console.log(res)
- })
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function() {
-
- }
+// pages/personal/personal.js.
+import {request} from "../../utils/bin"
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ openid:"",
+ username:"啦啦啦"
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function(options) {
+
+ },
+ toorder() {
+ wx.navigateTo({
+ url: "/pages/order/order"
+ })
+ },
+ toaddress() {
+ wx.navigateTo({
+ url: "/pages/chooseaddr/chooseaddr"
+ })
+ },
+ toserver() {
+ // wx.navigateTo({
+ // url: "/pages/order/order"
+ // })
+ },
+ tomember() {
+ wx.navigateTo({
+ url: "/pages/member/member"
+ })
+ },
+ toorder() {
+ wx.navigateTo({
+ url: "/pages/order/order"
+ })
+ },
+ toyue() {
+ wx.navigateTo({
+ url: "/pages/yue/yue"
+ })
+ },
+
+ toyongjin() {
+ wx.navigateTo({
+ url: "/pages/yongjin/yongjin"
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ login(){
+ if(this.data.openid == ""){
+ wx.navigateTo({
+ url:"/pages/login/login"
+ })
+ }
+ },
+ onReady: function() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function() {
+ this.setData({
+ openid:wx.getStorageSync("openid")
+ })
+ request({
+ url:"User/validateOpenid"
+ }).then((res)=>{
+ console.log(res)
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function() {
+
+ }
})
\ No newline at end of file
diff --git a/pages/personal/personal.scss b/pages/personal/personal.scss
index de0dd3f..2b5563d 100644
--- a/pages/personal/personal.scss
+++ b/pages/personal/personal.scss
@@ -1,53 +1,53 @@
-.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;
- 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;
- }
- }
- .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;
- }
- }
-
- }
+.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;
+ 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;
+ }
+ }
+ .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
diff --git a/pages/personal/personal.wxml b/pages/personal/personal.wxml
index 9142488..1039351 100644
--- a/pages/personal/personal.wxml
+++ b/pages/personal/personal.wxml
@@ -1,43 +1,43 @@
-
-
-
-
- {{openid == ""?'点击登录':username}}
-
-
- 账户余额
- 480.00
-
-
-
-
- 我的订单
- >
-
-
- 地址管理
- >
-
-
- 在线客服
-
-
-
- 会员中心
- 非会员 >
-
-
- 我的余额
-
-
-
- 当前佣金
-
-
-
- 分 享
-
-
-
-
+
+
+
+
+ {{openid == ""?'点击登录':username}}
+
+
+ 账户余额
+ 480.00
+
+
+
+
+ 我的订单
+ >
+
+
+ 地址管理
+ >
+
+
+ 在线客服
+
+
+
+ 会员中心
+ 非会员 >
+
+
+ 我的余额
+
+
+
+ 当前佣金
+
+
+
+ 分 享
+
+
+
+
\ No newline at end of file
diff --git a/pages/product/product.js b/pages/product/product.js
index 27c8bdf..bf9ae12 100644
--- a/pages/product/product.js
+++ b/pages/product/product.js
@@ -1,110 +1,111 @@
-// pages/product/product.js'
-import { request } from "../../utils/bin"
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- array: ['20粒', '30粒', '50粒', '100粒'],
- userid:0
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function(options) {
- console.log(options)
- request({
- url: "Goods/goodsInfo",
- data: {
- id: options.shopid
- }
- }).then((res) => {
- // console.log(res)
- this.setData({
- info: res.data.result,
- shopid:options.shopid,
- })
- // console.log(this.data.type, 150)
- })
- request({
- url:"User/validateOpenid"
- }).then((res)=>{
- console.log(res)
- this.setData({
- userid:res.data.data.user_id
- })
- })
- },
- // goshop() {
-
- // },
- bindPickerChange(e) {
- console.log(e.detail.value)
- request({
- url: "Cart/addCart",
- data: {
- goods_id: this.data.shopid,
- goods_num: 1,
- goods_spec:"",
- user_id:this.data.userid
- },
- name:"session_id"
- }).then((res)=>{
- console.log(res)
- wx.switchTab({
- url: '/pages/shopping/shopping'
- })
- })
-
- },
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function() {
-
- }
+// pages/product/product.js'
+import { request } from "../../utils/bin"
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ array: ['20粒', '30粒', '50粒', '100粒'],
+ userid:0,
+ specs:{item:'默认规格'}
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function(options) {
+ console.log(options)
+ request({
+ url: "Goods/goodsInfo",
+ data: {
+ id: options.shopid
+ }
+ }).then((res) => {
+ // console.log(res)
+ this.setData({
+ info: res.data.result,
+ shopid:options.shopid,
+ })
+ // console.log(this.data.type, 150)
+ })
+ request({
+ url:"User/validateOpenid"
+ }).then((res)=>{
+ console.log(res)
+ this.setData({
+ userid:res.data.data.user_id
+ })
+ })
+ },
+ // goshop() {
+
+ // },
+ bindPickerChange(e) {
+ console.log(e.detail.value)
+ request({
+ url: "Cart/addCart",
+ data: {
+ goods_id: this.data.shopid,
+ goods_num: 1,
+ goods_spec:this.data.info.goods.goods_spec_list?this.data.info.goods.goods_spec_list[0][e.detail.value].item_id:'',
+ user_id:this.data.userid
+ },
+ name:"session_id"
+ }).then((res)=>{
+ console.log(res)
+ wx.switchTab({
+ url: '/pages/shopping/shopping'
+ })
+ })
+
+ },
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function() {
+
+ }
})
\ No newline at end of file
diff --git a/pages/product/product.scss b/pages/product/product.scss
index 3476d77..2385c52 100644
--- a/pages/product/product.scss
+++ b/pages/product/product.scss
@@ -1,37 +1,37 @@
-.box{
- border-top: 1rpx solid #eaeaea;
- display: flex;
- flex-direction: column;
- align-items: center;
- .swiper{
- margin-top: 109rpx;
- width: 389rpx;
- height: 657rpx;
- .image{
- width: 389rpx;
- height: 549rpx;
- background-color: #000;
- }
- }
- .title{
- font-size: 32rpx;
- color: #333;
- margin-bottom: 34rpx;
- width: 540rpx;
- }
- .menery{
- font-size: 34rpx;
- color: #666;
- margin-bottom: 70rpx;
- }
- .add{
- width: 308rpx;
- height: 98rpx;
- background-color: #50CA80;
- border-radius: 49rpx;
- line-height: 98rpx;
- font-size: 34rpx;
- color: #fff;
- text-align: center;
- }
+.box{
+ border-top: 1rpx solid #eaeaea;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ .swiper{
+ margin-top: 109rpx;
+ width: 389rpx;
+ height: 657rpx;
+ .image{
+ width: 389rpx;
+ height: 549rpx;
+ background-color: #000;
+ }
+ }
+ .title{
+ font-size: 32rpx;
+ color: #333;
+ margin-bottom: 34rpx;
+ width: 540rpx;
+ }
+ .menery{
+ font-size: 34rpx;
+ color: #666;
+ margin-bottom: 70rpx;
+ }
+ .add{
+ width: 308rpx;
+ height: 98rpx;
+ background-color: #50CA80;
+ border-radius: 49rpx;
+ line-height: 98rpx;
+ font-size: 34rpx;
+ color: #fff;
+ text-align: center;
+ }
}
\ No newline at end of file
diff --git a/pages/product/product.wxml b/pages/product/product.wxml
index d1cd287..74f2a8d 100644
--- a/pages/product/product.wxml
+++ b/pages/product/product.wxml
@@ -1,24 +1,24 @@
-
-
-
-
-
-
-
-
-
- {{info.goods.goods_name}}
- $ {{info.goods.shop_price}}
-
- 加入购物车
-
+
+
+
+
+
+
+
+
+
+ {{info.goods.goods_name}}
+ $ {{info.goods.shop_price}}
+
+ 加入购物车
+
\ No newline at end of file
diff --git a/pages/receiving/receiving.scss b/pages/receiving/receiving.scss
index 02c16ae..214c6a4 100644
--- a/pages/receiving/receiving.scss
+++ b/pages/receiving/receiving.scss
@@ -1,7 +1,7 @@
-.box {
-
-
-}
-page {
- background-color: #fbfbfb;
-}
+.box {
+
+
+}
+page {
+ background-color: #fbfbfb;
+}
diff --git a/pages/sales1/sales1.scss b/pages/sales1/sales1.scss
index c6e0514..e1e096b 100644
--- a/pages/sales1/sales1.scss
+++ b/pages/sales1/sales1.scss
@@ -1,48 +1,48 @@
-.box {
- border-top: 1rpx solid #eee;
-
- .fill {
- padding: 42rpx 30rpx;
- box-sizing: border-box;
- .cause {
- display: flex;
- justify-content: space-between;
- align-items: center;
- margin-bottom: 45rpx;
- .title {
- font-size: 26rpx;
- color: #333;
- }
- .select {
- font-size: 26rpx;
- color: #999;
- }
- }
- .upload {
- .title {
- font-size: 26rpx;
- color: #333;
- margin-bottom: 45rpx;
- }
- .img {
- width: 187rpx;
- height: 187rpx;
- border: 1rpx solid rgba(229, 229, 229, 1);
- border-radius: 6rpx;
- }
- }
-
- }
- .submit{
- width: 650rpx;
- height: 98rpx;
- border-radius: 49rpx;
- background-color: #47C877;
- line-height: 98rpx;
- text-align: center;
- color: #fff;
- font-size:36rpx;
- margin-top: 67rpx;
- margin-left: 50rpx;
-}
-}
+.box {
+ border-top: 1rpx solid #eee;
+
+ .fill {
+ padding: 42rpx 30rpx;
+ box-sizing: border-box;
+ .cause {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 45rpx;
+ .title {
+ font-size: 26rpx;
+ color: #333;
+ }
+ .select {
+ font-size: 26rpx;
+ color: #999;
+ }
+ }
+ .upload {
+ .title {
+ font-size: 26rpx;
+ color: #333;
+ margin-bottom: 45rpx;
+ }
+ .img {
+ width: 187rpx;
+ height: 187rpx;
+ border: 1rpx solid rgba(229, 229, 229, 1);
+ border-radius: 6rpx;
+ }
+ }
+
+ }
+ .submit{
+ width: 650rpx;
+ height: 98rpx;
+ border-radius: 49rpx;
+ background-color: #47C877;
+ line-height: 98rpx;
+ text-align: center;
+ color: #fff;
+ font-size:36rpx;
+ margin-top: 67rpx;
+ margin-left: 50rpx;
+}
+}
diff --git a/pages/sales2/sales2.scss b/pages/sales2/sales2.scss
index a30cc84..d2678c0 100644
--- a/pages/sales2/sales2.scss
+++ b/pages/sales2/sales2.scss
@@ -1,34 +1,34 @@
-.box{
- border-top: 1rpx solid #efefef;
- .info{
- border-bottom: 1rpx solid #efefef;
- padding: 29rpx;
- box-sizing: border-box;
- .title{
- font-size: 26rpx;
- color: #333;
- margin-bottom: 22rpx;
- }
- .msg{
- font-size: 24rpx;
- color: #999;
- }
- }
- .submit{
- display: flex;
- margin-top: 36rpx;
- padding: 0 30rpx;
- justify-content: flex-end;
- .button{
- width: 133rpx;
- height: 51rpx;
- border: 1rpx solid #47C877;
- border-radius: 25rpx;
- color: #47C877;
- font-size: 22rpx;
- line-height: 51rpx;
- text-align: center;
- margin-left: 8rpx;
- }
- }
+.box{
+ border-top: 1rpx solid #efefef;
+ .info{
+ border-bottom: 1rpx solid #efefef;
+ padding: 29rpx;
+ box-sizing: border-box;
+ .title{
+ font-size: 26rpx;
+ color: #333;
+ margin-bottom: 22rpx;
+ }
+ .msg{
+ font-size: 24rpx;
+ color: #999;
+ }
+ }
+ .submit{
+ display: flex;
+ margin-top: 36rpx;
+ padding: 0 30rpx;
+ justify-content: flex-end;
+ .button{
+ width: 133rpx;
+ height: 51rpx;
+ border: 1rpx solid #47C877;
+ border-radius: 25rpx;
+ color: #47C877;
+ font-size: 22rpx;
+ line-height: 51rpx;
+ text-align: center;
+ margin-left: 8rpx;
+ }
+ }
}
\ No newline at end of file
diff --git a/pages/search/search.scss b/pages/search/search.scss
index 67cdbfa..e9b9146 100644
--- a/pages/search/search.scss
+++ b/pages/search/search.scss
@@ -1,7 +1,7 @@
-.box {
- border-top: #eaeaea solid 1rpx;
- width: 750rpx;
- display: flex;
- align-items: center;
- flex-direction: column;
-}
+.box {
+ border-top: #eaeaea solid 1rpx;
+ width: 750rpx;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+}
diff --git a/pages/share/share.js b/pages/share/share.js
index 259167a..08bb3c8 100644
--- a/pages/share/share.js
+++ b/pages/share/share.js
@@ -1,66 +1,66 @@
-// pages/share/share.js
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
-
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
+// pages/share/share.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
})
\ No newline at end of file
diff --git a/pages/share/share.json b/pages/share/share.json
index 808719a..41687e2 100644
--- a/pages/share/share.json
+++ b/pages/share/share.json
@@ -1,6 +1,6 @@
-{
- "usingComponents": {
- "share": "/components/yue/share/share",
- "yuedetail": "/components/yue/yuedetail/yuedetail"
- }
+{
+ "usingComponents": {
+ "share": "/components/yue/share/share",
+ "yuedetail": "/components/yue/yuedetail/yuedetail"
+ }
}
\ No newline at end of file
diff --git a/pages/share/share.scss b/pages/share/share.scss
index 9c21f5f..0dc74fb 100644
--- a/pages/share/share.scss
+++ b/pages/share/share.scss
@@ -1,7 +1,7 @@
-.share {
- background-color: white;
-}
-
-.detail {
- margin-top: 41rpx;
+.share {
+ background-color: white;
+}
+
+.detail {
+ margin-top: 41rpx;
}
\ No newline at end of file
diff --git a/pages/share/share.wxml b/pages/share/share.wxml
index 7f710b4..976b44f 100644
--- a/pages/share/share.wxml
+++ b/pages/share/share.wxml
@@ -1,15 +1,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/share/share.wxss b/pages/share/share.wxss
index d47f305..91e7e31 100644
--- a/pages/share/share.wxss
+++ b/pages/share/share.wxss
@@ -1,7 +1,7 @@
-.share {
- background-color: white;
-}
-
-.detail {
- margin-top: 41rpx;
-}
+.share {
+ background-color: white;
+}
+
+.detail {
+ margin-top: 41rpx;
+}
diff --git a/pages/shopping/shopping.js b/pages/shopping/shopping.js
index 66d90fa..7ed1950 100644
--- a/pages/shopping/shopping.js
+++ b/pages/shopping/shopping.js
@@ -1,178 +1,237 @@
-// pages/shopping/shopping.js
-import { request } from "../../utils/bin"
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
- list: [],
- select: [],
- userid: 0,
- price: "0.00"
- },
- sel(a) {
- console.log(a)
- this.setData({
- [`select[${a.detail.index}]`]: !a.detail.select
- })
- this.num();
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- getlist() {
- request({
- url: "Cart/cartList/session_id/" + wx.getStorageSync('openid'),
- data: {
- user_id: this.data.userid
- }
- }).then((res) => {
- console.log(res)
- this.setData({
- list: res.data.result
- })
- this.num()
-
- })
- },
- onLoad: function (options) {
- request({
- url: "User/validateOpenid"
- }).then((res) => {
- console.log(res)
- this.setData({
- userid: res.data.data.user_id
- })
- this.getlist()
-
- })
- },
- sub() {
- wx.navigateTo({
- url: "/pages/orderconfirm/orderconfirm"
- })
- },
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
- this.onLoad()
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- },
- num() {
- let num = 0;
- let sel = 0;
- for (let i in this.data.select) {
- console.log(i)
- if (this.data.select[i]) {
- num += parseFloat(this.data.list[i].goods_price) * 100
- sel++
- }
- }
- if (sel == this.data.list.length && this.data.list.length != 0) {
- this.setData({
- all: true
- })
- } else {
- this.setData({
- all: false
- })
- }
- this.setData({
- price: num / 100
- })
- },
- call() {
- let sel = 0;
- let select = []
- for (let i in this.data.list) {
- console.log(i)
- if (this.data.select[i]) {
- // num += parseFloat(this.data.list[i].goods_price)*100
- sel++
- } else {
- select[i] = true
- }
- }
- if (sel == this.data.list.length) {
- this.setData({
- all: false,
- select: []
- })
- } else {
- this.setData({
- all: true,
- select
- })
- }
- this.num()
-
- },
- del() {
- for (let i in this.data.list) {
- // console.log(i)
- if (this.data.select[i]) {
- // num += parseFloat(this.data.list[i].goods_price)*100
- // sel++
- request({
- url: "Cart/delCart",
- urldata: {
- id: this.data.list[i].id
- }
- }).then((res) => {
- console.log('删除成功')
- this.setData({
- list: [],
- select: [],
- userid: 0,
- price: "0.00"
- })
- this.onLoad()
- })
- }
- }
- }
+// pages/shopping/shopping.js
+import { request } from "../../utils/bin"
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ list: [],
+ select: [],
+ userid: 0,
+ price: "0.00"
+ },
+ sel(a) {
+ console.log(a)
+ request({
+ url: "Cart/updateSelect",
+ urldata: {
+ id: this.data.list[a.detail.index].goods_id,
+ select: this.data[`select[${a.detail.index}]`] ? 1 : 0
+ }
+ }).then((res) => {
+ this.setData({
+ [`select[${a.detail.index}]`]: !a.detail.select
+ })
+ this.num();
+ })
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ getlist() {
+ request({
+ url: "Cart/cartList/session_id/" + wx.getStorageSync('openid'),
+ urldata: {
+ user_id: this.data.userid
+ }
+ }).then((res) => {
+ console.log(res)
+ this.setData({
+ list: res.data.result
+ })
+ // this.num()
+ this.calls();
+
+ })
+ },
+ onLoad: function (options) {
+ request({
+ url: "User/validateOpenid"
+ }).then((res) => {
+ console.log(res)
+ this.setData({
+ userid: res.data.data.user_id
+ })
+ this.getlist()
+
+ })
+ },
+ sub() {
+ let sel = 0;
+ for (let i in this.data.select) {
+ // console.log(i)
+ if (this.data.select[i]) {
+ // num += parseFloat(this.data.list[i].goods_price) * 100
+ sel++
+ }
+ }
+ if (sel > 0) {
+ wx.navigateTo({
+ url: "/pages/orderconfirm/orderconfirm"
+ })
+ }
+
+ },
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+ this.onLoad()
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ },
+ num() {
+ let num = 0;
+ let sel = 0;
+ for (let i in this.data.select) {
+ console.log(i)
+ if (this.data.select[i]) {
+ num += parseFloat(this.data.list[i].goods_price) * 100
+ sel++
+ }
+ }
+ if (sel == this.data.list.length && this.data.list.length != 0) {
+ this.setData({
+ all: true
+ })
+ } else {
+ this.setData({
+ all: false
+ })
+ }
+ this.setData({
+ price: num / 100
+ })
+ },
+ call() {
+ let sel = 0;
+ let select = []
+ for (let i in this.data.list) {
+ console.log(i)
+ if (this.data.select[i]) {
+ // num += parseFloat(this.data.list[i].goods_price)*100
+ sel++
+ } else {
+ select[i] = true
+ }
+ }
+ if (sel == this.data.list.length) {
+ request({
+ url: "Cart/updateAllSelect",
+ urldata: {
+ open_id: wx.getStorageSync("openid"),
+ selected: 0
+ }
+ }).then((res) => {
+ this.setData({
+ all: false,
+ select: []
+ })
+ this.num()
+
+ })
+
+ } else {
+ request({
+ url: "Cart/updateAllSelect",
+ urldata: {
+ open_id: wx.getStorageSync("openid"),
+ selected: 1
+ }
+ }).then((res) => {
+ this.setData({
+ all: true,
+ select
+ })
+ this.num()
+
+ })
+
+ }
+
+ },
+ calls() {
+ let sel = 0;
+ let select = []
+ for (let i in this.data.list) {
+ console.log(i)
+
+ select[i] = true
+
+ }
+
+ this.setData({
+ all: true,
+ select
+ })
+ this.num()
+
+ },
+ del() {
+ for (let i in this.data.list) {
+ // console.log(i)
+ if (this.data.select[i]) {
+ // num += parseFloat(this.data.list[i].goods_price)*100
+ // sel++
+ request({
+ url: "Cart/delCart",
+ urldata: {
+ id: this.data.list[i].id
+ }
+ }).then((res) => {
+ console.log('删除成功')
+ this.setData({
+ list: [],
+ select: [],
+ userid: 0,
+ price: "0.00"
+ })
+ this.onLoad()
+ })
+ }
+ }
+ }
})
\ No newline at end of file
diff --git a/pages/shopping/shopping.json b/pages/shopping/shopping.json
index 5b1908e..60eb30c 100644
--- a/pages/shopping/shopping.json
+++ b/pages/shopping/shopping.json
@@ -1,7 +1,7 @@
-{
-
- "usingComponents": {
- "shopping-item":"/components/shopping/shoppingitem/shoppingitem"
- }
-
+{
+
+ "usingComponents": {
+ "shopping-item":"/components/shopping/shoppingitem/shoppingitem"
+ }
+
}
\ No newline at end of file
diff --git a/pages/shopping/shopping.wxml b/pages/shopping/shopping.wxml
index 58f0a24..79d9208 100644
--- a/pages/shopping/shopping.wxml
+++ b/pages/shopping/shopping.wxml
@@ -1,25 +1,25 @@
-
-
-
-
-
-
-
-
- 全选
- ${{price}}
-
-
- 删除
- 结算
-
-
+
+
+
+
+
+
+
+
+ 全选
+ ${{price}}
+
+
+ 删除
+ 结算
+
+
\ No newline at end of file
diff --git a/pages/shopping/shopping.wxss b/pages/shopping/shopping.wxss
index ace9498..a627fcc 100644
--- a/pages/shopping/shopping.wxss
+++ b/pages/shopping/shopping.wxss
@@ -1,54 +1,54 @@
-.shopping {
- padding-bottom: 128rpx;
-}
-.item {
- height: 186rpx;
- margin-left: 46rpx;
- margin-top: 59rpx;
-}
-
-.bottom {
- width: 100%;
- height: 98rpx;
- position: fixed;
- bottom: 0;
- background: linear-gradient(2deg, rgba(250, 250, 250, 0.94), rgba(255, 255, 255, 0.94));
- display: flex;
- justify-content: space-between;
- font-size: 28rpx;
- line-height: 98rpx;
-}
-
-.left {
- display: flex;
- /* line-height: 26rpx; */
-}
-
-.select {
- width: 26rpx;
- height: 26rpx;
- background: rgba(234, 234, 234, 1);
- border-radius: 50%;
- margin: auto 0;
- margin-left: 46rpx;
- margin-right: 24rpx;
-}
-.selects{
- background-color: #4cc97d;
-}
-
-.pri {
- color: #e0c79d;
- font-size: 26rpx;
- margin-left: 19rpx;
-}
-
-.right {
- color: #bbbbbb;
- margin-right: 31rpx;
-}
-
-.sub {
- margin-left: 30rpx;
- color: #4cc97d;
-}
+.shopping {
+ padding-bottom: 128rpx;
+}
+.item {
+ height: 186rpx;
+ margin-left: 46rpx;
+ margin-top: 59rpx;
+}
+
+.bottom {
+ width: 100%;
+ height: 98rpx;
+ position: fixed;
+ bottom: 0;
+ background: linear-gradient(2deg, rgba(250, 250, 250, 0.94), rgba(255, 255, 255, 0.94));
+ display: flex;
+ justify-content: space-between;
+ font-size: 28rpx;
+ line-height: 98rpx;
+}
+
+.left {
+ display: flex;
+ /* line-height: 26rpx; */
+}
+
+.select {
+ width: 26rpx;
+ height: 26rpx;
+ background: rgba(234, 234, 234, 1);
+ border-radius: 50%;
+ margin: auto 0;
+ margin-left: 46rpx;
+ margin-right: 24rpx;
+}
+.selects{
+ background-color: #4cc97d;
+}
+
+.pri {
+ color: #e0c79d;
+ font-size: 26rpx;
+ margin-left: 19rpx;
+}
+
+.right {
+ color: #bbbbbb;
+ margin-right: 31rpx;
+}
+
+.sub {
+ margin-left: 30rpx;
+ color: #4cc97d;
+}
diff --git a/pages/status/status.scss b/pages/status/status.scss
index abf7183..fb30cc0 100644
--- a/pages/status/status.scss
+++ b/pages/status/status.scss
@@ -1,11 +1,11 @@
-.box {
- .reference {
- font-size: 24rpx;
- color: #999;
- padding: 32rpx 20rpx;
- background-color: #fff;
- }
-}
-page {
- background-color: #fbfbfb;
-}
+.box {
+ .reference {
+ font-size: 24rpx;
+ color: #999;
+ padding: 32rpx 20rpx;
+ background-color: #fff;
+ }
+}
+page {
+ background-color: #fbfbfb;
+}
diff --git a/pages/undetermined/undetermined.js b/pages/undetermined/undetermined.js
index 291518d..21143b2 100644
--- a/pages/undetermined/undetermined.js
+++ b/pages/undetermined/undetermined.js
@@ -1,75 +1,75 @@
-// pages/undetermined/undetermined.js
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
-
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function(options) {
-
- },
- chooseaddr() {
- wx.navigateTo({
- url: "/pages/chooseaddr/chooseaddr"
- })
- },
- todetail() {
- wx.navigateTo({
- url: "/pages/product/product"
- })
- },
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function() {
-
- }
+// pages/undetermined/undetermined.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function(options) {
+
+ },
+ chooseaddr() {
+ wx.navigateTo({
+ url: "/pages/chooseaddr/chooseaddr"
+ })
+ },
+ todetail() {
+ wx.navigateTo({
+ url: "/pages/product/product"
+ })
+ },
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function() {
+
+ }
})
\ No newline at end of file
diff --git a/pages/undetermined/undetermined.scss b/pages/undetermined/undetermined.scss
index bc82d27..4ca84da 100644
--- a/pages/undetermined/undetermined.scss
+++ b/pages/undetermined/undetermined.scss
@@ -1,6 +1,6 @@
-page{
- background-color: #FBFBFB;
-}
-.box{
-
+page{
+ background-color: #FBFBFB;
+}
+.box{
+
}
\ No newline at end of file
diff --git a/pages/undetermined/undetermined.wxml b/pages/undetermined/undetermined.wxml
index 2102198..eb2aa95 100644
--- a/pages/undetermined/undetermined.wxml
+++ b/pages/undetermined/undetermined.wxml
@@ -1,4 +1,4 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/pages/yongjin/yongjin.js b/pages/yongjin/yongjin.js
index 41e2cf5..266e15f 100644
--- a/pages/yongjin/yongjin.js
+++ b/pages/yongjin/yongjin.js
@@ -1,66 +1,66 @@
-// pages/yongjin/yongjin.js
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
-
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage: function () {
-
- }
+// pages/yongjin/yongjin.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
})
\ No newline at end of file
diff --git a/pages/yongjin/yongjin.json b/pages/yongjin/yongjin.json
index 816d286..8d24fd6 100644
--- a/pages/yongjin/yongjin.json
+++ b/pages/yongjin/yongjin.json
@@ -1,7 +1,7 @@
-{
- "usingComponents": {
- "yongjintop": "/components/yue/yongjintop/yongjintop",
- "yuedetail": "/components/yue/yuedetail/yuedetail",
- "yuetitle": "/components/yue/yuetitle/yuetitle"
- }
+{
+ "usingComponents": {
+ "yongjintop": "/components/yue/yongjintop/yongjintop",
+ "yuedetail": "/components/yue/yuedetail/yuedetail",
+ "yuetitle": "/components/yue/yuetitle/yuetitle"
+ }
}
\ No newline at end of file
diff --git a/pages/yongjin/yongjin.scss b/pages/yongjin/yongjin.scss
index 54dacf5..20fda9b 100644
--- a/pages/yongjin/yongjin.scss
+++ b/pages/yongjin/yongjin.scss
@@ -1,7 +1,7 @@
-.detail {
- margin-top: 41rpx;
-}
-
-.title {
- margin-top: 40rpx
+.detail {
+ margin-top: 41rpx;
+}
+
+.title {
+ margin-top: 40rpx
}
\ No newline at end of file
diff --git a/pages/yongjin/yongjin.wxml b/pages/yongjin/yongjin.wxml
index c6d4bfc..3a42b1c 100644
--- a/pages/yongjin/yongjin.wxml
+++ b/pages/yongjin/yongjin.wxml
@@ -1,18 +1,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/yongjin/yongjin.wxss b/pages/yongjin/yongjin.wxss
index c165a91..175927d 100644
--- a/pages/yongjin/yongjin.wxss
+++ b/pages/yongjin/yongjin.wxss
@@ -1,7 +1,7 @@
-.detail {
- margin-top: 41rpx;
-}
-
-.title {
- margin-top: 40rpx;
-}
+.detail {
+ margin-top: 41rpx;
+}
+
+.title {
+ margin-top: 40rpx;
+}
diff --git a/pages/yue/yue.js b/pages/yue/yue.js
index 177c675..e4c19fd 100644
--- a/pages/yue/yue.js
+++ b/pages/yue/yue.js
@@ -1,23 +1,23 @@
-// pages/yue/yue.js
-Component({
- /**
- * 组件的属性列表
- */
- properties: {
-
- },
-
- /**
- * 组件的初始数据
- */
- data: {
-
- },
-
- /**
- * 组件的方法列表
- */
- methods: {
-
- }
-})
+// pages/yue/yue.js
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+
+ }
+})
diff --git a/pages/yue/yue.json b/pages/yue/yue.json
index 4845fe0..88c96da 100644
--- a/pages/yue/yue.json
+++ b/pages/yue/yue.json
@@ -1,8 +1,8 @@
-{
- "component": true,
- "usingComponents": {
- "yuetop": "/components/yue/yuetop/yuetop",
- "yuetitle": "/components/yue/yuetitle/yuetitle",
- "yuedetail": "/components/yue/yuedetail/yuedetail"
- }
+{
+ "component": true,
+ "usingComponents": {
+ "yuetop": "/components/yue/yuetop/yuetop",
+ "yuetitle": "/components/yue/yuetitle/yuetitle",
+ "yuedetail": "/components/yue/yuedetail/yuedetail"
+ }
}
\ No newline at end of file
diff --git a/pages/yue/yue.scss b/pages/yue/yue.scss
index fffd040..d0e748b 100644
--- a/pages/yue/yue.scss
+++ b/pages/yue/yue.scss
@@ -1,8 +1,8 @@
-.yue {
- .title {
- margin-top: 40rpx
- }
- .detail {
- margin-top: 41rpx;
- }
+.yue {
+ .title {
+ margin-top: 40rpx
+ }
+ .detail {
+ margin-top: 41rpx;
+ }
}
\ No newline at end of file
diff --git a/pages/yue/yue.wxml b/pages/yue/yue.wxml
index c99d31d..2f88218 100644
--- a/pages/yue/yue.wxml
+++ b/pages/yue/yue.wxml
@@ -1,19 +1,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/yue/yue.wxss b/pages/yue/yue.wxss
index 076f9fc..c087da3 100644
--- a/pages/yue/yue.wxss
+++ b/pages/yue/yue.wxss
@@ -1,7 +1,7 @@
-.yue .title {
- margin-top: 40rpx;
-}
-
-.yue .detail {
- margin-top: 41rpx;
-}
+.yue .title {
+ margin-top: 40rpx;
+}
+
+.yue .detail {
+ margin-top: 41rpx;
+}
diff --git a/utils/bin.js b/utils/bin.js
index f5daf4f..c94da10 100644
--- a/utils/bin.js
+++ b/utils/bin.js
@@ -1,57 +1,68 @@
-//请求接口
-let request = function (obj){
- let {
- url,
- data,
- method,
- header,
- dataType,
- responseType,
- complete,
- name,
- urldata
- } = obj
- url="http://daigou.sdbairui.com/index.php/WXAPI/" + url
- let text = ""
- for(let i in urldata){
- if(urldata[i] == undefined){
- text += `/${i}`
-
- }else{
- text += `/${i}/${urldata[i]}`
-
- }
- }
- url+=text
- // if(method == "POST" || method == "post"){
- // if(header == undefined){
- // header ={}
- // }
- // header['content-type'] = "application/x-www-form-urlencoded"
- // }
- if(data == undefined){
- data = {}
- }
- data[name || 'openid'] = wx.getStorageSync("openid")
- return new Promise((res,rej)=>{
- wx.request({
- url,
- data,
- method,
- header,
- dataType,
- responseType,
- success(data){
- res(data)
- },
- fail(data){
- rej(data)
- },
- complete
- })
- })
-}
-
-module.exports = {
- request
+//请求接口
+let request = function (obj){
+ let {
+ url,
+ data,
+ method,
+ header,
+ dataType,
+ responseType,
+ complete,
+ name,
+ urldata
+ } = obj
+ url="http://daigou.sdbairui.com/index.php/WXAPI/" + url
+ let text = ""
+ for(let i in urldata){
+ if(urldata[i] === ''){
+ text += `/${i}`
+
+ }else{
+ text += `/${i}/${urldata[i]}`
+
+ }
+ }
+ url+=text
+ // if(method == "POST" || method == "post"){
+ // if(header == undefined){
+ // header ={}
+ // }
+ // header['content-type'] = "application/x-www-form-urlencoded"
+ // }
+ if(data == undefined){
+ data = {}
+ }
+ data[name || 'openid'] = wx.getStorageSync("openid")
+ return new Promise((res,rej)=>{
+ wx.request({
+ url,
+ data,
+ method,
+ header,
+ dataType,
+ responseType,
+ success(data){
+ res(data)
+ },
+ fail(data){
+ rej(data)
+ },
+ complete
+ })
+ })
+}
+let getusetid = function(){
+ return new Promise((res,rej)=>{
+ request({
+ url:"User/validateOpenid"
+
+ }).then((r)=>{
+ res(r.data.data.user_id)
+ })
+ })
+
+}
+
+module.exports = {
+ request,getusetid
}
\ No newline at end of file