From fa782d2a51bafb0ed8f78a3f223bc71e480eb448 Mon Sep 17 00:00:00 2001
From: pplokijuhyg <1162963624@qq.com>
Date: Thu, 26 Dec 2019 09:13:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/index/search/index.wxml | 2 +-
components/order/commodity/index.js | 9 ++++++++-
components/order/tab/index.js | 5 +++++
components/order/tab/index.wxml | 10 ++++-----
.../shopping/shoppingitem/shoppingitem.wxss | 19 ++++++++++--------
pages/chooseaddr/chooseaddr.js | 2 +-
utils/img/search.png | Bin 0 -> 6369 bytes
7 files changed, 31 insertions(+), 16 deletions(-)
create mode 100644 utils/img/search.png
diff --git a/components/index/search/index.wxml b/components/index/search/index.wxml
index 484783f..c335ba8 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/order/commodity/index.js b/components/order/commodity/index.js
index f6bcaab..e8168e5 100644
--- a/components/order/commodity/index.js
+++ b/components/order/commodity/index.js
@@ -20,6 +20,8 @@ Component({
}
}).then((res)=>{
console.log(res)
+ this.triggerEvent('shua', { bubbles: true,composed: true })
+
})
})
},
@@ -33,6 +35,7 @@ Component({
}
}).then((res) => {
console.log(res)
+ this.triggerEvent('shua', { bubbles: true,composed: true })
})
})
@@ -52,7 +55,11 @@ Component({
nonceStr:res.data.result.wdata.nonceStr,
package:res.data.result.wdata.package,
signType:"MD5",
- paySign:res.data.result.wdata.sign
+ paySign:res.data.result.wdata.sign,
+ complete(){
+ this.triggerEvent('shua', { bubbles: true,composed: true })
+
+ }
})
})
})
diff --git a/components/order/tab/index.js b/components/order/tab/index.js
index 7efd408..0b5f890 100644
--- a/components/order/tab/index.js
+++ b/components/order/tab/index.js
@@ -98,6 +98,11 @@ Component({
} ,
receiving(){
+ },
+ shua(){
+ console.log(123)
+ this.getlist()
+
}
},
diff --git a/components/order/tab/index.wxml b/components/order/tab/index.wxml
index 9cc1726..6a893ba 100644
--- a/components/order/tab/index.wxml
+++ b/components/order/tab/index.wxml
@@ -1,17 +1,17 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/components/shopping/shoppingitem/shoppingitem.wxss b/components/shopping/shoppingitem/shoppingitem.wxss
index 03fbea8..c104a67 100644
--- a/components/shopping/shoppingitem/shoppingitem.wxss
+++ b/components/shopping/shoppingitem/shoppingitem.wxss
@@ -73,13 +73,14 @@
}
.reverse {
- width: 23rpx;
- height: 23rpx;
+ width: 63rpx;
+ height: 63rpx;
/* background-color: #97DFB4; */
margin: 0 auto;
- margin-top: 20rpx;
- line-height: 23rpx;
+ /* margin-top: 20rpx; */
+ line-height: 63rpx;
font-size: 46rpx;
+ text-align: center;
}
.num {
@@ -89,10 +90,12 @@
}
.add {
- width: 23rpx;
- height: 23rpx;
+ width: 63rpx;
+ height: 63rpx;
/* background-color: #242424; */
margin: 0 auto;
- margin-bottom: 17rpx;
- line-height: 23rpx;
+ /* margin-bottom: 17rpx; */
+ font-size: 46rpx;
+ line-height: 63rpx;
+ text-align: center;
}
\ No newline at end of file
diff --git a/pages/chooseaddr/chooseaddr.js b/pages/chooseaddr/chooseaddr.js
index 50f6bf2..0707f7e 100644
--- a/pages/chooseaddr/chooseaddr.js
+++ b/pages/chooseaddr/chooseaddr.js
@@ -135,7 +135,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function() {
-
+ this.onLoad()
},
/**
diff --git a/utils/img/search.png b/utils/img/search.png
new file mode 100644
index 0000000000000000000000000000000000000000..b489d1b4de56643ca3a1e8f19e94dc3d3e99030a
GIT binary patch
literal 6369
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