sunzhilei преди 2 години
родител
ревизия
e89fabf816
променени са 5 файла, в които са добавени 190 реда и са изтрити 203 реда
  1. 1 1
      pages/activity/goodList/goodList.wxml
  2. 1 1
      pages/activity/goodList/goodList.wxss
  3. 2 2
      pages/index/index.wxml
  4. 118 116
      project.config.json
  5. 68 83
      project.private.config.json

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

@@ -1,3 +1,3 @@
 <view class="good_list">
-  <image src="http://reader-wx.ai160.com/images/reader/activity/goodList.jpg"></image>
+  <image src="http://reader-wx.ai160.com/images/reader/activity/goodList.jpg" mode="widthFix"></image>
 </view>

+ 1 - 1
pages/activity/goodList/goodList.wxss

@@ -6,6 +6,6 @@
 }
 .good_list image {
   width: 100%;
-  height: 3624rpx;
+  height: 100%;
   display: block;
 }

+ 2 - 2
pages/index/index.wxml

@@ -47,9 +47,9 @@
   </view>
   
   <!-- <view hidden="{{gradeActivity === 'PRIMARY_SENIOR_GRADE' || gradeActivity === 'PRESCHOOL' || 0 != myIndex}}" class="activity-img" bindtap="goToActivity"> -->
-  <!-- <view hidden="{{0 != myIndex}}" class="activity-img" bindtap="goToActivity">
+  <view hidden="{{0 != myIndex}}" class="activity-img" bindtap="goToActivity">
     <image src="http://reader-wx.ai160.com/images/reader/activity/banner.jpg"></image>
-  </view> -->
+  </view>
  
   <!-- <view hidden="{{(!isIos && isVip) || 0 != myIndex }}" class="activity-img" bindtap="bannerTap">
     <image src="http://reader-wx.ai160.com/images/reader/pay/{{isIos ? 'ios_banner' : 'android_banner'}}.jpg"></image>

+ 118 - 116
project.config.json

