diff --git a/src/api/shop/index.js b/src/api/shop/index.js
index 689ae65..6996fdb 100644
--- a/src/api/shop/index.js
+++ b/src/api/shop/index.js
@@ -12,13 +12,13 @@ const api = {
 
 /**
  * 商户列表
- * @param {*} data
+ * @param {*} params
  */
-export function shopList(data) {
+export function shopList(params) {
   return axios({
     url: api.shopList,
     method: 'get',
-    data
+    params
   })
 }
 
diff --git a/src/views/goods/Index.vue b/src/views/goods/Index.vue
index 065308c..d97abc0 100644
--- a/src/views/goods/Index.vue
+++ b/src/views/goods/Index.vue
@@ -34,6 +34,13 @@
               </a-select-option>
             </a-select>
           </a-form-item>
+          <a-form-item label="商户">
+            <a-select @change="changeMerchant" placeholder="请选择">
+              <a-select-option :value="item.merchant_id" v-for="item in merchantList" :key="item.merchant_id">
+                {{ item.name }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
           <a-form-item label="商品价格">
             <div style="display: flex" class="goodsType">
               <a-input v-decorator="['goods_price_min']" placeholder="请输入" /><span style="padding: 0 3px 0 5px">-</span>
@@ -59,6 +66,8 @@
             <a-radio-button value="on_sale">出售中</a-radio-button>
             <a-radio-button value="off_sale">已下架</a-radio-button>
             <a-radio-button value="sold_out">已售罄</a-radio-button>
+            <a-radio-button value="in_pool">已入池</a-radio-button>
+            <a-radio-button value="out_pool">未入池</a-radio-button>
           </a-radio-group>
         </div>
         <a-button v-if="$auth('/goods/create') && (storeVersion === 0 || (storeVersion === 1 && isSuper === 0))" class="fl-l" type="primary" icon="plus" @click="handleCreate()">创建商品</a-button>
@@ -142,6 +151,7 @@
 
 <script>
 import * as GoodsApi from '@/api/goods'
+import * as ShopApi from '@/api/shop'
 import { ContentHeader, STable } from '@/components'
 import CategoryModel from '@/common/model/Category'
 import store from '../../store'
@@ -271,6 +281,7 @@ export default {
         listType: 'all',
         spec_type: '',
         channel: '',
+        merchant_id: ''
       },
       // 正在加载
       isLoading: false,
@@ -305,6 +316,7 @@ export default {
         { name: '多规格', val: 20 },
       ],
       checkList: [],
+      merchantList: []
     }
   },
   created() {
@@ -315,6 +327,7 @@ export default {
     // 获取商品分类列表
     this.getCategoryList()
     this.getDataList() // 渠道
+    this.getShopList() // 商户
   },
   computed: {
     rowSelection() {
@@ -357,6 +370,8 @@ export default {
         (this.queryParam.categoryId || '') +
         '&channel=' +
         this.queryParam.channel +
+        '&merchant_id=' +
+        this.queryParam.merchant_id +
         '&goodsIds=' +
         goodsIds +
         '&Access-Token=' +
@@ -367,6 +382,23 @@ export default {
     getChannel(val) {
       this.queryParam.channel = val
     },
+    changeMerchant(val) {
+      this.queryParam.merchant_id = val
+    },
+    // 获取商户列表
+    getShopList() {
+      this.isLoading = true
+      ShopApi.shopList({ page: 1, pageSize: 10000 })
+        .then((result) => {
+          const data = result.data.data
+          for (const shop of data) {
+            shop.name = shop.shop_name
+          }
+          this.merchantList = data
+          this.isLoading = false
+        })
+        .finally(() => (this.isLoading = false))
+    },
     getDataList() {
       return GoodsApi.getDataList().then((result) => {
         const obj = result.data
diff --git a/src/views/setting/payment/template/Create.vue b/src/views/setting/payment/template/Create.vue
index bcec67a..9b4bb5c 100644
--- a/src/views/setting/payment/template/Create.vue
+++ b/src/views/setting/payment/template/Create.vue
@@ -16,7 +16,7 @@
         >
           <a-input v-model="record.name" autocomplete="off" />
           <div class="form-item-help">
-            <small>仅用于后台管理使用，对前台用户不可见；例如：H5端-支付宝支付；微信小程序端-微信支付</small>
+            <small>必须填写商户平台-营业执照名称，否则会影响分账功能</small>
           </div>
         </a-form-model-item>
         <a-form-model-item label="管理员备注" prop="remarks">
@@ -540,4 +540,4 @@ export default {
     padding-left: 0;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/setting/payment/template/Update.vue b/src/views/setting/payment/template/Update.vue
index 1672bdf..52362ef 100644
--- a/src/views/setting/payment/template/Update.vue
+++ b/src/views/setting/payment/template/Update.vue
@@ -16,7 +16,7 @@
         >
           <a-input v-model="record.name" autocomplete="off" />
           <div class="form-item-help">
-            <small>仅用于后台管理使用，对前台用户不可见；例如：H5端-支付宝支付；微信小程序端-微信支付</small>
+            <small>必须填写商户平台-营业执照名称，否则会影响分账功能</small>
           </div>
         </a-form-model-item>
         <a-form-model-item label="管理员备注" prop="remarks">
@@ -565,4 +565,4 @@ export default {
     padding-left: 0;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/shop/Index.vue b/src/views/shop/Index.vue
index 8435356..60ddcec 100644
--- a/src/views/shop/Index.vue
+++ b/src/views/shop/Index.vue
@@ -4,14 +4,12 @@
     <div class="table-operator">
       <a-button v-action:add type="primary" icon="plus" @click="handleAdd">新增</a-button>
     </div>
-    <a-table
+    <s-table
+      ref="table"
       rowKey="merchant_id"
       :columns="columns"
-      :dataSource="shopList"
-      :defaultExpandAllRows="true"
-      :expandIconColumnIndex="1"
+      :data="loadData"
       :pagination="pagination"
-      :loading="isLoading"
     >
       <span slot="logoImage" slot-scope="text, item">
         <a v-if="item.logoImage" title="点击查看原图" :href="item.logoImage.external_url" target="_blank">
@@ -27,9 +25,9 @@
           <a v-action:delete @click="handleDelete(item)">删除</a>
         </template>
       </span>
-    </a-table>
-    <AddForm ref="AddForm" @handleSubmit="handleRefresh" />
-    <EditForm ref="EditForm" @handleSubmit="handleRefresh" />
+    </s-table>
+    <AddForm ref="AddForm" @handleSubmit="handleRefresh(true)" />
+    <EditForm ref="EditForm" @handleSubmit="handleRefresh()" />
   </a-card>
 </template>
 
@@ -47,7 +45,11 @@ export default {
   },
   data() {
     return {
-      shopList: [],
+      loadData: (param) => {
+        return Api.shopList({ ...param }).then((response) => {
+          return response.data
+        })
+      },
       // 表头
       columns: [
         {
@@ -93,10 +95,7 @@ export default {
       ]
     }
   },
-  created() {
-    // 获取分类列表
-    this.getShopList()
-  },
+  created() {},
   methods: {
     // 新增商户
     async handleAdd () {
@@ -109,20 +108,9 @@ export default {
       this.$refs.EditForm.add(record)
     },
     // 刷新列表
-    handleRefresh () {
+    handleRefresh (bool = false) {
       // 获取分类列表
-      this.getShopList()
-    },
-    // 获取商户列表
-    getShopList() {
-      this.isLoading = true
-      Api.shopList()
-        .then((result) => {
-          console.log(result)
-          this.shopList = result.data.data
-          this.isLoading = false
-        })
-        .finally(() => (this.isLoading = false))
+      this.$refs.table.refresh(bool)
     },
     // 删除记录
     handleDelete(record) {
@@ -134,7 +122,7 @@ export default {
           return Api.deleteShop({ merchantId: record['merchant_id'] })
             .then((result) => {
               self.$message.success(result.message, 1.5)
-              self.handleRefresh()
+              self.handleRefresh(true)
             })
             .finally(() => modal.destroy())
         }