order

pages/jcy/jcy.wxml

@@ -1,116 +0,0 @@
-<van-search value="{{ value }}" placeholder="请输入关键词" shape="round" background="#FFFFFF" use-left-icon-slot="false" />
-<!-- <van-divider /> -->
-
-<view>
-  <view class="button">
-    <view class="bon">
-      <van-button plain hairline type="primary" size="mini" round="ture">一键上架</van-button>
-      <van-button plain hairline type="primary" size="mini" color="#E73471" round="ture">一键下架</van-button>
-      <van-button plain hairline type="info" size="mini" color="#9FA0A2" round="ture"> 删除</van-button>
-    </view>
-    <checkbox-group bindchange="selectAll" style="float: left;">
-      <checkbox value="all" checked="{{checkedAll}}"></checkbox>全选
-    </checkbox-group>
-  </view>
-
-  <view class="sb">
-  <view>
-    <van-cell>
-      <view slot="title">
-        <view class="van-cell-text">
-          <van-checkbox value="{{ checked }}" checked-color="#07c160" bind:change="onChange">
-            老式麻辣烫（微辣）
-            <van-icon name="new-arrival" color="#FF8E0B" style="float: right;" />
-          </van-checkbox>
-        </view>
-      </view>
-    </van-cell>
-  </view>
-    <van-cell>
-      <view class="flex-row">
-        <view class="flex-view-item">
-          <van-image width="120" height="90" src="https://img-qn-4.51miz.com/Element/00/22/71/67/3b9c76d3_E227167_afb2884f.png!/quality/90/unsharp/true/compress/true/format/png/fh/320" />
-        </view>
-        <view class="flex-view-item">
-          <view>价格:￥9.9</view>
-          <view>原价:￥15.9</view>
-          <view>积分:20</view>
-          <view>内容:内容</view>
-        </view>
-        <view class="flex-view-item">
-          <view class="view_class">
-            <van-button type="primary" color="#999999" size="mini">修改</van-button>
-            <van-button type="primary" color="#999999" size="mini">删除</van-button>
-          </view>
-        </view>
-      </view>
-    </van-cell>
-  </view>
-
-  <view class="sb">
-    <van-cell>
-      <view slot="title">
-        <view class="van-cell-text">
-          <van-checkbox value="{{ checked }}" checked-color="#07c160" bind:change="onChange">
-            老式麻辣烫（微辣）
-            <van-icon name="new-arrival" color="#FF8E0B" style="float: right;" />
-          </van-checkbox>
-        </view>
-       
-      </view>
-    </van-cell>
-    <van-cell>
-      <view class="flex-row">
-        <view class="flex-view-item">
-          <van-image width="120" height="90" src="https://img-qn-4.51miz.com/Element/00/22/71/67/3b9c76d3_E227167_afb2884f.png!/quality/90/unsharp/true/compress/true/format/png/fh/320" />
-        </view>
-        <view class="flex-view-item">
-          <view>价格:￥9.9</view>
-          <view>原价:￥15.9</view>
-          <view>积分:20</view>
-          <view>内容:内容</view>
-        </view>
-        <view class="flex-view-item">
-          <view class="view_class">
-            <van-button type="primary" color="#999999" size="mini">修改</van-button>
-            <van-button type="primary" color="#999999" size="mini">删除</van-button>
-          </view>
-        </view>
-      </view>
-    </van-cell>
-  </view>
-
-
-  <view class="sb">
-    <van-cell>
-      <view slot="title">
-        <view class="van-cell-text">
-          <van-checkbox value="{{ checked }}" checked-color="#07c160" bind:change="onChange">
-            老式麻辣烫（微辣）
-            <van-icon name="new-arrival" color="#FF8E0B" style="float: right;" />
-          </van-checkbox>
-
-        </view>
-      </view>
-    </van-cell>
-    <van-cell>
-      <view class="flex-row">
-        <view class="flex-view-item">
-          <van-image width="120" height="90" src="https://img-qn-4.51miz.com/Element/00/22/71/67/3b9c76d3_E227167_afb2884f.png!/quality/90/unsharp/true/compress/true/format/png/fh/320" />
-        </view>
-        <view class="flex-view-item">
-          <view>价格:￥9.9</view>
-          <view>原价:￥15.9</view>
-          <view>积分:20</view>
-          <view>内容:内容</view>
-        </view>
-        <view class="flex-view-item">
-          <view class="view_class">
-            <van-button type="primary" color="#999999" size="mini">修改</van-button>
-            <van-button type="primary" color="#999999" size="mini">删除</van-button>
-          </view>
-        </view>
-      </view>
-    </van-cell>
-  </view>
-</view>

