From 819f3187cb3402d9b157390ce5d854e3d64b9617 Mon Sep 17 00:00:00 2001
From: chenkun <3289431190@qq.com>
Date: Sun, 20 Oct 2024 00:53:12 +0800
Subject: [PATCH] .

---
 components/config/customerServicePopup.vue |   2 +-
 pages.json                                 |   7 +
 pages/index/center.vue                     |  14 +-
 pages/index/index.vue                      |  12 +-
 pages/index/order.vue                      |  82 +++----
 pages_order/center/help.vue                | 331 +++++++++++++++++++++++++++++
 pages_order/center/systemSet.vue           | 115 ++++++++++
 pages_order/mine/individualTeam.vue        | 177 +++++++++------
 pages_order/mine/runningWater.vue          | 265 ++++++++++++++++++-----
 pages_order/order/orderDetail.vue          | 102 ++++-----
 pages_order/product/productDetail.vue      | 171 ++++++++-------
 pages_order/static/center/1.svg            |   1 +
 pages_order/static/center/2.svg            |   1 +
 pages_order/static/center/3.svg            |   1 +
 pages_order/static/center/4.svg            |   1 +
 pages_order/static/order/2.svg             |   1 +
 pages_order/static/order/copy.png          | Bin 0 -> 961 bytes
 17 files changed, 968 insertions(+), 315 deletions(-)
 create mode 100644 pages_order/center/help.vue
 create mode 100644 pages_order/center/systemSet.vue
 create mode 100644 pages_order/static/center/1.svg
 create mode 100644 pages_order/static/center/2.svg
 create mode 100644 pages_order/static/center/3.svg
 create mode 100644 pages_order/static/center/4.svg
 create mode 100644 pages_order/static/order/2.svg
 create mode 100644 pages_order/static/order/copy.png

diff --git a/components/config/customerServicePopup.vue b/components/config/customerServicePopup.vue
index d2d73a6..ab978b8 100644
--- a/components/config/customerServicePopup.vue
+++ b/components/config/customerServicePopup.vue
@@ -105,7 +105,7 @@
 				border-radius: 30rpx;
 			}
 			.btn1{
-				background-color: #fff;
+				background-color: #ffb300;
 			}
 			.btn2{
 				background-color: $uni-color;
diff --git a/pages.json b/pages.json
index 97ba381..9436d58 100644
--- a/pages.json
+++ b/pages.json
@@ -51,6 +51,7 @@
 			{
 				"path": "mine/purse"
 			},
+			
 			{
 				"path": "mine/runningWater"
 			},
@@ -89,6 +90,12 @@
 			},
 			{
 				"path": "mine/individualTeam"
+			},
+			{
+				"path": "center/systemSet"
+			},
+			{
+				"path": "center/help"
 			}
 		]
 	}],
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 6cfa52f..3677522 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -81,10 +81,7 @@
 						<text class="grid-text">我的团队</text>
 					</uv-grid-item>
 
-					<uv-grid-item @click="$utils.navigateTo('/pages_order/order/refundsOrExchange?index='+0)">
-						<image class="image" src="/static/image/center/5.png" mode=""></image>
-						<text class="grid-text">联系客服</text>
-					</uv-grid-item>
+				
 
 					<uv-grid-item @click="$utils.navigateTo('/pages_order/order/refundsOrExchange?index='+1)">
 						<image class="image" src="/static/image/center/7.png" mode=""></image>
@@ -96,12 +93,12 @@
 						<text class="grid-text">邀请好友</text>
 					</uv-grid-item>
 				
-					<uv-grid-item>
+					<uv-grid-item@click="$utils.navigateTo('/pages_order/center/systemSet')">
 						<image class="image" src="/static/image/center/6.png" mode=""></image>
 						<text class="grid-text">系统设置</text>
 					</uv-grid-item>
 				
-					<uv-grid-item @click="$utils.redirectTo('/index/cart')">
+					<uv-grid-item@click="$utils.navigateTo('/pages_order/center/help')">
 						<image class="image" src="/static/image/center/7.png" mode=""></image>
 						<text class="grid-text">帮助与反馈</text>
 					</uv-grid-item>
@@ -111,6 +108,11 @@
 						<image class="image" src="/static/image/center/7.png" mode=""></image>
 						<text class="grid-text">关于本程序</text>
 					</uv-grid-item>
+					
+					<uv-grid-item @click="$utils.navigateTo('/pages_order/order/refundsOrExchange?index='+0)">
+						<image class="image" src="/static/image/center/5.png" mode=""></image>
+						<text class="grid-text">联系客服</text>
+					</uv-grid-item>
 				</uv-grid>
 			</view>
 		</view>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 029b628..dcca45f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -80,7 +80,7 @@
 		
 		<view class="shop-list"
 		v-for="(item, index) in 20"
-		@click="$utils.navigateTo('/pages_order/product/productDetail')"
+		@click="toGoodInfo(item,index)"
 		:key="index">
 			<view class="picture-shop">
 				<image src="../../static/image/home/8.png" mode=""></image>
@@ -146,7 +146,15 @@
 					url: '/pages_order/order/fastCreateOrder'
 				})
 				// this.$utils.navigateTo('/pages_order/mine/address')
-			}
+			},
+			toGoodInfo(item,index){
+				// uni.navigateTo({
+					// url: `/pages_order/order/product/productDetail?id=`+item.id
+				// })
+				uni.navigateTo({
+					url: '/pages_order/product/productDetail'
+				})
+			},
 		}
 	}
 </script>
diff --git a/pages/index/order.vue b/pages/index/order.vue
index ad2979a..43f28a6 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -1,13 +1,7 @@
 <template>
 	<view class="page">
 		
-		<navbar
-		title="订单中心"
-		bgColor="#DC2828"
-		color="#fff"
-		leftClick 
-		@leftClick="$utils.navigateBack" 
-		/>
+		<navbar title="订单中心" bgColor="#DC2828" color="#fff" leftClick  @leftClick="$utils.navigateBack" />
 		
 		<uv-tabs :list="tabs" 
 		:activeStyle="{color : '#FD5100', fontWeight : 600}"
@@ -16,12 +10,10 @@
 		lineWidth="50rpx"
 		@click="clickTabs"></uv-tabs>
 		
-		<view v-if="orderList.length > 0" class="list">
-			<view class="item" 
-			v-for="(item, index) in orderList.records" 
-			@click="toOrderDetail(item.id)"
-			:key="index">
+		<view v-if="orderList.records.length > 0" class="list">
+			<view class="item"  v-for="(item, index) in orderList.records"  @click="toOrderDetail(item.id)" :key="index">
 	
+				<!-- 顶部 -->
 				<view class="top">
 					<view class="service">
 						<text>{{item.projectId_dictText}}</text>
@@ -31,50 +23,31 @@
 						<text> {{item.state_dictText}}</text>
 					</view>
 				</view>
-	
+				<!-- 中 -->
 				<view class="content">
-	
 					<view class="left">
 						<image mode="aspectFill" :src="item.image"></image>
 					</view>
-	
 					<view class="right">
 						<view class="text-hidden-1">
 							客户姓名：{{item.name}}
 						</view>
 						<view class="text-hidden-1">
-							产品规格：{{item.unit}}
+							下单时间：{{item.unit}}
 						</view>
 						<view class="text-hidden-1">
-							租赁地址：{{item.address}}
+							联系电话：{{item.address}}
 						</view>
-						<!-- <view class="text-hidden-1">
-							总计时间：{{item.useTime}}分钟
-						</view> -->
-						
 					</view>
-	
 				</view>
-	
+				<!-- 底 -->
 				<view class="bottom">
 					<view class="price">
-						总价格：<text class="num">{{item.money}}元</text>
+						总价格：<text class="num">￥{{item.money}}元</text>
 					</view>
 					<view class="b1">
-						查看物流
-					</view>
-					<!-- <view @click.stop="toPayOrder(item)" class="b2" v-if="item.state == 0">
-						立即付款
-					</view>
-					<view class="b1" @click.stop="moreOrder(item.projectId,toPlaceorder)" v-if="item.state == 3">
-						再来一单
-					</view>
-					<view class="b2" @click.stop="toEvaluate(item.id,item.projectId,item.technicianId)" v-if="item.state == 3">
-						立即评价
+						查看详情
 					</view>
-					<view class="b2" @click.stop="moreOrder(item.projectId,toPlaceorder)" v-if="item.state == 4">
-						再来一单
-					</view> -->
 				</view>
 	
 			</view>
@@ -97,35 +70,35 @@
 						name: '全部'
 					},
 					{
-						name: '租赁押金'
+						name: '待付款'
 					},
 					{
-						name: '水洗租赁'
+						name: '配送中'
 					},
 					{
-						name: '破损换货'
+						name: '已完成'
 					},
 					{
-						name: '退货退款'
+						name: '已取消'
 					}
 				],
 				queryParams: {
 					pageNo: 1,
 					pageSize: 10
 				},
-				// orderList: [
-				// 	{
-				// 		money : 99.99,
-				// 		address : '广东省广州市越秀区城南故事C3栋2802',
-				// 		name : '李**',
-				// 		phone : '150*****091',
-				// 		unit : '120*40*75【桌子尺寸】',
-				// 		image : 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg',
-				// 		state_dictText : '已完成',
-				// 	}
-				// ], //订单列表数据
 				orderList : {
-					records : [],
+					records : [
+							{
+								projectId_dictText:"泰山工装石膏板",
+								money : 99.99,
+								address : '广东省广州市越秀区城南故事C3栋2802',
+								name : '李**',
+								phone : '150*****091',
+								unit : '120*40*75【桌子尺寸】',
+								image : 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg',
+								state_dictText : '已完成',
+							}
+					],
 					total : 0,
 				},
 				state : -1,
@@ -235,9 +208,10 @@
 				justify-content: space-between;
 				font-size: 25rpx;
 				.price {
+					color: #787777;
 					font-weight: 900;
 					text {
-						color: #ff780099;
+						color: #fd7d41;
 						font-size: 30rpx;
 					}
 				}
diff --git a/pages_order/center/help.vue b/pages_order/center/help.vue
new file mode 100644
index 0000000..b31e037
--- /dev/null
+++ b/pages_order/center/help.vue
@@ -0,0 +1,331 @@
+<template>
+	<!-- 帮助与反馈 -->
+	<view class="help">
+		<navbar title="帮助与反馈"  leftClick @leftClick="$utils.navigateBack" />
+		<view class="help-box">
+			<view>
+				<view class="help-issue">
+					<text>问题和意见</text>
+					<text style="color: #BD3624;">*</text>
+				</view>
+				<uv-textarea v-model="value" :count="true" border="none" height="400"
+					placeholder="请把发现的问题提交给我们，感谢您的参与(必填)" 
+					:text-style="{color:'#BCB7B7',fontSize:'28rpx'}" />
+			</view>
+
+			<view>
+				<view class="help-issue">
+					<text>问题截图</text>
+					<text style="color: #BD3624;">*</text>
+				</view>
+
+				<view class="help-screenshot">
+					<uv-upload :fileList="fileList" multiple :maxCount="3" width="180rpx"
+						height="180rpx" multiple @afterRead="afterRead" @delete="deleteImage">
+						<image src="../static/help/uploading.png" mode="aspectFill"
+							style="width: 180rpx;height: 180rpx;" />
+					</uv-upload>
+				</view>
+			</view>
+
+			<!-- <view>
+				<view class="help-issue">
+					<text>联系方式</text>
+					<text style="color: #BD3624;">*</text>
+				</view>
+				<uv-input placeholder="请输入联系方式" fontSize="24rpx" border="bottom"
+					:custom-style="{backgroundColor: '#fff'}">
+					<template #prefix>
+						<uv-text text="联系姓名" size="24rpx" margin="20rpx 10rpx 20rpx 10rpx" />
+					</template>
+				</uv-input>
+				<uv-input placeholder="请输入联系姓名" border="none" fontSize="24rpx"
+					:custom-style="{backgroundColor: '#fff'}">
+					<template #prefix>
+						<uv-text text="联系方式" size="24rpx" margin="20rpx 10rpx 20rpx 10rpx" />
+					</template>
+				</uv-input>
+			</view> -->
+			<view class="help-button">
+				<view>确认</view>
+			</view>
+		</view>
+	</view>
+</template>
+<template>
+  <view class="page">
+
+    <navbar  title="帮助与反馈" leftClick @leftClick="$utils.navigateBack"/>
+
+    <view class="frame">
+      <!--帮助与反馈-->
+      <view class="helpFeedback">
+        <view class="title"> 问题和意见 <span style="color: red;">*</span></view>
+        <view class="desc">
+          <textarea placeholder="请把发现的问题提交给我们，感谢您的参与(必填)"/>
+        </view>
+      </view>
+
+      <!--问题截图-->
+      <view class="problemImg">
+        <view class="title">问题截图<span style="color: red;">*</span></view>
+        <view class="img">
+          <uv-upload
+              :fileList="fileList"
+              :maxCount="5"
+              multiple
+              width="150rpx"
+              height="150rpx"
+              @delete="deleteImage"
+              @afterRead="afterRead"
+              :previewFullImage="true">
+          </uv-upload>
+        </view>
+      </view>
+
+      <!--联系方式-->
+      <view class="name_phone">
+        <view class="title">联系方式<span style="color: red;">*</span></view>
+        <view class="items">
+          <view class="item">
+            <view>联系姓名</view>
+            <view>
+              <input  placeholder="请输入联系姓名" clearable></input>
+            </view>
+          </view>
+          <view class="item">
+            <view>联系电话</view>
+            <view>
+              <input placeholder="请输入联系电话" clearable></input>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!--提交反馈-->
+      <view class="btns">
+        <view @click="submitFeedback" class="btn">
+          提交反馈
+        </view>
+      </view>
+    </view>
+
+  </view>
+</template>
+<script>
+import topbar from "@/components/base/topbar.vue";
+import tabber from "@/components/base/tabbar.vue";
+
+export default {
+  name: "helpFeedback",
+  components: {tabber, topbar},
+  data() {
+    return {
+      fileList: [],
+    }
+  },
+  methods: {
+
+    // 提交反馈
+    submitFeedback() {
+
+    },
+
+    deleteImage(e) {
+      this.fileList.splice(e.index, 1)
+    },
+    afterRead(e) {
+      let self = this
+      e.file.forEach(file => {
+        self.$Oss.ossUpload(file.url).then(url => {
+          self.fileList.push({
+            url
+          })
+        })
+      })
+    },
+  },
+}
+</script>
+
+
+<style scoped lang="scss">
+.page {
+  height: 100vh;
+  background-color: #f2f5f5;
+
+  .frame {
+    padding: 40rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    gap: 40rpx;
+
+    .helpFeedback {
+      .title {
+
+      }
+
+      .desc {
+        margin-top: 20rpx;
+        height: 300rpx;
+        border-radius: 40rpx;
+        overflow: hidden;
+        padding: 20rpx;
+        font-size: 28rpx;
+        background-color: #fff;
+      }
+    }
+
+    .problemImg {
+
+      .img {
+        margin-top: 20rpx;
+        height: 150rpx;
+        border-radius: 40rpx;
+        overflow: hidden;
+        padding: 20rpx;
+        font-size: 28rpx;
+        background-color: #fff;
+      }
+    }
+
+    .name_phone {
+
+      .title {
+
+      }
+
+      .items {
+        margin-top: 20rpx;
+
+        .item {
+          display: flex;
+          align-items: center;
+          background-color: #FFF;
+          height: 80rpx;
+          padding: 10rpx 0 0 20rpx;
+          border-bottom: 1px solid #efefef;
+
+          > view:nth-of-type(1) {
+            width: 30%;
+            // font-weight: 700;
+          }
+
+          > view:nth-of-type(2) {
+            width: 70%;
+            border-radius: 10rpx;
+            overflow: hidden;
+
+
+            input {
+              background-color: #FFF;
+              font-size: 28rpx;
+              padding: 16rpx 8rpx 16rpx 15rpx;
+            }
+          }
+        }
+      }
+    }
+
+    .btns {
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      gap: 20rpx;
+
+      .btn {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 500rpx;
+        height: 70rpx;
+        border-radius: 40rpx;
+        color: #FFF;
+        font-size: 28rpx;
+        margin: 20rpx 10rpx 0 0;
+        background: $uni-color;
+        //margin-top: 20rpx;
+        border-radius: 40rpx;
+      }
+    }
+
+  }
+}
+</style>
+<script>
+	export default {
+		data() {
+			return {
+				value: "",
+				fileList: []
+			}
+		},
+		onLoad(args) {
+
+		},
+		methods: {
+			deleteImage(e){
+				this.fileList.splice(e.index, 1)
+			},
+			afterRead(e){
+				let self = this
+				e.file.forEach(file => {
+					self.$Oss.ossUpload(file.url).then(url => {
+						self.fileList.push({
+							url
+						})
+					})
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.help {
+		.help-box {
+			width: 92%;
+			margin-left: 4%;
+
+			.help-issue {
+				margin: 20rpx;
+				font-size: 28rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+
+			.help-screenshot {
+				display: flex;
+				align-items: center;
+				background-color: #fff;
+				padding: 20rpx;
+			}
+
+			.help-button {
+				display: flex;
+				justify-content: center;
+				font-size: 24rpx;
+				flex-shrink: 0;
+				margin-top: 60rpx;
+
+				view {
+					padding: 14rpx 120rpx;
+					border-radius: 38rpx;
+				}
+
+				view:nth-child(1) {
+					background: $uni-color;
+					color: #fff;
+				}
+
+				view:nth-child(2) {
+					color: #FFFDF6;
+					background-color: #C83741;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_order/center/systemSet.vue b/pages_order/center/systemSet.vue
new file mode 100644
index 0000000..2066460
--- /dev/null
+++ b/pages_order/center/systemSet.vue
@@ -0,0 +1,115 @@
+<template>
+  <view class="page">
+
+    <navbar title='系统设置' leftClick @leftClick="$utils.navigateBack"/>
+
+    <view class="frame">
+      <view class="content" v-for="(item, index) in list" :key="index">
+        <view class="title">{{ item.title }}</view>
+        <view class="item" v-for="(item2, index) in item.itemList" :key="index" @click="tapItem(item2, index)">
+          <view class="key">
+            <view class="img">
+              <img :src="item2.leftIcon" style="width: 100%; height: 100%;"/>
+            </view>
+            <view class="text">
+              {{ item2.text }}
+            </view>
+          </view>
+          <view class="value">
+            {{ item2.rightIcon }}
+          </view>
+        </view>
+      </view>
+    </view>
+
+
+  </view>
+</template>
+<script>
+// import topbar from "@/components/base/topbar.vue";
+// import tabber from "@/components/base/tabbar.vue";
+
+export default {
+  name: "systemSet",
+  // components: {tabber, topbar},
+  data() {
+    return {
+      list: [
+        {
+          title: `账号设置`,
+          itemList: [
+            {leftIcon: "../static/center/1.svg",  text: `切换账号`, rightIcon: ">"},
+          ]
+        },
+        {
+          title: `系统设置`,
+          itemList: [
+            {leftIcon: "../static/center/1.svg",  text: `清理缓存`, rightIcon: ">"},
+            {leftIcon: "../static/center/2.svg", text: `版本更新`, rightIcon: ">"},
+            {leftIcon: "../static/center/2.svg", text: `退出登录`, rightIcon: ">"},
+          ]
+        },
+      ],
+    }
+  },
+
+  methods: {
+    tapItem(item, index) {
+      
+    }
+  },
+}
+</script>
+
+
+<style scoped lang="scss">
+.page {
+  background-color: #FFF;
+  height: 100vh;
+
+  .frame {
+    padding: 40rpx;
+
+    .content {
+      margin-bottom: 40rpx;
+
+      .title {
+        font-size: 30rpx;
+        color: #b0b0b0;
+      }
+
+      .item {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 20rpx 40rpx;
+
+        .key {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          color: #333333;
+          font-size: 32rpx;
+
+          .img {
+            width: 40rpx;
+            height: 40rpx;
+          }
+
+          .text {
+            margin-left: 20rpx;
+          }
+
+
+        }
+
+        .value {
+          color: #999999;
+          font-size: 36rpx;
+        }
+      }
+    }
+
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages_order/mine/individualTeam.vue b/pages_order/mine/individualTeam.vue
index fac224e..86bb674 100644
--- a/pages_order/mine/individualTeam.vue
+++ b/pages_order/mine/individualTeam.vue
@@ -1,61 +1,66 @@
 <template>
 	<view class="page">
-			<navbar
+		<!-- 	<navbar
 			title="我的团队"
 			leftClick 
 			@leftClick="$utils.navigateBack"
 			bgColor="#DC2828"
 			color="#fff"
-			/>
-			<view class="team">
-				<view class="team-message">
-					<view class="leftImage">
-						<image src="" mode=""></image>
+			/> -->
+		<navbar title="我的团队" leftClick @leftClick="$utils.navigateBack" />
+
+		<view class="team">
+			<view class="team-message">
+				<view class="leftImage">
+					<image src="" mode=""></image>
+				</view>
+				<view class="number-team">
+					<view class="top-number">
+						<text style="font-weight: 500;">13845131854</text>
+						<view class="salesman">一级业务员</view>
 					</view>
-					<view class="number-team">
-						<view class="top-number">
-							<text style="font-weight: 500;">13845131854</text>
-							<view class="salesman">一级业务员</view>
-						</view>
-						<view class="bottom-number">
-							<view class="performance">
-								<view class="team-sum">
-									团队总业绩
-								</view>
-								<view class="figure">
-									<text style="margin-left: 30rpx; color: #DC2828; font-weight: 600;">￥</text><text class="money">66666</text>
-								</view>
+					<view class="bottom-number">
+						<view class="performance">
+							<view class="team-sum">
+								团队总业绩
 							</view>
-							<view class="withdraw">
-								<view class="withdraw-button">
-									去提现
-								</view>
+							<view class="figure">
+
+								<text style="margin-left: 30rpx; color: #DC2828; font-weight: 600;">￥</text><text
+									class="money">66666</text>
+							</view>
+						</view>
+						<view class="withdraw" @click="toPurse">
+							<view class="withdraw-button">
+								去提现
 							</view>
 						</view>
 					</view>
 				</view>
 			</view>
-			<view class="user">
-				<text>直销用户</text>
-			</view>
-			<view class="user-list">
-				<view class="head" v-for="(item,index) in 20">
-					<view class="headImage">
-						<image src="" mode=""></image>
+		</view>
+		<view class="user">
+			<uv-tabs :list="tabs" :activeStyle="{color : '#FD5100', fontWeight : 600}" lineColor="#FD5100"
+				lineHeight="8rpx" lineWidth="50rpx" @click="clickTabs"></uv-tabs>
+		</view>
+		<view class="user-list">
+			<view class="head" v-for="(item,index) in 20">
+				<view class="headImage">
+					<image src="" mode=""></image>
+				</view>
+				<view class="info">
+					<view class="name">
+						用户138xxxxxxxx
 					</view>
-					<view class="info">
-						<view class="name">
-							用户138xxxxxxxx
-						</view>
-						<view class="headBtn">
-							下单量：<text>12</text>单  | 佣金： <text style="color: darkorange;">120元</text>
-						</view>
-						<view class="tips">
-							已加入平台<text>120</text>天
-						</view>
+					<view class="headBtn">
+						下单量：<text>12</text>单 | 佣金： <text style="color: darkorange;">120元</text>
+					</view>
+					<view class="tips">
+						已加入平台<text>120</text>天
 					</view>
 				</view>
 			</view>
+		</view>
 	</view>
 </template>
 
@@ -63,25 +68,53 @@
 	export default {
 		data() {
 			return {
-				
+				state: -1,
+				tabs: [{
+						name: '直销用户'
+					},
+					{
+						name: '间推用户'
+					},
+
+				],
 			};
-		}
+		},
+		methods: {
+			//点击tab栏
+			clickTabs(index) {
+				if (index == 0) {
+					this.state = -1;
+				} else {
+					this.state = index - 1;
+				}
+				// this.queryParams.pageSize = 10
+				// this.orderPage()
+			},
+			// 跳转到钱包提现
+			toPurse() {
+				uni.navigateTo({
+					url: '/pages_order/mine/purse'
+				})
+			},
+		},
 	}
 </script>
 
 <style scoped lang="scss">
-	.page{
-		.team{
+	.page {
+		.team {
 			height: 250rpx;
 			background-color: #DC2828;
 			padding-top: 50rpx;
-			.team-message{
+
+			.team-message {
 				height: 200rpx;
 				width: 90%;
 				background-color: #fff;
 				margin: 0 30rpx;
 				position: relative;
 				border-radius: 10rpx;
+
 				.leftImage {
 					width: 150rpx;
 					height: 150rpx;
@@ -95,20 +128,23 @@
 					top: 25rpx;
 					left: 26rpx;
 				}
-				.number-team{
+
+				.number-team {
 					width: 70%;
 					display: inline-block;
 					position: absolute;
 					top: 0rpx;
 					left: 202rpx;
-					.top-number{
+
+					.top-number {
 						height: 70rpx;
 						position: relative;
 						border-bottom: #DC2828 dotted 1rpx;
 						display: flex;
 						align-items: center;
-						margin:  0 20rpx;
-						.salesman{
+						margin: 0 20rpx;
+
+						.salesman {
 							position: absolute;
 							height: 40rpx;
 							width: 160rpx;
@@ -121,16 +157,19 @@
 							font-size: 24rpx;
 						}
 					}
-					.bottom-number{
+
+					.bottom-number {
 						height: 120rpx;
 						position: relative;
-						.performance{
+
+						.performance {
 							width: 50%;
 							height: 100%;
 							display: inline-block;
 							position: absolute;
 							top: 0rpx;
-							.team-sum{
+
+							.team-sum {
 								display: inline-block;
 								width: 180rpx;
 								background-color: #F99F9F;
@@ -141,13 +180,15 @@
 								color: #DC2828;
 								font-size: 26rpx;
 							}
-							.figure{
+
+							.figure {
 								height: 60rpx;
 								line-height: 60rpx;
 								display: flex;
 								// align-items: center;
 								padding-top: 10rpx;
-								.money{
+
+								.money {
 									font-size: 40rpx;
 									color: #DC2828;
 									display: inline-block;
@@ -155,16 +196,18 @@
 								}
 							}
 						}
-						.withdraw{
+
+						.withdraw {
 							width: 50%;
 							height: 100%;
 							display: inline-block;
 							position: absolute;
 							right: 0rpx;
 							display: flex;
-							justify-content: center;//横轴居中
-							align-items: center;//竖轴居中
-							.withdraw-button{
+							justify-content: center; //横轴居中
+							align-items: center; //竖轴居中
+
+							.withdraw-button {
 								background-color: #DC2828;
 								color: #fff;
 								border-radius: 50rpx;
@@ -178,16 +221,18 @@
 				}
 			}
 		}
-		.user{
+
+		.user {
 			height: 120rpx;
 			background-color: #fff;
 			display: flex;
 			align-items: center;
 			padding-left: 30rpx;
 		}
-		
-		.user-list{
+
+		.user-list {
 			margin: 0 20rpx;
+
 			.head {
 				z-index: -1;
 				display: flex;
@@ -198,6 +243,7 @@
 				height: 100rpx;
 				margin-top: 20rpx;
 				border-radius: 20rpx;
+
 				.headImage {
 					width: 75rpx;
 					height: 75rpx;
@@ -207,21 +253,22 @@
 					border-radius: 50%;
 					margin-right: 15rpx;
 				}
-			
+
 				.info {
 					font-size: 22rpx;
+
 					.name {
 						font-size: 26rpx;
 						color: #333;
 					}
-			
+
 					.tips {
 						font-size: 22rpx;
 						color: #999999;
 						margin-top: 10rpx;
 					}
 				}
-			
+
 				.headBtn {
 					position: absolute;
 					right: 60rpx;
@@ -232,4 +279,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages_order/mine/runningWater.vue b/pages_order/mine/runningWater.vue
index a14a621..b1f5d40 100644
--- a/pages_order/mine/runningWater.vue
+++ b/pages_order/mine/runningWater.vue
@@ -1,88 +1,257 @@
 <template>
 	<view class="running-water">
 		<navbar :title="title[status]" leftClick @leftClick="leftClick" />
-		
+
+		<view style="background-color: red;height: 250rpx;">
+
+		</view>
+
+		<view class="sum">
+			<view class="left">
+				<view class="tiele">总佣金(元)</view>
+				<view class="price">￥1240.00</view>
+				<view class="btn">去提现</view>
+			</view>
+			<view class="right">
+				<view class="tiele">累计提现(元)</view>
+				<view class="price">￥1240.00</view>
+				<view class="btn">提现记录</view>
+			</view>
+		</view>
+
+		<view class="searchCondition">
+			<!--搜索框-->
+			<span style="margin-right: 40rpx;">金额明细</span>
+			
+			
+			<view class="dateTimeCls">
+				<view class="date" @click="startDateOpen">
+					{{ queryParams.startDate }}
+					<uv-datetime-picker ref="startDateRef" v-model="queryParams.startDate" mode="date"
+						@confirm="startDateChange"></uv-datetime-picker>
+				</view>
+				<view class="image">
+					<image src="../static/order/2.svg" style="width: 100%;height: 100%"></image>
+				</view>
+			</view>
+			<span style="margin:  0 20rpx;">-</span>
+			<view class="dateTimeCls">
+				<view class="date" @click="endDateOpen">
+					{{ queryParams.endDate }}
+					<uv-datetime-picker ref="endDateRef" v-model="queryParams.endDate" mode="date"
+						@confirm="endDateChange">
+					</uv-datetime-picker>
+				</view>
+				<view class="image">
+					<image src="../static/order/2.svg" style="width: 100%;height: 100%"></image>
+				</view>
+			</view>
+		</view>
+
 		<view class="tab-box">
-			<view class="tab-box1" v-if="agentFlow && agentFlow.total">
-				<uv-cell center border :title="item.title"
-				v-for="(item, index) in agentFlow.records"
-				:value="x[item.type] + item.money" :label="item.createTime" />
+			<view class="tab-box1" v-if="agentFlow.records.length>0 && agentFlow.total>0">
+				<uv-cell center border :title="item.title" v-for="(item, index) in agentFlow.records"
+					:value="x[item.type] + item.money" :label="item.createTime" />
 			</view>
-			<view 
-			style="padding: 100rpx 0;"
-			v-else>
-				<uv-empty 
-				mode="history"
-				textSize="28rpx"
-				iconSize="100rpx"/>
+			<view style="padding: 100rpx 0;" v-else>
+				<uv-empty mode="history" textSize="28rpx" iconSize="100rpx" />
 			</view>
 		</view>
-		
+
 	</view>
 </template>
 
 <script>
+	import dayjs from "dayjs";
 	export default {
 		data() {
 			return {
-				title : ['余额记录','提现记录','佣金记录'],
-				agentFlow : {
-					total : 0,
-					records : [
-						{
-							type : 0,
-							money : 100,
-							createTime : '2024-04-02 20:00',
-							title : "佣金提现",
+				queryParams: {
+					pageNo: 1,
+					pageSize: 10,
+					startDate: dayjs(new Date()).subtract(30, 'day').format('YYYY-MM-DD'),
+					endDate: dayjs(new Date()).format('YYYY-MM-DD'),
+				},
+				title: ['余额记录', '提现记录', '佣金记录'],
+				agentFlow: {
+					total: 1,
+					records: [{
+							type: 0,
+							money: 100,
+							createTime: '2024-04-02 20:00',
+							title: "佣金提现",
 						},
 						{
-							type : 0,
-							money : 100,
-							createTime : '2024-04-02 20:00',
-							title : "佣金提现",
+							type: 0,
+							money: 100,
+							createTime: '2024-04-02 20:00',
+							title: "佣金提现",
 						},
 						{
-							type : 0,
-							money : 100,
-							createTime : '2024-04-02 20:00',
-							title : "佣金提现",
+							type: 0,
+							money: 100,
+							createTime: '2024-04-02 20:00',
+							title: "佣金提现",
 						},
 					]
 				},
-				x : ['+', '-' , '-' , '+'],
-				status : 0,
+				x: ['+', '-', '-', '+'],
+				status: 0,
 			}
 		},
 		onLoad(e) {
 			this.status = e.status
 		},
 		methods: {
-			leftClick() {		//返回钱包
+			leftClick() { //返回钱包
 				uni.navigateBack(-1)
 			},
-			getAgentFlow(){		//获取流水记录
+			getAgentFlow() { //获取流水记录
 				let type = this.status;
-				this.$api('getAgentFlow', { type }, res => {
-					if(res.code == 200){
+				this.$api('getAgentFlow', {
+					type
+				}, res => {
+					if (res.code == 200) {
 						this.agentFlow = res.result
 					}
 				})
 			},
+			startDateChange(val) {
+				this.$nextTick(() => {
+					this.queryParams.startDate = dayjs(val.value).format("YYYY-MM-DD")
+					// this.getData()
+				});
+			},
+			startDateOpen() {
+				this.$refs.startDateRef.open();
+			},
+			endDateChange(val) {
+				this.$nextTick(() => {
+					this.queryParams.endDate = dayjs(val.value).format("YYYY-MM-DD")
+					// this.getData()
+				});
+			},
+			endDateOpen() {
+				this.$refs.endDateRef.open();
+			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-.running-water{
-	width: 750rpx;
-	background: #F5F5F5;
-	margin: 0 auto;
-	min-height: 100vh;
-	.tab-box{
-		margin: 20rpx;
-		background-color: #fff;
-		border-radius: 20rpx;
-		overflow: hidden;
+	.running-water {
+		width: 750rpx;
+		margin: 0 auto;
+		min-height: 100vh;
+		position: absolute;
+		background: #F5F5F5;
+		.tab-box {
+			margin: 20rpx;
+			// margin-top: 100rpx;
+			background-color: #fff;
+			border-radius: 20rpx;
+			overflow: hidden;
+		}
+
+		.sum {
+			display: flex;
+			justify-content: center;
+			gap: 100rpx;
+			width: 90%;
+			height: 200rpx;
+			margin-top: 20rpx;
+			padding: 20rpx;
+			border: 1px solid #fff;
+			background-color: #fff;
+			z-index: 999;
+			border-radius: 40rpx;
+			box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.5);
+			position: absolute;
+			top: 220rpx;
+			left: 20rpx;
+
+
+			.left {
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				align-items: center;
+
+				.title {
+					font-size: 28rpx;
+				}
+
+				.price {
+					font-size: 30rpx;
+					font-weight: 700;
+					color: #dc2929;
+				}
+
+				.btn {
+					padding: 10rpx 15rpx;
+					border: 1px solid #dc2929;
+					color: #dc2929;
+					border-radius: 20rpx;
+				}
+			}
+
+			.right {
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				align-items: center;
+
+				.title {
+					font-size: 28rpx;
+				}
+
+				.price {
+					font-size: 30rpx;
+					font-weight: 700;
+					color: #dc2929;
+				}
+
+				.btn {
+					padding: 10rpx 15rpx;
+					border: 1px solid #dc2929;
+					color: #dc2929;
+					border-radius: 20rpx;
+				}
+			}
+		}
+
+		.searchCondition {
+			
+			display: flex;	
+			width: 100vw;
+			padding:  0 40rpx;
+			padding-top: 130rpx;
+			background-color: #fff;
+			.dateTimeCls {
+				
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				width: 30%;
+				border: 1px solid #b0b2b3;
+				padding: 5rpx;
+				border-radius: 20rpx;
+
+				.date {
+					font-size: 25rpx;
+					display: flex;
+					align-items: center;
+					width: 80%;
+					height: 100%;
+					color: #b0b2b3;
+
+				}
+
+				.image {
+					width: 20%;
+					height: 100%;
+				}
+			}
+		}
 	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages_order/order/orderDetail.vue b/pages_order/order/orderDetail.vue
index 8ca27b7..837245d 100644
--- a/pages_order/order/orderDetail.vue
+++ b/pages_order/order/orderDetail.vue
@@ -1,14 +1,13 @@
 <template>
 	<view>
 		<navbar
-		title="订单详情"
+		title="订单详情"  bgColor="#DC2828" color="#fff" 
 		leftClick 
 		@leftClick="$utils.navigateBack"
 		/>
 		
 		<!-- 水洗店 -->
-		<view class=""
-		v-if="userShop">
+		<view class="">
 			<view class="controls">
 				<view class="title">
 					<image src="../static/order/icon.png" mode=""></image>
@@ -17,16 +16,23 @@
 				<view class="tips">
 					待送回
 				</view>
+				<view class="steps">
+					<uv-steps current="0">
+							<uv-steps-item title="已下单" desc="10:30"></uv-steps-item>
+							<uv-steps-item title="已出库" desc="10:35"></uv-steps-item>
+							<uv-steps-item title="运输中" desc="11:40"></uv-steps-item>
+						</uv-steps>
+				</view>
 				<view class="btns">
 					<view class="btn1">
 						快递寄回
 					</view>
-					<view class="btn2">
+				<!-- 	<view class="btn2">
 						线下配送
-					</view>
+					</view> -->
 				</view>
 			</view>
-			<view class="steps">
+			<!-- <view class="steps">
 				<uv-steps 
 				activeColor="#FD5100"
 				:current="stepsCurrent" dot>
@@ -34,7 +40,7 @@
 					:key="index"
 					v-for="(item, index) in steps"></uv-steps-item>
 				</uv-steps>
-			</view>
+			</view> -->
 		</view>
 		
 		<!-- 酒店和水洗店 -->
@@ -48,7 +54,6 @@
 		
 			<view class="flex">
 				<view class="server-item">
-					
 					<view class="img-box">
 						<image :src="msgShop.image" mode="aspectFill"></image>
 					</view>
@@ -67,60 +72,18 @@
 						<view class="sales-volume" style="margin-top: 5px;">
 							<view class="desc">规格：{{msgOrder.unit}}</view>
 						</view>
-						
-						<view class="time-coupon">
-							
-							<!-- <view class="flex">
-								<image src="@/static/home/time-icon.png"></image>
-								<view class="time">{{msgOrder.useTime}}分钟</view>
-							</view> -->
-							
-							<!-- <view class="sales-volume">
-								<image src="@/static/icons/icon1.png"></image>
-								<view class="desc">已售出{{msgShop.payNum}}+单</view>
-							</view> -->
-							
-						</view>
-						
 					</view>
 					
 				</view>
 			</view>
 		
-			<!-- <view class="line min_tips">
-				<view class="head-div flex">
-					<view style="width: 118rpx;height: 118rpx;border-radius: 50%;overflow: hidden;">
-						<image style="width: 118rpx;" :src="msgTechnician.image" mode="widthFix"></image>
-					</view>
-					<view style="padding: 10rpx 34rpx;display: flex;flex-direction: column;justify-content: space-around;">
-						<view class="nickname">
-							{{msgTechnician.title}}
-							<view v-if="msgTechnician.isVip" class="tag">
-								<image src="@/static/order/s.png" mode="aspectFit"></image>
-								<view class="auth">官方认证</view>
-							</view>
-						</view>
-						<view class="days">
-							<van-rate v-model="msgTechnician.score" :size="10" readonly color="#ffb54c" void-icon="star"
-								void-color="#eee" />
-							<view class="">
-								好评{{msgTechnician.pinNum}}
-							</view>
-						</view>
-					</view>
-				</view>
-				<view @click="gototechnicianDetail(msgTechnician)" class="btn-x">
-					服务技师
-				</view>
-			</view> -->
-		
 			<view class="line address">
 				<view class="address-top">
-					<!-- <view class="">
-						服务地址
-					</view> -->
-					<view class="copy">
-						<image @click="copy(msgOrder.name + ' ' + msgOrder.phone + ' ' + msgOrder.address)" src="/static/order/copy.png"></image>
+					<view class="">
+						地址信息
+					</view>
+					<view class="copy"> 
+						<image @click="$utils.copyText('1')" src="../static/order/copy.png"></image>
 					</view>
 				</view>
 				<view class="addressDetail">
@@ -130,7 +93,7 @@
 			</view>
 		
 		
-			<view class="line">
+			<!-- <view class="line">
 				<view class="t min_tips">
 					<view class="">
 						实付款
@@ -163,7 +126,7 @@
 						￥{{ msgOrder.price }}
 					</view>
 				</view>
-			</view>
+			</view> -->
 		
 			<!-- 订单信息 -->
 			<view class="line">
@@ -209,15 +172,21 @@
 			</view>
 		
 		</view>
+		<!-- 联系客服弹框 -->
+		<customerServicePopup ref="customerServicePopup" />
 	</view>
 </template>
 
 <script>
+		import customerServicePopup from "@/components/config/customerServicePopup.vue";
 	import { mapGetters } from 'vuex'
 	export default {
 		computed : {
 			...mapGetters(['userShop']),
 		},
+		components: {
+			customerServicePopup
+		},
 		data() {
 			return {
 				stepsCurrent : 0,
@@ -247,7 +216,10 @@
 			}
 		},
 		methods: {
-			
+			// 联系客服
+			clickService() {
+				this.$refs.customerServicePopup.open();
+			},
 		}
 	}
 </script>
@@ -261,18 +233,20 @@
 	.controls{
 		margin: 20rpx;
 		background-color: #fff;
-		height: 400rpx;
+		// height: 400rpx;
 		display: flex;
 		flex-direction: column;
-		width: 710rpx;
+		// width: 710rpx;
 		border-radius: 20rpx;
 		justify-content: center;
 		align-items: center;
+		padding: 20rpx;
 		.title{
 			display: flex;
 			justify-content: center;
 			align-items: center;
 			font-size: 40rpx;
+			
 			image{
 				width: 100rpx;
 				height: 100rpx;
@@ -284,8 +258,11 @@
 			color: #FD5100;
 			margin-top: 10rpx;
 		}
+		.steps{
+			height: 60rpx;
+		}
 		.btns{
-			margin-top: 50rpx;
+			// margin-top: 50rpx;
 			display: flex;
 			view{
 				margin: 0 20rpx;
@@ -462,8 +439,9 @@
 			
 			.addressDetail {
 				color: #777;
-				font-size: 22rpx;
+				font-size: 28rpx;
 				padding: 5px 0;
+				
 			}
 
 			text {
diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue
index 9760822..a4b0a78 100644
--- a/pages_order/product/productDetail.vue
+++ b/pages_order/product/productDetail.vue
@@ -1,14 +1,11 @@
 <template>
 	<view class="page">
 		<navbar title="商品详情" leftClick @leftClick="$utils.navigateBack" />
-		
+
 		<view class="swipe">
-			<uv-swiper 
-			:list="productDetail.image.split(',')" 
-			indicator
-			height="350rpx"></uv-swiper>
+			<uv-swiper :list="productDetail.image.split(',')" indicator height="350rpx"></uv-swiper>
 		</view>
-		
+
 		<view class="info">
 			<view class="title">
 				桌布租赁
@@ -34,57 +31,61 @@
 				</view>
 			</view> -->
 		</view>
-		
+
 		<view class="info-unit">
 			<uv-cell title="免费上门退·7天无理由退货·快递发货" isLink>
 				<template #icon>
 					<text class="text">服务</text>
 				</template>
 			</uv-cell>
-			
+
 			<uv-cell title="请选择规格" isLink>
 				<template #icon>
 					<text class="text">参数</text>
 				</template>
 			</uv-cell>
-			
+
 			<uv-cell>
 				<template #icon>
 					<text>品牌；适应人群</text>
 				</template>
 			</uv-cell>
 		</view>
-		
+
 		<view class="content">
 			<view class="title">
 				商品详情
 			</view>
 			<uv-parse :content="productDetail.content"></uv-parse>
 		</view>
-		
+
 		<!-- 分享和租赁按钮 -->
-		<submit 
-		@submit="$utils.navigateTo('/pages_order/order/firmOrder?id=')"
-		@share="share"/>
-		
+		<submit @submit="submit" @share="share" />
+
 		<!-- 选择规格 -->
-		<submitUnitSelect ref="submitUnitSelect"/>
+		<submitUnitSelect ref="submitUnitSelect" />
+
+		<!-- 联系客服弹框 -->
+		<customerServicePopup ref="customerServicePopup" />
 	</view>
 </template>
 
 <script>
 	import submit from '../components/product/submit.vue'
 	import submitUnitSelect from '../components/product/submitUnitSelect.vue'
+	import customerServicePopup from "@/components/config/customerServicePopup.vue";
+
 	export default {
-		components : {
+		components: {
 			submit,
+			customerServicePopup,
 			submitUnitSelect
 		},
 		data() {
 			return {
-				productDetail : {
-					image : 'https://cdn.uviewui.com/uview/swiper/swiper3.png,https://cdn.uviewui.com/uview/swiper/swiper2.png',
-					content : '',
+				productDetail: {
+					image: 'https://cdn.uviewui.com/uview/swiper/swiper3.png,https://cdn.uviewui.com/uview/swiper/swiper2.png',
+					content: '',
 				}
 			}
 		},
@@ -92,78 +93,94 @@
 			console.log(args);
 		},
 		methods: {
-			// 分享商品
-			share(){
-				
+			// 联系客服
+			share() {
+				var that = this
+				that.$refs.customerServicePopup.open();
 			},
 			// 选择完成规格立即租赁下单
-			submit(){
+			submit() {
+				var that = this
+				that.$refs.submitUnitSelect.open();
 				
+				// $utils.navigateTo('/pages_order/order/firmOrder?id=')
 			}
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-.page{
-	.swipe{
-		
-	}
-	.info{
-		padding: 30rpx;
-		background-color: #fff;
-		.title{
-			font-size: 34rpx;
-			font-weight: 900;
-		}
-		.info-line{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			margin-top: 30rpx;
-			.price{
-				font-size: 28rpx;
-				color: $uni-color;
-				text{
-					font-size: 34rpx;
+	.page {
+		.swipe {}
+
+		.info {
+			padding: 30rpx;
+			background-color: #fff;
+
+			.title {
+				font-size: 34rpx;
+				font-weight: 900;
+			}
+
+			.info-line {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-top: 30rpx;
+
+				.price {
+					font-size: 28rpx;
+					color: $uni-color;
+
+					text {
+						font-size: 34rpx;
+					}
+				}
+
+				.num {
+					font-size: 24rpx;
+
+					image {
+						width: 24rpx;
+						height: 24rpx;
+					}
 				}
 			}
-			.num{
-				font-size: 24rpx;
-				image{
-					width: 24rpx;
-					height: 24rpx;
+
+			.tips {
+				display: flex;
+				font-size: 20rpx;
+				margin-top: 30rpx;
+
+				.tip {
+					margin-right: 40rpx;
 				}
 			}
 		}
-		.tips{
-			display: flex;
-			font-size: 20rpx;
-			margin-top: 30rpx;
-			.tip{
-				margin-right: 40rpx;
+
+		.info-unit {
+			margin-top: 20rpx;
+			padding: 30rpx;
+			background-color: #fff;
+
+			/deep/ text {
+				font-size: 26rpx;
+			}
+
+			/deep/ .text {
+				color: #7C7C7C;
+				margin-right: 20rpx;
+				font-size: 26rpx;
 			}
 		}
-	}
-	.info-unit{
-		margin-top: 20rpx;
-		padding: 30rpx;
-		background-color: #fff;
-		/deep/ text{
-			font-size: 26rpx;
-		}
-		/deep/ .text{
-			color: #7C7C7C;
-			margin-right: 20rpx;
-			font-size: 26rpx;
-		}
-	}
-	.content{
-		background-color: #fff;
-		margin-top: 20rpx;
-		.title{
-			padding: 30rpx;
+
+		.content {
+			background-color: #fff;
+			margin-top: 20rpx;
+
+			.title {
+				padding: 30rpx;
+			}
 		}
 	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages_order/static/center/1.svg b/pages_order/static/center/1.svg
new file mode 100644
index 0000000..2054a7e
--- /dev/null
+++ b/pages_order/static/center/1.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15.777" height="12.51" viewBox="0 0 15.777 12.51"><defs><style>.a{fill:#333;stroke:#333;stroke-width:0.5px;}</style></defs><g transform="translate(0.26 0.281)"><path class="a" d="M324.545,108.387h14.168a.545.545,0,0,0,.385-.93l-3.814-3.814a.545.545,0,0,0-.77.77L337.4,107.3H324.545a.545.545,0,1,0,0,1.09Zm14.168,2.18H324.545a.545.545,0,0,0-.385.93l3.814,3.814a.544.544,0,1,0,.77-.77l-2.883-2.885h12.851a.545.545,0,1,0,0-1.09Zm0,0" transform="translate(-324 -103.491)"/></g></svg>
\ No newline at end of file
diff --git a/pages_order/static/center/2.svg b/pages_order/static/center/2.svg
new file mode 100644
index 0000000..5514154
--- /dev/null
+++ b/pages_order/static/center/2.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12.261" height="11.947" viewBox="0 0 12.261 11.947"><defs><style>.a{fill:#030000;}</style></defs><g transform="translate(-1.497 -0.015)"><path class="a" d="M366.7,79.826a.1.1,0,0,0-.019.034l-.617,2.278a.394.394,0,0,0,.1.377.389.389,0,0,0,.373.1L368.782,82s.005,0,.008,0a.1.1,0,0,0,.07-.03l6-6.049a.971.971,0,0,0,.276-.692,1.189,1.189,0,0,0-.35-.828l-.567-.572a1.172,1.172,0,0,0-.822-.353.961.961,0,0,0-.687.278l-6,6.051c-.006.006,0,.014-.009.021Zm7.576-4.5-.6.6-.967-.99.588-.592a.279.279,0,0,1,.38.027l.567.573a.313.313,0,0,1,.093.217.232.232,0,0,1-.065.164Zm-6.508,4.592,4.333-4.366.967.991L368.745,80.9l-.976-.982m-.79,1.77.313-1.158.835.841-1.148.317m7.678-3.965a.417.417,0,0,0-.415.418v5.011a1.229,1.229,0,0,1-1.161,1.164H364.87c-.523,0-1.066-.517-1.162-1.479V75.207c0-1.194.868-1.165,1.162-1.165h5.47a.417.417,0,0,0,0-.834h-5.533c-.716,0-1.927.449-1.927,1.622V82.9a1.983,1.983,0,0,0,1.927,2.251h8.338a1.816,1.816,0,0,0,1.927-1.936V78.142a.418.418,0,0,0-.414-.416Zm0,0" transform="translate(-361.383 -73.193)"/></g></svg>
\ No newline at end of file
diff --git a/pages_order/static/center/3.svg b/pages_order/static/center/3.svg
new file mode 100644
index 0000000..5397f5d
--- /dev/null
+++ b/pages_order/static/center/3.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="11.933" height="11.947" viewBox="0 0 11.933 11.947"><defs><style>.a{fill:none;}.b{clip-path:url(#a);}</style><clipPath id="a"><rect class="a" width="11.933" height="11.947"/></clipPath></defs><g transform="translate(-1.661 -0.011)"><g transform="translate(-296.339 0.011)"><g transform="translate(298)"><g class="b" transform="translate(0)"><path d="M309.922,4.772a2.761,2.761,0,0,0-.119-1.192c-.278-.437-.675-.358-1.351-.358h-2.82V1.872a4.328,4.328,0,0,0-.04-.755A1.384,1.384,0,0,0,304.8.164a1.646,1.646,0,0,0-.636-.119,2.109,2.109,0,0,0-.715.04A1.35,1.35,0,0,0,302.335,1.2a1.783,1.783,0,0,0-.04.477V3.263h-2.781c-.675-.04-1.112-.119-1.39.318A2.76,2.76,0,0,0,298,4.772v1.39a.812.812,0,0,0,.794.636V8.864a10.393,10.393,0,0,1-.079,1.629c-.04.159-.04.318-.079.437a1.017,1.017,0,0,0,0,.834c.159.238.437.2.794.2h9.057c.318,0,.556.04.755-.119.238-.2.159-.477.079-.794-.04-.119-.04-.278-.079-.4a9.23,9.23,0,0,1-.119-1.867V6.8a.735.735,0,0,0,.755-.6,1.905,1.905,0,0,0,0-.477V4.772Zm-1.629,6.2h-1.47V9.142c0-.278.04-.636-.079-.794a.48.48,0,0,0-.477-.238c-.516.079-.437.516-.437,1.073V10.97H304.48V9.142c0-.278.04-.636-.079-.794a.48.48,0,0,0-.477-.238c-.516.079-.437.516-.437,1.073V10.97h-1.351V9.142c0-.278.04-.636-.079-.794a.481.481,0,0,0-.477-.238c-.516.079-.437.516-.437,1.073V10.97h-1.51c.04-.2.04-.4.079-.6,0-.2.04-.358.04-.556V6.838h8.342V9.182a6.835,6.835,0,0,0,.079,1.311,1.387,1.387,0,0,1,.119.477Zm.636-5.164H299V4.256h3.019c.4,0,.953.079,1.112-.159.159-.2.119-.437.119-.755V1.952a2.044,2.044,0,0,1,.04-.715c.119-.2.318-.2.636-.2h.278c.4.079.358.4.358.834V3.3c0,.238-.04.516.079.675.2.318.675.238,1.152.238h3.059V5.805Zm0,0" transform="translate(-298 -0.035)"/></g></g></g></g></svg>
\ No newline at end of file
diff --git a/pages_order/static/center/4.svg b/pages_order/static/center/4.svg
new file mode 100644
index 0000000..2054a7e
--- /dev/null
+++ b/pages_order/static/center/4.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15.777" height="12.51" viewBox="0 0 15.777 12.51"><defs><style>.a{fill:#333;stroke:#333;stroke-width:0.5px;}</style></defs><g transform="translate(0.26 0.281)"><path class="a" d="M324.545,108.387h14.168a.545.545,0,0,0,.385-.93l-3.814-3.814a.545.545,0,0,0-.77.77L337.4,107.3H324.545a.545.545,0,1,0,0,1.09Zm14.168,2.18H324.545a.545.545,0,0,0-.385.93l3.814,3.814a.544.544,0,1,0,.77-.77l-2.883-2.885h12.851a.545.545,0,1,0,0-1.09Zm0,0" transform="translate(-324 -103.491)"/></g></svg>
\ No newline at end of file
diff --git a/pages_order/static/order/2.svg b/pages_order/static/order/2.svg
new file mode 100644
index 0000000..b9a2b18
--- /dev/null
+++ b/pages_order/static/order/2.svg
@@ -0,0 +1 @@
+<svg t="1724496486273" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4383" width="32" height="32"><path d="M512 128c-211.744 0-384 172.256-384 384s172.256 384 384 384 384-172.256 384-384-172.256-384-384-384z m0 704c-176.448 0-320-143.552-320-320s143.552-320 320-320 320 143.552 320 320-143.552 320-320 320z" fill="#bfbfbf" p-id="4384"></path><path d="M660.736 606.112L528 529.344V320c0-17.664-14.336-32-32-32s-32 14.336-32 32v224c0 11.872 14.752 21.824 24.352 27.328 2.656 4 9.952 7.616 14.4 10.176l132 80c15.296 8.832 31.872 3.584 40.704-11.712s0.608-34.848-14.72-43.68z" fill="#bfbfbf" p-id="4385"></path></svg>
\ No newline at end of file
diff --git a/pages_order/static/order/copy.png b/pages_order/static/order/copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..db0833f541a0ade58b01ccedae8c50fd129326c8
GIT binary patch
literal 961
zcmV;y13vtTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&dr3q=R9HvtmtTk%RTRg+=g#j3yC6bgM5dAm2GvXS=OGeSMJdXlB$4XD2(%Z$
z*mlmHZJ`NvXYRe*pQWCXKnTJpQxP9*4UAqa0)x;DEC@=M=pnR+W!s%O?UkJ$v%lZ&
z?>FVo-Iwm$%-nO%XU;wUE@7D${agD{6x}v6GqW}bf|Z?QdwP1##c_PC-M-2IQ4~Fy
z=lNa$J31L|`aUiqXPtBLLUNS=!Z3`9=yd>>0bCN19|8Pc0c0Z)Jpf=MfGZ-h-#K@*
zEY}f$na=>|6OlI-`-@H>TI-hqjEcw#BHC<>`Ld8{3&70p061_X#>;Tbd=9|<wOVb>
z$jFHICKd$<!*CmbkBR8kPJh_=8=~<%&%aVieQS&vZ<ZSx8rm>DJ^ej^Q`Xv@3j#z@
zbWfILZxPXBa|--fU#tk>&wBNB#YBgVG0!#2X{|p5u*Dd&rUk$o&-45f0QUkgK@c2H
zlEf2NUUNDI0POKX*4lYqX69FYJWNeZtsWa2n`r*{1%Rz0vfVj%y0X;;HfpV(7LlXP
z@iQ<muw5zjc@c~a0IhZZY?Qt!A_tvw`)<T|A*;21MMT~fkr$kEAC=zs6`9ZgVCJs@
zthLtO*$v}`4rcxfz!7Whi~b!muLE#MDYZLI(?7}pzXJHqTKiO&0WJaf(^~tm*Bgf6
zGeq=Rp68E`j*gxx14y^>y(#y7A$!PLyP|XidyO#%=Vbvi-%NnMayIztYOUS8EC5<-
zU)ImGWWiE-;C}$E^-d8vqLg|hP1CbWl?9C;WabY5yhKFnjWNG02f%p%xAgY*u8-sR
z?<ECb=KTQPE!UeR1DGA<o(JIj!G$0Qwk1h2(Od^Ei^$1tHKI~4xIWU&Jzr2t?Ml=1
zhsF?7+IYeb6V}=XyVVN@2M6!Svdp)2KVQ5jBF;JYTUmek2(0fFN~s-bnx5<iL@`Yh
z(Y~VgH|s6W19yptkI<{#Xvtw1-c3Z`0Qjk$SLaPcTI)R`a>%#kdcFSa@bK`@|HTu`
z{3rko;0YqyWsLcBF+D9)aTG<HvMf7JL_Gjb&$@3S&+{sm5GbW?7m*DB{6u|)hz_(f
z-ZGRHlyMxdnw*?`4ZtP<{$^8oiHIL!kJW0m_ls0(C*1L7)ZgE~s$Q?(SA{?+bumej
jO5SQo!zu=D#-4uwLnP-g;v#rG00000NkvXXu0mjfSOdGC

literal 0
HcmV?d00001