diff --git a/packageA/search/index.vue b/packageA/search/index.vue
new file mode 100644
index 0000000..dee3f41
--- /dev/null
+++ b/packageA/search/index.vue
@@ -0,0 +1,11 @@
+<template>
+	<s-layout title="搜索结果" navbar="inner" :bgStyle="{ color: 'rgb()' }">
+		<view>搜索页面</view>
+	</s-layout>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 87060b3..e3bb3d2 100644
--- a/pages.json
+++ b/pages.json
@@ -1,763 +1,779 @@
 {
-  "easycom": {
-    "autoscan": true,
-    "custom": {
-      "^s-(.*)": "@/sheep/components/s-$1/s-$1.vue",
-      "^su-(.*)": "@/sheep/ui/su-$1/su-$1.vue"
-    }
-  },
-  "pages": [
-    {
-      "path": "pages/index/index",
-      "aliasPath": "/",
-      "style": {
-        "navigationBarTitleText": "首页",
-        "enablePullDownRefresh": true
-      },
-      "meta": {
-        "auth": false,
-        "sync": true,
-        "title": "首页",
-        "group": "商城"
-      }
-    },
-    {
-      "path": "pages/index/user",
-      "style": {
-        "navigationBarTitleText": "个人中心",
-        "enablePullDownRefresh": true
-      },
-      "meta": {
-        "sync": true,
-        "title": "个人中心",
-        "group": "商城"
-      }
-    },
-    {
-      "path": "pages/index/category",
-      "style": {
-        "navigationBarTitleText": "商品分类"
-      },
-      "meta": {
-        "sync": true,
-        "title": "商品分类",
-        "group": "商城"
-      }
-    },
-    {
-      "path": "pages/index/cart",
-      "style": {
-        "navigationBarTitleText": "购物车"
-      },
-      "meta": {
-        "sync": true,
-        "title": "购物车",
-        "group": "商城"
-      }
-    },
-    {
-      "path": "pages/index/login",
-      "style": {
-        "navigationBarTitleText": "登录"
-      }
-    },
-    {
-      "path": "pages/index/search",
-      "style": {
-        "navigationBarTitleText": "搜索"
-      },
-      "meta": {
-        "sync": true,
-        "title": "搜索",
-        "group": "商城"
-      }
-    },
-    {
-      "path": "pages/index/page",
-      "style": {
-        "navigationBarTitleText": ""
-      },
-      "meta": {
-        "auth": false,
-        "sync": true,
-        "title": "自定义页面",
-        "group": "商城"
-      }
-    }
-  ],
-  "subPackages": [
-    {
-      "root": "pages/goods",
-      "pages": [
-        {
-          "path": "index",
-          "style": {
-            "navigationBarTitleText": "商品详情"
-          },
-          "meta": {
-            "sync": true,
-            "title": "普通商品",
-            "group": "商品"
-          }
-        },
-        {
-          "path": "groupon",
-          "style": {
-            "navigationBarTitleText": "拼团商品"
-          },
-          "meta": {
-            "sync": true,
-            "title": "拼团商品",
-            "group": "商品"
-          }
-        },
+	"easycom": {
+		"autoscan": true,
+		"custom": {
+			"^s-(.*)": "@/sheep/components/s-$1/s-$1.vue",
+			"^su-(.*)": "@/sheep/ui/su-$1/su-$1.vue"
+		}
+	},
+	"pages": [{
+			"path": "pages/index/index",
+			"aliasPath": "/",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true
+			},
+			"meta": {
+				"auth": false,
+				"sync": true,
+				"title": "首页",
+				"group": "商城"
+			}
+		},
+		{
+			"path": "pages/index/user",
+			"style": {
+				"navigationBarTitleText": "个人中心",
+				"enablePullDownRefresh": true
+			},
+			"meta": {
+				"sync": true,
+				"title": "个人中心",
+				"group": "商城"
+			}
+		},
+		{
+			"path": "pages/index/category",
+			"style": {
+				"navigationBarTitleText": "商品分类"
+			},
+			"meta": {
+				"sync": true,
+				"title": "商品分类",
+				"group": "商城"
+			}
+		},
+		{
+			"path": "pages/index/cart",
+			"style": {
+				"navigationBarTitleText": "发布"
+			},
+			"meta": {
+				"sync": true,
+				"title": "购物车",
+				"group": "商城"
+			}
+		},
+		{
+			"path": "pages/index/fabu",
+			"style": {
+				"navigationBarTitleText": "发布"
+			},
+			"meta": {
+				"sync": true,
+				"title": "购物车",
+				"group": "商城"
+			}
+		},
+		{
+			"path": "pages/index/login",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
+		},
+		{
+			"path": "pages/index/search",
+			"style": {
+				"navigationBarTitleText": "搜索"
+			},
+			"meta": {
+				"sync": true,
+				"title": "搜索",
+				"group": "商城"
+			}
+		},
+		{
+			"path": "pages/index/page",
+			"style": {
+				"navigationBarTitleText": ""
+			},
+			"meta": {
+				"auth": false,
+				"sync": true,
+				"title": "自定义页面",
+				"group": "商城"
+			}
+		}
+	],
+	"subPackages": [{
+			"root": "pages/goods",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "商品详情"
+					},
+					"meta": {
+						"sync": true,
+						"title": "普通商品",
+						"group": "商品"
+					}
+				},
+				{
+					"path": "groupon",
+					"style": {
+						"navigationBarTitleText": "拼团商品"
+					},
+					"meta": {
+						"sync": true,
+						"title": "拼团商品",
+						"group": "商品"
+					}
+				},
 
-        {
-          "path": "seckill",
-          "style": {
-            "navigationBarTitleText": "秒杀商品"
-          },
-          "meta": {
-            "sync": true,
-            "title": "秒杀商品",
-            "group": "商品"
-          }
-        },
+				{
+					"path": "seckill",
+					"style": {
+						"navigationBarTitleText": "秒杀商品"
+					},
+					"meta": {
+						"sync": true,
+						"title": "秒杀商品",
+						"group": "商品"
+					}
+				},
 
-        {
-          "path": "score",
-          "style": {
-            "navigationBarTitleText": "积分商品"
-          },
-          "meta": {
-            "sync": true,
-            "title": "积分商品",
-            "group": "商品"
-          }
-        },
-        {
-          "path": "list",
-          "style": {
-            "navigationBarTitleText": "商品列表"
-          },
-          "meta": {
-            "sync": true,
-            "title": "商品列表",
-            "group": "商品"
-          }
-        },
-        {
-          "path": "comment/add",
-          "style": {
-            "navigationBarTitleText": "评价商品"
-          },
-          "meta": {
-            "auth": true
-          }
-        },
-        {
-          "path": "comment/list",
-          "style": {
-            "navigationBarTitleText": "商品评价"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/order",
-      "pages": [
-        {
-          "path": "detail",
-          "style": {
-            "navigationBarTitleText": "订单详情"
-          },
-          "meta": {
-            "auth": true,
-            "title": "订单详情"
-          }
-        },
-        {
-          "path": "confirm",
-          "style": {
-            "navigationBarTitleText": "确认订单"
-          },
-          "meta": {
-            "auth": true,
-            "title": "确认订单"
-          }
-        },
-        {
-          "path": "list",
-          "style": {
-            "navigationBarTitleText": "我的订单",
-            "enablePullDownRefresh": true
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "用户订单",
-            "group": "订单中心"
-          }
-        },
-        {
-          "path": "invoice",
-          "style": {
-            "navigationBarTitleText": "发票详情"
-          },
-          "meta": {
-            "auth": true,
-            "title": "发票详情"
-          }
-        },
-        {
-          "path": "dispatch/content",
-          "style": {
-            "navigationBarTitleText": "发货内容"
-          },
-          "meta": {
-            "auth": true,
-            "title": "发货内容"
-          }
-        },
-        {
-          "path": "aftersale/apply",
-          "style": {
-            "navigationBarTitleText": "申请售后"
-          },
-          "meta": {
-            "auth": true,
-            "title": "申请售后"
-          }
-        },
-        {
-          "path": "aftersale/list",
-          "style": {
-            "navigationBarTitleText": "售后列表"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "售后订单",
-            "group": "订单中心"
-          }
-        },
-        {
-          "path": "aftersale/detail",
-          "style": {
-            "navigationBarTitleText": "售后详情"
-          },
-          "meta": {
-            "auth": true,
-            "title": "售后详情"
-          }
-        },
-        {
-          "path": "aftersale/log",
-          "style": {
-            "navigationBarTitleText": "售后进度"
-          },
-          "meta": {
-            "auth": true,
-            "title": "售后进度"
-          }
-        },
-        {
-          "path": "express/log",
-          "style": {
-            "navigationBarTitleText": "物流轨迹"
-          },
-          "meta": {
-            "auth": true,
-            "title": "物流轨迹"
-          }
-        },
-        {
-          "path": "express/list",
-          "style": {
-            "navigationBarTitleText": "订单包裹"
-          },
-          "meta": {
-            "auth": true,
-            "title": "订单包裹"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/user",
-      "pages": [
-        {
-          "path": "info",
-          "style": {
-            "navigationBarTitleText": "我的信息"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "用户信息",
-            "group": "用户中心"
-          }
-        },
-        {
-          "path": "goods-collect",
-          "style": {
-            "navigationBarTitleText": "我的收藏"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "商品收藏",
-            "group": "用户中心"
-          }
-        },
-        {
-          "path": "goods-log",
-          "style": {
-            "navigationBarTitleText": "我的足迹"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "浏览记录",
-            "group": "用户中心"
-          }
-        },
-        {
-          "path": "address/list",
-          "style": {
-            "navigationBarTitleText": "收货地址"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "地址管理",
-            "group": "用户中心"
-          }
-        },
-        {
-          "path": "address/edit",
-          "style": {
-            "navigationBarTitleText": "编辑地址"
-          },
-          "meta": {
-            "auth": true,
-            "title": "编辑地址"
-          }
-        },
-        {
-          "path": "invoice/list",
-          "style": {
-            "navigationBarTitleText": "发票管理"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "发票管理",
-            "group": "用户中心"
-          }
-        },
-        {
-          "path": "invoice/edit",
-          "style": {
-            "navigationBarTitleText": "编辑发票"
-          },
-          "meta": {
-            "auth": true,
-            "title": "编辑发票"
-          }
-        },
-        {
-          "path": "wallet/money",
-          "style": {
-            "navigationBarTitleText": "我的余额"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "用户余额",
-            "group": "用户中心"
-          }
-        },
-        {
-          "path": "wallet/commission",
-          "style": {
-            "navigationBarTitleText": "我的佣金"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "用户佣金",
-            "group": "分销中心"
-          }
-        },
-        {
-          "path": "wallet/score",
-          "style": {
-            "navigationBarTitleText": "我的积分"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "用户积分",
-            "group": "用户中心"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/commission",
-      "pages": [
-        {
-          "path": "index",
-          "style": {
-            "navigationBarTitleText": "分销"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "分销中心",
-            "group": "分销商城"
-          }
-        },
-        {
-          "path": "apply",
-          "style": {
-            "navigationBarTitleText": "申请分销商"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "申请分销商",
-            "group": "分销商城"
-          }
-        },
-        {
-          "path": "goods",
-          "style": {
-            "navigationBarTitleText": "推广商品"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "推广商品",
-            "group": "分销商城"
-          }
-        },
-        {
-          "path": "order",
-          "style": {
-            "navigationBarTitleText": "分销订单"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "分销订单",
-            "group": "分销商城"
-          }
-        },
-        {
-          "path": "share-log",
-          "style": {
-            "navigationBarTitleText": "分享记录"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "分享记录",
-            "group": "分销商城"
-          }
-        },
-        {
-          "path": "team",
-          "style": {
-            "navigationBarTitleText": "我的团队"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "我的团队",
-            "group": "分销商城"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/app",
-      "pages": [
-        {
-          "path": "sign",
-          "style": {
-            "navigationBarTitleText": "签到中心"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "签到中心",
-            "group": "应用"
-          }
-        },
-        {
-          "path": "score-shop",
-          "style": {
-            "navigationBarTitleText": "积分商城"
-          },
-          "meta": {
-            "auth": false,
-            "sync": true,
-            "title": "积分商城",
-            "group": "应用"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/public",
-      "pages": [
-        {
-          "path": "setting",
-          "style": {
-            "navigationBarTitleText": "系统设置"
-          },
-          "meta": {
-            "sync": true,
-            "title": "系统设置",
-            "group": "通用"
-          }
-        },
-        {
-          "path": "feedback",
-          "style": {
-            "navigationBarTitleText": "问题反馈"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "问题反馈",
-            "group": "通用"
-          }
-        },
-        {
-          "path": "richtext",
-          "style": {
-            "navigationBarTitleText": "富文本"
-          },
-          "meta": {
-            "sync": true,
-            "title": "富文本",
-            "group": "通用"
-          }
-        },
-        {
-          "path": "faq",
-          "style": {
-            "navigationBarTitleText": "常见问题"
-          },
-          "meta": {
-            "sync": true,
-            "title": "常见问题",
-            "group": "通用"
-          }
-        },
-        {
-          "path": "error",
-          "style": {
-            "navigationBarTitleText": "错误页面"
-          }
-        },
-        {
-          "path": "webview",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/coupon",
-      "pages": [
-        {
-          "path": "list",
-          "style": {
-            "navigationBarTitleText": "领券中心"
-          },
-          "meta": {
-            "sync": true,
-            "title": "领券中心",
-            "group": "优惠券"
-          }
-        },
-        {
-          "path": "detail",
-          "style": {
-            "navigationBarTitleText": "优惠券"
-          },
-          "meta": {
-            "auth": false,
-            "sync": true,
-            "title": "优惠券详情",
-            "group": "优惠券"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/chat",
-      "pages": [
-        {
-          "path": "index",
-          "style": {
-            "navigationBarTitleText": "客服"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "客服",
-            "group": "客服"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/pay",
-      "pages": [
-        {
-          "path": "index",
-          "style": {
-            "navigationBarTitleText": "收银台"
-          }
-        },
-        {
-          "path": "result",
-          "style": {
-            "navigationBarTitleText": "支付结果"
-          }
-        },
-        {
-          "path": "recharge",
-          "style": {
-            "navigationBarTitleText": "充值余额"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "充值余额",
-            "group": "支付"
-          }
-        },
-        {
-          "path": "recharge-log",
-          "style": {
-            "navigationBarTitleText": "充值记录"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "充值记录",
-            "group": "支付"
-          }
-        },
-        {
-          "path": "withdraw",
-          "style": {
-            "navigationBarTitleText": "申请提现"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "申请提现",
-            "group": "支付"
-          }
-        },
-        {
-          "path": "withdraw-log",
-          "style": {
-            "navigationBarTitleText": "提现记录"
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "提现记录",
-            "group": "支付"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/activity",
-      "pages": [
-        {
-          "path": "groupon/detail",
-          "style": {
-            "navigationBarTitleText": "拼团详情"
-          }
-        },
-        {
-          "path": "groupon/order",
-          "style": {
-            "navigationBarTitleText": "我的拼团",
-            "enablePullDownRefresh": true
-          },
-          "meta": {
-            "auth": true,
-            "sync": true,
-            "title": "拼团订单",
-            "group": "营销活动"
-          }
-        },
-        {
-          "path": "index",
-          "style": {
-            "navigationBarTitleText": "营销商品"
-          },
-          "meta": {
-            "sync": false,
-            "title": "营销商品",
-            "group": "营销活动"
-          }
-        },
-        {
-          "path": "groupon/list",
-          "style": {
-            "navigationBarTitleText": "拼团活动"
-          },
-          "meta": {
-            "sync": true,
-            "title": "拼团活动",
-            "group": "营销活动"
-          }
-        },
-        {
-          "path": "seckill/list",
-          "style": {
-            "navigationBarTitleText": "秒杀活动"
-          },
-          "meta": {
-            "sync": true,
-            "title": "秒杀活动",
-            "group": "营销活动"
-          }
-        }
-      ]
-    }
-  ],
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "星品购",
-    "navigationBarBackgroundColor": "#FFFFFF",
-    "backgroundColor": "#FFFFFF",
-    "navigationStyle": "custom"
-  },
-  "tabBar": {
-    "list": [
-      {
-        "pagePath": "pages/index/index"
-      },
-      {
-        "pagePath": "pages/index/cart"
-      },
-      {
-        "pagePath": "pages/index/user"
-      }
-    ]
-  }
-}
+				{
+					"path": "score",
+					"style": {
+						"navigationBarTitleText": "积分商品"
+					},
+					"meta": {
+						"sync": true,
+						"title": "积分商品",
+						"group": "商品"
+					}
+				},
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "商品列表"
+					},
+					"meta": {
+						"sync": true,
+						"title": "商品列表",
+						"group": "商品"
+					}
+				},
+				{
+					"path": "comment/add",
+					"style": {
+						"navigationBarTitleText": "评价商品"
+					},
+					"meta": {
+						"auth": true
+					}
+				},
+				{
+					"path": "comment/list",
+					"style": {
+						"navigationBarTitleText": "商品评价"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/order",
+			"pages": [{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "订单详情"
+					},
+					"meta": {
+						"auth": true,
+						"title": "订单详情"
+					}
+				},
+				{
+					"path": "confirm",
+					"style": {
+						"navigationBarTitleText": "确认订单"
+					},
+					"meta": {
+						"auth": true,
+						"title": "确认订单"
+					}
+				},
+				{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "我的订单",
+						"enablePullDownRefresh": true
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "用户订单",
+						"group": "订单中心"
+					}
+				},
+				{
+					"path": "invoice",
+					"style": {
+						"navigationBarTitleText": "发票详情"
+					},
+					"meta": {
+						"auth": true,
+						"title": "发票详情"
+					}
+				},
+				{
+					"path": "dispatch/content",
+					"style": {
+						"navigationBarTitleText": "发货内容"
+					},
+					"meta": {
+						"auth": true,
+						"title": "发货内容"
+					}
+				},
+				{
+					"path": "aftersale/apply",
+					"style": {
+						"navigationBarTitleText": "申请售后"
+					},
+					"meta": {
+						"auth": true,
+						"title": "申请售后"
+					}
+				},
+				{
+					"path": "aftersale/list",
+					"style": {
+						"navigationBarTitleText": "售后列表"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "售后订单",
+						"group": "订单中心"
+					}
+				},
+				{
+					"path": "aftersale/detail",
+					"style": {
+						"navigationBarTitleText": "售后详情"
+					},
+					"meta": {
+						"auth": true,
+						"title": "售后详情"
+					}
+				},
+				{
+					"path": "aftersale/log",
+					"style": {
+						"navigationBarTitleText": "售后进度"
+					},
+					"meta": {
+						"auth": true,
+						"title": "售后进度"
+					}
+				},
+				{
+					"path": "express/log",
+					"style": {
+						"navigationBarTitleText": "物流轨迹"
+					},
+					"meta": {
+						"auth": true,
+						"title": "物流轨迹"
+					}
+				},
+				{
+					"path": "express/list",
+					"style": {
+						"navigationBarTitleText": "订单包裹"
+					},
+					"meta": {
+						"auth": true,
+						"title": "订单包裹"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/user",
+			"pages": [{
+					"path": "info",
+					"style": {
+						"navigationBarTitleText": "我的信息"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "用户信息",
+						"group": "用户中心"
+					}
+				},
+				{
+					"path": "goods-collect",
+					"style": {
+						"navigationBarTitleText": "我的收藏"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "商品收藏",
+						"group": "用户中心"
+					}
+				},
+				{
+					"path": "goods-log",
+					"style": {
+						"navigationBarTitleText": "我的足迹"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "浏览记录",
+						"group": "用户中心"
+					}
+				},
+				{
+					"path": "address/list",
+					"style": {
+						"navigationBarTitleText": "收货地址"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "地址管理",
+						"group": "用户中心"
+					}
+				},
+				{
+					"path": "address/edit",
+					"style": {
+						"navigationBarTitleText": "编辑地址"
+					},
+					"meta": {
+						"auth": true,
+						"title": "编辑地址"
+					}
+				},
+				{
+					"path": "invoice/list",
+					"style": {
+						"navigationBarTitleText": "发票管理"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "发票管理",
+						"group": "用户中心"
+					}
+				},
+				{
+					"path": "invoice/edit",
+					"style": {
+						"navigationBarTitleText": "编辑发票"
+					},
+					"meta": {
+						"auth": true,
+						"title": "编辑发票"
+					}
+				},
+				{
+					"path": "wallet/money",
+					"style": {
+						"navigationBarTitleText": "我的余额"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "用户余额",
+						"group": "用户中心"
+					}
+				},
+				{
+					"path": "wallet/commission",
+					"style": {
+						"navigationBarTitleText": "我的佣金"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "用户佣金",
+						"group": "分销中心"
+					}
+				},
+				{
+					"path": "wallet/score",
+					"style": {
+						"navigationBarTitleText": "我的积分"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "用户积分",
+						"group": "用户中心"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/commission",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "分销"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "分销中心",
+						"group": "分销商城"
+					}
+				},
+				{
+					"path": "apply",
+					"style": {
+						"navigationBarTitleText": "申请分销商"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "申请分销商",
+						"group": "分销商城"
+					}
+				},
+				{
+					"path": "goods",
+					"style": {
+						"navigationBarTitleText": "推广商品"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "推广商品",
+						"group": "分销商城"
+					}
+				},
+				{
+					"path": "order",
+					"style": {
+						"navigationBarTitleText": "分销订单"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "分销订单",
+						"group": "分销商城"
+					}
+				},
+				{
+					"path": "share-log",
+					"style": {
+						"navigationBarTitleText": "分享记录"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "分享记录",
+						"group": "分销商城"
+					}
+				},
+				{
+					"path": "team",
+					"style": {
+						"navigationBarTitleText": "我的团队"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "我的团队",
+						"group": "分销商城"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/app",
+			"pages": [{
+					"path": "sign",
+					"style": {
+						"navigationBarTitleText": "签到中心"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "签到中心",
+						"group": "应用"
+					}
+				},
+				{
+					"path": "score-shop",
+					"style": {
+						"navigationBarTitleText": "积分商城"
+					},
+					"meta": {
+						"auth": false,
+						"sync": true,
+						"title": "积分商城",
+						"group": "应用"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/public",
+			"pages": [{
+					"path": "setting",
+					"style": {
+						"navigationBarTitleText": "系统设置"
+					},
+					"meta": {
+						"sync": true,
+						"title": "系统设置",
+						"group": "通用"
+					}
+				},
+				{
+					"path": "feedback",
+					"style": {
+						"navigationBarTitleText": "问题反馈"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "问题反馈",
+						"group": "通用"
+					}
+				},
+				{
+					"path": "richtext",
+					"style": {
+						"navigationBarTitleText": "富文本"
+					},
+					"meta": {
+						"sync": true,
+						"title": "富文本",
+						"group": "通用"
+					}
+				},
+				{
+					"path": "faq",
+					"style": {
+						"navigationBarTitleText": "常见问题"
+					},
+					"meta": {
+						"sync": true,
+						"title": "常见问题",
+						"group": "通用"
+					}
+				},
+				{
+					"path": "error",
+					"style": {
+						"navigationBarTitleText": "错误页面"
+					}
+				},
+				{
+					"path": "webview",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/coupon",
+			"pages": [{
+					"path": "list",
+					"style": {
+						"navigationBarTitleText": "领券中心"
+					},
+					"meta": {
+						"sync": true,
+						"title": "领券中心",
+						"group": "优惠券"
+					}
+				},
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "优惠券"
+					},
+					"meta": {
+						"auth": false,
+						"sync": true,
+						"title": "优惠券详情",
+						"group": "优惠券"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/chat",
+			"pages": [{
+				"path": "index",
+				"style": {
+					"navigationBarTitleText": "客服"
+				},
+				"meta": {
+					"auth": true,
+					"sync": true,
+					"title": "客服",
+					"group": "客服"
+				}
+			}]
+		},
+		{
+			"root": "pages/pay",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "收银台"
+					}
+				},
+				{
+					"path": "result",
+					"style": {
+						"navigationBarTitleText": "支付结果"
+					}
+				},
+				{
+					"path": "recharge",
+					"style": {
+						"navigationBarTitleText": "充值余额"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "充值余额",
+						"group": "支付"
+					}
+				},
+				{
+					"path": "recharge-log",
+					"style": {
+						"navigationBarTitleText": "充值记录"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "充值记录",
+						"group": "支付"
+					}
+				},
+				{
+					"path": "withdraw",
+					"style": {
+						"navigationBarTitleText": "申请提现"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "申请提现",
+						"group": "支付"
+					}
+				},
+				{
+					"path": "withdraw-log",
+					"style": {
+						"navigationBarTitleText": "提现记录"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "提现记录",
+						"group": "支付"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/activity",
+			"pages": [{
+					"path": "groupon/detail",
+					"style": {
+						"navigationBarTitleText": "拼团详情"
+					}
+				},
+				{
+					"path": "groupon/order",
+					"style": {
+						"navigationBarTitleText": "我的拼团",
+						"enablePullDownRefresh": true
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "拼团订单",
+						"group": "营销活动"
+					}
+				},
+				{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "营销商品"
+					},
+					"meta": {
+						"sync": false,
+						"title": "营销商品",
+						"group": "营销活动"
+					}
+				},
+				{
+					"path": "groupon/list",
+					"style": {
+						"navigationBarTitleText": "拼团活动"
+					},
+					"meta": {
+						"sync": true,
+						"title": "拼团活动",
+						"group": "营销活动"
+					}
+				},
+				{
+					"path": "seckill/list",
+					"style": {
+						"navigationBarTitleText": "秒杀活动"
+					},
+					"meta": {
+						"sync": true,
+						"title": "秒杀活动",
+						"group": "营销活动"
+					}
+				}
+			]
+		},
+		{
+			"root": "packageA",
+			"pages": [{
+					"path": "search/index",
+					"style": {
+						"navigationBarTitleText": "搜索结果"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "搜索结果",
+						"group": ""
+					}
+				}
+
+
+			]
+
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "星品购",
+		"navigationBarBackgroundColor": "#FFFFFF",
+		"backgroundColor": "#FFFFFF",
+		"navigationStyle": "custom"
+	},
+	"tabBar": {
+		"list": [{
+				"pagePath": "pages/index/index"
+			},
+			{
+				"pagePath": "pages/index/cart"
+			},
+			{
+				"pagePath": "pages/index/user"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/pages/index/fabu.vue b/pages/index/fabu.vue
new file mode 100644
index 0000000..f85c7d3
--- /dev/null
+++ b/pages/index/fabu.vue
@@ -0,0 +1,9 @@
+<template>
+	<view> 发布 </view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 954557f..88efcf3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,70 +1,401 @@
 <template>
-  <view v-if="template">
-    <s-layout
-      title="首页"
-      navbar="custom"
-      tabbar="/pages/index/index"
-      :bgStyle="template.style?.background"
-      :navbarStyle="template.style?.navbar"
-      onShareAppMessage
-      :showFloatButton="true"
-    >
-      <!-- <s-block v-for="(item, index) in template.data" :key="index" :styles="item.style">
-        <s-block-item :type="item.type" :data="item.data" :styles="item.style" />
-      </s-block>-->
-      <!-- 广告模块 
-      <s-popup-image /> -->
-    </s-layout>
-  </view>
+	<view v-if="template">
+		<s-layout title="首页" navbar="custom" tabbar="/pages/index/index" :bgStyle="template.style?.background"
+			:navbarStyle="template.style?.navbar" onShareAppMessage :showFloatButton="true" bgColor="#fcc74e">
+			<view class="container">
+				<!-- 顶部 -->
+				<view class="top">
+					<!-- 顶部-地址&搜索 -->
+					<view class="locTop">
+						<view class="locTop-left">
+							<image style="width: 34rpx;height: 34rpx;"
+								src="https://jiangxiaoxian.0rui.cn/locationTop.png" mode=""></image>
+							<view style="margin-left: 10rpx;font-size: 30rpx;font-weight: 800;line-height: 26rpx;">全国
+							</view>
+						</view>
+						<view class="locTop-right">
+							<uni-section style="border-radius: 192rpx;padding: 0;" type="line">
+								<uni-search-bar style="border-radius: 192rpx;" radius="23" placeholder="搜索您需要的信息"
+									bgColor="#EEEEEE" clearButton="none" cancelButton="none" @confirm="search" @focus="toPage()"/>
+							</uni-section>
+							<!-- <uni-search-bar></uni-search-bar> @confirm="search"-->
+						</view>
+					</view>
+
+					<!-- 顶部-三个内容跳转 -->
+					<view class="navTop">
+						<view class="navTop-left">
+							<view class="title" style="">食堂招租</view>
+							<view class="intro" style="color: #f42b2b;margin-top: 20rpx;">味揽商机 食载未来</view>
+						</view>
+						<view class="navTop-right">
+							<view class="navRight1">
+								<view class="title" style="">平台学院</view>
+								<view class="intro" style="color: #05b0b0;margin-top: 20rpx;">学知赋能成长</view>
+							</view>
+							<view class="navRight2">
+								<view class="title" style="">原料商城</view>
+								<view class="intro" style="color: #f58f3d;margin-top: 20rpx;">优材好料直供</view>
+							</view>
+						</view>
+					</view>
+
+				</view>
+				<!-- 轮播图 -->
+				<view class="swiper-box">
+					<view class="swiper_s">
+						<swiper class="swiper_s" :circular="true" :autoplay="true" indicator-active-color="#0DAE11"
+							indicator-color="#ffffff" :indicator-dots="false" :current="swiperCurrent"
+							@animationfinish="swiperChange">
+							<!-- v-for="(item, index) in swiperList" :key="index" @click="openSwiper(item)"-->
+							<swiper-item style="margin: 0 auto;">
+								<view style="position: relative;width: 100%;height: 100%;">
+									<!--<view class="fnon_tit"></view>
+									 <view class="text">{{ item.title ? item.title : '' }}</view> 
+									 @click="click(item.url)" 跳转活动链接 -->
+									<image class="swiper-image" src="/static/swiper.png" mode="scaleToFill" />
+								</view>
+							</swiper-item>
+							<swiper-item style="margin: 0 auto;">
+								<view style="position: relative;width: 100%;height: 100%">
+									<!--<view class="fnon_tit"></view>
+									 <view class="text">{{ item.title ? item.title : '' }}</view> 
+									 @click="click(item.url)" 跳转活动链接 -->
+									<image class="swiper-image" src="/static/cart-empty.png" mode="scaleToFill" />
+								</view>
+							</swiper-item>
+						</swiper>
+					</view>
+				</view>
+				<!-- 推荐列表 -->
+				<view class="recommend-box">
+					<!-- 推荐标题 -->
+					<view class="recom-titleBox">
+						<view style="font-size: 38rpx;line-height: 38rpx;font-weight: 800;color: #333333;">平台推荐</view>
+						<view class="title-more">
+							<view style="font-size: 26rpx;line-height: 26rpx;font-weight: 400;color: #999999;">查看更多
+							</view>
+							<image style="width: 28rpx;height: 28rpx;margin-left: 20rpx;"
+								src="https://jiangxiaoxian.0rui.cn/nextMore.png" mode=""></image>
+						</view>
+					</view>
+					<view class="rrecommList">
+						<view class="reListItem">
+							<!-- 左侧图片 -->
+							<view class="listItem-images">
+								<image style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;"
+									src="https://jiangxiaoxian.0rui.cn/hot.png"></image>
+								<image class="iamges-mainImg" src="https://jiangxiaoxian.0rui.cn/model.png"></image>
+							</view>
+							<!-- 右侧内容 -->
+							<view class="listItem-contents">
+								<view class="title2" style="margin-bottom: 20rpx;">食堂餐厅外包]洛阳某本科食堂新装修</view>
+								<view class="">标签</view>
+								<view class="cons-third">
+									<view style="display: flex;">
+										<image style="width: 24rpx;height: 24rpx;"
+											src="https://jiangxiaoxian.0rui.cn/locationList.png"></image>
+										<view class="title3" style="margin-left: 10rpx;">河南省洛阳市</view>
+									</view>
+									<view class="title3">2025-07-24</view>
+									<view style="display: flex;">
+										<image style="width: 23rpx;height: 15rpx;"
+											src="https://jiangxiaoxian.0rui.cn/eye.png"></image>
+										<view class="title3" style="margin-left: 10rpx;">河南省洛阳市</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+			</view>
+
+
+		</s-layout>
+	</view>
 </template>
 
 <script setup>
-  import { computed } from 'vue';
-  import { onLoad, onPageScroll, onPullDownRefresh } from '@dcloudio/uni-app';
-  import sheep from '@/sheep';
-  import $share from '@/sheep/platform/share';
+	import {
+		computed
+	} from 'vue';
+	import {
+		onLoad,
+		onPageScroll,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app';
+	import sheep from '@/sheep';
+	import $share from '@/sheep/platform/share';
 
-  // 隐藏原生tabBar
-  uni.hideTabBar({
-    fail: () => {},
-  });
+	// 隐藏原生tabBar
+	uni.hideTabBar({
+		fail: () => {},
+	});
 
-  const template = computed(() => sheep.$store('app').template?.home);
+	const template = computed(() => sheep.$store('app').template?.home);
 
-  onLoad((options) => {
-    // #ifdef MP
-    // 小程序识别二维码
-    if (options.scene) {
-      const sceneParams = decodeURIComponent(options.scene).split('=');
-      options[sceneParams[0]] = sceneParams[1];
-    }
-    // #endif
+	onLoad((options) => {
+		// #ifdef MP
+		// 小程序识别二维码
+		if (options.scene) {
+			const sceneParams = decodeURIComponent(options.scene).split('=');
+			options[sceneParams[0]] = sceneParams[1];
+		}
+		// #endif
 
-    // 预览模板
-    if (options.templateId) {
-      sheep.$store('app').init(options.templateId);
-    }
+		// 预览模板
+		if (options.templateId) {
+			sheep.$store('app').init(options.templateId);
+		}
 
-    // 解析分享信息
-    if (options.spm) {
-      $share.decryptSpm(options.spm);
-    }
+		// 解析分享信息
+		if (options.spm) {
+			$share.decryptSpm(options.spm);
+		}
 
-    // 进入指定页面(完整页面路径)
-    if (options.page) {
-      sheep.$router.go(decodeURIComponent(options.page));
-    }
-  });
+		// 进入指定页面(完整页面路径)
+		if (options.page) {
+			sheep.$router.go(decodeURIComponent(options.page));
+		}
+	});
 
-  // 下拉刷新
-  onPullDownRefresh(() => {
-    sheep.$store('app').init();
-    setTimeout(function () {
-      uni.stopPullDownRefresh();
-    }, 800);
-  });
+	// 下拉刷新
+	onPullDownRefresh(() => {
+		sheep.$store('app').init();
+		setTimeout(function() {
+			uni.stopPullDownRefresh();
+		}, 800);
+	});
 
-  onPageScroll(() => {});
+	onPageScroll(() => {});
+	
+	
+	function toPage() {
+		uni.navigateTo({
+			url:'/packageA/search/index'
+		})
+	}
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+	.search-result {
+		padding-top: 10px;
+		padding-bottom: 20px;
+		text-align: center;
+	}
+
+	.search-result-text {
+		text-align: center;
+		font-size: 14px;
+		color: #666;
+	}
+
+	.example-body {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		padding: 0px;
+	}
+
+	.uni-mt-10 {
+		margin-top: 10px;
+	}
+
+	.title {
+		color: #3d3d3d;
+		font-size: 34rpx;
+		font-weight: 800;
+		line-height: 34rpx;
+	}
+
+	.intro {
+		font-size: 24rpx;
+		font-weight: 400;
+		line-height: 24rpx;
+	}
+	
+	.title2 {
+		color: #3d3d3d;
+		font-size: 30rpx;
+		font-weight: 800;
+		line-height: 42rpx;
+	}
+
+	.title3 {
+		font-size: 20rpx;
+		font-weight: 400;
+		color: #999999;
+		line-height: 22rpx;
+	}
+
+	.container {
+		min-height: 90vh;
+		width: 100%;
+		background-color: #f7f7f7;
+		// display: grid;
+		// background-color: linear-gradient(to bottom, #fcc74e 0%, #f7f7f7 50%);
+		// background-size: 100% 100%;
+
+		.top {
+			height: 500rpx;
+			background-image: url('https://jiangxiaoxian.0rui.cn/topBack.png');
+			background-size: 100%;
+			padding: 30rpx 30rpx 30rpx 30rpx;
+			display: grid;
+
+			.locTop {
+				width: 100%;
+				height: 70rpx;
+				display: flex;
+				justify-content: space-between;
+				// align-items: center;
+
+				.locTop-left {
+					width: 276rpx;
+					display: flex;
+					align-items: center;
+					justify-content: flex-start;
+				}
+
+				.locTop-right {
+					width: 406rpx;
+					height: 70rpx;
+
+				}
+			}
+
+			.navTop {
+				margin-top: 30rpx;
+				display: flex;
+				justify-content: space-between;
+				// align-items: center;
+
+				.navTop-left {
+					width: 270rpx;
+					height: 350rpx;
+					background-image: url('https://jiangxiaoxian.0rui.cn/rent.png');
+					background-size: 100%;
+					border-radius: 18rpx;
+					padding: 40rpx 30rpx 0rpx 30rpx;
+
+				}
+
+				.navTop-right {
+					display: grid;
+					justify-content: center;
+					align-items: center;
+					width: 330rpx;
+
+					.navRight1 {
+						width: 270rpx;
+						height: 140rpx;
+						background-image: url('https://jiangxiaoxian.0rui.cn/school.png');
+						background-size: 100%;
+						border-radius: 18rpx;
+						padding: 40rpx 30rpx 0rpx 30rpx;
+					}
+
+					.navRight2 {
+						margin-top: 30rpx;
+						width: 270rpx;
+						height: 140rpx;
+						background-image: url('https://jiangxiaoxian.0rui.cn/shoppingMall.png');
+						background-size: 100%;
+						border-radius: 18rpx;
+						padding: 40rpx 30rpx 0rpx 30rpx;
+					}
+				}
+			}
+
+
+		}
+
+		.swiper-box {
+			width: 690rpx;
+			padding: 0 30rpx;
+			// display: grid;
+			// justify-content: center;
+			height: 280rpx;
+			position: relative;
+
+			.swiper_s {
+				width: 100%;
+				height: 100%;
+				// display: grid;
+				// justify-content: center;
+
+				.swiper-image {
+					width: 100%;
+					height: 100%;
+					border-radius: 36rpx;
+					object-fit: contain;
+				}
+			}
+
+		}
+
+		.recommend-box {
+			margin-top: 30rpx;
+			padding: 20rpx 30rpx;
+
+			.recom-titleBox {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				width: 690rpx;
+
+				.title-more {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+			}
+
+			.rrecommList {
+				margin-top: 30rpx;
+				// padding: 30rpx;
+
+				.reListItem {
+					background-color: #ffffff;
+					width: 630rpx;
+					height: 190rpx;
+					padding: 30rpx;
+					display: flex;
+					justify-content: flex-start;
+					align-items: center;
+					border-radius: 18rpx;
+
+					.listItem-images {
+						display: grid;
+						justify-content: flex-start;
+
+						.iamges-mainImg {
+							width: 190rpx;
+							height: 190rpx;
+							position: relative;
+							right: 0rpx;
+							bottom: 18rpx;
+							z-index: 1;
+
+						}
+					}
+					
+					.listItem-contents {
+						margin-left: 20rpx;
+						
+						.cons-third {
+							margin-top: 20rpx;
+							display: flex;
+							justify-content: space-around;
+						}
+					}
+				}
+
+			}
+
+		}
+
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/user.vue b/pages/index/user.vue
index 1d087d6..b7eba52 100644
--- a/pages/index/user.vue
+++ b/pages/index/user.vue
@@ -1,44 +1,653 @@
 <template>
-  <s-layout
-    title="我的"
-    tabbar="/pages/index/user"
-    navbar="custom"
-    :bgStyle="template.style?.background"
-    :navbarStyle="template.style?.navbar"
-    onShareAppMessage
-    :showFloatButton="true"
-  >
-    <s-block v-for="(item, index) in template.data" :key="index" :styles="item.style">
+	<s-layout title="我的" tabbar="/pages/index/user" navbar="custom" :bgStyle="template.style?.background"
+		:navbarStyle="template.style?.navbar" onShareAppMessage :showFloatButton="true">
+		<!-- 登录信息 -->
+		<view class="myBox">
+			<view class="box flex justify-start align-items flex-column">
+				<scroll-view @touchmove.prevent scroll-y="true" :show-scrollbar="true"
+					class="con-center flex flex-start flex-column">
+					<view class="header flex align-items">
+						<view class="hea-left flex align-items">
+							<image :src="avatar" mode="" class="avatar" @click="clickTop"></image>
+							<view class="first-header flex justify-center align-items">
+								<view class="flex flex-column" @click="clickTop">
+									<!-- <view
+										style="display: flex;align-items: center;;margin-bottom: 20rpx;font-weight: 800;font-size: 34rpx;color: #181818;">
+										<view>{{ userName }}</view>
+										<view style="padding-left: 20rpx; height: 35rpx;">
+											<image v-if="shop_auth_info.auth_status == 1" src="/static/my/owenr.png" mode=""
+												style="width: 35rpx; height: 35rpx;">
+											</image>
+										</view>
+									</view> -->
+									<view style="color: #909090; font-size: 24rpx;">{{ bio || '带着热爱，在搭子圈里撒野~'}}</view>
+								</view>
+								<image src="/static/goods-empty.png" mode=""
+									style="width: 50rpx; height: 50rpx;position: absolute;right: 0;" @click="clickTop">
+								</image>
+							</view>
+						</view>
+						<!-- <view class="hea-right flex flex-column align-items" @click="out()" v-if="token">
+							<image src="../../static/my/Leave.png" mode="" style="width: 64rpx; height: 64rpx;"></image>
+							<span>退出登录</span>
+						</view> -->
+					</view>
+
+					
+		
+					<view style="height: 80rpx;width: 100%;"></view>
+				</scroll-view>
+		
+		
+		
+				<!-- 授权登录 -->
+				<u-popup :show="showPopup" mode="center" round="20"
+					:customStyle="{ 'width': '644rpx', 'height': '426rpx','position': 'relative'}" :closeable="false"
+					@close="close">
+					<!-- 隐私协议 -->
+					<lsl-protocol-popup title="用户协议和隐私政策提示" predesc="感谢您使用洛阳多样青春搭+。为保护您的个人信息安全，在您洛阳多样青春搭+的服务前，请务必仔细阅读"
+						subdesc='以了解详细内容。如您同意，请点击“同意并继续”并开始使用我们的服务。'
+						top_img='https://naweigetetest2.hschool.com.cn/dyqc/dyqclogo.png' color="#C9935C" hideTabBar="true"
+						:onNeed='false' :other="other" :title_style="'padding-top:60rpx;'"
+						open_type='agreePrivacyAuthorization' @agree_call="miniLogin()">
+					</lsl-protocol-popup>
+		
+					<view class="popup">
+						<img class="img_shouquan" src="https://naweigetetest2.hschool.com.cn/dyqc/shou1.png" alt="" />
+						<text id="txt2">授权成功后即可参加多种户外活动</text>
+						<button class="texbut" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+							授权登录
+							<!-- <u-icon label="" labelColor="#fff" size="28" name="/static/wechat1.png"></u-icon> -->
+						</button>
+					</view>
+				</u-popup>
+		
+				<!-- <u-toast ref="uToast"></u-toast> -->
+			</view>
+		
+		</view>
+		
+		<!-- <s-block v-for="(item, index) in template.data" :key="index" :styles="item.style">
       <s-block-item :type="item.type" :data="item.data" :styles="item.style" />
-    </s-block>
-  </s-layout>
+    </s-block> -->
+	</s-layout>
 </template>
 
 <script setup>
-  import { computed } from 'vue';
-  import { onShow, onPageScroll, onPullDownRefresh } from '@dcloudio/uni-app';
-  import sheep from '@/sheep';
+	import {
+		computed
+	} from 'vue';
+	import {
+		onShow,
+		onPageScroll,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app';
+	import sheep from '@/sheep';
 
-  // 隐藏原生tabBar
-  uni.hideTabBar({
-    fail: () => {},
-  });
+	// 隐藏原生tabBar
+	uni.hideTabBar({
+		fail: () => {},
+	});
 
-  const template = computed(() => sheep.$store('app').template.user);
-  const isLogin = computed(() => sheep.$store('user').isLogin);
+	const template = computed(() => sheep.$store('app').template.user);
+	const isLogin = computed(() => sheep.$store('user').isLogin);
 
-  onShow(() => {
-    sheep.$store('user').updateUserData();
-  });
+	onShow(() => {
+		sheep.$store('user').updateUserData();
+	});
 
-  onPullDownRefresh(() => {
-    sheep.$store('user').updateUserData();
-    setTimeout(function () {
-      uni.stopPullDownRefresh();
-    }, 800);
-  });
+	onPullDownRefresh(() => {
+		sheep.$store('user').updateUserData();
+		setTimeout(function() {
+			uni.stopPullDownRefresh();
+		}, 800);
+	});
 
-  onPageScroll(() => {});
+	onPageScroll(() => {});
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+	.myBox {
+		position: fixed;
+		padding-top: 200rpx;
+		width: 750rpx;
+		min-height: 100vh;
+		background-color: #F5F5F5;
+		// background-image: url("https://naweigetetest2.hschool.com.cn/dyqc/bgx2.png");
+		background-size: 100%;
+		background-repeat: no-repeat;
+	}
+	
+	.box {
+		border-radius: 8rpx 8rpx 8rpx 8rpx;
+	
+		// padding-top: env(safe-area-inset-top);
+		/* 顶部安全距离 */
+		.backImg {
+			position: fixed;
+			width: 100%;
+			height: 100%;
+			top: 0;
+			left: 0;
+			z-index: -1;
+		}
+	}
+	
+	.w-100 {
+		width: 100%;
+	}
+	
+	.flex {
+		display: flex;
+	}
+	
+	.flex-start {
+		align-items: flex-start;
+	}
+	
+	.justify-center {
+		justify-content: center;
+	}
+	
+	.align-items {
+		align-items: center;
+	}
+	
+	.flex-column {
+		flex-flow: column;
+	}
+	
+	.justify-start {
+		justify-content: start;
+	}
+	
+	
+	.con-center {
+		height: 1314rpx;
+	
+		.header {
+			width: 690rpx;
+			justify-content: space-between;
+			margin: 0 auto;
+	
+			.hea-left {
+				width: 100%;
+				position: relative;
+	
+				.avatar {
+					width: 140rpx;
+					height: 140rpx;
+					border-radius: 50%;
+				}
+	
+	
+	
+				.first-header {
+					margin-left: 18rpx;
+	
+					span {
+						font-family: PingFang SC, PingFang SC;
+						font-weight: 800;
+						font-size: 34rpx;
+						color: #181818;
+						// line-height: 26rpx;
+					}
+				}
+	
+				.line {
+					width: 320rpx;
+					height: 1rpx;
+					background: #BABDC7;
+					border-radius: 0rpx 0rpx 0rpx 0rpx;
+					margin: 19rpx 0 7rpx 0;
+				}
+	
+				.red {
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 800;
+					font-size: 26rpx;
+					color: #FF4949;
+					line-height: 32rpx;
+				}
+			}
+	
+			.hea-right {
+				// width: 20%;
+			}
+	
+			.line {}
+	
+		}
+	}
+	
+	.top_box {
+		width: 690rpx;
+		margin: 0 auto;
+		margin-top: 32rpx;
+	
+		view {
+			background: #FFFFFF;
+			border-radius: 18rpx;
+			width: 330rpx;
+			padding: 20rpx 0;
+	
+			image {
+				width: 70rpx;
+				height: 70rpx;
+				margin-left: 30rpx;
+			}
+	
+			span {
+				margin-left: 20rpx;
+			}
+	
+			.p1 {
+				width: 100%;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: bold;
+				font-size: 30rpx;
+				color: #323232;
+			}
+	
+			.p2 {
+				width: 100%;
+				margin-top: 10rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #9C9C9C;
+			}
+		}
+	
+		.top_box_right {
+			margin-left: 30rpx;
+		}
+	}
+	
+	.first {
+		width: 690rpx;
+		padding-bottom: 32rpx;
+		margin-top: 52rpx;
+		background: #FFFFFF;
+		border-radius: 24rpx 24rpx 24rpx 24rpx;
+	
+		.centerBox {
+			flex-wrap: wrap;
+	
+			view {
+				width: 120rpx;
+				margin: 42rpx 90rpx 0 0;
+				position: relative;
+	
+				.numberPos {
+					position: absolute;
+					right: 0%;
+					top: 0;
+				}
+	
+				.text {
+					font-weight: 500;
+					font-size: 30rpx;
+					color: #181818;
+				}
+			}
+		}
+	}
+	
+	.popup {
+	
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding-left: 73rpx;
+		padding-right: 73rpx;
+	
+		.img_shouquan {
+			position: absolute;
+			width: 680rpx;
+			height: 857rpx;
+			left: -25rpx;
+			top: -390rpx;
+		}
+	
+	
+		#txt2 {
+			text-align: center;
+			margin-top: 200rpx;
+			font-size: 28rpx;
+			color: #525252;
+			margin-bottom: 60rpx;
+			position: relative;
+			font-weight: 500;
+		}
+	
+		.texbut {
+			width: 317rpx;
+			height: 90rpx;
+			border-radius: 45rpx;
+			background: #323232;
+			font-size: 34rpx;
+			color: #fff;
+			font-weight: bold;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+	}
+	
+	.jifen {
+		width: 690rpx;
+		height: 86rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx 20rpx 20rpx 20rpx;
+		margin-top: 41rpx;
+		justify-content: space-between;
+	
+		.left {
+			margin-left: 32rpx;
+	
+			.title {
+				width: 104rpx;
+				height: 32rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 800;
+				font-size: 26rpx;
+				color: #181818;
+				line-height: 32rpx;
+				margin: 0 12rpx 0 6rpx;
+			}
+	
+			.scoring {
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				font-size: 42rpx;
+				color: #FFB134;
+				line-height: 32rpx;
+			}
+		}
+	
+		.right {
+			margin-right: 32rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 500;
+			font-size: 24rpx;
+			color: #9E9E9E;
+			line-height: 32rpx;
+	
+			span {
+				margin-right: 8rpx;
+			}
+		}
+	}
+	
+	.mymoney {
+	
+		width: 690rpx;
+		height: 200rpx;
+		background: #323232;
+		border-radius: 24rpx;
+		position: relative;
+		align-items: flex-start;
+		margin: 0 auto;
+		margin-top: 30rpx;
+	
+		.myyue {
+			margin-top: 30rpx;
+			margin-left: 30rpx;
+			color: #ffffff;
+		}
+	
+		.tixian {
+			width: 148rpx;
+			height: 68rpx;
+			position: absolute;
+			right: -10rpx;
+			top: 45rpx;
+	
+		}
+	
+		.tixianwz {
+			position: absolute;
+			right: 35rpx;
+			top: 62rpx;
+			font-size: 28rpx;
+			color: #323232;
+		}
+	
+		.botmoney {
+			margin-top: 22rpx;
+			margin-left: 30rpx;
+			color: #777777;
+			font-weight: 400;
+			font-size: 26rpx;
+	
+			.shu {
+				width: 2rpx;
+				height: 22rpx;
+				margin: 0 20rpx;
+				background: #848484;
+			}
+		}
+	
+	}
+	
+	.service {
+		margin: 0 auto;
+		margin-top: 30rpx;
+		height: 206rpx;
+		// background: url("https://naweigetetest2.hschool.com.cn/dyqc/zhuliren.png");
+		background-size: 690rpx 206rpx;
+		padding-bottom: 0;
+	}
+	
+	.hot {
+		//   margin-top: 30rpx;
+		margin-bottom: 100rpx;
+	
+	
+	}
+	
+	.part {
+		width: 162rpx;
+		height: 70rpx;
+		// background: url(@/static/index/shangche.png);
+		background-size: 162rpx 70rpx;
+		background-repeat: no-repeat;
+		font-family: 'YouSheBiaoTiHei';
+		font-weight: 400;
+		font-size: 42rpx;
+		color: #BBFC5B;
+	}
+	
+	.part1 {
+		width: 162rpx;
+		height: 70rpx;
+		// background: url(@/static/index/shangchew.png);
+		background-size: 162rpx 70rpx;
+		background-repeat: no-repeat;
+		font-family: 'YouSheBiaoTiHei';
+		font-weight: 400;
+		font-size: 42rpx;
+		color: #9C9C9C;
+	}
+	
+	.content {
+		// height: 462rpx;
+		// overflow-x: auto;
+		/* 允许横向滚动 */
+		// white-space: nowrap;
+	
+		width: 690rpx;
+		margin: 0 auto;
+	
+		.bbb {
+			background: #ffffff;
+			margin-top: 24rpx;
+			border-radius: 36rpx;
+		}
+	
+		.right {
+			margin-left: 30rpx;
+			width: 100%;
+	
+			.title {
+				width: 95%;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: bold;
+				font-size: 30rpx;
+				color: #323232;
+			}
+	
+			.first-image {
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #9C9C9C;
+	
+				span {
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					font-size: 26rpx;
+					color: #222222;
+				}
+			}
+	
+			.row {
+				margin: 10rpx 0 26rpx 0;
+	
+				.remen {
+					// width: 136rpx;
+					height: 40rpx;
+					background: #ebfaf5;
+					border-radius: 4rpx 4rpx 4rpx 4rpx;
+	
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #14bc84;
+					line-height: 28rpx;
+					padding: 2rpx 8rpx;
+				}
+	
+				.line-colum {
+					width: 1rpx;
+					height: 32rpx;
+					background: #7a7a7a;
+					margin: 0 13rpx;
+				}
+	
+				.name {
+					width: 110rpx;
+					height: 32rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 500;
+					font-size: 26rpx;
+					color: #7a7a7a;
+					line-height: 32rpx;
+					margin-left: 12rpx;
+				}
+			}
+	
+	
+			.jigou {
+				width: 312rpx;
+				// height: 32rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				font-size: 26rpx;
+				color: #7a7a7a;
+				margin: 4rpx 0 14rpx 0;
+			}
+	
+			.time {
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #323232;
+				line-height: 30rpx;
+	
+				.time_tex {
+					width: 116rpx;
+					height: 42rpx;
+					background: #BBFC5B;
+					border-radius: 159rpx;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #323232;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+	
+				.time_texs {
+					background: #FF4810;
+					color: #ffffff;
+				}
+	
+			}
+	
+			.imgs_con {
+				width: 202rpx;
+				height: 202rpx;
+				margin-right: 12rpx;
+	
+				&:first-child {
+					border-radius: 18rpx 0 0 18rpx;
+				}
+	
+				&:nth-child(3) {
+					border-radius: 0 18rpx 18rpx 0;
+				}
+			}
+	
+		}
+	
+		.bottom {
+			margin: 32rpx 0 32rpx 24rpx;
+			width: 655rpx;
+	
+			.toptext {
+				width: 480rpx;
+	
+				.smalld {
+					margin-left: 0 !important;
+				}
+			}
+	
+			.number {
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #3D3D3D;
+				line-height: 30rpx;
+				width: 242rpx;
+				margin-left: 20rpx;
+			}
+	
+			.text {
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 800;
+				font-size: 26rpx;
+				color: #7a7a7a;
+			}
+	
+			.money {
+				width: 150rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 800;
+				font-size: 36rpx;
+				color: #ff2323;
+				justify-content: flex-end;
+			}
+		}
+	
+		.ovr {
+			width: 312rpx;
+			background: #ffffff;
+			border-radius: 20rpx 20rpx 20rpx 20rpx;
+			margin-top: 18rpx;
+			margin-right: 24rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/public/faq.vue b/pages/public/faq.vue
index 899ca79..4678ff9 100644
--- a/pages/public/faq.vue
+++ b/pages/public/faq.vue
@@ -1,5 +1,5 @@
 <template>
-  <s-layout class="set-wrap" title="常见问题" :bgStyle="{ color: '#FFF' }">
+  <s-layout class="set-wrap" title="常见问题" :bgStyle="{ color: '#FFF' }" color="#323232">
     <uni-collapse>
       <uni-collapse-item v-for="(item, index) in state.list" :key="item.id">
         <template v-slot:title>
diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 153c38a..2d6a7e2 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <s-image-block v-if="type === 'imageBlock'" :data="data" :styles="styles" />
+   <s-image-block v-if="type === 'imageBlock'" :data="data" :styles="styles" />
     <s-image-banner v-if="type === 'imageBanner'" :data="data" :styles="styles" />
     <s-video-block v-if="type === 'videoPlayer'" :data="data" :styles="styles" />
     <s-image-cube v-if="type === 'imageCube'" :data="data" :styles="styles" />
diff --git a/sheep/ui/su-inner-navbar/su-inner-navbar.vue b/sheep/ui/su-inner-navbar/su-inner-navbar.vue
index 9fc102d..dba0cd0 100644
--- a/sheep/ui/su-inner-navbar/su-inner-navbar.vue
+++ b/sheep/ui/su-inner-navbar/su-inner-navbar.vue
@@ -26,10 +26,10 @@
             <text class="sicon-back" v-if="hasHistory" />
             <text class="sicon-home" v-else />
           </view>
-          <view class="line"></view>
+          <!-- <view class="line"></view>
           <view class="icon-button icon-button-right ss-flex ss-row-center" @tap="onClickRight">
             <text class="sicon-more" />
-          </view>
+          </view> -->
         </view>
         <slot name="center">
           <view class="center navbar-title">{{ title }}</view>
@@ -173,20 +173,23 @@
   .icon-box {
     box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
     border-radius: 30rpx;
-    width: 134rpx;
+    width: 56rpx;
     height: 56rpx;
     margin-left: 8rpx;
-    border: 1px solid rgba(#fff, 0.4);
+    border: 1px solid rgba(#eee, 0.4);
     .line {
       width: 2rpx;
       height: 24rpx;
-      background: #e5e5e7;
+      // background: #e5e5e7;
+	  background: #323232;
     }
     .sicon-back {
-      font-size: 32rpx;
+      font-size: 40rpx;
+	  color: #000;
     }
     .sicon-home {
       font-size: 32rpx;
+	  color: #000;
     }
     .sicon-more {
       font-size: 32rpx;
@@ -194,6 +197,7 @@
     .icon-button {
       width: 67rpx;
       height: 56rpx;
+	  // background-color: ;
       &-left:hover {
         background: rgba(0, 0, 0, 0.16);
         border-radius: 30rpx 0px 0px 30rpx;
@@ -341,6 +345,7 @@
         @include flex-center;
         text-overflow: ellipsis;
         // text-align: center;
+		color: #323232;
         position: absolute;
         left: 50%;
         transform: translateX(-50%);
diff --git a/sheep/ui/su-navbar/su-navbar.vue b/sheep/ui/su-navbar/su-navbar.vue
index 316a005..e2bf8de 100644
--- a/sheep/ui/su-navbar/su-navbar.vue
+++ b/sheep/ui/su-navbar/su-navbar.vue
@@ -420,6 +420,7 @@
     // flex: 1;
     // padding: 0 10px;
     // overflow: hidden;
+	// color:#323232;
     position: absolute;
     left: 50%;
     transform: translateX(-50%) translateY(-50%);
diff --git a/static/swiper.png b/static/swiper.png
new file mode 100644
index 0000000..e08228c
Binary files /dev/null and b/static/swiper.png differ
diff --git a/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
index 2befbcc..8632543 100644
--- a/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
@@ -234,7 +234,7 @@
 		/* #endif */
 		flex-direction: row;
 		position: relative;
-		padding: 5px;
+		// padding: 5px;
 		// background-color: #fff;
 	}