app.json

@@ -1,4 +1,26 @@
 {
+<<<<<<< HEAD
+  "pages":[
+    "pages/index/index",
+    "pages/logs/logs"
+  ],
+  "window":{
+    "backgroundTextStyle":"light",
+    "navigationBarBackgroundColor": "#fff",
+    "navigationBarTitleText": "商家端",
+    "navigationBarTextStyle":"black"
+  },
+  "usingComponents": {
+    "van-button":"@vant/weapp/button",
+    "van-tab": "@vant/weapp/tab/index",
+   "van-tabs": "@vant/weapp/tabs/index"
+  },
+
+  "sitemapLocation": "sitemap.json"
+
+  
+}
+=======
   "pages": [
     "pages/index/index",
     "pages/logs/logs",
@@ -29,4 +51,5 @@
     "van-image": "@vant/weapp/image/index"
   },
   "sitemapLocation": "sitemap.json"
-}
+}
+>>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c

pages/index/index.json

@@ -1,10 +1,22 @@
 {
+<<<<<<< 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,4 +1,8 @@
+<<<<<<< HEAD
+<!--index.wxml-->
+=======
 
+>>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c
 <view class="header">
   <view class="text">
     <input type="text" placeholder="搜索用户手机号" />
@@ -127,4 +131,8 @@
 </view>
   
 </view>
+<<<<<<< HEAD
 </view>
+=======
+</view>
+>>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c

pages/index/index.wxss

@@ -1,4 +1,117 @@
 /**index.wxss**/
+<<<<<<< HEAD
+.header{
+  height: 6.16vh;
+  border: gray 1px solid;
+  border-radius: 20px;
+  margin: 0 3.125vw;
+}
+.text{
+  height: 5.28vh;
+  width: 75vw;
+  display: inline-block;
+  /* background: blue; */
+  margin-left: 6.25vw;
+  line-height: 5.28vh;
+  margin-top: 0.88vh;
+  position: relative;
+}
+.text input{
+  position: absolute;
+  top: 0px;
+}
+.btn1{
+  line-height: 7.04vh;
+  margin-top: 0px;
+  height: 5.28vh;
+  width: 23vw;
+  display: inline-block;
+  position: absolute;
+  top: 0.26vh;
+  text-align: center;
+  align-items: center;
+  right: 3.8vw;
+}
+.btn1 button{
+  font-size: 13px;
+  border-radius:20px;
+  background: orange;
+  color: #ffff;
+}
+
+.serve{
+  margin-top: 3.52vh;
+  font-size: 13px;
+}
+.serve-con{
+  width: auto;
+  height: 71vh;
+  background:		#F5F5F5	;
+}
+.content1{
+  width: 90.66vw;
+  height: 30vh;
+  background: #ffff;
+  margin: 3vh 5.33vw 0 5.33vw ;
+  margin-left: 5vw;
+  border-radius: 10px;
+  float: left;
+}
+
+.content-num{
+  width: 85.33vw;
+  height: 5vh;
+  margin: 1.5vh 0 0 2.6vw;
+
+  font-size: 12px;
+  border-bottom: gray 1px solid;
+  display: inline-block;
+}
+
+.num-left{
+  display: inline-block;
+  margin-left: 33.61vw;
+  width: 11.2vw;
+}
+.content-msg{
+  margin: 1.5vh 0 0 2.6vw;
+}
+.msg-right{
+  /* display: inline-block; */
+  /* margin-left: 220px; */
+  color: orange;
+  float: right;
+  margin-right: 3vh;
+}
+.msg-left{
+  margin: 1.5vh 0 0 0;
+}
+
+.btn2{
+  /* display: inline-block; */
+  float: right;
+  font-size: 12px;
+ 
+  /* margin-left: 180px; */
+  background: orange;
+  color: #fff;
+}
+.footer{
+position:fixed;
+bottom : 0;
+left:0;
+right:0;
+height:9vh;
+}
+
+.footer-img{
+  width: 33.3vw;
+  display: inline-block;
+}
+.img-box{
+  text-align: center;
+  font-size: 11px;
+=======
 
 .userinfo {
   display: flex;
@@ -18,4 +131,5 @@
 .usermotto {
   margin-top: 200px;
 
+>>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c
 }

project.config.json

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

project.private.config.json

@@ -4,6 +4,9 @@
   "setting": {
     "compileHotReLoad": true
   },
+<<<<<<< HEAD
+  "libVersion": "2.19.6"
+=======
   "condition": {
     "miniprogram": {
       "list": [
@@ -52,4 +55,5 @@
       ]
     }
   }
+>>>>>>> 433a4c6b7ddd90c2c9e3d215e91e2fbfafb60b2c
 }