From c6c566bb56441868d82cd0f2e0246b92b6722a51 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 28 八月 2025 17:17:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub

---
 pages.json | 1906 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 1,283 insertions(+), 623 deletions(-)

diff --git a/pages.json b/pages.json
index e738c2e..de4ac34 100644
--- a/pages.json
+++ b/pages.json
@@ -2,20 +2,21 @@
 	"easycom": {
 		"autoscan": true,
 		"custom": {
-			"^u-(.*)": "@/components/uview-components/uview-ui/components/u-$1/u-$1.vue" //uview,
+			"^u-(.*)": "@/pages/subComponents/uview-components/uview-ui/components/u-$1/u-$1.vue",
+			"^l-(.*)": "@/pages/prize/lime-dialer_0.2.7/components/l-$1/l-$1.vue",
+			"__placeholder__": true
+			//uview,
 			// "^uni-(.*)": "@/uni_modules/uni-$1/components/uni-$1/uni-$1.vue" // uniapp缁勪欢
 		}
 	},
-	// "preloadRule": {
-	// 	"pages/tabbar/index/home": // 椤甸潰璺緞
-	// 	// 椤甸潰鐨勯涓嬭浇閰嶇疆
-	// 	{
-	// 		"network": "all", // all(涓嶉檺缃戠粶) wifi(浠厀ifi涓嬮涓嬭浇)
-	// 		"packages": [
-	// 			"components/uview-components"
-	// 		] // 棰勪笅杞藉垎鍖呯殑 root 鎴� name銆俖_APP__ 琛ㄧず涓诲寘
-	// 	}
-	// },
+	"preloadRule": {
+		"pages/prize/PrizeDetail/PrizeDetail": {
+			"network": "all",
+			"packages": [
+				"pages/prize"
+			]
+		}
+	},
 	"pages": [
 		// 绗竴涓氨鏄椤�
 		{
@@ -23,303 +24,369 @@
 			"style": {
 				// "navigationBarTitleText" : "瑙嗛",
 				"enablePullDownRefresh": false,
-				"navigationStyle": "custom" // 闅愯棌椤堕儴瀵艰埅鏍�
+				"navigationStyle": "custom"
+				// 闅愯棌椤堕儴瀵艰埅鏍�
 			}
 		},
-		{
-			"path": "pages/tabbar/home/index",
-			"style": {
-				"navigationBarTitleText": "棣栭〉",
-				"navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
-				"navigationBarTextStyle": "black",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/tabbar/home/title",
-			"style": {
-				"navigationBarTitleText": "娑堟伅"
-			}
-		},
-		{
-			"path": "pages/tabbar/cart/cartList",
-			"style": {
-				"navigationBarTitleText": "璐墿杞�",
-				"navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
-				"navigationBarBackgroundColor": "#fff",
-				"enablePullDownRefresh": true, //瀹炵幇涓嬫媺鍒锋柊鏍峰紡
-				"componentPlaceholder": {
-					"u-navbar": "view",
-					"u-checkbox-group": "view",
-					"u-checkbox": "view",
-					"u-swipe-action": "view",
-					"u-image": "view",
-					"u-icon": "view",
-					"u-count-down": "view",
-					"u-modal": "view",
-					"u-popup": "view",
-					"u-toast": "view"
-				}
-			}
-		},
-		{
-			// "path": "pages/tabbar/category/category",
-			"path": "pages/commodity-square/commoditySquare",
-		
-			"style": {
-				"navigationBarTitleText": "鍟嗗搧骞垮満",
-				// "navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
-				"navigationBarTextStyle": "black",
-				// "disableScroll": true,
-				"bounce": "none",
-				"scrollIndicator": "none",
-				"componentPlaceholder": {
-					"u-navbar": "view",
-					"u-search": "view",
-					"u-image": "view"
-				}
-			}
-		},
-		{
-			"path": "components/m-search-revision/m-search-revision",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom",
-				"app-plus": {
-					//app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
-					"scrollIndicator": "none",
-					"bottom": "0",
-					"contentAdjust": "false",
-					"bounce": "none",
-					"safearea": {
-						"bottom": "none"
-					}
-				},
-				"componentPlaceholder": {
-					"u-icon": "view"
-				}
-			}
-		},
-		{
-			"path": "components/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": "components/m-share/index",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom",
-				"componentPlaceholder": {
-					"u-popup": "view",
-					"u-icon": "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": {
-				"navigationBarTitleText": "",
-				"componentPlaceholder": {
-					"u-popup": "view"
-				}
-			}
-		},
-		{
-			"path": "pages/navigation/search/searchPage",
-			"style": {
-				"navigationBarTitleText": "鎼滅储",
-				"navigationStyle": "custom",
-				"app-plus": {
-					//app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
-					"scrollIndicator": "none",
-					"bottom": "0",
-					"contentAdjust": "false",
-					"bounce": "none",
-					"safearea": {
-						"bottom": "none"
-					}
-				},
-				"componentPlaceholder": {
-					"u-navbar": "view",
-					"u-popup": "view",
-					"u-input": "view",
-					"u-back-top": "view"
-				}
-			}
-		},
-		{
-			"path": "pages/tabbar/user/my",
-			"style": {
-				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": true,
-				"navigationStyle": "custom",
-				"componentPlaceholder": {
-					"u-icon": "view",
-					"u-row": "view",
-					"u-col": "view"
-				}
-			}
-		},
-		{
-			"path": "pages/tabbar/home/web-view",
-			"style": {}
-		},
-		{
-			"path": "pages/tabbar/special/special",
-			"style": {
-				"navigationBarTitleText": "涓撻"
-			}
-		},
-		{
-			"path": "pages/tabbar/video/video",
-			"style": {
-				"navigationBarTitleText": "鍙戝竷瑙嗛",
-				"enablePullDownRefresh": false,
-				"componentPlaceholder": {
-					"u-icon": "view",
-					"u-button": "view",
-					"u-form": "view",
-					"u-form-item": "view",
-					"u-input": "view",
-					"u-popup": "view",
-					"u-search": "view"
-				}
-			}
-		},
-		{
-			"path": "pages/goods-manager/goodsList/goodsList",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "鍟嗗搧鍒楄〃",
-				"componentPlaceholder": {
-					"u-icon": "view",
-					"u-button": "view",
-					"u-form": "view",
-					"u-form-item": "view",
-					"u-input": "view",
-					"u-popup": "view",
-					"u-search": "view"
-				}
-			}
-		},
-		{
-			"path": "pages/goods-manager/addGoods/addGoods",
-			"style": {
-				"enablePullDownRefresh": true,
-				"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-upload": "view"
-				}
-			}
-		},
-		{
-			"path": "pages/goods-manager/updateSkus/updateSkus",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "璋冩暣搴撳瓨",
-				"componentPlaceholder": {
-					"u-icon": "view",
-					"u-button": "view",
-					"u-form": "view",
-					"u-form-item": "view",
-					"u-input": "view",
-					"u-popup": "view"
-				}
-			}
-		},
-		{
-			"path": "pages/userPermissions/userPermissions",
-			"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"
-				}
-			}
-		},
-		{
-			"path": "pages/customerManager/customerManager",
-			"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-checkbox": "view",
-					"u-checkbox-group": "view",
-					"u-navbar": "view"
-				}
-			}
-		},
-		{
-			"path": "pages/userPermissions/addStoreMember",
-			"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-checkbox": "view",
-					"u-checkbox-group": "view",
-					"u-navbar": "view"
-				}
-			}
-		}
+      {
+        "path" : "pages/ActivityPopup/ActivityPopup",
+        "style" :
+        {
+          "navigationBarTitleText" : ""
+        }
+      }
+     
+		// {
+		// 	"path": "pages/tabbar/home/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "棣栭〉",
+		// 		"navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
+		// 		"navigationBarTextStyle": "black",
+		// 		"enablePullDownRefresh": true
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/kitchen/KitchenVideo",
+		// 	"style": {
+		// 		"navigationBarTitleText": "绁炲帹",
+		// 		"navigationStyle": "custom" // 闅愯棌绯荤粺瀵艰埅鏍�
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/tabbar/home/title",
+		// 	"style": {
+		// 		"navigationBarTitleText": "娑堟伅"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/tabbar/cart/cartList",
+		// 	"style": {
+		// 		"navigationBarTitleText": "璐墿杞�",
+		// 		"navigationStyle": "custom",
+		// 		// 闅愯棌绯荤粺瀵艰埅鏍�
+		// 		"navigationBarBackgroundColor": "#fff",
+		// 		"enablePullDownRefresh": true,
+		// 		//瀹炵幇涓嬫媺鍒锋柊鏍峰紡
+		// 		"componentPlaceholder": {
+		// 			"u-navbar": "view",
+		// 			"u-checkbox-group": "view",
+		// 			"u-checkbox": "view",
+		// 			"u-swipe-action": "view",
+		// 			"u-image": "view",
+		// 			"u-icon": "view",
+		// 			"u-count-down": "view",
+		// 			"u-modal": "view",
+		// 			"u-popup": "view",
+		// 			"u-toast": "view"
+		// 		}
+		// 	}
+		// },
+		// {
+		// 	// "path": "pages/tabbar/category/category",
+		// 	"path": "pages/commodity-square/commoditySquare",
+
+		// 	"style": {
+		// 		"navigationBarTitleText": "鍟嗗搧骞垮満",
+		// 		"navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
+		// 		"navigationBarTextStyle": "black",
+		// 		// "disableScroll": true,
+		// 		"bounce": "none",
+		// 		"scrollIndicator": "none",
+		// 		"componentPlaceholder": {
+		// 			"u-navbar": "view",
+		// 			"u-search": "view",
+		// 			"u-image": "view"
+		// 		}
+		// 	}
+		// },
+		// {
+		//   "path": "components/m-search-revision/m-search-revision",
+		//   "style": {
+		//     "navigationBarTitleText": "",
+		//     "navigationStyle": "custom",
+		//     "app-plus": {
+		//       //app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
+		//       "scrollIndicator": "none",
+		//       "bottom": "0",
+		//       "contentAdjust": "false",
+		//       "bounce": "none",
+		//       "safearea": {
+		//         "bottom": "none"
+		//       }
+		//     },
+		//     "componentPlaceholder": {
+		//       "u-icon": "view"
+		//     }
+		//   }
+		// },
+		// {
+		//   "path": "components/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": "components/m-share/index",
+		//   "style": {
+		//     "navigationBarTitleText": "",
+		//     "navigationStyle": "custom",
+		//     "componentPlaceholder": {
+		//       "u-popup": "view",
+		//       "u-icon": "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": {
+		//     "navigationBarTitleText": "",
+		//     "componentPlaceholder": {
+		//       "u-popup": "view"
+		//     }
+		//   }
+		// }
+		// {
+		//   "path": "pages/navigation/search/searchPage",
+		//   "style": {
+		//     "navigationBarTitleText": "鎼滅储",
+		//     "navigationStyle": "custom",
+		//     "app-plus": {
+		//       //app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
+		//       "scrollIndicator": "none",
+		//       "bottom": "0",
+		//       "contentAdjust": "false",
+		//       "bounce": "none",
+		//       "safearea": {
+		//         "bottom": "none"
+		//       }
+		//     },
+		//     "componentPlaceholder": {
+		//       "u-navbar": "view",
+		//       "u-popup": "view",
+		//       "u-input": "view",
+		//       "u-back-top": "view"
+		//     }
+		//   }
+		// },
+		// {
+		//   "path": "pages/tabbar/user/my",
+		//   "style": {
+		//     "navigationBarTextStyle": "white",
+		//     "enablePullDownRefresh": true,
+		//     "navigationStyle": "custom",
+		//     "componentPlaceholder": {
+		//       "u-icon": "view",
+		//       "u-row": "view",
+		//       "u-col": "view"
+		//     }
+		//   }
+		// }
+		// {
+		//   "path": "pages/tabbar/home/web-view",
+		//   "style": {}
+		// }
+		// {
+		// 	"path": "pages/tabbar/special/special",
+		// 	"style": {
+		// 		"navigationBarTitleText": "涓撻"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/tabbar/video/video",
+		// 	"style": {
+		// 		"navigationBarTitleText": "鍙戝竷瑙嗛",
+		// 		"enablePullDownRefresh": false,
+		// 		"componentPlaceholder": {
+		// 			"u-icon": "view",
+		// 			"u-button": "view",
+		// 			"u-form": "view",
+		// 			"u-form-item": "view",
+		// 			"u-input": "view",
+		// 			"u-popup": "view",
+		// 			"u-search": "view"
+		// 		}
+		// 	}
+		// },
+		// {
+		//   "path": "pages/goods-manager/goodsList/goodsList",
+		//   "style": {
+		//     "enablePullDownRefresh": true,
+		//     "navigationBarTitleText": "鍟嗗搧鍒楄〃",
+		//     "componentPlaceholder": {
+		//       "u-icon": "view",
+		//       "u-button": "view",
+		//       "u-form": "view",
+		//       "u-form-item": "view",
+		//       "u-input": "view",
+		//       "u-popup": "view",
+		//       "u-search": "view"
+		//     }
+		//   }
+		// },
+		// {
+		// 	"path": "pages/supplier/publish-goods/publishGoods",
+		// 	"style": {
+		// 		"enablePullDownRefresh": true,
+		// 		"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-upload": "view"
+		// 		}
+		// 	}
+		// },
+		// {
+		//   "path": "pages/goods-manager/updateSkus/updateSkus",
+		//   "style": {
+		//     "enablePullDownRefresh": true,
+		//     "navigationBarTitleText": "璋冩暣搴撳瓨",
+		//     "componentPlaceholder": {
+		//       "u-icon": "view",
+		//       "u-button": "view",
+		//       "u-form": "view",
+		//       "u-form-item": "view",
+		//       "u-input": "view",
+		//       "u-popup": "view"
+		//     }
+		//   }
+		// },
+		// {
+		// 	"path": "pages/userPermissions/userPermissions",
+		// 	"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-loadmore":"view"
+		// 		}
+		// 	}
+		// },
+		// {
+		//   "path": "pages/news/news",
+		//   "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-loadmore": "view"
+		//     }
+		//   }
+		// },
+		// {
+		//   "path": "pages/news/detail",
+		//   "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-loadmore": "view"
+		//     }
+		//   }
+		// }
+		// {
+		// 	"path": "pages/customerManager/customerManager",
+		// 	"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-checkbox": "view",
+		// 			"u-checkbox-group": "view",
+		// 			"u-navbar": "view",
+		// 			"u-loadmore":"view"
+		// 		}
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/userPermissions/addStoreMember",
+		// 	"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-checkbox": "view",
+		// 			"u-checkbox-group": "view",
+		// 			"u-navbar": "view",
+		// 			"u-loadmore":"view",
+		// 			"u-switch": "view"
+		// 		}
+		// 	}
+		// },
+		// {
+		// 	"path" : "pages/supplier/publish-goods/goodsInfo",
+		// 	"style" :
+		// 	{
+		// 		"navigationBarTitleText" : ""
+		// 	}
+		// }
 	],
 	"subPackages": [
 		// {
@@ -336,17 +403,44 @@
 		// 	]
 		// },
 		{
-			"root": "pages/mine",
+			"root" : "pages/prizeRecord",
 			"pages": [
 				{
-					"path": "signIn",
-					"style": {
-						"navigationBarTitleText": "绛惧埌",
+					"path":"prizeRecord",
+					"style" :
+					{
+						"navigationBarTitleText" : "",
 						"componentPlaceholder": {
-							"u-icon": "view"
+							"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-empty": "view",
+							"u-loadmore":"view"
 						}
 					}
-				},
+				}
+			]
+			
+		},
+		{
+			"root": "pages/mine",
+			"pages": [
+				// {
+				//   "path": "signIn",
+				//   "style": {
+				//     "navigationBarTitleText": "绛惧埌",
+				//     "componentPlaceholder": {
+				//       "u-icon": "view"
+				//     }
+				//   }
+				// },
 				{
 					"path": "myTracks",
 					"style": {
@@ -363,118 +457,100 @@
 						}
 					}
 				},
-				{
-					"path": "myCollect",
-					"style": {
-						"navigationBarTitleText": "鏀惰棌",
-						"enablePullDownRefresh": true, //涓嬫媺鍒锋柊
-						"navigationStyle": "custom",
-						"app-plus": {
-							"scrollIndicator": "none"
-						},
-						"componentPlaceholder": {
-							"u-navbar": "view",
-							"u-tabs": "view",
-							"u-empty": "view",
-							"u-swipe-action": "view",
-							"u-image": "view",
-							"u-loading": "view",
-							"u-tag": "view"
-						}
-					}
-				},
-				{
-					"path": "distribution/list",
-					"style": {
-						"navigationBarTitleText": "鎺ㄥ箍鍒嗕剑",
-						"app-plus": {
-							//app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
-							"scrollIndicator": "none"
-						},
-						"componentPlaceholder": {
-							"u-swipe-action": "view",
-							"u-image": "view",
-							"u-modal": "view"
-						}
-					}
-				},
-				{
-					"path": "distribution/withdrawal",
-					"style": {
-						"navigationBarTitleText": "鎻愮幇",
-						"app-plus": {
-							//app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
-							"scrollIndicator": "none"
-						},
-						"componentPlaceholder": {
-							"u-input": "view"
-						}
-					}
-				},
-				{
-					"path": "distribution/join",
-					"style": {
-						"navigationBarTitleText": "鎺ㄥ箍璧勬牸鐢宠",
-						"navigationBarTextStyle": "black",
-						"app-plus": {
-							//app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
-							"scrollIndicator": "none"
-						},
-						"componentPlaceholder": {
-							"u-tabs": "view",
-							"u-form": "view",
-							"u-form-item": "view",
-							"u-input": "view",
-							"u-button": "view"
-						}
-					}
-				},
-				{
-					"path": "distribution/history",
-					"style": {
-						"navigationBarTitleText": "鎻愮幇鍘嗗彶",
-						"componentPlaceholder": {
-							"u-loadmore": "view"
-						}
-					}
-				},
-				{
-					"path": "distribution/auth",
-					"style": {
-						"navigationBarTitleText": "浼氬憳瀹炲悕璁よ瘉",
-						"componentPlaceholder": {
-							"u-form": "view",
-							"u-form-item": "view",
-							"u-input": "view",
-							"u-button": "view"
-						}
-					}
-				},
-				{
-					"path": "distribution/achievement",
-					"style": {
-						"navigationBarTitleText": "鎴戠殑鍒嗛攢涓氱哗"
-					}
-				},
-				{
-					"path": "distribution/home",
-					"style": {
-						"navigationBarTitleText": "鎺ㄥ箍鍒嗕剑",
-						"componentPlaceholder": {
-							"u-icon": "view"
-						}
-					}
-				},
+				// {
+				//   "path": "distribution/list",
+				//   "style": {
+				//     "navigationBarTitleText": "鎺ㄥ箍鍒嗕剑",
+				//     "app-plus": {
+				//       //app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
+				//       "scrollIndicator": "none"
+				//     },
+				//     "componentPlaceholder": {
+				//       "u-swipe-action": "view",
+				//       "u-image": "view",
+				//       "u-modal": "view"
+				//     }
+				//   }
+				// },
+				// {
+				//   "path": "distribution/withdrawal",
+				//   "style": {
+				//     "navigationBarTitleText": "鎻愮幇",
+				//     "app-plus": {
+				//       //app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
+				//       "scrollIndicator": "none"
+				//     },
+				//     "componentPlaceholder": {
+				//       "u-input": "view"
+				//     }
+				//   }
+				// },
+				// {
+				//   "path": "distribution/join",
+				//   "style": {
+				//     "navigationBarTitleText": "鎺ㄥ箍璧勬牸鐢宠",
+				//     "navigationBarTextStyle": "black",
+				//     "app-plus": {
+				//       //app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
+				//       "scrollIndicator": "none"
+				//     },
+				//     "componentPlaceholder": {
+				//       "u-tabs": "view",
+				//       "u-form": "view",
+				//       "u-form-item": "view",
+				//       "u-input": "view",
+				//       "u-button": "view"
+				//     }
+				//   }
+				// },
+				// {
+				//   "path": "distribution/history",
+				//   "style": {
+				//     "navigationBarTitleText": "鎻愮幇鍘嗗彶",
+				//     "componentPlaceholder": {
+				//       "u-loadmore": "view"
+				//     }
+				//   }
+				// },
+				// {
+				//   "path": "distribution/auth",
+				//   "style": {
+				//     "navigationBarTitleText": "浼氬憳瀹炲悕璁よ瘉",
+				//     "componentPlaceholder": {
+				//       "u-form": "view",
+				//       "u-form-item": "view",
+				//       "u-input": "view",
+				//       "u-button": "view"
+				//     }
+				//   }
+				// },
+				// {
+				//   "path": "distribution/achievement",
+				//   "style": {
+				//     "navigationBarTitleText": "鎴戠殑鍒嗛攢涓氱哗"
+				//   }
+				// },
+				// {
+				//   "path": "distribution/home",
+				//   "style": {
+				//     "navigationBarTitleText": "鎺ㄥ箍鍒嗕剑",
+				//     "componentPlaceholder": {
+				//       "u-icon": "view"
+				//     }
+				//   }
+				// },
 				{
 					"path": "deposit/index",
 					"style": {
-						"navigationStyle": "custom"
+						// "navigationStyle": "custom"
+						"navigationBarTitleText": "棰勫瓨娆惧垪琛�"
 					}
 				},
 				{
 					"path": "deposit/operation",
 					"style": {
-						"navigationStyle": "custom"
+						"navigationBarTitleText": "浣欓"
+						// "navigationStyle": "custom"
 					}
 				},
 				{
@@ -483,12 +559,12 @@
 						"navigationBarTitleText": "鍏呭�奸噾棰�"
 					}
 				},
-				{
-					"path": "deposit/withdrawal",
-					"style": {
-						"navigationBarTitleText": "鎻愮幇閲戦"
-					}
-				},
+				// {
+				//   "path": "deposit/withdrawal",
+				//   "style": {
+				//     "navigationBarTitleText": "鎻愮幇閲戦"
+				//   }
+				// },
 				{
 					"path": "deposit/info",
 					"style": {
@@ -507,13 +583,13 @@
 						}
 					}
 				},