@@ -1,125 +1,127 @@
 {
-  "description": "项目配置文件",
-  "packOptions": {
-    "ignore": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": true,
-    "coverView": true,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
+    "description": "项目配置文件",
+    "packOptions": {
+        "ignore": [],
+        "include": []
     },
-    "bundle": false,
-    "useIsolateContext": true,
-    "useCompilerModule": false,
-    "userConfirmedUseCompilerModuleSwitch": false,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true
-  },
-  "compileType": "miniprogram",
-  "libVersion": "2.16.0",
-  "appid": "wx8961a3e5512f307c",
-  "projectname": "%E5%B0%8F%E5%AD%A6%E8%AF%BE%E6%96%87%E6%9C%97%E8%AF%BB%E9%85%8D%E9%9F%B3",
-  "debugOptions": {
-    "hidedInDevtools": []
-  },
-  "isGameTourist": false,
-  "simulatorType": "wechat",
-  "simulatorPluginLibVersion": {},
-  "condition": {
-    "plugin": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
-    "miniprogram": {
-      "list": [
-        {
-          "id": 0,
-          "name": "pages/vipPage/wechat/wechat",
-          "pathName": "pages/vipPage/wechat/wechat",
-          "query": "",
-          "scene": null
-        },
-        {
-          "id": 1,
-          "name": "作品",
-          "pathName": "pages/social/works/works",
-          "query": "id=1548160250807513&title=【识字1】春夏秋冬",
-          "scene": "1012"
-        },
-        {
-          "id": 2,
-          "name": "分享团",
-          "pathName": "pages/groupPage/group-details/group-details",
-          "query": "productId=1550459447432909",
-          "scene": 1012
+    "setting": {
+        "urlCheck": false,
+        "es6": true,
+        "postcss": true,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "newFeature": true,
+        "coverView": true,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "scopeDataCheck": false,
+        "checkInvalidKey": true,
+        "checkSiteMap": true,
+        "uploadWithSourceMap": true,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
         },
-        {
-          "id": -1,
-          "name": "公众号进入",
-          "pathName": "pages/index/index",
-          "query": "",
-          "scene": 1020,
-          "referrerInfo": {}
-        },
-        {
-          "id": -1,
-          "name": "公众号文章进入",
-          "pathName": "pages/index/index",
-          "query": "",
-          "scene": 1058
-        },
-        {
-          "id": -1,
-          "name": "小红花兑换页面",
-          "pathName": "pages/social/prize/prize",
-          "query": "",
-          "scene": null
+        "bundle": false,
+        "useIsolateContext": true,
+        "useCompilerModule": false,
+        "userConfirmedUseCompilerModuleSwitch": false,
+        "userConfirmedBundleSwitch": false,
+        "packNpmManually": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "ignoreUploadUnusedFiles": true
+    },
+    "compileType": "miniprogram",
+    "libVersion": "2.16.0",
+    "appid": "wx8961a3e5512f307c",
+    "projectname": "%E5%B0%8F%E5%AD%A6%E8%AF%BE%E6%96%87%E6%9C%97%E8%AF%BB%E9%85%8D%E9%9F%B3",
+    "simulatorType": "wechat",
+    "simulatorPluginLibVersion": {},
+    "condition": {
+        "plugin": {
+            "list": []
         },
-        {
-          "id": -1,
-          "name": "有问题朗读页面",
-          "pathName": "pages/social/works/works",
-          "query": "id=1553402613620097&title=【课文7】怎么都快乐",
-          "scene": null
+        "game": {
+            "list": []
         },
-        {
-          "id": -1,
-          "name": "活动页面",
-          "pathName": "pages/activity/index/index",
-          "query": "",
-          "scene": null
+        "gamePlugin": {
+            "list": []
         },
-        {
-          "name": "pages/vipActivity/vipActivity",
-          "pathName": "pages/vipActivity/vipActivity",
-          "query": "",
-          "scene": null
+        "miniprogram": {
+            "list": [
+                {
+                    "id": 0,
+                    "name": "pages/vipPage/wechat/wechat",
+                    "pathName": "pages/vipPage/wechat/wechat",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": 1,
+                    "name": "作品",
+                    "pathName": "pages/social/works/works",
+                    "query": "id=1548160250807513&title=【识字1】春夏秋冬",
+                    "scene": "1012"
+                },
+                {
+                    "id": 2,
+                    "name": "分享团",
+                    "pathName": "pages/groupPage/group-details/group-details",
+                    "query": "productId=1550459447432909",
+                    "scene": 1012
+                },
+                {
+                    "id": -1,
+                    "name": "公众号进入",
+                    "pathName": "pages/index/index",
+                    "query": "",
+                    "scene": 1020,
+                    "referrerInfo": {}
+                },
+                {
+                    "id": -1,
+                    "name": "公众号文章进入",
+                    "pathName": "pages/index/index",
+                    "query": "",
+                    "scene": 1058
+                },
+                {
+                    "id": -1,
+                    "name": "小红花兑换页面",
+                    "pathName": "pages/social/prize/prize",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "有问题朗读页面",
+                    "pathName": "pages/social/works/works",
+                    "query": "id=1553402613620097&title=【课文7】怎么都快乐",
+                    "scene": null
+                },
+                {
+                    "id": -1,
+                    "name": "活动页面",
+                    "pathName": "pages/activity/index/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/vipActivity/vipActivity",
+                    "pathName": "pages/vipActivity/vipActivity",
+                    "query": "",
+                    "scene": null
+                }
+            ]
         }
-      ]
+    },
+    "editorSetting": {
+        "tabIndent": "insertSpaces",
+        "tabSize": 4
     }
-  }
 }

+ 68 - 83
project.private.config.json

@@ -1,86 +1,71 @@
 {
-  "setting": {},
-  "condition": {
-    "plugin": {
-      "list": []
-    },
-    "game": {
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
-    "miniprogram": {
-      "list": [
-        {
-          "id": 0,
-          "name": "pages/vipPage/wechat/wechat",
-          "pathName": "pages/vipPage/wechat/wechat",
-          "query": "",
-          "scene": null
-        },
-        {
-          "id": 1,
-          "name": "作品",
-          "pathName": "pages/social/works/works",
-          "query": "id=1548160250807513&title=【识字1】春夏秋冬",
-          "scene": "1012"
-        },
-        {
-          "id": 2,
-          "name": "分享团",
-          "pathName": "pages/groupPage/group-details/group-details",
-          "query": "productId=1550459447432909",
-          "scene": 1012
-        },
-        {
-          "id": -1,
-          "name": "公众号进入",
-          "pathName": "pages/index/index",
-          "query": "",
-          "scene": 1020,
-          "referrerInfo": {}
-        },
-        {
-          "id": -1,
-          "name": "公众号文章进入",
-          "pathName": "pages/index/index",
-          "query": "",
-          "scene": 1058
-        },
-        {
-          "id": -1,
-          "name": "小红花兑换页面",
-          "pathName": "pages/social/prize/prize",
-          "query": "",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "有问题朗读页面",
-          "pathName": "pages/social/works/works",
-          "query": "id=1553402613620097&title=【课文7】怎么都快乐",
-          "scene": null
-        },
-        {
-          "id": -1,
-          "name": "活动页面",
-          "pathName": "pages/activity/index/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "活动分享进入",
-          "pathName": "pages/index/index",
-          "query": "readId=1615468601012143&activity=true",
-          "scene": null
-        },
-        {
-          "name": "pages/product/product",
-          "pathName": "pages/product/product",
-          "scene": null
+    "setting": {},
+    "condition": {
+        "miniprogram": {
+            "list": [
+                {
+                    "name": "pages/vipPage/wechat/wechat",
+                    "pathName": "pages/vipPage/wechat/wechat",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "作品",
+                    "pathName": "pages/social/works/works",
+                    "query": "id=1548160250807513&title=【识字1】春夏秋冬",
+                    "scene": "1012"
+                },
+                {
+                    "name": "分享团",
+                    "pathName": "pages/groupPage/group-details/group-details",
+                    "query": "productId=1550459447432909",
+                    "scene": 1012
+                },
+                {
+                    "name": "公众号进入",
+                    "pathName": "pages/index/index",
+                    "query": "",
+                    "scene": 1020,
+                    "referrerInfo": {}
+                },
+                {
+                    "name": "公众号文章进入",
+                    "pathName": "pages/index/index",
+                    "query": "",
+                    "scene": 1058
+                },
+                {
+                    "name": "小红花兑换页面",
+                    "pathName": "pages/social/prize/prize",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "有问题朗读页面",
+                    "pathName": "pages/social/works/works",
+                    "query": "id=1553402613620097&title=【课文7】怎么都快乐",
+                    "scene": null
+                },
+                {
+                    "name": "活动页面",
+                    "pathName": "pages/activity/index/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "活动分享进入",
+                    "pathName": "pages/index/index",
+                    "query": "readId=1615468601012143&activity=true",
+                    "scene": null
+                },
+                {
+                    "name": "pages/product/product",
+                    "pathName": "pages/product/product",
+                    "query": "",
+                    "scene": null
+                }
+            ]
         }
-      ]
-    }
-  }
+    },
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
 }