pages/index/index.json

@@ -1,5 +1,24 @@
 {
+<<<<<<< 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-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,4 +1,8 @@
 <!--index.wxml-->
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 6726491 (订单页面)
 <view class="container">
   <view class="userinfo">
     <block wx:if="{{canIUseOpenData}}">
@@ -27,3 +31,137 @@
 <!-- 两端对齐 -->
 
 
+<<<<<<< HEAD
+=======
+=======
+<view class="header">
+  <view class="text">
+    <input type="text" placeholder="搜索用户手机号" />
+  </view>
+  <view class="btn1">
+    <button>搜索</button>
+  </view>
+</view>
+
+<view class="serve">
+  <van-tabs active="a">
+    <van-tab title="待送达" name="a">
+      <view class="serve-con">
+        <view class="content1">
+          <view class="content-num">
+            <view>订单编号:98989898989<view class="num-left">详情></view>
+            </view>
+          </view>
+          <view class="content-msg">
+          <view class="msg-left">姓名：吴迪 （先生）<view class="msg-right">待送达</view></view>
+          <view class="msg-left">手机号：13889004083</view>
+          <view class="msg-left">地址：黑龙江工程学院二公寓408</view>
+          <view class="msg-left">下单时间：2023-4-27 09:06:29<button class="btn2">重新打印</button> </view>
+          </view>
+        </view>
+        <view class="content1">
+          <view class="content-num">
+            <view>订单编号:98989898989<view class="num-left">详情></view>
+            </view>
+          </view>
+          <view class="content-msg">
+          <view class="msg-left">姓名：吴迪 （先生）
+          <text class="msg-right">待送达</text>
+          </view>
+          <view class="msg-left">手机号：13889004083</view>
+          <view class="msg-left">地址：黑龙江工程学院二公寓408</view>
+          <view class="msg-left">下单时间：2023-4-27 09:06:29 <button class="btn2">重新打印</button> </view>
+          </view>
+        </view>
+      </view>
+    </van-tab>
+    <van-tab title="已送达" name="b">
+      <view class="serve-con">
+        <view class="content1">
+          <view class="content-num">
+            <view>订单编号:98989898989<view class="num-left">详情></view>
+            </view>
+          </view>
+          <view class="content-msg">
+          <view class="msg-left">姓名：吴迪 （先生）
+            <text class="msg-right" style="color:#D3D3D3	 ;">已送达</text>
+          </view>
+          <view class="msg-left">手机号：13889004083</view>
+          <view class="msg-left">地址：黑龙江工程学院二公寓408</view>
+          <view class="msg-left">下单时间：2023-4-27 09:06:29<button class="btn2">重新打印</button> </view>
+          </view>
+        </view>
+        <view class="content1">
+          <view class="content-num">
+            <view>订单编号:98989898989<view class="num-left">详情></view>
+            </view>
+          </view>
+          <view class="content-msg">
+          <view class="msg-left">姓名：吴迪 （先生）
+          <text class="msg-right" style="color:#D3D3D3	 ;">已送达</text>
+          </view>
+          <view class="msg-left">手机号：13889004083</view>
+          <view class="msg-left">地址：黑龙江工程学院二公寓408</view>
+          <view class="msg-left">下单时间：2023-4-27 09:06:29 <button class="btn2">重新打印</button> </view>
+          </view>
+        </view>
+      </view>
+    </van-tab>
+    <van-tab title="已付款" name="c">
+      <view class="serve-con">
+        <view class="content1">
+          <view class="content-num">
+            <view>订单编号:98989898989<view class="num-left">详情></view>
+            </view>
+          </view>
+          <view class="content-msg">
+          <view class="msg-left">姓名：吴迪 （先生）
+            <text class="msg-right" style="color:#D3D3D3	 ;">已付款</text>
+          </view>
+          <view class="msg-left">手机号：13889004083</view>
+          <view class="msg-left">地址：黑龙江工程学院二公寓408</view>
+          <view class="msg-left">下单时间：2023-4-27 09:06:29<button class="btn2">重新打印</button> </view>
+          </view>
+        </view>
+        <view class="content1">
+          <view class="content-num">
+            <view>订单编号:98989898989<view class="num-left">详情></view>
+            </view>
+          </view>
+          <view class="content-msg">
+          <view class="msg-left">姓名：吴迪 （先生）
+          <text class="msg-right" style="color:#D3D3D3	 ;">已付款</text>
+          </view>
+          <view class="msg-left">手机号：13889004083</view>
+          <view class="msg-left">地址：黑龙江工程学院二公寓408</view>
+          <view class="msg-left">下单时间：2023-4-27 09:06:29 <button class="btn2">重新打印</button> </view>
+          </view>
+        </view>
+      </view>
+    </van-tab>
+  </van-tabs>
+</view>
+
+<view class="footer">
+<view class="footer-img">
+<view class="img-box">
+  <van-icon name="orders-o" size="30px" />
+  <view>订单</view>
+</view>
+</view>
+<view class="footer-img">
+<view class="img-box">
+  <van-icon name="chat-o" dot size="30px"/>
+  <view>消息</view>
+</view>
+</view>
+<view class="footer-img">
+<view class="img-box">
+  <van-icon name="user-o" size="30px"/>
+  <view>我的</view>
+</view>
+  
+</view>
+</view>
+>>>>>>> c8a92b5 (订单页面)
+>>>>>>> 6726491 (订单页面)

pages/index/index.wxss

@@ -1,4 +1,8 @@
 /**index.wxss**/
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 6726491 (订单页面)
 .userinfo {
   display: flex;
   flex-direction: column;
@@ -16,4 +20,117 @@
 
 .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 (订单页面)
 }

pink/app.json

@@ -1,34 +0,0 @@
-{
-  "pages": [
-    "pages/index/index",
-    "pages/logs/logs",
-    "pages/billing_Statistics/index",
-    "pages/store_Management/index",
-    "pages/jcy/jcy"
-  ],
-  "window": {
-    "backgroundTextStyle": "light",
-    "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "Weixin",
-    "navigationBarTextStyle": "black"
-  },
-  "usingComponents": {
-    "van-button": "@vant/weapp/button/index",
-    "van-action-sheet": "@vant/weapp/action-sheet/index",
-    "van-search": "@vant/weapp/search/index",
-    "van-tab": "@vant/weapp/tab/index",
-    "van-tabs": "@vant/weapp/tabs/index",
-    "van-cell": "@vant/weapp/cell/index",
-    "van-cell-group": "@vant/weapp/cell-group/index",
-    "van-icon": "@vant/weapp/icon/index",
-    "van-panel": "@vant/weapp/panel/index",
-    "van-divider": "@vant/weapp/divider/index",
-    "van-grid": "@vant/weapp/grid/index",
-    "van-grid-item": "@vant/weapp/grid-item/index",
-    "van-uploader": "@vant/weapp/uploader/index",
-    "van-calendar": "@vant/weapp/calendar/index",
-    "van-popup": "@vant/weapp/popup/index",
-    "van-dialog": "@vant/weapp/dialog/index"
-  },
-  "sitemapLocation": "sitemap.json"
-}

pink/pages/jcy/jcy.js

@@ -1,66 +0,0 @@
-// pages/jcy/jcy.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})