app.json

@@ -7,8 +7,16 @@
     "pages/shop/shop",
     "pages/message/message",
     "pages/total/total",
+<<<<<<< HEAD
+    "pages/detail arrived/detail arrived",
+    "pages/detail refund/detail refund",
+    "pages/detail order/detail order",
+    "pages/delails/details",
+    "pages/management/management"
+=======
     "pages/addProduct/addProduct",
     "pages/revise/revise"
+>>>>>>> 697a3afe5b100889fee65ba54e01e026871db79d
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -58,6 +66,8 @@
     "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-calendar": "@vant/weapp/calendar/index",
+    "van-popup": "@vant/weapp/popup/index",
+    "van-dialog": "@vant/weapp/dialog/index"
   }
 }

pages/delails/details.js

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

pages/delails/details.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "订单详情"
+}

pages/delails/details.wxml

@@ -0,0 +1,65 @@
+<!--pages/delails/details.wxml-->
+<!-- <text>pages/delails/details.wxml</text> -->
+<!--  消息页————订单详情  -->
+<!-- 配送地址 -->
+<view class="address-box">
+  <text class="address">
+    <text class="address01">哈尔滨师范大学第一公寓2门321</text>
+    <text class="address02">姓名：吴迪（先生）</text>
+  </text>
+</view>
+<!-- 麻辣烫图片 -->
+<view class="container04">
+  <view class="container03">
+    <image class="img01" src="https://qcloud.dpfile.com/pc/3CTRFdje6AmTRDHb_eqJ2bj2z7l8HY9CpntkZEpyOBObQ3QAyS5ZgqVDp-olAAnOjoJrvItByyS4HHaWdXyO_DrXIaWutJls2xCVbatkhjUNNiIYVnHvzugZCuBITtvjski7YaLlHpkrQUr5euoQrg.jpg" mode="" />
+    <view class="child">
+      <view class="child01">
+        <text class="ctx01">老式麻辣烫</text>
+        <text class="ctx02">￥9.9+20积分</text>
+      </view>
+      <view class="child01">
+        <text>*2</text>
+        <text class="ctx03">￥15.9</text>
+      </view>
+    </view>
+  </view>
+  <view class="text01">
+    <text>包装费：</text>
+    <text class="copper">￥0</text>
+  </view>
+  <view class="text02">
+    <text>配送费：</text>
+    <text class="copper">￥3</text>
+  </view>
+</view>
+
+
+<view class="container01">
+  <text class="text01">备注</text>
+  <text class="text02">不要香菜，不要蒜</text>
+</view>
+<view class="container02">
+  <view class="text01">
+    <text> 订单编号：</text>
+    <text>88888888888</text>
+  </view>
+  <view class="text01">
+    <text> 交易时间：</text>
+    <text>2023-4-36 13:18:34</text>
+  </view>
+  <view class="text01">
+    <text> 积分抵扣：</text>
+    <text>30积分</text>
+  </view>
+  <view class="text02">
+    <text>实付金额：</text>
+    <text class="copper">￥21.98</text>
+  </view>
+  <view class="text03">
+    <text>配送人：</text>
+    <text>冯川宇</text>
+  </view>
+
+</view>
+
+

pages/delails/details.wxss

