diff --git a/crmeb/public/install/.env b/crmeb/public/install/.env
index 0caf75351..71c73fb47 100755
--- a/crmeb/public/install/.env
+++ b/crmeb/public/install/.env
@@ -1 +1 @@
-APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[DATABASE]
TYPE = mysql
HOSTNAME = #DB_HOST#
HOSTPORT = #DB_PORT#
USERNAME = #DB_USER#
PASSWORD = '#DB_PWD#'
DATABASE = #DB_NAME#
PREFIX = #DB_PREFIX#
CHARSET = utf8
DEBUG = true

[LANG]
default_lang = zh-cn

[CACHE]
DRIVER = #CACHE_TYPE#
CACHE_PREFIX = #CACHE_PREFIX#
CACHE_TAG_PREFIX = #CACHE_TAG_PREFIX#

[REDIS]
REDIS_HOSTNAME = #RB_HOST#
PORT = #RB_PORT#
REDIS_PASSWORD = '#RB_PWD#'
SELECT = #RB_SELECT#

[QUEUE]
QUEUE_NAME = #QUEUE_NAME#
\ No newline at end of file
+APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[DATABASE]
TYPE = mysql
HOSTNAME = #DB_HOST#
HOSTPORT = #DB_PORT#
USERNAME = #DB_USER#
PASSWORD = '#DB_PWD#'
DATABASE = #DB_NAME#
PREFIX = #DB_PREFIX#
CHARSET = utf8mb4
DEBUG = true

[LANG]
default_lang = zh-cn

[CACHE]
DRIVER = #CACHE_TYPE#
CACHE_PREFIX = #CACHE_PREFIX#
CACHE_TAG_PREFIX = #CACHE_TAG_PREFIX#

[REDIS]
REDIS_HOSTNAME = #RB_HOST#
PORT = #RB_PORT#
REDIS_PASSWORD = '#RB_PWD#'
SELECT = #RB_SELECT#

[QUEUE]
QUEUE_NAME = #QUEUE_NAME#
\ No newline at end of file
diff --git a/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderSend.vue b/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderSend.vue
index 2dbf1a73b..d81d78c4e 100644
--- a/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderSend.vue
+++ b/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderSend.vue
@@ -8,7 +8,7 @@
           <Radio label="3">虚拟</Radio>
         </RadioGroup>
       </FormItem>
-      <FormItem v-show="formItem.type === '1' && export_open" label="发货类型：">
+      <FormItem v-show="formItem.type == '1' && export_open" label="发货类型：">
         <RadioGroup v-model="formItem.express_record_type" @on-change="changeExpress">
           <Radio label="1">手动填写</Radio>
           <Radio label="2">电子面单打印</Radio>
