liuxinyang 2 жил өмнө
parent
commit
d3ce5652fe
46 өөрчлөгдсөн 825 нэмэгдсэн , 32 устгасан
  1. 1 0
      Web_Wave
  2. 5 0
      app.js
  3. 51 8
      app.json
  4. 1 0
      images/dayuhao (1).svg
  5. BIN
      images/fanhui.png
  6. 1 0
      images/jine.svg
  7. 1 0
      images/kuaidi.svg
  8. 1 0
      images/rili.svg
  9. 1 0
      images/shangpin.png
  10. 1 0
      images/shangpin.svg
  11. 1 0
      images/tuikuan.svg
  12. BIN
      images/tupian2.png
  13. BIN
      images/wenbenbianji.png
  14. BIN
      images/wenbenbianjitianchong.png
  15. BIN
      images/wode (1).png
  16. BIN
      images/wode.png
  17. 1 0
      images/wodezhangdan.svg
  18. BIN
      images/xiaoxi.png
  19. BIN
      images/xiaoxi_1.png
  20. 1 0
      images/xuanze.svg
  21. 1 0
      images/xuanzeanniu.svg
  22. 0 0
      images/yunshu.svg
  23. 94 0
      pages/bill/bill.js
  24. 5 0
      pages/bill/bill.json
  25. 48 0
      pages/bill/bill.wxml
  26. 54 0
      pages/bill/bill.wxss
  27. 66 0
      pages/home/home.js
  28. 3 0
      pages/home/home.json
  29. 2 0
      pages/home/home.wxml
  30. 1 0
      pages/home/home.wxss
  31. 2 1
      pages/index/index.js
  32. 46 21
      pages/index/index.wxml
  33. 39 1
      pages/index/index.wxss
  34. 68 0
      pages/me/me.js
  35. 3 0
      pages/me/me.json
  36. 29 0
      pages/me/me.wxml
  37. 33 0
      pages/me/me.wxss
  38. 73 0
      pages/merManagement/merManagement.js
  39. 4 0
      pages/merManagement/merManagement.json
  40. 20 0
      pages/merManagement/merManagement.wxml
  41. 34 0
      pages/merManagement/merManagement.wxss
  42. 67 0
      pages/message/message.js
  43. 3 0
      pages/message/message.json
  44. 32 0
      pages/message/message.wxml
  45. 30 0
      pages/message/message.wxss
  46. 2 1
      project.private.config.json

+ 1 - 0
Web_Wave

@@ -0,0 +1 @@
+Subproject commit 52cd358619425e798fadf841a571a4ae6276f925

+ 5 - 0
app.js

@@ -15,5 +15,10 @@ App({
   },
   globalData: {
     userInfo: null
+  },
+  
+  globalData: {
+    // 动态获取各个手机类型的高度
+    statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'],
   }
 })

+ 51 - 8
app.json

