Merge branch 'master' of github.com:wechat-miniprogram/miniprogram-demo into master

Author: sanfordsun

Diff for: miniprogram/app.json

@@ -234,7 +234,9 @@
         "examples/half-screen/pages/index/index",
         "examples/segmented-half-screen/pages/index/index",
         "examples/card_transition/pages/list/list",
-        "examples/card_transition/pages/detail/detail"
+        "examples/card_transition/pages/detail/detail",
+        "examples/product-list/pages/index/index",
+        "examples/expanded-scroll-view/pages/index/index"
       ]
     },
     {

Diff for: miniprogram/packageSkylineExamples

@@ -19,12 +19,12 @@ Page({
   },
   onShareAppMessage() {
     return {
-      title: '小程序官方组件展示',
-      path: 'page/component/index'
+      title: '小程序交互动画展示',
+      path: 'page/animation/index'
     }
   },
   onShareTimeline() {
-    '小程序官方组件展示'
+    '小程序交互动画展示'
   },
 
   data: {
@@ -50,7 +50,9 @@ Page({
           { url: '/packageSkylineExamples/examples/card_transition/pages/list/list', name: '卡片转场'},
           { url: '/packageSkylineExamples/examples/half-screen/pages/index/index', name: '半屏弹窗'},
           { url: '/packageSkylineExamples/examples/segmented-half-screen/pages/index/index', name: '分段式半屏'},
-          { url: '/packageSkylineExamples/examples/tab-indicator/pages/index/index', name: 'Tab 指示条'}
+          { url: '/packageSkylineExamples/examples/tab-indicator/pages/index/index', name: 'Tab 指示条'},
+          { url: '/packageSkylineExamples/examples/product-list/pages/index/index', name: '搜索栏吸附'},
+          { url: '/packageSkylineExamples/examples/expanded-scroll-view/pages/index/index', name: '沉浸式商品浏览'}
         ]
       }, {
         id: 'XRFrame',

Diff for: miniprogram/page/animation/index.ts

@@ -1,11 +1,12 @@
 {
-  "libVersion": "2.31.1",
+  "libVersion": "2.32.0",
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "setting": {
     "useIsolateContext": true,
     "urlCheck": false,
     "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false
+    "lazyloadPlaceholderEnable": false,
+    "skylineRenderEnable": false
   },
   "projectname": "小程序示例",
   "condition": {
@@ -44,6 +45,20 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "product-list",
+          "pathName": "packageSkylineExamples/examples/product-list/pages/index/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "expanded-scroll-view",
+          "pathName": "packageSkylineExamples/examples/expanded-scroll-view/pages/index/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }