.gitignore

@@ -0,0 +1,23 @@
+.DS_Store
+node_modules/
+dist/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+**/*.log
+
+tests/**/coverage/
+tests/e2e/reports
+selenium-debug.log
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.local
+
+package-lock.json
+yarn.lock

app.json

@@ -1,4 +1,23 @@
 {
+<<<<<<< HEAD
+  "pages": [
+    "pages/index/index",
+    "pages/logs/logs",
+    "pages/billing_Statistics/index",
+    "pages/store_Management/index"
+  ],
+  "window": {
+    "backgroundTextStyle": "light",
+    "navigationBarBackgroundColor": "#fff",
+    "navigationBarTitleText": "Weixin",
+    "navigationBarTextStyle": "black"
+  },
+  "usingComponents": {
+    "van-button": "@vant/weapp/button"
+  },
+  "sitemapLocation": "sitemap.json"
+}
+=======
   "pages":[
     "pages/index/index",
     "pages/logs/logs"
@@ -15,3 +34,4 @@
 
   "sitemapLocation": "sitemap.json"
 }
+>>>>>>> 2e65b556490cfe24940c679f526c85a7b019b6c7

pages/billing_Statistics/index.js

@@ -0,0 +1,94 @@
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    date: '',
+    show: false,
+    isDisplay:true,
+  },
+  //点击图标 日历显示
+  onDisplay() {
+    this.setData({
+      show: true,
+      isDisplay:!this.data.isDisplay
+    });
+  },
+  //打开日期再次显示
+  dateShow(){
+    this.setData({
+      show:true,
+      isDisplay:false
+    })
+  },
+  onClose() {
+    this.setData({
+      show: false,
+      isDisplay:!this.data.isDisplay
+    });
+  },
+  formatDate(date) {
+    date = new Date(date);
+    return `${date.getFullYear()}-${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() {
+
+  }
+})

pages/billing_Statistics/index.json

@@ -0,0 +1,12 @@
+{
+  "usingComponents": {
+    "van-row":"@vant/weapp/row",
+    "van-icon":"@vant/weapp/icon",
+    "van-col": "@vant/weapp/col",
+    "van-datetime-picker": "@vant/weapp/datetime-picker",
+    "van-popup": "@vant/weapp/popup",
+    "van-calendar":"@vant/weapp/calendar",
+    "van-cell":"@vant/weapp/cell",
+    "van-button": "@vant/weapp/button"
+  }
+}

pages/billing_Statistics/index.wxml

@@ -0,0 +1,72 @@
+<view class="bill_container">
+  <view class="bill_header">
+    <van-row>
+      <van-col style="font-size: 44rpx;color:white;" span="10">
+        <van-icon name="arrow-left" />
+      </van-col>
+      <van-col style="font-size: 40rpx;color:white" span="10">账单统计</van-col>
+      <van-col span="4"></van-col>
+    </van-row>
+
+    <view class="bill_content">
+      <view class="todayBill">今日账单</view>
+      <view class="Account">入账金额：￥<span>9909.98</span>元
+      </view>
+    </view>
+
+    <view class="bill_list">
+      <view class="bill_list_content1">
+        <view><span>￥340.14</span>元</view>
+        <view>包装费</view>
+      </view>
+      <view class="bill_list_content2">
+        <view><span>￥298.00</span>元</view>
+        <view>配送费</view>
+      </view>
+      <view class="bill_list_content3">
+        <view><span>￥50.00</span>元</view>
+        <view>退款费</view>
+      </view>
+    </view>
+
+    <view class="bill_bottom">
+      <view class="bill_bottom_header">
+        <text>累计账单</text>
+        <van-icon wx:if="{{isDisplay}}" bind:click="onDisplay" name="calendar-o" />
+        <text style="color:orange;" bindtap="dateShow" wx:if="{{!isDisplay}}">{{date}}</text>
+      </view>
+      <view class="bill_bottom_content">
+        <view class="bill_bottom_contentList">
+          <view>
+            <van-icon name="gold-coin-o" /><span>￥19899.00</span>元
+          </view>
+          <view class="bill_bottom_contentList_text">入账金额</view>
+        </view>
+
+        <view class="bill_bottom_contentList">
+          <view>
+            <van-icon name="point-gift-o" /><span>￥19899.00</span>元
+          </view>
+          <view class="bill_bottom_contentList_text">包装费</view>
+        </view>
+
+        <view class="bill_bottom_contentList">
+          <view>
+            <van-icon name="logistics" /><span>￥19899.00</span>元
+          </view>
+          <view class="bill_bottom_contentList_text"> 配送费</view>
+        </view>
+
+        <view class="bill_bottom_contentList">
+          <view>
+            <van-icon name="refund-o" /><span>￥19899.00</span>元
+          </view>
+          <view class="bill_bottom_contentList_text">退款费</view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+</view>
+
+<van-calendar  show="{{ show }}" type="range" bind:close="onClose" bind:confirm="onConfirm" />

pages/billing_Statistics/index.wxss

@@ -0,0 +1,110 @@
+.bill_header {
+  width: 100%;
+  height: 500rpx;
+  background-color: #FE8146;
+}
+
+.bill_content {
+  margin-left: 80rpx;
+  color: white;
+  padding-top: 60rpx;
+}
+
+.bill_content .todayBill {
+  font-size: 40rpx;
+}
+
+.bill_content .Account {
+  margin-top: 20rpx;
+  font-size: 32rpx;
+}
+
+.bill_content span {
+  font-size: 48rpx;
+}
+
+.bill_list {
+  margin-top: 100rpx;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+}
+
+.bill_list_content1,
+.bill_list_content2,
+.bill_list_content3 {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  font-size: 28rpx;
+  color: aliceblue;
+  /* background-color: aqua; */
+  padding: 20rpx;
+}
+
+.bill_list_content1,
+.bill_list_content2 {
+  border-right: 1rpx solid rgb(199, 192, 192);
+}
+
+.bill_list_content1 view span {
+  font-size: 40rpx;
+}
+
+.bill_list_content2 view span {
+  font-size: 40rpx;
+}
+
+.bill_list_content3 view span {
+  font-size: 40rpx;
+}
+
+.bill_bottom {
+  width: 100%;
+  height: 60rpx;
+}
+
+.bill_bottom_header {
+  margin-top: 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.bill_bottom_header text {
+  padding: 40rpx;
+  font-size: 32rpx;
+}
+
+.bill_bottom_header van-icon {
+  padding: 40rpx;
+  color: orange;
+  font-size: 50rpx;
+}
+
+.bill_bottom_content {
+
+  display: grid;
+  grid-template-rows: 1fr 1fr;
+  grid-template-columns: 1fr 1fr;
+  text-align: center;
+}
+
+.bill_bottom_contentList {
+  padding: 40rpx;
+  border: 1px solid #ccc;
+}
+
+.bill_bottom_contentList van-icon {
+  font-size: 50rpx;
+  color: orange;
+}
+
+.bill_bottom_contentList span {
+  font-size: 35rpx;
+}
+
+.bill_bottom_contentList_text {
+  font-size: 24rpx;
+  color: #ccc;
+}

pages/index/index.wxml

@@ -24,3 +24,9 @@
   </view>
   <van-button type="primary">按钮</van-button>
 </view>
+<<<<<<< HEAD
+<!-- 两端对齐 -->
+
+
+=======
+>>>>>>> 2e65b556490cfe24940c679f526c85a7b019b6c7

pages/store_Management/index.js

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

pages/store_Management/index.json

@@ -0,0 +1,13 @@
+{
+  "navigationBarTitleText": "店铺管理",
+  "usingComponents": {
+    "van-row": "@vant/weapp/row",
+    "van-icon": "@vant/weapp/icon",
+    "van-col": "@vant/weapp/col",
+    "van-datetime-picker": "@vant/weapp/datetime-picker",
+    "van-popup": "@vant/weapp/popup",
+    "van-calendar": "@vant/weapp/calendar",
+    "van-cell": "@vant/weapp/cell",
+    "van-nav-bar": "@vant/weapp/nav-bar"
+  }
+}

pages/store_Management/index.wxml

@@ -0,0 +1,39 @@
+<view class="storeManage_container">
+    <view class="store_pic">
+        <text class="store_text">店铺图片</text>
+        <view class="store_upload">
+            <image src="{{imagePath}}"></image>
+            <text class="store_plus" bindtap="handleChooseAlbum">+</text>
+        </view>
+    </view>
+    <view class="store_name">
+        <view class="store_name_text">店铺名称</view>
+        <input type="text" placeholder="请输入店铺名称" />
+    </view>
+    <view class="dispatch_fee">
+        <text>配送费(￥)</text>
+        <span>5.00</span>
+    </view>
+    <view class="dispatch_time">
+        <text>配送时长</text>
+        <input type="text" placeholder="请输入时长" />
+    </view>
+    <view class="package_fee">
+        <text>包装费(￥)</text>
+        <input type="text" placeholder="请输入金额" />
+    </view>
+    <view class="open_time">
+        <text>营业时间</text>
+        <input type="text" placeholder="请输入营业时间" />
+    </view>
+    <view class="custom_service">
+        <view class="custom_service_text">客服电话</view>
+        <input type="text" placeholder="请输入客服电话" />
+    </view>
+    <view class="store_notify">
+        <text>公告</text>
+        <textarea name="" id="" cols="30" rows="10" placeholder="请提供更多参考信息帮助我们核实,如周边标志建筑、近邻商户等。">
+        </textarea>
+    </view>
+    <button>提交</button>
+</view>

pages/store_Management/index.wxss

@@ -0,0 +1,177 @@
+page {
+    background-color: #EFF0F5;
+}
+
+.storeManage_container view {
+    background-color: white;
+    margin-top: 30rpx;
+}
+
+.storeManage_container .store_pic {
+    width: 100%;
+    height: 200rpx;
+    position: relative;
+}
+
+.store_pic {
+    position: relative;
+}
+
+.store_pic .store_text {
+    color: black;
+    position: absolute;
+    top: 14%;
+    left: 8%;
+}
+
+.store_upload {
+    width: 200rpx;
+    position: absolute;
+    height: 160rpx;
+    border: 1px dashed rgb(143, 142, 142);
+    right: 4%;
+    top: -5%;
+}
+
+.store_upload image {
+    width: 100%;
+    height: 100%;
+    /* background-color: blue; */
+}
+
+.store_upload .store_plus {
+    position: absolute;
+    font-size: 40rpx;
+    top: 30%;
+    left: 45%;
+}
+
+/* Ming */
+.store_name {
+    width: 100%;
+    height: 180rpx;
+    /* background-color: burlywood !important; */
+    text-align: left;
+}
+
+.store_name .store_name_text {
+    width: 100%;
+    border-bottom: 1px solid rgb(146, 146, 146);
+    padding: 40rpx;
+}
+
+.store_name input {
+    padding: 10rpx;
+    padding-left: 40rpx;
+}
+
+/* 配送 */
+.dispatch_fee {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.dispatch_fee text {
+    padding: 30rpx;
+    padding-left: 40rpx;
+}
+
+.dispatch_fee span {
+    padding: 30rpx;
+    padding-right: 40rpx;
+    color: red;
+}
+
+/* 配送时长 */
+.dispatch_time {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.dispatch_time text {
+    padding: 30rpx;
+    padding-left: 40rpx;
+}
+
+.dispatch_time input {
+    padding: 30rpx;
+    color: red;
+    padding-right: 0px;
+}
+
+/* 包装费 */
+.package_fee {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.package_fee text {
+    padding: 30rpx;
+    padding-left: 40rpx;
+}
+
+.package_fee input {
+    padding: 30rpx;
+    color: red;
+    padding-right: 0px;
+}
+
+/* 营业时间 */
+.open_time {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.open_time text {
+    padding: 30rpx;
+    padding-left: 40rpx;
+}
+
+.open_time input {
+    padding: 30rpx;
+    color: red;
+    padding-right: 0px;
+}
+
+/* 客服电话 */
+.custom_service .custom_service_text {
+    width: 100%;
+    border-bottom: 1px solid rgb(146, 146, 146);
+    padding: 40rpx;
+}
+
+.custom_service input {
+    padding: 10rpx;
+    padding-left: 40rpx;
+}
+
+/* 公告 */
+.store_notify {
+    width: 100%;
+    overflow: hidden;
+   
+}
+
+.store_notify text {
+    padding-top: 200rpx;
+    padding-left: 50rpx;
+    font-size: 40rpx;
+
+}
+
+.store_notify textarea {
+    margin-left: 80rpx;
+    margin-top: 40rpx;
+    border: 1px solid rgb(180, 180, 180);
+    border-radius: 5%;
+    text-indent: 1em;
+}
+button{
+    margin-top: 40rpx;
+    background-color: #55B3F4;
+    width: 600rpx;
+}

project.private.config.json

@@ -1,8 +1,61 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+<<<<<<< HEAD
+  "projectname": "delivery-rider",
+  "setting": {
+    "compileHotReLoad": true
+  },
+  "libVersion": "2.19.6",
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "",
+          "pathName": "pages/index/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null,
+          "partialCompile": {
+            "enabled": false,
+            "pages": [
+              "pages/billing_Statistics/index"
+            ]
+          }
+        },
+        {
+          "name": "账单统计",
+          "pathName": "pages/billing_Statistics/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null,
+          "partialCompile": {
+            "enabled": false,
+            "pages": [
+              "pages/billing_Statistics/index"
+            ]
+          }
+        },
+        {
+          "name": "店铺管理",
+          "pathName": "pages/store_Management/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null,
+          "partialCompile": {
+            "enabled": false,
+            "pages": [
+              "pages/store_Management/index"
+            ]
+          }
+        }
+      ]
+    }
+  }
+=======
   "projectname": "miniprogram",
   "setting": {
     "compileHotReLoad": true
   },
   "libVersion": "2.19.6"
+>>>>>>> 2e65b556490cfe24940c679f526c85a7b019b6c7
 }