diff --git a/template/uni-app/api/admin.js b/template/uni-app/api/admin.js
index e853b8094..bca87ec81 100644
--- a/template/uni-app/api/admin.js
+++ b/template/uni-app/api/admin.js
@@ -175,4 +175,13 @@ export function setAdminRefundRemark(data) {
 	return request.post("admin/refund_order/remark", data, {
 		login: true
 	});
+}
+
+/**
+ * 订单同意退货
+ */
+export function agreeExpress(data) {
+	return request.post("admin/order/agreeExpress", data, {
+		login: true
+	});
 }
\ No newline at end of file
diff --git a/template/uni-app/pages/admin/components/PriceChange/index.vue b/template/uni-app/pages/admin/components/PriceChange/index.vue
index 74be9ce85..2e9eac6f1 100644
--- a/template/uni-app/pages/admin/components/PriceChange/index.vue
+++ b/template/uni-app/pages/admin/components/PriceChange/index.vue
@@ -2,16 +2,10 @@
   <view>
     <view class="priceChange" :class="change === true ? 'on' : ''">
       <view class="priceTitle">
-        {{
-          status == 0
-            ? orderInfo.refund_status === 1
-              ? $t(`立即退款`)
-              : $t(`一键改价`)
-            : $t(`订单备注`)
-        }}
+        {{ status == 0 ? $t(`一键改价`) : status == 1 ? $t(`订单备注`) : $t(`立即退款`) }}
         <span class="iconfont icon-guanbi" @click="close"></span>
       </view>
-      <view class="listChange" v-if="status == 0">
+      <view class="listChange" v-if="status == 0 || status == 2">
         <view
           class="item acea-row row-between-wrapper"
           v-if="orderInfo.refund_status === 0"