@@ -1,13 +1,56 @@
 {
-  "pages":[
+  "pages": [
     "pages/index/index",
-    "pages/logs/logs"
+    "pages/logs/logs",
+    "pages/me/me",
+    "pages/home/home",
+    "pages/message/message",
+    "pages/merManagement/merManagement",
+    "pages/bill/bill"
   ],
-  "window":{
-    "backgroundTextStyle":"light",
+  "window": {
+    "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "Weixin",
-    "navigationBarTextStyle":"black"
+    "navigationBarTitleText": "商家端",
+    "navigationBarTextStyle": "black"
   },
-  "sitemapLocation": "sitemap.json"
-}
+  "tabBar": {
+    "list": [
+      {
+        "pagePath": "pages/index/index",
+        "text": "订单",
+        "iconPath": "/images/wenbenbianji.png",
+        "selectedIconPath": "/images/wenbenbianjitianchong.png"
+      },
+      {
+        "pagePath": "pages/message/message",
+        "text": "消息",
+        "iconPath": "/images/xiaoxi.png",
+        "selectedIconPath": "/images/xiaoxi_1.png"
+      },
+      {
+        "pagePath": "pages/me/me",
+        "text": "我的",
+        "iconPath": "/images/wode.png",
+        "selectedIconPath": "/images/wode (1).png"
+      }
+    ]
+  },
+  "usingComponents": {
+    "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-icon": "@vant/weapp/icon/index",
+    "van-calendar": "@vant/weapp/calendar/index"
+  },
+  "sitemapLocation": "sitemap.json",
+  "lazyCodeLoading": "requiredComponents"
+}

+ 1 - 0
images/dayuhao (1).svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="14px" height="14.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#8B8B83" d="M798.38 538.03l-575.1-346.2 0.04-68.75 575.04 345.6 0.02 69.35z"  /><path fill="#8B8B83" d="M798.38 538.03L223.3 894.99v-69.52l575.06-356.79 0.02 69.35z"  /></svg>

BIN
images/fanhui.png


+ 1 - 0
images/jine.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="14px" height="14.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#ea986c" d="M512 64c249.6 0 448 198.4 448 448s-198.4 448-448 448-448-198.4-448-448 198.4-448 448-448z m0 64C300.8 128 128 300.8 128 512s172.8 384 384 384 384-172.8 384-384-172.8-384-384-384zM377.6 256L512 390.4 646.4 256l44.8 44.8L544 448h128v64h-128v64h128v64h-128v128h-64v-128h-128V576h128V512h-128V448h128L332.8 300.8l44.8-44.8z" /></svg>

+ 1 - 0
images/kuaidi.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="14px" height="13.93px" viewBox="0 0 1029 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M0 841.354253l497.202312 182.645747v-574.995871L0 266.358382v574.995871z" fill="#EF6E69" /><path d="M16.911643 214.77787l501.430223 189.410404 187.92218-71.231841L220.375623 127.632172 16.911643 214.77787zM1018.080925 214.77787L518.341866 0 345.724723 73.937704l495.984674 207.691891L1018.080925 214.77787z" fill="#F7A46B" /><path d="M345.724723 73.937704l-125.3491 53.694468 485.888423 205.324261 135.445351-51.326838L345.724723 73.937704z" fill="#EFEFEF" /><path d="M854.596069 330.757919V514.113955l-126.786589 57.499588V377.349496L532.716763 449.004129v574.995871l497.202312-182.645747v-574.995871l-175.323006 64.399537z" fill="#F7A46B" /><path d="M854.596069 514.113955V330.757919l-126.786589 46.591577V571.613543l126.786589-57.499588z" fill="#EFEFEF" /></svg>

+ 1 - 0
images/rili.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="14px" height="14.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#eeb174" d="M938.688 96H800V32a32 32 0 1 0-64 0v64h-192V32a32 32 0 1 0-64 0v64H288V32a32 32 0 1 0-64 0v64H85.344A85.312 85.312 0 0 0 0 181.312v757.344A85.344 85.344 0 0 0 85.344 1024h853.344A85.312 85.312 0 0 0 1024 938.656V181.312A85.28 85.28 0 0 0 938.688 96zM960 938.656a21.344 21.344 0 0 1-21.312 21.344H85.344A21.344 21.344 0 0 1 64 938.656V181.312C64 169.568 73.568 160 85.344 160H224v64a32 32 0 1 0 64 0V160h192v64a32 32 0 1 0 64 0V160h192v64a32 32 0 1 0 64 0V160h138.688c11.744 0 21.312 9.568 21.312 21.312v757.344z"  /><path fill="#eeb174" d="M224 384h128v96H224zM224 544h128v96H224zM224 704h128v96H224zM448 704h128v96h-128zM448 544h128v96h-128zM448 384h128v96h-128zM672 704h128v96h-128zM672 544h128v96h-128zM672 384h128v96h-128z"  /></svg>

+ 1 - 0
images/shangpin.png

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="14px" height="14.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h1024v1024H0V0z" fill="#202425" opacity=".01" /><path d="M68.266667 375.466667a34.133333 34.133333 0 0 1 34.133333-34.133334h819.2a34.133333 34.133333 0 0 1 34.133333 34.133334v443.733333a136.533333 136.533333 0 0 1-136.533333 136.533333H204.8a136.533333 136.533333 0 0 1-136.533333-136.533333V375.466667z" fill="#FF7744" /><path d="M187.1872 108.202667A102.4 102.4 0 0 1 268.356267 68.266667h487.287466a102.4 102.4 0 0 1 81.169067 39.936l110.7968 144.042666A34.133333 34.133333 0 0 1 920.541867 307.2H103.458133a34.133333 34.133333 0 0 1-27.067733-54.954667l110.7968-144.042666z" fill="#FFAA44" /><path d="M441.344 116.667733A17.066667 17.066667 0 0 1 458.205867 102.4h107.588266a17.066667 17.066667 0 0 1 16.861867 14.267733L614.4 307.2h-204.8l31.744-190.532267zM409.6 341.333333h204.8v275.319467a17.066667 17.066667 0 0 1-26.5216 14.199467l-56.9344-37.956267a34.133333 34.133333 0 0 0-37.888 0l-56.9344 37.956267a17.066667 17.066667 0 0 1-26.5216-14.199467V341.333333z m273.066667 392.533334a51.2 51.2 0 0 0 0 102.4h102.4a51.2 51.2 0 0 0 0-102.4h-102.4z" fill="#FFFFFF" /></svg>

+ 1 - 0
images/shangpin.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="14px" height="14.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h1024v1024H0V0z" fill="#202425" opacity=".01" /><path d="M68.266667 375.466667a34.133333 34.133333 0 0 1 34.133333-34.133334h819.2a34.133333 34.133333 0 0 1 34.133333 34.133334v443.733333a136.533333 136.533333 0 0 1-136.533333 136.533333H204.8a136.533333 136.533333 0 0 1-136.533333-136.533333V375.466667z" fill="#FF7744" /><path d="M187.1872 108.202667A102.4 102.4 0 0 1 268.356267 68.266667h487.287466a102.4 102.4 0 0 1 81.169067 39.936l110.7968 144.042666A34.133333 34.133333 0 0 1 920.541867 307.2H103.458133a34.133333 34.133333 0 0 1-27.067733-54.954667l110.7968-144.042666z" fill="#FFAA44" /><path d="M441.344 116.667733A17.066667 17.066667 0 0 1 458.205867 102.4h107.588266a17.066667 17.066667 0 0 1 16.861867 14.267733L614.4 307.2h-204.8l31.744-190.532267zM409.6 341.333333h204.8v275.319467a17.066667 17.066667 0 0 1-26.5216 14.199467l-56.9344-37.956267a34.133333 34.133333 0 0 0-37.888 0l-56.9344 37.956267a17.066667 17.066667 0 0 1-26.5216-14.199467V341.333333z m273.066667 392.533334a51.2 51.2 0 0 0 0 102.4h102.4a51.2 51.2 0 0 0 0-102.4h-102.4z" fill="#FFFFFF" /></svg>

+ 1 - 0
images/tuikuan.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="14px" height="14.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#ea986c" d="M329.5 454.6c0 12.3 10 22.3 22.3 22.3h134.9v76.4H357.8c-12.3 0-22.3 10-22.3 22.3s10 22.3 22.3 22.3h128.9V757c0 12.3 10 22.3 22.3 22.3s22.3-10 22.3-22.3V597.7h141c12.3 0 22.3-10 22.3-22.3s-10-22.3-22.3-22.3h-141v-76.4h134.9c12.3 0 22.3-10 22.3-22.3s-10-22.3-22.3-22.3H555.7L675.9 284c7.7-9.5 6.3-23.6-3.3-31.3-9.5-7.7-23.6-6.3-31.3 3.3L508.9 419.3 373.6 253.1c-7.8-9.5-21.8-11-31.3-3.2s-11 21.8-3.2 31.3l123.1 151.1H351.8c-12.3 0-22.3 10-22.3 22.3zM512 0C229.7 0 0 229.7 0 512c0 9 5.4 17.1 13.7 20.6 8.3 3.4 17.9 1.5 24.3-4.8l120.2-120.2c8.7-8.7 8.7-22.8 0-31.5s-22.8-8.7-31.5 0L48 454.8C76.3 223.9 273.6 44.5 512 44.5c257.8 0 467.5 209.7 467.5 467.5S769.8 979.5 512 979.5c-140.3 0-272-62.2-361.2-170.8-7.8-9.5-21.8-10.9-31.3-3.1-9.5 7.8-10.9 21.8-3.1 31.3 97.7 118.8 241.9 187 395.6 187 282.3 0 512-229.7 512-512S794.3 0 512 0z" /></svg>

BIN
images/tupian2.png


BIN
images/wenbenbianji.png


BIN
images/wenbenbianjitianchong.png


BIN
images/wode (1).png


BIN
images/wode.png


+ 1 - 0
images/wodezhangdan.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="14px" height="14.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M271.36 151.552h481.28c22.528 0 40.96 18.432 40.96 40.96v634.88c0 22.528-18.432 40.96-40.96 40.96l-87.04-51.2-90.624 51.2-65.024-51.2-71.68 51.2-90.624-51.2-76.8 51.2c-22.528 0-40.96-18.432-40.96-40.96v-634.88c0.512-23.04 18.944-40.96 41.472-40.96z" fill="#FFFFFF" /><path d="M573.44 892.928l-63.488-50.176-69.632 49.664-90.624-51.2-71.68 47.616h-6.144c-33.792 0-61.44-27.648-61.44-61.44v-634.88c0-33.792 27.648-61.44 61.44-61.44h481.28c33.792 0 61.44 27.648 61.44 61.44v634.88c0 33.792-27.648 61.44-61.44 61.44H747.52l-81.408-48.128-92.672 52.224z m92.16-99.84l91.648 53.76c9.216-2.048 15.872-10.24 15.872-19.968v-634.88c0-11.264-9.216-20.48-20.48-20.48h-481.28c-11.264 0-20.48 9.216-20.48 20.48v634.88c0 9.728 6.656 17.408 15.36 19.968l80.896-54.272 90.112 51.2 73.728-52.736 66.048 52.224 88.576-50.176z" fill="#80878B" /><path d="M686.08 361.472h-348.16c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h348.16c14.336 0 25.6 11.264 25.6 25.6 0 13.824-11.264 25.6-25.6 25.6z m-348.16 81.92h194.56c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6h-194.56c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6z" fill="#FAB90A" /></svg>

BIN
images/xiaoxi.png


BIN
images/xiaoxi_1.png


+ 1 - 0
images/xuanze.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="14px" height="14.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#8B8B83" d="M512 950.857143a438.857143 438.857143 0 1 1 438.857143-438.857143 438.857143 438.857143 0 0 1-438.857143 438.857143z m0-804.571429a365.714286 365.714286 0 1 0 365.714286 365.714286A365.714286 365.714286 0 0 0 512 146.285714z" /></svg>

+ 1 - 0
images/xuanzeanniu.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="14px" height="14.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#ea986c" d="M511.7 64.7c-247.4 0-448 200.6-448 448s200.6 448 448 448 448-200.6 448-448-200.6-448-448-448z m-0.2 850.5c-222.6 0-403-180.4-403-403s180.4-403 403-403 403 180.4 403 403-180.5 403-403 403z"  /><path fill="#ea986c" d="M512 513.2m-275 0a275 275 0 1 0 550 0 275 275 0 1 0-550 0Z"  /></svg>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
images/yunshu.svg


+ 94 - 0
pages/bill/bill.js

@@ -0,0 +1,94 @@
+// pages/bill/bill.js
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    imgs:"/images/tupian2.png",
+    statusBarHeight:app.globalData.statusBarHeight,
+    yuan:99999.98,
+    date:'',
+    show:false
+  },
+  back: function(){
+    wx.navigateBack({
+      delta:1
+    })
+  },
+
+  onDisplay() {
+    this.setData({ show: true });
+  },
+  onClose() {
+    this.setData({ show: false });
+  },
+  formatDate(date) {
+    date = new Date(date);
+    return `${date.getMonth() + 1}/${date.getDate()}`;
+  },
+  onConfirm(event) {
+    const [start, end] = event.detail;
+    this.setData({
+      show: false,
+      date: `${this.formatDate(start)} - ${this.formatDate(end)}`,
+    });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

+ 5 - 0
pages/bill/bill.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {},
+  "navigationStyle": "custom",
+  "navigationBarRightButton":{"hide":true}
+}

+ 48 - 0
pages/bill/bill.wxml

@@ -0,0 +1,48 @@
+<view class="all">
+  <view class="all1">
+    <view class="img tex" style="padding-top:{{statusBarHeight}}px">
+      <image src="/../images/fanhui.png" bindtap="back" style=" width: 40rpx;height: 40rpx;" mode="" />
+      <view style="color: #fff;">账单统计</view>
+    </view>
+
+    <view style="overflow:hidden;height:250upx">
+      <image style="width: 750rpx;" src="{{imgs}}"></image>
+    </view>
+    <view class="img1">
+      <view style="margin-bottom: 12rpx;">
+        今日账单
+      </view>
+      <view style="font-size: 22rpx; color: #D3D3D3;">
+        入账金额:¥{{yuan}}元
+      </view>
+    </view>
+    <view class="img2">
+      <view>
+        <text>¥<text style="font-size: 30rpx;">340.14</text>元</text>
+        <view style="margin-left: 16rpx;">
+          包装费
+        </view>
+      </view>
+      <view style="width: 1rpx;background-color: #A9A9A9;height: 60rpx;"></view>
+      <view>
+        <text>¥<text style="font-size: 30rpx;">298.00</text>元</text>
+        <view style="margin-left: 16rpx;">
+          配送费
+        </view>
+      </view>
+      <view style="width: 1rpx;background-color: #A9A9A9;height: 60rpx;"></view>
+      <view>
+        <text>¥<text style="font-size: 30rpx;">50.00</text>元</text>
+        <view style="margin-left: 16rpx;">
+          退款费
+        </view>
+      </view>
+    </view>
+  </view>
+  <view class="all2">
+    <view style=" margin: 20rpx 30rpx; width: 670rpx; display: inline-flex; justify-content: space-between;">
+      <text>累计账单</text>
+        <van-icon  style="margin-right: -20rpx;" bind:click="onDisplay"  name="/../images/rili.svg" />
+    </view>
+  </view>
+</view>

+ 54 - 0
pages/bill/bill.wxss

@@ -0,0 +1,54 @@
+/* pages/bill/bill.wxss */
+.all {
+  box-sizing:border-box;
+  width: 100%;
+  height: 100vh;
+  background-color: #F5F5F5;
+}
+.all1{
+  position: relative;
+  width: 100%;
+  height: 480rpx;
+}
+.all2{
+  width: 100%;
+  height: 480rpx;
+  background-color: #fff;
+}
+.img {
+  position: absolute;
+  top: 20rpx;
+  left: 16rpx;
+  width: 430rpx;
+}
+.tex {
+  display: flex;
+  justify-content: space-between;
+  /* align-items: center; */
+}
+.img1 {
+  position: absolute;
+  top: 35%;
+  left: 10%;
+  width: 430rpx;
+  color: #fff;
+}
+.img2 {
+  position: absolute;
+  bottom: 16rpx;
+  left: 6%;
+  width: 670rpx;
+  color: #fff;
+  font-size: 22rpx;
+  display: flex;
+  justify-content: space-around;
+  flex-direction: row;
+  overflow: hidden;
+}
+.wen {
+  float: left;
+  width: 80rpx;
+  height: 24rpx;
+  /* foverflow: hidden; */
+  margin-left: 14rpx;
+}

+ 66 - 0
pages/home/home.js

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

+ 3 - 0
pages/home/home.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

+ 2 - 0
pages/home/home.wxml

@@ -0,0 +1,2 @@
+<!--home/home.wxml-->
+<text>home/home.wxml</text>

+ 1 - 0
pages/home/home.wxss

@@ -0,0 +1 @@
+/* home/home.wxss */

+ 2 - 1
pages/index/index.js

@@ -44,5 +44,6 @@ Page({
       userInfo: e.detail.userInfo,
       hasUserInfo: true
     })
-  }
+  },
+  
 })

+ 46 - 21
pages/index/index.wxml

@@ -1,23 +1,48 @@
-<!--index.wxml-->
-<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>
+  <view class="ert">
+    <van-search value="{{ value }}" placeholder="请输入搜索关键词" shape="round" />
+    <van-button color="#FF8C00" class="btn" round type="info" size="mini">搜索</van-button>
   </view>
+  <van-tabs active="a" type="line">
+    <van-tab title="待送达" name="a" title-active-color='#FF8C00'>
+      <!-- <van-cell-group inset>
+        <van-cell title="单元格" value="内容" label="描述信息" />
+      </van-cell-group> -->
+      <view style="background-color: #DCDCDC; width: 100%;height: 100vh; padding: 14rpx 0;">
+        <template is="card" data="" />
+        <template is="card" data="" />
+      </view>
+      <view style="background-color: #DCDCDC; width: 100%;height: 100vh; padding: 14rpx 0;">
+       
+
+      </view>
+
+    </van-tab>
+    <van-tab title="已送达" name="b">内容 2</van-tab>
+    <van-tab title="已退款" name="c">内容 3</van-tab>
+  </van-tabs>
+  <!-- <view slot="action" bind:tap="onClick">搜索</view> -->
 </view>
+<template name="card">
+  <view class="card">
+    <view class="card2">
+      <text style="font-size:12px;">订单编号:98989898989</text>
+      <text style="font-size:12px;">详情></text>
+    </view>
+    <van-divider />
+    <view class="card1">
+      <text style="font-size:12px;">姓名:吴迪(先生)</text>
+      <text style="font-size:12px; color: #FF6347;">待送达</text>
+    </view>
+    <view class="card1">
+      <text style="font-size:12px;">手机号:13912345678</text>
+    </view>
+    <view class="card1">
+      <text style="font-size:12px;">地址:哈尔滨</text>
+    </view>
+    <view class="card1">
+      <text style="font-size:12px;">下单时间:2023-04-24 17:38:34</text>
+      <van-button color="#FF8C00" custom-style="border-radius:8px" class="btn1" round type="info" size="mini">重新打印</van-button>
+    </view>
+  </view>
+</template>

+ 39 - 1
pages/index/index.wxss

@@ -16,4 +16,42 @@
 
 .usermotto {
   margin-top: 200px;
-}
+}
+
+
+.ert{
+  position: relative;
+}
+.btn{
+  position: absolute;
+  right: 40rpx;
+  top: 32rpx;
+}
+.card{
+  width: 90%;
+  margin: auto;
+  height: 270rpx;
+  background: #fff;
+  border-radius: 10rpx;
+  margin-top: 18rpx;
+  padding: 20rpx 20rpx;
+  position: relative;
+  /* box-shadow: 5px 5px 5px #cdcfcf; */
+ }
+ .card1{
+   display: flex;
+   justify-content: space-between;
+   color: #696969;
+   margin-bottom: 8rpx;
+ }
+ .card2{
+  display: flex;
+  justify-content: space-between;
+  color: #696969;
+  margin-bottom: -10rpx;
+}
+ .btn1{
+  position: absolute;
+  right: 20rpx;
+  bottom: 25rpx;
+}

+ 68 - 0
pages/me/me.js

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

+ 3 - 0
pages/me/me.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

+ 29 - 0
pages/me/me.wxml

@@ -0,0 +1,29 @@
+<!-- <van-cell is-link title="单元格" link-type="navigateTo" url="/pages/message/message"
+  value="neirong" center icon="/../../images/tupian2.png" size="large"
+   /> -->
+
+<view class="all">
+  <view class="all1">
+    <!-- {{image}} -->
+    <view style="display: flex;">
+      <image style=" margin-left: 30rpx; margin-top: 20rpx; width: 260rpx; height: 160rpx; border-radius: 6px; line-height: 160rpx;" src="../../images/tupian2.png" mode="" />
+      <view class="wen">
+        <text style="font-weight: 700;">二食堂一楼麻辣烫</text>
+        <text style="margin-top: 20rpx; color: #808080 ; font-weight: 0;">营业时间:8:00-9:00</text>
+      </view>
+      <view class="dayu">
+        <image style="width: 28rpx;" src="/images/dayuhao (1).svg" mode=""/>
+      </view>
+    </view>
+  </view>
+
+  <view>
+    <view style="margin-bottom: 20rpx;">
+      <van-cell is-link icon="/images/shangpin.svg" title-class="title" title="商品管理" link-type="navigateTo" url="/pages/merManagement/merManagement" />
+    </view>
+
+    <view>
+      <van-cell is-link icon="/images/wodezhangdan.svg" title-class="title" title="账单统计" link-type="navigateTo" url="/pages/bill/bill" />
+    </view>
+  </view>
+</view>

+ 33 - 0
pages/me/me.wxss

@@ -0,0 +1,33 @@
+/* me/me.wxss */
+.all{
+  width: 100%;
+  height: 100vh;
+  background-color: #DCDCDC;
+  padding-top: 30rpx;
+}
+.all1{
+  width: 100vh;
+  height: 200rpx;
+  background-color: #fff;
+  margin-bottom: 20rpx;
+}
+.wen{
+  display: inline-flex;
+  flex-direction: column;
+  margin-left: 30rpx;
+  margin-top: 25rpx;
+  
+  font-size: 28rpx;
+}
+.dayu{
+  width: 240rpx;
+  display: flex;
+  height: 200rpx;
+  justify-content: center;
+  align-items: center;
+  color: #808080;
+}
+.title{
+  font-size: 26rpx;
+  color: #808080;
+}

+ 73 - 0
pages/merManagement/merManagement.js