@@ -0,0 +1,132 @@
+/* pages/delails/details.wxss *//* pages/detail order/detail order.wxss */
+/* pages/detail/detail.wxss */
+/* 地址 */
+.address {
+  width: 700rpx;
+  border-radius: 5px;
+  background-color: #f3f1f1;
+  display: block;
+  margin-left: 13px;
+}
+.address01 {
+  font-weight: 600;
+  font-size: 20px;
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  display: block;
+  margin-left: 10px;
+  margin-bottom: 10px;
+}
+.address02 {
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  display: block;
+  margin-top: -10px;
+  margin-left: 10px;
+}
+/* —————————————————————————————————————— */
+.container01 {
+  margin: auto;
+  border-radius: 5px;
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  font-size: 12px;
+  color: rgb(133, 133, 133);
+  /* width: 280px; */
+  width: 700rpx;
+  height: 70px;
+  background: #f3f1f1;
+  display: flex;
+  flex-direction: column;
+  /* word-break:break-all */
+}
+.container02 {
+  margin: 10px auto;
+  border-radius: 5px;
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  font-size: 12px;
+  color: rgb(133, 133, 133);
+  /* width: 280px; */
+  width: 700rpx;
+  height: 180px;
+  background: #f3f1f1;
+  display: flex;
+  flex-direction: column;
+  /* align-content:space-between ; */
+}
+.text01 {
+  display: flex;
+  justify-content: space-between;
+  border-bottom: 1px solid #d1d0d0;
+  line-height: 35px;
+  margin-left: 15px;
+  width: 90%;
+  height: 35px;
+}
+.text02 {
+  line-height: 35px;
+  margin-left: 15px;
+  width: 90%;
+  height: 35px;
+  display: flex;
+  justify-content: space-between;
+  border-bottom: 1px solid #d1d0d0;
+}
+.text03{
+  line-height: 35px;
+  margin-left: 15px;
+  width: 90%;
+  height: 35px;
+  display: flex;
+  justify-content: space-between;
+}
+.copper {
+  color: rgb(228, 52, 87);
+}
+
+/* 图片样式 */
+.img01 {
+  margin-right: 10px;
+  width: 90px;
+  height: 60px;
+  border-radius: 10px;
+}
+
+/* 图片与文字左右排列 */
+.container03 {
+  padding: 10px 10px 0px 10px;
+  display: flex;
+  align-content: space-between;
+}
+.container04 {
+  margin: 10px auto;
+  border-radius: 5px;
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  font-size: 12px;
+  color: rgb(133, 133, 133);
+  /* width: 280px; */
+  width: 700rpx;
+  height: 150px;
+  background: #f3f1f1;
+}
+/* 图片旁边文字 */
+.child {
+  flex: 1;
+}
+.child01 {
+  display: flex;
+  justify-content: space-between;
+}
+/* 老式麻辣烫 */
+.ctx01 {
+  font-weight: 800;
+  font-size: 13px;
+  color: black;
+}
+/* 价钱和积分 */
+.ctx02 {
+  color: rgb(228, 52, 87);
+  font-size: 13px;
+}
+/* 划掉价钱 */
+.ctx03 {
+  text-decoration: line-through;
+}
+

pages/detail arrived/detail arrived.js

