diff --git a/src/views/setting/gmall/order.vue b/src/views/setting/gmall/order.vue
index fd91f0c..de8a9d1 100644
--- a/src/views/setting/gmall/order.vue
+++ b/src/views/setting/gmall/order.vue
@@ -1,66 +1,78 @@
 <template>
-	<a-card :bordered="false">
-		<div class="card-title">{{ $route.meta.title }}</div>
-		<div class="table-operator">
-			<!-- 搜索板块 -->
-			<a-row class="row-item-search">
-				<a-form class="search-form" :form="searchForm" layout="inline" @submit="handleSearch">
-					<a-form-item label="订单号">
-						<a-input v-decorator="['search']" placeholder="请输入订单号" />
-					</a-form-item>
-					<a-form-item label="支付状态">
-						<a-select v-decorator="['pay_status', { initialValue: 0 }]">
-							<a-select-option :value="0">全部</a-select-option>
-							<a-select-option :value="10">待支付</a-select-option>
-							<a-select-option :value="20">已支付</a-select-option>
-						</a-select>
-					</a-form-item>
-					<a-form-item label="订单类型">
-						<a-select v-decorator="['order_type', { initialValue: 0 }]">
-							<a-select-option :value="0">全部</a-select-option>
-							<a-select-option :value="10">会员</a-select-option>
-							<a-select-option :value="20">分销商 </a-select-option>
-						</a-select>
-					</a-form-item>
-					<a-form-item label="支付方式">
-						<a-select v-decorator="['pay_method', { initialValue: 0 }]">
-							<a-select-option :value="0">全部</a-select-option>
-							<a-select-option :value="'wechat'">微信支付</a-select-option>
-							<a-select-option :value="'balance'">余额支付 </a-select-option>
-						</a-select>
-					</a-form-item>
-					<a-form-item label="付款时间">
-						<a-range-picker format="YYYY-MM-DD" style="width:220px" v-decorator="['pay_time']" />
-					</a-form-item>
-					<a-form-item class="search-btn">
-						<a-button type="primary" icon="search" html-type="submit">搜索</a-button>
-					</a-form-item>
-				</a-form>
-			</a-row>
-		</div>
-		<s-table ref="table" rowKey="order_id" :loading="isLoading" :columns="columns" :data="loadData" :pagination="pagination">
-				 <!-- 充值方式 -->
-			<span slot="order_type" slot-scope="text">
-				<a-tag  v-if="text==10">会员</a-tag>
-				<a-tag  v-if="text==20">分销商</a-tag>
-			</span>
-            <!-- 时效 -->
-			<span slot="month" slot-scope="text">
-				<p class="twoline-hide">{{ text }}个月</p>
-			</span>
-			<!-- 支付方式  -->
-			<span slot="pay_method" slot-scope="text">
-				 <a-tag v-if="text">{{ text=='wechat'?'微信支付':'余额支付' }}</a-tag>
-			</span>
-			<!-- 状态 -->
-			<span slot="pay_status" slot-scope="text">
-				<a-tag :color="text == 20 ? 'green' : ''">{{ text == 20 ? '已支付' : '待支付' }}</a-tag>
-			</span>
-			<span slot="pay_time" slot-scope="text">
-				<span>{{ text | formatDate }}</span>
-			</span>
-		</s-table>
-	</a-card>
+  <a-card :bordered="false">
+    <div class="card-title">{{ $route.meta.title }}</div>
+    <div class="table-operator">
+      <!-- 搜索板块 -->
+      <a-row class="row-item-search">
+        <a-form class="search-form" :form="searchForm" layout="inline" @submit="handleSearch">
+          <a-form-item label="订单号">
+            <a-input v-decorator="['search']" placeholder="请输入订单号" />
+          </a-form-item>
+          <a-form-item label="支付状态">
+            <a-select v-decorator="['pay_status', { initialValue: 0 }]">
+              <a-select-option :value="0">全部</a-select-option>
+              <a-select-option :value="10">待支付</a-select-option>
+              <a-select-option :value="20">已支付</a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item label="订单类型">
+            <a-select v-decorator="['order_type', { initialValue: 0 }]">
+              <a-select-option :value="0">全部</a-select-option>
+              <a-select-option :value="10">零售商城</a-select-option>
+              <a-select-option :value="20">批发商城 </a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item label="支付方式">
+            <a-select v-decorator="['pay_method', { initialValue: 0 }]">
+              <a-select-option :value="0">全部</a-select-option>
+              <a-select-option :value="'wechat'">微信支付</a-select-option>
+              <a-select-option :value="'balance'">余额支付 </a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item label="付款时间">
+            <a-range-picker format="YYYY-MM-DD" style="width: 220px" v-decorator="['pay_time']" />
+          </a-form-item>
+          <a-form-item class="search-btn">
+            <a-button type="primary" icon="search" html-type="submit">搜索</a-button>
+          </a-form-item>
+        </a-form>
+      </a-row>
+    </div>
+    <s-table
+      ref="table"
+      rowKey="order_id"
+      :loading="isLoading"
+      :columns="columns"
+      :data="loadData"
+      :pagination="pagination"
+    >
+      <!-- 会员信息 -->
+      <span slot="user" slot-scope="text">
+        <UserItem :user="text" />
+      </span>
+      <!-- 充值方式 -->
+      <span slot="order_type" slot-scope="text">
+        <a-tag v-if="text == 10">零售商城</a-tag>
+        <a-tag v-if="text == 20">批发商城</a-tag>
+      </span>
+      <!-- 时效 -->
+      <span slot="month" slot-scope="text">
+        <p class="twoline-hide">{{ text }}个月</p>
+      </span>
+      <span slot="year" slot-scope="text"> {{ text }}年 </span>
+      <!-- 支付方式  -->
+      <span slot="pay_method" slot-scope="text">
+        <a-tag v-if="text">{{ text == 'wechat' ? '微信支付' : '余额支付' }}</a-tag>
+      </span>
+      <!-- 状态 -->
+      <span slot="pay_status" slot-scope="text">
+        <a-tag :color="text == 20 ? 'green' : ''">{{ text == 20 ? '已支付' : '待支付' }}</a-tag>
+      </span>
+      <span slot="pay_time" slot-scope="text">
+        <span>{{ text | formatDate }}</span>
+      </span>
+    </s-table>
+  </a-card>
 </template>
   
   <script>
@@ -99,16 +111,26 @@ export default {
           title: 'ID',
           dataIndex: 'order_id',
         },
+        {
+          title: '会员信息',
+          dataIndex: 'user',
+          scopedSlots: { customRender: 'user' },
+        },
         {
           title: '订单号',
           dataIndex: 'order_no',
         },
-		{
+        {
           title: '订单类型',
           dataIndex: 'order_type',
-		   scopedSlots: { customRender: 'order_type' }
+          scopedSlots: { customRender: 'order_type' },
         },
-          {
+        {
+          title: '时效',
+          dataIndex: 'year',
+          scopedSlots: { customRender: 'year' },
+        },
+        {
           title: '订单金额',
           dataIndex: 'order_price',
         },