liuxinyang 1 年間 前
コミット
6eb5e95a41

+ 4 - 2
app.json

@@ -6,12 +6,14 @@
     "pages/serch/serch",
     "pages/logs/logs",
     "pages/my/my",
-    "pages/Integral/my-Integral",
     "pages/address/address",
     "pages/change/change",
     "pages/new/new",
     "pages/success/success",
-    "pages/Integral/Integral"
+    "pages/Integral/Integral",
+    "pages/OrderCheck/OrderCheck",
+    "pages/OrderView/index",
+    "pages/my order/myOrder"
   ],
   "window": {
     "backgroundTextStyle": "light",

BIN
images/image.png


+ 12 - 8
pages/Businesses/Businesses.js

@@ -6,6 +6,8 @@ Page({
   data: {
     money: 9.9,
     Integral: 20,
+    stagingMoney:0,
+    stagingMoney1: 0,
     allMoney: 0,
     allIntegral: 0,
     number: 0,
@@ -28,6 +30,7 @@ Page({
         this.setData({
           list: data.list,
         });
+        console.log(e);
       },
     });
     wx.request({
@@ -49,7 +52,7 @@ Page({
   },
   prev1() {
     this.setData({
-      allMoney: this.data.allMoney - this.data.money
+      allMoney: this.data.allMoney - this.data.money,
     });
   },
   plus() {
@@ -60,7 +63,7 @@ Page({
   },
   plus1() {
     this.setData({
-      allMoney: this.data.allMoney + this.data.money
+      allMoney: this.data.allMoney + this.data.money,
     });
   },
   OnInput(e) {
@@ -75,9 +78,10 @@ Page({
       }
       this.data.allMoney += list[i].status * this.data.money;
       this.data.allIntegral += list[i].status * this.data.Integral;
+      this.data.stagingMoney = this.data.allMoney;
     }
     this.setData({
-      allMoney: this.data.allMoney,
+      allMoney: this.data.stagingMoney1+this.data.stagingMoney,
       allIntegral: this.data.allIntegral,
     });
   },
@@ -92,16 +96,16 @@ Page({
         list[i].status = value;
       }
       this.data.allMoney += list[i].status * this.data.money;
+      this.data.stagingMoney1 = this.data.allMoney;
     }
     this.setData({
-      allMoney: this.data.allMoney,
-      allIntegral: this.data.allIntegral,
+      allMoney: this.data.stagingMoney1+this.data.stagingMoney,
     });
   },
-  goSerch(){
+  goSerch() {
     wx.navigateTo({
-      url: '../serch-outcome/serch-outcome',
-    })
+      url: "../serch-outcome/serch-outcome",
+    });
   },
   /**
    * 生命周期函数--监听页面初次渲染完成

+ 1 - 1
pages/Businesses/Businesses.wxml

@@ -84,7 +84,7 @@
             <view class="order-money">
               ¥{{item.money}}
             </view>
-            <van-stepper bind:blur="OnInput1" bind:minus="prev1" bind:plus="plus1" bind:change="onChange" data-id="{{item.id}}" class="minus-class" min="0" value="{{ 0 }}" round button-size="20px" input-width="36px" />
+            <van-stepper bind:blur="OnInput1" bind:minus="prev1" bind:plus="plus1" data-id="{{item.id}}" class="minus-class" min="0" value="{{ 0 }}" round button-size="20px" input-width="36px" />
           </view>
         </view>
       </view>

+ 0 - 2
pages/Integral/my-Integral.wxml

@@ -1,2 +0,0 @@
-<!--pages/Integral/my-Integral.wxml-->
-<text>pages/Integral/my-Integral.wxml</text>

+ 64 - 0
pages/OrderCheck/OrderCheck.js

@@ -0,0 +1,64 @@
+// index.js
+// 获取应用实例
+const app = getApp()
+Page({
+    data: {
+
+      textareaValue: '',// 文本域的值
+      show: false, 
+      isEmply:true,
+      address:[{
+        detail:"111",
+        phone:"111"
+      },{
+        detail:"222",
+        phone:"222"
+      },{
+        detail:"333",
+        phone:"333"
+      },],
+      checkAddress:"",
+    },
+    handleClickCell(event){
+      console.log(event);
+      console.log(event.currentTarget.dataset.item);
+      this.setData({ checkAddress: event.currentTarget.dataset.item });
+      this.setData({ isEmply:true });
+      this.onClose()
+    },
+    showPopup() {
+      this.setData({ show: true });
+    },
+    onClose() {
+      this.setData({ show: false });
+    },
+    jumpToPage: function() {
+      wx.navigateTo({
+        url: '../OrderView/index' // 跳转
+      })
+    },
+    onTextareaInput(event) {
+      const value = event.detail.value;
+      console.log("111");
+      if (value.length <= 150) {
+        this.setData({
+          textareaValue: value,
+        });
+      }
+    },
+    onClickButton: function() {
+      console.log('Button clicked.');
+    },
+    onLoad() {
+        if (wx.getUserProfile) {
+            this.setData({
+                canIUseGetUserProfile: true
+            })
+        }
+        console.log('Page loaded.');
+        wx.setNavigationBarTitle({ title: '查看订单' })
+    },
+    handleClick:function(){
+      console.log("xixixi");
+    }
+})

+ 20 - 0
pages/OrderCheck/OrderCheck.json

@@ -0,0 +1,20 @@
+{
+  "usingComponents": {
+    "van-icon": "@vant/weapp/icon/index",
+    "van-search": "@vant/weapp/search/index",
+    "van-button": "@vant/weapp/button/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-divider": "@vant/weapp/divider/index",
+    "van-switch": "@vant/weapp/switch/index",
+    "van-checkbox": "@vant/weapp/checkbox/index",
+    "van-checkbox-group": "@vant/weapp/checkbox-group/index",
+    "van-submit-bar": "@vant/weapp/submit-bar/index",
+    "van-calendar": "@vant/weapp/calendar/index",
+    "van-uploader": "@vant/weapp/uploader/index",
+    "van-popup": "@vant/weapp/popup/index",
+    "van-overlay": "@vant/weapp/overlay/index"
+  }
+}

+ 55 - 0
pages/OrderCheck/OrderCheck.wxml

@@ -0,0 +1,55 @@
+<view class="container">
+  <view class="header no-address" bindtap="showPopup" >
+    <text class="address">{{checkAddress.detail ?checkAddress.detail :'请选择收货地址'}}</text>
+    <!-- 有地址时候 no-address class去掉就行 加一行text-->
+    <text class="detail color-grey">{{checkAddress.phone ?checkAddress.phone :''}}</text>
+    <text class="detail color-grey">></text>
+  </view>
+ 
+  <view class="content">
+    <text class="shop-name with-line">This is a simple demo page.</text>
+    <view class="item with-line">
+      <view class="item-detail">
+        <image class="pic" src="./images/3.png" alt="" srcset="" />
+        <view class="bug-detail">
+          <text class="name">理工麻辣烫</text>
+          <text class="num color-grey ">*2</text>
+        </view>
+      </view>
+      <view class="item-price">
+        <text class="price-new color-red">$20+40积分</text>
+        <text class="price-old color-grey">$50</text>
+      </view>
+    </view>
+    <view class="package with-line">
+      <text class="name color-grey">包装费</text>
+      <text class="num color-red">$2</text>
+    </view>
+    <view class="pay with-line">
+      <text class="name color-grey">付款费</text>
+      <text class="num color-red">$2</text>
+    </view>
+    <text class="total">已优惠 <text class="color-red">¥10</text>累计<text class="color-red">¥10</text></text>
+  </view>
+  <view class="data">
+    <view class="data-detail">
+      <text class="name">备注</text>
+      <textarea bindinput="onTextareaInput"></textarea>
+      <text class="counter">{{ textareaValue.length }}/150</text>
+    </view>
+  </view>
+  <view class="bottom-total">
+    <text class="name">累计 <text class="color-red">$20</text> </text>
+    <button bindtap="jumpToPage">提交订单</button>
+  </view>
+</view>
+<view>
+
+  <van-popup show="{{ show }}" bind:close="onClose" custom-style="height: 70%;width:100%">
+    <van-cell-group>
+      <van-cell title="单元格" value="内容" label="描述信息" border="{{ true }}" icon="location-o" />
+
+      <van-cell wx:for="{{address}}" wx:key="this" title="{{item.detail}}" value="{{item.phone}}" data-item="{{item}}" label="描述信息" border="{{true}}" bind:click='handleClickCell' icon="location-o" />
+    </van-cell-group>
+  </van-popup>
+</view>

+ 206 - 0
pages/OrderCheck/OrderCheck.wxss

@@ -0,0 +1,206 @@
+.container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: flex-start;
+  align-content: center;
+  flex-wrap: nowrap;
+  height: 100vh;
+}
+
+.header,
+.data,
+.order-other {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  justify-content: center;
+
+  background-color: #fff;
+  border-bottom: 6px solid #eee;
+  padding-left: 20px;
+
+}
+
+.header .address {
+  font-size: 20px;
+
+  color: #333;
+}
+
+.header .detail {
+  font-size: 16px;
+  margin-top: 5px;
+  color: rgb(151, 151, 151);
+}
+
+.header.no-address {
+  justify-content: space-between;
+  flex-direction: row;
+  padding-bottom: 20px;
+  padding: 0 10px 20px;
+}
+
+.header.no-address .address {
+  margin-left: 20px;
+}
+
+.header.no-address .detail {
+  margin-right: 20px;
+}
+
+.with-line {
+  padding-top: 10px;
+  padding-bottom: 10px;
+
+  border-bottom: 2px solid #eee;
+}
+
+.content {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  justify-content: center;
+
+  width: calc(100% - 40px);
+}
+
+.shop-name {
+  font-size: 16px;
+  color: #333;
+
+}
+
+.item {
+  display: flex;
+  justify-content: space-between;
+  align-content: space-between;
+  width: 100%;
+
+}
+
+.item .item-detail {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-content: center;
+
+}
+
+.color-grey {
+  color: rgb(151, 151, 151);
+}
+
+.color-red {
+  color: rgba(255, 0, 0, 0.575);
+}
+
+.item .item-detail .pic {
+  width: 80px;
+  height: 48px;
+  margin-right: 10px;
+}
+
+.item .item-detail .bug-detail {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-content: center;
+  align-items: flex-start;
+}
+
+.item .item-detail .bug-detail .num,
+.item-price .price-old {
+  font-size: 14px;
+}
+
+.item .item-price {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-content: center;
+  align-items: flex-end;
+}
+
+.package,
+.pay,
+.data-detail {
+  display: flex;
+
+  justify-content: space-between;
+  align-content: space-between;
+  position: relative;
+}
+
+.data-detail .name {
+  width: 50px;
+}
+
+.counter {
+  position: absolute;
+  right: 10px;
+  bottom: 10px;
+}
+
+.data-detail textarea {
+  background-color: #f6f6f6;
+  height: 70px;
+}
+
+.content {
+  padding-bottom: 40px;
+
+}
+
+.total {
+  margin: 10px 0 -30px;
+  text-align: right;
+}
+
+.data {
+  border-top: 6px solid #eee;
+  height: unset;
+  width: calc(100% - 40px);
+  padding: 10px 20px;
+  border-bottom: unset;
+}
+
+.order-other {
+  height: unset;
+  width: calc(100% - 40px);
+  padding: 10px 20px;
+}
+
+.order-other .other-detail {
+  display: flex;
+
+  justify-content: flex-start;
+  align-content: space-between;
+  margin: 10px 0;
+}
+
+
+.bottom-total {
+  position: fixed;
+  bottom: 0;
+  display: flex;
+  align-content: space-between;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  width: calc(100% );
+  margin: 5px 0;
+  padding-top: 5px;
+  box-shadow: 0px -10px 24px 0px rgba(0, 0, 0, 0.08);
+}
+.bottom-total .name{
+  margin-left: 10px;
+}
+.bottom-total button {
+  margin: 0;
+  background: #ff8700;
+  border-radius: 50rpx;
+  padding: 0 30px;
+  margin-right: 10px;
+}

BIN
pages/OrderCheck/images/1.png


BIN
pages/OrderCheck/images/2.png


BIN
pages/OrderCheck/images/3.png


BIN
pages/OrderCheck/images/搜索.png


BIN
pages/OrderView/images/1.png


BIN
pages/OrderView/images/2.png


BIN
pages/OrderView/images/3.png


BIN
pages/OrderView/images/搜索.png


+ 25 - 0
pages/OrderView/index.js

@@ -0,0 +1,25 @@
+// index.js
+// 获取应用实例
+const app = getApp()
+
+Page({
+  data: {
+
+  
+  },
+  
+  onClickButton: function () {
+    console.log('Button clicked.');
+  },
+  onLoad() {
+    if (wx.getUserProfile) {
+      this.setData({
+        canIUseGetUserProfile: true
+      })
+    }
+    console.log('Page loaded.');
+    wx.setNavigationBarTitle({
+      title: '查看订单'
+    })
+  },
+})

+ 20 - 0
pages/OrderView/index.json

@@ -0,0 +1,20 @@
+{
+  "usingComponents": {
+    "van-icon": "@vant/weapp/icon/index",
+    "van-search": "@vant/weapp/search/index",
+    "van-button": "@vant/weapp/button/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-divider": "@vant/weapp/divider/index",
+    "van-switch": "@vant/weapp/switch/index",
+    "van-checkbox": "@vant/weapp/checkbox/index",
+    "van-checkbox-group": "@vant/weapp/checkbox-group/index",
+    "van-submit-bar": "@vant/weapp/submit-bar/index",
+    "van-calendar": "@vant/weapp/calendar/index",
+    "van-uploader": "@vant/weapp/uploader/index",
+    "van-popup": "@vant/weapp/popup/index",
+    "van-overlay": "@vant/weapp/overlay/index"
+  }
+}

+ 44 - 0
pages/OrderView/index.wxml

@@ -0,0 +1,44 @@
+<view class="container">
+  <view class="header">
+    <text class="address">Welcome to My App</text>
+    <text class="detail color-grey">Welcome to My App</text>
+  </view>
+  <view class="content">
+    <text class="shop-name with-line">This is a simple demo page.</text>
+    <view class="item with-line">
+      <view class="item-detail">
+        <image class="pic" src="./images/3.png" alt="" srcset="" />
+        <view class="bug-detail">
+          <text class="name">理工麻辣烫</text>
+          <text class="num color-grey ">*2</text>
+        </view>
+      </view>
+      <view class="item-price">
+        <text class="price-new color-red">$20+40积分</text>
+        <text class="price-old color-grey">$50</text>
+      </view>
+    </view>
+    <view class="package with-line">
+      <text class="name color-grey">包装费</text>
+      <text class="num color-red">$2</text>
+    </view>
+    <view class="pay with-line">
+      <text class="name color-grey">付款费</text>
+      <text class="num color-red">$2</text>
+    </view>
+  </view>
+  <view class="data">
+    <view class="data-detail">
+      <text class="name">备注</text>
+      <text class="num color-red">$2</text>
+    </view>
+
+  </view>
+  <view class="order-other">
+    <view class="other-detail">
+      <text class="name">订单编号:</text>
+      <text class="num color-grey">111111111</text>
+    </view>
+   
+  </view>
+</view>

+ 144 - 0
pages/OrderView/index.wxss

@@ -0,0 +1,144 @@
+.container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: flex-start;
+  align-content: center;
+  flex-wrap: nowrap;
+  height: 100vh;
+}
+
+.header,
+.data,
+.order-other {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  justify-content: center;
+  height: 70px;
+  background-color: #fff;
+  border-bottom: 6px solid #eee;
+  padding-left: 20px;
+}
+
+.header .address {
+  font-size: 20px;
+
+  color: #333;
+}
+
+.header .detail {
+  font-size: 16px;
+  margin-top: 5px;
+  color: rgb(151, 151, 151);
+}
+
+.with-line {
+  padding-top: 10px;
+  padding-bottom: 10px;
+
+  border-bottom: 2px solid #eee;
+}
+
+.content {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  justify-content: center;
+
+  width: calc(100% - 40px);
+}
+
+.shop-name {
+  font-size: 16px;
+  color: #333;
+
+}
+
+.item {
+  display: flex;
+  justify-content: space-between;
+  align-content: space-between;
+  width: 100%;
+
+}
+
+.item .item-detail {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-content: center;
+
+}
+
+.color-grey {
+  color: rgb(151, 151, 151);
+}
+
+.color-red {
+  color: rgba(255, 0, 0, 0.575);
+}
+
+.item .item-detail .pic {
+  width: 80px;
+  height: 48px;
+  margin-right: 10px;
+}
+
+.item .item-detail .bug-detail {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-content: center;
+  align-items: flex-start;
+}
+
+.item .item-detail .bug-detail .num,
+.item-price .price-old {
+  font-size: 14px;
+}
+
+.item .item-price {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-content: center;
+  align-items: flex-end;
+}
+
+.package,
+.pay,
+.data-detail {
+  display: flex;
+
+  justify-content: space-between;
+  align-content: space-between;
+
+}
+
+.content {
+  padding-bottom: 40px;
+
+}
+
+.data {
+  border-top: 6px solid #eee;
+  height: unset;
+  width: calc(100% - 40px);
+  padding: 10px 20px;
+}
+
+.order-other {
+  height: unset;
+  width: calc(100% - 40px);
+  padding: 10px 20px;
+}
+
+.order-other .other-detail {
+  display: flex;
+
+  justify-content: flex-start;
+  align-content: space-between;
+  margin: 10px 0;
+}

+ 39 - 27
pages/index/index.js

@@ -1,62 +1,74 @@
 // index.js
 // 获取应用实例
-const app = getApp()
+const app = getApp();
 
 Page({
   data: {
     swiperImgs: [
-      './images/5.png',
-      './images/6.png',
-      './images/7.png',
-      './images/1.png'
+      "./images/5.png",
+      "./images/6.png",
+      "./images/7.png",
+      "./images/1.png",
     ],
-    show: true,
+    show: false,
+    showCard: false,
   },
   showPopup() {
     this.setData({ show: true });
   },
-
+  goSerch(){
+    wx.navigateTo({
+      url: '../Businesses/Businesses',
+    })
+  },
   onClose() {
     this.setData({ show: false });
   },
   CompleteInformation() {
     wx.navigateTo({
-      url: '../logs/logs'
+      url: '../new/new'
     })
+    this.setData({
+      show: !this.data.show,
+    });
   },
   clickBtn(e) {
     console.log(e);
-    if (this.data.show) {
-      this.setData({
-        show: !this.data.show,
-        caiMing: '',
-        caiCount: '',
-        expire: '',
-        imagePath: '',
-      })
+    if (this.data.showCard) {
+      if (this.data.show) {
+        this.setData({
+          show: !this.data.show,
+          showCard:!this.data.showCard,
+          caiMing: "",
+          caiCount: "",
+          expire: "",
+          imagePath: "",
+        });
+      }
     }
   },
   clickBtnDelete() {
     this.setData({
       show: !this.data.show,
-      caiMing: '',
-      caiCount: '',
-      expire: '',
-      imagePath: '',
-    })
+      caiMing: "",
+      caiCount: "",
+      expire: "",
+      imagePath: "",
+      showCard: !this.data.showCard,
+    });
   },
   // 事件处理函数
   bindViewTap() {
     wx.navigateTo({
-      url: '../logs/logs'
-    })
+      url: "../logs/logs",
+    });
   },
   onLoad() {
     if (wx.getUserProfile) {
       this.setData({
-        canIUseGetUserProfile: true
-      })
+        canIUseGetUserProfile: true,
+      });
     }
-    wx.setNavigationBarTitle({ title: '外卖小程序' })
+    wx.setNavigationBarTitle({ title: "外卖小程序" });
   },
-})
+});

+ 23 - 23
pages/index/index.wxml

@@ -3,7 +3,7 @@
   <view class="search-box" style="margin-bottom:20rpx">
     <view class="search-top">
       <van-icon name="search" class="search-icon" />
-      <input class="search-ipt" placeholder="搜索商家名称" type="text" value="{{value}}" placeholder-style="color:#9d9d9d" />
+      <input bindtap="goSerch" class="search-ipt" placeholder="搜索商家名称" type="text" value="{{value}}" placeholder-style="color:#9d9d9d" />
       <button class="search-btn" bindtap="Search">搜索</button>
     </view>
     <view style="margin: 2%;">
@@ -113,32 +113,32 @@
 <!-- </view>
 </van-popup> -->
 
-<view style="font-size:32rpx;">
-  <!-- 弹出框 -->
-  <!-- hidden="{{show}}" -->
-  <view class="all-bottom" hidden="{{show}}">
-  </view>
-  <view class="pop-up" hidden="{{show}}">
-    <image class="img-2" src="./images/15.png" mode="widthFix" />
-    <view class="top">
-      <view style="color: #ffffff;text-align: center;margin-bottom:35rpx;font-family: Arial, Helvetica, sans-serif;font-size: 40rpx;">
-        信息完善
-      </view>
-      <view style="color:#c11b14;font-family: Arial, Helvetica, sans-serif;text-align: left;font-size: 33rpx;margin-bottom: 80rpx;">
-        为校园人员使用,新用户请完善个人信息。
-      </view>
+  <view style="font-size:32rpx;" hidden="{{show}}">
+    <!-- 弹出框 -->
+    <!-- hidden="{{show}}" -->
+    <view class="all-bottom" hidden="{{show}}">
     </view>
-    <van-divider borderColor="#f48185" />
-    <view class="under">
-      <view bindtap="CompleteInformation">
-        完善信息
+    <view class="pop-up" hidden="{{show}}">
+      <image class="img-2" src="./images/15.png" mode="widthFix" />
+      <view class="top">
+        <view style="color: #ffffff;text-align: center;margin-bottom:35rpx;font-family: Arial, Helvetica, sans-serif;font-size: 40rpx;">
+          信息完善
+        </view>
+        <view style="color:#c11b14;font-family: Arial, Helvetica, sans-serif;text-align: left;font-size: 33rpx;margin-bottom: 80rpx;">
+          为校园人员使用,新用户请完善个人信息。
+        </view>
+      </view>
+      <van-divider borderColor="#f48185" />
+      <view class="under">
+        <view bindtap="CompleteInformation">
+          完善信息
+        </view>
       </view>
+      <!-- <van-icon name="clear" /> -->
+      <van-icon name="clear" bindtap="clickBtnDelete" class="del-icon" color="#ffffff" />
     </view>
-    <!-- <van-icon name="clear" /> -->
-    <van-icon name="clear" bindtap="clickBtnDelete" class="del-icon" color="#ffffff" />
-  </view>
 
-</view>
+  </view>
 
 
 

+ 21 - 4
pages/Integral/my-Integral.js → pages/my order/myOrder.js

@@ -1,11 +1,18 @@
-// pages/Integral/my-Integral.js
+// pages/my order/myOrder.js
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    active: 1,
+    one:['二楼麻辣烫、麻辣香锅、麻辣拌饭'],
+    two:['麻辣烫微辣微麻'],
+    three:['待送达'],
+    four:['¥10.98'],
+    five:['¥32.98'],
+    six:['共2件'],
+    seven:['共3件']
   },
 
   /**
@@ -14,7 +21,11 @@ Page({
   onLoad(options) {
 
   },
-
+  goOrder(){
+    wx.navigateTo({
+      url: '../OrderCheck/OrderCheck',
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -62,5 +73,11 @@ Page({
    */
   onShareAppMessage() {
 
-  }
+  },
+  onChange(event) {
+    wx.showToast({
+      title: `切换到标签 ${event.detail.name}`,
+      icon: 'none',
+    });
+  },
 })

+ 3 - 0
pages/my order/myOrder.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "我的订单"
+}

+ 83 - 0
pages/my order/myOrder.wxml

@@ -0,0 +1,83 @@
+<!--pages/my order/myOrder.wxml-->
+<view>
+  <view style="display: flex;margin-top:50rpx ;">
+    <view style="background-color: rgb(233, 231, 231); width: 100%; height: 20rpx; margin-top: -25rpx;"></view>
+  </view>
+  <view class="top">
+    <view class="navigation">
+      <view class="navigation-word">
+        <van-tabs animated>
+          <van-tab title="全部"></van-tab>
+          <van-tab title="待送达"></van-tab>
+          <van-tab title="待支付"></van-tab>
+          <van-tab title="已完成"></van-tab>
+        </van-tabs>
+      </view>
+
+      <view style="display: flex;margin-top:50rpx ;">
+        <view style="background-color: rgb(233, 231, 231); width: 100%; height: 20rpx; margin-top: -25rpx;"></view>
+      </view>
+      <view class="among" bindtap="goOrder">
+        <view class="among-top">
+          {{one}}
+        </view>
+        <view class="among-top-left">
+          {{three}}
+        </view>
+        <view style="background-color: rgb(233, 231, 231); width: 650rpx; height: 5rpx; margin-top: 20rpx;margin-left: 50rpx;"></view>
+        <view class="image-food">
+          <image style="width: 200rpx;height: 120rpx;" src="/../../images/image.png" />
+
+        </view>
+        <view class="request">
+          {{two}}
+        </view>
+        <view class="price-1">
+          {{four}}
+        </view>
+        <view class="thing">
+          {{six}}
+        </view>
+
+      </view>
+
+    </view>
+    <view style="display: flex;margin-top:50rpx ;">
+      <view style="background-color: rgb(233, 231, 231); width: 100%; height: 20rpx; margin-top: -25rpx;"></view>
+    </view>
+    <view class="among">
+      <view class="among-top">
+        {{one}}
+      </view>
+      <view class="among-top-left">
+        {{three}}
+      </view>
+      <view style="background-color: rgb(233, 231, 231); width: 650rpx; height: 5rpx; margin-top: 20rpx;margin-left: 50rpx;"></view>
+      <view class="image-food">
+        <image style="width: 200rpx;height: 120rpx;" src="/../../images/image.png" />
+
+      </view>
+      <view class="request">
+        {{two}}
+      </view>
+      <view class="price-1">
+        {{five}}
+      </view>
+      <view class="thing">
+        {{seven}}
+      </view>
+
+    </view>
+
+
+
+
+  </view>
+
+
+
+
+
+
+
+</view>

+ 40 - 0
pages/my order/myOrder.wxss

@@ -0,0 +1,40 @@
+/* pages/my order/myOrder.wxss */
+.order{
+  text-align: center;
+  font-size:45rpx;
+  margin-top: -11rpx;
+}
+.navigation-word{
+  color: rgb(216, 212, 212);
+}
+.among-top{
+  margin-top: 20rpx;
+  margin-left: 50rpx;
+}
+.among-top-left{
+  float: right;
+  margin-top: -40rpx;
+  margin-right: 20rpx ;
+  color: rgb(216, 212, 212);
+}
+.image-food{
+  margin-left: 50rpx;
+  margin-top: 40rpx;
+}
+.request{
+  float: right;
+  margin-top: -130rpx;
+  margin-right: 240rpx;
+}
+.price-1{
+  float: right;
+  margin-top: -120rpx;
+  color: red;
+  margin-right: 20rpx;
+}
+.thing{
+  float: right;
+  margin-top: -60rpx;
+  margin-right: 20rpx;
+  color: rgb(216, 212, 212);
+}

+ 5 - 1
pages/my/my.js

@@ -25,7 +25,11 @@ Page({
   onLoad(options) {
     wx.setNavigationBarTitle({ title: '我的' })
   },
-
+  OnOrder(){
+    wx.navigateTo({
+      url: '../my order/myOrder',
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

+ 2 - 2
pages/my/my.wxml

@@ -21,7 +21,7 @@
               <image class="img-2" src="./images/20积分.png" mode="" />
             </view>
             <!--  number-->
-            <view class="number">
+            <view class="number" bindtap="onOrder">
               501
             </view>
           </view>
@@ -60,7 +60,7 @@
         我的订单
       </view>
       <!-- 箭头 -->
-      <view class="order-right" bindtap="onOrder">
+      <view class="order-right" bindtap="OnOrder">
         >
       </view>
     </view>

+ 5 - 0
pages/new/new.js

@@ -50,6 +50,11 @@ Page({
   onLoad(options) { 
  
   }, 
+  goIndex(){
+    wx.navigateBack({
+      delta: 1
+    })
+  },
   //  点击日期组件确定事件 
   bindDateChange: function (e) { 
     this.setData({ 

+ 2 - 2
pages/new/new.wxml

@@ -69,7 +69,7 @@
 </view> 
 </view> 
 <!-- 按钮 --> 
-<view class="box"> 
-  <van-button round type="info" color="red" block>提交</van-button> 
+<view class="box" bindtap="goIndex"> 
+  <van-button round type="info" color="red" block tapbind>提交</van-button> 
 </view> 
 </view>

+ 4 - 4
project.private.config.json

@@ -4,7 +4,7 @@
   "setting": {
     "compileHotReLoad": true
   },
-  "libVersion": "2.32.0",
+  "libVersion": "2.32.1",
   "condition": {
     "miniprogram": {
       "list": [
@@ -17,7 +17,7 @@
         },
         {
           "name": "",
-          "pathName": "pages/address/address",
+          "pathName": "pages/Businesses/Businesses",
           "query": "",
           "launchMode": "default",
           "scene": null
@@ -31,14 +31,14 @@
         },
         {
           "name": "",
-          "pathName": "pages/serch/serch",
+          "pathName": "pages/my order/myOrder",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
           "name": "",
-          "pathName": "pages/serch-outcome/serch-outcome",
+          "pathName": "pages/index/index",
           "query": "",
           "launchMode": "default",
           "scene": null