@@ -0,0 +1,79 @@
+// pages/detail/detail.js
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    show: false,
+  },
+
+  showPopup() {
+    this.setData({ show: true });
+  },
+
+  onClose() {
+    this.setData({ show: false });
+  },
+  jumpPage:function(){
+    wx.navigateTo({
+      url:'/pages/message/message',
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/detail arrived/detail arrived.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "订单详情"
+}

pages/detail arrived/detail arrived.wxml

@@ -0,0 +1,82 @@
+<!--pages/detail/detail.wxml-->
+<!-- 订单详情，已送达页面 -->
+<!-- 配送地址 -->
+<view class="address-box">
+  <text class="address">
+    <text class="address01">哈尔滨师范大学第一公寓2门321</text>
+    <text class="address02">姓名：吴迪（先生）</text>
+  </text>
+</view>
+<!-- 麻辣烫图片 -->
+<view class="container04">
+  <view class="container03">
+    <image class="img01" src="https://qcloud.dpfile.com/pc/3CTRFdje6AmTRDHb_eqJ2bj2z7l8HY9CpntkZEpyOBObQ3QAyS5ZgqVDp-olAAnOjoJrvItByyS4HHaWdXyO_DrXIaWutJls2xCVbatkhjUNNiIYVnHvzugZCuBITtvjski7YaLlHpkrQUr5euoQrg.jpg" mode="" />
+    <view class="child">
+      <view class="child01">
+        <text class="ctx01">老式麻辣烫</text>
+        <text class="ctx02">￥9.9+20积分</text>
+      </view>
+      <view class="child01">
+        <text>*2</text>
+        <text class="ctx03">￥15.9</text>
+      </view>
+    </view>
+  </view>
+  <view class="text01">
+    <text>包装费：</text>
+    <text class="copper">￥0</text>
+  </view>
+  <view class="text02">
+    <text>配送费：</text>
+    <text class="copper">￥3</text>
+  </view>
+</view>
+
+
+<view class="container01">
+  <text class="text01">备注</text>
+  <text class="text02">不要香菜，不要蒜</text>
+</view>
+<view class="container02">
+  <view class="text01">
+    <text> 订单编号：</text>
+    <text>88888888888</text>
+  </view>
+  <view class="text01">
+    <text> 交易时间：</text>
+    <text>2023-4-36 13:18:34</text>
+  </view>
+  <view class="text01">
+    <text> 积分抵扣：</text>
+    <text>30积分</text>
+  </view>
+  <view class="text02">
+    <text>实付金额：</text>
+    <text class="copper">￥21.98</text>
+  </view>
+
+</view>
+<view class="container01">
+  <text class="text01">配送人</text>
+  <text class="text02">冯春雨</text>
+</view>
+<view class="button001">
+  <!-- <van-row> -->
+    <van-col>
+      <van-button class="button01" round size="normal" type="default" color="rgb(167,166,166)" is-link bind:click="showPopup">退款</van-button>
+    </van-col>
+    <van-col span="6">
+      <van-button class="button01" round size="normal" type="warning" bindtap="jumpPage">重新打印</van-button>
+    </van-col>
+  <!-- </van-row> -->
+</view>
+<van-popup show="{{ show }}" bind:close="onClose">
+  <van-panel>
+  <view class="youno">确认退款？</view>
+  <view slot="footer">
+    <van-button size="small">确认</van-button>
+    <van-button size="small">取消</van-button>
+  </view>
+</van-panel>
+
+</van-popup>

pages/detail arrived/detail arrived.wxss

@@ -0,0 +1,150 @@
+/* pages/detail/detail.wxss */
+/* 地址 */
+.youno{
+  text-align: center;
+}
+.address {
+  width: 700rpx;
+  border-radius: 5px;
+  background-color: #f3f1f1;
+  display: block;
+  margin-left: 13px;
+}
+.address01 {
+  font-weight: 600;
+  font-size: 20px;
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  display: block;
+  margin-left: 10px;
+  margin-bottom: 10px;
+}
+.address02 {
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  display: block;
+  margin-top: -10px;
+  margin-left: 10px;
+}
+/* —————————————————————————————————————— */
+.container01 {
+  margin: auto;
+  border-radius: 5px;
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  font-size: 12px;
+  color: rgb(133, 133, 133);
+  /* width: 280px; */
+  width: 700rpx;
+  height: 70px;
+  background: #f3f1f1;
+  display: flex;
+  flex-direction: column;
+  /* word-break:break-all */
+}
+
+.container02 {
+  margin: 10px auto;
+  border-radius: 5px;
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  font-size: 12px;
+  color: rgb(133, 133, 133);
+  /* width: 280px; */
+  width: 700rpx;
+  height: 150px;
+  background: #f3f1f1;
+  display: flex;
+  flex-direction: column;
+  /* align-content:space-between ; */
+}
+
+.text01 {
+  display: flex;
+  justify-content: space-between;
+  border-bottom: 1px solid #d1d0d0;
+  line-height: 35px;
+  margin-left: 15px;
+  width: 90%;
+  height: 35px;
+}
+
+.text02 {
+  line-height: 35px;
+  margin-left: 15px;
+  width: 90%;
+  height: 35px;
+  display: flex;
+  justify-content: space-between;
+}
+
+.copper {
+  color: rgb(228, 52, 87);
+}
+
+/* 图片样式 */
+.img01 {
+  margin-right: 10px;
+  width: 90px;
+  height: 60px;
+  border-radius: 10px;
+}
+
+/* 图片与文字左右排列 */
+.container03 {
+  padding: 10px 10px 0px 10px;
+  display: flex;
+  align-content: space-between;
+}
+
+.container04 {
+  margin: 10px auto;
+  border-radius: 5px;
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  font-size: 12px;
+  color: rgb(133, 133, 133);
+  /* width: 280px; */
+  width: 700rpx;
+  height: 150px;
+  background: #f3f1f1;
+}
+
+/* 图片旁边文字 */
+.child {
+  flex: 1;
+}
+
+.child01 {
+  display: flex;
+  justify-content: space-between;
+}
+
+/* 老式麻辣烫 */
+.ctx01 {
+  font-weight: 800;
+  font-size: 13px;
+  color: black;
+}
+
+/* 价钱和积分 */
+.ctx02 {
+  color: rgb(228, 52, 87);
+  font-size: 13px;
+}
+
+/* 划掉价钱 */
+.ctx03 {
+  text-decoration: line-through;
+}
+
+/* 按钮 */
+.button001{
+  width: 700rpx;
+  margin: auto;
+  display: flex;
+  justify-content: center;
+}
+.button001 button{
+margin: 10px 24px 0;
+width: 120px;
+height: 50px;
+}
+/* .button01{
+margin: 0 24px;
+} */

pages/detail order/detail order.js

@@ -0,0 +1,13 @@
+Page({
+  data: {
+    show: false,
+  },
+
+  showPopup() {
+    this.setData({ show: true });
+  },
+
+  onClose() {
+    this.setData({ show: false });
+  },
+});

pages/detail order/detail order.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "订单详情"
+  
+}

pages/detail order/detail order.wxml

@@ -0,0 +1,78 @@
+<!--  订单页————订单详情  -->
+<!-- 配送地址 -->
+<view class="address-box">
+  <text class="address">
+    <text class="address01">哈尔滨师范大学第一公寓2门321</text>
+    <text class="address02">姓名：吴迪（先生）</text>
+  </text>
+</view>
+<!-- 麻辣烫图片 -->
+<view class="container04">
+  <view class="container03">
+    <image class="img01" src="https://qcloud.dpfile.com/pc/3CTRFdje6AmTRDHb_eqJ2bj2z7l8HY9CpntkZEpyOBObQ3QAyS5ZgqVDp-olAAnOjoJrvItByyS4HHaWdXyO_DrXIaWutJls2xCVbatkhjUNNiIYVnHvzugZCuBITtvjski7YaLlHpkrQUr5euoQrg.jpg" mode="" />
+    <view class="child">
+      <view class="child01">
+        <text class="ctx01">老式麻辣烫</text>
+        <text class="ctx02">￥9.9+20积分</text>
+      </view>
+      <view class="child01">
+        <text>*2</text>
+        <text class="ctx03">￥15.9</text>
+      </view>
+    </view>
+  </view>
+  <view class="text01">
+    <text>包装费：</text>
+    <text class="copper">￥0</text>
+  </view>
+  <view class="text02">
+    <text>配送费：</text>
+    <text class="copper">￥3</text>
+  </view>
+</view>
+
+
+<view class="container01">
+  <text class="text01">备注</text>
+  <text class="text02">不要香菜，不要蒜</text>
+</view>
+<view class="container02">
+  <view class="text01">
+    <text> 订单编号：</text>
+    <text>88888888888</text>
+  </view>
+  <view class="text01">
+    <text> 交易时间：</text>
+    <text>2023-4-36 13:18:34</text>
+  </view>
+  <view class="text01">
+    <text> 积分抵扣：</text>
+    <text>30积分</text>
+  </view>
+  <view class="text02">
+    <text>实付金额：</text>
+    <text class="copper">￥21.98</text>
+  </view>
+
+</view>
+<view class="button001">
+  <!-- <van-row> -->
+    <van-col>
+      <van-button class="button01" round size="normal" type="default" color="rgb(167,166,166)"  is-link bind:click="showPopup">退款</van-button>
+    </van-col>
+    <van-col span="6">
+      <van-button class="button01" round size="normal" type="warning" bindtap="jumpPage">重新打印</van-button>
+    </van-col>
+  <!-- </van-row> -->
+</view>
+<van-popup show="{{ show }}" bind:close="onClose">
+  <van-panel>
+  <view class="youno">确认退款？</view>
+  <view slot="footer">
+    <van-button size="small">确认</van-button>
+    <van-button size="small">取消</van-button>
+  </view>
+</van-panel>
+
+</van-popup>
+

pages/detail order/detail order.wxss

@@ -0,0 +1,148 @@
+/* pages/detail order/detail order.wxss */
+/* pages/detail/detail.wxss */
+/* 地址 */
+.youno{
+  text-align: center;
+}
+.address {
+  width: 700rpx;
+  border-radius: 5px;
+  background-color: #f3f1f1;
+  display: block;
+  margin-left: 13px;
+}
+.address01 {
+  font-weight: 600;
+  font-size: 20px;
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  display: block;
+  margin-left: 10px;
+  margin-bottom: 10px;
+}
+.address02 {
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  display: block;
+  margin-top: -10px;
+  margin-left: 10px;
+}
+/* —————————————————————————————————————— */
+.container01 {
+  margin: auto;
+  border-radius: 5px;
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  font-size: 12px;
+  color: rgb(133, 133, 133);
+  /* width: 280px; */
+  width: 700rpx;
+  height: 70px;
+  background: #f3f1f1;
+  display: flex;
+  flex-direction: column;
+  /* word-break:break-all */
+}
+
+.container02 {
+  margin: 10px auto;
+  border-radius: 5px;
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  font-size: 12px;
+  color: rgb(133, 133, 133);
+  /* width: 280px; */
+  width: 700rpx;
+  height: 150px;
+  background: #f3f1f1;
+  display: flex;
+  flex-direction: column;
+  /* align-content:space-between ; */
+}
+
+.text01 {
+  display: flex;
+  justify-content: space-between;
+  border-bottom: 1px solid #d1d0d0;
+  line-height: 35px;
+  margin-left: 15px;
+  width: 90%;
+  height: 35px;
+}
+
+.text02 {
+  line-height: 35px;
+  margin-left: 15px;
+  width: 90%;
+  height: 35px;
+  display: flex;
+  justify-content: space-between;
+}
+
+.copper {
+  color: rgb(228, 52, 87);
+}
+
+/* 图片样式 */
+.img01 {
+  margin-right: 10px;
+  width: 90px;
+  height: 60px;
+  border-radius: 10px;
+}
+
+/* 图片与文字左右排列 */
+.container03 {
+  padding: 10px 10px 0px 10px;
+  display: flex;
+  align-content: space-between;
+}
+
+.container04 {
+  margin: 10px auto;
+  border-radius: 5px;
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  font-size: 12px;
+  color: rgb(133, 133, 133);
+  /* width: 280px; */
+  width: 700rpx;
+  height: 150px;
+  background: #f3f1f1;
+}
+
+/* 图片旁边文字 */
+.child {
+  flex: 1;
+}
+
+.child01 {
+  display: flex;
+  justify-content: space-between;
+}
+
+/* 老式麻辣烫 */
+.ctx01 {
+  font-weight: 800;
+  font-size: 13px;
+  color: black;
+}
+
+/* 价钱和积分 */
+.ctx02 {
+  color: rgb(228, 52, 87);
+  font-size: 13px;
+}
+
+/* 划掉价钱 */
+.ctx03 {
+  text-decoration: line-through;
+}
+
+/* 按钮 */
+.button001{
+  width: 700rpx;
+  margin: auto;
+  display: flex;
+  justify-content: center;
+}
+.button001 button{
+margin: 10px 24px 0;
+width: 120px;
+height: 50px;
+}

pages/detail refund/detail refund.js

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

pages/detail refund/detail refund.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "订单详情"
+}

