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 0000000..b489d1b Binary files /dev/null and b/utils/img/search.png differ