@@ -142,7 +142,7 @@ export default {
       //     ]
       // },
       temp: {},
-      export_open: true,
+      export_open: false,
     };
   },
   methods: {
diff --git a/template/admin/src/pages/order/orderList/handle/orderDetails.vue b/template/admin/src/pages/order/orderList/handle/orderDetails.vue
index 138e63abd..cf15bba9b 100644
--- a/template/admin/src/pages/order/orderList/handle/orderDetails.vue
+++ b/template/admin/src/pages/order/orderList/handle/orderDetails.vue
@@ -8,8 +8,8 @@
           <Col span="12">收货人：{{ orderDatalist.orderInfo.real_name }}</Col>
         </Row>
         <Row class="mb10">
-          <Col span="12">联系电话：{{ orderDatalist.orderInfo.user_phone }}</Col>
-          <Col span="12">收货地址：{{ orderDatalist.orderInfo.user_address }}</Col>
+          <Col span="12">联系电话：{{ orderDatalist.orderInfo.user_phone || '' }}</Col>
+          <Col span="12">收货地址：{{ orderDatalist.orderInfo.user_address || '' }}</Col>
         </Row>
         <Divider style="margin: 20px 0 !important" />
         <div class="ivu-description-list-title">订单信息</div>
@@ -18,7 +18,7 @@
           <Col span="12" class="fontColor1"
             >订单状态：{{ orderDatalist.orderInfo._status._title }}
             {{
-              orderDatalist.orderInfo.refund.length
+              orderDatalist.orderInfo.refund && orderDatalist.orderInfo.refund.length
                 ? orderDatalist.orderInfo.is_all_refund
                   ? '退款中'
                   : '部分退款中'
diff --git a/template/admin/src/pages/order/refund/index.vue b/template/admin/src/pages/order/refund/index.vue
index 0be8af516..66c4dc34e 100644
--- a/template/admin/src/pages/order/refund/index.vue
+++ b/template/admin/src/pages/order/refund/index.vue
@@ -567,15 +567,17 @@ export default {
     getData(id) {
       getDataInfoNew(id)
         .then(async (res) => {
-          this.$refs.detailss.modals = true;
           this.orderDatalist = res.data;
-          if (this.orderDatalist.orderInfo.refund_img) {
+          if (this.orderDatalist.orderInfo.refund_img.length) {
             try {
               this.orderDatalist.orderInfo.refund_img = JSON.parse(this.orderDatalist.orderInfo.refund_img);
             } catch (e) {
               this.orderDatalist.orderInfo.refund_img = [];
             }
           }
+          this.$nextTick((e) => {
+            this.$refs.detailss.modals = true;
+          });
         })
         .catch((res) => {
           this.$Message.error(res.msg);
@@ -668,7 +670,7 @@ export default {
   position: relative;
 }
 .ivu-form-item{
-  
+
 }
 .QRpic {
   width: 180px;
diff --git a/template/uni-app/components/goodList/index.vue b/template/uni-app/components/goodList/index.vue
index f066953f7..8ce0942b5 100644
--- a/template/uni-app/components/goodList/index.vue
+++ b/template/uni-app/components/goodList/index.vue
@@ -20,11 +20,11 @@
 							<view class='vip-money acea-row row-middle'
 								v-if="item.is_vip && item.vip_price && item.vip_price > 0">
 								{{$t(`￥`)}}{{item.vip_price || 0}}
-								<image src='../../static/images/vip.png'></image><text class='num'>{{$t(`已售`)}}
-									{{item.sales}}{{$t(item.unit_name)}}</text>
+								<image src='../../static/images/vip.png'></image><text class='num'>
+								{{$t(`已售`)}}{{item.sales}}{{$t(item.unit_name)}}</text>
 							</view>
-							<view class='vip-money acea-row row-middle' v-else><text class='num'>{{$t(`已售`)}}
-									{{item.sales}}{{$t(item.unit_name)}}</text></view>
+							<view class='vip-money acea-row row-middle' v-else><text class='num'>
+							{{$t(`已售`)}}{{item.sales}}{{$t(item.unit_name)}}</text></view>
 						</view>
 					</view>
 					<!-- <view class='iconfont icon-gouwuche cart-color acea-row row-center-wrapper'></view> -->
@@ -148,6 +148,11 @@
 		color: #aaa;
 		font-weight: normal;
 		margin-top: -2rpx;
+		white-space: nowrap;
+
+		text {
+			white-space: nowrap;
+		}
 
 		~.num {
 			margin-left: 22rpx;
diff --git a/template/uni-app/pages/activity/goods_bargain/index.vue b/template/uni-app/pages/activity/goods_bargain/index.vue
index 61a8df79d..63ae8b9de 100644
--- a/template/uni-app/pages/activity/goods_bargain/index.vue
+++ b/template/uni-app/pages/activity/goods_bargain/index.vue
@@ -13,8 +13,8 @@
 							<image :src='item.image'></image>
 						</view>
 						<view class='text acea-row row-column-around'>
-							<view class='name line1'>{{item.title}}</view>
-							<view class='num'><text class='iconfont icon-pintuan'></text>{{item.people}}{{$t(`人正在参与`)}}
+							<view class='name line1'>{{item.title || ''}}</view>
+							<view class='num'><text class='iconfont icon-pintuan'></text>{{item.people || ''}}{{$t(`人正在参与`)}}
 							</view>
 							<view class='money'>{{$t(`最低`)}} : {{$t(`￥`)}}<text class='price'>{{item.min_price}}</text>
 							</view>
diff --git a/template/uni-app/pages/activity/goods_combination/index.vue b/template/uni-app/pages/activity/goods_combination/index.vue
index 60cf96292..38f74acdd 100644
--- a/template/uni-app/pages/activity/goods_combination/index.vue
+++ b/template/uni-app/pages/activity/goods_combination/index.vue
@@ -30,7 +30,7 @@
 				<image src="../static/groupLine.png"></image>
 			</view>
 		</view>
-		<view class="list">
+		<view class="list" v-if="combinationList.length">
 			<view class="item acea-row row-between-wrapper" v-for="(item,index) in combinationList" :key='index'
 				@tap="openSubcribe(item)">
 				<view class="pictrue">
diff --git a/template/uni-app/pages/activity/presell/index.vue b/template/uni-app/pages/activity/presell/index.vue
index 9cec7c047..fd2a2faeb 100644
--- a/template/uni-app/pages/activity/presell/index.vue
+++ b/template/uni-app/pages/activity/presell/index.vue
@@ -9,7 +9,7 @@
 					<view class='timeList'>
 						<block v-for="(item,index) in timeList" :key='index'>
 							<view @tap='settimeList(item,item.key)' class='item' :class="active == index + 1?'on':''">
-								<view class='time'><span>{{item.name}}</span></view>
+								<view class='time'><span>{{item.name || ''}}</span></view>
 							</view>
 						</block>
 					</view>
@@ -21,10 +21,10 @@
 								<image :src='item.image'></image>
 							</view>
 							<view class='text acea-row row-column-around'>
-								<view class='name line2'>{{item.store_name}}</view>
+								<view class='name line2'>{{item.store_name || ''}}</view>
 								<view class='booking'>
 									<text v-if="item.presell_type != 0 && active != 1" class="count"
-										style="color: #999;">{{$t(`已预定`)}}{{item.sales ? item.sales : 0}}{{item.unit_name}}</text>
+										style="color: #999;">{{$t(`已预定`)}}{{item.sales ? item.sales : 0}}{{item.unit_name || ''}}</text>
 									<text v-else style="color: #999; font-size: 24rpx;">{{$t(`未开始`)}}</text>
 								</view>
 								<view v-if="item.coupon" class='coupon acea-row row-between-wrapper'
diff --git a/template/uni-app/pages/annex/applicationRecord/index.vue b/template/uni-app/pages/annex/applicationRecord/index.vue
index 2680c9ad3..1badcae6e 100644
--- a/template/uni-app/pages/annex/applicationRecord/index.vue
+++ b/template/uni-app/pages/annex/applicationRecord/index.vue
@@ -3,9 +3,9 @@
 		<view class="application-record" v-if="listData.length">
 			<view class="card-list" v-for="item in listData" :key="item.mer_intention_id">
 				<view class="card-top">
-					<view class="title">{{item.mer_name}}</view>
-					<view class="time">{{$t(`提交时间`)}}：{{item.create_time}}</view>
-					<view v-if="item.fail_msg" class="reason">{{$t(`原因`)}}：{{item.fail_msg}}</view>
+					<view class="title">{{item.mer_name || ''}}</view>
+					<view class="time">{{$t(`提交时间`)}}：{{item.create_time || ''}}</view>
+					<view v-if="item.fail_msg" class="reason">{{$t(`原因`)}}：{{item.fail_msg || ''}}</view>
 				</view>
 				<view class="line"></view>
 				<view class="card-bottom">
diff --git a/template/uni-app/pages/annex/offline_pay/index.vue b/template/uni-app/pages/annex/offline_pay/index.vue
index a64ada279..571593ed7 100644
--- a/template/uni-app/pages/annex/offline_pay/index.vue
+++ b/template/uni-app/pages/annex/offline_pay/index.vue
@@ -7,7 +7,7 @@
 					{{$t(`￥`)}}
 					<input v-model.number="money" class="input" name="money" type="digit" @input="inputChange" placeholder="0.00" />
 				</view>
-				<view v-if="payPrice && show" class="discount">{{$t(`会员优惠价`)}}：{{$t(`￥`)}}{{ payPrice }}</view>
+				<view v-if="payPrice && show" class="discount">{{$t(`会员优惠价`)}}：{{$t(`￥`)}}{{ payPrice || 0 }}</view>
 			</view>
 		</view>
 		<view class="radio-section">
diff --git a/template/uni-app/pages/annex/vip_active/index.vue b/template/uni-app/pages/annex/vip_active/index.vue
index c3ed03c5b..44b3b53cc 100644
--- a/template/uni-app/pages/annex/vip_active/index.vue
+++ b/template/uni-app/pages/annex/vip_active/index.vue
@@ -22,8 +22,8 @@
 				<view v-for="item in memberRights" :key="item.id" class="acea-row row-middle item">
 					<image class="image" :src="item.pic"></image>
 					<view class="text">
-						<view class="name">{{item.title}}</view>
-						<view>{{item.explain}}</view>
+						<view class="name">{{item.title || ''}}</view>
+						<view>{{item.explain || ''}}</view>
 					</view>
 				</view>
 			</view>
diff --git a/template/uni-app/pages/annex/vip_clause/index.vue b/template/uni-app/pages/annex/vip_clause/index.vue
index a9b143a1e..f2850b861 100644
--- a/template/uni-app/pages/annex/vip_clause/index.vue
+++ b/template/uni-app/pages/annex/vip_clause/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="title">{{agreement.title}}</view>
+		<view class="title">{{agreement.title || ''}}</view>
 		<view class="cont" v-html="agreement.content"></view>
 	</view>
 </template>
diff --git a/template/uni-app/pages/annex/vip_paid/index.vue b/template/uni-app/pages/annex/vip_paid/index.vue
index 9ba564416..5cab6e21a 100644
--- a/template/uni-app/pages/annex/vip_paid/index.vue
+++ b/template/uni-app/pages/annex/vip_paid/index.vue
@@ -4,19 +4,19 @@
 			<view class="acea-row row-middle">
 				<image class="image" :src="userInfo.avatar"></image>
 				<view class="text">
-					<view class="name line1">{{userInfo.nickname}}</view>
+					<view class="name line1">{{userInfo.nickname || ''}}</view>
 					<view v-if="userInfo.is_ever_level">{{$t(`永久SVIP会员`)}}</view>
 					<view v-else-if="userInfo.is_money_level">{{$t(`SVIP会员`)}} {{userInfo.overdue_time | dateFormat}}
 						{{$t(`到期`)}}
 					</view>
-					<view v-else>{{$t(`您与`)}} {{userInfo.shop_name}} {{$t(`商城的第`)}} {{userInfo.register_days}}
+					<view v-else>{{$t(`您与`)}} {{userInfo.shop_name || ''}} {{$t(`商城的第`)}} {{userInfo.register_days || ''}}
 						{{$t(`天.`)}}
 					</view>
 				</view>
 			</view>
 			<view class="acea-row row-between-wrapper info">
 				<view v-if="userInfo.is_money_level">{{$t(`已累积为您节省`)}} {{$t(`￥`)}}<text
-						class="num">{{userInfo.economize_money}}</text>
+						class="num">{{userInfo.economize_money || ''}}</text>
 				</view>
 				<view v-else>{{$t(`开通即享会员权益`)}}</view>
 				<view class="btn" @click="scrollToCard" v-if="!userInfo.is_ever_level">
diff --git a/template/uni-app/pages/extension/components/shareInfo/index.vue b/template/uni-app/pages/extension/components/shareInfo/index.vue
index 4de1b3ac1..d40db49a2 100644
--- a/template/uni-app/pages/extension/components/shareInfo/index.vue
+++ b/template/uni-app/pages/extension/components/shareInfo/index.vue
@@ -1,49 +1,53 @@
-<template>
-	<view v-if="shareInfoStatus" class="poster-first">
-	    <view class="mask-share">
-			<image :src="imgHost + '/statics/images/share-info.png'" @click="shareInfoClose" @touchmove.stop.prevent="false"></image>
-	    </view>
-	  </view>
-</template>
-
-<script>
-	import {HTTP_REQUEST_URL} from '@/config/app';
-export default {
-	props: {
-		 shareInfoStatus: {
-		      type: Boolean,
-		      default:false,
-		    }
-	},
-  data: function() {
-    return {
-			imgHost:HTTP_REQUEST_URL,
-		};
-  },
-  mounted: function() {},
-  methods: {
-    shareInfoClose: function() {
-      this.$emit("setShareInfoStatus");
-    }
-  }
-};
-
-</script>
-
-<style scoped lang="scss">
-	.poster-first {
-	  overscroll-behavior: contain;
-	}
-	.mask-share {
-	  position: fixed;
-	  top: 0;
-	  left: 0;
-	  right: 0;
-	  bottom: 0;
-	  z-index: 99;
-	}
-	.mask-share image {
-	  width: 100%;
-	  height:100%;
-	}
+<template>
+	<view v-if="shareInfoStatus" class="poster-first">
+		<view class="mask-share">
+			<image :src="imgHost + '/statics/images/share-info.png'" @click="shareInfoClose"
+				@touchmove.stop.prevent="false"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	export default {
+		props: {
+			shareInfoStatus: {
+				type: Boolean,
+				default: false,
+			}
+		},
+		data: function() {
+			return {
+				imgHost: HTTP_REQUEST_URL,
+			};
+		},
+		mounted: function() {},
+		methods: {
+			shareInfoClose: function() {
+				this.$emit("setShareInfoStatus");
+			}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	.poster-first {
+		overscroll-behavior: contain;
+	}
+
+	.mask-share {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 99;
+	}
+
+	.mask-share image {
+		width: 100%;
+		height: 100%;
+	}
 </style>
diff --git a/template/uni-app/pages/extension/news_details/index.vue b/template/uni-app/pages/extension/news_details/index.vue
index 5d86fb1b5..aba791701 100644
--- a/template/uni-app/pages/extension/news_details/index.vue
+++ b/template/uni-app/pages/extension/news_details/index.vue
@@ -1,11 +1,11 @@
 <template>
 	<view :style="colorStyle">
 		<view class='newsDetail'>
-			<view class='title'>{{articleInfo.title}}</view>
+			<view class='title'>{{articleInfo.title || ''}}</view>
 			<view class='list acea-row row-middle'>
-				<view class='label'>{{articleInfo.catename}}</view>
-				<view class='item'></text>{{articleInfo.add_time}}</view>
-				<view class='item'><text class='iconfont icon-liulan'></text>{{articleInfo.visit}}</view>
+				<view class='label'>{{articleInfo.catename || ''}}</view>
+				<view class='item'></text>{{articleInfo.add_time || ''}}</view>
+				<view class='item'><text class='iconfont icon-liulan'></text>{{articleInfo.visit || ''}}</view>
 			</view>
 			<view class='conters'>
 				<jyf-parser :html="content" ref="article" :tag-style="tagStyle"></jyf-parser>
@@ -16,11 +16,11 @@
 					<image :src="store_info.image"></image>
 				</view>
 				<view class="text">
-					<view class="name line1">{{store_info.store_name}}</view>
+					<view class="name line1">{{store_info.store_name || ''}}</view>
 					<view class="money font-color">
-						{{$t(`￥`)}}<text class="num">{{store_info.price}}</text>
+						{{$t(`￥`)}}<text class="num">{{store_info.price || 0}}</text>
 					</view>
-					<view class="y_money">{{$t(`￥`)}}{{store_info.ot_price}}</view>
+					<view class="y_money">{{$t(`￥`)}}{{store_info.ot_price || 0}}</view>
 				</view>
 				<navigator class="label"><text class="span">{{$t(`查看商品`)}}</text></navigator>
 			</navigator>
diff --git a/template/uni-app/pages/goods/admin_order_detail/index.vue b/template/uni-app/pages/goods/admin_order_detail/index.vue
index 41fe5b2c3..e6f803896 100644
--- a/template/uni-app/pages/goods/admin_order_detail/index.vue
+++ b/template/uni-app/pages/goods/admin_order_detail/index.vue
@@ -1,625 +1,625 @@
-<template>
-	<view class="order-details pos-order-details">
-		<view class="header acea-row row-middle">
-			<view class="state">{{ $t(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="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>
-			</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.suk }}</view>
-					</view>
-				</view>
-				<view class="money">
-					<view class="x-money">{{$t(`￥`)}}{{ item.productInfo.attrInfo.price }}</view>
-					<view class="num">x{{ item.cart_num }}</view>
-					<view class="y-money">{{$t(`￥`)}}{{ item.productInfo.attrInfo.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
-          }}
-				</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(`￥`)}}{{(parseFloat(orderInfo.total_price)+parseFloat(orderInfo.vip_true_price)).toFixed(2)}}
-				</view>
-			</view>
-			<view class='item acea-row row-between' v-if="orderInfo.pay_postage > 0">
-				<view>{{$t(`配送运费`)}}：</view>
-				<view class='conter'>{{$t(`￥`)}}{{parseFloat(orderInfo.pay_postage).toFixed(2)}}</view>
-			</view>
-			<view v-if="orderInfo.levelPrice > 0" class='item acea-row row-between'>
-				<view>{{$t(`用户等级优惠`)}}：</view>
-				<view class='conter'>-{{$t(`￥`)}}{{parseFloat(orderInfo.levelPrice).toFixed(2)}}</view>
-			</view>
-			<view v-if="orderInfo.memberPrice > 0" class='item acea-row row-between'>
-				<view>{{$t(`付费会员优惠`)}}：</view>
-				<view class='conter'>-{{$t(`￥`)}}{{parseFloat(orderInfo.memberPrice).toFixed(2)}}</view>
-			</view>
-			<view class='item acea-row row-between' v-if='orderInfo.coupon_price > 0'>
-				<view>{{$t(`优惠券抵扣`)}}：</view>
-				<view class='conter'>-{{$t(`￥`)}}{{parseFloat(orderInfo.coupon_price).toFixed(2)}}</view>
-			</view>
-			<view class='item acea-row row-between' v-if="orderInfo.use_integral > 0">
-				<view>{{$t(`积分抵扣`)}}：</view>
-				<view class='conter'>-{{$t(`￥`)}}{{parseFloat(orderInfo.deduction_price).toFixed(2)}}</view>
-			</view>
-			<view class='actualPay acea-row row-right'>{{$t(`实付款`)}}：<text class='money'>{{$t(`￥`)}}{{parseFloat(orderInfo.pay_price).toFixed(2)}}</text></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}}
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-<script>
-	import {
-		getAdminOrderDetail
-	} from "@/api/admin";
-
-	export default {
-		name: "AdminOrder",
-		data: function() {
-			return {
-				order: false,
-				change: false,
-				order_id: "",
-				orderInfo: {
-					_status: {}
-				},
-				status: "",
-				title: "",
-				payType: "",
-				types: "",
-				clickNum: 1,
-				goname: '',
-				customForm: []
-			};
-		},
-		watch: {
-			"$route.params.oid": function(newVal) {
-				let that = this;
-				if (newVal != undefined) {
-					that.order_id = newVal;
-					that.getIndex();
-				}
-			}
-		},
-		onLoad: function(option) {
-			let self = this
-			this.order_id = option.id;
-			this.goname = option.goname
-			this.getIndex();
-		},
-		methods: {
-			getIndex: function() {
-				let that = this;
-				getAdminOrderDetail(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
-						});
-					}
-				);
-			}
-		}
-	};
-</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;
-		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;
-	}
-
-	.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;
-	}
-
-	.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">{{ $t(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="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>
+			</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.suk }}</view>
+					</view>
+				</view>
+				<view class="money">
+					<view class="x-money">{{$t(`￥`)}}{{ item.productInfo.attrInfo.price || 0 }}</view>
+					<view class="num">x{{ item.cart_num }}</view>
+					<view class="y-money">{{$t(`￥`)}}{{ item.productInfo.attrInfo.ot_price || 0 }}</view>
+				</view>
+			</navigator>
+		</view>
+		<view class="public-total">
+			{{$t(`共`)}}{{ orderInfo.total_num || 0 }}{{$t(`件商品，应支付`)}}
+			<span class="money">{{$t(`￥`)}}{{ orderInfo.pay_price || 0 }}</span> ( {{$t(`邮费`)}} {{$t(`￥`)}}{{
+        orderInfo.pay_postage || 0
+      }}
+			)
+		</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 || ''
+          }}
+				</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(`￥`)}}{{(parseFloat(orderInfo.total_price)+parseFloat(orderInfo.vip_true_price)).toFixed(2)}}
+				</view>
+			</view>
+			<view class='item acea-row row-between' v-if="orderInfo.pay_postage > 0">
+				<view>{{$t(`配送运费`)}}：</view>
+				<view class='conter'>{{$t(`￥`)}}{{parseFloat(orderInfo.pay_postage).toFixed(2)}}</view>
+			</view>
+			<view v-if="orderInfo.levelPrice > 0" class='item acea-row row-between'>
+				<view>{{$t(`用户等级优惠`)}}：</view>
+				<view class='conter'>-{{$t(`￥`)}}{{parseFloat(orderInfo.levelPrice).toFixed(2)}}</view>
+			</view>
+			<view v-if="orderInfo.memberPrice > 0" class='item acea-row row-between'>
+				<view>{{$t(`付费会员优惠`)}}：</view>
+				<view class='conter'>-{{$t(`￥`)}}{{parseFloat(orderInfo.memberPrice).toFixed(2)}}</view>
+			</view>
+			<view class='item acea-row row-between' v-if='orderInfo.coupon_price > 0'>
+				<view>{{$t(`优惠券抵扣`)}}：</view>
+				<view class='conter'>-{{$t(`￥`)}}{{parseFloat(orderInfo.coupon_price).toFixed(2)}}</view>
+			</view>
+			<view class='item acea-row row-between' v-if="orderInfo.use_integral > 0">
+				<view>{{$t(`积分抵扣`)}}：</view>
+				<view class='conter'>-{{$t(`￥`)}}{{parseFloat(orderInfo.deduction_price).toFixed(2)}}</view>
+			</view>
+			<view class='actualPay acea-row row-right'>{{$t(`实付款`)}}：<text
+					class='money'>{{$t(`￥`)}}{{parseFloat(orderInfo.pay_price).toFixed(2)}}</text></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 || ''}}
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import {
+		getAdminOrderDetail
+	} from "@/api/admin";
+
+	export default {
+		name: "AdminOrder",
+		data: function() {
+			return {
+				order: false,
+				change: false,
+				order_id: "",
+				orderInfo: {
+					_status: {}
+				},
+				status: "",
+				title: "",
+				payType: "",
+				types: "",
+				clickNum: 1,
+				goname: '',
+				customForm: []
+			};
+		},
+		watch: {
+			"$route.params.oid": function(newVal) {
+				let that = this;
+				if (newVal != undefined) {
+					that.order_id = newVal;
+					that.getIndex();
+				}
+			}
+		},
+		onLoad: function(option) {
+			let self = this
+			this.order_id = option.id;
+			this.goname = option.goname
+			this.getIndex();
+		},
+		methods: {
+			getIndex: function() {
+				let that = this;
+				getAdminOrderDetail(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
+						});
+					}
+				);
+			}
+		}
+	};
+</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;
+		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;
+		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;
+	}
+
+	.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;
+	}
+
+	.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/goods/cashier/index.vue b/template/uni-app/pages/goods/cashier/index.vue
index 1b3d031b4..19adb7e82 100644
--- a/template/uni-app/pages/goods/cashier/index.vue
+++ b/template/uni-app/pages/goods/cashier/index.vue
@@ -256,6 +256,7 @@
 					title: that.$t(`支付中`)
 				});
 				if (paytype == 'friend' && that.orderId) {
+					uni.hideLoading();
 					return uni.navigateTo({
 						url: '/pages/users/payment_on_behalf/index?order_id=' + that.orderId + '&spread=' +
 							this.$store.state.app.uid,
@@ -290,7 +291,6 @@
 						'&spread=' +
 						this
 						.$store.state.app.uid
-
 					switch (status) {
 						case 'ORDER_EXIST':
 						case 'EXTEND_ORDER':
@@ -518,16 +518,16 @@
 
 						case 'ALIPAY_PAY':
 							//#ifdef H5
-							uni.hideLoading();
-							that.$util.Tips({
-								title: that.$t(`等待支付中`)
-							}, {
-								tab: 4,
-								url: goPages + '&status=0'
+							uni.hideLoading();
+							that.$util.Tips({
+								title: that.$t(`等待支付中`)
+							}, {
+								tab: 4,
+								url: goPages + '&status=0'
 							});
-							that.formContent = res.data.result.jsConfig;
-							setTimeout(() => {
-								document.getElementById('alipaysubmit').submit();
+							that.formContent = res.data.result.jsConfig;
+							setTimeout(() => {
+								document.getElementById('alipaysubmit').submit();
 							}, 1500);
 							//#endif
 							// #ifdef MP
diff --git a/template/uni-app/pages/goods/order_confirm/index.vue b/template/uni-app/pages/goods/order_confirm/index.vue
index 2e65d237a..4d062ae63 100644
--- a/template/uni-app/pages/goods/order_confirm/index.vue
+++ b/template/uni-app/pages/goods/order_confirm/index.vue
@@ -11,9 +11,9 @@
 						v-if='store_self_mention && is_shipping'></view>
 				</view>
 				<view class='address acea-row row-between-wrapper' @tap='onAddress' v-if='shippingType == 0'>
-					<view class='addressCon' v-if="addressInfo.real_name">
-						<view class='name'>{{addressInfo.real_name}}
-							<text class='phone'>{{addressInfo.phone}}</text>
+					<view class='addressCon' v-if="addressInfo.real_name || ''">
+						<view class='name'>{{addressInfo.real_name || ''}}
+							<text class='phone'>{{addressInfo.phone || ''}}</text>
 						</view>
 						<view class="line1">
 							<text class='default font-num'
@@ -29,8 +29,8 @@
 				<view class='address acea-row row-between-wrapper' v-else @tap="showStoreList">
 					<block v-if="storeList.length>0">
 						<view class='addressCon'>
-							<view class='name'>{{system_store.name}}
-								<text class='phone'>{{system_store.phone}}</text>
+							<view class='name'>{{system_store.name || ''}}
+								<text class='phone'>{{system_store.phone || ''}}</text>
 							</view>
 							<view class="line1"> {{system_store.address}}{{", " + system_store.detailed_address}}</view>
 						</view>
@@ -172,7 +172,7 @@
 				<view class='item acea-row row-between-wrapper'>
 					<view>{{$t(`商品总价`)}}：</view>
 					<view class='money'>
-						{{$t(`￥`)}}{{totalPriceAll || ''}}
+						{{$t(`￥`)}}{{allPrice || 0}}
 					</view>
 				</view>
 				<view class='item acea-row row-between-wrapper'
@@ -388,7 +388,6 @@
 				priceGroup: {},
 				animated: false,
 				totalPrice: 0,
-				totalPriceAll: 0,
 				integralRatio: "0",
 				pagesUrl: "",
 				orderKey: "",
@@ -823,7 +822,6 @@
 					that.$set(that, 'store_self_mention', res.data.store_self_mention);
 					that.$set(that, 'virtual_type', res.data.virtual_type || 0);
 					that.$set(that, 'integral_open', res.data.integral_open);
-					this.totalPriceAll=  (parseFloat(res.data.priceGroup.totalPrice) + parseFloat(res.data.priceGroup.vipPrice)).toFixed(2)
 					uni.hideLoading()
 					//微信支付是否开启
 					that.cartArr[0].payStatus = res.data.pay_weixin_open || 0
diff --git a/template/uni-app/pages/goods/order_details/index.vue b/template/uni-app/pages/goods/order_details/index.vue
index bf5c3662b..3ccf60af5 100644
--- a/template/uni-app/pages/goods/order_details/index.vue
+++ b/template/uni-app/pages/goods/order_details/index.vue
@@ -146,7 +146,7 @@
 						<image src="../static/shuoming.png" mode=""></image>
 						{{$t(`拒绝退款`)}}
 					</view>
-					<view class="con">{{$t(`拒绝原因`)}}：{{orderInfo.refuse_reason}}</view>
+					<view class="con">{{$t(`拒绝原因`)}}：{{orderInfo.refuse_reason || ''}}</view>
 				</view>
 			</view>
 			<orderGoods v-for="(item,index) in split" :key="item.id" :evaluate='item._status._type == 3 ? 3 : 0'
diff --git a/template/uni-app/pages/goods/order_refund_goods/index.vue b/template/uni-app/pages/goods/order_refund_goods/index.vue
index aeef945f8..e4d2bbf5a 100644
--- a/template/uni-app/pages/goods/order_refund_goods/index.vue
+++ b/template/uni-app/pages/goods/order_refund_goods/index.vue
@@ -1,298 +1,307 @@
-<template>
-	<view :style="colorStyle">
-		<form @submit="subRefund">
-			<view class='apply-return'>
-				<view class='goodsStyle acea-row row-between' v-for="(item,index) in orderInfo.cart_info" :key="index">
-					<view class='pictrue'>
-						<image :src='item.productInfo.attrInfo?item.productInfo.attrInfo.image:item.productInfo.image'></image>
-					</view>
-					<view class='text acea-row row-between'>
-						<view class='name line2'>{{item.productInfo.store_name}}</view>
-						<view class='money'>
-							<view>{{$t(`￥`)}}{{item.truePrice}}</view>
-							<view class='num'>x{{item.cart_num}}</view>
-						</view>
-					</view>
-				</view>
-				<view class='list'>
-					<view class='item acea-row row-between-wrapper' v-if="expressList.length">
-						<view>{{$t(`快递公司`)}}</view>
-						<picker class='num' @change="bindPickerChange" :value="seIndex" :range="expressList" range-key="name">
-							<view class="picker acea-row row-between-wrapper">
-								<view class='reason'>{{expressList[seIndex].name}}</view>
-								<text class='iconfont icon-jiantou'></text>
-							</view>
-						</picker>
-					</view>
-					<view class='item acea-row row-between-wrapper'>
-						<view>{{$t(`快递单号`)}}</view>
-						<input class="input" type="text" :placeholder="$t(`填写快递单号`)" placeholder-class='placeholder' v-model="refundInfo.refund_express" />
-					</view>
-					<view class='item acea-row row-between-wrapper'>
-						<view>{{$t(`联系电话`)}}</view>
-						<input  class="input" type="number" :placeholder="$t(`请输入手机号`)" placeholder-class='placeholder' v-model="refundInfo.refund_phone" />
-					</view>
-					<view class='item textarea acea-row row-between'>
-						<view>{{$t(`备注说明`)}}</view>
-						<textarea :placeholder='$t(`填写备注信息，100字以内`)' class='num' v-model="refundInfo.refund_explain"></textarea>
-					</view>
-				  <view class='item acea-row row-between'>
-						<view class='title acea-row row-between-wrapper'>
-							<view>{{$t(`上传图片`)}}</view>
-							<view class='tip'>{{$t(`最多可上传3张`)}}</view>
-						</view>
-						<view class='upload acea-row row-middle'>
-							<view class='pictrue' v-for="(item,index) in refund_reason_wap_img" :key="index">
-								<image :src='item'></image>
-								<view class='iconfont icon-guanbi1 font-num' @tap='DelPic(index)'></view>
-							</view>
-							<view class='pictrue acea-row row-center-wrapper row-column' @tap='uploadpic'
-								v-if="refund_reason_wap_img.length < 3">
-								<text class='iconfont icon-icon25201'></text>
-								<view>{{$t(`上传图片`)}}</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<button class='returnBnt bg-color' form-type="submit">{{$t(`提交`)}}</button>
-			</view>
-		</form>
-	</view>
-</template>
-<script>
-	import { refundOrderDetail, refundExpress } from '@/api/order.js';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from "vuex";
-	import colors from '@/mixins/color.js';
-	export default {
-		mixins: [colors],
-		data() {
-			return {
-				expressList:[],
-				orderInfo:{},
-				seIndex: 0,
-				refund_reason_wap_img: [],
-				refundInfo:{
-					refund_express:'',
-					refund_phone:'',
-					refund_explain:'',
-					id:'',
-					refund_express_name:'',
-					refund_img:''
-				}
-			};
-		},
-		computed: mapGetters(['isLogin']),
-		watch: {
-			isLogin: {
-				handler: function(newV, oldV) {
-					if (newV) {
-						this.getOrderInfo();
-					}
-				},
-				deep: true
-			}
-		},
-		onLoad(options) {
-			this.orderId = options.orderId;
-			if (this.isLogin) {
-				this.getOrderInfo();
-			} else {
-				toLogin();
-			}
-		},
-		methods: {
-			/**
-			 * 申请退货
-			 */
-			subRefund: function(e) {
-				let that = this
-				if (!that.refundInfo.refund_express) return this.$util.Tips({
-					title: that.$t(`填写快递单号`)
-				});
-				if (!that.refundInfo.refund_phone) return this.$util.Tips({
-					title: that.$t(`请输入手机号`)
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.refundInfo.refund_phone)) return this.$util.Tips({
-					title: that.$t(`请输入正确的手机号码`)
-				});
-				that.refundInfo.refund_express_name = that.expressList[that.seIndex].name;
-				that.refundInfo.refund_img = that.refund_reason_wap_img.join(',');
-				refundExpress(that.refundInfo).then(res => {
-					return this.$util.Tips({
-						title: res.msg,
-						icon: 'success'
-					}, {
-						tab: 5,
-						url: '/pages/users/user_return_list/index?isT=1'
-					});
-				}).catch(err => {
-					return this.$util.Tips({
-						title: err
-					});
-				})
-			},
-			/**
-			 * 删除图片
-			 * 
-			 */
-			DelPic: function(e) {
-				let index = e,
-					that = this,
-					pic = this.refund_reason_wap_img[index];
-				that.refund_reason_wap_img.splice(index, 1);
-				that.$set(that, 'refund_reason_wap_img', that.refund_reason_wap_img);
-			},
-			
-			/**
-			 * 上传文件
-			 * 
-			 */
-			uploadpic: function() {
-				let that = this;
-				this.$util.uploadImageOne('upload/image', function(res) {
-					that.refund_reason_wap_img.push(res.data.url);
-					that.$set(that, 'refund_reason_wap_img', that.refund_reason_wap_img);
-				});
-			},
-			/**
-			 * 获取订单详情
-			 * 
-			 */
-			getOrderInfo: function() {
-				let that = this;
-				refundOrderDetail(that.orderId).then(res => {
-					that.$set(that, 'orderInfo', res.data);
-					that.expressList = res.data.express_list;
-					that.refundInfo.id = res.data.id;
-				});
-			},
-			bindPickerChange(e) {
-				this.$set(this, 'seIndex', e.detail.value);
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.apply-return .list {
-		background-color: #fff;
-		margin-top: 18rpx;
-	}
-
-	.apply-return .list .item {
-		margin-left: 30rpx;
-		padding-right: 30rpx;
-		min-height: 90rpx;
-		border-bottom: 1rpx solid #eee;
-		font-size: 30rpx;
-		color: #333;
-		.input{
-			text-align: right;
-		}
-	}
-
-	.apply-return .list .item .num {
-		color: #282828;
-		width: 427rpx;
-		text-align: right;
-	}
-
-	.apply-return .list .item .num .picker .reason {
-		width: 385rpx;
-	}
-
-	.apply-return .list .item .num .picker .iconfont {
-		color: #666;
-		font-size: 30rpx;
-		margin-top: 2rpx;
-	}
-
-	.apply-return .list .item.textarea {
-		padding: 30rpx 30rpx 30rpx 0;
-	}
-
-	.apply-return .list .item textarea {
-		height: 100rpx;
-		font-size: 30rpx;
-	}
-
-	.apply-return .list .item .placeholder {
-		color: #bbb;
-		font-size: 30rpx;
-		text-align: right;
-	}
-
-	.apply-return .list .item .title {
-		height: 95rpx;
-		width: 100%;
-	}
-
-	.apply-return .list .item .title .tip {
-		font-size: 30rpx;
-		color: #bbb;
-	}
-
-	.apply-return .list .item .upload {
-		padding-bottom: 36rpx;
-	}
-
-	.apply-return .list .item .upload .pictrue {
-		margin: 22rpx 23rpx 0 0;
-		width: 156rpx;
-		height: 156rpx;
-		position: relative;
-		font-size: 24rpx;
-		color: #bbb;
-	}
-
-	.apply-return .list .item .upload .pictrue:nth-of-type(4n) {
-		margin-right: 0;
-	}
-
-	.apply-return .list .item .upload .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 3rpx;
-	}
-
-	.apply-return .list .item .upload .pictrue .icon-guanbi1 {
-		position: absolute;
-		font-size: 45rpx;
-		top: -10rpx;
-		right: -10rpx;
-	}
-
-	.apply-return .list .item .upload .pictrue .icon-icon25201 {
-		color: #bfbfbf;
-		font-size: 50rpx;
-	}
-
-	.apply-return .list .item .upload .pictrue:nth-last-child(1) {
-		border: 1rpx solid #ddd;
-		box-sizing: border-box;
-	}
-
-	.apply-return .returnBnt {
-		font-size: 32rpx;
-		color: #fff;
-		width: 690rpx;
-		height: 86rpx;
-		border-radius: 50rpx;
-		text-align: center;
-		line-height: 86rpx;
-		margin: 43rpx auto;
-	}
-
-	.goodsStyle .text .name {
-		align-self: flex-start;
-	}
-
-	.list /deep/ .uni-input-input {
-		text-align: right;
-	}
+<template>
+	<view :style="colorStyle">
+		<form @submit="subRefund">
+			<view class='apply-return'>
+				<view class='goodsStyle acea-row row-between' v-for="(item,index) in orderInfo.cart_info" :key="index">
+					<view class='pictrue'>
+						<image :src='item.productInfo.attrInfo?item.productInfo.attrInfo.image:item.productInfo.image'>
+						</image>
+					</view>
+					<view class='text acea-row row-between'>
+						<view class='name line2'>{{item.productInfo.store_name}}</view>
+						<view class='money'>
+							<view>{{$t(`￥`)}}{{item.truePrice }}</view>
+							<view class='num'>x{{item.cart_num }}</view>
+						</view>
+					</view>
+				</view>
+				<view class='list'>
+					<view class='item acea-row row-between-wrapper' v-if="expressList.length">
+						<view>{{$t(`快递公司`)}}</view>
+						<picker class='num' @change="bindPickerChange" :value="seIndex" :range="expressList"
+							range-key="name">
+							<view class="picker acea-row row-between-wrapper">
+								<view class='reason'>{{expressList[seIndex].name}}</view>
+								<text class='iconfont icon-jiantou'></text>
+							</view>
+						</picker>
+					</view>
+					<view class='item acea-row row-between-wrapper'>
+						<view>{{$t(`快递单号`)}}</view>
+						<input class="input" type="text" :placeholder="$t(`填写快递单号`)" placeholder-class='placeholder'
+							v-model="refundInfo.refund_express" />
+					</view>
+					<view class='item acea-row row-between-wrapper'>
+						<view>{{$t(`联系电话`)}}</view>
+						<input class="input" type="number" :placeholder="$t(`请输入手机号`)" placeholder-class='placeholder'
+							v-model="refundInfo.refund_phone" />
+					</view>
+					<view class='item textarea acea-row row-between'>
+						<view>{{$t(`备注说明`)}}</view>
+						<textarea :placeholder='$t(`填写备注信息，100字以内`)' class='num'
+							v-model="refundInfo.refund_explain"></textarea>
+					</view>
+					<view class='item acea-row row-between'>
+						<view class='title acea-row row-between-wrapper'>
+							<view>{{$t(`上传图片`)}}</view>
+							<view class='tip'>{{$t(`最多可上传3张`)}}</view>
+						</view>
+						<view class='upload acea-row row-middle'>
+							<view class='pictrue' v-for="(item,index) in refund_reason_wap_img" :key="index">
+								<image :src='item'></image>
+								<view class='iconfont icon-guanbi1 font-num' @tap='DelPic(index)'></view>
+							</view>
+							<view class='pictrue acea-row row-center-wrapper row-column' @tap='uploadpic'
+								v-if="refund_reason_wap_img.length < 3">
+								<text class='iconfont icon-icon25201'></text>
+								<view>{{$t(`上传图片`)}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<button class='returnBnt bg-color' form-type="submit">{{$t(`提交`)}}</button>
+			</view>
+		</form>
+	</view>
+</template>
+<script>
+	import {
+		refundOrderDetail,
+		refundExpress
+	} from '@/api/order.js';
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import colors from '@/mixins/color.js';
+	export default {
+		mixins: [colors],
+		data() {
+			return {
+				expressList: [],
+				orderInfo: {},
+				seIndex: 0,
+				refund_reason_wap_img: [],
+				refundInfo: {
+					refund_express: '',
+					refund_phone: '',
+					refund_explain: '',
+					id: '',
+					refund_express_name: '',
+					refund_img: ''
+				}
+			};
+		},
+		computed: mapGetters(['isLogin']),
+		watch: {
+			isLogin: {
+				handler: function(newV, oldV) {
+					if (newV) {
+						this.getOrderInfo();
+					}
+				},
+				deep: true
+			}
+		},
+		onLoad(options) {
+			this.orderId = options.orderId;
+			if (this.isLogin) {
+				this.getOrderInfo();
+			} else {
+				toLogin();
+			}
+		},
+		methods: {
+			/**
+			 * 申请退货
+			 */
+			subRefund: function(e) {
+				let that = this
+				if (!that.refundInfo.refund_express) return this.$util.Tips({
+					title: that.$t(`填写快递单号`)
+				});
+				if (!that.refundInfo.refund_phone) return this.$util.Tips({
+					title: that.$t(`请输入手机号`)
+				});
+				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.refundInfo.refund_phone)) return this.$util.Tips({
+					title: that.$t(`请输入正确的手机号码`)
+				});
+				that.refundInfo.refund_express_name = that.expressList[that.seIndex].name;
+				that.refundInfo.refund_img = that.refund_reason_wap_img.join(',');
+				refundExpress(that.refundInfo).then(res => {
+					return this.$util.Tips({
+						title: res.msg,
+						icon: 'success'
+					}, {
+						tab: 5,
+						url: '/pages/users/user_return_list/index?isT=1'
+					});
+				}).catch(err => {
+					return this.$util.Tips({
+						title: err
+					});
+				})
+			},
+			/**
+			 * 删除图片
+			 * 
+			 */
+			DelPic: function(e) {
+				let index = e,
+					that = this,
+					pic = this.refund_reason_wap_img[index];
+				that.refund_reason_wap_img.splice(index, 1);
+				that.$set(that, 'refund_reason_wap_img', that.refund_reason_wap_img);
+			},
+
+			/**
+			 * 上传文件
+			 * 
+			 */
+			uploadpic: function() {
+				let that = this;
+				this.$util.uploadImageOne('upload/image', function(res) {
+					that.refund_reason_wap_img.push(res.data.url);
+					that.$set(that, 'refund_reason_wap_img', that.refund_reason_wap_img);
+				});
+			},
+			/**
+			 * 获取订单详情
+			 * 
+			 */
+			getOrderInfo: function() {
+				let that = this;
+				refundOrderDetail(that.orderId).then(res => {
+					that.$set(that, 'orderInfo', res.data);
+					that.expressList = res.data.express_list;
+					that.refundInfo.id = res.data.id;
+				});
+			},
+			bindPickerChange(e) {
+				this.$set(this, 'seIndex', e.detail.value);
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.apply-return .list {
+		background-color: #fff;
+		margin-top: 18rpx;
+	}
+
+	.apply-return .list .item {
+		margin-left: 30rpx;
+		padding-right: 30rpx;
+		min-height: 90rpx;
+		border-bottom: 1rpx solid #eee;
+		font-size: 30rpx;
+		color: #333;
+
+		.input {
+			text-align: right;
+		}
+	}
+
+	.apply-return .list .item .num {
+		color: #282828;
+		width: 427rpx;
+		text-align: right;
+	}
+
+	.apply-return .list .item .num .picker .reason {
+		width: 385rpx;
+	}
+
+	.apply-return .list .item .num .picker .iconfont {
+		color: #666;
+		font-size: 30rpx;
+		margin-top: 2rpx;
+	}
+
+	.apply-return .list .item.textarea {
+		padding: 30rpx 30rpx 30rpx 0;
+	}
+
+	.apply-return .list .item textarea {
+		height: 100rpx;
+		font-size: 30rpx;
+	}
+
+	.apply-return .list .item .placeholder {
+		color: #bbb;
+		font-size: 30rpx;
+		text-align: right;
+	}
+
+	.apply-return .list .item .title {
+		height: 95rpx;
+		width: 100%;
+	}
+
+	.apply-return .list .item .title .tip {
+		font-size: 30rpx;
+		color: #bbb;
+	}
+
+	.apply-return .list .item .upload {
+		padding-bottom: 36rpx;
+	}
+
+	.apply-return .list .item .upload .pictrue {
+		margin: 22rpx 23rpx 0 0;
+		width: 156rpx;
+		height: 156rpx;
+		position: relative;
+		font-size: 24rpx;
+		color: #bbb;
+	}
+
+	.apply-return .list .item .upload .pictrue:nth-of-type(4n) {
+		margin-right: 0;
+	}
+
+	.apply-return .list .item .upload .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 3rpx;
+	}
+
+	.apply-return .list .item .upload .pictrue .icon-guanbi1 {
+		position: absolute;
+		font-size: 45rpx;
+		top: -10rpx;
+		right: -10rpx;
+	}
+
+	.apply-return .list .item .upload .pictrue .icon-icon25201 {
+		color: #bfbfbf;
+		font-size: 50rpx;
+	}
+
+	.apply-return .list .item .upload .pictrue:nth-last-child(1) {
+		border: 1rpx solid #ddd;
+		box-sizing: border-box;
+	}
+
+	.apply-return .returnBnt {
+		font-size: 32rpx;
+		color: #fff;
+		width: 690rpx;
+		height: 86rpx;
+		border-radius: 50rpx;
+		text-align: center;
+		line-height: 86rpx;
+		margin: 43rpx auto;
+	}
+
+	.goodsStyle .text .name {
+		align-self: flex-start;
+	}
+
+	.list /deep/ .uni-input-input {
+		text-align: right;
+	}
 </style>
diff --git a/template/uni-app/pages/goods_details/index.vue b/template/uni-app/pages/goods_details/index.vue
index 2e6115abc..186877bbb 100644
--- a/template/uni-app/pages/goods_details/index.vue
+++ b/template/uni-app/pages/goods_details/index.vue
@@ -67,7 +67,7 @@
 								</view>
 								<view class="iconfont icon-fenxiang" @click="listenerActionSheet"></view>
 							</view>
-							<view class="introduce" v-text="storeInfo.store_name"></view>
+							<view class="introduce" v-text="storeInfo.store_name || ''"></view>
 							<view class="limit_good" v-if="storeInfo.limit_type > 0">
 								{{storeInfo.limit_type == 1 ? $t(`单次限购`) : $t(`永久限购`)}}{{storeInfo.limit_num}}{{$t(storeInfo.unit_name)}}
 							</view>
diff --git a/template/uni-app/pages/users/promoter-list/index.vue b/template/uni-app/pages/users/promoter-list/index.vue
index 64fa475fd..56707f3b9 100644
--- a/template/uni-app/pages/users/promoter-list/index.vue
+++ b/template/uni-app/pages/users/promoter-list/index.vue
@@ -227,7 +227,9 @@
 			}
 		},
 		onReachBottom: function() {
-			this.userSpreadNewList();
+			if (this.teamCount > this.recordList.length) {
+				this.userSpreadNewList();
+			}
 		}
 	}
 </script>
@@ -370,7 +372,7 @@
 	.no-data {
 		background-color: #fff;
 		padding-bottom: 30rpx;
-		padding: 180rpx 0 300rpx;
+		padding: 180rpx 0 calc(100vh - 1030rpx);
 
 		.emptyBox {
 			text-align: center;