diff --git a/template/uni-app/pages/admin/orderDetail/index.vue b/template/uni-app/pages/admin/orderDetail/index.vue
index bfc917870..625607018 100644
--- a/template/uni-app/pages/admin/orderDetail/index.vue
+++ b/template/uni-app/pages/admin/orderDetail/index.vue
@@ -1,858 +1,884 @@
-<template>
-	<view class="order-details pos-order-details">
-		<view class="header acea-row row-middle">
-			<view class="state">{{ title }}</view>
-			<view class="data">
-				<view class="order-num">{{$t(`订单`)}}：{{ orderInfo.order_id }}</view>
-				<view>
-					<span class="time">{{ orderInfo._add_time }}</span>
-				</view>
-			</view>
-		</view>
-		<view class="remarks acea-row row-between-wrapper" v-if="goname != 'looks'">
-			<span class="iconfont icon-zhinengkefu-"></span>
-			<input class="line1" style="text-align: left;" :value="
-          orderInfo.remark ? orderInfo.remark : $t(`订单未备注，点击添加备注信息`)
-        " disabled @click="modify('1')" />
-		</view>
-		<view class="orderingUser acea-row row-middle">
-			<span class="iconfont icon-yonghu2"></span>{{ orderInfo.nickname }}
-		</view>
-		<view class="address">
-			<view class="name">
-				{{ orderInfo.real_name
-        }}<span class="phone">{{ orderInfo.user_phone }}</span>
-				<!-- #ifdef H5 -->
-				<span class="copy copy-data"
-					:data-clipboard-text="`${orderInfo.real_name} ${orderInfo.user_phone} ${orderInfo.user_address}`">{{$t(`复制`)}}</span>
-				<!-- #endif -->
-				<!-- #ifdef MP -->
-				<span class="copy copy-data"
-					@click="copyNum(`${orderInfo.real_name} ${orderInfo.user_phone} ${orderInfo.user_address}`)">{{$t(`复制`)}}</span>
-				<!-- #endif -->
-			</view>
-			<view>{{ orderInfo.user_address }}</view>
-		</view>
-		<view class="line">
-			<image src="/static/images/line.jpg" />
-		</view>
-		<view class="pos-order-goods">
-			<navigator :url="`/pages/goods_details/index?id=${item.productInfo.id}`" hover-class="none"
-				class="goods acea-row row-between-wrapper" v-for="(item, index) in orderInfo.cartInfo" :key="index">
-				<view class="picTxt acea-row row-between-wrapper">
-					<view class="pictrue">
-						<image :src="item.productInfo.image" />
-					</view>
-					<view class="text acea-row row-between row-column">
-						<view class="info line2">
-							{{ item.productInfo.store_name }}
-						</view>
-						<view class="attr">{{ item.productInfo.attrInfo.suk }}</view>
-					</view>
-				</view>
-				<view class="money">
-					<view class="x-money">{{$t(`￥`)}}{{ item.productInfo.price }}</view>
-					<view class="num">x{{ item.cart_num }}</view>
-					<view class="y-money">{{$t(`￥`)}}{{ item.productInfo.ot_price }}</view>
-				</view>
-			</navigator>
-		</view>
-		<view class="public-total">
-			{{$t(`共`)}}{{ orderInfo.total_num }}{{$t(`件商品，应支付`)}}
-			<span class="money">{{$t(`￥`)}}{{ orderInfo.pay_price }}</span> ( {{$t(`邮费`)}} {{$t(`￥`)}}{{
-        orderInfo.pay_postage
-      }}
-			)
-		</view>
-		<view class="wrapper">
-			<view class="item acea-row row-between">
-				<view>{{$t(`订单编号`)}}：</view>
-				<view class="conter acea-row row-middle row-right">
-					{{ orderInfo.order_id
-          }}
-					<!-- #ifdef H5 -->
-					<span class="copy copy-data" :data-clipboard-text="orderInfo.order_id">{{$t(`复制`)}}</span>
-					<!-- #endif -->
-					<!-- #ifdef MP -->
-					<span class="copy copy-data" @click="copyNum(orderInfo.order_id)">{{$t(`复制`)}}</span>
-					<!-- #endif -->
-				</view>
-			</view>
-			<view class="item acea-row row-between">
-				<view>{{$t(`下单时间`)}}：</view>
-				<view class="conter">{{ orderInfo._add_time }}</view>
-			</view>
-			<view class="item acea-row row-between">
-				<view>{{$t(`支付状态`)}}：</view>
-				<view class="conter">
-					{{ orderInfo.paid == 1 ? $t(`已支付`) : $t(`未支付`) }}
-				</view>
-			</view>
-			<view class="item acea-row row-between">
-				<view>{{$t(`支付方式`)}}：</view>
-				<view class="conter">{{ payType }}</view>
-			</view>
-			<view class="item acea-row row-between">
-				<view>{{$t(`买家留言`)}}：</view>
-				<view class="conter">{{ orderInfo.mark }}</view>
-			</view>
-		</view>
-		<view class='wrapper' v-if="customForm && customForm.length">
-			<view class='item acea-row row-between' v-for="(item,index) in customForm" :key="index">
-				<view class='upload' v-if="item.label == 'img'">
-					<view>{{item.title}}：</view>
-					<view class='pictrue' v-for="(img,index) in item.value" :key="index">
-						<image :src='img'></image>
-					</view>
-				</view>
-				<view v-if="item.label !== 'img'">{{item.title}}：</view>
-				<view v-if="item.label !== 'img'" class='conter'>{{item.value}}</view>
-			</view>
-		</view>
-		<view class="wrapper">
-			<view class="item acea-row row-between">
-				<view>{{$t(`支付金额`)}}：</view>
-				<view class="conter">{{$t(`￥`)}}{{ orderInfo.total_price }}</view>
-			</view>
-			<view class="item acea-row row-between">
-				<view>{{$t(`优惠券抵扣`)}}：</view>
-				<view class="conter">-{{$t(`￥`)}}{{ orderInfo.coupon_price }}</view>
-			</view>
-			<view class="item acea-row row-between">
-				<view>{{$t(`运费`)}}：</view>
-				<view class="conter">{{$t(`￥`)}}{{ orderInfo.pay_postage }}</view>
-			</view>
-			<view class="actualPay acea-row row-right">
-				{{$t(`实付款`)}}：<span class="money">{{$t(`￥`)}}{{ orderInfo.pay_price }}</span>
-			</view>
-		</view>
-
-		<view class="wrapper" v-if="
-        orderInfo.delivery_type != 'fictitious' && orderInfo._status._type === 2
-      ">
-			<view class="item acea-row row-between">
-				<view>{{$t(`配送方式`)}}：</view>
-				<view class="conter" v-if="orderInfo.delivery_type === 'express'">
-{{$t(`快递`)}}
-				</view>
-				<view class="conter" v-if="orderInfo.delivery_type === 'send'">{{$t(`送货`)}}</view>
-			</view>
-			<view class="item acea-row row-between">
-				<view v-if="orderInfo.delivery_type === 'express'">{{$t(`快递公司`)}}：</view>
-				<view v-if="orderInfo.delivery_type === 'send'">{{$t(`送货人`)}}：</view>
-				<view class="conter">{{ orderInfo.delivery_name }}</view>
-			</view>
-			<view class="item acea-row row-between">
-				<view v-if="orderInfo.delivery_type === 'express'">{{$t(`快递单号`)}}：</view>
-				<view v-if="orderInfo.delivery_type === 'send'">{{$t(`送货人电话`)}}：</view>
-				<view class="conter">
-					{{ orderInfo.delivery_id}}
-					<!-- #ifdef H5 -->
-					<span class="copy copy-data" :data-clipboard-text="orderInfo.delivery_id">{{$t(`复制`)}}</span>
-					<!-- #endif -->
-					<!-- #ifdef MP -->
-					<span class="copy copy-data" @click="copyNum(orderInfo.delivery_id)">{{$t(`复制`)}}</span>
-					<!-- #endif -->
-				</view>
-			</view>
-		</view>
-		<view style="height:120upx;"></view>
-		<view class="footer acea-row row-right row-middle" v-if="goname != 'looks'">
-			<view class="more"></view>
-			<view class="bnt cancel" @click="modify('0')" v-if="types == 0">
-				{{$t(`一键改价`)}}
-			</view>
-			<view class="bnt cancel" @click="modify('0')" v-if="types == -1">
-				{{$t(`立即退款`)}}
-			</view>
-			<view class="bnt cancel" @click="modify('1')">{{$t(`订单备注`)}}</view>
-			<view class="bnt cancel" v-if="orderInfo.pay_type === 'offline' && orderInfo.paid === 0"
-				@click="offlinePay">
-				{{$t(`确认付款`)}}
-			</view>
-			<navigator class="bnt delivery"
-				v-if="types == 1 && orderInfo.shipping_type === 1 && (orderInfo.pinkStatus === null || orderInfo.pinkStatus === 2)"
-				:url="'/pages/admin/delivery/index?id='+orderInfo.order_id">{{$t(`去发货`)}}</navigator>
-		</view>
-		<PriceChange :change="change" :orderInfo="orderInfo" v-on:closechange="changeclose($event)"
-			v-on:savePrice="savePrice" :status="status"></PriceChange>
-	</view>
-</template>
-<script>
-	import PriceChange from "../components/PriceChange/index.vue";
-	// #ifdef H5
-	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
-	// #endif
-	import {
-		getAdminOrderDetail,
-		getAdminRefundOrderDetail,
-		setAdminOrderPrice,
-		setAdminOrderRemark,
-		setAdminRefundRemark,
-		setOfflinePay,
-		setOrderRefund,
-	} from "@/api/admin";
-	// import { required, num } from "@utils/validate";
-	// import { validatorDefaultCatch } from "@utils/dialog";
-	import {
-		isMoney
-	} from '@/utils/validate.js'
-
-	export default {
-		name: "AdminOrder",
-		components: {
-			PriceChange
-		},
-		props: {},
-		data: function() {
-			return {
-				order: false,
-				change: false,
-				order_id: "",
-				orderInfo: {
-					_status: {}
-				},
-				status: "",
-				title: "",
-				payType: "",
-				types: "",
-				order_type: "",
-				clickNum: 1,
-				goname: '',
-				customForm: []
-			};
-		},
-		watch: {
-			"$route.params.oid": function(newVal) {
-				let that = this;
-				if (newVal != undefined) {
-					that.order_id = newVal;
-					that.getIndex();
-				}
-			}
-		},
-		onShow() {
-			console.log('111')
-			this.getIndex();
-		},
-		onLoad(option) {
-			let self = this
-			this.order_id = option.id;
-			this.goname = option.goname
-			this.order_type = option.types
-			// #ifdef H5
-			this.$nextTick(function() {
-				var clipboard = new ClipboardJS('.copy-data');
-				// var copybtn = document.getElementsByClassName("copy-data");
-				// var clipboard = new Clipboard(copybtn);
-				clipboard.on('success', function(e) {
-					self.$util.Tips({
-						title: self.$t(`复制成功`)
-					})
-				});
-				clipboard.on('error', function(e) {
-					self.$util.Tips({
-						title: self.$t(`复制失败`)
-					})
-				});
-			});
-			// #endif
-
-		},
-		methods: {
-			more: function() {
-				this.order = !this.order;
-			},
-			modify(status) {
-				this.change = true;
-				this.status = status;
-			},
-			changeclose: function(msg) {
-				this.change = msg;
-			},
-			getIndex: function() {
-				let that = this;
-				let fn = this.order_type == -3 ? getAdminRefundOrderDetail : getAdminOrderDetail
-				fn(that.order_id).then(
-					res => {
-						that.orderInfo = res.data;
-						//处理自定义留言非必填项的数据展示
-
-						that.types = res.data._status._type;
-						that.title = res.data._status._title;
-						that.payType = res.data._status._payType;
-						if (that.orderInfo.custom_form && that.orderInfo.custom_form.length) {
-							let arr = []
-							that.orderInfo.custom_form.map(i => {
-								if (i.value != '') {
-									arr.push(i)
-								}
-							})
-							that.$set(that, 'customForm', arr);
-						}
-					},
-					err => {
-						// that.$util.Tips({
-						// 	title: err
-						// }, {
-						// 	tab: 3,
-						// 	url: 1
-						// });
-					}
-				);
-			},
-			async savePrice(opt) {
-				let that = this,
-					data = {},
-					price = opt.price,
-					refund_price = opt.refund_price,
-					refund_status = that.orderInfo.refund_status,
-					remark = opt.remark;
-				data.order_id = that.orderInfo.order_id;
-				if (that.status == 0 && refund_status === 0) {
-					if (!isMoney(price)) {
-						return that.$util.Tips({
-							title: that.$t(`请输入正确的金额`)
-						});
-					}
-					data.price = price;
-					setAdminOrderPrice(data).then(
-						function() {
-							that.change = false;
-							that.$util.Tips({
-								title: that.$t(`改价成功`),
-								icon: 'success'
-							})
-							that.getIndex();
-						},
-						function() {
-							that.change = false;
-							that.$util.Tips({
-								title: that.$t(`改价失败`),
-								icon: 'none'
-							})
-						}
-					);
-				} else if (that.status == 0 && refund_status === 1) {
-					if (!isMoney(refund_price)) {
-						return that.$util.Tips({
-							title: that.$t(`请输入正确的金额`)
-						});
-					}
-					data.price = refund_price;
-					data.type = opt.type;
-					setOrderRefund(data).then(
-						res => {
-							that.change = false;
-							that.$util.Tips({
-								title: res.msg
-							});
-							that.getIndex();
-						},
-						err => {
-							that.change = false;
-							that.$util.Tips({
-								title: err
-							});
-						}
-					);
-				} else {
-					if (!remark) {
-						return that.$util.Tips({
-							title: that.$t(`请输入备注`)
-						})
-					}
-					data.remark = remark;
-					let obj
-					if (that.order_type == -3) {
-						obj = setAdminRefundRemark(data);
-					} else {
-						obj = setAdminOrderRemark(data);
-					}
-					obj.then(
-						res => {
-							that.change = false;
-							that.$util.Tips({
-								title: res.msg,
-								icon: 'success'
-							})
-							that.getIndex();
-						},
-						err => {
-							that.change = false;
-							that.$util.Tips({
-								title: err
-							});
-						}
-					);
-				}
-			},
-			offlinePay: function() {
-				setOfflinePay({
-					order_id: this.orderInfo.order_id
-				}).then(
-					res => {
-						this.$util.Tips({
-							title: res.msg,
-							icon: 'success'
-						});
-						this.getIndex();
-					},
-					err => {
-						this.$util.Tips({
-							title: err
-						});
-					}
-				);
-			},
-			// #ifdef MP
-			copyNum(id) {
-
-				uni.setClipboardData({
-					data: id,
-					success: function() {}
-				});
-			},
-			// #endif
-			// #ifdef H5
-			webCopy(item, index) {
-				let items = item
-				let indexs = index
-				let self = this
-
-				if (self.clickNum == 1) {
-					self.clickNum += 1
-					self.webCopy(items, indexs)
-				}
-			}
-			// #endif
-		}
-	};
-</script>
-
-<style>
-	/*商户管理订单详情*/
-	.pos-order-details .header {
-		background: linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
-		background: -webkit-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
-		background: -moz-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
-	}
-
-	.pos-order-details .header .state {
-		font-size: 36upx;
-		color: #fff;
-	}
-
-	.pos-order-details .header .data {
-		margin-left: 35upx;
-		font-size: 28upx;
-	}
-
-	.pos-order-details .header .data .order-num {
-		font-size: 30upx;
-		margin-bottom: 8upx;
-	}
-
-	.pos-order-details .remarks {
-		width: 100%;
-		height: 86upx;
-		background-color: #fff;
-		padding: 0 30upx;
-	}
-
-	.pos-order-details .remarks .iconfont {
-		font-size: 40upx;
-		color: #2a7efb;
-	}
-
-	.pos-order-details .remarks input {
-		width: 630upx;
-		height: 100%;
-		font-size: 30upx;
-	}
-
-	.pos-order-details .remarks input::placeholder {
-		color: #666;
-	}
-
-	.pos-order-details .orderingUser {
-		font-size: 26upx;
-		color: #282828;
-		padding: 0 30upx;
-		height: 67upx;
-		background-color: #fff;
-		margin-top: 16upx;
-		border-bottom: 1px solid #f5f5f5;
-	}
-
-	.pos-order-details .orderingUser .iconfont {
-		font-size: 40upx;
-		color: #2a7efb;
-		margin-right: 15upx;
-	}
-
-	.pos-order-details .address {
-		margin-top: 0;
-	}
-
-	.pos-order-details .pos-order-goods {
-		margin-top: 17upx;
-	}
-
-	.pos-order-details .footer .more {
-		font-size: 27upx;
-		color: #aaa;
-		width: 100upx;
-		height: 64upx;
-		text-align: center;
-		line-height: 64upx;
-		margin-right: 25upx;
-		position: relative;
-	}
-
-	.pos-order-details .footer .delivery {
-		background: linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
-		background: -webkit-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
-		background: -moz-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
-	}
-
-	.pos-order-details .footer .more .order .arrow {
-		width: 0;
-		height: 0;
-		border-left: 11upx solid transparent;
-		border-right: 11upx solid transparent;
-		border-top: 20upx solid #e5e5e5;
-		position: absolute;
-		left: 15upx;
-		bottom: -18upx;
-	}
-
-	.pos-order-details .footer .more .order .arrow:before {
-		content: '';
-		width: 0;
-		height: 0;
-		border-left: 9upx solid transparent;
-		border-right: 9upx solid transparent;
-		border-top: 19upx solid #fff;
-		position: absolute;
-		left: -10upx;
-		bottom: 0;
-	}
-
-	.pos-order-details .footer .more .order {
-		width: 200upx;
-		background-color: #fff;
-		border: 1px solid #eee;
-		border-radius: 10upx;
-		position: absolute;
-		top: -200upx;
-		z-index: 9;
-	}
-
-	.pos-order-details .footer .more .order .item {
-		height: 77upx;
-		line-height: 77upx;
-	}
-
-	.pos-order-details .footer .more .order .item~.item {
-		border-top: 1px solid #f5f5f5;
-	}
-
-	.pos-order-details .footer .more .moreName {
-		width: 100%;
-		height: 100%;
-	}
-
-	/*订单详情*/
-	.order-details .header {
-		padding: 0 30upx;
-		height: 150upx;
-	}
-
-	.order-details .header.on {
-		background-color: #666 !important;
-	}
-
-	.order-details .header .pictrue {
-		width: 110upx;
-		height: 110upx;
-	}
-
-	.order-details .header .pictrue image {
-		width: 100%;
-		height: 100%;
-	}
-
-	.order-details .header .data {
-		color: rgba(255, 255, 255, 0.8);
-		font-size: 24upx;
-		margin-left: 27upx;
-	}
-
-	.order-details .header.on .data {
-		margin-left: 0;
-	}
-
-	.order-details .header .data .state {
-		font-size: 30upx;
-		font-weight: bold;
-		color: #fff;
-		margin-bottom: 7upx;
-	}
-
-	/* .order-details .header .data .time{margin-left:20upx;} */
-	.order-details .nav {
-		background-color: #fff;
-		font-size: 26upx;
-		color: #282828;
-		padding: 25upx 0;
-	}
-
-	.order-details .nav .navCon {
-		padding: 0 40upx;
-	}
-
-	.order-details .nav .navCon .on {
-		font-weight: bold;
-		color: #e93323;
-	}
-
-	.order-details .nav .progress {
-		padding: 0 65upx;
-		margin-top: 10upx;
-	}
-
-	.order-details .nav .progress .line {
-		width: 100upx;
-		height: 2upx;
-		background-color: #939390;
-	}
-
-	.order-details .nav .progress .iconfont {
-		font-size: 25upx;
-		color: #939390;
-		margin-top: -2upx;
-		width: 30upx;
-		height: 30upx;
-		line-height: 33upx;
-		text-align: center;
-		margin-right: 0 !important;
-	}
-
-	.order-details .address {
-		font-size: 26upx;
-		color: #868686;
-		background-color: #fff;
-		padding: 25upx 30upx 30upx 30upx;
-	}
-
-	.order-details .address .name {
-		font-size: 30upx;
-		color: #282828;
-		margin-bottom: 0.1rem;
-	}
-
-	.order-details .address .name .phone {
-		margin-left: 40upx;
-	}
-
-	.order-details .line {
-		width: 100%;
-		height: 3upx;
-	}
-
-	.order-details .line image {
-		width: 100%;
-		height: 100%;
-		display: block;
-	}
-
-	.order-details .wrapper {
-		background-color: #fff;
-		margin-top: 12upx;
-		padding: 30upx;
-	}
-
-	.order-details .wrapper .item {
-		font-size: 28upx;
-		color: #282828;
-	}
-
-	.order-details .wrapper .item~.item {
-		margin-top: 20upx;
-	}
-
-	.order-details .wrapper .item .conter {
-		color: #868686;
-		width: 500upx;
-		text-align: right;
-	}
-
-	.order-details .wrapper .item .conter .copy {
-		font-size: 20rpx;
-		color: #333;
-		border-radius: 3rpx;
-		border: 1px solid #666;
-		padding: 0rpx 15rpx;
-		margin-left: 24rpx;
-		height: 40rpx;
-	}
-
-	.order-details .wrapper .actualPay {
-		border-top: 1upx solid #eee;
-		margin-top: 30upx;
-		padding-top: 30upx;
-	}
-
-	.order-details .wrapper .actualPay .money {
-		font-weight: bold;
-		font-size: 30upx;
-		color: #e93323;
-	}
-
-	.order-details .footer {
-		width: 100%;
-		height: 100upx;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		background-color: #fff;
-		padding: 0 30upx;
-		border-top: 1px solid #eee;
-	}
-
-	.order-details .footer .bnt {
-		width: auto;
-		height: 60upx;
-		line-height: 60upx;
-		text-align: center;
-		line-height: upx;
-		border-radius: 50upx;
-		color: #fff;
-		font-size: 27upx;
-		padding: 0 3%;
-	}
-
-	.order-details .footer .bnt.cancel {
-		color: #aaa;
-		border: 1px solid #ddd;
-	}
-
-	.order-details .footer .bnt.default {
-		color: #444;
-		border: 1px solid #444;
-	}
-
-	.order-details .footer .bnt~.bnt {
-		margin-left: 18upx;
-	}
-
-	.pos-order-goods {
-		padding: 0 30upx;
-		background-color: #fff;
-	}
-
-	.pos-order-goods .goods {
-		height: 185upx;
-	}
-
-	.pos-order-goods .goods~.goods {
-		border-top: 1px dashed #e5e5e5;
-	}
-
-	.pos-order-goods .goods .picTxt {
-		width: 515upx;
-	}
-
-	.pos-order-goods .goods .picTxt .pictrue {
-		width: 130upx;
-		height: 130upx;
-	}
-
-	.pos-order-goods .goods .picTxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6upx;
-	}
-
-	.pos-order-goods .goods .picTxt .text {
-		width: 365upx;
-		display: flex;
-		justify-content: space-between;
-		flex-direction: column;
-		height: 130upx;
-	}
-
-	.pos-order-goods .goods .picTxt .text .info {
-		font-size: 28upx;
-		color: #282828;
-	}
-
-	.pos-order-goods .goods .picTxt .text .attr {
-		font-size: 24upx;
-		color: #999;
-		width: 100%;
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-	}
-
-	.pos-order-goods .goods .money {
-		width: 164upx;
-		text-align: right;
-		font-size: 28upx;
-	}
-
-	.pos-order-goods .goods .money .x-money {
-		color: #282828;
-	}
-
-	.pos-order-goods .goods .money .num {
-		color: #ff9600;
-		margin: 5upx 0;
-	}
-
-	.pos-order-goods .goods .money .y-money {
-		color: #999;
-		text-decoration: line-through;
-	}
-
-	.public-total {
-		font-size: 28upx;
-		color: #282828;
-		border-top: 1px solid #eee;
-		height: 92upx;
-		line-height: 92upx;
-		text-align: right;
-		padding: 0 30upx;
-		background-color: #fff;
-	}
-
-	.public-total .money {
-		color: #ff4c3c;
-	}
-
-	.copy-data {
-		font-size: 10px;
-		color: #333;
-		-webkit-border-radius: 1px;
-		border-radius: 1px;
-		border: 1px solid #666;
-		padding: 0px 7px;
-		margin-left: 12px;
-		height: 20px;
-	}
-
-	.upload .pictrue {
-		display: inline-block;
-		margin: 22rpx 17rpx 20rpx 0;
-		width: 156rpx;
-		height: 156rpx;
-		color: #bbb;
-	}
-
-	.upload .pictrue image {
-		width: 100%;
-		height: 100%;
-	}
+<template>
+	<view class="order-details pos-order-details">
+		<view class="header acea-row row-middle">
+			<view class="state">{{ title }}</view>
+			<view class="data">
+				<view class="order-num">{{$t(`订单`)}}：{{ orderInfo.order_id }}</view>
+				<view>
+					<span class="time">{{ orderInfo._add_time }}</span>
+				</view>
+			</view>
+		</view>
+		<view class="remarks acea-row row-between-wrapper" v-if="goname != 'looks'">
+			<span class="iconfont icon-zhinengkefu-"></span>
+			<input class="line1" style="text-align: left;" :value="
+          orderInfo.remark ? orderInfo.remark : $t(`订单未备注，点击添加备注信息`)
+        " disabled @click="modify('1')" />
+		</view>
+		<view class="orderingUser acea-row row-middle">
+			<span class="iconfont icon-yonghu2"></span>{{ orderInfo.nickname }}
+		</view>
+		<view class="address">
+			<view class="name">
+				{{ orderInfo.real_name
+        }}<span class="phone">{{ orderInfo.user_phone }}</span>
+				<!-- #ifdef H5 -->
+				<span class="copy copy-data"
+					:data-clipboard-text="`${orderInfo.real_name} ${orderInfo.user_phone} ${orderInfo.user_address}`">{{$t(`复制`)}}</span>
+				<!-- #endif -->
+				<!-- #ifdef MP -->
+				<span class="copy copy-data"
+					@click="copyNum(`${orderInfo.real_name} ${orderInfo.user_phone} ${orderInfo.user_address}`)">{{$t(`复制`)}}</span>
+				<!-- #endif -->
+			</view>
+			<view>{{ orderInfo.user_address }}</view>
+		</view>
+		<view class="line">
+			<image src="/static/images/line.jpg" />
+		</view>
+		<view class="pos-order-goods">
+			<navigator :url="`/pages/goods_details/index?id=${item.productInfo.id}`" hover-class="none"
+				class="goods acea-row row-between-wrapper" v-for="(item, index) in orderInfo.cartInfo" :key="index">
+				<view class="picTxt acea-row row-between-wrapper">
+					<view class="pictrue">
+						<image :src="item.productInfo.image" />
+					</view>
+					<view class="text acea-row row-between row-column">
+						<view class="info line2">
+							{{ item.productInfo.store_name }}
+						</view>
+						<view class="attr">{{ item.productInfo.attrInfo.suk }}</view>
+					</view>
+				</view>
+				<view class="money">
+					<view class="x-money">{{$t(`￥`)}}{{ item.productInfo.price }}</view>
+					<view class="num">x{{ item.cart_num }}</view>
+					<view class="y-money">{{$t(`￥`)}}{{ item.productInfo.ot_price }}</view>
+				</view>
+			</navigator>
+		</view>
+		<view class="public-total">
+			{{$t(`共`)}}{{ orderInfo.total_num }}{{$t(`件商品，应支付`)}}
+			<span class="money">{{$t(`￥`)}}{{ orderInfo.pay_price }}</span> ( {{$t(`邮费`)}} {{$t(`￥`)}}{{
+        orderInfo.pay_postage
+      }}
+			)
+		</view>
+		<view class="wrapper">
+			<view class="item acea-row row-between">
+				<view>{{$t(`订单编号`)}}：</view>
+				<view class="conter acea-row row-middle row-right">
+					{{ orderInfo.order_id
+          }}
+					<!-- #ifdef H5 -->
+					<span class="copy copy-data" :data-clipboard-text="orderInfo.order_id">{{$t(`复制`)}}</span>
+					<!-- #endif -->
+					<!-- #ifdef MP -->
+					<span class="copy copy-data" @click="copyNum(orderInfo.order_id)">{{$t(`复制`)}}</span>
+					<!-- #endif -->
+				</view>
+			</view>
+			<view class="item acea-row row-between">
+				<view>{{$t(`下单时间`)}}：</view>
+				<view class="conter">{{ orderInfo._add_time }}</view>
+			</view>
+			<view class="item acea-row row-between">
+				<view>{{$t(`支付状态`)}}：</view>
+				<view class="conter">
+					{{ orderInfo.paid == 1 ? $t(`已支付`) : $t(`未支付`) }}
+				</view>
+			</view>
+			<view class="item acea-row row-between">
+				<view>{{$t(`支付方式`)}}：</view>
+				<view class="conter">{{ payType }}</view>
+			</view>
+			<view class="item acea-row row-between">
+				<view>{{$t(`买家留言`)}}：</view>
+				<view class="conter">{{ orderInfo.mark }}</view>
+			</view>
+		</view>
+		<view class='wrapper' v-if="customForm && customForm.length">
+			<view class='item acea-row row-between' v-for="(item,index) in customForm" :key="index">
+				<view class='upload' v-if="item.label == 'img'">
+					<view>{{item.title}}：</view>
+					<view class='pictrue' v-for="(img,index) in item.value" :key="index">
+						<image :src='img'></image>
+					</view>
+				</view>
+				<view v-if="item.label !== 'img'">{{item.title}}：</view>
+				<view v-if="item.label !== 'img'" class='conter'>{{item.value}}</view>
+			</view>
+		</view>
+		<view class="wrapper">
+			<view class="item acea-row row-between">
+				<view>{{$t(`支付金额`)}}：</view>
+				<view class="conter">{{$t(`￥`)}}{{ orderInfo.total_price }}</view>
+			</view>
+			<view class="item acea-row row-between">
+				<view>{{$t(`优惠券抵扣`)}}：</view>
+				<view class="conter">-{{$t(`￥`)}}{{ orderInfo.coupon_price }}</view>
+			</view>
+			<view class="item acea-row row-between">
+				<view>{{$t(`运费`)}}：</view>
+				<view class="conter">{{$t(`￥`)}}{{ orderInfo.pay_postage }}</view>
+			</view>
+			<view class="actualPay acea-row row-right">
+				{{$t(`实付款`)}}：<span class="money">{{$t(`￥`)}}{{ orderInfo.pay_price }}</span>
+			</view>
+		</view>
+
+		<view class="wrapper" v-if="
+        orderInfo.delivery_type != 'fictitious' && orderInfo._status._type === 2
+      ">
+			<view class="item acea-row row-between">
+				<view>{{$t(`配送方式`)}}：</view>
+				<view class="conter" v-if="orderInfo.delivery_type === 'express'">
+					{{$t(`快递`)}}
+				</view>
+				<view class="conter" v-if="orderInfo.delivery_type === 'send'">{{$t(`送货`)}}</view>
+			</view>
+			<view class="item acea-row row-between">
+				<view v-if="orderInfo.delivery_type === 'express'">{{$t(`快递公司`)}}：</view>
+				<view v-if="orderInfo.delivery_type === 'send'">{{$t(`送货人`)}}：</view>
+				<view class="conter">{{ orderInfo.delivery_name }}</view>
+			</view>
+			<view class="item acea-row row-between">
+				<view v-if="orderInfo.delivery_type === 'express'">{{$t(`快递单号`)}}：</view>
+				<view v-if="orderInfo.delivery_type === 'send'">{{$t(`送货人电话`)}}：</view>
+				<view class="conter">
+					{{ orderInfo.delivery_id}}
+					<!-- #ifdef H5 -->
+					<span class="copy copy-data" :data-clipboard-text="orderInfo.delivery_id">{{$t(`复制`)}}</span>
+					<!-- #endif -->
+					<!-- #ifdef MP -->
+					<span class="copy copy-data" @click="copyNum(orderInfo.delivery_id)">{{$t(`复制`)}}</span>
+					<!-- #endif -->
+				</view>
+			</view>
+		</view>
+		<view style="height:120upx;"></view>
+		<view class="footer acea-row row-right row-middle" v-if="goname != 'looks'">
+			<view class="more"></view>
+			<view class="bnt cancel" @click="modify('0')" v-if="types == 0">
+				{{$t(`一键改价`)}}
+			</view>
+			<view class="bnt cancel" @click="modify('2')" v-if="types == -1 && orderInfo.refund_type == 1">
+				{{$t(`立即退款`)}}
+			</view>
+			<view class="bnt cancel" @click="agreeExpress(orderInfo.id)"
+				v-if="types == -1 && orderInfo.refund_type == 2">
+				{{$t(`同意退货`)}}
+			</view>
+			<view class="wait" v-if="types == -1 && orderInfo.refund_type == 4">{{$t(`待用户发货`)}}</view>
+			<view class="bnt cancel" @click="modify('1')">{{$t(`订单备注`)}}</view>
+			<view class="bnt cancel" v-if="orderInfo.pay_type === 'offline' && orderInfo.paid === 0"
+				@click="offlinePay">
+				{{$t(`确认付款`)}}
+			</view>
+			<navigator class="bnt delivery"
+				v-if="types == 1 && orderInfo.shipping_type === 1 && (orderInfo.pinkStatus === null || orderInfo.pinkStatus === 2)"
+				:url="'/pages/admin/delivery/index?id='+orderInfo.order_id">{{$t(`去发货`)}}</navigator>
+		</view>
+		<PriceChange :change="change" :orderInfo="orderInfo" v-on:closechange="changeclose($event)"
+			v-on:savePrice="savePrice" :status="status"></PriceChange>
+	</view>
+</template>
+<script>
+	import PriceChange from "../components/PriceChange/index.vue";
+	// #ifdef H5
+	import ClipboardJS from "@/plugin/clipboard/clipboard.js";
+	// #endif
+	import {
+		getAdminOrderDetail,
+		getAdminRefundOrderDetail,
+		setAdminOrderPrice,
+		setAdminOrderRemark,
+		setAdminRefundRemark,
+		setOfflinePay,
+		setOrderRefund,
+		agreeExpress
+	} from "@/api/admin";
+	// import { required, num } from "@utils/validate";
+	// import { validatorDefaultCatch } from "@utils/dialog";
+	import {
+		isMoney
+	} from '@/utils/validate.js'
+
+	export default {
+		name: "AdminOrder",
+		components: {
+			PriceChange
+		},
+		props: {},
+		data: function() {
+			return {
+				order: false,
+				change: false,
+				order_id: "",
+				orderInfo: {
+					_status: {}
+				},
+				status: "",
+				title: "",
+				payType: "",
+				types: "",
+				order_type: "",
+				clickNum: 1,
+				goname: '',
+				customForm: []
+			};
+		},
+		watch: {
+			"$route.params.oid": function(newVal) {
+				let that = this;
+				if (newVal != undefined) {
+					that.order_id = newVal;
+					that.getIndex();
+				}
+			}
+		},
+		onShow() {
+			console.log('111')
+			this.getIndex();
+		},
+		onLoad(option) {
+			let self = this
+			this.order_id = option.id;
+			this.goname = option.goname
+			this.order_type = option.types
+			// #ifdef H5
+			this.$nextTick(function() {
+				var clipboard = new ClipboardJS('.copy-data');
+				// var copybtn = document.getElementsByClassName("copy-data");
+				// var clipboard = new Clipboard(copybtn);
+				clipboard.on('success', function(e) {
+					self.$util.Tips({
+						title: self.$t(`复制成功`)
+					})
+				});
+				clipboard.on('error', function(e) {
+					self.$util.Tips({
+						title: self.$t(`复制失败`)
+					})
+				});
+			});
+			// #endif
+
+		},
+		methods: {
+			more: function() {
+				this.order = !this.order;
+			},
+			modify(status) {
+				this.change = true;
+				this.status = status;
+			},
+			changeclose: function(msg) {
+				this.change = msg;
+			},
+			getIndex: function() {
+				let that = this;
+				let fn = this.order_type == -3 ? getAdminRefundOrderDetail : getAdminOrderDetail
+				fn(that.order_id).then(
+					res => {
+						that.orderInfo = res.data;
+						//处理自定义留言非必填项的数据展示
+
+						that.types = res.data._status._type;
+						that.title = res.data._status._title;
+						that.payType = res.data._status._payType;
+						if (that.orderInfo.custom_form && that.orderInfo.custom_form.length) {
+							let arr = []
+							that.orderInfo.custom_form.map(i => {
+								if (i.value != '') {
+									arr.push(i)
+								}
+							})
+							that.$set(that, 'customForm', arr);
+						}
+					},
+					err => {
+						// that.$util.Tips({
+						// 	title: err
+						// }, {
+						// 	tab: 3,
+						// 	url: 1
+						// });
+					}
+				);
+			},
+			agreeExpress(id) {
+				console.log(3333)
+				let that = this;
+				agreeExpress({
+					id
+				}).then(res => {
+					that.$util.Tips({
+						title: res.msg
+					});
+					that.init();
+				}).catch(err => {
+					that.$util.Tips({
+						title: err
+					});
+				})
+			},
+			async savePrice(opt) {
+				let that = this,
+					data = {},
+					price = opt.price,
+					refund_price = opt.refund_price,
+					refund_status = that.orderInfo.refund_status,
+					remark = opt.remark;
+				data.order_id = that.orderInfo.order_id;
+				if (that.status == 0) {
+					if (!isMoney(price)) {
+						return that.$util.Tips({
+							title: that.$t(`请输入正确的金额`)
+						});
+					}
+					data.price = price;
+					setAdminOrderPrice(data).then(
+						res => {
+							that.change = false;
+							that.$util.Tips({
+								title: that.$t(`改价成功`),
+								icon: 'success'
+							}, '/pages/admin/orderDetail/index?id=' + res.data.order_id + '&types=0')
+						},
+						err => {
+							that.change = false;
+							that.$util.Tips({
+								title: that.$t(`改价失败`),
+								icon: 'none'
+							})
+						}
+					);
+				} else if (that.status == 2) {
+					if (!isMoney(refund_price)) {
+						return that.$util.Tips({
+							title: that.$t(`请输入正确的金额`)
+						});
+					}
+					data.price = refund_price;
+					data.type = opt.type;
+					setOrderRefund(data).then(
+						res => {
+							that.change = false;
+							that.$util.Tips({
+								title: res.msg
+							});
+							that.getIndex();
+						},
+						err => {
+							that.change = false;
+							that.$util.Tips({
+								title: err
+							});
+						}
+					);
+				} else {
+					if (!remark) {
+						return that.$util.Tips({
+							title: that.$t(`请输入备注`)
+						})
+					}
+					data.remark = remark;
+					let obj
+					if (that.order_type == -3) {
+						obj = setAdminRefundRemark(data);
+					} else {
+						obj = setAdminOrderRemark(data);
+					}
+					obj.then(
+						res => {
+							that.change = false;
+							that.$util.Tips({
+								title: res.msg,
+								icon: 'success'
+							})
+							that.getIndex();
+						},
+						err => {
+							that.change = false;
+							that.$util.Tips({
+								title: err
+							});
+						}
+					);
+				}
+			},
+			offlinePay: function() {
+				setOfflinePay({
+					order_id: this.orderInfo.order_id
+				}).then(
+					res => {
+						this.$util.Tips({
+							title: res.msg,
+							icon: 'success'
+						});
+						this.getIndex();
+					},
+					err => {
+						this.$util.Tips({
+							title: err
+						});
+					}
+				);
+			},
+			// #ifdef MP
+			copyNum(id) {
+
+				uni.setClipboardData({
+					data: id,
+					success: function() {}
+				});
+			},
+			// #endif
+			// #ifdef H5
+			webCopy(item, index) {
+				let items = item
+				let indexs = index
+				let self = this
+
+				if (self.clickNum == 1) {
+					self.clickNum += 1
+					self.webCopy(items, indexs)
+				}
+			}
+			// #endif
+		}
+	};
+</script>
+
+<style>
+	/*商户管理订单详情*/
+	.pos-order-details .header {
+		background: linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
+		background: -webkit-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
+		background: -moz-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
+	}
+
+	.pos-order-details .header .state {
+		font-size: 36upx;
+		color: #fff;
+	}
+
+	.pos-order-details .header .data {
+		margin-left: 35upx;
+		font-size: 28upx;
+	}
+
+	.pos-order-details .header .data .order-num {
+		font-size: 30upx;
+		margin-bottom: 8upx;
+	}
+
+	.pos-order-details .remarks {
+		width: 100%;
+		height: 86upx;
+		background-color: #fff;
+		padding: 0 30upx;
+	}
+
+	.pos-order-details .remarks .iconfont {
+		font-size: 40upx;
+		color: #2a7efb;
+	}
+
+	.pos-order-details .remarks input {
+		width: 630upx;
+		height: 100%;
+		font-size: 30upx;
+	}
+
+	.pos-order-details .remarks input::placeholder {
+		color: #666;
+	}
+
+	.pos-order-details .orderingUser {
+		font-size: 26upx;
+		color: #282828;
+		padding: 0 30upx;
+		height: 67upx;
+		background-color: #fff;
+		margin-top: 16upx;
+		border-bottom: 1px solid #f5f5f5;
+	}
+
+	.pos-order-details .orderingUser .iconfont {
+		font-size: 40upx;
+		color: #2a7efb;
+		margin-right: 15upx;
+	}
+
+	.pos-order-details .address {
+		margin-top: 0;
+	}
+
+	.pos-order-details .pos-order-goods {
+		margin-top: 17upx;
+	}
+
+	.pos-order-details .footer .more {
+		font-size: 27upx;
+		color: #aaa;
+		width: 100upx;
+		height: 64upx;
+		text-align: center;
+		line-height: 64upx;
+		margin-right: 25upx;
+		position: relative;
+	}
+
+	.pos-order-details .footer .delivery {
+		background: linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
+		background: -webkit-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
+		background: -moz-linear-gradient(to right, #2291f8 0%, #1cd1dc 100%);
+	}
+
+	.pos-order-details .footer .more .order .arrow {
+		width: 0;
+		height: 0;
+		border-left: 11upx solid transparent;
+		border-right: 11upx solid transparent;
+		border-top: 20upx solid #e5e5e5;
+		position: absolute;
+		left: 15upx;
+		bottom: -18upx;
+	}
+
+	.pos-order-details .footer .more .order .arrow:before {
+		content: '';
+		width: 0;
+		height: 0;
+		border-left: 9upx solid transparent;
+		border-right: 9upx solid transparent;
+		border-top: 19upx solid #fff;
+		position: absolute;
+		left: -10upx;
+		bottom: 0;
+	}
+
+	.pos-order-details .footer .more .order {
+		width: 200upx;
+		background-color: #fff;
+		border: 1px solid #eee;
+		border-radius: 10upx;
+		position: absolute;
+		top: -200upx;
+		z-index: 9;
+	}
+
+	.pos-order-details .footer .more .order .item {
+		height: 77upx;
+		line-height: 77upx;
+	}
+
+	.pos-order-details .footer .more .order .item~.item {
+		border-top: 1px solid #f5f5f5;
+	}
+
+	.pos-order-details .footer .more .moreName {
+		width: 100%;
+		height: 100%;
+	}
+
+	/*订单详情*/
+	.order-details .header {
+		padding: 0 30upx;
+		height: 150upx;
+	}
+
+	.order-details .header.on {
+		background-color: #666 !important;
+	}
+
+	.order-details .header .pictrue {
+		width: 110upx;
+		height: 110upx;
+	}
+
+	.order-details .header .pictrue image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.order-details .header .data {
+		color: rgba(255, 255, 255, 0.8);
+		font-size: 24upx;
+		margin-left: 27upx;
+	}
+
+	.order-details .header.on .data {
+		margin-left: 0;
+	}
+
+	.order-details .header .data .state {
+		font-size: 30upx;
+		font-weight: bold;
+		color: #fff;
+		margin-bottom: 7upx;
+	}
+
+	/* .order-details .header .data .time{margin-left:20upx;} */
+	.order-details .nav {
+		background-color: #fff;
+		font-size: 26upx;
+		color: #282828;
+		padding: 25upx 0;
+	}
+
+	.order-details .nav .navCon {
+		padding: 0 40upx;
+	}
+
+	.order-details .nav .navCon .on {
+		font-weight: bold;
+		color: #e93323;
+	}
+
+	.order-details .nav .progress {
+		padding: 0 65upx;
+		margin-top: 10upx;
+	}
+
+	.order-details .nav .progress .line {
+		width: 100upx;
+		height: 2upx;
+		background-color: #939390;
+	}
+
+	.order-details .nav .progress .iconfont {
+		font-size: 25upx;
+		color: #939390;
+		margin-top: -2upx;
+		width: 30upx;
+		height: 30upx;
+		line-height: 33upx;
+		text-align: center;
+		margin-right: 0 !important;
+	}
+
+	.order-details .address {
+		font-size: 26upx;
+		color: #868686;
+		background-color: #fff;
+		padding: 25upx 30upx 30upx 30upx;
+	}
+
+	.order-details .address .name {
+		font-size: 30upx;
+		color: #282828;
+		margin-bottom: 0.1rem;
+	}
+
+	.order-details .address .name .phone {
+		margin-left: 40upx;
+	}
+
+	.order-details .line {
+		width: 100%;
+		height: 3upx;
+	}
+
+	.order-details .line image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+
+	.order-details .wrapper {
+		background-color: #fff;
+		margin-top: 12upx;
+		padding: 30upx;
+	}
+
+	.order-details .wrapper .item {
+		font-size: 28upx;
+		color: #282828;
+	}
+
+	.order-details .wrapper .item~.item {
+		margin-top: 20upx;
+	}
+
+	.order-details .wrapper .item .conter {
+		color: #868686;
+		width: 500upx;
+		text-align: right;
+	}
+
+	.order-details .wrapper .item .conter .copy {
+		font-size: 20rpx;
+		color: #333;
+		border-radius: 3rpx;
+		border: 1px solid #666;
+		padding: 0rpx 15rpx;
+		margin-left: 24rpx;
+		height: 40rpx;
+	}
+
+	.order-details .wrapper .actualPay {
+		border-top: 1upx solid #eee;
+		margin-top: 30upx;
+		padding-top: 30upx;
+	}
+
+	.order-details .wrapper .actualPay .money {
+		font-weight: bold;
+		font-size: 30upx;
+		color: #e93323;
+	}
+
+	.order-details .footer {
+		width: 100%;
+		height: 100upx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background-color: #fff;
+		padding: 0 30upx;
+		border-top: 1px solid #eee;
+	}
+
+	.order-details .footer .bnt {
+		width: auto;
+		height: 60upx;
+		line-height: 60upx;
+		text-align: center;
+		line-height: upx;
+		border-radius: 50upx;
+		color: #fff;
+		font-size: 27upx;
+		padding: 0 3%;
+	}
+
+	.order-details .footer .bnt.cancel {
+		color: #aaa;
+		border: 1px solid #ddd;
+	}
+
+	.order-details .footer .bnt.default {
+		color: #444;
+		border: 1px solid #444;
+	}
+
+	.wait {
+		margin-right: 30rpx;
+		color: orangered;
+	}
+
+	.order-details .footer .bnt~.bnt {
+		margin-left: 18upx;
+	}
+
+	.pos-order-goods {
+		padding: 0 30upx;
+		background-color: #fff;
+	}
+
+	.pos-order-goods .goods {
+		height: 185upx;
+	}
+
+	.pos-order-goods .goods~.goods {
+		border-top: 1px dashed #e5e5e5;
+	}
+
+	.pos-order-goods .goods .picTxt {
+		width: 515upx;
+	}
+
+	.pos-order-goods .goods .picTxt .pictrue {
+		width: 130upx;
+		height: 130upx;
+	}
+
+	.pos-order-goods .goods .picTxt .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 6upx;
+	}
+
+	.pos-order-goods .goods .picTxt .text {
+		width: 365upx;
+		display: flex;
+		justify-content: space-between;
+		flex-direction: column;
+		height: 130upx;
+	}
+
+	.pos-order-goods .goods .picTxt .text .info {
+		font-size: 28upx;
+		color: #282828;
+	}
+
+	.pos-order-goods .goods .picTxt .text .attr {
+		font-size: 24upx;
+		color: #999;
+		width: 100%;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	.pos-order-goods .goods .money {
+		width: 164upx;
+		text-align: right;
+		font-size: 28upx;
+	}
+
+	.pos-order-goods .goods .money .x-money {
+		color: #282828;
+	}
+
+	.pos-order-goods .goods .money .num {
+		color: #ff9600;
+		margin: 5upx 0;
+	}
+
+	.pos-order-goods .goods .money .y-money {
+		color: #999;
+		text-decoration: line-through;
+	}
+
+	.public-total {
+		font-size: 28upx;
+		color: #282828;
+		border-top: 1px solid #eee;
+		height: 92upx;
+		line-height: 92upx;
+		text-align: right;
+		padding: 0 30upx;
+		background-color: #fff;
+	}
+
+	.public-total .money {
+		color: #ff4c3c;
+	}
+
+	.copy-data {
+		font-size: 10px;
+		color: #333;
+		-webkit-border-radius: 1px;
+		border-radius: 1px;
+		border: 1px solid #666;
+		padding: 0px 7px;
+		margin-left: 12px;
+		height: 20px;
+	}
+
+	.upload .pictrue {
+		display: inline-block;
+		margin: 22rpx 17rpx 20rpx 0;
+		width: 156rpx;
+		height: 156rpx;
+		color: #bbb;
+	}
+
+	.upload .pictrue image {
+		width: 100%;
+		height: 100%;
+	}
 </style>
diff --git a/template/uni-app/pages/admin/orderList/index.vue b/template/uni-app/pages/admin/orderList/index.vue
index cf0f7a891..75531d7f7 100644
--- a/template/uni-app/pages/admin/orderList/index.vue
+++ b/template/uni-app/pages/admin/orderList/index.vue
@@ -1,558 +1,562 @@
-<template>
-	<view class="pos-order-list" ref="container">
-		<view class="nav acea-row row-around row-middle">
-			<view class="item" :class="where.status == 0 ? 'on' : ''" @click="changeStatus(0)">
-				{{$t(`待付款`)}}
-			</view>
-			<view class="item" :class="where.status == 1 ? 'on' : ''" @click="changeStatus(1)">
-				{{$t(`待发货`)}}
-			</view>
-			<view class="item" :class="where.status == 2 ? 'on' : ''" @click="changeStatus(2)">
-				{{$t(`待收货`)}}
-			</view>
-			<view class="item" :class="where.status == 3 ? 'on' : ''" @click="changeStatus(3)">
-				{{$t(`待评价`)}}
-			</view>
-			<view class="item" :class="where.status == 4 ? 'on' : ''" @click="changeStatus(4)">
-				{{$t(`已完成`)}}
-			</view>
-			<view class="item" :class="where.status == -3 ? 'on' : ''" @click="changeStatus(-3)">
-				{{$t(`退款`)}}
-			</view>
-		</view>
-		<view class="list" v-if="list.length">
-			<view class="item" v-for="(item, index) in list" :key="index">
-				<view class="order-num acea-row row-between-wrapper" @click="toDetail(item)">
-					<view>
-						<view>{{$t(`订单号`)}}：{{ item.order_id }}</view>
-						<view class="time">{{$t(`下单时间`)}}：{{ item.add_time }}</view>
-					</view>
-					<view class="state"
-						:class="(item.refund_status==0 && where.status != 0 && item.refund.length)?'on':''">
-						{{item.refund_status==1?$t(`退款中`):item.refund_status==2?$t(`已退款`):item.refund_status==3?$t(`拒绝退款`):$t(item.status_name.status_name)}}
-						<text
-							v-if="item.refund_status==0 && where.status != 0 && item.refund.length">{{item.is_all_refund?$t(`退款中`):$t(`部分退款中`)}}</text>
-					</view>
-				</view>
-				<view class="pos-order-goods" v-for="(val, key) in item._info" :key="key">
-					<view class="goods acea-row row-between row-top" @click="toDetail(item)">
-						<view class="picTxt acea-row row-between-wrapper">
-							<view class="pictrue">
-								<image
-									:src="val.cart_info.productInfo.attrInfo?val.cart_info.productInfo.attrInfo.image:val.cart_info.productInfo.image" />
-							</view>
-							<view class="text acea-row row-between row-column">
-								<view class="info line2">
-									{{ val.cart_info.productInfo.store_name }}
-								</view>
-								<view class="attr" v-if="val.cart_info.productInfo.attrInfo">
-									{{ val.cart_info.productInfo.attrInfo.suk }}
-								</view>
-							</view>
-						</view>
-						<view class="money">
-							<view class="x-money">
-								{{$t(`￥`)}}{{ val.cart_info.productInfo.attrInfo?val.cart_info.productInfo.attrInfo.price:val.cart_info.productInfo.price }}
-							</view>
-							<view class="num">x{{ val.cart_info.cart_num }}</view>
-							<view class="info" v-if="val.cart_info.refund_num && item._status._type !=-2">
-								{{val.cart_info.refund_num}}{{$t(`件退款中`)}}
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="public-total">
-					{{$t(`共`)}}{{ item.total_num }}{{$t(`件商品，实付款`)}}
-					<span class="money">{{$t(`￥`)}}{{ item.pay_price }}</span> ( {{$t(`邮费`)}} {{$t(`￥`)}}{{
-	            item.pay_postage
-	          }}
-					)
-				</view>
-				<view class="operation acea-row row-between-wrapper">
-					<view class="acea-row row-middle">
-						<view class="bnt" @click="modify(item, 0)" v-if="where.status == 0">
-							{{$t(`一键改价`)}}
-						</view>
-						<view class="bnt" @click="modify(item, 1)">{{$t(`订单备注`)}}</view>
-						<view class="bnt" @click="modify(item, 0, 1)"
-							v-if="(item.refund_type == 0 || item.refund_type == 1 || item.refund_type == 5 ) && where.status == -3 && parseFloat(item.pay_price) > 0">
-							{{$t(`立即退款`)}}
-						</view>
-						<view class="bnt" @click="modify(item, 2, 0)"
-							v-if="where.status == -3 && item.refund_type == 2">{{$t(`同意退货`)}}</view>
-						<view class="wait" v-if="where.status == -3 && item.refund_type == 4">{{$t(`待用户发货`)}}</view>
-						<view class="bnt cancel" v-if="item.pay_type === 'offline' && item.paid === 0"
-							@click="offlinePay(item)">
-							{{$t(`确认付款`)}}
-						</view>
-						<navigator class="bnt"
-							v-if="where.status == 1 && item.shipping_type === 1 && (item.pinkStatus === null || item.pinkStatus === 2)"
-							:url="'/pages/admin/delivery/index?id='+item.order_id+'&listId='+item.id+'&totalNum='+item.total_num+'&orderStatus='+item._status+'&comeType=1'">
-							{{$t(`去发货`)}}
-						</navigator>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view v-else class="nothing">
-			<image v-if="!loading" :src="imgHost + '/statics/images/no-thing.png'" alt="">
-			<view v-if="!loading">{{$t(`暂无记录`)}}</view>
-		</view>
-		<Loading :loaded="loaded" :loading="loading"></Loading>
-		<PriceChange :change="change" :orderInfo="orderInfo" :isRefund="isRefund" v-on:closechange="changeclose($event)"
-			v-on:savePrice="savePrice" :status="status"></PriceChange>
-	</view>
-</template>
-
-<script>
-	import {
-		getAdminOrderList,
-		setAdminOrderPrice,
-		setAdminOrderRemark,
-		setAdminRefundRemark,
-		setOfflinePay,
-		setOrderRefund,
-		orderRefundAgree,
-		orderRefund_order
-	} from "@/api/admin";
-	import Loading from '@/components/Loading/index'
-	import PriceChange from '../components/PriceChange/index.vue'
-	import {HTTP_REQUEST_URL} from '@/config/app'
-	import {
-		isMoney
-	} from '@/utils/validate.js'
-	export default {
-		name: "AdminOrderList",
-		components: {
-			Loading,
-			PriceChange
-		},
-		data() {
-			return {
-				imgHost:HTTP_REQUEST_URL,
-				current: "",
-				change: false,
-				types: 0,
-				where: {
-					page: 1,
-					limit: 10,
-					status: 0
-				},
-				list: [],
-				loaded: false,
-				loading: false,
-				orderInfo: {},
-				status: "",
-				isRefund: 0 //1是仅退款;0是退货退款
-			};
-		},
-		onLoad(option) {
-			let type = option.types;
-			this.where.status = type;
-			this.init();
-		},
-		methods: {
-			// 获取数据
-			getIndex: function() {
-				let that = this;
-				if (that.loading || that.loaded) return;
-				that.loading = true;
-				let fn
-				that.where.status == -3 ? fn = orderRefund_order : fn = getAdminOrderList
-				fn(that.where).then(
-					res => {
-						that.loading = false;
-						that.loaded = res.data.length < that.where.limit;
-						that.list.push.apply(that.list, res.data);
-						that.where.page = that.where.page + 1;
-					},
-					err => {
-						that.$util.Tips({
-							title: err
-						})
-					}
-				);
-			},
-			// 初始化
-			init: function() {
-				this.list = [];
-				this.where.page = 1;
-				this.loaded = false;
-				this.loading = false;
-				this.getIndex();
-				this.current = "";
-			},
-			// 导航切换
-			changeStatus(val) {
-				if (this.where.status != val) {
-					this.where.status = val;
-					this.init();
-				}
-			},
-			// 商品操作
-			modify: function(item, status, type) {
-				this.change = true;
-				this.status = status.toString();
-				this.orderInfo = item;
-				if (status == 0 && type == 1) {
-					this.isRefund = type
-				}
-			},
-			changeclose: function(msg) {
-				this.change = msg;
-			},
-			async savePrice(opt) {
-				let that = this,
-					data = {},
-					price = opt.price,
-					refund_price = opt.refund_price,
-					refund_status = that.orderInfo.refund_status,
-					remark = opt.remark;
-				data.order_id = that.orderInfo.order_id;
-				if (that.status == 0) {
-					if (!isMoney(price)) {
-						return that.$util.Tips({
-							title: that.$t(`请输入正确的金额`)
-						});
-					}
-					data.price = price;
-					setAdminOrderPrice(data).then(
-						res => {
-							that.change = false;
-							that.$util.Tips({
-								title: that.$t(`改价成功`),
-								icon: 'success'
-							})
-							that.init();
-						},
-						err => {
-							that.change = false;
-							that.$util.Tips({
-								title: that.$t(`改价失败`),
-								icon: 'none'
-							})
-						}
-					);
-				} else if (that.status == 2) {
-					if (this.isRefund) {
-						if (!isMoney(refund_price)) {
-							return that.$util.Tips({
-								title: that.$t(`请输入正确的金额`)
-							});
-						}
-						data.price = refund_price;
-						data.type = opt.type;
-						setOrderRefund(data).then(
-							res => {
-								that.change = false;
-								that.$util.Tips({
-									title: res.msg
-								});
-								that.init();
-							},
-							err => {
-								that.change = false;
-								that.$util.Tips({
-									title: err
-								});
-							}
-						);
-					} else {
-						orderRefundAgree(this.orderInfo.id).then(res => {
-							that.change = false;
-							that.$util.Tips({
-								title: res.msg
-							});
-							that.init();
-						}).catch(err => {
-							that.change = false;
-							that.$util.Tips({
-								title: err
-							});
-						})
-					}
-				} else {
-					if (!remark) {
-						return this.$util.Tips({
-							title: that.$t(`请输入备注`)
-						})
-					}
-					data.remark = remark;
-					let obj = '';
-					if (that.where.status == -3) {
-						obj = setAdminRefundRemark(data);
-					} else {
-						obj = setAdminOrderRemark(data);
-					}
-					obj.then(
-						res => {
-							that.change = false;
-							this.$util.Tips({
-								title: res.msg,
-								icon: 'success'
-							})
-							that.init();
-						},
-						err => {
-							that.change = false;
-							that.$util.Tips({
-								title: err
-							});
-						}
-					);
-				}
-			},
-			toDetail(item) {
-				uni.navigateTo({
-					url: `/pages/admin/orderDetail/index?id=${item.order_id}&types=${this.where.status}`
-				})
-			},
-			offlinePay: function(item) {
-				setOfflinePay({
-					order_id: item.order_id
-				}).then(
-					res => {
-						this.$util.Tips({
-							title: res.msg,
-							icon: "success"
-						});
-						this.init();
-					},
-					error => {
-						this.$util.Tips(error);
-					}
-				);
-			}
-		},
-		onReachBottom() {
-			this.getIndex()
-		}
-	}
-</script>
-
-<style>
-	.pos-order-list .nav {
-		width: 100%;
-		height: 96upx;
-		background-color: #fff;
-		font-size: 30upx;
-		color: #282828;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 9999;
-	}
-
-	.pos-order-list .nav .item.on {
-		color: #2291f8;
-	}
-
-	.pos-order-list .list {
-		margin-top: 120upx;
-	}
-
-	.pos-order-list .nothing {
-		margin-top: 120upx;
-		text-align: center;
-		color: #cfcfcf;
-	}
-
-	.pos-order-list .list .item {
-		background-color: #fff;
-		width: 100%;
-	}
-
-	.pos-order-list .list .item~.item {
-		margin-top: 24upx;
-	}
-
-	.pos-order-list .list .item .order-num {
-		height: 124upx;
-		border-bottom: 1px solid #eee;
-		font-size: 30upx;
-		font-weight: bold;
-		color: #282828;
-		padding: 0 30upx;
-	}
-
-	.pos-order-list .list .item .order-num .state {
-		color: #2291f8;
-		font-weight: normal;
-	}
-
-	.pos-order-list .list .item .order-num .state.on {
-		font-size: 24rpx;
-		width: 150rpx;
-		text-align: right;
-	}
-
-	.pos-order-list .list .item .order-num .time {
-		font-size: 26upx;
-		font-weight: normal;
-		color: #999;
-	}
-
-	.pos-order-list .list .item .operation {
-		padding: 20upx 30upx;
-		margin-top: 3upx;
-	}
-
-	.pos-order-list .list .item .operation .more {
-		position: relative;
-	}
-
-	.pos-order-list .list .item .operation .icon-gengduo {
-		font-size: 50upx;
-		color: #aaa;
-	}
-
-	.pos-order-list .list .item .operation .order .arrow {
-		width: 0;
-		height: 0;
-		border-left: 11upx solid transparent;
-		border-right: 11upx solid transparent;
-		border-top: 20upx solid #e5e5e5;
-		position: absolute;
-		left: 15upx;
-		bottom: -18upx;
-	}
-
-	.pos-order-list .list .item .operation .order .arrow:before {
-		content: '';
-		width: 0;
-		height: 0;
-		border-left: 7upx solid transparent;
-		border-right: 7upx solid transparent;
-		border-top: 20upx solid #fff;
-		position: absolute;
-		left: -7upx;
-		bottom: 0;
-	}
-
-	.pos-order-list .list .item .operation .order {
-		width: 200upx;
-		background-color: #fff;
-		border: 1px solid #eee;
-		border-radius: 10upx;
-		position: absolute;
-		top: -100upx;
-		z-index: 9;
-	}
-
-	.pos-order-list .list .item .operation .order .items {
-		height: 77upx;
-		line-height: 77upx;
-		text-align: center;
-	}
-
-	.pos-order-list .list .item .operation .order .items~.items {
-		border-top: 1px solid #f5f5f5;
-	}
-
-	.pos-order-list .list .item .operation .bnt {
-		font-size: 28upx;
-		color: #5c5c5c;
-		width: 170upx;
-		height: 60upx;
-		border-radius: 30upx;
-		border: 1px solid #bbb;
-		text-align: center;
-		line-height: 60upx;
-	}
-
-	.pos-order-list .list .item .operation .bnt~.bnt {
-		margin-left: 14upx;
-	}
-
-	.pos-order-list .list .item .operation .wait {
-		margin-left: 30rpx;
-	}
-
-	.pos-order-goods {
-		padding: 0 30upx;
-		background-color: #fff;
-	}
-
-	.pos-order-goods .goods {
-		padding: 28rpx 0;
-	}
-
-	.pos-order-goods .goods~.goods {
-		border-top: 1px dashed #e5e5e5;
-	}
-
-	.pos-order-goods .goods .picTxt {
-		width: 515upx;
-	}
-
-	.pos-order-goods .goods .picTxt .pictrue {
-		width: 130upx;
-		height: 130upx;
-	}
-
-	.pos-order-goods .goods .picTxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6upx;
-	}
-
-	.pos-order-goods .goods .picTxt .text {
-		width: 365upx;
-		height: 130upx;
-	}
-
-	.pos-order-goods .goods .picTxt .text .info {
-		width: 100%;
-		font-size: 28upx;
-		color: #282828;
-	}
-
-	.pos-order-goods .goods .picTxt .text .attr {
-		width: 100%;
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		font-size: 24upx;
-		color: #999;
-	}
-
-	.pos-order-goods .goods .money {
-		width: 164upx;
-		text-align: right;
-		font-size: 28upx;
-	}
-
-	.pos-order-goods .goods .money .info {
-		margin-top: 18rpx;
-		font-size: 24rpx;
-	}
-
-	.pos-order-goods .goods .money .x-money {
-		color: #282828;
-	}
-
-	.pos-order-goods .goods .money .num {
-		color: #ff9600;
-		margin: 5upx 0;
-	}
-
-	.pos-order-goods .goods .money .y-money {
-		color: #999;
-		text-decoration: line-through;
-	}
-
-	.public-total {
-		font-size: 28upx;
-		color: #282828;
-		border-top: 1px solid #eee;
-		height: 92upx;
-		line-height: 92upx;
-		text-align: right;
-		padding: 0 30upx;
-		background-color: #fff;
-	}
-
-	.public-total .money {
-		color: #ff4c3c;
-	}
+<template>
+	<view class="pos-order-list" ref="container">
+		<view class="nav acea-row row-around row-middle">
+			<view class="item" :class="where.status == 0 ? 'on' : ''" @click="changeStatus(0)">
+				{{$t(`待付款`)}}
+			</view>
+			<view class="item" :class="where.status == 1 ? 'on' : ''" @click="changeStatus(1)">
+				{{$t(`待发货`)}}
+			</view>
+			<view class="item" :class="where.status == 2 ? 'on' : ''" @click="changeStatus(2)">
+				{{$t(`待收货`)}}
+			</view>
+			<view class="item" :class="where.status == 3 ? 'on' : ''" @click="changeStatus(3)">
+				{{$t(`待评价`)}}
+			</view>
+			<view class="item" :class="where.status == 4 ? 'on' : ''" @click="changeStatus(4)">
+				{{$t(`已完成`)}}
+			</view>
+			<view class="item" :class="where.status == -3 ? 'on' : ''" @click="changeStatus(-3)">
+				{{$t(`退款`)}}
+			</view>
+		</view>
+		<view class="list" v-if="list.length">
+			<view class="item" v-for="(item, index) in list" :key="index">
+				<view class="order-num acea-row row-between-wrapper" @click="toDetail(item)">
+					<view>
+						<view>{{$t(`订单号`)}}：{{ item.order_id }}</view>
+						<view class="time">{{$t(`下单时间`)}}：{{ item.add_time }}</view>
+					</view>
+					<view class="state"
+						:class="(item.refund_status==0 && where.status != 0 && item.refund.length)?'on':''">
+						{{item.refund_status==1?$t(`退款中`):item.refund_status==2?$t(`已退款`):item.refund_status==3?$t(`拒绝退款`):$t(item.status_name.status_name)}}
+						<text
+							v-if="item.refund_status==0 && where.status != 0 && item.refund.length">{{item.is_all_refund?$t(`退款中`):$t(`部分退款中`)}}</text>
+					</view>
+				</view>
+				<view class="pos-order-goods" v-for="(val, key) in item._info" :key="key">
+					<view class="goods acea-row row-between row-top" @click="toDetail(item)">
+						<view class="picTxt acea-row row-between-wrapper">
+							<view class="pictrue">
+								<image
+									:src="val.cart_info.productInfo.attrInfo?val.cart_info.productInfo.attrInfo.image:val.cart_info.productInfo.image" />
+							</view>
+							<view class="text acea-row row-between row-column">
+								<view class="info line2">
+									{{ val.cart_info.productInfo.store_name }}
+								</view>
+								<view class="attr" v-if="val.cart_info.productInfo.attrInfo">
+									{{ val.cart_info.productInfo.attrInfo.suk }}
+								</view>
+							</view>
+						</view>
+						<view class="money">
+							<view class="x-money">
+								{{$t(`￥`)}}{{ val.cart_info.productInfo.attrInfo?val.cart_info.productInfo.attrInfo.price:val.cart_info.productInfo.price }}
+							</view>
+							<view class="num">x{{ val.cart_info.cart_num }}</view>
+							<view class="info" v-if="val.cart_info.refund_num && item._status._type !=-2">
+								{{val.cart_info.refund_num}}{{$t(`件退款中`)}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="public-total">
+					{{$t(`共`)}}{{ item.total_num }}{{$t(`件商品，实付款`)}}
+					<span class="money">{{$t(`￥`)}}{{ item.pay_price }}</span> ( {{$t(`邮费`)}} {{$t(`￥`)}}{{
+	            item.pay_postage
+	          }}
+					)
+				</view>
+				<view class="operation acea-row row-between-wrapper">
+					<view class="acea-row row-middle">
+						<view class="bnt" @click="modify(item, 0)" v-if="where.status == 0">
+							{{$t(`一键改价`)}}
+						</view>
+						<view class="bnt" @click="modify(item, 1)">{{$t(`订单备注`)}}</view>
+						<view class="bnt" @click="modify(item, 2)"
+							v-if="(item.refund_type == 0 || item.refund_type == 1 || item.refund_type == 5 ) && where.status == -3 && parseFloat(item.pay_price) > 0">
+							{{$t(`立即退款`)}}
+						</view>
+						<view class="bnt" @click="agreeExpress(item)"
+							v-if="where.status == -3 && item.refund_type == 2">{{$t(`同意退货`)}}</view>
+						<view class="wait" v-if="where.status == -3 && item.refund_type == 4">{{$t(`待用户发货`)}}</view>
+						<view class="bnt cancel" v-if="item.pay_type === 'offline' && item.paid === 0"
+							@click="offlinePay(item)">
+							{{$t(`确认付款`)}}
+						</view>
+						<navigator class="bnt"
+							v-if="where.status == 1 && item.shipping_type === 1 && (item.pinkStatus === null || item.pinkStatus === 2)"
+							:url="'/pages/admin/delivery/index?id='+item.order_id+'&listId='+item.id+'&totalNum='+item.total_num+'&orderStatus='+item._status+'&comeType=1'">
+							{{$t(`去发货`)}}
+						</navigator>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view v-else class="nothing">
+			<image v-if="!loading" :src="imgHost + '/statics/images/no-thing.png'" alt="">
+				<view v-if="!loading">{{$t(`暂无记录`)}}</view>
+		</view>
+		<Loading :loaded="loaded" :loading="loading"></Loading>
+		<PriceChange :change="change" :orderInfo="orderInfo" :isRefund="isRefund" v-on:closechange="changeclose($event)"
+			v-on:savePrice="savePrice" :status="status"></PriceChange>
+	</view>
+</template>
+
+<script>
+	import {
+		getAdminOrderList,
+		setAdminOrderPrice,
+		setAdminOrderRemark,
+		setAdminRefundRemark,
+		setOfflinePay,
+		setOrderRefund,
+		agreeExpress,
+		orderRefund_order
+	} from "@/api/admin";
+	import Loading from '@/components/Loading/index'
+	import PriceChange from '../components/PriceChange/index.vue'
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app'
+	import {
+		isMoney
+	} from '@/utils/validate.js'
+	export default {
+		name: "AdminOrderList",
+		components: {
+			Loading,
+			PriceChange
+		},
+		data() {
+			return {
+				imgHost: HTTP_REQUEST_URL,
+				current: "",
+				change: false,
+				types: 0,
+				where: {
+					page: 1,
+					limit: 10,
+					status: 0
+				},
+				list: [],
+				loaded: false,
+				loading: false,
+				orderInfo: {},
+				status: "",
+				isRefund: 0 //1是仅退款;0是退货退款
+			};
+		},
+		onLoad(option) {
+			let type = option.types;
+			this.where.status = type;
+			this.init();
+		},
+		methods: {
+			// 获取数据
+			getIndex: function() {
+				let that = this;
+				if (that.loading || that.loaded) return;
+				that.loading = true;
+				let fn
+				that.where.status == -3 ? fn = orderRefund_order : fn = getAdminOrderList
+				fn(that.where).then(
+					res => {
+						that.loading = false;
+						that.loaded = res.data.length < that.where.limit;
+						that.list.push.apply(that.list, res.data);
+						that.where.page = that.where.page + 1;
+					},
+					err => {
+						that.$util.Tips({
+							title: err
+						})
+					}
+				);
+			},
+			// 初始化
+			init: function() {
+				this.list = [];
+				this.where.page = 1;
+				this.loaded = false;
+				this.loading = false;
+				this.getIndex();
+				this.current = "";
+			},
+			// 导航切换
+			changeStatus(val) {
+				if (this.where.status != val) {
+					this.where.status = val;
+					this.init();
+				}
+			},
+			// 商品操作
+			modify: function(item, status) {
+				this.change = true;
+				this.status = status.toString();
+				this.orderInfo = item;
+				if (status == 2) {
+					this.isRefund = 1
+				}
+			},
+			changeclose: function(msg) {
+				this.change = msg;
+			},
+			async savePrice(opt) {
+				let that = this,
+					data = {},
+					price = opt.price,
+					refund_price = opt.refund_price,
+					refund_status = that.orderInfo.refund_status,
+					remark = opt.remark;
+				data.order_id = that.orderInfo.order_id;
+				if (that.status == 0) {
+					if (!isMoney(price)) {
+						return that.$util.Tips({
+							title: that.$t(`请输入正确的金额`)
+						});
+					}
+					data.price = price;
+					setAdminOrderPrice(data).then(
+						res => {
+							that.change = false;
+							that.$util.Tips({
+								title: that.$t(`改价成功`),
+								icon: 'success'
+							})
+							that.init();
+						},
+						err => {
+							that.change = false;
+							that.$util.Tips({
+								title: that.$t(`改价失败`),
+								icon: 'none'
+							})
+						}
+					);
+				} else if (that.status == 2) {
+					if (!isMoney(refund_price)) {
+						return that.$util.Tips({
+							title: that.$t(`请输入正确的金额`)
+						});
+					}
+					data.price = refund_price;
+					data.type = opt.type;
+					setOrderRefund(data).then(
+						res => {
+							that.change = false;
+							that.$util.Tips({
+								title: res.msg
+							});
+							that.init();
+						},
+						err => {
+							that.change = false;
+							that.$util.Tips({
+								title: err
+							});
+						}
+					);
+				} else {
+					if (!remark) {
+						return this.$util.Tips({
+							title: that.$t(`请输入备注`)
+						})
+					}
+					data.remark = remark;
+					let obj = '';
+					if (that.where.status == -3) {
+						obj = setAdminRefundRemark(data);
+					} else {
+						obj = setAdminOrderRemark(data);
+					}
+					obj.then(
+						res => {
+							that.change = false;
+							this.$util.Tips({
+								title: res.msg,
+								icon: 'success'
+							})
+							that.init();
+						},
+						err => {
+							that.change = false;
+							that.$util.Tips({
+								title: err
+							});
+						}
+					);
+				}
+			},
+			agreeExpress(item) {
+				console.log(3333)
+				let that = this;
+				agreeExpress({
+					id: item.id
+				}).then(res => {
+					that.$util.Tips({
+						title: res.msg
+					});
+					that.init();
+				}).catch(err => {
+					that.$util.Tips({
+						title: err
+					});
+				})
+			},
+			toDetail(item) {
+				uni.navigateTo({
+					url: `/pages/admin/orderDetail/index?id=${item.order_id}&types=${this.where.status}`
+				})
+			},
+			offlinePay: function(item) {
+				setOfflinePay({
+					order_id: item.order_id
+				}).then(
+					res => {
+						this.$util.Tips({
+							title: res.msg,
+							icon: "success"
+						});
+						this.init();
+					},
+					error => {
+						this.$util.Tips(error);
+					}
+				);
+			}
+		},
+		onReachBottom() {
+			this.getIndex()
+		}
+	}
+</script>
+
+<style>
+	.pos-order-list .nav {
+		width: 100%;
+		height: 96upx;
+		background-color: #fff;
+		font-size: 30upx;
+		color: #282828;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 9999;
+	}
+
+	.pos-order-list .nav .item.on {
+		color: #2291f8;
+	}
+
+	.pos-order-list .list {
+		margin-top: 120upx;
+	}
+
+	.pos-order-list .nothing {
+		margin-top: 120upx;
+		text-align: center;
+		color: #cfcfcf;
+	}
+
+	.pos-order-list .list .item {
+		background-color: #fff;
+		width: 100%;
+	}
+
+	.pos-order-list .list .item~.item {
+		margin-top: 24upx;
+	}
+
+	.pos-order-list .list .item .order-num {
+		height: 124upx;
+		border-bottom: 1px solid #eee;
+		font-size: 30upx;
+		font-weight: bold;
+		color: #282828;
+		padding: 0 30upx;
+	}
+
+	.pos-order-list .list .item .order-num .state {
+		color: #2291f8;
+		font-weight: normal;
+	}
+
+	.pos-order-list .list .item .order-num .state.on {
+		font-size: 24rpx;
+		width: 150rpx;
+		text-align: right;
+	}
+
+	.pos-order-list .list .item .order-num .time {
+		font-size: 26upx;
+		font-weight: normal;
+		color: #999;
+	}
+
+	.pos-order-list .list .item .operation {
+		padding: 20upx 30upx;
+		margin-top: 3upx;
+	}
+
+	.pos-order-list .list .item .operation .more {
+		position: relative;
+	}
+
+	.pos-order-list .list .item .operation .icon-gengduo {
+		font-size: 50upx;
+		color: #aaa;
+	}
+
+	.pos-order-list .list .item .operation .order .arrow {
+		width: 0;
+		height: 0;
+		border-left: 11upx solid transparent;
+		border-right: 11upx solid transparent;
+		border-top: 20upx solid #e5e5e5;
+		position: absolute;
+		left: 15upx;
+		bottom: -18upx;
+	}
+
+	.pos-order-list .list .item .operation .order .arrow:before {
+		content: '';
+		width: 0;
+		height: 0;
+		border-left: 7upx solid transparent;
+		border-right: 7upx solid transparent;
+		border-top: 20upx solid #fff;
+		position: absolute;
+		left: -7upx;
+		bottom: 0;
+	}
+
+	.pos-order-list .list .item .operation .order {
+		width: 200upx;
+		background-color: #fff;
+		border: 1px solid #eee;
+		border-radius: 10upx;
+		position: absolute;
+		top: -100upx;
+		z-index: 9;
+	}
+
+	.pos-order-list .list .item .operation .order .items {
+		height: 77upx;
+		line-height: 77upx;
+		text-align: center;
+	}
+
+	.pos-order-list .list .item .operation .order .items~.items {
+		border-top: 1px solid #f5f5f5;
+	}
+
+	.pos-order-list .list .item .operation .bnt {
+		font-size: 28upx;
+		color: #5c5c5c;
+		width: 170upx;
+		height: 60upx;
+		border-radius: 30upx;
+		border: 1px solid #bbb;
+		text-align: center;
+		line-height: 60upx;
+	}
+
+	.pos-order-list .list .item .operation .bnt~.bnt {
+		margin-left: 14upx;
+	}
+
+	.pos-order-list .list .item .operation .wait {
+		margin-left: 30rpx;
+		color: orangered;
+	}
+
+	.pos-order-goods {
+		padding: 0 30upx;
+		background-color: #fff;
+	}
+
+	.pos-order-goods .goods {
+		padding: 28rpx 0;
+	}
+
+	.pos-order-goods .goods~.goods {
+		border-top: 1px dashed #e5e5e5;
+	}
+
+	.pos-order-goods .goods .picTxt {
+		width: 515upx;
+	}
+
+	.pos-order-goods .goods .picTxt .pictrue {
+		width: 130upx;
+		height: 130upx;
+	}
+
+	.pos-order-goods .goods .picTxt .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 6upx;
+	}
+
+	.pos-order-goods .goods .picTxt .text {
+		width: 365upx;
+		height: 130upx;
+	}
+
+	.pos-order-goods .goods .picTxt .text .info {
+		width: 100%;
+		font-size: 28upx;
+		color: #282828;
+	}
+
+	.pos-order-goods .goods .picTxt .text .attr {
+		width: 100%;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		font-size: 24upx;
+		color: #999;
+	}
+
+	.pos-order-goods .goods .money {
+		width: 164upx;
+		text-align: right;
+		font-size: 28upx;
+	}
+
+	.pos-order-goods .goods .money .info {
+		margin-top: 18rpx;
+		font-size: 24rpx;
+	}
+
+	.pos-order-goods .goods .money .x-money {
+		color: #282828;
+	}
+
+	.pos-order-goods .goods .money .num {
+		color: #ff9600;
+		margin: 5upx 0;
+	}
+
+	.pos-order-goods .goods .money .y-money {
+		color: #999;
+		text-decoration: line-through;
+	}
+
+	.public-total {
+		font-size: 28upx;
+		color: #282828;
+		border-top: 1px solid #eee;
+		height: 92upx;
+		line-height: 92upx;
+		text-align: right;
+		padding: 0 30upx;
+		background-color: #fff;
+	}
+
+	.public-total .money {
+		color: #ff4c3c;
+	}
 </style>