Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-wx into dev

xiangpei

2025-06-09 78685131317e9a08a05895c899ebea9970be52c8

 pages.json

@@ -257,7 +257,10 @@
               "u-input": "view",
               "u-popup": "view",
               "u-search": "view",
               "u-loading": "view"
               "u-loading": "view",
               "u-checkbox": "view",
               "u-checkbox-group": "view",
               "u-navbar": "view"
            }
         }
      },
@@ -281,8 +284,6 @@
            }
         }
      }


   ],
   "subPackages": [{
         "root": "uview-components", // 必须与preloadRule中的名称完全一致
@@ -672,14 +673,8 @@
            }, {
               "path": "activity/detail",
               "style": {
                  "navigationBarTitleText": "活动详情"
               }
            }, {
               "path": "activity/myActivity",
               "style": {
                  "navigationBarTitleText": "我的活动",
                  "navigationBarTitleText": "活动详情",
                  "enablePullDownRefresh": true, //下拉刷新
                  "navigationStyle": "custom",
                  "componentPlaceholder": {
                     "u-form": "view",
                     "u-form-item": "view",
@@ -688,7 +683,27 @@
                     "u-action-sheet": "view",
                     "u-checkbox-group": "view",
                     "u-checkbox": "view",
                     "u-navbar": "view"
                     "u-navbar": "view",
                     "u-button": "view",
                     "u-image": "view"
                  }
               }
            }, {
               "path": "activity/myActivity",
               "style": {
                  "navigationBarTitleText": "我的活动",
                  "enablePullDownRefresh": true, //下拉刷新
                  "componentPlaceholder": {
                     "u-form": "view",
                     "u-form-item": "view",
                     "u-input": "view",
                     "u-icon": "view",
                     "u-action-sheet": "view",
                     "u-checkbox-group": "view",
                     "u-checkbox": "view",
                     "u-navbar": "view",
                     "u-button": "view",
                     "u-image": "view"
                  }
               }
            }, {
@@ -696,7 +711,6 @@
               "style": {
                  "navigationBarTitleText": "活动",
                  "enablePullDownRefresh": true, //下拉刷新
                  "navigationStyle": "custom",
                  "componentPlaceholder": {
                     "u-form": "view",
                     "u-form-item": "view",
@@ -705,13 +719,17 @@
                     "u-action-sheet": "view",
                     "u-checkbox-group": "view",
                     "u-checkbox": "view",
                     "u-navbar": "view"
                     "u-navbar": "view",
                     "u-button": "view",
                     "u-image": "view",
                     "u-loadmore": "view"
                  }
               }
            }, {
               "path": "myCollect/myCollect",
               "style": {
                  "navigationBarTitleText": "我的收藏",
                  "enablePullDownRefresh": true, //下拉刷新
                  "componentPlaceholder": {
                     "u-icon": "view",
                     "u-button": "view",
@@ -721,7 +739,10 @@
                     "u-popup": "view",
                     "u-search": "view",
                     "u-loading": "view",
                     "u-navbar": "view"
                     "u-navbar": "view",
                     "u-image": "view",
                     "u-loadmore": "view"
							
                  }

               }
@@ -902,6 +923,37 @@

      },
      {
         "root": "pages/video",
         "pages": [{
               "path": "home-page",
               "style": {
                  "navigationBarTitleText": "TA的主页"
               }
            },
            {
               "path" : "video-play",
               "style" : 
               {
                  "navigationBarTitleText" : ""
               }
            },
            {
               "path" : "home-page-edit",
               "style" : 
               {
                  "navigationBarTitleText" : "主页信息修改"
               }
            },
            {
               "path" : "video-edit",
               "style" : 
               {
                  "navigationBarTitleText" : "视频编辑"
               }
            }
         ]
      },
      {
         "root": "pages/passport",
         "pages": [{
               "path": "login",