bug

app.json

@@ -2,12 +2,8 @@
   "pages": [
     "pages/index/index",
     "pages/search/index",
-<<<<<<< HEAD
     "pages/me/me",
     "pages/exchange/exchange"
-=======
-    "pages/me/me"
->>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -18,7 +14,6 @@
   "tabBar": {
     "color": "#CBCBCB",
     "selectedColor": "#F9872C",
-<<<<<<< HEAD
     "list": [
       {
         "pagePath": "pages/index/index",
@@ -32,23 +27,9 @@
         "iconPath": "/images/icon/me.png",
         "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"
   },
   "sitemapLocation": "sitemap.json"
-}
+}}

pages/index/index.json

@@ -3,11 +3,7 @@
     "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,10 +1,9 @@
-<<<<<<< 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>
 <!-- 搜索框 -->
 <view class="search_container">
   <view class="inputContent">
@@ -12,7 +11,7 @@
     <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>
@@ -25,10 +24,9 @@
     </swiper-item>
   </swiper>
 
-<<<<<<< HEAD
-<!-- 商品标签页 -->
-=======
+
   <!-- 商品标签页 -->
- 
->>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
+
+  <!-- 商品标签页 -->
+
 </view>

pages/index/index.wxss

@@ -1,8 +1,8 @@
-<<<<<<< HEAD
+
 /* 轮播图样式 */
 .swiper {
   height: 270rpx ;
-=======
+}
 /* 搜索框样式 */
 .inputContent {
   width: 95%;
@@ -38,7 +38,6 @@
 /* 轮播图样式 */
 .swiper {
   height: 270rpx;
->>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   margin: 20rpx;
   border-radius: 10px;
 }
@@ -48,7 +47,3 @@
   width: 100%;
   height: 100%;
 }
-<<<<<<< HEAD
-
-=======
->>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78

pages/me/me.js

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

pages/me/me.json

@@ -1,14 +1,7 @@
 {
-<<<<<<< HEAD
   "usingComponents": {
     "van-image": "@vant/weapp/image/index",
     "van-icon": "@vant/weapp/icon/index"
   },
   "navigationBarTitleText": "我的"
-  }
- 
-  
-=======
-  "usingComponents": {}
-}
->>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
+}

pages/me/me.wxml

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

pages/me/me.wxss

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

pages/search/index.js

@@ -123,10 +123,7 @@ 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,9 +6,5 @@
     "van-row": "@vant/weapp/row",
     "van-col": "@vant/weapp/col",
     "van-submit-bar": "@vant/weapp/submit-bar"
-<<<<<<< HEAD
-
-=======
->>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   }
 }

pages/search/index.wxml

@@ -46,7 +46,4 @@
     <van-submit-bar  price="{{ totalPrice*100 }}" button-text="去结算" bind:submit="onSubmit" />
   </view>
   </view>
-
-
-  
 </view>

project.config.json

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

project.private.config.json

@@ -1,31 +1,8 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "delivery-customer",
-  "setting": {
-    "compileHotReLoad": true
-  },
-<<<<<<< HEAD
-  "libVersion": "2.10.4",
-=======
-  "libVersion": "2.19.6",
->>>>>>> 3f957164efdb7318fceb5ccdc8d82e9c7804ff78
   "condition": {
     "miniprogram": {
       "list": [
-        {
-          "name": "商家页面——搜索",
-          "pathName": "pages/merchant_page/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/search/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
         {
           "name": "",
           "pathName": "pages/index/index",