Merge branch 'dev' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev

999a6a3a · 高淑倩 · 0a75f880 · 058b0ac3 · 999a6a3a · 999a6a3a
Commit 999a6a3a authored May 24, 2019 by 高淑倩
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

app.json src/app.json +2 -1

mySpend.js src/pages/mySpend/mySpend.js +1 -1

No files found.
--- a/src/app.json
+++ b/src/app.json
 {
  "pages": [
-    "pages/welcome/welcome",
    "pages/mySpend/mySpend",
+    "pages/welcome/welcome",
+    
    "pages/memberOfOwn/memberOfOwn",
    "pages/userCenter/userCenter",
    "pages/memberRules/memberRules",

--- a/src/pages/mySpend/mySpend.js
+++ b/src/pages/mySpend/mySpend.js
@@ -27,7 +27,7 @@ wxService.page({
   * 生命周期函数--监听页面显示
   */
  onShow: function () {
-
+    this.initOrderList()
  },

  //获取消费列表