bobo 3 vuotta sitten
vanhempi
commit
d6c56c7fd8
3 muutettua tiedostoa jossa 72 lisäystä ja 58 poistoa
  1. 65 58
      app.json
  2. 1 0
      pages/welfareMall/coupon/coupon.js
  3. 6 0
      project.private.config.json

+ 65 - 58
app.json

@@ -1,60 +1,67 @@
 {
-  "pages": [
-    "pages/welfareMall/index/index",
-    "pages/activityList/activityList",
-    "pages/activityInfo/activityInfo",
-    "pages/myCoupons/myCoupons",
-    "pages/index/index",
-    "pages/receiveCoupon/receiveCoupon",
-    "pages/logs/logs",
-    "pages/signIn/activity/activity",
-    "pages/signIn/record/record",
-    "pages/welfareMall/personal/personal",
-    "pages/welfareMall/historical/historical",
-    "pages/welfareMall/order/orderCompletion",
-    "pages/welfareMall/refund/refund",
-    "pages/welfareMall/feedback/feedback",
-    "pages/welfareMall/activityList/activityList",
-    "pages/welfareMall/activityInfo/activityInfo",
-    "pages/luckDraw/detail",
-    "pages/luckDraw/index",
-    "pages/luckDraw/profile",
-    "pages/luckDraw/recordPrize",
-    "pages/welfareMall/coupon/coupon",
-    "pages/welfareMall/writeOff/writeOff",
-    "pages/welfareMall/staff/isStaff",
-    "pages/welfareMall/staff/distinguish",
-    "pages/welfareMall/staff/noStaff",
-    "pages/welfareMall/staffManage/staffManage"
-  ],
-  "window": {
-    "backgroundTextStyle": "light",
-    "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "Weixin",
-    "navigationBarTextStyle": "black"
-  },
-  "usingComponents": {
-    "page-wrap": "components/pageWrap/index"
-  },
-  "style": "v2",
-  "sitemapLocation": "sitemap.json",
-  "tabBar": {
-    "color": "#1b1b1b",
-    "selectedColor": "#1b1b1b",
-    "backgroundColor": "#ffffff",
-    "list": [
-      {
-        "text": "首页",
-        "pagePath": "pages/welfareMall/index/index",
-        "selectedIconPath": "images/welfareMall/home.png",
-        "iconPath": "images/welfareMall/home.png"
-      },
-      {
-        "text": "我的",
-        "pagePath": "pages/welfareMall/personal/personal",
-        "selectedIconPath": "images/welfareMall/user.png",
-        "iconPath": "images/welfareMall/user.png"
-      }
-    ]
-  }
+    "pages": [
+        "pages/welfareMall/index/index",
+        "pages/activityList/activityList",
+        "pages/activityInfo/activityInfo",
+        "pages/myCoupons/myCoupons",
+        "pages/index/index",
+        "pages/receiveCoupon/receiveCoupon",
+        "pages/logs/logs",
+        "pages/signIn/activity/activity",
+        "pages/signIn/record/record",
+        "pages/welfareMall/personal/personal",
+        "pages/welfareMall/historical/historical",
+        "pages/welfareMall/order/orderCompletion",
+        "pages/welfareMall/refund/refund",
+        "pages/welfareMall/feedback/feedback",
+        "pages/welfareMall/activityList/activityList",
+        "pages/welfareMall/activityInfo/activityInfo",
+        "pages/luckDraw/detail",
+        "pages/luckDraw/index",
+        "pages/luckDraw/profile",
+        "pages/luckDraw/recordPrize",
+        "pages/welfareMall/coupon/coupon",
+        "pages/welfareMall/writeOff/writeOff",
+        "pages/welfareMall/staff/isStaff",
+        "pages/welfareMall/staff/distinguish",
+        "pages/welfareMall/staff/noStaff",
+        "pages/welfareMall/staffManage/staffManage",
+        "pages/welfareMall/couponFitStore/index",
+        "pages/welfareMall/couponFitFood/index"
+    ],
+    "window": {
+        "backgroundTextStyle": "light",
+        "navigationBarBackgroundColor": "#fff",
+        "navigationBarTitleText": "Weixin",
+        "navigationBarTextStyle": "black"
+    },
+    "usingComponents": {
+        "page-wrap": "components/pageWrap/index"
+    },
+    "style": "v2",
+    "sitemapLocation": "sitemap.json",
+    "tabBar": {
+        "color": "#1b1b1b",
+        "selectedColor": "#1b1b1b",
+        "backgroundColor": "#ffffff",
+        "list": [
+            {
+                "text": "首页",
+                "pagePath": "pages/welfareMall/index/index",
+                "selectedIconPath": "images/welfareMall/home.png",
+                "iconPath": "images/welfareMall/home.png"
+            },
+            {
+                "text": "我的",
+                "pagePath": "pages/welfareMall/personal/personal",
+                "selectedIconPath": "images/welfareMall/user.png",
+                "iconPath": "images/welfareMall/user.png"
+            }
+        ]
+    },
+    "permission": {
+        "scope.userLocation": {
+            "desc": "本次获取位置,为了查看附加可用卡券的门店"
+        }
+    }
 }

+ 1 - 0
pages/welfareMall/coupon/coupon.js

@@ -121,6 +121,7 @@ Page({
     })
 
     this.data.couponList = this.data.couponList.concat(...data)
+    
     this.setData({
         mobileTop:getMobileCache(),
         couponList: this.data.couponList

+ 6 - 0
project.private.config.json

@@ -143,6 +143,12 @@
                     "pathName": "pages/welfareMall/coupon/coupon",
                     "query": "",
                     "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/welfareMall/couponFitStore/index",
+                    "query": "couponId=1PmexHzevy-1300",
+                    "scene": null
                 }
             ]
         }