me

app.json

@@ -2,8 +2,12 @@
   "pages": [
     "pages/index/index",
     "pages/search/index",
+<<<<<<< HEAD
     "pages/me/me",
     "pages/exchange/exchange"
+=======
+    "pages/me/me"
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -14,6 +18,7 @@
   "tabBar": {
     "color": "#CBCBCB",
     "selectedColor": "#F9872C",
+<<<<<<< HEAD
     "list": [
       {
         "pagePath": "pages/index/index",
@@ -28,6 +33,19 @@
         "selectedIconPath": "/images/icon/me-select .png"
       }
     ]
+=======
+    "list": [{
+      "pagePath": "pages/index/index",
+      "text": "首页",
+      "iconPath": "/images/icon/index.png",
+      "selectedIconPath": "/images/icon/index-select.png"
+    }, {
+      "pagePath": "pages/me/me",
+      "text": "我的",
+      "iconPath": "/images/icon/me.png",
+      "selectedIconPath": "/images/icon/me-select .png"
+    }]
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   },
   "usingComponents": {
     "van-button": "@vant/weapp/button"

pages/index/index.json

@@ -3,6 +3,11 @@
     "van-button": "@vant/weapp/button",
     "van-search": "@vant/weapp/search/index",
     "van-row": "@vant/weapp/row/index",
+<<<<<<< HEAD
     "van-col": "@vant/weapp/col/index"
+=======
+    "van-col": "@vant/weapp/col/index",
+    "van-icon": "@vant/weapp/icon/index"
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   }
 }

pages/index/index.wxml

@@ -1,8 +1,18 @@
+<<<<<<< HEAD
 <view class="index">
   <!-- 搜索栏 -->
   <van-search value="{{ value }}" placeholder="请输入商家名称" use-action-slot bind:change="onChange" bind:search="onSearch">
     <view slot="action" bind:tap="onClick">搜索</view>
   </van-search>
+=======
+<!-- 搜索框 -->
+<view class="search_container">
+  <view class="inputContent">
+    <van-icon name="search" />
+    <input type="text" bindinput="onInput" bindconfirm="onInput" placeholder="搜索商品名称" />
+    <button bindtap="onSearch" bintap="onSearch">搜索</button>
+  </view>
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
 
   <!-- 主页轮播图 -->
   <swiper class="swiper" indicator-dots indicator-color="#CBCBCB" indicator-active-color="#F9872C" autoplay interval="2000" circular>
@@ -15,5 +25,10 @@
     </swiper-item>
   </swiper>
 
+<<<<<<< HEAD
 <!-- 商品标签页 -->
+=======
+  <!-- 商品标签页 -->
+ 
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
 </view>

pages/index/index.wxss

@@ -1,6 +1,44 @@
+<<<<<<< HEAD
 /* 轮播图样式 */
 .swiper {
   height: 270rpx ;
+=======
+/* 搜索框样式 */
+.inputContent {
+  width: 95%;
+  margin: 0 auto;
+  height: 80rpx;
+  background-color: #F4F4F4;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  border-radius: 60rpx;
+
+}
+
+/* 搜索输入框样式 */
+.inputContent input {
+  font-size: 28rpx;
+  margin-left: -90rpx;
+}
+
+/* 搜索按钮样式 */
+.inputContent button {
+  width: 170rpx;
+  height: 60rpx;
+  border-radius: 60rpx;
+  font-size: 28rpx;
+  color: white;
+  line-height: 60rpx;
+  background-color: #F9872C;
+  margin-left: 0;
+  margin-right: -30rpx;
+}
+
+/* 轮播图样式 */
+.swiper {
+  height: 270rpx;
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   margin: 20rpx;
   border-radius: 10px;
 }
@@ -10,4 +48,7 @@
   width: 100%;
   height: 100%;
 }
+<<<<<<< HEAD
 
+=======
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78

pages/me/me.js

@@ -1,6 +1,10 @@
 // pages/me/me.js
 Page({
+<<<<<<< HEAD
   
+=======
+
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   /**
    * 页面的初始数据
    */
@@ -13,8 +17,13 @@ Page({
    */
   onLoad(options) {
 
+<<<<<<< HEAD
    
   },
+=======
+  },
+
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/me/me.json

@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
   "usingComponents": {
     "van-image": "@vant/weapp/image/index",
     "van-icon": "@vant/weapp/icon/index"
@@ -7,3 +8,7 @@
   }
  
   
+=======
+  "usingComponents": {}
+}
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78

pages/me/me.wxml

@@ -1,4 +1,5 @@
 <!--pages/me/me.wxml-->
+<<<<<<< HEAD
 <view class="container">
   <!-- 个人信息 -->
   <view class="message">
@@ -52,4 +53,7 @@
   </view>
 
   <view class="other"></view>
-</view>
+</view>
+=======
+<text>pages/me/me.wxml</text>
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78

pages/me/me.wxss

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /* pages/me/me.wxss */
 .container{
   width: 100vh;
@@ -196,4 +197,7 @@
   position: absolute;
   top: 72vh;
   left: 0;
-}
+}
+=======
+/* pages/me/me.wxss */
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78

pages/search/index.js

@@ -123,7 +123,10 @@ Page({
  
   onSearch() {
     let list = this.data.foods;
+<<<<<<< HEAD
     // 给你一个数组  里面包含a这个字的元素  将这些元素抛入新数组 
+=======
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
     let inputData = this.data.info
     let showList = [];
     for (let i = 0; i < list.length; i++) {

pages/search/index.json

@@ -6,6 +6,9 @@
     "van-row": "@vant/weapp/row",
     "van-col": "@vant/weapp/col",
     "van-submit-bar": "@vant/weapp/submit-bar"
+<<<<<<< HEAD
 
+=======
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   }
 }

project.config.json

@@ -47,7 +47,11 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.19.4",
+<<<<<<< HEAD
   "appid": "wx14d5f43259cae512",
+=======
+  "appid": "wxc06fe0355f1e6452",
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   "projectname": "miniprogram-92",
   "condition": {},
   "editorSetting": {

project.private.config.json

@@ -4,7 +4,11 @@
   "setting": {
     "compileHotReLoad": true
   },
+<<<<<<< HEAD
   "libVersion": "2.10.4",
+=======
+  "libVersion": "2.19.6",
+>>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   "condition": {
     "miniprogram": {
       "list": [