pages/detail refund/detail refund.wxml

@@ -0,0 +1,67 @@
+
+<!-- 已退款页面 -->
+<!-- 配送地址 -->
+<view class="address-box">
+  <text class="address">
+    <text class="address01">哈尔滨师范大学第一公寓2门321</text>
+    <text class="address02">姓名：吴迪（先生）</text>
+  </text>
+</view>
+<!-- 麻辣烫图片 -->
+<view class="container04">
+  <view class="container03">
+    <image class="img01" src="https://qcloud.dpfile.com/pc/3CTRFdje6AmTRDHb_eqJ2bj2z7l8HY9CpntkZEpyOBObQ3QAyS5ZgqVDp-olAAnOjoJrvItByyS4HHaWdXyO_DrXIaWutJls2xCVbatkhjUNNiIYVnHvzugZCuBITtvjski7YaLlHpkrQUr5euoQrg.jpg" mode="" />
+    <view class="child">
+      <view class="child01">
+        <text class="ctx01">老式麻辣烫</text>
+        <text class="ctx02">￥9.9+20积分</text>
+      </view>
+      <view class="child01">
+        <text>*2</text>
+        <text class="ctx03">￥15.9</text>
+      </view>
+    </view>
+  </view>
+  <view class="text01">
+    <text>包装费：</text>
+    <text class="copper">￥0</text>
+  </view>
+  <view class="text02">
+    <text>配送费：</text>
+    <text class="copper">￥3</text>
+  </view>
+</view>
+
+
+<view class="container01">
+  <text class="text01">备注</text>
+  <text class="text02">不要香菜，不要蒜</text>
+</view>
+<view class="container02">
+  <view class="text01">
+    <text> 订单编号：</text>
+    <text>88888888888</text>
+  </view>
+  <view class="text01">
+    <text> 交易时间：</text>
+    <text>2023-4-36 13:18:34</text>
+  </view>
+  <view class="text01">
+    <text> 积分抵扣：</text>
+    <text>30积分</text>
+  </view>
+  <view class="text02">
+    <text>实付金额：</text>
+    <text class="copper">￥21.98</text>
+  </view>
+
+</view>
+<view class="button001">
+  <!-- <van-row> -->
+    <van-col>
+      <van-button class="button01" round size="normal" type="default" color="rgb(167,166,166)">已退款</van-button>
+    </van-col>
+    <van-col span="6">
+      <van-button class="button01" round size="normal" type="warning" bindtap="jumpPage">重新打印</van-button>
+    </van-col>
+</view>

pages/detail refund/detail refund.wxss

@@ -0,0 +1,144 @@
+/* pages/refund detail/refund detail.wxss *//* pages/detail/detail.wxss */
+/* 地址 */
+.address {
+  width: 700rpx;
+  border-radius: 5px;
+  background-color: #f3f1f1;
+  display: block;
+  margin-left: 13px;
+}
+.address01 {
+  font-weight: 600;
+  font-size: 20px;
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  display: block;
+  margin-left: 10px;
+  margin-bottom: 10px;
+}
+.address02 {
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  display: block;
+  margin-top: -10px;
+  margin-left: 10px;
+}
+/* —————————————————————————————————————— */
+.container01 {
+  margin: auto;
+  border-radius: 5px;
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  font-size: 12px;
+  color: rgb(133, 133, 133);
+  /* width: 280px; */
+  width: 700rpx;
+  height: 70px;
+  background: #f3f1f1;
+  display: flex;
+  flex-direction: column;
+  /* word-break:break-all */
+}
+
+.container02 {
+  margin: 10px auto;
+  border-radius: 5px;
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  font-size: 12px;
+  color: rgb(133, 133, 133);
+  /* width: 280px; */
+  width: 700rpx;
+  height: 150px;
+  background: #f3f1f1;
+  display: flex;
+  flex-direction: column;
+  /* align-content:space-between ; */
+}
+
+.text01 {
+  display: flex;
+  justify-content: space-between;
+  border-bottom: 1px solid #d1d0d0;
+  line-height: 35px;
+  margin-left: 15px;
+  width: 90%;
+  height: 35px;
+}
+
+.text02 {
+  line-height: 35px;
+  margin-left: 15px;
+  width: 90%;
+  height: 35px;
+  display: flex;
+  justify-content: space-between;
+}
+
+.copper {
+  color: rgb(228, 52, 87);
+}
+
+/* 图片样式 */
+.img01 {
+  margin-right: 10px;
+  width: 90px;
+  height: 60px;
+  border-radius: 10px;
+}
+
+/* 图片与文字左右排列 */
+.container03 {
+  padding: 10px 10px 0px 10px;
+  display: flex;
+  align-content: space-between;
+}
+
+.container04 {
+  margin: 10px auto;
+  border-radius: 5px;
+  font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+  font-size: 12px;
+  color: rgb(133, 133, 133);
+  /* width: 280px; */
+  width: 700rpx;
+  height: 150px;
+  background: #f3f1f1;
+}
+
+/* 图片旁边文字 */
+.child {
+  flex: 1;
+}
+
+.child01 {
+  display: flex;
+  justify-content: space-between;
+}
+
+/* 老式麻辣烫 */
+.ctx01 {
+  font-weight: 800;
+  font-size: 13px;
+  color: black;
+}
+
+/* 价钱和积分 */
+.ctx02 {
+  color: rgb(228, 52, 87);
+  font-size: 13px;
+}
+
+/* 划掉价钱 */
+.ctx03 {
+  text-decoration: line-through;
+}
+
+/* 按钮 */
+.button001{
+  width: 700rpx;
+  margin: auto;
+  display: flex;
+  justify-content: center;
+}
+.button001 button{
+margin: 80px 20px 0;
+width: 140px;
+height: 50px;
+}

pages/management/management.js

@@ -0,0 +1,23 @@
+// index.js
+// 获取应用实例
+const app = getApp()
+
+Page({
+  data: {
+    value: '',
+   
+  },
+  onChange(e) {
+    this.setData({
+      value: e.detail,
+     
+    });
+  },
+
+  onSearch() {
+    Toast('搜索' + this.data.value);
+  },
+  onClick() {
+    Toast('搜索' + this.data.value);
+  },
+});

pages/management/management.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "商品管理"
+}
+

pages/management/management.wxml

@@ -0,0 +1,132 @@
+<!--index.wxml-->
+<van-search value="{{ value }}" placeholder="请输入关键词" shape="round" background="#FFFFFF" use-left-icon-slot="false" />
+<!-- <van-divider /> -->
+
+<view>
+  <view class="button">
+    <view class="but">
+      <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="as">
+  <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="as">
+    <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="as">
+    <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/management/management.wxss

@@ -0,0 +1,32 @@
+/**index.wxss**/
+
+.button {
+  margin: 5px 15px;
+}
+.but {
+  float: right;
+}
+van-button {
+  margin-left: 10px;
+}
+.as{
+  margin: 10px 15px;
+}
+.view_class {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+}
+.flex-row{
+  width: 350px;
+  display: flex;
+  flex-direction: row;
+  /* justify-content :center; */
+}
+.flex-view-item{
+  width: 30%;
+}
+.view_class{
+  margin-right: 5px;
+  margin-top: 45px;
+}