-				{
-					"path": "address/storeAddress",
-					"style": {
-						"enablePullDownRefresh": true,
-						"navigationBarTitleText": "鑷彁鐐�"
-					}
-				},
+				// {
+				//   "path": "address/storeAddress",
+				//   "style": {
+				//     "enablePullDownRefresh": true,
+				//     "navigationBarTitleText": "鑷彁鐐�"
+				//   }
+				// },
 				{
 					"path": "address/add",
 					"style": {
@@ -540,24 +616,24 @@
 						}
 					}
 				},
-				{
-					"path": "set/versionFunctionList",
-					"style": {
-						"navigationBarTitleText": "鍔熻兘浠嬬粛"
-					}
-				},
-				{
-					"path": "set/securityCenter/fingerLogin",
-					"style": {
-						"navigationBarTitleText": "鎸囩汗鐧诲綍"
-					}
-				},
-				{
-					"path": "set/securityCenter/faceLogin",
-					"style": {
-						"navigationBarTitleText": "闈㈠鐧诲綍"
-					}
-				},
+				// {
+				//   "path": "set/versionFunctionList",
+				//   "style": {
+				//     "navigationBarTitleText": "鍔熻兘浠嬬粛"
+				//   }
+				// },
+				// {
+				//   "path": "set/securityCenter/fingerLogin",
+				//   "style": {
+				//     "navigationBarTitleText": "鎸囩汗鐧诲綍"
+				//   }
+				// },
+				// {
+				//   "path": "set/securityCenter/faceLogin",
+				//   "style": {
+				//     "navigationBarTitleText": "闈㈠鐧诲綍"
+				//   }
+				// },
 				{
 					"path": "set/securityCenter/editPassword",
 					"style": {
@@ -569,13 +645,21 @@
 					"path": "set/securityCenter/bindMobile",
 					"style": {
 						"navigationBarTitleText": "缁戝畾鎵嬫満鍙�",
-						"app-plus": {}
+						"app-plus": {},
+						"componentPlaceholder": {
+							"u-form": "view",
+							"u-form-item": "view",
+							"u-input": "view",
+							"u-verification-code": "view",
+							"u-icon": "view"
+						}
 					}
 				},
 				{
 					"path": "im/list",
 					"style": {
-						"navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
+						"navigationStyle": "custom",
+						// 闅愯棌绯荤粺瀵艰埅鏍�
 						"enablePullDownRefresh": true,
 						"app-plus": {}
 					}
@@ -583,9 +667,15 @@
 				{
 					"path": "im/index",
 					"style": {
-						"navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
+						"navigationStyle": "custom",
+						// 闅愯棌绯荤粺瀵艰埅鏍�
 						"enablePullDownRefresh": true,
-						"app-plus": {}
+						"app-plus": {},
+						"componentPlaceholder": {
+							"u-navbar": "view",
+							"u-image": "view",
+							"u-avatar": "view"
+						}
 					}
 				},
 				{
@@ -598,12 +688,12 @@
 						}
 					}
 				},
