qiao

app.json

@@ -10,7 +10,7 @@
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "Weixin",
+    "navigationBarTitleText": "商家端",
     "navigationBarTextStyle": "black"
   },
   "usingComponents": {

pages/index/index.json

@@ -1,24 +1,10 @@
 {
-<<<<<<< HEAD
-  "usingComponents": {
-    "van-button": "@vant/weapp/button"
-  }
-=======
-<<<<<<< HEAD
-  "usingComponents": {
-    "van-button": "@vant/weapp/button"
-  }
-=======
-  
   "usingComponents": {
     "van-tab": "@vant/weapp/tab/index",
     "van-tabs": "@vant/weapp/tabs/index",
+    "van-button": "@vant/weapp/button",
     "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
     "van-icon": "@vant/weapp/icon/index"
   }
-  
-  
->>>>>>> c8a92b5 (订单页面)
->>>>>>> 6726491 (订单页面)
 }

pages/index/index.wxml

@@ -1,39 +1,4 @@
-<!--index.wxml-->
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
->>>>>>> 6726491 (订单页面)
-<view class="container">
-  <view class="userinfo">
-    <block wx:if="{{canIUseOpenData}}">
-      <view class="userinfo-avatar" bindtap="bindViewTap">
-        <open-data type="userAvatarUrl"></open-data>
-      </view>
-      <open-data type="userNickName"></open-data>
-    </block>
-    <block wx:elif="{{!hasUserInfo}}">
-      <button wx:if="{{canIUseGetUserProfile}}" bindtap="getUserProfile"> 获取头像昵称 </button>
-      <button wx:elif="{{canIUse}}" open-type="getUserInfo" bindgetuserinfo="getUserInfo"> 获取头像昵称 </button>
-      
-
-      <view wx:else> 请使用1.4.4及以上版本基础库 </view>
-    </block>
-    <block wx:else>
-      <image bindtap="bindViewTap" class="userinfo-avatar" src="{{userInfo.avatarUrl}}" mode="cover"></image>
-      <text class="userinfo-nickname">{{userInfo.nickName}}</text>
-    </block>
-  </view>
-  <view class="usermotto">
-    <text class="user-motto">{{motto}}</text>
-  </view>
-  <van-button type="primary">按钮</van-button>
-</view>
-<!-- 两端对齐 -->
-
 
-<<<<<<< HEAD
-=======
-=======
 <view class="header">
   <view class="text">
     <input type="text" placeholder="搜索用户手机号" />
@@ -163,5 +128,3 @@
   
 </view>
 </view>
->>>>>>> c8a92b5 (订单页面)
->>>>>>> 6726491 (订单页面)

pages/index/index.wxss

@@ -1,8 +1,5 @@
 /**index.wxss**/
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
->>>>>>> 6726491 (订单页面)
+
 .userinfo {
   display: flex;
   flex-direction: column;
@@ -20,117 +17,5 @@
 
 .usermotto {
   margin-top: 200px;
-<<<<<<< HEAD
-=======
-=======
-.header{
-  height: 35px;
-  border: gray 1px solid;
-  border-radius: 20px;
-  margin: 0 10px 0 10px;
-}
-.text{
-  height: 30px;
-  width: 240px;
-  display: inline-block;
-  /* background: blue; */
-  margin-left: 20px;
-  line-height: 30px;
-  margin-top: 5px;
-  position: relative;
-}
-.text input{
-  position: absolute;
-  top: 0px;
-}
-.btn1{
-  line-height: 40px;
-  margin-top: 0px;
-  height: 30px;
-  width: 90px;
-  display: inline-block;
-  position: absolute;
-  top: 1.5px;
-  text-align: center;
-  align-items: center;
-}
-.btn1 button{
-  font-size: 13px;
-  border-radius:20px;
-  background: orange;
-  color: #ffff;
-}
-
-.serve{
-  margin-top: 20px;
-}
-.serve-con{
-  width: auto;
-  height: 75vh;
-  background:		#F5F5F5	;
-}
-.content1{
-  width: 340px;
-  height: 30vh;
-  background: #ffff;
-  margin: 20px 20px 0 20px ;
-  margin-left: 5vw;
-  border-radius: 10px;
-  float: left;
-}
-
-.content-num{
-  width: 320px;
-  height: 5vh;
-  margin: 10px 0 0 10px;
 
-  font-size: 14px;
-  border-bottom: gray 1px solid;
-  display: inline-block;
-}
-
-.num-left{
-  display: inline-block;
-  margin-left: 120px;
-  width: 40px;
-}
-.content-msg{
-  margin: 10px 0 0 10px;
-}
-.msg-right{
-  /* display: inline-block; */
-  /* margin-left: 220px; */
-  color: orange;
-  float: right;
-  margin-right: 3vh;
-}
-.msg-left{
-  margin: 10px 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:8vh;
-}
-
-.footer-img{
-  width: 33.3vw;
-  display: inline-block;
-}
-.img-box{
-  text-align: center;
-  font-size: 11px;
->>>>>>> c8a92b5 (订单页面)
->>>>>>> 6726491 (订单页面)
 }