pages/me/me.wxml

@@ -10,7 +10,7 @@
   is-link
   title="商品管理"
   link-type="navigateTo"
-  url=""
+  url="../management/management"
 />
 <van-cell
 icon="balance-list-o"

project.config.json

@@ -30,6 +30,7 @@
     "packNpmManually": true,
     "enableEngineNative": false,
     "ignoreUploadUnusedFiles": false,
+    "ignoreDevUnusedFiles": false,
     "packNpmRelationList": [
       {
         "packageJsonPath": "./package.json",

project.private.config.json

@@ -36,22 +36,51 @@
           "scene": null
         },
         {
+<<<<<<< HEAD
+          "name": "订单详细",
+          "pathName": "pages/detail order/detail order",
+=======
           "name": "",
           "pathName": "pages/addProduct/addProduct",
+>>>>>>> 697a3afe5b100889fee65ba54e01e026871db79d
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
+<<<<<<< HEAD
+          "name": "详细",
+          "pathName": "pages/delails/details",
+=======
           "name": "",
           "pathName": "pages/revise",
+>>>>>>> 697a3afe5b100889fee65ba54e01e026871db79d
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
+<<<<<<< HEAD
+          "name": "订单送达",
+          "pathName": "pages/detail arrived/detail arrived",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "订单退款",
+          "pathName": "pages/detail refund/detail refund",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "商品管理",
+          "pathName": "pages/management/management",
+=======
           "name": "",
           "pathName": "pages/revise/revise",
+>>>>>>> 697a3afe5b100889fee65ba54e01e026871db79d
           "query": "",
           "launchMode": "default",
           "scene": null