-				{
-					"path": "set/securityCenter/securityCenter",
-					"style": {
-						"navigationBarTitleText": "瀹夊叏涓績"
-					}
-				},
+				// {
+				//   "path": "set/securityCenter/securityCenter",
+				//   "style": {
+				//     "navigationBarTitleText": "瀹夊叏涓績"
+				//   }
+				// },
 				{
 					"path": "set/editionIntro",
 					"style": {
@@ -633,14 +723,12 @@
 						"app-plus": {
 							"titleNView": {
 								"padding-right": "12",
-								"buttons": [
-									{
-										"text": "淇濆瓨",
-										"fontSize": "16",
-										"width": "auto",
-										"color": "#FFFFFF"
-									}
-								]
+								"buttons": [{
+									"text": "淇濆瓨",
+									"fontSize": "16",
+									"width": "auto",
+									"color": "#FFFFFF"
+								}]
 							}
 						},
 						"componentPlaceholder": {
@@ -649,7 +737,8 @@
 							"u-input": "view",
 							"u-radio-group": "view",
 							"u-radio": "view",
-							"u-picker": "view"
+							"u-picker": "view",
+							"u-icon": "view"
 						}
 					}
 				},
@@ -672,24 +761,24 @@
 						}
 					}
 				},
-				{
-					"path": "msgTips/main",
-					"style": {
-						"navigationBarTitleText": "娑堟伅涓績"
-					}
-				},
-				{
-					"path": "msgTips/sysMsg/index",
-					"style": {
-						"navigationBarTitleText": "绯荤粺娑堟伅"
-					}
-				},
-				{
-					"path": "msgTips/serviceMsg/index",
-					"style": {
-						"navigationBarTitleText": "瀹㈡湇璁板綍"
-					}
-				},
+				// {
+				//   "path": "msgTips/main",
+				//   "style": {
+				//     "navigationBarTitleText": "娑堟伅涓績"
+				//   }
+				// },
+				// {
+				//   "path": "msgTips/sysMsg/index",
+				//   "style": {
+				//     "navigationBarTitleText": "绯荤粺娑堟伅"
+				//   }
+				// },
+				// {
+				//   "path": "msgTips/serviceMsg/index",
+				//   "style": {
+				//     "navigationBarTitleText": "瀹㈡湇璁板綍"
+				//   }
+				// },
 				{
 					"path": "msgTips/packageMsg/index",
 					"style": {
@@ -699,14 +788,21 @@
 				{
 					"path": "msgTips/packageMsg/logisticsDetail",
 					"style": {
-						"navigationBarTitleText": "璁㈠崟璺熻釜"
+						"navigationBarTitleText": "璁㈠崟璺熻釜",
+						"componentPlaceholder": {
+							"u-time-line": "view",
+							"u-time-line-item": "view",
+							"u-icon": "view",
+							"u-empty": "view"
+						}
 					}
 				},
 				{
 					"path": "activity/detail",
 					"style": {
 						"navigationBarTitleText": "娲诲姩璇︽儏",
-						"enablePullDownRefresh": true, //涓嬫媺鍒锋柊
+						"enablePullDownRefresh": true,
+						//涓嬫媺鍒锋柊
 						"componentPlaceholder": {
 							"u-form": "view",
 							"u-form-item": "view",
@@ -725,7 +821,8 @@
 					"path": "activity/myActivity",
 					"style": {
 						"navigationBarTitleText": "鎴戠殑娲诲姩",
-						"enablePullDownRefresh": true, //涓嬫媺鍒锋柊
+						"enablePullDownRefresh": true,
+						//涓嬫媺鍒锋柊
 						"componentPlaceholder": {
 							"u-form": "view",
 							"u-form-item": "view",
@@ -741,10 +838,33 @@
 					}
 				},
 				{
+					"path": "activity/applyActivityList",
+					"style": {
+						"navigationBarTitleText": "娲诲姩鐢宠",
+						"enablePullDownRefresh": true,
+						//涓嬫媺鍒锋柊
+						"componentPlaceholder": {
+							"u-empty": "view",
+							"u-loadmore": "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"
+						}
+					}
+				},
+				{
 					"path": "activity/reportActivity",
 					"style": {
 						"navigationBarTitleText": "娲诲姩",
-						"enablePullDownRefresh": true, //涓嬫媺鍒锋柊
+						"enablePullDownRefresh": true,
+						//涓嬫媺鍒锋柊
+						"navigationStyle": "custom",
+						// 闅愯棌椤堕儴瀵艰埅鏍�
 						"componentPlaceholder": {
 							"u-form": "view",
 							"u-form-item": "view",
@@ -756,15 +876,168 @@
 							"u-navbar": "view",
 							"u-button": "view",
 							"u-image": "view",
-							"u-loadmore": "view"
+							"u-loadmore": "view",
+							"u-empty": "view"
+						}
+					}
+				},
+				// {
+				//   "path": "myCollect/myCollect",
+				//   "style": {
+				//     "navigationBarTitleText": "鎴戠殑鏀惰棌",
+				//     "enablePullDownRefresh": true,
+				//     //涓嬫媺鍒锋柊
+				//     "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": "myAttention",
+					"style": {
+						"navigationBarTitleText": "鍏虫敞鍒楄〃",
+						"enablePullDownRefresh": true
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/product",
+			// 鍏抽敭閰嶇疆
+			"pages": [{
+					"path": "shopPage",
+					"style": {
+						"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": "myCollect/myCollect",
+					"path": "m-goods-list/list",
 					"style": {
-						"navigationBarTitleText": "鎴戠殑鏀惰棌",
-						"enablePullDownRefresh": true, //涓嬫媺鍒锋柊
+						"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": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "licencePhoto",
+					"style": {
+						"navigationBarTitleText": "钀ヤ笟鎵х収",
+						"componentPlaceholder": {
+							"u-image": "view"
+						}
+					}
+				},
+				{
+					"path": "shopPageGoods",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom",
 						"componentPlaceholder": {
 							"u-icon": "view",
 							"u-button": "view",
@@ -778,38 +1051,6 @@
 							"u-image": "view",
 							"u-loadmore": "view"
 						}
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/product",
-			"pages": [
-				{
-					"path": "shopPage",
-					"style": {
-						"navigationBarTitleText": "",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "shopList",
-					"style": {
-						"navigationBarTitleText": "",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "licencePhoto",
-					"style": {
-						"navigationBarTitleText": "钀ヤ笟鎵х収"
-					}
-				},
-				{
-					"path": "shopPageGoods",
-					"style": {
-						"navigationBarTitleText": "",
-						"navigationStyle": "custom"
 					}
 				},
 				{
@@ -831,7 +1072,8 @@
 						"componentPlaceholder": {
 							"u-icon": "view",
 							"u-navbar": "view",
-							"u-popup": "view"
+							"u-popup": "view",
+							"popups": "view"
 						}
 					}
 				},
@@ -924,16 +1166,24 @@
 						}
 					}
 				},
-				{ //鍟嗗搧璇勪环
+				{
+					//鍟嗗搧璇勪环
 					"path": "comment",
 					"navigationStyle": "custom",
 					"style": {
 						"navigationBarTitleText": "鍟嗗搧璇勪环",
 						//app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
-						"scrollIndicator": "none"
+						"scrollIndicator": "none",
+						"componentPlaceholder": {
+							"u-empty": "view",
+							"u-loadmore": "view",
+							"u-image": "view",
+							"u-empty": "view"
+						}
 					}
 				},
-				{ // 瀹㈡湇
+				{
+					// 瀹㈡湇
 					"path": "customerservice/index",
 					"style": {
 						"navigationBarTitleText": "瀹㈡湇",
@@ -948,16 +1198,13 @@
 		},
 		{
 			"root": "pages/floor",
-			"pages": [
-				{
-					"path": "empty"
-				}
-			]
+			"pages": [{
+				"path": "empty"
+			}]
 		},
 		{
 			"root": "pages/video",
-			"pages": [
-				{
+			"pages": [{
 					"path": "home-page",
 					"style": {
 						"navigationBarTitleText": "TA鐨勪富椤�"
@@ -982,21 +1229,25 @@
 					}
 				},
 				{
-					"path" : "video-goods-detail",
-					"style" : 
-					{
-						"navigationBarTitleText" : "瑙嗛鎺ㄨ崘鍟嗗搧",
+					"path": "video-goods-detail",
+					"style": {
+						"navigationBarTitleText": "瑙嗛鎺ㄨ崘鍟嗗搧",
 						"componentPlaceholder": {
 							"u-button": "view"
 						}
+					}
+				},
+				{
+					"path": "video-search",
+					"style": {
+						"navigationBarTitleText": ""
 					}
 				}
 			]
 		},
 		{
 			"root": "pages/passport",
-			"pages": [
-				{
+			"pages": [{
 					"path": "login",
 					"style": {
 						"navigationBarTitleText": "",
@@ -1016,7 +1267,7 @@
 				{
 					"path": "entry/seller/index",
 					"style": {
-						"navigationBarTitleText": "搴楅摵鍏ラ┗",
+						"navigationBarTitleText": "渚涘簲鍟嗗叆椹�",
 						"navigationStyle": "custom",
 						"componentPlaceholder": {
 							"u-navbar": "view"
@@ -1103,12 +1354,12 @@
 		},
 		{
 			"root": "pages/promotion",
-			"pages": [
-				{
+			"pages": [{
 					"path": "seckill",
 					"style": {
 						"navigationBarTitleText": "闄愭椂鎶㈣喘",
-						"navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
+						"navigationStyle": "custom",
+						// 闅愯棌绯荤粺瀵艰埅鏍�
 						"navigationBarTextStyle": "black",
 						"app-plus": {
 							"titleNView": {
@@ -1121,7 +1372,8 @@
 					"path": "joinGroup",
 					"style": {
 						"navigationBarTitleText": "鎷煎洟娲诲姩",
-						"navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
+						"navigationStyle": "custom",
+						// 闅愯棌绯荤粺瀵艰埅鏍�
 						"navigationBarTextStyle": "black",
 						"app-plus": {
 							// 灏嗗洖寮瑰睘鎬у叧鎺�
@@ -1177,8 +1429,7 @@
 		},
 		{
 			"root": "pages/cart",
-			"pages": [
-				{
+			"pages": [{
 					"path": "coupon/myCoupon",
 					"style": {
 						"navigationBarTitleText": "鎴戠殑浼樻儬鍒�",
@@ -1200,7 +1451,11 @@
 				{
 					"path": "coupon/index",
 					"style": {
-						"navigationBarTitleText": "浼樻儬鍒�"
+						"navigationBarTitleText": "浼樻儬鍒�",
+						"componentPlaceholder": {
+							"u-tabs": "view",
+							"u-empty": "view"
+						}
 					}
 				},
 				{
@@ -1218,7 +1473,13 @@
 					"style": {
 						"navigationBarTitleText": "鏀粯璁㈠崟",
 						"app-plus": {
-							"popGesture": "none" //绂佹渚ф粦閫�鍑�
+							"popGesture": "none"
+							//绂佹渚ф粦閫�鍑�
+						},
+						"componentPlaceholder": {
+							"u-count-down": "view",
+							"u-row": "view",
+							"u-icon": "view"
 						}
 					}
 				},
@@ -1226,10 +1487,12 @@
 					"path": "payment/success",
 					"style": {
 						"navigationBarTitleText": "鏀粯鎴愬姛",
-						"navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
+						"navigationStyle": "custom",
+						// 闅愯棌绯荤粺瀵艰埅鏍�
 						"navigationBarTextStyle": "white",
 						"app-plus": {
-							"popGesture": "none", //绂佹渚ф粦閫�鍑�
+							"popGesture": "none",
+							//绂佹渚ф粦閫�鍑�
 							"titleNView": false
 						}
 					}
@@ -1245,8 +1508,7 @@
 		},
 		{
 			"root": "pages/order",
-			"pages": [
-				{
+			"pages": [{
 					"path": "complain/complain",
 					"style": {
 						"navigationBarTitleText": "璁㈠崟鍟嗗搧鎶曡瘔"
@@ -1312,7 +1574,18 @@
 				{
 					"path": "orderDetail",
 					"style": {
-						"navigationBarTitleText": "璁㈠崟璇︽儏"
+						"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"
+						}
 					}
 				},
 				{
@@ -1324,13 +1597,24 @@
 				{
 					"path": "evaluate/evaluateDetail",
 					"style": {
-						"navigationBarTitleText": "璇勪环璇︽儏"
+						"navigationBarTitleText": "璇勪环璇︽儏",
+						"componentPlaceholder": {
+							"u-image": "view"
+						}
 					}
 				},
 				{
 					"path": "evaluate/releaseEvaluate",
 					"style": {
-						"navigationBarTitleText": "鍙戝竷璇勪环"
+						"navigationBarTitleText": "鍙戝竷璇勪环",
+						"componentPlaceholder": {
+							"u-icon": "view",
+							"u-image": "view",
+							"u-input": "view",
+							"u-upload": "view",
+							"u-rate": "view",
+							"u-toast": "view"
+						}
 					}
 				},
 				{
@@ -1349,32 +1633,43 @@
 				{
 					"path": "afterSales/applyProgress",
 					"style": {
-						"navigationBarTitleText": "鍞悗鏈嶅姟"
+						"navigationBarTitleText": "鍞悗鏈嶅姟",
+						"componentPlaceholder": {
+							"u-time-line": "view",
+							"u-time-line-item": "view",
+							"u-empty": "view"
+						}
 					}
 				},
 				{
 					"path": "afterSales/applyDetail",
 					"style": {
-						"navigationBarTitleText": "鍞悗鏈嶅姟"
+						"navigationBarTitleText": "鍞悗鏈嶅姟",
+						"componentPlaceholder": {
+							"u-icon": "view",
+							"u-image": "view"
+						}
 					}
 				},
 				{
 					"path": "afterSales/applySuccess",
 					"style": {
 						"navigationBarTitleText": "鎻愪氦鎴愬姛",
+						"componentPlaceholder": {
+							"u-icon": "view",
+							"u-button": "view"
+						},
 						"app-plus": {
 							"bounce": "none",
 							"titleNView": {
 								"titleColor": "#FFFFFF",
-								"buttons": [
-									{
-										"text": "瀹屾垚",
-										"fontSize": "14",
-										"color": "#FFFFFF",
-										"width": "36px"
-										// "background": "rgba(0,0,0,0)"
-									}
-								]
+								"buttons": [{
+									"text": "瀹屾垚",
+									"fontSize": "14",
+									"color": "#FFFFFF",
+									"width": "36px"
+									// "background": "rgba(0,0,0,0)"
+								}]
 							}
 						}
 					}
@@ -1385,13 +1680,28 @@
 				{
 					"path": "afterSales/afterSalesSelect",
 					"style": {
-						"navigationBarTitleText": "鐢宠鍞悗"
+						"navigationBarTitleText": "鐢宠鍞悗",
+						"componentPlaceholder": {
+							"u-image": "view",
+							"u-icon": "view"
+						}
 					}
 				},
 				{
 					"path": "afterSales/afterSalesDetail",
 					"style": {
-						"navigationBarTitleText": "鐢宠鍞悗"
+						"navigationBarTitleText": "鐢宠鍞悗",
+						"componentPlaceholder": {
+							"u-form": "view",
+							"u-image": "view",
+							"u-number-box": "view",
+							"u-form-item": "view",
+							"u-input": "view",
+							"u-upload": "view",
+							"u-button": "view",
+							"u-select": "view",
+							"u-toast": "view"
+						}
 					}
 				},
 				{
@@ -1431,21 +1741,370 @@
 			"pages": [{
 				"path": "healthVideo",
 				"style": {
-					"navigationBarTitleText": "澶у仴搴�"
+					"navigationBarTitleText": "澶у仴搴�",
+					"navigationStyle": "custom"
 				}
 			}]
+		},
+		{
+			"root": "pages/tabbar/home",
+			"pages": [{
+				"path": "web-view",
+				"style": {}
+			}]
+		},
+		{
+			"root": "pages/kitchen",
+			"pages": [{
+				"path": "KitchenVideo",
+				"style": {
+					"navigationBarTitleText": "绁炲帹",
+					"navigationStyle": "custom"
+					// 闅愯棌绯荤粺瀵艰埅鏍�
+				}
+			}]
+		},
+		{
+			"root": "pages/prize",
+			"pages": [{
+				"path": "PrizeDetail/PrizeDetail",
+				"style": {
+					"navigationBarTitleText": "鎶藉娲诲姩",
+					"enablePullDownRefresh": false
+				}
+			} ]
+		},
+		{
+			"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",
+				"style": {
+					"navigationBarTextStyle": "white",
+					"enablePullDownRefresh": true,
+					"navigationStyle": "custom",
+					"componentPlaceholder": {
+						"u-icon": "view",
+						"u-row": "view",
+						"u-col": "view"
+					}
+				}
+			}]
+		},
+		{
+			"root": "pages/supplier/suppler-order",
+			"pages": [{
+					"path": "suppler-order",
+					"style": {
+						"navigationBarTitleText": "渚涘簲鍟嗙",
+						// "navigationStyle": "custom"
+						"componentPlaceholder": {
+							"u-empty": "view",
+							"u-image": "view"
+						}
+					}
+				},
+				{
+					"path": "order-detail",
+					"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-upload": "view"
+						}
+						// "navigationStyle": "custom"
+
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/supplier/publish-goods",
+			"pages": [{
+					"path": "publishGoods",
+					"style": {
+						"enablePullDownRefresh": true,
+						"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-upload": "view"
+						}
+					}
+				},
+				{
+					"path": "goodsInfo",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/goods-manager",
+			"pages": [{
+					"path": "goodsList/goodsList",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "鍟嗗搧鍒楄〃",
+						"componentPlaceholder": {
+							"u-icon": "view",
+							"u-button": "view",
+							"u-form": "view",
+							"u-form-item": "view",
+							"u-input": "view",
+							"u-popup": "view",
+							"u-search": "view"
+						}
+					}
+				},
+				{
+					"path": "updateSkus/updateSkus",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "璋冩暣搴撳瓨",
+						"componentPlaceholder": {
+							"u-icon": "view",
+							"u-button": "view",
+							"u-form": "view",
+							"u-form-item": "view",
+							"u-input": "view",
+							"u-popup": "view"
+						}
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/news",
+			"pages": [{
+					"path": "news",
+					"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-loadmore": "view",
+							"u-empty": "view"
+						}
+					}
+				},
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "蹇璇︽儏",
+						"componentPlaceholder": {
+							"u-icon": "view",
+							"u-button": "view",
+							"u-form": "view",
+							"u-form-item": "view",
+							"u-input": "view",
+							"u-toast": "view",
+							"u-search": "view",
+							"u-loading": "view",
+							"u-navbar": "view",
+							"u-loadmore": "view"
+						}
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/userPermissions",
+			"pages": [{
+					"path": "addStoreMember",
+					"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-checkbox": "view",
+							"u-checkbox-group": "view",
+							"u-navbar": "view",
+							"u-loadmore": "view",
+							"u-switch": "view"
+						}
+					}
+				},
+				{
+					"path": "userPermissions",
+					"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-loadmore": "view"
+						}
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/commodity-square",
+			"pages": [{
+					"path": "commoditySquare",
+					"style": {
+						"navigationBarTitleText": "鍟嗗搧骞垮満",
+						"navigationStyle": "custom",
+						// 闅愯棌绯荤粺瀵艰埅鏍�
+						"navigationBarTextStyle": "black",
+						// "disableScroll": true,
+						"bounce": "none",
+						"scrollIndicator": "none",
+						"componentPlaceholder": {
+							"u-navbar": "view",
+							"u-search": "view",
+							"u-image": "view",
+							"u-icon": "view"
+						}
+					}
+				},
+				{
+					"path": "coups-goods-list",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "浼樻儬鍗峰晢鍝侀〉闈�",
+						"componentPlaceholder": {
+							"u-navbar": "view",
+							"u-search": "view",
+							"u-image": "view",
+							"u-icon": "view"
+						}
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/navigation",
+			"pages": [{
+				"path": "search/searchPage",
+				"style": {
+					"navigationBarTitleText": "鎼滅储",
+					"navigationStyle": "custom",
+					"app-plus": {
+						//app椤甸潰涓嶆樉绀烘粴鍔ㄦ潯
+						"scrollIndicator": "none",
+						"bottom": "0",
+						"contentAdjust": "false",
+						"bounce": "none",
+						"safearea": {
+							"bottom": "none"
+						}
+					},
+					"componentPlaceholder": {
+						"u-navbar": "view",
+						"u-popup": "view",
+						"u-input": "view",
+						"u-back-top": "view"
+					}
+				}
+			}]
+		},
+		{
+			"root": "pages/cusbar",
+			"pages": [
+				// {
+				//   "path": "special/special",
+				//   "style": {
+				//     "navigationBarTitleText": "涓撻"
+				//   }
+				// },
+				{
+					"path": "cart/cartList",
+					"style": {
+						"navigationBarTitleText": "璐墿杞�",
+						"navigationStyle": "custom",
+						// 闅愯棌绯荤粺瀵艰埅鏍�
+						"navigationBarBackgroundColor": "#fff",
+						"enablePullDownRefresh": true,
+						//瀹炵幇涓嬫媺鍒锋柊鏍峰紡
+						"componentPlaceholder": {
+							"u-navbar": "view",
+							"u-checkbox-group": "view",
+							"u-checkbox": "view",
+							"u-swipe-action": "view",
+							"u-image": "view",
+							"u-icon": "view",
+							"u-count-down": "view",
+							"u-modal": "view",
+							"u-popup": "view",
+							"u-toast": "view"
+						}
+					}
+				},
+				{
+					"path": "video/video",
+					"style": {
+						"navigationBarTitleText": "鍙戝竷瑙嗛",
+						"enablePullDownRefresh": false,
+						"componentPlaceholder": {
+							"u-icon": "view",
+							"u-button": "view",
+							"u-form": "view",
+							"u-form-item": "view",
+							"u-input": "view",
+							"u-popup": "view",
+							"u-search": "view"
+						}
+					}
+				}
+			]
 		}
-		// ,
-		// {
-		// 	"root": "pages/commodity-square",
-		// 	"pages": [{
-		// 		"path" : "commoditySquare",
-		// 		"style" :
-		// 		{
-		// 			"navigationBarTitleText" : "鍟嗗搧骞垮満"
-		// 		}
-		// 	}]
-		// }
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -1459,50 +2118,51 @@
 			"bounce": "none"
 		}
 	},
-	"tabBar": {
-		"custom": true,
-		"color": "#666",
-		"selectedColor": "#ff573e",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"list": [
-			{
-				"pagePath": "pages/tabbar/index/home",
-				"iconPath": "static/tabbar/home.png",
-				"selectedIconPath": "static/tabbar/home-s.png",
-				"text": "棣栭〉"
-			},
-			{
-				// "pagePath": "pages/tabbar/category/category",
-				"pagePath": "pages/commodity-square/commoditySquare",
-				"iconPath": "static/tabbar/category.png",
-				"selectedIconPath": "static/tabbar/category-s.png",
-				"text": "鍟嗗煄"
-			},
-			{
-				"pagePath": "pages/tabbar/video/video",
-				"iconPath": "static/tabbar/video.png",
-				"selectedIconPath": "static/tabbar/video-selected.png"
-			},
-			{
-				"pagePath": "pages/tabbar/cart/cartList",
-				"iconPath": "static/tabbar/cart.png",
-				"selectedIconPath": "static/tabbar/cart-s.png",
-				"text": "璐墿杞�"
-			},
-			{
-				"pagePath": "pages/tabbar/user/my",
-				"iconPath": "static/tabbar/mine.png",
-				"selectedIconPath": "static/tabbar/mine-s.png",
-				"text": "鎴戠殑"
-			}
-		]
-	},
-	// #todo 涓轰粈涔堣娉ㄩ噴condition涓嬩唬鐮侊紵 
+	// "tabBar": {
+	// 	"custom": true,
+	// 	"color": "#666",
+	// 	"selectedColor": "#ff573e",
+	// 	"borderStyle": "black",
+	// 	"backgroundColor": "#ffffff",
+	// 	"list": [
+	// 		{
+	// 			"pagePath": "pages/tabbar/index/home",
+	// 			"iconPath": "static/tabbar/home.png",
+	// 			"selectedIconPath": "static/tabbar/home-s.png",
+	// 			"text": "棣栭〉"
+	// 		},
+	// 		{
+	// 			// "pagePath": "pages/tabbar/category/category",
+	// 			"pagePath": "pages/kitchen/KitchenVideo",
+	// 			"iconPath": "static/tabbar/category.png",
+	// 			"selectedIconPath": "static/tabbar/category-s.png",
+	// 			"text": "绁炲帹"
+	// 		},
+	// 		{
+	// 			"pagePath": "pages/tabbar/video/video",
+	// 			"iconPath": "static/tabbar/video.png",
+	// 			"selectedIconPath": "static/tabbar/video-selected.png"
+	// 		},
+	// 		{
+	// 			"pagePath": "pages/tabbar/cart/cartList",
+	// 			"iconPath": "static/tabbar/cart.png",
+	// 			"selectedIconPath": "static/tabbar/cart-s.png",
+	// 			"text": "璐墿杞�"
+	// 		},
+	// 		{
+	// 			"pagePath": "pages/tabbar/user/my",
+	// 			"iconPath": "static/tabbar/mine.png",
+	// 			"selectedIconPath": "static/tabbar/mine-s.png",
+	// 			"text": "鎴戠殑"
+	// 		}
+	// 	]
+	// },
+	// #todo 涓轰粈涔堣娉ㄩ噴condition涓嬩唬鐮侊紵
 	// IOS plus.runtime.arguments 娣诲姞 condition鑺傜偣鍚庯紝 妗嗘灦浼氫慨鏀� runtime.arguments
 	// 浼氬奖鍝嶄粈涔堝姛鑳斤紵
 	//    -鍦╤5涓敜閱抋pp浼氫竴鐩磋繑鍥為粯璁ゅ�� {"name":"","path":"","query":"","id":0}
-	"condition": { //妯″紡閰嶇疆锛屼粎寮�鍙戞湡闂寸敓鏁�   
+	"condition": {
+		//妯″紡閰嶇疆锛屼粎寮�鍙戞湡闂寸敓鏁�
 		// "current": 0, //褰撳墠婵�娲荤殑妯″紡(list 鐨勭储寮曢」)
 		// "list": [{
 		// 	"name": "", //妯″紡鍚嶇О

--
Gitblit v1.8.0