Merge remote-tracking branch 'origin/dev' into dev

zxl

2025-07-15 723389702b9ce28e8fb282f265fbf2e8e4faf13a

 pages.json

@@ -816,6 +816,53 @@
               }
            },
            {
               "path" : "activity/applayActivityList",
               "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",
                     "u-loadmore": "view",
                     "u-empty":"view"
                  }
               }
            },
            {
               "path" : "activity/addActivity",
               "style" : 
               {
                  "navigationBarTitleText": "申请活动",
                  "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",
                     "u-loadmore": "view",
                     "u-empty":"view",
                     "u-datetime-picker":"view",
                     "u-radio-group":"view",
                     "u-radio":"view",
                     "u-cell":"view"
                  }
               }
            },
            {
               "path": "myCollect/myCollect",
               "style": {
                  "navigationBarTitleText": "我的收藏",
@@ -1504,17 +1551,23 @@
               "navigationStyle": "custom"
            }
         }]
      },
      {
         "root": "pages/supplier/suppler-order",
         "pages": [{
            "path": "suppler-order",
            "style": {
               "navigationBarTitleText": "供应商端"
               // "navigationStyle": "custom"
            }
         },{
            "path": "order-detail",
            "style": {
               "navigationBarTitleText": "订单详情"
               // "navigationStyle": "custom"
            }
         }]
      }
      // {
      //    "root": "pages/supplier/publish-goods",
      //    "pages": [{
      //       "path": "publishGoods",
      //       "style": {
      //          "navigationBarTitleText": "商品发布"
      //          // "navigationStyle": "custom"
      //       }
      //    }]
      // }
      // ,
      // {
      //    "root": "pages/commodity-square",