店铺管理头像

app.json

@@ -1,5 +1,5 @@
 {
-<<<<<<< HEAD
+
   "pages":[
     "pages/index/index",
     "pages/logs/logs"
@@ -20,36 +20,3 @@
 
   
 }
-=======
-  "pages": [
-    "pages/index/index",
-    "pages/logs/logs",
-    "pages/billing_Statistics/index",
-    "pages/store_Management/index",
-    "pages/increase/increase",
-    "pages/details/orderDetails",
-    "pages/search/search",
-    "pages/message/message",
-    "pages/login/login"
-  ],
-  "window": {
-    "backgroundTextStyle": "light",
-    "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "商家端",
-    "navigationBarTextStyle": "black"
-  },
-  "usingComponents": {
-    "van-button": "@vant/weapp/button",
-    "van-field": "@vant/weapp/field/index",
-    "van-uploader": "@vant/weapp/uploader/index",
-    "van-search": "@vant/weapp/search/index",
-    "van-row": "@vant/weapp/row/index",
-    "van-col": "@vant/weapp/col/index",
-    "van-panel": "@vant/weapp/panel/index",
-    "van-cell": "@vant/weapp/cell/index",
-    "van-cell-group": "@vant/weapp/cell-group/index",
-    "van-image": "@vant/weapp/image/index"
-  },
-  "sitemapLocation": "sitemap.json"
-}
->>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c

pages/index/index.json

@@ -1,22 +1,14 @@
 {
-<<<<<<< HEAD
+
   
   "usingComponents": {
     "van-tab": "@vant/weapp/tab/index",
-    "van-tabs": "@vant/weapp/tabs/index",
-=======
-  "usingComponents": {
-    "van-tab": "@vant/weapp/tab/index",
-    "van-tabs": "@vant/weapp/tabs/index",
     "van-button": "@vant/weapp/button",
->>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
     "van-icon": "@vant/weapp/icon/index"
   }
-<<<<<<< HEAD
-  
+
+}
   
-=======
->>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c
-}
+

pages/index/index.wxml

@@ -1,8 +1,8 @@
-<<<<<<< HEAD
+
 <!--index.wxml-->
-=======
 
->>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c
+
+<view>
 <view class="header">
   <view class="text">
     <input type="text" placeholder="搜索用户手机号" />
@@ -131,8 +131,8 @@
 </view>
   
 </view>
-<<<<<<< HEAD
+
 </view>
-=======
+
 </view>
->>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c
+

pages/index/index.wxss

@@ -1,5 +1,5 @@
 /**index.wxss**/
-<<<<<<< HEAD
+
 .header{
   height: 6.16vh;
   border: gray 1px solid;
@@ -111,7 +111,7 @@ height:9vh;
 .img-box{
   text-align: center;
   font-size: 11px;
-=======
+}
 
 .userinfo {
   display: flex;
@@ -131,5 +131,5 @@ height:9vh;
 .usermotto {
   margin-top: 200px;
 
->>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c
+
 }

project.config.json

@@ -47,15 +47,11 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.19.4",
-<<<<<<< HEAD
-  "appid": "wxe1ecd56185c011f9",
-=======
   "appid": "wx57c1363607c7f1e8",
->>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c
-  "projectname": "miniprogram-92",
   "condition": {},
   "editorSetting": {
     "tabIndent": "insertSpaces",
     "tabSize": 2
-  }
+  },
+  "projectname": "miniprogram-92"
 }