diff --git a/api/admin.js b/api/admin.js
index 5df728e..4795d44 100644
--- a/api/admin.js
+++ b/api/admin.js
@@ -40,6 +40,12 @@ export function setAdminOrderPrice(merId, id, data) {
 export function postconfirm(merId, data) {
   return request.post("admin/" + merId + "/confirm" , data, { login: true });
 }
+/**
+ * 同意先货后款
+ */
+export function postsettle(merId, data) {
+  return request.post("admin/" + merId + "/settle" , data, { login: true });
+}
 /**
  * 订单备注
  */
diff --git a/pages.json b/pages.json
index 92b8509..aa227e3 100644
--- a/pages.json
+++ b/pages.json
@@ -486,6 +486,12 @@
             "navigationBarTitleText": "我的订单"
           }
         },
+		{
+		  "path": "order_list/order",
+		  "style": {
+		    "navigationBarTitleText": "我的订单"
+		  }
+		},
         {
           "path": "order_list/search",
           "style": {
@@ -674,7 +680,16 @@
           }
 
         }
-      ]
+          ,{
+                    "path" : "payment/payment",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
     },
     {
       "root": "pages/store",
diff --git a/pages/admin/order/index.vue b/pages/admin/order/index.vue
index 906a4ee..56c283f 100644
--- a/pages/admin/order/index.vue
+++ b/pages/admin/order/index.vue
@@ -77,12 +77,59 @@
           </view>
         </view>
       </view>
-      <view class="public-wrapper">
+	  <view class="public_footer">
+	  	<view class="footer_top">
+	  		<image src="@/static/images/jiankong.png"></image>
+			<text>订单监控</text>
+	  	</view>
+		<view class="footer_bon">
+			<view class="bon_top">
+				<view class="public_img">
+					图
+				</view>
+				<view >
+					<view class="text_top">
+						<view class="text">
+							啊十分大师傅但是发sdfsfasfsfs
+						</view>
+						<view class="monry">
+							$ 100.00
+						</view>
+					</view>
+					<view class="text_order">
+						是的方法
+					</view>
+				</view>
+			</view>
+			<view class="bon_bon">
+				<view class="order">
+					采购数量
+					<view class="txt">
+						sdfa
+					</view>
+				</view>
+				<view class="order" style="border-left: 1px solid #999999;border-right: 1px solid #999999;">
+					已售数量
+					<view class="txt">
+						sdfa
+					</view>
+				</view>
+				<view class="order">
+					库存数量
+					<view class="txt">
+						sdfa
+					</view>
+				</view>
+			</view>
+		</view>
+	  </view>
+	  <button class="footer-bnt" @click="navigator()">查看更多 ></button>
+     <!-- <view class="public-wrapper">
 		  <navigator class="item" :url="`/pages/admin/order/monitor?merId=${mer_id}`"
 		    hover-class="none">
 		    <view class="num">订单监控</view>
 		  </navigator>
-      </view>
+      </view> -->
       <Loading :loaded="loaded" :loading="loading"></Loading>
     </view>
   </view>
@@ -170,7 +217,12 @@
             })
           }
         );
-      }
+      },
+	  navigator(){
+		  uni.navigateTo({
+		  	url:`/pages/admin/order/monitor?merId=${this.mer_id}`
+		  })
+	  }
     },
     onReachBottom() {
       this.getList(this.mer_id)
@@ -313,6 +365,13 @@
     background-color: #fff;
     border-radius: 10upx;
     padding-top: 25upx;
+	.item{
+		.num{
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;	
+		}
+	}
   }
 
   .public-wrapper .nav {
@@ -346,9 +405,90 @@
     border-bottom: 1px solid #f7f7f7;
     height: 70upx;
     font-size: 24upx;
+	
   }
 
   .public-wrapper .conter .item .turnover {
     color: #d84242;
   }
+  .public_footer{
+	  width: 90%;
+	  margin: auto;
+	  .footer_top{
+		  display: flex;
+		  align-items: center;
+		  margin: 16px 0 16px 0;
+		  image{
+		  		  width: 22px;
+		  		  height: 22px;
+				  margin-right: 5px;
+		  }
+	  }
+	  .footer_bon{
+		  width: 100%;
+		  border-radius: 8px;
+		  background-color: #fff;
+		  padding-bottom: 10px;
+		  margin-bottom: 10px;
+		  .bon_top{
+			  display: flex;
+			  justify-content: flex-start;
+			  align-items: center;
+			  .public_img{
+				  width: 60px;
+				  height: 60px;
+				  margin: 12px;
+			  }
+			  .text_top{
+				  display: flex;
+				  justify-content: flex-start;
+				  align-items: center;
+				  margin: 3px 0 3px 0;
+				  .text{
+					  width: 180px;
+					  background-color: #2291f8;
+					  overflow: hidden;
+					  white-space:nowrap;
+					 text-overflow:ellipsis;
+				  }
+				  .monry{
+					  margin-left: 20px;
+					  color: #F84221;
+				  }
+			  }
+		  }
+		  .bon_bon{
+			  width: 90%;
+			  height: 66px;
+			  background: #F5F5F5;
+			  border-radius: 4px 4px 4px 4px;
+			  display: flex;
+			  justify-content: center;
+			  align-items: center;
+			  text-align: center;
+			  margin: auto;
+			  margin-bottom: 10px;
+			  .order{
+				  width: 120px;
+				  .txt{
+					  margin-top: 5px;
+				  }
+			  }
+		  }
+	  }
+	 
+	 
+  }
+  .footer-bnt{
+  		  margin-top: 20px;
+  		  width: 100px;
+  		  height: 40px;
+  		  border-radius: 15px;
+  		  margin: auto;
+  		  line-height: 40px;
+  		 border: 1px solid #CCCCCC;
+		 background-color: #f5f5f5;
+		 color: #999999;
+		 font-size: 13px
+  }
 </style>
\ No newline at end of file
diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index 8b16c4d..5dbaab2 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -265,6 +265,7 @@
 				id:id,
 				type:number
 			}
+			this.getIndex();
 			postconfirm(this.merId,data).then(res=>{
 				console.log(res);
 			})
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index ec28b9a..d0dc959 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -69,7 +69,7 @@
 							<image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image>
 							<text class="text">供货采购</text>
 						</view>
-						<view class="examine" @click="navigator('/pages/users/order_list/index?status=-1')">
+						<view class="examine" @click="navigator('/pages/users/order_list/index?status=-1&product_type=98')">
 							<image class="icon_img" :src="`${prefix}jhgl.png`" mode="aspectFill"></image>
 							<text class="text">进货管理</text>
 						</view>
diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue
index b010383..822f198 100644
--- a/pages/order_details/stay.vue
+++ b/pages/order_details/stay.vue
@@ -385,6 +385,8 @@
 				this.pay_close = true;
 				this.pay_order_id = this.orderInfo.group_order_id.toString();
 				this.totalPrice = this.orderInfo.pay_price;