@@ -0,0 +1,73 @@
+// merManagement/merManagement.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    checked: true,
+    activeIcon: '/images/xuanze.svg',
+    inactiveIcon: '/images/xuanzeanniu.svg',
+  },
+  onChange(event) {
+    this.setData({
+      checked: event.detail,
+    });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

+ 4 - 0
pages/merManagement/merManagement.json

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

+ 20 - 0
pages/merManagement/merManagement.wxml

@@ -0,0 +1,20 @@
+<view style="width: 100wh; height: 100vh; background-color: #DCDCDC;">
+  <van-divider />
+  <view class="ert">
+    <van-search value="{{ value }}" placeholder="请输入搜索关键词" shape="round" />
+    <van-button color="#FF8C00" class="btn" round type="info" size="mini">搜索</van-button>
+  </view>
+  <view class="checks">
+    <van-checkbox label-class="lable" style="font-size: 26rpx;" use-icon-slot value="{{ checked }}" bind:change="onChange">
+      全选
+      <image style="width: 40rpx;height: 40rpx;" slot="icon" src="{{ checked ? activeIcon : inactiveIcon }}" />
+      <view class="btn1">
+        <van-button plain class="cst" color="#32CD32" style="margin-left:30rpx;" hairline round size="mini">一键上架</van-button>
+        <van-button style="margin-left:30rpx;" color="#7232dd" round size="mini">一键下架</van-button>
+        <van-button style="margin-left:30rpx;" color="#7232dd" round size="mini">删除</van-button>
+      </view>
+    </van-checkbox>
+
+
+  </view>
+</view>

+ 34 - 0
pages/merManagement/merManagement.wxss

@@ -0,0 +1,34 @@
+/* merManagement/merManagement.wxss */
+.ert{
+  position: relative;
+  margin-top: -32rpx;
+}
+.btn{
+  position: absolute;
+  right: 40rpx;
+  top: 32rpx;
+}
+.lable{
+  margin-top: -10rpx;
+  margin-left: -10rpx;
+}
+.checks{
+  margin: 20rpx 0 20rpx 30rpx;
+  display: flex;
+  position: relative;
+}
+.btn1{
+  position: absolute;
+  right: 40rpx;
+  top: 0rpx;
+}
+.cst{
+  /* background-color: #DCDCDC; */
+background: transparent;   /*设置背景颜色一致*/
+border-color: transparent; /*设置边框颜色一致*/
+}
+button[plain] {
+  /* border: none; */
+  background-color:#DCDCDC ;
+  border-color: transparent;
+}

+ 67 - 0
pages/message/message.js

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

+ 3 - 0
pages/message/message.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

+ 32 - 0
pages/message/message.wxml

@@ -0,0 +1,32 @@
+
+ <view style="background-color: #DCDCDC; width: 100%;height: 100vh; padding: 14rpx 0;">
+        <template is="card" data=""/>
+        <template is="card" data=""/>
+      </view>
+
+<template name="card">
+
+  <view class="card">
+          <view class="card2">
+            <text style="font-size:12px;">订单编号:98989898989</text>
+            <text style="font-size:12px;">详情></text>
+          </view>
+          <van-divider  />
+          <view class="card1" style="margin-top:-20rpx;">
+            <text style="font-size:12px; ">姓名:吴迪(先生)</text>
+            <text style="font-size:12px; color: #FF6347;">已送达</text>
+          </view>
+          <view class="card1">
+            <text style="font-size:12px;">手机号:13912345678</text>
+          </view>
+          <view class="card1">
+            <text style="font-size:12px;">地址:哈尔滨</text>
+          </view>
+          <view class="card1">
+            <text style="font-size:12px;">下单时间:2023-04-24 17:38:34</text>
+          </view>
+          <view class="card1">
+            <text style="font-size:12px;">配送人:***</text>
+          </view>
+        </view>
+</template>

+ 30 - 0
pages/message/message.wxss

@@ -0,0 +1,30 @@
+/* message/message.wxss */
+.card{
+  width: 90%;
+  margin: auto;
+  height: 270rpx;
+  background: #fff;
+  border-radius: 10rpx;
+  margin-top: 18rpx;
+  padding: 20rpx 20rpx;
+  position: relative;
+  /* box-shadow: 5px 5px 5px #cdcfcf; */
+ }
+ .card2{
+  display: flex;
+  justify-content: space-between;
+  color: #696969;
+  margin-bottom: -10rpx;
+}
+ .btn1{
+  position: absolute;
+  right: 20rpx;
+  bottom: 25rpx;
+}
+.card1{
+  display: flex;
+  justify-content: space-between;
+  color: #696969;
+  margin-bottom: 8rpx;
+
+}

+ 2 - 1
project.private.config.json

@@ -3,5 +3,6 @@
   "projectname": "delivery-business",
   "setting": {
     "compileHotReLoad": true
-  }
+  },
+  "libVersion": "2.31.0"
 }

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно