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

zxl

2025-07-23 e61cbe9fa57af60f28e4219b57b0c31841d01882

 pages.json

@@ -2,8 +2,8 @@
  "easycom": {
    "autoscan": true,
    "custom": {
      "^u-(.*)": "@/pages/subComponents/uview-components/uview-ui/components/u-$1/u-$1.vue",
     "__placeholder__": true
      "^u-(.*)": "@/pages/subComponents/uview-components/uview-ui/components/u-$1/u-$1.vue",	  
      "__placeholder__": true
      //uview,
      // "^uni-(.*)": "@/uni_modules/uni-$1/components/uni-$1/uni-$1.vue" // uniapp组件
    }
@@ -146,18 +146,18 @@
    //     }
    //   }
    // }
   // ,
 //    {
 //      "path": "components/m-buy/goods",
 //      "style": {
 //        "navigationBarTitleText": "",
 //        "componentPlaceholder": {
 //          "u-popup": "view",
 //          "u-image": "view",
 //          "u-alert-tips": "view"
 //        }
 //      }
 //    }
    // ,
    //    {
    //      "path": "components/m-buy/goods",
    //      "style": {
    //        "navigationBarTitleText": "",
    //        "componentPlaceholder": {
    //          "u-popup": "view",
    //          "u-image": "view",
    //          "u-alert-tips": "view"
    //        }
    //      }
    //    }
    // {
    //   "path": "components/m-take-down-sale-goods/index",
    //   "style": {
@@ -530,13 +530,13 @@
          "path": "deposit/index",
          "style": {
            // "navigationStyle": "custom"
         "navigationBarTitleText": "预存款列表"
            "navigationBarTitleText": "预存款列表"
          }
        },
        {
          "path": "deposit/operation",
          "style": {
           "navigationBarTitleText": "余额"
            "navigationBarTitleText": "余额"
            // "navigationStyle": "custom"
          }
        },
@@ -651,11 +651,11 @@
            // 隐藏系统导航栏
            "enablePullDownRefresh": true,
            "app-plus": {},
         "componentPlaceholder": {
           "u-navbar": "view",
           "u-image": "view",
           "u-avatar": "view"
         }
            "componentPlaceholder": {
              "u-navbar": "view",
              "u-image": "view",
              "u-avatar": "view"
            }
          }
        },
        {
@@ -719,7 +719,8 @@
              "u-input": "view",
              "u-radio-group": "view",
              "u-radio": "view",
              "u-picker": "view"
              "u-picker": "view",
           "u-icon":"view"
            }
          }
        },
@@ -770,12 +771,12 @@
          "path": "msgTips/packageMsg/logisticsDetail",
          "style": {
            "navigationBarTitleText": "订单跟踪",
         "componentPlaceholder": {
           "u-time-line": "view",
           "u-time-line-item": "view",
           "u-icon": "view",
           "u-empty": "view"
         }
            "componentPlaceholder": {
              "u-time-line": "view",
              "u-time-line-item": "view",
              "u-icon": "view",
              "u-empty": "view"
            }
          }
        },
        {
@@ -893,87 +894,111 @@
    },
    {
      "root": "pages/product",
        // 关键配置
      // 关键配置
      "pages": [
        {
          "path": "shopPage",
          "style": {
            "navigationBarTitleText": ""
            "navigationBarTitleText": "",
         "componentPlaceholder": {
           "u-image": "view",
           "u-navbar": "view",
           "u-no-network": "view",
           "u-icon": "view",
           "tpl_banner": "view",
           "tpl_title": "view",
           "tpl_left_one_right_two":"view",
           "tpl_left_two_right_one":"view",
           "tpl_top_one_bottom_two":"view",
           "tpl_top_two_bottom_one":"view",
           "tpl_flex_three":"view",
           "tpl_flex_five":"view",
           "tpl_flex_four":"view",
           "tpl_flex_two":"view",
           "tpl_text_picture":"view",
           "tpl_menu":"view",
           "tpl_search":"view",
           "tpl_flex_one":"view",
           "tpl_goods":"view",
           "tpl_group":"view"
			  
			  
         }
          }
        },
      {
        "path": "m-share/index",
        "style": {
          "navigationBarTitleText": "",
          "navigationStyle": "custom",
          "componentPlaceholder": {
            "u-popup": "view",
            "u-icon": "view"
          }
        }
      },
      {
        "path": "m-goods-list/list",
        "style": {
          "navigationBarTitleText": "",
          "navigationStyle": "custom",
          "app-plus": {
            //app页面不显示滚动条
            "scrollIndicator": "none",
            "bottom": "0",
            "contentAdjust": "false",
            "bounce": "none",
            "safearea": {
              "bottom": "none"
            }
          },
          "componentPlaceholder": {
            "u-image": "view",
            "u-loading": "view",
            "u-tag": "view",
            "u-icon": "view"
          }
        }
      },
         {
           "path": "m-buy/goods",
           "style": {
             "navigationBarTitleText": "",
             "componentPlaceholder": {
               "u-popup": "view",
               "u-image": "view",
               "u-alert-tips": "view"
             }
           }
         },
         {
           "path": "m-take-down-sale-goods/index",
           "style": {
             "navigationBarTitleText": "",
             "componentPlaceholder": {
               "u-popup": "view"
             }
           }
         },
      // {
      //   "path": "popups/popups",
      //   "style": {
      //     "navigationBarTitleText": "",
      //    "componentPlaceholder": {
      //      "u-icon": "view",
      //      "u-button": "view",
      //      "u-form": "view",
      //      "u-form-item": "view",
      //      "u-input": "view",
      //      "u-popup": "view",
      //      "u-search": "view",
      //      "u-loading": "view",
      //      "u-navbar": "view",
      //      "u-image": "view",
      //      "u-loadmore": "view"
      //    }
      //   }
      // },
        {
          "path": "m-goods-list/list",
          "style": {
            "navigationBarTitleText": "",
            "navigationStyle": "custom",
            "app-plus": {
              //app页面不显示滚动条
              "scrollIndicator": "none",
              "bottom": "0",
              "contentAdjust": "false",
              "bounce": "none",
              "safearea": {
                "bottom": "none"
              }
            },
            "componentPlaceholder": {
              "u-image": "view",
              "u-loading": "view",
              "u-tag": "view",
              "u-icon": "view"
            }
          }
        },
        {
          "path": "m-share/index",
          "style": {
            "navigationBarTitleText": "",
            "navigationStyle": "custom",
            "componentPlaceholder": {
              "u-popup": "view",
              "u-icon": "view"
            }
          }
        },
        {
          "path": "m-buy/goods",
          "style": {
            "navigationBarTitleText": "",
            "componentPlaceholder": {
              "u-popup": "view",
              "u-image": "view",
              "u-alert-tips": "view"
            }
          }
        },
        {
          "path": "m-take-down-sale-goods/index",
          "style": {
            "navigationBarTitleText": "",
            "componentPlaceholder": {
              "u-popup": "view"
            }
          }
        },
        // {
        //   "path": "popups/popups",
        //   "style": {
        //     "navigationBarTitleText": "",
        //    "componentPlaceholder": {
        //      "u-icon": "view",
        //      "u-button": "view",
        //      "u-form": "view",
        //      "u-form-item": "view",
        //      "u-input": "view",
        //      "u-popup": "view",
        //      "u-search": "view",
        //      "u-loading": "view",
        //      "u-navbar": "view",
        //      "u-image": "view",
        //      "u-loadmore": "view"
        //    }
        //   }
        // },
        {
          "path": "shopList",
          "style": {
@@ -984,7 +1009,10 @@
        {
          "path": "licencePhoto",
          "style": {
            "navigationBarTitleText": "营业执照"
            "navigationBarTitleText": "营业执照",
         "componentPlaceholder": {
           "u-image": "view"
         }
          }
        },
        {
@@ -992,19 +1020,19 @@
          "style": {
            "navigationBarTitleText": "",
            "navigationStyle": "custom",
         "componentPlaceholder": {
           "u-icon": "view",
           "u-button": "view",
           "u-form": "view",
           "u-form-item": "view",
           "u-input": "view",
           "u-popup": "view",
           "u-search": "view",
           "u-loading": "view",
           "u-navbar": "view",
           "u-image": "view",
           "u-loadmore": "view"
         }
            "componentPlaceholder": {
              "u-icon": "view",
              "u-button": "view",
              "u-form": "view",
              "u-form-item": "view",
              "u-input": "view",
              "u-popup": "view",
              "u-search": "view",
              "u-loading": "view",
              "u-navbar": "view",
              "u-image": "view",
              "u-loadmore": "view"
            }
          }
        },
        {
@@ -1026,7 +1054,8 @@
            "componentPlaceholder": {
              "u-icon": "view",
              "u-navbar": "view",
              "u-popup": "view"
              "u-popup": "view",
              "popups": "view"
            }
          }
        },
@@ -1126,7 +1155,13 @@
          "style": {
            "navigationBarTitleText": "商品评价",
            //app页面不显示滚动条
            "scrollIndicator": "none"
            "scrollIndicator": "none",
            "componentPlaceholder": {
              "u-empty": "view",
              "u-loadmore": "view",
              "u-image": "view",
              "u-empty": "view"
            }
          }
        },
        {
@@ -1145,7 +1180,6 @@
    },
    {
      "root": "pages/floor",
	   
      "pages": [
        {
          "path": "empty"
@@ -1198,7 +1232,6 @@
    },
    {
      "root": "pages/passport",
	   
      "pages": [
        {
          "path": "login",
@@ -1307,7 +1340,6 @@
    },
    {
      "root": "pages/promotion",
	   
      "pages": [
        {
          "path": "seckill",
@@ -1384,7 +1416,6 @@
    },
    {
      "root": "pages/cart",
	   
      "pages": [
        {
          "path": "coupon/myCoupon",
@@ -1408,7 +1439,11 @@
        {
          "path": "coupon/index",
          "style": {
            "navigationBarTitleText": "优惠券"
            "navigationBarTitleText": "优惠券",
         "componentPlaceholder": {
           "u-tabs": "view",
           "u-empty": "view"
         }
          }
        },
        {
@@ -1429,11 +1464,11 @@
              "popGesture": "none"
              //禁止侧滑退出
            },
         "componentPlaceholder": {
           "u-count-down": "view",
           "u-row": "view",
           "u-icon": "view"
         }
            "componentPlaceholder": {
              "u-count-down": "view",
              "u-row": "view",
              "u-icon": "view"
            }
          }
        },
        {
@@ -1461,7 +1496,6 @@
    },
    {
      "root": "pages/order",
	   
      "pages": [
        {
          "path": "complain/complain",
@@ -1530,17 +1564,17 @@
          "path": "orderDetail",
          "style": {
            "navigationBarTitleText": "订单详情",
         "componentPlaceholder": {
           "u-icon": "view",
           "u-image": "view",
           "u-tag": "view",
           "u-button": "view",
           "u-popup": "view",
           "u-radio-group": "view",
           "u-radio": "view",
           "u-toast": "view",
           "u-modal": "view"
         }
            "componentPlaceholder": {
              "u-icon": "view",
              "u-image": "view",
              "u-tag": "view",
              "u-button": "view",
              "u-popup": "view",
              "u-radio-group": "view",
              "u-radio": "view",
              "u-toast": "view",
              "u-modal": "view"
            }
          }
        },
        {
@@ -1553,23 +1587,23 @@
          "path": "evaluate/evaluateDetail",
          "style": {
            "navigationBarTitleText": "评价详情",
         "componentPlaceholder": {
           "u-image": "view"
         }
            "componentPlaceholder": {
              "u-image": "view"
            }
          }
        },
        {
          "path": "evaluate/releaseEvaluate",
          "style": {
            "navigationBarTitleText": "发布评价",
        "componentPlaceholder": {
          "u-icon": "view",
          "u-image": "view",
          "u-input": "view",
          "u-upload": "view",
          "u-rate": "view",
          "u-toast": "view"
        }
            "componentPlaceholder": {
              "u-icon": "view",
              "u-image": "view",
              "u-input": "view",
              "u-upload": "view",
              "u-rate": "view",
              "u-toast": "view"
            }
          }
        },
        {
@@ -1625,10 +1659,10 @@
          "path": "afterSales/afterSalesSelect",
          "style": {
            "navigationBarTitleText": "申请售后",
         "componentPlaceholder": {
           "u-image": "view",
           "u-icon": "view"
         }
            "componentPlaceholder": {
              "u-image": "view",
              "u-icon": "view"
            }
          }
        },
        {
@@ -1671,7 +1705,6 @@
    },
    {
      "root": "pages/health",
	   
      "pages": [
        {
          "path": "healthVideo",
@@ -1684,7 +1717,6 @@
    },
    {
      "root": "pages/tabbar/home",
	   
      "pages": [
        {
          "path": "web-view",
@@ -1694,7 +1726,6 @@
    },
    {
      "root": "pages/kitchen",
	   
      "pages": [
        {
          "path": "KitchenVideo",
@@ -1706,20 +1737,32 @@
        }
      ]
    },
   {
     "root": "pages/subComponents",
     "pages": [{
        "path" : "empty/empty",
        "style" : 
        {
           "navigationBarTitleText" : "分包占位"
        }
     }
     ]
   },
    {
      "root": "pages/subComponents",
      "pages": [
        {
          "path": "empty/empty",
          "style": {
            "navigationBarTitleText": "分包占位"
          }
        },
        {
          "path": "popups/popups",
          "style": {
            "componentPlaceholder": {
              "u-modal": "view",
              "u-tabs": "view",
              "u-image": "view",
              "u-search": "view",
              "u-icon": "view",
              "u-loadmore": "view"
            }
          }
        }
      ]
    },
    {
      "root": "pages/tabbar/user",
	   
      "pages": [
        {
          "path": "my",
@@ -1738,13 +1781,16 @@
    },
    {
      "root": "pages/supplier/suppler-order",
	   
      "pages": [
        {
          "path": "suppler-order",
          "style": {
            "navigationBarTitleText": "供应商端"
            "navigationBarTitleText": "供应商端",
            // "navigationStyle": "custom"
         "componentPlaceholder":{
            "u-empty":"view",
            "u-image":"view"
         }
          }
        },
        {
@@ -1758,7 +1804,6 @@
    },
    {
      "root": "pages/supplier/publish-goods",
	   
      "pages": [
        {
          "path": "publishGoods",
@@ -1787,7 +1832,6 @@
    },
    {
      "root": "pages/goods-manager",
	   
      "pages": [
        {
          "path": "goodsList/goodsList",
@@ -1824,7 +1868,6 @@
    },
    {
      "root": "pages/news",
	   
      "pages": [
        {
          "path": "news",
@@ -1841,8 +1884,7 @@
              "u-loading": "view",
              "u-navbar": "view",
              "u-loadmore": "view",
           "u-empty": "view"
			  
              "u-empty": "view"
            }
          }
        },
@@ -1868,7 +1910,6 @@
    },
    {
      "root": "pages/userPermissions",
	   
      "pages": [
        {
          "path": "addStoreMember",
@@ -1896,7 +1937,7 @@
        {
          "path": "userPermissions",
          "style": {
            "navigationBarTitleText": "用户权限",
            "navigationBarTitleText": "店员管理",
            "componentPlaceholder": {
              "u-icon": "view",
              "u-button": "view",
@@ -1915,7 +1956,6 @@
    },
    {
      "root": "pages/commodity-square",
	   
      "pages": [
        {
          "path": "commoditySquare",
@@ -1938,7 +1978,6 @@
    },
    {
      "root": "pages/navigation",
	   
      "pages": [
        {
          "path": "search/searchPage",
@@ -1967,7 +2006,6 @@
    },
    {
      "root": "pages/cusbar",
	   
      "pages": [
        {
          "path": "special/special",