+				console.log(this.pay_order_id);
+				console.log(this.totalPrice);
 			},
 			/**
 			 * 支付成功回调
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 882c02c..ba97143 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -125,8 +125,10 @@
 			<Loading :loaded="loaded" :loading="loading"></Loading>
 		</view>
 		<u-popup :show="show" @close="close"  mode="center">
+			<image src="" mode=""></image>
 			<view class="popen" >
-				<h4 >线下入库</h4>
+				<h4 v-if="this.on_line==1">线下入库</h4>
+				<h4 v-else>线上入库</h4>
 				<view class="guige">
 					<u-radio-group v-model="checkboxValue1" placement="column" @change="checkboxChange" >
 						<u-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in checkboxList1"  @change="radioChange(item)"
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 1315d77..c63c9d2 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -105,7 +105,7 @@
         <view class="order-wrapper">
           <view class="order-hd flex skeleton-rect">
             <view class="left">我的订单</view>
-            <view class="right flex" @click="authTo('/pages/users/order_list/index?status=-1')" hover-class="none"
+            <view class="right flex" @click="authTo('/pages/users/order_list/index?status=-1&product_type=0')" hover-class="none"
               open-type="navigate">
               全部订单
               <text class="iconfont icon-xiangyou"></text>
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index f340e6c..3e0ae76 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -1005,6 +1005,9 @@
 			 */
 			getConfirm: function(address_id) {
 				// console.log(address_id, 'address_id')
+				// console.log(this.take,)
+				// console.log(this.subCoupon,)
+				// console.log(this.use_integral, )
 				let that = this;
 				// console.log(that.cartId.split(","))
 				uni.showLoading({
@@ -1110,6 +1113,7 @@
 							real_name: res.data.real_name,
 							phone: res.data.phone
 						}
+						console.log(that.addressId);
 						this.getConfirm(that.addressId);
 					})
 				} else {
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 9c1db4e..e77e245 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -21,7 +21,7 @@
 					<view>全部</view>
 					<view class='num'>{{orderData.all || 0}}</view>
 				</view>
-				<view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(0)">
+				<view class='item' :class='orderStatus==21 ? "on": ""' @click="statusClick(21)">
 					<view>待付款</view>
 					<view class='num'>{{orderData.noPay || 0}}</view>
 				</view>
@@ -59,7 +59,7 @@
 			<view class='list'>
 				<!-- 代付款 -->
 				<view v-if="orderList.length > 0">
-					<block v-if="orderStatus == 0">
+					<block v-if="orderStatus == 21">
 						<view class='item' v-for="(item,index) in orderList" :key="index">
 							<view @click='goOrderDetails(item.group_order_id)'>
 								<view class='title acea-row row-between-wrapper'>
@@ -416,7 +416,8 @@
 					id: ''
 				},
 				//商品分类
