Bladeren bron

签到返回

bobo 3 jaren geleden
bovenliggende
commit
bd94109a91
5 gewijzigde bestanden met toevoegingen van 181 en 174 verwijderingen
  1. 2 1
      pages/signIn/activity/activity.json
  2. 1 1
      pages/signIn/activity/activity.wxml
  3. 70 70
      project.config.json
  4. 107 101
      project.private.config.json
  5. 1 1
      utils/request.js

+ 2 - 1
pages/signIn/activity/activity.json

@@ -1,6 +1,7 @@
 {
   "usingComponents": {
-    "jumpmallapp": "../../../components/jumpmallapp"
+    "jumpmallapp": "../../../components/jumpmallapp",
+    "topbar": "../../../components/topbar"
   },
   "navigationStyle": "custom"
 }

+ 1 - 1
pages/signIn/activity/activity.wxml

@@ -1,6 +1,6 @@
 <!--pages/signIn/index.wxml-->
 <view wx:if="{{showPage}}">
-
+<topbar />
 <!-- 页面主体 -->
 <view class="sign-scroll-body" style="margin-top:{{navHeight}}px; height: {{bodyHeight}}px;">
     <view class="sign-info-extra">

+ 70 - 70
project.config.json

@@ -1,77 +1,77 @@
 {
-  "description": "项目配置文件",
-  "packOptions": {
-    "ignore": []
-  },
-  "setting": {
-    "urlCheck": true,
-    "es6": true,
-    "enhance": true,
-    "postcss": false,
-    "preloadBackgroundData": false,
-    "minified": false,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
+    "description": "项目配置文件",
+    "packOptions": {
+        "ignore": []
     },
-    "enableEngineNative": false,
-    "useIsolateContext": false,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": false,
-    "disableUseStrict": false,
-    "minifyWXML": false,
-    "showES6CompileOption": false,
-    "useCompilerPlugins": false
-  },
-  "compileType": "miniprogram",
-  "libVersion": "2.21.0",
-  "appid": "wxcc1cdb8babd3f62c",
-  "projectname": "%E9%A3%9E%E7%A0%81",
-  "debugOptions": {
-    "hidedInDevtools": []
-  },
-  "scripts": {},
-  "staticServerOptions": {
-    "baseURL": "",
-    "servePath": ""
-  },
-  "isGameTourist": false,
-  "condition": {
-    "search": {
-      "list": []
+    "setting": {
+        "urlCheck": false,
+        "es6": true,
+        "enhance": true,
+        "postcss": false,
+        "preloadBackgroundData": false,
+        "minified": false,
+        "newFeature": false,
+        "coverView": true,
+        "nodeModules": false,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "scopeDataCheck": false,
+        "uglifyFileName": false,
+        "checkInvalidKey": true,
+        "checkSiteMap": true,
+        "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        },
+        "enableEngineNative": false,
+        "useIsolateContext": true,
+        "userConfirmedBundleSwitch": false,
+        "packNpmManually": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": false,
+        "disableUseStrict": false,
+        "minifyWXML": false,
+        "showES6CompileOption": false,
+        "useCompilerPlugins": false
     },
-    "conversation": {
-      "list": []
+    "compileType": "miniprogram",
+    "libVersion": "2.21.0",
+    "appid": "wxcc1cdb8babd3f62c",
+    "projectname": "%E9%A3%9E%E7%A0%81",
+    "debugOptions": {
+        "hidedInDevtools": []
     },
-    "game": {
-      "list": []
+    "scripts": {},
+    "staticServerOptions": {
+        "baseURL": "",
+        "servePath": ""
     },
-    "plugin": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
-    "miniprogram": {
-      "list": []
+    "isGameTourist": false,
+    "condition": {
+        "search": {
+            "list": []
+        },
+        "conversation": {
+            "list": []
+        },
+        "game": {
+            "list": []
+        },
+        "plugin": {
+            "list": []
+        },
+        "gamePlugin": {
+            "list": []
+        },
+        "miniprogram": {
+            "list": []
+        }
     }
-  }
 }

+ 107 - 101
project.private.config.json

@@ -1,108 +1,114 @@
 {
-  "setting": {},
-  "condition": {
-    "plugin": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
-    "miniprogram": {
-      "list": [
-        {
-          "name": "pages/activityInfo/activityInfo",
-          "pathName": "pages/activityInfo/activityInfo",
-          "query": "id=Bg5740r78w&mobile=18636653274",
-          "scene": null
+    "setting": {},
+    "condition": {
+        "plugin": {
+            "list": []
         },
-        {
-          "name": "pages/couponReceive/couponReceive",
-          "pathName": "pages/couponReceive/couponReceive",
-          "query": "codeId=JyZmVzKm0D-47",
-          "scene": null
+        "game": {
+            "list": []
         },
-        {
-          "name": "pages/myCoupons/myCoupons",
-          "pathName": "pages/myCoupons/myCoupons",
-          "query": "mobile=18636653274",
-          "scene": null
+        "gamePlugin": {
+            "list": []
         },
-        {
-          "name": "pages/receiveCoupon/receiveCoupon",
-          "pathName": "pages/receiveCoupon/receiveCoupon",
-          "query": "",
-          "scene": 1013
-        },
-        {
-          "name": "pages/welfareMall/personal/personal",
-          "pathName": "pages/welfareMall/personal/personal",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "pages/welfareMall/historical/historical",
-          "pathName": "pages/welfareMall/historical/historical",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "pages/welfareMall/refund/refund",
-          "pathName": "pages/welfareMall/refund/refund",
-          "query": "id=undefined",
-          "scene": null
-        },
-        {
-          "name": "福利go ",
-          "pathName": "pages/welfareMall/index/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "超值券包",
-          "pathName": "pages/welfareMall/activityList/activityList",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "券包详情",
-          "pathName": "pages/welfareMall/activityInfo/activityInfo",
-          "query": "activityId=dl5v9NpmWQ",
-          "scene": null
-        },
-        {
-          "name": "pages/luckDraw/detail",
-          "pathName": "pages/luckDraw/detail",
-          "query": "id=8",
-          "scene": null
-        },
-        {
-          "name": "pages/luckDraw/index",
-          "pathName": "pages/luckDraw/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "pages/luckDraw/profile",
-          "pathName": "pages/luckDraw/profile",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "pages/signIn/activity/activity",
-          "pathName": "pages/signIn/activity/activity",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "pages/signIn/record/record",
-          "pathName": "pages/signIn/record/record",
-          "query": "",
-          "scene": null
+        "miniprogram": {
+            "list": [
+                {
+                    "name": "pages/activityInfo/activityInfo",
+                    "pathName": "pages/activityInfo/activityInfo",
+                    "query": "id=Bg5740r78w&mobile=18636653274",
+                    "scene": null
+                },
+                {
+                    "name": "pages/couponReceive/couponReceive",
+                    "pathName": "pages/couponReceive/couponReceive",
+                    "query": "codeId=JyZmVzKm0D-47",
+                    "scene": null
+                },
+                {
+                    "name": "pages/myCoupons/myCoupons",
+                    "pathName": "pages/myCoupons/myCoupons",
+                    "query": "mobile=18636653274",
+                    "scene": null
+                },
+                {
+                    "name": "pages/receiveCoupon/receiveCoupon",
+                    "pathName": "pages/receiveCoupon/receiveCoupon",
+                    "query": "",
+                    "scene": 1013
+                },
+                {
+                    "name": "pages/welfareMall/personal/personal",
+                    "pathName": "pages/welfareMall/personal/personal",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/welfareMall/historical/historical",
+                    "pathName": "pages/welfareMall/historical/historical",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/welfareMall/refund/refund",
+                    "pathName": "pages/welfareMall/refund/refund",
+                    "query": "id=undefined",
+                    "scene": null
+                },
+                {
+                    "name": "福利go ",
+                    "pathName": "pages/welfareMall/index/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "超值券包",
+                    "pathName": "pages/welfareMall/activityList/activityList",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "券包详情",
+                    "pathName": "pages/welfareMall/activityInfo/activityInfo",
+                    "query": "activityId=dl5v9NpmWQ",
+                    "scene": null
+                },
+                {
+                    "name": "pages/luckDraw/detail",
+                    "pathName": "pages/luckDraw/detail",
+                    "query": "id=8",
+                    "scene": null
+                },
+                {
+                    "name": "pages/luckDraw/index",
+                    "pathName": "pages/luckDraw/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/luckDraw/profile",
+                    "pathName": "pages/luckDraw/profile",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/signIn/activity/activity",
+                    "pathName": "pages/signIn/activity/activity",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/signIn/record/record",
+                    "pathName": "pages/signIn/record/record",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/signIn/activity/activity",
+                    "pathName": "pages/signIn/activity/activity",
+                    "query": "",
+                    "scene": null
+                }
+            ]
         }
-      ]
     }
-  }
 }

+ 1 - 1
utils/request.js

@@ -2,7 +2,7 @@ import util from './util.js'
 class request {
 
     //本地的
-    // static BASE_URL = 'http://localhost:8014/'
+//    static BASE_URL = 'http://localhost:8014/'
 //   pre环境的
   static BASE_URL = 'https://oapi.shpr.top/'
 //   正式的