diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js
new file mode 100644
index 0000000..43ffdd3
--- /dev/null
+++ b/components/goods_list/goods_list.js
@@ -0,0 +1,28 @@
+// pages/user/yhq/qr_code/qr_code.js
+const {
+ barcode,
+ qrcode
+} = require('../../utils/index.js')
+
+Component({
+ data: {
+ object: null,
+ },
+ properties: {
+ // 这里定义了innerText属性,属性值可以在组件使用时指定
+ },
+ ready: function () {
+ },
+
+ methods: {
+
+ },
+
+ //打开
+ onshow: function (e) {
+
+ }
+
+
+
+})
\ No newline at end of file
diff --git a/components/goods_list/goods_list.json b/components/goods_list/goods_list.json
new file mode 100644
index 0000000..a74b8d1
--- /dev/null
+++ b/components/goods_list/goods_list.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
new file mode 100644
index 0000000..8eb9a4c
--- /dev/null
+++ b/components/goods_list/goods_list.wxml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+ {{item.goods_name}}
+
+
+
+
+ ¥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+ ¥
+ {{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 没有更多内容了
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/goods_list/goods_list.wxss b/components/goods_list/goods_list.wxss
new file mode 100644
index 0000000..4434e22
--- /dev/null
+++ b/components/goods_list/goods_list.wxss
@@ -0,0 +1,93 @@
+.collects {
+ margin-top: 40rpx;
+}
+
+.hang {
+ width: 100%;
+ margin: auto;
+ padding-left: 21rpx;
+}
+
+.hang .collect {
+ width: 347rpx;
+ height: 571rpx;
+ border-radius: 25rpx;
+ border: 1rpx solid rgb(214, 214, 214);
+ overflow: hidden;
+ margin-right: 14rpx;
+ margin-bottom: 5rpx;
+}
+
+.collect .bottom {
+ padding: 0rpx 20rpx;
+}
+
+.collect .sp {
+ width: 100%;
+ height: 326rpx;
+}
+
+.collect .money {
+ margin-top: 60rpx;
+ margin-bottom: 18rpx;
+ line-height: 28rpx;
+ align-items: baseline;
+}
+.collect .money view{
+ line-height: 28rpx;
+}
+.collect .money .flex {
+ font-weight: bold;
+}
+.collect .money .flex .fs24{
+ padding-top: 5rpx;
+}
+.collect .Discount {
+ width: 156rpx;
+ height: 28rpx;
+ border-radius: 20rpx;
+ background-color: rgb(56, 56, 56);
+ font-size: 18rpx;
+ color: rgb(255, 255, 255);
+}
+
+.collect .Discount image {
+ height: 18rpx;
+ width: 18rpx;
+ line-height: 28rpx;
+ margin-right: 3rpx;
+}
+
+.collect.ml20 {
+ margin-left: 13rpx;
+}
+
+.fs24.dollar {
+ padding: 0rpx;
+}
+
+.money .price {
+ margin-left: 12rpx;
+ text-decoration: line-through;
+ line-height: 23rpx;
+}
+
+.province {
+ line-height: 26rpx;
+}
+
+.nothing {
+ height: 75rpx;
+ width: 100%;
+}
+
+.nothing .no_content {
+ margin: 0rpx 11rpx;
+ color: rgb(138, 138, 138);
+}
+
+.nothing .Foil {
+ width: 80rpx;
+ height: 2rpx;
+ background-color: rgb(138, 138, 138);
+}
\ No newline at end of file
diff --git a/pages/index/index/index.json b/pages/index/index/index.json
index a2f411c..292c095 100644
--- a/pages/index/index/index.json
+++ b/pages/index/index/index.json
@@ -2,10 +2,11 @@
"navigationBarBackgroundColor": "#ff7295",
"navigationBarTextStyle": "white",
"usingComponents": {
+ "goods_list":"/components/goods_list/goods_list",
"nav": "/components/diy_nav/diy_nav",
- "advertising":"/components/diy_advertising/diy_advertising",
+ "advertising":"/components/diy_advertising/diy_advertising",
"groupbuy": "/components/diy_groupbuy/diy_groupbuy",
- "goodsGroup": "/components/diy_goodsGroup/diy_goodsGroup",
+ "goodsGroup": "/components/diy_goodsGroup/diy_goodsGroup",
"seckill": "/components/diy_seckill/diy_seckill",
"searchbox":"/components/diy_searchbox/diy_searchbox",
"shopname": "/components/diy_shopname/diy_shopname",
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 4d00377..ce01948 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -1,4 +1,5 @@
+
@@ -375,36 +376,32 @@
-
-
-
+
+
-
+
-
-
+
- {{item.goods_name}}
+
-
+
-
+
-
+
+
@@ -416,7 +413,7 @@
没有更多内容了
-
+ -->
diff --git a/pages/user/member/menber.wxml b/pages/user/member/menber.wxml
index 67fa3c5..3024e84 100644
--- a/pages/user/member/menber.wxml
+++ b/pages/user/member/menber.wxml
@@ -4,7 +4,7 @@
总资产 (元)
{{filter.getNum(user_money)}}
-
+
可提现 (元)
diff --git a/utils/filter.wxs b/utils/filter.wxs
index 1f2b8cb..76c6b60 100644
--- a/utils/filter.wxs
+++ b/utils/filter.wxs
@@ -1,8 +1,9 @@
var filters = {
toFix:function(val,count){
+ console.log("你是说明书上 没什么 ");
return val.toFixed(count)
},
- replace_time:function(val){
+ replace_time:function(val){
if(!val) return "不限";
return val.replace("00:00:00","");
},