-				activity_type: ''
+				activity_type: '',
+				product_type:0,
 			};
 		},
 		computed: {
@@ -498,7 +499,10 @@
 			 * 生命周期函数--监听页面加载
 			 */
 			onLoad: function(options) {
+					if (options.product_type) this.product_type = options.product_type;
+			
 				if (options.status) this.orderStatus = options.status;
+				
 			},
 			/**
 			 * 获取订单统计数据
@@ -506,7 +510,9 @@
 			 */
 			getOrderData: function() {
 				let that = this;
-				orderData().then(res => {
+				orderData({
+					product_type:this.product_type
+				}).then(res => {
 					that.$set(that, 'orderData', res.data);
 				})
 			},
@@ -540,10 +546,13 @@
 			 *
 			 */
 			goPay: function(pay_price, order_id) {
-				this.$set(this, 'pay_close', true);
-				this.order_id = order_id;
-				this.pay_order_id = order_id.toString()
-				this.$set(this, 'totalPrice', pay_price);
+				uni.navigateTo({
+					url: '/pages/users/payment/payment?order_id=' + order_id
+				});
+				// this.$set(this, 'pay_close', true);
+				// this.order_id = order_id;
+				// this.pay_order_id = order_id.toString()
+				// this.$set(this, 'totalPrice', pay_price);
 			},
 			/**
 			 * 支付成功回调
@@ -659,37 +668,17 @@
 				that.loadTitle = "加载更多";
 				if (that.isReady) {
 					that.isReady = false
-					if (that.orderStatus == 0) {
-						groupOrderList({
-							page: that.page,
-							limit: that.limit,
-						}).then(res => {
-							console.log(res);
-							that.isReady = true;
-							let list = res.data.list || [];
-							let loadend = list.length < that.limit;
-							// console.log(that.orderList)
-							that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
-								.orderList);
-							that.$set(that, 'orderList', that.orderList);
-							// console.log(that.orderList)
-							that.getProductCount();
-							that.loadend = loadend;
-							that.loading = false;
-							that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
-							that.page = that.page + 1
-						})
-					} else {
+					
 						getOrderList({
-							status: that.orderStatus - 1,
+							status: that.orderStatus-1,
 							page: that.page,
 							limit: that.limit,
+							product_type:that.product_type
 						}).then(res => {
 							console.log(res);
 							let list = res.data.list || [];
 							let loadend = list.length < that.limit;
-							that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
-								.orderList);
+							that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that.orderList);
 							that.$set(that, 'orderList', that.orderList);
 							that.getProductCount();
 							that.loadend = loadend;
@@ -702,7 +691,7 @@
 							that.loadTitle = "加载更多";
 						})
 					}
-				}
+				
 			},
 			/**
 			 * 获取定金预售订单列表
diff --git a/pages/users/order_list/order.vue b/pages/users/order_list/order.vue
new file mode 100644
index 0000000..d802e68
--- /dev/null
+++ b/pages/users/order_list/order.vue
@@ -0,0 +1,1182 @@
+<template>
+	<view :style="viewColor">
+		<view class='my-order'>
+			<view class='header'>
+				<view class='picTxt acea-row row-between-wrapper'>
+					<view class='text'>
+						<view class='name'>订单信息</view>
+						<view>消费订单：{{orderData.orderCount || 0}} 总消费：￥{{orderData.orderPrice || 0}}</view>
+					</view>
+					<view class='pictrue'>
+						<image :src="`${domain}/static/images/orderTime.png`"></image>
+					</view>
+				</view>
+			</view>
+			<navigator class="search acea-row row-middle" url="/pages/users/order_list/search" hover-class="none">
+				<text class="iconfont icon-sousuo"></text>
+				搜索我的订单
+			</navigator>
+			<view class='nav acea-row row-around'>
+				<view class='item' :class='orderStatus==-1 ? "on": ""' @click="statusClick(-1)">
+					<view>全部</view>
+					<view class='num'>{{orderData.all || 0}}</view>
+				</view>
+				<view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(20)">
+					<view>待付款</view>
+					<view class='num'>{{orderData.noPay || 0}}</view>
+				</view>
+				<view class='item' :class='orderStatus==1 ? "on": ""' @click="statusClick(1)">
+					<view>待发货</view>
+					<view class='num'>{{orderData.noPostage || 0}}</view>
+				</view>
+				<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
+					<view>待收货</view>
+					<view class='num '>{{orderData.noDeliver || 0}}</view>
+				</view>
+				<view class='item' :class='orderStatus==3 ? "on": ""' @click="statusClick(3)">
+					<view>待评价</view>
+					<view class='num'>{{orderData.noComment || 0}}</view>
+				</view>
+			</view>
+			<!--定金预售订单-->
+			<view v-if="presellProList.length > 0" class="event_container">
+				<navigator class="acea-row row-between" url="/pages/users/presell_order_list/index" hover-class='none'>
+					<view class="info">
+						<view class="title">预售尾款订单转到这里了！</view>
+						<view class="desc">有 <text class="t-color">{{ presellOrderCount }}</text> 笔预售尾款订单待付款，请点击查看
+						</view>
+					</view>
+					<view class="photo acea-row row-between">
+						<view class='picture'>
+							<image
+								:src='(presellProList[0].orderProduct[0].cart_info.productAttr && presellProList[0].orderProduct[0].cart_info.productAttr.image) || presellProList[0].orderProduct[0].cart_info.product.image'>
+							</image>
+						</view>
+						<view class="more_btn"><text class="iconfont icon-gengduo3"></text></view>
+					</view>
+				</navigator>
+			</view>
+			<view class='list'>
+				<!-- 代付款 -->
+				<view v-if="orderList.length > 0">
+					<block v-if="orderStatus == 0">
+						<view class='item' v-for="(item,index) in orderList" :key="index">
+							<view @click='goOrderDetails(item.group_order_id)'>
+								<view class='title acea-row row-between-wrapper'>
+									<view class="acea-row row-middle left-wrapper">
+										{{item.group_order_sn}}
+									</view>
+									<view class='t-color'>
+										{{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}
+									</view>
+								</view>
+								<view v-for="(order,j) in item.orderList" :key="order.order_id+j">
+									<!--预售-->
+									<view v-if="order.activity_type === 2">
+										<block v-for="(goods,g) in order.orderProduct">
+											<view class='item-info acea-row row-between row-top'>
+												<view class='pictrue'>
+													<image
+														:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+													</image>
+												</view>
+												<view class='text acea-row row-between'>
+													<view class='name line1'>
+														<text
+															class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
+														<view class="event_ship event_color">发货时间：
+															<!--全款预售-->
+															<text
+																v-if="goods.cart_info.productPresell.presell_type === 1">
+																{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
+															</text>
+															<!--定金预售-->
+															<text
+																v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+														</view>
+													</view>
+													<view class='money'>
+														<view>￥{{goods.cart_info.productPresellAttr.presell_price}}
+														</view>
+														<view>x{{goods.product_num}}</view>
+													</view>
+												</view>
+												<view v-if="goods.cart_info.productPresell.presell_type === 2"
+													class="event_price">
+													定金待支付 <text class="t-color">￥{{ order.pay_price }}</text>
+													尾款待支付 <text
+														class="t-color">￥{{ order.presellOrder.pay_price }}</text>
+												</view>
+											</view>
+										</block>
+									</view>
+									<view v-else>
+										<block v-for="(goods,g) in order.orderProduct">
+											<view class='item-info acea-row row-between row-top'>
+												<view class='pictrue'>
+													<image
+														:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+													</image>
+												</view>
+												<view class='text acea-row row-between'>
+
+													<view class='name line2'>{{goods.cart_info.product.store_name}}
+													</view>
+
+													<view class='money' v-if="item.orderList[0].activity_type == 4">
+														<view v-if="goods.cart_info.activeSku">
+															￥{{goods.cart_info.activeSku.active_price}}</view>
+														<view>x{{goods.product_num}}</view>
+													</view>
+													<view v-else class='money'>
+														<view>￥{{goods.cart_info.productAttr.price}}</view>
+														<view>x{{goods.product_num}}</view>
+													</view>
+												</view>
+											</view>
+										</block>
+									</view>
+								</view>
+								<view class='totalPrice' v-if="item.orderList[0].activity_type !== 2">
+									共{{item.total_num || 0}}件商品，总金额
+									<text class='money p-color'>￥{{item.pay_price}}</text>
+								</view>
+								<view class='bottom acea-row row-right row-middle'>
+									<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>
+										立即付款</view>
+								</view>
+							</view>
+						</view>
+					</block>
+					<!-- 待发货 待收货 待评价 已完成 -->
+					<block v-else>
+						<view class='item' v-for="(item,index) in orderList" :key="index">
+							<view @click='goOrderDetails(item.order_id)'>
+								<view class='title acea-row row-between-wrapper'>
+									<view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)">
+										<text class="iconfont icon-shangjiadingdan"></text>
+										<view class="store-name">{{item.merchant.mer_name}}</view>
+										<text class="iconfont icon-xiangyou"></text>
+									</view>
+									<view v-if="item.status == 0" class='t-color'>
+										<text
+											v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
+										<text v-else>待发货</text>
+									</view>
+									<view v-if="item.status == 1" class='t-color'>待收货</view>
+									<view v-if="item.status == 2" class='t-color'>待评价</view>
+									<view v-if="item.status == 3" class='t-color'>已完成</view>
+									<view v-if="item.status == -1" class='t-color'>已退款</view>
+								</view>
+								<view v-if="item.activity_type === 2">
+									<view class='item-info acea-row row-between row-top'
+										v-for="(goods,index) in item.orderProduct" :key="index">
+										<view class='pictrue'>
+											<image
+												:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+											</image>
+										</view>
+										<view class='text acea-row row-between'>
+											<view class='name '>
+												<view class='name' :class="item.status === 0 ? 'line1' : 'line2'">
+													<text
+														class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
+													<view v-if="item.status == 0" class="event_ship event_color">发货时间：
+														<!--全款预售-->
+														<text
+															v-if="goods.cart_info.productPresell.presell_type === 1">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+														<!--定金预售-->
+														<text
+															v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
+													</view>
+												</view>
+												<view style="margin-top: 10rpx;" class="t-color">
+													{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+												</view>
+											</view>
+											<view class='money'>
+												<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
+												<view>x{{goods.product_num}}</view>
+											</view>
+										</view>
+									</view>
+								</view>
+								<view v-else>
+									<view class='item-info acea-row row-between row-top'
+										v-for="(goods,index) in item.orderProduct" :key="index">
+										<view class='pictrue'>
+											<image
+												:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
+											</image>
+										</view>
+										<view class='text acea-row row-between'>
+											<view class='name '>
+												<view class='name line2'>
+													<text>{{goods.cart_info.product.store_name}}</text>
+												</view>
+												<view style="margin-top: 10rpx;" class="t-color">
+													{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
+												</view>
+											</view>
+											<view class='money' v-if="item.activity_type == 3">
+												<view v-if="goods.cart_info.productAssistAttr">
+													￥{{goods.cart_info.productAssistAttr.assist_price}}</view>
+												<view>x{{goods.product_num}}</view>
+											</view>
+											<view class='money' v-else-if="item.activity_type == 4">
+												<view v-if="goods.cart_info.activeSku">
+													￥{{goods.cart_info.activeSku.active_price}}</view>
+												<view>x{{goods.product_num}}</view>
+											</view>
+											<view class='money' v-else>
+												<view>￥{{goods.cart_info.productAttr.price}}</view>
+												<view>x{{goods.product_num}}</view>
+											</view>
+										</view>
+									</view>
+								</view>
+								<view class='totalPrice' v-if="item.activity_type == 2">共{{item.orderNum || 0}}件商品，总金额
+									<text class='money p-color'>￥{{item.presell_price}}</text>
+								</view>
+								<view class='totalPrice' v-else>共{{item.orderNum || 0}}件商品，总金额
+									<text class='money p-color'>￥{{item.pay_price}}</text>
+								</view>
+								<view class="totalPrice" v-if="item.pay_type == 8 && item.status == 12">
+
+									共1件商品，结算周期到期后付款￥100
+								</view>
+							</view>
+							<view class='bottom acea-row row-right row-middle'>
+								<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
+									@click.stop='applyInvoice(item.order_id)'>申请开票</view>
+								<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
+									<view v-if="!item.receipt && item.status != -1" class="bnt cancelBnt">一键转卖</view>
+									<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
+								</block>
+								<block v-if="item.status == 1">
+									<view class='bnt cancelBnt'
+										v-if="item.delivery_type == 1 || item.delivery_type == 2"
+										@click='goOrderDetails(item.order_id)'>查看物流</view>
+									<view class='bnt b-color' @tap='confirmOrder(item,index)'>确认收货</view>
+								</block>
+								<block v-if="item.status == 2">
+									<navigator v-if="community_status == 1 && !item.community_id"
+										:url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id"
+										class='bnt colorBnt' hover-class="none">
+										<text class="iconfont icon-fabu"></text>
+										发布种草
+									</navigator>
+									<view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价	
+									</view>
+								</block>
+								<block v-if="item.status == 3">
+									<view class='bnt b-color' @click='goOrderDetails(item.order_id)'
+										v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">
+										查看详情</view>
+									<navigator v-if="community_status == 1 && !item.community_id"
+										:url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id"
+										class='bnt colorBnt' hover-class="none">
+										<text class="iconfont icon-fabu"></text>
+										发布种草
+									</navigator>
+									<view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-else>再次购买</view>
+								</block>
+							</view>
+						</view>
+					</block>
+				</view>
+			</view>
+			<view class='loadingicon acea-row row-center-wrapper' v-if="orderList.length>5">
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+			</view>
+			<view v-if="orderList.length == 0 && page > 1">
+				<emptyPage title="暂无订单~"></emptyPage>
+			</view>
+		</view>
+		<home></home>
+		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+		<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
+			:totalPrice='totalPrice'></payment>
+		<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
+		<u-popup :show="show" bgColor='transparent' mode='center'>
+			<view class="warp">
+				<image @click="close" class="guanbi" src="@/static/images/guanbi.png"></image>
+				<image src="@/static/images/shouhuo.png" mode="widthFix"></image>
+			</view>
+			<view class="textp">
+				<h3>确认收到货了吗?</h3>
+				<span>此订单为先货后款订单，确认收货后将开始计算结算周期。为保障售后权益，请检查后再确认收货。</span>
+				<button class="shouhuobtn" @click="queding()">确认收货</button>
+				<view class="cle" @click="close">取消</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	let app = getApp();
+	import {
+		getOrderList,
+		orderData,
+		unOrderCancel,
+		orderDel,
+		orderPay,
+		groupOrderList,
+		orderTake,
+		applyInvoiceApi
+	} from '@/api/order.js';
+	import {
+		getUserInfo
+	} from '@/api/user.js';
+	import {
+		postsettle
+	} from '@/api/admin.js';
+	import {
+		openOrderSubscribe
+	} from '@/utils/SubscribeMessage.js';
+	import payment from '@/components/payment';
+	import home from '@/components/home/index.vue';
+	import addInvoicing from '@/components/addInvoicing';
+	import {
+		mapGetters
+	} from "vuex";
+	import authorize from '@/components/Authorize';
+	import emptyPage from '@/components/emptyPage.vue';
+	import {
+		configMap
+	} from '@/utils'
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	export default {
+		components: {
+			payment,
+			emptyPage,
+			home,
+			authorize,
+			addInvoicing
+		},
+		data() {
+			return {
+				loading: false, //是否加载中
+				loadend: false, //是否加载完毕
+				loadTitle: '加载更多', //提示语
+				orderList: [], //订单数组
+				presellProList: [], //定金预售订单
+				presellOrderCount: 0,
+				orderData: {}, //订单详细统计
+				orderStatus: 0, //订单状态
+				page: 1,
+				limit: 20,
+				domain: HTTP_REQUEST_URL,
+				payMode: [{
+						name: "微信支付",
+						icon: "icon-weixinzhifu",
+						value: 'wechat',
+						title: '微信快捷支付',
+						payStatus: 1
+					},
+					{
+						name: "支付宝支付",
+						icon: "icon-zhifubao",
+						value: 'alipay',
+						title: '支付宝支付',
+						payStatus: this.$store.getters.globalData.alipay_open
+					},
+					{
+						name: "余额支付",
+						icon: "icon-yuezhifu",
+						value: 'balance',
+						title: '可用余额:',
+						number: 0,
+						payStatus: this.$store.getters.globalData.yue_pay_status
+					},
+					
+				],
+				pay_close: false,
+				pay_order_id: '',
+				invoice_order_id: '',
+				totalPrice: '0',
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
+				isReady: true,
+				invoice: {
+					invoice: false,
+					add: false,
+				},
+				show: false,
+				shouhuo: {
+					index: '',
+					id: ''
+				},
+				//商品分类
+				activity_type: ''
+			};
+		},
+		computed: {
+			...mapGetters(['isLogin', 'viewColor']),
+			...configMap(['hide_mer_status', 'community_status', 'alipay_open', 'yue_pay_status']),
+		},
+		watch: {
+			alipay_open(n) {
+				this.payMode[1].payStatus = n
+			},
+			yue_pay_status(n) {
+				this.payMode[2].payStatus = n
+			}
+		},
+		onShow() {
+			if (this.isLogin) {
+				this.page = 1;
+				this.loadend = false;
+				this.loading = false;
+				this.getOrderData();
+				this.getOrderList();
+				this.getUserInfo();
+				this.getpreSellOrderList();
+			} else {
+				this.isAuto = true;
+				this.isShowAuth = true
+			}
+		},
+		onReady() {},
+		mounted: function() {},
+		methods: {
+			// 去商铺
+			goMall(item) {
+				if (this.hide_mer_status == 0) {
+					uni.navigateTo({
+						url: '/pages/store/home/index?id=' + item.mer_id
+					})
+				}
+			},
+			onLoadFun() {
+				this.isShowAuth = false;
+				this.getOrderData();
+				this.getOrderList();
+				this.getUserInfo();
+			},
+			// 授权关闭
+			authColse: function(e) {
+				this.isShowAuth = e
+			},
+			/**
+			 * 事件回调
+			 *
+			 */
+			onChangeFun: function(e) {
+				let opt = e;
+				let action = opt.action || null;
+				let value = opt.value != undefined ? opt.value : null;
+				(action && this[action]) && this[action](value);
+			},
+			/**
+			 * 获取用户信息
+			 *
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					that.payMode[2].number = res.data.now_money;
+					// that.$set(that, 'payMode', that.payMode);
+				});
+			},
+			/**
+			 * 关闭支付组件
+			 *
+			 */
+			payClose: function() {
+				this.pay_close = false;
+			},
+			/**
+			 * 生命周期函数--监听页面加载
+			 */
+			onLoad: function(options) {
+				if (options.status) this.orderStatus = options.status;
+			},
+			/**
+			 * 获取订单统计数据
+			 *
+			 */
+			getOrderData: function() {
+				let that = this;
+				orderData().then(res => {
+					that.$set(that, 'orderData', res.data);
+				})
+			},
+			/**
+			 * 取消订单
+			 *
+			 */
+			cancelOrder: function(index, order_id) {
+				let that = this;
+				if (!order_id) return that.$util.Tips({
+					title: '缺少订单号无法取消订单'
+				});
+				unOrderCancel(order_id).then(res => {
+					return that.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					}, function() {
+						that.orderList.splice(index, 1);
+						that.$set(that, 'orderList', that.orderList);
+						that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
+						that.getOrderData();
+					});
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				});
+			},
+			/**
+			 * 打开支付组件
+			 *
+			 */
+			goPay: function(pay_price, order_id) {
+				uni.navigateTo({
+					url: '/pages/users/payment/payment?order_id=' + order_id
+				});
+				// this.$set(this, 'pay_close', true);
+				// this.order_id = order_id;
+				// this.pay_order_id = order_id.toString()
+				// this.$set(this, 'totalPrice', pay_price);
+			},
+			/**
+			 * 支付成功回调
+			 *
+			 */
+			pay_complete: function() {
+				this.loadend = false;
+				this.page = 1;
+				this.$set(this, 'orderList', []);
+				this.pay_close = false;
+				this.pay_order_id = '';
+				this.getOrderData();
+				this.getOrderList();
+			},
+			/**
+			 * 支付失败回调
+			 *
+			 */
+			pay_fail: function() {
+				this.pay_close = false;
+				this.pay_order_id = '';
+			},
+			/**
+			 * 去订单详情
+			 */
+			goOrderDetails: function(order_id) {
+				let self = this
+				if (!order_id) return that.$util.Tips({
+					title: '缺少订单号无法查看订单详情'
+				});
+				// #ifdef MP
+				uni.showLoading({
+					title: '正在加载',
+				})
+				openOrderSubscribe().then(() => {
+					uni.hideLoading();
+					if (self.orderStatus == 0) {
+						uni.navigateTo({
+							url: '/pages/order_details/stay?order_id=' + order_id
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/order_details/index?order_id=' + order_id
+						})
+					}
+				}).catch(() => {
+					uni.hideLoading();
+				})
+				// #endif
+				// #ifndef MP
+				if (self.orderStatus == 0) {
+					uni.navigateTo({
+						url: '/pages/order_details/stay?order_id=' + order_id
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/order_details/index?order_id=' + order_id
+					})
+				}
+				// #endif
+			},
+			/**
+			 * 点击去评价
+			 */
+			goOrderDetails_Evaluation: function(order_id) {
+				let self = this
+				if (!order_id) return that.$util.Tips({
+					title: '缺少订单号无法查看订单详情和评价'
+				});
+				// #ifdef MP
+				if (self.orderStatus == 0) {
+					uni.navigateTo({
+						url: '/pages/order_details/stay?order_id=' + order_id
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/order_details/index?order_id=' + order_id
+					})
+				}
+				// #endif
+				// #ifndef MP
+				if (self.orderStatus == 0) {
+					uni.navigateTo({
+						url: '/pages/order_details/stay?order_id=' + order_id
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/order_details/index?order_id=' + order_id
+					})
+				}
+				// #endif
+			},
+			/**
+			 * 切换类型
+			 */
+			statusClick: function(status) {
+				if (status == this.orderStatus) return;
+				this.orderStatus = status;
+				this.loadend = false;
+				this.loading = false;
+				this.page = 1;
+				this.$set(this, 'orderList', []);
+				this.getOrderList();
+			},
+			/**
+			 * 获取订单列表
+			 */
+			getOrderList: function() {
+				let that = this;
+				if (that.loadend) return;
+				if (that.loading) return;
+				that.loading = true;
+				that.loadTitle = "加载更多";
+				if (that.isReady) {
+					that.isReady = false
+				
+						getOrderList({
+							status: that.orderStatus - 1,
+							page: that.page,
+							limit: that.limit,
+						}).then(res => {
+							console.log(res);
+							let list = res.data.list || [];
+							let loadend = list.length < that.limit;
+							that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
+								.orderList);
+							that.$set(that, 'orderList', that.orderList);
+							that.getProductCount();
+							that.loadend = loadend;
+							that.loading = false;
+							that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
+							that.page = that.page + 1;
+							that.isReady = true;
+						}).catch(err => {
+							that.loading = false;
+							that.loadTitle = "加载更多";
+						})
+					
+				}
+			},
+			/**
+			 * 获取定金预售订单列表
+			 */
+			getpreSellOrderList: function() {
+				let that = this;
+				getOrderList({
+					status: 10,
+					page: 1,
+					limit: 1,
+				}).then(res => {
+					let list = res.data.list || [];
+					that.presellOrderCount = res.data.count;
+					that.$set(that, 'presellProList', list);
+				})
+			},
+			/**
+			 * 获取单个订单商品数量
+			 */
+			getProductCount: function() {
+				if (this.orderStatus !== 0) {
+					this.orderList.forEach((item, i) => {
+						let orderNum = 0
+						if (item.orderProduct) {
+							item.orderProduct.forEach((val) => {
+								orderNum += val.product_num
+							})
+							this.orderList[i]['orderNum'] = orderNum;
+						}
+					})
+				}
+			},
+			/**
+			 * 删除订单
+			 */
+			delOrder: function(order_id, index) {
+				let that = this;
+				orderDel(order_id).then(res => {
+					that.orderList.splice(index, 1);
+					that.$set(that, 'orderList', that.orderList);
+					that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
+					that.getOrderData();
+					return that.$util.Tips({
+						title: '删除成功',
+						icon: 'success'
+					});
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				})
+			},
+			// 确认收货
+			confirmOrder: function(item, index) {
+				this.show = true
+				this.shouhuo.id = item.order_id
+				this.shouhuo.index = index
+				// uni.showModal({
+				// 	title: '确认收货',
+				// 	content: '为保障权益，请收到货确认无误后，再确认收货',
+				// 	success: function(res) {
+				// 		if (res.confirm) {
+				// 			orderTake(item.order_id).then(res => {
+				// 				return that.$util.Tips({
+				// 					title: '操作成功',
+				// 					icon: 'success'
+				// 				}, function() {
+				// 					that.orderList.splice(index, 1);
+				// 					that.getOrderData();
+				// 				});
+				// 			}).catch(err => {
+				// 				return that.$util.Tips({
+				// 					title: err
+				// 				});
+				// 			})
+				// 		}
+				// 	}
+				// })
+			},
+			queding() {
+				let that = this;
+				orderTake(that.shouhuo.id).then(res => {
+							that.show = false
+							that.orderList.splice(that.shouhuo.index, 1); 
+							that.getOrderData();
+							return that.$util.Tips({
+									title: '操作成功',
+									icon: 'success',
+								})
+
+							}).catch(err => {
+							return that.$util.Tips({
+								title: err
+							});
+							that.show = false
+						})
+					},
+					/*申请开票*/
+					applyInvoice(order_id) {
+						let that = this;
+						that.invoice_order_id = order_id
+						that.invoice.invoice = true;
+						that.$refs.addInvoicing.getInvoiceDefault();
+						that.$refs.addInvoicing.getInvoiceList();
+					},
+					// 关闭发票弹窗
+					changeInvoiceClose: function(data) {
+						if (data) this.getInvoiceData(data);
+						this.$set(this.invoice, 'invoice', false);
+					},
+					// 开票回调
+					getInvoiceData(data) {
+						let that = this
+						applyInvoiceApi(that.invoice_order_id, data).then(res => {
+							return that.$util.Tips({
+								title: res.message,
+							});
+						}).catch(err => {
+							return that.$util.Tips({
+								title: err
+							});
+						})
+					},
+					close() {
+						this.show = false
+					}
+			},
+			onReachBottom: function() {
+				this.getOrderList();
+			}
+		}
+</script>
+
+<style scoped lang="scss">
+	.my-order .header {
+		height: 260rpx;
+		padding: 0 30rpx;
+		background-color: var(--view-theme);
+	}
+
+	.t-color {
+		color: var(--view-theme);
+	}
+
+	.p-color {
+		color: var(--view-priceColor);
+	}
+
+	.b-color {
+		background-color: var(--view-theme);
+	}
+
+	.my-order .header .picTxt {
+		height: 190rpx;
+	}
+
+	.my-order .header .picTxt .text {
+		color: rgba(255, 255, 255, 0.8);
+		font-size: 26rpx;
+		// font-family: 'Guildford Pro';
+	}
+
+	.my-order .header .picTxt .text .name {
+		font-size: 34rpx;
+		font-weight: bold;
+		color: #fff;
+		margin-bottom: 20rpx;
+	}
+
+	.my-order .header .picTxt .pictrue {
+		width: 122rpx;
+		height: 109rpx;
+	}
+
+	.my-order .header .picTxt .pictrue image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.my-order .nav {
+		background-color: #fff;
+		width: 690rpx;
+		height: 140rpx;
+		border-radius: 16rpx;
+		margin: 20rpx auto 0 auto;
+	}
+
+	.my-order .nav .item {
+		text-align: center;
+		font-size: 26rpx;
+		color: #282828;
+		padding: 29rpx 0;
+	}
+
+	.my-order .nav .item.on {
+		font-weight: bold;
+		border-bottom: 5rpx solid var(--view-theme);
+	}
+
+	.my-order .nav .item .num {
+		margin-top: 18rpx;
+	}
+
+	.my-order .list {
+		width: 690rpx;
+		margin: 14rpx auto 0 auto;
+	}
+
+	.my-order .list .item {
+		background-color: #fff;
+		border-radius: 16rpx;
+		margin-bottom: 14rpx;
+	}
+
+	.my-order .list .item .title {
+		height: 84rpx;
+		padding: 0 30rpx;
+		border-bottom: 1px solid #eee;
+		font-size: 28rpx;
+		color: #282828;
+
+		.left-wrapper {
+			.iconfont {
+				margin-top: 5rpx;
+			}
+
+			.store-name {
+				margin: 0 10rpx;
+			}
+
+			.icon-xiangyou {
+				font-size: 20rpx;
+			}
+		}
+	}
+
+	.my-order .list .item .title .sign {
+		font-size: 24rpx;
+		padding: 0 7rpx;
+		height: 36rpx;
+		margin-right: 15rpx;
+	}
+
+	.my-order .list .item .item-info {
+		padding: 0 30rpx;
+		margin-top: 22rpx;
+	}
+
+	.my-order .list .item .item-info .pictrue {
+		width: 120rpx;
+		height: 120rpx;
+	}
+
+	.my-order .list .item .item-info .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 6rpx;
+	}
+
+	.my-order .list .item .item-info .text {
+		width: 486rpx;
+		font-size: 28rpx;
+		color: #999;
+		margin-top: 6rpx;
+	}
+
+	.my-order .list .item .item-info .text .name {
+		width: 320rpx;
+		color: #282828;
+	}
+
+	.event_bg {
+		background: #FF7F00;
+	}
+
+	.event_color {
+		color: #FF7F00;
+	}
+
+	.my-order .list .item .event_name {
+		display: inline-block;
+		margin-right: 9rpx;
+		color: #fff;
+		font-size: 20rpx;
+		padding: 0 8rpx;
+		line-height: 30rpx;
+		text-align: center;
+		border-radius: 6rpx;
+	}
+
+	.my-order .list .item .event_ship {
+		font-size: 20rpx;
+		margin-top: 10rpx;
+	}
+
+	.my-order .list .event_price {
+		margin: 0 0 50rpx 120rpx;
+	}
+
+	.my-order .list .item .item-info .text .money {
+		text-align: right;
+	}
+
+	.my-order .list .item .totalPrice {
+		font-size: 26rpx;
+		color: #282828;
+		text-align: right;
+		margin: 27rpx 0 0 30rpx;
+		padding: 0 30rpx 30rpx 0;
+	}
+
+	.my-order .list .item .totalPrice .money {
+		font-size: 28rpx;
+		font-weight: bold;
+	}
+
+	.my-order .list .item .bottom {
+		height: 107rpx;
+		padding: 0 30rpx;
+		border-top: 1px solid #f0f0f0;
+	}
+
+	.my-order .list .item .bottom .bnt {
+		width: 176rpx;
+		height: 60rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #fff;
+		border-radius: 50rpx;
+		font-size: 27rpx;
+	}
+
+	.my-order .list .item .bottom .bnt.cancelBnt {
+		border: 1px solid #ddd;
+		color: #aaa;
+	}
+
+	.my-order .list .item .bottom .bnt.colorBnt {
+		border: 1px solid var(--view-theme);
+		color: var(--view-theme);
+	}
+
+	.my-order .list .item .bottom .bnt .icon-fabu {
+		font-size: 26rpx;
+		margin-right: 10rpx;
+	}
+
+	.my-order .list .item .bottom .bnt~.bnt {
+		margin-left: 17rpx;
+	}
+
+	.noCart {
+		margin-top: 171rpx;
+		padding-top: 0.1rpx;
+	}
+
+	.noCart .pictrue {
+		width: 414rpx;
+		height: 336rpx;
+		margin: 78rpx auto 56rpx auto;
+	}
+
+	.noCart .pictrue image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.event_container {
+		width: 690rpx;
+		background-image: url(../static/images/presell_orderBg.png);
+		background-size: cover;
+		background-repeat: no-repeat;
+		margin: 20rpx auto;
+		padding: 26rpx 30rpx;
+		border-radius: 16rpx;
+
+		.info {
+			width: 420rpx;
+
+			.title {
+				color: #282828;
+				font-size: 26rpx;
+			}
+
+			.desc {
+				color: #999;
+				font-size: 24rpx;
+				margin-top: 30rpx;
+			}
+		}
+
+		.photo {
+			width: 180rpx;
+
+			.picture {
+				width: 120rpx;
+				height: 120rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 8rpx;
+				}
+			}
+
+			.more_btn {
+				color: #fff;
+				background: #F97E3B;
+				width: 40rpx;
+				height: 40rpx;
+				border-radius: 40rpx;
+				text-align: center;
+				line-height: 40rpx;
+				position: relative;
+				top: 40rpx;
+
+				text {
+					font-size: 20rpx;
+				}
+			}
+		}
+	}
+
+	.search {
+		height: 70rpx;
+		padding: 0 30rpx;
+		border-radius: 35rpx;
+		margin: -35rpx 30rpx 0;
+		background-color: #FFFFFF;
+		font-size: 26rpx;
+		color: #999999;
+
+		.iconfont {
+			margin-right: 10rpx;
+			font-size: 23rpx;
+		}
+	}
+
+	.warp {
+		margin: auto;
+
+		.guanbi {
+			position: absolute;
+			right: 0px;
+			z-index: 1;
+			width: 30px;
+			height: 30px;
+		}
+	}
+
+	.textp {
+		width: 320px;
+		padding-bottom: 20px;
+		position: absolute;
+		top: 130px;
+		border-radius: 10px;
+
+		h3 {
+			text-align: center;
+		}
+
+		span {
+			display: block;
+			width: 280px;
+			padding-top: 20px;
+			margin: auto;
+		}
+
+		.shouhuobtn {
+			margin: auto;
+			line-height: 54px;
+			margin-top: 30px;
+			width: 191px;
+			height: 54px;
+			color: white;
+			background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
+			border-radius: 27px 27px 27px 27px;
+		}
+
+		.cle {
+			margin: auto;
+			text-align: center;
+			margin-top: 15px;
+			height: 40px;
+			background-color: #FFFFFF;
+			border-radius: 10px;
+			color: #999999;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/users/payment/payment.vue b/pages/users/payment/payment.vue
new file mode 100644
index 0000000..397a226
--- /dev/null
+++ b/pages/users/payment/payment.vue
@@ -0,0 +1,384 @@
+<template>
+	<view class="center">
+
+
+		<view class='wrapper'>
+			<view class='item'>
+				<view>支付方式</view>
+				<view class='list'>
+					<!-- #ifdef H5 -->
+					<view class='payItem acea-row row-middle' :class='active==index ?"on":""' @tap='payItem(index)'
+						v-for="(item,index) in cartArr" :key='index' v-if="item.payStatus==1">
+						<view class='name acea-row row-center-wrapper'>
+							<view class='iconfont animated'
+								:class='(item.icon) + " " + (animated==true&&active==index ?"bounceIn":"")'></view>
+							{{item.name}}
+						</view>
+						<view class='tip'>
+							{{item.title}}
+							<block v-if="item.value == 'balance'">
+								{{userInfo.now_money}}
+							</block>
+						</view>
+					</view>
+					<!-- #endif -->
+					<!-- #ifdef MP || APP-PLUS -->
+					<view class='payItem acea-row row-middle' :class='active==index ?"on":""' @tap='payItem(index)'
+						v-for="(item,index) in cartArr" :key='index' v-if="item.payStatus==1">
+						<view class='name acea-row row-center-wrapper'>
+							<view class='iconfont animated'
+								:class='(item.icon) + " " + (animated==true&&active==index ?"bounceIn":"")'></view>
+							{{item.name}}
+						</view>
+						<view class='tip'>
+							{{item.title}}
+							<block v-if="item.value == 'balance'">
+								{{userInfo.now_money}}
+							</block>
+						</view>
+					</view>
+					<!-- #endif -->
+				</view>
+			</view>
+		</view>
+		<view class="settel">
+			<view class='settel-t'>
+				<view>实付款：</view>
+				<view class='conter'>￥ {{couponData.orderList[0].pay_price}}</view>
+			</view>
+		</view>
+		<view class="settel">
+			<view class='settel-t'>
+				<view>利息合计:</view>
+				<view class="conter">
+					<view class='con_text'>￥ {{couponData.orderList[0].pay_price}}</view>
+					<view class='con_text' style="color: #F84221;" v-if="couponData.pay_type == 8">（已逾期1天)</view>
+				</view>
+
+			</view>
+		</view>
+		<view class='footer acea-row row-between-wrapper'>
+			<view class="footer_count">
+				<view>
+					合计:
+					<text class='pColor' v-if="cartArr[4].payStatus == 1">￥0.00</text>
+					<text class='pColor' v-else>￥{{couponData.orderList[0].pay_price}}</text>
+				</view>
+				<view style="font-size: 14px;color: #F84221;" v-if="couponData.pay_type == 8">
+					可结算周期到期后再付款￥{{totalPrice}}
+				</view>
+			</view>
+			<view class='settlement' @tap="SubOrder">
+				提交订单
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+
+		getUserInfo,
+
+	} from '@/api/user.js';
+	import {
+		groupOrderDetail,
+		orderPay
+	} from '@/api/order.js'
+	export default {
+		data() {
+			return {
+				animated: false,
+				totalPrice: 0,
+				couponData: {},
+				active: 0, //支付方式切换	,
+				userInfo: {}, //用户信息
+				cartArr: [{
+						"name": "微信支付",
+						"icon": "icon-weixin2",
+						value: 'weixin',
+						title: '微信快捷支付',
+						payStatus: 1,
+					},
+					{
+						name: "支付宝支付",
+						icon: "icon-icon34",
+						// #ifdef H5 || APP-PLUS
+						value: 'alipay',
+						// #endif
+						// #ifdef MP
+						value: 'alipayQr',
+						// #endif
+						title: '支付宝支付',
+						payStatus: this.$store.getters.globalData.alipay_open
+					},
+					{
+						"name": "余额支付",
+						"icon": "icon-icon-test",
+						value: 'balance',
+						title: '可用余额:',
+						payStatus: this.$store.getters.globalData.yue_pay_status,
+					},
+					{
+						"name": "线下支付",
+						"icon": "icon-yinhangqia",
+						value: 'offline',
+						title: '线下支付',
+						payStatus: 2,
+					}, {
+						"name": "先货后款",
+						"icon": "tan-a-lujing17324",
+						value: 'creditBuy',
+						title: `结算周期：30天 `,
+						label: '日利率：0.05%',
+						order_id: '',
+					},
+				],
+				order_id: ''
+			};
+		},
+		onLoad(options) {
+			this.order_id = options.order_id
+			this.getOrderInfo(this.order_id)
+			this.getUserInfo()
+		},
+		methods: {
+			payItem: function(e) {
+				let that = this;
+				let active = e;
+				that.active = active;
+				that.animated = true;
+				that.payType = that.cartArr[active].value;
+				if (that.payType == 'weixin') {
+					that.payType = that.from
+				}
+				console.log(that.payType);
+			},
+			getUserInfo() {
+				getUserInfo().then(res => {
+					this.userInfo = res.data
+				})
+			},
+			getOrderInfo(order_id) {
+				groupOrderDetail(order_id).then(res => {
+					this.couponData = res.data
+					console.log(res);
+				})
+			},
+			SubOrder() {
+				orderPay(this.order_id, {
+					type: this.payType
+				}).then(res => {
+					console.log(res);
+					setTimeout(() => {
+						uni.navigateBack({
+							delta: 1
+						})
+					}, 1000)
+					uni.showToast({
+						title: res.message
+					})
+				})
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.center {
+		.wrapper .item .discount .placeholder {
+			color: #ccc;
+			text-align: right;
+		}
+
+		.wrapper {
+			margin-bottom: 12rpx;
+			background-color: #fff;
+			padding-top: 20px;
+		}
+
+		.wrapper .item {
+			padding: 27rpx 30rpx;
+			font-size: 30rpx;
+			color: #282828;
+		}
+
+		.wrapper .item .discount .iconfont {
+			color: #515151;
+			font-size: 30rpx;
+			margin-left: 15rpx;
+		}
+
+		.wrapper .item .discount .num {
+			font-size: 32rpx;
+			margin-right: 20rpx;
+		}
+
+		.wrapper .item .shipping {
+			font-size: 30rpx;
+			color: #999;
+			position: relative;
+			padding-right: 58rpx;
+		}
+
+		.wrapper .item .shipping .iconfont {
+			font-size: 35rpx;
+			color: #707070;
+			position: absolute;
+			right: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			margin-left: 30rpx;
+		}
+
+		.wrapper .item input {
+			flex: 1;
+			height: 100%;
+			margin-left: 20rpx;
+			text-align: right;
+		}
+
+		.wrapper .item .placeholder {
+			color: #ccc;
+		}
+
+		.wrapper .item .list {
+			margin-top: 35rpx;
+		}
+
+		.wrapper .item .list .payItem {
+			border: 1px solid #eee;
+			border-radius: 6rpx;
+			height: 86rpx;
+			width: 100%;
+			box-sizing: border-box;
+			margin-top: 20rpx;
+			font-size: 28rpx;
+			color: #282828;
+		}
+
+		.wrapper .item .list .payItem.on {
+			border-color: var(--view-theme);
+			color: var(--view-theme);
+		}
+
+		.wrapper .item .list .payItem .name {
+			width: 50%;
+			text-align: center;
+			border-right: 1px solid #eee;
+			justify-content: left;
+			padding-left: 80rpx;
+		}
+
+		.wrapper .item .list .payItem .name .iconfont {
+			width: 44rpx;
+			height: 44rpx;
+			border-radius: 50%;
+			text-align: center;
+			line-height: 44rpx;
+			background-color: #fe960f;
+			color: #fff;
+			font-size: 30rpx;
+			margin-right: 15rpx;
+		}
+
+		.wrapper .item .list .payItem .name .iconfont.icon-weixin2 {
+			background-color: #41b035;
+		}
+
+		.wrapper .item .list .payItem .name .iconfont.icon-icon34 {
+			background-color: #4295D5;
+		}
+
+		.wrapper .item .list .payItem .tip {
+			width: 49%;
+			text-align: center;
+			font-size: 26rpx;
+			color: #aaa;
+		}
+
+		.footer {
+			width: 100%;
+			height: 100rpx;
+			height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+			height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+			background-color: #fff;
+			padding: 0 30rpx;
+			font-size: 28rpx;
+			color: #333;
+			box-sizing: border-box;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			z-index: 30;
+
+			.footer_count {
+				font-size: 28rpx;
+			}
+
+			.coupon_price {
+				color: #999999;
+				font-size: 20rpx;
+				margin-top: 10rpx;
+
+				text {
+					color: #282828;
+					padding: 2rpx 10rpx;
+					background: #F5F5F5;
+					border-radius: 26rpx;
+					margin-left: 20rpx;
+					line-height: 30rpx;
+					height: 30rpx;
+					display: inline-block;
+				}
+			}
+
+			.settlement {
+				font-size: 30rpx;
+				color: #fff;
+				width: 240rpx;
+				height: 70rpx;
+				background: linear-gradient(90deg, #F98649 0%, #F34E45 100%);
+				border-radius: 50rpx;
+				text-align: center;
+				line-height: 70rpx;
+
+				&.disabled {
+					background-color: #cccccc;
+				}
+			}
+
+			.transparent {
+				opacity: 0
+			}
+
+		}
+
+		.settel {
+			width: 100%;
+			background-color: #fff;
+			height: 70px;
+			padding: 0 15px 0 15px;
+			line-height: 70px;
+
+			.settel-t {
+				width: 100%;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+			}
+
+			.con_text {
+				display: flex;
+				justify-content: flex-end;
+				height: 35px;
+				margin: auto;
+				line-height: 35px;
+			}
+
+
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/users/supply_procurement/index.vue b/pages/users/supply_procurement/index.vue
index 44d5199..064a6d9 100644
--- a/pages/users/supply_procurement/index.vue
+++ b/pages/users/supply_procurement/index.vue
@@ -4,7 +4,7 @@
 			<image class="con_img" src="@/static/images/bg1.png" mode=""></image>
 			<image class="con_ico" src="@/static/images/bgic1.png" mode=""></image>
 			<view class="con_text">
-				<h3>现款后货</h3>
+				<h3>先款后货</h3>
 				<span>先付款后发货</span>
 			</view>
 		</view>
@@ -12,7 +12,7 @@
 			<image class="con_img" src="@/static/images/bg2.png" mode=""></image>
 			<image  class="con_ico" src="@/static/images/bgic2.png" mode=""></image>
 			<view class="con_text">
-				<h3>现货后款</h3>
+				<h3>先货后款</h3>
 				<span>先发货后付款</span>
 			</view>
 		</view>
diff --git a/static/images/jiankong.png b/static/images/jiankong.png
new file mode 100644
index 0000000..b25184b
Binary files /dev/null and b/static/images/jiankong.png differ