From f9417ba5ec255a9933d67c239773d851f3ba10fa Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Tue, 4 Jul 2023 09:46:41 +0800
Subject: [PATCH] =?UTF-8?q?improve:=20=E5=90=8E=E5=8F=B0=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/src/components/Pagination/index.vue |  115 ++
 template/admin/src/components/cards/cards.vue |   14 +-
 .../admin/src/components/couponList/index.vue |  325 ++-
 .../src/components/customerInfo/index.vue     |  257 ++-
 .../admin/src/components/dateRadio/index.vue  |    6 +-
 .../components/diyComponents/c_bg_color.vue   |    8 +-
 .../components/diyComponents/c_hot_word.vue   |    6 +-
 .../components/diyComponents/c_input_list.vue |   20 +-
 .../diyComponents/c_input_number.vue          |   14 +-
 .../components/diyComponents/c_is_show.vue    |    8 +-
 .../src/components/diyComponents/c_select.vue |   21 +-
 .../src/components/diyComponents/c_tab.vue    |    8 +-
 .../components/diyComponents/c_tab_bar.vue    |   20 +-
 .../components/diyComponents/c_txt_list.vue   |   32 +-
 .../components/diyComponents/c_txt_tab.vue    |   16 +-
 .../diyComponents/c_upload_list.vue           |    8 +-
 .../src/components/freightTemplate/city.vue   |   32 +-
 .../src/components/freightTemplate/index.vue  |  469 ++---
 template/admin/src/components/from/from.vue   |   10 +-
 .../admin/src/components/goodsList/index.vue  |  187 +-
 .../admin/src/components/iconFrom/index.vue   |    4 +-
 .../admin/src/components/labelList/index.vue  |    4 +-
 .../src/components/linkaddress/index.vue      |  174 +-
 .../mobileConfigDiy/c_home_service.vue        |    4 +-
 .../mobileConfigDiy/c_news_roll.vue           |    4 +-
 .../mobileConfigDiy/c_search_box.vue          |    4 +-
 .../components/mobileConfigDiy/pageFoot.vue   |    4 +-
 .../components/mobileConfigDiy/pageTitle.vue  |   44 +-
 .../mobileConfigRightDiy/c_bg_color.vue       |    8 +-
 .../mobileConfigRightDiy/c_cascader.vue       |   10 +-
 .../mobileConfigRightDiy/c_foot.vue           |   18 +-
 .../mobileConfigRightDiy/c_hot_imgs.vue       |    4 +-
 .../mobileConfigRightDiy/c_hot_word.vue       |    6 +-
 .../mobileConfigRightDiy/c_input_item.vue     |   10 +-
 .../mobileConfigRightDiy/c_input_number.vue   |   16 +-
 .../mobileConfigRightDiy/c_is_show.vue        |    8 +-
 .../mobileConfigRightDiy/c_menu_list.vue      |   10 +-
 .../mobileConfigRightDiy/c_pictrue.vue        |    2 +-
 .../mobileConfigRightDiy/c_product.vue        |   12 +-
 .../mobileConfigRightDiy/c_select.vue         |   16 +-
 .../mobileConfigRightDiy/c_set_up.vue         |    8 +-
 .../mobileConfigRightDiy/c_slider.vue         |   10 +-
 .../mobileConfigRightDiy/c_status.vue         |    8 +-
 .../components/mobileConfigRightDiy/c_tab.vue |    8 +-
 .../mobileConfigRightDiy/c_txt_tab.vue        |   16 +-
 .../src/components/modelSure/modelSure.vue    |    4 +-
 .../src/components/newsCategory/index.vue     |   44 +-
 .../src/components/publicSearchFrom/index.vue |   74 +-
 .../admin/src/components/remark/index.vue     |   14 +-
 .../admin/src/components/rightBtn/index.vue   |    2 +-
 .../src/components/rightConfig/index.vue      |    2 +-
 .../src/components/searchFrom/searchFrom.vue  |   82 +-
 .../src/components/sendCoupons/index.vue      |   50 +-
 .../admin/src/components/sortList/index.vue   |   65 +-
 .../src/components/systemStore/index.vue      |  158 +-
 .../admin/src/components/upGrade/index.vue    |    4 +-
 .../src/components/uploadPictures/index.vue   |   51 +-
 .../src/components/uploadVideo/index.vue      |   10 +-
 .../src/components/uploadVideo2/index.vue     |   10 +-
 template/admin/src/components/userLabel.vue   |    4 +-
 .../admin/src/components/wangEditor/index.vue |    2 +-
 .../src/components/wangEditor/monaco.vue      |    2 +-
 .../src/layout/component/columnsAside.vue     |   12 +-
 .../src/layout/component/transverseAside.vue  |    9 +-
 .../src/layout/navBars/breadcrumb/setings.vue |   34 +-
 .../src/layout/navBars/breadcrumb/user.vue    |    6 +-
 template/admin/src/main.js                    |   10 +-
 .../admin/src/pages/account/login/index.vue   |   32 +-
 .../admin/src/pages/agent/agentManage.vue     |  205 +-
 .../src/pages/agent/handle/promotersList.vue  |  246 +--
 template/admin/src/pages/app/app/index.vue    |   14 +-
 .../src/pages/app/routine/download/index.vue  |   18 +-
 .../admin/src/pages/app/version/index.vue     |   90 +-
 .../src/pages/app/wechat/menus/index.vue      |  106 +-
 .../pages/app/wechat/newsCategory/save.vue    |   90 +-
 .../src/pages/app/wechat/reply/follow.vue     |   96 +-
 .../src/pages/app/wechat/reply/index.vue      |    2 +-
 .../src/pages/app/wechat/reply/keyword.vue    |  135 +-
 .../pages/app/wechat/user/handle/sendOut.vue  |  188 +-
 .../src/pages/app/wechat/user/message.vue     |  157 +-
 .../admin/src/pages/app/wechat/user/tag.vue   |   66 +-
 .../admin/src/pages/app/wechat/user/user.vue  |  290 ++-
 .../admin/src/pages/cms/addArticle/index.vue  |  130 +-
 .../admin/src/pages/cms/article/index.vue     |  182 +-
 .../admin/src/pages/cms/article/relation.vue  |   58 +-
 .../src/pages/cms/articleCategory/index.vue   |   86 +-
 template/admin/src/pages/crud/index.vue       |   51 +-
 .../src/pages/division/agent/agreement.vue    |   18 +-
 .../src/pages/division/agent/applyList.vue    |  151 +-
 .../admin/src/pages/division/agent/index.vue  |  239 ++-
 .../admin/src/pages/division/list/index.vue   |  339 ++--
 .../admin/src/pages/finance/balance/index.vue |  136 +-
 .../pages/finance/billingRecords/index.vue    |  111 +-
 .../finance/billingRecords/orderDetall.vue    |   74 +-
 .../src/pages/finance/capitalFlow/index.vue   |  148 +-
 .../commission/handle/commissionDetails.vue   |  103 +-
 .../src/pages/finance/commission/index.vue    |   96 +-
 .../components/commissionDetails/index.vue    |  158 +-
 .../finance/financialRecords/bill/index.vue   |  171 +-
 .../financialRecords/recharge/index.vue       |  240 +--
 .../src/pages/finance/userExtract/index.vue   |  248 +--
 .../src/pages/index/components/baseInfo.vue   |   30 +-
 .../src/pages/index/components/gridMenu.vue   |   70 +-
 .../src/pages/index/components/userChart.vue  |   20 +-
 .../src/pages/index/components/visitChart.vue |   36 +-
 template/admin/src/pages/index/hot-search.vue |  103 -
 template/admin/src/pages/index/index.vue      |    7 -
 .../admin/src/pages/index/search-table.vue    |  451 -----
 .../admin/src/pages/index/user-gender.vue     |   49 -
 .../admin/src/pages/index/user-preference.vue |   25 -
 .../admin/src/pages/kefu/appChat/feedback.vue |   30 +-
 .../pages/kefu/appChat/mobile/feedback.vue    |    8 +-
 .../src/pages/kefu/appChat/mobile/index.vue   |    2 +-
 .../admin/src/pages/kefu/components/words.vue |   22 +-
 template/admin/src/pages/kefu/index.vue       |   24 +-
 .../admin/src/pages/kefu/mobile/chat_list.vue |    2 +-
 .../src/pages/kefu/mobile/goods/list.vue      |    2 +-
 .../admin/src/pages/kefu/mobile/index.vue     |   12 +-
 .../src/pages/kefu/mobile/orderList/index.vue |    2 +-
 .../src/pages/kefu/mobile/user/userLabel.vue  |    2 +-
 .../pages/kefu/pc/components/baseHeader.vue   |    4 +-
 .../src/pages/kefu/pc/components/delivery.vue |  150 +-
 .../pages/kefu/pc/components/msgWindow.vue    |   38 +-
 .../pages/kefu/pc/components/order_detail.vue |   74 +-
 .../src/pages/kefu/pc/components/remarks.vue  |   16 +-
 .../pages/kefu/pc/components/rightMenu.vue    |   26 +-
 .../src/pages/kefu/pc/components/transfer.vue |   15 -
 .../pages/kefu/pc/components/userGroup.vue    |    4 +-
 .../pages/kefu/pc/components/userLabel.vue    |    4 +-
 template/admin/src/pages/kefu/pc/index.vue    |    4 +-
 .../channelCode/channelCodeIndex.vue          |  323 ++-
 .../marketing/channelCode/codeStatistic.vue   |   10 +-
 .../marketing/channelCode/createCode.vue      |  105 +-
 .../src/pages/marketing/live/add_goods.vue    |  117 +-
 .../admin/src/pages/marketing/live/anchor.vue |  105 +-
 .../marketing/live/components/add_goods.vue   |    2 +-
 .../src/pages/marketing/live/creat_live.vue   |  205 +-
 .../admin/src/pages/marketing/live/index.vue  |  176 +-
 .../src/pages/marketing/live/live_goods.vue   |  178 +-
 .../src/pages/marketing/lottery/addGoods.vue  |   80 +-
 .../src/pages/marketing/lottery/create.vue    |  451 ++---
 .../src/pages/marketing/lottery/index.vue     |  290 ++-
 .../pages/marketing/lottery/recordingList.vue |  283 ++-
 .../pages/marketing/point_record/index.vue    |  132 +-
 .../pages/marketing/point_statistic/index.vue |  130 +-
 .../src/pages/marketing/recharge/index.vue    |   63 +-
 .../admin/src/pages/marketing/sign/index.vue  |   78 +-
 .../marketing/storeBargain/bargainList.vue    |  206 +-
 .../pages/marketing/storeBargain/create.vue   |  388 ++--
 .../pages/marketing/storeBargain/index.vue    |  215 +-
 .../marketing/storeBargain/statistics.vue     |  193 +-
 .../storeCombination/combinaList.vue          |  247 ++-
 .../marketing/storeCombination/create.vue     |  419 ++--
 .../marketing/storeCombination/index.vue      |  302 ++-
 .../marketing/storeCombination/statistics.vue |  210 +-
 .../src/pages/marketing/storeCoupon/index.vue |  145 +-
 .../marketing/storeCouponIssue/create.vue     |  180 +-
 .../marketing/storeCouponIssue/index.vue      |  356 ++--
 .../pages/marketing/storeCouponUser/index.vue |  184 +-
 .../storeIntegral/addStoreIntegral.vue        |  618 ------
 .../pages/marketing/storeIntegral/create.vue  |  254 +--
 .../pages/marketing/storeIntegral/index.vue   |  259 ++-
 .../components/tableExpand.vue                |   16 +-
 .../components/tableFrom.vue                  |   76 +-
 .../components/tableList.vue                  |  195 +-
 .../storeIntegralOrder/handle/autoSend.vue    |  103 +-
 .../handle/orderDetails.vue                   |   90 +-
 .../storeIntegralOrder/handle/orderRecord.vue |   33 +-
 .../storeIntegralOrder/handle/orderRemark.vue |   14 +-
 .../storeIntegralOrder/handle/orderSend.vue   |  121 +-
 .../storeIntegralOrder/handle/queueList.vue   |  221 ++-
 .../storeIntegralOrder/orderlistDetails.vue   |    4 +-
 .../pages/marketing/storePresell/create.vue   |  310 ++-
 .../pages/marketing/storePresell/index.vue    |  262 ++-
 .../marketing/storePresell/presellList.vue    |  229 ++-
 .../pages/marketing/storeSeckill/create.vue   |  378 ++--
 .../pages/marketing/storeSeckill/index.vue    |  194 +-
 .../marketing/storeSeckill/statistics.vue     |  101 +-
 .../pages/marketing/systemConfig/index.vue    |    2 +-
 .../src/pages/marketing/userPoint/index.vue   |  138 +-
 .../smsConfig/components/forgetPassword.vue   |   72 +-
 .../smsConfig/components/forgetPhone.vue      |   72 +-
 .../notify/smsConfig/components/loginFrom.vue |   30 +-
 .../notify/smsConfig/components/register.vue  |   62 +-
 .../src/pages/notify/smsConfig/index.vue      |   34 +-
 .../src/pages/notify/smsConfig/tableList.vue  |  296 +--
 .../admin/src/pages/notify/smsPay/index.vue   |  104 +-
 .../pages/notify/smsTemplateApply/index.vue   |  145 +-
 .../admin/src/pages/order/invoice/index.vue   |  353 ++--
 .../src/pages/order/invoice/orderDetall.vue   |   74 +-
 .../admin/src/pages/order/offline/index.vue   |  152 +-
 .../orderList/components/tableExpand.vue      |   36 +-
 .../order/orderList/components/tableFrom.vue  |  136 +-
 .../order/orderList/components/tableList.vue  |  463 ++---
 .../order/orderList/handle/orderDetails.vue   |  160 +-
 .../order/orderList/handle/orderRecord.vue    |   58 +-
 .../order/orderList/handle/orderRemark.vue    |   14 +-
 .../order/orderList/handle/orderSend.vue      |  131 +-
 .../admin/src/pages/order/orderList/index.vue |  109 +-
 .../src/pages/order/orderList/splitList.vue   |  890 ---------
 .../admin/src/pages/order/refund/index.vue    |  350 ++--
 .../admin/src/pages/product/list_wait.vue     |  286 ---
 .../src/pages/product/productAdd/index.vue    | 1761 +++++++++--------
 .../src/pages/product/productAdd/taoBao.vue   |   22 +-
 .../src/pages/product/productAttr/addAttr.vue |   74 +-
 .../src/pages/product/productAttr/index.vue   |  150 +-
 .../pages/product/productClassify/index.vue   |   82 +-
 .../product/productList/attribute/index.vue   |   40 +-
 .../src/pages/product/productList/index.vue   |  541 +++--
 .../pages/product/productList/tableExpand.vue |   28 +-
 .../src/pages/product/productList/taoBao.vue  |  478 +++--
 .../src/pages/product/productReply/index.vue  |  243 ++-
 .../admin/src/pages/product/tableExpand.vue   |   48 +-
 .../src/pages/setting/agreement/index.vue     |   42 +-
 .../src/pages/setting/cityDada/index.vue      |   61 +-
 .../src/pages/setting/clerkList/index.vue     |  152 +-
 .../pages/setting/deliveryService/index.vue   |  116 +-
 .../setting/devise/components/uploadPic.vue   |    8 +-
 .../src/pages/setting/devise/diyIndex.vue     |   36 +-
 .../src/pages/setting/devise/goodClass.vue    |    4 +-
 .../admin/src/pages/setting/devise/index.vue  |   14 +-
 .../admin/src/pages/setting/devise/links.vue  |    4 +-
 .../admin/src/pages/setting/devise/list.vue   |  263 ++-
 .../src/pages/setting/devise/template.vue     |    6 +-
 .../admin/src/pages/setting/devise/users.vue  |   76 +-
 .../src/pages/setting/devisePage/index.vue    |    8 +-
 .../src/pages/setting/devisePage/links.vue    |    4 +-
 .../src/pages/setting/devisePage/list.vue     |  167 +-
 .../admin/src/pages/setting/freight/index.vue |  109 +-
 .../pages/setting/membershipLevel/index.vue   |  265 ++-
 .../pages/setting/multiLanguage/country.vue   |   92 +-
 .../pages/setting/multiLanguage/langList.vue  |  190 +-
 .../src/pages/setting/multiLanguage/list.vue  |  150 +-
 .../src/pages/setting/notification/index.vue  |  264 ++-
 .../setting/notification/notificationEdit.vue |  207 +-
 .../admin/src/pages/setting/setApp/index.vue  |   12 +-
 .../src/pages/setting/setSystem/index.vue     |   23 +-
 .../pages/setting/shippingTemplates/index.vue |  143 +-
 .../admin/src/pages/setting/storage/index.vue |  387 ++--
 .../src/pages/setting/storeList/index.vue     |  200 +-
 .../pages/setting/storeService/feedback.vue   |  147 +-
 .../src/pages/setting/storeService/index.vue  |  389 ++--
 .../setting/storeService/speechcraft.vue      |  185 +-
 .../src/pages/setting/systemAdmin/index.vue   |  190 +-
 .../systemMenus/components/menusFrom.vue      |   80 +-
 .../src/pages/setting/systemMenus/index.vue   |   74 +-
 .../pages/setting/systemOutAccount/index.vue  |  322 ++-
 .../setting/systemOutInterface/debugging.vue  |   34 +-
 .../setting/systemOutInterface/index.vue      |  169 +-
 .../src/pages/setting/systemRole/index.vue    |  190 +-
 .../src/pages/setting/systemStore/index.vue   |  148 +-
 .../src/pages/setting/themeStyle/index.vue    |   38 +-
 .../admin/src/pages/setting/user/index.vue    |   50 +-
 .../src/pages/setting/userFile/index.vue      |   34 +-
 .../src/pages/setting/verifyOrder/index.vue   |  263 ++-
 .../src/pages/statistic/balance/index.vue     |  126 +-
 .../src/pages/statistic/integral/index.vue    |   36 +-
 .../admin/src/pages/statistic/order/index.vue |  127 +-
 .../product/components/productInfo.vue        |   14 +-
 .../product/components/productRanking.vue     |  169 +-
 .../transaction/components/toDay.vue          |   16 +-
 .../transaction/components/transaction.vue    |   14 +-
 .../statistic/user/components/userInfo.vue    |   20 +-
 .../statistic/user/components/userRegion.vue  |   44 +-
 .../statistic/user/components/wechetInfo.vue  |    8 +-
 .../admin/src/pages/statistic/user/index.vue  |   40 +-
 .../src/pages/system/auth/index copy.vue      |  110 +-
 .../admin/src/pages/system/auth/index.vue     |   26 +-
 .../pages/system/backendRouting/debugging.vue |   42 +-
 .../src/pages/system/backendRouting/index.vue |  196 +-
 .../admin/src/pages/system/clear/index.vue    |    4 +-
 .../components/FoundationFor.vue              |   97 +-
 .../codeGeneration/components/StorageLoc.vue  |   58 +-
 .../codeGeneration/components/TableForm.vue   |  171 +-
 .../src/pages/system/codeGeneration/index.vue |   28 +-
 .../src/pages/system/codeGeneration/list.vue  |  111 +-
 .../src/pages/system/configTab/index.vue      |   81 +-
 .../admin/src/pages/system/configTab/list.vue |  196 +-
 .../src/pages/system/crontab/createModal.vue  |  132 +-
 .../admin/src/pages/system/crontab/index.vue  |   69 +-
 .../src/pages/system/error/error-content.vue  |   14 +-
 .../admin/src/pages/system/file/index.vue     |    4 +-
 .../system/group/components/groupFrom.vue     |  120 +-
 .../admin/src/pages/system/group/index.vue    |  134 +-
 .../admin/src/pages/system/group/list.vue     |  130 +-
 template/admin/src/pages/system/group/pc.vue  |   62 +-
 .../src/pages/system/group/visualization.vue  |  189 +-
 .../system/maintain/systemCleardata/index.vue |   20 +-
 .../maintain/systemDatabackup/index.vue       |  321 ++-
 .../systemFile/components/codemirror.vue      |    8 +-
 .../systemFile/components/loginFrom.vue       |   30 +-
 .../system/maintain/systemFile/index.vue      |   82 +-
 .../system/maintain/systemFile/login.vue      |   34 +-
 .../system/maintain/systemFile/opendir.vue    |  156 +-
 .../pages/system/maintain/systemLog/index.vue |  207 +-
 .../src/pages/system/onlineUpgrade/index.vue  |   38 +-
 .../systemMenus/components/menusFrom.vue      |  172 +-
 .../src/pages/system/systemMenus/index.vue    |   75 +-
 .../system/systemUpgradeclient/index.vue      |   35 +-
 .../src/pages/user/cancel/handle/task.vue     |  208 +-
 .../admin/src/pages/user/cancel/index.vue     |  172 +-
 .../src/pages/user/grade/agreement/index.vue  |   34 +-
 .../admin/src/pages/user/grade/card/index.vue |  151 +-
 .../admin/src/pages/user/grade/card/list.vue  |  169 +-
 .../src/pages/user/grade/record/index.vue     |  144 +-
 .../src/pages/user/grade/right/index.vue      |  155 +-
 .../admin/src/pages/user/grade/type/index.vue |  130 +-
 template/admin/src/pages/user/group/index.vue |   83 +-
 template/admin/src/pages/user/label/index.vue |  115 +-
 .../src/pages/user/level/handle/task.vue      |  206 +-
 template/admin/src/pages/user/level/index.vue |  272 +--
 .../pages/user/list/handle/userDetails.vue    |   76 +-
 .../src/pages/user/list/handle/userEdit.vue   |  134 +-
 .../pages/user/list/handle/userEditForm.vue   |  128 +-
 template/admin/src/pages/user/list/index.vue  |  655 +++---
 .../admin/src/pages/user/list/tableExpand.vue |   49 +-
 .../admin/src/router/modules/marketing.js     |    9 -
 template/admin/src/router/modules/order.js    |    9 -
 template/admin/src/setting.js                 |    2 +-
 .../admin/src/store/module/themeConfig.js     |    1 -
 template/admin/src/styles/style.css           |   27 +
 template/admin/src/theme/element.scss         |   21 +
 template/admin/src/theme/variables.scss       |   21 +-
 template/admin/src/utils/componentSize.js     |    2 +-
 template/admin/src/utils/scroll-to.js         |   65 +
 template/admin/src/vendor/Export2Excel.js     |    2 +-
 template/admin/vue.config.js                  |    5 -
 template/uni-app/config/app.js                |    4 +-
 template/uni-app/manifest.json                |    2 +-
 .../index/diy/components/pictureCube.vue      |    2 +-
 330 files changed, 17259 insertions(+), 20104 deletions(-)
 create mode 100644 template/admin/src/components/Pagination/index.vue
 delete mode 100644 template/admin/src/pages/index/hot-search.vue
 delete mode 100644 template/admin/src/pages/index/search-table.vue
 delete mode 100644 template/admin/src/pages/index/user-gender.vue
 delete mode 100644 template/admin/src/pages/index/user-preference.vue
 delete mode 100644 template/admin/src/pages/marketing/storeIntegral/addStoreIntegral.vue
 delete mode 100644 template/admin/src/pages/order/orderList/splitList.vue
 delete mode 100644 template/admin/src/pages/product/list_wait.vue
 create mode 100644 template/admin/src/utils/scroll-to.js

diff --git a/template/admin/src/components/Pagination/index.vue b/template/admin/src/components/Pagination/index.vue
new file mode 100644
index 000000000..6d5d8110a
--- /dev/null
+++ b/template/admin/src/components/Pagination/index.vue
@@ -0,0 +1,115 @@
+<template>
+  <div :class="{ hidden: hidden }" class="pagination-container">
+    <el-pagination
+      :background="background"
+      :current-page.sync="currentPage"
+      :page-size.sync="pageSize"
+      :layout="layout"
+      :page-sizes="pageSizes"
+      :total="total"
+      v-bind="$attrs"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    ></el-pagination>
+    <!-- <el-pagination
+        @size-change="limitChange"
+        @current-change="pageChange"
+        :current-page="4"
+        :page-sizes="[10, 15, 20, 30]"
+        :page-size="page.limit"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="page.total"
+      >
+      </el-pagination> -->
+  </div>
+</template>
+
+<script>
+import { scrollTo } from '@/utils/scroll-to.js';
+
+export default {
+  name: 'Pagination',
+  props: {
+    total: {
+      required: true,
+      type: Number,
+    },
+    page: {
+      type: Number,
+      default: 1,
+    },
+    limit: {
+      type: Number,
+      default: 20,
+    },
+    pageSizes: {
+      type: Array,
+      default() {
+        return [10, 20, 30, 50];
+      },
+    },
+    layout: {
+      type: String,
+      default: 'total, sizes, prev, pager, next, jumper',
+    },
+    background: {
+      type: Boolean,
+      default: true,
+    },
+    autoScroll: {
+      type: Boolean,
+      default: true,
+    },
+    hidden: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  computed: {
+    currentPage: {
+      get() {
+        console.log(this.page);
+        return this.page;
+      },
+      set(val) {
+        this.$emit('update:page', val);
+      },
+    },
+    pageSize: {
+      get() {
+        return this.limit;
+      },
+      set(val) {
+        this.$emit('update:limit', val);
+      },
+    },
+  },
+  methods: {
+    handleSizeChange(val) {
+      console.log(val);
+      this.$emit('pagination');
+      if (this.autoScroll) {
+        scrollTo(0, 800);
+      }
+    },
+    handleCurrentChange(val) {
+      console.log(val);
+
+      this.$emit('pagination');
+      if (this.autoScroll) {
+        scrollTo(0, 800);
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.pagination-container {
+  background: #fff;
+  padding: 32px 16px;
+}
+.pagination-container.hidden {
+  display: none;
+}
+</style>
diff --git a/template/admin/src/components/cards/cards.vue b/template/admin/src/components/cards/cards.vue
index 3d06b0744..1e3186186 100644
--- a/template/admin/src/components/cards/cards.vue
+++ b/template/admin/src/components/cards/cards.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <!--v-if="item.count && item.count!='0.00'"-->
-    <Row type="flex" align="middle" :gutter="10" class="ivu-mt">
-      <Col
+    <el-row  align="middle" :gutter="10" class="ivu-mt">
+      <el-col
         :xl="item.col"
         :lg="6"
         :md="12"
@@ -12,7 +12,7 @@
         v-for="(item, index) in cardLists"
         :key="index"
       >
-        <Card shadow :padding="0" class="card_cent">
+        <el-card shadow="never" class="card_cent">
           <div class="card_box">
             <div
               class="card_box_cir"
@@ -42,9 +42,9 @@
               <span class="sp2" v-text="item.name"></span>
             </div>
           </div>
-        </Card>
-      </Col>
-    </Row>
+        </el-card>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
@@ -95,7 +95,7 @@ export default {
     display flex
     align-items: center
     /*justify-content: center*/
-    padding: 25px
+    // padding: 25px
     box-sizing: border-box
     border-radius: 4px
     .card_box_cir
diff --git a/template/admin/src/components/couponList/index.vue b/template/admin/src/components/couponList/index.vue
index cb109fef9..04621bd35 100644
--- a/template/admin/src/components/couponList/index.vue
+++ b/template/admin/src/components/couponList/index.vue
@@ -1,45 +1,86 @@
 <template>
   <div>
     <Modal v-model="isTemplate" title="优惠券列表" width="60%" @on-ok="ok" @on-cancel="cancel">
-      <Table
-        :columns="columns"
+      <el-table
         :data="couponList"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
-        @on-select="handleSelectRow"
-        @on-select-cancel="handleCancelRow"
-        @on-select-all="handleSelectAll"
-        @on-select-all-cancel="handleSelectAll"
+        v-loading="loading"
+        highlight-current-row
+        :row-key="getRowKey"
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
+        @selection-change="changeCheckbox"
       >
-        <template slot-scope="{ row, index }" slot="count">
-          <span v-if="row.is_permanent">不限量</span>
-          <div v-else>
-            <span class="fa">发布：{{ row.total_count }}</span>
-            <span class="sheng">剩余：{{ row.remain_count }}</span>
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="start_time">
-          <div v-if="row.start_time">{{ row.start_time | formatDate }} - {{ row.end_time | formatDate }}</div>
-          <span v-else>不限时</span>
-        </template>
-        <template slot-scope="{ row }" slot="type">
-          <span v-if="row.type === 1">品类券</span>
-          <span v-else-if="row.type === 2">商品券</span>
-          <span v-else-if="row.type === 3">会员券</span>
-          <span v-else>通用券</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          <Tag color="blue" v-show="row.status === 1">正常</Tag>
-          <Tag color="gold" v-show="row.status === 0">未开启</Tag>
-          <Tag color="red" v-show="row.status === -1">已失效</Tag>
-        </template>
-      </Table>
+        <el-table-column v-if="!luckDraw" type="selection" width="55" :reserve-selection="true"> </el-table-column>
+        <el-table-column v-else width="50">
+          <template slot-scope="scope">
+            <el-radio v-model="templateRadio" :label="scope.row.id" @change.native="getTemplateRow(scope.row)"
+              >&nbsp;</el-radio
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="ID" width="60">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠券名称" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠券类型" min-width="100">
+          <template slot-scope="scope">
+            <span v-if="scope.row.type === 1">品类券</span>
+            <span v-else-if="scope.row.type === 2">商品券</span>
+            <span v-else-if="scope.row.type === 3">会员券</span>
+            <span v-else>通用券</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="面值" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.coupon_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="最低消费额" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.use_min_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="发布数量" min-width="100">
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_permanent">不限量</span>
+            <div v-else>
+              <span class="fa">发布：{{ scope.row.total_count }}</span>
+              <span class="sheng">剩余：{{ scope.row.remain_count }}</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="有效期限" min-width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.start_time">
+              {{ scope.row.start_time | formatDate }} - {{ scope.row.end_time | formatDate }}
+            </div>
+            <span v-else>不限时</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="100">
+          <template slot-scope="scope">
+            <Tag color="blue" v-show="scope.row.status === 1">正常</Tag>
+            <Tag color="gold" v-show="scope.row.status === 0">未开启</Tag>
+            <Tag color="red" v-show="scope.row.status === -1">已失效</Tag>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page :total="total" show-elevator show-total @on-change="receivePageChange" :page-size="tableFrom.limit" />
+        <pagination
+          v-if="total"
+          :total="total"
+          :page.sync="tableFrom.page"
+          :limit.sync="tableFrom.limit"
+          @pagination="tableList"
+        />
       </div>
     </Modal>
   </div>
@@ -76,6 +117,8 @@ export default {
   },
   data() {
     return {
+      templateRadio: 0,
+
       currentid: 0,
       productRow: {},
       isTemplate: false,
@@ -83,183 +126,63 @@ export default {
       tableFrom: {
         receive_type: 3,
         page: 1,
-        limit: 10,
+        limit: 5,
       },
       total: 0,
       ids: [],
       texts: [],
-      columns: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 60,
-        },
-        {
-          title: '优惠券名称',
-          key: 'title',
-          minWidth: 150,
-        },
-        {
-          title: '优惠券类型',
-          slot: 'type',
-          minWidth: 80,
-        },
-        {
-          title: '面值',
-          key: 'coupon_price',
-          minWidth: 100,
-        },
-        {
-          title: '最低消费额',
-          key: 'use_min_price',
-          minWidth: 100,
-        },
-        {
-          title: '发布数量',
-          slot: 'count',
-          minWidth: 120,
-        },
-        {
-          title: '有效期限',
-          slot: 'start_time',
-          minWidth: 120,
-        },
-        {
-          title: '状态',
-          slot: 'status',
-          minWidth: 80,
-        },
-      ],
       couponList: [],
-      selectedIds: new Set(),
-      selectedNames: new Set(),
+      selectedIds: [],
+      selectedNames: [],
+      multipleSelection: [],
     };
   },
   mounted() {},
   watch: {
     updateIds: function (newVal) {
-      this.selectedIds = new Set(newVal);
+      this.selectedIds = newVal;
     },
     updateName: function (newVal) {
-      this.selectedNames = new Set(newVal);
+      this.selectedNames = newVal;
+      this.multipleSelection = newVal;
     },
   },
-  created() {
-    let radio = {
-      width: 60,
-      align: 'center',
-      render: (h, params) => {
-        let id = params.row.id;
-        let flag = false;
-        if (this.currentid === id) {
-          flag = true;
-        } else {
-          flag = false;
-        }
-        let self = this;
-        return h('div', [
-          h('Radio', {
-            props: {
-              value: flag,
-            },
-            on: {
-              'on-change': () => {
-                self.currentid = id;
-                this.productRow = params.row;
-              },
-            },
-          }),
-        ]);
-      },
-    };
-
-    let checkbox = {
-      type: 'selection',
-      width: 60,
-      align: 'center',
-    };
-    if (this.luckDraw) {
-      this.columns.unshift(radio);
-    } else {
-      this.columns.unshift(checkbox);
-    }
-  },
+  created() {},
   methods: {
+    getRowKey(row) {
+      return row.id;
+    },
+    getTemplateRow(row) {
+      this.currentid = row.id;
+      this.productRow = row;
+    },
     //对象数组去重；
     unique(arr) {
       const res = new Map();
       return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));
     },
-    handleSelectAll(selection) {
-      // 取消全选 数组为空
-      if (selection.length === 0) {
-        // cy 若取消全选，删除保存在selectedIds里和当前table数据的id一致的数据，达到，当前页取消全选的效果
-        // 当前页的table数据
-        let that = this;
-        let data = that.$refs.table.data;
-        data.forEach((item) => {
-          if (that.selectedIds.has(item.id)) {
-            that.selectedIds.delete(item.id);
-            let nameList = that.unique(Array.from(that.selectedNames));
-            that.unique(Array.from(that.selectedNames)).forEach((j, index) => {
-              if (j.id === item.id) {
-                nameList.splice(index, 1);
-              }
-            });
-            that.selectedNames = new Set(nameList);
-            // this.selectedNames.clear();
-          }
-        });
-      } else {
-        selection.forEach((item) => {
-          this.selectedIds.add(item.id);
-          this.selectedNames.add({ id: item.id, title: item.title });
-        });
-      }
-      this.$nextTick(() => {
-        //确保dom加载完毕
-        this.setChecked();
-      });
-    },
-
-    //  选中某一行
-    handleSelectRow(selection, row) {
-      this.selectedIds.add(row.id);
-      this.selectedNames.add({ id: row.id, title: row.title });
-      this.$nextTick(() => {
-        //确保dom加载完毕
-        this.setChecked();
-      });
-    },
-    //  取消某一行
-    handleCancelRow(selection, row) {
-      let that = this;
-      that.selectedIds.delete(row.id);
-      let nameList = Array.from(that.selectedNames);
-      Array.from(that.selectedNames).forEach((item, index) => {
-        if (item.id === row.id) {
-          nameList.splice(index, 1);
-        }
-      });
-      that.selectedNames = new Set(nameList);
-      this.$nextTick(() => {
-        //确保dom加载完毕
-        this.setChecked();
-      });
-    },
-    setChecked() {
-      this.ids = [...this.selectedIds];
-      this.texts = [...this.selectedNames];
-      // 找到绑定的table的ref对应的dom，找到table的objData对象，objData保存的是当前页的数据
-      let objData = this.$refs.table.objData;
-      for (let index in objData) {
-        if (this.selectedIds.has(objData[index].id)) {
-          // cy 弊端 每次切换select都会触发table的on-select事件
-          // this.$refs.purchaseTable.toggleSelect(index) // 在保存选中的ids的set合集里找与当前页数据id一样的行，使用toggleSelect（index），将这一行选中
-          // cy 改进
-          objData[index]._isChecked = true;
+    changeCheckbox(selection) {
+      console.log(selection);
+      let uniqueArr = [];
+      let cups = [];
+      let ids = [];
+      let arr = this.unique(selection);
+      for (let i = 0; i < arr.length; i++) {
+        const item = arr[i];
+        if (!ids.includes(item.id)) {
+          let obj = {
+            id: item.id,
+            title: item.title,
+          };
+          cups.push(obj);
+          ids.push(item.id);
+          uniqueArr.push(item);
         }
       }
+      console.log(cups);
+      this.selectedIds = ids;
+      this.selectedNames = cups;
+      this.multipleSelection = uniqueArr;
     },
     cancel() {
       this.isTemplate = false;
@@ -272,11 +195,12 @@ export default {
       releasedListApi(this.tableFrom).then((res) => {
         let data = res.data;
         this.couponList = data.list;
+        this.total = data.count;
         this.$nextTick(() => {
           //确保dom加载完毕
-          this.setChecked();
+          // this.setChecked();
+          this.showSelectData();
         });
-        this.total = data.count;
         this.loading = false;
       });
     },
@@ -285,13 +209,32 @@ export default {
         this.$emit('getCouponId', this.productRow);
         this.currentid = 0;
       } else {
-        this.$emit('nameId', this.ids, this.texts);
+        this.$emit('nameId', this.selectedIds, this.selectedNames);
       }
     },
-    receivePageChange(index) {
+    pageChange(index) {
       this.tableFrom.page = index;
       this.tableList();
     },
+    limitChange(limit) {
+      this.tableFrom.limit = limit;
+      this.tableList();
+    },
+    showSelectData() {
+      console.log(this.multipleSelection);
+      if (this.multipleSelection.length > 0) {
+        // 判断是否存在勾选过的数据
+        this.couponList.forEach((row) => {
+          // 获取数据列表接口请求到的数据
+          this.multipleSelection.forEach((item) => {
+            // 勾选到的数据
+            if (row.id === item.id) {
+              // this.$refs.table.toggleRowSelection(item, true); // 若有重合，则回显该条数据
+            }
+          });
+        });
+      }
+    },
   },
 };
 </script>
diff --git a/template/admin/src/components/customerInfo/index.vue b/template/admin/src/components/customerInfo/index.vue
index 3f0c047d1..ca660c90d 100644
--- a/template/admin/src/components/customerInfo/index.vue
+++ b/template/admin/src/components/customerInfo/index.vue
@@ -1,20 +1,22 @@
 <template>
   <div class="customer">
-    <Form ref="formValidate" :model="formValidate" :label-width="100" @submit.native.prevent>
-      <Row :gutter="24" type="flex">
-        <Col span="24" class="ivu-text-left">
-          <FormItem label="搜索日期：">
-            <RadioGroup
+    <el-form ref="formValidate" :model="formValidate" label-width="100px" @submit.native.prevent>
+      <el-row :gutter="24">
+        <el-col :span="24" class="ivu-text-left">
+          <el-form-item label="搜索日期：">
+            <el-radio-group
               v-model="formValidate.data"
               type="button"
-              @on-change="selectChange(formValidate.data)"
+              @change="selectChange(formValidate.data)"
               class="mr"
             >
-              <Radio :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{ item.text }}</Radio>
-            </RadioGroup>
+              <el-radio-button :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{
+                item.text
+              }}</el-radio-button>
+            </el-radio-group>
             <DatePicker
               :editable="false"
-              @on-change="onchangeTime"
+              @change="onchangeTime"
               :value="timeVal"
               format="yyyy/MM/dd"
               type="daterange"
@@ -22,63 +24,99 @@
               placeholder="请选择时间"
               style="width: 200px"
             ></DatePicker>
-          </FormItem>
-        </Col>
-        <Col span="12" class="ivu-text-left">
-          <FormItem label="用户名称：">
-            <Input
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="ivu-text-left">
+          <el-form-item label="用户名称：">
+            <el-input
               search
               enter-button
               placeholder="请输入用户名称"
               v-model="formValidate.nickname"
               style="width: 90%"
               @on-search="userSearchs"
-            ></Input>
-          </FormItem>
-        </Col>
-      </Row>
-    </Form>
-    <Table
-      :loading="loading2"
-      highlight-row
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table
+      v-loading="loading2"
+      highlight-current-row
       no-userFrom-text="暂无数据"
       no-filtered-userFrom-text="暂无筛选结果"
       ref="selection"
-      :columns="columns4"
       :data="tableList2"
     >
-      <template slot-scope="{ row, index }" slot="nickname">
-        <div>{{ row.nickname }}</div>
-        <div style="color: red">{{ row.is_del ? '用户已注销' : '' }}</div>
-      </template>
-      <template slot-scope="{ row, index }" slot="headimgurl">
-        <div class="tabBox_img" v-viewer>
-          <img v-lazy="row.headimgurl" />
-        </div>
-      </template>
-      <template slot-scope="{ row, index }" slot="user_type">
-        <span v-if="row.user_type === 'wechat'">公众号</span>
-        <span v-else-if="row.user_type === 'routine'">小程序</span>
-        <span v-else-if="row.user_type === 'h5'">H5</span>
-        <span v-else-if="row.user_type === 'pc'">PC</span>
-        <span v-else>--</span>
-      </template>
-      <template slot-scope="{ row, index }" slot="sex">
-        <span v-show="row.sex === 1">男</span>
-        <span v-show="row.sex === 2">女</span>
-        <span v-show="row.sex === 0">保密</span>
-        <span v-show="row.sex === null">--</span>
-      </template>
-      <template slot-scope="{ row, index }" slot="country">
-        <span v-if="row.country || row.province || row.city">{{ row.country + row.province + row.city }}</span>
-        <span v-else>--</span>
-      </template>
-      <template slot-scope="{ row, index }" slot="subscribe">
-        <span v-text="row.subscribe === 1 ? '关注' : '未关注'"></span>
-      </template>
-    </Table>
+      <el-table-column width="50">
+        <template slot-scope="scope">
+          <el-radio
+            v-model="currentid"
+            :disabled="!!scope.row.is_del"
+            :label="scope.row.uid"
+            @input="() => currentidRadio(scope.row)"
+            >&nbsp;</el-radio
+          >
+        </template>
+      </el-table-column>
+      <el-table-column label="ID" width="80">
+        <template slot-scope="scope">
+          <span>{{ scope.row.uid }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="微信用户名称" min-width="180">
+        <template slot-scope="scope">
+          <div>{{ scope.row.nickname }}</div>
+          <div style="color: red">{{ scope.row.is_del ? '用户已注销' : '' }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="客服头像" min-width="90">
+        <template slot-scope="scope">
+          <div class="tabBox_img" v-viewer>
+            <img v-lazy="scope.row.headimgurl" />
+          </div>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="用户类型" min-width="130">
+        <template slot-scope="scope">
+          <span v-if="scope.row.user_type === 'wechat'">公众号</span>
+          <span v-else-if="scope.row.user_type === 'routine'">小程序</span>
+          <span v-else-if="scope.row.user_type === 'h5'">H5</span>
+          <span v-else-if="scope.row.user_type === 'pc'">PC</span>
+          <span v-else>--</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="性别" min-width="130">
+        <template slot-scope="scope">
+          <span v-show="scope.row.sex === 1">男</span>
+          <span v-show="scope.row.sex === 2">女</span>
+          <span v-show="scope.row.sex === 0">保密</span>
+          <span v-show="scope.row.sex === null">--</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="地区" min-width="130">
+        <template slot-scope="scope">
+          <span v-if="scope.row.country || scope.row.province || scope.row.city">{{
+            scope.row.country + scope.row.province + scope.row.city
+          }}</span>
+          <span v-else>--</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否关注公众号" min-width="130">
+        <template slot-scope="scope">
+          <span v-text="scope.row.subscribe === 1 ? '关注' : '未关注'"></span>
+        </template>
+      </el-table-column>
+    </el-table>
     <div class="acea-row row-right page">
-      <Page :total="total2" show-elevator show-total @on-change="pageChange2" :page-size="formValidate.limit" />
+      <pagination
+        v-if="total2"
+        :total="total2"
+        :page.sync="formValidate.page"
+        :limit.sync="formValidate.limit"
+        @pagination="getListService"
+      />
     </div>
   </div>
 </template>
@@ -111,91 +149,6 @@ export default {
       },
       currentid: 0,
       productRow: {},
-      columns4: [
-        {
-          title: '选择',
-          key: 'chose',
-          width: 60,
-          align: 'center',
-          render: (h, params) => {
-            let uid = params.row.uid;
-            let flag = false;
-            if (this.currentid === uid) {
-              flag = true;
-            } else {
-              flag = false;
-            }
-            let self = this;
-            return h('div', [
-              h('Radio', {
-                props: {
-                  value: flag,
-                  disabled: !!params.row.is_del,
-                },
-                on: {
-                  'on-change': () => {
-                    self.currentid = uid;
-                    this.productRow = params.row;
-                    if (this.productRow.uid) {
-                      if (this.$route.query.fodder === 'image') {
-                        /* eslint-disable */
-                        let imageObject = {
-                          image: this.productRow.headimgurl,
-                          uid: this.productRow.uid,
-                        };
-                        form_create_helper.set('image', imageObject);
-                        form_create_helper.close('image');
-                      } else {
-                        this.$emit('imageObject', {
-                          image: this.productRow.headimgurl,
-                          uid: this.productRow.uid,
-                        });
-                      }
-                    } else {
-                      this.$Message.warning('请先选择商品');
-                    }
-                  },
-                },
-              }),
-            ]);
-          },
-        },
-        {
-          title: 'ID',
-          key: 'uid',
-          width: 80,
-        },
-        {
-          title: '微信用户名称',
-          slot: 'nickname',
-          minWidth: 180,
-        },
-        {
-          title: '客服头像',
-          slot: 'headimgurl',
-          minWidth: 60,
-        },
-        {
-          title: '用户类型',
-          slot: 'user_type',
-          minWidth: 100,
-        },
-        {
-          title: '性别',
-          slot: 'sex',
-          minWidth: 60,
-        },
-        {
-          title: '地区',
-          slot: 'country',
-          minWidth: 120,
-        },
-        {
-          title: '是否关注公众号',
-          slot: 'subscribe',
-          minWidth: 120,
-        },
-      ],
       loading2: false,
       total2: 0,
     };
@@ -235,15 +188,33 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange2(pageIndex) {
-      this.formValidate.page = pageIndex;
-      this.getListService();
-    },
     // 搜索
     userSearchs() {
       this.formValidate.page = 1;
       this.getListService();
     },
+    currentidRadio(row) {
+      self.currentid = row.uid;
+      this.productRow = row;
+      if (this.productRow.uid) {
+        if (this.$route.query.fodder === 'image') {
+          /* eslint-disable */
+          let imageObject = {
+            image: this.productRow.headimgurl,
+            uid: this.productRow.uid,
+          };
+          form_create_helper.set('image', imageObject);
+          form_create_helper.close('image');
+        } else {
+          this.$emit('imageObject', {
+            image: this.productRow.headimgurl,
+            uid: this.productRow.uid,
+          });
+        }
+      } else {
+        this.$Message.warning('请先选择商品');
+      }
+    },
   },
 };
 </script>
diff --git a/template/admin/src/components/dateRadio/index.vue b/template/admin/src/components/dateRadio/index.vue
index f9c84bb08..ef1132934 100644
--- a/template/admin/src/components/dateRadio/index.vue
+++ b/template/admin/src/components/dateRadio/index.vue
@@ -1,7 +1,7 @@
 <template>
-  <RadioGroup v-model="selectIndexTime" type="button" @on-change="onSelectTime">
-    <Radio :label="index" v-for="(item, index) in options.shortcuts" :key="index">{{ item.text }}</Radio>
-  </RadioGroup>
+  <el-radio-group v-model="selectIndexTime" type="button" @change="onSelectTime">
+    <el-radio-button :label="index" v-for="(item, index) in options.shortcuts" :key="index">{{ item.text }}</el-radio-button>
+  </el-radio-group>
 </template>
 
 <script>
diff --git a/template/admin/src/components/diyComponents/c_bg_color.vue b/template/admin/src/components/diyComponents/c_bg_color.vue
index 121fa6e67..3125ff2a1 100644
--- a/template/admin/src/components/diyComponents/c_bg_color.vue
+++ b/template/admin/src/components/diyComponents/c_bg_color.vue
@@ -1,13 +1,13 @@
 <template>
   <div>
     <div class="c_row-item" v-if="configData[this.configNum]">
-      <Col span="8" class="c_label">{{ configData[this.configNum][name].title }}</Col>
-      <Col span="14" class="color-box">
+      <el-col :span="8" class="c_label">{{ configData[this.configNum][name].title }}</el-col>
+      <el-col span="14" class="color-box">
         <div class="color-item" v-for="(color, key) in configData[this.configNum][name].color" :key="key">
-          <ColorPicker v-model="color.item" @on-change="changeColor($event, color)" alpha></ColorPicker
+          <ColorPicker v-model="color.item" @change="changeColor($event, color)" alpha></ColorPicker
           ><span @click="resetBgA(color, index, key)">重置</span>
         </div>
-      </Col>
+      </el-col>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/diyComponents/c_hot_word.vue b/template/admin/src/components/diyComponents/c_hot_word.vue
index 87acc2911..480288012 100644
--- a/template/admin/src/components/diyComponents/c_hot_word.vue
+++ b/template/admin/src/components/diyComponents/c_hot_word.vue
@@ -8,15 +8,15 @@
       <draggable class="dragArea list-group" :list="datas[name].list" group="peoples" handle=".icon">
         <div class="input-item" v-for="(item, index) in datas[name].list" :key="index">
           <div class="icon"><Icon type="ios-keypad" size="20" /></div>
-          <Input v-model="item.val" placeholder="选填，不超过十个字" :maxlength="item.maxlength || 10" />
+          <el-input v-model="item.val" placeholder="选填，不超过十个字" :maxlength="item.maxlength || 10" />
           <div class="close" @click="close(index)">
             <Icon type="md-close" size="20" style="color: #d8d8d8" />
           </div>
         </div>
       </draggable>
       <div class="add-btn" @click="addHotTxt">
-        <Button type="primary" ghost style="width: 100%; height: 40px; border-color: #1890ff; color: #1890ff"
-          >添加热词</Button
+        <el-button type="primary" ghost style="width: 100%; height: 40px; border-color: #1890ff; color: #1890ff"
+          >添加热词</el-button
         >
       </div>
     </div>
diff --git a/template/admin/src/components/diyComponents/c_input_list.vue b/template/admin/src/components/diyComponents/c_input_list.vue
index c59f106e5..70de24d7c 100644
--- a/template/admin/src/components/diyComponents/c_input_list.vue
+++ b/template/admin/src/components/diyComponents/c_input_list.vue
@@ -2,22 +2,22 @@
   <div class="numbox" v-if="datas[name]">
     <div class="c_row-item" v-for="(item, index) in datas[name].list" :key="index">
       <div class="dif" v-if="item.title === '链接'">
-        <Col class="label" span="4">
+        <el-col class="label" :span="4">
           <span>{{ item.title }}</span>
-        </Col>
-        <Col span="19" class="slider-box">
+        </el-col>
+        <el-col span="19" class="slider-box">
           <div class="input-box" @click="getLink(index)">
-            <Input v-model="item.val" :placeholder="item.pla" :maxlength="item.max" icon="ios-arrow-forward" readonly />
+            <el-input v-model="item.val" :placeholder="item.pla" :maxlength="item.max" icon="ios-arrow-forward" readonly />
           </div>
-        </Col>
+        </el-col>
       </div>
       <div class="dif" v-else>
-        <Col class="label" span="4">
+        <el-col class="label" :span="4">
           <span>{{ item.title }}</span>
-        </Col>
-        <Col span="19" class="slider-box">
-          <Input v-model="item.val" :placeholder="item.pla" :maxlength="item.max" style="text-align: right" />
-        </Col>
+        </el-col>
+        <el-col span="19" class="slider-box">
+          <el-input v-model="item.val" :placeholder="item.pla" :maxlength="item.max" style="text-align: right" />
+        </el-col>
       </div>
     </div>
     <linkaddress ref="linkaddres" @linkUrl="linkUrl"></linkaddress>
diff --git a/template/admin/src/components/diyComponents/c_input_number.vue b/template/admin/src/components/diyComponents/c_input_number.vue
index d68b056e4..9401a407e 100644
--- a/template/admin/src/components/diyComponents/c_input_number.vue
+++ b/template/admin/src/components/diyComponents/c_input_number.vue
@@ -1,20 +1,20 @@
 <template>
   <div class="numbox" v-if="datas[name]">
     <div class="c_row-item">
-      <Col class="label" span="4">
+      <el-col class="label" :span="4">
         <span v-if="datas[name].show">{{ datas[name].title }}</span>
         <span v-else>数量</span>
-      </Col>
-      <Col span="19" class="slider-box">
-        <Input
+      </el-col>
+      <el-col span="19" class="slider-box">
+        <el-input
           v-model="datas[name].val"
           type="number"
           placeholder="请输入数量"
           style="text-align: right; width: 350px"
-          @on-blur="numberVal(datas[name].val)"
-          @on-change="maxNum(datas[name].val)"
+          @blur="numberVal(datas[name].val)"
+          @change="maxNum(datas[name].val)"
         />
-      </Col>
+      </el-col>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/diyComponents/c_is_show.vue b/template/admin/src/components/diyComponents/c_is_show.vue
index 747cccba2..c2e2c35b8 100644
--- a/template/admin/src/components/diyComponents/c_is_show.vue
+++ b/template/admin/src/components/diyComponents/c_is_show.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="c_row-item">
-    <Col class="label" span="4"> 是否显示 </Col>
-    <Col span="19">
-      <i-switch v-model="datas[name].val" />
-    </Col>
+    <el-col class="label" :span="4"> 是否显示 </el-col>
+    <el-col span="19">
+      <el-switch :active-value="1"  :inactive-value="0" v-model="datas[name].val" />
+    </el-col>
   </div>
 </template>
 
diff --git a/template/admin/src/components/diyComponents/c_select.vue b/template/admin/src/components/diyComponents/c_select.vue
index 3c116f0b9..45baa30b3 100644
--- a/template/admin/src/components/diyComponents/c_select.vue
+++ b/template/admin/src/components/diyComponents/c_select.vue
@@ -1,16 +1,19 @@
 <template>
   <div class="slider-box">
     <div class="c_row-item">
-      <Col class="label" span="4" v-if="datas[name].title">
+      <el-col class="label" :span="4" v-if="datas[name].title">
         {{ datas[name].title }}
-      </Col>
-      <Col span="19" class="slider-box">
-        <Select v-model="datas[name].activeValue" clearable style="width: 350px" @on-change="sliderChange">
-          <Option v-for="(item, index) in datas[name].list" :value="item.activeValue" :key="index">{{
-            item.title
-          }}</Option>
-        </Select>
-      </Col>
+      </el-col>
+      <el-col span="19" class="slider-box">
+        <el-select v-model="datas[name].activeValue" clearable style="width: 350px" @change="sliderChange">
+          <el-option
+            v-for="(item, index) in datas[name].list"
+            :value="item.activeValue"
+            :key="index"
+            :label="item.title"
+          ></el-option>
+        </el-select>
+      </el-col>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/diyComponents/c_tab.vue b/template/admin/src/components/diyComponents/c_tab.vue
index 07c3f1800..375d6bdc3 100644
--- a/template/admin/src/components/diyComponents/c_tab.vue
+++ b/template/admin/src/components/diyComponents/c_tab.vue
@@ -4,12 +4,12 @@
       <span>选择模板</span>{{ datas[name].tabList[datas[name].tabVal].name }}
     </div>
     <div class="radio-box" :class="{ on: datas[name].type == 1 }">
-      <RadioGroup v-model="datas[name].tabVal" type="button" size="large" @on-change="radioChange($event)">
-        <Radio :label="index" v-for="(item, index) in datas[name].tabList" :key="index">
+      <el-radio-group v-model="datas[name].tabVal" type="button" size="large" @change="radioChange($event)">
+        <el-radio-button :label="index" v-for="(item, index) in datas[name].tabList" :key="index">
           <span class="iconfont" :class="item.icon" v-if="item.icon"></span>
           <span v-else>{{ item.name }}</span>
-        </Radio>
-      </RadioGroup>
+        </el-radio-button>
+      </el-radio-group>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/diyComponents/c_tab_bar.vue b/template/admin/src/components/diyComponents/c_tab_bar.vue
index cd8a373ea..c182236b1 100644
--- a/template/admin/src/components/diyComponents/c_tab_bar.vue
+++ b/template/admin/src/components/diyComponents/c_tab_bar.vue
@@ -18,16 +18,16 @@
             </div>
           </div>
           <div class="c_row-item">
-            <Col class="label" span="4"> 名称 </Col>
-            <Col span="19" class="slider-box">
-              <Input v-model="item.name" placeholder="选填不超过10个字" />
-            </Col>
+            <el-col class="label" :span="4"> 名称 </el-col>
+            <el-col span="19" class="slider-box">
+              <el-input v-model="item.name" placeholder="选填不超过10个字" />
+            </el-col>
           </div>
           <div class="c_row-item">
-            <Col class="label" span="4"> 链接 </Col>
-            <Col span="19" class="slider-box">
-              <Input v-model="item.link" placeholder="选填不超过10个字" />
-            </Col>
+            <el-col class="label" :span="4"> 链接 </el-col>
+            <el-col span="19" class="slider-box">
+              <el-input v-model="item.link" placeholder="选填不超过10个字" />
+            </el-col>
           </div>
         </div>
         <div class="del-box" @click="deleteMenu(index)">
@@ -36,13 +36,13 @@
       </div>
     </draggable>
     <div class="add-btn" v-if="datas[name].list.length < 5">
-      <Button
+      <el-button
         type="primary"
         ghost
         style="width: 100%; height: 40px; border-color: #1890ff; color: #1890ff"
         @click="addMenu"
         >添加图文导航
-      </Button>
+      </el-button>
     </div>
     <div>
       <Modal
diff --git a/template/admin/src/components/diyComponents/c_txt_list.vue b/template/admin/src/components/diyComponents/c_txt_list.vue
index e11bbc216..1a5877e98 100644
--- a/template/admin/src/components/diyComponents/c_txt_list.vue
+++ b/template/admin/src/components/diyComponents/c_txt_list.vue
@@ -10,12 +10,12 @@
           <div class="content">
             <div class="con-item" v-for="(list, key) in item.chiild" :key="key">
               <div class="dif" v-if="list.title === '链接'">
-                <Col class="label">
+                <el-col class="label">
                   <span>{{ list.title }}</span>
-                </Col>
-                <Col class="slider-box">
+                </el-col>
+                <el-col class="slider-box">
                   <div class="input-box" @click="getLink(index, key)">
-                    <Input
+                    <el-input
                       v-model="list.val"
                       :placeholder="list.pla"
                       :maxlength="list.max"
@@ -23,18 +23,18 @@
                       readonly
                     />
                   </div>
-                </Col>
+                </el-col>
               </div>
               <div class="dif" v-else>
-                <Col class="label">
+                <el-col class="label">
                   <span>{{ list.title }}</span>
-                </Col>
-                <Col span="19" class="slider-box">
-                  <Input v-model="list.val" :placeholder="list.pla" :maxlength="list.max" style="text-align: right" />
-                </Col>
+                </el-col>
+                <el-col span="19" class="slider-box">
+                  <el-input v-model="list.val" :placeholder="list.pla" :maxlength="list.max" style="text-align: right" />
+                </el-col>
               </div>
               <!-- <span>{{ list.title }}</span>
-              <Input
+              <el-input
                 v-model="list.val"
                 :placeholder="list.pla"
                 :maxlength="list.max"
@@ -42,9 +42,9 @@
             </div>
             <div class="con-item" v-if="item.link">
               <span>{{ item.link.title }}</span>
-              <Select v-model="item.link.activeVal" style="">
-                <Option v-for="(item, j) in item.link.optiops" :value="item.value" :key="j">{{ item.label }} </Option>
-              </Select>
+              <el-select v-model="item.link.activeVal" style="">
+                <el-option v-for="(item, j) in item.link.optiops" :value="item.value" :key="j" :label="item.label"></el-option>
+              </el-select>
             </div>
           </div>
           <div class="delete" @click.stop="bindDelete(index)" v-if="datas[name].max > 1">
@@ -55,8 +55,8 @@
     </div>
     <div v-if="datas[name]">
       <div class="add-btn" @click="addHotTxt" v-if="datas[name].list.length < datas[name].max">
-        <Button type="primary" ghost style="width: 100%; height: 40px; border-color: #1890ff; color: #1890ff"
-          >添加模块</Button
+        <el-button type="primary" ghost style="width: 100%; height: 40px; border-color: #1890ff; color: #1890ff"
+          >添加模块</el-button
         >
       </div>
     </div>
diff --git a/template/admin/src/components/diyComponents/c_txt_tab.vue b/template/admin/src/components/diyComponents/c_txt_tab.vue
index 53234cbba..dc65dd769 100644
--- a/template/admin/src/components/diyComponents/c_txt_tab.vue
+++ b/template/admin/src/components/diyComponents/c_txt_tab.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="txt_tab" v-if="datas[name]">
     <div class="c_row-item">
-      <Col class="c_label">
+      <el-col class="c_label">
         {{ datas[name].title }}
         <span>{{ datas[name].list[datas[name].type].val }}</span>
-      </Col>
-      <Col class="color-box">
-        <RadioGroup v-model="datas[name].type" type="button" @on-change="radioChange($event)">
-          <Radio :label="key" v-for="(radio, key) in datas[name].list" :key="key">
+      </el-col>
+      <el-col class="color-box">
+        <el-radio-group v-model="datas[name].type" type="button" @change="radioChange($event)">
+          <el-radio-button :label="key" v-for="(radio, key) in datas[name].list" :key="key">
             <span class="iconfont" :class="radio.icon" v-if="radio.icon"></span>
             <span v-else>{{ radio.val }}</span>
-          </Radio>
-        </RadioGroup>
-      </Col>
+          </el-radio-button>
+        </el-radio-group>
+      </el-col>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/diyComponents/c_upload_list.vue b/template/admin/src/components/diyComponents/c_upload_list.vue
index 66ca6cbf1..b4dc5d6d7 100644
--- a/template/admin/src/components/diyComponents/c_upload_list.vue
+++ b/template/admin/src/components/diyComponents/c_upload_list.vue
@@ -23,7 +23,7 @@
               <div class="info-item" v-if="infos.title === '链接'">
                 <span>{{ infos.title }}</span>
                 <div class="input-box" @click="getLink(index, key)">
-                  <Input
+                  <el-input
                     v-model="infos.value"
                     :placeholder="infos.tips"
                     :maxlength="infos.maxlength"
@@ -35,7 +35,7 @@
               <div v-else class="info-item">
                 <span>{{ infos.title }}</span>
                 <div class="input-box">
-                  <Input v-model="infos.value" :placeholder="infos.tips" :maxlength="infos.maxlength" width="250px" />
+                  <el-input v-model="infos.value" :placeholder="infos.tips" :maxlength="infos.maxlength" width="250px" />
                 </div>
               </div>
             </div>
@@ -65,13 +65,13 @@
     </div>
     <template v-if="datas[name]">
       <div class="add-btn" v-if="datas[name].list.length < datas[name].max || datas[name].max == ''">
-        <Button
+        <el-button
           type="primary"
           ghost
           style="width: 100%; height: 40px; border-color: #1890ff; color: #1890ff"
           @click="addBox"
           >添加图片
-        </Button>
+        </el-button>
       </div>
     </template>
     <linkaddress ref="linkaddres" @linkUrl="linkUrl"></linkaddress>
diff --git a/template/admin/src/components/freightTemplate/city.vue b/template/admin/src/components/freightTemplate/city.vue
index ce4cf045f..06f576d44 100644
--- a/template/admin/src/components/freightTemplate/city.vue
+++ b/template/admin/src/components/freightTemplate/city.vue
@@ -1,16 +1,16 @@
 <template>
   <div>
     <Modal v-model="addressModal" title="选择可配送区域" width="50%" class="modal" :mask="true">
-      <Row :gutter="24" type="flex">
-        <Col :xl="24" :lg="24" :md="24" :sm="24" :xs="24" class="item">
+      <el-row :gutter="24" >
+        <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24" class="item">
           <div class="acea-row row-right row-middle">
-            <Checkbox v-model="iSselect" @on-change="allCheckbox">全选</Checkbox>
+            <el-checkbox v-model="iSselect" @change="allCheckbox">全选</el-checkbox>
             <div class="empty" @click="empty">清空</div>
           </div>
-        </Col>
-      </Row>
-      <Row :gutter="24" type="flex" :loading="loading">
-        <Col
+        </el-col>
+      </el-row>
+      <el-row :gutter="24"  :loading="loading">
+        <el-col
           :xl="6"
           :lg="6"
           :md="6"
@@ -22,33 +22,33 @@
           v-if="item.isShow"
         >
           <div @mouseenter="enter(index)" @mouseleave="leave()">
-            <Checkbox v-model="item.checked" :label="item.name" @on-change="checkedClick(index)">{{
+            <el-checkbox v-model="item.checked" :label="item.name" @change="checkedClick(index)">{{
               item.name
-            }}</Checkbox
+            }}</el-checkbox
             ><span class="red">({{ (item.count || 0) + '/' + item.childNum }})</span>
             <div class="city" v-show="activeCity === index">
               <div class="checkBox">
                 <div class="arrow"></div>
                 <div>
-                  <Checkbox
+                  <el-checkbox
                     v-model="city.checked"
                     :label="city.name"
-                    @on-change="primary(index, indexn)"
+                    @change="primary(index, indexn)"
                     class="itemn"
                     v-for="(city, indexn) in item.children"
                     :key="indexn"
                     v-show="city.isShow"
-                    >{{ city.name }}</Checkbox
+                    >{{ city.name }}</el-checkbox
                   >
                 </div>
               </div>
             </div>
           </div>
-        </Col>
-      </Row>
+        </el-col>
+      </el-row>
       <div slot="footer">
-        <Button @click="close">取消</Button>
-        <Button type="primary" @click="confirm">确定</Button>
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">确定</el-button>
       </div>
       <Spin size="large" fix v-if="loading"></Spin>
     </Modal>
diff --git a/template/admin/src/components/freightTemplate/index.vue b/template/admin/src/components/freightTemplate/index.vue
index 9ed994909..b67d49aff 100644
--- a/template/admin/src/components/freightTemplate/index.vue
+++ b/template/admin/src/components/freightTemplate/index.vue
@@ -9,119 +9,187 @@
       @on-visible-change="close"
     >
       <div class="Modals">
-        <Form class="form" ref="formData" :label-width="120" label-position="right">
-          <Row :gutter="24" type="flex">
-            <Col :xl="18" :lg="18" :md="18" :sm="24" :xs="24">
-              <FormItem label="模板名称：" prop="name">
-                <Input type="text" placeholder="请输入模板名称" :maxlength="20" v-model="formData.name" />
-              </FormItem>
-            </Col>
-          </Row>
-          <Row :gutter="24" type="flex">
-            <Col :xl="18" :lg="18" :md="18" :sm="24" :xs="24">
-              <FormItem label="计费方式：" props="state" label-for="state">
-                <RadioGroup class="radio" v-model="formData.type" @on-change="changeRadio" element-id="state">
-                  <Radio :label="1">按件数</Radio>
-                  <Radio :label="2">按重量</Radio>
-                  <Radio :label="3">按体积</Radio>
-                </RadioGroup>
-              </FormItem>
-            </Col>
-          </Row>
-          <Row :gutter="24" type="flex">
-            <Col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
-              <FormItem class="label" label="配送区域及运费：" props="state" label-for="state">
-                <Table
+        <el-form class="form" ref="formData" label-width="120px" label-position="right">
+          <el-row :gutter="24">
+            <el-col :xl="18" :lg="18" :md="18" :sm="24" :xs="24">
+              <el-form-item label="模板名称：" prop="name">
+                <el-input type="text" placeholder="请输入模板名称" :maxlength="20" v-model="formData.name" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :xl="18" :lg="18" :md="18" :sm="24" :xs="24">
+              <el-form-item label="计费方式：" props="state" label-for="state">
+                <el-radio-group class="radio" v-model="formData.type" @change="changeRadio" element-id="state">
+                  <el-radio :label="1">按件数</el-radio>
+                  <el-radio :label="2">按重量</el-radio>
+                  <el-radio :label="3">按体积</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+              <el-form-item class="label" label="配送区域及运费：" props="state" label-for="state">
+                <el-table ref="table" :data="templateList" class="ivu-mt" empty-text="暂无数据" border>
+                  <el-table-column label="可配送区域" minWidth="100">
+                    <template slot-scope="scope">
+                      <el-input v-model="templateList[scope.$index].regionName" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    :label="formData.type === 2 ? '首件重量(KG)' : formData.type === 3 ? '首件体积(m³)' : '首件'"
+                    minWidth="100"
+                  >
+                    <template slot-scope="scope">
+                      <el-input type="number" v-model="templateList[scope.$index].first" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="运费（元）" minWidth="100">
+                    <template slot-scope="scope">
+                      <el-input type="number" v-model="templateList[scope.$index].price" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    :label="formData.type === 2 ? '续件重量(KG)' : formData.type === 3 ? '续件体积(m³)' : '续件'"
+                    minWidth="100"
+                  >
+                    <template slot-scope="scope">
+                      <el-input type="number" v-model="templateList[scope.$index].continue" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="续费（元）" minWidth="100">
+                    <template slot-scope="scope">
+                      <el-input type="number" v-model="templateList[scope.$index].continue_price" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" fixed="right" width="100">
+                    <template slot-scope="scope">
+                      <a
+                        v-if="scope.row.regionName !== '默认全国'"
+                        @click="delCity(scope.row, '配送区域', scope.$index, 1)"
+                        >删除</a
+                      >
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <el-row class="addTop">
+                  <el-col>
+                    <el-button type="primary" icon="md-add" @click="addCity(1)">单独添加配送区域</el-button>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+              <el-form-item label="指定包邮：" prop="store_name" label-for="store_name">
+                <el-radio-group class="radio" v-model="formData.appoint_check">
+                  <el-radio :label="1">开启</el-radio>
+                  <el-radio :label="0">关闭</el-radio>
+                </el-radio-group>
+                <el-table
                   ref="table"
-                  :columns="columns"
-                  :data="templateList"
-                  class="ivu-mt"
-                  no-data-text="暂无数据"
-                  border
-                >
-                  <template slot-scope="{ row, index }" slot="action">
-                    <a v-if="row.regionName !== '默认全国'" @click="delCity(row, '配送区域', index, 1)">删除</a>
-                  </template>
-                </Table>
-                <Row type="flex" class="addTop">
-                  <Col>
-                    <Button type="primary" icon="md-add" @click="addCity(1)">单独添加配送区域</Button>
-                  </Col>
-                </Row>
-              </FormItem>
-            </Col>
-          </Row>
-          <Row :gutter="24" type="flex">
-            <Col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
-              <FormItem label="指定包邮：" prop="store_name" label-for="store_name">
-                <Radio-group class="radio" v-model="formData.appoint_check">
-                  <Radio :label="1">开启</Radio>
-                  <Radio :label="0">关闭</Radio>
-                </Radio-group>
-                <Table
-                  ref="table"
-                  :columns="columns2"
                   :data="appointList"
                   class="addTop ivu-mt"
-                  no-data-text="暂无数据"
+                  empty-text="暂无数据"
                   border
                   v-if="formData.appoint_check === 1"
                 >
-                  <template slot-scope="{ row, index }" slot="action">
-                    <a v-if="row.regionName !== '默认全国'" @click="delCity(row, '配送区域', index, 2)">删除</a>
-                  </template>
-                </Table>
-                <Row type="flex" class="addTop" v-if="formData.appoint_check === 1">
-                  <Col>
-                    <Button type="primary" icon="md-add" @click="addCity(2)">单独指定包邮</Button>
-                  </Col>
-                </Row>
-              </FormItem>
-            </Col>
-          </Row>
-          <Row :gutter="24" type="flex">
-            <Col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
-              <FormItem label="指定不送达：" prop="store_name" label-for="store_name">
-                <Radio-group class="radio" v-model="formData.no_delivery_check">
-                  <Radio :label="1">开启</Radio>
-                  <Radio :label="0">关闭</Radio>
-                </Radio-group>
-                <Table
+                  <el-table-column label="选择地区" minWidth="100">
+                    <template slot-scope="scope">
+                      <el-input v-model="appointList[scope.$index].placeName" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    :label="formData.type === 2 ? '包邮重量' : formData.type === 3 ? '包邮体积(m³)' : '包邮件数'"
+                    minWidth="100"
+                  >
+                    <template slot-scope="scope">
+                      <el-input type="number" v-model="appointList[scope.$index].a_num" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="包邮金额（元）" minWidth="100">
+                    <template slot-scope="scope">
+                      <el-input type="number" v-model="appointList[scope.$index].a_price" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" fixed="right" width="100">
+                    <template slot-scope="scope">
+                      <a
+                        v-if="scope.row.regionName !== '默认全国'"
+                        @click="delCity(scope.row, '配送区域', scope.$index, 2)"
+                        >删除</a
+                      >
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <el-row class="addTop" v-if="formData.appoint_check === 1">
+                  <el-col>
+                    <el-button type="primary" icon="md-add" @click="addCity(2)">单独指定包邮</el-button>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+              <el-form-item label="指定不送达：" prop="store_name" label-for="store_name">
+                <el-radio-group class="radio" v-model="formData.no_delivery_check">
+                  <el-radio :label="1">开启</el-radio>
+                  <el-radio :label="0">关闭</el-radio>
+                </el-radio-group>
+                <el-table
                   ref="table"
-                  :columns="columns3"
                   :data="noDeliveryList"
                   class="addTop ivu-mt"
-                  no-data-text="暂无数据"
+                  empty-text="暂无数据"
                   border
                   v-if="formData.no_delivery_check === 1"
                 >
-                  <template slot-scope="{ row, index }" slot="action">
-                    <a v-if="row.regionName !== '默认全国'" @click="delCity(row, '配送区域', index, 3)">删除</a>
-                  </template>
-                </Table>
-                <Row type="flex" class="addTop" v-if="formData.no_delivery_check === 1">
-                  <Col>
-                    <Button type="primary" icon="md-add" @click="addCity(3)">单独指定不送达</Button>
-                  </Col>
-                </Row>
-              </FormItem>
-            </Col>
-          </Row>
-          <Row :gutter="24" type="flex">
-            <Col :xl="18" :lg="18" :md="18" :sm="24" :xs="24">
-              <FormItem label="排序：" prop="store_name" label-for="store_name">
-                <InputNumber :min="0" placeholder="输入值越大越靠前" v-model="formData.sort"></InputNumber>
-              </FormItem>
-            </Col>
-          </Row>
-          <Row :gutter="24" type="flex">
-            <Col>
-              <FormItem prop="store_name" label-for="store_name">
-                <Button type="primary" @click="handleSubmit">{{ id ? '立即修改' : '立即提交' }}</Button>
-              </FormItem>
-            </Col>
-          </Row>
-        </Form>
+                  <el-table-column label="选择地区" minWidth="100">
+                    <template slot-scope="scope">
+                      <el-input v-model="noDeliveryList[scope.$index].placeName" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" fixed="right" width="100">
+                    <template slot-scope="scope">
+                      <a
+                        v-if="scope.row.regionName !== '默认全国'"
+                        @click="delCity(scope.row, '配送区域', scope.$index, 3)"
+                        >删除</a
+                      >
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <el-row class="addTop" v-if="formData.no_delivery_check === 1">
+                  <el-col>
+                    <el-button type="primary" icon="md-add" @click="addCity(3)">单独指定不送达</el-button>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :xl="18" :lg="18" :md="18" :sm="24" :xs="24">
+              <el-form-item label="排序：" prop="store_name" label-for="store_name">
+                <el-input-number
+                  controls-position="right"
+                  :min="0"
+                  placeholder="输入值越大越靠前"
+                  v-model="formData.sort"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col>
+              <el-form-item prop="store_name" label-for="store_name">
+                <el-button type="primary" @click="handleSubmit">{{ id ? '立即修改' : '立即提交' }}</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
       </div>
       <div slot="footer"></div>
     </Modal>
@@ -141,186 +209,6 @@ export default {
     let that = this;
     return {
       isTemplate: false,
-      columns: [
-        {
-          title: '可配送区域',
-          key: 'regionName',
-          minWidth: 100,
-          render: (h, params) => {
-            return h('Input', {
-              props: {
-                type: 'text',
-                readonly: true,
-                size: 'small',
-                value: that.templateList[params.index].regionName,
-              },
-            });
-          },
-        },
-        {
-          title: '首件',
-          key: 'first',
-          minWidth: 70,
-          render: (h, params) => {
-            return h('Input', {
-              props: {
-                type: 'number',
-                size: 'small',
-                value: that.templateList[params.index].first, // 此处如何让数据双向绑定
-              },
-              on: {
-                'on-change': (event) => {
-                  that.templateList[params.index].first = event.target.value;
-                },
-              },
-            });
-          },
-        },
-        {
-          title: '运费（元）',
-          key: 'price',
-          minWidth: 70,
-          render: (h, params) => {
-            return h('Input', {
-              props: {
-                type: 'number',
-                size: 'small',
-                value: that.templateList[params.index].price, // 此处如何让数据双向绑定
-              },
-              on: {
-                'on-change': (event) => {
-                  that.templateList[params.index].price = event.target.value;
-                },
-              },
-            });
-          },
-        },
-        {
-          title: '续件',
-          key: 'continue',
-          minWidth: 70,
-          render: (h, params) => {
-            return h('Input', {
-              props: {
-                type: 'number',
-                size: 'small',
-                value: that.templateList[params.index].continue, // 此处如何让数据双向绑定
-              },
-              on: {
-                'on-change': (event) => {
-                  that.templateList[params.index].continue = event.target.value;
-                },
-              },
-            });
-          },
-        },
-        {
-          title: '续费（元）',
-          key: 'continue_price',
-          minWidth: 70,
-          render: (h, params) => {
-            return h('Input', {
-              props: {
-                type: 'number',
-                size: 'small',
-                value: that.templateList[params.index].continue_price, // 此处如何让数据双向绑定
-              },
-              on: {
-                'on-change': (event) => {
-                  that.templateList[params.index].continue_price = event.target.value;
-                },
-              },
-            });
-          },
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          minWidth: 70,
-        },
-      ],
-      columns2: [
-        {
-          title: '选择地区',
-          key: 'placeName',
-          minWidth: 250,
-          render: (h, params) => {
-            return h('Input', {
-              props: {
-                type: 'text',
-                readonly: true,
-                size: 'small',
-                value: that.appointList[params.index].placeName,
-              },
-            });
-          },
-        },
-        {
-          title: '包邮件数',
-          key: 'a_num',
-          minWidth: 100,
-          render: (h, params) => {
-            return h('Input', {
-              props: {
-                type: 'number',
-                size: 'small',
-                value: that.appointList[params.index].a_num, // 此处如何让数据双向绑定
-              },
-              on: {
-                'on-change': (event) => {
-                  that.appointList[params.index].a_num = event.target.value;
-                },
-              },
-            });
-          },
-        },
-        {
-          title: '包邮金额（元）',
-          key: 'a_price',
-          minWidth: 100,
-          render: (h, params) => {
-            return h('Input', {
-              props: {
-                type: 'number',
-                size: 'small',
-                value: that.appointList[params.index].a_price, // 此处如何让数据双向绑定
-              },
-              on: {
-                'on-change': (event) => {
-                  that.appointList[params.index].a_price = event.target.value;
-                },
-              },
-            });
-          },
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          minWidth: 100,
-        },
-      ],
-      columns3: [
-        {
-          title: '选择地区',
-          key: 'placeName',
-          minWidth: 250,
-          render: (h, params) => {
-            return h('Input', {
-              props: {
-                type: 'text',
-                readonly: true,
-                size: 'small',
-                value: that.noDeliveryList[params.index].placeName,
-              },
-            });
-          },
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          minWidth: 100,
-        },
-      ],
       templateList: [
         {
           region: [
@@ -384,7 +272,7 @@ export default {
           appoint_check: formData.appoint_check,
           no_delivery_check: formData.no_delivery_check,
         };
-        this.headerType();
+        // this.headerType();
       });
     },
     selectCity: function (data, type) {
@@ -431,23 +319,6 @@ export default {
       this.$refs.city.addressModal = true;
     },
     changeRadio() {
-      this.headerType();
-    },
-    headerType() {
-      let that = this;
-      if (this.formData.type === 2) {
-        that.columns[1].title = '首件重量(KG)';
-        that.columns[3].title = '续件重量(KG)';
-        that.columns2[1].title = '包邮重量(KG)';
-      } else if (this.formData.type === 3) {
-        that.columns[1].title = '首件体积(m³)';
-        that.columns[3].title = '续件体积(m³)';
-        that.columns2[1].title = '包邮体积(m³)';
-      } else {
-        that.columns[1].title = '首件';
-        that.columns[3].title = '续件';
-        that.columns2[1].title = '包邮件数';
-      }
     },
     // 提交
     handleSubmit: function () {
diff --git a/template/admin/src/components/from/from.vue b/template/admin/src/components/from/from.vue
index 4886c8291..bf55214a8 100644
--- a/template/admin/src/components/from/from.vue
+++ b/template/admin/src/components/from/from.vue
@@ -13,11 +13,11 @@
       <template>
         <div class="radio acea-row row-middle" v-if="FromData.action === '/marketing/coupon/save.html'">
           <div class="name ivu-form-item-content">优惠券类型</div>
-          <Radio-group v-model="type" @on-change="couponsType">
-            <Radio :label="0">通用券</Radio>
-            <Radio :label="1">品类券</Radio>
-            <Radio :label="2">商品券</Radio>
-          </Radio-group>
+          <el-radio-group v-model="type" @change="couponsType">
+            <el-radio :label="0">通用券</el-radio>
+            <el-radio :label="1">品类券</el-radio>
+            <el-radio :label="2">商品券</el-radio>
+          </el-radio-group>
         </div>
       </template>
       <form-create
diff --git a/template/admin/src/components/goodsList/index.vue b/template/admin/src/components/goodsList/index.vue
index 2e8bd8cb3..5bb3d0c2d 100644
--- a/template/admin/src/components/goodsList/index.vue
+++ b/template/admin/src/components/goodsList/index.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="goodList">
-    <Form ref="formValidate" :model="formValidate" :label-width="120" label-position="right" class="tabform">
-      <Row type="flex" :gutter="24">
-        <Col v-bind="grid" v-if="!liveStatus">
-          <FormItem label="商品分类：" label-for="pid">
-            <!-- <Select v-model="formValidate.cate_id" style="width: 200px" clearable @on-change="userSearchs">
-              <Option v-for="item in treeSelect" :value="item.id" :key="item.id"
+    <el-form ref="formValidate" :model="formValidate" label-width="120px" label-position="right" class="tabform">
+      <el-row :gutter="24">
+        <el-col v-bind="grid" v-if="!liveStatus">
+          <el-form-item label="商品分类：" label-for="pid">
+            <!-- <el-select v-model="formValidate.cate_id" style="width: 200px" clearable @change="userSearchs">
+              <el-option v-for="item in treeSelect" :value="item.id" :key="item.id"
                 >{{ item.html + item.cate_name }}
-              </Option>
-            </Select> -->
+              </el-option>
+            </el-select> -->
             <el-cascader
               v-model="formValidate.cate_id"
               size="small"
@@ -16,20 +16,19 @@
               :props="{ emitPath: false }"
               clearable
             ></el-cascader>
-          </FormItem>
-        </Col>
-        <Col v-bind="grid" v-if="!type && diy">
-          <FormItem label="商品类型：" label-for="pid">
-            <Select v-model="goodType" style="width: 200px" clearable @on-change="userSearchs">
-              <Option v-for="item in goodList" :value="item.activeValue" :key="item.activeValue"
-                >{{ item.title }}
-              </Option>
-            </Select>
-          </FormItem>
-        </Col>
-        <Col v-bind="grid">
-          <FormItem label="商品搜索：" label-for="store_name">
-            <Input
+          </el-form-item>
+        </el-col>
+        <el-col v-bind="grid" v-if="!type && diy">
+          <el-form-item label="商品类型：" label-for="pid">
+            <el-select v-model="goodType" style="width: 200px" clearable @change="userSearchs">
+              <el-option v-for="item in goodList" :value="item.activeValue" :key="item.activeValue" :label="item.title">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-bind="grid">
+          <el-form-item label="商品搜索：" label-for="store_name">
+            <el-input
               search
               enter-button
               placeholder="请输入商品名称/关键字/编号"
@@ -37,31 +36,63 @@
               style="width: 250px"
               @on-search="userSearchs"
             />
-          </FormItem>
-        </Col>
-      </Row>
-    </Form>
-    <Table
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table
       ref="table"
-      no-data-text="暂无数据"
-      @on-selection-change="changeCheckbox"
-      no-filtered-data-text="暂无筛选结果"
+      empty-text="暂无数据"
       max-height="400"
-      :columns="liveStatus == false ? columns4 : columns5"
+      :highlight-current-row="many !== 'many'"
       :data="tableList"
-      :loading="loading"
+      v-loading="loading"
+      @select="changeCheckbox"
+      @select-all="changeCheckbox"
     >
-      <template slot-scope="{ row, index }" slot="image">
-        <div class="tabBox_img" v-viewer>
-          <img v-lazy="row.image" />
-        </div>
-      </template>
-    </Table>
+      <el-table-column v-if="many == 'many'" type="selection" width="55"> </el-table-column>
+      <el-table-column v-else width="50">
+        <template slot-scope="scope">
+          <el-radio v-model="templateRadio" :label="scope.row.id" @change.native="getTemplateRow(scope.row)"
+            >&nbsp;</el-radio
+          >
+        </template>
+      </el-table-column>
+
+      <el-table-column label="商品ID" width="80">
+        <template slot-scope="scope">
+          <span>{{ scope.row.id }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="图片" width="80">
+        <template slot-scope="scope">
+          <div class="tabBox_img" v-viewer>
+            <img v-lazy="scope.row.image" />
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品名称" min-width="250">
+        <template slot-scope="scope">
+          <span>{{ scope.row.store_name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品分类" min-width="150" v-if="liveStatus">
+        <template slot-scope="scope">
+          <span>{{ scope.row.cate_name }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
     <div class="acea-row row-right page">
-      <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="formValidate.limit" />
+      <pagination
+        v-if="total"
+        :total="total"
+        :page.sync="formValidate.page"
+        :limit.sync="formValidate.limit"
+        @pagination="pageChange"
+      />
     </div>
     <div class="footer" slot="footer" v-if="many === 'many' && !diy">
-      <Button type="primary" size="large" :loading="modal_loading" long @click="ok">提交</Button>
+      <el-button type="primary" size="large" :loading="modal_loading" long @click="ok">提交</el-button>
     </div>
   </div>
 </template>
@@ -117,6 +148,8 @@ export default {
   },
   data() {
     return {
+      templateRadio: 0,
+
       modal_loading: false,
       treeSelect: [],
       formValidate: {
@@ -203,53 +236,6 @@ export default {
   },
   computed: {},
   created() {
-    let radio = {
-      width: 60,
-      align: 'center',
-      render: (h, params) => {
-        let id = params.row.id;
-        let flag = false;
-        if (this.currentid === id) {
-          flag = true;
-        } else {
-          flag = false;
-        }
-        let self = this;
-        return h('div', [
-          h('Radio', {
-            props: {
-              value: flag,
-            },
-            on: {
-              'on-change': () => {
-                self.currentid = id;
-                this.productRow = params.row;
-                this.$emit('getProductId', this.productRow);
-                if (this.productRow.id) {
-                  if (this.$route.query.fodder === 'image') {
-                    /* eslint-disable */
-                    let imageObject = {
-                      image: this.productRow.image,
-                      product_id: this.productRow.id,
-                    };
-                    form_create_helper.set('image', imageObject);
-                    form_create_helper.close('image');
-                  }
-                } else {
-                  this.$Message.warning('请先选择商品');
-                }
-              },
-            },
-          }),
-        ]);
-      },
-    };
-
-    let checkbox = {
-      type: 'selection',
-      width: 60,
-      align: 'center',
-    };
     let many = '';
     if (this.ischeckbox) {
       many = 'many';
@@ -257,13 +243,6 @@ export default {
       many = this.$route.query.type;
     }
     this.many = many;
-    if (many === 'many') {
-      this.columns4.unshift(checkbox);
-      this.columns5.unshift(checkbox);
-    } else {
-      this.columns4.unshift(radio);
-      this.columns5.unshift(radio);
-    }
   },
   mounted() {
     this.goodsCategory();
@@ -295,6 +274,21 @@ export default {
           this.$Message.error(res.msg);
         });
     },
+    getTemplateRow(row) {
+      console.log('111');
+      let images = [];
+      let imageObject = {
+        image: row.image,
+        product_id: row.id,
+        store_name: row.store_name,
+        temp_id: row.temp_id,
+      };
+      images.push(imageObject);
+      this.images = images;
+      this.diyVal = row;
+      this.$emit('getProductId', row);
+    },
+    changeRadio(row) {},
     changeCheckbox(selection) {
       let images = [];
       selection.forEach(function (item) {
@@ -308,7 +302,7 @@ export default {
       });
       this.images = images;
       this.diyVal = selection;
-      this.$emit('getProductDiy', selection);
+      this.$emit('getProductId', selection);
     },
     // 商品分类；
     goodsCategory() {
@@ -320,8 +314,7 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
+    pageChange() {
       if (this.diy) {
         this.productList();
       } else {
diff --git a/template/admin/src/components/iconFrom/index.vue b/template/admin/src/components/iconFrom/index.vue
index 023a619c2..12451eb92 100644
--- a/template/admin/src/components/iconFrom/index.vue
+++ b/template/admin/src/components/iconFrom/index.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="iconBox">
-    <Input
+    <el-input
       v-model="iconVal"
       placeholder="输入关键词搜索,注意全是英文"
       clearable
       style="width: 300px"
-      @on-change="upIcon(iconVal)"
+      @change="upIcon(iconVal)"
       ref="search"
     />
     <div class="trees-coadd">
diff --git a/template/admin/src/components/labelList/index.vue b/template/admin/src/components/labelList/index.vue
index d0f0664a2..079f95c83 100644
--- a/template/admin/src/components/labelList/index.vue
+++ b/template/admin/src/components/labelList/index.vue
@@ -18,8 +18,8 @@
       <div v-if="!isUser">暂无标签</div>
     </div>
     <div class="footer">
-      <Button type="primary" class="btns" @click="subBtn">确定</Button>
-      <Button type="primary" class="btns" ghost @click="cancel">取消</Button>
+      <el-button type="primary" class="btns" @click="subBtn">确定</el-button>
+      <el-button type="primary" class="btns" ghost @click="cancel">取消</el-button>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/linkaddress/index.vue b/template/admin/src/components/linkaddress/index.vue
index 79a3532a3..d57645b19 100644
--- a/template/admin/src/components/linkaddress/index.vue
+++ b/template/admin/src/components/linkaddress/index.vue
@@ -149,20 +149,24 @@
             currenType == 'integral'
           "
         >
-          <Form ref="formValidate" :model="formValidate" class="tabform" v-if="currenType == 'product'">
-            <Row type="flex" :gutter="24">
-              <Col>
-                <FormItem label="" label-for="pid">
-                  <Select v-model="formValidate.cate_id" style="width: 230px" clearable @on-change="userSearchs">
-                    <Option v-for="item in treeSelect" :value="item.id" :key="item.id"
-                      >{{ item.html + item.cate_name }}
-                    </Option>
-                  </Select>
-                </FormItem>
-              </Col>
-              <Col>
-                <FormItem label="" label-for="store_name">
-                  <Input
+          <el-form ref="formValidate" :model="formValidate" class="tabform" v-if="currenType == 'product'">
+            <el-row :gutter="24">
+              <el-col>
+                <el-form-item label="" label-for="pid">
+                  <el-select v-model="formValidate.cate_id" style="width: 230px" clearable @change="userSearchs">
+                    <el-option
+                      v-for="item in treeSelect"
+                      :value="item.id"
+                      :key="item.id"
+                      :label="item.html + item.cate_name"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <el-form-item label="" label-for="store_name">
+                  <el-input
                     search
                     enter-button
                     placeholder="请输入商品名称,关键字,编号"
@@ -170,31 +174,16 @@
                     style="width: 250px"
                     @on-search="userSearchs"
                   />
-                </FormItem>
-              </Col>
-            </Row>
-          </Form>
-          <Table
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+          <el-table
             row-key="id"
             ref="table"
-            no-data-text="暂无数据"
-            no-filtered-data-text="暂无筛选结果"
-            :columns="
-              currenType == 'special'
-                ? columns
-                : currenType == 'product_category'
-                ? columns7
-                : currenType == 'bargain' ||
-                  currenType == 'combination' ||
-                  currenType == 'advance' ||
-                  currenType == 'integral'
-                ? bargain
-                : currenType == 'news'
-                ? news
-                : columns8
-            "
+            empty-text="暂无数据"
             :data="tableList"
-            :loading="loading"
+            v-loading="loading"
             :max-height="
               currenType == 'product_category'
                 ? '410'
@@ -209,28 +198,53 @@
                 : ''
             "
           >
-            <template slot-scope="{ row, index }" slot="pic" v-if="row.hasOwnProperty('pic')">
-              <viewer>
-                <div class="tabBox_img">
-                  <img v-lazy="row.pic" />
-                </div>
-              </viewer>
-            </template>
-            <template slot-scope="{ row, index }" slot="image" v-if="row.hasOwnProperty('image')">
-              <viewer>
-                <div class="tabBox_img">
-                  <img v-lazy="row.image" />
-                </div>
-              </viewer>
-            </template>
-            <template slot-scope="{ row, index }" slot="image_input" v-if="row.hasOwnProperty('image_input')">
-              <viewer>
-                <div class="tabBox_img">
-                  <img v-lazy="row.image_input[0]" />
-                </div>
-              </viewer>
-            </template>
-          </Table>
+            <el-table-column
+              :label="item.title"
+              :min-width="item.minWidth"
+              v-for="(item, index) in currenType == 'special'
+                ? columns
+                : currenType == 'product_category'
+                ? columns7
+                : currenType == 'bargain' ||
+                  currenType == 'combination' ||
+                  currenType == 'advance' ||
+                  currenType == 'integral'
+                ? bargain
+                : currenType == 'news'
+                ? news
+                : columns8"
+              :key="index"
+            >
+              <template slot-scope="scope">
+                <template v-if="item.key">
+                  <div>
+                    <span>{{ scope.row[item.key] }}</span>
+                  </div>
+                </template>
+                <template v-else-if="item.slot === 'pic' && scope.row.hasOwnProperty('pic')">
+                  <viewer>
+                    <div class="tabBox_img">
+                      <img v-lazy="scope.row.pic" />
+                    </div>
+                  </viewer>
+                </template>
+                <template v-else-if="item.slot === 'image' && scope.row.hasOwnProperty('image')">
+                  <viewer>
+                    <div class="tabBox_img">
+                      <img v-lazy="scope.row.image" />
+                    </div>
+                  </viewer>
+                </template>
+                <template v-else-if="item.slot === 'image_input' && scope.row.hasOwnProperty('image_input')">
+                  <viewer>
+                    <div class="tabBox_img">
+                      <img v-lazy="scope.row.image_input[0]" />
+                    </div>
+                  </viewer>
+                </template>
+              </template>
+            </el-table-column>
+          </el-table>
           <div
             class="acea-row row-right page"
             v-if="
@@ -243,25 +257,31 @@
               currenType == 'integral'
             "
           >
-            <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="formValidate.limit" />
+            <pagination
+              v-if="total"
+              :total="total"
+              :page.sync="formValidate.page"
+              :limit.sync="formValidate.limit"
+              @pagination="getList"
+            />
           </div>
         </div>
         <div class="right_box" v-if="currenType == 'custom'">
           <!--<div v-if="!tableList.length || customNum==2">-->
-          <!--<Button type="primary" @click="customList" v-if="tableList.length">自定义列表</Button>-->
+          <!--<el-button type="primary" @click="customList" v-if="tableList.length">自定义列表</el-button>-->
           <div style="width: 340px; margin: 150px 100px 0 120px">
-            <Form ref="customdate" :model="customdate" :rules="ruleValidate" :label-width="88">
-              <!--<FormItem label="链接名称：" prop="name">-->
-              <!--<Input v-model="customdate.name" placeholder="会员中心"></Input>-->
-              <!--</FormItem>-->
-              <FormItem label="跳转路径：" prop="url">
-                <Input v-model="customdate.url" placeholder="请输入跳转路径"></Input>
-              </FormItem>
-            </Form>
+            <el-form ref="customdate" :model="customdate" :rules="ruleValidate" :label-width="88">
+              <!--<el-form-item label="链接名称：" prop="name">-->
+              <!--<el-input v-model="customdate.name" placeholder="会员中心"></el-input>-->
+              <!--</el-form-item>-->
+              <el-form-item label="跳转路径：" prop="url">
+                <el-input v-model="customdate.url" placeholder="请输入跳转路径"></el-input>
+              </el-form-item>
+            </el-form>
           </div>
           <!--</div>-->
           <!--<div v-else>-->
-          <!--<Button type="primary" @click="customLink">自定义链接</Button>-->
+          <!--<el-button type="primary" @click="customLink">自定义链接</el-button>-->
           <!--<div class="Box">-->
           <!--<div v-for="(item,index) in tableList" :key="index" class="item">-->
           <!--<div class="cont_box" :class="currenId==item.id?'on':''" @click="getUrl(item)">{{item.name}}</div>-->
@@ -272,13 +292,13 @@
         </div>
       </div>
       <!--<div slot="footer" v-if="categoryId==9&&customNum==2">-->
-      <!--<Button @click="handleReset('customdate')">重置</Button>-->
-      <!--<Button type="primary" @click="handleSubmit('customdate')">确定</Button>-->
+      <!--<el-button @click="handleReset('customdate')">重置</el-button>-->
+      <!--<el-button type="primary" @click="handleSubmit('customdate')">确定</el-button>-->
       <!--</div>-->
       <div slot="footer">
-        <Button @click="cancel">取消</Button>
-        <Button type="primary" @click="handleSubmit('customdate')" v-if="currenType == 'custom'">确定</Button>
-        <Button type="primary" @click="ok" v-else>确定</Button>
+        <el-button @click="cancel">取消</el-button>
+        <el-button type="primary" @click="handleSubmit('customdate')" v-if="currenType == 'custom'">确定</el-button>
+        <el-button type="primary" @click="ok" v-else>确定</el-button>
       </div>
     </Modal>
   </div>
@@ -430,7 +450,7 @@ export default {
         }
         let self = this;
         return h('div', [
-          h('Radio', {
+          h('el-radio', {
             props: {
               value: flag,
             },
@@ -513,10 +533,6 @@ export default {
     handleReset(name) {
       this.$refs[name].resetFields();
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 商品分类；
     goodsCategory() {
       treeListApi(1)
diff --git a/template/admin/src/components/mobileConfigDiy/c_home_service.vue b/template/admin/src/components/mobileConfigDiy/c_home_service.vue
index 84316f718..89c654ab4 100644
--- a/template/admin/src/components/mobileConfigDiy/c_home_service.vue
+++ b/template/admin/src/components/mobileConfigDiy/c_home_service.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="mobile-config">
-    <Form ref="formInline">
+    <el-form ref="formInline">
       <div v-for="(item, key) in rCom" :key="key">
         <component
           :is="item.components.name"
@@ -14,7 +14,7 @@
         ></component>
       </div>
       <rightBtn :activeIndex="activeIndex" :configObj="configObj"></rightBtn>
-    </Form>
+    </el-form>
   </div>
 </template>
 
diff --git a/template/admin/src/components/mobileConfigDiy/c_news_roll.vue b/template/admin/src/components/mobileConfigDiy/c_news_roll.vue
index e33740b43..41aeccfd6 100644
--- a/template/admin/src/components/mobileConfigDiy/c_news_roll.vue
+++ b/template/admin/src/components/mobileConfigDiy/c_news_roll.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="mobile-config">
-    <Form ref="formInline">
+    <el-form ref="formInline">
       <div v-for="(item, key) in rCom" :key="key">
         <component
           :is="item.components.name"
@@ -14,7 +14,7 @@
         ></component>
       </div>
       <rightBtn :activeIndex="activeIndex" :configObj="configObj"></rightBtn>
-    </Form>
+    </el-form>
   </div>
 </template>
 
diff --git a/template/admin/src/components/mobileConfigDiy/c_search_box.vue b/template/admin/src/components/mobileConfigDiy/c_search_box.vue
index 0e0ad97e5..c821b414e 100644
--- a/template/admin/src/components/mobileConfigDiy/c_search_box.vue
+++ b/template/admin/src/components/mobileConfigDiy/c_search_box.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="mobile-config">
-    <Form ref="formInline">
+    <el-form ref="formInline">
       <div v-for="(item, key) in rCom" :key="key">
         <component
           :is="item.components.name"
@@ -13,7 +13,7 @@
         ></component>
       </div>
       <rightBtn :activeIndex="activeIndex" :configObj="configObj"></rightBtn>
-    </Form>
+    </el-form>
   </div>
 </template>
 
diff --git a/template/admin/src/components/mobileConfigDiy/pageFoot.vue b/template/admin/src/components/mobileConfigDiy/pageFoot.vue
index febf1a51d..9b90417a6 100644
--- a/template/admin/src/components/mobileConfigDiy/pageFoot.vue
+++ b/template/admin/src/components/mobileConfigDiy/pageFoot.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="mobile-config">
-    <Form ref="formInline">
+    <el-form ref="formInline">
       <div v-for="(item, key) in rCom" :key="key">
         <component
           :is="item.components.name"
@@ -9,7 +9,7 @@
           :configNme="item.configNme"
         ></component>
       </div>
-    </Form>
+    </el-form>
   </div>
 </template>
 
diff --git a/template/admin/src/components/mobileConfigDiy/pageTitle.vue b/template/admin/src/components/mobileConfigDiy/pageTitle.vue
index ee82ea111..0a73cdf82 100644
--- a/template/admin/src/components/mobileConfigDiy/pageTitle.vue
+++ b/template/admin/src/components/mobileConfigDiy/pageTitle.vue
@@ -1,37 +1,37 @@
 <template>
   <div class="box">
     <div class="c_row-item" v-if="this.$route.query.type !== 2">
-      <Col class="label" span="4"> 模板名称 </Col>
-      <Col span="19" class="slider-box">
-        <Input v-model="name" placeholder="选填不超过15个字" maxlength="15" @on-change="changName" />
-      </Col>
+      <el-col class="label" :span="4"> 模板名称 </el-col>
+      <el-col span="19" class="slider-box">
+        <el-input v-model="name" placeholder="选填不超过15个字" maxlength="15" @change="changName" />
+      </el-col>
     </div>
     <div class="c_row-item">
-      <Col class="label" span="4"> 页面标题 </Col>
-      <Col span="19" class="slider-box">
-        <Input v-model="value" placeholder="选填不超过30个字" maxlength="30" @on-change="changVal" />
-      </Col>
+      <el-col class="label" :span="4"> 页面标题 </el-col>
+      <el-col span="19" class="slider-box">
+        <el-input v-model="value" placeholder="选填不超过30个字" maxlength="30" @change="changVal" />
+      </el-col>
     </div>
     <div class="c_row-item">
-      <Col class="label" span="4"> 页面状态 </Col>
-      <Col span="19" class="slider-box">
-        <i-switch v-model="isShow" @on-change="changeState" />
-      </Col>
+      <el-col class="label" :span="4"> 页面状态 </el-col>
+      <el-col span="19" class="slider-box">
+        <el-switch :active-value="1"  :inactive-value="0" v-model="isShow" @change="changeState" />
+      </el-col>
     </div>
     <div class="c_row-item acea-row row-top">
-      <Col class="label" span="4"> 背景设置 </Col>
-      <Col span="19" class="slider-box">
+      <el-col class="label" :span="4"> 背景设置 </el-col>
+      <el-col span="19" class="slider-box">
         <div class="acea-row row-between row-top color">
-          <Checkbox v-model="bgColor" @on-change="bgColorTap">背景色</Checkbox>
-          <ColorPicker v-model="colorPicker" @on-change="colorPickerTap(colorPicker)" />
+          <el-checkbox v-model="bgColor" @change="bgColorTap">背景色</el-checkbox>
+          <ColorPicker v-model="colorPicker" @change="colorPickerTap(colorPicker)" />
         </div>
         <div class="acea-row row-between row-top color">
-          <Checkbox v-model="bgPic" @on-change="bgPicTap">背景图</Checkbox>
-          <RadioGroup v-model="tabVal" type="button" @on-change="radioTap">
-            <Radio :label="index" v-for="(item, index) in picList" :key="index">
+          <el-checkbox v-model="bgPic" @change="bgPicTap">背景图</el-checkbox>
+          <el-radio-group v-model="tabVal" type="button" @change="radioTap">
+            <el-radio-button :label="index" v-for="(item, index) in picList" :key="index">
               <span class="iconfont-diy" :class="item"></span>
-            </Radio>
-          </RadioGroup>
+            </el-radio-button>
+          </el-radio-group>
         </div>
         <div v-if="bgPic">
           <div class="title">建议尺寸：690 * 240px</div>
@@ -44,7 +44,7 @@
             <!--<span class="iconfont-diy icondel_1" @click.stop="bindDelete" v-if="bgPicUrl"></span>-->
           </div>
         </div>
-      </Col>
+      </el-col>
     </div>
     <div>
       <Modal
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_bg_color.vue b/template/admin/src/components/mobileConfigRightDiy/c_bg_color.vue
index 9a4f357de..5ab925296 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_bg_color.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_bg_color.vue
@@ -1,13 +1,13 @@
 <template>
   <div>
     <div class="c_row-item" v-if="configData">
-      <Col span="8" class="c_label">{{ configData.title }}</Col>
-      <Col span="14" class="color-box">
+      <el-col :span="8" class="c_label">{{ configData.title }}</el-col>
+      <el-col span="14" class="color-box">
         <div class="color-item" v-for="(color, key) in configData.color" :key="key">
-          <ColorPicker v-model="color.item" @on-change="changeColor($event, color)" alpha></ColorPicker
+          <ColorPicker v-model="color.item" @change="changeColor($event, color)" alpha></ColorPicker
           ><span @click="resetBgA(color, index, key)">重置</span>
         </div>
-      </Col>
+      </el-col>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_cascader.vue b/template/admin/src/components/mobileConfigRightDiy/c_cascader.vue
index a557ca6af..bcd7d27a4 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_cascader.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_cascader.vue
@@ -1,19 +1,19 @@
 <template>
   <div class="slider-box">
     <div class="c_row-item">
-      <Col class="label" span="4" v-if="configData.title">
+      <el-col class="label" :span="4" v-if="configData.title">
         {{ configData.title }}
-      </Col>
-      <Col span="19" class="slider-box">
+      </el-col>
+      <el-col span="19" class="slider-box">
         <Cascader
           :data="configData.list"
           placeholder="请选择商品分类"
           change-on-select
           v-model="configData.activeValue"
           filterable
-          @on-change="sliderChange"
+          @change="sliderChange"
         ></Cascader>
-      </Col>
+      </el-col>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_foot.vue b/template/admin/src/components/mobileConfigRightDiy/c_foot.vue
index 8032e02fa..1135154cd 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_foot.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_foot.vue
@@ -18,18 +18,18 @@
             </div>
           </div>
           <div class="c_row-item">
-            <Col class="label" span="4"> 名称 </Col>
-            <Col span="19" class="slider-box">
-              <Input v-model="item.name" placeholder="选填不超过10个字" />
-            </Col>
+            <el-col class="label" :span="4"> 名称 </el-col>
+            <el-col span="19" class="slider-box">
+              <el-input v-model="item.name" placeholder="选填不超过10个字" />
+            </el-col>
           </div>
           <div class="c_row-item">
-            <Col class="label" span="4"> 链接 </Col>
-            <Col span="19" class="slider-box">
+            <el-col class="label" :span="4"> 链接 </el-col>
+            <el-col span="19" class="slider-box">
               <div @click="getLink(index)">
-                <Input icon="ios-arrow-forward" v-model="item.link" readonly placeholder="选填不超过10个字" />
+                <el-input icon="ios-arrow-forward" v-model="item.link" readonly placeholder="选填不超过10个字" />
               </div>
-            </Col>
+            </el-col>
           </div>
         </div>
         <div class="del-box" @click="deleteMenu(index)">
@@ -37,7 +37,7 @@
         </div>
       </div>
     </draggable>
-    <Button class="add-btn" type="info" ghost @click="addMenu" v-if="footConfig.length < 5">添加图文导航</Button>
+    <el-button class="add-btn" type="info" ghost @click="addMenu" v-if="footConfig.length < 5">添加图文导航</el-button>
     <div>
       <Modal
         v-model="modalPic"
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_hot_imgs.vue b/template/admin/src/components/mobileConfigRightDiy/c_hot_imgs.vue
index 2b9b146aa..668e1a71a 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_hot_imgs.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_hot_imgs.vue
@@ -35,7 +35,7 @@
             <div class="info-item" v-for="(infos, key) in item.info" :key="key">
               <span>{{ infos.title }}</span>
               <div class="input-box">
-                <Input v-model="infos.value" :placeholder="infos.tips" :maxlength="infos.max" />
+                <el-input v-model="infos.value" :placeholder="infos.tips" :maxlength="infos.max" />
               </div>
             </div>
           </div>
@@ -43,7 +43,7 @@
       </draggable>
     </div>
     <div class="add-btn" v-if="defaults.menu.length < 4">
-      <Button style="width: 100%; height: 40px" @click="addBox">添加板块</Button>
+      <el-button style="width: 100%; height: 40px" @click="addBox">添加板块</el-button>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_hot_word.vue b/template/admin/src/components/mobileConfigRightDiy/c_hot_word.vue
index 8239eae11..33dfd26ab 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_hot_word.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_hot_word.vue
@@ -10,15 +10,15 @@
           <div class="icon">
             <Icon type="ios-keypad" size="20" />
           </div>
-          <Input v-model="item.val" maxlength="10" placeholder="选填，不超过十个字" />
+          <el-input v-model="item.val" maxlength="10" placeholder="选填，不超过十个字" />
           <div class="delete" @click.stop="bindDelete(index)">
             <Icon type="ios-close-circle" size="20" />
           </div>
         </div>
       </draggable>
       <div class="add-btn" @click="addHotTxt" v-if="configData.list.length < 20">
-        <Button type="primary" ghost style="width: 100%; height: 40px; border-color: #1890ff; color: #1890ff"
-          >添加热词</Button
+        <el-button type="primary" ghost style="width: 100%; height: 40px; border-color: #1890ff; color: #1890ff"
+          >添加热词</el-button
         >
       </div>
     </div>
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_input_item.vue b/template/admin/src/components/mobileConfigRightDiy/c_input_item.vue
index d031e8be8..5e3658b15 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_input_item.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_input_item.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="box" v-if="configData">
     <div class="c_row-item">
-      <Col class="label" span="4">
+      <el-col class="label" :span="4">
         {{ configData.title }}
-      </Col>
-      <Col span="19" class="slider-box">
+      </el-col>
+      <el-col span="19" class="slider-box">
         <div @click="getLink(configData.title)">
-          <Input
+          <el-input
             :icon="configData.title == '链接' ? 'ios-arrow-forward' : ''"
             :readonly="configData.title == '链接' ? true : false"
             v-model="configData.value"
@@ -14,7 +14,7 @@
             :maxlength="configData.max"
           />
         </div>
-      </Col>
+      </el-col>
     </div>
     <linkaddress ref="linkaddres" @linkUrl="linkUrl"></linkaddress>
   </div>
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_input_number.vue b/template/admin/src/components/mobileConfigRightDiy/c_input_number.vue
index 68a51e75e..6da2daa8e 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_input_number.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_input_number.vue
@@ -1,21 +1,21 @@
 <template>
   <div class="numbox" v-if="configData">
     <div class="c_row-item">
-      <Col class="label" span="4">
+      <el-col class="label" :span="4">
         <span>{{ configData.title || '商品数量' }}</span>
-      </Col>
-      <Col span="19" class="slider-box">
-        <!--<Input v-model="configData.val" type="number" placeholder="请输入数量" @on-change="bindChange" style="text-align: right;"/>-->
-        <InputNumber
+      </el-col>
+      <el-col span="19" class="slider-box">
+        <!--<el-input v-model="configData.val" type="number" placeholder="请输入数量" @change="bindChange" style="text-align: right;"/>-->
+        <el-input-number controls-position="right"
           v-model="configData.val"
           placeholder="请输入数量"
           :step="1"
           :max="100"
           :min="1"
-          @on-change="bindChange"
+          @change="bindChange"
           style="text-align: right"
-        ></InputNumber>
-      </Col>
+        ></el-input-number>
+      </el-col>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_is_show.vue b/template/admin/src/components/mobileConfigRightDiy/c_is_show.vue
index 3d9c2412d..fefc685d2 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_is_show.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_is_show.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="c_row-item">
-    <Col class="c_label">{{ configData.title }}</Col>
-    <Col>
-      <i-switch v-model="configData.val" />
-    </Col>
+    <el-col class="c_label">{{ configData.title }}</el-col>
+    <el-col>
+      <el-switch :active-value="1"  :inactive-value="0" v-model="configData.val" />
+    </el-col>
   </div>
 </template>
 
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_menu_list.vue b/template/admin/src/components/mobileConfigRightDiy/c_menu_list.vue
index 2ff5b2cc4..ef381dddd 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_menu_list.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_menu_list.vue
@@ -20,16 +20,16 @@
             <div class="info-item" v-for="(infos, key) in item.info" :key="key">
               <span>{{ infos.title }}</span>
               <div class="input-box" @click="getLink(index, key, item.info)">
-                <Input
+                <el-input
                   :icon="key == item.info.length - 1 ? 'ios-arrow-forward' : ''"
                   v-model="infos.value"
                   :readonly="key == item.info.length - 1 ? true : false"
                   :placeholder="infos.tips"
                   :maxlength="infos.max"
                   v-if="configData.isCube"
-                  @on-blur="onBlur"
+                  @blur="onBlur"
                 />
-                <Input
+                <el-input
                   :icon="key == item.info.length - 1 ? 'ios-arrow-forward' : ''"
                   v-model="infos.value"
                   :readonly="key == item.info.length - 1 ? true : false"
@@ -65,12 +65,12 @@
     </div>
     <template v-if="configData.list">
       <div class="add-btn" v-if="configData.list.length < configData.maxList">
-        <Button
+        <el-button
           type="primary"
           ghost
           style="width: 100%; height: 40px; border-color: #1890ff; color: #1890ff"
           @click="addBox"
-          >添加板块</Button
+          >添加板块</el-button
         >
       </div>
     </template>
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_pictrue.vue b/template/admin/src/components/mobileConfigRightDiy/c_pictrue.vue
index 4822ca13e..038a520d9 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_pictrue.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_pictrue.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="mobile-page">
     <div v-if="isUpdate">
-      <Divider />
+      <el-divider direction="vertical" />
       <div class="title">布局</div>
       <div class="tip">选定布局区域，在下方添加图片，建议添加比例一致的图片</div>
       <div class="advert">
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_product.vue b/template/admin/src/components/mobileConfigRightDiy/c_product.vue
index 8e583e4ae..8cc6b97a3 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_product.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_product.vue
@@ -17,7 +17,7 @@
             <div class="con-item" v-for="(list, key) in item.chiild" :key="key">
               <span>{{ list.title }}</span>
               <div style="width: 100%" @click="getLink(index, key, item)">
-                <Input
+                <el-input
                   :icon="key && !item.link ? 'ios-arrow-forward' : ''"
                   :readonly="key && !item.link ? true : false"
                   v-model="list.val"
@@ -28,9 +28,9 @@
             </div>
             <div class="con-item" v-if="item.link">
               <span>{{ item.link.title }}</span>
-              <Select v-model="item.link.activeVal" style="" @on-change="sliderChange(index)">
-                <Option v-for="(item, j) in item.link.optiops" :value="item.value" :key="j">{{ item.label }} </Option>
-              </Select>
+              <el-select v-model="item.link.activeVal" style="" @change="sliderChange(index)">
+                <el-option v-for="(item, j) in item.link.optiops" :value="item.value" :key="j" :label="item.label"></el-option>
+              </el-select>
             </div>
           </div>
           <div class="delete" @click.stop="bindDelete(index)">
@@ -41,8 +41,8 @@
     </div>
     <div v-if="configData.list">
       <div class="add-btn" @click="addHotTxt" v-if="configData.list.length < configData.max">
-        <Button type="primary" ghost style="width: 100%; height: 40px; border-color: #1890ff; color: #1890ff"
-          >添加模块</Button
+        <el-button type="primary" ghost style="width: 100%; height: 40px; border-color: #1890ff; color: #1890ff"
+          >添加模块</el-button
         >
       </div>
     </div>
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_select.vue b/template/admin/src/components/mobileConfigRightDiy/c_select.vue
index 32a974218..404fcaa1e 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_select.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_select.vue
@@ -1,16 +1,14 @@
 <template>
   <div class="slider-box">
     <div class="c_row-item">
-      <Col class="label" span="4" v-if="configData.title">
+      <el-col class="label" :span="4" v-if="configData.title">
         {{ configData.title }}
-      </Col>
-      <Col span="19" class="slider-box">
-        <Select v-model="configData.activeValue" @on-change="sliderChange">
-          <Option v-for="(item, index) in configData.list" :value="item.activeValue" :key="index">{{
-            item.title
-          }}</Option>
-        </Select>
-      </Col>
+      </el-col>
+      <el-col span="19" class="slider-box">
+        <el-select v-model="configData.activeValue" @change="sliderChange">
+          <el-option v-for="(item, index) in configData.list" :value="item.activeValue" :key="index" :label="item.title"></el-option>
+        </el-select>
+      </el-col>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_set_up.vue b/template/admin/src/components/mobileConfigRightDiy/c_set_up.vue
index 65c70a82b..c22a6fb38 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_set_up.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_set_up.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="setUp">
     <template>
-      <Tabs v-model="configData.tabVal">
-        <TabPane label="内容设置" />
-        <TabPane label="样式设置" />
-      </Tabs>
+      <el-tabs v-model="configData.tabVal">
+        <el-tab-pane label="内容设置" />
+        <el-tab-pane label="样式设置" />
+      </el-tabs>
     </template>
   </div>
 </template>
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_slider.vue b/template/admin/src/components/mobileConfigRightDiy/c_slider.vue
index 3f60383a8..c51537346 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_slider.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_slider.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="slider-box">
     <div class="c_row-item">
-      <Col class="label" span="4" v-if="configData.title">
+      <el-col class="label" :span="4" v-if="configData.title">
         {{ configData.title }}
-      </Col>
-      <Col span="18" class="slider-box">
-        <Slider v-model="configData.val" show-input @on-change="sliderChange($event)" :min="configData.min"></Slider>
-      </Col>
+      </el-col>
+      <el-col span="18" class="slider-box">
+        <Slider v-model="configData.val" show-input @change="sliderChange($event)" :min="configData.min"></Slider>
+      </el-col>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_status.vue b/template/admin/src/components/mobileConfigRightDiy/c_status.vue
index 4d11f2c24..bd5b28aee 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_status.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_status.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <div class="c_row-item" v-if="configData">
-      <Col span="8" class="c_label">{{ configData.title }}</Col>
-      <Col span="14" class="color-box">
-        <i-switch :true-value="true" :false-value="false" v-model="configData.status" @on-change="change" />
-      </Col>
+      <el-col :span="8" class="c_label">{{ configData.title }}</el-col>
+      <el-col span="14" class="color-box">
+        <el-switch :active-value="true"  :inactive-value="false" v-model="configData.status" @change="change" />
+      </el-col>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_tab.vue b/template/admin/src/components/mobileConfigRightDiy/c_tab.vue
index faa227a42..6b2fd53f3 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_tab.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_tab.vue
@@ -5,12 +5,12 @@
       >{{ configData.tabList[configData.tabVal].name }}
     </div>
     <div class="radio-box" :class="{ on: configData.type == 1 }">
-      <RadioGroup v-model="configData.tabVal" type="button" size="large" @on-change="radioChange($event)">
-        <Radio :label="index" v-for="(item, index) in configData.tabList" :key="index">
+      <el-radio-group v-model="configData.tabVal" type="button" size="large" @change="radioChange($event)">
+        <el-radio-button :label="index" v-for="(item, index) in configData.tabList" :key="index">
           <span class="iconfont-diy" :class="item.icon" v-if="item.icon"></span>
           <span v-else>{{ item.name }}</span>
-        </Radio>
-      </RadioGroup>
+        </el-radio-button>
+      </el-radio-group>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/mobileConfigRightDiy/c_txt_tab.vue b/template/admin/src/components/mobileConfigRightDiy/c_txt_tab.vue
index ed8c4662a..b6e44321f 100644
--- a/template/admin/src/components/mobileConfigRightDiy/c_txt_tab.vue
+++ b/template/admin/src/components/mobileConfigRightDiy/c_txt_tab.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="txt_tab" v-if="configData">
     <div class="c_row-item">
-      <Col class="c_label">
+      <el-col class="c_label">
         {{ configData.title }}
         <span>{{ configData.list[configData.type].val }}</span>
-      </Col>
-      <Col class="color-box">
-        <RadioGroup v-model="configData.type" type="button" @on-change="radioChange($event)">
-          <Radio :label="key" v-for="(radio, key) in configData.list" :key="key">
+      </el-col>
+      <el-col class="color-box">
+        <el-radio-group v-model="configData.type" type="button" @change="radioChange($event)">
+          <el-radio-button :label="key" v-for="(radio, key) in configData.list" :key="key">
             <span class="iconfont-diy" :class="radio.icon" v-if="radio.icon"></span>
             <span v-else>{{ radio.val }}</span>
-          </Radio>
-        </RadioGroup>
-      </Col>
+          </el-radio-button>
+        </el-radio-group>
+      </el-col>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/modelSure/modelSure.vue b/template/admin/src/components/modelSure/modelSure.vue
index 1380d5dc7..0777e6140 100644
--- a/template/admin/src/components/modelSure/modelSure.vue
+++ b/template/admin/src/components/modelSure/modelSure.vue
@@ -9,8 +9,8 @@
       <p v-if="delfromData.info !== undefined">{{ `${delfromData.info}` }}</p>
     </div>
     <div slot="footer" class="acea-row row-right">
-      <Button type="warning" :loading="modal_loading" @click="ok">确定</Button>
-      <Button type="primary" @click="cancel">取消</Button>
+      <el-button type="warning" :loading="modal_loading" @click="ok">确定</el-button>
+      <el-button type="primary" @click="cancel">取消</el-button>
     </div>
   </Modal>
 </template>
diff --git a/template/admin/src/components/newsCategory/index.vue b/template/admin/src/components/newsCategory/index.vue
index 40d5bfbc9..18325925b 100644
--- a/template/admin/src/components/newsCategory/index.vue
+++ b/template/admin/src/components/newsCategory/index.vue
@@ -1,12 +1,12 @@
 <template>
   <div :style="{ height: scrollerHeight + 'px' || '' }">
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form ref="formValidate" :model="formValidate" :label-width="80" label-position="left" class="tabform">
-        <Row :gutter="24" type="flex" justify="end">
-          <Col span="24">
-            <Col v-bind="grid" class="mr">
-              <FormItem label="图文搜索：" prop="cate_name" label-for="cate_name">
-                <Input
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form ref="formValidate" :model="formValidate" label-width="85px" label-position="left" class="tabform">
+        <el-row :gutter="24"  justify="end">
+          <el-col :span="24">
+            <el-col v-bind="grid" class="mr">
+              <el-form-item label="图文搜索：" prop="cate_name" label-for="cate_name">
+                <el-input
                   search
                   enter-button
                   placeholder="请输入"
@@ -14,17 +14,17 @@
                   v-model="formValidate.cate_name"
                   @on-search="userSearchs"
                 />
-              </FormItem>
-            </Col>
-          </Col>
-        </Row>
-        <Row type="flex" v-show="$route.path === routePre + '/app/wechat/news_category/index'">
+              </el-form-item>
+            </el-col>
+          </el-col>
+        </el-row>
+        <el-row  v-show="$route.path === routePre + '/app/wechat/news_category/index'">
           <router-link :to="routePre + '/app/wechat/news_category/save/0'">
-            <Button type="primary" class="bnt" icon="md-add">添加图文消息</Button>
+            <el-button type="primary" class="bnt" icon="md-add">添加图文消息</el-button>
           </router-link>
-        </Row>
-      </Form>
-    </Card>
+        </el-row>
+      </el-form>
+    </el-card>
     <div class="contentBox">
       <div id="content" :style="{ top: contentTop + 'px' || '', width: contentWidth }" ref="content">
         <vue-waterfall-easy
@@ -48,28 +48,28 @@
                   @mouseenter="mouseenterOut(j)"
                   @mouseleave="mouseenterOver(j)"
                 >
-                  <Button
+                  <el-button
                     type="success"
                     shape="circle"
                     icon="md-create"
                     v-show="props.value.new[i].isDel && isShow"
                     @click="clkk(props.value)"
-                  ></Button>
-                  <Button
+                  ></el-button>
+                  <el-button
                     type="error"
                     shape="circle"
                     icon="md-trash"
                     v-show="props.value.new[i].isDel && isShow"
                     @click="del(props.value, '删除图文', i)"
                     style="margin-top: 5px"
-                  ></Button>
-                  <Button
+                  ></el-button>
+                  <el-button
                     type="primary"
                     icon="md-paper-plane"
                     v-show="props.value.new[i].isDel && isShowSend"
                     shape="circle"
                     @click="send(props.value, '发送', i)"
-                    >推送</Button
+                    >推送</el-button
                   >
                 </div>
                 <span class="news_sp">{{ j.title }}</span>
diff --git a/template/admin/src/components/publicSearchFrom/index.vue b/template/admin/src/components/publicSearchFrom/index.vue
index b53bccfe4..511ff4b8b 100644
--- a/template/admin/src/components/publicSearchFrom/index.vue
+++ b/template/admin/src/components/publicSearchFrom/index.vue
@@ -1,18 +1,18 @@
 <template>
   <div>
-    <Form ref="orderData" :label-width="80" label-position="right" class="tabform">
-      <Row :gutter="24" type="flex" v-for="(item, index) in fromList" :key="index">
-        <Col :xl="8" :lg="8" :md="8" :sm="24" :xs="24">
-          <FormItem :label="item.title + '：'">
-            <RadioGroup type="button" v-model="date">
-              <Radio :label="itemn.text" v-for="(itemn, indexn) in item.fromTxt" :key="indexn"
-                >{{ itemn.text }}{{ item.num }}</Radio
+    <el-form ref="orderData" label-width="85px" label-position="right" class="tabform">
+      <el-row :gutter="24"  v-for="(item, index) in fromList" :key="index">
+        <el-col :xl="8" :lg="8" :md="8" :sm="24" :xs="24">
+          <el-form-item :label="item.title + '：'">
+            <el-radio-group type="button" v-model="date">
+              <el-radio-button :label="itemn.text" v-for="(itemn, indexn) in item.fromTxt" :key="indexn"
+                >{{ itemn.text }}{{ item.num }}</el-radio-button
               >
-            </RadioGroup>
-          </FormItem>
-        </Col>
-        <Col v-if="item.custom">
-          <FormItem class="tab_data">
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="item.custom">
+          <el-form-item class="tab_data">
             <DatePicker
               :editable="false"
               format="yyyy/MM/dd"
@@ -21,32 +21,32 @@
               placeholder="请选择时间"
               style="width: 200px"
             ></DatePicker>
-          </FormItem>
-        </Col>
-      </Row>
-      <Row :gutter="24" type="flex" v-if="isExist.existOne">
-        <Col span="10" class="mr">
-          <FormItem :label="searchFrom.title + '：'" prop="real_name" label-for="real_name">
-            <Input search enter-button :placeholder="searchFrom.place" element-id="name" />
-          </FormItem>
-        </Col>
-        <Col>
-          <Button class="mr">导出</Button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24"  v-if="isExist.existOne">
+        <el-col span="10" class="mr">
+          <el-form-item :label="searchFrom.title + '：'" prop="real_name" label-for="real_name">
+            <el-input search enter-button :placeholder="searchFrom.place" element-id="name" />
+          </el-form-item>
+        </el-col>
+        <el-col>
+          <el-button class="mr">导出</el-button>
           <span class="Refresh">刷新</span><Icon type="ios-refresh" />
-        </Col>
-      </Row>
-      <Row :gutter="24" type="flex" class="withdrawal" v-if="isExist.existTwo">
-        <Col span="2.5" class="item">
-          <TreeSelect v-model="withdrawalTxt" :data="treeData.withdrawal" class="perW160" @on-change="changeTree" />
-        </Col>
-        <Col span="2.5" class="item">
-          <TreeSelect v-model="paymentTxt" :data="treeData.payment" class="perW160" @on-change="changeTree" />
-        </Col>
-        <Col span="6" class="item">
-          <Input search enter-button placeholder="微信名称、姓名、支付宝账号、银行卡号" element-id="name" />
-        </Col>
-      </Row>
-    </Form>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24"  class="withdrawal" v-if="isExist.existTwo">
+        <el-col span="2.5" class="item">
+          <TreeSelect v-model="withdrawalTxt" :data="treeData.withdrawal" class="perW160" @change="changeTree" />
+        </el-col>
+        <el-col span="2.5" class="item">
+          <TreeSelect v-model="paymentTxt" :data="treeData.payment" class="perW160" @change="changeTree" />
+        </el-col>
+        <el-col :span="6" class="item">
+          <el-input search enter-button placeholder="微信名称、姓名、支付宝账号、银行卡号" element-id="name" />
+        </el-col>
+      </el-row>
+    </el-form>
   </div>
 </template>
 <style scoped lang="stylus">
diff --git a/template/admin/src/components/remark/index.vue b/template/admin/src/components/remark/index.vue
index d536a97d5..729e611b9 100644
--- a/template/admin/src/components/remark/index.vue
+++ b/template/admin/src/components/remark/index.vue
@@ -1,8 +1,8 @@
 <template>
   <Modal v-model="modals" scrollable title="备注" class="order_box" :closable="false">
-    <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80" @submit.native.prevent>
-      <FormItem label="备注：" prop="remark">
-        <Input
+    <el-form ref="formValidate" :model="formValidate" :rules="ruleValidate" label-width="85px" @submit.native.prevent>
+      <el-form-item label="备注：" prop="remark">
+        <el-input
           v-model="formValidate.remark"
           :maxlength="200"
           show-word-limit
@@ -10,11 +10,11 @@
           placeholder="请输入备注信息"
           style="width: 100%"
         />
-      </FormItem>
-    </Form>
+      </el-form-item>
+    </el-form>
     <div slot="footer">
-      <Button type="primary" @click="putRemark('formValidate')">提交</Button>
-      <Button @click="cancel('formValidate')">取消</Button>
+      <el-button type="primary" @click="putRemark('formValidate')">提交</el-button>
+      <el-button @click="cancel('formValidate')">取消</el-button>
     </div>
   </Modal>
 </template>
diff --git a/template/admin/src/components/rightBtn/index.vue b/template/admin/src/components/rightBtn/index.vue
index 1b26f5119..aeb186cd1 100644
--- a/template/admin/src/components/rightBtn/index.vue
+++ b/template/admin/src/components/rightBtn/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="btn-box" style="display: none">
-    <Button type="primary" @click="handleSubmit('formInline')" style="text-align: center; width: 60%">确定</Button>
+    <el-button type="primary" @click="handleSubmit('formInline')" style="text-align: center; width: 60%">确定</el-button>
   </div>
 </template>
 
diff --git a/template/admin/src/components/rightConfig/index.vue b/template/admin/src/components/rightConfig/index.vue
index 95e1e4def..2261f760e 100644
--- a/template/admin/src/components/rightConfig/index.vue
+++ b/template/admin/src/components/rightConfig/index.vue
@@ -12,7 +12,7 @@
         ></component>
       </div>
       <div style="text-align: center" v-if="rCom.length">
-        <Button type="primary" style="width: 100%; margin: 0 auto; height: 40px" @click="saveConfig">保存</Button>
+        <el-button type="primary" style="width: 100%; margin: 0 auto; height: 40px" @click="saveConfig">保存</el-button>
       </div>
     </div>
   </div>
diff --git a/template/admin/src/components/searchFrom/searchFrom.vue b/template/admin/src/components/searchFrom/searchFrom.vue
index 130ff4e57..1c53f6c25 100644
--- a/template/admin/src/components/searchFrom/searchFrom.vue
+++ b/template/admin/src/components/searchFrom/searchFrom.vue
@@ -1,61 +1,61 @@
 <template>
   <div class="table_box">
-    <Form
+    <el-form
       ref="DataList"
       :model="DataList"
       :rules="rules"
-      :label-width="80"
+      label-width="85px"
       :label-position="labelPosition"
       class="tabform"
     >
-      <Row :gutter="24" type="flex" justify="end">
-        <Col span="24" class="ivu-text-left">
-          <FormItem label="订单状态：">
-            <RadioGroup v-model="DataList.status" type="button" @on-change="selectChange(DataList.status)">
-              <Radio :label="item.label" v-for="(item, i) in typeName" :key="i">{{
+      <el-row :gutter="24"  justify="end">
+        <el-col :span="24" class="ivu-text-left">
+          <el-form-item label="订单状态：">
+            <el-radio-group v-model="DataList.status" type="button" @change="selectChange(DataList.status)">
+              <el-radio-button :label="item.label" v-for="(item, i) in typeName" :key="i">{{
                 item.name + '(' + item.num + ')'
-              }}</Radio>
-            </RadioGroup>
-          </FormItem>
-        </Col>
-        <Col span="24" class="ivu-text-left">
-          <Col v-bind="grid">
-            <FormItem label="创建时间：">
-              <RadioGroup v-model="DataList.data" type="button" @on-change="timeChange(DataList.data)">
-                <Radio label="today">今天</Radio>
-                <Radio label="yesterday">昨天</Radio>
-                <Radio label="lately7">最近7天</Radio>
-                <Radio label="lately30">最近30天</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem class="tab_data">
+              }}</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="ivu-text-left">
+          <el-col v-bind="grid">
+            <el-form-item label="创建时间：">
+              <el-radio-group v-model="DataList.data" type="button" @change="timeChange(DataList.data)">
+                <el-radio-button label="today">今天</el-radio-button>
+                <el-radio-button label="yesterday">昨天</el-radio-button>
+                <el-radio-button label="lately7">最近7天</el-radio-button>
+                <el-radio-button label="lately30">最近30天</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item class="tab_data">
               <DatePicker
                 :editable="false"
                 :value="value2"
                 format="yyyy/MM/dd"
                 type="daterange"
                 placement="bottom-end"
-                placeholder="Select date"
+                placeholder="el-select date"
                 style="width: 200px"
               ></DatePicker>
-            </FormItem>
-          </Col>
-        </Col>
-        <Col span="24" class="ivu-text-left" v-if="$route.path === routePro + '/echarts/trade/order'">
-          <FormItem label="订单类型：">
-            <RadioGroup v-model="currentTab" type="button" @on-change="onClickTab(currentTab)">
-              <Radio label="">全部</Radio>
-              <Radio label="1">普通</Radio>
-              <Radio label="2">拼团</Radio>
-              <Radio label="3">砍价</Radio>
-              <Radio label="4">秒杀</Radio>
-            </RadioGroup>
-          </FormItem>
-        </Col>
-      </Row>
-    </Form>
+            </el-form-item>
+          </el-col>
+        </el-col>
+        <el-col :span="24" class="ivu-text-left" v-if="$route.path === routePro + '/echarts/trade/order'">
+          <el-form-item label="订单类型：">
+            <el-radio-group v-model="currentTab" type="button" @change="onClickTab(currentTab)">
+              <el-radio-button label="">全部</el-radio-button>
+              <el-radio-button label="1">普通</el-radio-button>
+              <el-radio-button label="2">拼团</el-radio-button>
+              <el-radio-button label="3">砍价</el-radio-button>
+              <el-radio-button label="4">秒杀</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
   </div>
 </template>
 
diff --git a/template/admin/src/components/sendCoupons/index.vue b/template/admin/src/components/sendCoupons/index.vue
index d6bbdd03b..dc2634a56 100644
--- a/template/admin/src/components/sendCoupons/index.vue
+++ b/template/admin/src/components/sendCoupons/index.vue
@@ -12,7 +12,7 @@
     >
       <div class="acea-row">
         <span class="sp">优惠券名称：</span
-        ><Input
+        ><el-input
           v-model="page.coupon_title"
           search
           enter-button
@@ -21,26 +21,44 @@
           @on-search="userSearchs"
         />
       </div>
-      <Table
-        :columns="columns"
+      <el-table
         :data="couponList"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="coupon_time">
-          <div v-if="row.coupon_time">{{ row.coupon_time }}</div>
-          <div v-else>{{ row.use_time }}</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="sendGrant(row, '发送优惠券', index)">发送</a>
-        </template>
-      </Table>
+        <el-table-column label="优惠券名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠券面值" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.coupon_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠券最低消费" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.use_min_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠券有效期限" min-width="130">
+          <template slot-scope="scope">
+            <div v-if="scope.row.coupon_time">{{ scope.row.coupon_time }}</div>
+            <div v-else>{{ scope.row.use_time }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="90">
+          <template slot-scope="scope">
+            <a @click="sendGrant(scope.row, '发送优惠券', index)">发送</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="page.limit" />
+        <pagination v-if="total" :total="total" :page.sync="page.page" :limit.sync="page.limit" @pagination="getList" />
       </div>
     </Modal>
   </div>
@@ -127,10 +145,6 @@ export default {
     userSearchs() {
       this.getList();
     },
-    pageChange(index) {
-      this.page.page = index;
-      this.getList();
-    },
     // 发送
     sendGrant(row, tit, num) {
       let delfromData = {
diff --git a/template/admin/src/components/sortList/index.vue b/template/admin/src/components/sortList/index.vue
index 848c6c7e7..17e11a567 100644
--- a/template/admin/src/components/sortList/index.vue
+++ b/template/admin/src/components/sortList/index.vue
@@ -1,17 +1,17 @@
 <template>
   <div class="goodList">
-    <Form ref="formValidate" :model="formValidate" :label-width="120" label-position="right" class="tabform">
-      <Row type="flex" :gutter="24">
-        <Col v-bind="grid">
-          <FormItem label="商品分类：" label-for="pid">
-            <Select v-model="formValidate.pid" style="width: 230px" clearable @on-change="userSearchs">
-              <Option v-for="item in treeSelect" :value="item.id" :key="item.id">{{ item.cate_name }} </Option>
-            </Select>
-          </FormItem>
-        </Col>
-        <Col v-bind="grid">
-          <FormItem label="商品搜索：" label-for="store_name">
-            <Input
+    <el-form ref="formValidate" :model="formValidate" label-width="120px" label-position="right" class="tabform">
+      <el-row :gutter="24">
+        <el-col v-bind="grid">
+          <el-form-item label="商品分类：" label-for="pid">
+            <el-select v-model="formValidate.pid" style="width: 230px" clearable @change="userSearchs">
+              <el-option v-for="item in treeSelect" :value="item.id" :key="item.id" :label="item.cate_name"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-bind="grid">
+          <el-form-item label="商品搜索：" label-for="store_name">
+            <el-input
               search
               enter-button
               placeholder="请输入商品分类,id"
@@ -19,26 +19,39 @@
               style="width: 80%"
               @on-search="userSearchs"
             />
-          </FormItem>
-        </Col>
-      </Row>
-    </Form>
-    <Table
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table
       ref="table"
-      no-data-text="暂无数据"
-      no-filtered-data-text="暂无筛选结果"
+      empty-text="暂无数据"
+      
       max-height="400"
       :columns="columns"
       :data="tableList"
       :loading="loading"
-      @on-selection-change="selectionGood"
+      @select="selectionGood"
     >
-      <template slot-scope="{ row, index }" slot="image">
-        <div class="tabBox_img" v-viewer>
-          <img v-lazy="row.pic" />
-        </div>
-      </template>
-    </Table>
+      <el-table-column type="selection" width="55"> </el-table-column>
+      <el-table-column label="商品ID" width="80">
+        <template slot-scope="scope">
+          <span>{{ scope.row.id }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="图片" min-width="90">
+        <template slot-scope="scope">
+          <div class="tabBox_img" v-viewer>
+            <img v-lazy="scope.row.pic" />
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品分类" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.cate_name }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
   </div>
 </template>
 
diff --git a/template/admin/src/components/systemStore/index.vue b/template/admin/src/components/systemStore/index.vue
index bbf3a63aa..faf315095 100644
--- a/template/admin/src/components/systemStore/index.vue
+++ b/template/admin/src/components/systemStore/index.vue
@@ -10,81 +10,81 @@
       @on-cancel="cancel"
     >
       <div class="article-manager">
-        <Card :bordered="false" dis-hover class="ivu-mt">
-          <Form
+        <el-card :bordered="false" shadow="never" class="ivu-mt">
+          <el-form
             ref="formItem"
             :model="formItem"
-            :label-width="120"
+            label-width="120px"
             label-position="right"
             :rules="ruleValidate"
             @submit.native.prevent
           >
-            <Row type="flex" :gutter="24">
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="提货点名称：" prop="name" label-for="name">
-                    <Input v-model="formItem.name" placeholder="请输入提货点名称" />
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="提货点简介：" label-for="introduction">
-                    <Input v-model="formItem.introduction" placeholder="请输入提货点简介" />
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="提货点手机号：" label-for="phone" prop="phone">
-                    <Input v-model="formItem.phone" placeholder="请输入提货点手机号" />
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="提货点地址：" label-for="address" prop="address">
+            <el-row  :gutter="24">
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="提货点名称：" prop="name" label-for="name">
+                    <el-input v-model="formItem.name" placeholder="请输入提货点名称" />
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="提货点简介：" label-for="introduction">
+                    <el-input v-model="formItem.introduction" placeholder="请输入提货点简介" />
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="提货点手机号：" label-for="phone" prop="phone">
+                    <el-input v-model="formItem.phone" placeholder="请输入提货点手机号" />
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="提货点地址：" label-for="address" prop="address">
                     <Cascader
                       :data="addresData"
                       :value="formItem.address"
                       v-model="formItem.address"
-                      @on-change="handleChange"
+                      @change="handleChange"
                     ></Cascader>
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="详细地址：" label-for="detailed_address" prop="detailed_address">
-                    <Input v-model="formItem.detailed_address" placeholder="请输入详细地址" />
-                  </FormItem>
-                </Col>
-              </Col>
-              <!--<Col span="24">-->
-              <!--<Col v-bind="grid">-->
-              <!--<FormItem label="核销时效：" label-for="valid_time">-->
-              <!--<DatePicker @on-change="onchangeDate" :value="formItem.valid_time" v-model="formItem.valid_time" format="yyyy/MM/dd" type="daterange" split-panels placeholder="请选择核销时效" ></DatePicker>-->
-              <!--</FormItem>-->
-              <!--</Col>-->
-              <!--</Col>-->
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="提货点营业：" label-for="day_time" prop="day_time">
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="详细地址：" label-for="detailed_address" prop="detailed_address">
+                    <el-input v-model="formItem.detailed_address" placeholder="请输入详细地址" />
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <!--<el-col :span="24">-->
+              <!--<el-col v-bind="grid">-->
+              <!--<el-form-item label="核销时效：" label-for="valid_time">-->
+              <!--<DatePicker @change="onchangeDate" :value="formItem.valid_time" v-model="formItem.valid_time" format="yyyy/MM/dd" type="daterange" split-panels placeholder="请选择核销时效" ></DatePicker>-->
+              <!--</el-form-item>-->
+              <!--</el-col>-->
+              <!--</el-col>-->
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="提货点营业：" label-for="day_time" prop="day_time">
                     <TimePicker
                       type="timerange"
-                      @on-change="onchangeTime"
+                      @change="onchangeTime"
                       v-model="formItem.day_time"
                       format="HH:mm:ss"
                       :value="formItem.day_time"
                       placement="bottom-end"
                       placeholder="请选择营业时间"
                     ></TimePicker>
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="提货点logo：" prop="image">
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="提货点logo：" prop="image">
                     <div class="picBox" @click="modalPicTap('单选', 'logo')">
                       <div class="pictrue" v-if="formItem.image">
                         <img v-lazy="formItem.image" />
@@ -93,12 +93,12 @@
                         <Icon type="ios-camera-outline" size="26" />
                       </div>
                     </div>
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="提货点大图：" prop="oblong_image">
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="提货点大图：" prop="oblong_image">
                     <div class="picBox" @click="modalPicTap('单选', 'oblong')">
                       <div class="pictrue" v-if="formItem.oblong_image">
                         <img v-lazy="formItem.oblong_image" />
@@ -107,14 +107,14 @@
                         <Icon type="ios-camera-outline" size="26" />
                       </div>
                     </div>
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="经纬度：" label-for="status2" prop="latlng">
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="经纬度：" label-for="status2" prop="latlng">
                     <Tooltip>
-                      <Input
+                      <el-input
                         search
                         enter-button="查找位置"
                         v-model="formItem.latlng"
@@ -124,20 +124,20 @@
                       />
                       <div slot="content">请点击查找位置选择位置</div>
                     </Tooltip>
-                  </FormItem>
-                </Col>
-              </Col>
-            </Row>
-            <Row type="flex">
+                  </el-form-item>
+                </el-col>
+              </el-col>
+            </el-row>
+            <el-row >
               <div class="btn">
-                <Button type="primary" long @click="handleSubmit('formItem')">{{
+                <el-button type="primary" long @click="handleSubmit('formItem')">{{
                   formItem.id ? '修改' : '提交'
-                }}</Button>
+                }}</el-button>
               </div>
-            </Row>
+            </el-row>
             <Spin size="large" fix v-if="spinShow"></Spin>
-          </Form>
-        </Card>
+          </el-form>
+        </el-card>
 
         <Modal
           v-model="modalPic"
diff --git a/template/admin/src/components/upGrade/index.vue b/template/admin/src/components/upGrade/index.vue
index 5577a8354..a19b9ea4c 100644
--- a/template/admin/src/components/upGrade/index.vue
+++ b/template/admin/src/components/upGrade/index.vue
@@ -17,8 +17,8 @@
         <p>更多惊喜内容等你来探索，快来看看吧～</p>
       </div>
       <div slot="footer" class="footer">
-        <Button class="cancel" shape="circle" @click="upgrade = false">暂不升级</Button>
-        <Button shape="circle" type="primary" @click="upgradeNow()">立即升级</Button>
+        <el-button class="cancel" shape="circle" @click="upgrade = false">暂不升级</el-button>
+        <el-button shape="circle" type="primary" @click="upgradeNow()">立即升级</el-button>
       </div>
     </Modal>
   </div>
diff --git a/template/admin/src/components/uploadPictures/index.vue b/template/admin/src/components/uploadPictures/index.vue
index 6241bab4a..a55bb9a27 100644
--- a/template/admin/src/components/uploadPictures/index.vue
+++ b/template/admin/src/components/uploadPictures/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="Modal">
-    <Row class="colLeft">
-      <Col :xl="6" :lg="6" :md="6" :sm="6" :xs="24" class="colLeft">
+    <el-row class="colLeft">
+      <el-col :xl="6" :lg="6" :md="6" :sm="6" :xs="24" class="colLeft">
         <div class="Nav">
           <div class="input">
-            <Input
+            <el-input
               search
               enter-button
               placeholder="请输入分类名称"
@@ -21,18 +21,18 @@
             </div>
           </div>
         </div>
-      </Col>
-      <Col :xl="18" :lg="18" :md="18" :sm="18" :xs="24" class="colLeft">
+      </el-col>
+      <el-col :xl="18" :lg="18" :md="18" :sm="18" :xs="24" class="colLeft">
         <div class="conter">
           <div class="bnt acea-row row-middle">
-            <Col span="24">
-              <Button
+            <el-col :span="24">
+              <el-button
                 type="primary"
                 :disabled="checkPicList.length === 0"
                 @click="checkPics"
                 class="mr10"
                 v-if="isShow !== 0"
-                >使用选中图片</Button
+                >使用选中图片</el-button
               >
               <Upload
                 :show-upload-list="false"
@@ -46,11 +46,15 @@
                 :on-success="handleSuccess"
                 style="margin-top: 1px; display: inline-block"
               >
-                <Button type="primary">上传图片</Button>
+                <el-button type="primary">上传图片</el-button>
               </Upload>
-              <!--<Button type="success" @click.stop="add" class="mr10">添加分类</Button>-->
-              <Button type="error" class="mr10" :disabled="checkPicList.length === 0" @click.stop="editPicList('图片')"
-                >删除图片</Button
+              <!--<el-button type="success" @click.stop="add" class="mr10">添加分类</el-button>-->
+              <el-button
+                type="error"
+                class="mr10"
+                :disabled="checkPicList.length === 0"
+                @click.stop="editPicList('图片')"
+                >删除图片</el-button
               >
               <i-select :value="pids" placeholder="图片移动至" style="width: 250px" class="treeSel">
                 <i-option v-for="(item, index) of list" :value="item.value" :key="index" style="display: none">
@@ -64,10 +68,10 @@
                   class="treeBox"
                 ></Tree>
               </i-select>
-            </Col>
+            </el-col>
           </div>
           <div class="pictrueList acea-row">
-            <Row :gutter="24" class="conter">
+            <el-row :gutter="24" class="conter">
               <div v-show="isShowPic" class="imagesNo">
                 <Icon type="ios-images" size="60" color="#dbdbdb" />
                 <span class="imagesNo_sp">图片库为空</span>
@@ -98,13 +102,13 @@
                     <p style="width: 80%" v-if="!item.isEdit">
                       {{ item.editName }}
                     </p>
-                    <Input
+                    <el-input
                       size="small"
                       style="width: 80%"
                       type="text"
                       v-model="item.real_name"
                       v-else
-                      @on-blur="bindTxt(item)"
+                      @blur="bindTxt(item)"
                     />
                     <span
                       class="iconfont iconbianji1"
@@ -117,21 +121,21 @@
                   </div>
                 </div>
               </div>
-              <!--<Col class="mb20" v-bind="gridPic"-->
+              <!--<el-col class="mb20" v-bind="gridPic"-->
               <!--v-for="(item, index) in pictrueList" :key="index" >-->
               <!--<div class="pictrueList_pic">-->
               <!--<img :class="item.isSelect ? 'on': '' " v-lazy="item.satt_dir"-->
               <!--@click.stop="changImage(item, index, pictrueList)"/>-->
               <!--</div>-->
-              <!--</Col>-->
-            </Row>
+              <!--</el-col>-->
+            </el-row>
           </div>
           <div class="footer acea-row row-right">
-            <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="fileData.limit" />
+            <pagination v-if="total" :total="total" :page.sync="fileData.page" :limit.sync="fileData.limit" @pagination="pageChange" />
           </div>
         </div>
-      </Col>
-    </Row>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
@@ -648,8 +652,7 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.fileData.page = index;
+    pageChange() {
       this.getFileList();
       this.checkPicList = [];
     },
diff --git a/template/admin/src/components/uploadVideo/index.vue b/template/admin/src/components/uploadVideo/index.vue
index 006edd524..64d8f6a7b 100644
--- a/template/admin/src/components/uploadVideo/index.vue
+++ b/template/admin/src/components/uploadVideo/index.vue
@@ -1,15 +1,15 @@
 <template>
   <div>
     <div class="mt20 ml20">
-      <Input class="perW35" v-model="videoLink" placeholder="请输入视频链接" />
+      <el-input class="perW35" v-model="videoLink" placeholder="请输入视频链接" />
       <input type="file" ref="refid" style="display: none" @change="zh_uploadFile_change" />
-      <Button
+      <el-button
         v-if="upload_type !== '1' || videoLink"
         type="primary"
         icon="ios-cloud-upload-outline"
         class="ml10"
         @click="zh_uploadFile"
-        >{{ videoLink ? '确认添加' : '上传视频' }}</Button
+        >{{ videoLink ? '确认添加' : '上传视频' }}</el-button
       >
       <Upload
         v-if="upload_type === '1' && !videoLink"
@@ -22,7 +22,7 @@
         :multiple="true"
         style="display: inline-block"
       >
-        <Button type="primary" icon="ios-cloud-upload-outline">上传视频</Button>
+        <el-button type="primary" icon="ios-cloud-upload-outline">上传视频</el-button>
       </Upload>
       <Progress :percent="progress" :stroke-width="5" v-if="upload.videoIng" />
       <div class="iview-video-style" v-if="formValidate.video_link">
@@ -38,7 +38,7 @@
       </div>
     </div>
     <div class="mt50 ml20">
-      <Button type="primary" @click="uploads">确认</Button>
+      <el-button type="primary" @click="uploads">确认</el-button>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/uploadVideo2/index.vue b/template/admin/src/components/uploadVideo2/index.vue
index a67c8cff1..a6d2be0e4 100644
--- a/template/admin/src/components/uploadVideo2/index.vue
+++ b/template/admin/src/components/uploadVideo2/index.vue
@@ -1,15 +1,15 @@
 <template>
   <div>
     <div class="mt20 ml20">
-      <Input class="perW35" v-model="videoLink" placeholder="请输入视频链接" />
+      <el-input class="perW35" v-model="videoLink" placeholder="请输入视频链接" />
       <input type="file" ref="refid" style="display: none" @change="zh_uploadFile_change" />
-      <Button
+      <el-button
         v-if="upload_type !== '1' || videoLink"
         type="primary"
         icon="ios-cloud-upload-outline"
         class="ml10"
         @click="zh_uploadFile"
-        >{{ videoLink ? '确认添加' : '上传视频' }}</Button
+        >{{ videoLink ? '确认添加' : '上传视频' }}</el-button
       >
       <Upload
         v-if="upload_type === '1' && !videoLink"
@@ -22,7 +22,7 @@
         :multiple="true"
         style="display: inline-block"
       >
-        <Button type="primary" icon="ios-cloud-upload-outline">上传视频</Button>
+        <el-button type="primary" icon="ios-cloud-upload-outline">上传视频</el-button>
       </Upload>
       <Progress :percent="progress" :stroke-width="5" v-if="upload.videoIng" />
       <div class="iview-video-style" v-if="formValidate.video_link">
@@ -38,7 +38,7 @@
       </div>
     </div>
     <div class="mt50 ml20">
-      <Button type="primary" @click="uploads">确认</Button>
+      <el-button type="primary" @click="uploads">确认</el-button>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/userLabel.vue b/template/admin/src/components/userLabel.vue
index 30851aa9e..f0db53b2a 100644
--- a/template/admin/src/components/userLabel.vue
+++ b/template/admin/src/components/userLabel.vue
@@ -17,8 +17,8 @@
     </div>
 
     <div class="footer">
-      <Button type="primary" class="btns" @click="subBtn">确定</Button>
-      <Button type="primary" class="btns" ghost @click="cancel">取消</Button>
+      <el-button type="primary" class="btns" @click="subBtn">确定</el-button>
+      <el-button type="primary" class="btns" ghost @click="cancel">取消</el-button>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/components/wangEditor/index.vue b/template/admin/src/components/wangEditor/index.vue
index be4c35a82..72988b5c5 100644
--- a/template/admin/src/components/wangEditor/index.vue
+++ b/template/admin/src/components/wangEditor/index.vue
@@ -4,7 +4,7 @@
       <div ref="wang-editor" class="wang-editor" />
     </div>
     <div v-if="monacoBox">
-      <Button type="primary" class="bottom" @click="getHtmlint">可视化界面</Button>
+      <el-button type="primary" class="bottom" @click="getHtmlint">可视化界面</el-button>
       <monaco @change="changeValue" :value="newHtml" />
     </div>
 
diff --git a/template/admin/src/components/wangEditor/monaco.vue b/template/admin/src/components/wangEditor/monaco.vue
index 8915e1510..4439dbfa5 100644
--- a/template/admin/src/components/wangEditor/monaco.vue
+++ b/template/admin/src/components/wangEditor/monaco.vue
@@ -1,6 +1,6 @@
 <template>
   <div ref="code_box" class="text">
-    <Input v-model="content" type="textarea" placeholder="" @on-change="changeContent" />
+    <el-input v-model="content" type="textarea" placeholder="" @change="changeContent" />
   </div>
 </template>
 
diff --git a/template/admin/src/layout/component/columnsAside.vue b/template/admin/src/layout/component/columnsAside.vue
index b5da36da9..7d9cadbcd 100644
--- a/template/admin/src/layout/component/columnsAside.vue
+++ b/template/admin/src/layout/component/columnsAside.vue
@@ -42,8 +42,9 @@
 </template>
 
 <script>
-import { getMenuSider, getHeaderName } from '@/libs/system';
+import { getMenuSider, getHeaderName, findFirstNonNullChildren } from '@/libs/system';
 import Logo from '@/layout/logo/index.vue';
+import { mapState } from 'vuex';
 
 export default {
   name: 'layoutColumnsAside',
@@ -54,7 +55,6 @@ export default {
       liIndex: 0,
       difference: 0,
       routeSplit: [],
-      activePath: '',
     };
   },
   computed: {
@@ -72,6 +72,7 @@ export default {
     routesList() {
       this.$store.state.routesList.routesList;
     },
+    ...mapState('menu', ['activePath']),
   },
   beforeDestroy() {
     this.bus.$off('routesListChange');
@@ -93,8 +94,11 @@ export default {
     // 菜单高亮点击事件
     onColumnsAsideMenuClick(v) {
       let { path, redirect } = v;
-      if (path) this.$router.push(path);
-      else this.$router.push(path);
+      if (v.children) {
+        this.$router.push(findFirstNonNullChildren(v.children).path);
+      } else {
+        this.$router.push(path);
+      }
       // 一个路由设置自动收起菜单
       if (!v.children || v.children.length <= 1) this.$store.state.themeConfig.themeConfig.isCollapse = true;
       else if (v.children.length > 1) this.$store.state.themeConfig.themeConfig.isCollapse = false;
diff --git a/template/admin/src/layout/component/transverseAside.vue b/template/admin/src/layout/component/transverseAside.vue
index 2a9785fc2..8a8a386cb 100644
--- a/template/admin/src/layout/component/transverseAside.vue
+++ b/template/admin/src/layout/component/transverseAside.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import { getMenuSider, getHeaderName } from '@/libs/system';
+import { getMenuSider, getHeaderName, findFirstNonNullChildren } from '@/libs/system';
 import Logo from '@/layout/logo/index.vue';
 
 export default {
@@ -109,8 +109,11 @@ export default {
     // 菜单高亮点击事件
     onColumnsAsideMenuClick(v) {
       let { path, redirect } = v;
-      if (path) this.$router.push(path);
-      else this.$router.push(path);
+      if (v.children) {
+        this.$router.push(findFirstNonNullChildren(v.children).path);
+      } else {
+        this.$router.push(path);
+      }
       // 一个路由设置自动收起菜单
       if (!v.children || v.children.length <= 1) this.$store.state.themeConfig.themeConfig.isCollapse = true;
       else if (v.children.length > 1) this.$store.state.themeConfig.themeConfig.isCollapse = false;
diff --git a/template/admin/src/layout/navBars/breadcrumb/setings.vue b/template/admin/src/layout/navBars/breadcrumb/setings.vue
index 98993d19f..a32db70b1 100644
--- a/template/admin/src/layout/navBars/breadcrumb/setings.vue
+++ b/template/admin/src/layout/navBars/breadcrumb/setings.vue
@@ -116,7 +116,7 @@
         <div class="layout-breadcrumb-seting-bar-flex mt15">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsDark') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
-            <el-switch v-model="getThemeConfig.isIsDark" :width="35" @change="onAddDarkChange"></el-switch>
+            <el-switch  v-model="getThemeConfig.isIsDark" :width="35" @change="onAddDarkChange"> </el-switch>
           </div>
         </div> -->
 
@@ -147,19 +147,19 @@
         <div class="layout-breadcrumb-seting-bar-flex">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsCollapse') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
-            <el-switch v-model="getThemeConfig.isCollapse" :width="35" @change="setLocalThemeConfig"></el-switch>
+            <el-switch v-model="getThemeConfig.isCollapse" :width="35" @change="setLocalThemeConfig"> </el-switch>
           </div>
         </div>
         <div class="layout-breadcrumb-seting-bar-flex mt15">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsUniqueOpened') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
-            <el-switch v-model="getThemeConfig.isUniqueOpened" :width="35" @change="setLocalThemeConfig"></el-switch>
+            <el-switch v-model="getThemeConfig.isUniqueOpened" :width="35" @change="setLocalThemeConfig"> </el-switch>
           </div>
         </div>
         <div class="layout-breadcrumb-seting-bar-flex mt15">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeIsFixedHeader') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
-            <el-switch v-model="getThemeConfig.isFixedHeader" :width="35" @change="setLocalThemeConfig"></el-switch>
+            <el-switch v-model="getThemeConfig.isFixedHeader" :width="35" @change="setLocalThemeConfig"> </el-switch>
           </div>
         </div>
 
@@ -168,7 +168,7 @@
         <div class="layout-breadcrumb-seting-bar-flex">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsShowLogo') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
-            <el-switch v-model="getThemeConfig.isShowLogo" :width="35" @change="setLocalThemeConfig"></el-switch>
+            <el-switch v-model="getThemeConfig.isShowLogo" :width="35" @change="setLocalThemeConfig"> </el-switch>
           </div>
         </div>
         <div
@@ -182,58 +182,56 @@
               :disabled="getThemeConfig.layout === 'classic' || getThemeConfig.layout === 'transverse'"
               :width="35"
               @change="setLocalThemeConfig"
-            ></el-switch>
+            >
+            </el-switch>
           </div>
         </div>
         <div class="layout-breadcrumb-seting-bar-flex mt15">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsBreadcrumbIcon') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
-            <el-switch v-model="getThemeConfig.isBreadcrumbIcon" :width="35" @change="setLocalThemeConfig"></el-switch>
+            <el-switch v-model="getThemeConfig.isBreadcrumbIcon" :width="35" @change="setLocalThemeConfig"> </el-switch>
           </div>
         </div>
         <div class="layout-breadcrumb-seting-bar-flex mt15">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsTagsview') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
-            <el-switch v-model="getThemeConfig.isTagsview" :width="35" @change="setLocalThemeConfig"></el-switch>
+            <el-switch v-model="getThemeConfig.isTagsview" :width="35" @change="setLocalThemeConfig"> </el-switch>
           </div>
         </div>
         <!-- <div class="layout-breadcrumb-seting-bar-flex mt15">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsTagsviewIcon') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
-            <el-switch
+            <el-switch 
               v-model="getThemeConfig.isTagsviewIcon"
               :disabled="!getThemeConfig.isTagsview"
               :width="35"
               @change="setLocalThemeConfig"
-            ></el-switch>
+            > </el-switch>
           </div>
         </div> -->
         <!-- <div class="layout-breadcrumb-seting-bar-flex mt15">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsCacheTagsView') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
-            <el-switch v-model="getThemeConfig.isCacheTagsView" :width="35" @change="setLocalThemeConfig"></el-switch>
+            <el-switch  v-model="getThemeConfig.isCacheTagsView" :width="35" @change="setLocalThemeConfig"> </el-switch>
           </div>
         </div> -->
         <div class="layout-breadcrumb-seting-bar-flex mt15">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsFooter') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
-            <el-switch v-model="getThemeConfig.isFooter" :width="35" @change="setLocalThemeConfig"></el-switch>
+            <el-switch v-model="getThemeConfig.isFooter" :width="35" @change="setLocalThemeConfig"> </el-switch>
           </div>
         </div>
         <div class="layout-breadcrumb-seting-bar-flex mt15">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsGrayscale') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
-            <el-switch
-              v-model="getThemeConfig.isGrayscale"
-              :width="35"
-              @change="onAddFilterChange('grayscale')"
-            ></el-switch>
+            <el-switch v-model="getThemeConfig.isGrayscale" :width="35" @change="onAddFilterChange('grayscale')">
+            </el-switch>
           </div>
         </div>
         <div class="layout-breadcrumb-seting-bar-flex mt15">
           <div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourIsInvert') }}</div>
           <div class="layout-breadcrumb-seting-bar-flex-value">
-            <el-switch v-model="getThemeConfig.isInvert" :width="35" @change="onAddFilterChange('invert')"></el-switch>
+            <el-switch v-model="getThemeConfig.isInvert" :width="35" @change="onAddFilterChange('invert')"> </el-switch>
           </div>
         </div>
 
diff --git a/template/admin/src/layout/navBars/breadcrumb/user.vue b/template/admin/src/layout/navBars/breadcrumb/user.vue
index 18ab06964..2b49216d6 100644
--- a/template/admin/src/layout/navBars/breadcrumb/user.vue
+++ b/template/admin/src/layout/navBars/breadcrumb/user.vue
@@ -8,12 +8,12 @@
     </div>
 
     <div class="layout-navbars-breadcrumb-user-icon">
-      <el-popover
+      <el-tooltip effect="light"
         placement="bottom"
         trigger="click"
         v-model="isShowUserNewsPopover"
         :width="300"
-        popper-class="el-popover-pupop-user-news"
+        popper-class="el-tooltip-pupop-user-news"
       >
         <el-badge :is-dot="isDot" @click.stop="openNews" slot="reference">
           <i class="el-icon-bell" :title="$t('message.user.title4')"></i>
@@ -21,7 +21,7 @@
         <transition name="el-zoom-in-top">
           <UserNews v-show="isShowUserNewsPopover" @haveNews="initIsDot" />
         </transition>
-      </el-popover>
+      </el-tooltip>
     </div>
     <div class="layout-navbars-breadcrumb-user-icon mr10" @click="onScreenfullClick">
       <i
diff --git a/template/admin/src/main.js b/template/admin/src/main.js
index 79f86ecca..2d6f1016c 100644
--- a/template/admin/src/main.js
+++ b/template/admin/src/main.js
@@ -53,7 +53,7 @@ import 'vue-happy-scroll/docs/happy-scroll.css';
 import VueAwesomeSwiper from 'vue-awesome-swiper';
 // 懒加载
 import VueLazyload from 'vue-lazyload';
-import VXETable from 'vxe-table';
+import VXETable, { t } from 'vxe-table';
 import Viewer from 'v-viewer';
 import VueDND from 'awe-dnd';
 import formCreate from '@form-create/iview';
@@ -70,7 +70,9 @@ import timeOptions from '@/libs/timeOptions';
 import scroll from '@/libs/loading';
 import * as tools from '@/libs/tools';
 import VueTreeList from 'vue-tree-list';
-
+import Pagination from "@/components/Pagination";
+// 全局组件挂载
+Vue.component('Pagination', Pagination)
 // 复制到粘贴板插件
 import VueClipboard from 'vue-clipboard2';
 
@@ -187,7 +189,9 @@ new Vue({
   watch: {
     // 监听路由 控制侧边栏显示 标记当前顶栏菜单（如需要）
     $route(to, from) {
-      const onRoutes = to.meta.activeMenu ? to.meta.activeMenu : '';
+      console.log(to);
+      const onRoutes = to.meta.activeMenu ? to.meta.activeMenu : to.meta.path;
+      console.log(onRoutes);
       this.$store.commit('menu/setActivePath', onRoutes);
       if (to.name == 'crud_crud') {
         this.$store.state.menus.oneLvRoutes.map((e) => {
diff --git a/template/admin/src/pages/account/login/index.vue b/template/admin/src/pages/account/login/index.vue
index 4ab6816dd..2d29c7346 100644
--- a/template/admin/src/pages/account/login/index.vue
+++ b/template/admin/src/pages/account/login/index.vue
@@ -13,28 +13,29 @@
             <img :src="login_logo" alt="logo" style="width: 100%; height: 74px" />
           </div>
         </div>
-        <Form ref="formInline" :model="formInline" :rules="ruleInline" @keyup.enter="handleSubmit('formInline')">
-          <FormItem prop="username">
-            <Input
+        <el-form ref="formInline" :model="formInline" :rules="ruleInline" @keyup.enter="handleSubmit('formInline')">
+          <el-form-item prop="username">
+            <el-input
               type="text"
               v-model="formInline.username"
               prefix="ios-contact-outline"
               placeholder="请输入用户名"
               size="large"
             />
-          </FormItem>
-          <FormItem prop="password">
-            <Input
+          </el-form-item>
+          <el-form-item prop="password">
+            <el-input
               type="password"
               v-model="formInline.password"
               prefix="ios-lock-outline"
               placeholder="请输入密码"
               size="large"
+              show-password
             />
-          </FormItem>
-          <!-- <FormItem prop="code">
+          </el-form-item>
+          <!-- <el-form-item prop="code">
             <div class="code">
-              <Input
+              <el-input
                 type="text"
                 v-model="formInline.code"
                 prefix="ios-keypad-outline"
@@ -43,13 +44,13 @@
               />
               <img :src="imgcode" class="pictrue" @click="captchas" />
             </div>
-          </FormItem> -->
-          <FormItem class="pt10">
-            <Button type="primary" long :loading="loading" size="large" @click="handleSubmit('formInline')" class="btn"
-              >登录</Button
+          </el-form-item> -->
+          <el-form-item class="pt10">
+            <el-button type="primary" :loading="loading" size="large" @click="handleSubmit('formInline')" class="btn"
+              >登录</el-button
             >
-          </FormItem>
-        </Form>
+          </el-form-item>
+        </el-form>
       </div>
     </div>
 
@@ -422,6 +423,7 @@ export default {
 }
 
 .btn {
+  width: 100%;
   background: linear-gradient(90deg, rgba(25, 180, 241, 1) 0%, rgba(14, 115, 232, 1) 100%) !important;
 }
 
diff --git a/template/admin/src/pages/agent/agentManage.vue b/template/admin/src/pages/agent/agentManage.vue
index ba1bda190..527ea1053 100644
--- a/template/admin/src/pages/agent/agentManage.vue
+++ b/template/admin/src/pages/agent/agentManage.vue
@@ -1,28 +1,30 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mb-16">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mb-16">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col span="24">
-            <FormItem label="时间选择：">
-              <RadioGroup
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="时间选择：">
+              <el-radio-group
                 v-model="formValidate.data"
                 type="button"
-                @on-change="selectChange(formValidate.data)"
+                @change="selectChange(formValidate.data)"
                 class="mr"
               >
-                <Radio :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{ item.text }}</Radio>
-              </RadioGroup>
+                <el-radio-button :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{
+                  item.text
+                }}</el-radio-button>
+              </el-radio-group>
               <DatePicker
                 :editable="true"
                 :clearable="true"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="daterange"
@@ -30,79 +32,128 @@
                 placeholder="请选择时间"
                 style="width: 200px"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="搜索：" label-for="status">
-              <Input
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="搜索：" label-for="status">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入姓名、电话、UID"
                 v-model="formValidate.nickname"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <Button v-auth="['export-userAgent']" class="export" icon="ios-share-outline" @click="exports">导出</Button>
-          </Col>
-        </Row>
-      </Form>
-    </Card>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-button v-auth="['export-userAgent']" class="export" icon="ios-share-outline" @click="exports"
+              >导出</el-button
+            >
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
     <cards-data :cardLists="cardLists" v-if="cardLists.length >= 0"></cards-data>
-    <Card :bordered="false" dis-hover>
-      <Table
+    <el-card :bordered="false" shadow="never">
+      <el-table
         ref="selection"
         :columns="columns"
         :data="tableList"
         class="ivu-mt"
-        :loading="loading"
-        no-data-text="暂无数据"
-        highlight-row
-        no-filtered-data-text="暂无筛选结果"
+        v-loading="loading"
+        empty-text="暂无数据"
+        highlight-current-row
       >
-        <template slot-scope="{ row }" slot="nickname">
-          <div class="name">
-            <div class="item">昵称:{{ row.nickname }}</div>
-            <div class="item">姓名:{{ row.real_name }}</div>
-            <div class="item">电话:{{ row.phone }}</div>
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="agentLevel">
-          <div>{{ row.agentLevel ? row.agentLevel.name : '--' }}</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="right">
-          <a @click="promoters(row, 'man')">推广人</a>
-          <Divider type="vertical" />
-          <template>
-            <Dropdown @on-click="changeMenu(row, $event, index)" :transfer="true">
-              <a href="javascript:void(0)">
-                更多
-                <Icon type="ios-arrow-down"></Icon>
-              </a>
-              <DropdownMenu slot="list">
-                <DropdownItem name="1">推广订单</DropdownItem>
-                <DropdownItem name="2">推广二维码</DropdownItem>
-                <DropdownItem name="3">修改上级推广人</DropdownItem>
-                <DropdownItem name="4" v-if="row.spread_uid">清除上级推广人</DropdownItem>
-                <DropdownItem name="5">取消推广资格</DropdownItem>
-                <DropdownItem name="6">修改分销等级</DropdownItem>
-              </DropdownMenu>
-            </Dropdown>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.uid }}</span>
           </template>
-        </template>
-      </Table>
+        </el-table-column>
+        <el-table-column label="商品图片" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.headimgurl ? scope.row.headimgurl : require('../../assets/images/moren.jpg')" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户信息" min-width="120">
+          <template slot-scope="scope">
+            <div class="name">
+              <div class="item">昵称:{{ scope.row.nickname }}</div>
+              <div class="item">姓名:{{ scope.row.real_name }}</div>
+              <div class="item">电话:{{ scope.row.phone }}</div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="推广用户数量" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.spread_count }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="分销等级" min-width="120">
+          <template slot-scope="scope">
+            <div>{{ scope.row.agentLevel ? scope.row.agentLevel.name : '--' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单数量" min-width="120">
+          <template slot-scope="scope">
+            <div>{{ scope.row.order_count }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单金额" min-width="120">
+          <template slot-scope="scope">
+            <div>{{ scope.row.order_price }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="佣金总金额" min-width="120">
+          <template slot-scope="scope">
+            <div>{{ scope.row.brokerage_money }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="已提现金额" min-width="120">
+          <template slot-scope="scope">
+            <div>{{ scope.row.extract_count_price }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="提现次数" min-width="120">
+          <template slot-scope="scope">
+            <div>{{ scope.row.extract_count_num }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="未提现金额" min-width="120">
+          <template slot-scope="scope">
+            <div>{{ scope.row.new_money }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="上级推广人" min-width="120">
+          <template slot-scope="scope">
+            <div>{{ scope.row.spread_name }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="promoters(scope.row, 'man')">推广人</a>
+            <el-divider direction="vertical"></el-divider>
+            <template>
+              <el-dropdown size="small" @command="changeMenu(scope.row, $event, index)" :transfer="true">
+                <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i> </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="1">推广订单</el-dropdown-item>
+                  <el-dropdown-item command="2">推广二维码</el-dropdown-item>
+                  <el-dropdown-item command="3">修改上级推广人</el-dropdown-item>
+                  <el-dropdown-item command="4" v-if="scope.row.spread_uid">清除上级推广人</el-dropdown-item>
+                  <el-dropdown-item command="5">取消推广资格</el-dropdown-item>
+                  <el-dropdown-item command="6">修改分销等级</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
-          :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
-        />
+        <pagination v-if="total" :total="total" :page.sync="formValidate.page" :limit.sync="formValidate.limit" @pagination="getList" />
       </div>
-    </Card>
+    </el-card>
     <!-- 推广人列表-->
     <promoters-list ref="promotersLists"></promoters-list>
     <!-- 推广二维码-->
@@ -125,8 +176,8 @@
     </Modal>
     <!--修改推广人-->
     <Modal v-model="promoterShow" scrollable title="修改推广人" class="order_box" :closable="false">
-      <Form ref="formInline" :model="formInline" :label-width="100" @submit.native.prevent>
-        <FormItem label="用户头像：" prop="image">
+      <el-form ref="formInline" :model="formInline" label-width="100px" @submit.native.prevent>
+        <el-form-item label="用户头像：" prop="image">
           <div class="picBox" @click="customer">
             <div class="pictrue" v-if="formInline.image">
               <img v-lazy="formInline.image" />
@@ -135,11 +186,11 @@
               <Icon type="ios-camera-outline" size="26" />
             </div>
           </div>
-        </FormItem>
-      </Form>
+        </el-form-item>
+      </el-form>
       <div slot="footer">
-        <Button type="primary" @click="putSend('formInline')">提交</Button>
-        <Button @click="cancel('formInline')">取消</Button>
+        <el-button type="primary" @click="putSend('formInline')">提交</el-button>
+        <el-button @click="cancel('formInline')">取消</el-button>
       </div>
     </Modal>
     <Modal v-model="customerShow" scrollable title="请选择商城用户" :closable="false" width="50%">
@@ -318,7 +369,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -499,10 +550,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.formValidate.page = 1;
diff --git a/template/admin/src/pages/agent/handle/promotersList.vue b/template/admin/src/pages/agent/handle/promotersList.vue
index 531b1cd0b..eba1e6a8c 100644
--- a/template/admin/src/pages/agent/handle/promotersList.vue
+++ b/template/admin/src/pages/agent/handle/promotersList.vue
@@ -11,7 +11,7 @@
       @on-cancel="onCancel"
     >
       <div class="table_box">
-        <Form
+        <el-form
           ref="formValidate"
           :model="formValidate"
           :label-width="labelWidth"
@@ -19,20 +19,22 @@
           class="tabform"
           @submit.native.prevent
         >
-          <Row :gutter="24" type="flex" justify="end">
-            <Col span="24" class="ivu-text-left">
-              <FormItem label="时间选择：">
-                <RadioGroup
+          <el-row :gutter="24" justify="end">
+            <el-col :span="24" class="ivu-text-left">
+              <el-form-item label="时间选择：">
+                <el-radio-group
                   v-model="formValidate.data"
                   type="button"
-                  @on-change="selectChange(formValidate.data)"
+                  @change="selectChange(formValidate.data)"
                   class="mr"
                 >
-                  <Radio :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{ item.text }}</Radio>
-                </RadioGroup>
+                  <el-radio-button :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{
+                    item.text
+                  }}</el-radio-button>
+                </el-radio-group>
                 <DatePicker
                   :editable="false"
-                  @on-change="onchangeTime"
+                  @change="onchangeTime"
                   :value="timeVal"
                   format="yyyy/MM/dd"
                   type="daterange"
@@ -40,66 +42,129 @@
                   placeholder="请选择时间"
                   style="width: 200px"
                 ></DatePicker>
-              </FormItem>
-            </Col>
-            <Col span="24" class="ivu-text-left">
-              <Col :xl="15" :lg="15" :md="20" :sm="24" :xs="24">
-                <FormItem label="用户类型：">
-                  <RadioGroup v-model="formValidate.type" type="button" @on-change="userSearchs" class="mr">
-                    <Radio
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" class="ivu-text-left">
+              <el-col :xl="15" :lg="15" :md="20" :sm="24" :xs="24">
+                <el-form-item label="用户类型：">
+                  <el-radio-group v-model="formValidate.type" type="button" @change="userSearchs" class="mr">
+                    <el-radio-button
                       :label="item.val"
                       v-for="(item, i) in listTitle === 'man' ? fromList.fromTxt2 : fromList.fromTxt3"
                       :key="i"
                     >
                       {{ item.text }}
-                    </Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col>
-              <Col :xl="15" :lg="15" :md="20" :sm="24" :xs="24" v-if="listTitle === 'man'">
-                <FormItem label="搜索：">
-                  <Input
+                    </el-radio-button>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :xl="15" :lg="15" :md="20" :sm="24" :xs="24" v-if="listTitle === 'man'">
+                <el-form-item label="搜索：">
+                  <el-input
                     search
                     enter-button
                     placeholder="请输入请姓名、电话、UID"
                     v-model="formValidate.nickname"
                     style="width: 90%"
                     @on-search="userSearchs"
-                  ></Input>
-                </FormItem>
-              </Col>
-              <Col :xl="15" :lg="15" :md="20" :sm="24" :xs="24" v-if="listTitle === 'order'">
-                <FormItem label="订单号：">
-                  <Input
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xl="15" :lg="15" :md="20" :sm="24" :xs="24" v-if="listTitle === 'order'">
+                <el-form-item label="订单号：">
+                  <el-input
                     search
                     enter-button
                     placeholder="请输入请订单号"
                     v-model="formValidate.order_id"
                     style="width: 90%"
                     @on-search="userSearchs"
-                  ></Input>
-                </FormItem>
-              </Col>
-            </Col>
-          </Row>
-        </Form>
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+        </el-form>
       </div>
-      <Table
+      <el-table
         ref="selection"
         :columns="columns4"
         :data="tabList"
         :loading="loading"
-        no-data-text="暂无数据"
-        highlight-row
+        empty-text="暂无数据"
+        highlight-current-row
         max-height="400"
-        no-filtered-data-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="add_time">
-          <div>{{ row.spread_time | formatDate }}</div>
+        <template v-if="listTitle === 'man'">
+          <el-table-column label="UID" width="80">
+            <template slot-scope="scope">
+              <span>{{ scope.row.uid }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="头像" min-width="90">
+            <template slot-scope="scope">
+              <div class="tabBox_img" v-viewer>
+                <img v-lazy="scope.row.avatar ? scope.row.avatar : require('../../../assets/images/moren.jpg')" />
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="用户信息" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row.nickname }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="是否推广员" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row.promoter_name }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="推广人数" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row.spread_count }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="订单数" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row.order_count }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="绑定时间" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row.spread_time | formatDate }}</span>
+            </template>
+          </el-table-column>
         </template>
-      </Table>
+        <template v-else>
+          <el-table-column label="订单ID" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row.order_id }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="用户信息" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row.user_info }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="时间" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row._add_time }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="返佣金额" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row.brokerage_price || 0 }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="formValidate.limit" />
+        <pagination
+          v-if="total"
+          :total="total"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="pageChange"
+        />
       </div>
     </Modal>
   </div>
@@ -171,7 +236,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 100;
+      return this.isMobile ? undefined : '100px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -218,96 +283,6 @@ export default {
           let data = res.data;
           this.tabList = data.list;
           this.total = data.count;
-          if (this.listTitle === 'man') {
-            this.columns4 = [
-              {
-                title: 'UID',
-                minWidth: 80,
-                key: 'uid',
-              },
-              {
-                title: '头像',
-                key: 'avatar',
-                minWidth: 80,
-                render: (h, params) => {
-                  return h('viewer', [
-                    h(
-                      'div',
-                      {
-                        style: {
-                          width: '36px',
-                          height: '36px',
-                          borderRadius: '4px',
-                          cursor: 'pointer',
-                        },
-                      },
-                      [
-                        h('img', {
-                          attrs: {
-                            src: params.row.avatar ? params.row.avatar : require('../../../assets/images/moren.jpg'),
-                          },
-                          style: {
-                            width: '100%',
-                            height: '100%',
-                          },
-                        }),
-                      ],
-                    ),
-                  ]);
-                },
-              },
-              {
-                title: '用户信息',
-                key: 'nickname',
-                minWidth: 120,
-              },
-              {
-                title: '是否推广员',
-                key: 'promoter_name',
-                minWidth: 100,
-              },
-              {
-                title: '推广人数',
-                key: 'spread_count',
-                sortable: true,
-                minWidth: 90,
-              },
-              {
-                title: '订单数',
-                key: 'order_count',
-                sortable: true,
-                minWidth: 90,
-              },
-              {
-                title: '绑定时间',
-                slot: 'add_time',
-                sortable: true,
-                minWidth: 130,
-              },
-            ];
-          } else {
-            this.columns4 = [
-              {
-                title: '订单ID',
-                key: 'order_id',
-              },
-              {
-                title: '用户信息',
-                key: 'user_info',
-              },
-              {
-                title: '时间',
-                key: '_add_time',
-              },
-              {
-                title: '返佣金额',
-                key: 'brokerage_price',
-                render: (h, params) => {
-                  return h('viewer', [h('span', params.row.brokerage_price || 0)]);
-                },
-              },
-            ];
-          }
           this.loading = false;
         })
         .catch((res) => {
@@ -316,8 +291,7 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
+    pageChange() {
       this.getList(this.rowsList, this.listTitle);
     },
     // 搜索
diff --git a/template/admin/src/pages/app/app/index.vue b/template/admin/src/pages/app/app/index.vue
index b7106f9e0..8b3bd9b2e 100644
--- a/template/admin/src/pages/app/app/index.vue
+++ b/template/admin/src/pages/app/app/index.vue
@@ -3,7 +3,7 @@
     <div class="i-layout-page-header header-title">
       <span class="ivu-page-header-title mr20">{{ $route.meta.title }}</span>
       <div style="float: right">
-        <Button class="bnt" type="primary" @click="onsubmit('formValidate')">保存</Button>
+        <el-button class="bnt" type="primary" @click="onsubmit('formValidate')">保存</el-button>
       </div>
     </div>
     <div class="box-wrapper">
@@ -22,13 +22,13 @@
       </div>
       <div style="margin-left: 40px">
         <div class="table_box">
-          <div type="flex">
+          <div >
             <div v-bind="grid">
               <div class="title">隐私权限页面展示：</div>
             </div>
           </div>
           <div>
-            <Form
+            <el-form
               class="form"
               ref="formValidate"
               :model="formValidate"
@@ -37,14 +37,14 @@
               @submit.native.prevent
             >
               <div class="goodsTitle acea-row"></div>
-              <FormItem label="" style="margin: 0px">
+              <el-form-item label="" style="margin: 0px">
                 <WangEditor
                   style="width: 90%"
                   :content="formValidate.content"
                   @editorContent="getEditorContent"
                 ></WangEditor>
-              </FormItem>
-            </Form>
+              </el-form-item>
+            </el-form>
           </div>
         </div>
       </div>
@@ -94,7 +94,7 @@ export default {
       };
     },
     labelWidth() {
-      return this.isMobile ? undefined : 120;
+      return this.isMobile ? undefined : '120px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
diff --git a/template/admin/src/pages/app/routine/download/index.vue b/template/admin/src/pages/app/routine/download/index.vue
index f0a35ab41..2b2192178 100644
--- a/template/admin/src/pages/app/routine/download/index.vue
+++ b/template/admin/src/pages/app/routine/download/index.vue
@@ -3,7 +3,7 @@
     <div class="i-layout-page-header header-title">
       <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="flex-wrapper">
         <!-- :src="iframeUrl" -->
         <div>
@@ -31,17 +31,17 @@
             <div class="content-box">
               <div class="left">小程序码：</div>
               <div class="right">
-                <Button type="primary" @click="downLoadCode(pageData.code)">下载小程序码</Button>
+                <el-button type="primary" @click="downLoadCode(pageData.code)">下载小程序码</el-button>
               </div>
             </div>
             <div class="content-box">
               <div class="left">小程序包：</div>
               <div class="right">
                 <span>是否已开通小程序直播</span>
-                <RadioGroup class="rad" size="large" v-model="is_live">
-                  <Radio :label="0">未开通</Radio>
-                  <Radio :label="1">已开通</Radio>
-                </RadioGroup>
+                <el-radio-group class="rad" size="large" v-model="is_live">
+                  <el-radio :label="0">未开通</el-radio>
+                  <el-radio :label="1">已开通</el-radio>
+                </el-radio-group>
               </div>
             </div>
             <div class="content-box last">
@@ -53,13 +53,13 @@
                   查看如何开通直播功能
                 </div>
 
-                <Button class="mt10" type="primary" @click="downLoad()">下载小程序包</Button>
+                <el-button class="mt10" type="primary" @click="downLoad()">下载小程序包</el-button>
               </div>
             </div>
           </div>
         </div>
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -107,7 +107,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
diff --git a/template/admin/src/pages/app/version/index.vue b/template/admin/src/pages/app/version/index.vue
index d634b81fb..7f69571a7 100644
--- a/template/admin/src/pages/app/version/index.vue
+++ b/template/admin/src/pages/app/version/index.vue
@@ -1,42 +1,66 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row type="flex" class="mb20">
-        <Col span="24">
-          <Button type="primary" icon="md-add" @click="add" class="mr10">发布版本</Button>
-        </Col>
-      </Row>
-      <Table
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row class="mb20">
+        <el-col :span="24">
+          <el-button type="primary" icon="md-add" @click="add" class="mr10">发布版本</el-button>
+        </el-col>
+      </el-row>
+      <el-table
         :columns="columns1"
         :data="tableList"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row }" slot="version">
-          <Poptip v-if="row.is_new" trigger="hover" placement="top-start" content="当前为最新线上版本!">
-            <Icon size="16" type="ios-bookmark" color="red" style="margin-right: 10px" />
-          </Poptip>
-          <Icon v-else size="16" type="ios-bookmark" color="white" style="margin-right: 10px" />
-          <span>{{ row.version }} </span>
-        </template>
-        <template slot-scope="{ row }" slot="platform">
-          <span>{{ row.platform === 1 ? '安卓' : '苹果' }}</span>
-        </template>
-        <template slot-scope="{ row }" slot="is_force">
-          <span>{{ row.is_force === 1 ? '强制' : '非强制' }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row)">编辑</a>
-          <!-- <Divider type="vertical" /> -->
-          <!-- <a @click="del(row, '删除版本', index)">删除</a> -->
-        </template>
-      </Table>
-      <div class="acea-row row-right page">
-        <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="tableFrom.limit" />
-      </div>
-    </Card>
+        <el-table-column label="版本号" width="80">
+          <template slot-scope="scope">
+            <el-tooltip
+              effect="light"
+              v-if="scope.row.is_new"
+              trigger="hover"
+              placement="top-start"
+              content="当前为最新线上版本!"
+            >
+              <Icon size="16" type="ios-bookmark" color="red" style="margin-right: 10px" />
+            </el-tooltip>
+          </template>
+        </el-table-column>
+        <el-table-column label="平台类型" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <span>{{ scope.row.platform === 1 ? '安卓' : '苹果' }}</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="升级信息" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.info }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否强制" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.is_force === 1 ? '强制' : '非强制' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="发布日期" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="下载地址" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.url }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="60">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row)">编辑</a>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
   </div>
 </template>
 
@@ -49,7 +73,7 @@ export default {
     ...mapState('media', ['isMobile']),
     ...mapState('userLevel', ['categoryId']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
diff --git a/template/admin/src/pages/app/wechat/menus/index.vue b/template/admin/src/pages/app/wechat/menus/index.vue
index 0f9b114f3..c395d55ba 100644
--- a/template/admin/src/pages/app/wechat/menus/index.vue
+++ b/template/admin/src/pages/app/wechat/menus/index.vue
@@ -3,13 +3,13 @@
     <div class="i-layout-page-header header-title">
       <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <!-- 公众号设置 -->
-      <Row :gutter="24" type="flex">
-        <Col span="24" class="ml40">
+      <el-row :gutter="24" >
+        <el-col :span="24" class="ml40">
           <!-- 预览功能 -->
-          <Col :span="24">
-            <Col :xl="7" :lg="7" :md="22" :sm="22" :xs="22" class="left mb15">
+          <el-col ::span="24">
+            <el-col :xl="7" :lg="7" :md="22" :sm="22" :xs="22" class="left mb15">
               <img class="top" src="../../../../assets/images/mobilehead.png" />
               <img class="bottom" src="@/assets/images/mobilefoot.png" />
               <div style="background: #f4f5f9; min-height: 438px; position: absolute; top: 63px; width: 320px"></div>
@@ -38,71 +38,71 @@
                   <div class="text" @click="addtext"><Icon type="ios-add" /></div>
                 </div>
               </div>
-            </Col>
-            <Col :xl="11" :lg="12" :md="22" :sm="22" :xs="22">
-              <Tabs value="name1" v-if="checkedMenuId !== null">
-                <TabPane label="菜单信息" name="name1">
-                  <Col span="24" class="userAlert">
+            </el-col>
+            <el-col :xl="11" :lg="12" :md="22" :sm="22" :xs="22">
+              <el-tabs value="name1" v-if="checkedMenuId !== null">
+                <el-tab-pane label="菜单信息" name="name1">
+                  <el-col :span="24" class="userAlert">
                     <div class="box-card right">
                       <Alert show-icon closable class="spwidth"> 已添加子菜单，仅可设置菜单名称</Alert>
-                      <Form
+                      <el-form
                         ref="formValidate"
                         :model="formValidate"
                         :rules="ruleValidate"
-                        :label-width="100"
+                        label-width="100px"
                         class="mt20"
                       >
-                        <FormItem label="菜单名称" prop="name">
-                          <Input v-model="formValidate.name" placeholder="请填写菜单名称" class="spwidth"></Input>
-                        </FormItem>
-                        <FormItem label="规则状态" prop="type">
-                          <Select v-model="formValidate.type" placeholder="请选择规则状态" class="spwidth">
-                            <Option value="click">关键字</Option>
-                            <Option value="view">跳转网页</Option>
-                            <Option value="miniprogram">小程序</Option>
-                          </Select>
-                        </FormItem>
+                        <el-form-item label="菜单名称" prop="name">
+                          <el-input v-model="formValidate.name" placeholder="请填写菜单名称" class="spwidth"></el-input>
+                        </el-form-item>
+                        <el-form-item label="规则状态" prop="type">
+                          <el-select v-model="formValidate.type" placeholder="请选择规则状态" class="spwidth">
+                            <el-option value="click" label="关键字"></el-option>
+                            <el-option value="view" label="跳转网页"></el-option>
+                            <el-option value="miniprogram" label="小程序"></el-option>
+                          </el-select>
+                        </el-form-item>
                         <div v-if="formValidate.type === 'click'">
-                          <FormItem label="关键字" prop="key">
-                            <Input v-model="formValidate.key" placeholder="请填写关键字" class="spwidth"></Input>
-                          </FormItem>
+                          <el-form-item label="关键字" prop="key">
+                            <el-input v-model="formValidate.key" placeholder="请填写关键字" class="spwidth"></el-input>
+                          </el-form-item>
                         </div>
                         <div v-if="formValidate.type === 'miniprogram'">
-                          <FormItem label="appid" prop="appid">
-                            <Input v-model="formValidate.appid" placeholder="请填写appid" class="spwidth"></Input>
-                          </FormItem>
-                          <FormItem label="小程序路径" prop="pagepath">
-                            <Input
+                          <el-form-item label="appid" prop="appid">
+                            <el-input v-model="formValidate.appid" placeholder="请填写appid" class="spwidth"></el-input>
+                          </el-form-item>
+                          <el-form-item label="小程序路径" prop="pagepath">
+                            <el-input
                               v-model="formValidate.pagepath"
                               placeholder="请填写小程序路径"
                               class="spwidth"
-                            ></Input>
-                          </FormItem>
-                          <FormItem label="备用网页" prop="url">
-                            <Input v-model="formValidate.url" placeholder="请填写备用网页" class="spwidth"></Input>
-                          </FormItem>
+                            ></el-input>
+                          </el-form-item>
+                          <el-form-item label="备用网页" prop="url">
+                            <el-input v-model="formValidate.url" placeholder="请填写备用网页" class="spwidth"></el-input>
+                          </el-form-item>
                         </div>
                         <div v-if="formValidate.type === 'view'">
-                          <FormItem label="跳转地址" prop="url">
-                            <Input v-model="formValidate.url" placeholder="请填写跳转地址" class="spwidth"></Input>
-                          </FormItem>
+                          <el-form-item label="跳转地址" prop="url">
+                            <el-input v-model="formValidate.url" placeholder="请填写跳转地址" class="spwidth"></el-input>
+                          </el-form-item>
                         </div>
-                      </Form>
+                      </el-form>
                     </div>
-                  </Col>
-                </TabPane>
-                <Button size="small" type="error" slot="extra" @click="deltMenus">删除</Button>
-              </Tabs>
-              <Col :span="24" v-if="isTrue">
-                <Button type="primary" style="display: block; margin: 10px auto" @click="submenus('formValidate')"
-                  >保存并发布</Button
+                  </el-col>
+                </el-tab-pane>
+                <el-button size="small" type="error" slot="extra" @click="deltMenus">删除</el-button>
+              </el-tabs>
+              <el-col ::span="24" v-if="isTrue">
+                <el-button type="primary" style="display: block; margin: 10px auto" @click="submenus('formValidate')"
+                  >保存并发布</el-button
                 >
-              </Col>
-            </Col>
-          </Col>
-        </Col>
-      </Row>
-    </Card>
+              </el-col>
+            </el-col>
+          </el-col>
+        </el-col>
+      </el-row>
+    </el-card>
 
     <Modal v-model="modal2" width="360">
       <p slot="header" style="color: #f60; text-align: center">
@@ -113,7 +113,7 @@
         <p>确定删除吗？</p>
       </div>
       <div slot="footer">
-        <Button type="error" size="large" long @click="del">确定</Button>
+        <el-button type="error" size="large" long @click="del">确定</el-button>
       </div>
     </Modal>
   </div>
diff --git a/template/admin/src/pages/app/wechat/newsCategory/save.vue b/template/admin/src/pages/app/wechat/newsCategory/save.vue
index a490230e5..2b1274d41 100644
--- a/template/admin/src/pages/app/wechat/newsCategory/save.vue
+++ b/template/admin/src/pages/app/wechat/newsCategory/save.vue
@@ -3,15 +3,15 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <router-link :to="{ path: $routeProStr + '/app/wechat/news_category/index' }"
-          ><Button icon="ios-arrow-back" size="small" type="text" v-show="$route.params.id">返回</Button></router-link
+          ><el-button icon="ios-arrow-back" size="small" type="text" v-show="$route.params.id">返回</el-button></router-link
         >
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span class="ivu-page-header-title mr20" style="padding: 0" v-text="$route.meta.title"></span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="save_from ivu-mt">
-      <Row type="flex" :gutter="24">
-        <Col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
+    <el-card :bordered="false" shadow="never" class="save_from ivu-mt">
+      <el-row  :gutter="24">
+        <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
           <!--                    v-if="list.length!=0"-->
           <div v-for="(item, i) in list" :key="i">
             <div
@@ -28,7 +28,7 @@
                   backgroundSize: '100% 100%',
                 }"
               >
-                <Button type="error" shape="circle" icon="md-trash" @click="del(i)" v-show="isDel"></Button>
+                <el-button type="error" shape="circle" icon="md-trash" @click="del(i)" v-show="isDel"></el-button>
               </div>
               <span class="news_sp">{{ item.title }}</span>
             </div>
@@ -37,21 +37,21 @@
               <div class="news_cent_img ivu-mr-8">
                 <img :src="item.image_input ? item.image_input : baseImg" />
               </div>
-              <Button type="error" shape="circle" icon="md-trash" @click="del(i)"></Button>
+              <el-button type="error" shape="circle" icon="md-trash" @click="del(i)"></el-button>
             </div>
           </div>
           <!-- <div class="acea-row row-center-wrapper">
-            <Button
+            <el-button
               icon="ios-download-outline"
               class="mt20"
               type="primary"
               @click="handleAdd"
-              >添加图文</Button
+              >添加图文</el-button
             >
           </div> -->
-        </Col>
-        <Col :xl="18" :lg="18" :md="12" :sm="24" :xs="24">
-          <Form
+        </el-col>
+        <el-col :xl="18" :lg="18" :md="12" :sm="24" :xs="24">
+          <el-form
             class="saveForm"
             ref="saveForm"
             :model="saveForm"
@@ -60,24 +60,24 @@
             :label-position="labelPosition"
             @submit.native.prevent
           >
-            <Row :gutter="24" type="flex">
-              <Col span="24" class="ml40">
-                <FormItem label="标题：" prop="title">
-                  <Input style="width: 60%" v-model="saveForm.title" type="text" placeholder="请输入文章标题" />
-                </FormItem>
-              </Col>
-              <Col span="24" class="ml40">
-                <FormItem label="作者：" prop="author">
-                  <Input style="width: 60%" v-model="saveForm.author" type="text" placeholder="请输入作者名称" />
-                </FormItem>
-              </Col>
-              <Col span="24" class="ml40">
-                <FormItem label="摘要：" prop="synopsis">
-                  <Input style="width: 60%" v-model="saveForm.synopsis" type="textarea" placeholder="请输入摘要" />
-                </FormItem>
-              </Col>
-              <Col span="24" class="ml40">
-                <FormItem label="图文封面：" prop="image_input">
+            <el-row :gutter="24" >
+              <el-col :span="24" class="ml40">
+                <el-form-item label="标题：" prop="title">
+                  <el-input style="width: 60%" v-model="saveForm.title" type="text" placeholder="请输入文章标题" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="ml40">
+                <el-form-item label="作者：" prop="author">
+                  <el-input style="width: 60%" v-model="saveForm.author" type="text" placeholder="请输入作者名称" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="ml40">
+                <el-form-item label="摘要：" prop="synopsis">
+                  <el-input style="width: 60%" v-model="saveForm.synopsis" type="textarea" placeholder="请输入摘要" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="ml40">
+                <el-form-item label="图文封面：" prop="image_input">
                   <div class="picBox" @click="modalPicTap('单选')">
                     <div class="pictrue" v-if="saveForm.image_input">
                       <img :src="saveForm.image_input" />
@@ -86,16 +86,16 @@
                       <Icon type="ios-camera-outline" size="26" />
                     </div>
                   </div>
-                </FormItem>
-                <FormItem label="正文：" prop="content">
+                </el-form-item>
+                <el-form-item label="正文：" prop="content">
                   <WangEditor style="width: 90%" :content="content" @editorContent="getEditorContent"></WangEditor>
-                </FormItem>
-              </Col>
-              <Col span="24" class="ml40">
-                <FormItem>
-                  <Button type="primary" class="submission" @click="subFrom('saveForm')">提交</Button>
-                </FormItem>
-              </Col>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" class="ml40">
+                <el-form-item>
+                  <el-button type="primary" class="submission" @click="subFrom('saveForm')">提交</el-button>
+                </el-form-item>
+              </el-col>
               <Modal
                 v-model="modalPic"
                 width="950px"
@@ -114,11 +114,11 @@
                   v-if="modalPic"
                 ></uploadPictures>
               </Modal>
-            </Row>
-          </Form>
-        </Col>
-      </Row>
-    </Card>
+            </el-row>
+          </el-form>
+        </el-col>
+      </el-row>
+    </el-card>
   </div>
 </template>
 
@@ -219,7 +219,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 120;
+      return this.isMobile ? undefined : '120px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
diff --git a/template/admin/src/pages/app/wechat/reply/follow.vue b/template/admin/src/pages/app/wechat/reply/follow.vue
index af6ef5a05..b06b7ebc4 100644
--- a/template/admin/src/pages/app/wechat/reply/follow.vue
+++ b/template/admin/src/pages/app/wechat/reply/follow.vue
@@ -3,13 +3,13 @@
     <div class="i-layout-page-header header-title">
       <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <!-- 公众号设置 -->
-      <Row :gutter="24" type="flex">
-        <Col span="24" class="ml40">
+      <el-row :gutter="24" >
+        <el-col :span="24" class="ml40">
           <!-- 预览功能 -->
-          <Col :span="24">
-            <Col :xl="7" :lg="7" :md="22" :sm="22" :xs="22" class="left mb15">
+          <el-col ::span="24">
+            <el-col :xl="7" :lg="7" :md="22" :sm="22" :xs="22" class="left mb15">
               <img class="top" src="../../../../assets/images/mobilehead.png" />
               <img class="bottom" src="../../../../assets/images/mobilefoot.png" />
               <div class="centent">
@@ -39,19 +39,19 @@
                   </div>
                 </div>
               </div>
-            </Col>
-            <Col :xl="11" :lg="12" :md="22" :sm="22" :xs="22">
-              <Col span="24" class="userAlert">
+            </el-col>
+            <el-col :xl="11" :lg="12" :md="22" :sm="22" :xs="22">
+              <el-col :span="24" class="userAlert">
                 <div class="box-card right">
-                  <Form
+                  <el-form
                     ref="formValidate"
                     :model="formValidate"
                     :rules="ruleValidate"
-                    :label-width="100"
+                    label-width="100px"
                     class="mt20"
                     @submit.native.prevent
                   >
-                    <FormItem label="关键字：" prop="val" v-if="$route.params.id">
+                    <el-form-item label="关键字：" prop="val" v-if="$route.params.id">
                       <div class="arrbox">
                         <!--:closable="$route.params.id==='0'? true : false"-->
                         <Tag
@@ -71,45 +71,45 @@
                           @keyup.enter="addlabel"
                         />
                       </div>
-                    </FormItem>
-                    <FormItem label="消息状态：">
-                      <RadioGroup v-model="formValidate.status">
-                        <Radio :label="1">启用</Radio>
-                        <Radio :label="0">禁用</Radio>
-                      </RadioGroup>
-                    </FormItem>
-                    <FormItem label="消息类型：" prop="type">
-                      <Select
+                    </el-form-item>
+                    <el-form-item label="消息状态：">
+                      <el-radio-group v-model="formValidate.status">
+                        <el-radio :label="1">启用</el-radio>
+                        <el-radio :label="0">禁用</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="消息类型：" prop="type">
+                      <el-select
                         v-model="formValidate.type"
                         placeholder="请选择规则状态"
                         style="width: 90%"
-                        @on-change="RuleFactor(formValidate.type)"
+                        @change="RuleFactor(formValidate.type)"
                       >
-                        <Option value="text">文字消息</Option>
-                        <Option value="image">图片消息</Option>
-                        <Option value="news">图文消息</Option>
-                        <Option value="voice">声音消息</Option>
-                      </Select>
-                    </FormItem>
-                    <FormItem label="消息内容：" prop="content" v-if="formValidate.type === 'text'">
-                      <Input
+                        <el-option value="text" label="文字消息"></el-option>
+                        <el-option value="image" label="图片消息"></el-option>
+                        <el-option value="news" label="图文消息"></el-option>
+                        <el-option value="voice" label="声音消息"></el-option>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="消息内容：" prop="content" v-if="formValidate.type === 'text'">
+                      <el-input
                         v-model="formValidate.data.content"
                         placeholder="请填写消息内容"
                         style="width: 90%"
                         type="textarea"
                         :rows="4"
-                      ></Input>
-                    </FormItem>
-                    <FormItem label="选取图文：" v-if="formValidate.type === 'news'">
-                      <Button type="info" @click="changePic">选择图文消息</Button>
-                    </FormItem>
-                    <FormItem
+                      ></el-input>
+                    </el-form-item>
+                    <el-form-item label="选取图文：" v-if="formValidate.type === 'news'">
+                      <el-button type="info" @click="changePic">选择图文消息</el-button>
+                    </el-form-item>
+                    <el-form-item
                       :label="formValidate.type === 'image' ? '图片地址：' : '语音地址：'"
                       prop="src"
                       v-if="formValidate.type === 'image' || formValidate.type === 'voice'"
                     >
                       <div class="acea-row row-middle">
-                        <Input
+                        <el-input
                           readonly="readonly"
                           placeholder="default size"
                           style="width: 75%"
@@ -128,25 +128,25 @@
                           class="mr20"
                           style="margin-top: 1px"
                         >
-                          <Button type="primary">上传</Button>
+                          <el-button type="primary">上传</el-button>
                         </Upload>
                       </div>
                       <span v-show="formValidate.type === 'image'">文件最大2Mb，支持bmp/png/jpeg/jpg/gif格式</span>
                       <span v-show="formValidate.type === 'voice'">文件最大2Mb，支持mp3格式,播放长度不超过60s</span>
-                    </FormItem>
-                  </Form>
+                    </el-form-item>
+                  </el-form>
                 </div>
-              </Col>
-              <Col :span="24">
+              </el-col>
+              <el-col ::span="24">
                 <div class="acea-row row-center">
-                  <Button type="primary" class="mr20" @click="submenus('formValidate')">保存并发布 </Button>
+                  <el-button type="primary" class="mr20" @click="submenus('formValidate')">保存并发布 </el-button>
                 </div>
-              </Col>
-            </Col>
-          </Col>
-        </Col>
-      </Row>
-    </Card>
+              </el-col>
+            </el-col>
+          </el-col>
+        </el-col>
+      </el-row>
+    </el-card>
 
     <!--图文消息 -->
     <Modal v-model="modals" scrollable title="发送消息" width="1200" height="800" footer-hide class="modelBox">
diff --git a/template/admin/src/pages/app/wechat/reply/index.vue b/template/admin/src/pages/app/wechat/reply/index.vue
index b37bed6e9..8512da697 100644
--- a/template/admin/src/pages/app/wechat/reply/index.vue
+++ b/template/admin/src/pages/app/wechat/reply/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt"></Card>
+    <el-card :bordered="false" shadow="never" class="ivu-mt"></el-card>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/app/wechat/reply/keyword.vue b/template/admin/src/pages/app/wechat/reply/keyword.vue
index b22837776..717019571 100644
--- a/template/admin/src/pages/app/wechat/reply/keyword.vue
+++ b/template/admin/src/pages/app/wechat/reply/keyword.vue
@@ -1,90 +1,107 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="levelFrom"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="回复类型：" prop="type" label-for="type">
-              <Select
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="回复类型：" prop="type" label-for="type">
+              <el-select
                 v-model="formValidate.type"
                 placeholder="请选择"
                 element-id="type"
                 clearable
-                @on-change="userSearchs"
+                @change="userSearchs"
               >
-                <Option value="text">文字消息</Option>
-                <Option value="image">图片消息</Option>
-                <Option value="news">图文消息</Option>
-                <Option value="voice">声音消息</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="关键字：" prop="key" label-for="key">
-              <Input
+                <el-option value="text" label="文字消息"></el-option>
+                <el-option value="image" label="图片消息"></el-option>
+                <el-option value="news" label="图文消息"></el-option>
+                <el-option value="voice" label="声音消息"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="关键字：" prop="key" label-for="key">
+              <el-input
                 search
                 enter-button
                 v-model="formValidate.key"
                 placeholder="请输入关键字"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button type="primary" icon="md-add" @click="add">添加关键字</Button>
-          </Col>
-        </Row>
-      </Form>
-      <Table
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-button type="primary" icon="md-add" @click="add">添加关键字</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :columns="columns1"
         :data="tabList"
         ref="table"
         class="mt25"
         :loading="loading"
-        highlight-row
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="status">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">显示</span>
-            <span slot="close">隐藏</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row)">编辑</a>
-          <!--<Divider type="vertical" />-->
-          <!--<a @click="download(row)">下载二维码</a>-->
-          <Divider type="vertical" />
-          <a @click="del(row, '关键字回复', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="关键字" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.key }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="回复类型" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.type }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否显示" min-width="130">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              :value="scope.row.status"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+              active-text="显示"
+              inactive-text="隐藏"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '关键字回复', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <Modal v-model="modal" title="二维码" footer-hide>
       <div class="acea-row row-around">
         <div class="acea-row row-column-around row-between-wrapper">
@@ -158,7 +175,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -180,10 +197,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 修改是否显示
     onchangeIsShow(row) {
       let data = {
diff --git a/template/admin/src/pages/app/wechat/user/handle/sendOut.vue b/template/admin/src/pages/app/wechat/user/handle/sendOut.vue
index 6b75d4243..8124dd50d 100644
--- a/template/admin/src/pages/app/wechat/user/handle/sendOut.vue
+++ b/template/admin/src/pages/app/wechat/user/handle/sendOut.vue
@@ -10,17 +10,17 @@
     width="950"
     @on-cancel="handleReset"
   >
-    <Form
+    <el-form
       ref="levelFrom"
       :model="levelFrom"
       :label-width="labelWidth"
       :label-position="labelPosition"
       @submit.native.prevent
     >
-      <Row type="flex" :gutter="24">
-        <Col v-bind="grid">
-          <FormItem label="优惠券名称：" prop="status2" label-for="status2">
-            <Input
+      <el-row :gutter="24">
+        <el-col v-bind="grid">
+          <el-form-item label="优惠券名称：" prop="status2" label-for="status2">
+            <el-input
               search
               enter-button
               v-model="levelFrom.name"
@@ -28,61 +28,91 @@
               @on-search="userSearchs"
               style="width: 100%"
             />
-          </FormItem>
-        </Col>
-      </Row>
-    </Form>
-    <Divider dashed />
-    <Row type="flex">
-      <Col v-bind="grid" class="mb15">
-        <Button type="primary" icon="md-add" @click="add">添加等级任务</Button>
-      </Col>
-      <Col span="24" class="userAlert">
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-divider direction="vertical" dashed />
+    <el-row>
+      <el-col v-bind="grid" class="mb15">
+        <el-button type="primary" icon="md-add" @click="add">添加等级任务</el-button>
+      </el-col>
+      <el-col :span="24" class="userAlert">
         <Alert show-icon closable>添加等级任务,任务类型中的{$num}会自动替换成限定数量+系统预设的单位生成任务名</Alert>
-      </Col>
-    </Row>
-    <Divider dashed />
-    <Table
-      :columns="columns1"
+      </el-col>
+    </el-row>
+    <el-divider direction="vertical" dashed />
+    <el-table
       :data="levelLists"
       ref="table"
-      :loading="loading"
+      v-loading="loading"
       no-userFrom-text="暂无数据"
       no-filtered-userFrom-text="暂无筛选结果"
     >
-      <template slot-scope="{ row, index }" slot="is_shows">
-        <i-switch
-          v-model="row.is_show"
-          :value="row.is_show"
-          :true-value="1"
-          :false-value="0"
-          size="large"
-          @on-change="onchangeIsShow(row)"
-        >
-          <span slot="open">显示</span>
-          <span slot="close">隐藏</span>
-        </i-switch>
-      </template>
-      <template slot-scope="{ row, index }" slot="is_musts">
-        <i-switch
-          v-model="row.is_must"
-          :value="row.is_must"
-          :true-value="1"
-          :false-value="0"
-          size="large"
-          @on-change="onchangeIsMust(row)"
-        >
-          <span slot="open">全部完成</span>
-          <span slot="close">达成其一</span>
-        </i-switch>
-      </template>
-      <template slot-scope="{ row, index }" slot="action">
-        <a @click="edit(row)">编辑 | </a>
-        <a @click="del(row, '删除等级任务', index)"> 删除</a>
-      </template>
-    </Table>
+      <el-table-column label="ID" width="80">
+        <template slot-scope="scope">
+          <span>{{ scope.row.id }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="等级名称" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.level_name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="任务名称" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否显示" min-width="100">
+        <template slot-scope="scope">
+          <el-switch
+            :active-value="1"
+            :inactive-value="0"
+            v-model="scope.row.is_show"
+            :value="scope.row.is_show"
+            size="large"
+            @change="onchangeIsShow(scope.row)"
+          >
+          </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="务必达成" min-width="100">
+        <template slot-scope="scope">
+          <el-switch
+            :active-value="1"
+            :inactive-value="0"
+            v-model="scope.row.is_must"
+            :value="scope.row.is_must"
+            size="large"
+            @change="onchangeIsMust(scope.row)"
+            active-text="全部"
+            inactive-text="其一"
+          >
+          </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="任务说明" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.illustrate }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" fixed="right" width="170">
+        <template slot-scope="scope">
+          <a @click="edit(scope.row)">编辑 | </a>
+          <el-divider direction="vertical"></el-divider>
+          <a @click="del(scope.row, '删除等级任务', index)"> 删除</a>
+        </template>
+      </el-table-column>
+    </el-table>
     <div class="acea-row row-right page">
-      <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="levelFrom.limit" />
+      <pagination
+        v-if="total"
+        :total="total"
+        :page.sync="levelFrom.page"
+        :limit.sync="levelFrom.limit"
+        @pagination="getList"
+      />
     </div>
     <!-- 新建 编辑表单-->
     <edit-from ref="edits" :FromData="FromData" @submitFail="submitFail" :titleType="titleType"></edit-from>
@@ -116,51 +146,7 @@ export default {
       total: 0,
       levelLists: [],
       loading: false,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          sortable: true,
-          width: 80,
-        },
-        {
-          title: '等级名称',
-          key: 'level_name',
-          minWidth: 100,
-        },
-        {
-          title: '任务名称',
-          key: 'name',
-          minWidth: 120,
-        },
-        {
-          title: '排序',
-          sort: 'grade',
-          sortable: true,
-          minWidth: 100,
-        },
-        {
-          title: '是否显示',
-          slot: 'is_shows',
-          minWidth: 110,
-        },
-        {
-          title: '务必达成',
-          slot: 'is_musts',
-          minWidth: 135,
-        },
-        {
-          title: '任务说明',
-          key: 'illustrate',
-          minWidth: 120,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 120,
-        },
-      ],
+
       FromData: null,
       ids: 0,
       modalTitleSs: '',
@@ -171,7 +157,7 @@ export default {
     ...mapState('media', ['isMobile']),
     ...mapState('userLevel', ['levelId']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -229,10 +215,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.levelFrom.page = index;
-      this.getList();
-    },
     // 修改显示隐藏
     onchangeIsShow(row) {
       let data = {
diff --git a/template/admin/src/pages/app/wechat/user/message.vue b/template/admin/src/pages/app/wechat/user/message.vue
index e589c020c..f3b0c3fd4 100644
--- a/template/admin/src/pages/app/wechat/user/message.vue
+++ b/template/admin/src/pages/app/wechat/user/message.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="table_box">
-        <Form
+        <el-form
           ref="formValidate"
           :model="formValidate"
           :label-width="labelWidth"
@@ -10,20 +10,22 @@
           class="tabform"
           @submit.native.prevent
         >
-          <Row :gutter="24" type="flex" justify="end">
-            <Col span="24" class="ivu-text-left">
-              <FormItem label="时间选择：">
-                <RadioGroup
+          <el-row :gutter="24" justify="end">
+            <el-col :span="24" class="ivu-text-left">
+              <el-form-item label="时间选择：">
+                <el-radio-group
                   v-model="formValidate.data"
                   type="button"
-                  @on-change="selectChange(formValidate.data)"
+                  @change="selectChange(formValidate.data)"
                   class="mr"
                 >
-                  <Radio :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{ item.text }}</Radio>
-                </RadioGroup>
+                  <el-radio-button :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{
+                    item.text
+                  }}</el-radio-button>
+                </el-radio-group>
                 <DatePicker
                   :editable="false"
-                  @on-change="onchangeTime"
+                  @change="onchangeTime"
                   :value="timeVal"
                   format="yyyy/MM/dd"
                   type="daterange"
@@ -31,51 +33,71 @@
                   placeholder="请选择时间"
                   style="width: 200px"
                 ></DatePicker>
-              </FormItem>
-            </Col>
-            <Col span="24" class="ivu-text-left">
-              <Col :xl="7" :lg="10" :md="12" :sm="24" :xs="24">
-                <FormItem label="操作名称：">
-                  <Select v-model="formValidate.type" style="width: 90%" clearable>
-                    <Option :value="1">男</Option>
-                    <Option :value="2">女</Option>
-                    <Option :value="0">保密</Option>
-                  </Select>
-                </FormItem>
-              </Col>
-              <Col :xl="7" :lg="10" :md="12" :sm="24" :xs="24">
-                <FormItem label="操作用户：">
-                  <Input placeholder="请输入用户名称" v-model="formValidate.nickname" style="width: 90%"></Input>
-                </FormItem>
-              </Col>
-              <Col :xl="3" :lg="4" :md="12" :sm="24" :xs="24" class="btn_box">
-                <FormItem>
-                  <Button type="primary" icon="ios-search" label="default" class="userSearch" @click="userSearchs"
-                    >搜索</Button
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" class="ivu-text-left">
+              <el-col :xl="7" :lg="10" :md="12" :sm="24" :xs="24">
+                <el-form-item label="操作名称：">
+                  <el-select v-model="formValidate.type" style="width: 90%" clearable>
+                    <el-option :value="1" label="男"></el-option>
+                    <el-option :value="2" label="女"></el-option>
+                    <el-option :value="0" label="保密"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :xl="7" :lg="10" :md="12" :sm="24" :xs="24">
+                <el-form-item label="操作用户：">
+                  <el-input placeholder="请输入用户名称" v-model="formValidate.nickname" style="width: 90%"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xl="3" :lg="4" :md="12" :sm="24" :xs="24" class="btn_box">
+                <el-form-item>
+                  <el-button type="primary" icon="ios-search" label="default" class="userSearch" @click="userSearchs"
+                    >搜索</el-button
                   >
-                </FormItem>
-              </Col>
-            </Col>
-          </Row>
-        </Form>
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+        </el-form>
       </div>
-      <Table
-        ref="selection"
-        :columns="columns4"
-        :data="tabList"
-        :loading="loading"
-        no-data-text="暂无数据"
-        highlight-row
-        no-filtered-data-text="暂无筛选结果"
-      >
-        <template slot-scope="{ row, index }" slot="add_time">
-          <span> {{ row.add_time ? row.add_time : '' | formatDate }}</span>
-        </template>
-      </Table>
+      <el-table ref="selection" :data="tabList" :loading="loading" empty-text="暂无数据" highlight-current-row>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作用户" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.type_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="关联内容" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.headimgurl }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作时间" min-width="130">
+          <template slot-scope="scope">
+            <span> {{ scope.row.add_time ? scope.row.add_time : '' | formatDate }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="formValidate.limit" />
+        <pagination
+          v-if="total"
+          :total="total"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
+        />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -119,40 +141,13 @@ export default {
       loading: false,
       tabList: [],
       total: 0,
-      columns4: [
-        {
-          title: 'ID',
-          width: 80,
-          key: 'id',
-        },
-        {
-          title: '操作用户',
-          key: 'nickname',
-          minWidth: 120,
-        },
-        {
-          title: '操作名称',
-          key: 'type_name',
-          minWidth: 120,
-        },
-        {
-          title: '关联内容',
-          key: 'headimgurl',
-          minWidth: 150,
-        },
-        {
-          title: '操作时间',
-          slot: 'add_time',
-          minWidth: 150,
-        },
-      ],
     };
   },
   computed: {
     ...mapState('media', ['isMobile']),
     ...mapState('order', ['orderChartType']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -190,10 +185,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 搜索
     userSearchs() {
       this.getList();
diff --git a/template/admin/src/pages/app/wechat/user/tag.vue b/template/admin/src/pages/app/wechat/user/tag.vue
index f18ba7474..a85eeb908 100644
--- a/template/admin/src/pages/app/wechat/user/tag.vue
+++ b/template/admin/src/pages/app/wechat/user/tag.vue
@@ -1,24 +1,40 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="save_from ivu-mt">
-      <Button type="primary" icon="md-add" @click="add">{{ '添加' + $route.meta.title }}</Button>
-      <Table
-        :columns="columns1"
+    <el-card :bordered="false" shadow="never" class="save_from ivu-mt">
+      <el-button type="primary" icon="md-add" @click="add">{{ '添加' + $route.meta.title }}</el-button>
+      <el-table
         :data="tabList"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row)">编辑</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除标签', index)">删除</a>
-        </template>
-      </Table>
-    </Card>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="标签名" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="人数" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.count }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除标签', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
   </div>
 </template>
 
@@ -40,29 +56,7 @@ export default {
       FromData: null,
       loading: false,
       tabList: [],
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '标签名',
-          key: 'name',
-          minWidth: 200,
-        },
-        {
-          title: '人数',
-          key: 'count',
-          minWidth: 120,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 150,
-        },
-      ],
+     
     };
   },
   watch: {
diff --git a/template/admin/src/pages/app/wechat/user/user.vue b/template/admin/src/pages/app/wechat/user/user.vue
index 9e4da8bc4..d04adf00a 100644
--- a/template/admin/src/pages/app/wechat/user/user.vue
+++ b/template/admin/src/pages/app/wechat/user/user.vue
@@ -3,9 +3,9 @@
     <div class="i-layout-page-header header-title">
       <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="table_box">
-        <Form
+        <el-form
           ref="formValidate"
           :model="formValidate"
           :label-width="labelWidth"
@@ -13,22 +13,22 @@
           class="tabform"
           @submit.native.prevent
         >
-          <Row :gutter="24" type="flex" justify="end">
-            <Col span="24" class="ivu-text-left">
-              <FormItem :label="fromList.title + '：'">
-                <RadioGroup
+          <el-row :gutter="24" justify="end">
+            <el-col :span="24" class="ivu-text-left">
+              <el-form-item :label="fromList.title + '：'">
+                <el-radio-group
                   type="button"
                   v-model="formValidate.data"
                   class="mr15"
-                  @on-change="selectChange(formValidate.data)"
+                  @change="selectChange(formValidate.data)"
                 >
-                  <Radio :label="itemn.val" v-for="(itemn, indexn) in fromList.fromTxt" :key="indexn">
+                  <el-radio-button :label="itemn.val" v-for="(itemn, indexn) in fromList.fromTxt" :key="indexn">
                     {{ itemn.text }}
-                  </Radio>
-                </RadioGroup>
+                  </el-radio-button>
+                </el-radio-group>
                 <DatePicker
                   :editable="false"
-                  @on-change="onchangeTime"
+                  @change="onchangeTime"
                   :value="timeVal"
                   format="yyyy/MM/dd"
                   type="daterange"
@@ -36,115 +36,148 @@
                   placeholder="请选择时间"
                   style="width: 200px"
                 ></DatePicker>
-              </FormItem>
-            </Col>
-            <Col span="24" class="ivu-text-left">
-              <FormItem label="用户分组：">
-                <RadioGroup type="button" v-model="formValidate.groupid">
-                  <Radio :label="item.id" v-for="(item, index) in groupList" :key="index">{{ item.name }}</Radio>
-                </RadioGroup>
-              </FormItem>
-            </Col>
-            <Col span="24" class="ivu-text-left">
-              <FormItem label="用户标签：">
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" class="ivu-text-left">
+              <el-form-item label="用户分组：">
+                <el-radio-group type="button" v-model="formValidate.groupid">
+                  <el-radio-button :label="item.id" v-for="(item, index) in groupList" :key="index">{{
+                    item.name
+                  }}</el-radio-button>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" class="ivu-text-left">
+              <el-form-item label="用户标签：">
                 <TagSelect v-model="tagidList">
                   <TagSelectOption :name="item.id" v-for="(item, index) in tagList" :key="index">{{
                     item.name
                   }}</TagSelectOption>
                 </TagSelect>
-              </FormItem>
-            </Col>
-            <Col span="24" class="ivu-text-left">
-              <Col :xl="7" :lg="12" :md="12" :sm="24" :xs="24">
-                <FormItem label="用户名称：">
-                  <Input placeholder="请输入用户名称" v-model="formValidate.nickname" class="perW90"></Input>
-                </FormItem>
-              </Col>
-              <Col :xl="7" :lg="12" :md="12" :sm="24" :xs="24" class="sex_box">
-                <FormItem label="性别：">
-                  <Select v-model="formValidate.sex" style="width: 90%" clearable>
-                    <Option value="1">男</Option>
-                    <Option value="2">女</Option>
-                    <Option value="0">保密</Option>
-                  </Select>
-                </FormItem>
-              </Col>
-              <Col :xl="7" :lg="12" :md="12" :sm="24" :xs="24" class="subscribe_box">
-                <FormItem label="是否关注公众号：">
-                  <Select v-model="formValidate.subscribe" style="width: 90%" clearable>
-                    <Option value="1">是</Option>
-                    <Option value="0">否</Option>
-                  </Select>
-                </FormItem>
-              </Col>
-              <Col :xl="3" :lg="3" :md="3" :sm="24" :xs="24" class="btn_box">
-                <FormItem>
-                  <Button type="primary" icon="ios-search" label="default" class="userSearch" @click="userSearchs"
-                    >搜索</Button
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" class="ivu-text-left">
+              <el-col :xl="7" :lg="12" :md="12" :sm="24" :xs="24">
+                <el-form-item label="用户名称：">
+                  <el-input placeholder="请输入用户名称" v-model="formValidate.nickname" class="perW90"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xl="7" :lg="12" :md="12" :sm="24" :xs="24" class="sex_box">
+                <el-form-item label="性别：">
+                  <el-select v-model="formValidate.sex" style="width: 90%" clearable>
+                    <el-option :value="1" label="男"></el-option>
+                    <el-option :value="2" label="女"></el-option>
+                    <el-option :value="0" label="保密"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :xl="7" :lg="12" :md="12" :sm="24" :xs="24" class="subscribe_box">
+                <el-form-item label="是否关注公众号：">
+                  <el-select v-model="formValidate.subscribe" style="width: 90%" clearable>
+                    <el-option value="1" label="是"></el-option>
+                    <el-option value="0" label="否"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :xl="3" :lg="3" :md="3" :sm="24" :xs="24" class="btn_box">
+                <el-form-item>
+                  <el-button type="primary" icon="ios-search" label="default" class="userSearch" @click="userSearchs"
+                    >搜索</el-button
                   >
-                </FormItem>
-              </Col>
-            </Col>
-            <Divider dashed />
-            <Col span="24">
-              <Button type="primary" class="mr20" @click="onSend">发送优惠券</Button>
-              <Button class="greens mr20" size="default" @click="onSendPic">
+                </el-form-item>
+              </el-col>
+            </el-col>
+            <el-divider direction="vertical" dashed />
+            <el-col :span="24">
+              <el-button type="primary" class="mr20" @click="onSend">发送优惠券</el-button>
+              <el-button class="greens mr20" size="default" @click="onSendPic">
                 <Icon type="md-list"></Icon>
                 发送图文消息
-              </Button>
-            </Col>
-          </Row>
-        </Form>
+              </el-button>
+            </el-col>
+          </el-row>
+        </el-form>
       </div>
-      <Table
+      <el-table
         ref="selection"
-        :columns="columns4"
         :data="tabList"
         :loading="loading"
-        no-data-text="暂无数据"
-        highlight-row
+        empty-text="暂无数据"
+        highlight-current-row
         class="mt25"
-        no-filtered-data-text="暂无筛选结果"
-        @on-selection-change="onSelectTab"
+        @select="onSelectTab"
+        @select-all="onSelectTab"
       >
-        <template slot-scope="{ row, index }" slot="headimgurl">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.headimgurl" />
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="sex">
-          <span v-show="row.sex === 1">男</span>
-          <span v-show="row.sex === 2">女</span>
-          <span v-show="row.sex === 0">保密</span>
-        </template>
-        <template slot-scope="{ row }" slot="country">
-          <span>{{ row.country + row.province + row.city }}</span>
-        </template>
-        <template slot-scope="{ row }" slot="subscribe">
-          <span v-show="row.subscribe === 1">关注</span>
-          <span v-show="row.subscribe === 0">未关注</span>
-        </template>
-        <template slot-scope="{ row }" slot="createModalFrame">
-          <template>
-            <Dropdown @on-click="changeMenu(row, $event)">
-              <a href="javascript:void(0)"
-                >操作
-                <Icon type="ios-arrow-down"></Icon>
-              </a>
-              <DropdownMenu slot="list">
-                <DropdownItem name="1" v-show="row.subscribe">修改分组</DropdownItem>
-                <DropdownItem name="2" v-show="row.subscribe">修改标签</DropdownItem>
-                <DropdownItem name="3" v-show="row.subscribe">同步标签</DropdownItem>
-                <DropdownItem v-show="!row.subscribe">无法操作</DropdownItem>
-              </DropdownMenu>
-            </Dropdown>
+        <el-table-column type="selection" width="55"> </el-table-column>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.uid }}</span>
           </template>
-        </template>
-      </Table>
+        </el-table-column>
+        <el-table-column label="微信用户名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="头像" min-width="130">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.headimgurl" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="性别" min-width="130">
+          <template slot-scope="scope">
+            <span v-show="scope.row.sex === 1">男</span>
+            <span v-show="scope.row.sex === 2">女</span>
+            <span v-show="scope.row.sex === 0">保密</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="地区" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.country + scope.row.province + scope.row.city }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否关注公众号" min-width="130">
+          <template slot-scope="scope">
+            <span v-show="scope.row.subscribe === 1">关注</span>
+            <span v-show="scope.row.subscribe === 0">未关注</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户分组" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.groupid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户标签" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.tagid_list }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <el-dropdown size="small" @command="changeMenu(scope.row, $event)">
+              <span class="el-dropdown-link">操作<i class="el-icon-arrow-down el-icon--right"></i> </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="1" v-show="scope.row.subscribe">修改分组</el-dropdown-item>
+                <el-dropdown-item command="2" v-show="scope.row.subscribe">修改标签</el-dropdown-item>
+                <el-dropdown-item command="3" v-show="scope.row.subscribe">同步标签</el-dropdown-item>
+                <el-dropdown-item v-show="!scope.row.subscribe">无法操作</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="formValidate.limit" />
+        <pagination
+          v-if="total"
+          :total="total"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
+        />
       </div>
-    </Card>
+    </el-card>
     <!-- 用户分组和标签编辑-->
     <edit-from ref="edits" :FromData="FromData" @submitFail="submitFail"></edit-from>
     <!-- 发送优惠券-->
@@ -231,51 +264,6 @@ export default {
         sm: 24,
         xs: 24,
       },
-      columns4: [
-        {
-          type: 'selection',
-          min: 60,
-          align: 'center',
-        },
-        {
-          title: 'ID',
-          key: 'uid',
-        },
-        {
-          title: '微信用户名称',
-          key: 'nickname',
-        },
-        {
-          title: '头像',
-          slot: 'headimgurl',
-        },
-        {
-          title: '性别',
-          slot: 'sex',
-        },
-        {
-          title: '地区',
-          slot: 'country',
-        },
-        {
-          title: '是否关注公众号',
-          slot: 'subscribe',
-        },
-        {
-          title: '用户分组',
-          key: 'groupid',
-        },
-        {
-          title: '用户标签',
-          key: 'tagid_list',
-        },
-        {
-          title: '操作',
-          slot: 'createModalFrame',
-          fixed: 'right',
-          width: 100,
-        },
-      ],
       tagList: [],
       groupList: [],
       FromData: null,
@@ -286,7 +274,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -416,10 +404,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 搜索
     userSearchs() {
       this.getList();
diff --git a/template/admin/src/pages/cms/addArticle/index.vue b/template/admin/src/pages/cms/addArticle/index.vue
index 884826ed3..3cd86a4ad 100644
--- a/template/admin/src/pages/cms/addArticle/index.vue
+++ b/template/admin/src/pages/cms/addArticle/index.vue
@@ -3,14 +3,14 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <span>
-          <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
+          <el-button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</el-button>
         </span>
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span class="ivu-page-header-title">{{ $route.params.id ? '编辑文章' : '添加文章' }}</span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         class="form"
         ref="formValidate"
         :model="formValidate"
@@ -22,35 +22,39 @@
         <div class="goodsTitle acea-row">
           <div class="title">文章信息</div>
         </div>
-        <Row :gutter="24" type="flex">
-          <Col v-bind="grid" class="mr50">
-            <FormItem label="标题：" prop="title" label-for="title">
-              <Input v-model="formValidate.title" placeholder="请输入" element-id="title" style="width: 90%" />
-            </FormItem>
-          </Col>
-          <Col v-bind="grid" class="mr50">
-            <FormItem label="作者：" prop="author" label-for="author">
-              <Input v-model="formValidate.author" placeholder="请输入" element-id="author" style="width: 90%" />
-            </FormItem>
-          </Col>
-          <Col v-bind="grid" class="mr50">
-            <FormItem label="文章分类：" label-for="cid" prop="cid">
+        <el-row :gutter="24" >
+          <el-col v-bind="grid" class="mr50">
+            <el-form-item label="标题：" prop="title" label-for="title">
+              <el-input v-model="formValidate.title" placeholder="请输入" element-id="title" style="width: 90%" />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid" class="mr50">
+            <el-form-item label="作者：" prop="author" label-for="author">
+              <el-input v-model="formValidate.author" placeholder="请输入" element-id="author" style="width: 90%" />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid" class="mr50">
+            <el-form-item label="文章分类：" label-for="cid" prop="cid">
               <div class="perW90">
-                <Select v-model="formValidate.cid">
-                  <Option v-for="item in treeData" :value="item.id" :disabled="item.disabled" :key="item.id">{{
-                    item.html + item.title
-                  }}</Option>
-                </Select>
+                <el-select v-model="formValidate.cid">
+                  <el-option
+                    v-for="item in treeData"
+                    :value="item.id"
+                    :disabled="item.disabled"
+                    :key="item.id"
+                    :label="item.html + item.title"
+                  ></el-option>
+                </el-select>
               </div>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid" class="mr50">
-            <FormItem label="文章简介：" prop="synopsis" label-for="synopsis">
-              <Input v-model="formValidate.synopsis" type="textarea" placeholder="请输入" style="width: 90%" />
-            </FormItem>
-          </Col>
-          <Col v-bind="grid" class="mr50">
-            <FormItem label="图文封面：" prop="image_input">
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid" class="mr50">
+            <el-form-item label="文章简介：" prop="synopsis" label-for="synopsis">
+              <el-input v-model="formValidate.synopsis" type="textarea" placeholder="请输入" style="width: 90%" />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid" class="mr50">
+            <el-form-item label="图文封面：" prop="image_input">
               <div class="picBox" @click="modalPicTap('单选')">
                 <div class="pictrue" v-if="formValidate.image_input">
                   <img :src="formValidate.image_input" />
@@ -60,43 +64,43 @@
                 </div>
               </div>
               <div class="tip">建议尺寸：500 x 312 px</div>
-            </FormItem>
-          </Col>
-        </Row>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <div class="goodsTitle acea-row">
           <div class="title">文章内容</div>
         </div>
-        <FormItem label="文章内容：" prop="content">
+        <el-form-item label="文章内容：" prop="content">
           <WangEditor style="width: 90%" :content="formValidate.content" @editorContent="getEditorContent"></WangEditor>
-        </FormItem>
+        </el-form-item>
         <div class="goodsTitle acea-row">
           <div class="title">其他设置</div>
         </div>
-        <Row :gutter="24" type="flex">
-          <!--                    <Col span="24">-->
-          <!--                        <FormItem label="原文链接：">-->
-          <!--                            <Input v-model="formValidate.url" placeholder="请输入" element-id="url" style="width: 60%"/>-->
-          <!--                        </FormItem>-->
-          <!--                    </Col>-->
-          <Col span="24">
-            <FormItem label="banner显示：" label-for="is_banner">
-              <RadioGroup v-model="formValidate.is_banner" element-id="is_banner">
-                <Radio :label="1" class="radio">显示</Radio>
-                <Radio :label="0">不显示</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="热门文章：" label-for="is_hot">
-              <RadioGroup v-model="formValidate.is_hot" element-id="is_hot">
-                <Radio :label="1" class="radio">显示</Radio>
-                <Radio :label="0">不显示</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-        </Row>
-        <Button type="primary" class="submission" @click="onsubmit('formValidate')">提交</Button>
-      </Form>
+        <el-row :gutter="24" >
+          <!--                    <el-col :span="24">-->
+          <!--                        <el-form-item label="原文链接：">-->
+          <!--                            <el-input v-model="formValidate.url" placeholder="请输入" element-id="url" style="width: 60%"/>-->
+          <!--                        </el-form-item>-->
+          <!--                    </el-col>-->
+          <el-col :span="24">
+            <el-form-item label="banner显示：" label-for="is_banner">
+              <el-radio-group v-model="formValidate.is_banner" element-id="is_banner">
+                <el-radio :label="1" class="radio">显示</el-radio>
+                <el-radio :label="0">不显示</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="热门文章：" label-for="is_hot">
+              <el-radio-group v-model="formValidate.is_hot" element-id="is_hot">
+                <el-radio :label="1" class="radio">显示</el-radio>
+                <el-radio :label="0">不显示</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-button type="primary" class="submission" @click="onsubmit('formValidate')">提交</el-button>
+      </el-form>
       <Modal
         v-model="modalPic"
         width="950px"
@@ -115,7 +119,7 @@
           v-if="modalPic"
         ></uploadPictures>
       </Modal>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -213,7 +217,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 120;
+      return this.isMobile ? undefined : '120px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
diff --git a/template/admin/src/pages/cms/article/index.vue b/template/admin/src/pages/cms/article/index.vue
index 107f09536..3f27bbd2f 100644
--- a/template/admin/src/pages/cms/article/index.vue
+++ b/template/admin/src/pages/cms/article/index.vue
@@ -1,27 +1,27 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="artFrom"
         :model="artFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="文章分类：" label-for="pid">
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="文章分类：" label-for="pid">
               <i-select :value="artFrom.pid" placeholder="请选择" style="width: 80%" class="treeSel">
                 <i-option v-for="(item, index) of list" :value="item.value" :key="index" style="display: none">
                   {{ item.title }}
                 </i-option>
                 <Tree :data="treeData" @on-select-change="handleCheckChange"></Tree>
               </i-select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="文章搜索：" label-for="title">
-              <Input
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="文章搜索：" label-for="title">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入"
@@ -29,56 +29,82 @@
                 style="width: 80%"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
             <router-link :to="$routeProStr + '/cms/article/add_article'" v-auth="['cms-article-creat']"
-              ><Button type="primary" class="bnt" icon="md-add">添加文章</Button></router-link
+              ><el-button type="primary" class="bnt" icon="md-add">添加文章</el-button></router-link
             >
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="cmsList"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="titles">
-          <span>{{ ' [ ' + row.catename + ' ] ' + row.title }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="image_inputs">
-          <div v-if="row.image_input.length !== 0" v-viewer>
-            <div class="tabBox_img" v-for="(item, index) in row.image_input" :key="index">
-              <img v-lazy="item" />
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="文章图片" min-width="90">
+          <template slot-scope="scope">
+            <div v-if="scope.row.image_input.length !== 0" v-viewer>
+              <div class="tabBox_img" v-for="(item, index) in scope.row.image_input" :key="index">
+                <img v-lazy="item" />
+              </div>
             </div>
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row)">编辑</a>
-          <Divider type="vertical" />
-          <a @click="artRelation(row, '取消关联', index)">{{ row.product_id === 0 ? '关联' : '取消关联' }}</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除文章', index)">删除</a>
-        </template>
-      </Table>
+          </template>
+        </el-table-column>
+        <el-table-column label="文章名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ ' [ ' + scope.row.catename + ' ] ' + scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="关联商品" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.store_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="浏览量" min-width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.visit }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time | formatDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="artRelation(scope.row, '取消关联', index)">{{
+              scope.row.product_id === 0 ? '关联' : '取消关联'
+            }}</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除文章', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="artFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="artFrom.limit"
+          :page.sync="artFrom.page"
+          :limit.sync="artFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!--关联-->
     <Modal
       v-model="modals"
@@ -121,53 +147,7 @@ export default {
         limit: 20,
       },
       total: 0,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '文章图片',
-          slot: 'image_inputs',
-          minWidth: 90,
-        },
-        {
-          title: '文章名称',
-          slot: 'titles',
-          minWidth: 130,
-        },
-        {
-          title: '关联商品',
-          key: 'store_name',
-          minWidth: 130,
-        },
-        // {
-        //     title: '排序',
-        //     key: 'sort',
-        //     minWidth: 60
-        // },
-        {
-          title: '浏览量',
-          key: 'visit',
-          minWidth: 80,
-        },
-        {
-          title: '时间',
-          key: 'add_time',
-          sortable: true,
-          render: (h, params) => {
-            return h('div', formatDate(new Date(Number(params.row.add_time) * 1000), 'yyyy-MM-dd hh:mm'));
-          },
-          minWidth: 120,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 150,
-        },
-      ],
+
       cmsList: [],
       treeData: [],
       list: [],
@@ -188,12 +168,20 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
     },
   },
+  filters: {
+    formatDate(time) {
+      if (time !== 0) {
+        let date = new Date(time * 1000);
+        return formatDate(date, 'yyyy-MM-dd hh:mm');
+      }
+    },
+  },
   created() {},
   activated() {
     this.artFrom.pid = this.$route.query.id ? this.$route.query.id : 0;
@@ -256,10 +244,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.artFrom.page = index;
-      this.getList();
-    },
     // 下拉树
     handleCheckChange(data) {
       let value = '';
diff --git a/template/admin/src/pages/cms/article/relation.vue b/template/admin/src/pages/cms/article/relation.vue
index a84d23dfc..d104d6331 100644
--- a/template/admin/src/pages/cms/article/relation.vue
+++ b/template/admin/src/pages/cms/article/relation.vue
@@ -9,17 +9,17 @@
     width="950"
     @on-cancel="handleReset"
   >
-    <Form
+    <el-form
       ref="levelFrom"
       :model="levelFrom"
       :label-width="labelWidth"
       :label-position="labelPosition"
       @submit.native.prevent
     >
-      <Row type="flex" :gutter="24">
-        <Col v-bind="grid">
-          <FormItem label="商品名称：" prop="status2" label-for="status2">
-            <Input
+      <el-row :gutter="24">
+        <el-col v-bind="grid">
+          <el-form-item label="商品名称：" prop="status2" label-for="status2">
+            <el-input
               search
               enter-button
               v-model="levelFrom.name"
@@ -27,12 +27,12 @@
               @on-search="userSearchs"
               style="width: 100%"
             />
-          </FormItem>
-        </Col>
-      </Row>
-    </Form>
-    <Divider dashed />
-    <Table
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-divider direction="vertical" dashed />
+    <el-table
       :columns="columns1"
       :data="levelLists"
       ref="table"
@@ -41,38 +41,42 @@
       no-filtered-userFrom-text="暂无筛选结果"
     >
       <template slot-scope="{ row, index }" slot="is_shows">
-        <i-switch
+        <el-switch
+          :active-value="1"
+          :inactive-value="0"
           v-model="row.is_show"
           :value="row.is_show"
-          :true-value="1"
-          :false-value="0"
           size="large"
-          @on-change="onchangeIsShow(row)"
+          @change="onchangeIsShow(row)"
         >
-          <span slot="open">显示</span>
-          <span slot="close">隐藏</span>
-        </i-switch>
+        </el-switch>
       </template>
       <template slot-scope="{ row, index }" slot="is_musts">
-        <i-switch
+        <el-switch
+          :active-value="1"
+          :inactive-value="0"
           v-model="row.is_must"
           :value="row.is_must"
-          :true-value="1"
-          :false-value="0"
           size="large"
-          @on-change="onchangeIsMust(row)"
+          @change="onchangeIsMust(row)"
+          active-text="全部完成"
+          inactive-text="达成其一"
         >
-          <span slot="open">全部完成</span>
-          <span slot="close">达成其一</span>
-        </i-switch>
+        </el-switch>
       </template>
       <template slot-scope="{ row, index }" slot="action">
         <a @click="edit(row)">编辑 | </a>
         <a @click="del(row, '删除任务')"> 删除</a>
       </template>
-    </Table>
+    </el-table>
     <div class="acea-row row-right page">
-      <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="levelFrom.limit" />
+      <pagination
+        v-if="total"
+        :total="total"
+        :page.sync="levelFrom.page"
+        :limit.sync="levelFrom.limit"
+        @pagination="getList"
+      />
     </div>
     <!-- 新建 编辑表单-->
     <edit-from ref="edits" :FromData="FromData" @submitFail="submitFail" :titleType="titleType"></edit-from>
diff --git a/template/admin/src/pages/cms/articleCategory/index.vue b/template/admin/src/pages/cms/articleCategory/index.vue
index f7c62a88f..c5fff10d2 100644
--- a/template/admin/src/pages/cms/articleCategory/index.vue
+++ b/template/admin/src/pages/cms/articleCategory/index.vue
@@ -1,42 +1,43 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="是否显示：" label-for="status">
-              <Select v-model="status" placeholder="请选择" element-id="status" clearable @on-change="userSearchs">
-                <Option value="all">全部</Option>
-                <Option value="1">显示</Option>
-                <Option value="0">不显示</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="分类昵称：" prop="title" label-for="status2">
-              <Input
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="是否显示：" label-for="status">
+              <el-select v-model="status" placeholder="请选择" element-id="status" clearable @change="userSearchs">
+                <el-option value="all" label="全部"></el-option>
+                <el-option value="1" label="显示"></el-option>
+                <el-option value="0" label="不显示"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="分类昵称：" prop="title" label-for="status2">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入分类昵称"
                 v-model="formValidate.title"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button v-auth="['cms-category-create']" type="primary" icon="md-add" @click="add">添加文章分类</Button>
-          </Col>
-        </Row>
-      </Form>
-      <!-- <Divider dashed /> -->
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-button v-auth="['cms-category-create']" type="primary" icon="md-add" @click="add"
+              >添加文章分类</el-button
+            >
+          </el-col>
+        </el-row>
+      </el-form>
       <vxe-table
         class="vxeTable mt25"
         highlight-hover-row
@@ -56,40 +57,37 @@
         </vxe-table-column>
         <vxe-table-column field="status" title="状态" min-width="120">
           <template v-slot="{ row }">
-            <i-switch
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
               v-model="row.status"
               :value="row.status"
-              :true-value="1"
-              :false-value="0"
-              @on-change="onchangeIsShow(row)"
+              @change="onchangeIsShow(row)"
               size="large"
             >
-              <span slot="open">显示</span>
-              <span slot="close">隐藏</span>
-            </i-switch>
+            </el-switch>
           </template>
         </vxe-table-column>
         <vxe-table-column field="date" title="操作" align="center" width="250" fixed="right">
           <template v-slot="{ row }">
             <a @click="edit(row)">编辑</a>
-            <Divider type="vertical" />
+            <el-divider direction="vertical"></el-divider>
             <a @click="del(row, '删除文章分类')">删除</a>
-            <Divider type="vertical" />
+            <el-divider direction="vertical"></el-divider>
             <a @click="lookUp(row)">查看文章</a>
           </template>
         </vxe-table-column>
       </vxe-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 <script>
@@ -152,7 +150,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -217,10 +215,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.formValidate.page = 1;
diff --git a/template/admin/src/pages/crud/index.vue b/template/admin/src/pages/crud/index.vue
index 1e6f2f666..1ab2de4e3 100644
--- a/template/admin/src/pages/crud/index.vue
+++ b/template/admin/src/pages/crud/index.vue
@@ -1,31 +1,39 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row type="flex">
-        <Col v-bind="grid">
-          <Button type="primary" icon="md-add" @click="add">添加</Button>
-        </Col>
-      </Row>
-      <Table
-        :columns="columns"
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row>
+        <el-col v-bind="grid">
+          <el-button type="primary" icon="md-add" @click="add">添加</el-button>
+        </el-col>
+      </el-row>
+      <el-table
         :data="dataList"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row)">修改</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column :label="item.title" :min-width="item.minWidth" v-for="(item, index) in columns" :key="index">
+          <template slot-scope="scope">
+            <template v-if="item.key">
+              <div>
+                <span>{{ scope.row[item.key] }}</span>
+              </div>
+            </template>
+            <template v-else-if="item.slot === 'action'">
+              <a @click="edit(scope.row)">修改</a>
+              <el-divider direction="vertical"></el-divider>
+              <a @click="del(scope.row, '删除', index)">删除</a>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="from.limit" />
+        <pagination v-if="total" :total="total" :page.sync="from.page" :limit.sync="from.limit" @pagination="getList" />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -59,7 +67,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -166,11 +174,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    //分页
-    pageChange(index) {
-      this.from.page = index;
-      this.getList();
-    },
     // 修改
     edit(row) {
       let url = this.methodApi.edit.replace('<id>', row[this.curdKey]);
diff --git a/template/admin/src/pages/division/agent/agreement.vue b/template/admin/src/pages/division/agent/agreement.vue
index 690eba012..8ffc24aa2 100644
--- a/template/admin/src/pages/division/agent/agreement.vue
+++ b/template/admin/src/pages/division/agent/agreement.vue
@@ -3,17 +3,17 @@
     <div class="i-layout-page-header header-title">
       <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form :label-width="80" @submit.native.prevent>
-        <FormItem label="协议内容：">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form label-width="85px" @submit.native.prevent>
+        <el-form-item label="协议内容：">
           <WangEditor :content="agreement.content" @editorContent="getEditorContent"></WangEditor>
-        </FormItem>
-        <FormItem>
-          <Button type="primary" @click="memberAgreementSave">保存</Button>
-        </FormItem>
-      </Form>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="memberAgreementSave">保存</el-button>
+        </el-form-item>
+      </el-form>
       <Spin fix v-if="spinShow"></Spin>
-    </Card>
+    </el-card>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/division/agent/applyList.vue b/template/admin/src/pages/division/agent/applyList.vue
index d5799926d..a3ce87e4a 100644
--- a/template/admin/src/pages/division/agent/applyList.vue
+++ b/template/admin/src/pages/division/agent/applyList.vue
@@ -1,34 +1,37 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt mb10">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt mb10">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24" align="middle">
-          <Col>
-            <FormItem label="状态：">
-              <Select
+        <el-row :gutter="24" align="middle">
+          <el-col>
+            <el-form-item label="状态：">
+              <el-select
                 style="width: 200px"
                 v-model="formValidate.status"
                 placeholder="请选择状态"
                 element-id="group_id"
                 clearable
-                @on-change="userSearchs"
+                @change="userSearchs"
               >
-                <Option value="all">全部</Option>
-                <Option :value="item.id" v-for="(item, index) in statusList" :key="index">{{
-                  item.status_name
-                }}</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col>
-            <FormItem label="搜索：">
-              <Input
+                <el-option value="all" label="全部"></el-option>
+                <el-option
+                  :value="item.id"
+                  v-for="(item, index) in statusList"
+                  :key="index"
+                  :label="item.status_name"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col>
+            <el-form-item label="搜索：">
+              <el-input
                 style="width: 250px"
                 search
                 enter-button
@@ -36,57 +39,89 @@
                 v-model="formValidate.keyword"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-    </Card>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row class="ivu-mt box-wrapper">
-        <Col :xs="24" :sm="24" ref="rightBox">
-          <Table
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row class="ivu-mt box-wrapper">
+        <el-col :xs="24" :sm="24" ref="rightBox">
+          <el-table
             :columns="columns"
             :data="userLists"
             ref="table"
-            :loading="loading"
-            highlight-row
+            v-loading="loading"
+            highlight-current-row
             no-formValidate-text="暂无数据"
             no-filtered-formValidate-text="暂无筛选结果"
           >
-            <template slot-scope="{ row, index }" slot="images">
-              <div class="pictrue-box" v-if="row.images.length">
-                <div v-viewer v-for="(item, index) in row.images || []" :key="index">
-                  <img class="pictrue mr10" v-lazy="item" :src="item" />
+            <el-table-column label="用户UID" width="80">
+              <template slot-scope="scope">
+                <span>{{ scope.row.uid }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="代理商名称" min-width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.agent_name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="代理商电话" min-width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.phone }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="事业部ID" min-width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.division_id }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请图片" min-width="150">
+              <template slot-scope="scope">
+                <div class="pictrue-box" v-if="scope.row.images.length">
+                  <div v-viewer v-for="(item, index) in scope.row.images || []" :key="index">
+                    <img class="pictrue mr10" v-lazy="item" :src="item" />
+                  </div>
                 </div>
-              </div>
-            </template>
-            <template slot-scope="{ row, index }" slot="status">
-              <Tag>{{ row.status == 0 ? '申请中' : row.status == 1 ? '已同意' : '已拒绝' }}</Tag>
-            </template>
-            <template slot-scope="{ row, index }" slot="division_end_time">
-              <span> {{ row.division_end_time }}</span>
-            </template>
-            <template slot-scope="{ row, index }" slot="action">
-              <a v-if="row.status == 0" @click="groupAdd(row.id, 1)">同意</a>
-              <Divider v-if="row.status == 0" type="vertical" />
-              <a v-if="row.status == 0" @click="groupAdd(row.id, 0)">拒绝</a>
-              <Divider type="vertical" v-if="row.status == 0" />
-              <a @click="del(row, '删除申请', index)">删除</a>
-            </template>
-          </Table>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请时间" min-width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.add_time }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="申请状态" min-width="150">
+              <template slot-scope="scope">
+                <Tag>{{ scope.row.status == 0 ? '申请中' : scope.row.status == 1 ? '已同意' : '已拒绝' }}</Tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="邀请码" min-width="150">
+              <template slot-scope="scope">
+                <Tag>{{ scope.row.division_invite }}</Tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" fixed="right" width="170">
+              <template slot-scope="scope">
+                <a v-if="scope.row.status == 0" @click="groupAdd(scope.row.id, 1)">同意</a>
+                <el-divider v-if="scope.row.status == 0" direction="vertical" />
+                <a v-if="scope.row.status == 0" @click="groupAdd(scope.row.id, 0)">拒绝</a>
+                <el-divider direction="vertical" v-if="scope.row.status == 0" />
+                <a @click="del(scope.row, '删除申请', index)">删除</a>
+              </template>
+            </el-table-column>
+          </el-table>
           <div class="acea-row row-right page">
-            <Page
+            <pagination
+              v-if="total"
               :total="total"
-              :current="formValidate.page"
-              show-elevator
-              show-total
-              @on-change="pageChange"
-              :page-size="formValidate.limit"
+              :page.sync="formValidate.page"
+              :limit.sync="formValidate.limit"
+              @pagination="getList"
             />
           </div>
-        </Col>
-      </Row>
-    </Card>
+        </el-col>
+      </el-row>
+    </el-card>
   </div>
 </template>
 
@@ -204,7 +239,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
diff --git a/template/admin/src/pages/division/agent/index.vue b/template/admin/src/pages/division/agent/index.vue
index 7c0ad66b1..f73572711 100644
--- a/template/admin/src/pages/division/agent/index.vue
+++ b/template/admin/src/pages/division/agent/index.vue
@@ -1,17 +1,17 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24" align="middle">
-          <Col v-bind="grid">
-            <FormItem label="搜索：" label-for="status">
-              <Input
+        <el-row :gutter="24" align="middle">
+          <el-col v-bind="grid">
+            <el-form-item label="搜索：" label-for="status">
+              <el-input
                 style="width: 300px"
                 search
                 enter-button
@@ -19,121 +19,150 @@
                 v-model="formValidate.keyword"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-    </Card>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row class="ivu-mt box-wrapper">
-        <Col :xs="24" :sm="24" ref="rightBox">
-          <Row type="flex">
-            <Col v-bind="grid">
-              <Button type="primary" @click="groupAdd('0')" class="mr20">添加代理商</Button>
-            </Col>
-          </Row>
-          <Table
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row class="ivu-mt box-wrapper">
+        <el-col :xs="24" :sm="24" ref="rightBox">
+          <el-row>
+            <el-col v-bind="grid">
+              <el-button type="primary" @click="groupAdd('0')" class="mr20">添加代理商</el-button>
+            </el-col>
+          </el-row>
+          <el-table
             :columns="columns"
             :data="userLists"
             ref="table"
             class="mt25"
-            :loading="loading"
-            highlight-row
+            v-loading="loading"
+            highlight-current-row
             no-formValidate-text="暂无数据"
             no-filtered-formValidate-text="暂无筛选结果"
           >
-            <template slot-scope="{ row, index }" slot="avatars">
-              <div class="tabBox_img" v-viewer>
-                <img v-lazy="row.avatar" />
-              </div>
-            </template>
-            <template slot-scope="{ row, index }" slot="nickname">
-              <div class="acea-row">
-                <Icon type="md-male" v-show="row.sex === '男'" color="#2db7f5" size="15" class="mr5" />
-                <Icon type="md-female" v-show="row.sex === '女'" color="#ed4014" size="15" class="mr5" />
-                <div v-text="row.nickname"></div>
-              </div>
-              <!--                    <div v-show="row.vip_name" class="vipName">{{row.vip_name}}</div>-->
-            </template>
-            <template slot-scope="{ row, index }" slot="status">
-              <i-switch
-                v-model="row.division_status"
-                :value="row.division_status"
-                :true-value="1"
-                :false-value="0"
-                @on-change="onchangeIsShow(row)"
-                size="large"
-              >
-                <span slot="open">显示</span>
-                <span slot="close">隐藏</span>
-              </i-switch>
-            </template>
-            <template slot-scope="{ row, index }" slot="division_end_time">
-              <span> {{ row.division_end_time }}</span>
-            </template>
-            <template slot-scope="{ row, index }" slot="division_percent">
-              <span> {{ row.division_percent }}%</span>
-            </template>
-            <template slot-scope="{ row, index }" slot="action">
-              <a @click="jump(row.uid)">查看员工</a>
-              <Divider type="vertical" />
-              <a @click="groupAdd(row.uid)">编辑</a>
-              <Divider type="vertical" />
-              <a @click="del(row, '删除代理商', index)">删除</a>
-            </template>
-          </Table>
+            <el-table-column label="用户UID" width="80">
+              <template slot-scope="scope">
+                <span>{{ scope.row.uid }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="头像" min-width="90">
+              <template slot-scope="scope">
+                <div class="tabBox_img" v-viewer>
+                  <img v-lazy="scope.row.avatar" />
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="姓名" min-width="130">
+              <template slot-scope="scope">
+                <div class="acea-row">
+                  <Icon type="md-male" v-show="scope.row.sex === '男'" color="#2db7f5" size="15" class="mr5" />
+                  <Icon type="md-female" v-show="scope.row.sex === '女'" color="#ed4014" size="15" class="mr5" />
+                  <div v-text="scope.row.nickname"></div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="分销比例" min-width="130">
+              <template slot-scope="scope">
+                <span> {{ scope.row.division_percent }}%</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="代理商数量" min-width="130">
+              <template slot-scope="scope">
+                <span>{{ scope.row.agent_count }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="订单数量" min-width="130">
+              <template slot-scope="scope">
+                <span>{{ scope.row.order_count }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="截止时间" min-width="130">
+              <template slot-scope="scope">
+                <span>{{ scope.row.division_end_time }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" min-width="130">
+              <template slot-scope="scope">
+                <el-switch
+                  :active-value="1"
+                  :inactive-value="0"
+                  v-model="scope.row.division_status"
+                  :value="scope.row.division_status"
+                  @change="onchangeIsShow(scope.row)"
+                  size="large"
+                >
+                </el-switch>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" fixed="right" width="170">
+              <template slot-scope="scope">
+                <a @click="jump(scope.row.uid)">查看员工</a>
+                <el-divider direction="vertical"></el-divider>
+                <a @click="groupAdd(scope.row.uid)">编辑</a>
+                <el-divider direction="vertical"></el-divider>
+                <a @click="del(scope.row, '删除代理商', index)">删除</a>
+              </template>
+            </el-table-column>
+          </el-table>
           <div class="acea-row row-right page">
-            <Page
+            <pagination
+              v-if="total"
               :total="total"
-              :current="formValidate.page"
-              show-elevator
-              show-total
-              @on-change="pageChange"
-              :page-size="formValidate.limit"
+              :page.sync="formValidate.page"
+              :limit.sync="formValidate.limit"
+              @pagination="getList"
             />
           </div>
-        </Col>
-      </Row>
-    </Card>
+        </el-col>
+      </el-row>
+    </el-card>
     <Modal v-model="staffModal" scrollable title="员工列表" class="order_box" width="800" footer-hide>
-      <Table
+      <el-table
         :columns="columns2"
         :data="clerkLists"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-formValidate-text="暂无数据"
         no-filtered-formValidate-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="avatars">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="nickname">
-          <div class="acea-row">
-            <Icon type="md-male" v-show="row.sex === '男'" color="#2db7f5" size="15" class="mr5" />
-            <Icon type="md-female" v-show="row.sex === '女'" color="#ed4014" size="15" class="mr5" />
-            <div v-text="row.nickname"></div>
-          </div>
-          <!--                    <div v-show="row.vip_name" class="vipName">{{row.vip_name}}</div>-->
-        </template>
-        <template slot-scope="{ row, index }" slot="agent_end_time">
-          <span> {{ row.agent_end_time | formatDate }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="division_percent">
-          <span> {{ row.division_percent }}%</span>
-        </template>
-      </Table>
+        <el-table-column label="用户UID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.uid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="头像" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.avatar" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="姓名" min-width="130">
+          <template slot-scope="scope">
+            <div class="acea-row">
+              <Icon type="md-male" v-show="scope.row.sex === '男'" color="#2db7f5" size="15" class="mr5" />
+              <Icon type="md-female" v-show="scope.row.sex === '女'" color="#ed4014" size="15" class="mr5" />
+              <div v-text="scope.row.nickname"></div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="分销比例" min-width="130">
+          <template slot-scope="scope">
+            <span> {{ scope.row.division_percent }}%</span>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total2"
           :total="total2"
-          :current="clerkReqData.page"
-          show-elevator
-          show-total
-          @on-change="clerkPageChange"
-          :page-size="clerkReqData.limit"
+          :page.sync="clerkReqData.page"
+          :limit.sync="clerkReqData.limit"
+          @pagination="getClerkList"
         />
       </div>
     </Modal>
@@ -261,7 +290,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -303,14 +332,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
-    clerkPageChange() {
-      this.clerkReqData.page = index;
-      this.getClerkList();
-    },
     // 添加表单
     groupAdd(id) {
       this.$modalForm(agentFrom(id))
diff --git a/template/admin/src/pages/division/list/index.vue b/template/admin/src/pages/division/list/index.vue
index 91e380459..f6d1f8c62 100644
--- a/template/admin/src/pages/division/list/index.vue
+++ b/template/admin/src/pages/division/list/index.vue
@@ -1,17 +1,17 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24" align="middle">
-          <Col v-bind="grid">
-            <FormItem label="搜索：" label-for="status">
-              <Input
+        <el-row :gutter="24" align="middle">
+          <el-col v-bind="grid">
+            <el-form-item label="搜索：" label-for="status">
+              <el-input
                 style="width: 300px"
                 search
                 enter-button
@@ -19,121 +19,163 @@
                 v-model="formValidate.keyword"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-    </Card>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row class="ivu-mt box-wrapper">
-        <Col :xs="24" :sm="24" ref="rightBox">
-          <Row type="flex">
-            <Col v-bind="grid">
-              <Button type="primary" @click="groupAdd('0')" class="mr20">添加事业部</Button>
-            </Col>
-          </Row>
-          <Table
-            :columns="columns"
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row class="ivu-mt box-wrapper">
+        <el-col :xs="24" :sm="24" ref="rightBox">
+          <el-row>
+            <el-col v-bind="grid">
+              <el-button type="primary" @click="groupAdd('0')" class="mr20">添加事业部</el-button>
+            </el-col>
+          </el-row>
+          <el-table
             :data="userLists"
             ref="table"
             class="mt25"
             :loading="loading"
-            highlight-row
+            highlight-current-row
             no-formValidate-text="暂无数据"
             no-filtered-formValidate-text="暂无筛选结果"
           >
-            <template slot-scope="{ row, index }" slot="avatars">
-              <div class="tabBox_img" v-viewer>
-                <img v-lazy="row.avatar" />
-              </div>
-            </template>
-            <template slot-scope="{ row, index }" slot="nickname">
-              <div class="acea-row">
-                <Icon type="md-male" v-show="row.sex === '男'" color="#2db7f5" size="15" class="mr5" />
-                <Icon type="md-female" v-show="row.sex === '女'" color="#ed4014" size="15" class="mr5" />
-                <div v-text="row.nickname"></div>
-              </div>
-              <!--                    <div v-show="row.vip_name" class="vipName">{{row.vip_name}}</div>-->
-            </template>
-            <template slot-scope="{ row, index }" slot="status">
-              <i-switch
-                v-model="row.division_status"
-                :value="row.division_status"
-                :true-value="1"
-                :false-value="0"
-                @on-change="onchangeIsShow(row)"
-                size="large"
-              >
-                <span slot="open">显示</span>
-                <span slot="close">隐藏</span>
-              </i-switch>
-            </template>
-            <template slot-scope="{ row, index }" slot="division_end_time">
-              <span> {{ row.division_end_time }}</span>
-            </template>
-            <template slot-scope="{ row, index }" slot="division_percent">
-              <span> {{ row.division_percent }}%</span>
-            </template>
-            <template slot-scope="{ row, index }" slot="action">
-              <a @click="jump(row.uid)">查看代理商</a>
-              <Divider type="vertical" />
-              <a @click="groupAdd(row.uid)">编辑</a>
-              <Divider type="vertical" />
-              <a @click="del(row, '删除员工', index)">删除</a>
-            </template>
-          </Table>
+            <el-table-column label="用户UID" width="80">
+              <template slot-scope="scope">
+                <span>{{ scope.row.uid }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="头像" min-width="90">
+              <template slot-scope="scope">
+                <div class="tabBox_img" v-viewer>
+                  <img v-lazy="scope.row.avatar" />
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="姓名" min-width="130">
+              <template slot-scope="scope">
+                <div class="acea-row">
+                  <Icon type="md-male" v-show="scope.row.sex === '男'" color="#2db7f5" size="15" class="mr5" />
+                  <Icon type="md-female" v-show="scope.row.sex === '女'" color="#ed4014" size="15" class="mr5" />
+                  <div v-text="scope.row.nickname"></div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="邀请码" min-width="130">
+              <template slot-scope="scope">
+                <span>{{ scope.row.division_invite }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="分销比例" min-width="130">
+              <template slot-scope="scope">
+                <span> {{ scope.row.division_percent }}%</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="代理商数量" min-width="130">
+              <template slot-scope="scope">
+                <span>{{ scope.row.agent_count }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="订单数量" min-width="130">
+              <template slot-scope="scope">
+                <span>{{ scope.row.order_count }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="截止时间" min-width="130">
+              <template slot-scope="scope">
+                <span>{{ scope.row.division_end_time }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" min-width="130">
+              <template slot-scope="scope">
+                <el-switch
+                  :active-value="1"
+                  :inactive-value="0"
+                  v-model="scope.row.division_status"
+                  :value="scope.row.division_status"
+                  @change="onchangeIsShow(scope.row)"
+                  size="large"
+                >
+                </el-switch>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" fixed="right" width="170">
+              <template slot-scope="scope">
+                <a @click="jump(scope.row.uid)">查看代理商</a>
+                <el-divider direction="vertical"></el-divider>
+                <a @click="groupAdd(scope.row.uid)">编辑</a>
+                <el-divider direction="vertical"></el-divider>
+                <a @click="del(scope.row, '删除员工', index)">删除</a>
+              </template>
+            </el-table-column>
+          </el-table>
           <div class="acea-row row-right page">
-            <Page
+            <pagination
+              v-if="total"
               :total="total"
-              :current="formValidate.page"
-              show-elevator
-              show-total
-              @on-change="pageChange"
-              :page-size="formValidate.limit"
+              :page.sync="formValidate.page"
+              :limit.sync="formValidate.limit"
+              @pagination="getList"
             />
           </div>
-        </Col>
-      </Row>
-    </Card>
+        </el-col>
+      </el-row>
+    </el-card>
     <Modal v-model="staffModal" scrollable title="代理商列表" class="order_box" width="800" footer-hide>
-      <Table
-        :columns="columns2"
+      <el-table
         :data="clerkLists"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-formValidate-text="暂无数据"
         no-filtered-formValidate-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="avatars">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="nickname">
-          <div class="acea-row">
-            <Icon type="md-male" v-show="row.sex === '男'" color="#2db7f5" size="15" class="mr5" />
-            <Icon type="md-female" v-show="row.sex === '女'" color="#ed4014" size="15" class="mr5" />
-            <div v-text="row.nickname"></div>
-          </div>
-          <!--                    <div v-show="row.vip_name" class="vipName">{{row.vip_name}}</div>-->
-        </template>
-        <template slot-scope="{ row, index }" slot="agent_end_time">
-          <span> {{ row.agent_end_time | formatDate }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="division_percent">
-          <span> {{ row.division_percent }}%</span>
-        </template>
-      </Table>
+        <el-table-column label="用户UID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.uid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="头像" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.avatar" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="姓名" min-width="130">
+          <template slot-scope="scope">
+            <div class="acea-row">
+              <Icon type="md-male" v-show="scope.row.sex === '男'" color="#2db7f5" size="15" class="mr5" />
+              <Icon type="md-female" v-show="scope.row.sex === '女'" color="#ed4014" size="15" class="mr5" />
+              <div v-text="scope.row.nickname"></div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="分销比例" min-width="130">
+          <template slot-scope="scope">
+            <span> {{ scope.row.division_percent }}%</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="到期时间" min-width="130">
+          <template slot-scope="scope">
+            <span> {{ scope.row.division_end_time | formatDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="员工数量" min-width="130">
+          <template slot-scope="scope">
+            <span> {{ scope.row.agent_count }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+         <pagination
+          v-if="total2"
           :total="total2"
-          :current="clerkReqData.page"
-          show-elevator
-          show-total
-          @on-change="clerkPageChange"
-          :page-size="clerkReqData.limit"
+          :page.sync="clerkReqData.page"
+          :limit.sync="clerkReqData.limit"
+          @pagination="getClerkList"
         />
       </div>
     </Modal>
@@ -163,91 +205,6 @@ export default {
         proportion: 0,
         image: '',
       },
-      columns2: [
-        {
-          title: '用户UID',
-          key: 'uid',
-          width: 80,
-        },
-        {
-          title: '头像',
-          slot: 'avatars',
-          minWidth: 60,
-        },
-        {
-          title: '姓名',
-          slot: 'nickname',
-          minWidth: 150,
-        },
-        {
-          title: '分销比例',
-          slot: 'division_percent',
-          minWidth: 100,
-        },
-        {
-          title: '到期时间',
-          key: 'division_end_time',
-          minWidth: 150,
-        },
-        {
-          title: '员工数量',
-          key: 'agent_count',
-          minWidth: 100,
-        },
-      ],
-      columns: [
-        {
-          title: '用户UID',
-          key: 'uid',
-          width: 80,
-        },
-        {
-          title: '头像',
-          slot: 'avatars',
-          minWidth: 60,
-        },
-        {
-          title: '姓名',
-          slot: 'nickname',
-          minWidth: 150,
-        },
-        {
-          title: '邀请码',
-          key: 'division_invite',
-          minWidth: 150,
-        },
-        {
-          title: '分销比例',
-          slot: 'division_percent',
-          minWidth: 100,
-        },
-        {
-          title: '代理商数量',
-          key: 'agent_count',
-          minWidth: 100,
-        },
-        {
-          title: '订单数量',
-          key: 'order_count',
-          minWidth: 100,
-        },
-        {
-          title: '截止时间',
-          slot: 'division_end_time',
-          minWidth: 100,
-        },
-        {
-          title: '状态',
-          slot: 'status',
-          minWidth: 100,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 120,
-        },
-      ],
       FromData: null,
       loading: false,
       current: 0,
@@ -276,7 +233,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -319,14 +276,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
-    clerkPageChange() {
-      this.clerkReqData.page = index;
-      this.getClerkList();
-    },
     // 添加表单
     groupAdd(id) {
       this.$modalForm(regionFrom(id))
diff --git a/template/admin/src/pages/finance/balance/index.vue b/template/admin/src/pages/finance/balance/index.vue
index cf1198075..123529ea0 100644
--- a/template/admin/src/pages/finance/balance/index.vue
+++ b/template/admin/src/pages/finance/balance/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt mb10">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt mb10">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
@@ -9,14 +9,14 @@
         class="tabform"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex">
-          <Col span="24">
-            <FormItem label="订单时间：">
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="订单时间：">
               <dateRadio @selectDate="onSelectDate"></dateRadio>
               <DatePicker
                 :editable="false"
                 :clearable="false"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="daterange"
@@ -26,74 +26,88 @@
                 :options="options"
                 class="mr20"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="交易类型：">
-              <Select
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="交易类型：">
+              <el-select
                 type="button"
                 v-model="formValidate.trading_type"
                 class="mr15"
-                @on-change="selChange"
+                @change="selChange"
                 style="width: 30%"
               >
-                <Option
+                <el-option
                   :label="item"
                   :value="Object.keys(withdrawal)[index]"
                   v-for="(item, index) in Object.values(withdrawal)"
                   :key="index"
-                  >{{ item }}</Option
-                >
-              </Select>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-    </Card>
-    <Card :bordered="false" dis-hover>
-      <Table
-        ref="table"
-        :columns="columns"
-        :data="tabList"
-        :loading="loading"
-        no-data-text="暂无数据"
-        no-filtered-data-text="暂无筛选结果"
-      >
-        <template slot-scope="{ row }" slot="extract_price">
-          <div>{{ row.extract_price }}</div>
-        </template>
-        <template slot-scope="{ row }" slot="pay_type">
-          <div v-for="item in payment" :key="item.value">
-            <span v-if="row.pay_type == item.value"> {{ item.title }} </span>
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="number">
-          <div v-if="row.pm" class="z-price">+ {{ row.number }}</div>
-          <div v-else class="f-price">- {{ row.number }}</div>
-        </template>
-        <template slot-scope="{ row }" slot="add_time">
-          <span> {{ row.add_time | formatDate }}</span>
-        </template>
-        <template slot-scope="{ row }" slot="set">
-          <Button size="small" type="primary" class="item" @click="setMark(row)">备注</Button>
-        </template>
-      </Table>
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <el-card :bordered="false" shadow="never">
+      <el-table ref="table" :columns="columns" :data="tabList" :loading="loading" empty-text="暂无数据">
+        <el-table-column label="ID" width="50">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="关联订单" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.relation }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="交易时间" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="交易金额" min-width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.pm" class="z-price">+ {{ scope.row.number }}</div>
+            <div v-else class="f-price">- {{ scope.row.number }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="交易类型" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.type_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.mark }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="70">
+          <template slot-scope="scope">
+            <a @click="setMark(scope.row)">备注</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!-- 拒绝通过-->
     <Modal v-model="modals" scrollable closable title="备注" :mask-closable="false">
-      <Input v-model="mark_msg.mark" type="textarea" :rows="4" placeholder="请输入备注" />
+      <el-input v-model="mark_msg.mark" type="textarea" :rows="4" placeholder="请输入备注" />
       <div slot="footer">
-        <Button type="primary" size="large" long :loading="modal_loading" @click="oks">确定</Button>
+        <el-button type="primary" size="large" long :loading="modal_loading" @click="oks">确定</el-button>
       </div>
     </Modal>
   </div>
@@ -209,7 +223,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -279,10 +293,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 编辑提交成功
     submitFail() {
       this.getList();
diff --git a/template/admin/src/pages/finance/billingRecords/index.vue b/template/admin/src/pages/finance/billingRecords/index.vue
index 2a95e84ba..66937524b 100644
--- a/template/admin/src/pages/finance/billingRecords/index.vue
+++ b/template/admin/src/pages/finance/billingRecords/index.vue
@@ -1,24 +1,24 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="ivu-mt tabbox">
-        <Tabs @on-click="onClickTab" class="mb20">
-          <TabPane label="日账单" name="day" />
-          <TabPane label="周账单" name="week" />
-          <TabPane label="月账单" name="month" />
-        </Tabs>
-        <Form
+        <el-tabs v-model="tab" @tab-click="onClickTab" class="mb20">
+          <el-tab-pane label="日账单" name="day" />
+          <el-tab-pane label="周账单" name="week" />
+          <el-tab-pane label="月账单" name="month" />
+        </el-tabs>
+        <el-form
           ref="formValidate"
           :model="formValidate"
           :label-width="labelWidth"
           :label-position="labelPosition"
           @submit.native.prevent
         >
-          <FormItem label="创建时间：">
+          <el-form-item label="创建时间：">
             <DatePicker
               :editable="false"
               :clearable="false"
-              @on-change="onchangeTime"
+              @change="onchangeTime"
               :value="timeVal"
               format="yyyy/MM/dd"
               type="daterange"
@@ -28,47 +28,69 @@
               :options="options"
               class="mr20"
             ></DatePicker>
-          </FormItem>
-        </Form>
+          </el-form-item>
+        </el-form>
       </div>
       <div class="table">
-        <Table
+        <el-table
           :columns="columns"
           :data="orderList"
           ref="table"
           class="mt25"
-          :loading="loading"
-          highlight-row
+          v-loading="loading"
+          highlight-current-row
           no-userFrom-text="暂无数据"
           no-filtered-userFrom-text="暂无筛选结果"
         >
-          <template slot-scope="{ row }" slot="income_price">
-            <span style="color: #f5222d">￥{{ row.income_price }}</span>
-          </template>
-          <template slot-scope="{ row }" slot="exp_price">
-            <span style="color: #00c050">￥{{ row.exp_price }}</span>
-          </template>
-          <template slot-scope="{ row }" slot="entry_price">
-            <span>￥{{ row.entry_price }}</span>
-          </template>
-          <template slot-scope="{ row }" slot="action">
-            <a @click="Info(row)">账单详情</a>
-            <Divider type="vertical" />
-            <a @click="download(row)">下载</a>
-          </template>
-        </Table>
+          <el-table-column label="ID" width="80">
+            <template slot-scope="scope">
+              <span>{{ scope.row.id }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="标题" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row.title }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="日期" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row.add_time }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="收入金额" min-width="130">
+            <template slot-scope="scope">
+              <span style="color: #f5222d">￥{{ scope.row.income_price }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="支出金额" min-width="130">
+            <template slot-scope="scope">
+              <span style="color: #00c050">￥{{ scope.row.exp_price }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="入账金额" min-width="130">
+            <template slot-scope="scope">
+              <span>￥{{ scope.row.entry_price }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" width="170">
+            <template slot-scope="scope">
+              <a @click="Info(scope.row)">账单详情</a>
+              <el-divider direction="vertical"></el-divider>
+              <a @click="download(scope.row)">下载</a>
+            </template>
+          </el-table-column>
+        </el-table>
         <div class="acea-row row-right page">
-          <Page
+          <pagination
+            v-if="total"
             :total="total"
-            :current="formValidate.page"
-            show-elevator
-            show-total
-            @on-change="pageChange"
-            :page-size="formValidate.limit"
+            :page.sync="formValidate.page"
+            :limit.sync="formValidate.limit"
+            @pagination="getList"
           />
         </div>
       </div>
-    </Card>
+    </el-card>
     <Modal
       v-model="modals"
       scrollable
@@ -110,7 +132,6 @@ export default {
       total: 0,
       loading: false,
       tab: 'day',
-      staff: [],
       columns: [
         {
           title: 'ID',
@@ -184,7 +205,7 @@ export default {
   },
   computed: {
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -192,16 +213,9 @@ export default {
   },
   mounted() {
     this.onClickTab(this.tab);
-    this.staffApi();
   },
   methods: {
-    staffApi() {
-      staffListInfo().then((res) => {
-        this.staff = res.data;
-      });
-    },
-    onClickTab(e) {
-      this.tab = e;
+    onClickTab() {
       this.getList();
     },
     search() {
@@ -236,11 +250,6 @@ export default {
       this.formValidate.page = 1;
       this.getList();
     },
-    //分页
-    pageChange(status) {
-      this.formValidate.page = status;
-      this.getList();
-    },
     // 账单详情
     Info(row) {
       this.ids = row.ids || '';
diff --git a/template/admin/src/pages/finance/billingRecords/orderDetall.vue b/template/admin/src/pages/finance/billingRecords/orderDetall.vue
index 0ad7eddd4..6a8c6060b 100644
--- a/template/admin/src/pages/finance/billingRecords/orderDetall.vue
+++ b/template/admin/src/pages/finance/billingRecords/orderDetall.vue
@@ -51,26 +51,36 @@
       </div>
     </div>
     <div class="goods-box">
-      <Table :columns="columns1" :data="orderList">
-        <template slot-scope="{ row, index }" slot="id">
-          {{ row.productInfo.id }}
-        </template>
-        <template slot-scope="{ row, index }" slot="name">
-          <div class="product_info">
-            <img :src="row.productInfo.image" alt="" />
-            <p>{{ row.productInfo.store_name }}</p>
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="className">
-          {{ row.class_name }}
-        </template>
-        <template slot-scope="{ row, index }" slot="price">
-          {{ row.productInfo.price }}
-        </template>
-        <template slot-scope="{ row, index }" slot="total_num">
-          {{ row.cart_num }}
-        </template>
-      </Table>
+      <el-table  :data="orderList">
+        <el-table-column label="商品ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.productInfo.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品名称" min-width="160">
+          <template slot-scope="scope">
+            <div class="product_info">
+              <img :src="scope.row.productInfo.image" alt="" />
+              <p>{{ scope.row.productInfo.store_name }}</p>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品分类" min-width="160">
+          <template slot-scope="scope">
+            <div>{{ scope.row.class_name }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品售价" min-width="160">
+          <template slot-scope="scope">
+            <div>{{ scope.row.productInfo.price }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品数量" min-width="160">
+          <template slot-scope="scope">
+            <div>{{ scope.row.cart_num }}</div>
+          </template>
+        </el-table-column>
+      </el-table>
     </div>
     <Spin fix v-if="spinShow"></Spin>
   </div>
@@ -90,30 +100,6 @@ export default {
     return {
       orderDetail: {},
       orderList: [],
-      columns1: [
-        {
-          title: '商品ID',
-          slot: 'id',
-          maxWidth: 80,
-        },
-        {
-          title: '商品名称',
-          slot: 'name',
-          minWidth: 160,
-        },
-        {
-          title: '商品分类',
-          slot: 'className',
-        },
-        {
-          title: '商品售价',
-          slot: 'price',
-        },
-        {
-          title: '商品数量',
-          slot: 'total_num',
-        },
-      ],
       spinShow: false,
     };
   },
diff --git a/template/admin/src/pages/finance/capitalFlow/index.vue b/template/admin/src/pages/finance/capitalFlow/index.vue
index b3f869375..9e6a374a9 100644
--- a/template/admin/src/pages/finance/capitalFlow/index.vue
+++ b/template/admin/src/pages/finance/capitalFlow/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt mb10">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt mb10">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
@@ -9,13 +9,13 @@
         class="tabform"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex">
-          <Col span="24">
-            <FormItem label="订单时间：">
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="订单时间：">
               <DatePicker
                 :editable="false"
                 :clearable="false"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="daterange"
@@ -25,27 +25,25 @@
                 :options="options"
                 class="mr20"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="交易类型：">
-              <Select
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="交易类型：">
+              <el-select
                 type="button"
                 v-model="formValidate.status"
                 class="mr15"
-                @on-change="selChange"
+                @change="selChange"
                 style="width: 30%"
               >
-                <Option :label="item" :value="index" v-for="(item, index) in withdrawal" :key="index">{{
-                  item
-                }}</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="流水搜索：">
+                <el-option :label="item" :value="index" v-for="(item, index) in withdrawal" :key="index"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="流水搜索：">
               <div class="acea-row row-middle">
-                <Input
+                <el-input
                   search
                   enter-button
                   @on-search="getList"
@@ -55,56 +53,72 @@
                   style="width: 30%"
                 />
               </div>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-    </Card>
-    <Card :bordered="false" dis-hover>
-      <Table
-        ref="table"
-        :columns="columns"
-        :data="tabList"
-        class="ivu-mt"
-        :loading="loading"
-        no-data-text="暂无数据"
-        no-filtered-data-text="暂无筛选结果"
-      >
-        <template slot-scope="{ row }" slot="extract_price">
-          <div>{{ row.extract_price }}</div>
-        </template>
-        <template slot-scope="{ row }" slot="pay_type">
-          <div v-for="item in payment" :key="item.value">
-            <span v-if="row.pay_type == item.value"> {{ item.title }} </span>
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="price">
-          <div v-if="row.price >= 0" class="z-price">+{{ row.price }}</div>
-          <div v-if="row.price < 0" class="f-price">{{ row.price }}</div>
-        </template>
-        <template slot-scope="{ row }" slot="add_time">
-          <span> {{ row.add_time | formatDate }}</span>
-        </template>
-        <template slot-scope="{ row }" slot="set">
-          <Button size="small" type="primary" class="item" @click="setMark(row)">备注</Button>
-        </template>
-      </Table>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <el-card :bordered="false" shadow="never">
+      <el-table ref="table" :data="tabList" class="ivu-mt" v-loading="loading" empty-text="暂无数据">
+        <el-table-column label="交易单号" width="180">
+          <template slot-scope="scope">
+            <span>{{ scope.row.flow_id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="关联订单" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.order_id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="交易时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="交易金额" min-width="90">
+          <template slot-scope="scope">
+            <div v-if="scope.row.price >= 0" class="z-price">+{{ scope.row.price }}</div>
+            <div v-if="scope.row.price < 0" class="f-price">{{ scope.row.price }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="交易用户" min-width="90">
+          <template slot-scope="scope">
+            <span>{{ scope.row.nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="支付方式" min-width="90">
+          <template slot-scope="scope">
+            <div v-for="item in payment" :key="item.value">
+              <span v-if="scope.row.pay_type == item.value"> {{ item.title }} </span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="90">
+          <template slot-scope="scope">
+            <span>{{ scope.row.mark }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="setMark(scope.row)">备注</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!-- 拒绝通过-->
     <Modal v-model="modals" scrollable closable title="备注" :mask-closable="false">
-      <Input v-model="mark_msg.mark" type="textarea" :rows="4" placeholder="请输入备注" />
+      <el-input v-model="mark_msg.mark" type="textarea" :rows="4" placeholder="请输入备注" />
       <div slot="footer">
-        <Button type="primary" size="large" long :loading="modal_loading" @click.prevent="oks">确定</Button>
+        <el-button type="primary" size="large" long :loading="modal_loading" @click.prevent="oks">确定</el-button>
       </div>
     </Modal>
   </div>
@@ -225,7 +239,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -285,10 +299,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 编辑提交成功
     submitFail() {
       this.getList();
diff --git a/template/admin/src/pages/finance/commission/handle/commissionDetails.vue b/template/admin/src/pages/finance/commission/handle/commissionDetails.vue
index 35fc71641..6fa2d2ff3 100644
--- a/template/admin/src/pages/finance/commission/handle/commissionDetails.vue
+++ b/template/admin/src/pages/finance/commission/handle/commissionDetails.vue
@@ -15,50 +15,70 @@
           </div>
         </div>
       </div>
-      <Divider dashed />
-      <Form ref="formValidate" :label-width="75" :label-position="labelPosition" class="tabform" @submit.native.prevent>
-        <Row :gutter="24" type="flex">
-          <!--                    <Col span="8">-->
-          <!--                        <FormItem label="订单号/昵称：">-->
-          <!--                            <Input enter-button placeholder="请输入" element-id="name" v-model="formValidate.nickname"-->
+      <el-divider direction="vertical" dashed />
+      <el-form
+        ref="formValidate"
+        label-width="75px"
+        :label-position="labelPosition"
+        class="tabform"
+        @submit.native.prevent
+      >
+        <el-row :gutter="24">
+          <!--                    <el-col :span="8">-->
+          <!--                        <el-form-item label="订单号/昵称：">-->
+          <!--                            <el-input enter-button placeholder="请输入" element-id="name" v-model="formValidate.nickname"-->
           <!--                                   clearable/>-->
-          <!--                        </FormItem>-->
-          <!--                    </Col>-->
-          <Col span="12">
-            <FormItem label="时间范围：" class="tab_data">
+          <!--                        </el-form-item>-->
+          <!--                    </el-col>-->
+          <el-col :span="12">
+            <el-form-item label="时间范围：" class="tab_data">
               <DatePicker
                 :editable="false"
                 style="width: 100%"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 format="yyyy-MM-dd"
                 type="daterange"
                 placement="bottom-end"
                 placeholder="请选择时间范围"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col span="4">
-            <Button type="primary" icon="ios-search" @click="userSearchs">搜索</Button>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns"
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-button type="primary" icon="ios-search" @click="userSearchs">搜索</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tabList"
         ref="table"
-        :loading="loading"
+        v-loading="loading"
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
         class="table"
-      ></Table>
+      >
+        <el-table-column label="佣金金额" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="获得时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row._add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.mark }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
     </Modal>
@@ -85,34 +105,13 @@ export default {
         limit: 20, // 每页显示条数
       },
       total: 0,
-      columns: [
-        // {
-        //     title:'昵称',
-        //     key:'nickname'
-        // },
-        {
-          title: '佣金金额',
-          key: 'number',
-          minWidth: 80,
-        },
-        {
-          title: '获得时间',
-          key: '_add_time',
-          minWidth: 150,
-        },
-        {
-          title: '备注',
-          key: 'mark',
-          minWidth: 330,
-        },
-      ],
       tabList: [],
     };
   },
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 100;
+      return this.isMobile ? undefined : '100px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -164,10 +163,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 搜索
     userSearchs() {
       this.formValidate.page = 1;
diff --git a/template/admin/src/pages/finance/commission/index.vue b/template/admin/src/pages/finance/commission/index.vue
index f399bac61..b4d65018b 100644
--- a/template/admin/src/pages/finance/commission/index.vue
+++ b/template/admin/src/pages/finance/commission/index.vue
@@ -1,28 +1,28 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         class="tabform"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex">
-          <Col :xl="5" :lg="8" :md="10" :sm="11" :xs="24" class="mr10">
-            <FormItem label="昵称/ID：">
-              <Input
+        <el-row :gutter="24">
+          <el-col :xl="5" :lg="8" :md="10" :sm="11" :xs="24" class="mr10">
+            <el-form-item label="昵称/ID：">
+              <el-input
                 enter-button
                 placeholder="请输入"
                 element-id="nickname"
                 v-model="formValidate.nickname"
                 clearable
               />
-            </FormItem>
-          </Col>
-          <Col :xl="6" :lg="12" :md="13" :sm="12" :xs="24">
-            <FormItem label="佣金范围：" class="tab_data">
-              <Input-number
+            </el-form-item>
+          </el-col>
+          <el-col :xl="6" :lg="12" :md="13" :sm="12" :xs="24">
+            <el-form-item label="佣金范围：" class="tab_data">
+              <el-input-number
                 type="number"
                 :min="0"
                 enter-button
@@ -32,7 +32,7 @@
                 v-model="formValidate.price_min"
               />
               <span class="mr10">一</span>
-              <Input-number
+              <el-input-number
                 type="number"
                 :min="0"
                 enter-button
@@ -40,40 +40,60 @@
                 element-id="price_max"
                 v-model="formValidate.price_max"
               />
-            </FormItem>
-          </Col>
-          <Col>
-            <Button type="primary" icon="ios-search" @click="userSearchs">搜索</Button>
-            <Button v-auth="['export-userCommission']" class="export" icon="ios-share-outline" @click="exports"
+            </el-form-item>
+          </el-col>
+          <el-col>
+            <el-button type="primary" icon="ios-search" @click="userSearchs">搜索</el-button>
+            <el-button v-auth="['export-userCommission']" class="export" icon="ios-share-outline" @click="exports"
               >导出
-            </Button>
-          </Col>
-        </Row>
-      </Form>
-      <Table
+            </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         ref="table"
         :columns="columns"
         :data="tabList"
         :loading="loading"
-        no-data-text="暂无数据"
-        no-filtered-data-text="暂无筛选结果"
+        empty-text="暂无数据"
         @on-sort-change="sortChanged"
       >
-        <!-- <template slot-scope="{ row, index }" slot="action">
-          <a @click="Info(row)">详情</a>
-        </template> -->
-      </Table>
+        <el-table-column label="用户信息" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="总佣金金额" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sum_number }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="账户余额" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.now_money }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="账户佣金" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.brokerage_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="提现到账佣金" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.extract_price }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          :page-size="formValidate.limit"
-          @on-change="pageChange"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <commission-details ref="commission"></commission-details>
   </div>
 </template>
@@ -138,7 +158,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -163,10 +183,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 搜索
     userSearchs() {
       this.formValidate.page = 1;
diff --git a/template/admin/src/pages/finance/components/commissionDetails/index.vue b/template/admin/src/pages/finance/components/commissionDetails/index.vue
index f5f8aa55e..46e6e58ee 100644
--- a/template/admin/src/pages/finance/components/commissionDetails/index.vue
+++ b/template/admin/src/pages/finance/components/commissionDetails/index.vue
@@ -1,58 +1,83 @@
 <template>
   <div>
-    <Form
+    <el-form
       ref="formValidate"
       :label-width="labelWidth"
       :label-position="labelPosition"
       class="tabform"
       @submit.native.prevent
     >
-      <Row type="flex" :gutter="24">
-        <Col v-bind="grid">
-          <FormItem label="订单搜索：" label-for="status1">
-            <Input v-model="formValidate.keywords" placeholder="请输入交易单号/交易人" class="input"></Input>
-          </FormItem>
-        </Col>
-        <Col>
+      <el-row :gutter="24">
+        <el-col v-bind="grid">
+          <el-form-item label="订单搜索：" label-for="status1">
+            <el-input v-model="formValidate.keywords" placeholder="请输入交易单号/交易人" class="input"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col>
           <div class="search" @click="searchs">搜索</div>
-        </Col>
-        <Col>
+        </el-col>
+        <el-col>
           <div class="reset" @click="reset">重置</div>
-        </Col>
-      </Row>
-    </Form>
-    <!-- <Divider dashed/> -->
-    <Table
-      :columns="columns"
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table
       :data="tabList"
       ref="table"
-      :loading="loading"
+      v-loading="loading"
       no-userFrom-text="暂无数据"
       no-filtered-userFrom-text="暂无筛选结果"
       class="table"
     >
-      <template slot-scope="{ row }" slot="extract_price">
-        <div>{{ row.extract_price }}</div>
-      </template>
-      <template slot-scope="{ row }" slot="pay_type">
-        <span> {{ row.pay_type_name }} </span>
-      </template>
-      <template slot-scope="{ row }" slot="price">
-        <div v-if="row.price >= 0" class="z-price">+{{ row.price }}</div>
-        <div v-if="row.price < 0" class="f-price">{{ row.price }}</div>
-      </template>
-      <template slot-scope="{ row }" slot="add_time">
-        <span> {{ row.add_time | formatDate }}</span>
-      </template>
-    </Table>
+      <el-table-column label="交易单号" width="180">
+        <template slot-scope="scope">
+          <span>{{ scope.row.flow_id }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="关联订单" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.order_id }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="交易时间" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.add_time }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="交易金额" min-width="130">
+        <template slot-scope="scope">
+          <div v-if="scope.row.price >= 0" class="z-price">+{{ scope.row.price }}</div>
+          <div v-if="scope.row.price < 0" class="f-price">{{ scope.row.price }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="交易用户" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.nickname }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="交易类型" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.pay_type_name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="支付方式" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.order_id }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.mark }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
     <div class="acea-row row-right page">
-      <Page
+      <pagination
+        v-if="total"
         :total="total"
-        :current="formValidate.page"
-        show-elevator
-        show-total
-        @on-change="pageChange"
-        :page-size="formValidate.limit"
+        :page.sync="formValidate.page"
+        :limit.sync="formValidate.limit"
+        @pagination="getList"
       />
     </div>
   </div>
@@ -85,48 +110,6 @@ export default {
         limit: 20,
       },
       total: 0,
-      columns: [
-        {
-          title: '交易单号',
-          key: 'flow_id',
-          width: 180,
-        },
-        {
-          title: '关联订单',
-          key: 'order_id',
-          minWidth: 180,
-        },
-        {
-          title: '交易时间',
-          key: 'add_time',
-          minWidth: 120,
-        },
-        {
-          title: '交易金额',
-          slot: 'price',
-          minWidth: 80,
-        },
-        {
-          title: '交易用户',
-          key: 'nickname',
-          minWidth: 80,
-        },
-        {
-          title: '交易类型',
-          key: 'trading_type',
-          minWidth: 80,
-        },
-        {
-          title: '支付方式',
-          slot: 'pay_type',
-          minWidth: 100,
-        },
-        {
-          title: '备注',
-          key: 'mark',
-          minWidth: 100,
-        },
-      ],
       tabList: [],
       payment: [
         {
@@ -165,14 +148,14 @@ export default {
   computed: {
     ...mapState('admin/layout', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
     },
   },
   mounted() {
-    this.getList(this.ids);
+    this.getList();
   },
   methods: {
     staffApi() {
@@ -182,7 +165,7 @@ export default {
     },
     searchs() {
       this.formValidate.page = 1;
-      this.getList(this.ids);
+      this.getList();
     },
     // 时间
     onchangeTime(e) {
@@ -190,9 +173,8 @@ export default {
       this.formValidate.end_time = e[1];
     },
     // 列表
-    getList(id) {
-      this.ids = id;
-      this.formValidate.ids = id;
+    getList() {
+      this.formValidate.ids = this.ids;
       this.loading = true;
       getFlowList(this.formValidate)
         .then(async (res) => {
@@ -206,10 +188,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList(this.ids);
-    },
     reset() {
       this.formValidate = {
         ids: this.ids,
@@ -219,7 +197,7 @@ export default {
         page: 1,
         limit: 10,
       };
-      this.getList(this.ids);
+      this.getList();
     },
     // 关闭按钮
     cancel() {
diff --git a/template/admin/src/pages/finance/financialRecords/bill/index.vue b/template/admin/src/pages/finance/financialRecords/bill/index.vue
index b8efa1200..46664aea2 100644
--- a/template/admin/src/pages/finance/financialRecords/bill/index.vue
+++ b/template/admin/src/pages/finance/financialRecords/bill/index.vue
@@ -3,8 +3,8 @@
     <div class="i-layout-page-header header-title">
       <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
@@ -12,68 +12,91 @@
         class="tabform"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex">
-          <Col :xl="6" :lg="12" :md="13" :sm="12" :xs="24">
-            <FormItem label="关键字：">
-              <Input enter-button placeholder="请输入" element-id="name" v-model="formValidate.nickname" />
-            </FormItem>
-          </Col>
-          <Col :xl="6" :lg="12" :md="13" :sm="12" :xs="24">
-            <FormItem label="时间范围：" class="tab_data">
+        <el-row :gutter="24">
+          <el-col :xl="6" :lg="12" :md="13" :sm="12" :xs="24">
+            <el-form-item label="关键字：">
+              <el-input enter-button placeholder="请输入" element-id="name" v-model="formValidate.nickname" />
+            </el-form-item>
+          </el-col>
+          <el-col :xl="6" :lg="12" :md="13" :sm="12" :xs="24">
+            <el-form-item label="时间范围：" class="tab_data">
               <DatePicker
                 :editable="false"
                 style="width: 80%"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 format="yyyy/MM/dd"
                 type="daterange"
                 placement="bottom-end"
                 placeholder="请选择时间"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col :xl="6" :lg="12" :md="13" :sm="12" :xs="24">
-            <FormItem label="筛选类型：" class="tab_data">
-              <Select v-model="formValidate.type" style="width: 200px; height: 32px" clearable>
-                <Option v-for="(item, index) in billList" :key="index" :value="item.type">{{ item.title }}</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col span="6">
-            <FormItem>
-              <Button type="primary" icon="ios-search" @click="userSearchs">搜索</Button>
-              <Button v-auth="['export-userFinance']" class="export" icon="ios-share-outline" @click="exports"
+            </el-form-item>
+          </el-col>
+          <el-col :xl="6" :lg="12" :md="13" :sm="12" :xs="24">
+            <el-form-item label="筛选类型：" class="tab_data">
+              <el-select v-model="formValidate.type" style="width: 200px; height: 32px" clearable>
+                <el-option
+                  v-for="(item, index) in billList"
+                  :key="index"
+                  :value="item.type"
+                  :label="item.title"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" icon="ios-search" @click="userSearchs">搜索</el-button>
+              <el-button v-auth="['export-userFinance']" class="export" icon="ios-share-outline" @click="exports"
                 >导出
-              </Button>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        ref="table"
-        highlight-row
-        :columns="columns"
-        :data="tabList"
-        :loading="loading"
-        no-data-text="暂无数据"
-        no-filtered-data-text="暂无筛选结果"
-      >
-        <template slot-scope="{ row }" slot="number">
-          <div :class="[row.pm === 1 ? 'green' : 'red']">
-            {{ row.pm === 1 ? row.number : '-' + row.number }}
-          </div>
-        </template>
-      </Table>
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table ref="table" highlight-current-row :data="tabList" v-loading="loading" empty-text="暂无数据">
+        <el-table-column label="用户ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.uid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="昵称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="金额" min-width="130">
+          <template slot-scope="scope">
+            <div :class="[scope.row.pm === 1 ? 'green' : 'red']">
+              {{ scope.row.pm === 1 ? scope.row.number : '-' + scope.row.number }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="类型" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.mark }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          :page-size="formValidate.limit"
-          @on-change="pageChange"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -97,52 +120,12 @@ export default {
       loading: false,
       tabList: [],
       total: 0,
-      columns: [
-        {
-          title: '用户ID',
-          key: 'uid',
-          sortable: true,
-          width: 80,
-        },
-        {
-          title: '昵称',
-          key: 'nickname',
-          minWidth: 150,
-        },
-        {
-          title: '金额',
-          minWidth: 150,
-          slot: 'number',
-          // render: (h, params) => {
-          //     return h('div', {
-          //         style: {
-          //             color: '#FF5722'
-          //         }
-          //     })
-          // }
-        },
-        {
-          title: '类型',
-          key: 'title',
-          minWidth: 100,
-        },
-        {
-          title: '备注',
-          key: 'mark',
-          minWidth: 150,
-        },
-        {
-          title: '创建时间',
-          key: 'add_time',
-          minWidth: 200,
-        },
-      ],
     };
   },
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -183,10 +166,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 搜索
     userSearchs() {
       this.formValidate.page = 1;
diff --git a/template/admin/src/pages/finance/financialRecords/recharge/index.vue b/template/admin/src/pages/finance/financialRecords/recharge/index.vue
index ee874f174..50ce54387 100644
--- a/template/admin/src/pages/finance/financialRecords/recharge/index.vue
+++ b/template/admin/src/pages/finance/financialRecords/recharge/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mb-16">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mb-16">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
@@ -9,20 +9,22 @@
         class="tabform"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex" justify="end">
-          <Col span="24" class="ivu-text-left">
-            <FormItem label="时间选择：">
-              <RadioGroup
+        <el-row :gutter="24" justify="end">
+          <el-col :span="24" class="ivu-text-left">
+            <el-form-item label="时间选择：">
+              <el-radio-group
                 v-model="formValidate.data"
                 type="button"
-                @on-change="selectChange(formValidate.data)"
+                @change="selectChange(formValidate.data)"
                 class="mr"
               >
-                <Radio :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{ item.text }}</Radio>
-              </RadioGroup>
+                <el-radio-button :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{
+                  item.text
+                }}</el-radio-button>
+              </el-radio-group>
               <DatePicker
                 :editable="false"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="daterange"
@@ -30,20 +32,20 @@
                 placeholder="请选择时间"
                 style="width: 200px"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col span="24" class="ivu-text-left">
-            <FormItem label="支付类型：">
-              <RadioGroup v-model="formValidate.paid" type="button" @on-change="selChange">
-                <Radio label="">全部</Radio>
-                <Radio label="1">已支付</Radio>
-                <Radio label="0">未支付</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col span="24" class="ivu-text-left">
-            <FormItem label="搜索：">
-              <Input
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="ivu-text-left">
+            <el-form-item label="支付类型：">
+              <el-radio-group v-model="formValidate.paid" type="button" @change="selChange">
+                <el-radio-button label="">全部</el-radio-button>
+                <el-radio-button label="1">已支付</el-radio-button>
+                <el-radio-button label="0">未支付</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="ivu-text-left">
+            <el-form-item label="搜索：">
+              <el-input
                 search
                 enter-button
                 @on-search="selChange"
@@ -53,50 +55,87 @@
                 style="width: 30%; display: inline-table"
                 class="mr"
               />
-              <Button v-auth="['export-userRecharge']" class="mr" icon="ios-share-outline" @click="exports"
-                >导出</Button
+              <el-button v-auth="['export-userRecharge']" class="mr" icon="ios-share-outline" @click="exports"
+                >导出</el-button
               >
               <!--                            <span class="Refresh">刷新</span><Icon type="ios-refresh" />-->
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-    </Card>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
     <cards-data :cardLists="cardLists" v-if="cardLists.length >= 0"></cards-data>
-    <Card :bordered="false" dis-hover>
+    <el-card :bordered="false" shadow="never">
       <div>充值记录列表</div>
-      <Table
-        ref="table"
-        :columns="columns"
-        :data="tabList"
-        class="ivu-mt"
-        :loading="loading"
-        no-data-text="暂无数据"
-        no-filtered-data-text="暂无筛选结果"
-      >
-        <template slot-scope="{ row, index }" slot="right">
-          <a
-            href="javascript:void(0);"
-            v-if="row.refund_price <= 0 && row.paid && row.recharge_type != 'system'"
-            @click="refund(row)"
-            >退款</a
-          >
-          <!--                    <Divider type="vertical"  v-if="row.paid"/>-->
-          <a href="javascript:void(0);" v-if="row.paid === 0" @click="del(row, '此条充值记录', index)">删除</a>
-          <span class="refund" v-if="row.refund_price > 0">已退款</span>
-        </template>
-      </Table>
+      <el-table ref="table" :data="tabList" class="ivu-mt" :loading="loading" empty-text="暂无数据"
+        ><el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="头像" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.avatar ? scope.row.avatar : require('../../../../assets/images/moren.jpg')" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户昵称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单号" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.order_id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="支付金额" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否支付" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.paid_type }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="充值类型" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row._recharge_type }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="支付时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row._pay_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a
+              href="javascript:void(0);"
+              v-if="scope.row.refund_price <= 0 && scope.row.paid && scope.row.recharge_type != 'system'"
+              @click="refund(scope.row)"
+              >退款</a
+            >
+            <!--                    <el-divider direction="vertical"  v-if="scope.row.paid"/>-->
+            <a href="javascript:void(0);" v-if="scope.row.paid === 0" @click="del(scope.row, '此条充值记录', index)"
+              >删除</a
+            >
+            <span class="refund" v-if="scope.row.refund_price > 0">已退款</span>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!-- 退款表单-->
     <edit-from ref="edits" :FromData="FromData" @submitFail="submitFail"></edit-from>
   </div>
@@ -129,81 +168,6 @@ export default {
       total: 0,
       cardLists: [],
       loading: false,
-      columns: [
-        {
-          title: 'ID',
-          key: 'id',
-          sortable: true,
-          width: 80,
-        },
-        {
-          title: '头像',
-          key: 'avatar',
-          minWidth: 80,
-          render: (h, params) => {
-            return h('viewer', [
-              h(
-                'div',
-                {
-                  style: {
-                    width: '36px',
-                    height: '36px',
-                    borderRadius: '4px',
-                    cursor: 'pointer',
-                  },
-                },
-                [
-                  h('img', {
-                    attrs: {
-                      src: params.row.avatar ? params.row.avatar : require('../../../../assets/images/moren.jpg'),
-                    },
-                    style: {
-                      width: '100%',
-                      height: '100%',
-                    },
-                  }),
-                ],
-              ),
-            ]);
-          },
-        },
-        {
-          title: '用户昵称',
-          key: 'nickname',
-          minWidth: 150,
-        },
-        {
-          title: '订单号',
-          key: 'order_id',
-          minWidth: 150,
-        },
-        {
-          title: '支付金额',
-          key: 'price',
-          minWidth: 110,
-        },
-        {
-          title: '是否支付',
-          key: 'paid_type',
-          minWidth: 110,
-        },
-        {
-          title: '充值类型',
-          key: '_recharge_type',
-          minWidth: 100,
-        },
-        {
-          title: '支付时间',
-          key: '_pay_time',
-          minWidth: 120,
-        },
-        {
-          title: '操作',
-          slot: 'right',
-          fixed: 'right',
-          minWidth: 100,
-        },
-      ],
       tabList: [],
       fromList: {
         title: '选择时间',
@@ -224,7 +188,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -310,10 +274,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 小方块
     getUserRecharge() {
       userRechargeApi({
diff --git a/template/admin/src/pages/finance/userExtract/index.vue b/template/admin/src/pages/finance/userExtract/index.vue
index e22038c87..e71c6f077 100644
--- a/template/admin/src/pages/finance/userExtract/index.vue
+++ b/template/admin/src/pages/finance/userExtract/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mb-16">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mb-16">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
@@ -9,20 +9,22 @@
         class="tabform"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex">
-          <Col span="24">
-            <FormItem label="时间选择：">
-              <RadioGroup
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="时间选择：">
+              <el-radio-group
                 v-model="formValidate.data"
                 type="button"
-                @on-change="selectChange(formValidate.data)"
+                @change="selectChange(formValidate.data)"
                 class="mr"
               >
-                <Radio :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{ item.text }}</Radio>
-              </RadioGroup>
+                <el-radio-button :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{
+                  item.text
+                }}</el-radio-button>
+              </el-radio-group>
               <DatePicker
                 :editable="false"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="daterange"
@@ -30,30 +32,30 @@
                 placeholder="请选择时间"
                 style="width: 200px"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="提现状态：">
-              <RadioGroup type="button" v-model="formValidate.status" class="mr15" @on-change="selChange">
-                <Radio :label="itemn.value" v-for="(itemn, indexn) in treeData.withdrawal" :key="indexn">{{
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="提现状态：">
+              <el-radio-group type="button" v-model="formValidate.status" class="mr15" @change="selChange">
+                <el-radio-button :label="itemn.value" v-for="(itemn, indexn) in treeData.withdrawal" :key="indexn">{{
                   itemn.title
-                }}</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="提现方式：">
-              <RadioGroup type="button" v-model="formValidate.extract_type" class="mr15" @on-change="selChange">
-                <Radio :label="itemn.value" v-for="(itemn, indexn) in treeData.payment" :key="indexn">{{
+                }}</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="提现方式：">
+              <el-radio-group type="button" v-model="formValidate.extract_type" class="mr15" @change="selChange">
+                <el-radio-button :label="itemn.value" v-for="(itemn, indexn) in treeData.payment" :key="indexn">{{
                   itemn.title
-                }}</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="搜索：">
+                }}</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="搜索：">
               <div class="acea-row row-middle">
-                <Input
+                <el-input
                   search
                   enter-button
                   @on-search="selChange"
@@ -64,94 +66,122 @@
                 />
                 <router-link :to="$routeProStr + '/finance/finance/commission'" class="ml20">佣金记录</router-link>
               </div>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-    </Card>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
     <cards-data :cardLists="cardLists" v-if="extractStatistics"></cards-data>
-    <Card :bordered="false" dis-hover>
-      <Table
-        ref="table"
-        :columns="columns"
-        :data="tabList"
-        class="ivu-mt"
-        :loading="loading"
-        no-data-text="暂无数据"
-        no-filtered-data-text="暂无筛选结果"
-      >
-        <template slot-scope="{ row }" slot="nickname">
-          <div>
-            用户昵称: {{ row.nickname }} <br />
-            用户id:{{ row.uid }}
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="extract_price">
-          <div>{{ row.extract_price }}</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="add_time">
-          <span> {{ row.add_time | formatDate }}</span>
-        </template>
-        <template slot-scope="{ row }" slot="extract_type">
-          <div class="type" v-if="row.extract_type === 'bank'">
-            <div class="item">姓名:{{ row.real_name }}</div>
-            <div class="item">银行卡号:{{ row.bank_code }}</div>
-            <div class="item">银行开户地址:{{ row.bank_address }}</div>
-          </div>
-          <div class="type" v-if="row.extract_type === 'weixin'">
-            <div class="item">昵称:{{ row.nickname }}</div>
-            <div class="item">微信号:{{ row.wechat }}</div>
-          </div>
-          <div class="type" v-if="row.extract_type === 'alipay'">
-            <div class="item">姓名:{{ row.real_name }}</div>
-            <div class="item">支付宝号:{{ row.alipay_code }}</div>
-          </div>
-          <div class="type" v-if="row.extract_type === 'balance'">
-            <div class="item">姓名:{{ row.real_name }}</div>
-            <div class="item">提现方式：佣金转入余额</div>
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="qrcode_url">
-          <div class="tabBox_img" v-viewer v-if="row.extract_type === 'weixin' || row.extract_type === 'alipay'">
-            <img v-lazy="row.qrcode_url" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          <div class="status" v-if="row.status === 0">
-            <div class="statusVal">申请中</div>
+    <el-card :bordered="false" shadow="never">
+      <el-table ref="table" :data="tabList" class="ivu-mt" :loading="loading" empty-text="暂无数据">
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户信息" min-width="130">
+          <template slot-scope="scope">
             <div>
-              <Button type="error" icon="md-close" size="small" class="item" @click="invalid(row)">驳回</Button>
-              <Button type="info" icon="md-checkmark" size="small" class="item" @click="adopt(row, '审核通过', index)"
-                >通过</Button
-              >
+              用户昵称: {{ scope.row.nickname }} <br />
+              用户id:{{ scope.row.uid }}
             </div>
-          </div>
-          <div class="statusVal" v-if="row.status === 1">提现通过</div>
-          <div class="statusVal" v-if="row.status === -1">提现未通过<br />未通过原因：{{ row.fail_msg }}</div>
-        </template>
-        <template slot-scope="{ row }" slot="createModalFrame">
-          <a href="javascript:void(0);" @click="edit(row)">编辑</a>
-        </template>
-      </Table>
+          </template>
+        </el-table-column>
+        <el-table-column label="提现金额" min-width="130">
+          <template slot-scope="scope">
+            <div>{{ scope.row.extract_price }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="提现方式" min-width="130">
+          <template slot-scope="scope">
+            <div class="type" v-if="scope.row.extract_type === 'bank'">
+              <div class="item">姓名:{{ scope.row.real_name }}</div>
+              <div class="item">银行卡号:{{ scope.row.bank_code }}</div>
+              <div class="item">银行开户地址:{{ scope.row.bank_address }}</div>
+            </div>
+            <div class="type" v-if="scope.row.extract_type === 'weixin'">
+              <div class="item">昵称:{{ scope.row.nickname }}</div>
+              <div class="item">微信号:{{ scope.row.wechat }}</div>
+            </div>
+            <div class="type" v-if="scope.row.extract_type === 'alipay'">
+              <div class="item">姓名:{{ scope.row.real_name }}</div>
+              <div class="item">支付宝号:{{ scope.row.alipay_code }}</div>
+            </div>
+            <div class="type" v-if="scope.row.extract_type === 'balance'">
+              <div class="item">姓名:{{ scope.row.real_name }}</div>
+              <div class="item">提现方式：佣金转入余额</div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="收款码" min-width="90">
+          <template slot-scope="scope">
+            <div
+              class="tabBox_img"
+              v-viewer
+              v-if="scope.row.extract_type === 'weixin' || scope.row.extract_type === 'alipay'"
+            >
+              <img v-lazy="scope.row.qrcode_url" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="添加时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time | formatDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.mark }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核状态" min-width="130">
+          <template slot-scope="scope">
+            <div class="status" v-if="scope.row.status === 0">
+              <div class="statusVal">申请中</div>
+              <div>
+                <el-button type="error" icon="md-close" size="small" class="item" @click="invalid(scope.row)"
+                  >驳回</el-button
+                >
+                <el-button
+                  type="info"
+                  icon="md-checkmark"
+                  size="small"
+                  class="item"
+                  @click="adopt(scope.row, '审核通过', index)"
+                  >通过</el-button
+                >
+              </div>
+            </div>
+            <div class="statusVal" v-if="scope.row.status === 1">提现通过</div>
+            <div class="statusVal" v-if="scope.row.status === -1">
+              提现未通过<br />未通过原因：{{ scope.row.fail_msg }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a href="javascript:void(0);" @click="edit(scope.row)">编辑</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
 
     <!-- 编辑表单-->
     <edit-from ref="edits" :FromData="FromData" @submitFail="submitFail"></edit-from>
     <!-- 拒绝通过-->
     <Modal v-model="modals" scrollable closable title="未通过原因" :mask-closable="false">
-      <Input v-model="fail_msg.message" type="textarea" :rows="4" placeholder="请输入未通过原因" />
+      <el-input v-model="fail_msg.message" type="textarea" :rows="4" placeholder="请输入未通过原因" />
       <div slot="footer">
-        <Button type="primary" size="large" long :loading="modal_loading" @click="oks">确定</Button>
+        <el-button type="primary" size="large" long :loading="modal_loading" @click="oks">确定</el-button>
       </div>
     </Modal>
   </div>
@@ -309,7 +339,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -406,10 +436,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 编辑
     edit(row) {
       cashEditApi(row.id)
diff --git a/template/admin/src/pages/index/components/baseInfo.vue b/template/admin/src/pages/index/components/baseInfo.vue
index f2e2e23f1..d99066890 100644
--- a/template/admin/src/pages/index/components/baseInfo.vue
+++ b/template/admin/src/pages/index/components/baseInfo.vue
@@ -1,11 +1,11 @@
 <template>
-  <Row :gutter="24">
-    <Col v-bind="grid" class="ivu-mb" v-for="(item, index) in infoList" :key="index">
-      <Card :bordered="false" dis-hover :padding="12">
-        <p slot="title">
+  <el-row :gutter="24">
+    <el-col v-bind="grid" class="ivu-mb" v-for="(item, index) in infoList" :key="index">
+      <el-card shadow="never" :padding="12">
+        <p slot="header">
           <span v-text="item.title"></span>
+          <el-tag style="float: right;" type="success">{{ item.date }}</el-tag>
         </p>
-        <Tag slot="extra" color="green">{{ item.date }}</Tag>
         <div>
           <!--<Numeral :value="item.yesterday" style=""/>-->
           <div class="number">{{ item.today }}</div>
@@ -30,17 +30,17 @@
               />
             </span> -->
           </div>
-          <Divider style="margin: 8px 0" />
+          <el-divider style="margin: 8px 0" />
           <div>
-            <Row>
-              <Col span="12" v-text="item.total_name"></Col>
-              <Col span="12" class="ivu-text-right">{{ item.total }}</Col>
-            </Row>
+            <el-row>
+              <el-col :span="12" v-text="item.total_name"></el-col>
+              <el-col :span="12" class="ivu-text-right">{{ item.total }}</el-col>
+            </el-row>
           </div>
         </div>
-      </Card>
-    </Col>
-  </Row>
+      </el-card>
+    </el-col>
+  </el-row>
 </template>
 <script>
 import echarts from 'echarts';
@@ -51,10 +51,10 @@ export default {
       infoList: [],
       grid: {
         xl: 6,
-        lg: 12,
+        lg: 6,
         md: 12,
         sm: 12,
-        xs: 24,
+        xs: 12,
       },
       excessStyle: {
         color: '#f56a00',
diff --git a/template/admin/src/pages/index/components/gridMenu.vue b/template/admin/src/pages/index/components/gridMenu.vue
index 4f825fc30..5db1983cb 100644
--- a/template/admin/src/pages/index/components/gridMenu.vue
+++ b/template/admin/src/pages/index/components/gridMenu.vue
@@ -1,70 +1,70 @@
 <template>
-  <Row :gutter="24" class="dashboard-console-grid">
-    <Col v-bind="grid" class="ivu-mb" v-auth="['admin-user-user-index']">
-      <Card :bordered="false">
+  <el-row :gutter="24" class="dashboard-console-grid">
+    <el-col v-bind="grid" class="ivu-mb" v-auth="['admin-user-user-index']">
+      <el-card shadow="never">
         <router-link :to="{ path: $routeProStr + '/user/list' }">
           <Icon type="md-people" color="#69c0ff" />
           <p>用户管理</p>
         </router-link>
-      </Card>
-    </Col>
-    <Col v-bind="grid" class="ivu-mb" v-auth="['setting-system-config']">
-      <Card :bordered="false">
+      </el-card>
+    </el-col>
+    <el-col v-bind="grid" class="ivu-mb" v-auth="['setting-system-config']">
+      <el-card shadow="never">
         <router-link :to="{ path: $routeProStr + '/setting/system_config' }">
           <Icon type="md-settings" color="#95de64" />
           <p>系统设置</p>
         </router-link>
-      </Card>
-    </Col>
-    <Col v-bind="grid" class="ivu-mb" v-auth="['admin-store-storeProuduct-index']">
-      <Card :bordered="false">
+      </el-card>
+    </el-col>
+    <el-col v-bind="grid" class="ivu-mb" v-auth="['admin-store-storeProuduct-index']">
+      <el-card shadow="never">
         <router-link :to="{ path: $routeProStr + '/product/product_list' }">
           <Icon type="md-cart" color="#ff9c6e" />
           <p>商品</p>
         </router-link>
-      </Card>
-    </Col>
-    <Col v-bind="grid" class="ivu-mb" v-auth="['admin-order-storeOrder-index']">
-      <Card :bordered="false">
+      </el-card>
+    </el-col>
+    <el-col v-bind="grid" class="ivu-mb" v-auth="['admin-order-storeOrder-index']">
+      <el-card shadow="never">
         <router-link :to="{ path: $routeProStr + '/order/list' }">
           <Icon type="md-clipboard" color="#b37feb" />
           <p>订单管理</p>
         </router-link>
-      </Card>
-    </Col>
-    <Col v-bind="grid" class="ivu-mb" v-auth="['setting-sms']">
-      <Card :bordered="false">
+      </el-card>
+    </el-col>
+    <el-col v-bind="grid" class="ivu-mb" v-auth="['setting-sms']">
+      <el-card shadow="never">
         <router-link :to="{ path: $routeProStr + '/setting/sms/sms_config/index' }">
           <Icon type="md-mail" color="#ffd666" />
           <p>短信配置</p>
         </router-link>
-      </Card>
-    </Col>
-    <Col v-bind="grid" class="ivu-mb" v-auth="['cms-article-index']">
-      <Card :bordered="false">
+      </el-card>
+    </el-col>
+    <el-col v-bind="grid" class="ivu-mb" v-auth="['cms-article-index']">
+      <el-card shadow="never">
         <router-link :to="{ path: $routeProStr + '/cms/article/index' }">
           <Icon type="md-card" color="#5cdbd3" />
           <p>文章管理</p>
         </router-link>
-      </Card>
-    </Col>
-    <Col v-bind="grid" class="ivu-mb" v-auth="['agent-agent-manage']">
-      <Card :bordered="false">
+      </el-card>
+    </el-col>
+    <el-col v-bind="grid" class="ivu-mb" v-auth="['agent-agent-manage']">
+      <el-card shadow="never">
         <router-link :to="{ path: $routeProStr + '/agent/agent_manage/index' }">
           <Icon type="md-pricetags" color="#ff85c0" />
           <p>分销管理</p>
         </router-link>
-      </Card>
-    </Col>
-    <Col v-bind="grid" class="ivu-mb" v-auth="['marketing-store_coupon-index']">
-      <Card :bordered="false">
+      </el-card>
+    </el-col>
+    <el-col v-bind="grid" class="ivu-mb" v-auth="['marketing-store_coupon-index']">
+      <el-card shadow="never">
         <router-link :to="{ path: $routeProStr + '/marketing/store_coupon_issue/index' }">
           <Icon type="md-cash" color="#ffc069" />
           <p>优惠券</p>
         </router-link>
-      </Card>
-    </Col>
-  </Row>
+      </el-card>
+    </el-col>
+  </el-row>
 </template>
 <script>
 export default {
@@ -72,7 +72,7 @@ export default {
     return {
       grid: {
         xl: 3,
-        lg: 6,
+        lg: 3,
         md: 6,
         sm: 8,
         xs: 8,
diff --git a/template/admin/src/pages/index/components/userChart.vue b/template/admin/src/pages/index/components/userChart.vue
index fac61c8fb..c66257000 100644
--- a/template/admin/src/pages/index/components/userChart.vue
+++ b/template/admin/src/pages/index/components/userChart.vue
@@ -1,8 +1,8 @@
 <template>
   <div @resize="handleResize">
-    <Row :gutter="24">
-      <Col :xl="16" :lg="12" :md="24" :sm="24" :xs="24" class="ivu-mb dashboard-console-visit">
-        <Card :bordered="false" dis-hover>
+    <el-row :gutter="24">
+      <el-col :xl="16" :lg="12" :md="24" :sm="24" :xs="24" class="ivu-mb dashboard-console-visit">
+        <el-card :bordered="false" shadow="never">
           <div slot="title">
             <Avatar icon="ios-pulse" size="small" style="color: #1890ff; background-color: #e6f7ff" />
             <span class="ivu-pl-8">用户</span>
@@ -14,18 +14,18 @@
             :series="series"
             v-if="infoList && series.length !== 0"
           ></echarts-from>
-        </Card>
-      </Col>
-      <Col :xl="8" :lg="12" :md="24" :sm="24" :xs="24">
-        <Card :bordered="false" dis-hover class="dashboard-console-visit">
+        </el-card>
+      </el-col>
+      <el-col :xl="8" :lg="12" :md="24" :sm="24" :xs="24">
+        <el-card :bordered="false" shadow="never" class="dashboard-console-visit">
           <div slot="title">
             <Avatar icon="ios-analytics" size="small" style="color: #1890ff; background-color: #e6f7ff" />
             <span class="ivu-pl-8">购买用户统计</span>
           </div>
           <echarts-from ref="visitChart" :infoList="infoList" :echartsTitle="circle"></echarts-from>
-        </Card>
-      </Col>
-    </Row>
+        </el-card>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/index/components/visitChart.vue b/template/admin/src/pages/index/components/visitChart.vue
index 81959f9eb..769b6e3dd 100644
--- a/template/admin/src/pages/index/components/visitChart.vue
+++ b/template/admin/src/pages/index/components/visitChart.vue
@@ -1,23 +1,23 @@
 <template>
   <div @resize="handleResize">
-    <Row :gutter="24">
-      <Col san="24" class="ivu-mb">
-        <Card :bordered="false" dis-hover class="dashboard-console-visit">
+    <el-row :gutter="24">
+      <el-col san="24" class="ivu-mb">
+        <el-card :bordered="false" shadow="never" class="dashboard-console-visit">
           <div slot="title">
-            <Row type="flex" justify="center" align="middle">
-              <Col span="8">
+            <el-row  justify="center" align="middle">
+              <el-col :span="8">
                 <Avatar icon="ios-podium" size="small" style="color: #1890ff; background-color: #e6f7ff" />
                 <span class="ivu-pl-8">订单</span>
-              </Col>
-              <Col span="16" class="ivu-text-right">
-                <RadioGroup v-model="visitDate" type="button" class="ivu-mr-8" @on-change="handleChangeVisitType">
-                  <Radio label="thirtyday">30天</Radio>
-                  <Radio label="week">周</Radio>
-                  <Radio label="month">月</Radio>
-                  <Radio label="year">年</Radio>
-                </RadioGroup>
-              </Col>
-            </Row>
+              </el-col>
+              <el-col :span="16" class="ivu-text-right">
+                <el-radio-group v-model="visitDate" type="button" class="ivu-mr-8" @change="handleChangeVisitType">
+                  <el-radio label="thirtyday">30天</el-radio>
+                  <el-radio label="week">周</el-radio>
+                  <el-radio label="month">月</el-radio>
+                  <el-radio label="year">年</el-radio>
+                </el-radio-group>
+              </el-col>
+            </el-row>
           </div>
           <h4>订单量趋势</h4>
           <echarts-from
@@ -27,9 +27,9 @@
             v-if="infoList"
             :yAxisData="yAxisData"
           ></echarts-from>
-        </Card>
-      </Col>
-    </Row>
+        </el-card>
+      </el-col>
+    </el-row>
   </div>
 </template>
 <script>
diff --git a/template/admin/src/pages/index/hot-search.vue b/template/admin/src/pages/index/hot-search.vue
deleted file mode 100644
index 3d1d41c1e..000000000
--- a/template/admin/src/pages/index/hot-search.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-  <div>
-    <Row :gutter="24">
-      <Col span="12">
-        <NumberInfo total="23,378" sub-total="16.8" status="up">
-          <span slot="subTitle">
-            搜索用户数
-            <Tooltip content="指标说明" placement="top">
-              <Icon type="ios-information-circle-outline" />
-            </Tooltip>
-          </span>
-        </NumberInfo>
-        <div style="height: 50px" ref="searchUserChart"></div>
-      </Col>
-      <Col span="12">
-        <NumberInfo total="3.1" sub-total="8.5" status="down">
-          <span slot="subTitle">
-            人均搜索次数
-            <Tooltip content="指标说明" placement="top">
-              <Icon type="ios-information-circle-outline" />
-            </Tooltip>
-          </span>
-        </NumberInfo>
-        <div style="height: 50px" ref="searchCountChart"></div>
-      </Col>
-    </Row>
-    <div class="ivu-mt">
-      <search-table />
-    </div>
-  </div>
-</template>
-<script>
-import echarts from 'echarts';
-import searchTable from './search-table';
-
-export default {
-  components: { searchTable },
-  data() {
-    return {};
-  },
-  methods: {
-    handleSetSearchChart() {
-      this.searchUserChart = echarts.init(this.$refs.searchUserChart);
-      this.searchCountChart = echarts.init(this.$refs.searchCountChart);
-      const option = {
-        xAxis: {
-          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-          type: 'category',
-          show: false,
-        },
-        yAxis: {
-          show: false,
-          type: 'value',
-        },
-        series: [
-          {
-            data: [120, 300, 150, 350, 70, 210, 130],
-            type: 'line',
-            tooltip: true,
-            smooth: true,
-            symbol: 'none',
-            areaStyle: {
-              normal: {
-                opacity: 0.2,
-              },
-            },
-          },
-        ],
-        color: ['#1495EB', '#00CC66', '#F9D249', '#ff9900', '#9860DF'],
-        grid: {
-          left: -60,
-          right: -20,
-          bottom: -20,
-          top: 0,
-          containLabel: true,
-        },
-        tooltip: {
-          trigger: 'axis',
-        },
-      };
-      this.searchUserChart.setOption(option);
-      this.searchCountChart.setOption(option);
-    },
-    handleResize() {
-      if (this.searchUserChart) this.searchUserChart.resize();
-      if (this.searchCountChart) this.searchCountChart.resize();
-    },
-  },
-  mounted() {
-    this.handleSetSearchChart();
-  },
-  beforeDestroy() {
-    if (this.searchUserChart) {
-      this.searchUserChart.dispose();
-      this.searchUserChart = null;
-    }
-    if (this.searchCountChart) {
-      this.searchCountChart.dispose();
-      this.searchCountChart = null;
-    }
-  },
-};
-</script>
diff --git a/template/admin/src/pages/index/index.vue b/template/admin/src/pages/index/index.vue
index c896a5b45..9d71d9df5 100644
--- a/template/admin/src/pages/index/index.vue
+++ b/template/admin/src/pages/index/index.vue
@@ -18,12 +18,7 @@ import baseInfo from './components/baseInfo';
 import gridMenu from './components/gridMenu';
 import visitChart from './components/visitChart';
 import userChart from './components/userChart';
-import hotSearch from './hot-search';
-import userPreference from './user-preference';
 import { auth } from '@/api/system';
-import { Notice } from 'iview';
-import { getCookies, setCookies } from '@/libs/util';
-import { upgradeStatusApi } from '@/api/system';
 
 export default {
   name: 'index',
@@ -32,8 +27,6 @@ export default {
     gridMenu,
     visitChart,
     userChart,
-    hotSearch,
-    userPreference,
   },
   data() {
     return {
diff --git a/template/admin/src/pages/index/search-table.vue b/template/admin/src/pages/index/search-table.vue
deleted file mode 100644
index f2aaa92d7..000000000
--- a/template/admin/src/pages/index/search-table.vue
+++ /dev/null
@@ -1,451 +0,0 @@
-<template>
-  <div class="i-table-no-border">
-    <Table :columns="column" :data="dataWithPage" :loading="loading" size="small" @on-sort-change="handleSortChange">
-      <template slot-scope="{ row }" slot="keyword">
-        <a href="/" target="_blank">{{ row.keyword }}</a>
-      </template>
-      <template slot-scope="{ row }" slot="range">
-        {{ row.range }}%
-        <Trend :flag="row.status ? 'up' : 'down'" />
-      </template>
-    </Table>
-    <div class="ivu-text-right ivu-mt-8">
-      <Page size="small" :page-size="5" :total="limitData.length" :current.sync="current" @on-change="getData" />
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      current: 1,
-      size: 5,
-      loading: false,
-      sortType: 'normal', // 当前排序类型，可选值为：normal（默认） || asc（升序）|| desc（降序）
-      sortKey: '',
-      column: [
-        {
-          title: '排名',
-          key: 'index',
-          width: 80,
-        },
-        {
-          title: '搜索关键词',
-          key: 'keyword',
-          slot: 'keyword',
-          minWidth: 120,
-        },
-        {
-          title: '用户数',
-          key: 'count',
-          sortable: 'custom',
-          minWidth: 100,
-        },
-        {
-          title: '周涨幅',
-          key: 'range',
-          slot: 'range',
-          width: 100,
-          align: 'right',
-          sortable: 'custom',
-        },
-      ],
-      data: [],
-    };
-  },
-  computed: {
-    limitData() {
-      let data = [...this.data];
-
-      // 动态计算排序类型
-      if (this.sortType === 'asc') {
-        data = data.sort((a, b) => {
-          return a[this.sortKey] > b[this.sortKey] ? 1 : -1;
-        });
-      }
-      if (this.sortType === 'desc') {
-        data = data.sort((a, b) => {
-          return a[this.sortKey] < b[this.sortKey] ? 1 : -1;
-        });
-      }
-
-      return data;
-    },
-    // 因为要动态计算总页数，所以还需要一个计算属性来返回最终给 Table 的 data
-    dataWithPage() {
-      const data = this.limitData;
-      const start = this.current * this.size - this.size;
-      const end = start + this.size;
-      return [...data].slice(start, end);
-    },
-  },
-  methods: {
-    // 点击排序按钮时触发
-    handleSortChange({ key, order }) {
-      // 将排序保存到数据
-      this.sortKey = key;
-      this.sortType = order;
-      this.current = 1;
-    },
-    getData() {
-      const data = [
-        {
-          index: 1,
-          keyword: '搜索关键词-0',
-          count: 257,
-          range: 69,
-          status: 0,
-        },
-        {
-          index: 2,
-          keyword: '搜索关键词-1',
-          count: 711,
-          range: 57,
-          status: 0,
-        },
-        {
-          index: 3,
-          keyword: '搜索关键词-2',
-          count: 766,
-          range: 24,
-          status: 1,
-        },
-        {
-          index: 4,
-          keyword: '搜索关键词-3',
-          count: 597,
-          range: 31,
-          status: 1,
-        },
-        {
-          index: 5,
-          keyword: '搜索关键词-4',
-          count: 133,
-          range: 30,
-          status: 0,
-        },
-        {
-          index: 6,
-          keyword: '搜索关键词-5',
-          count: 845,
-          range: 16,
-          status: 0,
-        },
-        {
-          index: 7,
-          keyword: '搜索关键词-6',
-          count: 454,
-          range: 35,
-          status: 1,
-        },
-        {
-          index: 8,
-          keyword: '搜索关键词-7',
-          count: 884,
-          range: 96,
-          status: 1,
-        },
-        {
-          index: 9,
-          keyword: '搜索关键词-8',
-          count: 725,
-          range: 30,
-          status: 1,
-        },
-        {
-          index: 10,
-          keyword: '搜索关键词-9',
-          count: 778,
-          range: 46,
-          status: 0,
-        },
-        {
-          index: 11,
-          keyword: '搜索关键词-10',
-          count: 414,
-          range: 69,
-          status: 1,
-        },
-        {
-          index: 12,
-          keyword: '搜索关键词-11',
-          count: 927,
-          range: 41,
-          status: 0,
-        },
-        {
-          index: 13,
-          keyword: '搜索关键词-12',
-          count: 128,
-          range: 54,
-          status: 0,
-        },
-        {
-          index: 14,
-          keyword: '搜索关键词-13',
-          count: 169,
-          range: 77,
-          status: 0,
-        },
-        {
-          index: 15,
-          keyword: '搜索关键词-14',
-          count: 764,
-          range: 8,
-          status: 0,
-        },
-        {
-          index: 16,
-          keyword: '搜索关键词-15',
-          count: 178,
-          range: 23,
-          status: 1,
-        },
-        {
-          index: 17,
-          keyword: '搜索关键词-16',
-          count: 32,
-          range: 94,
-          status: 0,
-        },
-        {
-          index: 18,
-          keyword: '搜索关键词-17',
-          count: 183,
-          range: 34,
-          status: 1,
-        },
-        {
-          index: 19,
-          keyword: '搜索关键词-18',
-          count: 988,
-          range: 5,
-          status: 0,
-        },
-        {
-          index: 20,
-          keyword: '搜索关键词-19',
-          count: 324,
-          range: 15,
-          status: 0,
-        },
-        {
-          index: 21,
-          keyword: '搜索关键词-20',
-          count: 832,
-          range: 42,
-          status: 0,
-        },
-        {
-          index: 22,
-          keyword: '搜索关键词-21',
-          count: 336,
-          range: 99,
-          status: 0,
-        },
-        {
-          index: 23,
-          keyword: '搜索关键词-22',
-          count: 23,
-          range: 1,
-          status: 1,
-        },
-        {
-          index: 24,
-          keyword: '搜索关键词-23',
-          count: 557,
-          range: 84,
-          status: 0,
-        },
-        {
-          index: 25,
-          keyword: '搜索关键词-24',
-          count: 894,
-          range: 62,
-          status: 1,
-        },
-        {
-          index: 26,
-          keyword: '搜索关键词-25',
-          count: 610,
-          range: 73,
-          status: 1,
-        },
-        {
-          index: 27,
-          keyword: '搜索关键词-26',
-          count: 810,
-          range: 1,
-          status: 1,
-        },
-        {
-          index: 28,
-          keyword: '搜索关键词-27',
-          count: 83,
-          range: 13,
-          status: 1,
-        },
-        {
-          index: 29,
-          keyword: '搜索关键词-28',
-          count: 734,
-          range: 11,
-          status: 1,
-        },
-        {
-          index: 30,
-          keyword: '搜索关键词-29',
-          count: 6,
-          range: 97,
-          status: 0,
-        },
-        {
-          index: 31,
-          keyword: '搜索关键词-30',
-          count: 112,
-          range: 88,
-          status: 0,
-        },
-        {
-          index: 32,
-          keyword: '搜索关键词-31',
-          count: 978,
-          range: 92,
-          status: 0,
-        },
-        {
-          index: 33,
-          keyword: '搜索关键词-32',
-          count: 674,
-          range: 86,
-          status: 0,
-        },
-        {
-          index: 34,
-          keyword: '搜索关键词-33',
-          count: 632,
-          range: 42,
-          status: 1,
-        },
-        {
-          index: 35,
-          keyword: '搜索关键词-34',
-          count: 0,
-          range: 23,
-          status: 1,
-        },
-        {
-          index: 36,
-          keyword: '搜索关键词-35',
-          count: 965,
-          range: 94,
-          status: 0,
-        },
-        {
-          index: 37,
-          keyword: '搜索关键词-36',
-          count: 758,
-          range: 86,
-          status: 0,
-        },
-        {
-          index: 38,
-          keyword: '搜索关键词-37',
-          count: 857,
-          range: 34,
-          status: 0,
-        },
-        {
-          index: 39,
-          keyword: '搜索关键词-38',
-          count: 72,
-          range: 95,
-          status: 0,
-        },
-        {
-          index: 40,
-          keyword: '搜索关键词-39',
-          count: 69,
-          range: 74,
-          status: 1,
-        },
-        {
-          index: 41,
-          keyword: '搜索关键词-40',
-          count: 553,
-          range: 21,
-          status: 1,
-        },
-        {
-          index: 42,
-          keyword: '搜索关键词-41',
-          count: 430,
-          range: 2,
-          status: 1,
-        },
-        {
-          index: 43,
-          keyword: '搜索关键词-42',
-          count: 86,
-          range: 23,
-          status: 1,
-        },
-        {
-          index: 44,
-          keyword: '搜索关键词-43',
-          count: 626,
-          range: 2,
-          status: 1,
-        },
-        {
-          index: 45,
-          keyword: '搜索关键词-44',
-          count: 266,
-          range: 8,
-          status: 1,
-        },
-        {
-          index: 46,
-          keyword: '搜索关键词-45',
-          count: 943,
-          range: 61,
-          status: 0,
-        },
-        {
-          index: 47,
-          keyword: '搜索关键词-46',
-          count: 417,
-          range: 17,
-          status: 1,
-        },
-        {
-          index: 48,
-          keyword: '搜索关键词-47',
-          count: 151,
-          range: 92,
-          status: 1,
-        },
-        {
-          index: 49,
-          keyword: '搜索关键词-48',
-          count: 197,
-          range: 63,
-          status: 0,
-        },
-        {
-          index: 50,
-          keyword: '搜索关键词-49',
-          count: 578,
-          range: 18,
-          status: 1,
-        },
-      ];
-      this.total = data.length;
-      this.data = data;
-    },
-  },
-  mounted() {
-    this.getData();
-  },
-};
-</script>
diff --git a/template/admin/src/pages/index/user-gender.vue b/template/admin/src/pages/index/user-gender.vue
deleted file mode 100644
index 93b7118a0..000000000
--- a/template/admin/src/pages/index/user-gender.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<template>
-  <div class="dashboard-console-user-gender">
-    <Row type="flex" justify="center" align="middle">
-      <Col span="8" class="ivu-text-center" style="color: #3399ff">
-        <Avatar icon="ios-man" size="large" style="background-color: #d6f0ff; color: #3399ff" />
-        <div class="ivu-mt-8">男性 65%</div>
-      </Col>
-      <Col span="8" class="ivu-text-center" style="color: #be6be0">
-        <Avatar icon="ios-woman" size="large" style="color: #be6be0; background-color: #fdf0ff" />
-        <div class="ivu-mt-8">女性 25%</div>
-      </Col>
-      <Col span="8" class="ivu-text-center" style="color: #babdc3">
-        <Avatar icon="md-man" size="large" style="color: #babdc3; background-color: #e6edf5" />
-        <div class="ivu-mt-8">未知 10%</div>
-      </Col>
-    </Row>
-    <div class="dashboard-console-user-gender-grid ivu-mt-8">
-      <Grid center square :col="25" padding="2px" :border="false">
-        <GridItem v-for="item in 100" :key="item">
-          <span style="background-color: #3399ff" v-if="item <= 65"></span>
-          <span style="background-color: #be6be0" v-else-if="item <= 90"></span>
-          <span style="background-color: #babdc3" v-else></span>
-        </GridItem>
-      </Grid>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {};
-  },
-};
-</script>
-<style lang="less">
-.dashboard-console-user-gender {
-  &-grid {
-    .ivu-grid-item-main {
-      height: 100%;
-    }
-    span {
-      display: block;
-      height: 100%;
-      border-radius: 2px;
-      opacity: 0.75;
-    }
-  }
-}
-</style>
diff --git a/template/admin/src/pages/index/user-preference.vue b/template/admin/src/pages/index/user-preference.vue
deleted file mode 100644
index ca691e38f..000000000
--- a/template/admin/src/pages/index/user-preference.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-  <div>
-    <div style="height: 200px">
-      <user-gender />
-    </div>
-    <div style="height: 200px">
-      <div class="dashboard-console-user-preference"></div>
-    </div>
-  </div>
-</template>
-<script>
-import userGender from './user-gender';
-export default {
-  components: { userGender },
-};
-</script>
-<style lang="less">
-.dashboard-console-user-preference {
-  height: 100%;
-  //background-image: url("../../../assets/images/user-preference.png");
-  background-repeat: no-repeat;
-  background-size: cover;
-  background-position: center;
-}
-</style>
diff --git a/template/admin/src/pages/kefu/appChat/feedback.vue b/template/admin/src/pages/kefu/appChat/feedback.vue
index 129176d9e..7c2105f0c 100644
--- a/template/admin/src/pages/kefu/appChat/feedback.vue
+++ b/template/admin/src/pages/kefu/appChat/feedback.vue
@@ -13,27 +13,27 @@
           <div class="ft" v-text="notice"></div>
         </div>
         <div>
-          <Form :model="formItem" ref="formItem" class="pl15" :rules="ruleValidate">
-            <FormItem prop="rela_name">
-              <Input v-model="formItem.rela_name" placeholder="请输入您的姓名"></Input>
-            </FormItem>
-            <FormItem prop="phone">
-              <Input v-model="formItem.phone" placeholder="请输入您的联系电话"></Input>
-            </FormItem>
-            <FormItem prop="content">
-              <Input v-model="formItem.content" class="mb10" type="textarea" placeholder="请输入留言内容"></Input>
-            </FormItem>
-            <FormItem>
-              <Button type="primary" @click="handleSubmit('formItem')" style="width: 100%">提交留言</Button>
-            </FormItem>
-          </Form>
+          <el-form :model="formItem" ref="formItem" class="pl15" :rules="ruleValidate">
+            <el-form-item prop="rela_name">
+              <el-input v-model="formItem.rela_name" placeholder="请输入您的姓名"></el-input>
+            </el-form-item>
+            <el-form-item prop="phone">
+              <el-input v-model="formItem.phone" placeholder="请输入您的联系电话"></el-input>
+            </el-form-item>
+            <el-form-item prop="content">
+              <el-input v-model="formItem.content" class="mb10" type="textarea" placeholder="请输入留言内容"></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="handleSubmit('formItem')" style="width: 100%">提交留言</el-button>
+            </el-form-item>
+          </el-form>
         </div>
       </div>
       <div class="sure" v-if="isShow">
         <div class="sure-yuan"><Icon type="md-checkmark" color="#fff" size="30" /></div>
         <div class="sp1 mb10">提交成功</div>
         <div class="sp2 mb30">您的信息提交成功，我们会尽快与您取得联系！</div>
-        <Button type="primary" @click="close">好的</Button>
+        <el-button type="primary" @click="close">好的</el-button>
       </div>
     </div>
     <div class="maskModel" @touchmove.prevent v-show="change === true"></div>
diff --git a/template/admin/src/pages/kefu/appChat/mobile/feedback.vue b/template/admin/src/pages/kefu/appChat/mobile/feedback.vue
index dc834affa..38a0a00c5 100644
--- a/template/admin/src/pages/kefu/appChat/mobile/feedback.vue
+++ b/template/admin/src/pages/kefu/appChat/mobile/feedback.vue
@@ -10,15 +10,15 @@
     <div class="main">
       <div class="title">我要反馈</div>
       <div class="input-box">
-        <Input type="text" placeholder="请输入您的姓名" v-model="name" />
+        <el-input type="text" placeholder="请输入您的姓名" v-model="name" />
       </div>
       <div class="input-box">
-        <Input type="text" placeholder="请输入您的联系电话" v-model="phone" />
+        <el-input type="text" placeholder="请输入您的联系电话" v-model="phone" />
       </div>
       <div class="input-box">
-        <Input type="textarea" placeholder="请填写内容" v-model="con" />
+        <el-input type="textarea" placeholder="请填写内容" v-model="con" />
       </div>
-      <Button class="sub_btn" @click="subMit" :disabled="isDisabled">提交</Button>
+      <el-button class="sub_btn" @click="subMit" :disabled="isDisabled">提交</el-button>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/pages/kefu/appChat/mobile/index.vue b/template/admin/src/pages/kefu/appChat/mobile/index.vue
index c8065052b..8210ff6d9 100644
--- a/template/admin/src/pages/kefu/appChat/mobile/index.vue
+++ b/template/admin/src/pages/kefu/appChat/mobile/index.vue
@@ -106,7 +106,7 @@
         </Upload>
       </div>
       <div class="input-box">
-        <Input v-model="con" placeholder="请输入内容" />
+        <el-input v-model="con" placeholder="请输入内容" />
         <span class="iconfont iconfasong" @click="sendText" :class="{ isSend: isSend }"></span>
       </div>
       <div class="emoji" @click="openBox(1)"><span class="iconfont iconbiaoqing2"></span></div>
diff --git a/template/admin/src/pages/kefu/components/words.vue b/template/admin/src/pages/kefu/components/words.vue
index 23426d007..6198a41c2 100644
--- a/template/admin/src/pages/kefu/components/words.vue
+++ b/template/admin/src/pages/kefu/components/words.vue
@@ -19,7 +19,7 @@
             </div>
           </div>
           <div class="input-box">
-            <Input v-model="wordsData.searchTxt" placeholder="搜索快捷回复" :search="true" @on-search="bindSearch" />
+            <el-input v-model="wordsData.searchTxt" placeholder="搜索快捷回复" :search="true" @on-search="bindSearch" />
           </div>
         </div>
         <div class="scroll-box">
@@ -67,12 +67,12 @@
         <span class="iconfont iconcha" @click.stop="closeCate"></span>
       </div>
       <div class="input-box">
-        <Input class="noinput" v-model="cateData.name" placeholder="请输入分组名称" />
+        <el-input class="noinput" v-model="cateData.name" placeholder="请输入分组名称" />
       </div>
       <div class="input-box">
-        <Input class="noinput" v-model="cateData.sort" placeholder="请输入分组排序" />
+        <el-input class="noinput" v-model="cateData.sort" placeholder="请输入分组排序" />
       </div>
-      <Button @click.stop="cateConfirm" class="subBtn" type="primary" :disabled="cateStatus">确定</Button>
+      <el-button @click.stop="cateConfirm" class="subBtn" type="primary" :disabled="cateStatus">确定</el-button>
     </Modal>
     <!-- 添加话术  -->
     <Modal
@@ -88,17 +88,17 @@
         <span class="iconfont iconcha" @click.stop="closeMsgBox"></span>
       </div>
       <div class="input-box">
-        <Input class="noinput" v-model="msgData.title" placeholder="请输入标题名称 (选填)" />
+        <el-input class="noinput" v-model="msgData.title" placeholder="请输入标题名称 (选填)" />
       </div>
       <div class="input-box text-area">
-        <Input class="noinput" :rows="4" type="textarea" v-model="msgData.message" placeholder="请输入您的话术" />
+        <el-input class="noinput" :rows="4" type="textarea" v-model="msgData.message" placeholder="请输入您的话术" />
       </div>
       <div class="input-box">
-        <Select v-model="msgData.msgCateId">
-          <Option v-for="item in selectData" :value="item.id" :key="item.value">{{ item.name }}</Option>
-        </Select>
+        <el-select v-model="msgData.msgCateId">
+          <el-option v-for="item in selectData" :value="item.id" :key="item.value" :label="item.name"></el-option>
+        </el-select>
       </div>
-      <Button @click.stop="msgConfirm" class="subBtn" type="primary" :disabled="msgStatus">确定</Button>
+      <el-button @click.stop="msgConfirm" class="subBtn" type="primary" :disabled="msgStatus">确定</el-button>
     </Modal>
     <!-- 编辑弹窗  -->
     <div class="edit-box" v-if="isWordShow">
@@ -107,7 +107,7 @@
           {{ wordsTabCur ? '个人库' : '公共库' }}<span @click.stop="isWordShow = false">完成</span>
         </div>
         <div class="input-box noinput">
-          <Input v-model="wordsData.searchTxt" placeholder="搜索快捷回复" :search="true" @on-search="bindSearch" />
+          <el-input v-model="wordsData.searchTxt" placeholder="搜索快捷回复" :search="true" @on-search="bindSearch" />
         </div>
       </div>
       <div class="scroll-box">
diff --git a/template/admin/src/pages/kefu/index.vue b/template/admin/src/pages/kefu/index.vue
index 1cb469f13..d878796ac 100644
--- a/template/admin/src/pages/kefu/index.vue
+++ b/template/admin/src/pages/kefu/index.vue
@@ -14,17 +14,17 @@
             <div class="page-account-top">
               <div class="page-account-top-logo">客服登录</div>
             </div>
-            <Form ref="formInline" :model="formInline" :rules="ruleInline" @keyup.enter="handleSubmit('formInline')">
-              <FormItem prop="username">
-                <Input type="text" v-model="formInline.username" placeholder="请输入用户名" size="large" />
-              </FormItem>
-              <FormItem prop="password">
-                <Input type="password" v-model="formInline.password" placeholder="请输入密码" size="large" />
-              </FormItem>
-              <FormItem>
-                <Button type="primary" long size="large" @click="handleSubmit('formInline')" class="btn">登录 </Button>
-              </FormItem>
-            </Form>
+            <el-form ref="formInline" :model="formInline" :rules="ruleInline" @keyup.enter="handleSubmit('formInline')">
+              <el-form-item prop="username">
+                <el-input type="text" v-model="formInline.username" placeholder="请输入用户名" size="large" />
+              </el-form-item>
+              <el-form-item prop="password">
+                <el-input type="password" v-model="formInline.password" placeholder="请输入密码" size="large" />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" long size="large" @click="handleSubmit('formInline')" class="btn">登录 </el-button>
+              </el-form-item>
+            </el-form>
             <div class="qh_box" v-if="!isMobile" @click="bindScan"><span class="iconfont iconerweima2"></span></div>
           </div>
           <div :style="{ display: loginType ? 'block' : 'none' }">
@@ -35,7 +35,7 @@
               <div class="qrcode" ref="qrCodeUrl"></div>
               <div class="rxpired-box" v-show="rxpired">
                 <p>已过期</p>
-                <Button type="primary" @click="bindRefresh">点击刷新</Button>
+                <el-button type="primary" @click="bindRefresh">点击刷新</el-button>
               </div>
             </div>
             <div class="qh_box" @click="loginType = 0"><span class="iconfont iconzhanghaomima"></span></div>
diff --git a/template/admin/src/pages/kefu/mobile/chat_list.vue b/template/admin/src/pages/kefu/mobile/chat_list.vue
index ff0081625..a9a8cacbb 100644
--- a/template/admin/src/pages/kefu/mobile/chat_list.vue
+++ b/template/admin/src/pages/kefu/mobile/chat_list.vue
@@ -39,7 +39,7 @@
         </div>
       </div>
       <div class="search-box">
-        <Input v-model="searchTxt" placeholder="搜索用户名称" @on-enter="bindSearch" />
+        <el-input v-model="searchTxt" placeholder="搜索用户名称" @on-enter="bindSearch" />
       </div>
     </div>
     <div class="list-box" v-if="list.length > 0">
diff --git a/template/admin/src/pages/kefu/mobile/goods/list.vue b/template/admin/src/pages/kefu/mobile/goods/list.vue
index 16412d431..474071258 100644
--- a/template/admin/src/pages/kefu/mobile/goods/list.vue
+++ b/template/admin/src/pages/kefu/mobile/goods/list.vue
@@ -13,7 +13,7 @@
         </div>
       </div>
       <div class="search-box">
-        <Input
+        <el-input
           type="text"
           placeholder="搜索商品名称/ID"
           v-model="searchTxt"
diff --git a/template/admin/src/pages/kefu/mobile/index.vue b/template/admin/src/pages/kefu/mobile/index.vue
index 69e8390f6..5d98d4a31 100644
--- a/template/admin/src/pages/kefu/mobile/index.vue
+++ b/template/admin/src/pages/kefu/mobile/index.vue
@@ -51,7 +51,7 @@
     <div class="footer-box">
       <div class="words" @click="showWords"><span class="iconfont iconhuashu1"></span></div>
       <div class="input-box">
-        <Input v-model="con" placeholder="请输入内容" style="font-size: 0.28rem" />
+        <el-input v-model="con" placeholder="请输入内容" style="font-size: 0.28rem" />
         <span class="iconfont iconfasong" @click="sendText" :class="{ isSend: isSend }"></span>
       </div>
       <div class="emoji" @click="openBox(1)"><span class="iconfont iconbiaoqing2"></span></div>
@@ -105,16 +105,16 @@
       <div class="content" :class="{ on: isTransfer }">
         <div class="title">转接客服<span class="iconfont iconcha" @click="closeTransfer"></span></div>
         <div class="list-wrapper">
-          <RadioGroup v-model="activeKF">
-            <Radio class="list-item" v-for="(item, index) in transferList" :label="item.uid" :key="index">
+          <el-radio-group v-model="activeKF">
+            <el-radio class="list-item" v-for="(item, index) in transferList" :label="item.uid" :key="index">
               <div class="avatar-box">
                 <img v-lazy="item.avatar" alt="" />
               </div>
               <p class="nickName">{{ item.wx_name }}</p>
-            </Radio>
-          </RadioGroup>
+            </el-radio>
+          </el-radio-group>
         </div>
-        <Button class="btn" @click="confirm">确定</Button>
+        <el-button class="btn" @click="confirm">确定</el-button>
       </div>
     </div>
   </div>
diff --git a/template/admin/src/pages/kefu/mobile/orderList/index.vue b/template/admin/src/pages/kefu/mobile/orderList/index.vue
index 81d5d1895..3a121f4c2 100644
--- a/template/admin/src/pages/kefu/mobile/orderList/index.vue
+++ b/template/admin/src/pages/kefu/mobile/orderList/index.vue
@@ -8,7 +8,7 @@
         <div class="item" :class="where.type === -1 ? 'on' : ''" @click="changeStatus(-1)">退款中</div>
       </div>
       <div class="input-box">
-        <Input placeholder="搜索订单编号" v-model="where.search" @on-enter="bindSearch" />
+        <el-input placeholder="搜索订单编号" v-model="where.search" @on-enter="bindSearch" />
       </div>
     </div>
 
diff --git a/template/admin/src/pages/kefu/mobile/user/userLabel.vue b/template/admin/src/pages/kefu/mobile/user/userLabel.vue
index 671f1cf06..2099a5f0e 100644
--- a/template/admin/src/pages/kefu/mobile/user/userLabel.vue
+++ b/template/admin/src/pages/kefu/mobile/user/userLabel.vue
@@ -22,7 +22,7 @@
         </div>
       </div>
       <div class="footer">
-        <Button type="primary" class="btn" @click="subBtn">确定</Button>
+        <el-button type="primary" class="btn" @click="subBtn">确定</el-button>
       </div>
     </div>
     <div class="maskModel" @touchmove.prevent v-show="change === true"></div>
diff --git a/template/admin/src/pages/kefu/pc/components/baseHeader.vue b/template/admin/src/pages/kefu/pc/components/baseHeader.vue
index 382ca33c0..38f060bb7 100644
--- a/template/admin/src/pages/kefu/pc/components/baseHeader.vue
+++ b/template/admin/src/pages/kefu/pc/components/baseHeader.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="base-header">
     <div class="left-header-wrapper">
-      <Input
+      <el-input
         class="search_box"
         prefix="ios-search"
         placeholder="搜索用户名称"
         @on-enter="bindSearch"
-        @on-change="inputChange"
+        @change="inputChange"
       />
       <div class="user_info">
         <img v-lazy="kefuInfo.avatar" alt="" />
diff --git a/template/admin/src/pages/kefu/pc/components/delivery.vue b/template/admin/src/pages/kefu/pc/components/delivery.vue
index 584ef6b64..6940ec78e 100644
--- a/template/admin/src/pages/kefu/pc/components/delivery.vue
+++ b/template/admin/src/pages/kefu/pc/components/delivery.vue
@@ -1,102 +1,140 @@
 <template>
   <div>
-    <Form ref="formValidate" :model="formValidate" :rules="ruleInline" inline>
-      <FormItem label="选择类型：" class="form-item" label-position="right" :label-width="100">
-        <RadioGroup v-model="formValidate.gender">
-          <Radio :label="item.key" v-for="(item, index) in radioList" :key="index">{{ item.title }}</Radio>
-        </RadioGroup>
-      </FormItem>
-      <FormItem
+    <el-form ref="formValidate" :model="formValidate" :rules="ruleInline" inline>
+      <el-form-item label="选择类型：" class="form-item" label-position="right" label-width="100px">
+        <el-radio-group v-model="formValidate.gender">
+          <el-radio :label="item.key" v-for="(item, index) in radioList" :key="index">{{ item.title }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
         v-if="formValidate.gender == 1"
         label="发货类型："
         class="form-item"
         label-position="right"
-        :label-width="100"
+        label-width="100px"
         :key="'test0'"
       >
-        <RadioGroup v-model="formValidate.shipStatus">
-          <Radio :label="item.key" v-for="(item, index) in shipType" :key="index">{{ item.title }}</Radio>
-        </RadioGroup>
-      </FormItem>
+        <el-radio-group v-model="formValidate.shipStatus">
+          <el-radio :label="item.key" v-for="(item, index) in shipType" :key="index">{{ item.title }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <!--  发货手动填写  -->
       <div v-if="formValidate.gender == 1 && formValidate.shipStatus == 1" :key="'test1'">
-        <FormItem label="快递公司：" prop="logisticsCode" class="form-item" label-position="right" :label-width="100">
-          <Select
+        <el-form-item
+          label="快递公司："
+          prop="logisticsCode"
+          class="form-item"
+          label-position="right"
+          label-width="100px"
+        >
+          <el-select
             v-model="formValidate.logisticsCode"
             filterable
             placeholder="请选择"
-            @on-change="bindChange"
+            @change="bindChange"
             :label-in-value="true"
             style="width: 100%"
           >
-            <Option :value="item.code" v-for="(item, index) in logisticsList" :key="index">{{ item.value }}</Option>
-          </Select>
-        </FormItem>
-        <FormItem label="快递单号：" prop="number" class="form-item" label-position="right" :label-width="100">
-          <Input v-model="formValidate.number" placeholder="请输入快递单号" style="width: 100%"></Input>
-        </FormItem>
-        <FormItem label="" class="form-item" label-position="right" :label-width="100">
+            <el-option
+              :value="item.code"
+              v-for="(item, index) in logisticsList"
+              :key="index"
+              :label="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="快递单号：" prop="number" class="form-item" label-position="right" label-width="100px">
+          <el-input v-model="formValidate.number" placeholder="请输入快递单号" style="width: 100%"></el-input>
+        </el-form-item>
+        <el-form-item label="" class="form-item" label-position="right" label-width="100px">
           <div style="color: #c4c4c4">顺丰请输入单号：收件人或寄件人手机号后四位,</div>
           <div style="color: #c4c4c4">例如：SF000000000000:3941</div>
-        </FormItem>
+        </el-form-item>
       </div>
       <!--  电子面单打印  -->
       <div v-if="formValidate.gender == 1 && formValidate.shipStatus == 2" :key="'test2'">
-        <FormItem label="快递公司：" prop="logisticsCode" class="form-item" label-position="right" :label-width="100">
-          <Select
+        <el-form-item
+          label="快递公司："
+          prop="logisticsCode"
+          class="form-item"
+          label-position="right"
+          label-width="100px"
+        >
+          <el-select
             v-model="formValidate.logisticsCode"
             placeholder="请选择"
             style="width: 100%"
-            @on-change="bindChange"
+            @change="bindChange"
             filterable
             :label-in-value="true"
           >
-            <Option :value="item.code" v-for="(item, index) in logisticsList" :key="index">{{ item.value }}</Option>
-          </Select>
-        </FormItem>
-        <FormItem
+            <el-option
+              :value="item.code"
+              v-for="(item, index) in logisticsList"
+              :key="index"
+              :label="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item
           label="电子面单："
           class="form-item"
           label-position="right"
-          :label-width="100"
+          label-width="100px"
           v-if="orderTempList.length > 0"
         >
-          <Select v-model="formValidate.electronic" placeholder="请选择电子面单" style="width: 80%">
-            <Option :value="item.temp_id" v-for="(item, index) in orderTempList" :key="index">{{ item.title }}</Option>
-          </Select>
-          <Button style="flex: 1; margin-left: 21px" @click="lookImg">预览</Button>
+          <el-select v-model="formValidate.electronic" placeholder="请选择电子面单" style="width: 80%">
+            <el-option
+              :value="item.temp_id"
+              v-for="(item, index) in orderTempList"
+              :key="index"
+              :label="item.title"
+            ></el-option>
+          </el-select>
+          <el-button style="flex: 1; margin-left: 21px" @click="lookImg">预览</el-button>
           <viewer :images="orderTempList" class="viewer" ref="viewer" @inited="inited" style="display: none">
             <img v-for="src in orderTempList" :src="src.pic" :key="src.id" class="image" />
           </viewer>
-        </FormItem>
-        <FormItem label="寄件人姓名：" prop="sendName" class="form-item" label-position="right" :label-width="100">
-          <Input v-model="formValidate.sendName" placeholder="请输入寄件人姓名" style="width: 100%"></Input>
-        </FormItem>
-        <FormItem label="寄件人电话：" prop="sendPhone" class="form-item" label-position="right" :label-width="100">
-          <Input v-model="formValidate.sendPhone" placeholder="请输入寄件人电话" style="width: 100%"></Input>
-        </FormItem>
-        <FormItem label="寄件人地址：" prop="sendAddress" class="form-item" label-position="right" :label-width="100">
-          <Input v-model="formValidate.sendAddress" placeholder="请输入寄件人地址" style="width: 100%"></Input>
-        </FormItem>
+        </el-form-item>
+        <el-form-item label="寄件人姓名：" prop="sendName" class="form-item" label-position="right" label-width="100px">
+          <el-input v-model="formValidate.sendName" placeholder="请输入寄件人姓名" style="width: 100%"></el-input>
+        </el-form-item>
+        <el-form-item label="寄件人电话：" prop="sendPhone" class="form-item" label-position="right" label-width="100px">
+          <el-input v-model="formValidate.sendPhone" placeholder="请输入寄件人电话" style="width: 100%"></el-input>
+        </el-form-item>
+        <el-form-item
+          label="寄件人地址："
+          prop="sendAddress"
+          class="form-item"
+          label-position="right"
+          label-width="100px"
+        >
+          <el-input v-model="formValidate.sendAddress" placeholder="请输入寄件人地址" style="width: 100%"></el-input>
+        </el-form-item>
       </div>
       <!--  送货  -->
       <div v-if="formValidate.gender == 2" :key="'test3'">
-        <FormItem label="选择送货人：" class="form-item" label-position="right" :label-width="100">
-          <Select v-model="formValidate.postPeople" placeholder="选择送货人" style="width: 100%">
-            <Option :value="item.id" v-for="(item, index) in deliveryList" :key="index">{{ item.nickname }}</Option>
-          </Select>
-        </FormItem>
+        <el-form-item label="选择送货人：" class="form-item" label-position="right" label-width="100px">
+          <el-select v-model="formValidate.postPeople" placeholder="选择送货人" style="width: 100%">
+            <el-option
+              :value="item.id"
+              v-for="(item, index) in deliveryList"
+              :key="index"
+              :label="item.nickname"
+            ></el-option>
+          </el-select>
+        </el-form-item>
       </div>
       <div v-if="formValidate.gender == 3">
-        <FormItem label="备注：" props="msg" class="form-item" label-position="right" :label-width="100">
-          <Input placeholder="备注" v-model="formValidate.msg" />
-        </FormItem>
+        <el-form-item label="备注：" props="msg" class="form-item" label-position="right" label-width="100px">
+          <el-input placeholder="备注" v-model="formValidate.msg" />
+        </el-form-item>
       </div>
       <div class="mask-footer">
-        <Button type="primary" @click="handleSubmit('formValidate')">提交</Button>
-        <Button @click="close">取消</Button>
+        <el-button type="primary" @click="handleSubmit('formValidate')">提交</el-button>
+        <el-button @click="close">取消</el-button>
       </div>
-    </Form>
+    </el-form>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/kefu/pc/components/msgWindow.vue b/template/admin/src/pages/kefu/pc/components/msgWindow.vue
index 681f63b09..e611db9a6 100644
--- a/template/admin/src/pages/kefu/pc/components/msgWindow.vue
+++ b/template/admin/src/pages/kefu/pc/components/msgWindow.vue
@@ -13,9 +13,9 @@
         >
       </div>
       <div class="search-box">
-        <Input placeholder="搜索快捷回复" style="width: 100%" v-model="searchTxt" @on-enter="bindSearch">
+        <el-input placeholder="搜索快捷回复" style="width: 100%" v-model="searchTxt" @on-enter="bindSearch">
           <Icon type="ios-search" slot="suffix" />
-        </Input>
+        </el-input>
       </div>
     </div>
     <div class="main">
@@ -49,7 +49,7 @@
         <Scroll :on-reach-bottom="handleReachBottom" class="right-scroll" height="360">
           <div class="msg-item add-box" v-if="tabCur" style="margin-top: 0">
             <div class="box2">
-              <Input
+              <el-input
                 class="input-box"
                 v-model="addMsg.title"
                 placeholder="输入标题（选填）"
@@ -58,17 +58,17 @@
               />
               <div class="conBox" :class="{ active: addMsg.isEdit }">
                 <div class="content">
-                  <Input v-model="addMsg.message" type="textarea" :rows="4" placeholder="请输入内容" />
+                  <el-input v-model="addMsg.message" type="textarea" :rows="4" placeholder="请输入内容" />
                 </div>
                 <div class="bom">
                   <div class="select">
-                    <Select v-model="addMsg.cateId" style="width: 100px" size="small">
-                      <Option v-for="item in sortList" :value="item.id" :key="item.id">{{ item.name }} </Option>
-                    </Select>
+                    <el-select v-model="addMsg.cateId" style="width: 100px" size="small">
+                      <el-option v-for="item in sortList" :value="item.id" :key="item.id">{{ item.name }} </el-option>
+                    </el-select>
                   </div>
                   <div class="btns-box">
-                    <Button @click.stop="addMsg.isEdit = false">取消</Button>
-                    <Button type="primary" @click.stop="bindAdd">保存</Button>
+                    <el-button @click.stop="addMsg.isEdit = false">取消</el-button>
+                    <el-button type="primary" @click.stop="bindAdd">保存</el-button>
                   </div>
                 </div>
               </div>
@@ -86,19 +86,19 @@
               </div>
             </div>
             <div class="box2" v-else>
-              <Input class="input-box" v-model="item.title" placeholder="输入标题（选填）" style="width: 100%" />
+              <el-input class="input-box" v-model="item.title" placeholder="输入标题（选填）" style="width: 100%" />
               <div class="content">
-                <Input v-model="item.message" type="textarea" :rows="4" placeholder="请输入内容" />
+                <el-input v-model="item.message" type="textarea" :rows="4" placeholder="请输入内容" />
               </div>
               <div class="bom">
                 <div class="select">
-                  <Select v-model="cateId" style="width: 100px" size="small">
-                    <Option v-for="item in sortList" :value="item.id" :key="item.id">{{ item.name }} </Option>
-                  </Select>
+                  <el-select v-model="cateId" style="width: 100px" size="small">
+                    <el-option v-for="item in sortList" :value="item.id" :key="item.id" :label="item.name"></el-option>
+                  </el-select>
                 </div>
                 <div class="btns-box">
-                  <Button @click.stop="item.isEdit = false">取消</Button>
-                  <Button type="primary" @click.stop="updataMsg(item)">保存</Button>
+                  <el-button @click.stop="item.isEdit = false">取消</el-button>
+                  <el-button type="primary" @click.stop="updataMsg(item)">保存</el-button>
                 </div>
               </div>
             </div>
@@ -109,14 +109,14 @@
     <Modal v-model="isAddSort" :title="maskTitle" width="304" :mask="false" class="class-box" :footer-hide="true">
       <div class="item">
         <span>分组名称：</span>
-        <Input v-model="classTitle" placeholder="分组名称" />
+        <el-input v-model="classTitle" placeholder="分组名称" />
       </div>
       <div class="item">
         <span>分组排序：</span>
-        <Input v-model="classSort" placeholder="输入排序" />
+        <el-input v-model="classSort" placeholder="输入排序" />
       </div>
       <div class="btn">
-        <Button type="primary" style="background: #1890ff; width: 100%" @click="addServiceCate">确定</Button>
+        <el-button type="primary" style="background: #1890ff; width: 100%" @click="addServiceCate">确定</el-button>
       </div>
     </Modal>
   </div>
diff --git a/template/admin/src/pages/kefu/pc/components/order_detail.vue b/template/admin/src/pages/kefu/pc/components/order_detail.vue
index d39be3886..a0c20f138 100644
--- a/template/admin/src/pages/kefu/pc/components/order_detail.vue
+++ b/template/admin/src/pages/kefu/pc/components/order_detail.vue
@@ -47,26 +47,36 @@
       </div>
     </div>
     <div class="goods-box">
-      <Table :columns="columns1" :data="orderList">
-        <template slot-scope="{ row, index }" slot="id">
-          {{ row.productInfo.id }}
-        </template>
-        <template slot-scope="{ row, index }" slot="name">
-          <div class="product_info">
-            <img :src="row.productInfo.image" alt="" />
-            <p>{{ row.productInfo.store_name }}</p>
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="className">
-          {{ row.class_name }}
-        </template>
-        <template slot-scope="{ row, index }" slot="price">
-          {{ row.productInfo.attrInfo.price }}
-        </template>
-        <template slot-scope="{ row, index }" slot="total_num">
-          {{ row.cart_num }}
-        </template>
-      </Table>
+      <el-table :data="orderList">
+        <el-table-column label="商品ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.productInfo.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品名称" min-width="130">
+          <template slot-scope="scope">
+            <div class="product_info">
+              <img :src="scope.row.productInfo.image" alt="" />
+              <p>{{ scope.row.productInfo.store_name }}</p>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品分类" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.class_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品售价" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.productInfo.attrInfo.price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品数量" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.cart_num }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
     </div>
   </div>
 </template>
@@ -85,30 +95,6 @@ export default {
     return {
       orderDetail: {},
       orderList: [],
-      columns1: [
-        {
-          title: '商品ID',
-          slot: 'id',
-          maxWidth: 80,
-        },
-        {
-          title: '商品名称',
-          slot: 'name',
-          minWidth: 160,
-        },
-        {
-          title: '商品分类',
-          slot: 'className',
-        },
-        {
-          title: '商品售价',
-          slot: 'price',
-        },
-        {
-          title: '商品数量',
-          slot: 'total_num',
-        },
-      ],
     };
   },
   mounted() {
diff --git a/template/admin/src/pages/kefu/pc/components/remarks.vue b/template/admin/src/pages/kefu/pc/components/remarks.vue
index 6df99be7d..f5171df6b 100644
--- a/template/admin/src/pages/kefu/pc/components/remarks.vue
+++ b/template/admin/src/pages/kefu/pc/components/remarks.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
-    <Form ref="formValidate" :model="formValidate" :rules="ruleInline" inline>
-      <FormItem label="备注：" prop="con" class="form-item" label-position="right" :label-width="100">
-        <Input
+    <el-form ref="formValidate" :model="formValidate" :rules="ruleInline" inline>
+      <el-form-item label="备注：" prop="con" class="form-item" label-position="right" label-width="100px">
+        <el-input
           v-model="formValidate.con"
           placeholder="请输入备注"
           style="width: 100%"
@@ -10,13 +10,13 @@
           type="textarea"
           :rows="5"
           show-word-limit
-        ></Input>
-      </FormItem>
+        ></el-input>
+      </el-form-item>
       <div class="mask-footer">
-        <Button type="primary" @click="handleSubmit('formValidate')">提交</Button>
-        <Button @click="close">取消</Button>
+        <el-button type="primary" @click="handleSubmit('formValidate')">提交</el-button>
+        <el-button @click="close">取消</el-button>
       </div>
-    </Form>
+    </el-form>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/kefu/pc/components/rightMenu.vue b/template/admin/src/pages/kefu/pc/components/rightMenu.vue
index 805091b07..84f616420 100644
--- a/template/admin/src/pages/kefu/pc/components/rightMenu.vue
+++ b/template/admin/src/pages/kefu/pc/components/rightMenu.vue
@@ -29,9 +29,9 @@
           </div>
           <!-- <div class="item">
                         <span>分组</span>
-                        <Select v-model="activeUserInfo.group_id" size="small" @on-change="onChange" style="flex:1;">
-                            <Option v-for="item in userGroup" :value="item.id" :key="item.value">{{ item.group_name }}</Option>
-                        </Select>
+                        <el-select v-model="activeUserInfo.group_id" size="small" @change="onChange" style="flex:1;">
+                            <el-option v-for="item in userGroup" :value="item.id" :key="item.value">{{ item.group_name }}</el-option>
+                        </el-select>
                     </div> -->
           <div class="label-list">
             <span>分组</span>
@@ -94,7 +94,7 @@
           </div>
         </div>
         <div class="search-box">
-          <Input
+          <el-input
             class="search_box"
             prefix="ios-search"
             @on-enter="orderSearch"
@@ -144,38 +144,38 @@
                   <div class="info-item"><span>实收款：</span>¥ {{ item.pay_price }}</div>
                 </div>
                 <div class="btn-wrapper">
-                  <Button
+                  <el-button
                     class="btn"
                     type="primary"
                     v-if="item._status._type == 1 && item._status._type != 0 && item.shipping_type != 2"
                     @click.stop="openDelivery(item)"
-                    >发货</Button
+                    >发货</el-button
                   >
-                  <Button
+                  <el-button
                     class="btn"
                     type="info"
                     ghost
                     style="color: #1890ff; border-color: #1890ff"
                     v-if="item.refund_status == 1"
                     @click.stop="orderRecord(item.id)"
-                    >退款</Button
+                    >退款</el-button
                   >
-                  <Button
+                  <el-button
                     class="btn"
                     type="info"
                     ghost
                     style="color: #1890ff; border-color: #1890ff"
                     @click.stop="orderEdit(item.id)"
                     v-if="item._status._type == 0"
-                    >改价</Button
+                    >改价</el-button
                   >
-                  <Button
+                  <el-button
                     class="btn"
                     type="info"
                     ghost
                     style="color: #1890ff; border-color: #1890ff"
                     @click.stop="bindRemark(item)"
-                    >备注</Button
+                    >备注</el-button
                   >
                 </div>
               </div>
@@ -202,7 +202,7 @@
           </div>
         </div>
         <div class="search-box">
-          <Input
+          <el-input
             class="search_box"
             @on-enter="productSearch"
             v-model="storeName"
diff --git a/template/admin/src/pages/kefu/pc/components/transfer.vue b/template/admin/src/pages/kefu/pc/components/transfer.vue
index dec7ec2b6..6bceb9f08 100644
--- a/template/admin/src/pages/kefu/pc/components/transfer.vue
+++ b/template/admin/src/pages/kefu/pc/components/transfer.vue
@@ -1,20 +1,5 @@
 <template>
   <div>
-    <!--        <div class="head">-->
-    <!--            客户名称：<Input search enter-button placeholder="请输入名称或者ID" style="width: 40%" @on-search="search" v-model="name" />-->
-    <!--        </div>-->
-    <!--        <Table :columns="columns1" :data="labelLists" ref="table" class="mt25"-->
-    <!--               :loading="loading" highlight-row-->
-    <!--               no-userFrom-text="暂无数据"-->
-    <!--               no-filtered-userFrom-text="暂无筛选结果">-->
-    <!--            <template slot-scope="{ row, index }" slot="avatar">-->
-    <!--                <viewer>-->
-    <!--                    <div class="tabBox_img">-->
-    <!--                        <img v-lazy="row.avatar">-->
-    <!--                    </div>-->
-    <!--                </viewer>-->
-    <!--            </template>-->
-    <!--        </Table>-->
     <div class="list-wrapper">
       <div class="user-item" v-for="(item, index) in labelLists" :key="index" @click="bindActive(item)">
         <img v-lazy="item.avatar" alt="" />
diff --git a/template/admin/src/pages/kefu/pc/components/userGroup.vue b/template/admin/src/pages/kefu/pc/components/userGroup.vue
index 7a40456fa..4109e14ec 100644
--- a/template/admin/src/pages/kefu/pc/components/userGroup.vue
+++ b/template/admin/src/pages/kefu/pc/components/userGroup.vue
@@ -14,8 +14,8 @@
       </div>
     </div>
     <!-- <div class="footer">
-            <Button type="primary" class="btns" @click="subBtn">确定</Button>
-            <Button type="primary" class="btns" ghost @click="cancel">取消</Button>
+            <el-button type="primary" class="btns" @click="subBtn">确定</el-button>
+            <el-button type="primary" class="btns" ghost @click="cancel">取消</el-button>
         </div> -->
   </div>
 </template>
diff --git a/template/admin/src/pages/kefu/pc/components/userLabel.vue b/template/admin/src/pages/kefu/pc/components/userLabel.vue
index 2ede3ab5d..bd98a8d23 100644
--- a/template/admin/src/pages/kefu/pc/components/userLabel.vue
+++ b/template/admin/src/pages/kefu/pc/components/userLabel.vue
@@ -15,8 +15,8 @@
       </div>
     </div>
     <div class="footer">
-      <Button type="primary" class="btns" @click="subBtn">确定</Button>
-      <Button type="primary" class="btns" ghost @click="cancel">取消</Button>
+      <el-button type="primary" class="btns" @click="subBtn">确定</el-button>
+      <el-button type="primary" class="btns" ghost @click="cancel">取消</el-button>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/pages/kefu/pc/index.vue b/template/admin/src/pages/kefu/pc/index.vue
index 3bff37e54..26c2e8a2a 100644
--- a/template/admin/src/pages/kefu/pc/index.vue
+++ b/template/admin/src/pages/kefu/pc/index.vue
@@ -129,7 +129,7 @@
               </div>
             </div>
             <div class="textarea-box" style="position: relative">
-              <Input
+              <el-input
                 v-paste="handleParse"
                 v-model="chatCon"
                 type="textarea"
@@ -139,7 +139,7 @@
                 style="font-size: 14px; height: 150px"
               />
               <div class="send-btn">
-                <Button class="btns" type="primary" :disabled="disabled" @click.stop="sendText">发送</Button>
+                <el-button class="btns" type="primary" :disabled="disabled" @click.stop="sendText">发送</el-button>
               </div>
             </div>
           </div>
diff --git a/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue b/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue
index 41210b3fa..60d43789b 100644
--- a/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue
+++ b/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <Row class="ivu-mt box-wrapper" ref="warpper">
-      <Col span="3" class="left-wrapper">
+    <el-row class="ivu-mt box-wrapper" ref="warpper">
+      <el-col :span="3" class="left-wrapper">
         <Menu :theme="theme3" :active-name="sortName" width="auto">
           <MenuGroup>
             <MenuItem
@@ -31,131 +31,162 @@
             </MenuItem>
           </MenuGroup>
         </Menu>
-      </Col>
-      <Col span="21" ref="rightBox">
-        <Card :bordered="false" dis-hover>
-          <Row type="flex" class="mb20">
-            <Col span="20">
-              <Button v-auth="['marketing-channel_code-create']" type="primary" icon="md-add" @click="add" class="mr10"
-                >新建二维码</Button
+      </el-col>
+      <el-col :span="21" ref="rightBox">
+        <el-card :bordered="false" shadow="never">
+          <el-row class="mb20">
+            <el-col :span="20">
+              <el-button
+                v-auth="['marketing-channel_code-create']"
+                type="primary"
+                icon="md-add"
+                @click="add"
+                class="mr10"
+                >新建二维码</el-button
               >
-              <Button
+              <el-button
                 v-auth="['marketing-channel_code-create']"
                 type="success"
                 icon="md-add"
                 @click="addSort"
                 style="margin-left: 10px"
-                >添加分组</Button
+                >添加分组</el-button
               >
-            </Col>
-            <Col span="4">
-              <Input
+            </el-col>
+            <el-col :span="4">
+              <el-input
                 v-model="tableFrom.name"
                 search
                 @on-search="userSearchs"
                 enter-button="搜索"
                 placeholder="请输入二维码名称"
               />
-            </Col>
-          </Row>
-          <Table
-            :columns="columns1"
+            </el-col>
+          </el-row>
+          <el-table
             :data="tableList"
-            :loading="loading"
-            highlight-row
+            v-loading="loading"
+            highlight-current-row
             no-userFrom-text="暂无数据"
             no-filtered-userFrom-text="暂无筛选结果"
           >
-            <template slot-scope="{ row, index }" slot="image">
-              <div class="tabBox_img" v-viewer>
-                <img v-lazy="row.image" />
-              </div>
-            </template>
-            <template slot-scope="{ row, index }" slot="avatar">
-              <div class="tabBox_img" v-viewer>
-                <img v-lazy="row.avatar" />
-              </div>
-            </template>
-            <template slot-scope="{ row, index }" slot="label_name">
-              <div v-if="row.label_name.length">
-                <Tag :checkable="false" color="primary" v-for="(item, index) in row.label_name" :key="index">{{
-                  item
-                }}</Tag>
-              </div>
-              <div v-else>--</div>
-            </template>
-            <template slot-scope="{ row, index }" slot="add_time">
-              <span v-if="row.stop === 0"> 永久 </span>
-              <span v-if="row.stop === 1">
-                <div>{{ row.add_time }}</div>
-                <div>-</div>
-                <div>{{ row.end_time }}</div>
-              </span>
-              <span v-if="row.stop === -1">已过期</span>
-            </template>
-            <template slot-scope="{ row, index }" slot="status">
-              <i-switch
-                v-model="row.status"
-                :value="row.status"
-                :true-value="1"
-                :false-value="0"
-                :disabled="row.lottery_status == 2 ? true : false"
-                @on-change="onchangeIsShow(row)"
-                size="large"
-              >
-                <span slot="open">开启</span>
-                <span slot="close">关闭</span>
-              </i-switch>
-            </template>
-
-            <template slot-scope="{ row, index }" slot="action">
-              <a @click="edit(row)">编辑</a>
-              <Divider type="vertical" />
-              <a @click="del(row, '删除二维码', index)">删除</a>
-              <Divider type="vertical" />
-              <Dropdown @on-click="changeMenu(row, $event)" :transfer="true">
-                <a href="javascript:void(0)"
-                  >更多
-                  <Icon type="ios-arrow-down"></Icon>
-                </a>
-                <DropdownMenu slot="list">
-                  <DropdownItem name="1">下载</DropdownItem>
-                  <DropdownItem name="2">统计</DropdownItem>
-                  <DropdownItem name="3">用户列表</DropdownItem>
-                </DropdownMenu>
-              </Dropdown>
-            </template>
-          </Table>
+            <el-table-column label="二维码" width="80">
+              <template slot-scope="scope">
+                <div class="tabBox_img" v-viewer>
+                  <img v-lazy="scope.row.image" />
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="二维码名称" min-width="80">
+              <template slot-scope="scope">
+                <span>{{ scope.row.name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="总关注数" min-width="80">
+              <template slot-scope="scope">
+                <span>{{ scope.row.follow }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="昨日新增关注" min-width="80">
+              <template slot-scope="scope">
+                <span>{{ scope.row.y_follow }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="用户标签" min-width="80">
+              <template slot-scope="scope">
+                <span>{{ scope.row.label_name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="时间" min-width="80">
+              <template slot-scope="scope">
+                <span v-if="scope.row.stop === 0"> 永久 </span>
+                <span v-if="scope.row.stop === 1">
+                  <div>{{ scope.row.add_time }}</div>
+                  <div>-</div>
+                  <div>{{ scope.row.end_time }}</div>
+                </span>
+                <span v-if="scope.row.stop === -1">已过期</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="关联推广员" min-width="80">
+              <template slot-scope="scope">
+                <div class="tabBox_img" v-viewer>
+                  <img v-lazy="scope.row.avatar" />
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" min-width="80">
+              <template slot-scope="scope">
+                <el-switch
+                  :active-value="1"
+                  :inactive-value="0"
+                  v-model="scope.row.status"
+                  :value="scope.row.status"
+                  :disabled="scope.row.lottery_status == 2 ? true : false"
+                  @change="onchangeIsShow(scope.row)"
+                  size="large"
+                  active-text="开启"
+                  inactive-text="关闭"
+                >
+                </el-switch>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" fixed="right" width="170">
+              <template slot-scope="scope">
+                <a @click="edit(scope.row)">编辑</a>
+                <el-divider direction="vertical"></el-divider>
+                <a @click="del(scope.row, '删除二维码', index)">删除</a>
+                <el-divider direction="vertical"></el-divider>
+                <el-dropdown size="small" @command="changeMenu(scope.row, $event)" :transfer="true">
+                  <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i> </span>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item command="1">下载</el-dropdown-item>
+                    <el-dropdown-item command="2">统计</el-dropdown-item>
+                    <el-dropdown-item command="3">用户列表</el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </template>
+            </el-table-column>
+          </el-table>
           <div class="acea-row row-right page">
-            <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="tableFrom.limit" />
+            <pagination
+              v-if="total"
+              :total="total"
+              :page.sync="tableFrom.page"
+              :limit.sync="tableFrom.limit"
+              @pagination="getList"
+            />
           </div>
-        </Card>
-      </Col>
-    </Row>
+        </el-card>
+      </el-col>
+    </el-row>
     <Modal v-model="modals" scrollable footer-hide closable title="渠道码用户列表" :mask-closable="false" width="900">
-      <Table
-        ref="selection"
-        :columns="columns4"
-        :data="tabList"
-        no-data-text="暂无数据"
-        highlight-row
-        max-height="400"
-        no-filtered-data-text="暂无筛选结果"
-      >
-        <template slot-scope="{ row, index }" slot="avatar">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-      </Table>
+      <el-table ref="selection" :data="tabList" empty-text="暂无数据" highlight-current-row max-height="400">
+        <el-table-column label="UID" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.uid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户头像" min-width="120">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.avatar" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户昵称" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.nickname }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total2"
           :total="total2"
-          show-elevator
-          show-total
-          :loading="loading2"
-          @on-change="pageChangeUser"
-          :page-size="userData.limit"
+          :page.sync="userData.page"
+          :limit.sync="userData.limit"
+          @pagination="getUserList"
         />
       </div>
     </Modal>
@@ -187,7 +218,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -240,77 +271,6 @@ export default {
       timeVal: [],
       loading: false,
       tableList: [],
-      columns4: [
-        {
-          title: 'UID',
-          key: 'uid',
-          minWidth: 120,
-        },
-        {
-          title: '用户头像',
-          slot: 'avatar',
-          minWidth: 120,
-        },
-        {
-          title: '用户昵称',
-          key: 'nickname',
-          minWidth: 120,
-        },
-      ],
-      columns1: [
-        {
-          title: '二维码',
-          slot: 'image',
-          width: 80,
-          align: 'center',
-        },
-        {
-          title: '二维码名称',
-          key: 'name',
-          minWidth: 80,
-          align: 'center',
-        },
-        {
-          title: '总关注数',
-          key: 'follow',
-          minWidth: 80,
-          align: 'center',
-        },
-        {
-          title: '昨日新增关注',
-          key: 'y_follow',
-          minWidth: 80,
-          align: 'center',
-        },
-        {
-          title: '用户标签',
-          slot: 'label_name',
-          minWidth: 80,
-        },
-        {
-          title: '时间',
-          slot: 'add_time',
-          width: 140,
-          align: 'center',
-        },
-        {
-          title: '关联推广员',
-          slot: 'avatar',
-          minWidth: 60,
-        },
-        {
-          title: '状态',
-          slot: 'status',
-          minWidth: 60,
-          align: 'center',
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 150,
-        },
-      ],
       loading2: false,
       total2: 0,
       addFrom: {
@@ -375,11 +335,6 @@ export default {
         a.dispatchEvent(event); // 触发a的单击事件
       };
     },
-    // 用列表翻页
-    pageChangeUser(index) {
-      this.userData.page = index;
-      this.getUserList();
-    },
     // 获取渠道码用户列表
     getUserList() {
       getUserList(this.userData)
@@ -543,10 +498,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.tableFrom.page = index;
-      this.getList();
-    },
     // 修改是否显示
     onchangeIsShow(row) {
       let data = {
diff --git a/template/admin/src/pages/marketing/channelCode/codeStatistic.vue b/template/admin/src/pages/marketing/channelCode/codeStatistic.vue
index 6797cec07..f24ba72f9 100644
--- a/template/admin/src/pages/marketing/channelCode/codeStatistic.vue
+++ b/template/admin/src/pages/marketing/channelCode/codeStatistic.vue
@@ -3,20 +3,20 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <span>
-          <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
+          <el-button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</el-button>
         </span>
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
       </div>
     </div>
     <cards-data :cardLists="cardLists" v-if="cardLists.length >= 0"></cards-data>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="table-head">
         <h3>关注趋势</h3>
         <DatePicker
           :editable="false"
           :clearable="false"
-          @on-change="onchangeTime"
+          @change="onchangeTime"
           :value="timeVal"
           format="yyyy/MM/dd"
           type="daterange"
@@ -28,7 +28,7 @@
         ></DatePicker>
       </div>
       <echarts-new :option-data="optionData" :styles="style" height="100%" width="100%" v-if="optionData"></echarts-new>
-    </Card>
+    </el-card>
     <Spin size="large" fix v-if="spinShow"></Spin>
   </div>
 </template>
diff --git a/template/admin/src/pages/marketing/channelCode/createCode.vue b/template/admin/src/pages/marketing/channelCode/createCode.vue
index f3254659d..40990b6ff 100644
--- a/template/admin/src/pages/marketing/channelCode/createCode.vue
+++ b/template/admin/src/pages/marketing/channelCode/createCode.vue
@@ -3,37 +3,42 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <span>
-          <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
+          <el-button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</el-button>
         </span>
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span class="ivu-page-header-title">{{ $route.query.id ? '编辑渠道码' : '添加渠道码' }}</span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form :model="formData" :label-width="150" :rules="ruleValidate">
-        <FormItem label="二维码名称">
-          <Input v-model="formData.name" placeholder="请输入二维码名称"></Input>
-        </FormItem>
-        <FormItem label="二维码分组" :label-width="150">
-          <Select v-model="formData.cate_id" style="width: 320px">
-            <Option :value="item.id" v-for="(item, index) in labelSort" :key="index">{{ item.cate_name }}</Option>
-          </Select>
-        </FormItem>
-        <FormItem label="用户标签" :label-width="150">
-          <!-- <Select
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form :model="formData" label-width="150px" :rules="ruleValidate">
+        <el-form-item label="二维码名称">
+          <el-input v-model="formData.name" placeholder="请输入二维码名称"></el-input>
+        </el-form-item>
+        <el-form-item label="二维码分组" label-width="150px">
+          <el-select v-model="formData.cate_id" style="width: 320px">
+            <el-option
+              :value="item.id"
+              v-for="(item, index) in labelSort"
+              :key="index"
+              :label="item.cate_name"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="用户标签" label-width="150px">
+          <!-- <el-select
             v-model="formData.label_id"
             placeholder="请选择用户标签"
             multiple
             class="perW20"
             style="width: 320px"
           >
-            <Option
+            <el-option
               v-for="item in labelSelect"
               :value="item.id"
               :key="item.id"
-              >{{ item.label_name }}</Option
+              >{{ item.label_name }}</el-option
             >
-          </Select>
+          </el-select>
           <span class="addfont" @click="addLabel">新增标签</span> -->
           <div style="display: flex">
             <div class="labelInput acea-row row-between-wrapper" @click="openLabel">
@@ -49,8 +54,8 @@
             </div>
             <span class="addfont" @click="addLabel">新增标签</span>
           </div>
-        </FormItem>
-        <FormItem label="关联推广员" :label-width="150">
+        </el-form-item>
+        <el-form-item label="关联推广员" label-width="150px">
           <div class="picBox" @click="customer">
             <div class="pictrue" v-if="formData.avatar">
               <img v-lazy="formData.avatar" />
@@ -60,28 +65,28 @@
             </div>
           </div>
           <div class="trip">扫码注册的新用户,将自动成为此推广员的下级,与分销推广功能一致</div>
-        </FormItem>
-        <FormItem label="有效期">
-          <RadioGroup v-model="isReceiveTime">
-            <Radio :label="0">永久</Radio>
-            <Radio :label="1">有效期</Radio>
-          </RadioGroup>
+        </el-form-item>
+        <el-form-item label="有效期">
+          <el-radio-group v-model="isReceiveTime">
+            <el-radio :label="0">永久</el-radio>
+            <el-radio :label="1">有效期</el-radio>
+          </el-radio-group>
           <span v-show="isReceiveTime">
-            <InputNumber
+            <el-input-number controls-position="right"
               :min="1"
               :max="10000"
               :precision="0"
               v-model="formData.time"
               placeholder="请输入天数"
               style="width: 100px"
-            ></InputNumber>
+            ></el-input-number>
             天
           </span>
           <div class="trip">临时码过期后不能再扫码,永久二维码最大创建数量为10万个</div>
-        </FormItem>
-        <FormItem label="回复内容">
-          <Row>
-            <Col span="4">
+        </el-form-item>
+        <el-form-item label="回复内容">
+          <el-row>
+            <el-col :span="4">
               <Menu theme="light" style="width: 150px" :active-name="formData.type" @on-select="selectMenu">
                 <MenuItem name="text">文字内容</MenuItem>
                 <!-- <MenuItem name="url">网址链接</MenuItem> -->
@@ -90,29 +95,33 @@
                 <MenuItem name="image">图片消息</MenuItem>
                 <MenuItem name="news">图文消息</MenuItem>
               </Menu>
-            </Col>
-            <Col span="18">
-              <FormItem label="消息内容：" prop="content" v-if="formData.type === 'text' || formData.type === 'url'">
+            </el-col>
+            <el-col span="18">
+              <el-form-item
+                label="消息内容："
+                prop="content"
+                v-if="formData.type === 'text' || formData.type === 'url'"
+              >
                 <textarea
                   v-model="formData.content.content"
                   :placeholder="formData.type === 'text' ? '请填写消息内容' : '请填写网址链接'"
                   style="width: 50%"
                 ></textarea>
-              </FormItem>
-              <FormItem label="选取图文：" v-if="formData.type === 'news'">
-                <Button type="info" @click="modals = true">选择图文消息</Button>
+              </el-form-item>
+              <el-form-item label="选取图文：" v-if="formData.type === 'news'">
+                <el-button type="info" @click="modals = true">选择图文消息</el-button>
                 <div class="news-box" v-if="formData.content.list.title">
                   <img class="news_pic" :src="formData.content.list.image_input[0]" />
                   <span>{{ formData.content.list.title }}</span>
                 </div>
-              </FormItem>
-              <FormItem
+              </el-form-item>
+              <el-form-item
                 :label="formData.type === 'image' ? '图片地址：' : '语音地址：'"
                 prop="src"
                 v-if="formData.type === 'image' || formData.type === 'voice'"
               >
                 <div class="acea-row row-middle">
-                  <Input
+                  <el-input
                     readonly="readonly"
                     placeholder="请填入链接地址"
                     style="width: 75%"
@@ -131,18 +140,18 @@
                     class="mr20"
                     style="margin-top: 1px"
                   >
-                    <Button type="primary">上传</Button>
+                    <el-button type="primary">上传</el-button>
                   </Upload>
                 </div>
                 <span v-show="formData.type === 'image'">文件最大2Mb，支持bmp/png/jpeg/jpg/gif格式</span>
                 <span v-show="formData.type === 'voice'">文件最大2Mb，支持mp3格式,播放长度不超过60s</span>
-              </FormItem>
-            </Col>
-          </Row>
-        </FormItem>
-      </Form>
-      <Button class="submit" type="primary" @click="save" :loading="loading" :disabled="disabled">立即提交</Button>
-    </Card>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form-item>
+      </el-form>
+      <el-button class="submit" type="primary" @click="save" :loading="loading" :disabled="disabled">立即提交</el-button>
+    </el-card>
     <Modal v-model="customerShow" scrollable title="请选择商城用户" :closable="false" width="800">
       <customerInfo v-if="customerShow" @imageObject="imageObject"></customerInfo>
     </Modal>
diff --git a/template/admin/src/pages/marketing/live/add_goods.vue b/template/admin/src/pages/marketing/live/add_goods.vue
index e6cd4bab9..11652bafb 100644
--- a/template/admin/src/pages/marketing/live/add_goods.vue
+++ b/template/admin/src/pages/marketing/live/add_goods.vue
@@ -3,14 +3,14 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <span>
-          <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
+          <el-button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</el-button>
         </span>
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
@@ -18,9 +18,9 @@
         class="tabform"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex">
-          <Col span="24">
-            <FormItem label="选择商品：">
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="选择商品：">
               <div class="box">
                 <div class="box-item" v-for="(item, index) in goodsList" :key="index">
                   <img :src="item.image" alt="" />
@@ -30,41 +30,59 @@
                   <Icon type="ios-camera-outline" size="36" />
                 </div>
               </div>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
       <div class="active-btn" v-if="goodsList.length > 0">
-        <Button type="success" @click="liveGoods">生成直播商品</Button>
+        <el-button type="success" @click="liveGoods">生成直播商品</el-button>
       </div>
       <div class="table-box" v-if="isShowBox">
-        <Table
-          :columns="columns1"
+        <el-table
           :data="tabList"
           ref="table"
           class="mt25"
-          :loading="loading"
+          v-loading="loading"
           no-userFrom-text="暂无数据"
           no-filtered-userFrom-text="暂无筛选结果"
         >
-          <template slot-scope="{ row, index }" slot="img">
-            <div class="product_box">
-              <img :src="row.image" alt="" />
-              <span>{{ row.store_name }}</span>
-            </div>
-          </template>
-          <template slot-scope="{ row, index }" slot="action">
-            <a @click="del(row, index)">删除</a>
-          </template>
-        </Table>
+          <el-table-column label="商品ID" width="80">
+            <template slot-scope="scope">
+              <span>{{ scope.row.id }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="商品信息" min-width="90">
+            <template slot-scope="scope">
+              <div class="product_box">
+                <img :src="scope.row.image" alt="" />
+                <span>{{ scope.row.store_name }}</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="直播售价" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row.price }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="库存" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row.stock }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" width="80">
+            <template slot-scope="scope">
+              <a @click="del(scope.row, index)">删除</a>
+            </template>
+          </el-table-column>
+        </el-table>
 
         <div class="sub_btn">
-          <Button type="primary" style="width: 8%" @click="bindSub" :disabled="disabled" :loading="loadings"
-            >提交</Button
+          <el-button type="primary" style="width: 8%" @click="bindSub" :disabled="disabled" :loading="loadings"
+            >提交</el-button
           >
         </div>
       </div>
-    </Card>
+    </el-card>
     <Modal v-model="modals" title="商品列表" class="paymentFooter" scrollable width="900" :footer-hide="true">
       <goods-list
         ref="goodslist"
@@ -89,7 +107,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 100;
+      return this.isMobile ? undefined : '100px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -103,47 +121,6 @@ export default {
       goodsList: [],
       tempGoods: {},
       formValidate: {},
-      columns1: [
-        { key: 'id', title: '商品ID' },
-        { slot: 'img', title: '商品信息' },
-        { key: 'price', title: '直播售价' },
-        // {
-        //   key: 'price',
-        //   title: '直播售价',
-        //   render: (h, params) => {
-        //     return h('Input', {
-        //       props: {
-        //         type: 'number',
-        //         value: params.row.price,
-        //       },
-        //       on: {
-        //         input: (val) => {
-        //           this.tabList[params.index].price = val;
-        //         },
-        //       },
-        //     });
-        //   },
-        // },
-        // {
-        //   key: 'cost_price',
-        //   title: '直播原价',
-        //   render: (h, params) => {
-        //     return h('Input', {
-        //       props: {
-        //         type: 'number',
-        //         value: params.row.cost_price,
-        //       },
-        //       on: {
-        //         input: (val) => {
-        //           this.tabList[params.index].cost_price = val;
-        //         },
-        //       },
-        //     });
-        //   },
-        // },
-        { key: 'stock', title: '库存' },
-        { slot: 'action', fixed: 'right', title: '操作' },
-      ],
       tabList: [],
       disabled: false,
       loadings: false,
diff --git a/template/admin/src/pages/marketing/live/anchor.vue b/template/admin/src/pages/marketing/live/anchor.vue
index 9d5bf11d9..f192a914d 100644
--- a/template/admin/src/pages/marketing/live/anchor.vue
+++ b/template/admin/src/pages/marketing/live/anchor.vue
@@ -1,38 +1,58 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row type="flex">
-        <Col v-bind="grid">
-          <Button v-auth="['admin-user-label_add']" type="primary" icon="md-add" @click="add">添加主播</Button>
-        </Col>
-      </Row>
-      <Table
-        :columns="columns1"
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row>
+        <el-col v-bind="grid">
+          <el-button v-auth="['admin-user-label_add']" type="primary" icon="md-add" @click="add">添加主播</el-button>
+        </el-col>
+      </el-row>
+      <el-table
         :data="labelLists"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="icons">
-          <viewer>
-            <div class="tabBox_img">
-              <img v-lazy="row.icon" />
-            </div>
-          </viewer>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row.id)">修改</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除主播', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="名称" min-width="300">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="电话" min-width="300">
+          <template slot-scope="scope">
+            <span>{{ scope.row.phone }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="微信号" min-width="300">
+          <template slot-scope="scope">
+            <span>{{ scope.row.wechat }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row.id)">修改</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除主播', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="labelFrom.limit" />
+        <pagination
+          v-if="total"
+          :total="total"
+          :page.sync="labelFrom.page"
+          :limit.sync="labelFrom.limit"
+          @pagination="getList"
+        />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -51,34 +71,6 @@ export default {
         xs: 24,
       },
       loading: false,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          minWidth: 120,
-        },
-        {
-          title: '名称',
-          key: 'name',
-          minWidth: 300,
-        },
-        {
-          title: '电话',
-          key: 'phone',
-          minWidth: 300,
-        },
-        {
-          title: '微信号',
-          key: 'wechat',
-          minWidth: 300,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 120,
-        },
-      ],
       labelFrom: {
         kerword: '',
         page: 1,
@@ -91,7 +83,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -107,6 +99,7 @@ export default {
     },
     // 修改
     edit(id) {
+      console.log(id);
       this.$modalForm(liveAuchorAdd(id)).then(() => this.getList());
     },
     // 删除
@@ -148,10 +141,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.labelFrom.page = index;
-      this.getList();
-    },
   },
 };
 </script>
diff --git a/template/admin/src/pages/marketing/live/components/add_goods.vue b/template/admin/src/pages/marketing/live/components/add_goods.vue
index e53c223e6..f29bc7c63 100644
--- a/template/admin/src/pages/marketing/live/components/add_goods.vue
+++ b/template/admin/src/pages/marketing/live/components/add_goods.vue
@@ -15,7 +15,7 @@
       </div>
       <div class="upload-box" @click="modals = true"><Icon type="ios-camera-outline" size="36" /></div>
     </div>
-    <Button type="primary" style="width: 100%" @click="bindSub">提交</Button>
+    <el-button type="primary" style="width: 100%" @click="bindSub">提交</el-button>
     <Modal v-model="modals" title="商品列表" class="paymentFooter" scrollable width="900" :footer-hide="true">
       <goods-list
         ref="goodslist"
diff --git a/template/admin/src/pages/marketing/live/creat_live.vue b/template/admin/src/pages/marketing/live/creat_live.vue
index a8e5048db..216d7913f 100644
--- a/template/admin/src/pages/marketing/live/creat_live.vue
+++ b/template/admin/src/pages/marketing/live/creat_live.vue
@@ -3,14 +3,14 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <span>
-          <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
+          <el-button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</el-button>
         </span>
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
@@ -19,95 +19,100 @@
         :rules="ruleValidate"
         @submit.native.prevent
       >
-        <Col span="24">
+        <el-col :span="24">
           <Alert type="warning" show-icon style="width: 550px; margin-left: 17px; margin-bottom: 25px"
             >必须前往微信小程序官方后台开通直播权限，关注<span style="color: red; cursor: pointer" @click="codeImg"
               >【小程序直播】</span
             >须知直播状态</Alert
           >
-        </Col>
-        <Col span="24">
-          <FormItem label="选择主播：" prop="anchor_wechat">
-            <Select
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="选择主播：" prop="anchor_wechat">
+            <el-select
               v-model="formValidate.anchor_wechat"
               filterable
               clearable
               style="width: 300px"
-              @on-change="anchorName"
+              @change="anchorName"
             >
-              <Option v-for="(item, index) in liveList" :value="item.wechat" :key="index">{{ item.wechat }}</Option>
-            </Select>
-          </FormItem>
-        </Col>
-        <Row :gutter="24" type="flex">
-          <Col span="24">
-            <FormItem label="直播间名称：" prop="name">
-              <Input
+              <el-option
+                v-for="(item, index) in liveList"
+                :value="item.wechat"
+                :key="index"
+                :label="item.wechat"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-row :gutter="24" >
+          <el-col :span="24">
+            <el-form-item label="直播间名称：" prop="name">
+              <el-input
                 enter-button
                 placeholder="请输入直播间名称"
                 element-id="name"
                 v-model="formValidate.name"
                 style="width: 300px"
               />
-            </FormItem>
-          </Col>
-          <Col span="24">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
             <div style="display: flex">
-              <FormItem label="背景图：" prop="name">
+              <el-form-item label="背景图：" prop="name">
                 <div @click="modalPicTap(0)" class="box">
                   <img :src="formValidate.cover_img" alt="" v-if="formValidate.cover_img" />
                   <div class="upload-box" v-else>
                     <Icon type="ios-camera-outline" size="36" />
                   </div>
                 </div>
-              </FormItem>
+              </el-form-item>
               <span style="margin-left: 20px; color: #b0bac5">尺寸：1080*1920px</span>
             </div>
-          </Col>
-          <Col span="24">
+          </el-col>
+          <el-col :span="24">
             <div style="display: flex">
-              <FormItem label="分享图：" prop="name">
+              <el-form-item label="分享图：" prop="name">
                 <div @click="modalPicTap(1)" class="box">
                   <img :src="formValidate.share_img" alt="" v-if="formValidate.share_img" />
                   <div class="upload-box" v-else>
                     <Icon type="ios-camera-outline" size="36" />
                   </div>
                 </div>
-              </FormItem>
+              </el-form-item>
               <span style="margin-left: 20px; color: #b0bac5">尺寸：800*640px</span>
             </div>
-          </Col>
-          <!--<Col span="24">-->
-          <!--<FormItem label="主播昵称：">-->
-          <!--<Input enter-button  placeholder="请输入主播昵称" element-id="anchor_name" v-model="formValidate.anchor_name" style="width: 60%;"/>-->
-          <!--</FormItem>-->
-          <!--</Col>-->
-          <Col span="24">
-            <FormItem label="联系电话：">
-              <Input
+          </el-col>
+          <!--<el-col :span="24">-->
+          <!--<el-form-item label="主播昵称：">-->
+          <!--<el-input enter-button  placeholder="请输入主播昵称" element-id="anchor_name" v-model="formValidate.anchor_name" style="width: 60%;"/>-->
+          <!--</el-form-item>-->
+          <!--</el-col>-->
+          <el-col :span="24">
+            <el-form-item label="联系电话：">
+              <el-input
                 enter-button
                 placeholder="请输入主播联系电话"
                 element-id="phone"
                 v-model="formValidate.phone"
                 style="width: 300px"
               />
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="直播时间：" prop="name">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="直播时间：" prop="name">
               <DatePicker
                 type="datetimerange"
                 format="yyyy-MM-dd HH:mm"
                 placeholder="请选择直播时间"
                 style="width: 300px"
                 :value="timeVal"
-                @on-change="selectDate"
+                @change="selectDate"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="排序：">
-              <Input
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="排序：">
+              <el-input
                 type="number"
                 enter-button
                 placeholder="0"
@@ -115,70 +120,70 @@
                 v-model="formValidate.sort"
                 style="width: 300px"
               />
-            </FormItem>
-          </Col>
-          <!-- <Col span="24">
-            <FormItem label="显示样式：">
-              <RadioGroup v-model="formValidate.screen_type">
-                <Radio :label="item.label" v-for="(item, index) in screen_type" :key="index">
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="24">
+            <el-form-item label="显示样式：">
+              <el-radio-group v-model="formValidate.screen_type">
+                <el-radio :label="item.label" v-for="(item, index) in screen_type" :key="index">
                   <span>{{ item.value }}</span>
-                </Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col> -->
-          <Col span="24">
-            <FormItem label="直播间类型：">
-              <RadioGroup v-model="formValidate.type">
-                <Radio :label="item.label" v-for="(item, index) in type" :key="index">
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="24">
+            <el-form-item label="直播间类型：">
+              <el-radio-group v-model="formValidate.type">
+                <el-radio :label="item.label" v-for="(item, index) in type" :key="index">
                   <span>{{ item.value }}</span>
-                </Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="直播间点赞：">
-              <RadioGroup v-model="formValidate.close_like">
-                <Radio :label="item.label" v-for="(item, index) in close_like" :key="index">
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="直播间点赞：">
+              <el-radio-group v-model="formValidate.close_like">
+                <el-radio :label="item.label" v-for="(item, index) in close_like" :key="index">
                   <span>{{ item.value }}</span>
-                </Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="直播卖货：">
-              <RadioGroup v-model="formValidate.close_goods">
-                <Radio :label="item.label" v-for="(item, index) in close_goods" :key="index">
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="直播卖货：">
+              <el-radio-group v-model="formValidate.close_goods">
+                <el-radio :label="item.label" v-for="(item, index) in close_goods" :key="index">
                   <span>{{ item.value }}</span>
-                </Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="直播间评论：">
-              <RadioGroup v-model="formValidate.close_comment">
-                <Radio :label="item.label" v-for="(item, index) in close_comment" :key="index">
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="直播间评论：">
+              <el-radio-group v-model="formValidate.close_comment">
+                <el-radio :label="item.label" v-for="(item, index) in close_comment" :key="index">
                   <span>{{ item.value }}</span>
-                </Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-        </Row>
-        <Row :gutter="24" type="flex">
-          <Col v-bind="grid" span="24">
-            <Button :loading="loading" type="primary" style="margin-left: 99px" @click="handleSubmit('formItem')">
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" >
+          <el-col v-bind="grid" :span="24">
+            <el-button :loading="loading" type="primary" style="margin-left: 99px" @click="handleSubmit('formItem')">
               <span v-if="!loading">提交</span>
               <span v-else>提交中...</span>
-            </Button>
-            <!-- <Button
+            </el-button>
+            <!-- <el-button
               type="primary"
               @click="handleSubmit('formItem')"
               style="width: 19%; margin-left: 99px"
-              >提交</Button
+              >提交</el-button
             > -->
-          </Col>
-        </Row>
-      </Form>
-    </Card>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
     <div>
       <Modal
         v-model="modalPic"
@@ -222,7 +227,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 100;
+      return this.isMobile ? undefined : '100px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
diff --git a/template/admin/src/pages/marketing/live/index.vue b/template/admin/src/pages/marketing/live/index.vue
index f59fc0c1d..b4688775e 100644
--- a/template/admin/src/pages/marketing/live/index.vue
+++ b/template/admin/src/pages/marketing/live/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
@@ -9,19 +9,19 @@
         class="tabform"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex">
-          <Col span="24">
-            <FormItem label="直播状态：">
-              <RadioGroup type="button" v-model="formValidate.status" class="mr15" @on-change="selChange">
-                <Radio :label="itemn.value" v-for="(itemn, indexn) in treeData.withdrawal" :key="indexn">{{
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="直播状态：">
+              <el-radio-group type="button" v-model="formValidate.status" class="mr15" @change="selChange">
+                <el-radio-button :label="itemn.value" v-for="(itemn, indexn) in treeData.withdrawal" :key="indexn">{{
                   itemn.title
-                }}</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="搜索：">
-              <Input
+                }}</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="搜索：">
+              <el-input
                 search
                 enter-button
                 @on-search="selChange"
@@ -30,70 +30,119 @@
                 v-model="formValidate.kerword"
                 style="width: 30%"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button v-auth="['setting-system_menus-add']" type="primary" @click="menusAdd('添加直播间')" icon="md-add"
-              >添加直播间</Button
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-button
+              v-auth="['setting-system_menus-add']"
+              type="primary"
+              @click="menusAdd('添加直播间')"
+              icon="md-add"
+              >添加直播间</el-button
             >
-            <Button
+            <el-button
               v-auth="['setting-system_menus-add']"
               icon="md-list"
               type="success"
               @click="syncRoom"
               style="margin-left: 20px"
-              >同步直播间</Button
+              >同步直播间</el-button
             >
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tabList"
         ref="table"
         class="mt25"
         :loading="loading"
-        highlight-row
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="is_mer_show">
-          <i-switch
-            v-model="row.is_show"
-            :value="row.is_show"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">显示</span>
-            <span slot="close">隐藏</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          <div>{{ row.live_status | liveReviewStatusFilter }}</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="detail(row, '详情')">详情</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除这条信息', index)">删除</a>
-          <Divider type="vertical" v-if="row.live_status == 102" />
-          <a v-if="row.live_status == 102" @click="addGoods(row)">添加商品</a>
-        </template>
-      </Table>
+        <el-table-column label="直播间ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="直播间名称" min-width="35">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="主播昵称" min-width="35">
+          <template slot-scope="scope">
+            <span>{{ scope.row.anchor_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="主播微信号" min-width="35">
+          <template slot-scope="scope">
+            <span>{{ scope.row.anchor_wechat }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="直播开始时间" min-width="35">
+          <template slot-scope="scope">
+            <span>{{ scope.row.start_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="计划结束时间" min-width="35">
+          <template slot-scope="scope">
+            <span>{{ scope.row.end_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" min-width="35">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="显示状态" min-width="35">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.is_show"
+              :value="scope.row.is_show"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+              active-text="开启"
+              inactive-text="关闭"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="直播状态" min-width="35">
+          <template slot-scope="scope">
+            <div>{{ scope.row.live_status | liveReviewStatusFilter }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="排序" min-width="35">
+          <template slot-scope="scope">
+            <div>{{ scope.row.sort }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="detail(scope.row, '详情')">详情</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除这条信息', index)">删除</a>
+            <el-divider direction="vertical" v-if="scope.row.live_status == 102" />
+            <a v-if="scope.row.live_status == 102" @click="addGoods(scope.row)">添加商品</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!--详情-->
     <Modal v-model="modals" title="直播间详情" class="paymentFooter" scrollable width="700" :footer-hide="true">
       <details-from ref="studioDetail" />
@@ -186,7 +235,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -216,11 +265,6 @@ export default {
         path: this.$routeProStr + '/marketing/live/add_live_room',
       });
     },
-    // 分页
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 直播间显示隐藏
     onchangeIsShow({ id, is_show }) {
       liveShow(id, is_show)
diff --git a/template/admin/src/pages/marketing/live/live_goods.vue b/template/admin/src/pages/marketing/live/live_goods.vue
index 8b99ad916..341a83e29 100644
--- a/template/admin/src/pages/marketing/live/live_goods.vue
+++ b/template/admin/src/pages/marketing/live/live_goods.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
@@ -9,19 +9,19 @@
         class="tabform"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex">
-          <Col span="24">
-            <FormItem label="审核状态：">
-              <RadioGroup type="button" v-model="formValidate.status" class="mr15" @on-change="selChange">
-                <Radio :label="itemn.value" v-for="(itemn, indexn) in treeData.withdrawal" :key="indexn">
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="审核状态：">
+              <el-radio-group type="button" v-model="formValidate.status" class="mr15" @change="selChange">
+                <el-radio :label="itemn.value" v-for="(itemn, indexn) in treeData.withdrawal" :key="indexn">
                   {{ itemn.title }}
-                </Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="搜索：">
-              <Input
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="搜索：">
+              <el-input
                 search
                 enter-button
                 @on-search="selChange"
@@ -30,83 +30,108 @@
                 v-model="formValidate.kerword"
                 style="width: 30%"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button v-auth="['setting-system_menus-add']" type="primary" @click="menusAdd('添加直播间')" icon="md-add"
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-button
+              v-auth="['setting-system_menus-add']"
+              type="primary"
+              @click="menusAdd('添加直播间')"
+              icon="md-add"
               >添加商品
-            </Button>
-            <!-- <Button
+            </el-button>
+            <!-- <el-button
               v-auth="['setting-system_menus-add']"
               icon="md-list"
               type="success"
               @click="syncGoods"
               style="margin-left: 20px"
               >同步商品
-            </Button> -->
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+            </el-button> -->
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tabList"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="name">
-          <div class="product_box">
-            <div v-viewer>
-              <img :src="row.product.image" alt="" />
+        <el-table-column label="商品ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.product_id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品名称" min-width="120">
+          <template slot-scope="scope">
+            <div class="product_box">
+              <div v-viewer>
+                <img :src="scope.row.product.image" alt="" />
+              </div>
+              <div class="txt">{{ scope.row.name }}</div>
             </div>
-            <div class="txt">{{ row.name }}</div>
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="cost_price">
-          <div>{{ row.cost_price }}</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="stock">
-          <div>{{ row.product.stock }}</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          <div>{{ row.audit_status | liveStatusFilter }}</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="is_mer_show">
-          <i-switch
-            v-model="row.is_show"
-            :value="row.is_show"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-            :disabled="row.audit_status != 2"
-          >
-            <span slot="open">显示</span>
-            <span slot="close">隐藏</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row, '编辑')">详情</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除这条信息', index)">删除</a>
-        </template>
-      </Table>
+          </template>
+        </el-table-column>
+        <el-table-column label="直播价" min-width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="原价" min-width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.cost_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="库存" min-width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.product.stock }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核状态" min-width="80">
+          <template slot-scope="scope">
+            <div>{{ scope.row.audit_status | liveStatusFilter }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否显示" min-width="80">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.is_show"
+              :value="scope.row.is_show"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+              :disabled="scope.row.audit_status != 2"
+              active-text="显示"
+              inactive-text="隐藏"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row, '编辑')">详情</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除这条信息', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!--详情-->
     <Modal v-model="modals" title="商品详情" class="paymentFooter" scrollable width="700" :footer-hide="true">
       <goodsFrom ref="goodsDetail" />
@@ -178,7 +203,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -188,11 +213,6 @@ export default {
     this.getList();
   },
   methods: {
-    // 分页
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 直播间显示隐藏
     onchangeIsShow({ id, is_show }) {
       liveGoodsShow(id, is_show)
diff --git a/template/admin/src/pages/marketing/lottery/addGoods.vue b/template/admin/src/pages/marketing/lottery/addGoods.vue
index 840e4516a..04d92a686 100644
--- a/template/admin/src/pages/marketing/lottery/addGoods.vue
+++ b/template/admin/src/pages/marketing/lottery/addGoods.vue
@@ -1,36 +1,36 @@
 <template>
   <div>
-    <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="90">
-      <FormItem label="奖品" prop="type">
-        <RadioGroup v-model="formValidate.type">
-          <Radio :label="1">未中奖</Radio>
-          <Radio :label="5">优惠券</Radio>
-          <Radio :label="2">积分</Radio>
-          <Radio :label="6">商品</Radio>
-          <Radio :label="4">红包</Radio>
-          <Radio :label="3">余额</Radio>
-        </RadioGroup>
-      </FormItem>
-      <FormItem label="赠送优惠券：" v-if="formValidate.type == 5">
+    <el-form ref="formValidate" :model="formValidate" :rules="ruleValidate" label-width="90px">
+      <el-form-item label="奖品" prop="type">
+        <el-radio-group v-model="formValidate.type">
+          <el-radio :label="1">未中奖</el-radio>
+          <el-radio :label="5">优惠券</el-radio>
+          <el-radio :label="2">积分</el-radio>
+          <el-radio :label="6">商品</el-radio>
+          <el-radio :label="4">红包</el-radio>
+          <el-radio :label="3">余额</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="赠送优惠券：" v-if="formValidate.type == 5">
         <div v-if="couponName.length" class="mb20">
           <Tag closable v-for="(item, index) in couponName" :key="index" @on-close="handleClose(item)">{{
             item.title
           }}</Tag>
         </div>
-        <Button type="primary" @click="addCoupon" v-if="!couponName.length">添加优惠券</Button>
-      </FormItem>
-      <FormItem
+        <el-button type="primary" @click="addCoupon" v-if="!couponName.length">添加优惠券</el-button>
+      </el-form-item>
+      <el-form-item
         :label="[3, 4].includes(formValidate.type) ? '金额信息' : '积分数量'"
         prop="num"
         v-if="[2, 3, 4].includes(formValidate.type)"
       >
-        <InputNumber
+        <el-input-number controls-position="right"
           v-model="formValidate.num"
           placeholder="请输入金额数量"
           :max="formValidate.type == 4 ? 999 : 99999"
           :min="1"
           style="width: 300px"
-        ></InputNumber>
+        ></el-input-number>
         <div class="ml100 grey">
           {{
             formValidate.type == 3
@@ -40,8 +40,8 @@
               : ''
           }}
         </div>
-      </FormItem>
-      <FormItem v-if="formValidate.type == 6" label="商品" prop="goods_image">
+      </el-form-item>
+      <el-form-item v-if="formValidate.type == 6" label="商品" prop="goods_image">
         <template v-if="formValidate.goods_image">
           <div class="upload-list">
             <img :src="formValidate.goods_image" />
@@ -51,11 +51,11 @@
         <div v-else class="upLoad pictrueTab acea-row row-center-wrapper">
           <Icon type="ios-camera-outline" size="26" @click="changeGoods" />
         </div>
-      </FormItem>
-      <FormItem label="奖品名称" prop="name">
-        <Input v-model="formValidate.name" :maxlength="10" placeholder="请输入奖品名称" style="width: 300px"></Input>
-      </FormItem>
-      <FormItem label="奖品图片" prop="image">
+      </el-form-item>
+      <el-form-item label="奖品名称" prop="name">
+        <el-input v-model="formValidate.name" :maxlength="10" placeholder="请输入奖品名称" style="width: 300px"></el-input>
+      </el-form-item>
+      <el-form-item label="奖品图片" prop="image">
         <template v-if="formValidate.image">
           <div class="upload-list">
             <img :src="formValidate.image" />
@@ -66,34 +66,34 @@
           <Icon type="ios-camera-outline" size="26" @click="modalPic = true" />
         </div>
         <!-- <div class="info">选择商品</div> -->
-      </FormItem>
-      <FormItem label="奖品数量" prop="total">
-        <InputNumber
+      </el-form-item>
+      <el-form-item label="奖品数量" prop="total">
+        <el-input-number controls-position="right"
           v-model="formValidate.total"
           placeholder="请输入奖品数量"
           :max="99999"
           :min="0"
           :precision="0"
           style="width: 300px"
-        ></InputNumber>
-      </FormItem>
-      <FormItem label="奖品权重" prop="chance">
-        <InputNumber
+        ></el-input-number>
+      </el-form-item>
+      <el-form-item label="奖品权重" prop="chance">
+        <el-input-number controls-position="right"
           v-model="formValidate.chance"
           placeholder="请输入奖品权重"
           :max="100"
           :min="1"
           :precision="0"
           style="width: 300px"
-        ></InputNumber>
-      </FormItem>
-      <FormItem label="提示语" prop="prompt">
-        <Input v-model="formValidate.prompt" :maxlength="15" placeholder="请输入提示语" style="width: 300px"></Input>
-      </FormItem>
-      <FormItem>
-        <Button type="primary" @click="handleSubmit('formValidate')">提交</Button>
-      </FormItem>
-    </Form>
+        ></el-input-number>
+      </el-form-item>
+      <el-form-item label="提示语" prop="prompt">
+        <el-input v-model="formValidate.prompt" :maxlength="15" placeholder="请输入提示语" style="width: 300px"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="handleSubmit('formValidate')">提交</el-button>
+      </el-form-item>
+    </el-form>
     <!-- 上传图片-->
     <Modal
       v-model="modalPic"
diff --git a/template/admin/src/pages/marketing/lottery/create.vue b/template/admin/src/pages/marketing/lottery/create.vue
index 8e45ec95b..b4252209b 100644
--- a/template/admin/src/pages/marketing/lottery/create.vue
+++ b/template/admin/src/pages/marketing/lottery/create.vue
@@ -1,14 +1,14 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div>
-        <Tabs v-model="formValidate.factor" @on-click="onClickTab">
-          <TabPane v-for="(item, index) in tabs" :label="item.name" :name="item.type" :key="index" />
-        </Tabs>
+        <el-tabs v-model="formValidate.factor" @tab-click="onClickTab">
+          <el-tab-pane v-for="(item, index) in tabs" :label="item.name" :name="item.type" :key="index" />
+        </el-tabs>
       </div>
-      <Row type="flex" class="mt10 acea-row row-middle row-center">
-        <Col span="23">
-          <Form
+      <el-row class="mt10 acea-row row-middle row-center">
+        <el-col :span="23">
+          <el-form
             class="form mt30"
             ref="formValidate"
             :rules="ruleValidate"
@@ -18,69 +18,84 @@
             :label-position="labelPosition"
             @submit.native.prevent
           >
-            <Row type="flex">
-              <Col span="24">
-                <FormItem label="活动名称：" prop="name" label-for="name">
-                  <Input class="perW30" placeholder="请输入活动名称" element-id="name" v-model="formValidate.name" />
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="活动时间：">
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="活动名称：" prop="name" label-for="name">
+                  <el-input class="perW30" placeholder="请输入活动名称" element-id="name" v-model="formValidate.name" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="活动时间：">
                   <div class="acea-row row-middle">
                     <DatePicker
                       :editable="false"
                       type="datetimerange"
                       format="yyyy-MM-dd HH:mm"
                       placeholder="请选择活动时间"
-                      @on-change="onchangeTime"
+                      @change="onchangeTime"
                       class="perW30"
                       v-model="formValidate.period"
                     ></DatePicker>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="参与用户：" prop="attends_user" label-for="attends_user">
-                  <RadioGroup element-id="attends_user" v-model="formValidate.attends_user" @on-change="changeUsers">
-                    <Radio :label="1" class="radio">全部用户</Radio>
-                    <Radio :label="2">部分用户</Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.attends_user == 2">
-                <FormItem label="" :prop="formValidate.attends_user == 2 ? 'user_level' : ''">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="参与用户：" prop="attends_user" label-for="attends_user">
+                  <el-radio-group element-id="attends_user" v-model="formValidate.attends_user" @change="changeUsers">
+                    <el-radio :label="1" class="radio">全部用户</el-radio>
+                    <el-radio :label="2">部分用户</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="formValidate.attends_user == 2">
+                <el-form-item label="" :prop="formValidate.attends_user == 2 ? 'user_level' : ''">
                   <div class="acea-row row-middle">
-                    <Select multiple v-model="formValidate.user_level" class="perW30" placeholder="请选择用户等级">
-                      <Option v-for="item in userLevelListApi" :value="item.id" :key="item.id">{{ item.name }}</Option>
-                    </Select>
+                    <el-select multiple v-model="formValidate.user_level" class="perW30" placeholder="请选择用户等级">
+                      <el-option
+                        v-for="item in userLevelListApi"
+                        :value="item.id"
+                        :key="item.id"
+                        :label="item.name"
+                      ></el-option>
+                    </el-select>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.attends_user == 2">
-                <FormItem label="" :prop="formValidate.attends_user == 2 ? 'is_svip' : ''">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="formValidate.attends_user == 2">
+                <el-form-item label="" :prop="formValidate.attends_user == 2 ? 'is_svip' : ''">
                   <div class="acea-row row-middle">
-                    <Select v-model="formValidate.is_svip" class="perW30" clearable placeholder="请选择是否是付费会员">
-                      <Option v-for="item in templateList" :value="item.id" :key="item.id">{{ item.name }}</Option>
-                    </Select>
+                    <el-select
+                      v-model="formValidate.is_svip"
+                      class="perW30"
+                      clearable
+                      placeholder="请选择是否是付费会员"
+                    >
+                      <el-option
+                        v-for="item in templateList"
+                        :value="item.id"
+                        :key="item.id"
+                        :label="item.name"
+                      ></el-option>
+                    </el-select>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.attends_user == 2">
-                <FormItem label="" :prop="formValidate.attends_user == 2 ? 'user_label' : ''">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="formValidate.attends_user == 2">
+                <el-form-item label="" :prop="formValidate.attends_user == 2 ? 'user_label' : ''">
                   <div class="acea-row row-middle">
-                    <!-- <Select
+                    <!-- <el-select
                       multiple
                       v-model="formValidate.user_label"
                       class="perW30"
                       placeholder="请选择用户标签"
                     >
-                      <Option
+                      <el-option
                         v-for="item in userLabelList"
                         :value="String(item.id)"
                         :key="item.id"
-                        >{{ item.label_name }}</Option
+                        >{{ item.label_name }}</el-option
                       >
-                    </Select> -->
+                    </el-select> -->
                     <div class="labelInput acea-row row-between-wrapper" @click="selectLabelShow = true">
                       <div class="">
                         <div v-if="selectDataLabel.length">
@@ -98,29 +113,30 @@
                     </div>
                   </div>
                   <div class="ml100 grey">三个条件都设置后,必须这些条件都满足的用户才能参加抽奖</div>
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.factor == 5">
-                <FormItem
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="formValidate.factor == 5">
+                <el-form-item
                   label="抽奖次数："
                   :prop="formValidate.factor == 5 ? 'lottery_num_term' : ''"
                   label-for="status"
                 >
-                  <RadioGroup element-id="lottery_num_term" v-model="formValidate.lottery_num_term">
-                    <Radio :label="1" class="radio">每天N次</Radio>
-                    <Radio :label="2">每人N次</Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.factor == 5">
-                <FormItem
+                  <el-radio-group element-id="lottery_num_term" v-model="formValidate.lottery_num_term">
+                    <el-radio :label="1" class="radio">每天N次</el-radio>
+                    <el-radio :label="2">每人N次</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="formValidate.factor == 5">
+                <el-form-item
                   label="邀请新用户最多可获得抽奖"
                   :prop="formValidate.factor == 5 ? 'lottery_num' : ''"
                   label-for="lottery_num"
                 >
                   <div class="acea-row row-middle">
                     <div class="mr10 grey"></div>
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       placeholder=""
                       element-id="lottery_num"
                       :min="1"
@@ -130,17 +146,18 @@
                     />
                     <div class="ml10 grey">次</div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.factor == 5">
-                <FormItem
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="formValidate.factor == 5">
+                <el-form-item
                   label="邀请一位新用户关注公众号可获得抽奖"
                   :prop="formValidate.factor == 5 ? 'spread_num' : ''"
                   label-for="spread_num"
                 >
                   <div class="acea-row row-middle">
                     <div class="mr10 grey"></div>
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       placeholder=""
                       element-id="spread_num"
                       :min="1"
@@ -150,10 +167,13 @@
                     />
                     <div class="ml10 grey">次</div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.factor == 1 || formValidate.factor == 3 || formValidate.factor == 4">
-                <FormItem
+                </el-form-item>
+              </el-col>
+              <el-col
+                :span="24"
+                v-if="formValidate.factor == 1 || formValidate.factor == 3 || formValidate.factor == 4"
+              >
+                <el-form-item
                   :label="formValidate.factor == 1 ? '抽奖消耗积分：' : '抽奖次数：'"
                   :prop="
                     formValidate.factor == 1 || formValidate.factor == 3 || formValidate.factor == 4 ? 'factor_num' : ''
@@ -162,7 +182,8 @@
                 >
                   <div class="acea-row row-middle">
                     <div class="mr10 grey"></div>
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       placeholder=""
                       element-id="factor_num"
                       :min="1"
@@ -172,83 +193,108 @@
                     />
                     <div class="ml10 grey" v-if="formValidate.factor !== 1">次</div>
                   </div>
-                </FormItem>
-              </Col>
-            </Row>
-            <Row>
-              <Col span="24">
-                <FormItem label="规格选择：" prop="prize">
-                  <Table :data="specsData" :columns="columns" border :draggable="true" @on-drag-drop="onDragDrop">
-                    <template slot-scope="{ row, index }" slot="image">
-                      <div class="acea-row row-middle row-center-wrapper" @click="modalPicTap('dan', 'goods', index)">
-                        <div class="pictrue pictrueTab" v-if="row.image">
-                          <img v-lazy="row.image" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="规格选择：" prop="prize">
+                  <el-table :data="specsData" border :draggable="true" @on-drag-drop="onDragDrop">
+                    <el-table-column label="序号" type="index" width="50"> </el-table-column>
+                    <el-table-column label="图片" min-width="80">
+                      <template slot-scope="scope">
+                        <div
+                          class="acea-row scope.row-middle scope.row-center-wrapper"
+                          @click="modalPicTap('dan', 'goods', index)"
+                        >
+                          <div class="pictrue pictrueTab" v-if="scope.row.image">
+                            <img v-lazy="scope.row.image" />
+                          </div>
+                          <div class="upLoad pictrueTab acea-row scope.row-center-wrapper" v-else>
+                            <Icon type="ios-camera-outline" size="21" class="iconfonts" />
+                          </div>
                         </div>
-                        <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
-                          <Icon type="ios-camera-outline" size="21" class="iconfonts" />
-                        </div>
-                      </div>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="total">
-                      <InputNumber
-                        v-model="row.total"
-                        :max="99999"
-                        :min="0"
-                        :precision="0"
-                        class="priceBox"
-                        @on-change="
-                          (data) => {
-                            changeTotal(data, index);
-                          }
-                        "
-                      ></InputNumber>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="chance">
-                      <InputNumber
-                        v-model="row.chance"
-                        :max="100"
-                        :min="0"
-                        :precision="0"
-                        class="priceBox"
-                        @on-change="
-                          (data) => {
-                            changeChance(data, index);
-                          }
-                        "
-                      ></InputNumber>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="type">
-                      <div>{{ row.type | typeName }}</div>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="setting">
-                      <Button class="submission mr15" @click="editGoods(index)">编辑</Button>
-                      <!-- <Button
-                        v-if="row.type !== 1"
-                        class="submission mr15"
-                        @click="deleteGoods(index)"
-                        >删除</Button
-                      > -->
-                    </template>
-                  </Table>
-                  <Button v-if="specsData.length < 8" type="primary" class="submission mr15 mt20" @click="addGoods"
-                    >添加商品</Button
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="名称" min-width="80">
+                      <template slot-scope="scope">
+                        <div>{{ scope.row.name }}</div>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="奖品" min-width="80">
+                      <template slot-scope="scope">
+                        <div>{{ scope.row.type | typeName }}</div>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="提示语" min-width="80">
+                      <template slot-scope="scope">
+                        <div>{{ scope.row.prompt }}</div>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="数量" min-width="80">
+                      <template slot-scope="scope">
+                        <el-input-number
+                          controls-position="right"
+                          v-model="scope.row.total"
+                          :max="99999"
+                          :min="0"
+                          :precision="0"
+                          class="priceBox"
+                          @change="
+                            (data) => {
+                              changeTotal(data, index);
+                            }
+                          "
+                        ></el-input-number>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="奖品权重" min-width="80">
+                      <template slot-scope="scope">
+                        <el-input-number
+                          controls-position="right"
+                          v-model="scope.row.chance"
+                          :max="100"
+                          :min="0"
+                          :precision="0"
+                          class="priceBox"
+                          @change="
+                            (data) => {
+                              changeChance(data, index);
+                            }
+                          "
+                        ></el-input-number>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="奖品概率" min-width="80">
+                      <template slot-scope="scope">
+                        <div>{{ scope.row.probability }}</div>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="操作" fixed="right" width="120">
+                      <template slot-scope="scope">
+                        <el-button class="submission mr15" @click="editGoods(index)">编辑</el-button>
+                      </template></el-table-column
+                    >
+                  </el-table>
+                  <el-button v-if="specsData.length < 8" type="primary" class="submission mr15 mt20" @click="addGoods"
+                    >添加商品</el-button
                   >
-                </FormItem>
-                <FormItem>
+                </el-form-item>
+                <el-form-item>
                   <div class="pl60 grey">
                     奖品必须设置为8个，列表中拖拽可调整奖品在九宫中的位置
-                    <Poptip placement="bottom" width="380">
+                    <el-tooltip effect="light" placement="bottom" width="380">
                       <a>查看位置示例图</a>
                       <div class="api" slot="content">
                         <img src="../../../assets/images/lotteryTest.png" alt="" />
                       </div>
-                    </Poptip>
+                    </el-tooltip>
                   </div>
-                </FormItem>
-              </Col>
-            </Row>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <div>
-              <FormItem
+              <el-form-item
                 v-if="formValidate.factor != 3 && formValidate.factor != 4"
                 :prop="formValidate.factor != 3 && formValidate.factor != 4 ? 'image' : ''"
               >
@@ -262,47 +308,47 @@
                 <div class="acea-row">
                   <div class="pictrue" v-if="formValidate.image">
                     <img v-lazy="formValidate.image" />
-                    <Button shape="circle" icon="md-close" @click.native="handleRemove()" class="btndel"></Button>
+                    <el-button shape="circle" icon="md-close" @click.native="handleRemove()" class="btndel"></el-button>
                   </div>
                   <div v-else class="upLoad acea-row row-center-wrapper" @click="modalPicTap('dan', 'danFrom')">
                     <Icon type="ios-camera-outline" size="26" class="iconfonts" />
                   </div>
                 </div>
-              </FormItem>
-              <FormItem
+              </el-form-item>
+              <el-form-item
                 v-if="formValidate.factor != 3 && formValidate.factor != 4"
                 label="中奖名单："
                 :prop="formValidate.factor != 3 && formValidate.factor != 4 ? 'is_all_record' : ''"
                 label-for="is_all_record"
               >
-                <RadioGroup element-id="is_all_record" v-model="formValidate.is_all_record">
-                  <Radio :label="0">关闭</Radio>
-                  <Radio :label="1" class="radio">开启</Radio>
-                </RadioGroup>
-              </FormItem>
-              <FormItem
+                <el-radio-group element-id="is_all_record" v-model="formValidate.is_all_record">
+                  <el-radio :label="0">关闭</el-radio>
+                  <el-radio :label="1" class="radio">开启</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item
                 v-if="formValidate.factor != 3 && formValidate.factor != 4"
                 label="个人中奖记录："
                 :prop="formValidate.factor != 3 && formValidate.factor != 4 ? 'is_personal_record' : ''"
                 label-for="is_personal_record"
               >
-                <RadioGroup element-id="is_personal_record" v-model="formValidate.is_personal_record">
-                  <Radio :label="0">关闭</Radio>
-                  <Radio :label="1" class="radio">开启</Radio>
-                </RadioGroup>
-              </FormItem>
-              <FormItem
+                <el-radio-group element-id="is_personal_record" v-model="formValidate.is_personal_record">
+                  <el-radio :label="0">关闭</el-radio>
+                  <el-radio :label="1" class="radio">开启</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item
                 v-if="formValidate.factor != 3 && formValidate.factor != 4"
                 label="活动规则："
                 prop="is_content"
                 label-for="is_content"
               >
-                <RadioGroup element-id="is_content" v-model="formValidate.is_content">
-                  <Radio :label="0">关闭</Radio>
-                  <Radio :label="1" class="radio">开启</Radio>
-                </RadioGroup>
-              </FormItem>
-              <FormItem
+                <el-radio-group element-id="is_content" v-model="formValidate.is_content">
+                  <el-radio :label="0">关闭</el-radio>
+                  <el-radio :label="1" class="radio">开启</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item
                 label=""
                 :prop="
                   formValidate.factor != 3 && formValidate.factor != 4 && formValidate.is_content == 1 ? 'content' : ''
@@ -314,25 +360,25 @@
                   :content="formValidate.content"
                   @editorContent="getEditorContent"
                 ></WangEditor>
-              </FormItem>
-              <FormItem label="活动状态：" prop="status" label-for="status">
-                <RadioGroup element-id="status" v-model="formValidate.status">
-                  <Radio :label="0">关闭</Radio>
-                  <Radio :label="1" class="radio">开启</Radio>
-                </RadioGroup>
-              </FormItem>
+              </el-form-item>
+              <el-form-item label="活动状态：" prop="status" label-for="status">
+                <el-radio-group element-id="status" v-model="formValidate.status">
+                  <el-radio :label="0">关闭</el-radio>
+                  <el-radio :label="1" class="radio">开启</el-radio>
+                </el-radio-group>
+              </el-form-item>
             </div>
-            <FormItem>
-              <Button type="primary" class="submission" :loading="submitOpen" @click="next('formValidate')">
+            <el-form-item>
+              <el-button type="primary" class="submission" :loading="submitOpen" @click="next('formValidate')">
                 <div v-if="!submitOpen">提交</div>
                 <div v-else>提交中</div>
-              </Button>
-            </FormItem>
+              </el-button>
+            </el-form-item>
             <Spin size="large" fix v-if="spinShow"></Spin>
-          </Form>
-        </Col>
-      </Row>
-    </Card>
+          </el-form>
+        </el-col>
+      </el-row>
+    </el-card>
 
     <!-- 上传图片-->
     <Modal
@@ -450,62 +496,6 @@ export default {
         { id: 0, name: '非付费会员' },
         { id: 1, name: '付费会员' },
       ],
-      columns: [
-        {
-          title: '序号',
-          type: 'index',
-          width: 60,
-          align: 'center',
-        },
-        {
-          title: '图片',
-          slot: 'image',
-          align: 'center',
-          minWidth: 120,
-        },
-        {
-          title: '名称',
-          align: 'center',
-          minWidth: 80,
-          key: 'name',
-        },
-        {
-          title: '奖品',
-          slot: 'type',
-          align: 'center',
-          minWidth: 80,
-        },
-        {
-          title: '提示语',
-          key: 'prompt',
-          align: 'center',
-          minWidth: 80,
-        },
-        {
-          title: '数量',
-          slot: 'total',
-          align: 'center',
-          minWidth: 80,
-        },
-        {
-          title: '奖品权重',
-          slot: 'chance',
-          align: 'center',
-          minWidth: 80,
-        },
-        {
-          title: '奖品概率',
-          key: 'probability',
-          align: 'center',
-          minWidth: 80,
-        },
-        {
-          title: '操作',
-          slot: 'setting',
-          align: 'center',
-          minWidth: 80,
-        },
-      ],
       specsData: [
         {
           type: 1, //类型 1：未中奖 2：积分  3:余额  4：红包 5:优惠券 6：站内商品
@@ -633,7 +623,7 @@ export default {
   computed: {
     ...mapState('admin/layout', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 135;
+      return this.isMobile ? undefined : '135px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -662,8 +652,7 @@ export default {
       this.selectDataLabel = data;
     },
     onClickTab(e) {
-      this.formValidate.factor = e;
-      this.getInfo(e);
+      this.getInfo(this.formValidate.factor);
     },
     getEditorContent(data) {
       this.content = data;
diff --git a/template/admin/src/pages/marketing/lottery/index.vue b/template/admin/src/pages/marketing/lottery/index.vue
index 6c078e276..e86f69fae 100644
--- a/template/admin/src/pages/marketing/lottery/index.vue
+++ b/template/admin/src/pages/marketing/lottery/index.vue
@@ -1,64 +1,64 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="tableFrom"
         :model="tableFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col>
-            <FormItem label="活动类型：" clearable>
-              <Select
+        <el-scope.row :gutter="24">
+          <el-col>
+            <el-form-item label="活动类型：" clearable>
+              <el-select
                 style="width: 200px"
                 v-model="tableFrom.factor"
                 placeholder="请选择活动类型"
                 clearable
-                @on-change="userSearchs"
+                @change="userSearchs"
               >
-                <Option value="1">积分抽取</Option>
-                <!-- <Option value="2">余额</Option> -->
-                <Option value="3">订单支付</Option>
-                <Option value="4">订单评价</Option>
-                <!-- <Option value="5">关注公众号</Option> -->
-              </Select>
-            </FormItem>
-          </Col>
-          <Col>
-            <FormItem label="活动状态：" clearable>
-              <Select
+                <el-option value="1" label="积分抽取"></el-option>
+                <!-- <el-option value="2">余额</el-option> -->
+                <el-option value="3" label="订单支付"></el-option>
+                <el-option value="4" label="订单评价"></el-option>
+                <!-- <el-option value="5">关注公众号</el-option> -->
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col>
+            <el-form-item label="活动状态：" clearable>
+              <el-select
                 style="width: 200px"
                 v-model="tableFrom.start_status"
                 placeholder="请选择"
                 clearable
-                @on-change="userSearchs"
+                @change="userSearchs"
               >
-                <Option value="0">未开始</Option>
-                <Option value="1">进行中</Option>
-                <Option value="-1">已结束</Option>
-              </Select>
-            </FormItem>
-          </Col>
+                <el-option value="0" label="未开始"></el-option>
+                <el-option value="1" label="进行中"></el-option>
+                <el-option value="-1" label="已结束"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-          <Col>
-            <FormItem label="上架状态：">
-              <Select
+          <el-col>
+            <el-form-item label="上架状态：">
+              <el-select
                 style="width: 200px"
                 placeholder="请选择"
                 v-model="tableFrom.status"
                 clearable
-                @on-change="userSearchs"
+                @change="userSearchs"
               >
-                <Option value="1">上架</Option>
-                <Option value="0">下架</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col>
-            <FormItem label="抽奖搜索：" label-for="store_name">
-              <Input
+                <el-option value="1" label="上架"></el-option>
+                <el-option value="0" label="下架"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col>
+            <el-form-item label="抽奖搜索：" label-for="store_name">
+              <el-input
                 search
                 enter-button
                 style="width: 200px"
@@ -66,80 +66,107 @@
                 v-model="tableFrom.store_name"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex" class="mb20">
-          <Button v-auth="['marketing-store_bargain-create']" type="primary" icon="md-add" @click="add" class="mr10"
-            >添加抽奖</Button
+            </el-form-item>
+          </el-col>
+        </el-scope.row>
+        <el-scope.row class="mb20">
+          <el-button v-auth="['marketing-store_bargain-create']" type="primary" icon="md-add" @click="add" class="mr10"
+            >添加抽奖</el-button
           >
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+        </el-scope.row>
+      </el-form>
+      <el-table
         :data="tableList"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-scope.row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="is_fail">
-          <Icon type="md-checkmark" v-if="row.is_fail === 1" color="#0092DC" size="14" />
-          <Icon type="md-close" v-else color="#ed5565" size="14" />
-        </template>
-        <template slot-scope="{ row, index }" slot="image">
-          <viewer>
-            <div class="tabBox_img">
-              <img v-lazy="row.image" />
-            </div>
-          </viewer>
-        </template>
-
-        <template slot-scope="{ row, index }" slot="bargain_min_price">
-          <span>{{ row.bargain_min_price }}~{{ row.bargain_max_price }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          {{ status == 0 ? '开启' : '关闭' }}
-        </template>
-        <template slot-scope="{ row, index }" slot="time">
-          <div>起：{{ row.start_time || '--' }}</div>
-          <div>止：{{ row.end_time || '--' }}</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            :disabled="row.lottery_status == 2 ? true : false"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">上架</span>
-            <span slot="close">下架</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row)">编辑</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除抽奖', index)">删除</a>
-          <Divider type="vertical" />
-          <a @click="copy(row)">复制</a>
-          <Divider type="vertical" />
-          <a @click="getRecording(row)">抽奖记录</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="活动名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="活动类型" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.lottery_type }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="参与次数" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.lottery_all }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="抽奖人数" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.lottery_people }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="中奖人数" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.lottery_win }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="活动状态" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.status_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="上架状态" min-width="130">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              :value="scope.row.status"
+              :disabled="scope.row.lottery_status == 2 ? true : false"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+              active-text="上架"
+              inactive-text="下架"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="活动时间" min-width="130">
+          <template slot-scope="scope">
+            <div>起：{{ scope.row.start_time || '--' }}</div>
+            <div>止：{{ scope.row.end_time || '--' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="活动状态" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.status_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除抽奖', index)">删除</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="copy(scope.row)">复制</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="getRecording(scope.row)">抽奖记录</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="tableFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="tableFrom.limit"
+          :page.sync="tableFrom.page"
+          :limit.sync="tableFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -160,59 +187,6 @@ export default {
   data() {
     return {
       loading: false,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '活动名称',
-          key: 'name',
-          minWidth: 90,
-        },
-        {
-          title: '活动类型',
-          key: 'lottery_type',
-          minWidth: 130,
-        },
-        {
-          title: '参与次数',
-          key: 'lottery_all',
-          minWidth: 100,
-        },
-        {
-          title: '抽奖人数',
-          key: 'lottery_people',
-          minWidth: 100,
-        },
-        {
-          title: '中奖人数',
-          key: 'lottery_win',
-          minWidth: 100,
-        },
-        {
-          title: '活动状态',
-          key: 'status_name',
-          minWidth: 100,
-        },
-        {
-          title: '上架状态',
-          slot: 'status',
-          minWidth: 100,
-        },
-        {
-          title: '活动时间',
-          slot: 'time',
-          minWidth: 100,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 130,
-        },
-      ],
       tableList: [],
       tableFrom: {
         start_status: '',
@@ -229,7 +203,7 @@ export default {
   computed: {
     ...mapState('admin/layout', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -306,10 +280,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.tableFrom.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.tableFrom.page = 1;
diff --git a/template/admin/src/pages/marketing/lottery/recordingList.vue b/template/admin/src/pages/marketing/lottery/recordingList.vue
index c764ee09e..43a6719e1 100644
--- a/template/admin/src/pages/marketing/lottery/recordingList.vue
+++ b/template/admin/src/pages/marketing/lottery/recordingList.vue
@@ -1,31 +1,33 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="tableFrom"
         :model="tableFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col>
-            <FormItem label="活动类型：" clearable>
-              <RadioGroup v-model="tableFrom.factor" type="button" @on-change="selectChangeFactor()" class="mr">
-                <Radio :label="1">积分抽取</Radio>
-                <Radio :label="3">订单支付</Radio>
-                <Radio :label="4">订单评价</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="时间选择：">
-              <RadioGroup v-model="tableFrom.data" type="button" @on-change="selectChange(tableFrom.data)" class="mr">
-                <Radio :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{ item.text }}</Radio>
-              </RadioGroup>
+        <el-row :gutter="24">
+          <el-col>
+            <el-form-item label="活动类型：" clearable>
+              <el-radio-group v-model="tableFrom.factor" type="button" @change="selectChangeFactor()" class="mr">
+                <el-radio-button :label="1">积分抽取</el-radio-button>
+                <el-radio-button :label="3">订单支付</el-radio-button>
+                <el-radio-button :label="4">订单评价</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="时间选择：">
+              <el-radio-group v-model="tableFrom.data" type="button" @change="selectChange(tableFrom.data)" class="mr">
+                <el-radio-button :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{
+                  item.text
+                }}</el-radio-button>
+              </el-radio-group>
               <DatePicker
                 :editable="false"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="daterange"
@@ -33,104 +35,121 @@
                 placeholder="自定义时间"
                 style="width: 200px"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="奖品类型：">
-              <RadioGroup v-model="tableFrom.type" type="button" @on-change="selectType()" class="mr">
-                <Radio :label="item.val" v-for="(item, i) in typeList" :key="i">{{ item.text }}</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <!-- <Col v-bind="grid">
-            <FormItem label="领取状态：" clearable>
-              <Select
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="奖品类型：">
+              <el-radio-group v-model="tableFrom.type" type="button" @change="selectType()" class="mr">
+                <el-radio-button :label="item.val" v-for="(item, i) in typeList" :key="i">{{
+                  item.text
+                }}</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col v-bind="grid">
+            <el-form-item label="领取状态：" clearable>
+              <el-select
                 v-model="tableFrom.is_receive"
                 placeholder="请选择"
                 clearable
-                @on-change="userSearchs"
+                @change="userSearchs"
               >
-                <Option value="0">待发货</Option>
-                <Option value="1">已发货</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="处理状态：" clearable>
-              <Select
+                <el-option value="0">待发货</el-option>
+                <el-option value="1">已发货</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="处理状态：" clearable>
+              <el-select
                 v-model="tableFrom.is_deliver"
                 placeholder="请选择"
                 clearable
-                @on-change="userSearchs"
+                @change="userSearchs"
               >
-                <Option value="0">未处理</Option>
-                <Option value="1">已处理</Option>
-              </Select>
-            </FormItem>
-          </Col> -->
-          <Col v-bind="grid">
-            <FormItem label="搜索用户：" label-for="store_name">
-              <Input
+                <el-option value="0">未处理</el-option>
+                <el-option value="1">已处理</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col> -->
+          <el-col v-bind="grid">
+            <el-form-item label="搜索用户：" label-for="store_name">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入用户信息"
                 v-model="tableFrom.keyword"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-      <Table
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :columns="columns1"
         :data="tableList"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="is_fail">
-          <Icon type="md-checkmark" v-if="row.is_fail === 1" color="#0092DC" size="14" />
-          <Icon type="md-close" v-else color="#ed5565" size="14" />
-        </template>
-        <template slot-scope="{ row, index }" slot="user">
-          <span>{{ row.user.nickname }} </span>
-        </template>
-        <template slot-scope="{ row, index }" slot="mark">
-          <span>{{ row.deliver_info.mark }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="receive_info">
-          <div v-if="row.receive_info.name">
-            <div>姓名：{{ row.receive_info.name }}</div>
-            <div>电话：{{ row.receive_info.phone }}</div>
-            <div>地址：{{ row.receive_info.address }}</div>
-            <div v-if="row.receive_info.mark">备注：{{ row.receive_info.mark }}</div>
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="prize">
-          <div class="prize">
-            <img :src="row.prize.image" alt="" />
-            <span>{{ row.prize.name }}</span>
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="deliver(row, 1)" v-if="row.type == 6 && row.is_deliver === 0">发货</a>
-          <a v-else-if="row.type == 6 && row.is_deliver === 1" @click="isDeliver(row)">配送信息</a>
-          <Divider type="vertical" v-if="row.type == 6" />
-          <a @click="deliver(row, 2)">备注</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <div>{{ scope.row.id }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户信息" min-width="90">
+          <template slot-scope="scope">
+            <span>{{ scope.row.user.nickname }} </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="奖品信息" min-width="130">
+          <template slot-scope="scope">
+            <div class="prize">
+              <img :src="scope.row.prize.image" alt="" />
+              <span>{{ scope.row.prize.name }}</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="抽奖时间" min-width="100">
+          <template slot-scope="scope">
+            <div>{{ scope.row.add_time }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="收货信息" min-width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.receive_info.name">
+              <div>姓名：{{ scope.row.receive_info.name }}</div>
+              <div>电话：{{ scope.row.receive_info.phone }}</div>
+              <div>地址：{{ scope.row.receive_info.address }}</div>
+              <div v-if="scope.row.receive_info.mark">备注：{{ scope.row.receive_info.mark }}</div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.deliver_info.mark }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="120">
+          <template slot-scope="scope">
+            <a @click="deliver(scope.row, 1)" v-if="scope.row.type == 6 && scope.row.is_deliver === 0">发货</a>
+            <a v-else-if="scope.row.type == 6 && scope.row.is_deliver === 1" @click="isDeliver(scope.row)">配送信息</a>
+            <el-divider direction="vertical" v-if="scope.row.type == 6" />
+            <a @click="deliver(scope.row, 2)">备注</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="tableFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="tableFrom.limit"
+          :page.sync="tableFrom.page"
+          :limit.sync="tableFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!-- 发货-->
     <Modal
       v-model="shipModel"
@@ -142,32 +161,32 @@
       :mask-closable="false"
       :z-index="1"
     >
-      <Form
+      <el-form
         v-model="shipModel"
         :ref="modelType === 1 ? 'shipForm' : 'markForm'"
         :model="modelType === 1 ? shipForm : markForm"
         :rules="modelType === 1 ? ruleShip : ruleMark"
-        :label-width="80"
+        label-width="85px"
       >
-        <FormItem v-if="modelType === 1" label="快递公司" prop="deliver_name">
-          <Select v-model="shipForm.deliver_name">
-            <Option v-for="item in locationList" :value="item.value" :key="item.id">{{ item.value }}</Option>
-          </Select>
-        </FormItem>
-        <FormItem v-if="modelType === 1" label="快递单号" prop="deliver_number">
-          <Input v-model="shipForm.deliver_number" placeholder="请输入快递单号"></Input>
+        <el-form-item v-if="modelType === 1" label="快递公司" prop="deliver_name">
+          <el-select v-model="shipForm.deliver_name">
+            <el-option v-for="item in locationList" :value="item.value" :key="item.id" :label="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="modelType === 1" label="快递单号" prop="deliver_number">
+          <el-input v-model="shipForm.deliver_number" placeholder="请输入快递单号"></el-input>
           <div class="trips" v-if="shipForm.deliver_name == '顺丰速运'">
             <p>顺丰请输入单号 :收件人或寄件人手机号后四位</p>
             <p>例如：SF000000000000:3941</p>
           </div>
-        </FormItem>
-        <FormItem v-if="modelType === 2" label="备注">
-          <Input v-model="markForm.mark" placeholder="请输入备注"></Input>
-        </FormItem>
-        <FormItem>
-          <Button type="primary" @click="ok(modelType === 1 ? 'shipForm' : 'markForm')">提交</Button>
-          <Button @click="cancel('formValidate')" style="margin-left: 8px">关闭</Button>
-        </FormItem></Form
+        </el-form-item>
+        <el-form-item v-if="modelType === 2" label="备注">
+          <el-input v-model="markForm.mark" placeholder="请输入备注"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="ok(modelType === 1 ? 'shipForm' : 'markForm')">提交</el-button>
+          <el-button @click="cancel('formValidate')" style="margin-left: 8px">关闭</el-button>
+        </el-form-item></el-form
       >
     </Modal>
   </div>
@@ -226,44 +245,6 @@ export default {
         { text: '优惠券', val: '5' },
         { text: '商品', val: '6' },
       ],
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '用户信息',
-          slot: 'user',
-          minWidth: 90,
-        },
-        {
-          title: '奖品信息',
-          slot: 'prize',
-          minWidth: 130,
-        },
-        {
-          title: '抽奖时间',
-          key: 'add_time',
-          minWidth: 100,
-        },
-        {
-          title: '收货信息',
-          slot: 'receive_info',
-          minWidth: 100,
-        },
-        {
-          title: '备注',
-          slot: 'mark',
-          minWidth: 100,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 130,
-        },
-      ],
       tableList: [],
       grid: {
         xl: 7,
@@ -289,7 +270,7 @@ export default {
   computed: {
     ...mapState('admin/layout', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -397,10 +378,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.tableFrom.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.tableFrom.page = 1;
diff --git a/template/admin/src/pages/marketing/point_record/index.vue b/template/admin/src/pages/marketing/point_record/index.vue
index 7f5f18ddb..5e9117b30 100644
--- a/template/admin/src/pages/marketing/point_record/index.vue
+++ b/template/admin/src/pages/marketing/point_record/index.vue
@@ -1,20 +1,20 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt mb10">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt mb10">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex">
-          <Col span="6">
-            <FormItem label="订单时间：">
+        <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="订单时间：">
               <!-- <dateRadio @selectDate="onSelectDate"></dateRadio> -->
               <DatePicker
                 :editable="false"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="daterange"
@@ -25,76 +25,84 @@
                 clearable
                 class="mr20"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col span="6">
-            <FormItem label="交易类型：">
-              <Select
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="交易类型：">
+              <el-select
                 type="button"
                 v-model="formValidate.trading_type"
                 class="mr15"
-                @on-change="selChange"
+                @change="selChange"
                 style="width: 100%"
                 clearable
               >
-                <Option
+                <el-option
                   :label="item"
                   :value="Object.keys(withdrawal)[index]"
                   v-for="(item, index) in Object.values(withdrawal)"
                   :key="index"
-                  >{{ item }}</Option
-                >
-              </Select>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-    </Card>
-    <Card :bordered="false" dis-hover>
-      <Table
-        ref="table"
-        :columns="columns"
-        :data="tabList"
-        class="ivu-mt"
-        :loading="loading"
-        no-data-text="暂无数据"
-        no-filtered-data-text="暂无筛选结果"
-      >
-        <template slot-scope="{ row }" slot="extract_price">
-          <div>{{ row.extract_price }}</div>
-        </template>
-        <template slot-scope="{ row }" slot="pay_type">
-          <div v-for="item in payment" :key="item.value">
-            <span v-if="row.pay_type == item.value"> {{ item.title }} </span>
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="number">
-          <div v-if="row.pm" class="z-price">+ {{ row.number }}</div>
-          <div v-else class="f-price">- {{ row.number }}</div>
-        </template>
-        <template slot-scope="{ row }" slot="add_time">
-          <span> {{ row.add_time | formatDate }}</span>
-        </template>
-        <template slot-scope="{ row }" slot="set">
-          <a class="item" @click="setMark(row)">备注</a>
-        </template>
-      </Table>
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <el-card :bordered="false" shadow="never">
+      <el-table ref="table" :data="tabList" class="ivu-mt" :loading="loading" empty-text="暂无数据">
+        <el-table-column label="ID" min-width="50">
+          <template slot-scope="scope">
+            <div>{{ scope.row.id }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="关联订单" min-width="100">
+          <template slot-scope="scope">
+            <div>{{ scope.row.relation }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="交易时间" min-width="100">
+          <template slot-scope="scope">
+            <div>{{ scope.row.add_time }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="交易积分" min-width="80">
+          <template slot-scope="scope">
+            <div v-if="scope.row.pm" class="z-price">+ {{ scope.row.number }}</div>
+            <div v-else class="f-price">- {{ scope.row.number }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户" min-width="80">
+          <template slot-scope="scope">
+            <div>{{ scope.row.nickname }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="交易类型" min-width="100">
+          <template slot-scope="scope">
+            <div>{{ scope.row.type_name }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" width="100">
+          <template slot-scope="scope">
+            <a class="item" @click="setMark(scope.row)">备注</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!-- 拒绝通过-->
     <Modal v-model="modals" scrollable closable title="备注" :mask-closable="false">
-      <Input v-model="mark_msg.mark" type="textarea" :rows="4" placeholder="请输入备注" />
+      <el-input v-model="mark_msg.mark" type="textarea" :rows="4" placeholder="请输入备注" />
       <div slot="footer">
-        <Button type="primary" size="large" long :loading="modal_loading" @click="oks">确定</Button>
+        <el-button type="primary" size="large" long :loading="modal_loading" @click="oks">确定</el-button>
       </div>
     </Modal>
   </div>
@@ -210,7 +218,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -280,10 +288,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 编辑提交成功
     submitFail() {
       this.getList();
diff --git a/template/admin/src/pages/marketing/point_statistic/index.vue b/template/admin/src/pages/marketing/point_statistic/index.vue
index 416f25116..26fb51575 100644
--- a/template/admin/src/pages/marketing/point_statistic/index.vue
+++ b/template/admin/src/pages/marketing/point_statistic/index.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mb-16">
+    <el-card :bordered="false" shadow="never" class="ivu-mb-16">
       <dateRadio @selectDate="onSelectDate"></dateRadio>
       <DatePicker
         :editable="false"
         :clearable="false"
-        @on-change="onchangeTime"
+        @change="onchangeTime"
         :value="timeVal"
         format="yyyy/MM/dd"
         type="daterange"
@@ -15,72 +15,96 @@
         :options="options"
         class="mr20"
       ></DatePicker>
-    </Card>
+    </el-card>
     <cards-data :cardLists="cardLists" v-if="cardLists.length >= 0"></cards-data>
-    <Card :bordered="false" dis-hover>
+    <el-card :bordered="false" shadow="never">
       <h3>积分使用趋势</h3>
       <echarts-new :option-data="optionData" :styles="style" height="100%" width="100%" v-if="optionData"></echarts-new>
-    </Card>
+    </el-card>
     <Spin size="large" fix v-if="spinShow"></Spin>
     <div class="code-row-bg">
-      <Card :bordered="false" dis-hover class="ivu-mt mt10 mr10">
+      <el-card :bordered="false" shadow="never" class="ivu-mt mt10 mr10">
         <div class="acea-row row-between-wrapper">
           <h3 class="header-title">积分来源分析</h3>
           <div class="change-style" @click="echartLeft = !echartLeft">切换样式</div>
         </div>
         <div class="ech-box">
           <echarts-from v-if="echartLeft" ref="visitChart" :infoList="infoList" echartsTitle="circle"></echarts-from>
-          <Table
+          <el-table
             v-show="!echartLeft"
             ref="selection"
-            :columns="columns"
             :data="tabList"
             :loading="loading"
-            no-data-text="暂无数据"
-            highlight-row
-            no-filtered-data-text="暂无筛选结果"
+            empty-text="暂无数据"
+            highlight-current-row
+            
           >
-            <template slot-scope="{ row }" slot="percent">
-              <div class="percent-box">
-                <div class="line">
-                  <div class="bg"></div>
-                  <div class="percent" :style="'width:' + row.percent + '%;'"></div>
+            <el-table-column type="index" width="60"> </el-table-column>
+            <el-table-column label="来源" min-width="80">
+              <template slot-scope="scope">
+                <span>{{ scope.row.name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="金额" width="180">
+              <template slot-scope="scope">
+                <span>{{ scope.row.value }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="占比率" min-width="100">
+              <template slot-scope="scope">
+                <div class="percent-box">
+                  <div class="line">
+                    <div class="bg"></div>
+                    <div class="percent" :style="'width:' + scope.row.percent + '%;'"></div>
+                  </div>
+                  <div class="num">{{ scope.row.percent }}%</div>
                 </div>
-                <div class="num">{{ row.percent }}%</div>
-              </div>
-            </template>
-          </Table>
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
-      </Card>
-      <Card :bordered="false" dis-hover class="ivu-mt mt10">
+      </el-card>
+      <el-card :bordered="false" shadow="never" class="ivu-mt mt10">
         <div class="acea-row row-between-wrapper">
           <h3 class="header-title">积分消耗</h3>
           <div class="change-style" @click="echartRight = !echartRight">切换样式</div>
         </div>
         <div class="ech-box">
           <echarts-from v-if="echartRight" ref="visitChart" :infoList="infoList2" echartsTitle="circle"></echarts-from>
-          <Table
-            v-show="!echartRight"
+          <el-table
+            v-show="!echartLeft"
             ref="selection"
-            :columns="columns"
-            :data="tabList2"
-            :loading="loading2"
-            no-data-text="暂无数据"
-            highlight-row
-            no-filtered-data-text="暂无筛选结果"
+            :data="tabList"
+            :loading="loading"
+            empty-text="暂无数据"
+            highlight-current-row
+            
           >
-            <template slot-scope="{ row }" slot="percent">
-              <div class="percent-box">
-                <div class="line">
-                  <div class="bg"></div>
-                  <div class="percent" :style="'width:' + row.percent + '%;'"></div>
+            <el-table-column type="index" width="60"> </el-table-column>
+            <el-table-column label="来源" min-width="80">
+              <template slot-scope="scope">
+                <span>{{ scope.row.name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="金额" width="180">
+              <template slot-scope="scope">
+                <span>{{ scope.row.value }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="占比率" min-width="100">
+              <template slot-scope="scope">
+                <div class="percent-box">
+                  <div class="line">
+                    <div class="bg"></div>
+                    <div class="percent" :style="'width:' + scope.row.percent + '%;'"></div>
+                  </div>
+                  <div class="num">{{ scope.row.percent }}%</div>
                 </div>
-                <div class="num">{{ row.percent }}%</div>
-              </div>
-            </template>
-          </Table>
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
-      </Card>
+      </el-card>
     </div>
   </div>
 </template>
@@ -144,32 +168,6 @@ export default {
       optionData: {},
       spinShow: false,
       options: this.$timeOptions,
-      columns: [
-        {
-          title: '序号',
-          type: 'index',
-          width: 60,
-          align: 'center',
-        },
-        {
-          title: '来源',
-          key: 'name',
-          minWidth: 80,
-          align: 'center',
-        },
-        {
-          title: '金额',
-          width: 180,
-          key: 'value',
-          align: 'center',
-        },
-        {
-          title: '占比率',
-          slot: 'percent',
-          minWidth: 100,
-          align: 'center',
-        },
-      ],
       tabList: [],
       tabList2: [],
     };
diff --git a/template/admin/src/pages/marketing/recharge/index.vue b/template/admin/src/pages/marketing/recharge/index.vue
index b6bb198cf..1961a4204 100644
--- a/template/admin/src/pages/marketing/recharge/index.vue
+++ b/template/admin/src/pages/marketing/recharge/index.vue
@@ -38,48 +38,60 @@
 
       <div v-if="name == 'user_recharge_quota'" style="margin-left: 20px">
         <div class="table_box">
-          <div type="flex">
+          <div>
             <div v-bind="grid">
               <div class="title">充值金额设置</div>
-              <Button
+              <el-button
                 type="primary"
                 icon="md-add"
                 @click="groupAdd('添加数据')"
                 style="margin-left: 14px; margin-top: 30px"
-                >添加数据</Button
+                >添加数据</el-button
               >
             </div>
           </div>
           <div class="table">
-            <Table
+            <el-table
               :columns="columns1"
               :data="sginList.list"
               ref="table"
               class="mt25"
               :loading="loading"
-              highlight-row
+              highlight-current-row
               no-userFrom-text="暂无数据"
               no-filtered-userFrom-text="暂无筛选结果"
             >
-              <template slot-scope="{ row, index }" slot="status">
-                <i-switch
-                  v-model="row.status"
-                  :value="row.status"
-                  :true-value="1"
-                  :false-value="0"
-                  @on-change="onchangeIsShow(row)"
-                  size="large"
-                >
-                  <span slot="open">显示</span>
-                  <span slot="close">隐藏</span>
-                </i-switch>
-              </template>
-              <template slot-scope="{ row, index }" slot="action">
-                <a @click="edit(row, '编辑')">编辑</a>
-                <Divider type="vertical" />
-                <a @click="del(row, '删除这条信息', index)">删除</a>
-              </template>
-            </Table>
+              <el-table-column
+                :label="item.title"
+                :min-width="item.minWidth"
+                v-for="(item, index) in columns1"
+                :key="index"
+              >
+                <template slot-scope="scope">
+                  <template v-if="item.key">
+                    <div>
+                      <span>{{ scope.row[item.key] }}</span>
+                    </div>
+                  </template>
+                  <template v-else-if="item.slot === 'status'">
+                    <el-switch
+                      :active-value="1"
+                      :inactive-value="0"
+                      v-model="scope.row.status"
+                      :value="scope.row.status"
+                      @change="onchangeIsShow(scope.row)"
+                      size="large"
+                    >
+                    </el-switch>
+                  </template>
+                  <template v-else-if="item.slot === 'action'">
+                    <a @click="edit(scope.row, '编辑')">编辑</a>
+                    <el-divider direction="vertical"></el-divider>
+                    <a @click="del(scope.row, '删除这条信息', index)">删除</a>
+                  </template>
+                </template>
+              </el-table-column>
+            </el-table>
           </div>
         </div>
       </div>
@@ -125,7 +137,7 @@ export default {
       };
     },
     labelWidth() {
-      return this.isMobile ? undefined : 120;
+      return this.isMobile ? undefined : '120px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -859,7 +871,6 @@ export default {
 }
 
 .table {
-  width: 700px;
   color: #515a6e;
   font-size: 14px;
   background-color: #fff;
diff --git a/template/admin/src/pages/marketing/sign/index.vue b/template/admin/src/pages/marketing/sign/index.vue
index 3f0409bb1..fab2d51a5 100644
--- a/template/admin/src/pages/marketing/sign/index.vue
+++ b/template/admin/src/pages/marketing/sign/index.vue
@@ -14,50 +14,73 @@
         </div>
       </div>
 
-      <div v-if="name == 'sign_day_num'" style="margin-left: 20px">
+      <div v-if="name == 'sign_day_num'" style="margin-left: 20px; flex: 1">
         <div class="table_box">
-          <div type="flex">
+          <div>
             <div v-bind="grid">
               <div class="title">签到天数设置</div>
-              <Button
+              <el-button
                 type="primary"
                 icon="md-add"
                 @click="groupAdd('添加数据')"
                 style="margin-left: 14px; margin-top: 30px"
-                >添加数据</Button
+                >添加数据</el-button
               >
             </div>
           </div>
           <div class="table">
-            <Table
+            <el-table
               :columns="columns1"
               :data="cmsList"
               ref="table"
               class="mt25"
               :loading="loading"
-              highlight-row
+              highlight-current-row
               no-userFrom-text="暂无数据"
               no-filtered-userFrom-text="暂无筛选结果"
             >
-              <template slot-scope="{ row, index }" slot="status">
-                <i-switch
-                  v-model="row.status"
-                  :value="row.status"
-                  :true-value="1"
-                  :false-value="0"
-                  @on-change="onchangeIsShow(row)"
-                  size="large"
-                >
-                  <span slot="open">显示</span>
-                  <span slot="close">隐藏</span>
-                </i-switch>
-              </template>
-              <template slot-scope="{ row, index }" slot="action">
-                <a @click="edit(row, '编辑')">编辑</a>
-                <Divider type="vertical" />
-                <a @click="del(row, '删除这条信息', index)">删除</a>
-              </template>
-            </Table>
+              <el-table-column label="编号" width="80">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.id }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="第几天" min-width="80">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.day }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="获取积分" min-width="80">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.sign_num }}</span>
+                </template>
+              </el-table-column>
+
+              <el-table-column label="是否可用" min-width="80">
+                <template slot-scope="scope">
+                  <el-switch
+                    :active-value="1"
+                    :inactive-value="0"
+                    v-model="scope.row.status"
+                    :value="scope.row.status"
+                    @change="onchangeIsShow(scope.row)"
+                    size="large"
+                  >
+                  </el-switch>
+                </template>
+              </el-table-column>
+              <el-table-column label="排序" min-width="80">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.sort }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" fixed="right" width="150">
+                <template slot-scope="scope">
+                  <a @click="edit(scope.row, '编辑')">编辑</a>
+                  <el-divider direction="vertical"></el-divider>
+                  <a @click="del(scope.row, '删除这条信息', index)">删除</a>
+                </template>
+              </el-table-column>
+            </el-table>
           </div>
         </div>
       </div>
@@ -101,7 +124,7 @@ export default {
       };
     },
     labelWidth() {
-      return this.isMobile ? undefined : 120;
+      return this.isMobile ? undefined : '120px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -321,7 +344,6 @@ export default {
           let data = res.data;
           let header = data.header;
           let index = [];
-          this.columns1 = header;
           this.loading = false;
         })
         .catch((res) => {
@@ -650,7 +672,7 @@ export default {
 }
 
 .table {
-  width: 700px;
+  // width: 700px;
   color: #515a6e;
   font-size: 14px;
   background-color: #fff;
diff --git a/template/admin/src/pages/marketing/storeBargain/bargainList.vue b/template/admin/src/pages/marketing/storeBargain/bargainList.vue
index 68570c093..be2f0afed 100644
--- a/template/admin/src/pages/marketing/storeBargain/bargainList.vue
+++ b/template/admin/src/pages/marketing/storeBargain/bargainList.vue
@@ -1,27 +1,27 @@
 <template>
   <div class="article-manager">
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col span="24">
-            <FormItem label="时间选择：">
-              <RadioGroup
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="时间选择：">
+              <el-radio-group
                 v-model="formValidate.data"
                 type="button"
-                @on-change="selectChange(formValidate.data)"
+                @change="selectChange(formValidate.data)"
                 class="mr"
               >
-                <Radio :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{ item.text }}</Radio>
-              </RadioGroup>
+                <el-radio :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{ item.text }}</el-radio>
+              </el-radio-group>
               <DatePicker
                 :editable="false"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="daterange"
@@ -29,64 +29,97 @@
                 placeholder="请选择时间"
                 style="width: 200px"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="砍价状态：">
-              <Select v-model="formValidate.status" placeholder="请选择" clearable @on-change="userSearchs">
-                <Option :value="1">进行中</Option>
-                <Option :value="2">已失败</Option>
-                <Option :value="3">已成功</Option>
-              </Select>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-      <Table
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="砍价状态：">
+              <el-select v-model="formValidate.status" placeholder="请选择" clearable @change="userSearchs">
+                <el-option :value="1" label="进行中"></el-option>
+                <el-option :value="2" label="已失败"></el-option>
+                <el-option :value="3" label="已成功"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :columns="columns1"
         :data="tableList"
         :loading="loading"
-        highlight-row
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="avatar">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="nickname">
-          <span> {{ row.nickname + ' / ' + row.uid }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="title">
-          <span> {{ row.title }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="add_time">
-          <span> {{ row.add_time }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="datatime">
-          <span> {{ row.datatime }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          <Tag color="blue" v-show="row.status === 1">进行中</Tag>
-          <Tag color="volcano" v-show="row.status === 2">已失败</Tag>
-          <Tag color="cyan" v-show="row.status === 3">已成功</Tag>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="Info(row)">查看详情</a>
-        </template>
-      </Table>
+        <el-table-column label="头像" width="80">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.avatar" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="发起用户" min-width="100">
+          <template slot-scope="scope">
+            <span> {{ scope.row.nickname + ' / ' + scope.row.uid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="开启时间" min-width="110">
+          <template slot-scope="scope">
+            <span> {{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="砍价商品" min-width="300">
+          <template slot-scope="scope">
+            <span> {{ scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="最低价" min-width="60">
+          <template slot-scope="scope">
+            <span> {{ scope.row.bargain_price_min }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="当前价" min-width="60">
+          <template slot-scope="scope">
+            <span> {{ scope.row.now_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="总砍价次数" min-width="60">
+          <template slot-scope="scope">
+            <span> {{ scope.row.people_num }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="剩余砍价次数" min-width="100">
+          <template slot-scope="scope">
+            <span> {{ scope.row.num }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="结束时间" min-width="150">
+          <template slot-scope="scope">
+            <span> {{ scope.row.datatime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="100">
+          <template slot-scope="scope">
+            <Tag color="blue" v-show="scope.row.status === 1">进行中</Tag>
+            <Tag color="volcano" v-show="scope.row.status === 2">已失败</Tag>
+            <Tag color="cyan" v-show="scope.row.status === 3">已成功</Tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="100">
+          <template slot-scope="scope">
+            <a @click="Info(scope.row)">查看详情</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
 
     <!-- 详情模态框-->
     <Modal
@@ -99,30 +132,43 @@
       :mask-closable="false"
       width="750"
     >
-      <Table
+      <el-table
         ref="selection"
-        :columns="columns2"
         :data="tabList3"
-        :loading="loading2"
-        no-data-text="暂无数据"
-        highlight-row
+        v-loading="loading2"
+        empty-text="暂无数据"
+        highlight-current-row
         max-height="600"
         size="small"
-        no-filtered-data-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="nickname">
-          <span> {{ row.nickname + ' / ' + row.uid }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="avatar">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <Tag color="cyan" v-show="row.is_refund === 1">已退款</Tag>
-          <Tag color="volcano" v-show="row.is_refund === 0">未退款</Tag>
-        </template>
-      </Table>
+        <el-table-column label="用户ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.uid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户头像" min-width="100">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.avatar" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户名称" min-width="100">
+          <template slot-scope="scope">
+            <span> {{ scope.row.nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="砍价金额" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="砍价时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
     </Modal>
   </div>
 </template>
@@ -267,7 +313,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -322,10 +368,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.formValidate.page = 1;
diff --git a/template/admin/src/pages/marketing/storeBargain/create.vue b/template/admin/src/pages/marketing/storeBargain/create.vue
index 7ca48eb08..516a51a44 100644
--- a/template/admin/src/pages/marketing/storeBargain/create.vue
+++ b/template/admin/src/pages/marketing/storeBargain/create.vue
@@ -3,9 +3,9 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <router-link :to="{ path: $routeProStr + '/marketing/store_bargain/index' }"
-          ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
+          ><el-button icon="ios-arrow-back" size="small" type="text">返回</el-button></router-link
         >
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span
           class="ivu-page-header-title mr20"
           style="padding: 0"
@@ -13,18 +13,18 @@
         ></span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row type="flex" class="mt30 acea-row row-middle row-center">
-        <Col span="20">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row class="mt30 acea-row row-middle row-center">
+        <el-col :span="20">
           <Steps :current="current">
             <Step title="选择砍价商品"></Step>
             <Step title="填写基础信息"></Step>
             <Step title="修改商品详情"></Step>
             <Step title="修改商品规则"></Step>
           </Steps>
-        </Col>
-        <Col span="23">
-          <Form
+        </el-col>
+        <el-col :span="23">
+          <el-form
             class="form mt30"
             ref="formValidate"
             :rules="ruleValidate"
@@ -34,7 +34,7 @@
             :label-position="labelPosition"
             @submit.native.prevent
           >
-            <FormItem label="选择商品：" prop="image_input" v-show="current === 0">
+            <el-form-item label="选择商品：" prop="image_input" v-show="current === 0">
               <div class="picBox" @click="changeGoods">
                 <div class="pictrue" v-if="formValidate.image">
                   <img v-lazy="formValidate.image" />
@@ -43,10 +43,10 @@
                   <Icon type="ios-camera-outline" size="26" class="iconfonts" />
                 </div>
               </div>
-            </FormItem>
-            <Row v-show="current === 1" type="flex">
-              <Col span="24">
-                <FormItem label="商品主图：" prop="image">
+            </el-form-item>
+            <el-row v-show="current === 1">
+              <el-col :span="24">
+                <el-form-item label="商品主图：" prop="image">
                   <div class="picBox" @click="modalPicTap('dan', 'danFrom')">
                     <div class="pictrue" v-if="formValidate.image">
                       <img v-lazy="formValidate.image" />
@@ -55,10 +55,10 @@
                       <Icon type="ios-camera-outline" size="26" class="iconfonts" />
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="商品轮播图：" prop="images">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="商品轮播图：" prop="images">
                   <div class="acea-row">
                     <div
                       class="pictrue"
@@ -71,12 +71,7 @@
                       @dragend="handleDragEnd($event, item)"
                     >
                       <img v-lazy="item" />
-                      <Button
-                        shape="circle"
-                        icon="md-close"
-                        @click.native="handleRemove(index)"
-                        class="btndel"
-                      ></Button>
+                      <i class="el-icon-circle-close btndel" @click="handleRemove(index)"></i>
                     </div>
                     <div
                       v-if="formValidate.images.length < 10"
@@ -86,68 +81,69 @@
                       <Icon type="ios-camera-outline" size="26" class="iconfonts" />
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="砍价活动名称：" prop="title" label-for="title">
-                    <Input placeholder="请输入砍价活动名称" element-id="title" v-model="formValidate.title" />
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="砍价活动简介：" prop="info" label-for="info">
-                    <Input
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="砍价活动名称：" prop="title" label-for="title">
+                    <el-input placeholder="请输入砍价活动名称" element-id="title" v-model="formValidate.title" />
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="砍价活动简介：" prop="info" label-for="info">
+                    <el-input
                       placeholder="请输入砍价活动简介"
                       type="textarea"
                       :rows="4"
                       element-id="info"
                       v-model="formValidate.info"
                     />
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <FormItem label="活动时间：" prop="section_time">
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="活动时间：" prop="section_time">
                   <div class="acea-row row-middle">
                     <DatePicker
                       :editable="false"
                       type="datetimerange"
                       format="yyyy-MM-dd HH:mm"
                       placeholder="请选择活动时间"
-                      @on-change="onchangeTime"
+                      @change="onchangeTime"
                       class="perW30"
                       :value="formValidate.section_time"
                       v-model="formValidate.section_time"
                     ></DatePicker>
                     <div class="ml10 grey">设置活动开启结束时间，用户可以在设置时间内发起参与砍价</div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.virtual_type == 0">
-                <FormItem label="物流方式：" prop="logistics">
-                  <CheckboxGroup v-model="formValidate.logistics" @on-change="logisticsBtn">
-                    <Checkbox label="1">快递</Checkbox>
-                    <Checkbox label="2">到店核销</Checkbox>
-                  </CheckboxGroup>
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.virtual_type == 0">
-                <FormItem label="运费设置：" :prop="formValidate.freight != 1 ? 'freight' : ''">
-                  <RadioGroup v-model="formValidate.freight">
-                    <Radio :label="2">固定邮费</Radio>
-                    <Radio :label="3">运费模板</Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col>
-              <Col
-                span="24"
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="formValidate.virtual_type == 0">
+                <el-form-item label="物流方式：" prop="logistics">
+                  <el-checkbox-group v-model="formValidate.logistics">
+                    <el-checkbox label="1">快递</el-checkbox>
+                    <el-checkbox label="2">到店核销</el-checkbox>
+                  </el-checkbox-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="formValidate.virtual_type == 0">
+                <el-form-item label="运费设置：" :prop="formValidate.freight != 1 ? 'freight' : ''">
+                  <el-radio-group v-model="formValidate.freight">
+                    <el-radio :label="2">固定邮费</el-radio>
+                    <el-radio :label="3">运费模板</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col
+                :span="24"
                 v-if="formValidate.freight != 3 && formValidate.freight != 1 && formValidate.virtual_type == 0"
               >
-                <FormItem label="">
+                <el-form-item label="">
                   <div class="acea-row">
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       min="0.01"
                       max="10000"
                       v-model="formValidate.postage"
@@ -155,24 +151,33 @@
                       class="perW20 maxW"
                     />
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.freight == 3 && formValidate.virtual_type == 0">
-                <FormItem label="" prop="temp_id">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="formValidate.freight == 3 && formValidate.virtual_type == 0">
+                <el-form-item label="" prop="temp_id">
                   <div class="acea-row">
-                    <Select v-model="formValidate.temp_id" clearable placeholder="请选择运费模板" class="perW20 maxW">
-                      <Option v-for="(item, index) in templateList" :value="item.id" :key="index">{{
-                        item.name
-                      }}</Option>
-                    </Select>
+                    <el-select
+                      v-model="formValidate.temp_id"
+                      clearable
+                      placeholder="请选择运费模板"
+                      class="perW20 maxW"
+                    >
+                      <el-option
+                        v-for="(item, index) in templateList"
+                        :value="item.id"
+                        :key="index"
+                        :label="item.name"
+                      ></el-option>
+                    </el-select>
                     <span class="addfont" @click="freight">新增运费模板</span>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="砍价人数：" prop="people_num" label-for="people_num">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="砍价人数：" prop="people_num" label-for="people_num">
                   <div class="acea-row row-middle">
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       placeholder="请输入砍价人数"
                       element-id="people_num"
                       :min="2"
@@ -183,12 +188,13 @@
                     />
                     <div class="ml10 grey">需要多少人砍价成功</div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="帮砍次数：" prop="bargain_num" label-for="bargain_num">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="帮砍次数：" prop="bargain_num" label-for="bargain_num">
                   <div class="acea-row row-middle">
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       placeholder="请输入帮砍次数"
                       element-id="bargain_num"
                       :min="1"
@@ -201,12 +207,13 @@
                       单个商品用户可以帮砍的次数，例：次数设置为1，甲和乙同时将商品A的砍价链接发给丙，丙只能帮甲或乙其中一个人砍价
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="购买数量限制：" prop="num">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="购买数量限制：" prop="num">
                   <div class="acea-row row-middle">
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       placeholder="购买数量限制"
                       :min="1"
                       :max="10000"
@@ -216,21 +223,22 @@
                     />
                     <div class="ml10 grey">单个活动每个用户发起砍价次数限制</div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="单位：" prop="unit_name" label-for="unit_name">
-                  <Input
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="单位：" prop="unit_name" label-for="unit_name">
+                  <el-input
                     placeholder="请输入单位"
                     element-id="unit_name"
                     v-model="formValidate.unit_name"
                     class="perW20"
                   />
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="排序：">
-                  <InputNumber
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="排序：">
+                  <el-input-number
+                    controls-position="right"
                     placeholder="请输入排序"
                     element-id="sort"
                     :min="0"
@@ -239,101 +247,129 @@
                     v-model="formValidate.sort"
                     class="perW10"
                   />
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="活动状态：" props="status" label-for="status">
-                  <RadioGroup element-id="status" v-model="formValidate.status">
-                    <Radio :label="1" class="radio">开启</Radio>
-                    <Radio :label="0">关闭</Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="规格选择：">
-                  <Table :data="specsData" :columns="columns" border>
-                    <template slot-scope="{ row, index }" slot="pic">
-                      <div
-                        class="acea-row row-middle row-center-wrapper"
-                        @click="modalPicTap('dan', 'danTable', index)"
-                      >
-                        <div class="pictrue pictrueTab" v-if="specsData[index].pic">
-                          <img v-lazy="specsData[index].pic" />
-                        </div>
-                        <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
-                          <Icon type="ios-camera-outline" size="21" class="iconfonts" />
-                        </div>
-                      </div>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="price">
-                      <InputNumber
-                        v-model="specsData[index].price"
-                        :min="0"
-                        :precision="2"
-                        class="priceBox"
-                        :active-change="false"
-                      ></InputNumber>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="min_price">
-                      <InputNumber
-                        v-model="specsData[index].min_price"
-                        :min="0"
-                        :precision="2"
-                        class="priceBox"
-                        :active-change="false"
-                      ></InputNumber>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="quota">
-                      <InputNumber
-                        v-model="specsData[index].quota"
-                        :min="1"
-                        active-change
-                        class="priceBox"
-                      ></InputNumber>
-                    </template>
-                  </Table>
-                </FormItem>
-              </Col>
-            </Row>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="活动状态：" props="status" label-for="status">
+                  <el-radio-group element-id="status" v-model="formValidate.status">
+                    <el-radio :label="1" class="radio">开启</el-radio>
+                    <el-radio :label="0">关闭</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="规格选择：">
+                  <el-table :data="specsData" :columns="columns" border>
+                    <el-table-column width="50">
+                      <template slot-scope="scope">
+                        <el-radio
+                          type="index"
+                          v-model="templateRadio"
+                          :label="index"
+                          @change.native="getTemplateRow(scope.row, index)"
+                          >&nbsp;</el-radio
+                        >
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      :label="item.title"
+                      :min-width="item.minWidth"
+                      v-for="(item, index) in columns"
+                      :key="index"
+                    >
+                      <template slot-scope="scope">
+                        <template v-if="item.key">
+                          <div>
+                            <span>{{ scope.row[item.key] }}</span>
+                          </div>
+                        </template>
+                        <template v-else-if="item.slot === 'pic'">
+                          <div
+                            class="acea-row row-middle row-center-wrapper"
+                            @click="modalPicTap('dan', 'danTable', index)"
+                          >
+                            <div class="pictrue pictrueTab" v-if="scope.row.pic">
+                              <img v-lazy="scope.row.pic" />
+                            </div>
+                            <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
+                              <Icon type="ios-camera-outline" size="21" class="iconfonts" />
+                            </div>
+                          </div>
+                        </template>
+                        <template v-else-if="item.slot === 'price'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="scope.row.price"
+                            :min="0"
+                            :precision="2"
+                            class="priceBox"
+                            :active-change="false"
+                          ></el-input-number>
+                        </template>
+                        <template v-else-if="item.slot === 'min_price'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="scope.row.min_price"
+                            :min="0"
+                            :precision="2"
+                            class="priceBox"
+                            :active-change="false"
+                          ></el-input-number>
+                        </template>
+                        <template v-else-if="item.slot === 'quota'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="scope.row.quota"
+                            :min="1"
+                            active-change
+                            class="priceBox"
+                          ></el-input-number>
+                        </template>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <div v-if="current === 2">
-              <FormItem label="内容：">
+              <el-form-item label="内容：">
                 <WangEditor
                   style="width: 90%"
                   :content="formValidate.description"
                   @editorContent="getEditorContent"
                 ></WangEditor>
-              </FormItem>
+              </el-form-item>
             </div>
             <div v-if="current === 3">
-              <FormItem label="规则：">
+              <el-form-item label="规则：">
                 <WangEditor
                   style="width: 90%"
                   :content="formValidate.rule"
                   @editorContent="getEditorContent2"
                 ></WangEditor>
-              </FormItem>
+              </el-form-item>
             </div>
-            <FormItem>
-              <Button
+            <el-form-item>
+              <el-button
                 class="submission mr15"
                 @click="step"
                 v-show="current !== 0"
                 :disabled="$route.params.id && $route.params.id !== '0' && current === 1"
-                >上一步</Button
+                >上一步</el-button
               >
-              <Button
+              <el-button
                 type="primary"
                 :disabled="submitOpen && current === 3"
                 class="submission"
                 @click="next('formValidate')"
                 v-text="current === 3 ? '提交' : '下一步'"
-              ></Button>
-            </FormItem>
+              ></el-button>
+            </el-form-item>
             <Spin size="large" fix v-if="spinShow"></Spin>
-          </Form>
-        </Col>
-      </Row>
-    </Card>
+          </el-form>
+        </el-col>
+      </el-row>
+    </el-card>
     <!-- 选择商品-->
     <Modal
       v-model="modals"
@@ -391,6 +427,7 @@ export default {
   },
   data() {
     return {
+      templateRadio: 0,
       submitOpen: false,
       spinShow: false,
       myConfig: {
@@ -582,7 +619,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 140;
+      return this.isMobile ? undefined : '140px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -631,7 +668,7 @@ export default {
               }
               let self = this;
               return h('div', [
-                h('Radio', {
+                h('el-radio', {
                   props: {
                     value: flag,
                   },
@@ -648,7 +685,7 @@ export default {
             },
           };
           that.columns = data.header;
-          that.columns.unshift(radio);
+          // that.columns.unshift(radio);
           that.specsData = data.attrs;
           that.inputChange(data);
           that.formValidate.items = data.items;
@@ -657,6 +694,12 @@ export default {
           that.$Message.error(res.msg);
         });
     },
+    getTemplateRow(row, index) {
+      this.currentid = index;
+      let attrs = [];
+      this.push(row);
+      this.formValidate.attrs = attrs;
+    },
     inputChange(data) {
       let that = this;
       let $index = [];
@@ -709,6 +752,7 @@ export default {
     },
     // 商品id
     getProductId(row) {
+      console.log(row, '1');
       this.modal_loading = false;
       this.modals = false;
       setTimeout(() => {
@@ -807,7 +851,7 @@ export default {
               }
               let self = this;
               return h('div', [
-                h('Radio', {
+                h('el-radio', {
                   props: {
                     value: flag,
                   },
diff --git a/template/admin/src/pages/marketing/storeBargain/index.vue b/template/admin/src/pages/marketing/storeBargain/index.vue
index aef9b6f0e..65ee947d5 100644
--- a/template/admin/src/pages/marketing/storeBargain/index.vue
+++ b/template/admin/src/pages/marketing/storeBargain/index.vue
@@ -1,108 +1,157 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="tableFrom"
         :model="tableFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="砍价状态：">
-              <Select placeholder="请选择" v-model="tableFrom.status" clearable @on-change="userSearchs">
-                <Option value="1">开启</Option>
-                <Option value="0">关闭</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="商品搜索：" label-for="store_name">
-              <Input
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="砍价状态：">
+              <el-select placeholder="请选择" v-model="tableFrom.status" clearable @change="userSearchs">
+                <el-option value="1" label="开启"></el-option>
+                <el-option value="0" label="关闭"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="商品搜索：" label-for="store_name">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入商品名称，ID"
                 v-model="tableFrom.store_name"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex" class="mb20">
-          <Col v-bind="grid">
-            <Button v-auth="['marketing-store_bargain-create']" type="primary" icon="md-add" @click="add" class="mr10"
-              >添加砍价商品</Button
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row class="mb20">
+          <el-col v-bind="grid">
+            <el-button
+              v-auth="['marketing-store_bargain-create']"
+              type="primary"
+              icon="md-add"
+              @click="add"
+              class="mr10"
+              >添加砍价商品</el-button
             >
-            <Button v-auth="['export-storeBargain']" class="export" icon="ios-share-outline" @click="exportList"
-              >导出</Button
+            <el-button v-auth="['export-storeBargain']" class="export" icon="ios-share-outline" @click="exportList"
+              >导出</el-button
             >
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tableList"
         :loading="loading"
-        highlight-row
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="is_fail">
-          <Icon type="md-checkmark" v-if="row.is_fail === 1" color="#0092DC" size="14" />
-          <Icon type="md-close" v-else color="#ed5565" size="14" />
-        </template>
-        <template slot-scope="{ row, index }" slot="image">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.image" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="bargain_min_price">
-          <span>{{ row.bargain_min_price }}~{{ row.bargain_max_price }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="start_name">
-          <Tag color="blue" v-show="row.start_name === '进行中'">进行中</Tag>
-          <Tag color="volcano" v-show="row.start_name === '未开始'">未开始</Tag>
-          <Tag color="cyan" v-show="row.start_name === '已结束'">已结束</Tag>
-        </template>
-        <template slot-scope="{ row, index }" slot="stop_time">
-          <span> {{ row.stop_time | formatDate }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :disabled="row.stop_status ? true : false"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">开启</span>
-            <span slot="close">关闭</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a v-if="row.stop_status === 0" @click="edit(row, 0)">编辑</a>
-          <Divider v-if="row.stop_status === 0" type="vertical" />
-          <a @click="edit(row, 1)">复制</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除砍价商品', index)">删除</a>
-          <Divider type="vertical" />
-          <a @click="viewInfo(row)">统计</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <div>{{ scope.row.id }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="砍价图片" min-width="60">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.image" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="砍价名称" min-width="150">
+          <template slot-scope="scope">
+            <div>{{ scope.row.title }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="砍价价格" min-width="100">
+          <template slot-scope="scope">
+            <div>{{ scope.row.price }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="最低价" min-width="100">
+          <template slot-scope="scope">
+            <div>{{ scope.row.min_price }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="参与人数" min-width="100">
+          <template slot-scope="scope">
+            <div>{{ scope.row.count_people_all }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="帮忙砍价人数" min-width="100">
+          <template slot-scope="scope">
+            <div>{{ scope.row.count_people_help }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="砍价成功人数" min-width="100">
+          <template slot-scope="scope">
+            <div>{{ scope.row.count_people_success }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="限量" min-width="80">
+          <template slot-scope="scope">
+            <div>{{ scope.row.quota_show }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="限量剩余" min-width="80">
+          <template slot-scope="scope">
+            <div>{{ scope.row.quota }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="活动状态" min-width="100">
+          <template slot-scope="scope">
+            <Tag color="blue" v-show="scope.row.start_name === '进行中'">进行中</Tag>
+            <Tag color="volcano" v-show="scope.row.start_name === '未开始'">未开始</Tag>
+            <Tag color="cyan" v-show="scope.row.start_name === '已结束'">已结束</Tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="结束时间" min-width="120">
+          <template slot-scope="scope">
+            <span> {{ scope.row.stop_time | formatDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="上架状态" min-width="100">
+          <template slot-scope="scope">
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              :value="scope.row.status"
+              :disabled="scope.row.stop_status ? true : false"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a v-if="scope.row.stop_status === 0" @click="edit(scope.row, 0)">编辑</a>
+            <el-divider v-if="scope.row.stop_status === 0" direction="vertical" />
+            <a @click="edit(scope.row, 1)">复制</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除砍价商品', index)">删除</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="viewInfo(scope.row)">统计</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="tableFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="tableFrom.limit"
+          :page.sync="tableFrom.page"
+          :limit.sync="tableFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -222,7 +271,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -311,10 +360,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.tableFrom.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.tableFrom.page = 1;
diff --git a/template/admin/src/pages/marketing/storeBargain/statistics.vue b/template/admin/src/pages/marketing/storeBargain/statistics.vue
index 2b38bac73..1f6a283a2 100644
--- a/template/admin/src/pages/marketing/storeBargain/statistics.vue
+++ b/template/admin/src/pages/marketing/storeBargain/statistics.vue
@@ -3,89 +3,98 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <span>
-          <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
+          <el-button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</el-button>
         </span>
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
       </div>
     </div>
     <cards-data :cardLists="cardLists" v-if="cardLists.length >= 0"></cards-data>
     <div>
-      <Tabs v-model="currentTab" @on-click="onClickTab">
-        <TabPane v-for="(item, index) in tabs" :label="item.label" :name="item.type" :key="index" />
-      </Tabs>
+      <el-tabs v-model="type" @tab-click="onClickTab">
+        <el-tab-pane v-for="(item, index) in tabs" :label="item.label" :name="item.type" :key="index" />
+      </el-tabs>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="pagination"
         :model="pagination"
         :label-width="labelWidth"
         label-position="right"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col span="6" v-if="type == 1">
-            <FormItem label="订单状态：" label-for="status">
-              <Select v-model="pagination.status" placeholder="请选择订单状态" clearable @on-change="searchList">
-                <Option value="0">未支付</Option>
-                <Option value="1">待发货</Option>
-                <Option value="2">待收货</Option>
-                <Option value="3">待评价</Option>
-                <Option value="4">交易完成</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col span="6">
-            <FormItem label="搜索：" label-for="title">
-              <Input
+        <el-row :gutter="24">
+          <el-col :span="6" v-if="type == 1">
+            <el-form-item label="订单状态：" label-for="status">
+              <el-select v-model="pagination.status" placeholder="请选择订单状态" clearable @change="searchList">
+                <el-option value="0" label="未支付"></el-option>
+                <el-option value="1" label="待发货"></el-option>
+                <el-option value="2" label="待收货"></el-option>
+                <el-option value="3" label="待评价"></el-option>
+                <el-option value="4" label="交易完成"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="搜索：" label-for="title">
+              <el-input
                 search
                 enter-button
                 v-model="pagination.real_name"
                 :placeholder="type == 1 ? '请输入用户姓名|订单号|UID' : '请输入用户UID'"
                 @on-search="searchList"
               />
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="type ? thead2 : thead"
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tbody"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row }" slot="avatar">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="num">
-          <span> {{ row.already_num + ' / ' + row.people_num }}</span>
-        </template>
-        <template slot-scope="{ row }" slot="status">
-          <Tag color="blue" v-show="row.status === 1">进行中</Tag>
-          <Tag color="volcano" v-show="row.status === 2">已失败</Tag>
-          <Tag color="cyan" v-show="row.status === 3">已成功</Tag>
-        </template>
-        <template slot-scope="{ row }" slot="action">
-          <a @click="Info(row)">查看详情</a>
-        </template>
-      </Table>
+        <el-table-column
+          :label="item.title"
+          :min-width="item.minWidth"
+          v-for="(item, index) in type ? thead2 : thead"
+          :key="index"
+        >
+          <template slot-scope="scope">
+            <template v-if="item.key">
+              <div>
+                <span>{{ scope.row[item.key] }}</span>
+              </div>
+            </template>
+            <template v-else-if="item.slot === 'avatar'">
+              <div class="tabBox_img" v-viewer>
+                <img v-lazy="scope.row.avatar" />
+              </div>
+            </template>
+            <template v-else-if="item.slot === 'status'">
+              <Tag color="blue" v-show="scope.row.status === 1">进行中</Tag>
+              <Tag color="volcano" v-show="scope.row.status === 2">已失败</Tag>
+              <Tag color="cyan" v-show="scope.row.status === 3">已成功</Tag>
+            </template>
+            <template v-else-if="item.slot === 'action'">
+              <a @click="Info(scope.row)">查看详情</a>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="pagination.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="pagination.limit"
+          :page.sync="pagination.page"
+          :limit.sync="pagination.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!-- 详情模态框-->
     <Modal
       v-model="modals"
@@ -97,30 +106,38 @@
       :mask-closable="false"
       width="750"
     >
-      <Table
+      <el-table
         ref="selection"
-        :columns="columns2"
         :data="tabList3"
-        :loading="loading2"
-        no-data-text="暂无数据"
-        highlight-row
+        v-loading="loading2"
+        empty-text="暂无数据"
+        highlight-current-row
         max-height="600"
         size="small"
-        no-filtered-data-text="暂无筛选结果"
       >
-        <template slot-scope="{ row }" slot="nickname">
-          <span> {{ row.nickname + ' / ' + row.uid }}</span>
-        </template>
-        <template slot-scope="{ row }" slot="avatar">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="action">
-          <Tag color="cyan" v-show="row.is_refund === 1">已退款</Tag>
-          <Tag color="volcano" v-show="row.is_refund === 0">未退款</Tag>
-        </template>
-      </Table>
+        <el-table-column label="用户ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.uid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户头像" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.avatar" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="砍价金额" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="砍价时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
     </Modal>
   </div>
 </template>
@@ -270,31 +287,6 @@ export default {
         status: '',
       },
       type: 0,
-      columns2: [
-        {
-          title: '用户ID',
-          key: 'uid',
-          width: 80,
-        },
-        {
-          title: '用户头像',
-          slot: 'avatar',
-        },
-        {
-          title: '用户名称',
-          slot: 'nickname',
-          minWidth: 100,
-        },
-        {
-          title: '砍价金额',
-          key: 'price',
-        },
-        {
-          title: '砍价时间',
-          key: 'add_time',
-          minWidth: 100,
-        },
-      ],
     };
   },
   created() {
@@ -349,11 +341,6 @@ export default {
       this.pagination.page = 1;
       this.getList(this.id);
     },
-    // 分页
-    pageChange(index) {
-      this.pagination.page = index;
-      this.getList(this.id);
-    },
     // 查看详情
     Info(row) {
       this.modals = true;
diff --git a/template/admin/src/pages/marketing/storeCombination/combinaList.vue b/template/admin/src/pages/marketing/storeCombination/combinaList.vue
index d8d9f1d90..a70c72ff5 100644
--- a/template/admin/src/pages/marketing/storeCombination/combinaList.vue
+++ b/template/admin/src/pages/marketing/storeCombination/combinaList.vue
@@ -1,28 +1,30 @@
 <template>
   <div class="article-manager">
     <cards-data :cardLists="cardLists" v-if="cardLists.length >= 0"></cards-data>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col span="24">
-            <FormItem label="时间选择：">
-              <RadioGroup
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="时间选择：">
+              <el-radio-group
                 v-model="formValidate.data"
                 type="button"
-                @on-change="selectChange(formValidate.data)"
+                @change="selectChange(formValidate.data)"
                 class="mr"
               >
-                <Radio :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{ item.text }}</Radio>
-              </RadioGroup>
+                <el-radio-button :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{
+                  item.text
+                }}</el-radio-button>
+              </el-radio-group>
               <DatePicker
                 :editable="false"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="daterange"
@@ -30,64 +32,86 @@
                 placeholder="请选择时间"
                 style="width: 200px"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="拼团状态：">
-              <Select v-model="formValidate.status" placeholder="请选择" clearable @on-change="userSearchs">
-                <Option :value="1">进行中</Option>
-                <Option :value="2">已完成</Option>
-                <Option :value="3">未完成</Option>
-              </Select>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="拼团状态：">
+              <el-select v-model="formValidate.status" placeholder="请选择" clearable @change="userSearchs">
+                <el-option :value="1" label="进行中"></el-option>
+                <el-option :value="2" label="已完成"></el-option>
+                <el-option :value="3" label="未完成"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tableList"
         :loading="loading"
-        highlight-row
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="avatar">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="nickname">
-          <span> {{ row.nickname + ' / ' + row.uid }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="title">
-          <span> {{ row.title + ' / ' + row.cid }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="add_time">
-          <span> {{ row.add_time | formatDate }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="stop_time">
-          <span> {{ row.stop_time | formatDate }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          <Tag color="blue" v-show="row.status === 1">进行中</Tag>
-          <Tag color="cyan" v-show="row.status === 2">已完成</Tag>
-          <Tag color="volcano" v-show="row.status === 3">未完成</Tag>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="Info(row)">查看详情</a>
-        </template>
-      </Table>
+        <el-table-column label="头像" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.avatar" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="开团团长" min-width="150">
+          <template slot-scope="scope">
+            <span> {{ scope.row.nickname + ' / ' + scope.row.uid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="开团时间" min-width="150">
+          <template slot-scope="scope">
+            <span> {{ scope.row.add_time | formatDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="拼团商品" min-width="180">
+          <template slot-scope="scope">
+            <span> {{ scope.row.title + ' / ' + scope.row.cid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="几人团" min-width="80">
+          <template slot-scope="scope">
+            <span> {{ scope.row.people }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="几人参加" min-width="80">
+          <template slot-scope="scope">
+            <span> {{ scope.row.count_people }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="结束时间" min-width="120">
+          <template slot-scope="scope">
+            <span> {{ scope.row.stop_time | formatDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="120">
+          <template slot-scope="scope">
+            <Tag color="blue" v-show="scope.row.status === 1">进行中</Tag>
+            <Tag color="cyan" v-show="scope.row.status === 2">已完成</Tag>
+            <Tag color="volcano" v-show="scope.row.status === 3">未完成</Tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="100">
+          <template slot-scope="scope">
+            <a @click="Info(scope.row)">查看详情</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
 
     <!-- 详情模态框-->
     <Modal
@@ -100,30 +124,50 @@
       :mask-closable="false"
       width="750"
     >
-      <Table
+      <el-table
         ref="selection"
         :columns="columns2"
         :data="tabList3"
         :loading="loading2"
-        no-data-text="暂无数据"
-        highlight-row
+        empty-text="暂无数据"
+        highlight-current-row
         max-height="600"
         size="small"
-        no-filtered-data-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="nickname">
-          <span> {{ row.nickname + ' / ' + row.uid }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="avatar">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <Tag color="volcano" v-show="row.is_refund != 0">已退款</Tag>
-          <Tag color="cyan" v-show="row.is_refund === 0">未退款</Tag>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户名称" min-width="100">
+          <template slot-scope="scope">
+            <span> {{ scope.row.nickname + ' / ' + scope.row.uid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户头像" min-width="150">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.avatar" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单编号" min-width="100">
+          <template slot-scope="scope">
+            <span> {{ scope.row.order_id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="金额" min-width="100">
+          <template slot-scope="scope">
+            <span> {{ scope.row.total_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单状态" min-width="100">
+          <template slot-scope="scope">
+            <Tag color="volcano" v-show="scope.row.is_refund != 0">已退款</Tag>
+            <Tag color="cyan" v-show="scope.row.is_refund === 0">未退款</Tag>
+          </template>
+        </el-table-column>
+      </el-table>
     </Modal>
   </div>
 </template>
@@ -175,54 +219,7 @@ export default {
         page: 1,
         limit: 15,
       },
-      columns1: [
-        {
-          title: '头像',
-          slot: 'avatar',
-          minWidth: 150,
-        },
-        {
-          title: '开团团长',
-          slot: 'nickname',
-          minWidth: 150,
-        },
-        {
-          title: '开团时间',
-          slot: 'add_time',
-          minWidth: 150,
-        },
-        {
-          title: '拼团商品',
-          slot: 'title',
-          minWidth: 400,
-        },
-        {
-          title: '几人团',
-          key: 'people',
-          minWidth: 120,
-        },
-        {
-          title: '几人参加',
-          key: 'count_people',
-          minWidth: 100,
-        },
-        {
-          title: '结束时间',
-          slot: 'stop_time',
-          minWidth: 150,
-        },
-        {
-          title: '状态',
-          slot: 'status',
-          minWidth: 100,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 170,
-        },
-      ],
+
       tableList: [],
       total: 0,
       timeVal: [],
@@ -262,7 +259,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
diff --git a/template/admin/src/pages/marketing/storeCombination/create.vue b/template/admin/src/pages/marketing/storeCombination/create.vue
index cbf420bc7..9c95cb2b1 100644
--- a/template/admin/src/pages/marketing/storeCombination/create.vue
+++ b/template/admin/src/pages/marketing/storeCombination/create.vue
@@ -3,9 +3,9 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <router-link :to="{ path: $routeProStr + '/marketing/store_combination/index' }"
-          ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
+          ><el-button icon="ios-arrow-back" size="small" type="text">返回</el-button></router-link
         >
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span
           class="ivu-page-header-title mr20"
           style="padding: 0"
@@ -13,17 +13,17 @@
         ></span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row type="flex" class="mt30 acea-row row-middle row-center">
-        <Col span="20">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row class="mt30 acea-row row-middle row-center">
+        <el-col :span="20">
           <Steps :current="current">
             <Step title="选择拼团商品"></Step>
             <Step title="填写基础信息"></Step>
             <Step title="修改商品详情"></Step>
           </Steps>
-        </Col>
-        <Col span="23">
-          <Form
+        </el-col>
+        <el-col :span="23">
+          <el-form
             class="form mt30"
             ref="formValidate"
             :model="formValidate"
@@ -33,7 +33,7 @@
             :label-position="labelPosition"
             @submit.native.prevent
           >
-            <FormItem label="选择商品：" prop="image_input" v-if="current === 0">
+            <el-form-item label="选择商品：" prop="image_input" v-if="current === 0">
               <div class="picBox" @click="changeGoods">
                 <div class="pictrue" v-if="formValidate.image">
                   <img v-lazy="formValidate.image" />
@@ -42,10 +42,10 @@
                   <Icon type="ios-camera-outline" size="26" />
                 </div>
               </div>
-            </FormItem>
-            <Row v-show="current === 1" type="flex">
-              <Col span="24">
-                <FormItem label="商品主图：" prop="image">
+            </el-form-item>
+            <el-row v-show="current === 1">
+              <el-col :span="24">
+                <el-form-item label="商品主图：" prop="image">
                   <div class="picBox" @click="modalPicTap('dan', 'danFrom')">
                     <div class="pictrue" v-if="formValidate.image">
                       <img v-lazy="formValidate.image" />
@@ -54,10 +54,10 @@
                       <Icon type="ios-camera-outline" size="26" />
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="商品轮播图：" prop="images">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="商品轮播图：" prop="images">
                   <div class="acea-row">
                     <div
                       class="pictrue"
@@ -70,12 +70,7 @@
                       @dragend="handleDragEnd($event, item)"
                     >
                       <img v-lazy="item" />
-                      <Button
-                        shape="circle"
-                        icon="md-close"
-                        @click.native="handleRemove(index)"
-                        class="btndel"
-                      ></Button>
+                      <i class="el-icon-circle-close btndel" @click="handleRemove(index)"></i>
                     </div>
                     <div
                       v-if="formValidate.images.length < 10"
@@ -85,93 +80,103 @@
                       <Icon type="ios-camera-outline" size="26" />
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="拼团名称：" prop="title" label-for="title">
-                    <Input placeholder="请输入拼团名称" element-id="title" v-model="formValidate.title" />
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="拼团简介：" prop="info" label-for="info">
-                    <Input
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="拼团名称：" prop="title" label-for="title">
+                    <el-input placeholder="请输入拼团名称" element-id="title" v-model="formValidate.title" />
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="拼团简介：" prop="info" label-for="info">
+                    <el-input
                       placeholder="请输入拼团简介"
                       type="textarea"
                       :rows="4"
                       element-id="info"
                       v-model="formValidate.info"
                     />
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <FormItem label="拼团时间：" prop="section_time">
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="拼团时间：" prop="section_time">
                   <div class="acea-row row-middle">
                     <DatePicker
                       :editable="false"
                       type="datetimerange"
                       format="yyyy-MM-dd HH:mm"
                       placeholder="请选择活动时间"
-                      @on-change="onchangeTime"
+                      @change="onchangeTime"
                       class="perW30"
                       :value="formValidate.section_time"
                       v-model="formValidate.section_time"
                     ></DatePicker>
                     <div class="ml10 grey">设置活动开启结束时间，用户可以在设置时间内发起参与拼团</div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.virtual_type == 0">
-                <FormItem label="物流方式：" prop="logistics">
-                  <CheckboxGroup v-model="formValidate.logistics">
-                    <Checkbox label="1">快递</Checkbox>
-                    <Checkbox label="2">到店核销</Checkbox>
-                  </CheckboxGroup>
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.virtual_type == 0">
-                <FormItem label="运费设置：" :prop="formValidate.freight != 1 ? 'freight' : ''">
-                  <RadioGroup v-model="formValidate.freight">
-                    <Radio :label="2">固定邮费</Radio>
-                    <Radio :label="3">运费模板</Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col>
-              <Col
-                span="24"
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="formValidate.virtual_type == 0">
+                <el-form-item label="物流方式：" prop="logistics">
+                  <el-checkbox-group v-model="formValidate.logistics">
+                    <el-checkbox label="1">快递</el-checkbox>
+                    <el-checkbox label="2">到店核销</el-checkbox>
+                  </el-checkbox-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="formValidate.virtual_type == 0">
+                <el-form-item label="运费设置：" :prop="formValidate.freight != 1 ? 'freight' : ''">
+                  <el-radio-group v-model="formValidate.freight">
+                    <el-radio :label="2">固定邮费</el-radio>
+                    <el-radio :label="3">运费模板</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col
+                :span="24"
                 v-if="formValidate.freight != 3 && formValidate.freight != 1 && formValidate.virtual_type == 0"
               >
-                <FormItem label="">
+                <el-form-item label="">
                   <div class="acea-row">
-                    <InputNumber
-                      min="0.01"
-                      max="10000"
+                    <el-input-number
+                      controls-position="right"
+                      :min="0.01"
+                      :max="10000"
                       v-model="formValidate.postage"
                       placeholder="请输入金额"
                       class="perW20 maxW"
                     />
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.freight == 3 && formValidate.virtual_type == 0">
-                <FormItem label="" prop="temp_id">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="formValidate.freight == 3 && formValidate.virtual_type == 0">
+                <el-form-item label="" prop="temp_id">
                   <div class="acea-row">
-                    <Select v-model="formValidate.temp_id" clearable placeholder="请选择运费模板" class="perW20 maxW">
-                      <Option v-for="(item, index) in templateList" :value="item.id" :key="index">{{
-                        item.name
-                      }}</Option>
-                    </Select>
+                    <el-select
+                      v-model="formValidate.temp_id"
+                      clearable
+                      placeholder="请选择运费模板"
+                      class="perW20 maxW"
+                    >
+                      <el-option
+                        v-for="(item, index) in templateList"
+                        :value="item.id"
+                        :key="index"
+                        :label="item.name"
+                      ></el-option>
+                    </el-select>
                     <span class="addfont" @click="freight">新增运费模板</span>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="拼团时效(单位 小时)：" prop="effective_time">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="拼团时效(单位 小时)：" prop="effective_time">
                   <div class="acea-row row-middle">
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       placeholder="请输入拼团时效(单位 小时)"
                       class="perW20"
                       element-id="effective_time"
@@ -181,12 +186,13 @@
                       用户发起拼团后开始计时，需在设置时间内邀请到规定好友人数参团，超过时效时间，则系统判定拼团失败，自动发起退款
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="拼团人数：" prop="people">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="拼团人数：" prop="people">
                   <div class="acea-row row-middle">
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       :min="2"
                       :max="10000"
                       placeholder="请输入拼团人数"
@@ -197,12 +203,13 @@
                     />
                     <div class="ml10 grey">单次拼团需要参与的用户数</div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="虚拟成团补齐人数：" prop="virtualPeople">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="虚拟成团补齐人数：" prop="virtualPeople">
                   <div class="acea-row row-middle">
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       placeholder="设置虚拟成团的补齐人数"
                       :precision="0"
                       :max="10000"
@@ -215,12 +222,13 @@
                       设置虚拟成团的补齐人数，如：5人团设置补齐2人，当团队成员大于等于3人时，拼团结束时自动补齐剩余最多2个位置，不开启虚拟成团请设置为0
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="总购买数量限制：" prop="num">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="总购买数量限制：" prop="num">
                   <div class="acea-row row-middle">
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       :min="1"
                       placeholder="请输入总数量限制"
                       :precision="0"
@@ -233,12 +241,13 @@
                       该商品活动期间内，用户可购买的最大数量。例如设置为4，表示本次活动有效期内，每个用户最多可购买4件
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="单次购买数量限制：" prop="once_num">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="单次购买数量限制：" prop="once_num">
                   <div class="acea-row row-middle">
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       :min="1"
                       placeholder="请输入单次购买数量限制"
                       :precision="0"
@@ -251,22 +260,23 @@
                       用户参与拼团时，一次购买最大数量限制。例如设置为2，表示每次参与拼团时，用户一次购买数量最大可选择2个
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="单位：" prop="unit_name" label-for="unit_name">
-                  <Input
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="单位：" prop="unit_name" label-for="unit_name">
+                  <el-input
                     placeholder="请输入单位"
                     element-id="unit_name"
                     v-model="formValidate.unit_name"
                     class="perW20"
                   />
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="团长返佣比例：" prop="head_commission">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="团长返佣比例：" prop="head_commission">
                   <div class="acea-row row-middle">
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       :min="0"
                       :max="100"
                       placeholder="团长返佣比例"
@@ -279,22 +289,23 @@
                       拼团成功后，如果团长是分销员，则在订单确认收货时会给团长返一定的佣金，佣金比例是实际支付金额的0-100%
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="拼团是否参与分销：" props="is_commission" label-for="is_commission">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="拼团是否参与分销：" props="is_commission" label-for="is_commission">
                   <div class="acea-row row-middle">
-                    <RadioGroup element-id="is_commission" v-model="formValidate.is_commission">
-                      <Radio :label="1" class="radio">开启</Radio>
-                      <Radio :label="0">关闭</Radio>
-                    </RadioGroup>
+                    <el-radio-group element-id="is_commission" v-model="formValidate.is_commission">
+                      <el-radio :label="1" class="radio">开启</el-radio>
+                      <el-radio :label="0">关闭</el-radio>
+                    </el-radio-group>
                     <div class="ml10 grey">拼团商品是否参与商城分销返佣</div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="排序：">
-                  <InputNumber
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="排序：">
+                  <el-input-number
+                    controls-position="right"
                     placeholder="请输入排序"
                     element-id="sort"
                     :precision="0"
@@ -303,90 +314,110 @@
                     v-model="formValidate.sort"
                     class="perW10"
                   />
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="热门推荐：" props="is_hot" label-for="is_hot">
-                  <RadioGroup element-id="is_hot" v-model="formValidate.is_host">
-                    <Radio :label="1" class="radio">开启</Radio>
-                    <Radio :label="0">关闭</Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="活动状态：" props="is_show" label-for="is_show">
-                  <RadioGroup element-id="status" v-model="formValidate.is_show">
-                    <Radio :label="1" class="radio">开启</Radio>
-                    <Radio :label="0">关闭</Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="规格选择：">
-                  <Table :data="specsData" :columns="columns" border @on-selection-change="changeCheckbox">
-                    <template slot-scope="{ row, index }" slot="price">
-                      <InputNumber
-                        v-model="row.price"
-                        :min="0"
-                        :precision="2"
-                        class="priceBox"
-                        :active-change="false"
-                        @on-change="
-                          (e) => {
-                            changePrice(e, index);
-                          }
-                        "
-                      ></InputNumber>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="pic">
-                      <div
-                        class="acea-row row-middle row-center-wrapper"
-                        @click="modalPicTap('dan', 'danTable', index)"
-                      >
-                        <div class="pictrue pictrueTab" v-if="row.pic">
-                          <img v-lazy="row.pic" />
-                        </div>
-                        <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
-                          <Icon type="ios-camera-outline" size="21" />
-                        </div>
-                      </div>
-                    </template>
-                  </Table>
-                </FormItem>
-              </Col>
-            </Row>
-            <Row v-show="current === 2">
-              <Col span="24">
-                <FormItem label="内容：">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="热门推荐：" props="is_hot" label-for="is_hot">
+                  <el-radio-group element-id="is_hot" v-model="formValidate.is_host">
+                    <el-radio :label="1" class="radio">开启</el-radio>
+                    <el-radio :label="0">关闭</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="活动状态：" props="is_show" label-for="is_show">
+                  <el-radio-group element-id="status" v-model="formValidate.is_show">
+                    <el-radio :label="1" class="radio">开启</el-radio>
+                    <el-radio :label="0">关闭</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="规格选择：">
+                  <el-table :data="specsData" :columns="columns" border @selection-change="changeCheckbox">
+                    <el-table-column type="selection" width="55"> </el-table-column>
+                    <el-table-column
+                      :label="item.title"
+                      :min-width="item.minWidth"
+                      v-for="(item, index) in columns"
+                      :key="index"
+                    >
+                      <template slot-scope="scope">
+                        <template v-if="item.key">
+                          <div>
+                            <span>{{ scope.row[item.key] }}</span>
+                          </div>
+                        </template>
+                        <template v-else-if="item.slot === 'pic'">
+                          <div
+                            class="acea-row row-middle row-center-wrapper"
+                            @click="modalPicTap('dan', 'danTable', index)"
+                          >
+                            <div class="pictrue pictrueTab" v-if="scope.row.pic">
+                              <img v-lazy="scope.row.pic" />
+                            </div>
+                            <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
+                              <Icon type="ios-camera-outline" size="21" class="iconfonts" />
+                            </div>
+                          </div>
+                        </template>
+                        <template v-else-if="item.slot === 'price'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="scope.row.price"
+                            :min="0"
+                            :precision="2"
+                            class="priceBox"
+                            :active-change="false"
+                          ></el-input-number>
+                        </template>
+                        <template v-else-if="item.slot === 'quota'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="scope.row.quota"
+                            :min="1"
+                            active-change
+                            class="priceBox"
+                          ></el-input-number>
+                        </template>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row v-show="current === 2">
+              <el-col :span="24">
+                <el-form-item label="内容：">
                   <WangEditor
                     style="width: 90%"
                     :content="formValidate.description"
                     @editorContent="getEditorContent"
                   ></WangEditor>
-                </FormItem>
-              </Col>
-            </Row>
-            <FormItem>
-              <Button
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item>
+              <el-button
                 class="submission mr15"
                 @click="step"
                 v-show="current !== 0"
                 :disabled="$route.params.id && current === 1"
-                >上一步</Button
+                >上一步</el-button
               >
-              <Button
+              <el-button
                 type="primary"
                 :disabled="submitOpen && current === 2"
                 class="submission"
                 @click="next('formValidate')"
                 v-text="current === 2 ? '提交' : '下一步'"
-              ></Button>
-            </FormItem>
-          </Form>
+              ></el-button>
+            </el-form-item>
+          </el-form>
           <Spin size="large" fix v-if="spinShow"></Spin>
-        </Col>
-      </Row>
-    </Card>
+        </el-col>
+      </el-row>
+    </el-card>
     <!-- 选择商品-->
     <Modal
       v-model="modals"
@@ -638,7 +669,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 155;
+      return this.isMobile ? undefined : '155px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -681,7 +712,7 @@ export default {
           });
           that.formValidate.items = data.items;
           that.columns = data.header;
-          that.columns.unshift(selection);
+          // that.columns.unshift(selection);
           that.inputChange(data);
         })
         .catch((res) => {
@@ -814,7 +845,7 @@ export default {
           );
           this.$set(this.formValidate, 'items', info.attrs.items);
           this.columns = info.attrs.header;
-          this.columns.unshift(selection);
+          // this.columns.unshift(selection);
           this.specsData = info.attrs.value;
           that.specsData.forEach(function (item, index) {
             that.$set(that.specsData[index], 'id', index);
diff --git a/template/admin/src/pages/marketing/storeCombination/index.vue b/template/admin/src/pages/marketing/storeCombination/index.vue
index 1eaf3e54c..606b4743e 100644
--- a/template/admin/src/pages/marketing/storeCombination/index.vue
+++ b/template/admin/src/pages/marketing/storeCombination/index.vue
@@ -1,109 +1,159 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="拼团状态：" clearable>
-              <Select v-model="formValidate.is_show" placeholder="请选择" clearable @on-change="userSearchs">
-                <Option :value="1">开启</Option>
-                <Option :value="0">关闭</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="商品搜索：" prop="store_name" label-for="store_name">
-              <Input
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="拼团状态：" clearable>
+              <el-select v-model="formValidate.is_show" placeholder="请选择" clearable @change="userSearchs">
+                <el-option :value="1" label="开启"></el-option>
+                <el-option :value="0" label="关闭"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="商品搜索：" prop="store_name" label-for="store_name">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入请输入商品名称/ID"
                 v-model="formValidate.store_name"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Button
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-button
             v-auth="['marketing-store_combination-create']"
             type="primary"
             class="bnt mr15"
             icon="md-add"
             @click="add"
-            >添加拼团商品</Button
+            >添加拼团商品</el-button
           >
-          <Button v-auth="['export-storeCombination']" class="export" icon="ios-share-outline" @click="exports"
-            >导出</Button
+          <el-button v-auth="['export-storeCombination']" class="export" icon="ios-share-outline" @click="exports"
+            >导出</el-button
           >
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+        </el-row>
+      </el-form>
+      <el-table
         :data="tableList"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="is_fail">
-          <Icon type="md-checkmark" v-if="row.is_fail === 1" color="#0092DC" size="14" />
-          <Icon type="md-close" v-else color="#ed5565" size="14" />
-        </template>
-        <template slot-scope="{ row, index }" slot="image">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.image" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="stop_time">
-          <span> {{ row.stop_time | formatDate }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="is_show">
-          <i-switch
-            v-model="row.is_show"
-            :value="row.is_show"
-            :true-value="1"
-            :false-value="0"
-            :disabled="row.stop_status ? true : false"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">开启</span>
-            <span slot="close">关闭</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="start_name">
-          <Tag color="blue" v-show="row.start_name === '进行中'">进行中</Tag>
-          <Tag color="volcano" v-show="row.start_name === '未开始'">未开始</Tag>
-          <Tag color="cyan" v-show="row.start_name === '已结束'">已结束</Tag>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a v-if="row.stop_status === 0" @click="edit(row)">编辑</a>
-          <Divider v-if="row.stop_status === 0" type="vertical" />
-          <a @click="copy(row)">复制</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除拼团商品', index)">删除</a>
-          <Divider type="vertical" />
-          <a @click="viewInfo(row)">统计</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="拼团图片" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.image" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="拼团名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="原价" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.ot_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="拼团价" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="拼团人数" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.count_people }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="参与人数" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.count_people_all }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="成团数量" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.count_people_pink }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="限量" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.quota_show }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="限量剩余" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.quota }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="活动状态" min-width="100">
+          <template slot-scope="scope">
+            <Tag color="blue" v-show="scope.row.start_name === '进行中'">进行中</Tag>
+            <Tag color="volcano" v-show="scope.row.start_name === '未开始'">未开始</Tag>
+            <Tag color="cyan" v-show="scope.row.start_name === '已结束'">已结束</Tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="结束时间" min-width="150">
+          <template slot-scope="scope">
+            <span> {{ scope.row.stop_time | formatDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="上架状态" min-width="150">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.is_show"
+              :value="scope.row.is_show"
+              :disabled="scope.row.stop_status ? true : false"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+              active-text="上架"
+              inactive-text="下架"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a v-if="scope.row.stop_status === 0" @click="edit(scope.row)">编辑</a>
+            <el-divider direction="vertical" v-if="scope.row.stop_status === 0" />
+            <a @click="copy(scope.row)">复制</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除拼团商品', index)">删除</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="viewInfo(scope.row)">统计</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -140,100 +190,6 @@ export default {
         limit: 15,
       },
       value: '',
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '拼团图片',
-          slot: 'image',
-          minWidth: 90,
-        },
-        {
-          title: '拼团名称',
-          key: 'title',
-          minWidth: 130,
-        },
-        {
-          title: '原价',
-          key: 'ot_price',
-          minWidth: 100,
-        },
-        {
-          title: '拼团价',
-          key: 'price',
-          minWidth: 120,
-        },
-        // {
-        //     title: '库存',
-        //     key: 'stock',
-        //     minWidth: 100
-        // },
-        {
-          title: '拼团人数',
-          key: 'count_people',
-          minWidth: 100,
-        },
-        // {
-        //     title: '访问人数',
-        //     key: 'count_people_browse',
-        //     minWidth: 100
-        // },
-        // {
-        //     title: '展现量',
-        //     key: 'browse',
-        //     minWidth: 150
-        // },
-        {
-          title: '参与人数',
-          key: 'count_people_all',
-          minWidth: 100,
-        },
-        {
-          title: '成团数量',
-          key: 'count_people_pink',
-          minWidth: 100,
-        },
-        // {
-        //     title: '浏览量',
-        //     key: 'browse',
-        //     minWidth: 150
-        // },
-        {
-          title: '限量',
-          key: 'quota_show',
-          minWidth: 100,
-        },
-        {
-          title: '限量剩余',
-          key: 'quota',
-          minWidth: 100,
-        },
-        {
-          title: '活动状态',
-          slot: 'start_name',
-          minWidth: 100,
-        },
-        {
-          title: '结束时间',
-          slot: 'stop_time',
-          minWidth: 150,
-        },
-
-        {
-          title: '上架状态',
-          slot: 'is_show',
-          minWidth: 120,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 170,
-        },
-      ],
       tableList: [],
       total: 0,
       statisticsList: [],
@@ -242,7 +198,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -337,10 +293,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.formValidate.page = 1;
diff --git a/template/admin/src/pages/marketing/storeCombination/statistics.vue b/template/admin/src/pages/marketing/storeCombination/statistics.vue
index 9ae61ba21..e6e26ebc3 100644
--- a/template/admin/src/pages/marketing/storeCombination/statistics.vue
+++ b/template/admin/src/pages/marketing/storeCombination/statistics.vue
@@ -3,89 +3,101 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <span>
-          <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
+          <el-button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</el-button>
         </span>
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
       </div>
     </div>
     <cards-data :cardLists="cardLists" v-if="cardLists.length >= 0"></cards-data>
     <div>
-      <Tabs v-model="currentTab" @on-click="onClickTab">
-        <TabPane v-for="(item, index) in tabs" :label="item.label" :name="item.type" :key="index" />
-      </Tabs>
+      <el-tabs v-model="currentTab" @tab-click="onClickTab">
+        <el-tab-pane v-for="(item, index) in tabs" :label="item.label" :name="item.type" :key="index" />
+      </el-tabs>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="pagination"
         :model="pagination"
         :label-width="labelWidth"
         label-position="right"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col span="6" v-if="type == 1">
-            <FormItem label="订单状态：" label-for="status">
-              <Select v-model="pagination.status" placeholder="请选择订单状态" clearable @on-change="searchList">
-                <Option value="0">未支付</Option>
-                <Option value="1">待发货</Option>
-                <Option value="2">待收货</Option>
-                <Option value="3">待评价</Option>
-                <Option value="4">交易完成</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col span="6">
-            <FormItem label="搜索：" label-for="title">
-              <Input
+        <el-row :gutter="24">
+          <el-col :span="6" v-if="type == 1">
+            <el-form-item label="订单状态：" label-for="status">
+              <el-select v-model="pagination.status" placeholder="请选择订单状态" clearable @change="searchList">
+                <el-option value="0" label="未支付"></el-option>
+                <el-option value="1" label="待发货"></el-option>
+                <el-option value="2" label="待收货"></el-option>
+                <el-option value="3" label="待评价"></el-option>
+                <el-option value="4" label="交易完成"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="搜索：" label-for="title">
+              <el-input
                 search
                 enter-button
                 v-model="pagination.real_name"
                 :placeholder="type == 1 ? '请输入用户|订单号|UID' : '请输入用户姓名|UID'"
                 @on-search="searchList"
               />
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="type ? thead2 : thead"
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tbody"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row }" slot="avatar">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="people">
-          <span> {{ row.count_people + ' / ' + row.people }}</span>
-        </template>
-        <template slot-scope="{ row }" slot="status">
-          <Tag color="blue" v-show="row.status === 1">进行中</Tag>
-          <Tag color="volcano" v-show="row.status === 3">已失败</Tag>
-          <Tag color="cyan" v-show="row.status === 2">已成功</Tag>
-        </template>
-        <template slot-scope="{ row }" slot="action">
-          <a @click="Info(row)">查看详情</a>
-        </template>
-      </Table>
+        <el-table-column
+          :label="item.title"
+          :min-width="item.minWidth"
+          v-for="(item, index) in type ? thead2 : thead"
+          :key="index"
+        >
+          <template slot-scope="scope">
+            <template v-if="item.key">
+              <div>
+                <span>{{ scope.row[item.key] }}</span>
+              </div>
+            </template>
+            <template v-else-if="item.slot === 'avatar'">
+              <div class="tabBox_img" v-viewer>
+                <img v-lazy="scope.row.avatar" />
+              </div>
+            </template>
+            <template v-else-if="item.slot === 'people'">
+              <span> {{ scope.row.count_people + ' / ' + scope.row.people }}</span>
+            </template>
+            <template v-else-if="item.slot === 'status'">
+              <Tag color="blue" v-show="scope.row.status === 1">进行中</Tag>
+              <Tag color="volcano" v-show="scope.row.status === 3">已失败</Tag>
+              <Tag color="cyan" v-show="scope.row.status === 2">已成功</Tag>
+            </template>
+            <template v-else-if="item.slot === 'action'">
+              <a @click="Info(scope.row)">查看详情</a>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="pagination.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="pagination.limit"
+          :page.sync="pagination.page"
+          :limit.sync="pagination.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!-- 详情模态框-->
     <Modal
       v-model="modals"
@@ -97,30 +109,49 @@
       :mask-closable="false"
       width="750"
     >
-      <Table
+      <el-table
         ref="selection"
-        :columns="columns2"
         :data="tabList3"
-        :loading="loading2"
-        no-data-text="暂无数据"
-        highlight-row
+        v-loading="loading2"
+        empty-text="暂无数据"
+        highlight-current-row
         max-height="600"
         size="small"
-        no-filtered-data-text="暂无筛选结果"
       >
-        <template slot-scope="{ row }" slot="nickname">
-          <span> {{ row.nickname + ' / ' + row.uid }}</span>
-        </template>
-        <template slot-scope="{ row }" slot="avatar">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="action">
-          <Tag color="volcano" v-show="row.is_refund != 0">已退款</Tag>
-          <Tag color="cyan" v-show="row.is_refund === 0">未退款</Tag>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户头像" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.avatar" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户名称" min-width="130">
+          <template slot-scope="scope">
+            <span> {{ scope.row.nickname + ' / ' + scope.row.uid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单编号" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.order_id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="金额" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.total_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单状态" min-width="130">
+          <template slot-scope="scope">
+            <Tag color="volcano" v-show="scope.row.is_refund != 0">已退款</Tag>
+            <Tag color="cyan" v-show="scope.row.is_refund === 0">未退款</Tag>
+          </template>
+        </el-table-column>
+      </el-table>
     </Modal>
   </div>
 </template>
@@ -270,34 +301,6 @@ export default {
       type: 0,
       loading2: false,
       tabList3: [],
-      columns2: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '用户名称',
-          slot: 'nickname',
-          minWidth: 100,
-        },
-        {
-          title: '用户头像',
-          slot: 'avatar',
-        },
-        {
-          title: '订单编号',
-          key: 'order_id',
-        },
-        {
-          title: '金额',
-          key: 'total_price',
-        },
-        {
-          title: '订单状态',
-          slot: 'action',
-        },
-      ],
     };
   },
   created() {
@@ -344,11 +347,6 @@ export default {
       this.pagination.page = 1;
       this.getList(this.id);
     },
-    // 分页
-    pageChange(index) {
-      this.pagination.page = index;
-      this.getList(this.id);
-    },
     // 查看详情
     Info(row) {
       this.modals = true;
diff --git a/template/admin/src/pages/marketing/storeCoupon/index.vue b/template/admin/src/pages/marketing/storeCoupon/index.vue
index 1d35c2645..da4df6425 100644
--- a/template/admin/src/pages/marketing/storeCoupon/index.vue
+++ b/template/admin/src/pages/marketing/storeCoupon/index.vue
@@ -1,84 +1,125 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="tableFrom"
         :model="tableFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="是否有效：" label-for="status">
-              <Select
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="是否有效：" label-for="status">
+              <el-select
                 v-model="tableFrom.status"
                 placeholder="请选择"
                 clearable
                 element-id="status"
-                @on-change="userSearchs"
+                @change="userSearchs"
               >
-                <Option value="1">有效</Option>
-                <Option value="0">无效</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="优惠券名称：" label-for="title">
-              <Input
+                <el-option value="1" label="有效"></el-option>
+                <el-option value="0" label="无效"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="优惠券名称：" label-for="title">
+              <el-input
                 search
                 enter-button
                 v-model="tableFrom.title"
                 placeholder="请输入优惠券名称"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button v-auth="['admin-marketing-store_coupon-add']" type="primary" icon="md-add" @click="add"
-              >添加优惠券</Button
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-button v-auth="['admin-marketing-store_coupon-add']" type="primary" icon="md-add" @click="add"
+              >添加优惠券</el-button
             >
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tableList"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="status">
-          <Icon type="md-checkmark" v-if="row.status === 1" color="#0092DC" size="14" />
-          <Icon type="md-close" v-else color="#ed5565" size="14" />
-        </template>
-        <template slot-scope="{ row, index }" slot="add_time">
-          <span> {{ row.add_time | formatDate }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="couponInvalid(row, '修改优惠券', index)" v-if="row.status">立即失效</a>
-          <Divider type="vertical" v-if="row.status" />
-          <a @click="couponSend(row)" v-if="row.status" v-auth="['admin-marketing-store_coupon-push']">发布</a>
-          <Divider type="vertical" v-if="row.status" />
-          <a @click="couponDel(row, '删除优惠券', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠券名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠券类型" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.type }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="面值" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.coupon_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="最低消费额" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.use_min_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="有效期限(天)" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.coupon_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="排序" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sort }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否有效" min-width="130">
+          <template slot-scope="scope">
+            <Icon type="md-checkmark" v-if="scope.row.status === 1" color="#0092DC" size="14" />
+            <Icon type="md-close" v-else color="#ed5565" size="14" />
+          </template>
+        </el-table-column>
+        <el-table-column label="添加时间" min-width="130">
+          <template slot-scope="scope">
+            <span> {{ scope.row.add_time | formatDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="couponInvalid(scope.row, '修改优惠券', index)" v-if="scope.row.status">立即失效</a>
+            <el-divider direction="vertical" v-if="scope.row.status" />
+            <a @click="couponSend(scope.row)" v-if="scope.row.status" v-auth="['admin-marketing-store_coupon-push']"
+              >发布</a
+            >
+            <el-divider direction="vertical" v-if="scope.row.status" />
+            <a @click="couponDel(scope.row, '删除优惠券', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="tableFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="tableFrom.limit"
+          :page.sync="tableFrom.page"
+          :limit.sync="tableFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!--表单编辑-->
     <edit-from :FromData="FromData" @changeType="changeType" ref="edits"></edit-from>
   </div>
@@ -180,7 +221,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 90;
+      return this.isMobile ? undefined : '90px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
diff --git a/template/admin/src/pages/marketing/storeCouponIssue/create.vue b/template/admin/src/pages/marketing/storeCouponIssue/create.vue
index 990562cc2..130b76b85 100644
--- a/template/admin/src/pages/marketing/storeCouponIssue/create.vue
+++ b/template/admin/src/pages/marketing/storeCouponIssue/create.vue
@@ -3,9 +3,9 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <router-link :to="{ path: $routeProStr + '/marketing/store_coupon_issue/index' }"
-          ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
+          ><el-button icon="ios-arrow-back" size="small" type="text">返回</el-button></router-link
         >
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span
           class="ivu-page-header-title mr20"
           style="padding: 0"
@@ -13,34 +13,34 @@
         ></span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form :model="formData" :label-width="150">
-        <FormItem label="优惠券名称">
-          <Input v-model="formData.coupon_title" :maxlength="18" placeholder="请输入优惠券名称"></Input>
-        </FormItem>
-        <FormItem label="优惠券面值">
-          <InputNumber :min="1" :max="99999" v-model="formData.coupon_price"></InputNumber>
-        </FormItem>
-        <FormItem label="发送方式">
-          <RadioGroup v-model="formData.receive_type">
-            <Radio :label="1">用户领取</Radio>
-            <Radio :label="2">新用户自动发放</Radio>
-            <Radio :label="3">系统赠送</Radio>
-            <Radio :label="4">付费会员专享</Radio>
-          </RadioGroup>
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form :model="formData" label-width="150px">
+        <el-form-item label="优惠券名称">
+          <el-input v-model="formData.coupon_title" :maxlength="18" placeholder="请输入优惠券名称"></el-input>
+        </el-form-item>
+        <el-form-item label="优惠券面值">
+          <el-input-number controls-position="right" :min="1" :max="99999" v-model="formData.coupon_price"></el-input-number>
+        </el-form-item>
+        <el-form-item label="发送方式">
+          <el-radio-group v-model="formData.receive_type">
+            <el-radio :label="1">用户领取</el-radio>
+            <el-radio :label="2">新用户自动发放</el-radio>
+            <el-radio :label="3">系统赠送</el-radio>
+            <el-radio :label="4">付费会员专享</el-radio>
+          </el-radio-group>
           <div class="tip">
             用户领取：用户需要手动领取优惠券；新用户自动发放：新注册的用户自动发放；系统赠送：后台发放制定用户或者添加到商品里面用户购买该商品获得；付费会员专享：仅付费会员可以领取和使用
           </div>
-        </FormItem>
-        <FormItem label="优惠劵类型">
-          <RadioGroup v-model="formData.type">
-            <Radio :label="0">通用券</Radio>
-            <Radio :label="1">品类券</Radio>
-            <Radio :label="2">商品券</Radio>
-            <!--                        <Radio :label="3">会员券</Radio>-->
-          </RadioGroup>
-        </FormItem>
-        <FormItem v-show="formData.type === 2">
+        </el-form-item>
+        <el-form-item label="优惠劵类型">
+          <el-radio-group v-model="formData.type">
+            <el-radio :label="0">通用券</el-radio>
+            <el-radio :label="1">品类券</el-radio>
+            <el-radio :label="2">商品券</el-radio>
+            <!--                        <el-radio :label="3">会员券</el-radio>-->
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-show="formData.type === 2">
           <template>
             <div class="upload-list" v-for="item in productList" :key="item.product_id">
               <img :src="item.image" />
@@ -49,11 +49,11 @@
           </template>
           <Icon type="ios-camera-outline" size="26" @click="modals = true" />
           <div class="info">选择商品</div>
-        </FormItem>
-        <FormItem v-show="formData.type === 1">
-          <!-- <Select v-model="formData.category_id" style="width: 320px" multiple>
-            <Option v-for="item in categoryList" :value="item.id" :key="item.id">{{ item.cate_name }}</Option>
-          </Select> -->
+        </el-form-item>
+        <el-form-item v-show="formData.type === 1">
+          <!-- <el-select v-model="formData.category_id" style="width: 320px" multiple>
+            <el-option v-for="item in categoryList" :value="item.id" :key="item.id">{{ item.cate_name }}</el-option>
+          </el-select> -->
           <el-cascader
             v-model="formData.category_id"
             size="small"
@@ -63,87 +63,87 @@
             style="width: 320px"
           ></el-cascader>
           <div class="info">选择商品的品类</div>
-        </FormItem>
-        <FormItem label="使用门槛">
-          <RadioGroup v-model="isMinPrice">
-            <Radio :label="0">无门槛</Radio>
-            <Radio :label="1">有门槛</Radio>
-          </RadioGroup>
-        </FormItem>
-        <FormItem v-if="isMinPrice">
-          <InputNumber :min="1" :max="99999" v-model="formData.use_min_price"></InputNumber>
+        </el-form-item>
+        <el-form-item label="使用门槛">
+          <el-radio-group v-model="isMinPrice">
+            <el-radio :label="0">无门槛</el-radio>
+            <el-radio :label="1">有门槛</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="isMinPrice">
+          <el-input-number controls-position="right" :min="1" :max="99999" v-model="formData.use_min_price"></el-input-number>
           <div class="info">填写优惠券的最低消费金额</div>
-        </FormItem>
-        <FormItem label="使用时间">
-          <RadioGroup v-model="isCouponTime">
-            <Radio :label="1">天数</Radio>
-            <Radio :label="0">时间段</Radio>
-          </RadioGroup>
-        </FormItem>
-        <FormItem v-show="isCouponTime" label="">
-          <InputNumber :min="1" v-model="formData.coupon_time" :precision="0"></InputNumber>
+        </el-form-item>
+        <el-form-item label="使用时间">
+          <el-radio-group v-model="isCouponTime">
+            <el-radio :label="1">天数</el-radio>
+            <el-radio :label="0">时间段</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-show="isCouponTime" label="">
+          <el-input-number controls-position="right" :min="1" v-model="formData.coupon_time" :precision="0"></el-input-number>
           <div class="info">领取后多少天内有效</div>
-        </FormItem>
-        <FormItem v-show="!isCouponTime" label="">
+        </el-form-item>
+        <el-form-item v-show="!isCouponTime" label="">
           <DatePicker
             :value="datetime1"
             :editable="false"
             type="datetimerange"
             placeholder="领取后在这个时间段内可以使用"
-            @on-change="dateChange"
+            @change="dateChange"
           ></DatePicker>
-        </FormItem>
-        <FormItem label="领取时间" v-if="formData.receive_type != 2 && formData.receive_type != 3">
-          <RadioGroup v-model="isReceiveTime">
-            <Radio :label="1">限时</Radio>
-            <Radio :label="0">不限时</Radio>
-          </RadioGroup>
-        </FormItem>
-        <FormItem v-show="isReceiveTime" label="">
+        </el-form-item>
+        <el-form-item label="领取时间" v-if="formData.receive_type != 2 && formData.receive_type != 3">
+          <el-radio-group v-model="isReceiveTime">
+            <el-radio :label="1">限时</el-radio>
+            <el-radio :label="0">不限时</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-show="isReceiveTime" label="">
           <DatePicker
             :value="datetime2"
             type="datetimerange"
             placeholder="在这个时间段内可领取"
-            @on-change="timeChange"
+            @change="timeChange"
           ></DatePicker>
-        </FormItem>
-        <FormItem label="优惠券发布数量" v-if="formData.receive_type != 2 && formData.receive_type != 3">
-          <RadioGroup v-model="formData.is_permanent">
-            <Radio :label="0">限量</Radio>
-            <Radio :label="1">不限量</Radio>
-          </RadioGroup>
-        </FormItem>
-        <FormItem
+        </el-form-item>
+        <el-form-item label="优惠券发布数量" v-if="formData.receive_type != 2 && formData.receive_type != 3">
+          <el-radio-group v-model="formData.is_permanent">
+            <el-radio :label="0">限量</el-radio>
+            <el-radio :label="1">不限量</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item
           v-show="!formData.is_permanent"
           label=""
           v-if="formData.receive_type != 2 && formData.receive_type != 3"
         >
-          <InputNumber :min="1" :max="99999" v-model="formData.total_count" :precision="0"></InputNumber>
+          <el-input-number controls-position="right" :min="1" :max="99999" v-model="formData.total_count" :precision="0"></el-input-number>
           <div class="info">填写优惠券的发布数量</div>
-        </FormItem>
-        <FormItem label="用户领取数量" v-if="formData.receive_type != 2 && formData.receive_type != 3">
-          <InputNumber :min="1" :max="99999" v-model="formData.receive_limit" :precision="0"></InputNumber>
+        </el-form-item>
+        <el-form-item label="用户领取数量" v-if="formData.receive_type != 2 && formData.receive_type != 3">
+          <el-input-number controls-position="right" :min="1" :max="99999" v-model="formData.receive_limit" :precision="0"></el-input-number>
           <div class="info">填写每个用户可以领取多少张</div>
-        </FormItem>
-        <!--                <FormItem label="排序">-->
-        <!--                    <InputNumber-->
+        </el-form-item>
+        <!--                <el-form-item label="排序">-->
+        <!--                    <el-input-number controls-position="right"-->
         <!--                        :min="0"-->
         <!--                        :max="100000000"-->
         <!--                        v-model="formData.sort"-->
         <!--                        :precision="0"-->
-        <!--                    ></InputNumber>-->
-        <!--                </FormItem>-->
-        <FormItem label="状态">
-          <RadioGroup v-model="formData.status">
-            <Radio :label="1">开启</Radio>
-            <Radio :label="0">关闭</Radio>
-          </RadioGroup>
-        </FormItem>
-        <FormItem>
-          <Button type="primary" @click="save" :disabled="disabled">立即创建</Button>
-        </FormItem>
-      </Form>
-    </Card>
+        <!--                    ></el-input-number>-->
+        <!--                </el-form-item>-->
+        <el-form-item label="状态">
+          <el-radio-group v-model="formData.status">
+            <el-radio :label="1">开启</el-radio>
+            <el-radio :label="0">关闭</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="save" :disabled="disabled">立即创建</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
     <Modal
       v-model="modals"
       title="商品列表"
diff --git a/template/admin/src/pages/marketing/storeCouponIssue/index.vue b/template/admin/src/pages/marketing/storeCouponIssue/index.vue
index 214d6f691..af3332271 100644
--- a/template/admin/src/pages/marketing/storeCouponIssue/index.vue
+++ b/template/admin/src/pages/marketing/storeCouponIssue/index.vue
@@ -1,147 +1,187 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="tableFrom"
         :model="tableFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="是否有效：" label-for="status">
-              <Select v-model="tableFrom.status" placeholder="请选择" clearable @on-change="userSearchs">
-                <Option value="1">正常</Option>
-                <Option value="0">未开启</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="类型：" label-for="status">
-              <Select v-model="receive_type" placeholder="请选择" clearable @on-change="userSearchs">
-                <Option value="all">全部</Option>
-                <Option value="1">手动领取</Option>
-                <Option value="2">新用户自动发放</Option>
-                <Option value="3">后台赠送</Option>
-                <Option value="4">付费会员专享</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="优惠券名称：" label-for="coupon_title">
-              <Input
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="是否有效：" label-for="status">
+              <el-select v-model="tableFrom.status" placeholder="请选择" clearable @change="userSearchs">
+                <el-option value="1" label="正常"></el-option>
+                <el-option value="0" label="未开启"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="类型：" label-for="status">
+              <el-select v-model="receive_type" placeholder="请选择" clearable @change="userSearchs">
+                <el-option value="all" label="全部"></el-option>
+                <el-option value="1" label="手动领取"></el-option>
+                <el-option value="2" label="新用户自动发放"></el-option>
+                <el-option value="3" label="后台赠送"></el-option>
+                <el-option value="4" label="付费会员专享"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="优惠券名称：" label-for="coupon_title">
+              <el-input
                 search
                 enter-button
                 v-model="tableFrom.coupon_title"
                 placeholder="请输入优惠券名称"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button v-auth="['admin-marketing-store_coupon-add']" type="primary" icon="md-add" @click="add"
-              >添加优惠券</Button
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-button v-auth="['admin-marketing-store_coupon-add']" type="primary" icon="md-add" @click="add"
+              >添加优惠券</el-button
             >
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tableList"
         ref="table"
         class="mt25"
         :loading="loading"
-        highlight-row
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row }" slot="count">
-          <span v-if="row.is_permanent">不限量</span>
-          <div v-else>
-            <span class="fa">发布：{{ row.total_count }}</span>
-            <span class="sheng">剩余：{{ row.remain_count }}</span>
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="type">
-          <span v-if="row.type === 1">品类券</span>
-          <span v-else-if="row.type === 2">商品券</span>
-          <span v-else-if="row.type === 3">会员券</span>
-          <span v-else>通用券</span>
-        </template>
-        <template slot-scope="{ row }" slot="receive_type">
-          <span v-if="row.receive_type === 1">手动领取</span>
-          <span v-else-if="row.receive_type === 2">新人券</span>
-          <span v-else-if="row.receive_type === 3">赠送券</span>
-          <span v-else-if="row.receive_type === 4">会员券</span>
-          <span v-else>虚拟购买</span>
-        </template>
-        <template slot-scope="{ row }" slot="start_time">
-          <div v-if="row.start_time">{{ row.start_time | formatDate }} - {{ row.end_time | formatDate }}</div>
-          <span v-else>不限时</span>
-        </template>
-        <template slot-scope="{ row }" slot="start_use_time">
-          <div v-if="row.start_use_time">
-            {{ row.start_use_time | formatDate }} -
-            {{ row.end_use_time | formatDate }}
-          </div>
-          <div v-else>{{ row.coupon_time }}天</div>
-        </template>
-        <template slot-scope="{ row }" slot="status">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            size="large"
-            @on-change="openChange(row)"
-          >
-            <span slot="open">开启</span>
-            <span slot="close">关闭</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="receive(row)">领取记录</a>
-          <Divider type="vertical" />
-          <a @click="copy(row)">复制</a>
-          <Divider type="vertical" />
-          <a @click="couponDel(row, '删除发布的优惠券', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠券名称" min-width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.coupon_title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠券类型" min-width="80">
+          <template slot-scope="scope">
+            <span v-if="scope.row.type === 1">品类券</span>
+            <span v-else-if="scope.row.type === 2">商品券</span>
+            <span v-else-if="scope.row.type === 3">会员券</span>
+            <span v-else>通用券</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="面值" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.coupon_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="领取方式" min-width="150">
+          <template slot-scope="scope">
+            <span v-if="scope.row.receive_type === 1">手动领取</span>
+            <span v-else-if="scope.row.receive_type === 2">新人券</span>
+            <span v-else-if="scope.row.receive_type === 3">赠送券</span>
+            <span v-else-if="scope.row.receive_type === 4">会员券</span>
+            <span v-else>虚拟购买</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="领取日期" min-width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.start_time">
+              {{ scope.row.start_time | formatDate }} - {{ scope.row.end_time | formatDate }}
+            </div>
+            <span v-else>不限时</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="使用时间" min-width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.start_use_time">
+              {{ scope.row.start_use_time | formatDate }} -
+              {{ scope.row.end_use_time | formatDate }}
+            </div>
+            <div v-else>{{ scope.row.coupon_time }}天</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="发布数量" min-width="100">
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_permanent">不限量</span>
+            <div v-else>
+              <span class="fa">发布：{{ scope.row.total_count }}</span>
+              <span class="sheng">剩余：{{ scope.row.remain_count }}</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否开启" min-width="100">
+          <template slot-scope="scope">
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              :value="scope.row.status"
+              size="large"
+              @change="openChange(scope.row)"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="150">
+          <template slot-scope="scope">
+            <a @click="receive(scope.row)">领取记录</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="copy(scope.row)">复制</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="couponDel(scope.row, '删除发布的优惠券', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="tableFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="tableFrom.limit"
+          :page.sync="tableFrom.page"
+          :limit.sync="tableFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!-- 领取记录 -->
     <Modal v-model="modals2" scrollable footer-hide closable title="领取记录" :mask-closable="false" width="700">
-      <Table
-        :columns="columns2"
+      <el-table
         :data="receiveList"
         ref="table"
         :loading="loading2"
-        highlight-row
+        highlight-current-row
         height="500"
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="avatar">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-      </Table>
-      <!-- <div class="acea-row row-right page">
-        <Page :total="total2" show-elevator show-total @on-change="receivePageChange" :page-size="receiveFrom.limit" />
-      </div> -->
+        <el-table-column label="ID" min-width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.uid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户名" min-width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户头像" min-width="150">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.avatar" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="领取时间" min-width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
     </Modal>
   </div>
 </template>
@@ -177,75 +217,7 @@ export default {
         xs: 24,
       },
       loading: false,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '优惠券名称',
-          key: 'coupon_title',
-          minWidth: 150,
-          // render (h, data) {
-          //     let row = data.row, content = '';
-          //     if (row.is_give_subscribe) {
-          //         content = '关注';
-          //     } else if (row.is_full_give) {
-          //         content = '满赠';
-          //     } else {
-          //         content = '普通'
-          //     }
-          //     return h('div', [
-          //         h('Tag', { attrs: {
-          //             color: 'blue'
-          //         } }, content),
-          //         h('span', data.row.coupon_title)
-          //     ]);
-          // }
-        },
-        {
-          title: '优惠券类型',
-          slot: 'type',
-          minWidth: 80,
-        },
-        {
-          title: '面值',
-          key: 'coupon_price',
-          minWidth: 100,
-        },
-        {
-          title: '领取方式',
-          slot: 'receive_type',
-          minWidth: 100,
-        },
-        {
-          title: '领取日期',
-          slot: 'start_time',
-          minWidth: 250,
-        },
-        {
-          title: '使用时间',
-          slot: 'start_use_time',
-          minWidth: 250,
-        },
-        {
-          title: '发布数量',
-          slot: 'count',
-          minWidth: 90,
-        },
-        {
-          title: '是否开启',
-          slot: 'status',
-          minWidth: 90,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 200,
-        },
-      ],
+
       tableFrom: {
         status: '',
         coupon_title: '',
@@ -259,28 +231,6 @@ export default {
       FromData: null,
       receiveList: [],
       loading2: false,
-      columns2: [
-        {
-          title: 'ID',
-          key: 'uid',
-          minWidth: 150,
-        },
-        {
-          title: '用户名',
-          key: 'nickname',
-          minWidth: 150,
-        },
-        {
-          title: '用户头像',
-          slot: 'avatar',
-          minWidth: 100,
-        },
-        {
-          title: '领取时间',
-          key: 'add_time',
-          minWidth: 140,
-        },
-      ],
       total2: 0,
       receiveFrom: {
         page: 1,
@@ -295,7 +245,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 90;
+      return this.isMobile ? undefined : '90px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -373,10 +323,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.tableFrom.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.tableFrom.page = 1;
diff --git a/template/admin/src/pages/marketing/storeCouponUser/index.vue b/template/admin/src/pages/marketing/storeCouponUser/index.vue
index cda0ffae3..6bb2b5ad3 100644
--- a/template/admin/src/pages/marketing/storeCouponUser/index.vue
+++ b/template/admin/src/pages/marketing/storeCouponUser/index.vue
@@ -1,64 +1,104 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="tableFrom"
         :model="tableFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="是否有效：">
-              <Select placeholder="请选择" clearable v-model="tableFrom.status" @on-change="userSearchs">
-                <Option value="1">已使用</Option>
-                <Option value="0">未使用</Option>
-                <Option value="2">已过期</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="领取人：" label-for="nickname">
-              <Input placeholder="请输入领取人" v-model="tableFrom.nickname" clearable />
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="优惠券搜索：" label-for="coupon_title">
-              <Input
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="是否有效：">
+              <el-select placeholder="请选择" clearable v-model="tableFrom.status" @change="userSearchs">
+                <el-option value="1" label="已使用"></el-option>
+                <el-option value="0" label="未使用"></el-option>
+                <el-option value="2" label="已过期"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="领取人：" label-for="nickname">
+              <el-input placeholder="请输入领取人" v-model="tableFrom.nickname" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="优惠券搜索：" label-for="coupon_title">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入优惠券名称"
                 v-model="tableFrom.coupon_title"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-      <Table :columns="columns1" :data="tableList">
-        <template slot-scope="{ row, index }" slot="is_fail">
-          <Icon type="md-checkmark" v-if="row.is_fail === 0" color="#0092DC" size="14" />
-          <Icon type="md-close" v-else color="#ed5565" size="14" />
-        </template>
-        <template slot-scope="{ row, index }" slot="add_time">
-          <span> {{ row.start_time | formatDate }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="end_time">
-          <span> {{ row.end_time | formatDate }}</span>
-        </template>
-      </Table>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table :data="tableList">
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠券名称" min-width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.coupon_title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="领取人" min-width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="面值" min-width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.coupon_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="最低消费额" min-width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.use_min_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="开始使用时间" min-width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.start_time | formatDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="结束使用时间" min-width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.end_time | formatDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="获取方式" min-width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.type }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否可用" min-width="150">
+          <template slot-scope="scope">
+            <Icon type="md-checkmark" v-if="scope.row.is_fail === 0" color="#0092DC" size="14" />
+            <Icon type="md-close" v-else color="#ed5565" size="14" />
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.status }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="tableFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="tableFrom.limit"
+          :page.sync="tableFrom.page"
+          :limit.sync="tableFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -78,58 +118,6 @@ export default {
   },
   data() {
     return {
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '优惠券名称',
-          key: 'coupon_title',
-          minWidth: 150,
-        },
-        {
-          title: '领取人',
-          key: 'nickname',
-          minWidth: 130,
-        },
-        {
-          title: '面值',
-          key: 'coupon_price',
-          minWidth: 100,
-        },
-        {
-          title: '最低消费额',
-          key: 'use_min_price',
-          minWidth: 120,
-        },
-        {
-          title: '开始使用时间',
-          slot: 'add_time',
-          minWidth: 150,
-        },
-        {
-          title: '结束使用时间',
-          slot: 'end_time',
-          minWidth: 150,
-        },
-        {
-          title: '获取方式',
-          key: 'type',
-          minWidth: 150,
-        },
-        {
-          title: '是否可用',
-          slot: 'is_fail',
-          minWidth: 120,
-        },
-        {
-          title: '状态',
-          key: 'status',
-          minWidth: 170,
-        },
-      ],
       tableList: [],
       grid: {
         xl: 7,
@@ -151,7 +139,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 90;
+      return this.isMobile ? undefined : '90px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -177,10 +165,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.tableFrom.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.tableFrom.page = 1;
diff --git a/template/admin/src/pages/marketing/storeIntegral/addStoreIntegral.vue b/template/admin/src/pages/marketing/storeIntegral/addStoreIntegral.vue
deleted file mode 100644
index 86d10454a..000000000
--- a/template/admin/src/pages/marketing/storeIntegral/addStoreIntegral.vue
+++ /dev/null
@@ -1,618 +0,0 @@
-<template>
-  <div>
-    <div class="i-layout-page-header">
-      <div class="i-layout-page-header">
-        <router-link :to="{ path: $routeProStr + '/marketing/store_integral/index' }"
-          ><Button icon="ios-arrow-back" size="small" class="mr20">返回</Button></router-link
-        >
-        <span class="ivu-page-header-title mr20" v-text="$route.params.id ? '编辑积分商品' : '添加积分商品'"></span>
-      </div>
-    </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row type="flex" class="mt30 acea-row row-middle row-center">
-        <Col span="23">
-          <Form
-            class="form mt30"
-            ref="formValidate"
-            :model="formValidate"
-            :rules="ruleValidate"
-            :label-width="labelWidth"
-            :label-position="labelPosition"
-            @submit.native.prevent
-          >
-            <FormItem label="选择商品：" prop="image_input">
-              <div class="picBox" @click="changeGoods">
-                <div class="pictrue" v-for="(item, index) in goodsImg" :key="index">
-                  <img v-lazy="item.image" v-if="item.image" />
-                  <span class="iconfont icondel_1" @click.stop="bindDelete(index)"></span>
-                </div>
-
-                <div class="upLoad acea-row row-center-wrapper">
-                  <Icon type="ios-camera-outline" size="26" class="iconfonts" />
-                </div>
-              </div>
-            </FormItem>
-            <Col type="flex">
-              <Col span="24">
-                <FormItem label="规格选择：">
-                  <Table
-                    :data="specsData"
-                    :columns="columns"
-                    border
-                    class="mt25"
-                    highlight-row
-                    :loading="loading"
-                    @on-selection-change="changeCheckbox"
-                  >
-                    <template slot-scope="{ row, index }" slot="pic">
-                      <div
-                        class="acea-row row-middle row-center-wrapper"
-                        @click="modalPicTap('dan', 'danTable', index)"
-                      >
-                        <div class="pictrue pictrueTab" v-if="row.pic">
-                          <img v-lazy="row.pic" />
-                        </div>
-                        <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
-                          <Icon type="ios-camera-outline" size="21" class="iconfont" />
-                        </div>
-                      </div>
-                    </template>
-                  </Table>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="上架状态：" props="is_show" label-for="is_show">
-                  <RadioGroup element-id="is_show" v-model="formValidate.is_show">
-                    <Radio :label="0">关闭</Radio>
-                    <Radio :label="1" class="radio">开启</Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col>
-            </Col>
-            <Col span="24">
-              <FormItem>
-                <Button
-                  class="submission mr15"
-                  @click="step"
-                  v-show="current !== 0"
-                  :disabled="$route.params.id && current === 1"
-                  >上一步
-                </Button>
-                <Button
-                  :disabled="submitOpen && current === 1"
-                  type="primary"
-                  class="submission"
-                  @click="next('formValidate')"
-                  v-text="'提交'"
-                ></Button>
-              </FormItem>
-            </Col>
-          </Form>
-          <Spin size="large" fix v-if="spinShow"></Spin>
-        </Col>
-      </Row>
-    </Card>
-    <!-- 选择商品-->
-    <Modal
-      v-model="modals"
-      title="商品列表"
-      class="paymentFooter"
-      footerHide
-      scrollable
-      width="900"
-      @on-cancel="cancel"
-    >
-      <goods-list v-if="modals" ref="goodslist" :ischeckbox="true" @getProductId="getProductId"></goods-list>
-    </Modal>
-    <!-- 上传图片-->
-    <Modal
-      v-model="modalPic"
-      width="950px"
-      scrollable
-      footer-hide
-      closable
-      title="上传商品图"
-      :mask-closable="false"
-      :z-index="1"
-    >
-      <uploadPictures
-        :isChoice="isChoice"
-        @getPic="getPic"
-        @getPicD="getPicD"
-        :gridBtn="gridBtn"
-        :gridPic="gridPic"
-        v-if="modalPic"
-      ></uploadPictures>
-    </Modal>
-  </div>
-</template>
-
-<script>
-import { mapState } from 'vuex';
-import goodsList from '@/components/goodsList/index';
-import uploadPictures from '@/components/uploadPictures';
-import { integralAddBatch, productAttrsApi, integralInfoApi } from '@/api/marketing';
-
-export default {
-  name: 'storeIntegralCreate',
-  components: { goodsList, uploadPictures },
-  data() {
-    return {
-      loading: false,
-      goodsImg: [],
-      productsId: [],
-      submitOpen: false,
-      spinShow: false,
-      isChoice: '',
-      current: 0,
-      modalPic: false,
-      grid: {
-        xl: 12,
-        lg: 20,
-        md: 24,
-        sm: 24,
-        xs: 24,
-      },
-      grid2: {
-        xl: 8,
-        lg: 12,
-        md: 12,
-        sm: 24,
-        xs: 24,
-      },
-      gridPic: {
-        xl: 6,
-        lg: 8,
-        md: 12,
-        sm: 12,
-        xs: 12,
-      },
-      gridBtn: {
-        xl: 4,
-        lg: 8,
-        md: 8,
-        sm: 8,
-        xs: 8,
-      },
-      myConfig: {
-        autoHeightEnabled: false, // 编辑器不自动被内容撑高
-        initialFrameHeight: 500, // 初始容器高度
-        initialFrameWidth: '100%', // 初始容器宽度
-        UEDITOR_HOME_URL: '/UEditor/',
-        serverUrl: '',
-      },
-      modals: false,
-      modal_loading: false,
-      images: [],
-      formValidate: {
-        is_show: 0,
-        attrs: [],
-      },
-      templateList: [],
-      timeList: [],
-      columns: [],
-      specsData: [],
-      picTit: '',
-      tableIndex: 0,
-      ruleValidate: {
-        price: [
-          {
-            required: true,
-            type: 'number',
-            message: '请输入兑换积分',
-            trigger: 'blur',
-          },
-        ],
-
-        num: [
-          {
-            required: true,
-            type: 'number',
-            message: '请输入购买数量限制',
-            trigger: 'blur',
-          },
-        ],
-        once_num: [
-          {
-            required: true,
-            type: 'number',
-            message: '请输入单次购买数量限制',
-            trigger: 'blur',
-          },
-        ],
-      },
-      copy: 0,
-    };
-  },
-  computed: {
-    ...mapState('media', ['isMobile']),
-    labelWidth() {
-      return this.isMobile ? undefined : 135;
-    },
-    labelPosition() {
-      return this.isMobile ? 'top' : 'right';
-    },
-  },
-  mounted() {
-    if (this.$route.params.id) {
-      this.copy = this.$route.params.copy;
-      this.current = 1;
-      this.getInfo();
-    }
-  },
-  methods: {
-    // 规格；
-    productAttrs(rows) {
-      this.loading = true;
-      return new Promise((resolve, reject) => {
-        let that = this;
-        productAttrsApi(rows.product_id, 4)
-          .then((res) => {
-            let data = res.data.info;
-            let selection = {
-              type: 'selection',
-              width: 60,
-              align: 'center',
-            };
-            that.specsData = that.specsData.concat(data.attrs);
-            that.specsData.forEach(function (item, index) {
-              that.$set(that.specsData[index], 'id', index);
-            });
-            that.columns = data.header;
-            that.columns.unshift(selection);
-            that.inputChange(data);
-            resolve();
-            this.loading = false;
-          })
-          .catch((res) => {
-            this.loading = false;
-
-            reject();
-            that.$Message.error(res.msg);
-          });
-      });
-    },
-    inputChange(data) {
-      let that = this;
-      let $index = [];
-      data.header.forEach(function (item, index) {
-        if (item.type === 1) {
-          $index.push({ index: index, key: item.key, title: item.title });
-        }
-      });
-      $index.forEach(function (item, index) {
-        let title = item.title;
-        let key = item.key;
-        let row = {
-          title: title,
-          key: key,
-          align: 'center',
-          minWidth: 120,
-          render: (h, params) => {
-            return h('div', [
-              h('InputNumber', {
-                props: {
-                  min: 0,
-                  precision: 0,
-                  value: key === 'price' ? params.row.price : params.row.quota,
-                },
-                on: {
-                  'on-change': (e) => {
-                    key === 'price' ? (params.row.price = e) : (params.row.quota = e);
-                    that.specsData[params.index] = params.row;
-                    if (!!that.formValidate.attrs && that.formValidate.attrs.length) {
-                      that.formValidate.attrs.forEach((v, index) => {
-                        if (v.id === params.row.id) {
-                          that.formValidate.attrs.splice(index, 1, params.row);
-                        }
-                      });
-                    }
-                  },
-                },
-              }),
-            ]);
-          },
-        };
-        that.columns.splice(item.index, 1, row);
-      });
-    },
-    // 多选
-    changeCheckbox(selection) {
-      this.formValidate.attrs = selection;
-    },
-    // 商品id
-    async getProductId(row) {
-      for (let i = 0; i < this.goodsImg.length; i++) {
-        const element = this.goodsImg[i];
-        if (element.product_id === row.product_id) {
-          this.$Message.error('该商品已经添加');
-          return;
-        }
-      }
-      this.modal_loading = false;
-      this.modals = false;
-      this.goodsImg = this.goodsImg.concat(row);
-      // this.goodsImg.push({
-      //   image: row.image,
-      //   id: row.id,
-      // });
-      for (let j = 0; j < row.length; j++) {
-        const element = row[j];
-        await this.productAttrs(element);
-      }
-    },
-
-    cancel() {
-      this.modals = false;
-    },
-    // 具体日期
-    onchangeTime(e) {
-      this.formValidate.section_time = e;
-    },
-    // 详情
-    getInfo() {
-      this.spinShow = true;
-      integralInfoApi(this.$route.params.id)
-        .then(async (res) => {
-          let that = this;
-          let info = res.data.info;
-          let selection = {
-            type: 'selection',
-            width: 60,
-            align: 'center',
-          };
-          this.formValidate = info;
-          this.columns = info.attrs.header;
-          this.columns.unshift(selection);
-          this.specsData = info.attrs.value;
-          that.specsData.forEach(function (item, index) {
-            that.$set(that.specsData[index], 'id', index);
-          });
-          let data = info.attrs;
-          let attr = [];
-          for (let index in info.attrs.value) {
-            if (info.attrs.value[index]._checked) {
-              attr.push(info.attrs.value[index]);
-            }
-          }
-          that.formValidate.attrs = attr;
-          that.inputChange(data);
-          this.spinShow = false;
-        })
-        .catch((res) => {
-          this.spinShow = false;
-          this.$Message.error(res.msg);
-        });
-    },
-    bindDelete(index) {
-      let delId = this.goodsImg[index].product_id;
-      this.goodsImg.splice(index, 1);
-      this.loading = true;
-      // 删除逻辑待完善
-    },
-    // 下一步
-    next(name) {
-      let that = this;
-      if (!this.formValidate.attrs.length) {
-        return that.$Message.error('请先选择商品规格');
-      }
-      for (let index in that.formValidate.attrs) {
-        if (that.formValidate.attrs[index].quota <= 0) {
-          return that.$Message.error('商品限量必须大于0');
-        }
-      }
-      this.$refs[name].validate((valid) => {
-        if (valid) {
-          if (this.copy == 1) this.formValidate.copy = 1;
-          this.formValidate.id = Number(this.$route.params.id) || 0;
-          this.submitOpen = true;
-          integralAddBatch(this.formValidate)
-            .then(async (res) => {
-              this.submitOpen = false;
-              this.$Message.success(res.msg);
-              setTimeout(() => {
-                this.$router.push({
-                  path: this.$routeProStr + '/marketing/store_integral/index',
-                });
-              }, 500);
-            })
-            .catch((res) => {
-              this.submitOpen = false;
-              this.$Message.error(res.msg);
-            });
-        } else {
-          return false;
-        }
-      });
-    },
-    // 上一步
-    step() {
-      this.current--;
-    },
-    // 内容
-    getContent(val) {
-      this.formValidate.description = val;
-    },
-    // 点击商品图
-    modalPicTap(tit, picTit, index) {
-      this.modalPic = true;
-      this.isChoice = tit === 'dan' ? '单选' : '多选';
-      this.picTit = picTit;
-      this.tableIndex = index;
-    },
-    // 获取单张图片信息
-    getPic(pc) {
-      switch (this.picTit) {
-        case 'danFrom':
-          this.formValidate.image = pc.att_dir;
-          break;
-        // case 'danTable':
-        //     this.specsData[this.tableIndex].pic = pc.att_dir;
-        //     break;
-        default:
-          if (!!this.formValidate.attrs && this.formValidate.attrs.length) {
-            this.$set(this.specsData[this.tableIndex], '_checked', true);
-          }
-          this.specsData[this.tableIndex].pic = pc.att_dir;
-      }
-      this.modalPic = false;
-    },
-    // 获取多张图信息
-    getPicD(pc) {
-      this.images = pc;
-      this.images.map((item) => {
-        this.formValidate.images.push(item.att_dir);
-        this.formValidate.images = this.formValidate.images.splice(0, 10);
-      });
-      this.modalPic = false;
-    },
-    handleRemove(i) {
-      this.images.splice(i, 1);
-      this.formValidate.images.splice(i, 1);
-    },
-    // 选择商品
-    changeGoods() {
-      this.modals = true;
-    }, // 移动
-    handleDragStart(e, item) {
-      this.dragging = item;
-    },
-    handleDragEnd(e, item) {
-      this.dragging = null;
-    },
-    // 首先把div变成可以放置的元素，即重写dragenter/dragover
-    handleDragOver(e) {
-      e.dataTransfer.dropEffect = 'move'; // e.dataTransfer.dropEffect="move";//在dragenter中针对放置目标来设置!
-    },
-    handleDragEnter(e, item) {
-      e.dataTransfer.effectAllowed = 'move'; // 为需要移动的元素设置dragstart事件
-      if (item === this.dragging) {
-        return;
-      }
-      const newItems = [...this.formValidate.images];
-      const src = newItems.indexOf(this.dragging);
-      const dst = newItems.indexOf(item);
-      newItems.splice(dst, 0, ...newItems.splice(src, 1));
-      this.formValidate.images = newItems;
-    },
-    // 添加自定义弹窗
-    addCustomDialog(editorId) {
-      window.UE.registerUI(
-        'test-dialog',
-        function (editor, uiName) {
-          // 创建 dialog
-          let dialog = new window.UE.ui.Dialog({
-            // 指定弹出层中页面的路径，这里只能支持页面，路径参考常见问题 2
-            iframeUrl: this.$routeProStr + '/widget.images/index.html?fodder=dialog',
-            // 需要指定当前的编辑器实例
-            editor: editor,
-            // 指定 dialog 的名字
-            name: uiName,
-            // dialog 的标题
-            title: '上传图片',
-            // 指定 dialog 的外围样式
-            cssRules: 'width:960px;height:550px;padding:20px;',
-          });
-          this.dialog = dialog;
-          // 参考上面的自定义按钮
-          var btn = new window.UE.ui.Button({
-            name: 'dialog-button',
-            title: '上传图片',
-            cssRules: `background-image: url(../../../assets/images/icons.png);background-position: -726px -77px;`,
-            onclick: function () {
-              // 渲染dialog
-              dialog.render();
-              dialog.open();
-            },
-          });
-          return btn;
-        },
-        37 /* 指定添加到工具栏上的那个位置，默认时追加到最后 */,
-        editorId /* 指定这个UI是哪个编辑器实例上的，默认是页面上所有的编辑器都会添加这个按钮 */,
-      );
-    },
-  },
-};
-</script>
-
-<style scoped lang="stylus">
-.custom-label {
-  display: inline-flex;
-  line-height: 1.5;
-}
-
-.grey {
-  color: #999;
-}
-
-.maxW /deep/.ivu-select-dropdown {
-  max-width: 600px;
-}
-
-.tabBox_img {
-  width: 50px;
-  height: 50px;
-  margin: 0 auto;
-}
-
-.tabBox_img img {
-  width: 100%;
-  height: 100%;
-}
-
-.priceBox {
-  width: 100%;
-}
-
-.form {
-  .picBox {
-    display: inline-block;
-    cursor: pointer;
-    display: flex;
-    align-items: center;
-  }
-
-  .pictrue {
-    width: 60px;
-    height: 60px;
-    border: 1px dotted rgba(0, 0, 0, 0.1);
-    margin-right: 15px;
-    display: inline-block;
-    position: relative;
-    cursor: pointer;
-
-    img {
-      width: 100%;
-      height: 100%;
-    }
-
-    .icondel_1 {
-      position: absolute;
-      right: -10px;
-      top: -16px;
-      color: #999999;
-      font-size: 28px;
-      cursor: pointer;
-    }
-
-    .btndel {
-      position: absolute;
-      z-index: 9;
-      width: 20px !important;
-      height: 20px !important;
-      left: 46px;
-      top: -4px;
-    }
-  }
-
-  .upLoad {
-    width: 58px;
-    height: 58px;
-    line-height: 58px;
-    border: 1px dotted rgba(0, 0, 0, 0.1);
-    border-radius: 4px;
-    background: rgba(0, 0, 0, 0.02);
-    cursor: pointer;
-  }
-}
-</style>
diff --git a/template/admin/src/pages/marketing/storeIntegral/create.vue b/template/admin/src/pages/marketing/storeIntegral/create.vue
index a59219635..e34850631 100644
--- a/template/admin/src/pages/marketing/storeIntegral/create.vue
+++ b/template/admin/src/pages/marketing/storeIntegral/create.vue
@@ -3,9 +3,9 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <router-link :to="{ path: $routeProStr + '/marketing/store_integral/index' }"
-          ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
+          ><el-button icon="ios-arrow-back" size="small" type="text">返回</el-button></router-link
         >
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span
           class="ivu-page-header-title mr20"
           style="padding: 0"
@@ -13,17 +13,17 @@
         ></span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row type="flex" class="mt30 acea-row row-middle row-center">
-        <Col span="20">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row class="mt30 acea-row row-middle row-center">
+        <el-col :span="20">
           <Steps :current="current">
             <Step title="选择积分商品"></Step>
             <Step title="填写基础信息"></Step>
             <Step title="修改商品详情"></Step>
           </Steps>
-        </Col>
-        <Col span="23">
-          <Form
+        </el-col>
+        <el-col :span="23">
+          <el-form
             class="form mt30"
             ref="formValidate"
             :model="formValidate"
@@ -33,7 +33,7 @@
             :label-position="labelPosition"
             @submit.native.prevent
           >
-            <FormItem label="选择商品：" prop="image_input" v-if="current === 0">
+            <el-form-item label="选择商品：" prop="image_input" v-if="current === 0">
               <div class="picBox" @click="changeGoods">
                 <div class="pictrue" v-if="formValidate.image">
                   <img v-lazy="formValidate.image" />
@@ -42,10 +42,10 @@
                   <Icon type="ios-camera-outline" size="26" class="iconfonts" />
                 </div>
               </div>
-            </FormItem>
-            <Col v-show="current === 1" type="flex">
-              <Col span="24">
-                <FormItem prop="image">
+            </el-form-item>
+            <el-col v-show="current === 1">
+              <el-col :span="24">
+                <el-form-item prop="image">
                   <div class="custom-label" slot="label">
                     <div>
                       <div>商品主图</div>
@@ -61,10 +61,10 @@
                       <Icon type="ios-camera-outline" size="26" class="iconfonts" />
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem prop="images">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item prop="images">
                   <div class="custom-label" slot="label">
                     <div>
                       <div>商品轮播图</div>
@@ -84,12 +84,7 @@
                       @dragend="handleDragEnd($event, item)"
                     >
                       <img v-lazy="item" />
-                      <Button
-                        shape="circle"
-                        icon="md-close"
-                        @click.native="handleRemove(index)"
-                        class="btndel"
-                      ></Button>
+                      <i class="el-icon-circle-close btndel" @click="handleRemove(index)"></i>
                     </div>
                     <div
                       v-if="formValidate.images.length < 10"
@@ -99,19 +94,20 @@
                       <Icon type="ios-camera-outline" size="26" class="iconfonts" />
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="商品标题：" prop="title" label-for="title">
-                    <Input placeholder="请输入商品标题" element-id="title" v-model="formValidate.title" />
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <FormItem label="用户兑换数量限制：" prop="num">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="商品标题：" prop="title" label-for="title">
+                    <el-input placeholder="请输入商品标题" element-id="title" v-model="formValidate.title" />
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="用户兑换数量限制：" prop="num">
                   <div class="acea-row row-middle">
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       :min="1"
                       :max="99999"
                       placeholder="请输入数量限制"
@@ -124,107 +120,135 @@
                       每个用户可购买该商品总数限制。例如设置为4，表示本活动,每个用户最多可兑换总数4个
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="单位：" prop="unit_name" label-for="unit_name">
-                  <Input
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="单位：" prop="unit_name" label-for="unit_name">
+                  <el-input
                     placeholder="请输入单位"
                     element-id="unit_name"
                     v-model="formValidate.unit_name"
                     class="perW20"
                   />
-                </FormItem>
-              </Col>
+                </el-form-item>
+              </el-col>
 
-              <Col span="24">
-                <FormItem label="排序：">
-                  <InputNumber
+              <el-col :span="24">
+                <el-form-item label="排序：">
+                  <el-input-number
+                    controls-position="right"
                     placeholder="请输入排序"
                     element-id="sort"
                     :precision="0"
                     v-model="formValidate.sort"
                     class="perW10"
                   />
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="上架状态：" props="is_show" label-for="status">
-                  <RadioGroup element-id="is_show" v-model="formValidate.is_show">
-                    <Radio :label="1" class="radio">开启</Radio>
-                    <Radio :label="0">关闭</Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col>
-              <Col v-bind="grid2">
-                <FormItem label="热门推荐：" props="is_host" label-for="is_host">
-                  <RadioGroup element-id="is_host" v-model="formValidate.is_host">
-                    <Radio :label="1" class="radio">开启</Radio>
-                    <Radio :label="0">关闭</Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="规格选择：">
-                  <Table
-                    :data="specsData"
-                    :columns="columns"
-                    border
-                    class="mt25"
-                    highlight-row
-                    @on-selection-change="changeCheckbox"
-                  >
-                    <template slot-scope="{ row, index }" slot="pic">
-                      <div
-                        class="acea-row row-middle row-center-wrapper"
-                        @click="modalPicTap('dan', 'danTable', index)"
-                      >
-                        <div class="pictrue pictrueTab" v-if="row.pic">
-                          <img v-lazy="row.pic" />
-                        </div>
-                        <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
-                          <Icon type="ios-camera-outline" size="21" class="iconfont" />
-                        </div>
-                      </div>
-                    </template>
-                  </Table>
-                </FormItem>
-              </Col>
-            </Col>
-            <Row v-show="current === 2">
-              <Col span="24">
-                <FormItem label="内容：">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="上架状态：" props="is_show" label-for="status">
+                  <el-radio-group element-id="is_show" v-model="formValidate.is_show">
+                    <el-radio :label="1" class="radio">开启</el-radio>
+                    <el-radio :label="0">关闭</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col v-bind="grid2">
+                <el-form-item label="热门推荐：" props="is_host" label-for="is_host">
+                  <el-radio-group element-id="is_host" v-model="formValidate.is_host">
+                    <el-radio :label="1" class="radio">开启</el-radio>
+                    <el-radio :label="0">关闭</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="规格选择：">
+                  <el-table :data="specsData" border class="mt25" highlight-current-row @selection-change="changeCheckbox">
+                    <el-table-column type="selection" width="55"> </el-table-column>
+                    <el-table-column
+                      :label="item.title"
+                      :min-width="item.minWidth"
+                      v-for="(item, index) in columns"
+                      :key="index"
+                    >
+                      <template slot-scope="scope">
+                        <template v-if="item.key">
+                          <div>
+                            <span>{{ scope.row[item.key] }}</span>
+                          </div>
+                        </template>
+                        <template v-else-if="item.slot === 'pic'">
+                          <div
+                            class="acea-row row-middle row-center-wrapper"
+                            @click="modalPicTap('dan', 'danTable', index)"
+                          >
+                            <div class="pictrue pictrueTab" v-if="scope.row.pic">
+                              <img v-lazy="scope.row.pic" />
+                            </div>
+                            <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
+                              <Icon type="ios-camera-outline" size="21" class="iconfonts" />
+                            </div>
+                          </div>
+                        </template>
+                        <template v-else-if="item.slot === 'price'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="scope.row.price"
+                            :min="0"
+                            :precision="2"
+                            class="priceBox"
+                            :active-change="false"
+                          ></el-input-number>
+                        </template>
+                        <template v-else-if="item.slot === 'quota'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="scope.row.quota"
+                            :min="1"
+                            active-change
+                            class="priceBox"
+                          ></el-input-number>
+                        </template>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-form-item>
+              </el-col>
+            </el-col>
+            <el-row v-show="current === 2">
+              <el-col :span="24">
+                <el-form-item label="内容：">
                   <WangEditor
                     style="width: 90%"
                     :content="formValidate.description"
                     @editorContent="getEditorContent"
                   ></WangEditor>
-                </FormItem>
-              </Col>
-            </Row>
-            <Col span="24">
-              <FormItem>
-                <Button
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-col :span="24">
+              <el-form-item>
+                <el-button
                   class="submission mr15"
                   @click="step"
                   v-show="current !== 0"
                   :disabled="$route.params.id && current === 1"
                   >上一步
-                </Button>
-                <Button
+                </el-button>
+                <el-button
                   :disabled="submitOpen && current === 2"
                   type="primary"
                   class="submission"
                   @click="next('formValidate')"
                   v-text="current === 2 ? '提交' : '下一步'"
-                ></Button>
-              </FormItem>
-            </Col>
-          </Form>
+                ></el-button>
+              </el-form-item>
+            </el-col>
+          </el-form>
           <Spin size="large" fix v-if="spinShow"></Spin>
-        </Col>
-      </Row>
-    </Card>
+        </el-col>
+      </el-row>
+    </el-card>
     <!-- 选择商品-->
     <Modal
       v-model="modals"
@@ -424,7 +448,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 135;
+      return this.isMobile ? undefined : '135px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -447,18 +471,12 @@ export default {
       productAttrsApi(rows.id, 4)
         .then((res) => {
           let data = res.data.info;
-          let selection = {
-            type: 'selection',
-            width: 60,
-            align: 'center',
-          };
           that.specsData = data.attrs;
           that.specsData.forEach(function (item, index) {
             that.$set(that.specsData[index], 'id', index);
           });
           that.formValidate.items = data.items;
           that.columns = data.header;
-          that.columns.unshift(selection);
           that.inputChange(data);
         })
         .catch((res) => {
@@ -568,15 +586,9 @@ export default {
         .then(async (res) => {
           let that = this;
           let info = res.data.info;
-          let selection = {
-            type: 'selection',
-            width: 60,
-            align: 'center',
-          };
           this.formValidate = info;
           this.$set(this.formValidate, 'items', info.attrs.items);
           this.columns = info.attrs.header;
-          this.columns.unshift(selection);
           this.specsData = info.attrs.value;
           that.specsData.forEach(function (item, index) {
             that.$set(that.specsData[index], 'id', index);
diff --git a/template/admin/src/pages/marketing/storeIntegral/index.vue b/template/admin/src/pages/marketing/storeIntegral/index.vue
index cd86fcad9..403f12152 100644
--- a/template/admin/src/pages/marketing/storeIntegral/index.vue
+++ b/template/admin/src/pages/marketing/storeIntegral/index.vue
@@ -1,20 +1,20 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="tableFrom"
         :model="tableFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col>
-            <FormItem label="创建时间：" label-for="user_time">
-              <!--<DatePicker clearable @on-change="onchangeTime" v-model="timeVal" :value="timeVal"  format="yyyy/MM/dd" type="daterange" placement="bottom-end" placeholder="选择时间" v-width="'100%'"></DatePicker>-->
+        <el-row :gutter="24">
+          <el-col>
+            <el-form-item label="创建时间：" label-for="user_time">
+              <!--<DatePicker clearable @change="onchangeTime" v-model="timeVal" :value="timeVal"  format="yyyy/MM/dd" type="daterange" placement="bottom-end" placeholder="选择时间" v-width="'100%'"></DatePicker>-->
               <DatePicker
                 :editable="false"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="daterange"
@@ -23,25 +23,25 @@
                 style="width: 200px"
                 class="mr20"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col>
-            <FormItem label="上架状态：">
-              <Select
+            </el-form-item>
+          </el-col>
+          <el-col>
+            <el-form-item label="上架状态：">
+              <el-select
                 placeholder="请选择"
                 clearable
                 style="width: 200px"
                 v-model="tableFrom.is_show"
-                @on-change="userSearchs"
+                @change="userSearchs"
               >
-                <Option value="1">上架</Option>
-                <Option value="0">下架</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col>
-            <FormItem label="商品搜索：" label-for="store_name">
-              <Input
+                <el-option value="1" label="上架"></el-option>
+                <el-option value="0" label="下架"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col>
+            <el-form-item label="商品搜索：" label-for="store_name">
+              <el-input
                 search
                 enter-button
                 style="width: 200px"
@@ -49,80 +49,108 @@
                 v-model="tableFrom.store_name"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex" class="mb20">
-          <Col>
-            <Button v-auth="['marketing-store_integral-create']" type="primary" icon="md-add" @click="add" class="mr10"
-              >添加积分商品</Button
-            >
-            <!-- <Button
-              v-auth="['marketing-store_seckill-create']"
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row class="mb20">
+          <el-col>
+            <el-button
+              v-auth="['marketing-store_integral-create']"
               type="primary"
               icon="md-add"
-              @click="addMore"
+              @click="add"
               class="mr10"
-              >批量添加积分商品</Button
-            > -->
-            <!--<Button v-auth="['export-storeSeckill']" class="export" icon="ios-share-outline" @click="exports">导出</Button>-->
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+              >添加积分商品</el-button
+            >
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tableList"
         :loading="loading"
-        highlight-row
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="image">
-          <viewer>
-            <div class="tabBox_img">
-              <img v-lazy="row.image" />
-            </div>
-          </viewer>
-        </template>
-        <template slot-scope="{ row, index }" slot="stop_time">
-          <span> {{ row.stop_time | formatDate }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="is_show">
-          <i-switch
-            v-model="row.is_show"
-            :value="row.is_show"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">上架</span>
-            <span slot="close">下架</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <!-- <a v-if="row.stop_status === 1" @click="copy(row)" >一键复制</a>
-                    <a v-else @click="edit(row)" >编辑</a> -->
-          <a @click="orderList(row)">兑换记录</a>
-          <Divider type="vertical" />
-          <a @click="edit(row)">编辑</a>
-          <Divider type="vertical" />
-          <a @click="copy(row)">复制</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除积分商品', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" min-width="50">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品图片" min-width="40">
+          <template slot-scope="scope">
+            <viewer>
+              <div class="tabBox_img">
+                <img v-lazy="scope.row.image" />
+              </div>
+            </viewer>
+          </template>
+        </el-table-column>
+        <el-table-column label="活动标题" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="兑换积分" min-width="60">
+          <template slot-scope="scope">
+            <span>{{ scope.row.price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="限量" min-width="60">
+          <template slot-scope="scope">
+            <span>{{ scope.row.quota_show }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="限量剩余" min-width="60">
+          <template slot-scope="scope">
+            <span>{{ scope.row.quota }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="排序" min-width="60">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sort }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="60">
+          <template slot-scope="scope">
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.is_show"
+              :value="scope.row.is_show"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="200">
+          <template slot-scope="scope">
+            <a @click="orderList(scope.row)">兑换记录</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="edit(scope.row)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="copy(scope.row)">复制</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除积分商品', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="tableFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="tableFrom.limit"
+          :page.sync="tableFrom.page"
+          :limit.sync="tableFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -143,59 +171,7 @@ export default {
   data() {
     return {
       loading: false,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '商品图片',
-          slot: 'image',
-          minWidth: 90,
-        },
-        {
-          title: '活动标题',
-          key: 'title',
-          minWidth: 130,
-        },
-        {
-          title: '兑换积分',
-          key: 'price',
-          minWidth: 100,
-        },
-        {
-          title: '限量',
-          key: 'quota_show',
-          minWidth: 130,
-        },
-        {
-          title: '限量剩余',
-          key: 'quota',
-          minWidth: 130,
-        },
-        {
-          title: '创建时间',
-          key: 'add_time',
-          minWidth: 130,
-        },
-        {
-          title: '排序',
-          key: 'sort',
-          minWidth: 50,
-        },
-        {
-          title: '状态',
-          slot: 'is_show',
-          minWidth: 100,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 130,
-        },
-      ],
+
       tableList: [],
       timeVal: [],
       grid: {
@@ -218,7 +194,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -232,11 +208,6 @@ export default {
     add() {
       this.$router.push({ path: this.$routeProStr + '/marketing/store_integral/create' });
     },
-    addMore() {
-      this.$router.push({
-        path: this.$routeProStr + '/marketing/store_integral/add_store_integral',
-      });
-    },
     orderList(row) {
       this.$router.push({
         path: this.$routeProStr + '/marketing/store_integral/order_list',
@@ -308,10 +279,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.tableFrom.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.tableFrom.page = 1;
diff --git a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableExpand.vue b/template/admin/src/pages/marketing/storeIntegralOrder/components/tableExpand.vue
index 75e888852..4fb4e49e4 100644
--- a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableExpand.vue
+++ b/template/admin/src/pages/marketing/storeIntegralOrder/components/tableExpand.vue
@@ -1,19 +1,19 @@
 <template>
   <div>
-    <Row class="expand-row">
-      <Col span="8">
+    <el-row class="expand-row">
+      <el-col :span="8">
         <span class="expand-key">下单时间：</span>
         <span class="expand-value" v-text="row.add_time"></span>
-      </Col>
-      <Col span="8">
+      </el-col>
+      <el-col :span="8">
         <span class="expand-key">用户备注：</span>
         <span class="expand-value" v-text="row.mark ? row.mark : '无'"></span>
-      </Col>
-      <Col span="8">
+      </el-col>
+      <el-col :span="8">
         <span class="expand-key">商家备注：</span>
         <span class="expand-value" v-text="row.remark ? row.remark : '无'"></span>
-      </Col>
-    </Row>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableFrom.vue b/template/admin/src/pages/marketing/storeIntegralOrder/components/tableFrom.vue
index ae162254f..ad5e2a871 100644
--- a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableFrom.vue
+++ b/template/admin/src/pages/marketing/storeIntegralOrder/components/tableFrom.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="table_box">
-    <Form
+    <el-form
       ref="orderData"
       :model="orderData"
       :label-width="labelWidth"
@@ -8,27 +8,27 @@
       class="tabform"
       @submit.native.prevent
     >
-      <Row :gutter="24">
-        <Col span="8" class="ivu-text-left">
-          <FormItem label="订单状态：">
-            <RadioGroup
+      <el-row :gutter="24">
+        <el-col :span="8" class="ivu-text-left">
+          <el-form-item label="订单状态：">
+            <el-radio-group
               v-model="orderData.status"
               type="button"
-              @on-change="selectChange2(orderData.status)"
+              @change="selectChange2(orderData.status)"
               style="width: 400px"
             >
-              <Radio label="">全部 {{ '(' + orderChartType.statusAll ? orderChartType.statusAll : 0 + ')' }}</Radio>
-              <Radio label="1">未发货 {{ '(' + orderChartType.unshipped ? orderChartType.unshipped : 0 + ')' }}</Radio>
-              <Radio label="2">待收货 {{ '(' + orderChartType.untake ? orderChartType.untake : 0 + ')' }}</Radio>
-              <Radio label="3">交易完成 {{ '(' + orderChartType.complete ? orderChartType.complete : 0 + ')' }}</Radio>
-            </RadioGroup>
-          </FormItem>
-        </Col>
-        <Col span="8" class="ivu-text-left">
-          <FormItem label="创建时间：">
+              <el-radio-button label="">全部 {{ '(' + orderChartType.statusAll ? orderChartType.statusAll : 0 + ')' }}</el-radio-button>
+              <el-radio-button label="1">未发货 {{ '(' + orderChartType.unshipped ? orderChartType.unshipped : 0 + ')' }}</el-radio-button>
+              <el-radio-button label="2">待收货 {{ '(' + orderChartType.untake ? orderChartType.untake : 0 + ')' }}</el-radio-button>
+              <el-radio-button label="3">交易完成 {{ '(' + orderChartType.complete ? orderChartType.complete : 0 + ')' }}</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" class="ivu-text-left">
+          <el-form-item label="创建时间：">
             <DatePicker
               :editable="false"
-              @on-change="onchangeTime"
+              @change="onchangeTime"
               :value="timeVal"
               format="yyyy/MM/dd HH:mm:ss"
               type="datetimerange"
@@ -38,14 +38,14 @@
               class="mr20"
               :options="options"
             ></DatePicker>
-          </FormItem>
-        </Col>
-      </Row>
-      <Row :gutter="24" type="flex">
-        <Col span="12">
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" >
+        <el-col :span="12">
           <div class="df">
-            <FormItem label="搜索：" prop="real_name" label-for="real_name">
-              <Input
+            <el-form-item label="搜索：" prop="real_name" label-for="real_name">
+              <el-input
                 v-model="orderData.real_name"
                 search
                 enter-button
@@ -54,21 +54,21 @@
                 style="width: 300px"
                 @on-search="orderSearch(orderData.real_name)"
               >
-                <Select v-model="orderData.field_key" slot="prepend" style="width: 80px">
-                  <Option value="all">全部</Option>
-                  <Option value="order_id">订单号</Option>
-                  <Option value="uid">UID</Option>
-                  <Option value="real_name">用户姓名</Option>
-                  <Option value="user_phone">用户电话</Option>
-                  <Option value="store_name">商品名称(模糊)</Option>
-                </Select>
-              </Input>
-            </FormItem>
-            <!-- <Button class="ml10" @click="exports">导出</Button> -->
+                <el-select v-model="orderData.field_key" slot="prepend" style="width: 80px">
+                  <el-option value="all" label="全部"></el-option>
+                  <el-option value="order_id" label="订单号"></el-option>
+                  <el-option value="uid" label="UID"></el-option>
+                  <el-option value="real_name" label="用户姓名"></el-option>
+                  <el-option value="user_phone" label="用户电话"></el-option>
+                  <el-option value="store_name" label="商品名称(模糊)"></el-option>
+                </el-select>
+              </el-input>
+            </el-form-item>
+            <!-- <el-button class="ml10" @click="exports">导出</el-button> -->
           </div>
-        </Col>
-      </Row>
-    </Form>
+        </el-col>
+      </el-row>
+    </el-form>
   </div>
 </template>
 
@@ -260,7 +260,7 @@ export default {
     ...mapState('media', ['isMobile']),
     ...mapState('integralOrder', ['isDels', 'delIdList']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
diff --git a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue b/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue
index f4d9c5f36..338748b2b 100644
--- a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue
+++ b/template/admin/src/pages/marketing/storeIntegralOrder/components/tableList.vue
@@ -1,70 +1,86 @@
 <template>
   <div>
-    <Table
-      :columns="columns"
+    <el-table
       :data="orderList"
       ref="table"
       :loading="loading"
-      highlight-row
-      no-data-text="暂无数据"
-      no-filtered-data-text="暂无筛选结果"
-      @on-selection-change="onSelectTab"
-      @on-select-all="selectAll"
-      @on-select-all-cancel="selectAll"
-      @on-select-cancel="onSelectCancel"
+      highlight-current-row
+      empty-text="暂无数据"
+      @select="selectAll"
+      @select-all="selectAll"
       class="orderData"
     >
-      <template slot-scope="{ row, index }" slot="order_id">
-        <span v-text="row.order_id" style="display: block"></span>
-        <span v-show="row.is_del == 1" style="color: #ed4014; display: block">用户已删除</span>
-      </template>
-      <template slot-scope="{ row, index }" slot="nickname">
-        <a @click="showUserInfo(row)">{{ row.nickname }}/{{ row.uid }}</a>
-      </template>
-      <template slot-scope="{ row, index }" slot="info">
-        <div class="tabBox">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.image" />
-          </div>
-          <span class="tabBox_tit"> {{ row.store_name + ' | ' }}{{ row.suk ? row.suk : '' }} </span>
-          <span class="tabBox_pice">{{ '积分' + row.total_price + ' x ' + row.total_num }}</span>
-        </div>
-      </template>
-      <template slot-scope="{ row, index }" slot="action">
-        <!--        <a @click="edit(row)" v-if="row.status === 1">编辑</a>-->
-        <a @click="sendOrder(row)" v-if="row.status === 1">发送货</a>
-        <a @click="delivery(row)" v-if="row.status === 2">配送信息</a>
-        <Divider type="vertical" v-if="row.status === 1 || row.status === 2" />
-        <template>
-          <Dropdown @on-click="changeMenu(row, $event)" :transfer="true">
-            <a href="javascript:void(0)">
-              更多
-              <Icon type="ios-arrow-down"></Icon>
-            </a>
-            <DropdownMenu slot="list">
-              <DropdownItem name="2">订单详情</DropdownItem>
-              <DropdownItem name="3">订单记录</DropdownItem>
-              <DropdownItem name="11" v-show="row.status >= 1 && row.express_dump">电子面单打印</DropdownItem>
-              <DropdownItem name="10" v-show="row.status >= 1">小票打印</DropdownItem>
-              <!-- <DropdownItem name="10" v-show="row._status >= 2">订单打印</DropdownItem> -->
-              <DropdownItem name="4" v-show="row.status !== 4">订单备注</DropdownItem>
-              <DropdownItem name="8" v-show="row.status === 2">已收货</DropdownItem>
-              <!-- <DropdownItem name="9">删除订单</DropdownItem> -->
-            </DropdownMenu>
-          </Dropdown>
+      <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
+      <el-table-column label="订单号" min-width="150">
+        <template slot-scope="scope">
+          <span v-text="scope.row.order_id" style="display: block"></span>
+          <span v-show="scope.row.is_del == 1" style="color: #ed4014; display: block">用户已删除</span>
         </template>
-      </template>
-    </Table>
+      </el-table-column>
+      <el-table-column label="用户信息" min-width="100">
+        <template slot-scope="scope">
+          <a @click="showUserInfo(scope.row)">{{ scope.row.nickname }}/{{ scope.row.uid }}</a>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品信息" min-width="330">
+        <template slot-scope="scope">
+          <div class="tabBox">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.image" />
+            </div>
+            <span class="tabBox_tit"> {{ scope.row.store_name + ' | ' }}{{ scope.row.suk ? scope.row.suk : '' }} </span>
+            <span class="tabBox_pice">{{ '积分' + scope.row.total_price + ' x ' + scope.row.total_num }}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="兑换积分" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.total_price }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="订单状态" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.status_name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="下单时间" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.add_time }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" fixed="right" width="150">
+        <template slot-scope="scope">
+          <a @click="sendOrder(scope.row)" v-if="scope.row.status === 1">发送货</a>
+          <a @click="delivery(scope.row)" v-if="scope.row.status === 2">配送信息</a>
+          <el-divider direction="vertical" v-if="scope.row.status === 1 || scope.row.status === 2" />
+          <template>
+            <el-dropdown size="small" @command="changeMenu(scope.row, $event)" :transfer="true">
+              <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i> </span>
+
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="2">订单详情</el-dropdown-item>
+                <el-dropdown-item command="3">订单记录</el-dropdown-item>
+                <el-dropdown-item command="11" v-show="scope.row.status >= 1 && scope.row.express_dump"
+                  >电子面单打印</el-dropdown-item
+                >
+                <el-dropdown-item command="10" v-show="scope.row.status >= 1">小票打印</el-dropdown-item>
+                <!-- <el-dropdown-item name="10" v-show="scope.row._status >= 2">订单打印</el-dropdown-item> -->
+                <el-dropdown-item command="4" v-show="scope.row.status !== 4">订单备注</el-dropdown-item>
+                <el-dropdown-item command="8" v-show="scope.row.status === 2">已收货</el-dropdown-item>
+                <!-- <el-dropdown-item name="9">删除订单</el-dropdown-item> -->
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </template>
+      </el-table-column>
+    </el-table>
     <div class="acea-row row-right page">
-      <Page
-        :total="page.total"
-        :current="page.pageNum"
-        show-elevator
-        show-total
-        @on-change="pageChange"
-        :page-size="page.pageSize"
-        @on-page-size-change="limitChange"
-        show-sizer
+      <pagination
+        v-if="total"
+        :total="total"
+        :page.sync="page.pageNum"
+        :limit.sync="page.pageSize"
+        @pagination="getList"
       />
     </div>
     <!-- 编辑 退款 退积分 不退款-->
@@ -123,59 +139,8 @@ export default {
       orderCards: [],
       loading: false,
       orderId: 0,
-      columns: [
-        {
-          type: 'expand',
-          width: 30,
-          render: (h, params) => {
-            return h(expandRow, {
-              props: {
-                row: params.row,
-              },
-            });
-          },
-        },
-        {
-          title: '订单号',
-          align: 'center',
-          slot: 'order_id',
-          minWidth: 150,
-        },
-        {
-          title: '用户信息',
-          slot: 'nickname',
-          minWidth: 100,
-        },
-        {
-          title: '商品信息',
-          slot: 'info',
-          minWidth: 330,
-        },
-        {
-          title: '兑换积分',
-          key: 'total_price',
-          minWidth: 70,
-        },
-        {
-          title: '订单状态',
-          key: 'status_name',
-          minWidth: 100,
-        },
-        {
-          title: '下单时间',
-          key: 'add_time',
-          minWidth: 100,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 150,
-          align: 'center',
-        },
-      ],
+      total: 0, // 总条数
       page: {
-        total: 0, // 总条数
         pageNum: 1, // 当前页
         pageSize: 10, // 每页显示条数
       },
@@ -345,14 +310,6 @@ export default {
     submitModel() {
       this.getList();
     },
-    pageChange(index) {
-      this.page.pageNum = index;
-      this.getList();
-    },
-    limitChange(limit) {
-      this.page.pageSize = limit;
-      this.getList();
-    },
     // 订单列表
     getList(res) {
       this.page.pageNum = res === 1 ? 1 : this.page.pageNum;
@@ -381,7 +338,7 @@ export default {
             return item;
           });
           this.orderCards = data.stat;
-          this.page.total = data.count;
+          this.total = data.count;
           this.$emit('on-changeCards', data.stat);
           this.loading = false;
         })
diff --git a/template/admin/src/pages/marketing/storeIntegralOrder/handle/autoSend.vue b/template/admin/src/pages/marketing/storeIntegralOrder/handle/autoSend.vue
index fd01831a6..83b32ba18 100644
--- a/template/admin/src/pages/marketing/storeIntegralOrder/handle/autoSend.vue
+++ b/template/admin/src/pages/marketing/storeIntegralOrder/handle/autoSend.vue
@@ -1,77 +1,90 @@
 <template>
   <Modal v-model="modals" scrollable title="订单发送货" class="order_box" :closable="false">
-    <Form ref="formItem" :model="formItem" :label-width="100" @submit.native.prevent>
-      <FormItem label="选择类型：">
-        <RadioGroup v-model="formItem.type" @on-change="changeRadio">
-          <Radio label="1">打印电子面单</Radio>
-          <Radio label="2">送货</Radio>
-          <Radio label="3">虚拟</Radio>
-        </RadioGroup>
-      </FormItem>
+    <el-form ref="formItem" :model="formItem" label-width="100px" @submit.native.prevent>
+      <el-form-item label="选择类型：">
+        <el-radio-group v-model="formItem.type" @change="changeRadio">
+          <el-radio label="1">打印电子面单</el-radio>
+          <el-radio label="2">送货</el-radio>
+          <el-radio label="3">虚拟</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <div v-show="formItem.type === '1'">
-        <FormItem label="快递公司：">
-          <Select
+        <el-form-item label="快递公司：">
+          <el-select
             v-model="formItem.delivery_name"
             filterable
             placeholder="请选择快递公司"
             style="width: 80%"
-            @on-change="expressChange"
+            @change="expressChange"
           >
-            <Option v-for="(item, i) in express" :value="item.value" :key="item.value">{{ item.value }}</Option>
-          </Select>
-        </FormItem>
+            <el-option
+              v-for="(item, i) in express"
+              :value="item.value"
+              :key="item.value"
+              :label="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <template v-if="formItem.type === '1'">
-          <FormItem label="电子面单：" class="express_temp_id">
-            <Select
+          <el-form-item label="电子面单：" class="express_temp_id">
+            <el-select
               v-model="formItem.express_temp_id"
               placeholder="请选择电子面单"
               style="width: 80%"
-              @on-change="expressTempChange"
+              @change="expressTempChange"
             >
-              <Option v-for="(item, i) in expressTemp" :value="item.temp_id" :key="i">{{ item.title }}</Option>
-            </Select>
-            <Button v-if="formItem.express_temp_id" type="text" @click="preview">预览</Button>
-          </FormItem>
-          <FormItem label="寄件人姓名：">
-            <Input v-model="formItem.to_name" placeholder="请输入寄件人姓名" style="width: 80%"></Input>
-          </FormItem>
-          <FormItem label="寄件人电话：">
-            <Input v-model="formItem.to_tel" placeholder="请输入寄件人电话" style="width: 80%"></Input>
-          </FormItem>
-          <FormItem label="寄件人地址：">
-            <Input v-model="formItem.to_addr" placeholder="请输入寄件人地址" style="width: 80%"></Input>
-          </FormItem>
+              <el-option
+                v-for="(item, i) in expressTemp"
+                :value="item.temp_id"
+                :key="i"
+                :label="item.title"
+              ></el-option>
+            </el-select>
+            <el-button v-if="formItem.express_temp_id" type="text" @click="preview">预览</el-button>
+          </el-form-item>
+          <el-form-item label="寄件人姓名：">
+            <el-input v-model="formItem.to_name" placeholder="请输入寄件人姓名" style="width: 80%"></el-input>
+          </el-form-item>
+          <el-form-item label="寄件人电话：">
+            <el-input v-model="formItem.to_tel" placeholder="请输入寄件人电话" style="width: 80%"></el-input>
+          </el-form-item>
+          <el-form-item label="寄件人地址：">
+            <el-input v-model="formItem.to_addr" placeholder="请输入寄件人地址" style="width: 80%"></el-input>
+          </el-form-item>
         </template>
       </div>
       <div v-show="formItem.type === '2'">
-        <FormItem label="送货人：">
-          <Select
+        <el-form-item label="送货人：">
+          <el-select
             v-model="formItem.sh_delivery"
             placeholder="请选择送货人"
             style="width: 80%"
-            @on-change="shDeliveryChange"
+            @change="shDeliveryChange"
           >
-            <Option v-for="(item, i) in deliveryList" :value="item.id" :key="i"
-              >{{ item.wx_name }}（{{ item.phone }}）</Option
-            >
-          </Select>
-        </FormItem>
+            <el-option
+              v-for="(item, i) in deliveryList"
+              :value="item.id"
+              :key="i"
+              :label="`${item.wx_name} (${item.phone})`"
+            ></el-option>
+          </el-select>
+        </el-form-item>
       </div>
       <div v-show="formItem.type === '3'">
-        <FormItem label="备注：">
-          <Input
+        <el-form-item label="备注：">
+          <el-input
             v-model="formItem.fictitious_content"
             type="textarea"
             :autosize="{ minRows: 2, maxRows: 5 }"
             placeholder="备注"
             style="width: 80%"
-          ></Input>
-        </FormItem>
+          ></el-input>
+        </el-form-item>
       </div>
-    </Form>
+    </el-form>
     <div slot="footer">
-      <Button @click="cancel">取消</Button>
-      <Button type="primary" @click="putSend">提交</Button>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="putSend">提交</el-button>
     </div>
     <div ref="viewer" v-viewer v-show="temp">
       <img :src="temp.pic" style="display: none" />
diff --git a/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderDetails.vue b/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderDetails.vue
index d7775a060..f8685cd72 100644
--- a/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderDetails.vue
+++ b/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderDetails.vue
@@ -1,68 +1,68 @@
 <template>
   <div v-if="orderDatalist">
     <Modal v-model="modals" scrollable title="订单信息" width="700" class="order_box" footer-hide>
-      <Card :bordered="false" dis-hover class="i-table-no-border">
+      <el-card :bordered="false" shadow="never" class="i-table-no-border">
         <div class="ivu-description-list-title">收货信息</div>
-        <Row class="mb10">
-          <Col span="12">用户昵称：{{ orderDatalist.userInfo.nickname }}</Col>
-          <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>
-        </Row>
-        <Divider style="margin: 20px 0 !important" />
+        <el-row class="mb10">
+          <el-col :span="12">用户昵称：{{ orderDatalist.userInfo.nickname }}</el-col>
+          <el-col :span="12">收货人：{{ orderDatalist.orderInfo.real_name }}</el-col>
+        </el-row>
+        <el-row class="mb10">
+          <el-col :span="12">联系电话：{{ orderDatalist.orderInfo.user_phone }}</el-col>
+          <el-col :span="12">收货地址：{{ orderDatalist.orderInfo.user_address }}</el-col>
+        </el-row>
+        <el-divider direction="vertical" style="margin: 20px 0 !important" />
         <div class="ivu-description-list-title">订单信息</div>
-        <Row class="mb10">
-          <Col span="12">订单ID：{{ orderDatalist.orderInfo.order_id }}</Col>
-          <Col span="12" class="fontColor1">订单状态：{{ orderDatalist.orderInfo.status_name }}</Col>
-        </Row>
-        <Row class="mb10">
-          <Col span="12"
+        <el-row class="mb10">
+          <el-col :span="12">订单ID：{{ orderDatalist.orderInfo.order_id }}</el-col>
+          <el-col :span="12" class="fontColor1">订单状态：{{ orderDatalist.orderInfo.status_name }}</el-col>
+        </el-row>
+        <el-row class="mb10">
+          <el-col :span="12"
             >商品名称：{{ orderDatalist.orderInfo.store_name + ' | '
-            }}{{ orderDatalist.orderInfo.suk ? orderDatalist.orderInfo.suk : '' }}</Col
+            }}{{ orderDatalist.orderInfo.suk ? orderDatalist.orderInfo.suk : '' }}</el-col
           >
-        </Row>
-        <Row class="mb10">
-          <Col span="12">商品总数：{{ orderDatalist.orderInfo.total_num }}</Col>
-          <Col span="12">商品总积分：{{ orderDatalist.orderInfo.total_price }}</Col>
-        </Row>
-        <Row class="mb10">
-          <Col span="12" class="mb10">创建时间：{{ orderDatalist.orderInfo.add_time }}</Col>
-          <Col span="12" class="mb10" v-if="orderDatalist.orderInfo.remark"
-            >商家备注：{{ orderDatalist.orderInfo.remark }}</Col
+        </el-row>
+        <el-row class="mb10">
+          <el-col :span="12">商品总数：{{ orderDatalist.orderInfo.total_num }}</el-col>
+          <el-col :span="12">商品总积分：{{ orderDatalist.orderInfo.total_price }}</el-col>
+        </el-row>
+        <el-row class="mb10">
+          <el-col :span="12" class="mb10">创建时间：{{ orderDatalist.orderInfo.add_time }}</el-col>
+          <el-col :span="12" class="mb10" v-if="orderDatalist.orderInfo.remark"
+            >商家备注：{{ orderDatalist.orderInfo.remark }}</el-col
           >
-          <Col span="12" class="mb10" v-if="orderDatalist.orderInfo.fictitious_content"
-            >虚拟发货备注：{{ orderDatalist.orderInfo.fictitious_content }}</Col
+          <el-col :span="12" class="mb10" v-if="orderDatalist.orderInfo.fictitious_content"
+            >虚拟发货备注：{{ orderDatalist.orderInfo.fictitious_content }}</el-col
           >
-        </Row>
+        </el-row>
         <div v-if="orderDatalist.orderInfo.delivery_type === 'express'">
-          <Divider style="margin: 20px 0 !important" />
+          <el-divider direction="vertical" style="margin: 20px 0 !important" />
           <div class="ivu-description-list-title">物流信息</div>
-          <Row class="mb10">
-            <Col span="12">快递公司：{{ orderDatalist.orderInfo.delivery_name }}</Col>
-            <Col span="12"
+          <el-row class="mb10">
+            <el-col :span="12">快递公司：{{ orderDatalist.orderInfo.delivery_name }}</el-col>
+            <el-col :span="12"
               >快递单号：{{ orderDatalist.orderInfo.delivery_id }}
-              <Button type="info" size="small" @click="openLogistics">物流查询</Button></Col
+              <el-button type="info" size="small" @click="openLogistics">物流查询</el-button></el-col
             >
-          </Row>
+          </el-row>
         </div>
         <div v-if="orderDatalist.orderInfo.delivery_type === 'send'">
-          <Divider style="margin: 20px 0 !important" />
+          <el-divider direction="vertical" style="margin: 20px 0 !important" />
           <div class="ivu-description-list-title">配送信息</div>
-          <Row class="mb10">
-            <Col span="12">送货人姓名：{{ orderDatalist.orderInfo.delivery_name }}</Col>
-            <Col span="12">送货人电话：{{ orderDatalist.orderInfo.delivery_id }}</Col>
-          </Row>
+          <el-row class="mb10">
+            <el-col :span="12">送货人姓名：{{ orderDatalist.orderInfo.delivery_name }}</el-col>
+            <el-col :span="12">送货人电话：{{ orderDatalist.orderInfo.delivery_id }}</el-col>
+          </el-row>
         </div>
         <div v-if="orderDatalist.orderInfo.mark">
-          <Divider style="margin: 20px 0 !important" v-if="orderDatalist.orderInfo.mark" />
+          <el-divider direction="vertical" style="margin: 20px 0 !important" v-if="orderDatalist.orderInfo.mark" />
           <div class="ivu-description-list-title" v-if="orderDatalist.orderInfo.mark">备注信息</div>
-          <Row class="mb10">
-            <Col span="12" class="fontColor2">{{ orderDatalist.orderInfo.mark }}</Col>
-          </Row>
+          <el-row class="mb10">
+            <el-col :span="12" class="fontColor2">{{ orderDatalist.orderInfo.mark }}</el-col>
+          </el-row>
         </div>
-      </Card>
+      </el-card>
     </Modal>
     <Modal v-model="modal2" scrollable title="物流查询" width="350" class="order_box2">
       <div class="logistics acea-row row-top">
diff --git a/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderRecord.vue b/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderRecord.vue
index cde9aa1f8..1ec0ce388 100644
--- a/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderRecord.vue
+++ b/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderRecord.vue
@@ -1,16 +1,31 @@
 <template>
   <Modal v-model="modals" scrollable title="订单记录" width="700" class="order_box" footer-hide>
-    <Card :bordered="false" dis-hover>
-      <Table
+    <el-card :bordered="false" shadow="never">
+      <el-table
         :columns="columns"
-        border
         :data="recordData"
-        :loading="loading"
-        no-data-text="暂无数据"
-        highlight-row
-        no-filtered-data-text="暂无筛选结果"
-      ></Table>
-    </Card>
+        v-loading="loading"
+        empty-text="暂无数据"
+        highlight-current-row
+        
+      >
+        <el-table-column label="订单ID" width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.oid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作记录" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.change_message }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.change_time }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
   </Modal>
 </template>
 
diff --git a/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderRemark.vue b/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderRemark.vue
index e36825b43..2fe8d6f54 100644
--- a/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderRemark.vue
+++ b/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderRemark.vue
@@ -1,8 +1,8 @@
 <template>
   <Modal v-model="modals" scrollable title="请修改内容" class="order_box" :closable="false">
-    <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80" @submit.native.prevent>
-      <FormItem label="备注：" prop="remark">
-        <Input
+    <el-form ref="formValidate" :model="formValidate" :rules="ruleValidate" label-width="85px" @submit.native.prevent>
+      <el-form-item label="备注：" prop="remark">
+        <el-input
           v-model="formValidate.remark"
           :maxlength="200"
           :rows="8"
@@ -11,11 +11,11 @@
           placeholder="订单备注"
           style="width: 100%"
         />
-      </FormItem>
-    </Form>
+      </el-form-item>
+    </el-form>
     <div slot="footer">
-      <Button type="primary" @click="putRemark('formValidate')">提交</Button>
-      <Button @click="cancel('formValidate')">取消</Button>
+      <el-button type="primary" @click="putRemark('formValidate')">提交</el-button>
+      <el-button @click="cancel('formValidate')">取消</el-button>
     </div>
   </Modal>
 </template>
diff --git a/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderSend.vue b/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderSend.vue
index d81d78c4e..4e530e8c9 100644
--- a/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderSend.vue
+++ b/template/admin/src/pages/marketing/storeIntegralOrder/handle/orderSend.vue
@@ -1,90 +1,103 @@
 <template>
   <Modal v-model="modals" scrollable title="订单发送货" class="order_box" :closable="false">
-    <Form ref="formItem" :model="formItem" :label-width="100" @submit.native.prevent>
-      <FormItem label="选择类型：">
-        <RadioGroup v-model="formItem.type" @on-change="changeRadio">
-          <Radio label="1">发货</Radio>
-          <Radio label="2">送货</Radio>
-          <Radio label="3">虚拟</Radio>
-        </RadioGroup>
-      </FormItem>
-      <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>
-        </RadioGroup>
-      </FormItem>
+    <el-form ref="formItem" :model="formItem" label-width="100px" @submit.native.prevent>
+      <el-form-item label="选择类型：">
+        <el-radio-group v-model="formItem.type" @change="changeRadio">
+          <el-radio label="1">发货</el-radio>
+          <el-radio label="2">送货</el-radio>
+          <el-radio label="3">虚拟</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item v-show="formItem.type == '1' && export_open" label="发货类型：">
+        <el-radio-group v-model="formItem.express_record_type" @change="changeExpress">
+          <el-radio label="1">手动填写</el-radio>
+          <el-radio label="2">电子面单打印</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <div v-show="formItem.type === '1'">
-        <FormItem label="快递公司：">
-          <Select
+        <el-form-item label="快递公司：">
+          <el-select
             v-model="formItem.delivery_name"
             filterable
             placeholder="请选择快递公司"
             style="width: 80%"
-            @on-change="expressChange"
+            @change="expressChange"
           >
-            <Option v-for="(item, i) in express" :value="item.value" :key="item.value">{{ item.value }}</Option>
-          </Select>
-        </FormItem>
-        <FormItem v-if="formItem.express_record_type === '1'" label="快递单号：">
-          <Input v-model="formItem.delivery_id" placeholder="请输入快递单号" style="width: 80%"></Input>
+            <el-option
+              v-for="(item, i) in express"
+              :value="item.value"
+              :key="item.value"
+              :label="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="formItem.express_record_type === '1'" label="快递单号：">
+          <el-input v-model="formItem.delivery_id" placeholder="请输入快递单号" style="width: 80%"></el-input>
           <div class="trips" v-if="formItem.delivery_name == '顺丰速运'">
             <p>顺丰请输入单号 :收件人或寄件人手机号后四位</p>
             <p>例如：SF000000000000:3941</p>
           </div>
-        </FormItem>
+        </el-form-item>
         <template v-if="formItem.express_record_type === '2'">
-          <FormItem label="电子面单：" class="express_temp_id">
-            <Select
+          <el-form-item label="电子面单：" class="express_temp_id">
+            <el-select
               v-model="formItem.express_temp_id"
               placeholder="请选择电子面单"
               style="width: 80%"
-              @on-change="expressTempChange"
+              @change="expressTempChange"
             >
-              <Option v-for="(item, i) in expressTemp" :value="item.temp_id" :key="i">{{ item.title }}</Option>
-            </Select>
-            <Button v-if="formItem.express_temp_id" type="text" @click="preview">预览</Button>
-          </FormItem>
-          <FormItem label="寄件人姓名：">
-            <Input v-model="formItem.to_name" placeholder="请输入寄件人姓名" style="width: 80%"></Input>
-          </FormItem>
-          <FormItem label="寄件人电话：">
-            <Input v-model="formItem.to_tel" placeholder="请输入寄件人电话" style="width: 80%"></Input>
-          </FormItem>
-          <FormItem label="寄件人地址：">
-            <Input v-model="formItem.to_addr" placeholder="请输入寄件人地址" style="width: 80%"></Input>
-          </FormItem>
+              <el-option
+                v-for="(item, i) in expressTemp"
+                :value="item.temp_id"
+                :key="i"
+                :label="item.title"
+              ></el-option>
+            </el-select>
+            <el-button v-if="formItem.express_temp_id" type="text" @click="preview">预览</el-button>
+          </el-form-item>
+          <el-form-item label="寄件人姓名：">
+            <el-input v-model="formItem.to_name" placeholder="请输入寄件人姓名" style="width: 80%"></el-input>
+          </el-form-item>
+          <el-form-item label="寄件人电话：">
+            <el-input v-model="formItem.to_tel" placeholder="请输入寄件人电话" style="width: 80%"></el-input>
+          </el-form-item>
+          <el-form-item label="寄件人地址：">
+            <el-input v-model="formItem.to_addr" placeholder="请输入寄件人地址" style="width: 80%"></el-input>
+          </el-form-item>
         </template>
       </div>
       <div v-show="formItem.type === '2'">
-        <FormItem label="送货人：">
-          <Select
+        <el-form-item label="送货人：">
+          <el-select
             v-model="formItem.sh_delivery"
             placeholder="请选择送货人"
             style="width: 80%"
-            @on-change="shDeliveryChange"
+            @change="shDeliveryChange"
           >
-            <Option v-for="(item, i) in deliveryList" :value="item.id" :key="i"
-              >{{ item.wx_name }}（{{ item.phone }}）</Option
-            >
-          </Select>
-        </FormItem>
+            <el-option
+              v-for="(item, i) in deliveryList"
+              :value="item.id"
+              :key="i"
+              :label="`${item.wx_name} (${item.phone})`"
+            ></el-option>
+          </el-select>
+        </el-form-item>
       </div>
       <div v-show="formItem.type === '3'">
-        <FormItem label="备注：">
-          <Input
+        <el-form-item label="备注：">
+          <el-input
             v-model="formItem.fictitious_content"
             type="textarea"
             :autosize="{ minRows: 2, maxRows: 5 }"
             placeholder="备注"
             style="width: 80%"
-          ></Input>
-        </FormItem>
+          ></el-input>
+        </el-form-item>
       </div>
-    </Form>
+    </el-form>
     <div slot="footer">
-      <Button @click="cancel">取消</Button>
-      <Button type="primary" @click="putSend">提交</Button>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="putSend">提交</el-button>
     </div>
     <!-- <viewer @inited="inited">
             <img :src="temp.pic" style="display:none" />
diff --git a/template/admin/src/pages/marketing/storeIntegralOrder/handle/queueList.vue b/template/admin/src/pages/marketing/storeIntegralOrder/handle/queueList.vue
index d4353a0dc..767416a1d 100644
--- a/template/admin/src/pages/marketing/storeIntegralOrder/handle/queueList.vue
+++ b/template/admin/src/pages/marketing/storeIntegralOrder/handle/queueList.vue
@@ -4,8 +4,8 @@
     <!-- <div class="i-layout-page-header">
             <PageHeader class="product_tabs" title="任务列表" hidden-breadcrumb></PageHeader>
         </div> -->
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
@@ -13,12 +13,12 @@
         class="tabform"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex">
-          <Col span="10">
-            <FormItem label="操作时间：">
+        <el-row :gutter="24">
+          <el-col span="10">
+            <el-form-item label="操作时间：">
               <DatePicker
                 :editable="false"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="datetimerange"
@@ -27,68 +27,119 @@
                 style="width: 90%"
                 :options="options"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col span="7">
-            <FormItem label="类型：">
-              <Select v-model="formValidate.type" clearable @on-change="typeSearchs">
-                <Option v-for="item in typeList" :value="item.value" :key="item.value">{{ item.label }}</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col span="7">
-            <FormItem label="状态：">
-              <Select v-model="formValidate.status" clearable @on-change="statusSearchs">
-                <Option v-for="item in statusList" :value="item.value" :key="item.value">{{ item.label }}</Option>
-              </Select>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-      <Table class="mt25" height="530" :columns="columns1" :data="data1" :loading="loading">
-        <template slot-scope="{ row, index }" slot="action">
-          <template v-if="row.is_show_log">
-            <a @click="deliveryLook(row)">查看</a>
-            <Divider type="vertical" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="类型：">
+              <el-select v-model="formValidate.type" clearable @change="typeSearchs">
+                <el-option
+                  v-for="item in typeList"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="状态：">
+              <el-select v-model="formValidate.status" clearable @change="statusSearchs">
+                <el-option
+                  v-for="item in statusList"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table class="mt25" height="530" :data="data1" v-loading="loading">
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
           </template>
-          <template>
-            <Dropdown @on-click="changeMenu(row, $event)">
-              <a>更多<Icon type="ios-arrow-down"></Icon></a>
-              <DropdownMenu slot="list">
-                <DropdownItem name="1">下载</DropdownItem>
-                <DropdownItem name="2">重新执行</DropdownItem>
-                <DropdownItem v-if="row.is_stop_button" name="3">停止任务</DropdownItem>
-                <DropdownItem v-if="row.is_error_button" name="4">清除异常任务</DropdownItem>
-              </DropdownMenu>
-            </Dropdown>
+        </el-table-column>
+        <el-table-column label="操作时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
           </template>
-        </template>
-      </Table>
+        </el-table-column>
+        <el-table-column label="发货单数" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.total_num }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="成功发货单数" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.success_num }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="发货类型" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.status_cn }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <template v-if="scope.row.is_show_log">
+              <a @click="deliveryLook(scope.row)">查看</a>
+              <el-divider direction="vertical"></el-divider>
+            </template>
+            <template>
+              <el-dropdown size="small" @command="changeMenu(scope.row, $event)">
+                <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i> </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="1">下载</el-dropdown-item>
+                  <el-dropdown-item command="2">重新执行</el-dropdown-item>
+                  <el-dropdown-item v-if="scope.row.is_stop_button" command="3">停止任务</el-dropdown-item>
+                  <el-dropdown-item v-if="scope.row.is_error_button" command="4">清除异常任务</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="page1.total"
           :total="page1.total"
-          :current="page1.pageNum"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          @on-page-size-change="limitChange"
-          :page-size="page1.pageSize"
-          show-sizer
+          :page.sync="page1.pageNum"
+          :limit.sync="page1.pageSize"
+          @pagination="getQueue"
         />
       </div>
-    </Card>
+    </el-card>
     <Modal v-model="modal1" width="900" footer-hide>
-      <Table height="500" class="mt25" :columns="columns4" :data="data2" :loading="loading2"></Table>
+      <el-table height="500" class="mt25" :columns="columns4" :data="data2" v-loading="loading2">
+        <el-table-column
+          :label="item.title"
+          :min-width="item.minWidth || 100"
+          v-for="(item, index) in columns4"
+          :key="index"
+        >
+          <template slot-scope="scope">
+            <template v-if="item.key">
+              <div>
+                <span>{{ scope.row[item.key] }}</span>
+              </div>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="page2.total"
           :total="page2.total"
-          :current="page2.pageNum"
-          show-elevator
-          show-total
-          @on-change="pageChange2"
-          @on-page-size-change="limitChange2"
-          :page-size="page2.pageSize"
-          show-sizer
+          :page.sync="page2.pageNum"
+          :limit.sync="page2.pageSize"
+          @pagination="getDeliveryLog"
         />
       </div>
     </Modal>
@@ -104,39 +155,6 @@ export default {
   data() {
     return {
       modal: false,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-        },
-        {
-          title: '操作时间',
-          key: 'add_time',
-        },
-        {
-          title: '发货单数',
-          key: 'total_num',
-        },
-        {
-          title: '成功发货单数',
-          key: 'success_num',
-        },
-        {
-          title: '发货类型',
-          key: 'title',
-        },
-        {
-          title: '状态',
-          key: 'status_cn',
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          // fixed: 'right',
-          width: 150,
-          align: 'center',
-        },
-      ],
       data1: [],
       page1: {
         total: 0, // 总条数
@@ -356,7 +374,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -391,23 +409,6 @@ export default {
           this.loading = false;
         });
     },
-    pageChange(index) {
-      this.page1.pageNum = index;
-      this.getQueue();
-    },
-    // 查看-分页
-    pageChange2(index) {
-      this.page2.pageNum = index;
-      this.getDeliveryLog();
-    },
-    limitChange(limit) {
-      this.page1.pageSize = limit;
-      this.getQueue();
-    },
-    limitChange2(limit) {
-      this.page2.pageSize = limit;
-      this.getDeliveryLog();
-    },
     // 搜索-操作时间
     onchangeTime(time) {
       this.timeVal = time;
diff --git a/template/admin/src/pages/marketing/storeIntegralOrder/orderlistDetails.vue b/template/admin/src/pages/marketing/storeIntegralOrder/orderlistDetails.vue
index f96ef9bea..2cc325ebe 100644
--- a/template/admin/src/pages/marketing/storeIntegralOrder/orderlistDetails.vue
+++ b/template/admin/src/pages/marketing/storeIntegralOrder/orderlistDetails.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover>
+    <el-card :bordered="false" shadow="never">
       <table-form
         ref="orderData"
         :is-all="isAll"
@@ -21,7 +21,7 @@
         @order-select="orderSelect"
         @updata="updata"
       />
-    </Card>
+    </el-card>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/marketing/storePresell/create.vue b/template/admin/src/pages/marketing/storePresell/create.vue
index 774a81029..ae2b38824 100644
--- a/template/admin/src/pages/marketing/storePresell/create.vue
+++ b/template/admin/src/pages/marketing/storePresell/create.vue
@@ -3,7 +3,7 @@
     <div class="i-layout-page-header">
       <div class="i-layout-page-header">
         <router-link :to="{ path: $routeProStr + '/marketing/presell/index' }">
-          <Button icon="ios-arrow-back" size="small" class="mr20">返回 </Button>
+          <el-button icon="ios-arrow-back" size="small" class="mr20">返回 </el-button>
         </router-link>
         <span
           class="ivu-page-header-title mr20"
@@ -11,17 +11,17 @@
         ></span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row type="flex" class="mt30 acea-row row-middle row-center">
-        <Col span="20">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row class="mt30 acea-row row-middle row-center">
+        <el-col :span="20">
           <Steps :current="current">
             <Step title="选择预售商品"></Step>
             <Step title="填写基础信息"></Step>
             <Step title="修改商品详情"></Step>
           </Steps>
-        </Col>
-        <Col span="23">
-          <Form
+        </el-col>
+        <el-col :span="23">
+          <el-form
             class="form mt30"
             ref="formValidate"
             :model="formValidate"
@@ -31,7 +31,7 @@
             :label-position="labelPosition"
             @submit.native.prevent
           >
-            <FormItem label="选择商品：" prop="image_input" v-if="current === 0">
+            <el-form-item label="选择商品：" prop="image_input" v-if="current === 0">
               <div class="picBox" @click="changeGoods">
                 <div class="pictrue" v-if="formValidate.image">
                   <img v-lazy="formValidate.image" />
@@ -40,10 +40,10 @@
                   <Icon type="ios-camera-outline" size="26" />
                 </div>
               </div>
-            </FormItem>
-            <Row v-show="current === 1" type="flex">
-              <Col span="24">
-                <FormItem label="商品主图：" prop="image">
+            </el-form-item>
+            <el-row v-show="current === 1">
+              <el-col :span="24">
+                <el-form-item label="商品主图：" prop="image">
                   <div class="picBox" @click="modalPicTap('dan', 'danFrom')">
                     <div class="pictrue" v-if="formValidate.image">
                       <img v-lazy="formValidate.image" />
@@ -52,10 +52,10 @@
                       <Icon type="ios-camera-outline" size="26" />
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="商品轮播图：" prop="images">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="商品轮播图：" prop="images">
                   <div class="acea-row">
                     <div
                       class="pictrue"
@@ -68,12 +68,12 @@
                       @dragend="handleDragEnd($event, item)"
                     >
                       <img v-lazy="item" />
-                      <Button
+                      <el-button
                         shape="circle"
                         icon="md-close"
                         @click.native="handleRemove(index)"
                         class="btndel"
-                      ></Button>
+                      ></el-button>
                     </div>
                     <div
                       v-if="formValidate.images.length < 10"
@@ -83,58 +83,51 @@
                       <Icon type="ios-camera-outline" size="26" />
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="预售名称：" prop="title" label-for="title">
-                    <Input placeholder="请输入预售名称" element-id="title" v-model="formValidate.title" />
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="预售简介：" prop="info" label-for="info">
-                    <Input
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="预售名称：" prop="title" label-for="title">
+                    <el-input placeholder="请输入预售名称" element-id="title" v-model="formValidate.title" />
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="预售简介：" prop="info" label-for="info">
+                    <el-input
                       placeholder="请输入预售简介"
                       type="textarea"
                       :rows="4"
                       element-id="info"
                       v-model="formValidate.info"
                     />
-                  </FormItem>
-                </Col>
-              </Col>
-              <!-- <Col span="24">
-                                <FormItem label="预售设置：" props="type" label-for="type">
-                                    <RadioGroup element-id="type"  v-model="formValidate.type">
-                                        <Radio :label="0" class="radio">全款预售</Radio>
-                                        <Radio :label="1" >定金预售</Radio>
-                                    </RadioGroup>
-                                </FormItem>
-                            </Col> -->
-              <Col span="24">
-                <FormItem label="预售活动时间：" prop="section_time">
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="预售活动时间：" prop="section_time">
                   <div class="acea-row row-middle">
                     <DatePicker
                       :editable="false"
                       type="datetimerange"
                       format="yyyy-MM-dd HH:mm"
                       placeholder="请选择活动时间"
-                      @on-change="onchangeTime"
+                      @change="onchangeTime"
                       class="perW20"
                       :value="formValidate.section_time"
                       v-model="formValidate.section_time"
                     ></DatePicker>
                     <div class="ml10 grey">设置活动开启结束时间，用户可以在设置时间内发起参与预售</div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="发货时间：" prop="deliver_time">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="发货时间：" prop="deliver_time">
                   <div class="acea-row row-middle">
                     <span class="mr10">预售活动结束后</span>
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       placeholder="请输入发货时间"
                       :precision="0"
                       :min="1"
@@ -143,31 +136,28 @@
                     <span class="ml10"> 天之内 </span>
                     <div class="ml10 grey"></div>
                   </div>
-                </FormItem>
-              </Col>
-              <!-- <Col span="24" v-if="formValidate.type === 1">
-                                <FormItem label="尾款支付日期：" prop="pay_time">
-                                    <div class="acea-row row-middle">
-                                        <DatePicker :editable="false" type="datetimerange" format="yyyy-MM-dd HH:mm" placeholder="请选择尾款支付日期"
-                                                    @on-change="onchangePayTime" class="perW30" :value="formValidate.pay_time" v-model="formValidate.pay_time"></DatePicker>
-                                        <div class="ml10 grey"></div>
-                                    </div>
-                                </FormItem>
-                            </Col> -->
-              <Col span="24">
-                <FormItem label="运费模板：" prop="temp_id">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="运费模板：" prop="temp_id">
                   <div class="acea-row row-middle">
-                    <Select v-model="formValidate.temp_id" class="perW20">
-                      <Option v-for="item in templateList" :value="item.id" :key="item.id">{{ item.name }} </Option>
-                    </Select>
+                    <el-select v-model="formValidate.temp_id" class="perW20">
+                      <el-option
+                        v-for="item in templateList"
+                        :value="item.id"
+                        :key="item.id"
+                        :label="item.name"
+                      ></el-option>
+                    </el-select>
                     <div class="ml10 col" @click="freight">添加运费模板</div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="总购买数量限制：" prop="num">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="总购买数量限制：" prop="num">
                   <div class="acea-row row-middle">
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       :min="1"
                       placeholder="请输入总数量限制"
                       :precision="0"
@@ -179,140 +169,100 @@
                       该商品活动期间内，用户可购买的最大数量。例如设置为4，表示本次活动有效期内，每个用户最多可购买4件
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="单位：" prop="unit_name" label-for="unit_name">
-                  <Input
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="单位：" prop="unit_name" label-for="unit_name">
+                  <el-input
                     placeholder="请输入单位"
                     element-id="unit_name"
                     v-model="formValidate.unit_name"
                     class="perW20"
                   />
-                </FormItem>
-              </Col>
-              <!--                            <Col span="24">-->
-              <!--                                <FormItem label="虚拟成团比例(%)：" prop="virtual">-->
-              <!--                                    <div class="acea-row row-middle">-->
-              <!--                                        <InputNumber :min="0" placeholder="请输入虚拟成团比例" :precision="0" :max="100" element-id="virtual"  v-model="formValidate.virtual" class="perW10" :formatter="value => `${value}%`" :parser="value => value.replace('%', '')"/>-->
-              <!--                                        <div class="ml10 grey">预售结束前若用户发起的活动未成团，并且现有人数比例大于设置比例，自动补齐人数，预售成功</div>-->
-              <!--                                    </div>-->
-              <!--                                </FormItem>-->
-              <!--                            </Col>-->
-              <Col span="24">
-                <FormItem label="排序：">
-                  <InputNumber
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="排序：">
+                  <el-input-number
+                    controls-position="right"
                     placeholder="请输入排序"
                     element-id="sort"
                     :precision="0"
                     v-model="formValidate.sort"
                     class="perW10"
                   />
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="活动状态：" props="status" label-for="status">
-                  <RadioGroup element-id="status" v-model="formValidate.status">
-                    <Radio :label="1" class="radio">上架</Radio>
-                    <Radio :label="0">下架</Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col>
-              <!-- <Col span="24">
-                <FormItem label="定金预售：" props="type" label-for="type">
-                  <RadioGroup element-id="type" v-model="formValidate.type">
-                    <Radio :label="1" class="radio">开启</Radio>
-                    <Radio :label="0">关闭</Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.type">
-                <FormItem label="定金金额：">
-                  <InputNumber
-                    placeholder="请输入定金金额"
-                    element-id="sort"
-                    :precision="0"
-                    v-model="formValidate.deposit"
-                    class="perW10"
-                  />
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.type">
-                <FormItem label="尾款支付时间：" prop="pay_time">
-                  <div class="acea-row row-middle">
-                    <DatePicker
-                      :editable="false"
-                      type="datetimerange"
-                      format="yyyy-MM-dd HH:mm"
-                      placeholder="请选择尾款支付时间"
-                      @on-change="onchangePayTime"
-                      class="perW20"
-                      :value="formValidate.pay_time"
-                      v-model="formValidate.pay_time"
-                    ></DatePicker>
-                  </div>
-                </FormItem>
-              </Col> -->
-              <Col span="24">
-                <FormItem label="规格选择：">
-                  <Table :data="specsData" :columns="columns" border @on-selection-change="changeCheckbox">
-                    <template slot-scope="{ row, index }" slot="pic">
-                      <div
-                        class="acea-row row-middle row-center-wrapper"
-                        @click="modalPicTap('dan', 'danTable', index)"
-                      >
-                        <div class="pictrue pictrueTab" v-if="row.pic">
-                          <img v-lazy="row.pic" />
-                        </div>
-                        <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
-                          <Icon type="ios-camera-outline" size="21" />
-                        </div>
-                      </div>
-                    </template>
-                    <!-- <template slot-scope="{ row, index }" slot="quota">
-                      <InputNumber
-                        v-model="specsData[index].quota"
-                        :min="1"
-                        active-change
-                        class="priceBox"
-                      ></InputNumber>
-                    </template> -->
-                  </Table>
-                </FormItem>
-              </Col>
-            </Row>
-            <Row v-show="current === 2">
-              <Col span="24">
-                <FormItem label="内容：">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="活动状态：" props="status" label-for="status">
+                  <el-radio-group element-id="status" v-model="formValidate.status">
+                    <el-radio :label="1" class="radio">上架</el-radio>
+                    <el-radio :label="0">下架</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="规格选择：">
+                  <el-table :data="specsData" @selection-change="changeCheckbox">
+                    <el-table-column type="selection" width="55"> </el-table-column>
+                    <el-table-column
+                      :label="item.title"
+                      :min-width="item.minWidth"
+                      v-for="(item, index) in columns"
+                      :key="index"
+                    >
+                      <template slot-scope="scope">
+                        <template v-if="item.key">
+                          <div>
+                            <span>{{ scope.row[item.key] }}</span>
+                          </div>
+                        </template>
+                        <template v-else-if="item.slot === 'pic'">
+                          <div class="pictrue pictrueTab" v-if="scope.row.pic">
+                            <img v-lazy="scope.row.pic" />
+                          </div>
+                          <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
+                            <Icon type="ios-camera-outline" size="21" />
+                          </div>
+                        </template>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row v-show="current === 2">
+              <el-col :span="24">
+                <el-form-item label="内容：">
                   <WangEditor
                     style="width: 90%"
                     :content="formValidate.description"
                     @editorContent="getEditorContent"
                   ></WangEditor>
-                </FormItem>
-              </Col>
-            </Row>
-            <FormItem>
-              <Button
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item>
+              <el-button
                 class="submission mr15"
                 @click="step"
                 v-show="current !== 0"
                 :disabled="$route.params.id && current === 1"
                 >上一步
-              </Button>
-              <Button
+              </el-button>
+              <el-button
                 type="primary"
                 :disabled="submitOpen && current === 2"
                 class="submission"
                 @click="next('formValidate')"
                 v-text="current === 2 ? '提交' : '下一步'"
-              ></Button>
-            </FormItem>
-          </Form>
+              ></el-button>
+            </el-form-item>
+          </el-form>
           <Spin size="large" fix v-if="spinShow"></Spin>
-        </Col>
-      </Row>
-    </Card>
+        </el-col>
+      </el-row>
+    </el-card>
     <!-- 选择商品-->
     <Modal
       v-model="modals"
@@ -570,7 +520,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 155;
+      return this.isMobile ? undefined : '155px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -737,7 +687,7 @@ export default {
           );
           this.$set(this.formValidate, 'items', info.attrs.items);
           this.columns = info.attrs.header;
-          this.columns.unshift(selection);
+          // this.columns.unshift(selection);
           this.specsData = info.attrs.value;
           that.specsData.forEach(function (item, index) {
             that.$set(that.specsData[index], 'id', index);
diff --git a/template/admin/src/pages/marketing/storePresell/index.vue b/template/admin/src/pages/marketing/storePresell/index.vue
index b87199a01..94ef2ce30 100644
--- a/template/admin/src/pages/marketing/storePresell/index.vue
+++ b/template/admin/src/pages/marketing/storePresell/index.vue
@@ -1,115 +1,150 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="tableFrom"
         :model="tableFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="预售活动状态：">
-              <Select placeholder="请选择活动状态" v-model="tableFrom.time_type" clearable @on-change="userSearchs">
-                <Option value="0">全部</Option>
-                <Option value="1">未开始</Option>
-                <Option value="2">正在进行</Option>
-                <Option value="3">已结束</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="预售商品状态：">
-              <Select placeholder="请选择商品状态" v-model="tableFrom.status" clearable @on-change="userSearchs">
-                <Option value="">全部</Option>
-                <Option value="1">上架</Option>
-                <Option value="0">下架</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="商品搜索：" label-for="title">
-              <Input
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="预售活动状态：">
+              <el-select placeholder="请选择活动状态" v-model="tableFrom.time_type" clearable @change="userSearchs">
+                <el-option value="0" label="全部"></el-option>
+                <el-option value="1" label="未开始"></el-option>
+                <el-option value="2" label="正在进行"></el-option>
+                <el-option value="3" label="已结束"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="预售商品状态：">
+              <el-select placeholder="请选择商品状态" v-model="tableFrom.status" clearable @change="userSearchs">
+                <el-option value="" label="全部"></el-option>
+                <el-option value="1" label="上架"></el-option>
+                <el-option value="0" label="下架"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="商品搜索：" label-for="title">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入商品名称/ID"
                 v-model="tableFrom.title"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex" class="mb20">
-          <Col v-bind="grid">
-            <Button v-auth="['marketing-store_bargain-create']" type="primary" icon="md-add" @click="add" class="mr10"
-              >添加预售商品</Button
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row class="mb20">
+          <el-col v-bind="grid">
+            <el-button
+              v-auth="['marketing-store_bargain-create']"
+              type="primary"
+              icon="md-add"
+              @click="add"
+              class="mr10"
+              >添加预售商品</el-button
             >
-            <!-- <Button
+            <!-- <el-button
               v-auth="['export-storeBargain']"
               class="export"
               icon="ios-share-outline"
               @click="exports"
-              >导出</Button
+              >导出</el-button
             > -->
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tableList"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="is_fail">
-          <Icon type="md-checkmark" v-if="row.is_fail === 1" color="#0092DC" size="14" />
-          <Icon type="md-close" v-else color="#ed5565" size="14" />
-        </template>
-        <template slot-scope="{ row, index }" slot="image">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.image" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="bargain_min_price">
-          <span>{{ row.bargain_min_price }}~{{ row.bargain_max_price }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="stop_time">
-          <div>起: {{ row.start_time | formatDate }}</div>
-          <div>止: {{ row.stop_time | formatDate }}</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">上架</span>
-            <span slot="close">下架</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row)">编辑</a>
-          <Divider v-if="row.stop_status === 0" type="vertical" />
-          <Divider type="vertical" />
-          <a @click="del(row, '删除预售商品', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="预售图片" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.image" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="预售名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="预售价格" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="已售商品数" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sales }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="限量" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.quota_show }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="限量剩余" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.quota }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="活动时间" min-width="130">
+          <template slot-scope="scope">
+            <div>起: {{ scope.row.start_time | formatDate }}</div>
+            <div>止: {{ scope.row.stop_time | formatDate }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="预售状态" min-width="130">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              :value="scope.row.status"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+              active-text="上架"
+              inactive-text="下架"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row)">编辑</a>
+            <el-divider v-if="scope.row.stop_status === 0" direction="vertical" />
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除预售商品', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="tableFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="tableFrom.limit"
+          :page.sync="tableFrom.page"
+          :limit.sync="tableFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -130,59 +165,6 @@ export default {
   data() {
     return {
       loading: false,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '预售图片',
-          slot: 'image',
-          minWidth: 90,
-        },
-        {
-          title: '预售名称',
-          key: 'title',
-          minWidth: 130,
-        },
-        {
-          title: '预售价格',
-          key: 'price',
-          minWidth: 100,
-        },
-        {
-          title: '已售商品数',
-          key: 'sales',
-          minWidth: 100,
-        },
-        {
-          title: '限量',
-          key: 'quota_show',
-          minWidth: 100,
-        },
-        {
-          title: '限量剩余',
-          key: 'quota',
-          minWidth: 100,
-        },
-        {
-          title: '活动时间',
-          slot: 'stop_time',
-          minWidth: 150,
-        },
-        {
-          title: '预售状态',
-          slot: 'status',
-          minWidth: 130,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 130,
-        },
-      ],
       tableList: [],
       grid: {
         xl: 7,
@@ -209,7 +191,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 100;
+      return this.isMobile ? undefined : '100px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -284,10 +266,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.tableFrom.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.tableFrom.page = 1;
diff --git a/template/admin/src/pages/marketing/storePresell/presellList.vue b/template/admin/src/pages/marketing/storePresell/presellList.vue
index 09d4c56ca..32870e0c3 100644
--- a/template/admin/src/pages/marketing/storePresell/presellList.vue
+++ b/template/admin/src/pages/marketing/storePresell/presellList.vue
@@ -1,27 +1,27 @@
 <template>
   <div class="article-manager">
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col span="24">
-            <FormItem label="时间选择：">
-              <RadioGroup
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="时间选择：">
+              <el-radio-group
                 v-model="formValidate.data"
                 type="button"
-                @on-change="selectChange(formValidate.data)"
+                @change="selectChange(formValidate.data)"
                 class="mr"
               >
-                <Radio :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{ item.text }}</Radio>
-              </RadioGroup>
+                <el-radio :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{ item.text }}</el-radio>
+              </el-radio-group>
               <DatePicker
                 :editable="false"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="daterange"
@@ -29,65 +29,97 @@
                 placeholder="自定义时间"
                 style="width: 200px"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="预售状态：">
-              <Select v-model="formValidate.status" placeholder="请选择" clearable @on-change="userSearchs">
-                <Option :value="1">进行中</Option>
-                <Option :value="2">已失败</Option>
-                <Option :value="3">已成功</Option>
-              </Select>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="预售状态：">
+              <el-select v-model="formValidate.status" placeholder="请选择" clearable @change="userSearchs">
+                <el-option :value="1" label="进行中"></el-option>
+                <el-option :value="2" label="已失败"></el-option>
+                <el-option :value="3" label="已成功"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tableList"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="avatar">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="nickname">
-          <span> {{ row.nickname + ' / ' + row.uid }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="title">
-          <span> {{ row.title }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="add_time">
-          <span> {{ row.add_time }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="datatime">
-          <span> {{ row.datatime }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          <Tag color="blue" v-show="row.status === 1">进行中</Tag>
-          <Tag color="volcano" v-show="row.status === 2">已失败</Tag>
-          <Tag color="cyan" v-show="row.status === 3">已成功</Tag>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="Info(row)">查看详情</a>
-        </template>
-      </Table>
+        <el-table-column label="头像" min-width="100">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.avatar" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="发起用户" min-width="130">
+          <template slot-scope="scope">
+            <span> {{ scope.row.nickname + ' / ' + scope.row.uid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="开启时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="预售商品" min-width="300">
+          <template slot-scope="scope">
+            <span>{{ scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="最低价" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.bargain_price_min }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="当前价" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.now_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="总预售次数" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.people_num }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="剩余预售次数" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.num }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="结束时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.datatime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="130">
+          <template slot-scope="scope">
+            <Tag color="blue" v-show="scope.row.status === 1">进行中</Tag>
+            <Tag color="volcano" v-show="scope.row.status === 2">已失败</Tag>
+            <Tag color="cyan" v-show="scope.row.status === 3">已成功</Tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="100">
+          <template slot-scope="scope">
+            <a @click="Info(scope.row)">查看详情</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
 
     <!-- 详情模态框-->
     <Modal
@@ -100,30 +132,43 @@
       :mask-closable="false"
       width="750"
     >
-      <Table
+      <el-table
         ref="selection"
-        :columns="columns2"
         :data="tabList3"
-        :loading="loading2"
-        no-data-text="暂无数据"
-        highlight-row
+        v-loading="loading2"
+        empty-text="暂无数据"
+        highlight-current-row
         max-height="600"
         size="small"
-        no-filtered-data-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="nickname">
-          <span> {{ row.nickname + ' / ' + row.uid }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="avatar">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <Tag color="cyan" v-show="row.is_refund === 1">已退款</Tag>
-          <Tag color="volcano" v-show="row.is_refund === 0">未退款</Tag>
-        </template>
-      </Table>
+        <el-table-column label="用户ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.uid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户头像" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.avatar" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户名称" min-width="130">
+          <template slot-scope="scope">
+            <span> {{ scope.row.nickname + ' / ' + scope.row.uid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="预售金额" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="预售时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
     </Modal>
   </div>
 </template>
@@ -237,37 +282,13 @@ export default {
       timeVal: [],
       loading2: false,
       tabList3: [],
-      columns2: [
-        {
-          title: '用户ID',
-          key: 'uid',
-          width: 80,
-        },
-        {
-          title: '用户头像',
-          slot: 'avatar',
-        },
-        {
-          title: '用户名称',
-          slot: 'nickname',
-          minWidth: 150,
-        },
-        {
-          title: '预售金额',
-          key: 'price',
-        },
-        {
-          title: '预售时间',
-          key: 'add_time',
-        },
-      ],
       rows: {},
     };
   },
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
diff --git a/template/admin/src/pages/marketing/storeSeckill/create.vue b/template/admin/src/pages/marketing/storeSeckill/create.vue
index e3f322c21..4df4b17dd 100644
--- a/template/admin/src/pages/marketing/storeSeckill/create.vue
+++ b/template/admin/src/pages/marketing/storeSeckill/create.vue
@@ -3,23 +3,23 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <span>
-          <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
+          <el-button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</el-button>
         </span>
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span class="ivu-page-header-title">{{ $route.params.id ? '编辑秒杀商品' : '添加秒杀商品' }}</span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row type="flex" class="mt30 acea-row row-middle row-center">
-        <Col span="20">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row class="mt30 acea-row row-middle row-center">
+        <el-col :span="20">
           <Steps :current="current">
             <Step title="选择秒杀商品"></Step>
             <Step title="填写基础信息"></Step>
             <Step title="修改商品详情"></Step>
           </Steps>
-        </Col>
-        <Col span="23">
-          <Form
+        </el-col>
+        <el-col :span="23">
+          <el-form
             class="form mt30"
             ref="formValidate"
             :model="formValidate"
@@ -29,7 +29,7 @@
             :label-position="labelPosition"
             @submit.native.prevent
           >
-            <FormItem label="选择商品：" prop="image_input" v-if="current === 0">
+            <el-form-item label="选择商品：" prop="image_input" v-if="current === 0">
               <div class="picBox" @click="changeGoods">
                 <div class="pictrue" v-if="formValidate.image">
                   <img v-lazy="formValidate.image" />
@@ -38,10 +38,10 @@
                   <Icon type="ios-camera-outline" size="26" class="iconfonts" />
                 </div>
               </div>
-            </FormItem>
-            <Col v-show="current === 1" type="flex">
-              <!-- <Col span="24">
-                <FormItem label="商品主图：" prop="image">
+            </el-form-item>
+            <el-col v-show="current === 1">
+              <!-- <el-col :span="24">
+                <el-form-item label="商品主图：" prop="image">
                   <div class="picBox" @click="modalPicTap('dan', 'danFrom')">
                     <div class="pictrue" v-if="formValidate.image">
                       <img v-lazy="formValidate.image" />
@@ -54,10 +54,10 @@
                       />
                     </div>
                   </div>
-                </FormItem>
-              </Col> -->
-              <Col span="24">
-                <FormItem label="商品轮播图：" prop="images">
+                </el-form-item>
+              </el-col> -->
+              <el-col :span="24">
+                <el-form-item label="商品轮播图：" prop="images">
                   <div class="acea-row">
                     <div
                       class="pictrue"
@@ -70,12 +70,7 @@
                       @dragend="handleDragEnd($event, item)"
                     >
                       <img v-lazy="item" />
-                      <Button
-                        shape="circle"
-                        icon="md-close"
-                        @click.native="handleRemove(index)"
-                        class="btndel"
-                      ></Button>
+                      <i class="el-icon-circle-close btndel" @click="handleRemove(index)"></i>
                     </div>
                     <div
                       v-if="formValidate.images.length < 10"
@@ -85,68 +80,69 @@
                       <Icon type="ios-camera-outline" size="26" class="iconfonts" />
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="商品标题：" prop="title" label-for="title">
-                    <Input placeholder="请输入商品标题" element-id="title" v-model="formValidate.title" />
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="秒杀活动简介：" prop="info" label-for="info">
-                    <Input
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="商品标题：" prop="title" label-for="title">
+                    <el-input placeholder="请输入商品标题" element-id="title" v-model="formValidate.title" />
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="秒杀活动简介：" prop="info" label-for="info">
+                    <el-input
                       placeholder="请输入秒杀活动简介"
                       type="textarea"
                       :rows="4"
                       element-id="info"
                       v-model="formValidate.info"
                     />
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <FormItem label="活动时间：" prop="section_time">
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="活动时间：" prop="section_time">
                   <div class="acea-row row-middle">
                     <DatePicker
                       :editable="false"
                       type="daterange"
                       format="yyyy-MM-dd"
                       placeholder="请选择活动时间"
-                      @on-change="onchangeTime"
+                      @change="onchangeTime"
                       class="perW30"
                       :value="formValidate.section_time"
                       v-model="formValidate.section_time"
                     ></DatePicker>
                     <div class="ml10 grey">设置活动开启结束时间，用户可以在有效时间内参与秒杀</div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.virtual_type == 0">
-                <FormItem label="物流方式：" prop="logistics">
-                  <CheckboxGroup v-model="formValidate.logistics">
-                    <Checkbox label="1">快递</Checkbox>
-                    <Checkbox label="2">到店核销</Checkbox>
-                  </CheckboxGroup>
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.virtual_type == 0">
-                <FormItem label="运费设置：" :prop="formValidate.freight != 1 ? 'freight' : ''">
-                  <RadioGroup v-model="formValidate.freight">
-                    <Radio :label="2">固定邮费</Radio>
-                    <Radio :label="3">运费模板</Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col>
-              <Col
-                span="24"
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="formValidate.virtual_type == 0">
+                <el-form-item label="物流方式：" prop="logistics">
+                  <el-checkbox-group v-model="formValidate.logistics">
+                    <el-checkbox label="1">快递</el-checkbox>
+                    <el-checkbox label="2">到店核销</el-checkbox>
+                  </el-checkbox-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="formValidate.virtual_type == 0">
+                <el-form-item label="运费设置：" :prop="formValidate.freight != 1 ? 'freight' : ''">
+                  <el-radio-group v-model="formValidate.freight">
+                    <el-radio :label="2">固定邮费</el-radio>
+                    <el-radio :label="3">运费模板</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col
+                :span="24"
                 v-if="formValidate.freight != 3 && formValidate.freight != 1 && formValidate.virtual_type == 0"
               >
-                <FormItem label="">
+                <el-form-item label="">
                   <div class="acea-row">
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       :min="0.01"
                       :max="10000"
                       v-model="formValidate.postage"
@@ -154,39 +150,51 @@
                       class="perW20 maxW"
                     />
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24" v-if="formValidate.freight == 3 && formValidate.virtual_type == 0">
-                <FormItem label="" prop="temp_id">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="formValidate.freight == 3 && formValidate.virtual_type == 0">
+                <el-form-item label="" prop="temp_id">
                   <div class="acea-row">
-                    <Select v-model="formValidate.temp_id" clearable placeholder="请选择运费模板" class="perW20 maxW">
-                      <Option v-for="(item, index) in templateList" :value="item.id" :key="index">{{
-                        item.name
-                      }}</Option>
-                    </Select>
+                    <el-select
+                      v-model="formValidate.temp_id"
+                      clearable
+                      placeholder="请选择运费模板"
+                      class="perW20 maxW"
+                    >
+                      <el-option
+                        v-for="(item, index) in templateList"
+                        :value="item.id"
+                        :key="index"
+                        :label="item.name"
+                      ></el-option>
+                    </el-select>
                     <span class="addfont" @click="freight">新增运费模板</span>
                   </div>
-                </FormItem>
-              </Col>
+                </el-form-item>
+              </el-col>
 
-              <Col span="24">
-                <FormItem label="开始时间：" prop="time_id">
+              <el-col :span="24">
+                <el-form-item label="开始时间：" prop="time_id">
                   <div class="acea-row row-middle">
-                    <Select v-model="formValidate.time_id" class="perW20">
-                      <Option v-for="item in timeList" :value="item.id" :key="item.id"
-                        >{{ item.time }}点开始,持续{{ item.continued }}小时</Option
-                      >
-                    </Select>
+                    <el-select v-model="formValidate.time_id" class="perW20">
+                      <el-option
+                        v-for="item in timeList"
+                        :value="item.id"
+                        :key="item.id"
+                        :label="`${item.time}点开始,持续${item.continued}小时`"
+                      ></el-option>
+                    </el-select>
                     <div class="ml10 grey">
                       选择产品开始时间段，该时间段内用户可参与购买；其它时间段会显示活动未开始或已结束。如活动超过一天，则活动期内，每天都会定时开启
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="总购买数量限制：" prop="num">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="总购买数量限制：" prop="num">
                   <div class="acea-row row-middle">
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       :min="1"
                       placeholder="请输入数量限制"
                       element-id="num"
@@ -199,12 +207,13 @@
                       活动有效期内每个用户可购买该商品总数限制。例如设置为4，表示本次活动有效期内，每个用户最多可购买总数4个
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="单次购买数量限制：" prop="once_num">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="单次购买数量限制：" prop="once_num">
                   <div class="acea-row row-middle">
-                    <InputNumber
+                    <el-input-number
+                      controls-position="right"
                       :min="1"
                       placeholder="请输入单次购买数量限制"
                       element-id="once_num"
@@ -217,21 +226,22 @@
                       用户参与秒杀时，一次购买最大数量限制。例如设置为2，表示参与秒杀时，用户一次购买数量最大可选择2个
                     </div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="单位：" prop="unit_name" label-for="unit_name">
-                  <Input
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="单位：" prop="unit_name" label-for="unit_name">
+                  <el-input
                     placeholder="请输入单位"
                     element-id="unit_name"
                     v-model="formValidate.unit_name"
                     class="perW20"
                   />
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="排序：">
-                  <InputNumber
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="排序：">
+                  <el-input-number
+                    controls-position="right"
                     placeholder="请输入排序"
                     element-id="sort"
                     :precision="0"
@@ -240,98 +250,104 @@
                     v-model="formValidate.sort"
                     class="perW10"
                   />
-                </FormItem>
-              </Col>
-              <Col span="24">
-                <FormItem label="活动状态：" props="status" label-for="status">
-                  <RadioGroup element-id="status" v-model="formValidate.status">
-                    <Radio :label="1" class="radio">开启</Radio>
-                    <Radio :label="0">关闭</Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col>
-              <!--                            <Col span="24">-->
-              <!--                                <FormItem label="规格选择：">-->
-              <!--                                    <Table :data="specsData" :columns="columns" border class="mt25" highlight-row @on-selection-change="changeCheckbox">-->
-              <!--                                        <template slot-scope="{ row, index }" slot="pic">-->
-              <!--                                            <div class="acea-row row-middle row-center-wrapper" @click="modalPicTap('dan','danTable',index)">-->
-              <!--                                                <div class="pictrue pictrueTab" v-if="row.pic"><img v-lazy="row.pic"></div>-->
-              <!--                                                <div class="upLoad pictrueTab acea-row row-center-wrapper"   v-else>-->
-              <!--                                                    <Icon type="ios-camera-outline" size="21" class="iconfont"/>-->
-              <!--                                                </div>-->
-              <!--                                            </div>-->
-              <!--                                        </template>-->
-              <!--                                    </Table>-->
-              <!--                                </FormItem>-->
-              <!--                            </Col>-->
-              <Col span="24">
-                <FormItem label="规格选择：">
-                  <Table :data="specsData" :columns="columns" border @on-selection-change="changeCheckbox">
-                    <!-- <template slot-scope="{ row, index }" slot="price">
-                      <InputNumber
-                        v-model="row.price"
-                        :min="0.01"
-                        :precision="2"
-                        class="priceBox"
-                        @on-change="
-                          (e) => {
-                            changePrice(e, index);
-                          }
-                        "
-                        :active-change="false"
-                      ></InputNumber>
-                    </template> -->
-                    <template slot-scope="{ row, index }" slot="pic">
-                      <div
-                        class="acea-row row-middle row-center-wrapper"
-                        @click="modalPicTap('dan', 'danTable', index)"
-                      >
-                        <div class="pictrue pictrueTab" v-if="row.pic">
-                          <img v-lazy="row.pic" />
-                        </div>
-                        <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
-                          <Icon type="ios-camera-outline" size="21" />
-                        </div>
-                      </div>
-                    </template>
-                  </Table>
-                </FormItem>
-              </Col>
-            </Col>
-            <Row v-show="current === 2">
-              <Col span="24">
-                <FormItem label="内容：">
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="活动状态：" props="status" label-for="status">
+                  <el-radio-group element-id="status" v-model="formValidate.status">
+                    <el-radio :label="1" class="radio">开启</el-radio>
+                    <el-radio :label="0">关闭</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="规格选择：">
+                  <el-table :data="specsData" border @selection-change="changeCheckbox">
+                    <el-table-column type="selection" width="55"> </el-table-column>
+                    <el-table-column
+                      :label="item.title"
+                      :min-width="item.minWidth"
+                      v-for="(item, index) in columns"
+                      :key="index"
+                    >
+                      <template slot-scope="scope">
+                        <template v-if="item.key">
+                          <div>
+                            <span>{{ scope.row[item.key] }}</span>
+                          </div>
+                        </template>
+                        <template v-else-if="item.slot === 'pic'">
+                          <div
+                            class="acea-row row-middle row-center-wrapper"
+                            @click="modalPicTap('dan', 'danTable', index)"
+                          >
+                            <div class="pictrue pictrueTab" v-if="scope.row.pic">
+                              <img v-lazy="scope.row.pic" />
+                            </div>
+                            <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
+                              <Icon type="ios-camera-outline" size="21" class="iconfonts" />
+                            </div>
+                          </div>
+                        </template>
+                        <template v-else-if="item.slot === 'price'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="scope.row.price"
+                            :min="0"
+                            :precision="2"
+                            class="priceBox"
+                            :active-change="false"
+                          ></el-input-number>
+                        </template>
+                        <template v-else-if="item.slot === 'quota'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="scope.row.quota"
+                            :min="1"
+                            active-change
+                            class="priceBox"
+                          ></el-input-number>
+                        </template>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-form-item>
+              </el-col>
+            </el-col>
+            <el-row v-show="current === 2">
+              <el-col :span="24">
+                <el-form-item label="内容：">
                   <WangEditor
                     style="width: 90%"
                     :content="formValidate.description"
                     @editorContent="getEditorContent"
                   ></WangEditor>
-                </FormItem>
-              </Col>
-            </Row>
-            <Col span="24">
-              <FormItem>
-                <Button
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-col :span="24">
+              <el-form-item>
+                <el-button
                   class="submission mr15"
                   @click="step"
                   v-show="current !== 0"
                   :disabled="$route.params.id && current === 1"
                   >上一步
-                </Button>
-                <Button
+                </el-button>
+                <el-button
                   :disabled="submitOpen && current === 2"
                   type="primary"
                   class="submission"
                   @click="next('formValidate')"
                   v-text="current === 2 ? '提交' : '下一步'"
-                ></Button>
-              </FormItem>
-            </Col>
-          </Form>
+                ></el-button>
+              </el-form-item>
+            </el-col>
+          </el-form>
           <Spin size="large" fix v-if="spinShow"></Spin>
-        </Col>
-      </Row>
-    </Card>
+        </el-col>
+      </el-row>
+    </el-card>
     <!-- 选择商品-->
     <Modal
       v-model="modals"
@@ -567,7 +583,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 135;
+      return this.isMobile ? undefined : '135px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -608,7 +624,7 @@ export default {
           });
           that.formValidate.items = data.items;
           that.columns = data.header;
-          that.columns.unshift(selection);
+          // that.columns.unshift(selection);
           that.inputChange(data);
         })
         .catch((res) => {
@@ -748,7 +764,7 @@ export default {
           this.formValidate = info;
           this.$set(this.formValidate, 'items', info.attrs.items);
           this.columns = info.attrs.header;
-          this.columns.unshift(selection);
+          // this.columns.unshift(selection);
           that.specsData = info.attrs.value;
           that.specsData.forEach(function (item, index) {
             that.$set(that.specsData[index], 'id', index);
diff --git a/template/admin/src/pages/marketing/storeSeckill/index.vue b/template/admin/src/pages/marketing/storeSeckill/index.vue
index f3044c613..26525b5d3 100644
--- a/template/admin/src/pages/marketing/storeSeckill/index.vue
+++ b/template/admin/src/pages/marketing/storeSeckill/index.vue
@@ -1,95 +1,147 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="tableFrom"
         :model="tableFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="秒杀状态：">
-              <Select placeholder="请选择" clearable v-model="tableFrom.status" @on-change="userSearchs">
-                <Option value="1">开启</Option>
-                <Option value="0">关闭</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="商品搜索：" label-for="store_name">
-              <Input
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="秒杀状态：">
+              <el-select placeholder="请选择" clearable v-model="tableFrom.status" @change="userSearchs">
+                <el-option value="1" label="开启"></el-option>
+                <el-option value="0" label="关闭"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="商品搜索：" label-for="store_name">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入商品名称，ID"
                 v-model="tableFrom.store_name"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex" class="mb20">
-          <Col v-bind="grid">
-            <Button v-auth="['marketing-store_seckill-create']" type="primary" icon="md-add" @click="add" class="mr10"
-              >添加秒杀商品</Button
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row class="mb20">
+          <el-col v-bind="grid">
+            <el-button
+              v-auth="['marketing-store_seckill-create']"
+              type="primary"
+              icon="md-add"
+              @click="add"
+              class="mr10"
+              >添加秒杀商品</el-button
             >
-            <Button v-auth="['export-storeSeckill']" class="export" icon="ios-share-outline" @click="exports"
-              >导出</Button
+            <el-button v-auth="['export-storeSeckill']" class="export" icon="ios-share-outline" @click="exports"
+              >导出</el-button
             >
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tableList"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="image">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.image" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="stop_time">
-          <span> {{ row.stop_time | formatDate }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">开启</span>
-            <span slot="close">关闭</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a v-if="row.stop_status === 0" @click="edit(row)">编辑</a>
-          <Divider v-if="row.stop_status === 0" type="vertical" />
-          <a @click="copy(row)">复制</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除秒杀商品', index)">删除</a>
-          <Divider type="vertical" />
-          <a @click="viewInfo(row)">统计</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品图片" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.image" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="活动标题" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="活动简介" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.info }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="原价" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.ot_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="秒杀价" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="限量" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.quota_show }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="限量剩余" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.quota }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="秒杀状态" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.start_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="结束时间" min-width="100">
+          <template slot-scope="scope">
+            <span> {{ scope.row.stop_time | formatDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="100">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              :value="scope.row.status"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+              active-text="打开"
+              inactive-text="关闭"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a v-if="scope.row.stop_status === 0" @click="edit(scope.row)">编辑</a>
+            <el-divider direction="vertical" v-if="scope.row.stop_status === 0" />
+            <a @click="copy(scope.row)">复制</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除秒杀商品', index)">删除</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="viewInfo(scope.row)">统计</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="tableFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="tableFrom.limit"
+          :page.sync="tableFrom.page"
+          :limit.sync="tableFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -195,7 +247,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -290,10 +342,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.tableFrom.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.tableFrom.page = 1;
diff --git a/template/admin/src/pages/marketing/storeSeckill/statistics.vue b/template/admin/src/pages/marketing/storeSeckill/statistics.vue
index 0b8402866..111c3cb8e 100644
--- a/template/admin/src/pages/marketing/storeSeckill/statistics.vue
+++ b/template/admin/src/pages/marketing/storeSeckill/statistics.vue
@@ -3,73 +3,83 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <span>
-          <Button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</Button>
+          <el-button icon="ios-arrow-back" size="small" type="text" @click="$router.go(-1)">返回</el-button>
         </span>
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
       </div>
     </div>
     <cards-data :cardLists="cardLists" v-if="cardLists.length >= 0"></cards-data>
     <div>
-      <Tabs v-model="currentTab" @on-click="onClickTab">
-        <TabPane v-for="(item, index) in tabs" :label="item.label" :name="item.type" :key="index" />
-      </Tabs>
+      <el-tabs v-model="currentTab" @tab-click="onClickTab">
+        <el-tab-pane v-for="(item, index) in tabs" :label="item.label" :name="item.type" :key="index" />
+      </el-tabs>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="pagination"
         :model="pagination"
         :label-width="labelWidth"
         label-position="right"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col span="6" v-if="type == 1">
-            <FormItem label="订单状态：" label-for="status">
-              <Select v-model="pagination.status" clearable placeholder="请选择订单状态" @on-change="changeStatus">
-                <Option value="0">未支付</Option>
-                <Option value="1">待发货</Option>
-                <Option value="2">待收货</Option>
-                <Option value="3">待评价</Option>
-                <Option value="4">交易完成</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col span="6">
-            <FormItem label="搜索：" label-for="title">
-              <Input
+        <el-row :gutter="24">
+          <el-col :span="6" v-if="type == 1">
+            <el-form-item label="订单状态：" label-for="status">
+              <el-select v-model="pagination.status" clearable placeholder="请选择订单状态" @change="changeStatus">
+                <el-option value="0" label="未支付"></el-option>
+                <el-option value="1" label="待发货"></el-option>
+                <el-option value="2" label="待收货"></el-option>
+                <el-option value="3" label="待评价"></el-option>
+                <el-option value="4" label="交易完成"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="搜索：" label-for="title">
+              <el-input
                 search
                 enter-button
                 v-model="pagination.real_name"
                 placeholder="请输入用户姓名|手机号|UID"
                 @on-search="searchList"
               />
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="type ? thead2 : thead"
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tbody"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-      </Table>
+        <el-table-column
+          :label="item.title"
+          :min-width="item.minWidth || 100"
+          v-for="(item, index) in type ? thead2 : thead"
+          :key="index"
+        >
+          <template slot-scope="scope">
+            <template v-if="item.key">
+              <span>{{ scope.row[item.key] }}</span>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="pagination.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="pagination.limit"
+          :page.sync="pagination.page"
+          :limit.sync="pagination.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -195,12 +205,12 @@ export default {
   created() {
     this.id = this.$route.params.id;
     this.getStatistics(this.id);
-    this.getList(this.id);
+    this.getList();
   },
   methods: {
     changeStatus() {
       this.pagination.page = 1;
-      this.getList(this.id);
+      this.getList();
     },
     // 统计
     getStatistics(id) {
@@ -212,7 +222,7 @@ export default {
       });
     },
     // 列表
-    getList(id) {
+    getList() {
       this.loading = true;
       if (this.type == 0) {
         getseckillStatisticsPeople(this.id, this.pagination).then((res) => {
@@ -233,17 +243,12 @@ export default {
     // 标签切换
     onClickTab() {
       this.type = this.currentTab;
-      this.getList(this.id);
+      this.getList();
     },
     // 搜索
     searchList() {
       this.pagination.page = 1;
-      this.getList(this.id);
-    },
-    // 分页
-    pageChange(index) {
-      this.pagination.page = index;
-      this.getList(this.id);
+      this.getList();
     },
   },
 };
diff --git a/template/admin/src/pages/marketing/systemConfig/index.vue b/template/admin/src/pages/marketing/systemConfig/index.vue
index 2756c28bc..215602db1 100644
--- a/template/admin/src/pages/marketing/systemConfig/index.vue
+++ b/template/admin/src/pages/marketing/systemConfig/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt"> 后台from表单 </Card>
+    <el-card :bordered="false" shadow="never" class="ivu-mt"> 后台from表单 </el-card>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/marketing/userPoint/index.vue b/template/admin/src/pages/marketing/userPoint/index.vue
index 6d9343f42..9c8679ef4 100644
--- a/template/admin/src/pages/marketing/userPoint/index.vue
+++ b/template/admin/src/pages/marketing/userPoint/index.vue
@@ -1,32 +1,32 @@
 <template>
   <div>
     <cards-data :cardLists="cardLists" v-if="cardLists.length >= 0"></cards-data>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="tableFrom"
         :model="tableFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex">
-          <Col :xl="6" :lg="10" :md="10" :sm="24" :xs="24">
-            <FormItem label="搜索：" label-for="store_name">
-              <Input
+        <el-row :gutter="24">
+          <el-col :xl="6" :lg="10" :md="10" :sm="24" :xs="24">
+            <el-form-item label="搜索：" label-for="store_name">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入用户ID,标题"
                 v-model="tableFrom.nickname"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-          <Col :xl="6" :lg="10" :md="10" :sm="24" :xs="24">
-            <FormItem label="选择时间：" label-for="user_time">
+            </el-form-item>
+          </el-col>
+          <el-col :xl="6" :lg="10" :md="10" :sm="24" :xs="24">
+            <el-form-item label="选择时间：" label-for="user_time">
               <DatePicker
                 :editable="false"
                 clearable
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 v-model="timeVal"
                 :value="timeVal"
                 format="yyyy/MM/dd"
@@ -35,38 +35,65 @@
                 placeholder="选择时间"
                 class="perW100"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col :xl="4" :lg="4" :md="4" :sm="24" :xs="24">
-            <Button v-auth="['export-userPoint']" class="export" icon="ios-share-outline" @click="exports">导出</Button>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+            </el-form-item>
+          </el-col>
+          <el-col :xl="4" :lg="4" :md="4" :sm="24" :xs="24">
+            <el-button v-auth="['export-userPoint']" class="export" icon="ios-share-outline" @click="exports"
+              >导出</el-button
+            >
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tableList"
         ref="table"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row }" slot="number">
-          <div v-if="row.pm" class="z-price">+ {{ row.number }}</div>
-          <div v-else class="f-price">- {{ row.number }}</div>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="标题" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="积分变动" min-width="130">
+          <template slot-scope="scope">
+            <div v-if="scope.row.pm" class="z-price">+ {{ scope.row.number }}</div>
+            <div v-else class="f-price">- {{ scope.row.number }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="变动后积分" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.balance }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.mark }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="添加时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="tableFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="tableFrom.limit"
+          :page.sync="tableFrom.page"
+          :limit.sync="tableFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -91,43 +118,6 @@ export default {
       cardLists: [],
       loading: false,
       delfromData: {},
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '标题',
-          key: 'title',
-          minWidth: 130,
-        },
-        {
-          title: '积分变动',
-          slot: 'number',
-          minWidth: 100,
-        },
-        {
-          title: '变动后积分',
-          key: 'balance',
-          minWidth: 100,
-        },
-        {
-          title: '备注',
-          key: 'mark',
-          minWidth: 100,
-        },
-        {
-          title: '用户名称',
-          key: 'nickname',
-          minWidth: 150,
-        },
-        {
-          title: '添加时间',
-          key: 'add_time',
-          minWidth: 100,
-        },
-      ],
       tableList: [],
       grid: {
         xl: 7,
@@ -150,7 +140,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -199,10 +189,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.tableFrom.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.tableFrom.page = 1;
diff --git a/template/admin/src/pages/notify/smsConfig/components/forgetPassword.vue b/template/admin/src/pages/notify/smsConfig/components/forgetPassword.vue
index 581d396fd..21fe7a176 100644
--- a/template/admin/src/pages/notify/smsConfig/components/forgetPassword.vue
+++ b/template/admin/src/pages/notify/smsConfig/components/forgetPassword.vue
@@ -1,100 +1,100 @@
 <template>
-  <Row type="flex" justify="center" align="middle">
-    <Col span="20" style="margin-top: 70px" class="mb50">
+  <el-row  justify="center" align="middle">
+    <el-col :span="20" style="margin-top: 70px" class="mb50">
       <Steps :current="current">
         <Step title="验证账号信息"></Step>
         <Step title="修改账户密码"></Step>
         <Step title="登录"></Step>
       </Steps>
-    </Col>
-    <Col span="24">
+    </el-col>
+    <el-col :span="24">
       <div class="index_from page-account-container">
-        <Form ref="formInline" :model="formInline" :rules="ruleInline" @submit.native.prevent>
+        <el-form ref="formInline" :model="formInline" :rules="ruleInline" @submit.native.prevent>
           <template v-if="current === 0">
-            <FormItem prop="phone" class="maxInpt">
-              <Input
+            <el-form-item prop="phone" class="maxInpt">
+              <el-input
                 type="text"
                 v-model="formInline.phone"
                 prefix="ios-contact-outline"
                 placeholder="请输入手机号"
                 size="large"
               />
-            </FormItem>
-            <FormItem prop="verify_code" class="maxInpt">
+            </el-form-item>
+            <el-form-item prop="verify_code" class="maxInpt">
               <div class="code">
-                <Input
+                <el-input
                   type="text"
                   v-model="formInline.verify_code"
                   prefix="ios-keypad-outline"
                   placeholder="请输入验证码"
                   size="large"
                 />
-                <Button :disabled="!this.canClick" @click="cutDown" size="large">{{ cutNUm }}</Button>
+                <el-button :disabled="!this.canClick" @click="cutDown" size="large">{{ cutNUm }}</el-button>
               </div>
-            </FormItem>
+            </el-form-item>
           </template>
           <template v-if="current === 1">
-            <FormItem prop="password" class="maxInpt">
-              <Input
+            <el-form-item prop="password" class="maxInpt">
+              <el-input
                 type="password"
                 v-model="formInline.password"
                 prefix="ios-lock-outline"
                 placeholder="请输入新密码"
                 size="large"
               />
-            </FormItem>
-            <FormItem prop="checkPass" class="maxInpt">
-              <Input
+            </el-form-item>
+            <el-form-item prop="checkPass" class="maxInpt">
+              <el-input
                 type="password"
                 v-model="formInline.checkPass"
                 prefix="ios-lock-outline"
                 placeholder="请验证新密码"
                 size="large"
               />
-            </FormItem>
+            </el-form-item>
           </template>
           <template v-if="current === 2">
-            <FormItem prop="phone" class="maxInpt">
-              <Input type="text" v-model="formInline.phone" prefix="ios-contact-outline" placeholder="请输入手机号" />
-            </FormItem>
-            <FormItem prop="password" class="maxInpt">
-              <Input type="password" v-model="formInline.password" prefix="ios-lock-outline" placeholder="请输入密码" />
-            </FormItem>
+            <el-form-item prop="phone" class="maxInpt">
+              <el-input type="text" v-model="formInline.phone" prefix="ios-contact-outline" placeholder="请输入手机号" />
+            </el-form-item>
+            <el-form-item prop="password" class="maxInpt">
+              <el-input type="password" v-model="formInline.password" prefix="ios-lock-outline" placeholder="请输入密码" />
+            </el-form-item>
           </template>
-          <FormItem class="maxInpt">
-            <Button
+          <el-form-item class="maxInpt">
+            <el-button
               v-if="current === 0"
               type="primary"
               long
               size="large"
               @click="handleSubmit1('formInline', current)"
               class="mb20"
-              >下一步</Button
+              >下一步</el-button
             >
-            <Button
+            <el-button
               v-if="current === 1"
               type="primary"
               long
               size="large"
               @click="handleSubmit2('formInline', current)"
               class="mb20"
-              >提交</Button
+              >提交</el-button
             >
-            <Button
+            <el-button
               v-if="current === 2"
               type="primary"
               long
               size="large"
               @click="handleSubmit('formInline', current)"
               class="mb20"
-              >登录</Button
+              >登录</el-button
             >
-            <Button long size="large" @click="returns('formInline')" class="btn">返回 </Button>
-          </FormItem>
-        </Form>
+            <el-button long size="large" @click="returns('formInline')" class="btn">返回 </el-button>
+          </el-form-item>
+        </el-form>
       </div>
-    </Col>
-  </Row>
+    </el-col>
+  </el-row>
 </template>
 
 <script>
diff --git a/template/admin/src/pages/notify/smsConfig/components/forgetPhone.vue b/template/admin/src/pages/notify/smsConfig/components/forgetPhone.vue
index 0e1d5131f..400d0ee86 100644
--- a/template/admin/src/pages/notify/smsConfig/components/forgetPhone.vue
+++ b/template/admin/src/pages/notify/smsConfig/components/forgetPhone.vue
@@ -1,94 +1,94 @@
 <template>
-  <Row type="flex" justify="center" align="middle">
-    <Col span="20" style="margin-top: 70px" class="mb50">
+  <el-row  justify="center" align="middle">
+    <el-col :span="20" style="margin-top: 70px" class="mb50">
       <Steps :current="current">
         <Step title="验证账号信息"></Step>
         <Step title="修改手机号码"></Step>
         <Step title="登录"></Step>
       </Steps>
-    </Col>
-    <Col span="24">
+    </el-col>
+    <el-col :span="24">
       <div class="index_from page-account-container">
-        <Form ref="formInline" :model="formInline" :rules="ruleInline" @submit.native.prevent>
+        <el-form ref="formInline" :model="formInline" :rules="ruleInline" @submit.native.prevent>
           <template v-if="current === 0">
-            <FormItem prop="account" class="maxInpt">
-              <Input
+            <el-form-item prop="account" class="maxInpt">
+              <el-input
                 type="text"
                 v-model="formInline.account"
                 prefix="ios-contact-outline"
                 placeholder="请输入当前手机号"
                 size="large"
               />
-            </FormItem>
-            <FormItem prop="password" class="maxInpt">
-              <Input type="password" v-model="formInline.password" prefix="ios-lock-outline" placeholder="请输入密码" />
-            </FormItem>
+            </el-form-item>
+            <el-form-item prop="password" class="maxInpt">
+              <el-input type="password" v-model="formInline.password" prefix="ios-lock-outline" placeholder="请输入密码" />
+            </el-form-item>
           </template>
           <template v-if="current === 1">
-            <FormItem prop="phone" class="maxInpt">
-              <Input
+            <el-form-item prop="phone" class="maxInpt">
+              <el-input
                 type="text"
                 v-model="formInline.phone"
                 prefix="ios-lock-outline"
                 placeholder="请输入新手机号"
                 size="large"
               />
-            </FormItem>
-            <FormItem prop="verify_code" class="maxInpt">
+            </el-form-item>
+            <el-form-item prop="verify_code" class="maxInpt">
               <div class="code">
-                <Input
+                <el-input
                   type="text"
                   v-model="formInline.verify_code"
                   prefix="ios-keypad-outline"
                   placeholder="请输入验证码"
                   size="large"
                 />
-                <Button :disabled="!this.canClick" @click="cutDown" size="large">{{ cutNUm }}</Button>
+                <el-button :disabled="!this.canClick" @click="cutDown" size="large">{{ cutNUm }}</el-button>
               </div>
-            </FormItem>
+            </el-form-item>
           </template>
           <template v-if="current === 2">
-            <FormItem prop="phone" class="maxInpt">
-              <Input type="text" v-model="formInline.phone" prefix="ios-contact-outline" placeholder="请输入手机号" />
-            </FormItem>
-            <FormItem prop="password" class="maxInpt">
-              <Input type="password" v-model="formInline.password" prefix="ios-lock-outline" placeholder="请输入密码" />
-            </FormItem>
+            <el-form-item prop="phone" class="maxInpt">
+              <el-input type="text" v-model="formInline.phone" prefix="ios-contact-outline" placeholder="请输入手机号" />
+            </el-form-item>
+            <el-form-item prop="password" class="maxInpt">
+              <el-input type="password" v-model="formInline.password" prefix="ios-lock-outline" placeholder="请输入密码" />
+            </el-form-item>
           </template>
-          <FormItem class="maxInpt">
-            <Button
+          <el-form-item class="maxInpt">
+            <el-button
               v-if="current === 0"
               type="primary"
               long
               size="large"
               @click="handleSubmit1('formInline', current)"
               class="mb20"
-              >下一步</Button
+              >下一步</el-button
             >
-            <Button
+            <el-button
               v-if="current === 1"
               type="primary"
               long
               size="large"
               @click="handleSubmit2('formInline', current)"
               class="mb20"
-              >提交</Button
+              >提交</el-button
             >
-            <Button
+            <el-button
               v-if="current === 2"
               type="primary"
               long
               size="large"
               @click="handleSubmit('formInline', current)"
               class="mb20"
-              >登录</Button
+              >登录</el-button
             >
-            <Button long size="large" @click="returns('formInline')" class="btn">返回 </Button>
-          </FormItem>
-        </Form>
+            <el-button long size="large" @click="returns('formInline')" class="btn">返回 </el-button>
+          </el-form-item>
+        </el-form>
       </div>
-    </Col>
-  </Row>
+    </el-col>
+  </el-row>
 </template>
 
 <script>
diff --git a/template/admin/src/pages/notify/smsConfig/components/loginFrom.vue b/template/admin/src/pages/notify/smsConfig/components/loginFrom.vue
index be1d5b5df..309da12c8 100644
--- a/template/admin/src/pages/notify/smsConfig/components/loginFrom.vue
+++ b/template/admin/src/pages/notify/smsConfig/components/loginFrom.vue
@@ -1,34 +1,34 @@
 <template>
-  <Row type="flex">
-    <Col span="24">
+  <el-row >
+    <el-col :span="24">
       <div class="index_from page-account-container">
         <div class="page-account-top">
           <span class="page-account-top-tit">一号通账户登录</span>
         </div>
-        <Form
+        <el-form
           ref="formInline"
           :model="formInline"
           :rules="ruleInline"
           @submit.native.prevent
           @keyup.enter="handleSubmit('formInline')"
         >
-          <FormItem prop="sms_account" class="maxInpt">
-            <Input type="text" v-model="formInline.account" prefix="ios-contact-outline" placeholder="请输入手机号" />
-          </FormItem>
-          <FormItem prop="sms_token" class="maxInpt">
-            <Input type="password" v-model="formInline.password" prefix="ios-lock-outline" placeholder="请输入密码" />
-          </FormItem>
-          <FormItem class="maxInpt">
-            <Button type="primary" long size="large" @click="handleSubmit('formInline')" class="btn">登录</Button>
-          </FormItem>
-        </Form>
+          <el-form-item prop="sms_account" class="maxInpt">
+            <el-input type="text" v-model="formInline.account" prefix="ios-contact-outline" placeholder="请输入手机号" />
+          </el-form-item>
+          <el-form-item prop="sms_token" class="maxInpt">
+            <el-input type="password" v-model="formInline.password" prefix="ios-lock-outline" placeholder="请输入密码" />
+          </el-form-item>
+          <el-form-item class="maxInpt">
+            <el-button type="primary" long size="large" @click="handleSubmit('formInline')" class="btn">登录</el-button>
+          </el-form-item>
+        </el-form>
         <div class="page-account-other">
           <span @click="changePassword">忘记密码 |</span>
           <span @click="changeReg"> 注册账户</span>
         </div>
       </div>
-    </Col>
-  </Row>
+    </el-col>
+  </el-row>
 </template>
 
 <script>
diff --git a/template/admin/src/pages/notify/smsConfig/components/register.vue b/template/admin/src/pages/notify/smsConfig/components/register.vue
index 44319d306..0be33f964 100644
--- a/template/admin/src/pages/notify/smsConfig/components/register.vue
+++ b/template/admin/src/pages/notify/smsConfig/components/register.vue
@@ -1,58 +1,58 @@
 <template>
-  <Row type="flex">
-    <Col span="24">
+  <el-row >
+    <el-col :span="24">
       <div class="index_from page-account-container">
         <div class="page-account-top">
           <span class="page-account-top-tit">一号通账户注册</span>
         </div>
-        <Form ref="formInline" :model="formInline" :rules="ruleInline" @submit.native.prevent>
-          <!--<FormItem prop="account">-->
-          <!--<Input type="text" v-model="formInline.account" prefix="ios-contact-outline"-->
+        <el-form ref="formInline" :model="formInline" :rules="ruleInline" @submit.native.prevent>
+          <!--<el-form-item prop="account">-->
+          <!--<el-input type="text" v-model="formInline.account" prefix="ios-contact-outline"-->
           <!--placeholder="请输入短信平台账号" />-->
-          <!--</FormItem>-->
-          <FormItem prop="phone" class="maxInpt">
-            <Input
+          <!--</el-form-item>-->
+          <el-form-item prop="phone" class="maxInpt">
+            <el-input
               type="number"
               v-model="formInline.phone"
               prefix="ios-contact-outline"
               placeholder="请输入您的手机号"
             />
-          </FormItem>
-          <FormItem prop="password" class="maxInpt">
-            <Input type="password" v-model="formInline.password" prefix="ios-lock-outline" placeholder="请输入密码" />
-          </FormItem>
-          <!--<FormItem prop="password">-->
-          <!--<Input type="password" v-model="formInline.password" prefix="ios-lock-outline"-->
+          </el-form-item>
+          <el-form-item prop="password" class="maxInpt">
+            <el-input type="password" v-model="formInline.password" prefix="ios-lock-outline" placeholder="请输入密码" />
+          </el-form-item>
+          <!--<el-form-item prop="password">-->
+          <!--<el-input type="password" v-model="formInline.password" prefix="ios-lock-outline"-->
           <!--placeholder="请确认短信平台密码/token" />-->
-          <!--</FormItem>-->
-          <FormItem prop="url" class="maxInpt">
-            <Input type="text" v-model="formInline.url" prefix="ios-contact-outline" placeholder="请输入网址域名" />
-          </FormItem>
-          <!--<FormItem prop="sign">-->
-          <!--<Input type="text" v-model="formInline.sign" prefix="ios-contact-outline"-->
+          <!--</el-form-item>-->
+          <el-form-item prop="url" class="maxInpt">
+            <el-input type="text" v-model="formInline.url" prefix="ios-contact-outline" placeholder="请输入网址域名" />
+          </el-form-item>
+          <!--<el-form-item prop="sign">-->
+          <!--<el-input type="text" v-model="formInline.sign" prefix="ios-contact-outline"-->
           <!--placeholder="请输入短信签名，例如：CRMEB" />-->
-          <!--</FormItem>-->
-          <FormItem prop="verify_code" class="maxInpt">
+          <!--</el-form-item>-->
+          <el-form-item prop="verify_code" class="maxInpt">
             <div class="code">
-              <Input
+              <el-input
                 type="text"
                 v-model="formInline.verify_code"
                 prefix="ios-keypad-outline"
                 placeholder="请输入验证码"
               />
-              <Button :disabled="!canClick" @click="cutDown">{{ cutNUm }}</Button>
+              <el-button :disabled="!canClick" @click="cutDown">{{ cutNUm }}</el-button>
             </div>
-          </FormItem>
-          <FormItem class="maxInpt">
-            <Button type="primary" long size="large" @click="handleSubmit('formInline')" class="btn">注册</Button>
-          </FormItem>
-        </Form>
+          </el-form-item>
+          <el-form-item class="maxInpt">
+            <el-button type="primary" long size="large" @click="handleSubmit('formInline')" class="btn">注册</el-button>
+          </el-form-item>
+        </el-form>
         <div class="page-account-other">
           <span @click="changelogo">立即登录</span>
         </div>
       </div>
-    </Col>
-  </Row>
+    </el-col>
+  </el-row>
 </template>
 
 <script>
diff --git a/template/admin/src/pages/notify/smsConfig/index.vue b/template/admin/src/pages/notify/smsConfig/index.vue
index f02f94beb..0f78c2de7 100644
--- a/template/admin/src/pages/notify/smsConfig/index.vue
+++ b/template/admin/src/pages/notify/smsConfig/index.vue
@@ -11,9 +11,9 @@
             <p class="dashboard-workplace-header-tip-title">{{ smsAccount }}，祝您每一天开心！</p>
             <p class="dashboard-workplace-header-tip-desc">
               <a href="#" @click="onChangePassswordIndex">修改密码</a>
-              <Divider type="vertical" />
+              <el-divider direction="vertical"></el-divider>
               <!-- <a href="#" @click="onChangePhone">修改手机号</a>
-                <Divider type="vertical" /> -->
+                <el-divider direction="vertical"></el-divider> -->
               <a href="#" @click="signOut">退出登录</a>
             </p>
           </div>
@@ -25,17 +25,17 @@
                 <p class="mb5"><span>短信条数</span></p>
                 <div v-if="sms.open === 0">
                   <p>暂未开通</p>
-                  <Button size="small" type="primary" class="mt3 samll_font" @click="onOpen('sms')">开通服务</Button>
+                  <el-button size="small" type="primary" class="mt3 samll_font" @click="onOpen('sms')">开通服务</el-button>
                 </div>
                 <div v-else>
                   <p>{{ sms.num || 0 }}</p>
-                  <Button
+                  <el-button
                     size="small"
                     type="primary"
                     class="mt3 samll_font"
                     style="textalign: center"
                     @click="mealPay('sms')"
-                    >套餐购买</Button
+                    >套餐购买</el-button
                   >
                 </div>
               </div>
@@ -43,23 +43,23 @@
                 <p class="mb5"><span>采集次数</span></p>
                 <div v-if="copy.open === 0">
                   <p>暂未开通</p>
-                  <Button size="small" type="primary" class="mt3 samll_font" @click="onOpen('copy')">开通服务</Button>
+                  <el-button size="small" type="primary" class="mt3 samll_font" @click="onOpen('copy')">开通服务</el-button>
                 </div>
                 <div v-else>
                   <p>{{ copy.num || 0 }}</p>
-                  <Button size="small" type="primary" class="mt3 samll_font" @click="mealPay('copy')">套餐购买</Button>
+                  <el-button size="small" type="primary" class="mt3 samll_font" @click="mealPay('copy')">套餐购买</el-button>
                 </div>
               </div>
               <div class="header-extra">
                 <p class="mb5"><span>物流查询次数</span></p>
                 <div v-if="query.open === 0">
                   <p>暂未开通</p>
-                  <Button size="small" type="primary" class="mt3 samll_font" @click="onOpen('query')">开通服务</Button>
+                  <el-button size="small" type="primary" class="mt3 samll_font" @click="onOpen('query')">开通服务</el-button>
                 </div>
                 <div v-else>
                   <p>{{ query.num || 0 }}</p>
-                  <Button size="small" type="primary" class="mt3 samll_font" @click="mealPay('expr_query')"
-                    >套餐购买</Button
+                  <el-button size="small" type="primary" class="mt3 samll_font" @click="mealPay('expr_query')"
+                    >套餐购买</el-button
                   >
                 </div>
               </div>
@@ -67,12 +67,12 @@
                 <p class="mb5"><span>面单打印次数</span></p>
                 <div v-if="dump.open === 0">
                   <p>暂未开通</p>
-                  <Button size="small" type="primary" class="mt3 samll_font" @click="onOpen('dump')">开通服务</Button>
+                  <el-button size="small" type="primary" class="mt3 samll_font" @click="onOpen('dump')">开通服务</el-button>
                 </div>
                 <div v-else>
                   <p>{{ dump.num || 0 }}</p>
-                  <Button size="small" type="primary" class="mt3 samll_font" @click="mealPay('expr_dump')"
-                    >套餐购买</Button
+                  <el-button size="small" type="primary" class="mt3 samll_font" @click="mealPay('expr_dump')"
+                    >套餐购买</el-button
                   >
                 </div>
               </div>
@@ -81,15 +81,15 @@
         </div>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt" style="min-height: 600px">
+    <el-card :bordered="false" shadow="never" class="ivu-mt" style="min-height: 600px">
       <login-from
-        @on-change="onChangePasssword"
+        @change="onChangePasssword"
         v-if="isShowLogn"
         @on-changes="onChangeReg"
         @on-Login="onLogin"
       ></login-from>
       <forget-password v-if="isShow" @goback="goback" @on-Login="onLogin" :isIndex="isIndex"></forget-password>
-      <register-from v-if="isShowReg" @on-change="logoup"></register-from>
+      <register-from v-if="isShowReg" @change="logoup"></register-from>
       <table-list
         ref="tableLists"
         v-if="isShowList"
@@ -102,7 +102,7 @@
       ></table-list>
       <forget-phone v-if="isForgetPhone" @gobackPhone="gobackPhone" @on-Login="onLogin"></forget-phone>
       <Spin size="large" fix v-if="spinShow"></Spin>
-    </Card>
+    </el-card>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/notify/smsConfig/tableList.vue b/template/admin/src/pages/notify/smsConfig/tableList.vue
index e755bc385..95a2c9c74 100644
--- a/template/admin/src/pages/notify/smsConfig/tableList.vue
+++ b/template/admin/src/pages/notify/smsConfig/tableList.vue
@@ -1,46 +1,70 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover>
-      <Tabs v-model="isChecked" @on-click="onChangeType">
-        <TabPane label="短信" name="1"></TabPane>
-        <TabPane label="商品采集" name="4"></TabPane>
-        <TabPane label="物流查询" name="3"></TabPane>
-        <TabPane label="电子面单打印" name="2"></TabPane>
-      </Tabs>
+    <el-card :bordered="false" shadow="never">
+      <el-tabs v-model="isChecked" @tab-click="onChangeType">
+        <el-tab-pane label="短信" name="1"></el-tab-pane>
+        <el-tab-pane label="商品采集" name="4"></el-tab-pane>
+        <el-tab-pane label="物流查询" name="3"></el-tab-pane>
+        <el-tab-pane label="电子面单打印" name="2"></el-tab-pane>
+      </el-tabs>
       <!--短信列表-->
       <div class="note" v-if="isChecked === '1' && sms.open === 1">
         <div class="acea-row row-between-wrapper">
           <div>
             <span>短信状态：</span>
-            <RadioGroup type="button" v-model="tableFrom.type" @on-change="selectChange(tableFrom.type)">
-              <Radio label="">全部</Radio>
-              <Radio label="1">成功</Radio>
-              <Radio label="2">失败</Radio>
-              <Radio label="0">发送中</Radio>
-            </RadioGroup>
+            <el-radio-group type="button" v-model="tableFrom.type" @change="selectChange(tableFrom.type)">
+              <el-radio-button label="">全部</el-radio-button>
+              <el-radio-button label="1">成功</el-radio-button>
+              <el-radio-button label="2">失败</el-radio-button>
+              <el-radio-button label="0">发送中</el-radio-button>
+            </el-radio-group>
           </div>
           <div>
-            <Button type="primary" @click="shortMes">短信模板</Button>
-            <Button style="margin-left: 20px" @click="editSign">修改签名</Button>
+            <el-button type="primary" @click="shortMes">短信模板</el-button>
+            <el-button style="margin-left: 20px" @click="editSign">修改签名</el-button>
           </div>
         </div>
-        <Table
-          :columns="columns1"
+        <el-table
           :data="tableList"
-          :loading="loading"
-          highlight-row
+          v-loading="loading"
+          highlight-current-row
           no-userFrom-text="暂无数据"
           no-filtered-userFrom-text="暂无筛选结果"
           class="mt25"
-        ></Table>
+        >
+          <el-table-column label="手机号" width="100">
+            <template slot-scope="scope">
+              <span>{{ scope.row.phone }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="模板内容" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row.content }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="条数(每67/+1)" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row.num }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="发送时间" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row.add_time }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态码" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row._resultcode }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
         <div class="acea-row row-right page">
-          <Page
+          <pagination
+            v-if="total"
             :total="total"
-            :current="tableFrom.page"
-            show-elevator
-            show-total
-            @on-change="pageChange"
-            :page-size="tableFrom.limit"
+            :page.sync="tableFrom.page"
+            :limit.sync="tableFrom.limit"
+            @pagination="getList"
           />
         </div>
       </div>
@@ -52,27 +76,39 @@
           (isChecked === '2' && dump.open === 1)
         "
       >
-        <Table
-          :columns="columns2"
+        <el-table
           :data="tableList"
           :loading="loading"
-          highlight-row
+          highlight-current-row
           no-userFrom-text="暂无数据"
           no-filtered-userFrom-text="暂无筛选结果"
           class="mt25"
         >
-          <template slot-scope="{ row }" slot="num" v-if="isChecked === '3' && query.open === 1">
-            <div>{{ row.content.num }}</div>
-          </template>
-        </Table>
+          <el-table-column
+            :label="item.title"
+            :min-width="item.minWidth"
+            v-for="(item, index) in columns2"
+            :key="index"
+          >
+            <template slot-scope="scope">
+              <template v-if="item.key">
+                <div>
+                  <span>{{ scope.row[item.key] }}</span>
+                </div>
+              </template>
+              <template v-else-if="item.slot === 'num' && isChecked === '3' && query.open === 1">
+                <div>{{ scope.row.content.num }}</div>
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
         <div class="acea-row row-right page">
-          <Page
+          <pagination
+            v-if="total"
             :total="total"
-            :current="tableFrom.page"
-            show-elevator
-            show-total
-            @on-change="pageChangeOther"
-            :page-size="tableFrom.limit"
+            :page.sync="tableFrom.page"
+            :limit.sync="tableFrom.limit"
+            @pagination="getRecordList"
           />
         </div>
       </div>
@@ -105,7 +141,7 @@
             <span class="wuSp1">电子面单打印未开通哦</span>
             <span class="wuSp2">点击立即开通按钮，即可使用电子面单打印服务哦～～～</span>
           </span>
-          <Button size="default" type="primary" @click="onOpen">立即开通</Button>
+          <el-button size="default" type="primary" @click="onOpen">立即开通</el-button>
         </div>
         <!--短信立即开通-->
         <div class="smsBox" v-if="isSms && isChecked === '1'">
@@ -113,25 +149,27 @@
             <div class="page-account-top">
               <span class="page-account-top-tit">开通短信服务</span>
             </div>
-            <Form
+            <el-form
               ref="formInline"
               :model="formInline"
               :rules="ruleInline"
               @submit.native.prevent
               @keyup.enter="handleSubmit('formInline')"
             >
-              <FormItem prop="sign" class="maxInpt">
-                <Input
+              <el-form-item prop="sign" class="maxInpt">
+                <el-input
                   type="text"
                   v-model="formInline.sign"
                   prefix="ios-contact-outline"
                   placeholder="请输入短信签名"
                 />
-              </FormItem>
-              <FormItem class="maxInpt">
-                <Button type="primary" long size="default" @click="handleSubmit('formInline')" class="btn">登录</Button>
-              </FormItem>
-            </Form>
+              </el-form-item>
+              <el-form-item class="maxInpt">
+                <el-button type="primary" long size="default" @click="handleSubmit('formInline')" class="btn"
+                  >登录</el-button
+                >
+              </el-form-item>
+            </el-form>
           </div>
         </div>
         <!--电子面单立即开通-->
@@ -141,36 +179,44 @@
               <span class="page-account-top-tit" v-if="isChecked === '2'">开通电子面单服务</span>
               <span class="page-account-top-tit" v-if="isChecked === '3'">开通物流查询服务</span>
             </div>
-            <Form
+            <el-form
               ref="formInlineDump"
               :model="formInlineDump"
               :rules="ruleInlineDump"
               @submit.native.prevent
               @keyup.enter="handleSubmitDump('formInlineDump')"
             >
-              <FormItem prop="com" class="maxInpt">
-                <Select
+              <el-form-item prop="com" class="maxInpt">
+                <el-select
                   v-model="formInlineDump.com"
                   placeholder="请选择快递公司"
-                  @on-change="onChangeExport"
+                  @change="onChangeExport"
                   style="text-align: left"
                 >
-                  <Option v-for="(item, index) in exportList" :value="item.code" :key="index">{{ item.name }}</Option>
-                </Select>
-              </FormItem>
-              <FormItem prop="temp_id" class="tempId maxInpt">
+                  <el-option
+                    v-for="(item, index) in exportList"
+                    :value="item.code"
+                    :key="index"
+                    :label="item.name"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item prop="temp_id" class="tempId maxInpt">
                 <div class="acea-row">
-                  <Select
+                  <el-select
                     v-model="formInlineDump.temp_id"
                     placeholder="请选择电子面单模板"
                     style="text-align: left"
                     :class="[formInlineDump.temp_id ? 'width9' : 'width10']"
-                    @on-change="onChangeImg"
+                    @change="onChangeImg"
                   >
-                    <Option v-for="(item, index) in exportTempList" :value="item.temp_id" :key="index">{{
-                      item.title
-                    }}</Option>
-                  </Select>
+                    <el-option
+                      v-for="(item, index) in exportTempList"
+                      :value="item.temp_id"
+                      :key="index"
+                      :label="item.title"
+                    ></el-option>
+                  </el-select>
                   <div v-if="formInlineDump.temp_id">
                     <span class="tempImg">预览</span>
                     <div class="tabBox_img" v-viewer>
@@ -178,49 +224,49 @@
                     </div>
                   </div>
                 </div>
-              </FormItem>
-              <FormItem prop="to_name" class="maxInpt">
-                <Input
+              </el-form-item>
+              <el-form-item prop="to_name" class="maxInpt">
+                <el-input
                   type="text"
                   v-model="formInlineDump.to_name"
                   prefix="ios-contact-outline"
                   placeholder="请填写寄件人姓名"
                 />
-              </FormItem>
-              <FormItem prop="to_tel" class="maxInpt">
-                <Input
+              </el-form-item>
+              <el-form-item prop="to_tel" class="maxInpt">
+                <el-input
                   type="text"
                   v-model="formInlineDump.to_tel"
                   prefix="ios-contact-outline"
                   placeholder="请填写寄件人电话"
                 />
-              </FormItem>
-              <FormItem prop="to_address" class="maxInpt">
-                <Input
+              </el-form-item>
+              <el-form-item prop="to_address" class="maxInpt">
+                <el-input
                   type="text"
                   v-model="formInlineDump.to_address"
                   prefix="ios-contact-outline"
                   placeholder="请填写寄件人详细地址"
                 />
-              </FormItem>
-              <FormItem prop="siid" class="maxInpt">
-                <Input
+              </el-form-item>
+              <el-form-item prop="siid" class="maxInpt">
+                <el-input
                   type="text"
                   v-model="formInlineDump.siid"
                   prefix="ios-contact-outline"
                   placeholder="请填写云打印编号"
                 />
-              </FormItem>
-              <FormItem class="maxInpt">
-                <Button type="primary" long size="default" @click="handleSubmitDump('formInlineDump')" class="btn"
-                  >立即开通</Button
+              </el-form-item>
+              <el-form-item class="maxInpt">
+                <el-button type="primary" long size="default" @click="handleSubmitDump('formInlineDump')" class="btn"
+                  >立即开通</el-button
                 >
-              </FormItem>
-            </Form>
+              </el-form-item>
+            </el-form>
           </div>
         </div>
       </div>
-    </Card>
+    </el-card>
     <Modal
       v-model="modals"
       footer-hide
@@ -230,38 +276,38 @@
       class="order_box"
       @on-cancel="cancel('formInline')"
     >
-      <Form ref="formInline" :model="formInline" :rules="ruleInline" :label-width="100" @submit.native.prevent>
-        <FormItem>
-          <Input
+      <el-form ref="formInline" :model="formInline" :rules="ruleInline" label-width="100px" @submit.native.prevent>
+        <el-form-item>
+          <el-input
             v-model="accountInfo.account"
             disabled
             prefix="ios-person-outline"
             size="large"
             style="width: 87%"
-          ></Input>
-        </FormItem>
-        <FormItem prop="sign">
+          ></el-input>
+        </el-form-item>
+        <el-form-item prop="sign">
           <!--<Icon type="   ios-calendar-outline" />-->
-          <Input
+          <el-input
             v-model="formInline.sign"
             prefix="ios-document-outline"
             placeholder="请输入短信签名，例如：CRMEB"
             size="large"
             style="width: 87%"
-          ></Input>
-        </FormItem>
-        <FormItem prop="phone">
-          <Input
+          ></el-input>
+        </el-form-item>
+        <el-form-item prop="phone">
+          <el-input
             v-model="formInline.phone"
             prefix="ios-call-outline"
             placeholder="请输入您的手机号"
             size="large"
             style="width: 87%"
-          ></Input>
-        </FormItem>
-        <FormItem prop="code">
+          ></el-input>
+        </el-form-item>
+        <el-form-item prop="code">
           <div class="code acea-row row-middle" style="width: 87%">
-            <Input
+            <el-input
               type="text"
               v-model="formInline.code"
               prefix="ios-keypad-outline"
@@ -269,18 +315,18 @@
               size="large"
               style="width: 75%"
             />
-            <Button :disabled="!this.canClick" @click="cutDown" size="large">{{ cutNUm }}</Button>
+            <el-button :disabled="!this.canClick" @click="cutDown" size="large">{{ cutNUm }}</el-button>
           </div>
-        </FormItem>
-        <FormItem>
-          <Button type="primary" long size="large" @click="editSubmit('formInline')" class="btn" style="width: 87%"
-            >确认修改</Button
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" long size="large" @click="editSubmit('formInline')" class="btn" style="width: 87%"
+            >确认修改</el-button
           >
-        </FormItem>
-      </Form>
+        </el-form-item>
+      </el-form>
       <!--<div slot="footer">-->
-      <!--&lt;!&ndash;<Button type="primary" @click="putSend('formInline')">提交</Button>&ndash;&gt;-->
-      <!--&lt;!&ndash;<Button @click="cancel('formInline')">取消</Button>&ndash;&gt;-->
+      <!--&lt;!&ndash;<el-button type="primary" @click="putSend('formInline')">提交</el-button>&ndash;&gt;-->
+      <!--&lt;!&ndash;<el-button @click="cancel('formInline')">取消</el-button>&ndash;&gt;-->
       <!--</div>-->
     </Modal>
   </div>
@@ -349,38 +395,6 @@ export default {
         code: [{ required: true, message: '请输入验证码', trigger: 'blur' }],
       },
       isChecked: '1',
-      columns1: [
-        // {
-        //     title: 'ID',
-        //     key: 'id',
-        //     width: 80
-        // },
-        {
-          title: '手机号',
-          key: 'phone',
-          minWidth: 100,
-        },
-        {
-          title: '模板内容',
-          key: 'content',
-          minWidth: 590,
-        },
-        {
-          title: '条数(每67/+1)',
-          key: 'num',
-          minWidth: 100,
-        },
-        {
-          title: '发送时间',
-          key: 'add_time',
-          minWidth: 150,
-        },
-        {
-          title: '状态码',
-          key: '_resultcode',
-          minWidth: 100,
-        },
-      ],
       columns2: [],
       tableFrom: {
         page: 1,
@@ -629,10 +643,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChangeOther(index) {
-      this.tableFrom.page = index;
-      this.getRecordList();
-    },
     // 开通短信提交
     handleSubmit(name) {
       this.$refs[name].validate((valid) => {
@@ -745,10 +755,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.tableFrom.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.getList();
diff --git a/template/admin/src/pages/notify/smsPay/index.vue b/template/admin/src/pages/notify/smsPay/index.vue
index 7d6e65ab1..51ebbc158 100644
--- a/template/admin/src/pages/notify/smsPay/index.vue
+++ b/template/admin/src/pages/notify/smsPay/index.vue
@@ -3,35 +3,35 @@
     <div class="i-layout-page-header header_top">
       <div class="i-layout-page-header fl_header">
         <router-link :to="{ path: $routeProStr + '/setting/sms/sms_config/index' }"
-          ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
+          ><el-button icon="ios-arrow-back" size="small" type="text">返回</el-button></router-link
         >
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span class="ivu-page-header-title mr20" style="padding: 0">{{ $route.meta.title }}</span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Tabs v-model="isChecked" @on-click="onChangeType">
-        <TabPane label="短信" name="sms"></TabPane>
-        <TabPane label="商品采集" name="copy"></TabPane>
-        <TabPane label="物流查询" name="expr_query"></TabPane>
-        <TabPane label="电子面单打印" name="expr_dump"></TabPane>
-      </Tabs>
-      <Row :gutter="16" class="mt50">
-        <Col span="24" class="ivu-text-left mb20">
-          <Col :xs="12" :sm="6" :md="4" :lg="2" class="mr20">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-tabs v-model="isChecked" @tab-click="onChangeType">
+        <el-tab-pane label="短信" name="sms"></el-tab-pane>
+        <el-tab-pane label="商品采集" name="copy"></el-tab-pane>
+        <el-tab-pane label="物流查询" name="expr_query"></el-tab-pane>
+        <el-tab-pane label="电子面单打印" name="expr_dump"></el-tab-pane>
+      </el-tabs>
+      <el-row :gutter="16" class="mt50">
+        <el-col :span="24" class="ivu-text-left mb20">
+          <el-col :xs="12" :sm="6" :md="4" :lg="2" class="mr20">
             <span class="ivu-text-right ivu-block">当前剩余条数：</span>
-          </Col>
-          <Col :xs="11" :sm="13" :md="19" :lg="20">
+          </el-col>
+          <el-col :xs="11" :sm="13" :md="19" :lg="20">
             <span>{{ numbers }}</span>
-          </Col>
-        </Col>
-        <Col span="24" class="ivu-text-left mb20">
-          <Col :xs="12" :sm="6" :md="4" :lg="2" class="mr20">
+          </el-col>
+        </el-col>
+        <el-col :span="24" class="ivu-text-left mb20">
+          <el-col :xs="12" :sm="6" :md="4" :lg="2" class="mr20">
             <span class="ivu-text-right ivu-block">选择套餐：</span>
-          </Col>
-          <Col :xs="11" :sm="13" :md="19" :lg="20">
-            <Row :gutter="20">
-              <Col v-for="(item, index) in list" :key="index" :xxl="4" :xl="8" :lg="8" :md="12" :sm="24" :xs="24">
+          </el-col>
+          <el-col :xs="11" :sm="13" :md="19" :lg="20">
+            <el-row :gutter="20">
+              <el-col v-for="(item, index) in list" :key="index" :xxl="4" :xl="8" :lg="8" :md="12" :sm="24" :xs="24">
                 <div
                   class="list-goods-list-item mb15"
                   :class="{ active: index === current }"
@@ -44,45 +44,45 @@
                     <span>{{ all[isChecked] }}条数: {{ item.num }}</span>
                   </div>
                 </div>
-              </Col>
-            </Row>
-          </Col>
-        </Col>
-        <Col span="24" class="ivu-text-left mb20" v-if="checkList">
-          <Col :xs="12" :sm="6" :md="4" :lg="2" class="mr20">
+              </el-col>
+            </el-row>
+          </el-col>
+        </el-col>
+        <el-col :span="24" class="ivu-text-left mb20" v-if="checkList">
+          <el-col :xs="12" :sm="6" :md="4" :lg="2" class="mr20">
             <span class="ivu-text-right ivu-block">充值条数：</span>
-          </Col>
-          <Col :xs="11" :sm="13" :md="19" :lg="20">
+          </el-col>
+          <el-col :xs="11" :sm="13" :md="19" :lg="20">
             <span>{{ checkList.num }}</span>
-          </Col>
-        </Col>
-        <Col span="24" class="ivu-text-left mb20" v-if="checkList">
-          <Col :xs="12" :sm="6" :md="4" :lg="2" class="mr20">
+          </el-col>
+        </el-col>
+        <el-col :span="24" class="ivu-text-left mb20" v-if="checkList">
+          <el-col :xs="12" :sm="6" :md="4" :lg="2" class="mr20">
             <span class="ivu-text-right ivu-block">支付金额：</span>
-          </Col>
-          <Col :xs="11" :sm="13" :md="19" :lg="20">
+          </el-col>
+          <el-col :xs="11" :sm="13" :md="19" :lg="20">
             <span class="list-goods-list-item-number">￥{{ checkList.price }}</span>
-          </Col>
-        </Col>
-        <Col span="24" class="ivu-text-left mb20">
-          <Col :xs="12" :sm="6" :md="4" :lg="2" class="mr20">
+          </el-col>
+        </el-col>
+        <el-col :span="24" class="ivu-text-left mb20">
+          <el-col :xs="12" :sm="6" :md="4" :lg="2" class="mr20">
             <span class="ivu-text-right ivu-block">付款方式：</span>
-          </Col>
-          <Col :xs="11" :sm="13" :md="19" :lg="20">
+          </el-col>
+          <el-col :xs="11" :sm="13" :md="19" :lg="20">
             <span class="list-goods-list-item-pay"
               >微信支付<i v-if="code.invalid">{{ '  （ 支付码过期时间：' + code.invalid + ' ）' }}</i></span
             >
-          </Col>
-        </Col>
-        <Col span="24">
-          <Col :xs="12" :sm="6" :md="4" :lg="3" class="mr20">&nbsp;</Col>
-          <Col :xs="11" :sm="13" :md="19" :lg="20">
+          </el-col>
+        </el-col>
+        <el-col :span="24">
+          <el-col :xs="12" :sm="6" :md="4" :lg="3" class="mr20">&nbsp;</el-col>
+          <el-col :xs="11" :sm="13" :md="19" :lg="20">
             <div class="list-goods-list-item-code mr20"><img v-lazy="code.code_url" v-if="code.code_url" /></div>
-          </Col>
-        </Col>
+          </el-col>
+        </el-col>
         <Spin size="large" fix v-if="spinShow"></Spin>
-      </Row>
-    </Card>
+      </el-row>
+    </el-card>
   </div>
 </template>
 
@@ -155,7 +155,7 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    onChangeType(val) {
+    onChangeType() {
       this.current = 0;
       this.getPrice();
       this.getServeInfo();
diff --git a/template/admin/src/pages/notify/smsTemplateApply/index.vue b/template/admin/src/pages/notify/smsTemplateApply/index.vue
index df87ed10d..364c1e3ad 100644
--- a/template/admin/src/pages/notify/smsTemplateApply/index.vue
+++ b/template/admin/src/pages/notify/smsTemplateApply/index.vue
@@ -3,91 +3,98 @@
     <div class="i-layout-page-header header_top">
       <div class="i-layout-page-header fl_header">
         <router-link :to="{ path: $routeProStr + '/setting/sms/sms_config/index' }"
-          ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
+          ><el-button icon="ios-arrow-back" size="small" type="text">返回</el-button></router-link
         >
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span class="ivu-page-header-title mr20" style="padding: 0">{{ $route.meta.title }}</span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="levelFrom"
         :model="levelFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24" v-if="$route.path === $routeProStr + '/setting/sms/sms_template_apply/index'">
-          <!--                    <Col v-bind="grid">-->
-          <!--                        <FormItem label="模板类型：">-->
-          <!--                            <Select v-model="levelFrom.type" placeholder="请选择" clearable  @on-change="userSearchs">-->
-          <!--                                <Option value="1">验证码</Option>-->
-          <!--                                <Option value="2">通知</Option>-->
-          <!--                                <Option value="3">推广</Option>-->
-          <!--                            </Select>-->
-          <!--                        </FormItem>-->
-          <!--                    </Col>-->
-          <!--                    <Col v-bind="grid">-->
-          <!--                        <FormItem label="模板状态：">-->
-          <!--                            <Select v-model="levelFrom.status" placeholder="请选择" clearable  @on-change="userSearchs">-->
-          <!--                                <Option value="1">可用</Option>-->
-          <!--                                <Option value="0">不可用</Option>-->
-          <!--                            </Select>-->
-          <!--                        </FormItem>-->
-          <!--                    </Col>-->
-          <!--                    <Col v-bind="grid">-->
-          <!--                        <FormItem label="模板名称：" >-->
-          <!--                            <Input search enter-button  v-model="levelFrom.title" placeholder="请输入模板名称" @on-search="userSearchs"/>-->
-          <!--                        </FormItem>-->
-          <!--                    </Col>-->
-          <Col span="24">
-            <Button type="primary" icon="md-add" @click="add">申请模板</Button>
-          </Col>
-        </Row>
-        <Row type="flex" :gutter="24" v-else>
-          <Col v-bind="grid">
-            <FormItem label="是否拥有：">
-              <Select v-model="levelFrom.is_have" placeholder="请选择" clearable @on-change="userSearchs">
-                <Option value="1">有</Option>
-                <Option value="0">没有</Option>
-              </Select>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+        <el-row :gutter="24" v-if="$route.path === $routeProStr + '/setting/sms/sms_template_apply/index'">
+          <!--                    <el-col v-bind="grid">-->
+          <!--                        <el-form-item label="模板类型：">-->
+          <!--                            <el-select v-model="levelFrom.type" placeholder="请选择" clearable  @change="userSearchs">-->
+          <!--                                <el-option value="1">验证码</el-option>-->
+          <!--                                <el-option value="2">通知</el-option>-->
+          <!--                                <el-option value="3">推广</el-option>-->
+          <!--                            </el-select>-->
+          <!--                        </el-form-item>-->
+          <!--                    </el-col>-->
+          <!--                    <el-col v-bind="grid">-->
+          <!--                        <el-form-item label="模板状态：">-->
+          <!--                            <el-select v-model="levelFrom.status" placeholder="请选择" clearable  @change="userSearchs">-->
+          <!--                                <el-option value="1">可用</el-option>-->
+          <!--                                <el-option value="0">不可用</el-option>-->
+          <!--                            </el-select>-->
+          <!--                        </el-form-item>-->
+          <!--                    </el-col>-->
+          <!--                    <el-col v-bind="grid">-->
+          <!--                        <el-form-item label="模板名称：" >-->
+          <!--                            <el-input search enter-button  v-model="levelFrom.title" placeholder="请输入模板名称" @on-search="userSearchs"/>-->
+          <!--                        </el-form-item>-->
+          <!--                    </el-col>-->
+          <el-col :span="24">
+            <el-button type="primary" icon="md-add" @click="add">申请模板</el-button>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" v-else>
+          <el-col v-bind="grid">
+            <el-form-item label="是否拥有：">
+              <el-select v-model="levelFrom.is_have" placeholder="请选择" clearable @change="userSearchs">
+                <el-option value="1" label="有"></el-option>
+                <el-option value="0" label="没有"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="levelLists"
         ref="table"
         class="mt25"
-        :loading="loading"
+        v-loading="loading"
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="status">
-          <span v-show="row.status === 1">可用</span>
-          <span v-show="row.status === 0">不可用</span>
-        </template>
-        <template
-          slot-scope="{ row, index }"
-          slot="is_have"
-          v-if="$route.path === $routeProStr + '/setting/sms/sms_template_apply/commons'"
-        >
-          <span v-show="row.status === 1">有</span>
-          <span v-show="row.status === 0">没有</span>
-        </template>
-      </Table>
+        <el-table-column :label="item.title" :min-width="item.minWidth" v-for="(item, index) in columns" :key="index">
+          <template slot-scope="scope">
+            <template v-if="item.key">
+              <div>
+                <span>{{ scope.row[item.key] }}</span>
+              </div>
+            </template>
+            <template v-else-if="item.slot === 'status'">
+              <span v-show="scope.row.status === 1">可用</span>
+              <span v-show="scope.row.status === 0">不可用</span>
+            </template>
+            <template
+              v-else-if="
+                item.slot === 'is_have' && $route.path === $routeProStr + '/setting/sms/sms_template_apply/commons'
+              "
+            >
+              <span v-show="scope.row.status === 1">有</span>
+              <span v-show="scope.row.status === 0">没有</span>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="levelFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="levelFrom.limit"
+          :page.sync="levelFrom.page"
+          :limit.sync="levelFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
 
     <!-- 新建表单-->
     <edit-from ref="edits" :FromData="FromData" @submitFail="submitFail"></edit-from>
@@ -147,7 +154,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -191,7 +198,7 @@ export default {
           title: 'ID',
           key: 'id',
           sortable: true,
-          width: 80,
+          minWidth: 80,
         },
         {
           title: '模板ID',
@@ -244,10 +251,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.levelFrom.page = index;
-      this.getList();
-    },
     // 添加
     add() {
       tempCreateApi()
diff --git a/template/admin/src/pages/order/invoice/index.vue b/template/admin/src/pages/order/invoice/index.vue
index f620e48ba..5173814e9 100644
--- a/template/admin/src/pages/order/invoice/index.vue
+++ b/template/admin/src/pages/order/invoice/index.vue
@@ -1,37 +1,37 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mb-16">
+    <el-card :bordered="false" shadow="never" class="ivu-mb-16">
       <div class="table_box">
-        <Form
+        <el-form
           ref="orderData"
           :model="orderData"
-          :label-width="80"
+          label-width="85px"
           label-position="right"
           class="tabform"
           @submit.native.prevent
         >
-          <Row :gutter="24" type="flex" justify="end">
-            <!--                        <Col span="24" class="ivu-text-left">-->
-            <!--                            <FormItem label="订单状态：">-->
-            <!--                                <RadioGroup v-model="orderData.status" type="button"  @on-change="selectChange()">-->
-            <!--                                    <Radio label="">全部 {{  '(' +tablists.statusAll?tablists.statusAll:0 + ')' }}</Radio>-->
-            <!--                                    <Radio label="0">未支付 {{  '(' +tablists.unpaid?tablists.unpaid:0+ ')' }}</Radio>-->
-            <!--                                    <Radio label="1">未发货 {{  '(' +tablists.unshipped?tablists.unshipped:0+ ')' }}</Radio>-->
-            <!--                                    <Radio label="2">待收货 {{  '(' +tablists.untake?tablists.untake:0+ ')' }}</Radio>-->
-            <!--                                    <Radio label="3">待评价 {{  '(' +tablists.unevaluate?tablists.unevaluate:0+ ')' }}</Radio>-->
-            <!--                                    <Radio label="4">交易完成 {{  '(' +tablists.complete?tablists.complete:0+ ')' }}</Radio>-->
-            <!--                                    <Radio label="5">待核销 {{  '(' +tablists.write_off?tablists.write_off:0+ ')' }}</Radio>-->
-            <!--                                    <Radio label="-1">退款中 {{  '(' +tablists.refunding?tablists.refunding:0+ ')' }}</Radio>-->
-            <!--                                    <Radio label="-2">已退款 {{  '(' +tablists.refund?tablists.refund:0+ ')' }}</Radio>-->
-            <!--                                    <Radio label="-4">已删除 {{  '(' +tablists.del?tablists.del:0+ ')' }}</Radio>-->
-            <!--                                </RadioGroup>-->
-            <!--                            </FormItem>-->
-            <!--                        </Col>-->
-            <Col span="24" class="ivu-text-left">
-              <FormItem label="创建时间：">
+          <el-row :gutter="24" justify="end">
+            <!--                        <el-col :span="24" class="ivu-text-left">-->
+            <!--                            <el-form-item label="订单状态：">-->
+            <!--                                <el-radio-group v-model="orderData.status" type="button"  @change="selectChange()">-->
+            <!--                                    <el-radio-button label="">全部 {{  '(' +tablists.statusAll?tablists.statusAll:0 + ')' }}</el-radio-button>-->
+            <!--                                    <el-radio-button label="0">未支付 {{  '(' +tablists.unpaid?tablists.unpaid:0+ ')' }}</el-radio-button>-->
+            <!--                                    <el-radio-button label="1">未发货 {{  '(' +tablists.unshipped?tablists.unshipped:0+ ')' }}</el-radio-button>-->
+            <!--                                    <el-radio-button label="2">待收货 {{  '(' +tablists.untake?tablists.untake:0+ ')' }}</el-radio-button>-->
+            <!--                                    <el-radio-button label="3">待评价 {{  '(' +tablists.unevaluate?tablists.unevaluate:0+ ')' }}</el-radio-button>-->
+            <!--                                    <el-radio-button label="4">交易完成 {{  '(' +tablists.complete?tablists.complete:0+ ')' }}</el-radio-button>-->
+            <!--                                    <el-radio-button label="5">待核销 {{  '(' +tablists.write_off?tablists.write_off:0+ ')' }}</el-radio-button>-->
+            <!--                                    <el-radio-button label="-1">退款中 {{  '(' +tablists.refunding?tablists.refunding:0+ ')' }}</el-radio-button>-->
+            <!--                                    <el-radio-button label="-2">已退款 {{  '(' +tablists.refund?tablists.refund:0+ ')' }}</el-radio-button>-->
+            <!--                                    <el-radio-button label="-4">已删除 {{  '(' +tablists.del?tablists.del:0+ ')' }}</el-radio-button>-->
+            <!--                                </el-radio-group>-->
+            <!--                            </el-form-item>-->
+            <!--                        </el-col>-->
+            <el-col :span="24" class="ivu-text-left">
+              <el-form-item label="创建时间：">
                 <DatePicker
                   :editable="false"
-                  @on-change="onchangeTime"
+                  @change="onchangeTime"
                   :value="timeVal"
                   format="yyyy/MM/dd"
                   type="datetimerange"
@@ -41,12 +41,12 @@
                   class="mr20"
                   :options="options"
                 ></DatePicker>
-              </FormItem>
-            </Col>
-            <Col span="24">
-              <Col v-bind="grid" class="mr">
-                <FormItem label="搜索：" prop="real_name" label-for="real_name">
-                  <Input
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-col v-bind="grid" class="mr">
+                <el-form-item label="搜索：" prop="real_name" label-for="real_name">
+                  <el-input
                     v-model="orderData.real_name"
                     search
                     enter-button
@@ -54,76 +54,97 @@
                     element-id="name"
                     @on-search="orderSearch()"
                   >
-                    <Select v-model="orderData.field_key" slot="prepend" style="width: 80px">
-                      <Option value="all">全部</Option>
-                      <Option value="order_id">订单号</Option>
-                      <Option value="uid">UID</Option>
-                      <Option value="real_name">用户姓名</Option>
-                      <Option value="user_phone">用户电话</Option>
-                    </Select>
-                  </Input>
-                </FormItem>
-              </Col>
-            </Col>
-          </Row>
-        </Form>
+                    <el-select v-model="orderData.field_key" slot="prepend" style="width: 80px">
+                      <el-option value="all" label="全部"></el-option>
+                      <el-option value="order_id" label="订单号"></el-option>
+                      <el-option value="uid" label="UID"></el-option>
+                      <el-option value="real_name" label="用户姓名"></el-option>
+                      <el-option value="user_phone" label="用户电话"></el-option>
+                    </el-select>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+        </el-form>
       </div>
-    </Card>
-    <Card :bordered="false" dis-hover>
-      <Tabs v-model="currentTab" @on-click="onClickTab" v-if="tablists" class="mb20">
-        <TabPane :label="'全部发票（' + tablists.all + '）'" name=" " />
-        <TabPane :label="'待开发票（' + tablists.noOpened + '）'" name="1" />
-        <TabPane :label="'已开发票（' + tablists.opened + '）'" name="2" />
-        <TabPane :label="'退款发票（' + tablists.refund + '）'" name="3" />
-      </Tabs>
-      <Table
+    </el-card>
+    <el-card :bordered="false" shadow="never">
+      <el-tabs v-model="currentTab" @tab-click="onClickTab" v-if="tablists" class="mb20">
+        <el-tab-pane :label="'全部发票（' + tablists.all + '）'" name=" " />
+        <el-tab-pane :label="'待开发票（' + tablists.noOpened + '）'" name="1" />
+        <el-tab-pane :label="'已开发票（' + tablists.opened + '）'" name="2" />
+        <el-tab-pane :label="'退款发票（' + tablists.refund + '）'" name="3" />
+      </el-tabs>
+      <el-table
         :columns="columns"
         :data="orderList"
         ref="table"
         :loading="loading"
-        highlight-row
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="pay_price">
-          <div>¥ {{ row.pay_price }}</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="type">
-          <div v-if="row.type === 1">电子普通发票</div>
-          <div v-else>纸质专用发票</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="is_invoice">
-          <div v-if="row.is_invoice === 1">已开票</div>
-          <div v-else>未开票</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          <div v-if="row.status === 0">未发货</div>
-          <div v-else-if="row.status === 1">待收货</div>
-          <div v-else-if="row.status === 2">待评价</div>
-          <div v-else-if="row.status === 3">已完成</div>
-          <div v-else-if="row.status === -2">已退款</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="header_type">
-          <div v-if="row.header_type === 1">个人</div>
-          <div v-else>企业</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a v-if="row.status != -2" @click="edit(row)">编辑</a>
-          <Divider v-if="row.status != -2" type="vertical" />
-          <a @click="orderInfo(row.id)">订单信息</a>
-        </template>
-      </Table>
+        <el-table-column label="订单号" min-width="140">
+          <template slot-scope="scope">
+            <span>{{ scope.row.order_id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单金额" min-width="90">
+          <template slot-scope="scope">
+            <div>¥ {{ scope.row.pay_price }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="发票类型" min-width="130">
+          <template slot-scope="scope">
+            <div v-if="scope.row.type === 1">电子普通发票</div>
+            <div v-else>纸质专用发票</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="发票抬头类型" min-width="130">
+          <template slot-scope="scope">
+            <div v-if="scope.row.header_type === 1">个人</div>
+            <div v-else>企业</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="下单时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="开票状态" min-width="130">
+          <template slot-scope="scope">
+            <div v-if="scope.row.is_invoice === 1">已开票</div>
+            <div v-else>未开票</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单状态" min-width="130">
+          <template slot-scope="scope">
+            <div v-if="scope.row.status === 0">未发货</div>
+            <div v-else-if="scope.row.status === 1">待收货</div>
+            <div v-else-if="scope.row.status === 2">待评价</div>
+            <div v-else-if="scope.row.status === 3">已完成</div>
+            <div v-else-if="scope.row.status === -2">已退款</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a v-if="scope.row.status != -2" @click="edit(scope.row)">编辑</a>
+            <el-divider v-if="scope.row.status != -2" direction="vertical" />
+            <a @click="orderInfo(scope.row.id)">订单信息</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="orderData.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="orderData.limit"
+          :page.sync="orderData.page"
+          :limit.sync="orderData.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <Modal
       v-model="invoiceShow"
       scrollable
@@ -133,118 +154,118 @@
       @on-cancel="cancel"
       footer-hide
     >
-      <Form ref="formInline" :model="formInline" :label-width="100" @submit.native.prevent>
+      <el-form ref="formInline" :model="formInline" label-width="100px" @submit.native.prevent>
         <div v-if="invoiceDetails.header_type === 1 && invoiceDetails.type === 1">
           <div class="list">
             <div class="title">发票信息</div>
-            <Row class="row">
-              <Col span="12"
-                >发票抬头: <span class="info">{{ invoiceDetails.name }}</span></Col
+            <el-row class="row">
+              <el-col :span="12"
+                >发票抬头: <span class="info">{{ invoiceDetails.name }}</span></el-col
               >
-              <Col span="12">发票类型: <span class="info">电子普通发票</span></Col>
-            </Row>
-            <Row class="row">
-              <Col span="12">发票抬头类型: 个人</Col>
-              <Col span="12">订单金额: {{ invoiceDetails.pay_price }}</Col>
-            </Row>
+              <el-col :span="12">发票类型: <span class="info">电子普通发票</span></el-col>
+            </el-row>
+            <el-row class="row">
+              <el-col :span="12">发票抬头类型: 个人</el-col>
+              <el-col :span="12">订单金额: {{ invoiceDetails.pay_price }}</el-col>
+            </el-row>
           </div>
           <div class="list">
             <div class="title row">联系信息</div>
-            <Row class="row">
-              <Col span="12">真实姓名: {{ invoiceDetails.name }}</Col>
-              <Col span="12">联系电话: {{ invoiceDetails.drawer_phone }}</Col>
-            </Row>
-            <Row class="row">
-              <Col span="12">联系邮箱: {{ invoiceDetails.email }}</Col>
-            </Row>
+            <el-row class="row">
+              <el-col :span="12">真实姓名: {{ invoiceDetails.name }}</el-col>
+              <el-col :span="12">联系电话: {{ invoiceDetails.drawer_phone }}</el-col>
+            </el-row>
+            <el-row class="row">
+              <el-col :span="12">联系邮箱: {{ invoiceDetails.email }}</el-col>
+            </el-row>
           </div>
         </div>
         <div v-if="invoiceDetails.header_type === 2 && invoiceDetails.type === 1">
           <div class="list">
             <div class="title">发票信息</div>
-            <Row class="row">
-              <Col span="12"
-                >发票抬头: <span class="info">{{ invoiceDetails.name }}</span></Col
+            <el-row class="row">
+              <el-col :span="12"
+                >发票抬头: <span class="info">{{ invoiceDetails.name }}</span></el-col
               >
-              <Col span="12"
-                >企业税号: <span class="info">{{ invoiceDetails.duty_number }}</span></Col
+              <el-col :span="12"
+                >企业税号: <span class="info">{{ invoiceDetails.duty_number }}</span></el-col
               >
-            </Row>
-            <Row class="row">
-              <Col span="12">发票类型: 电子普通发票</Col>
-              <Col span="12">发票抬头类型: 企业</Col>
-            </Row>
+            </el-row>
+            <el-row class="row">
+              <el-col :span="12">发票类型: 电子普通发票</el-col>
+              <el-col :span="12">发票抬头类型: 企业</el-col>
+            </el-row>
           </div>
           <div class="list">
             <div class="title row">联系信息</div>
-            <Row class="row">
-              <Col span="12">真实姓名: {{ invoiceDetails.name }}</Col>
-              <Col span="12">联系电话: {{ invoiceDetails.user_phone }}</Col>
-            </Row>
-            <Row class="row">
-              <Col span="12">联系邮箱: {{ invoiceDetails.email }}</Col>
-            </Row>
+            <el-row class="row">
+              <el-col :span="12">真实姓名: {{ invoiceDetails.name }}</el-col>
+              <el-col :span="12">联系电话: {{ invoiceDetails.user_phone }}</el-col>
+            </el-row>
+            <el-row class="row">
+              <el-col :span="12">联系邮箱: {{ invoiceDetails.email }}</el-col>
+            </el-row>
           </div>
         </div>
         <div v-if="invoiceDetails.header_type === 2 && invoiceDetails.type === 2">
           <div class="list">
             <div class="title">发票信息</div>
-            <Row class="row">
-              <Col span="12"
-                >发票抬头: <span class="info">{{ invoiceDetails.name }}</span></Col
+            <el-row class="row">
+              <el-col :span="12"
+                >发票抬头: <span class="info">{{ invoiceDetails.name }}</span></el-col
               >
-              <Col span="12"
-                >企业税号: <span class="info">{{ invoiceDetails.duty_number }}</span></Col
+              <el-col :span="12"
+                >企业税号: <span class="info">{{ invoiceDetails.duty_number }}</span></el-col
               >
-            </Row>
-            <Row class="row">
-              <Col span="12">发票类型: 纸质专用发票</Col>
-              <Col span="12">发票抬头类型: 企业</Col>
-            </Row>
-            <Row class="row">
-              <Col span="12"
-                >开户银行: <span class="info">{{ invoiceDetails.bank }}</span></Col
+            </el-row>
+            <el-row class="row">
+              <el-col :span="12">发票类型: 纸质专用发票</el-col>
+              <el-col :span="12">发票抬头类型: 企业</el-col>
+            </el-row>
+            <el-row class="row">
+              <el-col :span="12"
+                >开户银行: <span class="info">{{ invoiceDetails.bank }}</span></el-col
               >
-              <Col span="12"
-                >银行账号: <span class="info">{{ invoiceDetails.card_number }}</span></Col
+              <el-col :span="12"
+                >银行账号: <span class="info">{{ invoiceDetails.card_number }}</span></el-col
               >
-            </Row>
-            <Row class="row">
-              <Col span="12">企业地址: {{ invoiceDetails.address }}</Col>
-              <Col span="12">企业电话: {{ invoiceDetails.drawer_phone }}</Col>
-            </Row>
+            </el-row>
+            <el-row class="row">
+              <el-col :span="12">企业地址: {{ invoiceDetails.address }}</el-col>
+              <el-col :span="12">企业电话: {{ invoiceDetails.drawer_phone }}</el-col>
+            </el-row>
           </div>
           <div class="list">
             <div class="title row">联系信息</div>
-            <Row class="row">
-              <Col span="12">真实姓名: {{ invoiceDetails.real_name }}</Col>
-              <Col span="12">联系电话: {{ invoiceDetails.user_phone }}</Col>
-            </Row>
-            <Row class="row">
-              <Col span="12">联系邮箱: {{ invoiceDetails.email }}</Col>
-            </Row>
+            <el-row class="row">
+              <el-col :span="12">真实姓名: {{ invoiceDetails.real_name }}</el-col>
+              <el-col :span="12">联系电话: {{ invoiceDetails.user_phone }}</el-col>
+            </el-row>
+            <el-row class="row">
+              <el-col :span="12">联系邮箱: {{ invoiceDetails.email }}</el-col>
+            </el-row>
           </div>
         </div>
-        <FormItem label="开票状态：" style="margin-top: 14px">
-          <RadioGroup v-model="formInline.is_invoice" @on-change="kaiInvoice(formInline.is_invoice)">
-            <Radio :label="1">已开票</Radio>
-            <Radio :label="0">未开票</Radio>
-          </RadioGroup>
-        </FormItem>
-        <FormItem label="发票编号：" v-if="formInline.is_invoice === 1">
-          <Input v-model="formInline.invoice_number" placeholder="请输入发票编号"></Input>
-        </FormItem>
-        <FormItem label="发票备注：" v-if="formInline.is_invoice === 1">
-          <Input
+        <el-form-item label="开票状态：" style="margin-top: 14px">
+          <el-radio-group v-model="formInline.is_invoice" @change="kaiInvoice(formInline.is_invoice)">
+            <el-radio-button :label="1">已开票</el-radio-button>
+            <el-radio-button :label="0">未开票</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="发票编号：" v-if="formInline.is_invoice === 1">
+          <el-input v-model="formInline.invoice_number" placeholder="请输入发票编号"></el-input>
+        </el-form-item>
+        <el-form-item label="发票备注：" v-if="formInline.is_invoice === 1">
+          <el-input
             v-model="formInline.remark"
             value="备注"
             type="textarea"
             :autosize="{ minRows: 2, maxRows: 5 }"
             placeholder="请输入发票备注"
-          ></Input>
-        </FormItem>
-        <Button type="primary" @click="handleSubmit()" style="width: 100%; margin: 0 10px">确定</Button>
-      </Form>
+          ></el-input>
+        </el-form-item>
+        <el-button type="primary" @click="handleSubmit()" style="width: 100%; margin: 0 10px">确定</el-button>
+      </el-form>
     </Modal>
     <Modal v-model="orderShow" scrollable title="订单详情" footer-hide class="order_box" width="700">
       <orderDetall :orderId="orderId" @detall="detall" v-if="orderShow"></orderDetall>
@@ -263,7 +284,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -530,10 +551,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.orderData.page = index;
-      this.getList();
-    },
     getTabs() {
       orderInvoiceChart(this.orderData)
         .then((res) => {
diff --git a/template/admin/src/pages/order/invoice/orderDetall.vue b/template/admin/src/pages/order/invoice/orderDetall.vue
index 0ad7eddd4..08cac87e8 100644
--- a/template/admin/src/pages/order/invoice/orderDetall.vue
+++ b/template/admin/src/pages/order/invoice/orderDetall.vue
@@ -51,26 +51,36 @@
       </div>
     </div>
     <div class="goods-box">
-      <Table :columns="columns1" :data="orderList">
-        <template slot-scope="{ row, index }" slot="id">
-          {{ row.productInfo.id }}
-        </template>
-        <template slot-scope="{ row, index }" slot="name">
-          <div class="product_info">
-            <img :src="row.productInfo.image" alt="" />
-            <p>{{ row.productInfo.store_name }}</p>
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="className">
-          {{ row.class_name }}
-        </template>
-        <template slot-scope="{ row, index }" slot="price">
-          {{ row.productInfo.price }}
-        </template>
-        <template slot-scope="{ row, index }" slot="total_num">
-          {{ row.cart_num }}
-        </template>
-      </Table>
+      <el-table :data="orderList">
+        <el-table-column label="商品ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.productInfo.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品名称" min-width="160">
+          <template slot-scope="scope">
+            <div class="product_info">
+              <img :src="scope.row.productInfo.image" alt="" />
+              <p>{{ scope.row.productInfo.store_name }}</p>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品分类" min-width="160">
+          <template slot-scope="scope">
+            <div>{{ scope.row.class_name }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品售价" min-width="160">
+          <template slot-scope="scope">
+            <div>{{ scope.row.productInfo.price }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品数量" min-width="160">
+          <template slot-scope="scope">
+            <div>{{ scope.row.cart_num }}</div>
+          </template>
+        </el-table-column>
+      </el-table>
     </div>
     <Spin fix v-if="spinShow"></Spin>
   </div>
@@ -90,30 +100,6 @@ export default {
     return {
       orderDetail: {},
       orderList: [],
-      columns1: [
-        {
-          title: '商品ID',
-          slot: 'id',
-          maxWidth: 80,
-        },
-        {
-          title: '商品名称',
-          slot: 'name',
-          minWidth: 160,
-        },
-        {
-          title: '商品分类',
-          slot: 'className',
-        },
-        {
-          title: '商品售价',
-          slot: 'price',
-        },
-        {
-          title: '商品数量',
-          slot: 'total_num',
-        },
-      ],
       spinShow: false,
     };
   },
diff --git a/template/admin/src/pages/order/offline/index.vue b/template/admin/src/pages/order/offline/index.vue
index 88673876d..7b27be9b8 100644
--- a/template/admin/src/pages/order/offline/index.vue
+++ b/template/admin/src/pages/order/offline/index.vue
@@ -1,19 +1,19 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="pagination"
         :model="pagination"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid" class="ivu-text-left">
-            <FormItem label="创建时间：">
+        <el-row :gutter="24">
+          <el-col v-bind="grid" class="ivu-text-left">
+            <el-form-item label="创建时间：">
               <DatePicker
                 :editable="false"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="datetimerange"
@@ -23,60 +23,89 @@
                 class="mr20"
                 :options="options"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="订单号：" label-for="title">
-              <Input
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="订单号：" label-for="title">
+              <el-input
                 search
                 enter-button
                 v-model="pagination.order_id"
                 placeholder="请输入订单号"
                 @on-search="orderSearch"
               />
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="用户名：" label-for="title">
-              <Input search enter-button v-model="pagination.name" placeholder="请输入用户名" @on-search="nameSearch" />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button type="primary" @click="qrcodeShow">查看收款二维码</Button>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="thead"
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="用户名：" label-for="title">
+              <el-input
+                search
+                enter-button
+                v-model="pagination.name"
+                placeholder="请输入用户名"
+                @on-search="nameSearch"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-button type="primary" @click="qrcodeShow">查看收款二维码</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tbody"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-      </Table>
+        <el-table-column label="订单号" min-width="180">
+          <template slot-scope="scope">
+            <span>{{ scope.row.order_id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户信息" min-width="180">
+          <template slot-scope="scope">
+            <span>{{ scope.row.nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="实际支付" min-width="180">
+          <template slot-scope="scope">
+            <span>{{ scope.row.pay_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠价格" min-width="180">
+          <template slot-scope="scope">
+            <span>{{ scope.row.true_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="支付时间" min-width="180">
+          <template slot-scope="scope">
+            <span>{{ scope.row.pay_time }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="pagination.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="pagination.limit"
+          :page.sync="pagination.page"
+          :limit.sync="pagination.limit"
+          @pagination="getOrderList"
         />
       </div>
-    </Card>
+    </el-card>
     <Modal v-model="modal" title="收款码" footer-hide>
       <div>
         <!--<div class="acea-row row-around mb10">-->
-        <!--<RadioGroup v-model="animal" @on-change="onchangeCode(animal)" style="width: 180px;">-->
-        <!--<Radio :label="0">二维码</Radio>-->
-        <!--<Radio :label="1">收款码</Radio>-->
-        <!--</RadioGroup>-->
+        <!--<el-radio-group v-model="animal" @change="onchangeCode(animal)" style="width: 180px;">-->
+        <!--<el-radio :label="0">二维码</el-radio>-->
+        <!--<el-radio :label="1">收款码</el-radio>-->
+        <!--</el-radio-group>-->
         <!--<div style="width: 180px;"></div>-->
         <!--</div>-->
         <div v-viewer class="acea-row row-around code">
@@ -113,40 +142,6 @@ export default {
         sm: 24,
         xs: 24,
       },
-      thead: [
-        {
-          title: '订单号',
-          key: 'order_id',
-        },
-        // {
-        //     title: "订单类型",
-        //     render: (h, params) => {
-        //         return h("span", "线下支付");
-        //     }
-        // },
-        {
-          title: '用户信息',
-          key: 'nickname',
-        },
-        {
-          title: '实际支付',
-          key: 'pay_price',
-        },
-        {
-          title: '优惠价格',
-          key: 'true_price',
-        },
-        // {
-        //     title: "订单状态",
-        //     render: (h, params) => {
-        //         return h("span", "已支付");
-        //     }
-        // },
-        {
-          title: '支付时间',
-          key: 'pay_time',
-        },
-      ],
       tbody: [],
       loading: false,
       total: 0,
@@ -234,7 +229,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -270,11 +265,6 @@ export default {
           this.$Message.error(err.msg);
         });
     },
-    // 分页
-    pageChange(index) {
-      this.pagination.page = index;
-      this.getOrderList();
-    },
     nameSearch() {
       this.pagination.page = 1;
       this.getOrderList();
diff --git a/template/admin/src/pages/order/orderList/components/tableExpand.vue b/template/admin/src/pages/order/orderList/components/tableExpand.vue
index af453bf20..603e8741a 100644
--- a/template/admin/src/pages/order/orderList/components/tableExpand.vue
+++ b/template/admin/src/pages/order/orderList/components/tableExpand.vue
@@ -1,37 +1,37 @@
 <template>
   <div class="expand">
-    <Row class="expand-row">
-      <Col span="6">
+    <el-row class="expand-row">
+      <el-col :span="6">
         <span class="expand-key">商品总价：</span>
         <span class="expand-value" v-text="row.total_price"></span>
-      </Col>
-      <Col span="6">
+      </el-col>
+      <el-col :span="6">
         <span class="expand-key">下单时间：</span>
         <span class="expand-value" v-text="row.add_time"></span>
-      </Col>
-      <Col span="6">
+      </el-col>
+      <el-col :span="6">
         <span class="expand-key">推广人：</span>
         <span class="expand-value" v-text="row.spread_nickname ? row.spread_nickname : '无'"></span>
-      </Col>
-      <Col span="6">
+      </el-col>
+      <el-col :span="6">
         <span class="expand-key">事业部：</span>
         <span class="expand-value" v-text="row.division_name ? row.division_name : '无'"></span>
-      </Col>
-    </Row>
-    <Row>
-      <Col span="6">
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="6">
         <span class="expand-key">用户备注：</span>
         <span class="expand-value" v-text="row.mark ? row.mark : '无'"></span>
-      </Col>
-      <Col span="6">
+      </el-col>
+      <el-col :span="6">
         <span class="expand-key">商家备注：</span>
         <span class="expand-value" v-text="row.remark ? row.remark : '无'"></span>
-      </Col>
-      <Col span="6">
+      </el-col>
+      <el-col :span="6">
         <span class="expand-key">核销码：</span>
         <span class="expand-value" v-text="row.verify_code ? row.verify_code : '无'"></span>
-      </Col>
-    </Row>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/order/orderList/components/tableFrom.vue b/template/admin/src/pages/order/orderList/components/tableFrom.vue
index 08b1d8a1d..f08520146 100644
--- a/template/admin/src/pages/order/orderList/components/tableFrom.vue
+++ b/template/admin/src/pages/order/orderList/components/tableFrom.vue
@@ -1,44 +1,44 @@
 <template>
   <div class="table_box">
-    <Form
+    <el-form
       ref="orderData"
       :model="orderData"
-      :label-width="80"
+      label-width="100px"
       label-position="right"
       class="tabform"
       @submit.native.prevent
     >
-      <Row :gutter="24" type="flex" justify="end">
-        <Col span="24" class="ivu-text-left">
-          <FormItem label="订单状态：">
-            <RadioGroup v-model="orderData.status" type="button" @on-change="selectChange2(orderData.status)">
-              <Radio label="">全部</Radio>
-              <Radio label="0">未支付</Radio>
-              <Radio label="1">未发货</Radio>
-              <Radio label="2">待收货</Radio>
-              <Radio label="3">待评价</Radio>
-              <Radio label="4">交易完成</Radio>
-              <Radio label="5">待核销</Radio>
-              <Radio label="6">已核销</Radio>
-              <!--                                <Radio label="-1">退款中 {{  '(' +orderChartType.refunding?orderChartType.refunding:0+ ')' }}</Radio>-->
-              <!--                                <Radio label="-2">已退款 {{  '(' +orderChartType.refund?orderChartType.refund:0+ ')' }}</Radio>-->
-              <Radio label="-2">已退款</Radio>
-              <Radio label="-4">已删除</Radio>
-            </RadioGroup>
-          </FormItem>
-        </Col>
-        <Col span="24" class="ivu-text-left">
-          <FormItem label="支付方式：">
-            <RadioGroup v-model="orderData.pay_type" type="button" @on-change="userSearchs">
-              <Radio v-for="item in payList" :label="item.val" :key="item.id">{{ item.label }}</Radio>
-            </RadioGroup>
-          </FormItem>
-        </Col>
-        <Col span="8" class="ivu-text-left">
-          <FormItem label="创建时间：">
+      <el-row :gutter="24" justify="end">
+        <el-col :span="24" class="ivu-text-left">
+          <el-form-item label="订单状态：">
+            <el-radio-group v-model="orderData.status" type="button" @change="selectChange2(orderData.status)">
+              <el-radio-button label="">全部</el-radio-button>
+              <el-radio-button label="0">未支付</el-radio-button>
+              <el-radio-button label="1">未发货</el-radio-button>
+              <el-radio-button label="2">待收货</el-radio-button>
+              <el-radio-button label="3">待评价</el-radio-button>
+              <el-radio-button label="4">交易完成</el-radio-button>
+              <el-radio-button label="5">待核销</el-radio-button>
+              <el-radio-button label="6">已核销</el-radio-button>
+              <!--                                <el-radio-button label="-1">退款中 {{  '(' +orderChartType.refunding?orderChartType.refunding:0+ ')' }}</el-radio-button>-->
+              <!--                                <el-radio-button label="-2">已退款 {{  '(' +orderChartType.refund?orderChartType.refund:0+ ')' }}</el-radio-button>-->
+              <el-radio-button label="-2">已退款</el-radio-button>
+              <el-radio-button label="-4">已删除</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="ivu-text-left">
+          <el-form-item label="支付方式：">
+            <el-radio-group v-model="orderData.pay_type" type="button" @change="userSearchs">
+              <el-radio-button v-for="item in payList" :label="item.val" :key="item.id">{{ item.label }}</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" class="ivu-text-left">
+          <el-form-item label="创建时间：">
             <DatePicker
               :editable="false"
-              @on-change="onchangeTime"
+              @change="onchangeTime"
               :value="timeVal"
               format="yyyy/MM/dd HH:mm:ss"
               type="datetimerange"
@@ -48,12 +48,12 @@
               class="mr20"
               :options="options"
             ></DatePicker>
-          </FormItem>
-        </Col>
-        <Col span="16">
-          <Col span="12" class="mr">
-            <FormItem label="搜索：" prop="real_name" label-for="real_name">
-              <Input
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <el-col :span="12" class="mr">
+            <el-form-item label="搜索：" prop="real_name" label-for="real_name">
+              <el-input
                 v-model="orderData.real_name"
                 search
                 enter-button
@@ -61,36 +61,36 @@
                 element-id="name"
                 @on-search="orderSearch(orderData.real_name)"
               >
-                <Select v-model="orderData.field_key" slot="prepend" style="width: 80px">
-                  <Option value="all">全部</Option>
-                  <Option value="order_id">订单号</Option>
-                  <Option value="uid">UID</Option>
-                  <Option value="real_name">用户姓名</Option>
-                  <Option value="user_phone">用户电话</Option>
-                  <Option value="title">商品名称(模糊)</Option>
-                </Select>
-              </Input>
-            </FormItem>
-          </Col>
-          <!--<Col v-bind="grid">-->
-          <!--<Button class="mr">导出</Button>-->
+                <el-select v-model="orderData.field_key" slot="prepend" style="width: 80px">
+                  <el-option value="all" label="全部"></el-option>
+                  <el-option value="order_id" label="订单号"></el-option>
+                  <el-option value="uid" label="UID"></el-option>
+                  <el-option value="real_name" label="用户姓名"></el-option>
+                  <el-option value="user_phone" label="用户电话"></el-option>
+                  <el-option value="title" label="商品名称(模糊)"></el-option>
+                </el-select>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <!--<el-col v-bind="grid">-->
+          <!--<el-button class="mr">导出</el-button>-->
           <!--<span class="Refresh" @click="Refresh">刷新</span><Icon type="ios-refresh" />-->
-          <!--</Col>-->
-        </Col>
-        <Col span="24">
+          <!--</el-col>-->
+        </el-col>
+        <el-col :span="24">
           <div class="ml20">
-            <Button v-auth="['order-dels']" class="mr10" type="primary" @click="delAll">批量删除订单</Button>
-            <Button v-auth="['order-write']" type="success" class="mr10 greens" size="default" @click="writeOff">
+            <el-button v-auth="['order-dels']" class="mr10" type="primary" @click="delAll">批量删除订单</el-button>
+            <el-button v-auth="['order-write']" type="success" class="mr10 greens"  @click="writeOff">
               <Icon type="md-list"></Icon>
               订单核销
-            </Button>
-            <Button v-auth="['export-storeOrder']" class="export" icon="ios-share-outline" @click="exportList"
-              >导出</Button
+            </el-button>
+            <el-button v-auth="['export-storeOrder']" class="export" icon="ios-share-outline" @click="exportList"
+              >导出</el-button
             >
           </div>
-        </Col>
-      </Row>
-    </Form>
+        </el-col>
+      </el-row>
+    </el-form>
     <!--订单核销模态框-->
     <Modal
       v-model="modals2"
@@ -100,7 +100,7 @@
       width="400"
       @on-visible-change="changeModal"
     >
-      <Form
+      <el-form
         ref="writeOffFrom"
         :model="writeOffFrom"
         :rules="writeOffRules"
@@ -108,13 +108,13 @@
         class="tabform"
         @submit.native.prevent
       >
-        <FormItem prop="code" label-for="code">
-          <Input style="width: 100%" type="text" placeholder="请输入12位核销码" v-model.number="writeOffFrom.code" />
-        </FormItem>
-      </Form>
+        <el-form-item prop="code" label-for="code">
+          <el-input style="width: 100%" type="text" placeholder="请输入12位核销码" v-model.number="writeOffFrom.code" />
+        </el-form-item>
+      </el-form>
       <div slot="footer">
-        <Button type="primary" @click="ok('writeOffFrom')">立即核销</Button>
-        <Button @click="del('writeOffFrom')">取消</Button>
+        <el-button type="primary" @click="ok('writeOffFrom')">立即核销</el-button>
+        <el-button @click="del('writeOffFrom')">取消</el-button>
       </div>
     </Modal>
   </div>
diff --git a/template/admin/src/pages/order/orderList/components/tableList.vue b/template/admin/src/pages/order/orderList/components/tableList.vue
index 0bdd191e4..b6f77d274 100644
--- a/template/admin/src/pages/order/orderList/components/tableList.vue
+++ b/template/admin/src/pages/order/orderList/components/tableList.vue
@@ -1,168 +1,196 @@
 <template>
   <div>
-    <Table
-      :columns="columns"
+    <el-table
       :data="orderList"
       ref="table"
       :loading="loading"
-      highlight-row
-      no-data-text="暂无数据"
-      no-filtered-data-text="暂无筛选结果"
-      @on-select="handleSelectRow"
-      @on-select-cancel="handleCancelRow"
-      @on-select-all="handleSelectAll"
-      @on-select-all-cancel="handleSelectAll"
+      highlight-current-row
+      empty-text="暂无数据"
+      @select="handleSelectRow"
+      @select-all="handleSelectAll"
       class="orderData mt25"
     >
-      <template slot-scope="{ row, index }" slot="order_id">
-        <div>{{ row.order_id }}</div>
-        <div class="pink_name">{{ row.pink_name }}</div>
-        <span v-show="row.is_del === 1" style="color: #ed4014; display: block">用户已删除</span>
-      </template>
-      <template slot-scope="{ row, index }" slot="nickname">
-        <span class="nickname">{{ row.nickname }}</span> |
-        <span class="uid">{{ row.uid }}</span>
-      </template>
-      <template slot-scope="{ row, index }" slot="pay_price">
-        <span>{{ row.paid ? row.pay_price : '未支付' }}</span>
-      </template>
-      <template slot-scope="{ row, index }" slot="info">
-        <div class="tabBox" v-for="(val, i) in row._info" :key="i">
-          <div class="tabBox_img" v-viewer>
-            <img
-              v-lazy="
-                val.cart_info.productInfo.attrInfo
-                  ? val.cart_info.productInfo.attrInfo.image
-                  : val.cart_info.productInfo.image
-              "
-            />
-          </div>
-          <span class="tabBox_tit"
-            >{{ val.cart_info.productInfo.store_name + ' | '
-            }}{{ val.cart_info.productInfo.attrInfo ? val.cart_info.productInfo.attrInfo.suk : '' }}</span
-          >
-          <span class="tabBox_pice">{{ '￥' + val.cart_info.truePrice + ' x ' + val.cart_info.cart_num }}</span>
-        </div>
-      </template>
-      <template slot-scope="{ row, index }" slot="statusName">
-        <div v-html="row.status_name.status_name" class="pt5"></div>
-        <div v-if="!row.is_all_refund && row.refund.length" class="trip">部分退款中</div>
-        <div
-          v-if="row.refund_status == 0 && row.is_all_refund && row.refund.length && row.refund_type != 6"
-          class="trip"
-        >
-          退款中
-        </div>
-        <div class="img">
-          <div
-            v-viewer
-            v-if="row.status_name.pics"
-            class="pictrue"
-            v-for="(item, index) in row.status_name.pics || []"
-            :key="index"
-          >
-            <img v-lazy="item" :src="item" />
-          </div>
-        </div>
-      </template>
-      <template slot-scope="{ row, index }" slot="action">
-        <a @click="edit(row)" v-if="row._status === 1 && row.is_del !== 1">编辑</a>
-        <a
-          @click="sendOrder(row)"
-          v-if="
-            (row.status === 4 || row._status === 2 || row._status === 8) &&
-            row.shipping_type === 1 &&
-            (row.pinkStatus === null || row.pinkStatus === 2) &&
-            row.is_del !== 1
-          "
-          >发送货</a
-        >
-        <a @click="delivery(row)" v-if="row._status === 4 && !row.split.length">配送信息</a>
-        <a
-          @click="bindWrite(row)"
-          v-if="row.shipping_type == 2 && row.status == 0 && row.paid == 1 && row.refund_status === 0"
-          >立即核销</a
-        >
-        <Divider
-          type="vertical"
-          v-if="(row._status === 8 || row.status === 0 || row.status === 4) && row.split.length && row.is_del !== 1"
-        />
-        <a @click="splitOrderDetail(row)" v-if="row.split.length && row.is_del !== 1">查看子订单</a>
-        <Divider
-          type="vertical"
-          v-if="
-            (row._status === 2 && row.shipping_type === 1 && row.pinkStatus === 2) ||
-            (row.split.length && row.is_del !== 1)
-          "
-        />
-        <Divider
-          type="vertical"
-          v-if="
-            row.refund_type !== 4 &&
-            row.refund_type !== 5 &&
-            (row._status === 1 ||
-              row._status === 3 ||
-              (row._status === 2 && !row.pinkStatus) ||
-              row._status === 4 ||
-              (row.shipping_type == 2 && row.status == 0 && row.paid == 1 && row.refund_status === 0)) &&
-            row.is_del !== 1
-          "
-        />
-        <template>
-          <Dropdown @on-click="changeMenu(row, $event)" :transfer="true">
-            <a href="javascript:void(0)"
-              >更多
-              <Icon type="ios-arrow-down"></Icon>
-            </a>
-            <DropdownMenu slot="list">
-              <DropdownItem
-                name="1"
-                ref="ones"
-                v-show="row._status === 1 && row.paid === 0 && row.pay_type === 'offline' && row.is_del !== 1"
-                >确认付款</DropdownItem
-              >
-              <DropdownItem name="2">订单详情</DropdownItem>
-              <DropdownItem name="3">订单记录</DropdownItem>
-              <DropdownItem name="11" v-show="row._status >= 3 && row.express_dump">电子面单打印</DropdownItem>
-              <DropdownItem name="10" v-show="row._status >= 2">小票打印</DropdownItem>
-              <DropdownItem
-                name="4"
-                v-show="
-                  row._status !== 1 ||
-                  (row._status === 3 && row.use_integral > 0 && row.use_integral >= row.back_integral)
-                "
-                >订单备注</DropdownItem
-              >
-              <!-- <DropdownItem
-                name="5"
-                v-show="
-                  row._status !== 1 &&
-                  (parseFloat(row.pay_price) > parseFloat(row.refund_price) ||
-                    (row.pay_price == 0 &&
-                      [0, 1].indexOf(row.refund_status) !== -1))
-                "
-                >立即退款</DropdownItem
-              > -->
-              <!--                            <DropdownItem name="6"  v-show='row._status !==1 && (row.use_integral > 0 && row.use_integral >= row.back_integral) '>退积分</DropdownItem>-->
-              <!--                            <DropdownItem name="7"  v-show='row._status === 3'>不退款</DropdownItem>-->
-              <DropdownItem name="8" v-show="row._status === 4">已收货</DropdownItem>
-              <DropdownItem name="9">删除订单</DropdownItem>
-              <DropdownItem name="12" v-show="row.kuaidi_label">快递面单打印</DropdownItem>
-            </DropdownMenu>
-          </Dropdown>
+      <el-table-column type="expand">
+        <template slot-scope="scope">
+          <expandRow :row="scope.row"></expandRow>
         </template>
-      </template>
-    </Table>
+      </el-table-column>
+      <el-table-column type="selection" width="55"> </el-table-column>
+      <el-table-column label="订单号 | 类型" width="200">
+        <template slot-scope="scope">
+          <div>{{ scope.row.order_id }}</div>
+          <div class="pink_name">{{ scope.row.pink_name }}</div>
+          <span v-show="scope.row.is_del === 1" style="color: #ed4014; display: block">用户已删除</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户昵称 | ID" min-width="150">
+        <template slot-scope="scope">
+          <span class="nickname">{{ scope.row.nickname }}</span> | <span class="uid">{{ scope.row.uid }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品信息" min-width="330">
+        <template slot-scope="scope">
+          <div class="tabBox" v-for="(val, i) in scope.row._info" :key="i">
+            <div class="tabBox_img" v-viewer>
+              <img
+                v-lazy="
+                  val.cart_info.productInfo.attrInfo
+                    ? val.cart_info.productInfo.attrInfo.image
+                    : val.cart_info.productInfo.image
+                "
+              />
+            </div>
+            <span class="tabBox_tit"
+              >{{ val.cart_info.productInfo.store_name + ' | '
+              }}{{ val.cart_info.productInfo.attrInfo ? val.cart_info.productInfo.attrInfo.suk : '' }}</span
+            >
+            <span class="tabBox_pice">{{ '￥' + val.cart_info.truePrice + ' x ' + val.cart_info.cart_num }}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="实际支付" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.paid ? scope.row.pay_price : '未支付' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="支付方式" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.pay_type_name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="支付时间" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row._pay_time }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="订单状态" min-width="100">
+        <template slot-scope="scope">
+          <div v-html="scope.row.status_name.status_name" class="pt5"></div>
+          <div v-if="!scope.row.is_all_refund && scope.row.refund.length" class="trip">部分退款中</div>
+          <div
+            v-if="
+              scope.row.refund_status == 0 &&
+              scope.row.is_all_refund &&
+              scope.row.refund.length &&
+              scope.row.refund_type != 6
+            "
+            class="trip"
+          >
+            退款中
+          </div>
+          <div class="img">
+            <div
+              v-viewer
+              v-if="scope.row.status_name.pics"
+              class="pictrue"
+              v-for="(item, index) in scope.row.status_name.pics || []"
+              :key="index"
+            >
+              <img v-lazy="item" :src="item" />
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" fixed="right" width="130">
+        <template slot-scope="scope">
+          <a @click="edit(scope.row)" v-if="scope.row._status === 1 && scope.row.is_del !== 1">编辑</a>
+          <a
+            @click="sendOrder(scope.row)"
+            v-if="
+              (scope.row.status === 4 || scope.row._status === 2 || scope.row._status === 8) &&
+              scope.row.shipping_type === 1 &&
+              (scope.row.pinkStatus === null || scope.row.pinkStatus === 2) &&
+              scope.row.is_del !== 1
+            "
+            >发送货</a
+          >
+          <a @click="delivery(scope.row)" v-if="scope.row._status === 4 && !scope.row.split.length">配送信息</a>
+          <a
+            @click="bindWrite(scope.row)"
+            v-if="
+              scope.row.shipping_type == 2 &&
+              scope.row.status == 0 &&
+              scope.row.paid == 1 &&
+              scope.row.refund_status === 0
+            "
+            >立即核销</a
+          >
+          <el-divider
+            direction="vertical"
+            v-if="
+              (scope.row._status === 2 && scope.row.shipping_type === 1 && scope.row.pinkStatus === 2) ||
+              (scope.row.split.length && scope.row.is_del !== 1)
+            "
+          />
+          <el-divider
+            direction="vertical"
+            v-if="
+              scope.row.refund_type !== 4 &&
+              scope.row.refund_type !== 5 &&
+              (scope.row._status === 1 ||
+                scope.row._status === 3 ||
+                (scope.row._status === 2 && !scope.row.pinkStatus) ||
+                scope.row._status === 4 ||
+                (scope.row.shipping_type == 2 &&
+                  scope.row.status == 0 &&
+                  scope.row.paid == 1 &&
+                  scope.row.refund_status === 0)) &&
+              scope.row.is_del !== 1
+            "
+          />
+          <template>
+            <el-dropdown size="small" @command="changeMenu(scope.row, $event)" :transfer="true">
+              <span class="el-dropdown-link"> 更多<i class="el-icon-arrow-down el-icon--right"></i> </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item
+                  command="1"
+                  v-show="
+                    scope.row._status === 1 &&
+                    scope.row.paid === 0 &&
+                    scope.row.pay_type === 'offline' &&
+                    scope.row.is_del !== 1
+                  "
+                  >确认付款</el-dropdown-item
+                >
+                <el-dropdown-item command="2">订单详情</el-dropdown-item>
+                <el-dropdown-item command="3">订单记录</el-dropdown-item>
+                <el-dropdown-item command="11" v-show="scope.row._status >= 3 && scope.row.express_dump"
+                  >电子面单打印</el-dropdown-item
+                >
+                <el-dropdown-item command="10" v-show="scope.row._status >= 2">小票打印</el-dropdown-item>
+                <el-dropdown-item
+                  command="4"
+                  v-show="
+                    scope.row._status !== 1 ||
+                    (scope.row._status === 3 &&
+                      scope.row.use_integral > 0 &&
+                      scope.row.use_integral >= scope.row.back_integral)
+                  "
+                  >订单备注</el-dropdown-item
+                >
+                <!-- <el-dropdown-item
+                command="5"
+                v-show="
+                  scope.row._status !== 1 &&
+                  (parseFloat(scope.row.pay_price) > parseFloat(scope.row.refund_price) ||
+                    (scope.row.pay_price == 0 &&
+                      [0, 1].indexOf(scope.row.refund_status) !== -1))
+                "
+                >立即退款</el-dropdown-item
+              > -->
+                <!--                            <el-dropdown-item command="6"  v-show='scope.row._status !==1 && (scope.row.use_integral > 0 && scope.row.use_integral >= scope.row.back_integral) '>退积分</el-dropdown-item>-->
+                <!--                            <el-dropdown-item command="7"  v-show='scope.row._status === 3'>不退款</el-dropdown-item>-->
+                <el-dropdown-item command="8" v-show="scope.row._status === 4">已收货</el-dropdown-item>
+                <el-dropdown-item command="9">删除订单</el-dropdown-item>
+                <el-dropdown-item command="12" v-show="scope.row.kuaidi_label">快递面单打印</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </template>
+      </el-table-column>
+    </el-table>
     <div class="acea-row row-right page">
-      <Page
-        :total="page.total"
-        :current="page.pageNum"
-        show-elevator
-        show-total
-        @on-change="pageChange"
-        :page-size="page.pageSize"
-        @on-page-size-change="limitChange"
-      />
+      <pagination v-if="total" :total="total" :page.sync="page.page" :limit.sync="page.limit" @pagination="getList" />
     </div>
     <!-- 编辑 退款 退积分 不退款-->
     <edit-from ref="edits" :FromData="FromData" @submitFail="submitFail"></edit-from>
@@ -231,83 +259,17 @@ export default {
       virtual_type: 0,
       status: 0,
       pay_type: '',
-      columns: [
-        {
-          type: 'expand',
-          width: 30,
-          render: (h, params) => {
-            return h(expandRow, {
-              props: {
-                row: params.row,
-              },
-            });
-          },
-        },
-        {
-          type: 'selection',
-          width: 40,
-          align: 'center',
-        },
-        {
-          title: '订单号 | 类型',
-          align: 'center',
-          slot: 'order_id',
-          width: 200,
-        },
-        {
-          title: '用户昵称 | ID',
-          slot: 'nickname',
-          align: 'center',
-          width: 150,
-        },
-        {
-          title: '商品信息',
-          slot: 'info',
-          minWidth: 330,
-        },
-        {
-          title: '实际支付',
-          slot: 'pay_price',
-          align: 'center',
-          width: 100,
-        },
-        {
-          title: '支付方式',
-          key: 'pay_type_name',
-          width: 80,
-        },
-        {
-          title: '支付时间',
-          key: '_pay_time',
-          align: 'center',
-          minWidth: 75,
-          maxWidth: 160,
-        },
-        {
-          title: '订单状态',
-          key: 'statusName',
-          slot: 'statusName',
-          align: 'center',
-          width: 100,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          width: 170,
-          align: 'center',
-        },
-      ],
+
+      total: 0, // 总条数
       page: {
-        total: 0, // 总条数
-        pageNum: 1, // 当前页
-        pageSize: 10, // 每页显示条数
+        page: 1, // 当前页
+        limit: 10, // 每页显示条数
       },
       data: [],
       FromData: null,
       orderDatalist: null,
       // modalTitleSs: '',
-      selectedIds: new Set(), //选中合并项的id
+      selectedIds: [], //选中合并项的id
     };
   },
   computed: {
@@ -319,7 +281,7 @@ export default {
   },
   watch: {
     orderType: function () {
-      this.page.pageNum = 1;
+      this.page.page = 1;
       this.getList();
     },
   },
@@ -327,6 +289,7 @@ export default {
     ...mapMutations('order', ['getIsDel', 'getisDelIdListl']),
     // 操作
     changeMenu(row, name) {
+      console.log(row, name);
       this.orderId = row.id;
       switch (name) {
         case '1':
@@ -448,21 +411,14 @@ export default {
     submitModel() {
       this.getList();
     },
-    pageChange(index) {
-      this.page.pageNum = index;
-      this.getList();
-    },
-    limitChange(limit) {
-      this.page.pageSize = limit;
-      this.getList();
-    },
     // 订单列表
     getList(res) {
-      this.page.pageNum = res === 1 ? 1 : this.page.pageNum;
+      console.log(this.page, 'resresres');
+      this.page.page = res === 1 ? 1 : this.page.page;
       this.loading = true;
       orderList({
-        page: this.page.pageNum,
-        limit: this.page.pageSize,
+        page: this.page.page,
+        limit: this.page.limit,
         status: this.orderStatus,
         pay_type: this.orderPayType,
         data: this.orderTime,
@@ -474,7 +430,7 @@ export default {
           let data = res.data;
           this.orderList = data.data;
           this.orderCards = data.stat;
-          this.page.total = data.count;
+          this.total = data.count;
           this.$nextTick(() => {
             //确保dom加载完毕
             this.setChecked();
@@ -497,20 +453,11 @@ export default {
     // },
     //全选和取消全选时触发
     handleSelectAll(selection) {
-      if (selection.length === 0) {
-        //获取table的数据；
-        let data = this.$refs.table.data;
-        data.forEach((item) => {
-          if (this.selectedIds.has(item.id)) {
-            this.selectedIds.delete(item.id);
-          }
-        });
-      } else {
-        selection.forEach((item) => {
-          this.selectedIds.add(item.id);
-        });
-      }
-      this.isDel(selection);
+      let ids = [];
+      selection.map((e) => {
+        ids.push(e.uid);
+      });
+      this.selectedIds = ids;
       this.$nextTick(() => {
         //确保dom加载完毕
         this.setChecked();
@@ -518,8 +465,12 @@ export default {
     },
     //  选中某一行
     handleSelectRow(selection, row) {
-      this.isDel(selection);
-      this.selectedIds.add(row.id);
+      console.log(selection);
+      let ids = [];
+      selection.map((e) => {
+        ids.push(e.uid);
+      });
+      this.selectedIds = ids;
       this.$nextTick(() => {
         //确保dom加载完毕
         this.setChecked();
diff --git a/template/admin/src/pages/order/orderList/handle/orderDetails.vue b/template/admin/src/pages/order/orderList/handle/orderDetails.vue
index e74eff00e..2de10e9ba 100644
--- a/template/admin/src/pages/order/orderList/handle/orderDetails.vue
+++ b/template/admin/src/pages/order/orderList/handle/orderDetails.vue
@@ -1,21 +1,21 @@
 <template>
   <div v-if="orderDatalist">
     <Drawer title="订单详情" :closable="false" width="700" v-model="modals" scrollable>
-      <Card :bordered="false" dis-hover class="i-table-no-border">
+      <el-card :bordered="false" shadow="never" class="i-table-no-border">
         <div class="ivu-description-list-title">收货信息</div>
-        <Row class="mb10">
-          <Col span="12">用户昵称：{{ orderDatalist.userInfo.nickname }}</Col>
-          <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>
-        </Row>
-        <Divider style="margin: 20px 0 !important" />
+        <el-row class="mb10">
+          <el-col :span="12">用户昵称：{{ orderDatalist.userInfo.nickname }}</el-col>
+          <el-col :span="12">收货人：{{ orderDatalist.orderInfo.real_name }}</el-col>
+        </el-row>
+        <el-row class="mb10">
+          <el-col :span="12">联系电话：{{ orderDatalist.orderInfo.user_phone || '' }}</el-col>
+          <el-col :span="12">收货地址：{{ orderDatalist.orderInfo.user_address || '' }}</el-col>
+        </el-row>
+        <el-divider direction="vertical" style="margin: 20px 0 !important" />
         <div class="ivu-description-list-title">订单信息</div>
-        <Row class="mb10">
-          <Col span="12">订单ID：{{ orderDatalist.orderInfo.order_id }}</Col>
-          <Col span="12" class="fontColor1"
+        <el-row class="mb10">
+          <el-col :span="12">订单ID：{{ orderDatalist.orderInfo.order_id }}</el-col>
+          <el-col :span="12" class="fontColor1"
             >订单状态：{{ orderDatalist.orderInfo._status._title }}
             {{
               orderDatalist.orderInfo.refund &&
@@ -26,120 +26,120 @@
                   : '部分退款中'
                 : ''
             }}
-          </Col>
-        </Row>
-        <Row class="mb10">
-          <Col span="12">商品总数：{{ orderDatalist.orderInfo.total_num }}</Col>
-          <Col span="12">商品总价：{{ orderDatalist.orderInfo.total_price }}</Col>
-        </Row>
-        <Row class="mb10">
-          <Col span="12">交付邮费：{{ orderDatalist.orderInfo.pay_postage }}</Col>
-          <Col span="12">优惠券金额：{{ orderDatalist.orderInfo.coupon_price }}</Col>
-        </Row>
-        <Row class="mb10">
-          <Col span="12">用户等级优惠：{{ orderDatalist.orderInfo.levelPrice || 0.0 }}</Col>
-          <Col span="12">付费会员优惠：{{ orderDatalist.orderInfo.memberPrice || 0.0 }}</Col>
-        </Row>
-        <Row class="mb10">
-          <Col span="12">积分抵扣：{{ orderDatalist.orderInfo.deduction_price || 0.0 }}</Col>
-          <Col span="12">实际支付：{{ orderDatalist.orderInfo.pay_price }}</Col>
-        </Row>
-        <Row class="mb10">
-          <Col
-            span="12"
+          </el-col>
+        </el-row>
+        <el-row class="mb10">
+          <el-col :span="12">商品总数：{{ orderDatalist.orderInfo.total_num }}</el-col>
+          <el-col :span="12">商品总价：{{ orderDatalist.orderInfo.total_price }}</el-col>
+        </el-row>
+        <el-row class="mb10">
+          <el-col :span="12">交付邮费：{{ orderDatalist.orderInfo.pay_postage }}</el-col>
+          <el-col :span="12">优惠券金额：{{ orderDatalist.orderInfo.coupon_price }}</el-col>
+        </el-row>
+        <el-row class="mb10">
+          <el-col :span="12">用户等级优惠：{{ orderDatalist.orderInfo.levelPrice || 0.0 }}</el-col>
+          <el-col :span="12">付费会员优惠：{{ orderDatalist.orderInfo.memberPrice || 0.0 }}</el-col>
+        </el-row>
+        <el-row class="mb10">
+          <el-col :span="12">积分抵扣：{{ orderDatalist.orderInfo.deduction_price || 0.0 }}</el-col>
+          <el-col :span="12">实际支付：{{ orderDatalist.orderInfo.pay_price }}</el-col>
+        </el-row>
+        <el-row class="mb10">
+          <el-col
+            :span="12"
             class="fontColor3 mb10"
             v-if="parseFloat(orderDatalist.orderInfo.refund_price) && orderDatalist.orderInfo.refund_type != 3"
-            >退款金额：{{ parseFloat(orderDatalist.orderInfo.refund_price) }}</Col
+            >退款金额：{{ parseFloat(orderDatalist.orderInfo.refund_price) }}</el-col
           >
-          <Col span="12" class="fontColor3 mb10" v-if="parseFloat(orderDatalist.orderInfo.use_integral)"
-            >使用积分：{{ parseFloat(orderDatalist.orderInfo.use_integral) }}</Col
+          <el-col :span="12" class="fontColor3 mb10" v-if="parseFloat(orderDatalist.orderInfo.use_integral)"
+            >使用积分：{{ parseFloat(orderDatalist.orderInfo.use_integral) }}</el-col
           >
-          <Col span="12" class="fontColor3 mb10" v-if="parseFloat(orderDatalist.orderInfo.back_integral)"
-            >退回积分：{{ parseFloat(orderDatalist.orderInfo.back_integral) }}</Col
+          <el-col :span="12" class="fontColor3 mb10" v-if="parseFloat(orderDatalist.orderInfo.back_integral)"
+            >退回积分：{{ parseFloat(orderDatalist.orderInfo.back_integral) }}</el-col
           >
-          <Col span="12" class="fontColor3 mb10" v-if="parseFloat(orderDatalist.orderInfo.gain_integral) && orderDatalist.orderInfo.paid == 1"
-            >赠送积分：{{ parseFloat(orderDatalist.orderInfo.gain_integral) }}</Col
+          <el-col :span="12" class="fontColor3 mb10" v-if="parseFloat(orderDatalist.orderInfo.gain_integral) && orderDatalist.orderInfo.paid == 1"
+            >赠送积分：{{ parseFloat(orderDatalist.orderInfo.gain_integral) }}</el-col
           >
-          <Col span="12" class="mb10">创建时间：{{ orderDatalist.orderInfo._add_time }}</Col>
-          <Col span="12" class="mb10">支付时间：{{ orderDatalist.orderInfo._pay_time }}</Col>
-          <Col span="12" class="mb10">支付方式：{{ orderDatalist.orderInfo._status._payType }}</Col>
-          <Col span="12" class="mb10" v-if="is_refund != 1"
-            >推广人：{{ orderDatalist.orderInfo.spread_name + '/' + orderDatalist.orderInfo.spread_uid }}</Col
+          <el-col :span="12" class="mb10">创建时间：{{ orderDatalist.orderInfo._add_time }}</el-col>
+          <el-col :span="12" class="mb10">支付时间：{{ orderDatalist.orderInfo._pay_time }}</el-col>
+          <el-col :span="12" class="mb10">支付方式：{{ orderDatalist.orderInfo._status._payType }}</el-col>
+          <el-col :span="12" class="mb10" v-if="is_refund != 1"
+            >推广人：{{ orderDatalist.orderInfo.spread_name + '/' + orderDatalist.orderInfo.spread_uid }}</el-col
           >
-          <Col
-            span="12"
+          <el-col
+            :span="12"
             class="mb10"
             v-if="
               orderDatalist.orderInfo.shipping_type === 2 &&
               orderDatalist.orderInfo.refund_status === 0 &&
               orderDatalist.orderInfo.paid === 1
             "
-            >门店名称：{{ orderDatalist.orderInfo._store_name }}</Col
+            >门店名称：{{ orderDatalist.orderInfo._store_name }}</el-col
           >
-          <Col
-            span="12"
+          <el-col
+            :span="12"
             class="mb10"
             v-if="
               orderDatalist.orderInfo.shipping_type === 2 &&
               orderDatalist.orderInfo.refund_status === 0 &&
               orderDatalist.orderInfo.paid === 1
             "
-            >核销码：{{ orderDatalist.orderInfo.verify_code }}</Col
+            >核销码：{{ orderDatalist.orderInfo.verify_code }}</el-col
           >
-          <Col span="24" class="mb10" v-if="orderDatalist.orderInfo.remark"
-            >商家备注：{{ orderDatalist.orderInfo.remark }}</Col
+          <el-col :span="24" class="mb10" v-if="orderDatalist.orderInfo.remark"
+            >商家备注：{{ orderDatalist.orderInfo.remark }}</el-col
           >
-          <Col span="24" class="mb10" v-if="orderDatalist.orderInfo.fictitious_content"
-            >虚拟发货备注：{{ orderDatalist.orderInfo.fictitious_content }}</Col
+          <el-col :span="24" class="mb10" v-if="orderDatalist.orderInfo.fictitious_content"
+            >虚拟发货备注：{{ orderDatalist.orderInfo.fictitious_content }}</el-col
           >
-        </Row>
-        <Divider style="margin: 20px 0 !important" v-if="orderDatalist.orderInfo.custom_form.length" />
+        </el-row>
+        <el-divider direction="vertical" style="margin: 20px 0 !important" v-if="orderDatalist.orderInfo.custom_form.length" />
         <div class="ivu-description-list-title" v-if="orderDatalist.orderInfo.custom_form.length">表单信息</div>
-        <Row class="mb10" v-if="orderDatalist.orderInfo.custom_form.length">
-          <Col
+        <el-row class="mb10" v-if="orderDatalist.orderInfo.custom_form.length">
+          <el-col
             class="mb10"
             :span="item.label !== 'text' ? 12 : 24"
             v-if="item.label !== 'img'"
             v-for="(item, index) in orderDatalist.orderInfo.custom_form"
             :key="index"
-            >{{ item.title }}：{{ item.value }}</Col
+            >{{ item.title }}：{{ item.value }}</el-col
           >
-          <Col span="24" v-else>
+          <el-col :span="24" v-else>
             <div>{{ item.title }}：</div>
             <div class="pic">
               <div v-for="(img, i) in item.value" :key="i" class="img">
                 <img v-viewer :src="img" alt="" />
               </div>
             </div>
-          </Col>
-        </Row>
+          </el-col>
+        </el-row>
         <div v-if="orderDatalist.orderInfo.delivery_type === 'express'">
-          <Divider style="margin: 20px 0 !important" />
+          <el-divider direction="vertical" style="margin: 20px 0 !important" />
           <div class="ivu-description-list-title">物流信息</div>
-          <Row class="mb10">
-            <Col span="12">快递公司：{{ orderDatalist.orderInfo.delivery_name }}</Col>
-            <Col span="12"
+          <el-row class="mb10">
+            <el-col :span="12">快递公司：{{ orderDatalist.orderInfo.delivery_name }}</el-col>
+            <el-col :span="12"
               >快递单号：{{ orderDatalist.orderInfo.delivery_id }}
-              <Button type="info" size="small" @click="openLogistics">物流查询</Button></Col
+              <el-button type="info" size="small" @click="openLogistics">物流查询</el-button></el-col
             >
-          </Row>
+          </el-row>
         </div>
         <div v-if="orderDatalist.orderInfo.delivery_type === 'send'">
-          <Divider style="margin: 20px 0 !important" />
+          <el-divider direction="vertical" style="margin: 20px 0 !important" />
           <div class="ivu-description-list-title">配送信息</div>
-          <Row class="mb10">
-            <Col span="12">送货人姓名：{{ orderDatalist.orderInfo.delivery_name }}</Col>
-            <Col span="12">送货人电话：{{ orderDatalist.orderInfo.delivery_id }}</Col>
-          </Row>
+          <el-row class="mb10">
+            <el-col :span="12">送货人姓名：{{ orderDatalist.orderInfo.delivery_name }}</el-col>
+            <el-col :span="12">送货人电话：{{ orderDatalist.orderInfo.delivery_id }}</el-col>
+          </el-row>
         </div>
         <div v-if="orderDatalist.orderInfo.mark">
-          <Divider style="margin: 20px 0 !important" v-if="orderDatalist.orderInfo.mark" />
+          <el-divider direction="vertical" style="margin: 20px 0 !important" v-if="orderDatalist.orderInfo.mark" />
           <div class="ivu-description-list-title" v-if="orderDatalist.orderInfo.mark">备注信息</div>
-          <Row class="mb10">
-            <Col span="12" class="fontColor2">{{ orderDatalist.orderInfo.mark }}</Col>
-          </Row>
+          <el-row class="mb10">
+            <el-col :span="12" class="fontColor2">{{ orderDatalist.orderInfo.mark }}</el-col>
+          </el-row>
         </div>
-      </Card>
+      </el-card>
     </Drawer>
     <Modal v-model="modal2" scrollable title="物流查询" width="350" class="order_box2">
       <div class="logistics acea-row row-top">
diff --git a/template/admin/src/pages/order/orderList/handle/orderRecord.vue b/template/admin/src/pages/order/orderList/handle/orderRecord.vue
index 14366ea9c..5f6518ca4 100644
--- a/template/admin/src/pages/order/orderList/handle/orderRecord.vue
+++ b/template/admin/src/pages/order/orderList/handle/orderRecord.vue
@@ -1,20 +1,30 @@
 <template>
   <Drawer title="订单记录" :closable="false" width="700" scrollable v-model="modals">
-    <Card :bordered="false" dis-hover>
-      <Table
-        :columns="columns"
-        border
+    <el-card :bordered="false" shadow="never">
+      <el-table
         :data="recordData"
-        :loading="loading"
-        no-data-text="暂无数据"
-        highlight-row
-        no-filtered-data-text="暂无筛选结果"
-      ></Table>
-      <!--            <div class="acea-row row-right page">-->
-      <!--                <Page :total="recordData.length" show-elevator show-total @on-change="pageChange"-->
-      <!--                      :page-size="page.limit"/>-->
-      <!--            </div>-->
-    </Card>
+        v-loading="loading"
+        empty-text="暂无数据"
+        highlight-current-row
+        
+      >
+        <el-table-column label="订单ID" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.oid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作记录" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.change_message }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作时间" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.change_time }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
   </Drawer>
 </template>
 
@@ -31,26 +41,6 @@ export default {
         page: 1, // 当前页
         limit: 10, // 每页显示条数
       },
-      columns: [
-        {
-          title: '订单ID',
-          key: 'oid',
-          align: 'center',
-          minWidth: 40,
-        },
-        {
-          title: '操作记录',
-          key: 'change_message',
-          align: 'center',
-          minWidth: 280,
-        },
-        {
-          title: '操作时间',
-          key: 'change_time',
-          align: 'center',
-          minWidth: 100,
-        },
-      ],
     };
   },
   methods: {
diff --git a/template/admin/src/pages/order/orderList/handle/orderRemark.vue b/template/admin/src/pages/order/orderList/handle/orderRemark.vue
index f95b31bb7..020fb6e4d 100644
--- a/template/admin/src/pages/order/orderList/handle/orderRemark.vue
+++ b/template/admin/src/pages/order/orderList/handle/orderRemark.vue
@@ -1,8 +1,8 @@
 <template>
   <Modal v-model="modals" scrollable title="请修改内容" class="order_box" :closable="false">
-    <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80" @submit.native.prevent>
-      <FormItem label="备注：" prop="remark">
-        <Input
+    <el-form ref="formValidate" :model="formValidate" :rules="ruleValidate" label-width="85px" @submit.native.prevent>
+      <el-form-item label="备注：" prop="remark">
+        <el-input
           v-model="formValidate.remark"
           :maxlength="200"
           show-word-limit
@@ -10,11 +10,11 @@
           placeholder="订单备注"
           style="width: 100%"
         />
-      </FormItem>
-    </Form>
+      </el-form-item>
+    </el-form>
     <div slot="footer">
-      <Button type="primary" @click="putRemark('formValidate')">提交</Button>
-      <Button @click="cancel('formValidate')">取消</Button>
+      <el-button type="primary" @click="putRemark('formValidate')">提交</el-button>
+      <el-button @click="cancel('formValidate')">取消</el-button>
     </div>
   </Modal>
 </template>
diff --git a/template/admin/src/pages/order/orderList/handle/orderSend.vue b/template/admin/src/pages/order/orderList/handle/orderSend.vue
index ed68c3cd5..f8dbc22ca 100644
--- a/template/admin/src/pages/order/orderList/handle/orderSend.vue
+++ b/template/admin/src/pages/order/orderList/handle/orderSend.vue
@@ -8,98 +8,111 @@
     width="1000"
     @on-visible-change="changeModal"
   >
-    <Form v-if="modals" ref="formItem" :model="formItem" :label-width="100" @submit.native.prevent>
-      <FormItem label="选择类型：">
-        <RadioGroup v-model="formItem.type" @on-change="changeRadio">
-          <Radio label="1" v-if="virtual_type !== 3">发货</Radio>
-          <Radio label="2" v-if="virtual_type !== 3">送货</Radio>
-          <Radio label="3">无需配送</Radio>
-        </RadioGroup>
-      </FormItem>
-      <FormItem v-if="formItem.type == 1" v-show="export_open" label="发货类型：">
-        <RadioGroup v-model="formItem.express_record_type" @on-change="changeExpress">
-          <Radio label="1">手动填写</Radio>
-          <Radio label="2">电子面单打印</Radio>
-        </RadioGroup>
-      </FormItem>
+    <el-form v-if="modals" ref="formItem" :model="formItem" label-width="100px" @submit.native.prevent>
+      <el-form-item label="选择类型：">
+        <el-radio-group v-model="formItem.type" @change="changeRadio">
+          <el-radio label="1" v-if="virtual_type !== 3">发货</el-radio>
+          <el-radio label="2" v-if="virtual_type !== 3">送货</el-radio>
+          <el-radio label="3">无需配送</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item v-if="formItem.type == 1" v-show="export_open" label="发货类型：">
+        <el-radio-group v-model="formItem.express_record_type" @change="changeExpress">
+          <el-radio label="1">手动填写</el-radio>
+          <el-radio label="2">电子面单打印</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <div>
-        <FormItem label="快递公司：" v-if="formItem.type == 1">
-          <Select
+        <el-form-item label="快递公司：" v-if="formItem.type == 1">
+          <el-select
             v-model="formItem.delivery_name"
             filterable
             placeholder="请选择快递公司"
             style="width: 80%"
-            @on-change="expressChange"
+            @change="expressChange"
           >
-            <Option v-for="(item, i) in express" :value="item.value" :key="item.value">{{ item.value }}</Option>
-          </Select>
-        </FormItem>
-        <FormItem v-if="formItem.express_record_type === '1' && formItem.type == 1" label="快递单号：">
-          <Input v-model="formItem.delivery_id" placeholder="请输入快递单号" style="width: 80%"></Input>
+            <el-option
+              v-for="(item, i) in express"
+              :value="item.value"
+              :key="item.value"
+              :label="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="formItem.express_record_type === '1' && formItem.type == 1" label="快递单号：">
+          <el-input v-model="formItem.delivery_id" placeholder="请输入快递单号" style="width: 80%"></el-input>
           <div class="trips" v-if="formItem.delivery_name == '顺丰速运'">
             <p>顺丰请输入单号 :收件人或寄件人手机号后四位，</p>
             <p>例如：SF000000000000:3941</p>
           </div>
-        </FormItem>
+        </el-form-item>
         <template v-if="formItem.express_record_type === '2' && formItem.type == 1">
-          <FormItem label="电子面单：" class="express_temp_id">
-            <Select
+          <el-form-item label="电子面单：" class="express_temp_id">
+            <el-select
               v-model="formItem.express_temp_id"
               placeholder="请选择电子面单"
               style="width: 80%"
-              @on-change="expressTempChange"
+              @change="expressTempChange"
             >
-              <Option v-for="(item, i) in expressTemp" :value="item.temp_id" :key="i">{{ item.title }}</Option>
-            </Select>
-            <Button v-if="formItem.express_temp_id" type="text" @click="preview">预览</Button>
-          </FormItem>
-          <FormItem label="寄件人姓名：">
-            <Input v-model="formItem.to_name" placeholder="请输入寄件人姓名" style="width: 80%"></Input>
-          </FormItem>
-          <FormItem label="寄件人电话：">
-            <Input v-model="formItem.to_tel" placeholder="请输入寄件人电话" style="width: 80%"></Input>
-          </FormItem>
-          <FormItem label="寄件人地址：">
-            <Input v-model="formItem.to_addr" placeholder="请输入寄件人地址" style="width: 80%"></Input>
-          </FormItem>
+              <el-option
+                v-for="(item, i) in expressTemp"
+                :value="item.temp_id"
+                :key="i"
+                :label="item.title"
+              ></el-option>
+            </el-select>
+            <el-button v-if="formItem.express_temp_id" type="text" @click="preview">预览</el-button>
+          </el-form-item>
+          <el-form-item label="寄件人姓名：">
+            <el-input v-model="formItem.to_name" placeholder="请输入寄件人姓名" style="width: 80%"></el-input>
+          </el-form-item>
+          <el-form-item label="寄件人电话：">
+            <el-input v-model="formItem.to_tel" placeholder="请输入寄件人电话" style="width: 80%"></el-input>
+          </el-form-item>
+          <el-form-item label="寄件人地址：">
+            <el-input v-model="formItem.to_addr" placeholder="请输入寄件人地址" style="width: 80%"></el-input>
+          </el-form-item>
         </template>
       </div>
       <div v-show="formItem.type === '2'">
-        <FormItem label="送货人：">
-          <Select
+        <el-form-item label="送货人：">
+          <el-select
             v-model="formItem.sh_delivery"
             placeholder="请选择送货人"
             style="width: 80%"
-            @on-change="shDeliveryChange"
+            @change="shDeliveryChange"
           >
-            <Option v-for="(item, i) in deliveryList" :value="item.id" :key="i"
-              >{{ item.wx_name }}（{{ item.phone }}）</Option
-            >
-          </Select>
-        </FormItem>
+            <el-option
+              v-for="(item, i) in deliveryList"
+              :value="item.id"
+              :key="i"
+              :label="`${item.wx_name}（${item.phone}）`"
+            ></el-option>
+          </el-select>
+        </el-form-item>
       </div>
       <div v-show="formItem.type === '3'">
-        <FormItem label="备注：">
-          <Input
+        <el-form-item label="备注：">
+          <el-input
             v-model="formItem.fictitious_content"
             type="textarea"
             :autosize="{ minRows: 2, maxRows: 5 }"
             placeholder="备注"
             style="width: 80%"
-          ></Input>
-        </FormItem>
+          ></el-input>
+        </el-form-item>
       </div>
       <div v-if="total_num > 1">
-        <FormItem label="分单发货：">
-          <i-switch
+        <el-form-item label="分单发货：">
+          <el-switch :active-value="1"  :inactive-value="0"
             size="large"
             v-model="splitSwitch"
             :disabled="orderStatus === 8 || orderStatus === 11"
-            @on-change="changeSplitStatus"
+            @change="changeSplitStatus"
           >
             <span slot="open">开启</span>
             <span slot="close">关闭</span>
-          </i-switch>
+           </el-switch>
           <div class="trips">
             <p>可选择表格中的商品单独发货，发货后会生成新的订单且不能撤回，请谨慎操作！</p>
           </div>
@@ -128,12 +141,12 @@
               </div>
             </template>
           </i-table>
-        </FormItem>
+        </el-form-item>
       </div>
-    </Form>
+    </el-form>
     <div slot="footer">
-      <Button @click="cancel">取消</Button>
-      <Button type="primary" @click="putSend">提交</Button>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="putSend">提交</el-button>
     </div>
     <!-- <viewer @inited="inited">
             <img :src="temp.pic" style="display:none" />
diff --git a/template/admin/src/pages/order/orderList/index.vue b/template/admin/src/pages/order/orderList/index.vue
index 838f26feb..24ab1678e 100644
--- a/template/admin/src/pages/order/orderList/index.vue
+++ b/template/admin/src/pages/order/orderList/index.vue
@@ -1,15 +1,21 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover>
-      <Tabs class="mb20" v-model="currentTab" @on-click="onClickTab" v-if="tablists">
-        <TabPane v-for="(item, index) in tabs" :label="item.label" :name="item.type" :key="index" />
-      </Tabs>
+    <el-card :bordered="false" shadow="never">
+      <el-tabs class="mb20" v-model="currentTab" @tab-click="onClickTab" v-if="tablists">
+        <el-tab-pane v-for="(item, index) in tabs" :name="item.type" :key="index">
+          <span slot="label">
+            <el-badge :hidden="!item.value" :value="item.value" :max="999999">
+              {{ item.label }}
+            </el-badge>
+          </span>
+        </el-tab-pane>
+      </el-tabs>
       <productlist-details
         v-if="currentTab === 'article' || 'project' || 'app'"
         ref="productlist"
       ></productlist-details>
       <Spin size="large" fix v-if="spinShow"></Spin>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -26,87 +32,39 @@ export default {
       tabs: [
         {
           type: '',
-          label: (h) => {
-            return h('div', [
-              h('span', '全部订单'),
-              h('Badge', {
-                props: {
-                  count: Number(this.tablists.all),
-                  'overflow-count': 999999,
-                },
-              }),
-            ]);
-          },
+          label: '全部订单',
+          value: Number(this.tablists?.all) || 0,
+          max: 999999,
         },
         {
           type: '1',
-          label: (h) => {
-            return h('div', [
-              h('span', '普通订单'),
-              h('Badge', {
-                props: {
-                  count: Number(this.tablists.general),
-                  'overflow-count': 999999,
-                },
-              }),
-            ]);
-          },
+          label: '普通订单',
+          value: Number(this.tablists?.general) || 0,
+          max: 999999,
         },
         {
           type: '2',
-          label: (h) => {
-            return h('div', [
-              h('span', '拼团订单'),
-              h('Badge', {
-                props: {
-                  count: Number(this.tablists.pink),
-                  'overflow-count': 999999,
-                },
-              }),
-            ]);
-          },
+          label: '拼团订单',
+          value: Number(this.tablists?.pink) || 0,
+          max: 999999,
         },
         {
           type: '3',
-          label: (h) => {
-            return h('div', [
-              h('span', '秒杀订单'),
-              h('Badge', {
-                props: {
-                  count: Number(this.tablists.seckill),
-                  'overflow-count': 999999,
-                },
-              }),
-            ]);
-          },
+          label: '秒杀订单',
+          value: Number(this.tablists?.seckill) || 0,
+          max: 999999,
         },
         {
           type: '4',
-          label: (h) => {
-            return h('div', [
-              h('span', '砍价订单'),
-              h('Badge', {
-                props: {
-                  count: Number(this.tablists.bargain),
-                  'overflow-count': 999999,
-                },
-              }),
-            ]);
-          },
+          label: '砍价订单',
+          value: Number(this.tablists?.bargain) || 0,
+          max: 999999,
         },
         {
           type: '5',
-          label: (h) => {
-            return h('div', [
-              h('span', '预售订单'),
-              h('Badge', {
-                props: {
-                  count: Number(this.tablists.advance),
-                  'overflow-count': 999999,
-                },
-              }),
-            ]);
-          },
+          label: '预售订单',
+          value: Number(this.tablists?.advance) || 0,
+          max: 999999,
         },
       ],
       spinShow: false,
@@ -192,13 +150,8 @@ export default {
   margin-bottom: 0px !important;
 }
 
-/deep/ .ivu-badge-count-alone {
-  top: -7px;
-  right: 2px;
+/deep/ .el-badge__content.is-fixed {
+  top: 7px;
 }
 
-.i-layout-page-header /deep/ .ivu-badge-count {
-  line-height: 14px;
-  height: 15px;
-}
 </style>
diff --git a/template/admin/src/pages/order/orderList/splitList.vue b/template/admin/src/pages/order/orderList/splitList.vue
deleted file mode 100644
index 7473535d1..000000000
--- a/template/admin/src/pages/order/orderList/splitList.vue
+++ /dev/null
@@ -1,890 +0,0 @@
-<template>
-  <div>
-    <div class="i-layout-page-header">
-      <div class="i-layout-page-header">
-        <span class="ivu-page-header-title">子订单列表</span>
-        <span class="return" @click="$router.go(-1)">返回</span>
-      </div>
-    </div>
-    <Table
-      :columns="columns"
-      :data="orderList"
-      ref="table"
-      :loading="loading"
-      highlight-row
-      no-data-text="暂无数据"
-      no-filtered-data-text="暂无筛选结果"
-      @on-selection-change="onSelectTab"
-      @on-select-all="selectAll"
-      @on-select-all-cancel="selectAll"
-      @on-select-cancel="onSelectCancel"
-      class="orderData mt25"
-    >
-      <template slot-scope="{ row, index }" slot="order_id">
-        <span v-text="row.order_id" style="display: block"></span>
-        <span v-show="row.is_del === 1" style="color: #ed4014; display: block">用户已删除</span>
-      </template>
-      <template slot-scope="{ row, index }" slot="nickname">
-        <a @click="showUserInfo(row)">{{ row.nickname }}</a>
-      </template>
-      <template slot-scope="{ row, index }" slot="info">
-        <div class="tabBox" v-for="(val, i) in row._info" :key="i">
-          <div class="tabBox_img" v-viewer>
-            <img
-              v-lazy="
-                val.cart_info.productInfo.attrInfo
-                  ? val.cart_info.productInfo.attrInfo.image
-                  : val.cart_info.productInfo.image
-              "
-            />
-          </div>
-          <span class="tabBox_tit">
-            {{ val.cart_info.productInfo.store_name + ' | '
-            }}{{ val.cart_info.productInfo.attrInfo ? val.cart_info.productInfo.attrInfo.suk : '' }}
-          </span>
-          <span class="tabBox_pice">{{ '￥' + val.cart_info.truePrice + ' x ' + val.cart_info.cart_num }}</span>
-        </div>
-      </template>
-      <template slot-scope="{ row, index }" slot="statusName">
-        <div v-html="row.status_name.status_name" class="pt5"></div>
-        <div class="pictrue-box">
-          <div v-viewer v-if="row.status_name.pics" v-for="(item, index) in row.status_name.pics || []" :key="index">
-            <img class="pictrue mr10" v-lazy="item" :src="item" />
-          </div>
-        </div>
-      </template>
-      <template slot-scope="{ row, index }" slot="action">
-        <a @click="edit(row)" v-if="row._status === 1">编辑</a>
-        <a
-          @click="sendOrder(row)"
-          v-if="
-            (row._status === 2 || row._status === 8) &&
-            row.shipping_type === 1 &&
-            (row.pinkStatus === null || row.pinkStatus === 2)
-          "
-          >发送货</a
-        >
-        <a @click="delivery(row)" v-if="row._status === 4">配送信息</a>
-        <a
-          @click="bindWrite(row)"
-          v-if="row.shipping_type == 2 && row.status == 0 && row.paid == 1 && row.refund_status === 0"
-          >立即核销</a
-        >
-        <Divider type="vertical" v-if="row._status === 2 || row._status === 8" />
-        <a @click="splitOrderDetail(row)" v-if="row._status === 8">查看子订单</a>
-
-        <Divider
-          type="vertical"
-          v-if="
-            row._status === 1 ||
-            ((row._status === 2 || row._status === 8) && (row.pinkStatus === null || row.pinkStatus === 2)) ||
-            row._status === 4 ||
-            (row.shipping_type == 2 && row.status == 0 && row.paid == 1 && row.refund_status === 0)
-          "
-        />
-        <template>
-          <Dropdown @on-click="changeMenu(row, $event)">
-            <a href="javascript:void(0)">
-              更多
-              <Icon type="ios-arrow-down"></Icon>
-            </a>
-            <DropdownMenu slot="list">
-              <DropdownItem
-                name="1"
-                ref="ones"
-                v-show="row._status === 1 && row.paid === 0 && row.pay_type === 'offline'"
-                >立即支付</DropdownItem
-              >
-              <DropdownItem name="2">订单详情</DropdownItem>
-              <DropdownItem name="3">订单记录</DropdownItem>
-              <DropdownItem name="11" v-show="row._status >= 3 && row.express_dump">电子面单打印</DropdownItem>
-              <DropdownItem name="10" v-show="row._status >= 2">小票打印</DropdownItem>
-              <!-- <DropdownItem name="10" v-show="row._status >= 2">订单打印</DropdownItem> -->
-              <DropdownItem
-                name="4"
-                v-show="
-                  row._status !== 1 ||
-                  (row._status === 3 && row.use_integral > 0 && row.use_integral >= row.back_integral)
-                "
-                >订单备注</DropdownItem
-              >
-              <!-- <DropdownItem
-                name="5"
-                v-show="
-                  row._status === 3 &&
-                  (parseFloat(row.pay_price) > parseFloat(row.refund_price) ||
-                    (row.pay_price == 0 &&
-                      [0, 1].indexOf(row.refund_status) !== -1))
-                "
-                >立即退款</DropdownItem
-              >
-              <DropdownItem
-                name="6"
-                v-show="
-                  row._status !== 1 &&
-                  row.use_integral > 0 &&
-                  row.use_integral >= row.back_integral
-                "
-                >退积分</DropdownItem
-              >
-              <DropdownItem name="7" v-show="row._status === 3"
-                >不退款</DropdownItem
-              > -->
-              <DropdownItem name="8" v-show="row._status === 4">已收货</DropdownItem>
-              <DropdownItem name="9" v-if="row.is_del == 1">删除订单</DropdownItem>
-            </DropdownMenu>
-          </Dropdown>
-        </template>
-      </template>
-    </Table>
-    <div class="acea-row row-right page">
-      <!-- <Page
-        :total="page.total"
-        :current="page.pageNum"
-        show-elevator
-        show-total
-        @on-change="pageChange"
-        :page-size="page.pageSize"
-        @on-page-size-change="limitChange"
-        show-sizer
-      /> -->
-    </div>
-    <!-- 编辑 退款 退积分 不退款-->
-    <edit-from ref="edits" :FromData="FromData" @submitFail="submitFail"></edit-from>
-    <!-- 会员详情-->
-    <user-details ref="userDetails"></user-details>
-    <!-- 详情 -->
-    <details-from ref="detailss" :orderDatalist="orderDatalist" :orderId="orderId"></details-from>
-    <!-- 备注 -->
-    <order-remark ref="remarks" :orderId="orderId" @submitFail="submitFail"></order-remark>
-    <!-- 记录 -->
-    <order-record ref="record"></order-record>
-    <!-- 发送货 -->
-    <order-send ref="send" :orderId="orderId" :status="status" @submitFail="submitFail"></order-send>
-  </div>
-</template>
-
-<script>
-import expandRow from './components/tableExpand.vue';
-import {
-  orderList,
-  getOrdeDatas,
-  getDataInfo,
-  getRefundFrom,
-  getnoRefund,
-  refundIntegral,
-  getDistribution,
-  writeUpdate,
-  splitOrderList,
-} from '@/api/order';
-import { mapState, mapMutations } from 'vuex';
-import editFrom from '../../../components/from/from';
-import detailsFrom from './handle/orderDetails';
-import orderRemark from './handle/orderRemark';
-import orderRecord from './handle/orderRecord';
-import orderSend from './handle/orderSend';
-import userDetails from '@/pages/user/list/handle/userDetails';
-
-export default {
-  name: 'table_list',
-  components: {
-    expandRow,
-    editFrom,
-    detailsFrom,
-    orderRemark,
-    orderRecord,
-    orderSend,
-    userDetails,
-  },
-  props: ['where', 'isAll'],
-  data() {
-    return {
-      delfromData: {},
-      modal: false,
-      orderList: [],
-      orderCards: [],
-      loading: false,
-      orderId: 0,
-      columns: [
-        {
-          type: 'expand',
-          width: 30,
-          render: (h, params) => {
-            return h(expandRow, {
-              props: {
-                row: params.row,
-              },
-            });
-          },
-        },
-        {
-          width: 50,
-          align: 'center',
-          renderHeader: (h, params) => {
-            return h(
-              'div',
-              {
-                class: {
-                  'select-panel': true,
-                },
-                on: {
-                  mouseenter: (e) => {
-                    this.display = 'block';
-                  },
-                  mouseleave: (e) => {
-                    this.display = 'none';
-                  },
-                },
-              },
-              [
-                h('Checkbox', {
-                  props: {
-                    value: this.checkBox,
-                  },
-                  on: {
-                    'on-change': (e) => {
-                      this.checkBox = e;
-                      this.$refs.table.selectAll(this.checkBox);
-                      this.$emit('on-all', e ? 0 : -1);
-                    },
-                  },
-                }),
-                h(
-                  'div',
-                  {
-                    style: {
-                      position: 'absolute',
-                      top: 0,
-                      zIndex: 2,
-                      display: this.display,
-                      width: '80px',
-                      height: '100%',
-                      padding: '0px 0',
-                      borderRadius: '4px',
-                      backgroundColor: '#fff',
-                      boxShadow: '0 0px 5px rgba(0, 0, 0, 0.2)',
-                      transform: 'translateX(25%)',
-                    },
-                  },
-                  [
-                    h(
-                      'div',
-                      {
-                        class: {
-                          'select-item': true,
-                          on: this.isAll == 0,
-                        },
-                        style: {
-                          padding: '1px 6px',
-                          cursor: 'pointer',
-                          height: '50%',
-                        },
-                        on: {
-                          click: (e) => {
-                            if (this.isAll === 0) {
-                              this.$emit('on-all', -1);
-                              this.checkBox = false;
-                              this.$refs.table.selectAll(this.checkBox);
-                            } else {
-                              this.$emit('on-all', 0);
-                              if (!this.formSelection.length) {
-                                this.checkBox = true;
-                                this.$refs.table.selectAll(this.checkBox);
-                              }
-                            }
-                            this.display = 'none';
-                          },
-                        },
-                      },
-                      '选择当页',
-                    ),
-                    h(
-                      'div',
-                      {
-                        class: {
-                          'select-item': true,
-                          on: this.isAll == 1,
-                        },
-                        style: {
-                          padding: '1px 6px',
-                          cursor: 'pointer',
-                          height: '50%',
-                        },
-                        on: {
-                          click: (e) => {
-                            if (this.isAll === 1) {
-                              this.isAll = -1;
-                              this.$emit('on-all', -1);
-                              this.checkBox = false;
-                            } else {
-                              this.isAll = 1;
-                              this.$emit('on-all', 1);
-                              this.checkBox = true;
-                            }
-                            this.$refs.table.selectAll(this.checkBox);
-                            this.display = 'none';
-                          },
-                        },
-                      },
-                      '选择全部',
-                    ),
-                  ],
-                ),
-              ],
-            );
-          },
-          render: (h, params) => {
-            return h('Checkbox', {
-              props: {
-                value: params.row.checkBox,
-              },
-              on: {
-                'on-change': (e) => {
-                  if (e) {
-                    this.formSelection.push(params.row);
-                  } else {
-                    this.checkBox = false;
-                    this.formSelection.forEach((item, index) => {
-                      if (item.id === params.row.id) {
-                        this.formSelection.splice(index, 1);
-                      }
-                    });
-                  }
-                  this.$emit('on-all', this.formSelection.length ? 0 : -1);
-                  // this.responseData为查询出的结果数据
-                  // params.row.checkBox = e;
-                  params.row.checkBox = e;
-                  this.orderList[params.index].checkBox = e;
-                },
-              },
-              ref: 'checkbox',
-              refInFor: true,
-            });
-          },
-        },
-        {
-          title: '订单号',
-          align: 'center',
-          slot: 'order_id',
-          minWidth: 150,
-        },
-        {
-          title: '订单类型',
-          key: 'pink_name',
-          minWidth: 120,
-        },
-        {
-          title: '用户信息',
-          slot: 'nickname',
-          minWidth: 100,
-        },
-        {
-          title: '商品信息',
-          slot: 'info',
-          minWidth: 330,
-        },
-        {
-          title: '实际支付',
-          key: 'pay_price',
-          minWidth: 70,
-        },
-        {
-          title: '支付时间',
-          key: '_pay_time',
-          minWidth: 100,
-        },
-        {
-          title: '支付状态',
-          key: 'pay_type_name',
-          minWidth: 80,
-        },
-        {
-          title: '订单状态',
-          key: 'statusName',
-          slot: 'statusName',
-          minWidth: 120,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 150,
-          align: 'center',
-        },
-      ],
-      page: {
-        total: 0, // 总条数
-        pageNum: 1, // 当前页
-        pageSize: 10, // 每页显示条数
-      },
-      data: [],
-      FromData: null,
-      orderDatalist: null,
-      modalTitleSs: '',
-      isDelIdList: [],
-      checkBox: false,
-      formSelection: [],
-      selectionCopy: [],
-      display: 'none',
-      autoDisabled: false,
-      status: 0, //发货状态判断
-      // isAll: -1,
-    };
-  },
-  computed: {
-    ...mapState('admin/order', ['orderPayType', 'orderStatus', 'orderTime', 'orderNum', 'fieldKey', 'orderType']),
-  },
-  mounted() {},
-  created() {
-    this.getList();
-  },
-  watch: {
-    orderType: function () {
-      this.page.pageNum = 1;
-      this.getList();
-    },
-    formSelection(value) {
-      this.$emit('order-select', value);
-      if (value.length) {
-        this.$emit('auto-disabled', 0);
-      } else {
-        this.$emit('auto-disabled', 1);
-      }
-      let isDel = value.some((item) => {
-        return item.is_del === 1;
-      });
-      this.getIsDel(isDel);
-      this.getisDelIdListl(value);
-    },
-    orderList: {
-      deep: true,
-      handler(value) {
-        value.forEach((item) => {
-          this.formSelection.forEach((itm) => {
-            if (itm.id === item.id) {
-              item.checkBox = true;
-            }
-          });
-        });
-        const arr = this.orderList.filter((item) => item.checkBox);
-        if (this.orderList.length) {
-          this.checkBox = this.orderList.length === arr.length;
-        } else {
-          this.checkBox = false;
-        }
-      },
-    },
-  },
-  methods: {
-    ...mapMutations('admin/order', ['getIsDel', 'getisDelIdListl']),
-    selectAll(row) {
-      if (row.length) {
-        this.formSelection = row;
-        this.selectionCopy = row;
-      }
-      this.selectionCopy.forEach((item, index) => {
-        item.checkBox = this.checkBox;
-        this.$set(this.orderList, index, item);
-      });
-    },
-    showUserInfo(row) {
-      this.$refs.userDetails.modals = true;
-      this.$refs.userDetails.getDetails(row.uid);
-    },
-    // 操作
-    changeMenu(row, name) {
-      this.orderId = row.id;
-      switch (name) {
-        case '1':
-          this.delfromData = {
-            title: '修改立即支付',
-            url: `/order/pay_offline/${row.id}`,
-            method: 'post',
-            ids: '',
-          };
-          this.$modalSure(this.delfromData)
-            .then((res) => {
-              this.$Message.success(res.msg);
-              this.$emit('changeGetTabs');
-              this.getList();
-            })
-            .catch((res) => {
-              this.$Message.error(res.msg);
-            });
-          // this.modalTitleSs = '修改立即支付';
-          break;
-        case '2':
-          this.getData(row.id);
-          break;
-        case '3':
-          this.$refs.record.modals = true;
-          this.$refs.record.getList(row.id);
-          break;
-        case '4':
-          this.$refs.remarks.modals = true;
-          break;
-        case '5':
-          this.getRefundData(row.id);
-          break;
-        case '6':
-          this.getRefundIntegral(row.id);
-          break;
-        case '7':
-          this.getNoRefundData(row.id);
-          break;
-        case '8':
-          this.delfromData = {
-            title: '修改确认收货',
-            url: `/order/take/${row.id}`,
-            method: 'put',
-            ids: '',
-          };
-          this.$modalSure(this.delfromData)
-            .then((res) => {
-              this.$Message.success(res.msg);
-              this.getList();
-            })
-            .catch((res) => {
-              this.$Message.error(res.msg);
-            });
-          // this.modalTitleSs = '修改确认收货';
-          break;
-        case '10':
-          this.delfromData = {
-            title: '立即打印订单',
-            info: '您确认打印此订单吗?',
-            url: `/order/print/${row.id}`,
-            method: 'get',
-            ids: '',
-          };
-          this.$modalSure(this.delfromData)
-            .then((res) => {
-              this.$Message.success(res.msg);
-              this.$emit('changeGetTabs');
-              this.getList();
-            })
-            .catch((res) => {
-              this.$Message.error(res.msg);
-            });
-          break;
-        case '11':
-          this.delfromData = {
-            title: '立即打印电子面单',
-            info: '您确认打印此电子面单吗?',
-            url: `/order/order_dump/${row.id}`,
-            method: 'get',
-            ids: '',
-          };
-          this.$modalSure(this.delfromData)
-            .then((res) => {
-              this.$Message.success(res.msg);
-              this.getList();
-            })
-            .catch((res) => {
-              this.$Message.error(res.msg);
-            });
-          break;
-        default:
-          this.delfromData = {
-            title: '删除订单',
-            url: `/order/del/${row.id}`,
-            method: 'DELETE',
-            ids: '',
-          };
-          // this.modalTitleSs = '删除订单';
-          this.delOrder(row, this.delfromData);
-      }
-    },
-    // 立即支付 /确认收货//删除单条订单
-    submitModel() {
-      this.getList();
-    },
-    pageChange(index) {
-      this.page.pageNum = index;
-      this.getList();
-    },
-    limitChange(limit) {
-      this.page.pageSize = limit;
-      this.getList();
-    },
-    getOrderList(id) {
-      splitOrderList(id).then((res) => {});
-    },
-    // 订单列表
-    getList(res) {
-      this.page.pageNum = res === 1 ? 1 : this.page.pageNum;
-      this.loading = true;
-
-      splitOrderList(this.$route.query.id)
-        .then(async (res) => {
-          let data = res.data;
-          // this.orderList = data.data;
-          this.orderList = data.map((item) => {
-            // item.checkBox = false;
-            if (this.isAll === 1) {
-              item.checkBox = true;
-            } else {
-              item.checkBox = false;
-            }
-            return item;
-          });
-          this.orderCards = data.stat;
-          this.page.total = data.count;
-          this.$emit('on-changeCards', data.stat);
-          this.loading = false;
-        })
-        .catch((res) => {
-          this.loading = false;
-          this.$Message.error(res.msg);
-        });
-    },
-    // 全选
-    onSelectTab(selection) {
-      this.formSelection = selection;
-      let isDel = selection.some((item) => {
-        return item.is_del === 1;
-      });
-      this.getIsDel(isDel);
-      this.getisDelIdListl(selection);
-    },
-    // 编辑
-    edit(row) {
-      this.getOrderData(row.id);
-    },
-    splitOrderDetail(row) {
-      this.$router.push({
-        path: 'split_order',
-        query: {
-          id: row.id,
-        },
-      });
-    },
-    // 删除单条订单
-    delOrder(row, data) {
-      if (row.is_del === 1) {
-        this.$modalSure(data)
-          .then((res) => {
-            this.$Message.success(res.msg);
-            this.getList();
-          })
-          .catch((res) => {
-            this.$Message.error(res.msg);
-          });
-      } else {
-        const title = '错误！';
-        const content = '<p>您选择的的订单存在用户未删除的订单，无法删除用户未删除的订单！</p>';
-        this.$Modal.error({
-          title: title,
-          content: content,
-        });
-      }
-    },
-    // 获取编辑表单数据
-    getOrderData(id) {
-      getOrdeDatas(id)
-        .then(async (res) => {
-          if (res.data.status === false) {
-            return this.$authLapse(res.data);
-          }
-          this.$authLapse(res.data);
-          this.FromData = res.data;
-          this.$refs.edits.modals = true;
-        })
-        .catch((res) => {
-          this.$Message.error(res.msg);
-        });
-    },
-    // 获取详情表单数据
-    getData(id) {
-      getDataInfo(id)
-        .then(async (res) => {
-          this.$refs.detailss.modals = true;
-          this.orderDatalist = res.data;
-          if (this.orderDatalist.orderInfo.refund_reason_wap_img) {
-            try {
-              this.orderDatalist.orderInfo.refund_reason_wap_img = JSON.parse(
-                this.orderDatalist.orderInfo.refund_reason_wap_img,
-              );
-            } catch (e) {
-              this.orderDatalist.orderInfo.refund_reason_wap_img = [];
-            }
-          }
-        })
-        .catch((res) => {
-          this.$Message.error(res.msg);
-        });
-    },
-    // 修改成功
-    submitFail() {
-      this.status = 0;
-      this.getList();
-    },
-    // 获取退款表单数据
-    getRefundData(id) {
-      this.$modalForm(getRefundFrom(id)).then(() => {
-        this.getList();
-        this.$emit('changeGetTabs');
-      });
-    },
-    // 获取退积分表单数据
-    getRefundIntegral(id) {
-      refundIntegral(id)
-        .then(async (res) => {
-          this.FromData = res.data;
-          this.$refs.edits.modals = true;
-        })
-        .catch((res) => {
-          this.$Message.error(res.msg);
-        });
-    },
-    // 不退款表单数据
-    getNoRefundData(id) {
-      this.$modalForm(getnoRefund(id)).then(() => {
-        this.getList();
-        this.$emit('changeGetTabs');
-      });
-    },
-    // 发送货
-    sendOrder(row) {
-      this.$refs.send.modals = true;
-      this.orderId = row.id;
-      this.status = row._status;
-      this.$refs.send.getList();
-      this.$refs.send.getDeliveryList();
-      this.$nextTick((e) => {
-        this.$refs.send.getCartInfo(row._status, row.id);
-      });
-    },
-    // 配送信息表单数据
-    delivery(row) {
-      getDistribution(row.id)
-        .then(async (res) => {
-          this.FromData = res.data;
-          this.$refs.edits.modals = true;
-        })
-        .catch((res) => {
-          this.$Message.error(res.msg);
-        });
-    },
-    change(status) {},
-    // 数据导出；
-    exportData: function () {
-      this.$refs.table.exportCsv({
-        filename: '商品列表',
-      });
-    },
-    // 核销订单
-    bindWrite(row) {
-      let self = this;
-      this.$Modal.confirm({
-        title: '提示',
-        content: '确定要核销该订单吗？',
-        cancelText: '取消',
-        closable: true,
-        maskClosable: true,
-        onOk: function () {
-          writeUpdate(row.order_id).then((res) => {
-            self.$Message.success(res.msg);
-            self.getList();
-          });
-        },
-        onCancel: () => {},
-      });
-    },
-    onSelectCancel(selection, row) {},
-  },
-};
-</script>
-
-<style scoped lang="stylus">
-img {
-  height: 36px;
-  display: block;
-}
-
-.tabBox {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  align-items: center;
-
-  .tabBox_img {
-    width: 36px;
-    height: 36px;
-
-    img {
-      width: 100%;
-      height: 100%;
-    }
-  }
-
-  .tabBox_tit {
-    width: 60%;
-    font-size: 12px !important;
-    margin: 0 2px 0 10px;
-    letter-spacing: 1px;
-    padding: 5px 0;
-    box-sizing: border-box;
-  }
-}
-
-.orderData >>>.ivu-table-cell {
-  padding-left: 0 !important;
-}
-
-.vertical-center-modal {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.orderData .ivu-table {
-  overflow: visible !important;
-}
-
-.orderData .ivu-table th {
-  overflow: visible !important;
-}
-
-.orderData .ivu-table-header {
-  overflow: visible !important;
-}
-
-/deep/.ivu-table-header {
-  // overflow: visible;
-}
-
-/deep/.ivu-table th {
-  overflow: visible;
-}
-
-/deep/.select-item:hover {
-  background-color: #f3f3f3;
-}
-
-/deep/.select-on {
-  display: block;
-}
-
-/deep/.select-item.on {
-  background: #f3f3f3;
-}
-
-.pictrue-box {
-  display: flex;
-  align-item: center;
-}
-
-.pictrue {
-  width: 25px;
-  height: 25px;
-}
-
-.return {
-  border: 1px solid #ccc;
-  padding: 3px 5px;
-  margin-left: 15px;
-  border-radius: 3px;
-  cursor: pointer;
-}
-</style>
diff --git a/template/admin/src/pages/order/refund/index.vue b/template/admin/src/pages/order/refund/index.vue
index 66c4dc34e..1dbaf81ad 100644
--- a/template/admin/src/pages/order/refund/index.vue
+++ b/template/admin/src/pages/order/refund/index.vue
@@ -1,30 +1,31 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="pagination"
         :model="pagination"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Col span="24" class="ivu-text-left">
-          <FormItem label="订单状态：">
-            <RadioGroup
-              v-model="pagination.refund_type"
-              type="button"
-              @on-change="selectChange2(pagination.refund_type)"
-            >
-              <Radio v-for="(item, index) in num" :key="index" :label="index">{{ item.name }}</Radio>
-            </RadioGroup>
-          </FormItem>
-        </Col>
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid" class="ivu-text-left">
-            <FormItem label="退款时间：">
+        <el-row :gutter="24">
+          <el-col :span="24" class="ivu-text-left">
+            <el-form-item label="订单状态：">
+              <el-radio-group v-model="pagination.refund_type" type="button" @change="selectChange2()">
+                <el-radio-button v-for="(item, index) in num" :key="index" :label="index">{{
+                  item.name
+                }}</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col v-bind="grid" class="ivu-text-left">
+            <el-form-item label="退款时间：">
               <DatePicker
                 :editable="false"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="daterange"
@@ -34,200 +35,153 @@
                 class="mr20"
                 :options="options"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="订单号：" label-for="title">
-              <Input
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="订单号：" label-for="title">
+              <el-input
                 search
                 enter-button
                 v-model="pagination.order_id"
                 placeholder="请输入订单号"
                 @on-search="orderSearch"
               />
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-      <Table
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :columns="thead"
         :data="tbody"
         ref="table"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="order_id">
-          <span v-text="row.order_id" style="display: block"></span>
-          <span v-show="row.is_del === 1" style="color: #ed4014; display: block">用户已删除</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="user">
-          <div>用户名：{{ row.nickname }}</div>
-          <div>用户ID：{{ row.uid }}</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="refund_type">
-          <div v-if="row.refund_type == 1">仅退款</div>
-          <div v-else-if="row.refund_type == 2">退货退款</div>
-          <div v-else-if="row.refund_type == 3">
-            <div>拒绝退款</div>
-            <div>原因：{{ row.refuse_reason }}</div>
-          </div>
-          <div v-else-if="row.refund_type == 4">商品待退货</div>
-          <div v-else-if="row.refund_type == 5">
-            <div>退货待收货</div>
-            <div>单号：{{ row.refund_express }}</div>
-          </div>
-          <div v-else-if="row.refund_type == 6">已退款</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="info">
-          <div class="tabBox" v-for="(val, i) in row._info" :key="i">
-            <div class="tabBox_img" v-viewer>
-              <img
-                v-lazy="
-                  val.cart_info.productInfo.attrInfo
-                    ? val.cart_info.productInfo.attrInfo.image
-                    : val.cart_info.productInfo.image
-                "
-              />
-            </div>
-            <span class="tabBox_tit"
-              >{{ val.cart_info.productInfo.store_name + ' | '
-              }}{{ val.cart_info.productInfo.attrInfo ? val.cart_info.productInfo.attrInfo.suk : '' }}</span
-            >
-            <span class="tabBox_pice">{{ '￥' + val.cart_info.truePrice + ' x ' + val.cart_info.cart_num }}</span>
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="order_info">
-          <div>订单金额：{{ row.pay_price }}</div>
-          <div>付款方式：{{ row.pay_type_name }}</div>
-          <div>订单状态：<span v-html="row.status_name.status_name"></span></div>
-        </template>
-        <template slot-scope="{ row, index }" slot="statusName">
-          <div v-html="row.refund_reason" class="pt5"></div>
-          <div class="pictrue-box" v-if="row.refund_img.length">
-            <div v-viewer v-for="(item, index) in row.refund_img || []" :key="index">
-              <img class="pictrue mr10" v-lazy="item" :src="item" />
-            </div>
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <!--          <a @click="edit(row)" v-if="row._status === 1">编辑</a>-->
-          <!--          <a-->
-          <!--            @click="sendOrder(row)"-->
-          <!--            v-if="-->
-          <!--              row._status === 2 && row.shipping_type === 1 && !row.pinkStatus-->
-          <!--            "-->
-          <!--            >发送货</a-->
-          <!--          >-->
-          <!--          <a-->
-          <!--            @click="sendOrder(row)"-->
-          <!--            v-if="-->
-          <!--              row._status === 2 &&-->
-          <!--              row.shipping_type === 1 &&-->
-          <!--              row.pinkStatus === 2-->
-          <!--            "-->
-          <!--            >发送货</a-->
-          <!--          >-->
-          <!--          <a @click="delivery(row)" v-if="row._status === 4">配送信息</a>-->
-          <!--          <a-->
-          <!--            @click="bindWrite(row)"-->
-          <!--            v-if="-->
-          <!--              row.shipping_type == 2 &&-->
-          <!--              row.status == 0 &&-->
-          <!--              row.paid == 1 &&-->
-          <!--              row.refund_status === 0-->
-          <!--            "-->
-          <!--            >立即核销</a-->
-          <!--          >-->
-          <!--          <Divider-->
-          <!--            type="vertical"-->
-          <!--            v-if="-->
-          <!--              row._status === 2 &&-->
-          <!--              row.shipping_type === 1 &&-->
-          <!--              row.pinkStatus === 2-->
-          <!--            "-->
-          <!--          />-->
-          <!--          <Divider-->
-          <!--            type="vertical"-->
-          <!--            v-if="-->
-          <!--              row._status === 1 ||-->
-          <!--              (row._status === 2 && !row.pinkStatus) ||-->
-          <!--              row._status === 4 ||-->
-          <!--              (row.shipping_type == 2 &&-->
-          <!--                row.status == 0 &&-->
-          <!--                row.paid == 1 &&-->
-          <!--                row.refund_status === 0)-->
-          <!--            "-->
-          <!--          />-->
-          <template>
-            <Dropdown @on-click="changeMenu(row, $event)" :transfer="true">
-              <a href="javascript:void(0)"
-                >更多
-                <Icon type="ios-arrow-down"></Icon>
-              </a>
-              <DropdownMenu slot="list">
-                <DropdownItem
-                  name="1"
-                  ref="ones"
-                  v-show="row._status === 1 && row.paid === 0 && row.pay_type === 'offline'"
-                  >立即支付</DropdownItem
-                >
-                <DropdownItem name="2">订单详情</DropdownItem>
-                <!-- <DropdownItem name="3">订单记录</DropdownItem> -->
-                <!--                <DropdownItem-->
-                <!--                  name="11"-->
-                <!--                  v-show="row._status >= 3 && row.express_dump"-->
-                <!--                  >电子面单打印</DropdownItem-->
-                <!--                >-->
-                <!--                <DropdownItem name="10" v-show="row._status >= 2"-->
-                <!--                  >小票打印</DropdownItem-->
-                <!--                >-->
-                <DropdownItem
-                  name="4"
-                  v-show="
-                    row._status !== 1 ||
-                    (row._status === 3 && row.use_integral > 0 && row.use_integral >= row.back_integral)
-                  "
-                  >售后备注</DropdownItem
-                >
-                <DropdownItem
-                  name="5"
-                  v-show="
-                    [1, 2, 5].includes(row.refund_type) &&
-                    (parseFloat(row.pay_price) > parseFloat(row.refunded_price) || row.pay_price == 0)
-                  "
-                  >{{ row.refund_type == 2 ? '同意退货' : '立即退款' }}</DropdownItem
-                >
-                <!--                <DropdownItem-->
-                <!--                  name="6"-->
-                <!--                  v-show="-->
-                <!--                    row._status !== 1 &&-->
-                <!--                    row.use_integral > 0 &&-->
-                <!--                    row.use_integral >= row.back_integral-->
-                <!--                  "-->
-                <!--                  >退积分</DropdownItem-->
-                <!--                >-->
-                <DropdownItem name="7" v-show="[1, 2].includes(row.refund_type) && row.is_pink_cancel === 0"
-                  >不退款</DropdownItem
-                >
-                <DropdownItem name="8" v-show="row.is_del == 1">删除订单</DropdownItem>
-              </DropdownMenu>
-            </Dropdown>
+        <el-table-column label="订单号" min-width="150">
+          <template slot-scope="scope">
+            <span v-text="scope.row.order_id" style="display: block"></span>
+            <span v-show="scope.row.is_del === 1" style="color: #ed4014; display: block">用户已删除</span>
           </template>
-        </template>
-      </Table>
+        </el-table-column>
+        <el-table-column label="用户信息" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品信息" min-width="330">
+          <template slot-scope="scope">
+            <div class="tabBox" v-for="(val, i) in scope.row._info" :key="i">
+              <div class="tabBox_img" v-viewer>
+                <img
+                  v-lazy="
+                    val.cart_info.productInfo.attrInfo
+                      ? val.cart_info.productInfo.attrInfo.image
+                      : val.cart_info.productInfo.image
+                  "
+                />
+              </div>
+              <span class="tabBox_tit"
+                >{{ val.cart_info.productInfo.store_name + ' | '
+                }}{{ val.cart_info.productInfo.attrInfo ? val.cart_info.productInfo.attrInfo.suk : '' }}</span
+              >
+              <span class="tabBox_pice">{{ '￥' + val.cart_info.truePrice + ' x ' + val.cart_info.cart_num }}</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="实际支付" min-width="70">
+          <template slot-scope="scope">
+            <span>{{ scope.row.pay_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="发起退款时间" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="退款状态" min-width="100">
+          <template slot-scope="scope">
+            <div v-if="scope.row.refund_type == 1">仅退款</div>
+            <div v-else-if="scope.row.refund_type == 2">退货退款</div>
+            <div v-else-if="scope.row.refund_type == 3">
+              <div>拒绝退款</div>
+              <div>原因：{{ scope.row.refuse_reason }}</div>
+            </div>
+            <div v-else-if="scope.row.refund_type == 4">商品待退货</div>
+            <div v-else-if="scope.row.refund_type == 5">
+              <div>退货待收货</div>
+              <div>单号：{{ scope.row.refund_express }}</div>
+            </div>
+            <div v-else-if="scope.row.refund_type == 6">已退款</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="退款信息" min-width="120">
+          <template slot-scope="scope">
+            <div v-html="scope.row.refund_reason" class="pt5"></div>
+            <div class="pictrue-box" v-if="scope.row.refund_img.length">
+              <div v-viewer v-for="(item, index) in scope.row.refund_img || []" :key="index">
+                <img class="pictrue mr10" v-lazy="item" :src="item" />
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="发起退款时间" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.remark }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right" label="操作" width="150">
+          <template slot-scope="scope">
+            <el-dropdown size="small" @command="changeMenu(scope.row, $event)">
+              <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i> </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item
+                  command="1"
+                  ref="ones"
+                  v-show="scope.row._status === 1 && scope.row.paid === 0 && scope.row.pay_type === 'offline'"
+                  >立即支付</el-dropdown-item
+                >
+                <el-dropdown-item command="2">订单详情</el-dropdown-item>
+                <el-dropdown-item
+                  command="4"
+                  v-show="
+                    scope.row._status !== 1 ||
+                    (scope.row._status === 3 &&
+                      scope.row.use_integral > 0 &&
+                      scope.row.use_integral >= scope.row.back_integral)
+                  "
+                  >售后备注</el-dropdown-item
+                >
+                <el-dropdown-item
+                  command="5"
+                  v-show="
+                    [1, 2, 5].includes(scope.row.refund_type) &&
+                    (parseFloat(scope.row.pay_price) > parseFloat(scope.row.refunded_price) || scope.row.pay_price == 0)
+                  "
+                  >{{ scope.row.refund_type == 2 ? '同意退货' : '立即退款' }}</el-dropdown-item
+                >
+                <el-dropdown-item
+                  command="7"
+                  v-show="[1, 2].includes(scope.row.refund_type) && scope.row.is_pink_cancel === 0"
+                  >不退款</el-dropdown-item
+                >
+                <el-dropdown-item command="8" v-show="scope.row.is_del == 1">删除订单</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="pagination.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="pagination.limit"
+          :page.sync="pagination.page"
+          :limit.sync="pagination.limit"
+          @pagination="getOrderList"
         />
       </div>
-    </Card>
+    </el-card>
     <!-- 编辑 退款 退积分 不退款-->
     <edit-from ref="edits" :FromData="FromData" @submitFail="submitFail"></edit-from>
     <!-- 详情 -->
@@ -412,7 +366,7 @@ export default {
     ...mapState('order', ['orderChartType']),
     // ...mapState("admin/layout", ["isMobile"]),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -610,7 +564,6 @@ export default {
     // 订单选择状态
     selectChange2(tab) {
       this.pagination.page = 1;
-      this.pagination.refund_type = tab;
       this.getOrderList(tab);
     },
     // 不退款表单数据
@@ -636,11 +589,6 @@ export default {
           this.$Message.error(err.msg);
         });
     },
-    // 分页
-    pageChange(index) {
-      this.pagination.page = index;
-      this.getOrderList();
-    },
     nameSearch() {
       this.pagination.page = 1;
       this.getOrderList();
diff --git a/template/admin/src/pages/product/list_wait.vue b/template/admin/src/pages/product/list_wait.vue
deleted file mode 100644
index dc9fa278b..000000000
--- a/template/admin/src/pages/product/list_wait.vue
+++ /dev/null
@@ -1,286 +0,0 @@
-<template>
-  <div class="article-manager">
-    <div class="i-layout-page-header">
-      <PageHeader
-        title="商品管理"
-        hidden-breadcrumb
-        :tab-list="tabList"
-        :tab-active-key="tabActiveKey"
-        @on-tab-change="handleChangeTab"
-      >
-      </PageHeader>
-    </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <div class="acea-row row-middle">
-        <span>商品分类：</span>
-        <TreeSelect v-model="value" :data="treeSelect" style="width: 160px" />
-        <div class="ivu-search acea-row row-middle">
-          <div>商品搜索：</div>
-          <div class="ivu-mt ivu-mb" style="max-width: 200px">
-            <Input search size="default" enter-button placeholder="请输入" />
-          </div>
-          <Button class="export" @click="exportData">导出</Button>
-        </div>
-      </div>
-      <div class="Button">
-        <Button type="primary" class="bnt">批量上架</Button>
-      </div>
-      <Table
-        ref="table"
-        :columns="columns"
-        :data="data"
-        class="ivu-mt"
-        :loading="loading"
-        no-data-text="暂无数据"
-        no-filtered-data-text="暂无筛选结果"
-      >
-        <template slot-scope="{ row }" slot="id">
-          {{ row.id }}
-        </template>
-        <template slot-scope="{ row }" slot="image">
-          <img v-lazy="row.image" />
-        </template>
-        <template slot-scope="{ row }" slot="name">
-          {{ row.name }}
-        </template>
-        <template slot-scope="{ row }" slot="sales">
-          {{ row.sales }}
-        </template>
-        <template slot-scope="{ row }" slot="voidSales">
-          {{ row.voidSales }}
-        </template>
-        <template slot-scope="{ row }" slot="stock">
-          {{ row.stock }}
-        </template>
-        <template slot-scope="{ row }" slot="collects">
-          {{ row.collects }}
-        </template>
-        <template slot-scope="{ row }" slot="sort">
-          {{ row.sort }}
-        </template>
-        <template slot-scope="{ row }" slot="state">
-          <Switch size="large" v-model="row.is_show ? true : false" @on-change="change">
-            <span slot="open">上架</span>
-            <span slot="close">下架</span>
-          </Switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a>编辑</a>
-          <Divider type="vertical" />
-          <template>
-            <Dropdown>
-              <a href="javascript:void(0)">
-                更多
-                <Icon type="ios-arrow-down"></Icon>
-              </a>
-            </Dropdown>
-          </template>
-        </template>
-      </Table>
-      <div class="acea-row row-right page">
-        <Page :total="total" show-elevator />
-      </div>
-    </Card>
-  </div>
-</template>
-<style scoped lang="less">
-img {
-  height: 36px;
-  display: block;
-}
-
-.ivu-mt .ivu-search {
-  margin-left: 16px;
-}
-
-.ivu-mt .export {
-  margin-left: 6px;
-}
-
-.ivu-mt .Button .bnt {
-  margin-right: 6px;
-}
-</style>
-<script>
-import expandRow from './tableExpand.vue';
-
-export default {
-  name: 'product_list_wait',
-  components: { expandRow },
-  data() {
-    return {
-      tabActiveKey: 'list_wait',
-      loading: false,
-      cityList: [
-        {
-          value: '跌幅很大功夫大湖股份',
-          label: '跌幅很大功夫大湖股份',
-        },
-        {
-          value: 'London',
-          label: 'London',
-        },
-      ],
-      model11: '',
-      model12: '',
-      columns: [
-        {
-          type: 'selection',
-          width: 60,
-          align: 'center',
-        },
-        {
-          type: 'expand',
-          width: 50,
-          render: (h, params) => {
-            return h(expandRow, {
-              props: {
-                row: params.row,
-              },
-            });
-          },
-        },
-        {
-          title: '商品ID',
-          slot: 'id',
-          width: 100,
-        },
-        {
-          title: '商品图',
-          slot: 'image',
-          minWidth: 80,
-        },
-        {
-          title: '商品名称',
-          slot: 'name',
-          minWidth: 250,
-        },
-        {
-          title: '销量',
-          slot: 'sales',
-          sortable: true,
-          minWidth: 90,
-        },
-        {
-          title: '虚拟销量',
-          slot: 'voidSales',
-          minWidth: 100,
-        },
-        {
-          title: '库存',
-          slot: 'stock',
-          minWidth: 80,
-        },
-        {
-          title: '收藏',
-          slot: 'collects',
-          minWidth: 70,
-        },
-        {
-          title: '排序',
-          slot: 'sort',
-          minWidth: 70,
-        },
-        {
-          title: '状态',
-          key: 'state',
-          slot: 'state',
-          width: 100,
-          filters: [
-            {
-              label: '上架',
-              value: 1,
-            },
-            {
-              label: '下架',
-              value: 0,
-            },
-          ],
-          filterMethod(value, row) {
-            return row.is_show === value;
-          },
-          filterMultiple: false,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 150,
-        },
-      ],
-      data: [],
-      total: 0,
-    };
-  },
-  mounted() {
-    this.getData();
-  },
-  methods: {
-    getData() {
-      this.loading = true;
-      setTimeout(() => {
-        let data = [
-          {
-            id: '1120',
-            image: 'https://dev-file.iviewui.com/PKCycgm3DWJOca5I2uAEqneuLFQAcKa7/middle',
-            name: 'CRMEB商城系统V3.0将在8月与大家见面',
-            sales: '357万',
-            voidSales: '400万',
-            stock: '3570',
-            collects: '26',
-            sort: '2',
-            is_show: 1,
-            job: 'Data engineer',
-            interest: 'badminton',
-            birthday: '1991-05-14',
-            book: 'Steve Jobs',
-            movie: 'The Prestige',
-          },
-          {
-            id: '2',
-            image: 'https://dev-file.iviewui.com/KUa7CaC6m7vRtDCfY0SAXlp7dw9OvBrf/middle',
-            name: 'CRMEB商城系统V3.0将在8月与大家见面',
-            sales: '357万',
-            voidSales: '400万',
-            stock: '3570',
-            collects: '26',
-            sort: '2',
-            is_show: 0,
-            job: 'Data engineer',
-            interest: 'badminton',
-            birthday: '1991-05-14',
-            book: 'Steve Jobs',
-            movie: 'The Prestige',
-          },
-          {
-            id: '666',
-            image: 'https://dev-file.iviewui.com/OYZqqiP1bbwN22Ai2HnwvSagxuSNchdD/middle',
-            name: 'CRMEB商城系统V3.0将在8月与大家见面',
-            sales: '357万',
-            voidSales: '400万',
-            stock: '3570',
-            collects: '26',
-            sort: '2',
-            is_show: 1,
-            job: 'Data engineer',
-            interest: 'badminton',
-            birthday: '1991-05-14',
-            book: 'Steve Jobs',
-            movie: 'The Prestige',
-          },
-        ];
-        this.loading = false;
-        this.data = data;
-        this.total = data.length;
-      }, 1000);
-    },
-    change(status) {},
-    // 数据导出；
-    exportData: function () {
-      this.$refs.table.exportCsv({
-        filename: '商品列表',
-      });
-    },
-  },
-};
-</script>
diff --git a/template/admin/src/pages/product/productAdd/index.vue b/template/admin/src/pages/product/productAdd/index.vue
index 76bcce906..9b5c3003d 100644
--- a/template/admin/src/pages/product/productAdd/index.vue
+++ b/template/admin/src/pages/product/productAdd/index.vue
@@ -3,9 +3,9 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <router-link :to="{ path: $routeProStr + '/product/product_list' }"
-          ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
+          ><el-button icon="ios-arrow-back" size="small" type="text">返回</el-button></router-link
         >
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span
           class="ivu-page-header-title mr20"
           style="padding: 0"
@@ -13,11 +13,11 @@
         ></span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Tabs v-model="currentTab" @on-click="onhangeTab">
-        <TabPane v-for="(item, index) in headTab" :key="index" :label="item.tit" :name="item.name"></TabPane>
-      </Tabs>
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-tabs v-model="currentTab">
+        <el-tab-pane v-for="(item, index) in headTab" :key="index" :label="item.tit" :name="item.name"></el-tab-pane>
+      </el-tabs>
+      <el-form
         class="formValidate mt20"
         ref="formValidate"
         :rules="ruleValidate"
@@ -27,9 +27,9 @@
         @submit.native.prevent
       >
         <!-- 基础信息-->
-        <Row :gutter="24" type="flex" v-show="currentTab === '1'">
-          <Col span="24">
-            <FormItem label="商品类型：" props="is_virtual">
+        <el-row :gutter="24" v-show="currentTab === '1'">
+          <el-col :span="24">
+            <el-form-item label="商品类型：" props="is_virtual">
               <div
                 class="virtual"
                 :class="formValidate.virtual_type == item.id ? 'virtual_boder' : 'virtual_boder2'"
@@ -42,16 +42,16 @@
                 <div v-if="formValidate.virtual_type == item.id" class="virtual_san"></div>
                 <div v-if="formValidate.virtual_type == item.id" class="virtual_dui">✓</div>
               </div>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="商品分类：" prop="cate_id">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="商品分类：" prop="cate_id">
               <!-- {{ formValidate.cate_id }}
-              <Select v-model="formValidate.cate_id" placeholder="请选择商品分类" multiple class="perW30">
-                <Option v-for="item in treeSelect" :disabled="item.pid === 0" :value="item.id" :key="item.id">{{
+              <el-select v-model="formValidate.cate_id" placeholder="请选择商品分类" multiple class="perW30">
+                <el-option v-for="item in treeSelect" :disabled="item.pid === 0" :value="item.id" :key="item.id">{{
                   item.html + item.cate_name
-                }}</Option>
-              </Select>
+                }}</el-option>
+              </el-select>
               {{ formValidate.cate_id }} -->
               <el-cascader
                 class="perW30"
@@ -62,21 +62,21 @@
                 clearable
               ></el-cascader>
               <span class="addfont" @click="addCate">新增分类</span>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="商品名称：" prop="store_name">
-              <Input class="perW30" v-model.trim="formValidate.store_name" placeholder="请输入商品名称" />
-            </FormItem>
-          </Col>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="商品名称：" prop="store_name">
+              <el-input class="perW30" v-model.trim="formValidate.store_name" placeholder="请输入商品名称" />
+            </el-form-item>
+          </el-col>
 
-          <Col span="24">
-            <FormItem label="单位：" prop="unit_name">
-              <Input class="perW30" v-model="formValidate.unit_name" placeholder="请输入单位" />
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="商品轮播图：" prop="slider_image">
+          <el-col :span="24">
+            <el-form-item label="单位：" prop="unit_name">
+              <el-input class="perW30" v-model="formValidate.unit_name" placeholder="请输入单位" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="商品轮播图：" prop="slider_image">
               <div class="acea-row">
                 <div
                   class="pictrue"
@@ -89,7 +89,7 @@
                   @dragend="handleDragEnd($event, item)"
                 >
                   <img v-lazy="item" />
-                  <Button shape="circle" icon="md-close" @click.native="handleRemove(index)" class="btndel"></Button>
+                  <i class="el-icon-circle-close btndel" @click="handleRemove(index)"></i>
                 </div>
                 <div
                   v-if="formValidate.slider_image.length < 10"
@@ -98,33 +98,33 @@
                 >
                   <Icon type="ios-camera-outline" size="26" />
                 </div>
-                <Input v-model="formValidate.slider_image[0]" style="display: none"></Input>
+                <el-input v-model="formValidate.slider_image[0]" style="display: none"></el-input>
               </div>
 
               <div class="titTip">建议尺寸：800*800，可拖拽改变图片顺序，默认首张图为主图，最多上传10张</div>
 
               <!-- <div class="tips">(最多10张<br />750*750)</div> -->
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="添加视频：">
-              <i-switch v-model="formValidate.video_open" size="large">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="添加视频：">
+              <el-switch :active-value="1" :inactive-value="0" v-model="formValidate.video_open" size="large">
                 <span slot="open">开启</span>
                 <span slot="close">关闭</span>
-              </i-switch>
-            </FormItem>
-          </Col>
-          <Col span="24" v-if="formValidate.video_open">
-            <FormItem label="视频类型：">
-              <RadioGroup v-model="seletVideo" @on-change="changeVideo">
-                <Radio :label="0" class="radio">本地视频</Radio>
-                <Radio :label="1">视频链接</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col span="24" v-if="formValidate.video_open" id="selectvideo">
-            <FormItem label="" prop="video_link">
-              <Input
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="formValidate.video_open">
+            <el-form-item label="视频类型：">
+              <el-radio-group v-model="seletVideo" @change="changeVideo">
+                <el-radio :label="0" class="radio">本地视频</el-radio>
+                <el-radio :label="1">视频链接</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="formValidate.video_open" id="selectvideo">
+            <el-form-item label="" prop="video_link">
+              <el-input
                 v-if="seletVideo == 1 && !formValidate.video_link"
                 class="perW30"
                 v-model="videoLink"
@@ -138,13 +138,13 @@
               >
                 +
               </div>
-              <Button
+              <el-button
                 v-if="seletVideo == 1 && (upload_type !== '1' || videoLink) && !formValidate.video_link"
                 type="primary"
                 icon="ios-cloud-upload-outline"
                 class="ml10"
                 @click="zh_uploadFile"
-                >确认添加</Button
+                >确认添加</el-button
               >
               <Upload
                 v-if="upload_type === '1' && !videoLink"
@@ -171,52 +171,55 @@
               </div>
               <Progress class="progress" :percent="progress" :stroke-width="5" v-if="upload.videoIng || videoIng" />
               <div class="titTip">建议时长：9～30秒，视频宽高比16:9</div>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="商品状态：">
-              <RadioGroup v-model="formValidate.is_show">
-                <Radio :label="1" class="radio">上架</Radio>
-                <Radio :label="0">下架</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="商品状态：">
+              <el-radio-group v-model="formValidate.is_show">
+                <el-radio :label="1" class="radio">上架</el-radio>
+                <el-radio :label="0">下架</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
 
-          <!-- <Col span="24">
-                        <FormItem label="商品标签：" prop="label_id">
-                            <Select v-model="formValidate.label_id" multiple v-width="'50%'">
-                                <Option v-for="item in dataLabel" :value="item.id" :key="item.id">{{ item.label_name }}</Option>
-                            </Select>
-                        </FormItem>
-                    </Col> -->
-        </Row>
+          <!-- <el-col :span="24">
+                        <el-form-item label="商品标签：" prop="label_id">
+                            <el-select v-model="formValidate.label_id" multiple v-width="'50%'">
+                                <el-option v-for="item in dataLabel" :value="item.id" :key="item.id">{{ item.label_name }}</el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col> -->
+        </el-row>
         <!-- 规格库存-->
-        <Row :gutter="24" type="flex" v-show="currentTab === '2'">
-          <Col span="24">
-            <FormItem label="商品规格：" props="spec_type">
-              <RadioGroup v-model="formValidate.spec_type" @on-change="changeSpec">
-                <Radio :label="0" class="radio">单规格</Radio>
-                <Radio :label="1">多规格</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
+        <el-row :gutter="24" v-show="currentTab === '2'">
+          <el-col :span="24">
+            <el-form-item label="商品规格：" props="spec_type">
+              <el-radio-group v-model="formValidate.spec_type" @change="changeSpec">
+                <el-radio :label="0" class="radio">单规格</el-radio>
+                <el-radio :label="1">多规格</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <!-- 多规格添加-->
-          <Col span="24" v-if="formValidate.spec_type === 1" class="noForm">
-            <Col span="24">
-              <FormItem label="选择规格：" prop="">
+          <el-col :span="24" v-if="formValidate.spec_type === 1" class="noForm">
+            <el-col :span="24">
+              <el-form-item label="选择规格：" prop="">
                 <div class="acea-row row-middle">
-                  <Select v-model="formValidate.selectRule" class="perW30">
-                    <Option v-for="(item, index) in ruleList" :value="item.rule_name" :key="index">{{
-                      item.rule_name
-                    }}</Option>
-                  </Select>
-                  <Button type="primary" class="mr20" @click="confirm">确认</Button>
-                  <Button @click="addRule">添加规格模板</Button>
+                  <el-select v-model="formValidate.selectRule" class="perW30">
+                    <el-option
+                      v-for="(item, index) in ruleList"
+                      :value="item.rule_name"
+                      :key="index"
+                      :label="item.rule_name"
+                    ></el-option>
+                  </el-select>
+                  <el-button type="primary" class="mr20" @click="confirm">确认</el-button>
+                  <el-button @click="addRule">添加规格模板</el-button>
                 </div>
-              </FormItem>
-            </Col>
-            <Col span="24">
-              <FormItem v-if="attrs.length !== 0">
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item v-if="attrs.length !== 0">
                 <draggable
                   class="dragArea list-group"
                   :list="attrs"
@@ -248,7 +251,7 @@
                             >{{ j }}</Tag
                           >
                         </draggable>
-                        <Input
+                        <el-input
                           search
                           enter-button="添加"
                           placeholder="请输入属性名称"
@@ -264,37 +267,37 @@
                                     <div class="acea-row row-middle"><span class="mr5">{{item.value}}</span><Icon type="ios-close-circle" size="14" class="curs" @click="handleRemoveRole(index)"/></div>
                                     <div class="rulesBox">
                                         <Tag type="dot" closable color="primary" v-for="(j, indexn) in item.detail" :key="indexn" :name="j" class="mr20" @on-close="handleRemove2(item.detail,indexn)">{{j}}</Tag>
-                                        <Input search enter-button="添加" placeholder="请输入属性名称" v-model="item.detail.attrsVal" @on-search="createAttr(item.detail.attrsVal,index)" style="width: 150px"/>
+                                        <el-input search enter-button="添加" placeholder="请输入属性名称" v-model="item.detail.attrsVal" @on-search="createAttr(item.detail.attrsVal,index)" style="width: 150px"/>
                                     </div>
                                 </div> -->
-              </FormItem>
-            </Col>
-            <Col span="24" v-if="createBnt">
-              <FormItem>
-                <Button type="primary" icon="md-add" @click="addBtn" class="mr15">添加新规格</Button>
-                <Button type="success" @click="generate(1)">立即生成</Button>
-              </FormItem>
-            </Col>
-            <Col span="24" v-if="showIput">
-              <Col :xl="6" :lg="9" :md="10" :sm="24" :xs="24">
-                <FormItem label="规格：">
-                  <Input placeholder="请输入规格" v-model="formDynamic.attrsName" />
-                </FormItem>
-              </Col>
-              <Col :xl="6" :lg="9" :md="10" :sm="24" :xs="24">
-                <FormItem label="规格值：">
-                  <Input v-model="formDynamic.attrsVal" placeholder="请输入规格值" />
-                </FormItem>
-              </Col>
-              <Col :xl="6" :lg="5" :md="10" :sm="24" :xs="24">
-                <FormItem>
-                  <Button type="primary" class="mr15" @click="createAttrName">确定</Button>
-                  <Button @click="offAttrName">取消</Button>
-                </FormItem>
-              </Col>
-            </Col>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="createBnt">
+              <el-form-item>
+                <el-button type="primary" icon="md-add" @click="addBtn" class="mr15">添加新规格</el-button>
+                <el-button type="success" @click="generate(1)">立即生成</el-button>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="showIput">
+              <el-col :xl="6" :lg="9" :md="10" :sm="24" :xs="24">
+                <el-form-item label="规格：">
+                  <el-input placeholder="请输入规格" v-model="formDynamic.attrsName" />
+                </el-form-item>
+              </el-col>
+              <el-col :xl="6" :lg="9" :md="10" :sm="24" :xs="24">
+                <el-form-item label="规格值：">
+                  <el-input v-model="formDynamic.attrsVal" placeholder="请输入规格值" />
+                </el-form-item>
+              </el-col>
+              <el-col :xl="6" :lg="5" :md="10" :sm="24" :xs="24">
+                <el-form-item>
+                  <el-button type="primary" class="mr15" @click="createAttrName">确定</el-button>
+                  <el-button @click="offAttrName">取消</el-button>
+                </el-form-item>
+              </el-col>
+            </el-col>
             <!-- 多规格设置-->
-            <Col
+            <el-col
               :xl="24"
               :lg="24"
               :md="24"
@@ -304,288 +307,351 @@
             >
               <!-- 批量设置-->
 
-              <Col span="24" v-if="[0, 3].includes(formValidate.virtual_type)">
-                <FormItem label="批量设置：" class="labeltop">
-                  <Table :data="oneFormBatch" :columns="formValidate.is_virtual ? columns3 : columns2" border>
-                    <template slot-scope="{ row, index }" slot="pic">
-                      <div class="acea-row row-middle row-center-wrapper" @click="modalPicTap('dan', 'duopi', index)">
-                        <div class="pictrue pictrueTab" v-if="oneFormBatch[0].pic">
-                          <img v-lazy="oneFormBatch[0].pic" />
-                        </div>
-                        <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
-                          <Icon type="ios-camera-outline" size="21" class="iconfont" />
-                        </div>
-                      </div>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="price">
-                      <InputNumber
-                        v-model="oneFormBatch[0].price"
-                        :min="0"
-                        :max="99999999"
-                        class="priceBox"
-                      ></InputNumber>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="cost">
-                      <InputNumber
-                        v-model="oneFormBatch[0].cost"
-                        :min="0"
-                        :max="99999999"
-                        class="priceBox"
-                      ></InputNumber>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="ot_price">
-                      <InputNumber v-model="oneFormBatch[0].ot_price" :min="0" class="priceBox"></InputNumber>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="stock">
-                      <InputNumber
-                        v-model="oneFormBatch[0].stock"
-                        :disabled="formValidate.virtual_type == 1"
-                        :min="0"
-                        :max="99999999"
-                        class="priceBox"
-                      ></InputNumber>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="fictitious">
-                      <Button
-                        v-if="!row.coupon_id && formValidate.virtual_type == 2"
-                        @click="addGoodsCoupon(index, 'oneFormBatch')"
-                        >添加优惠券</Button
-                      >
-                      <span
-                        class="see"
-                        v-else-if="row.coupon_id && formValidate.virtual_type == 2"
-                        @click="see(row, 'manyFormValidate', index)"
-                        >{{ row.coupon_name }}</span
-                      >
-                      <Button
-                        v-else-if="!row.virtual_list.length && formValidate.virtual_type == 1"
-                        @click="addVirtual(index, 'oneFormBatch')"
-                        >添加卡密</Button
-                      >
-                      <span
-                        class="see"
-                        v-else-if="row.virtual_list.length && formValidate.virtual_type == 1"
-                        @click="see(row, 'oneFormBatch', index)"
-                        >已设置</span
-                      >
-                    </template>
-                    <template slot-scope="{ row, index }" slot="bar_code">
-                      <Input v-model="oneFormBatch[0].bar_code"></Input>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="weight">
-                      <InputNumber
-                        v-model="oneFormBatch[0].weight"
-                        :step="0.1"
-                        :min="0"
-                        :max="99999999"
-                        class="priceBox"
-                      ></InputNumber>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="volume">
-                      <InputNumber
-                        v-model="oneFormBatch[0].volume"
-                        :step="0.1"
-                        :min="0"
-                        :max="99999999"
-                        class="priceBox"
-                      ></InputNumber>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="action">
-                      <a @click="batchAdd">批量添加</a>
-                      <Divider type="vertical" />
-                      <a @click="batchDel">清空</a>
-                    </template>
-                  </Table>
-                </FormItem>
-              </Col>
+              <el-col :span="24" v-if="[0, 3].includes(formValidate.virtual_type)">
+                <el-form-item label="批量设置：" class="labeltop">
+                  <el-table :data="oneFormBatch" border>
+                    <el-table-column
+                      :label="item.title"
+                      :min-width="item.minWidth"
+                      v-for="(item, index) in formValidate.is_virtual ? columns3 : columns2"
+                      :key="index"
+                    >
+                      <template slot-scope="scope">
+                        <template v-if="item.key">
+                          <div>
+                            <span>{{ scope.row[item.key] }}</span>
+                          </div>
+                        </template>
+                        <template v-else-if="item.slot === 'pic'">
+                          <div
+                            class="acea-row row-middle row-center-wrapper"
+                            @click="modalPicTap('dan', 'duopi', index)"
+                          >
+                            <div class="pictrue pictrueTab" v-if="oneFormBatch[0].pic">
+                              <img v-lazy="oneFormBatch[0].pic" />
+                            </div>
+                            <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
+                              <Icon type="ios-camera-outline" size="21" class="iconfont" />
+                            </div>
+                          </div>
+                        </template>
+                        <template v-else-if="item.slot === 'price'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="oneFormBatch[0].price"
+                            :min="0"
+                            :max="99999999"
+                            class="priceBox"
+                          ></el-input-number>
+                        </template>
+                        <template v-else-if="item.slot === 'cost'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="oneFormBatch[0].cost"
+                            :min="0"
+                            :max="99999999"
+                            class="priceBox"
+                          ></el-input-number>
+                        </template>
+                        <template v-else-if="item.slot === 'ot_price'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="oneFormBatch[0].ot_price"
+                            :min="0"
+                            class="priceBox"
+                          ></el-input-number>
+                        </template>
+                        <template v-else-if="item.slot === 'stock'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="oneFormBatch[0].stock"
+                            :disabled="formValidate.virtual_type == 1"
+                            :min="0"
+                            :max="99999999"
+                            class="priceBox"
+                          ></el-input-number>
+                        </template>
+                        <template v-else-if="item.slot === 'fictitious'">
+                          <el-button
+                            v-if="!row.coupon_id && formValidate.virtual_type == 2"
+                            @click="addGoodsCoupon(index, 'oneFormBatch')"
+                            >添加优惠券</el-button
+                          >
+                          <span
+                            class="see"
+                            v-else-if="row.coupon_id && formValidate.virtual_type == 2"
+                            @click="see(row, 'manyFormValidate', index)"
+                            >{{ row.coupon_name }}</span
+                          >
+                          <el-button
+                            v-else-if="!row.virtual_list.length && formValidate.virtual_type == 1"
+                            @click="addVirtual(index, 'oneFormBatch')"
+                            >添加卡密</el-button
+                          >
+                          <span
+                            class="see"
+                            v-else-if="row.virtual_list.length && formValidate.virtual_type == 1"
+                            @click="see(row, 'oneFormBatch', index)"
+                            >已设置</span
+                          >
+                        </template>
+                        <template v-else-if="item.slot === 'bar_code'">
+                          <el-input v-model="oneFormBatch[0].bar_code"></el-input>
+                        </template>
+                        <template v-else-if="item.slot === 'weight'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="oneFormBatch[0].weight"
+                            :step="0.1"
+                            :min="0"
+                            :max="99999999"
+                            class="priceBox"
+                          ></el-input-number>
+                        </template>
+                        <template v-else-if="item.slot === 'volume'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="oneFormBatch[0].volume"
+                            :step="0.1"
+                            :min="0"
+                            :max="99999999"
+                            class="priceBox"
+                          ></el-input-number>
+                        </template>
+                        <template v-else-if="item.slot === 'action'">
+                          <a @click="batchAdd">批量添加</a>
+                          <el-divider direction="vertical"></el-divider>
+                          <a @click="batchDel">清空</a>
+                        </template>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-form-item>
+              </el-col>
               <!-- 多规格表格-->
-              <Col span="24">
-                <FormItem label="商品属性：" class="labeltop">
-                  <Table :data="manyFormValidate" :columns="formValidate.header" border>
-                    <template slot-scope="{ row, index }" slot="pic">
-                      <div
-                        class="acea-row row-middle row-center-wrapper"
-                        @click="modalPicTap('dan', 'duoTable', index)"
-                      >
-                        <div class="pictrue pictrueTab" v-if="manyFormValidate[index].pic">
-                          <img v-lazy="manyFormValidate[index].pic" />
-                        </div>
-                        <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
-                          <Icon type="ios-camera-outline" size="21" class="iconfont" />
-                        </div>
-                      </div>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="price">
-                      <InputNumber
-                        v-model="manyFormValidate[index].price"
-                        :min="0"
-                        :max="99999999"
-                        class="priceBox"
-                      ></InputNumber>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="cost">
-                      <InputNumber
-                        v-model="manyFormValidate[index].cost"
-                        :min="0"
-                        :max="99999999"
-                        class="priceBox"
-                      ></InputNumber>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="ot_price">
-                      <InputNumber
-                        v-model="manyFormValidate[index].ot_price"
-                        :min="0"
-                        :max="99999999"
-                        class="priceBox"
-                      ></InputNumber>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="stock">
-                      <InputNumber
-                        v-model="manyFormValidate[index].stock"
-                        :disabled="formValidate.virtual_type == 1"
-                        :min="0"
-                        :max="99999999"
-                        :precision="0"
-                        class="priceBox"
-                      ></InputNumber>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="bar_code">
-                      <Input v-model="manyFormValidate[index].bar_code"></Input>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="weight">
-                      <InputNumber
-                        v-model="manyFormValidate[index].weight"
-                        :min="0"
-                        :max="99999999"
-                        class="priceBox"
-                      ></InputNumber>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="volume">
-                      <InputNumber
-                        v-model="manyFormValidate[index].volume"
-                        :min="0"
-                        :max="99999999"
-                        class="priceBox"
-                      ></InputNumber>
-                    </template>
-                    <template slot-scope="{ row, index }" slot="fictitious">
-                      <Button
-                        v-if="!row.coupon_id && formValidate.virtual_type == 2"
-                        @click="addGoodsCoupon(index, 'manyFormValidate')"
-                        >添加优惠券</Button
-                      >
-                      <span
-                        class="see"
-                        v-else-if="row.coupon_id && formValidate.virtual_type == 2"
-                        @click="see(row, 'manyFormValidate', index)"
-                        >{{ row.coupon_name }}</span
-                      >
-                      <Button
-                        v-else-if="!row.virtual_list && !row.stock && formValidate.virtual_type == 1"
-                        @click="addVirtual(index, 'manyFormValidate')"
-                        >添加卡密</Button
-                      >
-                      <span
-                        class="see"
-                        v-else-if="(row.virtual_list.length || row.stock) && formValidate.virtual_type == 1"
-                        @click="see(row, 'manyFormValidate', index)"
-                        >已设置</span
-                      >
-                    </template>
-                    <template slot-scope="{ row, index }" slot="action">
-                      <a @click="delAttrTable(index)">删除</a>
-                    </template>
-                  </Table>
-                </FormItem>
-              </Col>
-            </Col>
-          </Col>
+              <el-col :span="24">
+                <el-form-item label="商品属性：" class="labeltop">
+                  <el-table :data="manyFormValidate" border>
+                    <el-table-column
+                      :label="item.title"
+                      :min-width="item.minWidth"
+                      v-for="(item, index) in formValidate.header"
+                      :key="index"
+                    >
+                      <template slot-scope="scope">
+                        <template v-if="item.key">
+                          <div>
+                            <span>{{ scope.row[item.key] }}</span>
+                          </div>
+                        </template>
+                        <template v-else-if="item.slot === 'pic'">
+                          <div
+                            class="acea-row row-middle row-center-wrapper"
+                            @click="modalPicTap('dan', 'duoTable', index)"
+                          >
+                            <div class="pictrue pictrueTab" v-if="manyFormValidate[index].pic">
+                              <img v-lazy="manyFormValidate[index].pic" />
+                            </div>
+                            <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
+                              <Icon type="ios-camera-outline" size="21" class="iconfont" />
+                            </div>
+                          </div>
+                        </template>
+                        <template v-else-if="item.slot === 'price'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="manyFormValidate[scope.$index].price"
+                            :min="0"
+                            :max="99999999"
+                            class="priceBox"
+                          ></el-input-number>
+                        </template>
+                        <template v-else-if="item.slot === 'cost'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="manyFormValidate[scope.$index].cost"
+                            :min="0"
+                            :max="99999999"
+                            class="priceBox"
+                          ></el-input-number>
+                        </template>
+                        <template v-else-if="item.slot === 'ot_price'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="manyFormValidate[scope.$index].ot_price"
+                            :min="0"
+                            :max="99999999"
+                            class="priceBox"
+                          ></el-input-number>
+                        </template>
+                        <template v-else-if="item.slot === 'stock'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="manyFormValidate[scope.$index].stock"
+                            :disabled="formValidate.virtual_type == 1"
+                            :min="0"
+                            :max="99999999"
+                            :precision="0"
+                            class="priceBox"
+                          ></el-input-number>
+                        </template>
+                        <template v-else-if="item.slot === 'bar_code'">
+                          <el-input v-model="manyFormValidate[scope.$index].bar_code"></el-input>
+                        </template>
+                        <template v-else-if="item.slot === 'weight'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="manyFormValidate[scope.$index].weight"
+                            :min="0"
+                            :max="99999999"
+                            class="priceBox"
+                          ></el-input-number>
+                        </template>
+                        <template v-else-if="item.slot === 'volume'">
+                          <el-input-number
+                            controls-position="right"
+                            v-model="manyFormValidate[scope.$index].volume"
+                            :min="0"
+                            :max="99999999"
+                            class="priceBox"
+                          ></el-input-number>
+                        </template>
+                        <template v-else-if="item.slot === 'fictitious'">
+                          <el-button
+                            v-if="!row.coupon_id && formValidate.virtual_type == 2"
+                            @click="addGoodsCoupon(scope.$index, 'manyFormValidate')"
+                            >添加优惠券</el-button
+                          >
+                          <span
+                            class="see"
+                            v-else-if="row.coupon_id && formValidate.virtual_type == 2"
+                            @click="see(row, 'manyFormValidate', scope.$index)"
+                            >{{ row.coupon_name }}</span
+                          >
+                          <el-button
+                            v-else-if="!row.virtual_list && !row.stock && formValidate.virtual_type == 1"
+                            @click="addVirtual(index, 'manyFormValidate')"
+                            >添加卡密</el-button
+                          >
+                          <span
+                            class="see"
+                            v-else-if="(row.virtual_list.length || row.stock) && formValidate.virtual_type == 1"
+                            @click="see(row, 'manyFormValidate', scope.$index)"
+                            >已设置</span
+                          >
+                        </template>
+                        <template v-else-if="item.slot === 'action'">
+                          <a @click="delAttrTable(scope.$index)">删除</a>
+                        </template>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-col>
           <!-- 单规格表格-->
           <div v-if="formValidate.spec_type === 0">
-            <Col span="24">
-              <FormItem label="图片：">
+            <el-col :span="24">
+              <el-form-item label="图片：">
                 <div class="pictrueBox" @click="modalPicTap('dan', 'danTable', 0)">
                   <div class="pictrue" v-if="oneFormValidate[0].pic">
                     <img v-lazy="oneFormValidate[0].pic" />
-                    <Input v-model="oneFormValidate[0].pic" style="display: none"></Input>
+                    <el-input v-model="oneFormValidate[0].pic" style="display: none"></el-input>
                   </div>
                   <div class="upLoad acea-row row-center-wrapper" v-else>
-                    <Input v-model="oneFormValidate[0].pic" style="display: none"></Input>
+                    <el-input v-model="oneFormValidate[0].pic" style="display: none"></el-input>
                     <Icon type="ios-camera-outline" size="26" />
                   </div>
                 </div>
-              </FormItem>
-            </Col>
-            <Col span="24">
-              <FormItem label="售价：">
-                <InputNumber
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="售价：">
+                <el-input-number
+                  controls-position="right"
                   v-model="oneFormValidate[0].price"
                   :min="0"
                   :precision="2"
                   :max="99999999"
                   class="perW20"
                   :active-change="false"
-                ></InputNumber>
-              </FormItem>
-            </Col>
-            <Col span="24">
-              <FormItem label="成本价：">
-                <InputNumber
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="成本价：">
+                <el-input-number
+                  controls-position="right"
                   v-model="oneFormValidate[0].cost"
                   :min="0"
                   :max="99999999"
                   :precision="2"
                   :active-change="false"
                   class="perW20"
-                ></InputNumber>
-              </FormItem>
-            </Col>
-            <Col span="24">
-              <FormItem label="原价：">
-                <InputNumber
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="原价：">
+                <el-input-number
+                  controls-position="right"
                   v-model="oneFormValidate[0].ot_price"
                   :min="0"
                   :max="99999999"
                   :precision="2"
                   :active-change="false"
                   class="perW20"
-                ></InputNumber>
-              </FormItem>
-            </Col>
-            <Col span="24">
-              <FormItem label="库存：">
-                <InputNumber
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="库存：">
+                <el-input-number
+                  controls-position="right"
                   v-model="oneFormValidate[0].stock"
                   :min="0"
                   :max="99999999"
                   :disabled="formValidate.virtual_type == 1"
                   :precision="0"
                   class="perW20"
-                ></InputNumber>
-              </FormItem>
-            </Col>
-            <Col span="24">
-              <FormItem label="商品编号：">
-                <Input v-model.trim="oneFormValidate[0].bar_code" class="perW20"></Input>
-              </FormItem>
-            </Col>
-            <Col span="24" v-if="formValidate.virtual_type == 0">
-              <FormItem label="重量（KG）：">
-                <InputNumber v-model="oneFormValidate[0].weight" :min="0" :max="99999999" class="perW20"></InputNumber>
-              </FormItem>
-            </Col>
-            <Col span="24">
-              <FormItem label="体积(m³)：" v-if="formValidate.virtual_type == 0">
-                <InputNumber v-model="oneFormValidate[0].volume" :min="0" :max="99999999" class="perW20"></InputNumber>
-              </FormItem>
-            </Col>
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="商品编号：">
+                <el-input v-model.trim="oneFormValidate[0].bar_code" class="perW20"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="formValidate.virtual_type == 0">
+              <el-form-item label="重量（KG）：">
+                <el-input-number
+                  controls-position="right"
+                  v-model="oneFormValidate[0].weight"
+                  :min="0"
+                  :max="99999999"
+                  class="perW20"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="体积(m³)：" v-if="formValidate.virtual_type == 0">
+                <el-input-number
+                  controls-position="right"
+                  v-model="oneFormValidate[0].volume"
+                  :min="0"
+                  :max="99999999"
+                  class="perW20"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
 
-            <Col span="24">
-              <FormItem label="虚拟商品：" v-if="formValidate.virtual_type == 1 || formValidate.virtual_type == 2">
-                <Button
+            <el-col :span="24">
+              <el-form-item label="虚拟商品：" v-if="formValidate.virtual_type == 1 || formValidate.virtual_type == 2">
+                <el-button
                   v-if="!oneFormValidate[0].coupon_id && formValidate.virtual_type == 2"
                   @click="addGoodsCoupon(0, 'oneFormValidate')"
-                  >添加优惠券</Button
+                  >添加优惠券</el-button
                 >
                 <span
                   class="see"
@@ -593,14 +659,14 @@
                   @click="see(oneFormValidate[0], 'oneFormValidate', 0)"
                   >{{ oneFormValidate[0].coupon_name }}</span
                 >
-                <Button
+                <el-button
                   v-if="
                     !oneFormValidate[0].virtual_list.length &&
                     !oneFormValidate[0].stock &&
                     formValidate.virtual_type == 1
                   "
                   @click="addVirtual(0, 'oneFormValidate')"
-                  >添加卡密</Button
+                  >添加卡密</el-button
                 >
                 <span
                   class="see"
@@ -611,95 +677,124 @@
                   @click="see(oneFormValidate[0], 'oneFormValidate', 0)"
                   >已设置</span
                 >
-              </FormItem>
-            </Col>
+              </el-form-item>
+            </el-col>
           </div>
-        </Row>
+        </el-row>
         <!-- 商品详情-->
-        <Row v-show="currentTab === '3'">
-          <Col span="16">
-            <FormItem label="商品详情：">
+        <el-row v-show="currentTab === '3'">
+          <el-col :span="16">
+            <el-form-item label="商品详情：">
               <WangEditor style="width: 100%" :content="contents" @editorContent="getEditorContent"></WangEditor>
-            </FormItem>
-          </Col>
-          <Col span="6" style="width: 33%">
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="width: 33%">
             <div class="ifam">
               <div class="content" v-html="content"></div>
             </div>
-          </Col>
-        </Row>
+          </el-col>
+        </el-row>
 
         <!-- 物流设置-->
-        <Row v-show="headTab.length === 6 ? currentTab === '4' : false">
-          <Col span="24">
-            <FormItem label="物流方式：" prop="logistics">
-              <CheckboxGroup v-model="formValidate.logistics" @on-change="logisticsBtn">
-                <Checkbox label="1">快递</Checkbox>
+        <el-row v-show="headTab.length === 6 ? currentTab === '4' : false">
+          <el-col :span="24">
+            <el-form-item label="物流方式：" prop="logistics">
+              <el-checkbox-group v-model="formValidate.logistics" @change="logisticsBtn">
+                <el-checkbox label="1">快递</el-checkbox>
 
-                <Checkbox label="2">到店核销</Checkbox>
-              </CheckboxGroup>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="运费设置：">
-              <RadioGroup v-model="formValidate.freight">
-                <!-- <Radio :label="1">包邮</Radio> -->
-                <Radio :label="2">固定邮费</Radio>
-                <Radio :label="3">运费模板</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col span="24" v-if="formValidate.freight != 3 && formValidate.freight != 1">
-            <FormItem label="" :prop="formValidate.freight != 1 ? 'freight' : ''">
+                <el-checkbox label="2">到店核销</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="运费设置：">
+              <el-radio-group v-model="formValidate.freight">
+                <!-- <el-radio :label="1">包邮</el-radio> -->
+                <el-radio :label="2">固定邮费</el-radio>
+                <el-radio :label="3">运费模板</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="formValidate.freight != 3 && formValidate.freight != 1">
+            <el-form-item label="" :prop="formValidate.freight != 1 ? 'freight' : ''">
               <div class="acea-row">
-                <InputNumber :min="0" v-model="formValidate.postage" placeholder="请输入金额" class="perW30 maxW" />
+                <el-input-number
+                  controls-position="right"
+                  :min="0"
+                  v-model="formValidate.postage"
+                  placeholder="请输入金额"
+                  class="perW30 maxW"
+                />
               </div>
-            </FormItem>
-          </Col>
-          <Col span="24" v-if="formValidate.freight == 3">
-            <FormItem label="" prop="temp_id">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="formValidate.freight == 3">
+            <el-form-item label="" prop="temp_id">
               <div class="acea-row">
-                <Select v-model="formValidate.temp_id" clearable placeholder="请选择运费模板" class="perW30 maxW">
-                  <Option v-for="(item, index) in templateList" :value="item.id" :key="index">{{ item.name }}</Option>
-                </Select>
+                <el-select v-model="formValidate.temp_id" clearable placeholder="请选择运费模板" class="perW30 maxW">
+                  <el-option
+                    v-for="(item, index) in templateList"
+                    :value="item.id"
+                    :key="index"
+                    :label="item.name"
+                  ></el-option>
+                </el-select>
                 <span class="addfont" @click="addTemp">新增运费模板</span>
               </div>
-            </FormItem>
-          </Col>
-        </Row>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <!-- 营销设置-->
-        <Row :gutter="24" type="flex" v-show="headTab.length === 6 ? currentTab === '5' : currentTab === '4'">
-          <Col span="24">
-            <FormItem label="已售数量：">
-              <InputNumber :min="0" :max="999999" v-model="formValidate.ficti" placeholder="请输入虚拟销量" />
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="排序：">
-              <InputNumber :min="0" :max="999999" v-model="formValidate.sort" placeholder="请输入排序" />
-            </FormItem>
-          </Col>
-          <Col span="24">
+        <el-row :gutter="24" v-show="headTab.length === 6 ? currentTab === '5' : currentTab === '4'">
+          <el-col :span="24">
+            <el-form-item label="已售数量：">
+              <el-input-number
+                controls-position="right"
+                :min="0"
+                :max="999999"
+                v-model="formValidate.ficti"
+                placeholder="请输入虚拟销量"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="排序：">
+              <el-input-number
+                controls-position="right"
+                :min="0"
+                :max="999999"
+                v-model="formValidate.sort"
+                placeholder="请输入排序"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
             <div class="line"></div>
-          </Col>
+          </el-col>
 
-          <Col span="24">
-            <FormItem label="购买送积分：" prop="give_integral">
-              <InputNumber v-model="formValidate.give_integral" :min="0" :max="999999" placeholder="请输入积分" />
-            </FormItem>
-          </Col>
-          <Col v-bind="grid3">
-            <FormItem label="购买送优惠券：">
+          <el-col :span="24">
+            <el-form-item label="购买送积分：" prop="give_integral">
+              <el-input-number
+                controls-position="right"
+                v-model="formValidate.give_integral"
+                :min="0"
+                :max="999999"
+                placeholder="请输入积分"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid3">
+            <el-form-item label="购买送优惠券：">
               <div v-if="couponName.length" class="mb20">
                 <Tag closable v-for="(item, index) in couponName" :key="index" @on-close="handleClose(item)">{{
                   item.title
                 }}</Tag>
               </div>
-              <Button type="primary" @click="addCoupon">添加优惠券</Button>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="关联用户标签：" prop="label_id">
+              <el-button type="primary" @click="addCoupon">添加优惠券</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="关联用户标签：" prop="label_id">
               <div style="display: flex">
                 <div class="labelInput acea-row row-between-wrapper" @click="openLabel">
                   <div style="width: 90%">
@@ -714,340 +809,392 @@
                 </div>
                 <span class="addfont" @click="addLabel">新增标签</span>
               </div>
-            </FormItem>
-          </Col>
-          <Col span="24">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
             <div class="line"></div>
-          </Col>
-          <Col span="24">
-            <FormItem label="付费会员专属：">
-              <i-switch v-model="formValidate.vip_product" size="large">
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="付费会员专属：">
+              <el-switch :active-value="1" :inactive-value="0" v-model="formValidate.vip_product" size="large">
                 <span slot="open">开启</span>
                 <span slot="close">关闭</span>
-              </i-switch>
+              </el-switch>
               <div class="titTip">开启后仅付费会员可以看见并购买此商品</div>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="单独设置：">
-              <CheckboxGroup v-model="formValidate.is_sub" @on-change="checkAllGroupChange">
-                <Checkbox :label="1">佣金设置（数字即返佣金额）</Checkbox>
-                <Checkbox :label="0">付费会员价</Checkbox>
-              </CheckboxGroup>
-              <!-- <RadioGroup v-model="formValidate.is_sub">
-                                <Radio :label="1" class="radio">佣金设置</Radio>
-                                <Radio :label="0">会员价</Radio>
-                            </RadioGroup> -->
-            </FormItem>
-          </Col>
-          <Col span="24" v-if="formValidate.is_sub.length">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="单独设置：">
+              <el-checkbox-group v-model="formValidate.is_sub" @change="checkAllGroupChange">
+                <el-checkbox :label="1">佣金设置（数字即返佣金额）</el-checkbox>
+                <el-checkbox :label="0">付费会员价</el-checkbox>
+              </el-checkbox-group>
+              <!-- <el-radio-group v-model="formValidate.is_sub">
+                                <el-radio :label="1" class="radio">佣金设置</el-radio>
+                                <el-radio :label="0">会员价</el-radio>
+                            </el-radio-group> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="formValidate.is_sub.length">
             <!--单规格返佣-->
-            <FormItem label="商品属性：" v-if="formValidate.spec_type === 0">
-              <Table :data="oneFormValidate" :columns="columnsInstall" border>
-                <template slot-scope="{ row, index }" slot="pic">
-                  <div class="pictrue pictrueTab">
-                    <img v-lazy="oneFormValidate[0].pic" />
-                  </div>
-                </template>
-                <template slot-scope="{ row, index }" slot="price">{{ oneFormValidate[0].price }}</template>
-                <template slot-scope="{ row, index }" slot="cost">{{ oneFormValidate[0].cost }}</template>
-                <template slot-scope="{ row, index }" slot="ot_price">{{ oneFormValidate[0].ot_price }}</template>
-                <template slot-scope="{ row, index }" slot="stock">{{ oneFormValidate[0].stock }}</template>
-                <template slot-scope="{ row, index }" slot="bar_code">{{ oneFormValidate[0].bar_code }}</template>
-                <template slot-scope="{ row, index }" slot="weight">{{ oneFormValidate[0].weight }}</template>
-                <template slot-scope="{ row, index }" slot="fictitious">
-                  <Button
-                    v-if="!row.coupon_id && formValidate.virtual_type == 2"
-                    @click="addGoodsCoupon(index, 'oneFormValidate')"
-                    >添加优惠券</Button
-                  >
-                  <span
-                    class="see"
-                    v-else-if="row.coupon_id && formValidate.virtual_type == 2"
-                    @click="see(row, 'manyFormValidate', index)"
-                    >{{ row.coupon_name }}</span
-                  >
-                  <Button
-                    v-else-if="!row.virtual_list.length && !row.stock && formValidate.virtual_type == 1"
-                    @click="addVirtual(index, 'oneFormValidate')"
-                    >添加卡密</Button
-                  >
-                  <span
-                    class="see"
-                    v-else-if="(row.virtual_list.length || row.stock) && formValidate.virtual_type == 1"
-                    @click="see(row, 'oneFormValidate', index)"
-                    >已设置</span
-                  >
-                </template>
-                <template slot-scope="{ row, index }" slot="volume">{{ oneFormValidate[0].volume }}</template>
-                <template slot-scope="{ row, index }" slot="brokerage">
-                  <InputNumber
-                    v-model="oneFormValidate[0].brokerage"
-                    :min="0"
-                    :max="999999"
-                    class="priceBox"
-                  ></InputNumber>
-                </template>
-                <template slot-scope="{ row }" slot="brokerage_two">
-                  <InputNumber
-                    v-model="oneFormValidate[0].brokerage_two"
-                    :min="0"
-                    :max="999999"
-                    class="priceBox"
-                  ></InputNumber>
-                </template>
-                <template slot-scope="{ row }" slot="vip_price">
-                  <InputNumber
-                    v-model="oneFormValidate[0].vip_price"
-                    :min="0"
-                    :max="999999"
-                    class="priceBox"
-                  ></InputNumber>
-                </template>
-              </Table>
-              <!-- <Table v-else :data="oneFormValidate" :columns="columnsInsta8" border>
-                                <template slot-scope="{ row, index }" slot="pic">
-                                    <div class="pictrue pictrueTab"><img v-lazy="oneFormValidate[0].pic"></div>
-                                </template>
-                                <template slot-scope="{ row, index }" slot="price">{{oneFormValidate[0].price}}</template>
-                                <template slot-scope="{ row, index }" slot="cost">{{oneFormValidate[0].cost}}</template>
-                                <template slot-scope="{ row, index }" slot="ot_price">{{oneFormValidate[0].ot_price}}</template>
-                                <template slot-scope="{ row, index }" slot="vip_price">
-                                    <InputNumber  v-model="oneFormValidate[0].vip_price" :min="0" :precision="0" class="priceBox"></InputNumber>
-                                </template>
-                            </Table> -->
-            </FormItem>
+            <el-form-item label="商品属性：" v-if="formValidate.spec_type === 0">
+              <el-table :data="oneFormValidate" border>
+                <el-table-column
+                  :label="item.title"
+                  :min-width="item.minWidth"
+                  v-for="(item, index) in columnsInstall"
+                  :key="index"
+                >
+                  <template slot-scope="scope">
+                    <template v-if="item.key">
+                      <div>
+                        <span>{{ scope.row[item.key] }}</span>
+                      </div>
+                    </template>
+                    <template v-else-if="item.slot === 'pic'">
+                      <div class="pictrue pictrueTab">
+                        <img v-lazy="oneFormValidate[0].pic" />
+                      </div>
+                    </template>
+                    <template v-else-if="item.slot === 'price'">
+                      <span>{{ oneFormValidate[0].price }}</span>
+                    </template>
+                    <template v-else-if="item.slot === 'cost'">
+                      <span>{{ oneFormValidate[0].cost }}</span>
+                    </template>
+                    <template v-else-if="item.slot === 'ot_price'">
+                      <span>{{ oneFormValidate[0].ot_price }}</span>
+                    </template>
+                    <template v-else-if="item.slot === 'stock'">
+                      <span>{{ oneFormValidate[0].stock }}</span>
+                    </template>
+                    <template v-else-if="item.slot === 'bar_code'">
+                      <span>{{ oneFormValidate[0].bar_code }}</span>
+                    </template>
+                    <template v-else-if="item.slot === 'weight'">
+                      <span>{{ oneFormValidate[0].weight }}</span>
+                    </template>
+                    <template v-else-if="item.slot === 'fictitious'">
+                      <el-button
+                        v-if="!row.coupon_id && formValidate.virtual_type == 2"
+                        @click="addGoodsCoupon(scope.$index, 'oneFormValidate')"
+                        >添加优惠券</el-button
+                      >
+                      <span
+                        class="see"
+                        v-else-if="row.coupon_id && formValidate.virtual_type == 2"
+                        @click="see(row, 'manyFormValidate', scope.$index)"
+                        >{{ row.coupon_name }}</span
+                      >
+                      <el-button
+                        v-else-if="!row.virtual_list.length && !row.stock && formValidate.virtual_type == 1"
+                        @click="addVirtual(scope.$index, 'oneFormValidate')"
+                        >添加卡密</el-button
+                      >
+                      <span
+                        class="see"
+                        v-else-if="(row.virtual_list.length || row.stock) && formValidate.virtual_type == 1"
+                        @click="see(row, 'oneFormValidate', scope.$index)"
+                        >已设置</span
+                      >
+                    </template>
+                    <template v-else-if="item.slot === 'brokerage'">
+                      <el-input-number
+                        controls-position="right"
+                        v-model="oneFormValidate[0].brokerage"
+                        :min="0"
+                        :max="999999"
+                        class="priceBox"
+                      ></el-input-number>
+                    </template>
+                    <template v-else-if="item.slot === 'brokerage_two'">
+                      <el-input-number
+                        controls-position="right"
+                        v-model="oneFormValidate[0].brokerage_two"
+                        :min="0"
+                        :max="999999"
+                        class="priceBox"
+                      ></el-input-number>
+                    </template>
+                    <template v-else-if="item.slot === 'vip_price'">
+                      <el-input-number
+                        controls-position="right"
+                        v-model="oneFormValidate[0].vip_price"
+                        :min="0"
+                        :max="999999"
+                        class="priceBox"
+                      ></el-input-number>
+                    </template>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
             <!--多规格返佣-->
-            <FormItem label="批量设置：" v-if="formValidate.spec_type === 1">
+            <el-form-item label="批量设置：" v-if="formValidate.spec_type === 1">
               <span v-if="formValidate.is_sub.indexOf(1) > -1">
-                一级返佣：<InputNumber
+                一级返佣：<el-input-number
+                  controls-position="right"
                   placeholder="请输入一级返佣"
                   :min="0"
                   :max="9999999"
                   class="columnsBox perW30"
                   v-model="manyBrokerage"
-                ></InputNumber>
-                二级返佣：<InputNumber
+                ></el-input-number>
+                二级返佣：<el-input-number
+                  controls-position="right"
                   placeholder="请输入二级返佣"
                   :min="0"
                   :max="99999999"
                   class="columnsBox perW30"
                   v-model="manyBrokerageTwo"
-                ></InputNumber>
+                ></el-input-number>
               </span>
               <span v-if="formValidate.is_sub.indexOf(0) > -1">
-                会员价：<InputNumber
+                会员价：<el-input-number
+                  controls-position="right"
                   placeholder="请输入会员价"
                   :min="0"
                   :max="99999999"
                   class="columnsBox perW30"
                   v-model="manyVipPrice"
-                ></InputNumber>
+                ></el-input-number>
               </span>
-              <Button type="primary" @click="brokerageSetUp">批量设置</Button>
+              <el-button type="primary" @click="brokerageSetUp">批量设置</el-button>
               <!-- <template v-if="formValidate.is_sub">
-                                <InputNumber v-width="'20%'" placeholder="请输入一级返佣" :min="0" class="columnsBox" v-model="manyBrokerage"></InputNumber>
-                                <InputNumber v-width="'20%'" placeholder="请输入二级返佣" :min="0" class="columnsBox" v-model="manyBrokerageTwo"></InputNumber>
-                                <Button type="primary" @click="brokerageSetUp">批量设置</Button>
+                                <el-input-number controls-position="right" v-width="'20%'" placeholder="请输入一级返佣" :min="0" class="columnsBox" v-model="manyBrokerage"></el-input-number>
+                                <el-input-number controls-position="right" v-width="'20%'" placeholder="请输入二级返佣" :min="0" class="columnsBox" v-model="manyBrokerageTwo"></el-input-number>
+                                <el-button type="primary" @click="brokerageSetUp">批量设置</el-button>
                             </template>
                             <template v-else>
-                                <InputNumber v-width="'20%'" placeholder="请输入会员价" :min="0" class="columnsBox" v-model="manyVipPrice"></InputNumber>
-                                <Button type="primary" @click="vipPriceSetUp">批量设置</Button>
+                                <el-input-number controls-position="right" v-width="'20%'" placeholder="请输入会员价" :min="0" class="columnsBox" v-model="manyVipPrice"></el-input-number>
+                                <el-button type="primary" @click="vipPriceSetUp">批量设置</el-button>
                             </template> -->
-            </FormItem>
-            <FormItem label="商品属性：" v-if="formValidate.spec_type === 1 && manyFormValidate.length">
-              <Table v-if="formValidate.is_sub" :data="manyFormValidate" :columns="columnsInstal2" border>
-                <template slot-scope="{ row, index }" slot="pic">
-                  <div class="pictrue pictrueTab">
-                    <img v-lazy="manyFormValidate[index].pic" />
-                  </div>
-                </template>
-                <template slot-scope="{ row, index }" slot="price">{{ manyFormValidate[index].price }}</template>
-                <template slot-scope="{ row, index }" slot="cost">{{ manyFormValidate[index].cost }}</template>
-                <template slot-scope="{ row, index }" slot="ot_price">{{ manyFormValidate[index].ot_price }}</template>
-                <template slot-scope="{ row, index }" slot="stock">{{ manyFormValidate[index].stock }}</template>
-                <template slot-scope="{ row, index }" slot="bar_code">{{ manyFormValidate[index].bar_code }}</template>
-                <template slot-scope="{ row, index }" slot="weight">{{ manyFormValidate[index].weight }}</template>
-                <template slot-scope="{ row, index }" slot="fictitious">
-                  <Button
-                    v-if="!row.coupon_id && formValidate.virtual_type == 2"
-                    @click="addGoodsCoupon(index, 'manyFormValidate')"
-                    >添加优惠券</Button
-                  >
-                  <span
-                    class="see"
-                    v-else-if="row.coupon_id && formValidate.virtual_type == 2"
-                    @click="see(row, 'manyFormValidate', index)"
-                    >{{ row.coupon_name }}</span
-                  >
-                  <Button
-                    v-else-if="!row.virtual_list.length && !row.stock && formValidate.virtual_type == 1"
-                    @click="addVirtual(index, 'manyFormValidate')"
-                    >添加卡密</Button
-                  >
-                  <span
-                    class="see"
-                    v-else-if="(row.virtual_list.length || row.stock) && formValidate.virtual_type == 1"
-                    @click="see(row, 'manyFormValidate', index)"
-                    >已设置</span
-                  >
-                </template>
-                <template slot-scope="{ row, index }" slot="volume">{{ manyFormValidate[index].volume }}</template>
-                <template slot-scope="{ row, index }" slot="brokerage">
-                  <InputNumber
-                    v-model="manyFormValidate[index].brokerage"
-                    :min="0"
-                    :max="99999999"
-                    class="priceBox"
-                  ></InputNumber>
-                </template>
-                <template slot-scope="{ row, index }" slot="brokerage_two">
-                  <InputNumber
-                    v-model="manyFormValidate[index].brokerage_two"
-                    :min="0"
-                    :max="99999999"
-                    class="priceBox"
-                  ></InputNumber>
-                </template>
-                <template slot-scope="{ row, index }" slot="vip_price">
-                  <InputNumber
-                    v-model="manyFormValidate[index].vip_price"
-                    :min="0"
-                    :max="99999999"
-                    class="priceBox"
-                  ></InputNumber>
-                </template>
-              </Table>
-              <!-- <Table v-else :data="manyFormValidate" :columns="columnsInsta9" border>
-                                <template slot-scope="{ row, index }" slot="pic">
-                                    <div class="pictrue pictrueTab"><img v-lazy="manyFormValidate[index].pic"></div>
-                                </template>
-                                <template slot-scope="{ row, index }" slot="price">{{manyFormValidate[index].price}}</template>
-                                <template slot-scope="{ row, index }" slot="cost">{{manyFormValidate[index].cost}}</template>
-                                <template slot-scope="{ row, index }" slot="ot_price">{{manyFormValidate[index].ot_price}}</template>
-                                <template slot-scope="{ row, index }" slot="vip_price">
-                                    <InputNumber  v-model="manyFormValidate[index].vip_price" :min="0" class="priceBox"></InputNumber>
-                                </template>
-                            </Table> -->
-            </FormItem>
-          </Col>
-          <Col span="24">
+            </el-form-item>
+            <el-form-item label="商品属性：" v-if="formValidate.spec_type === 1 && manyFormValidate.length">
+              <el-table v-if="formValidate.is_sub" :data="manyFormValidate" border>
+                <el-table-column
+                  :label="item.title"
+                  :min-width="item.minWidth"
+                  v-for="(item, index) in columnsInstal2"
+                  :key="index"
+                >
+                  <template slot-scope="scope">
+                    <template v-if="item.key">
+                      <div>
+                        <span>{{ scope.row[item.key] }}</span>
+                      </div>
+                    </template>
+                    <template v-else-if="item.slot === 'pic'">
+                      <div class="pictrue pictrueTab">
+                        <img v-lazy="manyFormValidate[scope.$index].pic" />
+                      </div>
+                    </template>
+                    <template v-else-if="item.slot === 'price'">
+                      <span>{{ manyFormValidate[scope.$index].price }}</span>
+                    </template>
+                    <template v-else-if="item.slot === 'cost'">
+                      <span>{{ manyFormValidate[scope.$index].cost }}</span>
+                    </template>
+                    <template v-else-if="item.slot === 'ot_price'">
+                      <span>{{ manyFormValidate[scope.$index].ot_price }}</span>
+                    </template>
+                    <template v-else-if="item.slot === 'stock'">
+                      <span>{{ manyFormValidate[scope.$index].stock }}</span>
+                    </template>
+                    <template v-else-if="item.slot === 'bar_code'">
+                      <span>{{ manyFormValidate[scope.$index].bar_code }}</span>
+                    </template>
+                    <template v-else-if="item.slot === 'weight'">
+                      <span>{{ manyFormValidate[index].weight }}</span>
+                    </template>
+                    <template v-else-if="item.slot === 'fictitious'">
+                      <el-button
+                        v-if="!row.coupon_id && formValidate.virtual_type == 2"
+                        @click="addGoodsCoupon(scope.$index, 'manyFormValidate')"
+                        >添加优惠券</el-button
+                      >
+                      <span
+                        class="see"
+                        v-else-if="row.coupon_id && formValidate.virtual_type == 2"
+                        @click="see(row, 'manyFormValidate', scope.$index)"
+                        >{{ row.coupon_name }}</span
+                      >
+                      <el-button
+                        v-else-if="!row.virtual_list.length && !row.stock && formValidate.virtual_type == 1"
+                        @click="addVirtual(scope.$index, 'manyFormValidate')"
+                        >添加卡密</el-button
+                      >
+                      <span
+                        class="see"
+                        v-else-if="(row.virtual_list.length || row.stock) && formValidate.virtual_type == 1"
+                        @click="see(row, 'manyFormValidate', scope.$index)"
+                        >已设置</span
+                      >
+                    </template>
+                    <template v-else-if="item.slot === 'volume'">
+                      <span>{{ manyFormValidate[scope.$index].volume }}</span>
+                    </template>
+                    <template v-else-if="item.slot === 'brokerage'">
+                      <el-input-number
+                        controls-position="right"
+                        v-model="manyFormValidate[scope.$index].brokerage"
+                        :min="0"
+                        :max="99999999"
+                        class="priceBox"
+                      ></el-input-number>
+                    </template>
+                    <template v-else-if="item.slot === 'brokerage_two'">
+                      <el-input-number
+                        controls-position="right"
+                        v-model="manyFormValidate[scope.$index].brokerage_two"
+                        :min="0"
+                        :max="99999999"
+                        class="priceBox"
+                      ></el-input-number>
+                    </template>
+                    <template v-else-if="item.slot === 'vip_price'">
+                      <el-input-number
+                        controls-position="right"
+                        v-model="manyFormValidate[scope.$index].vip_price"
+                        :min="0"
+                        :max="99999999"
+                        class="priceBox"
+                      ></el-input-number>
+                    </template>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
             <div class="line"></div>
-          </Col>
-          <Col span="24">
-            <FormItem label="是否限购：">
-              <i-switch v-model="formValidate.is_limit" size="large">
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="是否限购：">
+              <el-switch :active-value="1" :inactive-value="0" v-model="formValidate.is_limit" size="large">
                 <span slot="open">开启</span>
                 <span slot="close">关闭</span>
-              </i-switch>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="限购类型：" v-if="formValidate.is_limit">
-              <RadioGroup v-model="formValidate.limit_type">
-                <Radio :label="1">单次限购</Radio>
-                <Radio :label="2">永久限购</Radio>
-              </RadioGroup>
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="限购类型：" v-if="formValidate.is_limit">
+              <el-radio-group v-model="formValidate.limit_type">
+                <el-radio :label="1">单次限购</el-radio>
+                <el-radio :label="2">永久限购</el-radio>
+              </el-radio-group>
               <div class="titTip">单次限购是限制每次下单最多购买的数量，永久限购是限制一个用户总共可以购买的数量</div>
-            </FormItem>
-          </Col>
-          <Col span="24" v-if="formValidate.is_limit">
-            <FormItem label="限购数量：" prop="limit_num">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="formValidate.is_limit">
+            <el-form-item label="限购数量：" prop="limit_num">
               <div class="acea-row row-middle">
                 <span class="mr10"></span>
-                <InputNumber placeholder="请输入限购数量" :precision="0" :min="1" v-model="formValidate.limit_num" />
+                <el-input-number
+                  controls-position="right"
+                  placeholder="请输入限购数量"
+                  :precision="0"
+                  :min="1"
+                  v-model="formValidate.limit_num"
+                />
                 <span class="ml10"> 件 </span>
               </div>
-            </FormItem>
-          </Col>
-          <Col span="24" v-if="formValidate.virtual_type == 0 || formValidate.virtual_type == 3">
-            <FormItem label="预售商品：">
-              <i-switch v-model="formValidate.presale" size="large">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="formValidate.virtual_type == 0 || formValidate.virtual_type == 3">
+            <el-form-item label="预售商品：">
+              <el-switch :active-value="1" :inactive-value="0" v-model="formValidate.presale" size="large">
                 <span slot="open">开启</span>
                 <span slot="close">关闭</span>
-              </i-switch>
-            </FormItem>
-          </Col>
-          <Col span="24" v-if="formValidate.presale">
-            <FormItem label="预售活动时间：" prop="presale_time">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="formValidate.presale">
+            <el-form-item label="预售活动时间：" prop="presale_time">
               <div class="acea-row row-middle">
                 <DatePicker
                   :editable="false"
                   type="datetimerange"
                   format="yyyy-MM-dd HH:mm"
                   placeholder="请选择活动时间"
-                  @on-change="onchangeTime"
+                  @change="onchangeTime"
                   :value="formValidate.presale_time"
                   v-model="formValidate.presale_time"
                 ></DatePicker>
               </div>
               <div class="titTip">设置活动开启结束时间，用户可以在设置时间内发起参与预售</div>
-            </FormItem>
-          </Col>
-          <Col span="24" v-if="formValidate.presale">
-            <FormItem label="发货时间：" prop="presale_day">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="formValidate.presale">
+            <el-form-item label="发货时间：" prop="presale_day">
               <div class="acea-row row-middle">
                 <span class="mr10">预售活动结束后</span>
-                <InputNumber placeholder="请输入发货时间" :precision="0" :min="1" v-model="formValidate.presale_day" />
+                <el-input-number
+                  controls-position="right"
+                  placeholder="请输入发货时间"
+                  :precision="0"
+                  :min="1"
+                  v-model="formValidate.presale_day"
+                />
                 <span class="ml10"> 天之内 </span>
                 <div class="ml10 grey"></div>
               </div>
-            </FormItem>
-          </Col>
+            </el-form-item>
+          </el-col>
 
-          <Col span="24">
-            <FormItem label="商品推荐：">
-              <CheckboxGroup v-model="formValidate.recommend">
-                <Checkbox label="is_hot">热卖单品</Checkbox>
-                <Checkbox label="is_benefit">促销单品</Checkbox>
-                <Checkbox label="is_best">精品推荐</Checkbox>
-                <Checkbox label="is_new">首发新品</Checkbox>
-                <Checkbox label="is_good">优品推荐</Checkbox>
-              </CheckboxGroup>
-            </FormItem>
-          </Col>
-          <!-- <Col v-bind="grid">
-            <FormItem label="热卖单品：">
-              <RadioGroup v-model="formValidate.is_hot">
-                <Radio :label="1" class="radio">开启</Radio>
-                <Radio :label="0">关闭</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="促销单品：">
-              <RadioGroup v-model="formValidate.is_benefit">
-                <Radio :label="1" class="radio">开启</Radio>
-                <Radio :label="0">关闭</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="精品推荐：">
-              <RadioGroup v-model="formValidate.is_best">
-                <Radio :label="1" class="radio">开启</Radio>
-                <Radio :label="0">关闭</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="首发新品：">
-              <RadioGroup v-model="formValidate.is_new">
-                <Radio :label="1" class="radio">开启</Radio>
-                <Radio :label="0">关闭</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="优品推荐：">
-              <RadioGroup v-model="formValidate.is_good">
-                <Radio :label="1" class="radio">开启</Radio>
-                <Radio :label="0">关闭</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col> -->
-          <Col v-bind="grid3">
-            <FormItem label="活动优先级：">
+          <el-col :span="24">
+            <el-form-item label="商品推荐：">
+              <el-checkbox-group v-model="formValidate.recommend">
+                <el-checkbox label="is_hot">热卖单品</el-checkbox>
+                <el-checkbox label="is_benefit">促销单品</el-checkbox>
+                <el-checkbox label="is_best">精品推荐</el-checkbox>
+                <el-checkbox label="is_new">首发新品</el-checkbox>
+                <el-checkbox label="is_good">优品推荐</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col v-bind="grid">
+            <el-form-item label="热卖单品：">
+              <el-radio-group v-model="formValidate.is_hot">
+                <el-radio :label="1" class="radio">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="促销单品：">
+              <el-radio-group v-model="formValidate.is_benefit">
+                <el-radio :label="1" class="radio">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="精品推荐：">
+              <el-radio-group v-model="formValidate.is_best">
+                <el-radio :label="1" class="radio">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="首发新品：">
+              <el-radio-group v-model="formValidate.is_new">
+                <el-radio :label="1" class="radio">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="优品推荐：">
+              <el-radio-group v-model="formValidate.is_good">
+                <el-radio :label="1" class="radio">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col> -->
+          <el-col v-bind="grid3">
+            <el-form-item label="活动优先级：">
               <div class="color-list acea-row row-middle">
                 <div
                   class="color-item"
@@ -1064,96 +1211,95 @@
                 </div>
               </div>
               <div class="titTip">可拖动按钮调整活动的优先展示顺序</div>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid3">
-            <FormItem label="选择优品推荐商品：">
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid3">
+            <el-form-item label="选择优品推荐商品：">
               <div class="picBox">
                 <div class="pictrue" v-for="(item, index) in formValidate.recommend_list" :key="index">
                   <img v-lazy="item.image" />
-                  <Button
+                  <el-button
                     shape="circle"
                     icon="md-close"
                     @click.native="handleRemoveRecommend(index)"
                     class="btndel"
-                  ></Button>
+                  ></el-button>
                 </div>
                 <div class="upLoad acea-row row-center-wrapper" @click="changeGoods">
                   <Icon type="ios-add" size="26" class="iconfonts" />
                 </div>
               </div>
-            </FormItem>
-          </Col>
-        </Row>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <!-- 其他设置-->
-        <Row
-          type="flex"
-          justify="space-between"
-          v-show="headTab.length === 6 ? currentTab === '6' : currentTab === '5'"
-        >
-          <Col span="24">
-            <FormItem label="商品关键字：">
-              <Input class="perW30" v-model.trim="formValidate.keyword" placeholder="请输入商品关键字" />
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="商品简介：">
-              <Input
+        <el-row justify="space-between" v-show="headTab.length === 6 ? currentTab === '6' : currentTab === '5'">
+          <el-col :span="24">
+            <el-form-item label="商品关键字：">
+              <el-input class="perW30" v-model.trim="formValidate.keyword" placeholder="请输入商品关键字" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="商品简介：">
+              <el-input
                 class="perW30"
                 v-model.trim="formValidate.store_info"
                 type="textarea"
                 :rows="3"
                 placeholder="请输入商品简介"
               />
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="商品口令：">
-              <Input
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="商品口令：">
+              <el-input
                 v-model.trim="formValidate.command_word"
                 placeholder="请输入商品口令"
                 type="textarea"
                 :rows="3"
                 class="perW30"
               />
-            </FormItem>
-          </Col>
+            </el-form-item>
+          </el-col>
 
-          <Col span="24">
-            <FormItem label="商品推荐图：">
+          <el-col :span="24">
+            <el-form-item label="商品推荐图：">
               <div class="pictrueBox" @click="modalPicTap('dan', 'recommend_image')">
                 <div class="pictrue" v-if="formValidate.recommend_image">
                   <img v-lazy="formValidate.recommend_image" />
-                  <Input v-model.trim="formValidate.recommend_image" style="display: none"></Input>
+                  <el-input v-model.trim="formValidate.recommend_image" style="display: none"></el-input>
                 </div>
                 <div class="upLoad acea-row row-center-wrapper" v-else>
-                  <Input v-model.trim="formValidate.recommend_image" style="display: none"></Input>
+                  <el-input v-model.trim="formValidate.recommend_image" style="display: none"></el-input>
                   <Icon type="ios-camera-outline" size="26" />
                 </div>
                 <div class="titTip">建议比例：5:2</div>
               </div>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="自定义留言：">
-              <i-switch v-model="customBtn" @on-change="customMessBtn" size="large">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="自定义留言：">
+              <el-switch :active-value="1" :inactive-value="0" v-model="customBtn" @change="customMessBtn" size="large">
                 <span slot="open">开启</span>
                 <span slot="close">关闭</span>
-              </i-switch>
+              </el-switch>
               <div class="addCustom_content" v-if="customBtn">
-                <div v-for="(item, index) in formValidate.custom_form" type="flex" :key="index" class="custom_box">
-                  <Input
+                <div v-for="(item, index) in formValidate.custom_form" :key="index" class="custom_box">
+                  <el-input
                     v-model.trim="item.title"
                     :placeholder="'留言标题' + (index + 1)"
                     style="width: 150px; margin-right: 10px"
                     :maxlength="10"
                   />
-                  <Select v-model="item.label" style="width: 200px; margin-left: 6px; margin-right: 10px">
-                    <Option v-for="items in CustomList" :value="items.value" :key="items.value">{{
-                      items.label
-                    }}</Option>
-                  </Select>
-                  <Checkbox v-model="item.status">必填</Checkbox>
+                  <el-select v-model="item.label" style="width: 200px; margin-left: 6px; margin-right: 10px">
+                    <el-option
+                      v-for="items in CustomList"
+                      :value="items.value"
+                      :key="items.value"
+                      :label="items.label"
+                    ></el-option>
+                  </el-select>
+                  <el-checkbox v-model="item.status">必填</el-checkbox>
                   <div class="addfont" @click="delcustom(index)">删除</div>
                 </div>
               </div>
@@ -1161,44 +1307,44 @@
                 <div class="btn" @click="addcustom">+ 添加表单</div>
                 <div class="titTip">用户下单时需填写的信息，最多可设置10条</div>
               </div>
-            </FormItem>
-          </Col>
-        </Row>
-        <FormItem>
-          <Button v-if="currentTab !== '1'" @click="upTab">上一步</Button>
-          <Button
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item>
+          <el-button v-if="currentTab !== '1'" @click="upTab">上一步</el-button>
+          <el-button
             type="primary"
             class="submission"
             v-if="currentTab !== '6' && formValidate.virtual_type == 0"
             @click="downTab"
-            >下一步</Button
+            >下一步</el-button
           >
-          <Button
+          <el-button
             type="primary"
             class="submission"
             v-if="currentTab !== '5' && formValidate.virtual_type != 0"
             @click="downTab"
-            >下一步</Button
+            >下一步</el-button
           >
-          <Button
+          <el-button
             type="primary"
             :disabled="openSubimit"
             class="submission"
             @click="handleSubmit('formValidate')"
             v-if="($route.params.id || currentTab === '6') && formValidate.virtual_type == 0"
-            >保存</Button
+            >保存</el-button
           >
-          <Button
+          <el-button
             type="primary"
             :disabled="openSubimit"
             class="submission"
             @click="handleSubmit('formValidate')"
             v-if="($route.params.id || currentTab === '5') && formValidate.virtual_type != 0"
-            >保存</Button
+            >保存</el-button
           >
-        </FormItem>
+        </el-form-item>
         <Spin size="large" fix v-if="spinShow"></Spin>
-      </Form>
+      </el-form>
       <Modal
         v-model="modalPic"
         width="1024px"
@@ -1230,60 +1376,67 @@
       >
         <div class="trip"></div>
         <div class="type-radio">
-          <Form :label-width="80">
-            <FormItem label="卡密类型：">
-              <RadioGroup v-model="disk_type" size="large">
-                <Radio :label="1">固定卡密</Radio>
-                <Radio :label="2">一次性卡密</Radio>
-              </RadioGroup>
+          <el-form label-width="85px">
+            <el-form-item label="卡密类型：">
+              <el-radio-group v-model="disk_type" size="large">
+                <el-radio :label="1">固定卡密</el-radio>
+                <el-radio :label="2">一次性卡密</el-radio>
+              </el-radio-group>
               <div v-if="disk_type == 1">
                 <div class="stock-disk">
-                  <Input v-model="disk_info" size="large" type="textarea" :rows="4" placeholder="填写卡密信息" />
+                  <el-input v-model="disk_info" size="large" type="textarea" :rows="4" placeholder="填写卡密信息" />
                 </div>
                 <div class="stock-input">
-                  <!-- <Input type="number" v-model="stock" size="large" :min='0' placeholder="填写库存数量">
+                  <!-- <el-input type="number" v-model="stock" size="large" :min='0' placeholder="填写库存数量">
                     <span slot="append">件</span>
-                  </Input> -->
-                  <InputNumber :max="100000" :min="1" :step="1" :precision="0" v-model="stock" />
+                  </el-input> -->
+                  <el-input-number
+                    controls-position="right"
+                    :max="100000"
+                    :min="1"
+                    :step="1"
+                    :precision="0"
+                    v-model="stock"
+                  />
                   <span class="pl10">件</span>
                 </div>
               </div>
               <div class="scroll-virtual" v-if="disk_type == 2">
                 <div class="virtual-data mb10" v-for="(item, index) in virtualList" :key="index">
                   <span class="mr10 virtual-title">卡号{{ index + 1 }}：</span>
-                  <Input
+                  <el-input
                     class="mr10"
                     type="text"
                     v-model.trim="item.key"
                     style="width: 150px"
                     placeholder="请输入卡号(非必填)"
-                  ></Input>
+                  ></el-input>
                   <span class="mr10 virtual-title">卡密{{ index + 1 }}：</span>
-                  <Input
+                  <el-input
                     class="mr10"
                     type="text"
                     v-model.trim="item.value"
                     style="width: 150px"
                     placeholder="请输入卡密"
-                  ></Input>
+                  ></el-input>
                   <span class="deteal-btn" @click="removeVirtual(index)">删除</span>
                 </div>
               </div>
               <div class="add-more" v-if="disk_type == 2">
-                <Button type="primary" @click="handleAdd" icon="md-add">新增</Button>
+                <el-button type="primary" @click="handleAdd" icon="md-add">新增</el-button>
                 <Upload class="ml10" :action="cardUrl" :data="uploadData" :headers="header" :on-success="upFile">
-                  <Button icon="ios-cloud-upload-outline">导入卡密</Button>
+                  <el-button icon="ios-cloud-upload-outline">导入卡密</el-button>
                 </Upload>
               </div>
-            </FormItem>
-          </Form>
+            </el-form-item>
+          </el-form>
         </div>
         <div class="footer">
           <div class="clear" @click="closeVirtual">取消</div>
           <div class="submit" @click="upVirtual">确认</div>
         </div>
       </Modal>
-    </Card>
+    </el-card>
     <freightTemplate :template="template" v-on:changeTemplate="changeTemplate" ref="templates"></freightTemplate>
     <add-attr ref="addattr" @getList="userSearchs"></add-attr>
     <coupon-list
@@ -1504,7 +1657,7 @@ export default {
           slot: 'action',
           fixed: 'right',
           align: 'center',
-          minWidth: 140,
+          minWidth: 120,
         },
       ],
       columns3: [
@@ -1555,7 +1708,7 @@ export default {
           slot: 'action',
           fixed: 'right',
           align: 'center',
-          minWidth: 140,
+          minWidth: 120,
         },
       ],
       columns: [],
@@ -1824,13 +1977,13 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 120;
+      return this.isMobile ? undefined : '120px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
     },
     labelBottom() {
-      return this.isMobile ? undefined : 15;
+      return this.isMobile ? undefined : '15px';
     },
   },
   beforeRouteUpdate(to, from, next) {
@@ -2645,10 +2798,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    // tab切换
-    onhangeTab(name) {
-      this.currentTab = name;
-    },
     handleRemove(i) {
       this.images.splice(i, 1);
       this.formValidate.slider_image.splice(i, 1);
@@ -3317,7 +3466,7 @@ export default {
   border-radius: 5px;
   min-height: 30px;
   cursor: pointer;
-
+  font-size: 14px;
   .span {
     color: #c5c8ce;
   }
diff --git a/template/admin/src/pages/product/productAdd/taoBao.vue b/template/admin/src/pages/product/productAdd/taoBao.vue
index ad59ca8e9..77be1eb70 100644
--- a/template/admin/src/pages/product/productAdd/taoBao.vue
+++ b/template/admin/src/pages/product/productAdd/taoBao.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="Box">
-    <Card>
+    <el-card>
       <div>
         生成的商品默认是没有上架的，请手动上架商品！
         <a href="http://help.crmeb.net/crmeb-v4/1863579" v-if="copyConfig.copy_type == 2" target="_blank"
@@ -13,12 +13,12 @@
         >
       </div>
       <div>商品采集设置：设置 > 系统设置 > 第三方接口设置 > 采集商品配置</div>
-    </Card>
-    <Form class="formValidate mt20" ref="formValidate" :label-width="120" label-position="right" @submit.native.prevent>
-      <Row :gutter="24" type="flex">
-        <Col span="18">
-          <FormItem label="链接地址：">
-            <Input
+    </el-card>
+    <el-form class="formValidate mt20" ref="formValidate" label-width="120px" label-position="right" @submit.native.prevent>
+      <el-row :gutter="24" >
+        <el-col span="18">
+          <el-form-item label="链接地址：">
+            <el-input
               search
               enter-button="确定"
               v-model="soure_link"
@@ -26,10 +26,10 @@
               class="numPut"
               @on-search="add"
             />
-          </FormItem>
-        </Col>
-      </Row>
-    </Form>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
     <Spin size="large" fix v-if="spinShow"></Spin>
   </div>
 </template>
diff --git a/template/admin/src/pages/product/productAttr/addAttr.vue b/template/admin/src/pages/product/productAttr/addAttr.vue
index 3a5c3613b..6fcf1beb4 100644
--- a/template/admin/src/pages/product/productAttr/addAttr.vue
+++ b/template/admin/src/pages/product/productAttr/addAttr.vue
@@ -1,24 +1,24 @@
 <template>
   <Modal scrollable v-model="modal" @on-cancel="onCancel" title="商品规格" width="950">
-    <Form
+    <el-form
       ref="formDynamic"
       :model="formDynamic"
       :rules="rules"
       class="attrFrom"
-      :label-width="110"
+      label-width="110px"
       label-position="right"
       @submit.native.prevent
     >
-      <Row :gutter="24">
-        <Col span="24">
-          <Col span="8" class="mb15">
-            <FormItem label="规格模板名称：" prop="rule_name">
-              <Input placeholder="请输入标题名称" :maxlength="20" v-model.trim="formDynamic.rule_name" />
-            </FormItem>
-          </Col>
-        </Col>
-        <Col span="23" class="noForm" v-for="(item, index) in formDynamic.spec" :key="index">
-          <FormItem>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-col :span="8" class="mb15">
+            <el-form-item label="规格模板名称：" prop="rule_name">
+              <el-input placeholder="请输入标题名称" :maxlength="20" v-model.trim="formDynamic.rule_name" />
+            </el-form-item>
+          </el-col>
+        </el-col>
+        <el-col :span="23" class="noForm" v-for="(item, index) in formDynamic.spec" :key="index">
+          <el-form-item>
             <div class="acea-row row-middle">
               <span class="mr5">{{ item.value }}</span
               ><Icon type="ios-close-circle" @click="handleRemove(index)" />
@@ -35,7 +35,7 @@
                 @on-close="handleRemove2(item.detail, indexn)"
                 >{{ j }}</Tag
               >
-              <Input
+              <el-input
                 search
                 enter-button="添加"
                 placeholder="请输入属性名称"
@@ -44,32 +44,32 @@
                 style="width: 200px"
               />
             </div>
-          </FormItem>
-        </Col>
-        <Col span="24" v-if="isBtn" class="mt10">
-          <Col span="8" class="mr15">
-            <FormItem label="规格名称：">
-              <Input placeholder="请输入规格" v-model="attrsName" />
-            </FormItem>
-          </Col>
-          <Col span="8" class="mr20">
-            <FormItem label="规格值：">
-              <Input v-model="attrsVal" placeholder="请输入规格值" />
-            </FormItem>
-          </Col>
-          <Col span="2">
-            <Button type="primary" @click="createAttrName">确定</Button>
-          </Col>
-          <Col span="2">
-            <Button @click="offAttrName">取消</Button>
-          </Col>
-        </Col>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" v-if="isBtn" class="mt10">
+          <el-col :span="8" class="mr15">
+            <el-form-item label="规格名称：">
+              <el-input placeholder="请输入规格" v-model="attrsName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" class="mr20">
+            <el-form-item label="规格值：">
+              <el-input v-model="attrsVal" placeholder="请输入规格值" />
+            </el-form-item>
+          </el-col>
+          <el-col span="2">
+            <el-button type="primary" @click="createAttrName">确定</el-button>
+          </el-col>
+          <el-col span="2">
+            <el-button @click="offAttrName">取消</el-button>
+          </el-col>
+        </el-col>
         <Spin size="large" fix v-if="spinShow"></Spin>
-      </Row>
-      <Button type="primary" icon="md-add" @click="addBtn" v-if="!isBtn" class="ml95 mt10">添加新规格</Button>
-    </Form>
+      </el-row>
+      <el-button type="primary" icon="md-add" @click="addBtn" v-if="!isBtn" class="ml95 mt10">添加新规格</el-button>
+    </el-form>
     <div slot="footer">
-      <Button type="primary" :loading="modal_loading" @click="handleSubmit('formDynamic')">确定</Button>
+      <el-button type="primary" :loading="modal_loading" @click="handleSubmit('formDynamic')">确定</el-button>
     </div>
   </Modal>
 </template>
diff --git a/template/admin/src/pages/product/productAttr/index.vue b/template/admin/src/pages/product/productAttr/index.vue
index 30423588c..7879b5cb8 100644
--- a/template/admin/src/pages/product/productAttr/index.vue
+++ b/template/admin/src/pages/product/productAttr/index.vue
@@ -1,69 +1,90 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="artFrom"
         :model="artFrom"
-        :label-width="80"
+        label-width="85px"
         label-position="right"
         class="tabform"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex" justify="end">
-          <Col span="24" class="ivu-text-left">
-            <FormItem label="规格搜索：">
-              <Input
+        <el-row :gutter="24" justify="end">
+          <el-col :span="24" class="ivu-text-left">
+            <el-form-item label="规格搜索：">
+              <el-input
                 search
                 enter-button
                 v-model="artFrom.rule_name"
                 placeholder="请输入规格名称"
                 style="width: 30%"
                 @on-search="userSearchs"
-              ></Input>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <Button v-auth="['product-rule-save']" class="mr20" type="primary" icon="md-add" @click="addAttr"
-              >添加商品规格</Button
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-button v-auth="['product-rule-save']" class="mr20" type="primary" icon="md-add" @click="addAttr"
+              >添加商品规格</el-button
             >
-            <Button v-auth="['product-product-rule-delete']" @click="del(null, '批量删除规格')">批量删除</Button>
-          </Col>
-        </Row>
-      </Form>
-      <Table
+            <el-button v-auth="['product-product-rule-delete']" @click="del(null, '批量删除规格')">批量删除</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         class="mt25"
         ref="table"
         :columns="columns4"
         :data="tableList"
         :loading="loading"
-        highlight-row
-        @on-select="handleSelectRow"
-        @on-select-cancel="handleCancelRow"
-        @on-select-all="handleSelectAll"
-        @on-select-all-cancel="handleSelectAll"
-        no-data-text="暂无数据"
-        no-filtered-data-text="暂无筛选结果"
+        highlight-current-row
+        :row-key="getRowKey"
+        @selection-change="handleSelectRow"
+        empty-text="暂无数据"
       >
-        <template slot-scope="{ row }" slot="attr_value">
-          <span v-for="(item, index) in row.attr_value" :key="index" v-text="item" style="display: block"></span>
-        </template>
-        <template slot-scope="{ row }" slot="action">
-          <a @click="edit(row)">编辑</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除规格')">删除</a>
-        </template>
-      </Table>
+        <el-table-column type="selection" width="60" :reserve-selection="true"> </el-table-column>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="规格名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.rule_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品规格" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.attr_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品属性" min-width="130">
+          <template slot-scope="scope">
+            <span
+              v-for="(item, index) in scope.row.attr_value"
+              :key="index"
+              v-text="item"
+              style="display: block"
+            ></span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="120">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除规格')">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="artFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="artFrom.limit"
+          :page.sync="artFrom.page"
+          :limit.sync="artFrom.limit"
+          @pagination="getDataList"
         />
       </div>
-    </Card>
+    </el-card>
     <add-attr ref="addattr" @getList="userSearchs"></add-attr>
   </div>
 </template>
@@ -80,7 +101,7 @@ export default {
       loading: false,
       artFrom: {
         page: 1,
-        limit: 15,
+        limit: 1,
         rule_name: '',
       },
       columns4: [
@@ -117,8 +138,9 @@ export default {
       ],
       tableList: [],
       total: 0,
-      selectedIds: new Set(), //选中合并项的id
+      selectedIds: [], //选中合并项的id
       ids: '',
+      multipleSelection: [],
     };
   },
   computed: {
@@ -128,6 +150,9 @@ export default {
     this.getDataList();
   },
   methods: {
+    getRowKey(row) {
+      return row.id;
+    },
     //全选和取消全选时触发
     handleSelectAll(selection) {
       if (selection.length === 0) {
@@ -149,31 +174,26 @@ export default {
       });
     },
     //  选中某一行
-    handleSelectRow(selection, row) {
-      this.selectedIds.add(row.id);
-      this.$nextTick(() => {
-        //确保dom加载完毕
-        this.setChecked();
-      });
-    },
-    //  取消某一行
-    handleCancelRow(selection, row) {
-      this.selectedIds.delete(row.id);
-      this.$nextTick(() => {
-        //确保dom加载完毕
+    handleSelectRow(selection) {
+      const uniqueArr = [];
+      const ids = [];
+      for (let i = 0; i < selection.length; i++) {
+        const item = selection[i];
+        if (!ids.includes(item.id)) {
+          uniqueArr.push(item);
+          ids.push(item.id);
+        }
+      }
+      this.selectedIds = ids;
+      this.multipleSelection = uniqueArr;
+      this.$nextTick((e) => {
         this.setChecked();
       });
     },
     setChecked() {
       //将new Set()转化为数组
       this.ids = [...this.selectedIds].join(',');
-      // 找到绑定的table的ref对应的dom，找到table的objData对象，objData保存的是当前页的数据
-      let objData = this.$refs.table.objData;
-      for (let index in objData) {
-        if (this.selectedIds.has(objData[index].id)) {
-          objData[index]._isChecked = true;
-        }
-      }
+      console.log(this.ids);
     },
     // 删除
     del(row, tit) {
@@ -181,7 +201,7 @@ export default {
       if (tit === '批量删除规格') {
         if (this.selectedIds.size === 0) return this.$Message.warning('请选择要删除的规格！');
         data = {
-          ids: this.ids,
+          ids: this.ids.join(','),
         };
       } else {
         data = {
@@ -231,10 +251,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(status) {
-      this.artFrom.page = status;
-      this.getDataList();
-    },
     // 表格搜索
     userSearchs() {
       this.artFrom.page = 1;
diff --git a/template/admin/src/pages/product/productClassify/index.vue b/template/admin/src/pages/product/productClassify/index.vue
index 8ea0709e4..4d0d53f3c 100644
--- a/template/admin/src/pages/product/productClassify/index.vue
+++ b/template/admin/src/pages/product/productClassify/index.vue
@@ -1,43 +1,43 @@
 <template>
   <div class="article-manager">
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form ref="artFrom" :model="artFrom" :label-width="75" label-position="right" @submit.native.prevent>
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="商品分类：" prop="pid" label-for="pid">
-              <Select v-model="artFrom.pid" placeholder="请选择商品分类" @on-change="userSearchs" clearable>
-                <Option v-for="item in treeSelect" :value="item.id" :key="item.id">{{ item.cate_name }}</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="分类状态：" label-for="is_show">
-              <Select v-model="artFrom.is_show" placeholder="请选择分类状态" clearable @on-change="userSearchs">
-                <Option value="1">显示</Option>
-                <Option value="0">隐藏</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="分类名称：" label-for="status2">
-              <Input
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form ref="artFrom" :model="artFrom" label-width="75px" label-position="right" @submit.native.prevent>
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="商品分类：" prop="pid" label-for="pid">
+              <el-select v-model="artFrom.pid" placeholder="请选择商品分类" @change="userSearchs" clearable>
+                <el-option v-for="item in treeSelect" :value="item.id" :key="item.id">{{ item.cate_name }}</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="分类状态：" label-for="is_show">
+              <el-select v-model="artFrom.is_show" placeholder="请选择分类状态" clearable @change="userSearchs">
+                <el-option value="1" label="显示"></el-option>
+                <el-option value="0" label="隐藏"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="分类名称：" label-for="status2">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入分类名称"
                 v-model="artFrom.cate_name"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button v-auth="['product-save-cate']" type="primary" class="bnt" icon="md-add" @click="addClass"
-              >添加分类</Button
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-button v-auth="['product-save-cate']" type="primary" class="bnt" icon="md-add" @click="addClass"
+              >添加分类</el-button
             >
-          </Col>
-        </Row>
-      </Form>
+          </el-col>
+        </el-row>
+      </el-form>
       <vxe-table
         class="mt25"
         highlight-hover-row
@@ -58,32 +58,26 @@
         <vxe-table-column field="sort" title="排序" min-width="100" tooltip="true"></vxe-table-column>
         <vxe-table-column field="is_show" title="状态" min-width="120">
           <template v-slot="{ row }">
-            <i-switch
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
               v-model="row.is_show"
               :value="row.is_show"
-              :true-value="1"
-              :false-value="0"
-              @on-change="onchangeIsShow(row)"
+              @change="onchangeIsShow(row)"
               size="large"
             >
-              <span slot="open">显示</span>
-              <span slot="close">隐藏</span>
-            </i-switch>
+            </el-switch>
           </template>
         </vxe-table-column>
         <vxe-table-column field="date" title="操作" width="250" fixed="right" align="center">
           <template v-slot="{ row, index }">
             <a @click="edit(row)">编辑</a>
-            <Divider type="vertical" />
+            <el-divider direction="vertical"></el-divider>
             <a @click="del(row, '删除商品分类', index)">删除</a>
           </template>
         </vxe-table-column>
       </vxe-table>
-      <!--            <div class="acea-row row-right page">-->
-      <!--                <Page :total="total" :current="artFrom.page" show-elevator show-total @on-change="pageChange"-->
-      <!--                      :page-size="artFrom.limit"/>-->
-      <!--            </div>-->
-    </Card>
+    </el-card>
     <!-- 添加 编辑表单-->
     <edit-from ref="edits" :FromData="FromData" @submitFail="userSearchs"></edit-from>
   </div>
diff --git a/template/admin/src/pages/product/productList/attribute/index.vue b/template/admin/src/pages/product/productList/attribute/index.vue
index e16fd841b..bdaf5bea1 100644
--- a/template/admin/src/pages/product/productList/attribute/index.vue
+++ b/template/admin/src/pages/product/productList/attribute/index.vue
@@ -2,11 +2,11 @@
   <div>
     <Modal v-model="val" title="商品属性" width="70%" @on-cancel="cancel">
       <div class="Modals">
-        <Form class="form" ref="form" :label-width="70" label-position="right">
-          <Row :gutter="24" type="flex">
-            <Col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
-              <FormItem label="规格：" prop="store_name" label-for="store_name">
-                <Input
+        <el-form class="form" ref="form" label-width="70px" label-position="right">
+          <el-row :gutter="24" >
+            <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+              <el-form-item label="规格：" prop="store_name" label-for="store_name">
+                <el-input
                   placeholder="规格"
                   style="width: 10%"
                   class="input"
@@ -15,15 +15,15 @@
                   :key="index"
                 >
                   <Icon type="md-close" slot="suffix" />
-                </Input>
-                <Input placeholder="请输入" v-model="specsVal" style="width: 10%" class="input">
+                </el-input>
+                <el-input placeholder="请输入" v-model="specsVal" style="width: 10%" class="input">
                   <Icon type="md-add" slot="suffix" @click="confirm" />
-                </Input>
-                <!--<Button type="primary" icon="md-add" @click="confirm"></Button>-->
-              </FormItem>
-            </Col>
-            <Col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
-              <FormItem
+                </el-input>
+                <!--<el-button type="primary" icon="md-add" @click="confirm"></el-button>-->
+              </el-form-item>
+            </el-col>
+            <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+              <el-form-item
                 :label="item.attr + ':'"
                 prop="store_name"
                 label-for="store_name"
@@ -33,14 +33,14 @@
                 <Tag type="border" closable color="primary" v-for="(itemn, index) in item.attrVal" :key="index">{{
                   itemn
                 }}</Tag>
-                <Input placeholder="请输入" v-model="item.inputVal" style="width: 10%" class="input">
+                <el-input placeholder="请输入" v-model="item.inputVal" style="width: 10%" class="input">
                   <Icon type="md-add" slot="suffix" @click="confirmAttr(index)" />
-                </Input>
-                <!--<Button type="primary" icon="md-add" @click="confirm"></Button>-->
-              </FormItem>
-            </Col>
-          </Row>
-        </Form>
+                </el-input>
+                <!--<el-button type="primary" icon="md-add" @click="confirm"></el-button>-->
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
       </div>
       <div slot="footer"></div>
     </Modal>
diff --git a/template/admin/src/pages/product/productList/index.vue b/template/admin/src/pages/product/productList/index.vue
index dadddcbbb..e692395ca 100644
--- a/template/admin/src/pages/product/productList/index.vue
+++ b/template/admin/src/pages/product/productList/index.vue
@@ -1,23 +1,23 @@
 <template>
   <div class="article-manager">
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Tabs class="mb20" v-model="artFrom.type" @on-click="onClickTab">
-        <TabPane
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-tabs class="mb20" v-model="artFrom.type" @tab-click="onClickTab">
+        <el-tab-pane
           :label="item.name + '(' + item.count + ')'"
           :name="item.type.toString()"
           v-for="(item, index) in headeNum"
           :key="index"
         />
-      </Tabs>
-      <Form ref="artFrom" :model="artFrom" :label-width="75" label-position="right" @submit.native.prevent>
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="商品分类：" label-for="pid">
-              <!-- <Select v-model="artFrom.cate_id" placeholder="请选择商品分类" clearable @on-change="userSearchs">
-                <Option v-for="item in treeSelect" :value="item.id" :key="item.id">{{
+      </el-tabs>
+      <el-form ref="artFrom" :model="artFrom" label-width="75px" label-position="right" @submit.native.prevent>
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="商品分类：" label-for="pid">
+              <!-- <el-select v-model="artFrom.cate_id" placeholder="请选择商品分类" clearable @change="userSearchs">
+                <el-option v-for="item in treeSelect" :value="item.id" :key="item.id">{{
                   item.html + item.cate_name
-                }}</Option>
-              </Select> -->
+                }}</el-option>
+              </el-select> -->
               <el-cascader
                 v-model="artFrom.cate_id"
                 size="small"
@@ -25,115 +25,157 @@
                 :props="{ emitPath: false }"
                 clearable
               ></el-cascader>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="商品搜索：" label-for="store_name">
-              <Input
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="商品搜索：" label-for="store_name">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入商品名称/关键字/ID"
                 v-model="artFrom.store_name"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
       <div class="Button">
         <router-link v-auth="['product-product-save']" :to="$routeProStr + '/product/add_product'"
-          ><Button type="primary" class="bnt mr15" icon="md-add">添加商品</Button></router-link
+          ><el-button type="primary" class="bnt mr15" icon="md-add">添加商品</el-button></router-link
         >
-        <Button v-auth="['product-crawl-save']" type="success" class="bnt mr15" @click="onCopy">商品采集</Button>
-        <Dropdown class="bnt mr15" @on-click="batchSelect" :transfer="true">
-          <Button type="info">
-            批量修改
-            <Icon type="ios-arrow-down"></Icon>
-          </Button>
-          <DropdownMenu slot="list">
-            <DropdownItem :name="1">商品分类</DropdownItem>
-            <DropdownItem :name="2">物流设置</DropdownItem>
-            <DropdownItem :name="3">购买送积分</DropdownItem>
-            <DropdownItem :name="4">购买送优惠券</DropdownItem>
-            <DropdownItem :name="5">关联用户标签</DropdownItem>
-            <DropdownItem :name="6">活动推荐</DropdownItem>
-          </DropdownMenu>
-        </Dropdown>
-        <Button
+        <el-button v-auth="['product-crawl-save']" type="success" class="bnt mr15" @click="onCopy">商品采集</el-button>
+        <el-dropdown class="bnt mr15" @command="batchSelect">
+          <el-button type="primary">批量修改<i class="el-icon-arrow-down el-icon--right"></i> </el-button>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item :command="1">商品分类</el-dropdown-item>
+            <el-dropdown-item :command="2">物流设置</el-dropdown-item>
+            <el-dropdown-item :command="3">购买送积分</el-dropdown-item>
+            <el-dropdown-item :command="4">购买送优惠券</el-dropdown-item>
+            <el-dropdown-item :command="5">关联用户标签</el-dropdown-item>
+            <el-dropdown-item :command="6">活动推荐</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+        <el-button
           v-auth="['product-product-product_show']"
           class="bnt mr15"
           type="info"
           @click="onDismount"
           v-show="artFrom.type === '1'"
-          >批量下架</Button
+          >批量下架</el-button
         >
-        <Button
+        <el-button
           v-auth="['product-product-product_show']"
           class="bnt mr15"
           @click="onShelves"
           v-show="artFrom.type === '2'"
-          >批量上架</Button
+          >批量上架</el-button
+        >
+        <el-button v-auth="['export-storeProduct']" class="export" icon="ios-share-outline" @click="exports"
+          >导出</el-button
         >
-        <Button v-auth="['export-storeProduct']" class="export" icon="ios-share-outline" @click="exports">导出</Button>
       </div>
-      <Table
+      <el-table
         ref="table"
-        :columns="artFrom.type !== '1' && artFrom.type !== '2' ? columns2 : columns"
         :data="tableList"
         class="ivu-mt mt25"
-        :loading="loading"
-        highlight-row
-        @on-select="handleSelectRow"
-        @on-select-cancel="handleCancelRow"
-        @on-select-all="handleSelectAll"
-        @on-select-all-cancel="handleSelectAll"
-        no-data-text="暂无数据"
-        no-filtered-data-text="暂无筛选结果"
+        v-loading="loading"
+        highlight-current-row
+        :row-key="getRowKey"
+        @selection-change="handleSelectRow"
+        empty-text="暂无数据"
       >
-        <template slot-scope="{ row }" slot="id">
-          {{ row.id }}
-        </template>
-        <template slot-scope="{ row }" slot="image">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.image" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="state">
-          <i-switch
-            v-model="row.is_show"
-            :value="row.is_show"
-            :true-value="1"
-            :false-value="0"
-            @on-change="changeSwitch(row)"
-            size="large"
-          >
-            <span slot="open">上架</span>
-            <span slot="close">下架</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="look(row)">查看</a>
-          <Divider type="vertical" />
-          <a @click="edit(row)">编辑</a>
-          <Divider type="vertical" />
-          <router-link :to="{ path: $routeProStr + '/product/product_reply/' + row.id }"><a>查看评论</a></router-link>
-          <Divider type="vertical" />
-          <a @click="del(row, '恢复商品', index)" v-if="artFrom.type === '6'">恢复商品</a>
-          <a @click="del(row, '移入回收站', index)" v-else>移到回收站</a>
-        </template>
-      </Table>
+        <el-table-column type="expand" width="50" v-if="['1', '2'].includes(artFrom.type)">
+          <template slot-scope="scope">
+            <expandRow :row="scope.row"></expandRow>
+          </template>
+        </el-table-column>
+        <el-table-column type="selection" width="60" :reserve-selection="true"> </el-table-column>
+        <el-table-column label="商品ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品图" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.image" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品名称" min-width="250">
+          <template slot-scope="scope">
+            <span>{{ scope.row.store_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品类型" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.product_type }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品售价" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="销量" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sales }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="库存" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.stock }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="排序" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sort }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="100">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.is_show"
+              :value="scope.row.is_show"
+              :disabled="scope.row.stop_status ? true : false"
+              @change="changeSwitch(scope.row)"
+              size="large"
+              active-text="上架"
+              inactive-text="下架"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" minWidth="220">
+          <template slot-scope="scope">
+            <a @click="look(scope.row)">查看</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="edit(scope.row)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <router-link :to="{ path: $routeProStr + '/product/product_reply/' + scope.row.id }"
+              ><a>查看评论</a></router-link
+            >
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '恢复商品', scope.$index)" v-if="artFrom.type === '6'">恢复商品</a>
+            <a @click="del(scope.row, '移入回收站', scope.$index)" v-else>移到回收站</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="artFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="artFrom.limit"
+          :page.sync="artFrom.page"
+          :limit.sync="artFrom.limit"
+          @pagination="getDataList"
         />
       </div>
       <attribute :attrTemplate="attrTemplate" v-on:changeTemplate="changeTemplate"></attribute>
-    </Card>
+    </el-card>
     <!-- 生成淘宝京东表单-->
     <Modal
       v-model="modals"
@@ -159,24 +201,24 @@
       @on-ok="batchSub"
       @on-cancel="clearBatchData"
     >
-      <Form
+      <el-form
         class="batchFormData"
         ref="batchFormData"
         :rules="ruleBatch"
         :model="batchFormData"
-        :label-width="120"
+        label-width="120px"
         label-position="right"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex">
-          <Col span="24" v-if="batchType == 1">
-            <Divider orientation="left">基础设置</Divider>
-            <FormItem label="商品分类：" prop="cate_id">
-              <!-- <Select v-model="batchFormData.cate_id" placeholder="请选择商品分类" multiple class="perW20">
-                <Option v-for="item in treeSelect" :disabled="item.pid === 0" :value="item.id" :key="item.id">{{
+        <el-row :gutter="24">
+          <el-col :span="24" v-if="batchType == 1">
+            <el-divider content-position="left">基础设置</el-divider>
+            <el-form-item label="商品分类：" prop="cate_id">
+              <!-- <el-select v-model="batchFormData.cate_id" placeholder="请选择商品分类" multiple class="perW20">
+                <el-option v-for="item in treeSelect" :disabled="item.pid === 0" :value="item.id" :key="item.id">{{
                   item.html + item.cate_name
-                }}</Option>
-              </Select> -->
+                }}</el-option>
+              </el-select> -->
               <el-cascader
                 v-model="batchFormData.cate_id"
                 size="small"
@@ -184,51 +226,68 @@
                 :props="{ emitPath: false }"
                 clearable
               ></el-cascader>
-            </FormItem>
-          </Col>
-          <Col span="24" v-if="batchType == 2">
-            <Divider orientation="left">物流设置</Divider>
-            <FormItem label="物流方式：" prop="logistics">
-              <CheckboxGroup v-model="batchFormData.logistics" @on-change="logisticsBtn">
-                <Checkbox label="1">快递</Checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="batchType == 2">
+            <el-divider content-position="left">物流设置</el-divider>
+            <el-form-item label="物流方式：" prop="logistics">
+              <el-checkbox-group v-model="batchFormData.logistics" @change="logisticsBtn">
+                <el-checkbox label="1">快递</el-checkbox>
 
-                <Checkbox label="2">到店核销</Checkbox>
-              </CheckboxGroup>
-            </FormItem>
-            <FormItem label="运费设置：">
-              <RadioGroup v-model="batchFormData.freight">
-                <!-- <Radio :label="1">包邮</Radio> -->
-                <Radio :label="2">固定邮费</Radio>
-                <Radio :label="3">运费模板</Radio>
-              </RadioGroup>
-            </FormItem>
-            <FormItem label="" v-if="batchFormData.freight == 2">
+                <el-checkbox label="2">到店核销</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+            <el-form-item label="运费设置：">
+              <el-radio-group v-model="batchFormData.freight">
+                <!-- <el-radio :label="1">包邮</el-radio> -->
+                <el-radio :label="2">固定邮费</el-radio>
+                <el-radio :label="3">运费模板</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="" v-if="batchFormData.freight == 2">
               <div class="acea-row">
-                <InputNumber :min="0" v-model="batchFormData.postage" placeholder="请输入金额" class="perW20 maxW" />
+                <el-input-number
+                  controls-position="right"
+                  :min="0"
+                  v-model="batchFormData.postage"
+                  placeholder="请输入金额"
+                  class="perW20 maxW"
+                />
               </div>
-            </FormItem>
-            <FormItem label="" v-if="batchFormData.freight == 3" prop="temp_id">
+            </el-form-item>
+            <el-form-item label="" v-if="batchFormData.freight == 3" prop="temp_id">
               <div class="acea-row">
-                <Select v-model="batchFormData.temp_id" clearable placeholder="请选择运费模板" class="perW20 maxW">
-                  <Option v-for="(item, index) in templateList" :value="item.id" :key="index">{{ item.name }}</Option>
-                </Select>
+                <el-select v-model="batchFormData.temp_id" clearable placeholder="请选择运费模板" class="perW20 maxW">
+                  <el-option
+                    v-for="(item, index) in templateList"
+                    :value="item.id"
+                    :key="index"
+                    :label="item.name"
+                  ></el-option>
+                </el-select>
               </div>
-            </FormItem>
-          </Col>
-          <Col span="24" v-if="[3, 4, 5, 6].includes(batchType)">
-            <Divider orientation="left" v-if="[3, 4, 5, 6].includes(batchType)">营销设置</Divider>
-            <FormItem label="赠送积分：" prop="give_integral" v-if="batchType == 3">
-              <InputNumber v-model="batchFormData.give_integral" :min="0" :max="999999" placeholder="请输入积分" />
-            </FormItem>
-            <FormItem label="赠送优惠券：" v-if="batchType == 4">
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="[3, 4, 5, 6].includes(batchType)">
+            <el-divider content-position="left" v-if="[3, 4, 5, 6].includes(batchType)">营销设置</el-divider>
+            <el-form-item label="赠送积分：" prop="give_integral" v-if="batchType == 3">
+              <el-input-number
+                controls-position="right"
+                v-model="batchFormData.give_integral"
+                :min="0"
+                :max="999999"
+                placeholder="请输入积分"
+              />
+            </el-form-item>
+            <el-form-item label="赠送优惠券：" v-if="batchType == 4">
               <div v-if="couponName.length" class="mb20">
                 <Tag closable v-for="(item, index) in couponName" :key="index" @on-close="handleClose(item)">{{
                   item.title
                 }}</Tag>
               </div>
-              <Button type="primary" @click="addCoupon">添加优惠券</Button>
-            </FormItem>
-            <FormItem label="关联用户标签：" prop="label_id" v-if="batchType == 5">
+              <el-button type="primary" @click="addCoupon">添加优惠券</el-button>
+            </el-form-item>
+            <el-form-item label="关联用户标签：" prop="label_id" v-if="batchType == 5">
               <div style="display: flex">
                 <div class="labelInput acea-row row-between-wrapper" @click="openLabel">
                   <div style="width: 90%">
@@ -242,19 +301,19 @@
                   <div class="iconfont iconxiayi"></div>
                 </div>
               </div>
-            </FormItem>
-            <FormItem label="商品推荐：" v-if="batchType == 6">
-              <CheckboxGroup v-model="batchFormData.recommend">
-                <Checkbox label="is_hot">热卖单品</Checkbox>
-                <Checkbox label="is_benefit">促销单品</Checkbox>
-                <Checkbox label="is_best">精品推荐</Checkbox>
-                <Checkbox label="is_new">首发新品</Checkbox>
-                <Checkbox label="is_good">优品推荐</Checkbox>
-              </CheckboxGroup>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
+            </el-form-item>
+            <el-form-item label="商品推荐：" v-if="batchType == 6">
+              <el-checkbox-group v-model="batchFormData.recommend">
+                <el-checkbox label="is_hot">热卖单品</el-checkbox>
+                <el-checkbox label="is_benefit">促销单品</el-checkbox>
+                <el-checkbox label="is_best">精品推荐</el-checkbox>
+                <el-checkbox label="is_new">首发新品</el-checkbox>
+                <el-checkbox label="is_good">优品推荐</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </Modal>
     <!-- 用户标签 -->
     <Modal
@@ -347,97 +406,14 @@ export default {
       headeNum: [],
       treeSelect: [],
       loading: false,
-      columns: [
-        {
-          type: 'expand',
-          width: 50,
-          render: (h, params) => {
-            return h(expandRow, {
-              props: {
-                row: params.row,
-              },
-            });
-          },
-        },
-        {
-          type: 'selection',
-          width: 60,
-          align: 'center',
-        },
-        {
-          title: '商品ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '商品图',
-          slot: 'image',
-          minWidth: 80,
-        },
-        {
-          title: '商品名称',
-          key: 'store_name',
-          minWidth: 250,
-        },
-        {
-          title: '商品类型',
-          key: 'product_type',
-          minWidth: 100,
-        },
-        {
-          title: '商品售价',
-          key: 'price',
-          minWidth: 90,
-        },
-        {
-          title: '销量',
-          key: 'sales',
-          minWidth: 90,
-        },
-        {
-          title: '库存',
-          key: 'stock',
-          minWidth: 80,
-        },
-        {
-          title: '排序',
-          key: 'sort',
-          minWidth: 70,
-        },
-        {
-          title: '状态',
-          slot: 'state',
-          width: 100,
-          filters: [
-            {
-              label: '上架',
-              value: 1,
-            },
-            {
-              label: '下架',
-              value: 0,
-            },
-          ],
-          filterMethod(value, row) {
-            return row.is_show === value;
-          },
-          filterMultiple: false,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 220,
-        },
-      ],
       data: [],
       total: 0,
       attrTemplate: false,
-      selectedIds: new Set(), //选中合并项的id
       ids: [],
       goodsId: '',
       isProductBox: false,
       treeSelect: [],
+      multipleSelection: [],
     };
   },
   watch: {
@@ -556,14 +532,6 @@ export default {
       this.$refs.couponTemplates.tableList();
     },
     getPath() {
-      this.columns2 = [...this.columns];
-      if (name !== '1' && name !== '2') {
-        this.columns2.shift({
-          type: 'selection',
-          width: 60,
-          align: 'center',
-        });
-      }
       this.artFrom.page = 1;
       this.artFrom.type = this.$route.query.type.toString();
       this.getDataList();
@@ -652,55 +620,22 @@ export default {
     //     })
     //     this.ids = data
     // },
-    //全选和取消全选时触发
-    handleSelectAll(selection) {
-      if (selection.length === 0) {
-        //获取table的数据；
-        let data = this.$refs.table.data;
-        data.forEach((item) => {
-          if (this.selectedIds.has(item.id)) {
-            this.selectedIds.delete(item.id);
-          }
-        });
-      } else {
-        selection.forEach((item) => {
-          this.selectedIds.add(item.id);
-        });
-      }
-      this.$nextTick(() => {
-        //确保dom加载完毕
-        this.setChecked();
-      });
+    getRowKey(row) {
+      return row.id;
     },
     //  选中某一行
-    handleSelectRow(selection, row) {
-      this.selectedIds.add(row.id);
-      this.$nextTick(() => {
-        //确保dom加载完毕
-        this.setChecked();
-      });
-    },
-    clearAll(status) {
-      this.$refs.table.selectAll(status);
-    },
-    //  取消某一行
-    handleCancelRow(selection, row) {
-      this.selectedIds.delete(row.id);
-      this.$nextTick(() => {
-        //确保dom加载完毕
-        this.setChecked();
-      });
-    },
-    setChecked() {
-      //将new Set()转化为数组
-      this.ids = [...this.selectedIds];
-      // 找到绑定的table的ref对应的dom，找到table的objData对象，objData保存的是当前页的数据
-      let objData = this.$refs.table.objData;
-      for (let index in objData) {
-        if (this.selectedIds.has(objData[index].id)) {
-          objData[index]._isChecked = true;
+    handleSelectRow(selection) {
+      const uniqueArr = [];
+      const ids = [];
+      for (let i = 0; i < selection.length; i++) {
+        const item = selection[i];
+        if (!ids.includes(item.id)) {
+          uniqueArr.push(item);
+          ids.push(item.id);
         }
       }
+      this.ids = ids;
+      this.multipleSelection = uniqueArr;
     },
     // 添加淘宝商品成功
     onClose() {
@@ -715,18 +650,9 @@ export default {
       // this.modals = true
     },
     // tab选择
-    onClickTab(name) {
-      this.artFrom.type = name;
-      this.columns2 = [...this.columns];
-      if (name !== '1' && name !== '2') {
-        this.columns2.shift({
-          type: 'selection',
-          width: 60,
-          align: 'center',
-        });
-      }
+    onClickTab() {
       this.artFrom.page = 1;
-      this.selectedIds.clear();
+      this.multipleSelection = [];
       this.getDataList();
     },
     // 下拉树
@@ -779,7 +705,9 @@ export default {
           this.total = res.data.count;
           this.$nextTick(() => {
             //确保dom加载完毕
-            this.setChecked();
+            // this.setChecked();
+            this.showSelectData();
+            console.log(this.ids);
           });
           this.loading = false;
         })
@@ -788,9 +716,20 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(status) {
-      this.artFrom.page = status;
-      this.getDataList();
+    showSelectData() {
+      console.log(this.multipleSelection);
+      if (this.multipleSelection.length > 0) {
+        // 判断是否存在勾选过的数据
+        this.tableList.forEach((row) => {
+          // 获取数据列表接口请求到的数据
+          this.multipleSelection.forEach((item) => {
+            // 勾选到的数据
+            if (row.id === item.id) {
+              this.$refs.table.toggleRowSelection(item, true); // 若有重合，则回显该条数据
+            }
+          });
+        });
+      }
     },
     // 表格搜索
     userSearchs() {
diff --git a/template/admin/src/pages/product/productList/tableExpand.vue b/template/admin/src/pages/product/productList/tableExpand.vue
index f22816134..f514d3533 100644
--- a/template/admin/src/pages/product/productList/tableExpand.vue
+++ b/template/admin/src/pages/product/productList/tableExpand.vue
@@ -1,29 +1,29 @@
 <template>
   <div>
-    <Row class="expand-row">
-      <Col span="8" class="mr20">
+    <el-row class="expand-row">
+      <el-col :span="8" class="mr20">
         <span class="expand-key">商品分类：</span>
         <span class="expand-value">{{ row.cate_name }}</span>
-      </Col>
-      <Col span="8">
+      </el-col>
+      <el-col :span="8">
         <span class="expand-key">商品市场价格：</span>
         <span class="expand-value">{{ row.ot_price }}</span>
-      </Col>
-      <Col span="8">
+      </el-col>
+      <el-col :span="8">
         <span class="expand-key">成本价：</span>
         <span class="expand-value">{{ row.cost }}</span>
-      </Col>
-    </Row>
-    <Row class="expand-row">
-      <Col span="8">
+      </el-col>
+    </el-row>
+    <el-row class="expand-row">
+      <el-col :span="8">
         <span class="expand-key">收藏：</span>
         <span class="expand-value">{{ row.collect }}</span>
-      </Col>
-      <Col span="8">
+      </el-col>
+      <el-col :span="8">
         <span class="expand-key">虚拟销量：</span>
         <span class="expand-value">{{ row.ficti }}</span>
-      </Col>
-    </Row>
+      </el-col>
+    </el-row>
   </div>
 </template>
 <style scoped>
diff --git a/template/admin/src/pages/product/productList/taoBao.vue b/template/admin/src/pages/product/productList/taoBao.vue
index 367c1457d..136e255c8 100644
--- a/template/admin/src/pages/product/productList/taoBao.vue
+++ b/template/admin/src/pages/product/productList/taoBao.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="Box">
-    <Card>
+    <el-card>
       <div>
         生成的商品默认是没有上架的，请手动上架商品！
         <a href="http://help.crmeb.net/crmeb-v4/1863579" v-if="copyConfig.copy_type == 2" target="_blank"
@@ -11,32 +11,32 @@
         >
       </div>
       <div>商品采集设置：设置 > 系统设置 > 第三方接口设置 > 采集商品配置</div>
-    </Card>
-    <Form
+    </el-card>
+    <el-form
       class="formValidate mt20"
       ref="formValidate"
       :model="formValidate"
       :rules="ruleInline"
-      :label-width="120"
+      label-width="120px"
       label-position="right"
       @submit.native.prevent
     >
-      <Row :gutter="24" type="flex">
-        <!--<Col span="24">-->
-        <!--<FormItem label=""  label-for="">-->
-        <!--<RadioGroup v-model="artFrom.type">-->
-        <!--<Radio label="taobao">淘宝</Radio>-->
-        <!--<Radio label="tmall">天猫</Radio>-->
-        <!--<Radio label="jd">京东</Radio>-->
-        <!--<Radio label="pdd">拼多多</Radio>-->
-        <!--<Radio label="suning">苏宁</Radio>-->
-        <!--<Radio label="1688">1688</Radio>-->
-        <!--</RadioGroup>-->
-        <!--</FormItem>-->
-        <!--</Col>-->
-        <Col span="15">
-          <FormItem label="链接地址：">
-            <Input
+      <el-row :gutter="24">
+        <!--<el-col :span="24">-->
+        <!--<el-form-item label=""  label-for="">-->
+        <!--<el-radio-group v-model="artFrom.type">-->
+        <!--<el-radio label="taobao">淘宝</el-radio>-->
+        <!--<el-radio label="tmall">天猫</el-radio>-->
+        <!--<el-radio label="jd">京东</el-radio>-->
+        <!--<el-radio label="pdd">拼多多</el-radio>-->
+        <!--<el-radio label="suning">苏宁</el-radio>-->
+        <!--<el-radio label="1688">1688</el-radio>-->
+        <!--</el-radio-group>-->
+        <!--</el-form-item>-->
+        <!--</el-col>-->
+        <el-col span="15">
+          <el-form-item label="链接地址：">
+            <el-input
               search
               enter-button="确定"
               v-model="soure_link"
@@ -44,27 +44,27 @@
               class="numPut"
               @on-search="add"
             />
-          </FormItem>
-        </Col>
+          </el-form-item>
+        </el-col>
         <div>
           <div v-if="isData">
-            <Col span="24" class="">
-              <FormItem label="商品名称：" prop="store_name">
-                <Input v-model="formValidate.store_name" placeholder="请输入商品名称" />
-              </FormItem>
-            </Col>
-            <Col span="24">
-              <FormItem label="商品简介：" prop="store_info" label-for="store_info">
-                <Input v-model="formValidate.store_info" type="textarea" :rows="3" placeholder="请输入商品简介" />
-              </FormItem>
-            </Col>
-            <Col span="24">
-              <FormItem label="商品分类：" prop="cate_id">
-                <!-- <Select v-model="formValidate.cate_id" multiple>
-                  <Option v-for="item in treeSelect" :disabled="item.pid === 0" :value="item.id" :key="item.id">{{
+            <el-col :span="24" class="">
+              <el-form-item label="商品名称：" prop="store_name">
+                <el-input v-model="formValidate.store_name" placeholder="请输入商品名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="商品简介：" prop="store_info" label-for="store_info">
+                <el-input v-model="formValidate.store_info" type="textarea" :rows="3" placeholder="请输入商品简介" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="商品分类：" prop="cate_id">
+                <!-- <el-select v-model="formValidate.cate_id" multiple>
+                  <el-option v-for="item in treeSelect" :disabled="item.pid === 0" :value="item.id" :key="item.id">{{
                     item.html + item.cate_name
-                  }}</Option>
-                </Select> -->
+                  }}</el-option>
+                </el-select> -->
                 <el-cascader
                   v-model="formValidate.cate_id"
                   size="small"
@@ -72,51 +72,66 @@
                   :props="{ multiple: true, emitPath: false }"
                   clearable
                 ></el-cascader>
-              </FormItem>
-            </Col>
-            <Col v-bind="grid">
-              <FormItem label="商品关键字：" prop="keyword" label-for="keyword">
-                <Input v-model="formValidate.keyword" placeholder="请输入商品关键字" />
-              </FormItem>
-            </Col>
-            <Col v-bind="grid">
-              <FormItem label="单位：" prop="unit_name" label-for="unit_name">
-                <Input v-model="formValidate.unit_name" placeholder="请输入单位" />
-              </FormItem>
-            </Col>
-            <Col v-bind="grid">
-              <FormItem label="虚拟销量：" label-for="ficti">
-                <InputNumber class="perW100" v-model="formValidate.ficti" placeholder="请输入虚拟销量" />
-              </FormItem>
-            </Col>
-            <Col v-bind="grid">
-              <FormItem label="积分：" label-for="give_integral">
-                <InputNumber class="perW100" v-model="formValidate.give_integral" placeholder="请输入积分" />
-              </FormItem>
-            </Col>
-            <Col v-bind="grid">
-              <FormItem label="运费模板：" prop="temp_id">
-                <Select v-model="formValidate.temp_id" clearable>
-                  <Option v-for="(item, index) in templateList" :value="item.id" :key="index">{{ item.name }}</Option>
-                </Select>
-              </FormItem>
-            </Col>
-            <!--<Col v-bind="grid">-->
-            <!--<FormItem label="邮费："  label-for="postage">-->
-            <!--<InputNumber  v-model="formValidate.postage" placeholder="请输入邮费"  />-->
-            <!--</FormItem>-->
-            <!--</Col>-->
-            <Col span="24">
-              <FormItem label="商品图：">
+              </el-form-item>
+            </el-col>
+            <el-col v-bind="grid">
+              <el-form-item label="商品关键字：" prop="keyword" label-for="keyword">
+                <el-input v-model="formValidate.keyword" placeholder="请输入商品关键字" />
+              </el-form-item>
+            </el-col>
+            <el-col v-bind="grid">
+              <el-form-item label="单位：" prop="unit_name" label-for="unit_name">
+                <el-input v-model="formValidate.unit_name" placeholder="请输入单位" />
+              </el-form-item>
+            </el-col>
+            <el-col v-bind="grid">
+              <el-form-item label="虚拟销量：" label-for="ficti">
+                <el-input-number
+                  controls-position="right"
+                  class="perW100"
+                  v-model="formValidate.ficti"
+                  placeholder="请输入虚拟销量"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-bind="grid">
+              <el-form-item label="积分：" label-for="give_integral">
+                <el-input-number
+                  controls-position="right"
+                  class="perW100"
+                  v-model="formValidate.give_integral"
+                  placeholder="请输入积分"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-bind="grid">
+              <el-form-item label="运费模板：" prop="temp_id">
+                <el-select v-model="formValidate.temp_id" clearable>
+                  <el-option
+                    v-for="(item, index) in templateList"
+                    :value="item.id"
+                    :key="index"
+                    :label="item.name"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!--<el-col v-bind="grid">-->
+            <!--<el-form-item label="邮费："  label-for="postage">-->
+            <!--<el-input-number controls-position="right"  v-model="formValidate.postage" placeholder="请输入邮费"  />-->
+            <!--</el-form-item>-->
+            <!--</el-col>-->
+            <el-col :span="24">
+              <el-form-item label="商品图：">
                 <div class="pictrueBox">
                   <div class="pictrue" v-if="formValidate.image" v-viewer>
                     <img v-lazy="formValidate.image" />
                   </div>
                 </div>
-              </FormItem>
-            </Col>
-            <Col span="24">
-              <FormItem label="商品轮播图：">
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="商品轮播图：">
                 <div class="acea-row" v-viewer>
                   <div
                     class="lunBox mr15"
@@ -130,125 +145,220 @@
                   >
                     <div class="pictrue"><img v-lazy="item" /></div>
                     <ButtonGroup size="small">
-                      <Button @click.native="checked(item, index)">主图</Button>
-                      <Button @click.native="handleRemove(index)">移除</Button>
+                      <el-button @click.native="checked(item, index)">主图</el-button>
+                      <el-button @click.native="handleRemove(index)">移除</el-button>
                     </ButtonGroup>
                   </div>
                 </div>
-              </FormItem>
-            </Col>
-            <Col span="24">
-              <FormItem label="批量设置：" class="labeltop" v-if="formValidate.attrs">
-                <Col :xl="23" :lg="24" :md="24" :sm="24" :xs="24">
-                  <FormItem>
-                    <Table :data="oneFormBatch" :columns="columnsBatch" border>
-                      <template slot-scope="{ row, index }" slot="pic">
-                        <div class="acea-row row-middle row-center-wrapper" @click="modalPicTap('dan', 'duopi', index)">
-                          <div class="pictrue pictrueTab" v-if="oneFormBatch[0].pic">
-                            <img v-lazy="oneFormBatch[0].pic" />
-                          </div>
-                          <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
-                            <Icon type="ios-camera-outline" size="21" class="iconfont" />
-                          </div>
-                        </div>
-                      </template>
-                      <template slot-scope="{ row, index }" slot="price">
-                        <InputNumber v-model="oneFormBatch[0].price" :min="0" class="priceBox"></InputNumber>
-                      </template>
-                      <template slot-scope="{ row, index }" slot="cost">
-                        <InputNumber v-model="oneFormBatch[0].cost" :min="0" class="priceBox"></InputNumber>
-                      </template>
-                      <template slot-scope="{ row, index }" slot="ot_price">
-                        <InputNumber v-model="oneFormBatch[0].ot_price" :min="0" class="priceBox"></InputNumber>
-                      </template>
-                      <template slot-scope="{ row, index }" slot="stock">
-                        <InputNumber v-model="oneFormBatch[0].stock" :min="0" class="priceBox"></InputNumber>
-                      </template>
-                      <template slot-scope="{ row, index }" slot="bar_code">
-                        <Input v-model="oneFormBatch[0].bar_code"></Input>
-                      </template>
-                      <template slot-scope="{ row, index }" slot="weight">
-                        <InputNumber v-model="oneFormBatch[0].weight" :min="0" class="priceBox"></InputNumber>
-                      </template>
-                      <template slot-scope="{ row, index }" slot="volume">
-                        <InputNumber v-model="oneFormBatch[0].volume" :min="0" class="priceBox"></InputNumber>
-                      </template>
-                      <template slot-scope="{ row, index }" slot="action">
-                        <a @click="batchAdd">添加</a>
-                        <Divider type="vertical" />
-                        <a @click="batchDel">清空</a>
-                      </template>
-                    </Table>
-                  </FormItem>
-                </Col>
-              </FormItem>
-            </Col>
-            <Col span="24">
-              <FormItem label="商品规格：" props="spec_type" label-for="spec_type">
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="批量设置：" class="labeltop" v-if="formValidate.attrs">
+                <el-col :xl="23" :lg="24" :md="24" :sm="24" :xs="24">
+                  <el-form-item>
+                    <el-table :data="oneFormBatch" border>
+                      <el-table-column
+                        :label="item.title"
+                        :min-width="item.minWidth"
+                        v-for="(item, index) in columns"
+                        :key="index"
+                      >
+                        <template slot-scope="scope">
+                          <template v-if="item.key">
+                            <div>
+                              <span>{{ scope.row[item.key] }}</span>
+                            </div>
+                          </template>
+                          <template v-else-if="item.slot === 'pic'">
+                            <div
+                              class="acea-row row-middle row-center-wrapper"
+                              @click="modalPicTap('dan', 'duopi', index)"
+                            >
+                              <div class="pictrue pictrueTab" v-if="oneFormBatch[0].pic">
+                                <img v-lazy="oneFormBatch[0].pic" />
+                              </div>
+                              <div class="upLoad pictrueTab acea-row row-center-wrapper" v-else>
+                                <Icon type="ios-camera-outline" size="21" class="iconfont" />
+                              </div>
+                            </div>
+                          </template>
+                          <template v-else-if="item.slot === 'price'">
+                            <el-input-number
+                              controls-position="right"
+                              v-model="oneFormBatch[0].price"
+                              :min="0"
+                              class="priceBox"
+                            ></el-input-number>
+                          </template>
+                          <template v-else-if="item.slot === 'cost'">
+                            <el-input-number
+                              controls-position="right"
+                              v-model="oneFormBatch[0].cost"
+                              class="priceBox"
+                            ></el-input-number>
+                          </template>
+                          <template v-else-if="item.slot === 'ot_price'">
+                            <el-input-number
+                              controls-position="right"
+                              v-model="oneFormBatch[0].ot_price"
+                              class="priceBox"
+                            ></el-input-number>
+                          </template>
+                          <template v-else-if="item.slot === 'stock'">
+                            <el-input-number
+                              controls-position="right"
+                              v-model="oneFormBatch[0].stock"
+                              class="priceBox"
+                            ></el-input-number>
+                          </template>
+                          <template v-else-if="item.slot === 'bar_code'">
+                            <el-input v-model="oneFormBatch[0].bar_code"></el-input>
+                          </template>
+                          <template v-else-if="item.slot === 'weight'">
+                            <el-input-number
+                              controls-position="right"
+                              v-model="oneFormBatch[0].weight"
+                              :min="0"
+                              class="priceBox"
+                            ></el-input-number>
+                          </template>
+                          <template v-else-if="item.slot === 'volume'">
+                            <el-input-number
+                              controls-position="right"
+                              v-model="oneFormBatch[0].volume"
+                              :min="0"
+                              class="priceBox"
+                            ></el-input-number>
+                          </template>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="操作" fixed="right" width="170">
+                        <template slot-scope="scope">
+                          <a @click="batchAdd">添加</a>
+                          <el-divider direction="vertical"></el-divider>
+                          <a @click="batchDel">清空</a>
+                        </template>
+                      </el-table-column>
+                    </el-table>
+                  </el-form-item>
+                </el-col>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="商品规格：" props="spec_type" label-for="spec_type">
                 <!-- 单规格表格-->
-                <Col :xl="23" :lg="24" :md="24" :sm="24" :xs="24">
-                  <FormItem>
-                    <Table :data="items" :columns="columns" border>
-                      <template slot-scope="{ row, index }" slot="pic">
-                        <div class="acea-row row-middle row-center-wrapper" @click="modalPicTap('dan', index)">
-                          <div class="pictrue pictrueTab" v-if="formValidate.attrs[index].pic">
-                            <img v-lazy="formValidate.attrs[index].pic" />
-                          </div>
-                          <div class="upLoad upLoadTab acea-row row-center-wrapper" v-else>
-                            <Icon type="ios-camera-outline" size="26" class="iconfont" />
-                          </div>
-                        </div>
-                      </template>
-                      <template slot-scope="{ row, index }" slot="price">
-                        <InputNumber v-model="formValidate.attrs[index].price" class="priceBox"></InputNumber>
-                      </template>
-                      <template slot-scope="{ row, index }" slot="cost">
-                        <InputNumber v-model="formValidate.attrs[index].cost" class="priceBox"></InputNumber>
-                      </template>
-                      <template slot-scope="{ row, index }" slot="ot_price">
-                        <InputNumber v-model="formValidate.attrs[index].ot_price" class="priceBox"></InputNumber>
-                      </template>
-                      <template slot-scope="{ row, index }" slot="stock">
-                        <InputNumber v-model="formValidate.attrs[index].stock" class="priceBox"></InputNumber>
-                      </template>
-                      <template slot-scope="{ row, index }" slot="bar_code">
-                        <Input v-model="formValidate.attrs[index].bar_code"></Input>
-                      </template>
-                      <template slot-scope="{ row, index }" slot="weight">
-                        <InputNumber v-model="formValidate.attrs[index].weight" :min="0" class="priceBox"></InputNumber>
-                      </template>
-                      <template slot-scope="{ row, index }" slot="volume">
-                        <InputNumber v-model="formValidate.attrs[index].volume" :min="0" class="priceBox"></InputNumber>
-                      </template>
-                      <template slot-scope="{ row, index }" slot="action">
-                        <a @click="delAttrTable(index)">删除</a>
-                      </template>
-                    </Table>
-                  </FormItem>
-                </Col>
-              </FormItem>
-            </Col>
-            <Col span="24">
-              <FormItem label="商品详情：">
+                <el-col :xl="23" :lg="24" :md="24" :sm="24" :xs="24">
+                  <el-form-item>
+                    <el-table :data="items" border>
+                      <el-table-column
+                        :label="item.title"
+                        :min-width="item.minWidth"
+                        v-for="(item, index) in columns"
+                        :key="index"
+                      >
+                        <template slot-scope="scope">
+                          <template v-if="item.key">
+                            <div>
+                              <span>{{ scope.row[item.key] }}</span>
+                            </div>
+                          </template>
+                          <template v-else-if="item.slot === 'pic'">
+                            <div
+                              class="acea-row row-middle row-center-wrapper"
+                              @click="modalPicTap('dan', scope.$index)"
+                            >
+                              <div class="pictrue pictrueTab" v-if="formValidate.attrs[scope.$index].pic">
+                                <img v-lazy="formValidate.attrs[scope.$index].pic" />
+                              </div>
+                              <div class="upLoad upLoadTab acea-row row-center-wrapper" v-else>
+                                <Icon type="ios-camera-outline" size="26" class="iconfont" />
+                              </div>
+                            </div>
+                          </template>
+                          <template v-else-if="item.slot === 'price'">
+                            <el-input-number
+                              controls-position="right"
+                              v-model="formValidate.attrs[scope.$index].price"
+                              class="priceBox"
+                            ></el-input-number>
+                          </template>
+                          <template v-else-if="item.slot === 'cost'">
+                            <el-input-number
+                              controls-position="right"
+                              v-model="formValidate.attrs[scope.$index].cost"
+                              class="priceBox"
+                            ></el-input-number>
+                          </template>
+                          <template v-else-if="item.slot === 'ot_price'">
+                            <el-input-number
+                              controls-position="right"
+                              v-model="formValidate.attrs[scope.$index].ot_price"
+                              class="priceBox"
+                            ></el-input-number>
+                          </template>
+                          <template v-else-if="item.slot === 'stock'">
+                            <el-input-number
+                              controls-position="right"
+                              v-model="formValidate.attrs[scope.$index].stock"
+                              class="priceBox"
+                            ></el-input-number>
+                          </template>
+                          <template v-else-if="item.slot === 'bar_code'">
+                            <el-input v-model="formValidate.attrs[scope.$index].bar_code"></el-input>
+                          </template>
+                          <template v-else-if="item.slot === 'weight'">
+                            <el-input-number
+                              controls-position="right"
+                              v-model="formValidate.attrs[scope.$index].weight"
+                              :min="0"
+                              class="priceBox"
+                            ></el-input-number>
+                          </template>
+                          <template v-else-if="item.slot === 'volume'">
+                            <el-input-number
+                              controls-position="right"
+                              v-model="formValidate.attrs[scope.$index].volume"
+                              :min="0"
+                              class="priceBox"
+                            ></el-input-number>
+                          </template>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="操作" fixed="right" width="170">
+                        <template slot-scope="scope">
+                          <a @click="delAttrTable(scope.$index)">删除</a>
+                        </template>
+                      </el-table-column>
+                    </el-table>
+                  </el-form-item>
+                </el-col>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="商品详情：">
                 <WangEditor
                   style="width: 100%"
                   :content="formValidate.description"
                   @editorContent="getEditorContent"
                 ></WangEditor>
-              </FormItem>
-            </Col>
-            <Col span="24">
-              <FormItem>
-                <Button type="primary" :loading="modal_loading" class="submission" @click="handleSubmit('formValidate')"
-                  >提交</Button
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item>
+                <el-button
+                  type="primary"
+                  :loading="modal_loading"
+                  class="submission"
+                  @click="handleSubmit('formValidate')"
+                  >提交</el-button
                 >
-              </FormItem>
-            </Col>
+              </el-form-item>
+            </el-col>
           </div>
           <Spin size="large" fix v-if="spinShow"></Spin>
         </div>
-      </Row>
-    </Form>
+      </el-row>
+    </el-form>
     <Modal
       v-model="modalPic"
       width="950px"
diff --git a/template/admin/src/pages/product/productReply/index.vue b/template/admin/src/pages/product/productReply/index.vue
index 3d5255837..4b562fa36 100644
--- a/template/admin/src/pages/product/productReply/index.vue
+++ b/template/admin/src/pages/product/productReply/index.vue
@@ -3,27 +3,29 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <router-link :to="{ path: $routeProStr + '/product/product_list' }" v-if="$route.params.id"
-          ><Button icon="ios-arrow-back" size="small" class="mr20">返回</Button></router-link
+          ><el-button icon="ios-arrow-back" size="small" class="mr20">返回</el-button></router-link
         >
         <span class="ivu-page-header-title mr20">商品评论管理</span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form ref="formValidate" :model="formValidate" :label-width="75" label-position="left" @submit.native.prevent>
-        <Row type="flex" :gutter="24">
-          <Col span="24">
-            <FormItem label="评论时间：">
-              <RadioGroup
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form ref="formValidate" :model="formValidate" label-width="75px" label-position="left" @submit.native.prevent>
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="评论时间：">
+              <el-radio-group
                 v-model="formValidate.data"
                 type="button"
-                @on-change="selectChange(formValidate.data)"
+                @change="selectChange(formValidate.data)"
                 class="mr"
               >
-                <Radio :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{ item.text }}</Radio>
-              </RadioGroup>
+                <el-radio-button :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{
+                  item.text
+                }}</el-radio-button>
+              </el-radio-group>
               <DatePicker
                 :editable="false"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="daterange"
@@ -31,97 +33,125 @@
                 placeholder="请选择时间"
                 style="width: 200px"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="评价状态：">
-              <Select v-model="formValidate.is_reply" placeholder="请选择" clearable @on-change="userSearchs">
-                <Option value="1">已回复</Option>
-                <Option value="0">未回复</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid" v-if="!$route.params.id">
-            <FormItem label="商品信息：" label-for="store_name">
-              <Input
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="评价状态：">
+              <el-select v-model="formValidate.is_reply" placeholder="请选择" clearable @change="userSearchs">
+                <el-option value="1" label="已回复"></el-option>
+                <el-option value="0" label="未回复"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid" v-if="!$route.params.id">
+            <el-form-item label="商品信息：" label-for="store_name">
+              <el-input
                 size="default"
                 enter-button
                 placeholder="请输入商品ID或者商品信息"
                 clearable
                 v-model="formValidate.store_name"
               />
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="用户名称：" label-for="account">
-              <Input size="default" enter-button placeholder="请输入" clearable v-model="formValidate.account" />
-            </FormItem>
-          </Col>
-          <Col :xl="3" :lg="3" :md="12" :sm="12" :xs="24" class="search">
-            <FormItem>
-              <Button type="primary" icon="ios-search" @click="userSearchs">搜索</Button>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="用户名称：" label-for="account">
+              <el-input size="default" enter-button placeholder="请输入" clearable v-model="formValidate.account" />
+            </el-form-item>
+          </el-col>
+          <el-col :xl="3" :lg="3" :md="12" :sm="12" :xs="24" class="search">
+            <el-form-item>
+              <el-button type="primary" icon="ios-search" @click="userSearchs">搜索</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
       <!--            <div class="Button">-->
-      <!--                <Button type="primary" class="bnt" icon="md-add">添加评论</Button>-->
+      <!--                <el-button type="primary" class="bnt" icon="md-add">添加评论</el-button>-->
       <!--            </div>-->
-      <Row type="flex">
-        <Col v-bind="grid">
-          <Button v-auth="['product-reply-save_fictitious_reply']" type="primary" icon="md-add" @click="add"
-            >添加自评</Button
+      <el-row>
+        <el-col v-bind="grid">
+          <el-button v-auth="['product-reply-save_fictitious_reply']" type="primary" icon="md-add" @click="add"
+            >添加自评</el-button
           >
-        </Col>
-      </Row>
-      <Table
+        </el-col>
+      </el-row>
+      <el-table
         ref="table"
-        :columns="columns"
         :data="tableList"
         class="ivu-mt mt25"
-        :loading="loading"
+        v-loading="loading"
         @on-sort-change="sortMethod"
-        no-data-text="暂无数据"
-        no-filtered-data-text="暂无筛选结果"
+        empty-text="暂无数据"
       >
-        <template slot-scope="{ row }" slot="info">
-          <div class="imgPic acea-row row-middle">
-            <div class="pictrue" v-viewer><img v-lazy="row.image" /></div>
-            <div class="info">{{ row.store_name }}</div>
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="content">
-          <div class="mb5 content_font">{{ row.comment }}</div>
-          <div v-viewer class="pictrue mr10" v-for="(item, index) in row.pics || []" :key="index">
-            <img v-lazy="item" :src="item" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="reply(row)">回复</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除评论', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="评论ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品信息" min-width="130">
+          <template slot-scope="scope">
+            <div class="imgPic acea-scope.row scope.row-middle">
+              <div class="pictrue" v-viewer><img v-lazy="scope.row.image" /></div>
+              <div class="info">{{ scope.row.store_name }}</div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="评分" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.score }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="评价内容" min-width="130">
+          <template slot-scope="scope">
+            <div class="mb5 content_font">{{ scope.row.comment }}</div>
+            <div v-viewer class="pictrue mr10" v-for="(item, index) in scope.row.pics || []" :key="index">
+              <img v-lazy="item" :src="item" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="回复内容" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.merchant_reply_content }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="评价时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="reply(scope.row)">回复</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除评论', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <Modal v-model="modals" scrollable title="回复内容" closable>
-      <Form ref="contents" :model="contents" :rules="ruleInline" label-position="right" @submit.native.prevent>
-        <FormItem prop="content">
-          <Input v-model="contents.content" type="textarea" :rows="4" placeholder="请输入回复内容" />
-        </FormItem>
-      </Form>
+      <el-form ref="contents" :model="contents" :rules="ruleInline" label-position="right" @submit.native.prevent>
+        <el-form-item prop="content">
+          <el-input v-model="contents.content" type="textarea" :rows="4" placeholder="请输入回复内容" />
+        </el-form-item>
+      </el-form>
       <div slot="footer">
-        <Button type="primary" @click="oks">确定</Button>
-        <Button @click="cancels">取消</Button>
+        <el-button type="primary" @click="oks">确定</el-button>
+        <el-button @click="cancels">取消</el-button>
       </div>
     </Modal>
   </div>
@@ -170,51 +200,6 @@ export default {
       tableList: [],
       total: 0,
       loading: false,
-      columns: [
-        {
-          title: '评论ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '商品信息',
-          slot: 'info',
-          minWidth: 230,
-        },
-        {
-          title: '用户名称',
-          key: 'nickname',
-          minWidth: 150,
-        },
-        {
-          title: '评分',
-          key: 'score',
-          sortable: true,
-          minWidth: 90,
-        },
-        {
-          title: '评价内容',
-          slot: 'content',
-          minWidth: 210,
-        },
-        {
-          title: '回复内容',
-          key: 'merchant_reply_content',
-          minWidth: 250,
-        },
-        {
-          title: '评价时间',
-          key: 'add_time',
-          sortable: true,
-          minWidth: 150,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 150,
-        },
-      ],
       timeVal: [],
       contents: {
         content: '',
@@ -329,10 +314,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.formValidate.page = 1;
diff --git a/template/admin/src/pages/product/tableExpand.vue b/template/admin/src/pages/product/tableExpand.vue
index d3a5b0b43..773c0009e 100644
--- a/template/admin/src/pages/product/tableExpand.vue
+++ b/template/admin/src/pages/product/tableExpand.vue
@@ -1,47 +1,47 @@
 <template>
   <div>
-    <Row class="expand-row">
-      <Col span="6">
+    <el-row class="expand-row">
+      <el-col :span="6">
         <span class="expand-key">首次访问：</span>
         <span class="expand-value"> {{ row.add_time | formatDate }}</span>
-      </Col>
-      <Col span="6">
+      </el-col>
+      <el-col :span="6">
         <span class="expand-key">近次访问：</span>
         <span class="expand-value">{{ row.last_time | formatDate }}</span>
-      </Col>
-      <Col span="6">
+      </el-col>
+      <el-col :span="6">
         <span class="expand-key">身份证号：</span>
         <span class="expand-value">{{ row.card_id }}</span>
-      </Col>
-      <Col span="6">
+      </el-col>
+      <el-col :span="6">
         <span class="expand-key">真实姓名：</span>
         <span class="expand-value">{{ row.real_name }}</span>
-      </Col>
-    </Row>
-    <Row class="expand-row">
-      <Col span="6">
+      </el-col>
+    </el-row>
+    <el-row class="expand-row">
+      <el-col :span="6">
         <span class="expand-key">标签：</span>
         <span class="expand-value">{{ row.labels }}</span>
-      </Col>
-      <Col span="6">
+      </el-col>
+      <el-col :span="6">
         <span class="expand-key">生日：</span>
         <span class="expand-value">{{ row.birthday }}</span>
-      </Col>
-      <Col span="6">
+      </el-col>
+      <el-col :span="6">
         <span class="expand-key">推荐人：</span>
         <span class="expand-value">{{ row.spread_uid_nickname }}</span>
-      </Col>
-      <Col span="6">
+      </el-col>
+      <el-col :span="6">
         <span class="expand-key">地址：</span>
         <span class="expand-value">{{ row.addres }}</span>
-      </Col>
-    </Row>
-    <Row class="expand-row">
-      <Col span="6">
+      </el-col>
+    </el-row>
+    <el-row class="expand-row">
+      <el-col :span="6">
         <span class="expand-key">备注：</span>
         <span class="expand-value">{{ row.mark }}</span>
-      </Col>
-    </Row>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/setting/agreement/index.vue b/template/admin/src/pages/setting/agreement/index.vue
index 81c9ab501..2e9cf1cb7 100644
--- a/template/admin/src/pages/setting/agreement/index.vue
+++ b/template/admin/src/pages/setting/agreement/index.vue
@@ -1,39 +1,39 @@
 <template>
   <div class="agreemant">
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="new_card_pd">
-        <Tabs v-model="currentTab" @on-click="changeTab">
-          <TabPane :label="item.label" :name="item.value.toString()" v-for="(item, index) in headerList" :key="index" />
-        </Tabs>
+        <el-tabs v-model="currentTab" @tab-click="changeTab">
+          <el-tab-pane :label="item.label" :name="item.value.toString()" v-for="(item, index) in headerList" :key="index" />
+        </el-tabs>
       </div>
-    </Card>
+    </el-card>
 
-    <Row class="content">
-      <Col span="16">
+    <el-row class="content">
+      <el-col :span="16">
         <WangEditor style="width: 100%" :content="formValidate.content" @editorContent="getEditorContent"></WangEditor>
-      </Col>
-      <Col span="6" style="width: 33%">
+      </el-col>
+      <el-col :span="6" style="width: 33%">
         <div class="ifam">
           <div class="content" v-html="content"></div>
         </div>
-      </Col>
-    </Row>
-    <!-- <Row class="mb10 content">
-      <Button class="bnt" type="primary" @click="save" :loading="loadingExist"
-        >保存</Button
+      </el-col>
+    </el-row>
+    <!-- <el-row class="mb10 content">
+      <el-button class="bnt" type="primary" @click="save" :loading="loadingExist"
+        >保存</el-button
       >
-    </Row> -->
+    </el-row> -->
 
-    <Card
+    <el-card
       :bordered="false"
-      dis-hover
+      shadow="never"
       class="fixed-card"
       :style="{ left: `${!menuCollapse ? '240px' : isMobile ? '0' : '80px'}` }"
     >
       <div class="acea-row row-center">
-        <Button class="bnt" type="primary" @click="save" :loading="loadingExist">保存</Button>
+        <el-button class="bnt" type="primary" @click="save" :loading="loadingExist">保存</el-button>
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -92,9 +92,9 @@ export default {
     getEditorContent(content) {
       this.content = content;
     },
-    changeTab(data) {
+    changeTab() {
       this.formValidate.content = ' ';
-      getAgreements(data).then((res) => {
+      getAgreements(this.currentTab).then((res) => {
         this.formValidate.id = res.data.id || 0;
         this.formValidate.type = res.data.type;
         this.formValidate.title = res.data.title;
diff --git a/template/admin/src/pages/setting/cityDada/index.vue b/template/admin/src/pages/setting/cityDada/index.vue
index 481ac1732..4f8242ef4 100644
--- a/template/admin/src/pages/setting/cityDada/index.vue
+++ b/template/admin/src/pages/setting/cityDada/index.vue
@@ -1,26 +1,49 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="acea-row row-between-wrapper mb20">
-        <Row type="flex">
-          <Col v-bind="grid">
+        <el-row>
+          <el-col v-bind="grid">
             <div class="button acea-row row-middle">
-              <Button class="mr20" type="primary" icon="md-add" @click="add(0)">添加省份</Button>
-              <Button type="primary" @click="cleanCache">清除缓存</Button>
+              <el-button class="mr20" type="primary" icon="md-add" @click="add(0)">添加省份</el-button>
+              <el-button type="primary" @click="cleanCache">清除缓存</el-button>
             </div>
-          </Col>
-        </Row>
+          </el-col>
+        </el-row>
       </div>
-      <Table row-key="id" :load-data="handleLoadData" :columns="columns1" :data="cityLists">
-        <template slot-scope="{ row, index }" slot="action">
-          <a v-if="row.hasOwnProperty('children')" @click="add(row.city_id)">添加</a>
-          <Divider v-if="row.hasOwnProperty('children')" type="vertical" />
-          <a @click="edit(row.id)">编辑</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除城市', index)">删除</a>
-        </template>
-      </Table>
-    </Card>
+      <el-table
+        row-key="id"
+        :load="handleLoadData"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        :data="cityLists"
+        lazy
+      >
+        <el-table-column label="编号" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="地区名称" min-width="300">
+          <template slot-scope="scope">
+            <span>{{ scope.row.label }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="上级名称" min-width="300">
+          <template slot-scope="scope">
+            <span>{{ scope.row.parent_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a v-if="scope.row.hasOwnProperty('children')" @click="add(scope.row.city_id)">添加</a>
+            <el-divider direction="vertical" v-if="scope.row.hasOwnProperty('children')" />
+            <a @click="edit(scope.row.id)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除城市', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
   </div>
 </template>
 
@@ -70,7 +93,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -141,7 +164,7 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    handleLoadData(item, callback) {
+    handleLoadData(item, node, callback) {
       cityListApi(item.city_id).then((res) => {
         callback(res.data);
       });
diff --git a/template/admin/src/pages/setting/clerkList/index.vue b/template/admin/src/pages/setting/clerkList/index.vue
index 52079c1ce..fcddc5c23 100644
--- a/template/admin/src/pages/setting/clerkList/index.vue
+++ b/template/admin/src/pages/setting/clerkList/index.vue
@@ -1,76 +1,114 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="artFrom"
         :model="artFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid" class="mr">
-            <FormItem label="提货点名称：" label-for="store_name">
-              <Select v-model="artFrom.store_id" element-id="store_id" clearable @on-change="userSearchs">
-                <Option v-for="item in storeSelectList" :value="item.id" :key="item.id">{{ item.name }}</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <!--<Col v-bind="grid" class="mr">-->
-          <!--<Button type="primary" class="mr15" @click="userSearchs">搜索</Button>-->
-          <!--</Col>-->
-        </Row>
-      </Form>
-      <Row type="flex">
-        <Col v-bind="grid">
-          <Button v-auth="['merchant-store_staff-create']" type="primary" icon="md-add" @click="add">添加核销员</Button>
-        </Col>
-      </Row>
-      <Table
+        <el-row :gutter="24">
+          <el-col v-bind="grid" class="mr">
+            <el-form-item label="提货点名称：" label-for="store_name">
+              <el-select v-model="artFrom.store_id" element-id="store_id" clearable @change="userSearchs">
+                <el-option
+                  v-for="item in storeSelectList"
+                  :value="item.id"
+                  :key="item.id"
+                  :label="item.name"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <!--<el-col v-bind="grid" class="mr">-->
+          <!--<el-button type="primary" class="mr15" @click="userSearchs">搜索</el-button>-->
+          <!--</el-col>-->
+        </el-row>
+      </el-form>
+      <el-row>
+        <el-col v-bind="grid">
+          <el-button v-auth="['merchant-store_staff-create']" type="primary" icon="md-add" @click="add"
+            >添加核销员</el-button
+          >
+        </el-col>
+      </el-row>
+      <el-table
         :columns="columns"
         :data="storeLists"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="avatar">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row.id, row.status)"
-            size="large"
-            >>
-            <span slot="open">显示</span>
-            <span slot="close">隐藏</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row.id)">编辑</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除核销员', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="头像" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.avatar" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="微信名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="核销员名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.staff_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="所属提货点" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="添加时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="150">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              :value="scope.row.status"
+              @change="onchangeIsShow(scope.row.id, scope.row.status)"
+              size="large"
+              active-text="开启"
+              inactive-text="关闭"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row.id)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除核销员', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="artFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="artFrom.limit"
+          :page.sync="artFrom.page"
+          :limit.sync="artFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -90,7 +128,7 @@ export default {
     ...mapState('media', ['isMobile']),
     ...mapState('userLevel', ['categoryId']),
     labelWidth() {
-      return this.isMobile ? undefined : 85;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -189,10 +227,6 @@ export default {
       this.artFrom.page = 1;
       this.getList();
     },
-    pageChange(index) {
-      this.artFrom.page = index;
-      this.getList();
-    },
     // 删除
     del(row, tit, num) {
       let delfromData = {
diff --git a/template/admin/src/pages/setting/deliveryService/index.vue b/template/admin/src/pages/setting/deliveryService/index.vue
index 23b7f7ab7..2115ce515 100644
--- a/template/admin/src/pages/setting/deliveryService/index.vue
+++ b/template/admin/src/pages/setting/deliveryService/index.vue
@@ -1,60 +1,82 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row type="flex" class="mb20">
-        <Col span="24">
-          <Button v-auth="['setting-delivery_service-add']" type="primary" icon="md-add" @click="add" class="mr10"
-            >添加配送员</Button
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row class="mb20">
+        <el-col :span="24">
+          <el-button v-auth="['setting-delivery_service-add']" type="primary" icon="md-add" @click="add" class="mr10"
+            >添加配送员</el-button
           >
-        </Col>
-      </Row>
-      <Table
+        </el-col>
+      </el-row>
+      <el-table
         :columns="columns1"
         :data="data1"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="avatar">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">显示</span>
-            <span slot="close">隐藏</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="add_time">
-          <span> {{ row.add_time | formatDate }}</span>
-        </template>
-
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row)">编辑</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除配送员', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="头像" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.avatar" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="手机号码" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.phone }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否显示" min-width="130">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              :value="scope.row.status"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+              active-text="显示"
+              inactive-text="隐藏"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="添加时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="100">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除配送员', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="tableOptions.page"
-          show-elevator
-          show-total
-          :page-size="tableOptions.limit"
-          @on-change="pageChange"
+          :page.sync="tableOptions.page"
+          :limit.sync="tableOptions.limit"
+          @pagination="getOrderDeliveryList"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -170,10 +192,6 @@ export default {
           this.$Message.error(err.msg);
         });
     },
-    pageChange(index) {
-      this.tableOptions.page = index;
-      this.getOrderDeliveryList();
-    },
   },
 };
 </script>
diff --git a/template/admin/src/pages/setting/devise/components/uploadPic.vue b/template/admin/src/pages/setting/devise/components/uploadPic.vue
index 137829cc6..5c42ea0a2 100644
--- a/template/admin/src/pages/setting/devise/components/uploadPic.vue
+++ b/template/admin/src/pages/setting/devise/components/uploadPic.vue
@@ -16,13 +16,13 @@
             <div class="info-item" v-if="item.hasOwnProperty('name')">
               <span>{{ type == 1 ? '管理名称：' : type == 2 ? '广告名称' : '服务名称：' }}</span>
               <div class="input-box">
-                <Input v-model="item.name" :placeholder="type == 2 ? '请输入名称' : '服务中心'" :maxlength="4" />
+                <el-input v-model="item.name" :placeholder="type == 2 ? '请输入名称' : '服务中心'" :maxlength="4" />
               </div>
             </div>
             <div class="info-item">
               <span>链接地址：</span>
               <div class="input-box" @click="getLink(index)">
-                <Input v-model="item.url" icon="ios-arrow-forward" readonly placeholder="选择链接" />
+                <el-input v-model="item.url" icon="ios-arrow-forward" readonly placeholder="选择链接" />
               </div>
             </div>
           </div>
@@ -54,12 +54,12 @@
     </div>
     <template v-if="listData">
       <div class="add-btn" v-if="(type != 1 && type != 2) || (type == 2 && listData.length < 5)">
-        <Button
+        <el-button
           type="primary"
           ghost
           style="width: 100px; height: 30px; background: #1890ff; color: #fff; font-size: 13px"
           @click="addBox"
-          >添加板块</Button
+          >添加板块</el-button
         >
       </div>
     </template>
diff --git a/template/admin/src/pages/setting/devise/diyIndex.vue b/template/admin/src/pages/setting/devise/diyIndex.vue
index a58c6fd18..5e35db474 100644
--- a/template/admin/src/pages/setting/devise/diyIndex.vue
+++ b/template/admin/src/pages/setting/devise/diyIndex.vue
@@ -3,23 +3,23 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <!-- <router-link :to="{ path: $routeProStr + '/setting/pages/devise' }"
-          ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
+          ><el-button icon="ios-arrow-back" size="small" type="text">返回</el-button></router-link
         > -->
-        <!-- <Divider type="vertical" /> -->
+        <!-- <el-divider direction="vertical"></el-divider> -->
         <span class="ivu-page-header-title mr20" style="padding: 0" v-text="$route.meta.title"></span>
         <div class="rbtn">
-          <!-- <Button v-if="pageId !== 0" class="bnt" @click="setmoren" :loading="loading">保存默认</Button>
-          <Button v-if="pageId !== 0" class="bnt ml20" @click="getmoren" :loading="loading">恢复默认</Button> -->
+          <!-- <el-button v-if="pageId !== 0" class="bnt" @click="setmoren" :loading="loading">保存默认</el-button>
+          <el-button v-if="pageId !== 0" class="bnt ml20" @click="getmoren" :loading="loading">恢复默认</el-button> -->
           <!-- <div class="data" @click="setmoren">设置默认</div>
             <div class="data" @click="getmoren">恢复默认</div> -->
-          <Button class="bnt ml20" type="info" @click="preview" :loading="loading">预览</Button>
-          <Button class="bnt ml20" type="primary" @click="saveConfig(0)" :loading="loading">保存</Button>
-          <Button class="ml20" type="error" @click="closeWindow" :loading="loading">关闭</Button>
+          <el-button class="bnt ml20" type="info" @click="preview" :loading="loading">预览</el-button>
+          <el-button class="bnt ml20" type="primary" @click="saveConfig(0)" :loading="loading">保存</el-button>
+          <el-button class="ml20" type="error" @click="closeWindow" :loading="loading">关闭</el-button>
         </div>
       </div>
     </div>
 
-    <Card :bordered="false" dis-hover class="ivu-mt" style="margin: 0 10px">
+    <el-card :bordered="false" shadow="never" class="ivu-mt" style="margin: 0 10px">
       <div class="diy-wrapper">
         <!-- 左侧 -->
         <div class="left">
@@ -72,7 +72,7 @@
               </draggable>
             </div>
           </div>
-          <!--                    <div style="padding: 0 20px"><Button type="primary" style="width: 100%" @click="saveConfig">保存</Button></div>-->
+          <!--                    <div style="padding: 0 20px"><el-button type="primary" style="width: 100%" @click="saveConfig">保存</el-button></div>-->
           <div class="wrapper" v-else :style="'height:' + (clientHeight - 200) + 'px;'">
             <div class="link-item" v-for="(item, index) in urlList" :key="index">
               <div class="name">{{ item.name }}</div>
@@ -83,7 +83,7 @@
               </div>
               <div class="lable">
                 <p class="txt">例如：{{ item.example }}</p>
-                <Button size="small" @click="onCopy(item.example)">复制 </Button>
+                <el-button size="small" @click="onCopy(item.example)">复制 </el-button>
               </div>
             </div>
           </div>
@@ -94,9 +94,9 @@
           style="flex: 1; background: #f0f2f5; display: flex; justify-content: center; padding-top: 20px; height: 100%"
         >
           <div class="acticon">
-            <Button class="bnt mb10" @click="showTitle">页面设置</Button>
-            <Button class="bnt mb10" @click="nameModal = true">另存模板</Button>
-            <Button class="bnt" @click="reast">重置</Button>
+            <el-button class="bnt mb10" @click="showTitle">页面设置</el-button>
+            <el-button class="bnt mb10" @click="nameModal = true">另存模板</el-button>
+            <el-button class="bnt" @click="reast">重置</el-button>
           </div>
           <div class="content">
             <div class="contxt" style="display: flex; flex-direction: column; overflow: hidden; height: 100%">
@@ -210,12 +210,12 @@
           </div>
         </div>
       </div>
-    </Card>
+    </el-card>
     <!--<div class="foot-box">-->
-    <!--<Button @click="reast">重置</Button>-->
-    <!--<Button type="primary" @click="saveConfig" :loading="loading"-->
+    <!--<el-button @click="reast">重置</el-button>-->
+    <!--<el-button type="primary" @click="saveConfig" :loading="loading"-->
     <!--&gt;保存-->
-    <!--</Button-->
+    <!--</el-button-->
     <!--&gt;-->
     <!--</div>-->
     <Modal v-model="modal" title="预览" footer-hide>
@@ -235,7 +235,7 @@
       </div>
     </Modal>
     <Modal v-model="nameModal" title="设置模版名称" :closable="false" @on-ok="saveModal" @on-cancel="nameModal = false">
-      <Input v-model="saveName" placeholder="请输入模版名称"></Input>
+      <el-input v-model="saveName" placeholder="请输入模版名称"></el-input>
     </Modal>
   </div>
 </template>
diff --git a/template/admin/src/pages/setting/devise/goodClass.vue b/template/admin/src/pages/setting/devise/goodClass.vue
index 0ca242f17..e08834e00 100644
--- a/template/admin/src/pages/setting/devise/goodClass.vue
+++ b/template/admin/src/pages/setting/devise/goodClass.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="goodClass">
-    <Card :bordered="false" dis-hover>
+    <el-card :bordered="false" shadow="never">
       <!-- <div class="title">页面设置</div> -->
       <div class="list acea-row row-top">
         <div
@@ -14,7 +14,7 @@
           <div class="name">{{ item.name }}</div>
         </div>
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/setting/devise/index.vue b/template/admin/src/pages/setting/devise/index.vue
index 1a794e28f..92b69c447 100644
--- a/template/admin/src/pages/setting/devise/index.vue
+++ b/template/admin/src/pages/setting/devise/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="diy-page">
-    <Card :bordered="false" dis-hover class="ivu-mt" style="margin: 0 10px">
+    <el-card :bordered="false" shadow="never" class="ivu-mt" style="margin: 0 10px">
       <div class="diy-wrapper" :style="'height:' + clientHeight + 'px;'">
         <!-- 左侧 -->
         <div class="left">
@@ -50,7 +50,7 @@
               </draggable>
             </div>
           </div>
-          <!--                    <div style="padding: 0 20px"><Button type="primary" style="width: 100%" @click="saveConfig">保存</Button></div>-->
+          <!--                    <div style="padding: 0 20px"><el-button type="primary" style="width: 100%" @click="saveConfig">保存</el-button></div>-->
           <div class="wrapper" v-else :style="'height:' + (clientHeight - 46) + 'px;'">
             <div class="link-item" v-for="(item, index) in urlList" :key="index">
               <div class="name">{{ item.name }}</div>
@@ -61,7 +61,7 @@
               </div>
               <div class="lable">
                 <p class="txt">例如：{{ item.example }}</p>
-                <Button size="small" @click="onCopy(item.example)">复制 </Button>
+                <el-button size="small" @click="onCopy(item.example)">复制 </el-button>
               </div>
             </div>
           </div>
@@ -182,12 +182,12 @@
           </div>
         </div>
       </div>
-    </Card>
+    </el-card>
     <!--<div class="foot-box">-->
-    <!--<Button @click="reast">重置</Button>-->
-    <!--<Button type="primary" @click="saveConfig" :loading="loading"-->
+    <!--<el-button @click="reast">重置</el-button>-->
+    <!--<el-button type="primary" @click="saveConfig" :loading="loading"-->
     <!--&gt;保存-->
-    <!--</Button-->
+    <!--</el-button-->
     <!--&gt;-->
     <!--</div>-->
   </div>
diff --git a/template/admin/src/pages/setting/devise/links.vue b/template/admin/src/pages/setting/devise/links.vue
index 68de94fb7..ac5c6b4b5 100644
--- a/template/admin/src/pages/setting/devise/links.vue
+++ b/template/admin/src/pages/setting/devise/links.vue
@@ -11,9 +11,9 @@
       </div>
       <div class="tips">
         例如：{{ item.example }}
-        <!--<Button size="small" style="margin-left: 10px" v-clipboard:copy="item.example"-->
+        <!--<el-button size="small" style="margin-left: 10px" v-clipboard:copy="item.example"-->
         <!--v-clipboard:success="onCopy"-->
-        <!--v-clipboard:error="onError">复制</Button>-->
+        <!--v-clipboard:error="onError">复制</el-button>-->
         <span class="copy copy-data" @click="onCopy(item.example)">复制</span>
       </div>
     </div>
diff --git a/template/admin/src/pages/setting/devise/list.vue b/template/admin/src/pages/setting/devise/list.vue
index 0285a9f86..abea93647 100644
--- a/template/admin/src/pages/setting/devise/list.vue
+++ b/template/admin/src/pages/setting/devise/list.vue
@@ -4,14 +4,14 @@
       <span class="ivu-page-header-title mr20">{{ $route.meta.title }}</span>
       <div>
         <div style="float: right" v-if="cardShow == 1 || cardShow == 2">
-          <Button class="bnt" type="primary" @click="submit" :loading="loadingExist">保存</Button>
-          <Button class="bnt ml20" @click="reast">重置</Button>
+          <el-button class="bnt" type="primary" @click="submit" :loading="loadingExist">保存</el-button>
+          <el-button class="bnt ml20" @click="reast">重置</el-button>
         </div>
       </div>
     </div>
 
-    <Row class="ivu-mt box-wrapper">
-      <Col span="3" class="left-wrapper">
+    <el-row class="ivu-mt" type="flex">
+      <el-col :span="3" class="left-wrapper">
         <Menu :theme="theme3" :active-name="1" width="auto">
           <MenuGroup>
             <MenuItem
@@ -24,118 +24,126 @@
             </MenuItem>
           </MenuGroup>
         </Menu>
-      </Col>
-      <Col span="21" class="right-wrapper">
-        <Card :bordered="false" dis-hover v-if="cardShow == 0">
-          <Row v-if="cardShow == 0">
-            <Col style="width: 310px; height: 550px; margin-right: 30px; position: relative" v-if="isDiy">
+      </el-col>
+      <el-col :span="21">
+        <el-card :bordered="false" shadow="never" v-if="cardShow == 0">
+          <el-row v-if="cardShow == 0" type="flex">
+            <el-col style="width: 310px; height: 550px; margin-right: 30px" v-if="isDiy">
               <iframe class="iframe-box" :src="imgUrl" frameborder="0" ref="iframe"></iframe>
               <div class="mask"></div>
-            </Col>
-            <Col :span="isDiy ? '' : 24" v-bind="isDiy ? grid : ''" :class="isDiy ? 'table' : ''">
+            </el-col>
+            <el-col :span="isDiy ? '' : 24" v-bind="isDiy ? grid : ''" :class="isDiy ? 'table' : ''">
               <div class="acea-row row-between-wrapper">
-                <Row type="flex">
-                  <Col v-bind="grid">
+                <el-row>
+                  <el-col v-bind="grid">
                     <div class="button acea-row row-middle">
-                      <Button type="primary" icon="md-add"
+                      <el-button type="primary" icon="md-add"
                         ><a
                           class="target-add"
                           ref="target"
                           :href="`${url}${$routeProStr}/setting/pages/diy_index?id=0&name=首页&type=0`"
                           target="_blank"
                           >添加专题页
-                        </a></Button
+                        </a></el-button
                       >
                     </div>
-                  </Col>
-                </Row>
+                  </el-col>
+                </el-row>
               </div>
-              <Table
-                :columns="columns1"
+              <el-table
                 :data="list"
                 ref="table"
                 class="mt25"
-                :loading="loading"
-                highlight-row
+                v-loading="loading"
+                highlight-current-row
                 no-userFrom-text="暂无数据"
                 no-filtered-userFrom-text="暂无筛选结果"
               >
-                <template slot-scope="{ row, index }" slot="region">
-                  <div class="font-blue">首页</div>
-                </template>
-                <template slot-scope="{ row, index }" slot="type_name">
-                  <Tag color="primary" v-if="row.is_diy">{{ row.type_name }}{{ row.id }}</Tag>
-                  <Tag color="warning" v-else>{{ row.type_name }}</Tag>
-                  <Tag color="success" v-if="row.status == 1">首页</Tag>
-                </template>
-                <template slot-scope="{ row, index }" slot="action">
-                  <div style="display: inline-block" v-if="row.status || row.is_diy" @click="edit(row)">
-                    <a
-                      v-if="row.is_diy === 1"
-                      class="target"
-                      ref="target"
-                      :href="`${url}${$routeProStr}/setting/pages/diy_index?id=${row.id}&name=${
-                        row.template_name || 'moren'
-                      }`"
-                      target="_blank"
+                <el-table-column label="页面ID" width="80">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.id }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="模板名称" min-width="130">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.name }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="模板类型" min-width="130">
+                  <template slot-scope="scope">
+                    <Tag color="primary" v-if="scope.row.is_diy">{{ scope.row.type_name }}{{ scope.row.id }}</Tag>
+                    <Tag color="warning" v-else>{{ scope.row.type_name }}</Tag>
+                    <Tag color="success" v-if="scope.row.status == 1">首页</Tag>
+                  </template>
+                </el-table-column>
+                <el-table-column label="添加时间" min-width="130">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.add_time }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="更新时间" min-width="130">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.update_time }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="170">
+                  <template slot-scope="scope">
+                    <div
+                      style="display: inline-block"
+                      v-if="scope.row.status || scope.row.is_diy"
+                      @click="edit(scope.row)"
                     >
-                      编辑</a
-                    >
-                    <a v-else class="target">编辑</a>
-                  </div>
-                  <Divider type="vertical" v-if="(row.status || row.is_diy) && row.id != 1 && row.status != 1" />
+                      <a
+                        v-if="scope.row.is_diy === 1"
+                        class="target"
+                        ref="target"
+                        :href="`${url}${$routeProStr}/setting/pages/diy_index?id=${scope.row.id}&name=${
+                          scope.row.template_name || 'moren'
+                        }`"
+                        target="_blank"
+                      >
+                        编辑</a
+                      >
+                      <a v-else class="target">编辑</a>
+                    </div>
+                    <el-divider
+                      direction="vertical"
+                      v-if="(scope.row.status || scope.row.is_diy) && scope.row.id != 1 && scope.row.status != 1"
+                    />
 
-                  <div style="display: inline-block" v-if="row.id != 1 && row.status != 1">
-                    <a @click="del(row, '删除此模板', index)">删除</a>
-                  </div>
-                  <Divider type="vertical" v-if="(row.id != 1 && row.status != 1) || row.is_diy" />
-                  <div style="display: inline-block" v-if="row.is_diy">
-                    <a @click="preview(row, index)">预览</a>
-                  </div>
-                  <Divider type="vertical" v-if="row.is_diy && row.status != 1" />
-                  <div style="display: inline-block" v-if="row.status != 1">
-                    <a @click="setStatus(row, index)">设为首页</a>
-                  </div>
-
-                  <!-- <Divider type="vertical" v-if="row.status != 1" />
-                  <template>
-                    <Dropdown @on-click="changeMenu(row, index, $event)">
-                      <a href="javascript:void(0)"
-                        >更多
-                        <Icon type="ios-arrow-down"></Icon>
-                      </a>
-                      <DropdownMenu slot="list">
-                        <DropdownItem name="1" v-show="!row.type"
-                          >设置默认数据</DropdownItem
-                        >
-                        <DropdownItem name="2" v-show="!row.type"
-                          >恢复默认数据</DropdownItem
-                        >
-                        <DropdownItem name="3" v-show="row.id != 1"
-                          >删除模板</DropdownItem
-                        >
-                      </DropdownMenu>
-                    </Dropdown>
-                  </template> -->
-                </template>
-              </Table>
+                    <div style="display: inline-block" v-if="scope.row.id != 1 && scope.row.status != 1">
+                      <a @click="del(scope.row, '删除此模板', index)">删除</a>
+                    </div>
+                    <el-divider
+                      direction="vertical"
+                      v-if="(scope.row.id != 1 && scope.row.status != 1) || scope.row.is_diy"
+                    />
+                    <div style="display: inline-block" v-if="scope.row.is_diy">
+                      <a @click="preview(scope.row, index)">预览</a>
+                    </div>
+                    <el-divider direction="vertical" v-if="scope.row.is_diy && scope.row.status != 1" />
+                    <div style="display: inline-block" v-if="scope.row.status != 1">
+                      <a @click="setStatus(scope.row, index)">设为首页</a>
+                    </div>
+                  </template>
+                </el-table-column>
+              </el-table>
               <div class="acea-row row-right page">
-                <Page
+                <pagination
+                  v-if="total"
                   :total="total"
-                  :current="diyFrom.page"
-                  show-elevator
-                  show-total
-                  @on-change="pageChange"
-                  :page-size="diyFrom.limit"
+                  :page.sync="diyFrom.page"
+                  :limit.sync="diyFrom.limit"
+                  @pagination="getList"
                 />
               </div>
-            </Col>
-          </Row>
-        </Card>
+            </el-col>
+          </el-row>
+        </el-card>
         <goodClass v-else-if="cardShow == 1" ref="category" @parentFun="getChildData"></goodClass>
         <users v-else ref="users" @parentFun="getChildData"></users>
-      </Col>
-    </Row>
+      </el-col>
+    </el-row>
     <Modal
       v-model="isTemplate"
       scrollable
@@ -147,31 +155,33 @@
       @on-cancel="cancel"
     >
       <div class="article-manager">
-        <Card :bordered="false" dis-hover class="ivu-mt">
-          <Form
+        <el-card :bordered="false" shadow="never" class="ivu-mt">
+          <el-form
             ref="formItem"
             :model="formItem"
-            :label-width="120"
+            label-width="120px"
             label-position="right"
             :rules="ruleValidate"
             @submit.native.prevent
           >
-            <Row type="flex" :gutter="24">
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="开发移动端链接：" prop="link" label-for="link">
-                    <Input v-model="formItem.link" placeholder="http://localhost:8080" />
-                  </FormItem>
-                </Col>
-              </Col>
-            </Row>
-            <Row type="flex">
-              <Col v-bind="grid">
-                <Button type="primary" class="ml20" @click="handleSubmit('formItem')" style="width: 100%">提交</Button>
-              </Col>
-            </Row>
-          </Form>
-        </Card>
+            <el-row :gutter="24">
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="开发移动端链接：" prop="link" label-for="link">
+                    <el-input v-model="formItem.link" placeholder="http://localhost:8080" />
+                  </el-form-item>
+                </el-col>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col v-bind="grid">
+                <el-button type="primary" class="ml20" @click="handleSubmit('formItem')" style="width: 100%"
+                  >提交</el-button
+                >
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-card>
       </div>
     </Modal>
     <Modal v-model="modal" title="预览" footer-hide>
@@ -234,39 +244,6 @@ export default {
           id: 3,
         },
       ],
-      columns1: [
-        {
-          title: '页面ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '模板名称',
-          key: 'name',
-          minWidth: 100,
-        },
-        {
-          title: '模板类型',
-          slot: 'type_name',
-          minWidth: 100,
-        },
-        {
-          title: '添加时间',
-          key: 'add_time',
-          minWidth: 100,
-        },
-        {
-          title: '更新时间',
-          key: 'update_time',
-          minWidth: 100,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          // fixed: "right",
-          minWidth: 180,
-        },
-      ],
       list: [],
       imgUrl: '',
       modal: false,
@@ -412,10 +389,6 @@ export default {
         this.total = data.count;
       });
     },
-    pageChange(status) {
-      this.diyFrom.page = status;
-      this.getList();
-    },
     // 编辑
     edit(row) {
       this.formItem.id = row.id;
diff --git a/template/admin/src/pages/setting/devise/template.vue b/template/admin/src/pages/setting/devise/template.vue
index f5cb48a1f..c0f0b7350 100644
--- a/template/admin/src/pages/setting/devise/template.vue
+++ b/template/admin/src/pages/setting/devise/template.vue
@@ -2,11 +2,11 @@
   <div>
     <div class="i-layout-page-header">
       <router-link :to="{ path: $routeProStr + '/setting/pages/devise' }"
-        ><Button icon="ios-arrow-back" size="small" class="mr20">返回</Button></router-link
+        ><el-button icon="ios-arrow-back" size="small" class="mr20">返回</el-button></router-link
       >
       <span class="ivu-page-header-title mr20">页面设计</span>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="flex-wrapper">
         <!-- :src="iframeUrl" -->
         <iframe class="iframe-box" :src="iframeUrl" frameborder="0" ref="iframe"></iframe>
@@ -17,7 +17,7 @@
         </div>
         <links></links>
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/setting/devise/users.vue b/template/admin/src/pages/setting/devise/users.vue
index 2fb046852..af6be6741 100644
--- a/template/admin/src/pages/setting/devise/users.vue
+++ b/template/admin/src/pages/setting/devise/users.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="users">
-    <Card :bordered="false" dis-hover>
+    <el-card :bordered="false" shadow="never">
       <div class="acea-row row-top">
         <div class="left" :style="colorStyle">
           <div class="header" :class="userData.status == 3 ? 'bgColor' : ''">
@@ -122,76 +122,76 @@
         <div class="right">
           <div class="title">页面设置</div>
           <div class="c_row-item">
-            <Col class="label" span="4"> 页面风格： </Col>
-            <Col span="20" class="slider-box">
-              <RadioGroup v-model="userData.status">
-                <Radio :label="1">
+            <el-col class="label" :span="4"> 页面风格： </el-col>
+            <el-col :span="20" class="slider-box">
+              <el-radio-group v-model="userData.status">
+                <el-radio :label="1">
                   <Icon></Icon>
                   <span>样式1</span>
-                </Radio>
-                <Radio :label="2">
+                </el-radio>
+                <el-radio :label="2">
                   <Icon></Icon>
                   <span>样式2</span>
-                </Radio>
-                <Radio :label="3">
+                </el-radio>
+                <el-radio :label="3">
                   <Icon></Icon>
                   <span>样式3</span>
-                </Radio>
-              </RadioGroup>
-            </Col>
+                </el-radio>
+              </el-radio-group>
+            </el-col>
           </div>
           <div class="c_row-item" v-if="current == 4">
-            <Col class="label" span="4"> 订单中心： </Col>
-            <Col span="20" class="slider-box">
-              <RadioGroup v-model="userData.order_status" @on-change="orderStyle">
-                <Radio :label="1">
+            <el-col class="label" :span="4"> 订单中心： </el-col>
+            <el-col :span="20" class="slider-box">
+              <el-radio-group v-model="userData.order_status" @change="orderStyle">
+                <el-radio :label="1">
                   <Icon></Icon>
                   <span>样式1</span>
-                </Radio>
-                <Radio :label="2">
+                </el-radio>
+                <el-radio :label="2">
                   <Icon></Icon>
                   <span>样式2</span>
-                </Radio>
-                <Radio :label="3">
+                </el-radio>
+                <el-radio :label="3">
                   <Icon></Icon>
                   <span>样式3</span>
-                </Radio>
-                <Radio :label="4">
+                </el-radio>
+                <el-radio :label="4">
                   <Icon></Icon>
                   <span>样式4</span>
-                </Radio>
-                <Radio :label="5">
+                </el-radio>
+                <el-radio :label="5">
                   <Icon></Icon>
                   <span>样式5</span>
-                </Radio>
-              </RadioGroup>
-            </Col>
+                </el-radio>
+              </el-radio-group>
+            </el-col>
           </div>
           <div class="c_row-item acea-row row-top" v-if="current == 1">
-            <Col class="label" span="4"> 广告位： </Col>
-            <Col span="20" class="slider-box">
-              <i-switch v-model="userData.my_banner_status" style="margin-bottom: 12px" />
+            <el-col class="label" :span="4"> 广告位： </el-col>
+            <el-col :span="20" class="slider-box">
+              <el-switch :active-value="1"  :inactive-value="0" v-model="userData.my_banner_status" style="margin-bottom: 12px" />
               <div class="info">建议尺寸：690 * 240px，拖拽图片可调整图片显示顺序哦，最多添加五张</div>
               <uploadPic :listData="userData.routine_my_banner" :type="2"></uploadPic>
-            </Col>
+            </el-col>
           </div>
           <div class="c_row-item acea-row row-top" v-if="current == 2">
-            <Col class="label" span="4"> 我的服务： </Col>
-            <Col span="20" class="slider-box">
+            <el-col class="label" :span="4"> 我的服务： </el-col>
+            <el-col :span="20" class="slider-box">
               <div class="info">建议尺寸：86 * 86px，拖拽图片可调整图片显示顺序哦</div>
               <uploadPic :listData="MyMenus"></uploadPic>
-            </Col>
+            </el-col>
           </div>
           <div class="c_row-item acea-row row-top" v-if="current == 3">
-            <Col class="label" span="4"> 商家管理： </Col>
-            <Col span="20" class="slider-box">
+            <el-col class="label" :span="4"> 商家管理： </el-col>
+            <el-col :span="20" class="slider-box">
               <div class="info">建议尺寸：86 * 86px，拖拽图片可调整图片显示顺序哦，最多添加五张</div>
               <uploadPic :listData="storeMenu" :type="1"></uploadPic>
-            </Col>
+            </el-col>
           </div>
         </div>
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/setting/devisePage/index.vue b/template/admin/src/pages/setting/devisePage/index.vue
index d13020990..041bd68e5 100644
--- a/template/admin/src/pages/setting/devisePage/index.vue
+++ b/template/admin/src/pages/setting/devisePage/index.vue
@@ -3,13 +3,13 @@
     <div class="i-layout-page-header header_top">
       <div class="i-layout-page-header fl_header">
         <router-link :to="{ path: $routeProStr + '/setting/pages/devise' }"
-          ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
+          ><el-button icon="ios-arrow-back" size="small" type="text">返回</el-button></router-link
         >
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span class="ivu-page-header-title mr20" style="padding: 0">页面设计</span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="flex-wrapper">
         <!-- :src="iframeUrl" -->
         <iframe class="iframe-box" :src="iframeUrl" frameborder="0" ref="iframe"></iframe>
@@ -20,7 +20,7 @@
         </div>
         <!-- <links v-if="show"></links> -->
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/setting/devisePage/links.vue b/template/admin/src/pages/setting/devisePage/links.vue
index ec0c04e48..0fa343312 100644
--- a/template/admin/src/pages/setting/devisePage/links.vue
+++ b/template/admin/src/pages/setting/devisePage/links.vue
@@ -10,9 +10,9 @@
       </div>
       <div class="tips">
         例如：{{ item.example }}
-        <!--<Button size="small" style="margin-left: 10px" v-clipboard:copy="item.example"-->
+        <!--<el-button size="small" style="margin-left: 10px" v-clipboard:copy="item.example"-->
         <!--v-clipboard:success="onCopy"-->
-        <!--v-clipboard:error="onError">复制</Button>-->
+        <!--v-clipboard:error="onError">复制</el-button>-->
         <span class="copy copy-data" @click="onCopy(item.example)">复制</span>
       </div>
     </div>
diff --git a/template/admin/src/pages/setting/devisePage/list.vue b/template/admin/src/pages/setting/devisePage/list.vue
index 148a26fa0..4fa95b166 100644
--- a/template/admin/src/pages/setting/devisePage/list.vue
+++ b/template/admin/src/pages/setting/devisePage/list.vue
@@ -1,49 +1,69 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row type="flex">
-        <Col v-bind="grid">
-          <Button v-auth="['admin-template']" type="primary" icon="md-add" @click="add">添加模板</Button>
-        </Col>
-      </Row>
-      <Table
-        :columns="columns1"
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row>
+        <el-col v-bind="grid">
+          <el-button v-auth="['admin-template']" type="primary" icon="md-add" @click="add">添加模板</el-button>
+        </el-col>
+      </el-row>
+      <el-table
         :data="list"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="region">
-          <div class="font-blue">首页</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <div style="display: inline-block" v-if="row.status != 1">
-            <a @click="setStatus(row, index)">设为首页</a>
-          </div>
-          <Divider type="vertical" v-if="row.status != 1" />
-          <div style="display: inline-block" v-if="row.status || row.type">
-            <a @click="edit(row)">编辑</a>
-          </div>
-          <Divider type="vertical" v-if="row.status || row.type" />
-          <template>
-            <Dropdown @on-click="changeMenu(row, index, $event)" :transfer="true">
-              <a href="javascript:void(0)"
-                >更多
-                <Icon type="ios-arrow-down"></Icon>
-              </a>
-              <DropdownMenu slot="list">
-                <DropdownItem name="1" v-show="!row.type">设置默认数据</DropdownItem>
-                <DropdownItem name="2" v-show="!row.type">恢复默认数据</DropdownItem>
-                <DropdownItem name="3" v-show="row.id != 1">删除模板</DropdownItem>
-              </DropdownMenu>
-            </Dropdown>
+        <el-table-column label="页面ID" width="90">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
           </template>
-        </template>
-      </Table>
-    </Card>
+        </el-table-column>
+        <el-table-column label="页面名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="页面类型" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.template_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="添加时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.update_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <div style="display: inline-block" v-if="scope.row.status != 1">
+              <a @click="setStatus(scope.row, index)">设为首页</a>
+            </div>
+            <el-divider direction="vertical" v-if="scope.row.status != 1" />
+            <div style="display: inline-block" v-if="scope.row.status || scope.row.type">
+              <a @click="edit(scope.row)">编辑</a>
+            </div>
+            <el-divider direction="vertical" v-if="scope.row.status || scope.row.type" />
+            <template>
+              <el-dropdown size="small" @command="changeMenu(scope.row, index, $event)" :transfer="true">
+                <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i> </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="1" v-show="!scope.row.type">设置默认数据</el-dropdown-item>
+                  <el-dropdown-item command="2" v-show="!scope.row.type">恢复默认数据</el-dropdown-item>
+                  <el-dropdown-item command="3" v-show="scope.row.id != 1">删除模板</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
     <Modal
       v-model="isTemplate"
       scrollable
@@ -55,31 +75,33 @@
       @on-cancel="cancel"
     >
       <div class="article-manager">
-        <Card :bordered="false" dis-hover class="ivu-mt">
-          <Form
+        <el-card :bordered="false" shadow="never" class="ivu-mt">
+          <el-form
             ref="formItem"
             :model="formItem"
-            :label-width="120"
+            label-width="120px"
             label-position="right"
             :rules="ruleValidate"
             @submit.native.prevent
           >
-            <Row type="flex" :gutter="24">
-              <Col span="24">
-                <Col v-bind="grid">
-                  <FormItem label="开发移动端链接：" prop="link" label-for="link">
-                    <Input v-model="formItem.link" placeholder="http://localhost:8080" />
-                  </FormItem>
-                </Col>
-              </Col>
-            </Row>
-            <Row type="flex">
-              <Col v-bind="grid">
-                <Button type="primary" class="ml20" @click="handleSubmit('formItem')" style="width: 100%">提交</Button>
-              </Col>
-            </Row>
-          </Form>
-        </Card>
+            <el-row :gutter="24">
+              <el-col :span="24">
+                <el-col v-bind="grid">
+                  <el-form-item label="开发移动端链接：" prop="link" label-for="link">
+                    <el-input v-model="formItem.link" placeholder="http://localhost:8080" />
+                  </el-form-item>
+                </el-col>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col v-bind="grid">
+                <el-button type="primary" class="ml20" @click="handleSubmit('formItem')" style="width: 100%"
+                  >提交</el-button
+                >
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-card>
       </div>
     </Modal>
   </div>
@@ -101,39 +123,6 @@ export default {
         xs: 24,
       },
       loading: false,
-      columns1: [
-        {
-          title: '页面ID',
-          key: 'id',
-          minWidth: 120,
-        },
-        {
-          title: '页面名称',
-          key: 'name',
-          minWidth: 170,
-        },
-        {
-          title: '页面类型',
-          key: 'template_name',
-          minWidth: 120,
-        },
-        {
-          title: '添加时间',
-          key: 'add_time',
-          minWidth: 170,
-        },
-        {
-          title: '更新时间',
-          key: 'update_time',
-          minWidth: 170,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 300,
-        },
-      ],
       list: [],
       isTemplate: false,
       formItem: {
diff --git a/template/admin/src/pages/setting/freight/index.vue b/template/admin/src/pages/setting/freight/index.vue
index 19d8cf7cd..94e555623 100644
--- a/template/admin/src/pages/setting/freight/index.vue
+++ b/template/admin/src/pages/setting/freight/index.vue
@@ -1,33 +1,33 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="levelFrom"
         :model="levelFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="搜索：" label-for="keyword">
-              <Input
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="搜索：" label-for="keyword">
+              <el-input
                 search
                 enter-button
                 v-model="levelFrom.keyword"
                 placeholder="请输入物流公司名称或者编码"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button type="primary" icon="md-add" @click="syncExpress">同步物流公司</Button>
-          </Col>
-        </Row>
-      </Form>
-      <Table
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-button type="primary" icon="md-add" @click="syncExpress">同步物流公司</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :columns="columns1"
         :data="levelLists"
         ref="table"
@@ -36,36 +36,55 @@
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="is_shows">
-          <i-switch
-            v-model="row.is_show"
-            :value="row.is_show"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">显示</span>
-            <span slot="close">隐藏</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row)">编辑</a>
-          <!--                    <Divider type="vertical" />-->
-          <!--                    <a @click="del(row, '删除物流公司', index)">删除</a>-->
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="物流公司名称" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="编码" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.code }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="排序" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sort }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否显示" min-width="100">
+          <template slot-scope="scope">
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.is_show"
+              :value="scope.row.is_show"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="80">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row)">编辑</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="levelFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="levelFrom.limit"
+          :page.sync="levelFrom.page"
+          :limit.sync="levelFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 <script>
@@ -139,7 +158,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -193,10 +212,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.levelFrom.page = index;
-      this.getList();
-    },
     // 添加
     add() {
       this.$modalForm(freightCreateApi()).then(() => this.getList());
diff --git a/template/admin/src/pages/setting/membershipLevel/index.vue b/template/admin/src/pages/setting/membershipLevel/index.vue
index 76d03e1e9..ea13002a0 100644
--- a/template/admin/src/pages/setting/membershipLevel/index.vue
+++ b/template/admin/src/pages/setting/membershipLevel/index.vue
@@ -1,87 +1,119 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="headers">
         <div class="search">
           <div>
             <span>是否显示：</span>
-            <Select v-model="formValidate.status" style="width: 200px" clearable>
-              <!-- <Option value="">全部</Option> -->
-              <Option :value="1">显示</Option>
-              <Option :value="0">不显示</Option>
-            </Select>
+            <el-select v-model="formValidate.status" style="width: 200px" clearable>
+              <!-- <el-option value="">全部</el-option> -->
+              <el-option :value="1" label="显示"></el-option>
+              <el-option :value="0" label="不显示"></el-option>
+            </el-select>
           </div>
           <div>
             <span>等级名称：</span>
-            <Input v-model="formValidate.keyword" placeholder="请输入等级名称" style="width: 200px" />
+            <el-input v-model="formValidate.keyword" placeholder="请输入等级名称" style="width: 200px" />
           </div>
-          <Button type="primary" @click="search">搜索</Button>
-          <Button type="success" icon="md-add" @click="groupAdd()" class="ml20">添加等级</Button>
+          <el-button type="primary" @click="search">搜索</el-button>
+          <el-button type="success" icon="md-add" @click="groupAdd()" class="ml20">添加等级</el-button>
         </div>
       </div>
-      <Row type="flex">
-        <Col v-bind="grid"> </Col>
-      </Row>
-      <Table
+      <el-row>
+        <el-col v-bind="grid"> </el-col>
+      </el-row>
+      <el-table
         :columns="columns1"
         :data="tabList"
         ref="table"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row }" slot="image">
-          <viewer>
-            <div class="tabBox-img">
-              <img v-lazy="row.image" />
+        <el-table-column label="ID" width="50">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品图片" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.image" />
             </div>
-          </viewer>
-        </template>
-        <template slot-scope="{ row }" slot="one_brokerage">
-          <span>{{ row.one_brokerage }}%</span>
-        </template>
-        <template slot-scope="{ row }" slot="one_brokerage_ratio">
-          <span>{{ row.one_brokerage_ratio }}%</span>
-        </template>
-        <template slot-scope="{ row }" slot="two_brokerage">
-          <span>{{ row.two_brokerage }}%</span>
-        </template>
-        <template slot-scope="{ row }" slot="two_brokerage_ratio">
-          <span>{{ row.two_brokerage_ratio }}%</span>
-        </template>
-        <template slot-scope="{ row }" slot="status">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">显示</span>
-            <span slot="close">隐藏</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="addTask(row)">等级任务</a>
-          <Divider type="vertical" />
-          <a @click="edit(row, '编辑')">编辑</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除这条信息', index)">删除</a>
-        </template>
-      </Table>
+          </template>
+        </el-table-column>
+        <el-table-column label="名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="等级" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.grade }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="一级上浮比例" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.one_brokerage }}%</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="一级分佣比例(上浮后)" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.one_brokerage_ratio }}%</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="二级上浮比例" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.two_brokerage }}%</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="二级分佣比例(上浮后)" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.two_brokerage_ratio }}%</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否显示" min-width="130">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              :value="scope.row.status"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+              active-text="开启"
+              inactive-text="关闭"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="一级分佣比例(上浮后)" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.one_brokerage_ratio }}%</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="addTask(scope.row)">等级任务</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="edit(scope.row, '编辑')">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除这条信息', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <div class="task-modal">
       <Modal v-model="modal2" title="添加任务" footer-hide width="1000">
         <div class="header">
@@ -89,63 +121,84 @@
           <div class="search">
             <div>
               <span>是否显示：</span>
-              <Select v-model="taskData.status" style="width: 200px" clearable>
-                <!-- <Option :value="''">全部</Option> -->
-                <Option :value="1">显示</Option>
-                <Option :value="0">不显示</Option>
-              </Select>
+              <el-select v-model="taskData.status" style="width: 200px" clearable>
+                <!-- <el-option :value="''">全部</el-option> -->
+                <el-option :value="1" label="显示"></el-option>
+                <el-option :value="0" label="显示">不显示</el-option>
+              </el-select>
             </div>
             <div>
               <span>任务名称：</span>
-              <Input v-model="taskData.keyword" placeholder="请输入任务名称" style="width: 200px" />
+              <el-input v-model="taskData.keyword" placeholder="请输入任务名称" style="width: 200px" />
             </div>
-            <Button type="primary" @click="searchTask">搜索</Button>
+            <el-button type="primary" @click="searchTask">搜索</el-button>
           </div>
         </div>
         <div>
           <div class="add-task">
-            <Button type="primary" @click="taskAdd()">添加等级任务</Button>
+            <el-button type="primary" @click="taskAdd()">添加等级任务</el-button>
           </div>
           <div>
-            <Table
+            <el-table
               :columns="columns2"
               :data="taskTabList"
               ref="table"
               class="mt25"
-              :loading="taskLoading"
-              highlight-row
+              v-loading="taskLoading"
+              highlight-current-row
               no-userFrom-text="暂无数据"
               no-filtered-userFrom-text="暂无筛选结果"
             >
-              <template slot-scope="{ row }" slot="status">
-                <i-switch
-                  v-model="row.status"
-                  :value="row.status"
-                  :true-value="1"
-                  :false-value="0"
-                  @on-change="onchangeTaskIsShow(row)"
-                  size="large"
-                >
-                  <span slot="open">开启</span>
-                  <span slot="close">关闭</span>
-                </i-switch>
-              </template>
-              <template slot-scope="{ row, index }" slot="action">
-                <a @click="editTask(row, '编辑')">编辑</a>
-                <Divider type="vertical" />
-                <a @click="delTask(row, '删除这条信息', index)">删除</a>
-              </template>
-            </Table>
-            <!-- <div class="acea-row row-right page">
-              <Page
-                :total="taskTotal"
-                :current="taskData.page"
-                show-elevator
-                show-total
-                @on-change="pageTaskChange"
-                :page-size="taskData.limit"
-              />
-            </div> -->
+              <el-table-column label="ID" width="80">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.id }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="名称" min-width="130">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.name }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="任务类型" min-width="80">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.type_name }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="限定数量" min-width="80">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.number }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="是否显示" min-width="80">
+                <template slot-scope="scope">
+                  <el-switch
+                    class="defineSwitch"
+                    :active-value="1"
+                    :inactive-value="0"
+                    v-model="scope.row.status"
+                    :value="scope.row.status"
+                    @change="onchangeTaskIsShow(scope.row)"
+                    active-text="开启"
+                    inactive-text="关闭"
+                  >
+                    <span slot="open">开启</span>
+                    <span slot="close">关闭</span>
+                  </el-switch>
+                </template>
+              </el-table-column>
+              <el-table-column label="排序" min-width="50">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.sort }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" fixed="right" width="170">
+                <template slot-scope="scope">
+                  <a @click="editTask(scope.row, '编辑')">编辑</a>
+                  <el-divider direction="vertical"></el-divider>
+                  <a @click="delTask(scope.row, '删除这条信息', index)">删除</a>
+                </template>
+              </el-table-column>
+            </el-table>
           </div>
         </div>
       </Modal>
@@ -300,7 +353,7 @@ export default {
   computed: {
     ...mapState('admin/layout', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -353,14 +406,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
-    pageTaskChange(index) {
-      this.taskData.page = index;
-      this.getList();
-    },
     // 表格搜索
     search() {
       this.formValidate.page = 1;
diff --git a/template/admin/src/pages/setting/multiLanguage/country.vue b/template/admin/src/pages/setting/multiLanguage/country.vue
index fe6332f43..711d3bde6 100644
--- a/template/admin/src/pages/setting/multiLanguage/country.vue
+++ b/template/admin/src/pages/setting/multiLanguage/country.vue
@@ -1,18 +1,18 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt mb10">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt mb10">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex">
-          <Col span="24">
-            <FormItem label="搜索：">
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="搜索：">
               <div class="acea-row row-middle">
-                <Input
+                <el-input
                   search
                   enter-button
                   @on-search="selChange"
@@ -22,43 +22,63 @@
                   style="width: 30%"
                 />
               </div>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-    </Card>
-    <Card :bordered="false" dis-hover>
-      <Row type="flex">
-        <Col v-bind="grid">
-          <Button type="primary" icon="md-add" @click="add">添加语言地区</Button>
-        </Col>
-      </Row>
-      <Table
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <el-card :bordered="false" shadow="never">
+      <el-row>
+        <el-col v-bind="grid">
+          <el-button type="primary" icon="md-add" @click="add">添加语言地区</el-button>
+        </el-col>
+      </el-row>
+      <el-table
         ref="table"
         :columns="columns"
         :data="tabList"
         class="ivu-mt mt25"
         :loading="loading"
-        no-data-text="暂无数据"
-        no-filtered-data-text="暂无筛选结果"
+        empty-text="暂无数据"
       >
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row)">编辑</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除地区语言', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="编号" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="浏览器语言识别码" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.code }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="语言说明" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="关联语言" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.link_lang }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="100">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除地区语言', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 <script>
@@ -116,7 +136,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -170,10 +190,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
   },
 };
 </script>
diff --git a/template/admin/src/pages/setting/multiLanguage/langList.vue b/template/admin/src/pages/setting/multiLanguage/langList.vue
index 87d2f03f0..2bc65df3e 100644
--- a/template/admin/src/pages/setting/multiLanguage/langList.vue
+++ b/template/admin/src/pages/setting/multiLanguage/langList.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
@@ -9,29 +9,29 @@
         class="tabform"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex">
-          <Col span="24">
-            <FormItem label="语言分类：">
-              <RadioGroup type="button" v-model="formValidate.is_admin" class="mr15" @on-change="selChange">
-                <Radio :label="item.value" v-for="(item, index) in langType.isAdmin" :key="index"
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="语言分类：">
+              <el-radio-group type="button" v-model="formValidate.is_admin" class="mr15" @change="selChange">
+                <el-radio-button :label="item.value" v-for="(item, index) in langType.isAdmin" :key="index"
                   >{{ item.title }}
-                </Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="语言类型：">
-              <RadioGroup type="button" v-model="formValidate.type_id" class="mr15" @on-change="selChange">
-                <Radio :label="item.value" v-for="(item, index) in langType.langType" :key="index"
+                </el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="语言类型：">
+              <el-radio-group type="button" v-model="formValidate.type_id" class="mr15" @change="selChange">
+                <el-radio-button :label="item.value" v-for="(item, index) in langType.langType" :key="index"
                   >{{ item.title }}
-                </Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="搜索：">
+                </el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="搜索：">
               <div class="acea-row row-middle">
-                <Input
+                <el-input
                   search
                   enter-button
                   @on-search="selChange"
@@ -41,12 +41,12 @@
                   style="width: 30%"
                 />
               </div>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-    </Card>
-    <Alert class="mt10" closable="true">
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <Alert class="mt10" :closable="true">
       使用说明
       <template slot="desc">
         1、前端页面：添加用户端页面语言，添加完成之后状态码为中文文字，前端页面使用 $t(`xxxx`)，js文件中使用
@@ -54,38 +54,56 @@
         2、后端接口：添加后端接口语言，添加完成之后状态码为6位数字，后台抛错或者控制器返回文字的时候直接填写状态码数字
       </template>
     </Alert>
-    <Card :bordered="false" dis-hover>
-      <Row type="flex" class="mb15">
-        <Col>
-          <Button type="primary" icon="md-add" @click="add">添加语句</Button>
-        </Col>
-      </Row>
-      <Table
-        ref="table"
-        :columns="columns"
-        :data="tabList"
-        class="ivu-mt"
-        :loading="loading"
-        no-data-text="暂无数据"
-        no-filtered-data-text="暂无筛选结果"
-      >
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row)">编辑</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除语言', index)">删除</a>
-        </template>
-      </Table>
+    <el-card :bordered="false" shadow="never">
+      <el-row class="mb15">
+        <el-col>
+          <el-button type="primary" icon="md-add" @click="add">添加语句</el-button>
+        </el-col>
+      </el-row>
+      <el-table ref="table" :data="tabList" class="ivu-mt" :loading="loading" empty-text="暂无数据">
+        <el-table-column label="编号" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="原语句" min-width="230">
+          <template slot-scope="scope">
+            <span>{{ scope.row.remarks }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="对应语言翻译" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.lang_explain }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态码/文字(接口/页面调用参考)" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.code }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="语言类型" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.language_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除语言', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <Modal
       v-model="addlangModal"
       width="750"
@@ -95,38 +113,40 @@
       @on-cancel="addlangModal = false"
       @on-visible-change="modalChange"
     >
-      <Form ref="langFormData" :model="langFormData" :rules="ruleValidate">
-        <FormItem label="应用端：" class="mb20" :label-width="120">
-          <RadioGroup type="button" v-model="langFormData.is_admin" class="mr15">
-            <Radio :label="item.value" v-for="(item, index) in langType.isAdmin" :key="index">{{ item.title }}</Radio>
-          </RadioGroup>
-        </FormItem>
-        <Input v-model="langFormData.edit" v-show="false"></Input>
-        <FormItem label="需要翻译的语句：" prop="remarks" class="mb20">
-          <Input
+      <el-form ref="langFormData" :model="langFormData" :rules="ruleValidate">
+        <el-form-item label="应用端：" class="mb20" label-width="120px">
+          <el-radio-group type="button" v-model="langFormData.is_admin" class="mr15">
+            <el-radio-button :label="item.value" v-for="(item, index) in langType.isAdmin" :key="index">{{
+              item.title
+            }}</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-input v-model="langFormData.edit" v-show="false"></el-input>
+        <el-form-item label="需要翻译的语句：" prop="remarks" class="mb20">
+          <el-input
             v-model="langFormData.remarks"
             placeholder="请输入需要添加翻译的语句"
             style="width: 330px"
             search
             enter-button="翻译"
             @on-search="translate"
-          ></Input>
-        </FormItem>
-        <FormItem prop="remark" class="mb20">
-          <Table
-            ref="langTable"
-            :loading="traTabLoading"
-            :columns="langColumns"
-            :data="langFormData.list"
-            no-data-text="暂无数据"
-            no-filtered-data-text="暂无筛选结果"
-          >
-            <template slot-scope="{ row, index }" slot="lang_explain">
-              <Input v-model="langFormData.list[index].lang_explain" class="priceBox"></Input>
-            </template>
-          </Table>
-        </FormItem>
-      </Form>
+          ></el-input>
+        </el-form-item>
+        <el-form-item prop="remark" class="mb20">
+          <el-table ref="langTable" :loading="traTabLoading" :data="langFormData.list" empty-text="暂无数据">
+            <el-table-column label="语言类型" width="120">
+              <template slot-scope="scope">
+                <span> {{ scope.row.language_name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="对应语言翻译" min-width="250">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.lang_explain" class="priceBox"></el-input>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
+      </el-form>
     </Modal>
   </div>
 </template>
@@ -216,7 +236,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -344,10 +364,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
   },
 };
 </script>
diff --git a/template/admin/src/pages/setting/multiLanguage/list.vue b/template/admin/src/pages/setting/multiLanguage/list.vue
index ef86c6eb5..0de06bb54 100644
--- a/template/admin/src/pages/setting/multiLanguage/list.vue
+++ b/template/admin/src/pages/setting/multiLanguage/list.vue
@@ -1,55 +1,72 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row type="flex">
-        <Col v-bind="grid">
-          <Button type="primary" icon="md-add" @click="add">添加语言</Button>
-        </Col>
-      </Row>
-      <Table
-        :columns="columns"
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row>
+        <el-col v-bind="grid">
+          <el-button type="primary" icon="md-add" @click="add">添加语言</el-button>
+        </el-col>
+      </el-row>
+      <el-table
         :data="list"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="icons">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.icon" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="language_name">
-          <div class="acea-row row-middle">
-            <span>{{ row.language_name }}</span>
-            <Tag class="ml10" color="default" v-if="row.is_default">默认</Tag>
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            @on-change="changeSwitch(row)"
-            size="large"
-          >
-            <span slot="open">开启</span>
-            <span slot="close">关闭</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row, '编辑语言', index)">编辑</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除语言', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="语言名称" min-width="200">
+          <template slot-scope="scope">
+            <div class="acea-scope.row scope.row-middle">
+              <span>{{ scope.row.language_name }}</span>
+              <Tag class="ml10" color="default" v-if="scope.row.is_default">默认</Tag>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="浏览器语言识别码" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.file_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="150">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              :value="scope.row.status"
+              @change="changeSwitch(scope.row)"
+              size="large"
+              active-text="开启"
+              inactive-text="关闭"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row, '编辑语言', index)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除语言', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="langFrom.limit" />
+        <pagination
+          v-if="total"
+          :total="total"
+          :page.sync="langFrom.page"
+          :limit.sync="langFrom.limit"
+          @pagination="getList"
+        />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -68,48 +85,7 @@ export default {
         xs: 24,
       },
       loading: false,
-      columns: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 200,
-        },
-        {
-          title: '语言名称',
-          slot: 'language_name',
-          minWidth: 200,
-        },
-        {
-          title: '浏览器语言识别码',
-          key: 'file_name',
-          minWidth: 200,
-        },
-        {
-          title: '状态',
-          slot: 'status',
-          width: 100,
-          filters: [
-            {
-              label: '开启',
-              value: 1,
-            },
-            {
-              label: '关闭',
-              value: 0,
-            },
-          ],
-          filterMethod(value, row) {
-            return row.status === value;
-          },
-          filterMultiple: false,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 120,
-        },
-      ],
+
       langFrom: {
         page: 1,
         limit: 15,
@@ -121,7 +97,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -150,10 +126,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.langFrom.page = index;
-      this.getList();
-    },
     // 编辑
     edit(row) {
       this.$modalForm(langTypeForm(row.id)).then(() => this.getList());
diff --git a/template/admin/src/pages/setting/notification/index.vue b/template/admin/src/pages/setting/notification/index.vue
index fa1d1cb8f..722e0ba50 100644
--- a/template/admin/src/pages/setting/notification/index.vue
+++ b/template/admin/src/pages/setting/notification/index.vue
@@ -1,79 +1,145 @@
 <template>
   <div class="message">
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="mb20">
-        <Tabs v-model="currentTab" @on-click="changeTab">
-          <TabPane :label="item.label" :name="item.value.toString()" v-for="(item, index) in headerList" :key="index" />
-        </Tabs>
+        <el-tabs v-model="currentTab" @tab-click="changeTab">
+          <el-tab-pane
+            :label="item.label"
+            :name="item.value.toString()"
+            v-for="(item, index) in headerList"
+            :key="index"
+          />
+        </el-tabs>
       </div>
-      <Row type="flex" class="mb20" v-if="currentTab == 1">
-        <Col>
-          <Button
+      <el-row class="mb20" v-if="currentTab == 1">
+        <el-col>
+          <el-button
             v-auth="['app-wechat-template-sync']"
             icon="md-list"
             type="success"
             @click="routineTemplate"
             style="margin-left: 20px"
-            >同步小程序订阅消息</Button
+            >同步小程序订阅消息</el-button
           >
-          <Button
+          <el-button
             v-auth="['app-wechat-template-sync']"
             icon="md-list"
             type="success"
             @click="wechatTemplate"
             style="margin-left: 20px"
-            >同步微信模版消息</Button
+            >同步微信模版消息</el-button
           >
-        </Col>
-      </Row>
+        </el-col>
+      </el-row>
       <Alert v-if="currentTab == 1" :closable="true">
         <template slot="desc">
           1、公众号：登录微信公众号后台，选择模版消息，将模版消息的所在行业修改副行业为《其他/其他》<br />
           2、小程序：登录微信小程序后台，基本设置，服务类目增加《生活服务> 百货/超市/便利店》
         </template>
       </Alert>
-      <Table
+      <el-table
         :columns="currentTab == 1 ? columns : columns2"
         :data="levelLists"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="name">
-          <span class="table">
-            {{ row.name }}
-          </span>
-        </template>
-        <template slot-scope="{ row, index }" slot="title">
-          <span class="table">{{ row.title }}</span>
-        </template>
-        <template
-          slot-scope="{ row }"
-          v-for="item in ['is_system', 'is_wechat', 'is_routine', 'is_sms', 'is_ent_wechat']"
-          :slot="item"
-        >
-          <div v-if="item === 'is_ent_wechat' && currentTab == 1" :key="index">--</div>
-          <i-switch
-            v-model="row[item]"
-            :value="row[item]"
-            :true-value="1"
-            :false-value="2"
-            @on-change="changeSwitch(row, item)"
-            size="large"
-            v-if="row[item] > 0 && currentTab !== 1"
-          >
-            <span slot="open">开启</span>
-            <span slot="close">关闭</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="setting">
-          <span class="setting btn" @click="setting(item, row)">设置</span>
-        </template>
-      </Table>
-    </Card>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="通知类型" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="通知场景说明" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="站内信" min-width="130">
+          <template slot-scope="scope">
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.is_system"
+              :value="scope.row.is_system"
+              @change="changeSwitch(scope.row, item)"
+              size="large"
+              :disabled="scope.row.is_system > 0 && currentTab !== 1"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="公众号模板" min-width="130">
+          <template slot-scope="scope">
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.is_wechat"
+              :value="scope.row.is_wechat"
+              @change="changeSwitch(scope.row, item)"
+              size="large"
+              :disabled="scope.row.is_wechat > 0 && currentTab !== 1"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="发送短信" min-width="130">
+          <template slot-scope="scope">
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.is_sms"
+              :value="scope.row.is_sms"
+              @change="changeSwitch(scope.row, item)"
+              size="large"
+              :disabled="scope.row.is_sms > 0 && currentTab !== 1"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="企业微信" min-width="130" v-if="currentTab != 1">
+          <template slot-scope="scope">
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.is_ent_wechat"
+              :value="scope.row.is_ent_wechat"
+              @change="changeSwitch(scope.row, item)"
+              size="large"
+              :disabled="scope.row.is_ent_wechat > 0 && currentTab !== 1"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="小程序订阅" min-width="130" v-if="currentTab == 1">
+          <template slot-scope="scope">
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.is_routine"
+              :value="scope.row.is_routine"
+              @change="changeSwitch(scope.row, item)"
+              size="large"
+              :disabled="scope.row.is_routine > 0 && currentTab !== 1"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <span class="setting btn" @click="setting(item, scope.row)">设置</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
   </div>
 </template>
 
@@ -89,106 +155,6 @@ export default {
         { label: '通知会员', value: '1' },
         { label: '通知平台', value: '2' },
       ],
-      columns: [
-        {
-          title: 'ID',
-          key: 'id',
-          align: 'center',
-          width: 60,
-        },
-        {
-          title: '通知类型',
-          slot: 'name',
-          align: 'center',
-          width: 200,
-        },
-        {
-          title: '通知场景说明',
-          slot: 'title',
-          align: 'center',
-          minWidth: 200,
-        },
-        {
-          title: '站内信',
-          slot: 'is_system',
-          align: 'center',
-          minWidth: 100,
-        },
-        {
-          title: '公众号模板',
-          slot: 'is_wechat',
-          align: 'center',
-          minWidth: 100,
-        },
-        {
-          title: '小程序订阅',
-          slot: 'is_routine',
-          align: 'center',
-          minWidth: 100,
-        },
-        {
-          title: '发送短信',
-          slot: 'is_sms',
-          align: 'center',
-          minWidth: 100,
-        },
-        {
-          title: '设置',
-          slot: 'setting',
-          width: 150,
-          align: 'center',
-        },
-      ],
-      columns2: [
-        {
-          title: 'ID',
-          key: 'id',
-          align: 'center',
-          width: 60,
-        },
-        {
-          title: '通知类型',
-          slot: 'name',
-          align: 'center',
-          width: 200,
-        },
-        {
-          title: '通知场景说明',
-          slot: 'title',
-          align: 'center',
-          minWidth: 200,
-        },
-        {
-          title: '站内信',
-          slot: 'is_system',
-          align: 'center',
-          minWidth: 100,
-        },
-        {
-          title: '公众号模板',
-          slot: 'is_wechat',
-          align: 'center',
-          minWidth: 100,
-        },
-        {
-          title: '发送短信',
-          slot: 'is_sms',
-          align: 'center',
-          minWidth: 100,
-        },
-        {
-          title: '企业微信',
-          slot: 'is_ent_wechat',
-          align: 'center',
-          minWidth: 100,
-        },
-        {
-          title: '设置',
-          slot: 'setting',
-          width: 150,
-          align: 'center',
-        },
-      ],
       levelLists: [],
       currentTab: '1',
       loading: false,
@@ -208,8 +174,8 @@ export default {
           this.$Message.error(err.msg);
         });
     },
-    changeTab(data) {
-      getNotificationList(data).then((res) => {
+    changeTab() {
+      getNotificationList(this.currentTab).then((res) => {
         this.levelLists = res.data;
       });
     },
diff --git a/template/admin/src/pages/setting/notification/notificationEdit.vue b/template/admin/src/pages/setting/notification/notificationEdit.vue
index e0b3903af..a9987bfd7 100644
--- a/template/admin/src/pages/setting/notification/notificationEdit.vue
+++ b/template/admin/src/pages/setting/notification/notificationEdit.vue
@@ -2,8 +2,8 @@
   <div class="edit">
     <!-- <div class="i-layout-page-header">
       <router-link :to="{ path: '/admin/setting/notification/index' }"
-        ><Button icon="ios-arrow-back" size="small" class="mr20"
-          >返回</Button
+        ><el-button icon="ios-arrow-back" size="small" class="mr20"
+          >返回</el-button
         ></router-link
       >
       <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
@@ -11,31 +11,35 @@
     <div class="i-layout-page-header header_top">
       <div class="i-layout-page-header fl_header">
         <router-link :to="{ path: $routeProStr + '/setting/notification/index' }"
-          ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
+          ><el-button icon="ios-arrow-back" size="small" type="text">返回</el-button></router-link
         >
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span class="ivu-page-header-title mr20" style="padding: 0" v-text="$route.meta.title"></span>
       </div>
     </div>
     <div class="tabs">
-      <Row :gutter="32">
-        <Col span="32" class="demo-tabs-style1" style="padding: 16px">
-          <Tabs @on-click="changeTabs">
-            <TabPane v-for="(item, index) in tabsList" :key="index" :name="item.slot" :label="item.title">
-              <Form class="form-sty" ref="formData" :model="formData" :rules="ruleValidate" :label-width="80">
+      <el-row :gutter="32">
+        <el-col span="32" class="demo-tabs-style1" style="padding: 16px">
+          <el-tabs v-model="tagName" @tab-click="changeTabs">
+            <el-tab-pane v-for="(item, index) in tabsList" :key="index" :name="item.slot" :label="item.title">
+              <el-form class="form-sty" ref="formData" :model="formData" :rules="ruleValidate" label-width="85px">
                 <div v-if="item.slot === 'is_system' && !loading">
-                  <FormItem label="通知标题">
-                    <Input v-model="formData.system_title" placeholder="请输入通知标题" style="width: 500px"></Input>
-                  </FormItem>
-                  <FormItem label="通知内容">
+                  <el-form-item label="通知标题">
+                    <el-input
+                      v-model="formData.system_title"
+                      placeholder="请输入通知标题"
+                      style="width: 500px"
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item label="通知内容">
                     <div class="content">
-                      <Input
+                      <el-input
                         v-model="formData.system_text"
                         type="textarea"
                         :autosize="{ minRows: 5, maxRows: 8 }"
                         placeholder="请输入通知内容"
                         style="width: 500px"
-                      ></Input>
+                      ></el-input>
                       <div class="trip">
                         <div>请输入模板消息详细内容对应的变量。关键字个数需与已添加的模板一致。 可以使用如下变量：</div>
                         <div v-for="(item, index) in formData.variable.split(',')" :key="index">
@@ -43,122 +47,122 @@
                         </div>
                       </div>
                     </div>
-                  </FormItem>
-                  <FormItem label="状态" prop="is_system">
-                    <RadioGroup v-model="formData.is_system">
-                      <Radio :label="1">开启</Radio>
-                      <Radio :label="2">关闭</Radio>
-                    </RadioGroup>
-                  </FormItem>
+                  </el-form-item>
+                  <el-form-item label="状态" prop="is_system">
+                    <el-radio-group v-model="formData.is_system">
+                      <el-radio :label="1">开启</el-radio>
+                      <el-radio :label="2">关闭</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
                 </div>
                 <div v-if="item.slot === 'is_sms' && !loading">
-                  <FormItem label="短信模版ID">
-                    <Input v-model="formData.sms_id" placeholder="短信模版ID" style="width: 500px"></Input>
-                  </FormItem>
-                  <FormItem label="通知内容">
+                  <el-form-item label="短信模版ID">
+                    <el-input v-model="formData.sms_id" placeholder="短信模版ID" style="width: 500px"></el-input>
+                  </el-form-item>
+                  <el-form-item label="通知内容">
                     <div class="content">
-                      <Input
+                      <el-input
                         v-model="formData.content"
                         type="textarea"
                         disabled
                         :autosize="{ minRows: 5, maxRows: 8 }"
                         placeholder="请输入通知内容"
                         style="width: 500px"
-                      ></Input>
+                      ></el-input>
                     </div>
-                  </FormItem>
-                  <FormItem label="状态" prop="is_sms">
-                    <RadioGroup v-model="formData.is_sms">
-                      <Radio :label="1">开启</Radio>
-                      <Radio :label="2">关闭</Radio>
-                    </RadioGroup>
-                  </FormItem>
+                  </el-form-item>
+                  <el-form-item label="状态" prop="is_sms">
+                    <el-radio-group v-model="formData.is_sms">
+                      <el-radio :label="1">开启</el-radio>
+                      <el-radio :label="2">关闭</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
                 </div>
                 <div v-else-if="item.slot === 'is_wechat' && !loading">
-                  <FormItem label="ID">
-                    <Input
+                  <el-form-item label="ID">
+                    <el-input
                       v-model="formData.templage_message_id"
                       disabled
                       placeholder="请输入通模板编号"
                       style="width: 500px"
-                    ></Input>
-                  </FormItem>
-                  <FormItem label="模板编号">
-                    <Input
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item label="模板编号">
+                    <el-input
                       v-model="formData.tempkey"
                       disabled
                       placeholder="请输入通模板编号"
                       style="width: 500px"
-                    ></Input>
-                  </FormItem>
-                  <FormItem label="模板">
-                    <Input
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item label="模板">
+                    <el-input
                       disabled
                       v-model="formData.content"
                       type="textarea"
                       :autosize="{ minRows: 5, maxRows: 8 }"
                       placeholder="请输入模板"
                       style="width: 500px"
-                    ></Input>
-                  </FormItem>
-                  <FormItem label="模板ID">
-                    <Input v-model="formData.tempid" placeholder="请输入模板ID" style="width: 500px"></Input>
-                  </FormItem>
-                  <FormItem label="状态" prop="is_wechat">
-                    <RadioGroup v-model="formData.is_wechat">
-                      <Radio :label="1">开启</Radio>
-                      <Radio :label="2">关闭</Radio>
-                    </RadioGroup>
-                  </FormItem>
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item label="模板ID">
+                    <el-input v-model="formData.tempid" placeholder="请输入模板ID" style="width: 500px"></el-input>
+                  </el-form-item>
+                  <el-form-item label="状态" prop="is_wechat">
+                    <el-radio-group v-model="formData.is_wechat">
+                      <el-radio :label="1">开启</el-radio>
+                      <el-radio :label="2">关闭</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
                 </div>
                 <div v-else-if="item.slot === 'is_routine' && !loading">
-                  <FormItem label="ID">
-                    <Input
+                  <el-form-item label="ID">
+                    <el-input
                       v-model="formData.templage_message_id"
                       disabled
                       placeholder="请输入通模板编号"
                       style="width: 500px"
-                    ></Input>
-                  </FormItem>
-                  <FormItem label="模板编号">
-                    <Input
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item label="模板编号">
+                    <el-input
                       v-model="formData.tempkey"
                       disabled
                       placeholder="请输入通模板编号"
                       style="width: 500px"
-                    ></Input>
-                  </FormItem>
-                  <FormItem label="模板">
-                    <Input
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item label="模板">
+                    <el-input
                       disabled
                       v-model="formData.content"
                       type="textarea"
                       :autosize="{ minRows: 5, maxRows: 8 }"
                       placeholder="请输入模板"
                       style="width: 500px"
-                    ></Input>
-                  </FormItem>
-                  <FormItem label="模板ID">
-                    <Input v-model="formData.tempid" placeholder="请输入模板ID" style="width: 500px"></Input>
-                  </FormItem>
-                  <FormItem label="状态" prop="is_routine">
-                    <RadioGroup v-model="formData.is_routine">
-                      <Radio :label="1">开启</Radio>
-                      <Radio :label="2">关闭</Radio>
-                    </RadioGroup>
-                  </FormItem>
+                    ></el-input>
+                  </el-form-item>
+                  <el-form-item label="模板ID">
+                    <el-input v-model="formData.tempid" placeholder="请输入模板ID" style="width: 500px"></el-input>
+                  </el-form-item>
+                  <el-form-item label="状态" prop="is_routine">
+                    <el-radio-group v-model="formData.is_routine">
+                      <el-radio :label="1">开启</el-radio>
+                      <el-radio :label="2">关闭</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
                 </div>
 
                 <div v-else-if="item.slot === 'is_ent_wechat' && !loading">
-                  <FormItem label="通知内容">
+                  <el-form-item label="通知内容">
                     <div class="content">
-                      <Input
+                      <el-input
                         v-model="formData.ent_wechat_text"
                         type="textarea"
                         :autosize="{ minRows: 5, maxRows: 8 }"
                         placeholder="请输入通知内容"
                         style="width: 500px"
-                      ></Input>
+                      ></el-input>
                       <div class="trip">
                         <div>请输入模板消息详细内容对应的变量。关键字个数需与已添加的模板一致。 可以使用如下变量：</div>
                         <div v-for="(item, index) in formData.variable.split(',')" :key="index">
@@ -166,28 +170,28 @@
                         </div>
                       </div>
                     </div>
-                  </FormItem>
-                  <FormItem label="机器人链接">
+                  </el-form-item>
+                  <el-form-item label="机器人链接">
                     <div class="content">
-                      <Input v-model="formData.url" placeholder="请输入机器人链接" style="width: 500px"></Input>
+                      <el-input v-model="formData.url" placeholder="请输入机器人链接" style="width: 500px"></el-input>
                       <div class="trip">企业微信群机器人链接</div>
                     </div>
-                  </FormItem>
-                  <FormItem label="状态" prop="is_ent_wechat">
-                    <RadioGroup v-model="formData.is_ent_wechat">
-                      <Radio :label="1">开启</Radio>
-                      <Radio :label="2">关闭</Radio>
-                    </RadioGroup>
-                  </FormItem>
+                  </el-form-item>
+                  <el-form-item label="状态" prop="is_ent_wechat">
+                    <el-radio-group v-model="formData.is_ent_wechat">
+                      <el-radio :label="1">开启</el-radio>
+                      <el-radio :label="2">关闭</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
                 </div>
-                <FormItem>
-                  <Button type="primary" @click="handleSubmit('formData')">提交</Button>
-                </FormItem>
-              </Form>
-            </TabPane>
-          </Tabs>
-        </Col>
-      </Row>
+                <el-form-item>
+                  <el-button type="primary" @click="handleSubmit('formData')">提交</el-button>
+                </el-form-item>
+              </el-form>
+            </el-tab-pane>
+          </el-tabs>
+        </el-col>
+      </el-row>
     </div>
   </div>
 </template>
@@ -223,6 +227,7 @@ export default {
       formData: {},
       id: 0,
       loading: true,
+      tagName: 'is_system',
       ruleValidate: {
         name: [
           {
@@ -250,11 +255,11 @@ export default {
   },
   created() {
     this.id = this.$route.query.id;
-    this.changeTabs('is_system');
+    this.changeTabs();
   },
   methods: {
-    changeTabs(name) {
-      this.getData(this.id, name);
+    changeTabs() {
+      this.getData(this.id, this.tagName);
     },
     getData(id, name) {
       this.loading = true;
diff --git a/template/admin/src/pages/setting/setApp/index.vue b/template/admin/src/pages/setting/setApp/index.vue
index 0cf1a1206..fbc7af001 100644
--- a/template/admin/src/pages/setting/setApp/index.vue
+++ b/template/admin/src/pages/setting/setApp/index.vue
@@ -4,16 +4,16 @@
       <div class="i-layout-page-header">
         <span class="ivu-page-header-title">系统设置</span>
         <div>
-          <Tabs v-model="currentTab">
-            <TabPane label="公众号配置" name="onsale" />
-            <TabPane label="配置" name="forsale" />
-          </Tabs>
+          <el-tabs v-model="currentTab">
+            <el-tab-pane label="公众号配置" name="onsale" />
+            <el-tab-pane label="配置" name="forsale" />
+          </el-tabs>
         </div>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt" v-if="currentTab === 'onsale'">
+    <el-card :bordered="false" shadow="never" class="ivu-mt" v-if="currentTab === 'onsale'">
       <!--<form-create  :rule="Array.from(FromData.rules)" @submit="onSubmit" ></form-create>-->
-    </Card>
+    </el-card>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/setting/setSystem/index.vue b/template/admin/src/pages/setting/setSystem/index.vue
index b89dc55c7..f7b4156a3 100644
--- a/template/admin/src/pages/setting/setSystem/index.vue
+++ b/template/admin/src/pages/setting/setSystem/index.vue
@@ -4,27 +4,27 @@
       <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
     </div>
     <div class="article-manager">
-      <Card :bordered="false" dis-hover class="ivu-mt fromBox">
-        <Tabs v-model="currentTab" @on-click="changeTab" v-if="headerList.length">
-          <TabPane
+      <el-card :bordered="false" shadow="never" class="ivu-mt fromBox">
+        <el-tabs v-model="currentTab" @tab-click="changeTab" v-if="headerList.length">
+          <el-tab-pane
             :icon="item.icon"
             :label="item.label"
             :name="item.value.toString()"
             v-for="(item, index) in headerList"
             :key="index"
           />
-        </Tabs>
-        <Tabs type="card" v-model="childrenId" v-if="headerChildrenList.length" @on-click="changeChildrenTab">
-          <TabPane
+        </el-tabs>
+        <el-tabs v-model="childrenId" v-if="headerChildrenList.length">
+          <el-tab-pane
             :label="item.label"
             :name="item.id.toString()"
             v-for="(item, index) in headerChildrenList"
             :key="index"
-          ></TabPane>
-        </Tabs>
+          ></el-tab-pane>
+        </el-tabs>
         <form-create :option="option" :rule="rules" @submit="onSubmit" v-if="rules.length !== 0"></form-create>
         <Spin size="large" fix v-if="spinShow"></Spin>
-      </Card>
+      </el-card>
     </div>
   </div>
 </template>
@@ -191,12 +191,9 @@ export default {
     },
     // 选择
     changeTab() {
+      console.log('11');
       this.childrenList();
     },
-    // 二级选择
-    changeChildrenTab(name) {
-      this.childrenId = name;
-    },
     // 提交表单 group
     onSubmit(formData) {
       request({
diff --git a/template/admin/src/pages/setting/shippingTemplates/index.vue b/template/admin/src/pages/setting/shippingTemplates/index.vue
index 3e90b587c..368d43dfc 100644
--- a/template/admin/src/pages/setting/shippingTemplates/index.vue
+++ b/template/admin/src/pages/setting/shippingTemplates/index.vue
@@ -1,64 +1,90 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="levelFrom"
         :model="levelFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="搜索：" label-for="keyword">
-              <Input
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="搜索：" label-for="keyword">
+              <el-input
                 search
                 enter-button
                 v-model="levelFrom.name"
                 placeholder="请输入模板名称"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button type="primary" icon="md-add" @click="freight">添加运费模板</Button>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-button type="primary" icon="md-add" @click="freight">添加运费模板</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="levelLists"
         ref="table"
         class="mt25"
         :loading="loading"
-        highlight-row
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="icons">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.icon" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row.id)">修改</a>
-          <Divider type="vertical" v-if="row.id !== 1" />
-          <a @click="del(row, '删除分组', index)" v-if="row.id !== 1">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        </el-table-column>
+        <el-table-column label="模板名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="计费方式" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.type }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="指定包邮" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.appoint }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="排序" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sort }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="添加时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+         <el-table-column label="操作" fixed="right" width="100">
+          <template slot-scope="scope">
+          <a @click="edit(scope.row.id)">修改</a>
+          <el-divider direction="vertical" v-if="scope.row.id !== 1" />
+          <a @click="del(scope.row, '删除分组', index)" v-if="scope.row.id !== 1">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="levelFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="levelFrom.limit"
+          :page.sync="levelFrom.page"
+          :limit.sync="levelFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!-- 运费模板-->
     <freight-template
       v-if="isTemplate"
@@ -91,44 +117,7 @@ export default {
         xs: 24,
       },
       loading: false,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '模板名称',
-          key: 'name',
-          minWidth: 100,
-        },
-        {
-          title: '计费方式',
-          key: 'type',
-          minWidth: 120,
-        },
-        {
-          title: '指定包邮',
-          key: 'appoint',
-          minWidth: 120,
-        },
-        {
-          title: '排序',
-          key: 'sort',
-          minWidth: 120,
-        },
-        {
-          title: '添加时间',
-          key: 'add_time',
-          minWidth: 120,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 120,
-        },
-      ],
+      
       levelFrom: {
         name: '',
         page: 1,
@@ -146,7 +135,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -194,10 +183,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.levelFrom.page = index;
-      this.getList();
-    },
     // 编辑
     edit(id) {
       this.isTemplate = true;
diff --git a/template/admin/src/pages/setting/storage/index.vue b/template/admin/src/pages/setting/storage/index.vue
index 3b0f0f41f..ffe80eb47 100644
--- a/template/admin/src/pages/setting/storage/index.vue
+++ b/template/admin/src/pages/setting/storage/index.vue
@@ -1,16 +1,16 @@
 <template>
   <div>
     <div class="message">
-      <Card :bordered="false" dis-hover class="">
+      <el-card :bordered="false" shadow="never" class="">
         <div class="mb20">
-          <Tabs v-model="currentTab" @on-click="changeTab">
-            <TabPane
+          <el-tabs v-model="currentTab" @tab-click="changeTab">
+            <el-tab-pane
               :label="item.label"
               :name="item.value.toString()"
               v-for="(item, index) in headerList"
               :key="index"
             />
-          </Tabs>
+          </el-tabs>
         </div>
         <h3>使用说明</h3>
         <template v-if="currentTab == 1">
@@ -40,32 +40,32 @@
             <p>第四步（可选）： 选择云存储空间列表上的修改【CNAME配置】，打开后复制记录值到对应的平台解析</p>
           </template>
         </template>
-      </Card>
+      </el-card>
     </div>
     <div class="pt10" v-if="currentTab == 1">
-      <Card :bordered="false" dis-hover class="ivu-mt">
-        <Row type="flex">
-          <Col span="24">
+      <el-card :bordered="false" shadow="never" class="ivu-mt">
+        <el-row>
+          <el-col :span="24">
             <span class="save-type"> 存储方式： </span>
-            <RadioGroup v-model="formValidate.upload_type" @on-change="changeSave">
-              <Radio label="1">本地存储</Radio>
-              <Radio label="2">七牛云存储</Radio>
-              <Radio label="3">阿里云存储</Radio>
-              <Radio label="4">腾讯云存储</Radio>
-            </RadioGroup>
-            <!-- <i-switch
+            <el-radio-group v-model="formValidate.upload_type" @change="changeSave">
+              <el-radio label="1">本地存储</el-radio>
+              <el-radio label="2">七牛云存储</el-radio>
+              <el-radio label="3">阿里云存储</el-radio>
+              <el-radio label="4">腾讯云存储</el-radio>
+            </el-radio-group>
+            <!-- <el-switch :active-value="1"  :inactive-value="0"
               v-model="localStorage"
               size="large"
-              @on-change="addSwitch"
+              @change="addSwitch"
             >
               <span slot="open">开启</span>
               <span slot="close">关闭</span>
-            </i-switch> -->
-          </Col>
-        </Row>
-      </Card>
-      <Card :bordered="false" dis-hover class="ivu-mt">
-        <Form ref="formValidate" :model="formValidate" :rules="ruleValidate">
+             </el-switch> -->
+          </el-col>
+        </el-row>
+      </el-card>
+      <el-card :bordered="false" shadow="never" class="ivu-mt">
+        <el-form ref="formValidate" :model="formValidate" :rules="ruleValidate">
           <div class="abbreviation">
             <div class="top">
               <div class="topBox">
@@ -76,26 +76,26 @@
                   <div>缩略大图</div>
                 </div>
                 <div class="topRight">
-                  <FormItem label="宽：">
-                    <Input
+                  <el-form-item label="宽：">
+                    <el-input
                       class="topIput"
                       type="number"
                       v-model="formValidate.thumb_big_width"
                       placeholder="请输入宽度"
                     >
                       <span slot="append">px</span>
-                    </Input>
-                  </FormItem>
-                  <FormItem label="高：">
-                    <Input
+                    </el-input>
+                  </el-form-item>
+                  <el-form-item label="高：">
+                    <el-input
                       class="topIput"
                       type="number"
                       v-model="formValidate.thumb_big_height"
                       placeholder="请输入高度"
                     >
                       <span slot="append">px</span>
-                    </Input>
-                  </FormItem>
+                    </el-input>
+                  </el-form-item>
                 </div>
               </div>
               <div class="topBox">
@@ -106,26 +106,26 @@
                   <div>缩略中图</div>
                 </div>
                 <div class="topRight">
-                  <FormItem label="宽：">
-                    <Input
+                  <el-form-item label="宽：">
+                    <el-input
                       class="topIput"
                       type="number"
                       v-model="formValidate.thumb_mid_width"
                       placeholder="请输入宽度"
                     >
                       <span slot="append">px</span>
-                    </Input>
-                  </FormItem>
-                  <FormItem label="高：">
-                    <Input
+                    </el-input>
+                  </el-form-item>
+                  <el-form-item label="高：">
+                    <el-input
                       type="number"
                       class="topIput"
                       v-model="formValidate.thumb_mid_height"
                       placeholder="请输入高度"
                     >
                       <span slot="append">px</span>
-                    </Input>
-                  </FormItem>
+                    </el-input>
+                  </el-form-item>
                 </div>
               </div>
               <div class="topBox">
@@ -136,67 +136,72 @@
                   <div>缩略小图</div>
                 </div>
                 <div class="topRight">
-                  <FormItem label="宽：">
-                    <Input
+                  <el-form-item label="宽：">
+                    <el-input
                       class="topIput"
                       type="number"
                       v-model="formValidate.thumb_small_width"
                       placeholder="请输入宽度"
                     >
                       <span slot="append">px</span>
-                    </Input>
-                  </FormItem>
-                  <FormItem label="高：">
-                    <Input
+                    </el-input>
+                  </el-form-item>
+                  <el-form-item label="高：">
+                    <el-input
                       class="topIput"
                       type="number"
                       v-model="formValidate.thumb_small_height"
                       placeholder="请输入高度"
                     >
                       <span slot="append">px</span>
-                    </Input>
-                  </FormItem>
+                    </el-input>
+                  </el-form-item>
                 </div>
               </div>
             </div>
-            <Divider />
+            <divider />
             <div class="content">
-              <FormItem label="是否开启水印：">
-                <i-switch v-model="formValidate.image_watermark_status" size="large">
+              <el-form-item label="是否开启水印：">
+                <el-switch
+                  :active-value="1"
+                  :inactive-value="0"
+                  v-model="formValidate.image_watermark_status"
+                  size="large"
+                >
                   <span slot="open">开启</span>
                   <span slot="close">关闭</span>
-                </i-switch>
-              </FormItem>
+                </el-switch>
+              </el-form-item>
               <div v-if="formValidate.image_watermark_status == 1">
-                <FormItem label="水印类型：">
-                  <RadioGroup v-model="formValidate.watermark_type">
-                    <Radio :label="1">图片</Radio>
-                    <Radio :label="2">文字</Radio>
-                  </RadioGroup>
-                </FormItem>
+                <el-form-item label="水印类型：">
+                  <el-radio-group v-model="formValidate.watermark_type">
+                    <el-radio :label="1">图片</el-radio>
+                    <el-radio :label="2">文字</el-radio>
+                  </el-radio-group>
+                </el-form-item>
                 <div v-if="formValidate.watermark_type == 1">
                   <div class="flex">
-                    <FormItem class="contentIput" label="水印透明度：" prop="name">
-                      <Input
+                    <el-form-item class="contentIput" label="水印透明度：" prop="name">
+                      <el-input
                         class="topIput"
                         type="number"
                         v-model="formValidate.watermark_opacity"
                         placeholder="请输入水印透明度"
                       >
-                      </Input>
-                    </FormItem>
-                    <FormItem class="contentIput" label="水印倾斜度：" prop="mail">
-                      <Input
+                      </el-input>
+                    </el-form-item>
+                    <el-form-item class="contentIput" label="水印倾斜度：" prop="mail">
+                      <el-input
                         class="topIput"
                         type="number"
                         v-model="formValidate.watermark_rotate"
                         placeholder="请输入水印倾斜度"
                       >
-                      </Input>
-                    </FormItem>
+                      </el-input>
+                    </el-form-item>
                   </div>
                   <div class="flex">
-                    <FormItem class="contentIput" label="水印图片：" prop="name">
+                    <el-form-item class="contentIput" label="水印图片：" prop="name">
                       <div class="picBox" @click="modalPicTap('单选')">
                         <div class="pictrue" v-if="formValidate.watermark_image">
                           <img :src="formValidate.watermark_image" />
@@ -205,8 +210,8 @@
                           <Icon type="ios-camera-outline" size="24" />
                         </div>
                       </div>
-                    </FormItem>
-                    <FormItem class="contentIput" label="水印位置：" prop="mail">
+                    </el-form-item>
+                    <el-form-item class="contentIput" label="水印位置：" prop="mail">
                       <div class="conents">
                         <div class="positionBox">
                           <div
@@ -219,53 +224,53 @@
                         </div>
                         <div class="title">{{ positiontlt }}</div>
                       </div>
-                    </FormItem>
+                    </el-form-item>
                   </div>
                   <div class="flex">
-                    <FormItem class="contentIput" label="水印横坐标偏移量：" width="200" prop="name">
-                      <Input
+                    <el-form-item class="contentIput" label="水印横坐标偏移量：" width="200" prop="name">
+                      <el-input
                         class="topIput"
                         type="number"
                         v-model="formValidate.watermark_x"
                         placeholder="请输入水印横坐标偏移量"
                       >
                         <span slot="append">px</span>
-                      </Input>
-                    </FormItem>
-                    <FormItem class="contentIput" label="水印纵坐标偏移量：" prop="mail">
-                      <Input
+                      </el-input>
+                    </el-form-item>
+                    <el-form-item class="contentIput" label="水印纵坐标偏移量：" prop="mail">
+                      <el-input
                         class="topIput"
                         type="number"
                         v-model="formValidate.watermark_y"
                         placeholder="请输入水印纵坐标偏移量"
                       >
                         <span slot="append">px</span>
-                      </Input>
-                    </FormItem>
+                      </el-input>
+                    </el-form-item>
                   </div>
                 </div>
                 <!-- 水印类型为文字 -->
                 <div v-else>
                   <div class="flex">
-                    <FormItem class="contentIput" label="水印文字：" prop="name">
-                      <Input class="topIput" v-model="formValidate.watermark_text" placeholder="请输入水印文字">
-                      </Input>
-                    </FormItem>
-                    <FormItem class="contentIput" label="水印文字大小：">
-                      <Input
+                    <el-form-item class="contentIput" label="水印文字：" prop="name">
+                      <el-input class="topIput" v-model="formValidate.watermark_text" placeholder="请输入水印文字">
+                      </el-input>
+                    </el-form-item>
+                    <el-form-item class="contentIput" label="水印文字大小：">
+                      <el-input
                         class="topIput"
                         type="number"
                         v-model="formValidate.watermark_text_size"
                         placeholder="请输入水印文字大小"
                       >
-                      </Input>
-                    </FormItem>
+                      </el-input>
+                    </el-form-item>
                   </div>
                   <div class="flex">
-                    <FormItem class="contentIput" label="水印字体颜色：" prop="name">
+                    <el-form-item class="contentIput" label="水印字体颜色：" prop="name">
                       <ColorPicker v-model="formValidate.watermark_text_color" />
-                    </FormItem>
-                    <FormItem class="contentIput" label="水印位置：" prop="mail">
+                    </el-form-item>
+                    <el-form-item class="contentIput" label="水印位置：" prop="mail">
                       <div class="conents">
                         <div class="positionBox">
                           <div
@@ -278,105 +283,132 @@
                         </div>
                         <div class="title">{{ positiontlt }}</div>
                       </div>
-                    </FormItem>
+                    </el-form-item>
                   </div>
                   <div class="flex">
-                    <FormItem class="contentIput" label="水印字体旋转角度：">
-                      <Input
+                    <el-form-item class="contentIput" label="水印字体旋转角度：">
+                      <el-input
                         class="topIput"
                         type="number"
                         v-model="formValidate.watermark_text_angle"
                         placeholder="请输入水印字体旋转角度"
                       >
-                      </Input>
-                    </FormItem>
-                    <FormItem class="contentIput" label="水印横坐标偏移量：">
-                      <Input
+                      </el-input>
+                    </el-form-item>
+                    <el-form-item class="contentIput" label="水印横坐标偏移量：">
+                      <el-input
                         class="topIput"
                         type="number"
                         v-model="formValidate.watermark_x"
                         placeholder="请输入水印横坐标偏移量"
                       >
                         <span slot="append">px</span>
-                      </Input>
-                    </FormItem>
+                      </el-input>
+                    </el-form-item>
                   </div>
-                  <FormItem class="contentIput" label="水印横坐纵偏移量：" prop="mail">
-                    <Input
+                  <el-form-item class="contentIput" label="水印横坐纵偏移量：" prop="mail">
+                    <el-input
                       class="topIput"
                       type="number"
                       v-model="formValidate.watermark_y"
                       placeholder="请输入水印横坐纵偏移量"
                     >
                       <span slot="append">px</span>
-                    </Input>
-                  </FormItem>
+                    </el-input>
+                  </el-form-item>
                 </div>
               </div>
             </div>
-            <FormItem>
-              <Button type="primary" @click="handleSubmit('formValidate')">保存</Button>
-            </FormItem>
+            <el-form-item>
+              <el-button type="primary" @click="handleSubmit('formValidate')">保存</el-button>
+            </el-form-item>
           </div>
-        </Form>
-      </Card>
+        </el-form>
+      </el-card>
     </div>
     <!-- 缩略图配置 -->
     <div class="pt10" v-else-if="currentTab == 5"></div>
     <div class="pt10" v-else>
-      <Card :bordered="false" dis-hover class="ivu-mt">
-        <Row type="flex" class="mb20">
-          <Col span="24">
-            <Button type="primary" @click="addStorageBtn">添加存储空间</Button>
-            <Button type="success" @click="synchro" style="margin-left: 20px">同步存储空间</Button>
-            <Button @click="addConfigBtn" style="float: right">修改配置信息</Button>
-          </Col>
-        </Row>
-        <Table
-          :columns="columns"
+      <el-card :bordered="false" shadow="never" class="ivu-mt">
+        <el-row class="mb20">
+          <el-col :span="24">
+            <el-button type="primary" @click="addStorageBtn">添加存储空间</el-button>
+            <el-button type="success" @click="synchro" style="margin-left: 20px">同步存储空间</el-button>
+            <el-button @click="addConfigBtn" style="float: right">修改配置信息</el-button>
+          </el-col>
+        </el-row>
+        <el-table
           :data="levelLists"
           ref="table"
           class="mt25"
-          :loading="loading"
-          highlight-row
+          v-loading="loading"
+          highlight-current-row
           no-userFrom-text="暂无数据"
           no-filtered-userFrom-text="暂无筛选结果"
         >
-          <template slot-scope="{ row, index }" slot="status">
-            <!-- {{row}}{{index}} -->
-            <i-switch
-              v-model="row.status"
-              :value="row.status"
-              :true-value="1"
-              :false-value="0"
-              @on-change="changeSwitch(row, index)"
-              size="large"
-            >
-              <span slot="open">开启</span>
-              <span slot="close">关闭</span>
-            </i-switch>
-          </template>
-          <template slot-scope="{ row, index }" slot="action">
-            <template v-if="row.domain && row.domain != row.cname">
-              <span class="btn" @click="config(row)">CNAME配置</span>
-              <Divider type="vertical" />
+          <el-table-column label="储存空间名称" min-width="120">
+            <template slot-scope="scope">
+              <span>{{ scope.row.name }}</span>
             </template>
-            <span class="btn" @click="edit(row)">修改空间域名</span>
-            <Divider type="vertical" />
-            <span class="btn" @click="del(row, '删除该数据', index)">删除</span>
-          </template>
-        </Table>
+          </el-table-column>
+          <el-table-column label="区域" min-width="90">
+            <template slot-scope="scope">
+              <span>{{ scope.row._region }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="空间域名" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row.domain }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="使用状态" min-width="90">
+            <template slot-scope="scope">
+              <el-switch
+                class="defineSwitch"
+                :active-value="1"
+                :inactive-value="0"
+                v-model="scope.row.status"
+                :value="scope.row.status"
+                @change="changeSwitch(scope.row, index)"
+                size="large"
+                active-text="开启"
+                inactive-text="关闭"
+              >
+              </el-switch>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row._add_time }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="更新时间" min-width="130">
+            <template slot-scope="scope">
+              <span>{{ scope.row._update_time }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" width="220">
+            <template slot-scope="scope">
+              <template v-if="scope.row.domain && scope.row.domain != scope.row.cname">
+                <span class="btn" @click="config(scope.row)">CNAME配置</span>
+                <el-divider direction="vertical"></el-divider>
+              </template>
+              <span class="btn" @click="edit(scope.row)">修改空间域名</span>
+              <el-divider direction="vertical"></el-divider>
+              <span class="btn" @click="del(scope.row, '删除该数据', index)">删除</span>
+            </template>
+          </el-table-column>
+        </el-table>
         <div class="acea-row row-right page">
-          <Page
+          <pagination
+            v-if="total"
             :total="total"
-            :current="list.page"
-            show-elevator
-            show-total
-            @on-change="pageChange"
-            :page-size="list.limit"
+            :page.sync="list.page"
+            :limit.sync="list.limit"
+            @pagination="getList"
           />
         </div>
-      </Card>
+      </el-card>
     </div>
     <Modal v-model="configuModal" title="CNAME配置">
       <div>
@@ -484,50 +516,7 @@ export default {
         { label: '腾讯云储存', value: '4' },
         // { label: "缩略图配置", value: "5" },
       ],
-      columns: [
-        {
-          title: '储存空间名称',
-          key: 'name',
-          align: 'center',
-          minWidth: 200,
-        },
-        {
-          title: '区域',
-          key: '_region',
-          align: 'center',
-          minWidth: 100,
-        },
-        {
-          title: '空间域名',
-          key: 'domain',
-          align: 'center',
-          minWidth: 200,
-        },
-        {
-          title: '使用状态',
-          slot: 'status',
-          align: 'center',
-          width: 90,
-        },
-        {
-          title: '创建时间',
-          key: '_add_time',
-          align: 'center',
-          minWidth: 150,
-        },
-        {
-          title: '更新时间',
-          key: '_update_time',
-          align: 'center',
-          minWidth: 150,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          width: 210,
-          align: 'center',
-        },
-      ],
+
       total: 0,
       list: {
         page: 1,
@@ -556,7 +545,8 @@ export default {
         this.localStorage = true;
       }
       this.formValidate.upload_type = res.data.type;
-      this.changeTab(res.data.type.toString());
+      this.currentTab = res.data.type.toString();
+      this.changeTab();
     });
   },
   methods: {
@@ -684,11 +674,10 @@ export default {
         this.loading = false;
       });
     },
-    changeTab(data) {
-      this.currentTab = data;
-      this.list.type = data;
+    changeTab() {
+      this.list.type = this.currentTab;
       this.list.page = 1;
-      if (data == 1) {
+      if (this.currentTab == 1) {
         this.getposition();
       } else {
         this.getlist();
@@ -742,10 +731,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.list.page = index;
-      this.getlist();
-    },
   },
 };
 </script>
diff --git a/template/admin/src/pages/setting/storeList/index.vue b/template/admin/src/pages/setting/storeList/index.vue
index ec387840a..4e8afeec8 100644
--- a/template/admin/src/pages/setting/storeList/index.vue
+++ b/template/admin/src/pages/setting/storeList/index.vue
@@ -1,90 +1,120 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="mb20">
-        <Tabs v-model="artFrom.type" @on-click="onClickTab">
-          <TabPane :label="headeNum.show.name + '(' + headeNum.show.num + ')'" name="0" />
-          <TabPane :label="headeNum.hide.name + '(' + headeNum.hide.num + ')'" name="1" />
-          <TabPane :label="headeNum.recycle.name + '(' + headeNum.recycle.num + ')'" name="2" />
-        </Tabs>
+        <el-tabs v-model="artFrom.type" @tag-click="onClickTab">
+          <el-tab-pane :label="headeNum.show.name + '(' + headeNum.show.num + ')'" name="0" />
+          <el-tab-pane :label="headeNum.hide.name + '(' + headeNum.hide.num + ')'" name="1" />
+          <el-tab-pane :label="headeNum.recycle.name + '(' + headeNum.recycle.num + ')'" name="2" />
+        </el-tabs>
       </div>
-      <Form
+      <el-form
         ref="artFrom"
         :model="artFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid" class="mr">
-            <FormItem label="提货点搜索：" label-for="store_name">
-              <Input
+        <el-row :gutter="24">
+          <el-col v-bind="grid" class="mr">
+            <el-form-item label="提货点搜索：" label-for="store_name">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入提货点名称,电话"
                 v-model="artFrom.keywords"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-          <!--                    <Col v-bind="grid">-->
-          <!--                        <Button class="mr">导出</Button>-->
-          <!--                    </Col>-->
-        </Row>
-      </Form>
-      <Row type="flex" v-auth="['setting-merchant-system_store-save']">
-        <Col v-bind="grid">
-          <Button v-auth="['setting-merchant-system_store-save']" type="primary" icon="md-add" @click="add"
-            >添加提货点</Button
+            </el-form-item>
+          </el-col>
+          <!--                    <el-col v-bind="grid">-->
+          <!--                        <el-button class="mr">导出</el-button>-->
+          <!--                    </el-col>-->
+        </el-row>
+      </el-form>
+      <el-row v-auth="['setting-merchant-system_store-save']">
+        <el-col v-bind="grid">
+          <el-button v-auth="['setting-merchant-system_store-save']" type="primary" icon="md-add" @click="add"
+            >添加提货点</el-button
           >
-        </Col>
-      </Row>
-      <Table
-        :columns="columns"
+        </el-col>
+      </el-row>
+      <el-table
         :data="storeLists"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="image">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.image" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="is_show">
-          <i-switch
-            v-model="row.is_show"
-            :value="row.is_show"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row.id, row.is_show)"
-            size="large"
-            >>
-            <span slot="open">显示</span>
-            <span slot="close">隐藏</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row.id)">编辑</a>
-          <Divider type="vertical" />
-          <a v-if="row.is_del == 0" @click="del(row, '删除提货点', index)">删除</a>
-          <a v-else @click="del(row, '恢复提货点', index)">恢复</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="提货点图片" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.image" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="提货点名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="提货点电话" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.phone }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="地址" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.detailed_address }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="营业时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.day_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否显示" min-width="130">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.is_show"
+              :value="scope.row.is_show"
+              @change="onchangeIsShow(scope.row.id, scope.row.is_show)"
+              size="large"
+              active-text="显示"
+              inactive-text="隐藏"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row.id)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a v-if="scope.row.is_del == 0" @click="del(scope.row, '删除提货点', index)">删除</a>
+            <a v-else @click="del(scope.row, '恢复提货点', index)">恢复</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="artFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="artFrom.limit"
+          :page.sync="artFrom.page"
+          :limit.sync="artFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <system-store ref="template"></system-store>
   </div>
 </template>
@@ -100,7 +130,7 @@ export default {
     ...mapState('media', ['isMobile']),
     ...mapState('userLevel', ['categoryId']),
     labelWidth() {
-      return this.isMobile ? undefined : 85;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -127,50 +157,6 @@ export default {
         keywords: '',
       },
       loading: false,
-      columns: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-          sortable: true,
-        },
-        {
-          title: '提货点图片',
-          slot: 'image',
-          minWidth: 100,
-        },
-        {
-          title: '提货点名称',
-          key: 'name',
-          minWidth: 100,
-        },
-        {
-          title: '提货点电话',
-          key: 'phone',
-          minWidth: 100,
-        },
-        {
-          title: '地址',
-          key: 'detailed_address',
-          minWidth: 100,
-        },
-        {
-          title: '营业时间',
-          key: 'day_time',
-          minWidth: 100,
-        },
-        {
-          title: '是否显示',
-          slot: 'is_show',
-          minWidth: 100,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 120,
-        },
-      ],
       storeLists: [],
       total: 0,
     };
@@ -215,10 +201,6 @@ export default {
       this.artFrom.keywords = '';
       this.getList();
     },
-    pageChange(index) {
-      this.artFrom.page = index;
-      this.getList();
-    },
     // 删除
     del(row, tit, num) {
       let delfromData = {
diff --git a/template/admin/src/pages/setting/storeService/feedback.vue b/template/admin/src/pages/setting/storeService/feedback.vue
index 90d41f10b..678794fa9 100644
--- a/template/admin/src/pages/setting/storeService/feedback.vue
+++ b/template/admin/src/pages/setting/storeService/feedback.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
@@ -9,10 +9,10 @@
         class="tabform"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex" justify="end">
-          <Col span="24" class="ivu-text-left">
-            <FormItem label="留言信息：">
-              <Input
+        <el-row :gutter="24" justify="end">
+          <el-col :span="24" class="ivu-text-left">
+            <el-form-item label="留言信息：">
+              <el-input
                 search
                 enter-button
                 @on-search="selChange"
@@ -22,21 +22,23 @@
                 style="width: 30%; display: inline-table"
                 class="mr"
               />
-            </FormItem>
-          </Col>
-          <Col span="24" class="ivu-text-left">
-            <FormItem label="留言时间：">
-              <RadioGroup
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" class="ivu-text-left">
+            <el-form-item label="留言时间：">
+              <el-radio-group
                 v-model="formValidate.time"
                 type="button"
-                @on-change="selectChange(formValidate.time)"
+                @change="selectChange(formValidate.time)"
                 class="mr"
               >
-                <Radio :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{ item.text }}</Radio>
-              </RadioGroup>
+                <el-radio-button :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{
+                  item.text
+                }}</el-radio-button>
+              </el-radio-group>
               <DatePicker
                 :editable="false"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="daterange"
@@ -44,30 +46,53 @@
                 placeholder="请选择时间"
                 style="width: 200px"
               ></DatePicker>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
-        :data="list"
-        :loading="loading"
-        no-userFrom-text="暂无数据"
-        no-filtered-userFrom-text="暂无筛选结果"
-      >
-        <template slot-scope="{ row, index }" slot="status">
-          <div>{{ row.status === 1 ? '已处理' : '未处理' }}</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="remarks(row.id)">{{ row.status === 1 ? '备注' : '处理' }}</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除反馈', index)">删除</a>
-        </template>
-      </Table>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table :data="list" :loading="loading" no-userFrom-text="暂无数据" no-filtered-userFrom-text="暂无筛选结果">
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="昵称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.rela_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="电话" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.phone }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="内容" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.content }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="130">
+          <template slot-scope="scope">
+            <div>{{ scope.row.status === 1 ? '已处理' : '未处理' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="remarks(scope.row.id)">{{ scope.row.status === 1 ? '备注' : '处理' }}</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除反馈', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page :total="count" show-elevator show-total @on-change="pageChange" :page-size="limit" />
+        <pagination v-if="total" :total="total" :page.sync="page" :limit.sync="limit" @pagination="getList" />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -100,51 +125,13 @@ export default {
         ],
       },
       timeVal: [],
-      count: 0,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '昵称',
-          key: 'rela_name',
-          minWidth: 120,
-        },
-        {
-          title: '电话',
-          key: 'phone',
-          minWidth: 120,
-        },
-        {
-          title: '内容',
-          key: 'content',
-          minWidth: 320,
-        },
-        {
-          title: '状态',
-          slot: 'status',
-          minWidth: 120,
-        },
-        {
-          title: '时间',
-          key: 'add_time',
-          minWidth: 120,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 150,
-        },
-      ],
+      total: 0,
     };
   },
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -185,7 +172,7 @@ export default {
         title: this.formValidate.title,
       }).then((res) => {
         this.list = res.data.data;
-        this.count = res.data.count;
+        this.total = res.data.total;
       });
     },
     // 删除
@@ -206,10 +193,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.page = index;
-      this.getList();
-    },
   },
 };
 </script>
diff --git a/template/admin/src/pages/setting/storeService/index.vue b/template/admin/src/pages/setting/storeService/index.vue
index 577af0a97..1cb0fb84a 100644
--- a/template/admin/src/pages/setting/storeService/index.vue
+++ b/template/admin/src/pages/setting/storeService/index.vue
@@ -1,166 +1,158 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row type="flex" class="mb20">
-        <Col span="24">
-          <Button v-auth="['setting-store_service-add']" type="primary" icon="md-add" @click="add" class="mr10"
-            >添加客服</Button
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row class="mb20">
+        <el-col :span="24">
+          <el-button v-auth="['setting-store_service-add']" type="primary" icon="md-add" @click="add" class="mr10"
+            >添加客服</el-button
           >
-        </Col>
-      </Row>
-      <Table
-        :columns="columns1"
+        </el-col>
+      </el-row>
+      <el-table
         :data="tableList"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="avatar">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">开启</span>
-            <span slot="close">关闭</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="stop_time">
-          <span> {{ row.stop_time | formatDate }}</span>
-        </template>
-
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row)">编辑</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除客服', index)">删除</a>
-          <Divider type="vertical" v-if="row.status" />
-          <a @click="goChat(row)" v-if="row.status">进入工作台</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="客服头像" min-width="90">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.avatar" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="客服名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.wx_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="客服状态" min-width="130">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              :value="scope.row.status"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+              active-text="开启"
+              inactive-text="关闭"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="添加时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除客服', index)">删除</a>
+            <el-divider direction="vertical" v-if="scope.row.status" />
+            <a @click="goChat(scope.row)" v-if="scope.row.status">进入工作台</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="tableFrom.limit" />
+        <pagination
+          v-if="total"
+          :total="total"
+          :page.sync="tableFrom.page"
+          :limit.sync="tableFrom.limit"
+          @pagination="getList"
+        />
       </div>
-    </Card>
-
-    <!--添加客户-->
-    <!--<Modal v-model="modals" scrollable   closable title="添加客服"  width="1000"  @on-cancel="cancel">-->
-    <!--<Form ref="formValidate" :model="formValidate" :label-width="labelWidth" :label-position="labelPosition" @submit.native.prevent>-->
-    <!--<Row :gutter="24" type="flex">-->
-    <!--<Col span="24" class="ivu-text-left">-->
-    <!--<FormItem label="选择时间：">-->
-    <!--<RadioGroup v-model="formValidate.data" type="button" @on-change="selectChange(formValidate.data)"-->
-    <!--class="mr">-->
-    <!--<Radio :label=item.val v-for="(item,i) in fromList.fromTxt" :key="i">{{item.text}}</Radio>-->
-    <!--</RadioGroup>-->
-    <!--<DatePicker @on-change="onchangeTime" :value="timeVal" format="yyyy/MM/dd" type="daterange"-->
-    <!--placement="bottom-end" placeholder="请选择时间" style="width: 200px;"></DatePicker>-->
-    <!--</FormItem>-->
-    <!--</Col>-->
-    <!--<Col span="12" class="ivu-text-left">-->
-    <!--<FormItem label="用户名称：" >-->
-    <!--<Input search enter-button  placeholder="请输入用户名称" v-model="formValidate.nickname" style="width: 90%;" @on-search="userSearchs"></Input>-->
-    <!--</FormItem>-->
-    <!--</Col>-->
-    <!--<Col span="12" class="ivu-text-left">-->
-    <!--<FormItem label="用户类型：" >-->
-    <!--<Select v-model="formValidate.type" style="width:90%;" @on-change="userSearchs">-->
-    <!--<Option value="">全部用户</Option>-->
-    <!--<Option value="wechat">公众号</Option>-->
-    <!--<Option value="routine">小程序</Option>-->
-    <!--</Select>-->
-    <!--</FormItem>-->
-    <!--</Col>-->
-    <!--</Row>-->
-    <!--</Form>-->
-    <!--<Table :loading="loading2" highlight-row no-userFrom-text="暂无数据" max-height="400"-->
-    <!--@on-selection-change="onSelectTab"-->
-    <!--no-filtered-userFrom-text="暂无筛选结果" ref="selection" :columns="columns4" :data="tableList2">-->
-    <!--<template slot-scope="{ row, index }" slot="headimgurl">-->
-    <!--<viewer>-->
-    <!--<div class="tabBox_img">-->
-    <!--<img v-lazy="row.headimgurl">-->
-    <!--</div>-->
-    <!--</viewer>-->
-    <!--</template>-->
-    <!--<template slot-scope="{ row, index }" slot="user_type">-->
-    <!--<span>{{ row.user_type | typeFilter }}</span>-->
-    <!--</template>-->
-    <!--<template slot-scope="{ row, index }" slot="sex">-->
-    <!--<span v-show="row.sex ===1">男</span>-->
-    <!--<span v-show="row.sex ===2">女</span>-->
-    <!--<span v-show="row.sex ===0">保密</span>-->
-    <!--</template>-->
-    <!--<template slot-scope="{ row, index }" slot="country">-->
-    <!--<span>{{row.country + row.province + row.city}}</span>-->
-    <!--</template>-->
-    <!--<template slot-scope="{ row, index }" slot="subscribe">-->
-    <!--<span v-text="row.subscribe === 1?'关注':'未关注'"></span>-->
-    <!--</template>-->
-    <!--</Table>-->
-    <!--<div class="acea-row row-right page">-->
-    <!--<Page :total="total2" :current="formValidate.page" show-elevator show-total @on-change="pageChange2"-->
-    <!--:page-size="formValidate.limit"/>-->
-    <!--</div>-->
-    <!--<div slot="footer">-->
-    <!--<Button  type="primary"  @click="putRemark">提交</Button>-->
-    <!--</div>-->
-    <!--</Modal>-->
+    </el-card>
 
     <!--聊天记录-->
     <Modal v-model="modals3" footer-hide scrollable closable title="聊天记录" width="700">
       <div v-if="isChat" class="modelBox">
-        <Table
+        <el-table
           :loading="loading3"
-          highlight-row
+          highlight-current-row
           no-userFrom-text="暂无数据"
           no-filtered-userFrom-text="暂无筛选结果"
-          :columns="columns3"
           :data="tableList3"
         >
-          <template slot-scope="{ row, index }" slot="headimgurl">
-            <div class="tabBox_img" v-viewer>
-              <img v-lazy="row.headimgurl" />
-            </div>
-          </template>
-          <template slot-scope="{ row, index }" slot="action">
-            <a @click="look(row)">查看对话</a>
-          </template>
-        </Table>
+          <el-table-column label="用户名称" width="200">
+            <template slot-scope="scope">
+              <span>{{ scope.row.nickname }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="客服头像" min-width="90">
+            <template slot-scope="scope">
+              <div class="tabBox_img" v-viewer>
+                <img v-lazy="scope.row.headimgurl" />
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" width="170">
+            <template slot-scope="scope">
+              <a @click="look(scope.row)">查看对话</a>
+            </template>
+          </el-table-column>
+        </el-table>
         <div class="acea-row row-right page">
-          <Page :total="total3" show-elevator show-total @on-change="pageChange3" :page-size="formValidate3.limit" />
+          <pagination
+            v-if="total3"
+            :total="total3"
+            :page.sync="formValidate3.page"
+            :limit.sync="formValidate3.limit"
+            @pagination="getListRecord"
+          />
         </div>
       </div>
       <div v-if="!isChat">
-        <Button type="primary" @click="isChat = true">返回聊天记录</Button>
-        <Table
+        <el-button type="primary" @click="isChat = true">返回聊天记录</el-button>
+        <el-table
           :loading="loading5"
-          highlight-row
+          highlight-current-row
           no-userFrom-text="暂无数据"
           class="mt20"
           no-filtered-userFrom-text="暂无筛选结果"
-          :columns="columns5"
           :data="tableList5"
         >
-          <template slot-scope="{ row, index }" slot="avatar">
-            <div class="tabBox_img" v-viewer>
-              <img v-lazy="row.avatar" />
-            </div>
-          </template>
-          <template slot-scope="{ row, index }" slot="action">
-            <a @click="look(row)">查看对话</a>
-          </template>
-        </Table>
+          <el-table-column label="用户名称" min-width="200">
+            <template slot-scope="scope">
+              <span>{{ scope.row.nickname }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="用户头像" min-width="90">
+            <template slot-scope="scope">
+              <div class="tabBox_img" v-viewer>
+                <img v-lazy="scope.row.avatar" />
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="发送消息" min-width="200">
+            <template slot-scope="scope">
+              <span>{{ scope.row.msn }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="发送时间" min-width="200">
+            <template slot-scope="scope">
+              <span>{{ scope.row.add_time }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
         <div class="acea-row row-right page">
-          <Page :total="total5" show-elevator show-total @on-change="pageChange5" :page-size="formValidate5.limit" />
+          <pagination
+            v-if="total5"
+            :total="total5"
+            :page.sync="formValidate5.page"
+            :limit.sync="formValidate5.limit"
+            @pagination="getChatlist"
+          />
         </div>
       </div>
     </Modal>
@@ -196,7 +188,7 @@ export default {
     ...mapState('media', ['isMobile']),
     ...mapState('userLevel', ['categoryId']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -213,21 +205,6 @@ export default {
       loading3: false,
       modals3: false,
       tableList3: [],
-      columns3: [
-        {
-          title: '用户名称',
-          key: 'nickname',
-          width: 200,
-        },
-        {
-          title: '客服头像',
-          slot: 'headimgurl',
-        },
-        {
-          title: '操作',
-          slot: 'action',
-        },
-      ],
       formValidate5: {
         page: 1,
         limit: 15,
@@ -238,26 +215,6 @@ export default {
       total5: 0,
       loading5: false,
       tableList5: [],
-      columns5: [
-        {
-          title: '用户名称',
-          key: 'nickname',
-          width: 200,
-        },
-        {
-          title: '用户头像',
-          slot: 'avatar',
-        },
-        {
-          title: '发送消息',
-          key: 'msn',
-          width: 250,
-        },
-        {
-          title: '发送时间',
-          key: 'add_time',
-        },
-      ],
       FromData: null,
       formValidate: {
         page: 1,
@@ -289,86 +246,6 @@ export default {
       },
       loading: false,
       tableList: [],
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '微信用户名称',
-          key: 'nickname',
-          minWidth: 120,
-        },
-        {
-          title: '客服头像',
-          slot: 'avatar',
-          minWidth: 60,
-        },
-        {
-          title: '客服名称',
-          key: 'wx_name',
-          minWidth: 120,
-        },
-        {
-          title: '客服状态',
-          slot: 'status',
-          minWidth: 120,
-        },
-        {
-          title: '添加时间',
-          key: 'add_time',
-          minWidth: 120,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 150,
-        },
-      ],
-      columns4: [
-        {
-          type: 'selection',
-          width: 60,
-          align: 'center',
-        },
-        {
-          title: 'ID',
-          key: 'uid',
-          width: 80,
-        },
-        {
-          title: '微信用户名称',
-          key: 'nickname',
-          minWidth: 160,
-        },
-        {
-          title: '客服头像',
-          slot: 'headimgurl',
-          minWidth: 60,
-        },
-        {
-          title: '用户类型',
-          slot: 'user_type',
-          width: 100,
-        },
-        {
-          title: '性别',
-          slot: 'sex',
-          minWidth: 60,
-        },
-        {
-          title: '地区',
-          slot: 'country',
-          minWidth: 120,
-        },
-        {
-          title: '是否关注公众号',
-          slot: 'subscribe',
-          minWidth: 120,
-        },
-      ],
       loading2: false,
       total2: 0,
       addFrom: {
@@ -470,10 +347,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange5(index) {
-      this.formValidate5.page = index;
-      this.getChatlist();
-    },
     // 修改成功
     submitFail() {
       this.getList();
@@ -500,10 +373,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange3(index) {
-      this.formValidate3.page = index;
-      this.getListRecord();
-    },
     // 编辑
     edit(row) {
       this.$modalForm(kefuEditApi(row.id)).then(() => this.getList());
@@ -598,10 +467,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.tableFrom.page = index;
-      this.getList();
-    },
     // 修改是否显示
     onchangeIsShow(row) {
       let data = {
diff --git a/template/admin/src/pages/setting/storeService/speechcraft.vue b/template/admin/src/pages/setting/storeService/speechcraft.vue
index c075a74cb..4ac34c55d 100644
--- a/template/admin/src/pages/setting/storeService/speechcraft.vue
+++ b/template/admin/src/pages/setting/storeService/speechcraft.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <Row class="ivu-mt box-wrapper">
-      <Col v-bind="grid1" class="left-wrapper">
+    <el-row class="ivu-mt box-wrapper">
+      <el-col v-bind="grid1" class="left-wrapper">
         <Menu :theme="theme3" :active-name="sortName" width="auto">
           <MenuGroup>
             <MenuItem
@@ -27,53 +27,81 @@
             </MenuItem>
           </MenuGroup>
         </Menu>
-      </Col>
-      <Col v-bind="grid2" ref="rightBox">
-        <Card :bordered="false" dis-hover>
-          <Row type="flex" class="mb20">
-            <Col span="24">
-              <Button v-auth="['setting-store_service-add']" type="primary" icon="md-add" @click="add" class="mr10"
-                >添加话术</Button
+      </el-col>
+      <el-col v-bind="grid2" ref="rightBox">
+        <el-card :bordered="false" shadow="never">
+          <el-row class="mb20">
+            <el-col :span="24">
+              <el-button v-auth="['setting-store_service-add']" type="primary" icon="md-add" @click="add" class="mr10"
+                >添加话术</el-button
               >
-              <Button
+              <el-button
                 v-auth="['setting-store_service-add']"
                 type="success"
                 icon="md-add"
                 @click="addSort"
                 style="margin-left: 10px"
-                >添加分类</Button
+                >添加分类</el-button
               >
-            </Col>
-          </Row>
-          <Table
-            :columns="columns1"
+            </el-col>
+          </el-row>
+          <el-table
             :data="tableList"
             :loading="loading"
-            highlight-row
+            highlight-current-row
             no-userFrom-text="暂无数据"
             no-filtered-userFrom-text="暂无筛选结果"
           >
-            <template slot-scope="{ row, index }" slot="avatar">
-              <div class="tabBox_img" v-viewer>
-                <img v-lazy="row.avatar" />
-              </div>
-            </template>
-            <template slot-scope="{ row, index }" slot="add_time">
-              <span> {{ row.add_time }}</span>
-            </template>
-
-            <template slot-scope="{ row, index }" slot="action">
-              <a @click="edit(row)">编辑</a>
-              <Divider type="vertical" />
-              <a @click="del(row, '删除客服', index)">删除</a>
-            </template>
-          </Table>
+            <el-table-column label="ID" width="80">
+              <template slot-scope="scope">
+                <span>{{ scope.row.id }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="分类" min-width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.cate_name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="标题" min-width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.title }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="详情" min-width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.message }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="排序" min-width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.sort }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="添加时间" min-width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.add_time }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" fixed="right" width="170">
+              <template slot-scope="scope">
+                <a @click="edit(scope.row)">编辑</a>
+                <el-divider direction="vertical"></el-divider>
+                <a @click="del(scope.row, '删除客服', index)">删除</a>
+              </template>
+            </el-table-column>
+          </el-table>
           <div class="acea-row row-right page">
-            <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="tableFrom.limit" />
+            <pagination
+              v-if="total"
+              :total="total"
+              :page.sync="tableFrom.page"
+              :limit.sync="tableFrom.limit"
+              @pagination="getList"
+            />
           </div>
-        </Card>
-      </Col>
-    </Row>
+        </el-card>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
@@ -101,7 +129,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 80;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -189,86 +217,7 @@ export default {
       },
       loading: false,
       tableList: [],
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '分类',
-          key: 'cate_name',
-          minWidth: 120,
-        },
-        {
-          title: '标题',
-          key: 'title',
-          minWidth: 120,
-        },
-        {
-          title: '详情',
-          key: 'message',
-          minWidth: 320,
-        },
-        {
-          title: '排序',
-          key: 'sort',
-          minWidth: 60,
-        },
-        {
-          title: '添加时间',
-          slot: 'add_time',
-          minWidth: 120,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 150,
-        },
-      ],
-      columns4: [
-        {
-          type: 'selection',
-          width: 60,
-          align: 'center',
-        },
-        {
-          title: 'ID',
-          key: 'uid',
-          width: 80,
-        },
-        {
-          title: '微信用户名称',
-          key: 'nickname',
-          minWidth: 160,
-        },
-        {
-          title: '客服头像',
-          slot: 'headimgurl',
-          minWidth: 60,
-        },
-        {
-          title: '用户类型',
-          slot: 'user_type',
-          width: 100,
-        },
-        {
-          title: '性别',
-          slot: 'sex',
-          minWidth: 60,
-        },
-        {
-          title: '地区',
-          slot: 'country',
-          minWidth: 120,
-        },
-        {
-          title: '是否关注公众号',
-          slot: 'subscribe',
-          minWidth: 120,
-        },
-      ],
+
       loading2: false,
       total2: 0,
       addFrom: {
@@ -536,10 +485,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.tableFrom.page = index;
-      this.getList();
-    },
     // 修改是否显示
     onchangeIsShow(row) {
       let data = {
diff --git a/template/admin/src/pages/setting/systemAdmin/index.vue b/template/admin/src/pages/setting/systemAdmin/index.vue
index a0701d14f..5bb7e39ee 100644
--- a/template/admin/src/pages/setting/systemAdmin/index.vue
+++ b/template/admin/src/pages/setting/systemAdmin/index.vue
@@ -1,85 +1,112 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="状态：" label-for="status1">
-              <Select v-model="status" placeholder="请选择" @on-change="userSearchs" clearable>
-                <Option value="all">全部</Option>
-                <Option value="1">开启</Option>
-                <Option value="0">关闭</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="搜索：" label-for="status2">
-              <Input
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="状态：" label-for="status1">
+              <el-select v-model="status" placeholder="请选择" @change="userSearchs" clearable>
+                <el-option value="all" label="全部"></el-option>
+                <el-option value="1" label="开启"></el-option>
+                <el-option value="0" label="关闭"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="搜索：" label-for="status2">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入姓名或者账号"
                 v-model="formValidate.name"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button v-auth="['setting-system_admin-add']" type="primary" @click="add" icon="md-add">添加管理员</Button>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-button v-auth="['setting-system_admin-add']" type="primary" @click="add" icon="md-add"
+              >添加管理员</el-button
+            >
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="list"
         class="mt25"
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
       >
-        <template slot-scope="{ row, index }" slot="roles">
-          <div v-if="row.roles.length !== 0">
-            <Tag color="blue" v-for="(item, index) in row.roles.split(',')" :key="index" v-text="item"></Tag>
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="status">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">开启</span>
-            <span slot="close">关闭</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row)">编辑</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除管理员', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="姓名" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.real_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="账号" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.account }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="身份" min-width="130">
+          <template slot-scope="scope">
+            <div v-if="scope.row.roles.length !== 0">
+              <Tag color="blue" v-for="(item, index) in scope.row.roles.split(',')" :key="index" v-text="item"></Tag>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="最后一次登录时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row._last_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="最后一次登录ip" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.last_ip }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="开启" min-width="70">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              :value="scope.row.status"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+              active-text="开启"
+              inactive-text="关闭"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="100">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除管理员', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!-- 添加 编辑 -->
     <admin-from :FromData="FromData" ref="adminfrom" @submitFail="submitFail"></admin-from>
   </div>
@@ -115,45 +142,6 @@ export default {
       },
       status: '',
       list: [],
-      columns1: [
-        {
-          title: '姓名',
-          key: 'real_name',
-          minWidth: 120,
-        },
-        {
-          title: '账号',
-          key: 'account',
-          minWidth: 150,
-        },
-        {
-          title: '身份',
-          slot: 'roles',
-          minWidth: 250,
-        },
-        {
-          title: '最后一次登录时间',
-          key: '_last_time',
-          minWidth: 180,
-        },
-        {
-          title: '最后一次登录ip',
-          key: 'last_ip',
-          minWidth: 180,
-        },
-        {
-          title: '开启',
-          slot: 'status',
-          minWidth: 90,
-        },
-        {
-          title: '操作',
-          key: 'action',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 120,
-        },
-      ],
       FromData: null,
       modalTitleSs: '',
       ids: Number,
@@ -162,7 +150,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 50;
+      return this.isMobile ? undefined : '50px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -205,10 +193,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 添加表单
     add() {
       adminFromApi()
diff --git a/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue b/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue
index 20eed5668..be0141b23 100644
--- a/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue
+++ b/template/admin/src/pages/setting/systemMenus/components/menusFrom.vue
@@ -11,60 +11,60 @@
       @on-cancel="handleReset"
       @on-visible-change="visible"
     >
-      <Form ref="formValidate" :model="formValidate" :label-width="110" @submit.native.prevent>
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem :label="!authType ? '接口名称：' : '按钮名称：'" prop="menu_name">
+      <el-form ref="formValidate" :model="formValidate" label-width="110px" @submit.native.prevent>
+        <el-row  :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item :label="!authType ? '接口名称：' : '按钮名称：'" prop="menu_name">
               <div class="add">
-                <Input v-model="formValidate.menu_name" :placeholder="!authType ? '请输入接口名称' : '请输入按钮名称'">
-                </Input>
+                <el-input v-model="formValidate.menu_name" :placeholder="!authType ? '请输入接口名称' : '请输入按钮名称'">
+                </el-input>
               </div>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="父级分类：">
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="父级分类：">
               <Cascader :data="menuList" change-on-select v-model="formValidate.path" filterable></Cascader>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid" v-if="authType">
-            <FormItem label="图标：">
-              <Input
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid" v-if="authType">
+            <el-form-item label="图标：">
+              <el-input
                 v-model="formValidate.icon"
                 placeholder="请选择图标，点击右面图标"
                 icon="ios-appstore"
                 @on-click="iconClick"
-              ></Input>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid" v-if="authType">
-            <FormItem label="排序：">
-              <Input type="number" v-model="formValidate.sort" placeholder="请输入排序" number></Input>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="是否显示：">
-              <RadioGroup v-model="formValidate.is_show_path">
-                <Radio :label="item.value" v-for="(item, i) in isShowPathRadio" :key="i">
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid" v-if="authType">
+            <el-form-item label="排序：">
+              <el-input type="number" v-model="formValidate.sort" placeholder="请输入排序" number></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="是否显示：">
+              <el-radio-group v-model="formValidate.is_show_path">
+                <el-radio :label="item.value" v-for="(item, i) in isShowPathRadio" :key="i">
                   <Icon type="social-apple"></Icon>
                   <span>{{ item.label }}</span>
-                </Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
       <template #footer>
-        <Button @click="modals = false">取消</Button>
-        <Button type="primary" @click="handleSubmit('formValidate')" :disabled="valids">提交</Button>
+        <el-button @click="modals = false">取消</el-button>
+        <el-button type="primary" @click="handleSubmit('formValidate')" :disabled="valids">提交</el-button>
       </template>
     </Modal>
     <Modal v-model="modal12" scrollable width="600" title="图标选择" footer-hide>
-      <Input
+      <el-input
         v-model="iconVal"
         placeholder="输入关键词搜索,注意全是英文"
         clearable
         style="width: 300px"
-        @on-change="upIcon(iconVal)"
+        @change="upIcon(iconVal)"
         ref="search"
       />
       <div class="trees-coadd">
@@ -81,7 +81,7 @@
     </Modal>
     <Modal v-model="ruleModal" scrollable width="1100" title="权限列表" footer-hide @on-visible-change="modalchange">
       <div class="search-rule">
-        <Input
+        <el-input
           class="mr10"
           v-model="searchRule"
           placeholder="输入关键词搜索"
@@ -89,8 +89,8 @@
           style="width: 300px"
           ref="search"
         />
-        <Button class="mr10" type="primary" @click="searchRules">搜索</Button>
-        <Button @click="init">重置</Button>
+        <el-button class="mr10" type="primary" @click="searchRules">搜索</el-button>
+        <el-button @click="init">重置</el-button>
       </div>
       <div class="rule">
         <div
diff --git a/template/admin/src/pages/setting/systemMenus/index.vue b/template/admin/src/pages/setting/systemMenus/index.vue
index 9a108fa5f..7b2f93e6f 100644
--- a/template/admin/src/pages/setting/systemMenus/index.vue
+++ b/template/admin/src/pages/setting/systemMenus/index.vue
@@ -1,34 +1,34 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="roleData"
         :model="roleData"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <!-- <Col v-bind="grid">
-            <FormItem label="规则状态：">
-              <Select v-model="roleData.is_show" placeholder="请选择" clearable @on-change="getData">
-                <Option value="1">显示</Option>
-                <Option value="0">不显示</Option>
-              </Select>
-            </FormItem>
-          </Col> -->
-          <Col v-bind="grid">
-            <FormItem label="按钮名称：" prop="status2" label-for="status2">
-              <Input v-model="roleData.keyword" search enter-button placeholder="请输入按钮名称" @on-search="getData" />
-            </FormItem>
-          </Col>
-        </Row>
-        <!-- <Row type="flex">
-          <Col v-bind="grid">
-            <Button type="primary" @click="menusAdd('添加规则')" icon="md-add">添加规则 </Button>
-          </Col>
-        </Row> -->
-      </Form>
+        <el-row  :gutter="24">
+          <!-- <el-col v-bind="grid">
+            <el-form-item label="规则状态：">
+              <el-select v-model="roleData.is_show" placeholder="请选择" clearable @change="getData">
+                <el-option value="1">显示</el-option>
+                <el-option value="0">不显示</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col> -->
+          <el-col v-bind="grid">
+            <el-form-item label="按钮名称：" prop="status2" label-for="status2">
+              <el-input v-model="roleData.keyword" search enter-button placeholder="请输入按钮名称" @on-search="getData" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row >
+          <el-col v-bind="grid">
+            <el-button type="primary" @click="menusAdd('添加规则')" icon="md-add">添加规则 </el-button>
+          </el-col>
+        </el-row> -->
+      </el-form>
       <vxe-table
         :border="false"
         class="vxeTable mt25"
@@ -51,17 +51,15 @@
         <vxe-table-column field="sort" title="排序" width="150"></vxe-table-column>
         <vxe-table-column field="flag" title="是否显示" width="150">
           <template v-slot="{ row }">
-            <i-switch
+            <el-switch :active-value="1"  :inactive-value="0"
               v-model="row.is_show_path"
               :value="row.is_show_path"
-              :true-value="1"
-              :false-value="0"
-              @on-change="onchangeIsShow(row)"
+              @change="onchangeIsShow(row)"
               size="large"
             >
-              <span slot="open">显示</span>
-              <span slot="close">隐藏</span>
-            </i-switch>
+              
+              
+             </el-switch>
           </template>
         </vxe-table-column>
         <vxe-table-column field="date" title="操作" align="center" width="150" fixed="right">
@@ -70,7 +68,7 @@
           </template>
         </vxe-table-column>
       </vxe-table>
-    </Card>
+    </el-card>
     <menus-from
       :formValidate="formValidate"
       :titleFrom="titleFrom"
@@ -92,7 +90,7 @@
         <Alert
           >基础接口，可多选，并且添加后不会再展示出现；删除权限后才会出现；公共接口，可多选，并且添加后会继续展示；</Alert
         >
-        <Input
+        <el-input
           class="mr10"
           v-model="searchRule"
           placeholder="输入关键词搜索"
@@ -102,8 +100,8 @@
           @on-enter="searchRules"
           @on-clear="searchRules"
         />
-        <Button class="mr10" type="primary" @click="searchRules">搜索</Button>
-        <Button @click="init">重置</Button>
+        <el-button class="mr10" type="primary" @click="searchRules">搜索</el-button>
+        <el-button @click="init">重置</el-button>
       </div>
       <div class="route-list">
         <div class="tree">
@@ -133,9 +131,9 @@
           </div>
         </div>
       </div>
-      <!-- <Tabs v-model="routeType" @on-click="changTab">
-        <TabPane :label="item.name" :name="'' + index" v-for="(item, index) in foundationList" :key="item"></TabPane>
-      </Tabs> -->
+      <!-- <el-tabs v-model="routeType" @on-click="changTab">
+        <el-tab-pane :label="item.name" :name="'' + index" v-for="(item, index) in foundationList" :key="item"></el-tab-pane>
+      </el-tabs> -->
     </Modal>
   </div>
 </template>
@@ -204,7 +202,7 @@ export default {
   computed: {
     ...mapState('admin/layout', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
diff --git a/template/admin/src/pages/setting/systemOutAccount/index.vue b/template/admin/src/pages/setting/systemOutAccount/index.vue
index 8987fbf26..26b2417cf 100644
--- a/template/admin/src/pages/setting/systemOutAccount/index.vue
+++ b/template/admin/src/pages/setting/systemOutAccount/index.vue
@@ -1,87 +1,117 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <!-- <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="状态：" label-for="status1">
-              <Select v-model="status" placeholder="请选择" @on-change="userSearchs" clearable>
-                <Option value="all">全部</Option>
-                <Option value="1">开启</Option>
-                <Option value="0">关闭</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="搜索：" label-for="status2">
-              <Input
+        <!-- <el-row  :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="状态：" label-for="status1">
+              <el-select v-model="status" placeholder="请选择" @change="userSearchs" clearable>
+                <el-option value="all">全部</el-option>
+                <el-option value="1">开启</el-option>
+                <el-option value="0">关闭</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="搜索：" label-for="status2">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入账号"
                 v-model="formValidate.name"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row> -->
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button v-auth="['setting-system_admin-add']" type="primary" @click="add" icon="md-add">添加账号</Button>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row>
+          <el-col v-bind="grid">
+            <el-button v-auth="['setting-system_admin-add']" type="primary" @click="add" icon="md-add"
+              >添加账号</el-button
+            >
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="list"
         class="mt25"
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
       >
-        <template slot-scope="{ row }" slot="roles">
-          <div v-if="row.roles.length !== 0">
-            <Tag color="blue" v-for="(item, index) in row.roles.split(',')" :key="index" v-text="item"></Tag>
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="status">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">开启</span>
-            <span slot="close">关闭</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="setUp(row)">设置</a>
-          <Divider type="vertical" />
-          <a @click="edit(row)">编辑</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除账号', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="编号" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="账号" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.appid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="描述" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="添加时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="最后登录时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.last_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="最后登录ip" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.ip }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="130">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              :value="scope.row.status"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+              active-text="开启"
+              inactive-text="关闭"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="140">
+          <template slot-scope="scope">
+            <a @click="setUp(scope.row)">设置</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="edit(scope.row)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除账号', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <Modal
       v-model="modals"
       scrollable
@@ -90,125 +120,133 @@
       width="700"
       :closable="false"
     >
-      <Form
+      <el-form
         ref="modalsdate"
         :model="modalsdate"
         :rules="type == 0 ? ruleValidate : editValidate"
-        :label-width="70"
+        label-width="70px"
         label-position="right"
       >
-        <FormItem label="账号" prop="appid">
+        <el-form-item label="账号" prop="appid">
           <div style="display: flex">
-            <Input type="text" v-model="modalsdate.appid" :disabled="type != 0"></Input>
+            <el-input type="text" v-model="modalsdate.appid" :disabled="type != 0"></el-input>
           </div>
-        </FormItem>
-        <FormItem label="密码" prop="appsecret">
+        </el-form-item>
+        <el-form-item label="密码" prop="appsecret">
           <div style="display: flex">
-            <Input type="text" v-model="modalsdate.appsecret" class="input"></Input>
-            <Button type="primary" @click="reset" class="reset">重置</Button>
+            <el-input type="text" v-model="modalsdate.appsecret" class="input"></el-input>
+            <el-button type="primary" @click="reset" class="reset">重置</el-button>
           </div>
-        </FormItem>
-        <FormItem label="描述" prop="title">
+        </el-form-item>
+        <el-form-item label="描述" prop="title">
           <div style="display: flex">
-            <Input type="textarea" v-model="modalsdate.title"></Input>
+            <el-input type="textarea" v-model="modalsdate.title"></el-input>
           </div>
-        </FormItem>
-        <FormItem label="接口权限" prop="title">
-          <!-- <CheckboxGroup v-model="modalsdate.rules">
-            <Checkbox
+        </el-form-item>
+        <el-form-item label="接口权限" prop="title">
+          <!-- <el-checkbox-group v-model="modalsdate.rules">
+            <el-checkbox
               :disabled="[2, 3].includes(item.id)"
               style="width: 30%"
               v-for="item in intList"
               :key="item.id"
               :label="item.id"
-              >{{ item.name }}</Checkbox
+              >{{ item.name }}</el-checkbox
             >
-          </CheckboxGroup> -->
+          </el-checkbox-group> -->
           <Tree :data="intList" multiple show-checkbox ref="tree" @on-check-change="selectTree"></Tree>
-        </FormItem>
-      </Form>
+        </el-form-item>
+      </el-form>
       <div slot="footer">
-        <Button type="primary" @click="ok('modalsdate')">确定</Button>
-        <Button @click="cancel">取消</Button>
+        <el-button type="primary" @click="ok('modalsdate')">确定</el-button>
+        <el-button @click="cancel">取消</el-button>
       </div>
     </Modal>
     <Modal v-model="settingModals" scrollable title="设置推送" :mask-closable="false" width="900" :closable="false">
-      <Form
+      <el-form
         class="setting-style"
         ref="settingData"
         :model="settingData"
         :rules="type == 0 ? ruleValidate : editValidate"
-        :label-width="140"
+        label-width="140px"
         label-position="right"
       >
-        <FormItem label="推送开关" prop="switch">
-          <Switch v-model="settingData.push_open" :true-value="1" :false-value="0" />
-        </FormItem>
-        <FormItem label="推送账号" prop="push_account">
+        <el-form-item label="推送开关" prop="switch">
+          <el-switch v-model="settingData.push_open" :active-value="1" :inactive-value="0" />
+        </el-form-item>
+        <el-form-item label="推送账号" prop="push_account">
           <div class="form-content">
-            <Input type="text" v-model="settingData.push_account" placeholder="请输入推送账号"></Input>
+            <el-input type="text" v-model="settingData.push_account" placeholder="请输入推送账号"></el-input>
             <span class="trip">接受推送方获取token的账号</span>
           </div>
-        </FormItem>
-        <FormItem label="推送密码" prop="push_password">
+        </el-form-item>
+        <el-form-item label="推送密码" prop="push_password">
           <div class="form-content">
-            <Input type="text" v-model="settingData.push_password" placeholder="请输入推送密码"></Input>
+            <el-input type="text" v-model="settingData.push_password" placeholder="请输入推送密码"></el-input>
             <span class="trip">接受推送方获取token的密码</span>
           </div>
-        </FormItem>
-        <FormItem label="获取TOKEN接口" prop="push_token_url">
+        </el-form-item>
+        <el-form-item label="获取TOKEN接口" prop="push_token_url">
           <div class="form-content">
             <div class="input-button">
-              <Input type="text" v-model="settingData.push_token_url" placeholder="请输入获取TOKEN接口"></Input>
-              <Button class="ml10" type="primary" @click="textOutUrl(settingData.id)">测试链接</Button>
+              <el-input type="text" v-model="settingData.push_token_url" placeholder="请输入获取TOKEN接口"></el-input>
+              <el-button class="ml10" type="primary" @click="textOutUrl(settingData.id)">测试链接</el-button>
             </div>
             <span class="trip"
               >接受推送方获取token的URL地址，POST方法，传入push_account和push_password，返回token和有效时间time(秒)</span
             >
           </div>
-        </FormItem>
-        <FormItem label="用户数据修改推送接口" prop="user_update_push">
+        </el-form-item>
+        <el-form-item label="用户数据修改推送接口" prop="user_update_push">
           <div class="form-content">
-            <Input type="text" v-model="settingData.user_update_push" placeholder="请输入用户数据修改推送接口"></Input>
+            <el-input
+              type="text"
+              v-model="settingData.user_update_push"
+              placeholder="请输入用户数据修改推送接口"
+            ></el-input>
             <span class="trip">用户修改积分，余额，经验等将用户信息推送至该地址，POST方法</span>
           </div>
-        </FormItem>
-        <FormItem label="订单创建推送接口" prop="order_create_push">
+        </el-form-item>
+        <el-form-item label="订单创建推送接口" prop="order_create_push">
           <div class="form-content">
-            <Input type="text" v-model="settingData.order_create_push" placeholder="请输入订单创建推送接口"></Input>
+            <el-input
+              type="text"
+              v-model="settingData.order_create_push"
+              placeholder="请输入订单创建推送接口"
+            ></el-input>
             <span class="trip">订单创建时推送订单信息至该地址，POST方法</span>
           </div>
-        </FormItem>
-        <FormItem label="订单支付推送接口" prop="order_pay_push">
+        </el-form-item>
+        <el-form-item label="订单支付推送接口" prop="order_pay_push">
           <div class="form-content">
-            <Input type="text" v-model="settingData.order_pay_push" placeholder="请输入订单支付推送接口"></Input>
+            <el-input type="text" v-model="settingData.order_pay_push" placeholder="请输入订单支付推送接口"></el-input>
             <span class="trip">订单完成支付时推送订单已支付信息至该地址，POST方法</span>
           </div>
-        </FormItem>
-        <FormItem label="售后订单创建推送接口" prop="refund_create_push">
+        </el-form-item>
+        <el-form-item label="售后订单创建推送接口" prop="refund_create_push">
           <div class="form-content">
-            <Input
+            <el-input
               type="text"
               v-model="settingData.refund_create_push"
               placeholder="请输入售后订单创建推送接口"
-            ></Input>
+            ></el-input>
             <span class="trip">售后订单生成时推送售后单信息至该地址，POST方法</span>
           </div>
-        </FormItem>
-        <FormItem label="售后订单取消推送接口" prop="refund_cancel_push">
+        </el-form-item>
+        <el-form-item label="售后订单取消推送接口" prop="refund_cancel_push">
           <div class="form-content">
-            <Input
+            <el-input
               type="text"
               v-model="settingData.refund_cancel_push"
               placeholder="请输入售后订单取消推送接口"
-            ></Input>
+            ></el-input>
             <span class="trip">售后订单取消时推送售后单取消信息至该地址，POST方法</span>
           </div>
-        </FormItem>
-      </Form>
+        </el-form-item>
+      </el-form>
       <div slot="footer">
-        <Button type="primary" @click="submit('settingData')">确定</Button>
-        <Button @click="settingModals = false">取消</Button>
+        <el-button type="primary" @click="submit('settingData')">确定</el-button>
+        <el-button @click="settingModals = false">取消</el-button>
       </div>
     </Modal>
   </div>
@@ -263,50 +301,6 @@ export default {
           key: 'name',
         },
       ],
-      columns1: [
-        {
-          title: '编号',
-          key: 'id',
-          minWidth: 80,
-        },
-        {
-          title: '账号',
-          key: 'appid',
-          minWidth: 150,
-        },
-        {
-          title: '描述',
-          key: 'title',
-          minWidth: 250,
-        },
-        {
-          title: '添加时间',
-          key: 'add_time',
-          minWidth: 180,
-        },
-        {
-          title: '最后登录时间',
-          key: 'last_time',
-          minWidth: 180,
-        },
-        {
-          title: '最后登录ip',
-          key: 'ip',
-          minWidth: 180,
-        },
-        {
-          title: '状态',
-          slot: 'status',
-          minWidth: 90,
-        },
-        {
-          title: '操作',
-          key: 'action',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 120,
-        },
-      ],
       FromData: null,
       modalTitleSs: '',
       ids: Number,
@@ -337,7 +331,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 50;
+      return this.isMobile ? undefined : '50px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -380,10 +374,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 添加
     add() {
       this.modals = true;
diff --git a/template/admin/src/pages/setting/systemOutInterface/debugging.vue b/template/admin/src/pages/setting/systemOutInterface/debugging.vue
index 64d2bcb67..e919a1dc3 100644
--- a/template/admin/src/pages/setting/systemOutInterface/debugging.vue
+++ b/template/admin/src/pages/setting/systemOutInterface/debugging.vue
@@ -1,22 +1,22 @@
 <template>
   <div class="content" v-if="interfaceData">
     <div class="head">
-      <Input v-model="interfaceData.url">
+      <el-input v-model="interfaceData.url">
         <template #prepend>
-          <Select v-model="interfaceData.method" style="width: 120px">
-            <Option v-for="(item, index) in requestTypeList" :key="index" :value="item.value">{{ item.label }}</Option>
-          </Select>
+          <el-select v-model="interfaceData.method" style="width: 120px">
+            <el-option v-for="(item, index) in requestTypeList" :key="index" :value="item.value" :label="item.label"></el-option>
+          </el-select>
         </template>
-      </Input>
-      <Button class="ml20" type="primary" @click="requestData">请求</Button>
-      <Button class="ml10 copy-btn" type="success" @click="insertCopy()">复制</Button>
+      </el-input>
+      <el-button class="ml20" type="primary" @click="requestData">请求</el-button>
+      <el-button class="ml10 copy-btn" type="success" @click="insertCopy()">复制</el-button>
     </div>
     <div class="params">
-      <Tabs class="mt10" v-model="paramsType" @on-click="changeTab">
-        <TabPane label="Params" name="Params"> </TabPane>
-        <TabPane label="Body" name="Body"> </TabPane>
-        <TabPane label="Header" name="Header"> </TabPane>
-      </Tabs>
+      <el-tabs class="mt10" v-model="paramsType" @tag-click="changeTab">
+        <el-tab-pane label="Params" name="Params"> </el-tab-pane>
+        <el-tab-pane label="Body" name="Body"> </el-tab-pane>
+        <el-tab-pane label="Header" name="Header"> </el-tab-pane>
+      </el-tabs>
       <div v-show="paramsType === 'Params'">
         <vxe-table
           class="mt10"
@@ -71,7 +71,7 @@
             </template>
           </vxe-column>
         </vxe-table>
-        <Button class="mt10" type="primary" @click="insertEvent('xTable')">添加参数</Button>
+        <el-button class="mt10" type="primary" @click="insertEvent('xTable')">添加参数</el-button>
       </div>
       <div v-show="paramsType === 'Body'">
         <vxe-table
@@ -127,7 +127,7 @@
             </template>
           </vxe-column>
         </vxe-table>
-        <Button class="mt10" type="primary" @click="insertEvent('yTable')">添加参数</Button>
+        <el-button class="mt10" type="primary" @click="insertEvent('yTable')">添加参数</el-button>
       </div>
       <div v-show="paramsType === 'Header'">
         <vxe-table
@@ -173,7 +173,7 @@
             </template>
           </vxe-column>
         </vxe-table>
-        <Button class="mt10" type="primary" @click="insertEvent('zTable')">添加参数</Button>
+        <el-button class="mt10" type="primary" @click="insertEvent('zTable')">添加参数</el-button>
         <h4 class="mt10 title">全局Header参数</h4>
         <vxe-table
           class="mt10"
@@ -335,8 +335,8 @@ export default {
       }
       return x;
     },
-    changeTab(name) {
-      if (name === 'Header') {
+    changeTab() {
+      if (this.paramsType === 'Header') {
         if (!this.interfaceData.headerData) {
           this.insertEvent('zTable', {
             attribute: 'Content-Type',
diff --git a/template/admin/src/pages/setting/systemOutInterface/index.vue b/template/admin/src/pages/setting/systemOutInterface/index.vue
index 670caac04..8903114c8 100644
--- a/template/admin/src/pages/setting/systemOutInterface/index.vue
+++ b/template/admin/src/pages/setting/systemOutInterface/index.vue
@@ -3,16 +3,16 @@
     <div class="main">
       <!-- <Tree class="tree" :data="treeData"  @on-contextmenu="handleContextMenu">
           <template #contextMenu>
-            <DropdownItem @click.native="handleContextCreateFolder()">新建文件夹</DropdownItem>
-            <DropdownItem @click.native="handleContextCreateFile()">新建文件</DropdownItem>
-            <DropdownItem @click.native="handleContextDelFolder()" style="color: #ed4014">删除</DropdownItem>
+            <el-dropdown-item @click.native="handleContextCreateFolder()">新建文件夹</el-dropdown-item>
+            <el-dropdown-item @click.native="handleContextCreateFile()">新建文件</el-dropdown-item>
+            <el-dropdown-item @click.native="handleContextDelFolder()" style="color: #ed4014">删除</el-dropdown-item>
           </template>
         </Tree> -->
       <!-- <Tree :data="treeData" :render="renderContent" class="demo-tree-render"></Tree> -->
-      <Card :bordered="false" dis-hover class="ivu-mt mr20 card-tree">
+      <el-card :bordered="false" shadow="never" class="ivu-mt mr20 card-tree">
         <div class="tree">
           <div class="main-btn">
-            <Button class="mb10" type="primary" @click="clickMenu(4)" long>新增分类</Button>
+            <el-button class="mb10" type="primary" @click="clickMenu(4)" long>新增分类</el-button>
           </div>
 
           <vue-tree-list
@@ -34,25 +34,23 @@
                 <span class="" :class="{ open: formValidate.id == slotProps.model.id }">{{
                   slotProps.model.name
                 }}</span>
-                <Dropdown
-                  transfer
-                  @on-click="
+                <el-dropdown
+                  size="small"
+                  @command="
                     (name) => {
                       clickMenu(name, slotProps.model);
                     }
                   "
                 >
-                  <a href="javascript:void(0)">
-                    <Icon class="add" type="ios-more" />
-                  </a>
-                  <template #list>
-                    <DropdownMenu>
-                      <DropdownItem name="1" v-if="!slotProps.model.method">新增接口</DropdownItem>
-                      <DropdownItem name="2" v-if="!slotProps.model.method">编辑分类名</DropdownItem>
-                      <DropdownItem name="3">删除</DropdownItem>
-                    </DropdownMenu>
+                  <span class="el-dropdown-link"> <Icon class="add" type="ios-more" /></span>
+                  <template slot="dropdown">
+                    <el-dropdown-menu>
+                      <el-dropdown-item command="1" v-if="!slotProps.model.method">新增接口</el-dropdown-item>
+                      <el-dropdown-item command="2" v-if="!slotProps.model.method">编辑分类名</el-dropdown-item>
+                      <el-dropdown-item command="3">删除</el-dropdown-item>
+                    </el-dropdown-menu>
                   </template>
-                </Dropdown>
+                </el-dropdown>
               </div>
             </template>
             <!-- 新建文件夹 -->
@@ -82,37 +80,37 @@
             </template>
           </vue-tree-list>
         </div>
-      </Card>
-      <Card :bordered="false" dis-hover class="ivu-mt right-card">
+      </el-card>
+      <el-card :bordered="false" shadow="never" class="ivu-mt right-card">
         <div class="data">
           <div class="eidt-sub">
             <div class="name">
               {{ formValidate.name }}
             </div>
             <div>
-              <!-- <Button type="primary" class="submission mr20" @click="debugging()">调试</Button> -->
-              <Button v-if="formValidate.id" type="primary" class="submission mr20" @click="isEdit = !isEdit">{{
+              <!-- <el-button type="primary" class="submission mr20" @click="debugging()">调试</el-button> -->
+              <el-button v-if="formValidate.id" type="primary" class="submission mr20" @click="isEdit = !isEdit">{{
                 isEdit ? '返回' : '编辑'
-              }}</Button>
-              <Button v-if="isEdit" type="primary" class="submission" @click="handleSubmit('formValidate')"
-                >保存</Button
+              }}</el-button>
+              <el-button v-if="isEdit" type="primary" class="submission" @click="handleSubmit('formValidate')"
+                >保存</el-button
               >
             </div>
           </div>
-          <Form
+          <el-form
             class="formValidate mt20"
             ref="formValidate"
             :rules="ruleValidate"
             :model="formValidate"
-            :label-width="100"
+            label-width="100px"
             :label-position="labelPosition"
             @submit.native.prevent
           >
-            <Row :gutter="24" type="flex">
-              <Col span="24">
+            <el-row :gutter="24">
+              <el-col :span="24">
                 <div class="title">接口信息</div>
-                <FormItem label="接口名称：" prop="name">
-                  <Input
+                <el-form-item label="接口名称：" prop="name">
+                  <el-input
                     v-if="isEdit"
                     class="perW20"
                     type="text"
@@ -121,19 +119,22 @@
                     placeholder="请输入"
                   />
                   <span v-else>{{ formValidate.name || '' }}</span>
-                </FormItem>
-                <FormItem label="请求类型：" prop="name">
-                  <Select v-if="isEdit" v-model="formValidate.method" style="width: 120px">
-                    <Option v-for="(item, index) in requestTypeList" :key="index" :value="item.value">{{
-                      item.label
-                    }}</Option>
-                  </Select>
+                </el-form-item>
+                <el-form-item label="请求类型：" prop="name">
+                  <el-select v-if="isEdit" v-model="formValidate.method" style="width: 120px">
+                    <el-option
+                      v-for="(item, index) in requestTypeList"
+                      :key="index"
+                      :value="item.value"
+                      :label="item.label"
+                    ></el-option>
+                  </el-select>
                   <span v-else class="req-method" :style="'background-color:' + methodColor">{{
                     formValidate.method || ''
                   }}</span>
-                </FormItem>
-                <FormItem label="功能描述：" prop="name">
-                  <Input
+                </el-form-item>
+                <el-form-item label="功能描述：" prop="name">
+                  <el-input
                     v-if="isEdit"
                     class="perW20"
                     type="textarea"
@@ -142,14 +143,14 @@
                     placeholder="请输入"
                   />
                   <span v-else class="text-area">{{ formValidate.describe || '' }}</span>
-                </FormItem>
-              </Col>
-            </Row>
-            <Row :gutter="24" type="flex">
-              <Col span="24">
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="24">
                 <div class="title">调用方式</div>
-                <FormItem label="调用内容：" prop="url">
-                  <Input
+                <el-form-item label="调用内容：" prop="url">
+                  <el-input
                     v-if="isEdit"
                     class="perW20"
                     type="text"
@@ -158,8 +159,8 @@
                     placeholder="请输入"
                   />
                   <span v-else>{{ formValidate.url || '' }}</span>
-                </FormItem>
-                <FormItem label="请求参数：">
+                </el-form-item>
+                <el-form-item label="请求参数：">
                   <vxe-table
                     resizable
                     show-overflow
@@ -228,9 +229,11 @@
                     </vxe-column>
                   </vxe-table>
 
-                  <Button class="mt10" v-if="isEdit" type="primary" @click="insertEvent('xTable')">添加参数</Button>
-                </FormItem>
-                <FormItem label="返回参数：">
+                  <el-button class="mt10" v-if="isEdit" type="primary" @click="insertEvent('xTable')"
+                    >添加参数</el-button
+                  >
+                </el-form-item>
+                <el-form-item label="返回参数：">
                   <vxe-table
                     resizable
                     show-overflow
@@ -288,15 +291,17 @@
                       </template>
                     </vxe-column>
                   </vxe-table>
-                  <Button class="mt10" v-if="isEdit" type="primary" @click="insertEvent('resTable')">添加参数</Button>
-                </FormItem>
-              </Col>
-            </Row>
-            <Row :gutter="24" type="flex">
-              <Col span="24">
+                  <el-button class="mt10" v-if="isEdit" type="primary" @click="insertEvent('resTable')"
+                    >添加参数</el-button
+                  >
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="24">
+              <el-col :span="24">
                 <div class="title">调用示例</div>
-                <FormItem label="请求数据示例：" prop="request_example">
-                  <Input
+                <el-form-item label="请求数据示例：" prop="request_example">
+                  <el-input
                     v-if="isEdit"
                     class="perW20"
                     type="textarea"
@@ -305,9 +310,9 @@
                     placeholder="请输入"
                   />
                   <span v-else class="text-area">{{ formValidate.request_example || '' }}</span>
-                </FormItem>
-                <FormItem label="返回数据示例：" prop="return_example">
-                  <Input
+                </el-form-item>
+                <el-form-item label="返回数据示例：" prop="return_example">
+                  <el-input
                     v-if="isEdit"
                     class="perW20"
                     type="textarea"
@@ -316,8 +321,8 @@
                     placeholder="请输入"
                   />
                   <span v-else class="text-area">{{ formValidate.return_example || '' }}</span>
-                </FormItem>
-                <FormItem label="错误码：">
+                </el-form-item>
+                <el-form-item label="错误码：">
                   <vxe-table
                     resizable
                     show-overflow
@@ -355,18 +360,20 @@
                       </template>
                     </vxe-column>
                   </vxe-table>
-                  <Button class="mt10" v-if="isEdit" type="primary" @click="insertEvent('codeTable')">添加参数</Button>
-                </FormItem>
-              </Col>
-            </Row>
-            <!-- <Row :gutter="24" type="flex">
-              <Col span="24">
-                <FormItem>
-                  <Button type="primary" class="submission" @click="handleSubmit('formValidate')">保存</Button>
-                </FormItem>
-              </Col>
-            </Row> -->
-          </Form>
+                  <el-button class="mt10" v-if="isEdit" type="primary" @click="insertEvent('codeTable')"
+                    >添加参数</el-button
+                  >
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!-- <el-row :gutter="24" >
+              <el-col :span="24">
+                <el-form-item>
+                  <el-button type="primary" class="submission" @click="handleSubmit('formValidate')">保存</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row> -->
+          </el-form>
         </div>
         <!-- <div v-else class="nothing">
           <div class="box" @click="clickMenu(4)">
@@ -382,11 +389,11 @@
             <div class="text">新建接口</div>
           </div>
         </div> -->
-      </Card>
+      </el-card>
     </div>
     <Modal v-model="nameModal" title="分组名称" :loading="loading" @on-ok="asyncOK">
       <label>分组名称：</label>
-      <Input v-model="value" placeholder="请输入分组名称" style="width: 85%" />
+      <el-input v-model="value" placeholder="请输入分组名称" style="width: 85%" />
     </Modal>
     <Modal v-model="debuggingModal" :title="formValidate.name" width="70%" footer-hide :loading="loading">
       <debugging
@@ -506,7 +513,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 50;
+      return this.isMobile ? undefined : '50px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
diff --git a/template/admin/src/pages/setting/systemRole/index.vue b/template/admin/src/pages/setting/systemRole/index.vue
index f867944ad..0f539a1a7 100644
--- a/template/admin/src/pages/setting/systemRole/index.vue
+++ b/template/admin/src/pages/setting/systemRole/index.vue
@@ -1,82 +1,101 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="状态：" label-for="status">
-              <Select v-model="formValidate.status" placeholder="请选择" @on-change="userSearchs" clearable>
-                <Option value="1">显示</Option>
-                <Option value="0">不显示</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="身份昵称：" label-for="role_name">
-              <Input
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="状态：" label-for="status">
+              <el-select v-model="formValidate.status" placeholder="请选择" @change="userSearchs" clearable>
+                <el-option value="1" label="显示"></el-option>
+                <el-option value="0" label="不显示"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="身份昵称：" label-for="role_name">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入身份昵称"
                 v-model="formValidate.role_name"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button v-auth="['setting-system_role-add']" type="primary" icon="md-add" @click="add('添加')"
-              >添加身份</Button
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-button v-auth="['setting-system_role-add']" type="primary" icon="md-add" @click="add('添加')"
+              >添加身份</el-button
             >
-          </Col>
-        </Row>
-      </Form>
-      <Table
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :columns="columns1"
         :data="tableList"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="is_shows">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">显示</span>
-            <span slot="close">隐藏</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row, '编辑')">编辑</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="身份昵称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.role_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="权限" min-width="1000">
+          <template slot-scope="scope">
+            <span class="line1">{{ scope.row.rules }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="120">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              :value="scope.row.status"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+              active-text="显示"
+              inactive-text="隐藏"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="120">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row, '编辑')">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!-- 新增编辑-->
     <Modal
       v-model="modals"
@@ -88,24 +107,24 @@
       :mask-closable="false"
       width="600"
     >
-      <Form
+      <el-form
         ref="formInline"
         :model="formInline"
         :rules="ruleValidate"
-        :label-width="100"
+        label-width="100px"
         :label-position="labelPosition2"
         @submit.native.prevent
       >
-        <FormItem label="身份名称：" label-for="role_name" prop="role_name">
-          <Input placeholder="请输入身份昵称" v-model="formInline.role_name" />
-        </FormItem>
-        <FormItem label="是否开启：" prop="status">
-          <RadioGroup v-model="formInline.status">
-            <Radio :label="1">开启</Radio>
-            <Radio :label="0">关闭</Radio>
-          </RadioGroup>
-        </FormItem>
-        <FormItem label="权限：">
+        <el-form-item label="身份名称：" label-for="role_name" prop="role_name">
+          <el-input placeholder="请输入身份昵称" v-model="formInline.role_name" />
+        </el-form-item>
+        <el-form-item label="是否开启：" prop="status">
+          <el-radio-group v-model="formInline.status">
+            <el-radio :label="1">开启</el-radio>
+            <el-radio :label="0">关闭</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="权限：">
           <div class="trees-coadd">
             <div class="scollhide">
               <div class="iconlist">
@@ -113,10 +132,10 @@
               </div>
             </div>
           </div>
-        </FormItem>
+        </el-form-item>
         <Spin size="large" fix v-if="spinShow"></Spin>
-        <Button type="primary" size="large" long @click="handleSubmit('formInline')">提交</Button>
-      </Form>
+        <el-button type="primary" size="large" long @click="handleSubmit('formInline')">提交</el-button>
+      </el-form>
     </Modal>
   </div>
 </template>
@@ -144,35 +163,6 @@ export default {
         page: 1,
         limit: 20,
       },
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '身份昵称',
-          key: 'role_name',
-          minWidth: 120,
-        },
-        {
-          title: '权限',
-          key: 'rules',
-          tooltip: true,
-          width: 1000,
-        },
-        {
-          title: '状态',
-          slot: 'is_shows',
-          minWidth: 120,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 120,
-        },
-      ],
       tableList: [],
       formInline: {
         role_name: '',
@@ -194,7 +184,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -262,10 +252,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.formValidate.page = 1;
diff --git a/template/admin/src/pages/setting/systemStore/index.vue b/template/admin/src/pages/setting/systemStore/index.vue
index 4004a7f8b..1204e1508 100644
--- a/template/admin/src/pages/setting/systemStore/index.vue
+++ b/template/admin/src/pages/setting/systemStore/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="article-manager">
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formItem"
         :model="formItem"
         :label-width="labelWidth"
@@ -9,53 +9,53 @@
         :rules="ruleValidate"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col span="24">
-            <Col v-bind="grid">
-              <FormItem label="门店名称：" prop="name" label-for="name">
-                <Input v-model="formItem.name" placeholder="请输入门店名称" />
-              </FormItem>
-            </Col>
-          </Col>
-          <Col span="24">
-            <Col v-bind="grid">
-              <FormItem label="门店简介：" label-for="introduction">
-                <Input v-model="formItem.introduction" placeholder="请输入门店简介" />
-              </FormItem>
-            </Col>
-          </Col>
-          <Col span="24">
-            <Col v-bind="grid">
-              <FormItem label="门店手机号：" label-for="phone" prop="phone">
-                <Input v-model="formItem.phone" type="number" placeholder="请输入门店手机号" />
-              </FormItem>
-            </Col>
-          </Col>
-          <Col span="24">
-            <Col v-bind="grid">
-              <FormItem label="门店地址：" label-for="address" prop="address">
+        <el-row  :gutter="24">
+          <el-col :span="24">
+            <el-col v-bind="grid">
+              <el-form-item label="门店名称：" prop="name" label-for="name">
+                <el-input v-model="formItem.name" placeholder="请输入门店名称" />
+              </el-form-item>
+            </el-col>
+          </el-col>
+          <el-col :span="24">
+            <el-col v-bind="grid">
+              <el-form-item label="门店简介：" label-for="introduction">
+                <el-input v-model="formItem.introduction" placeholder="请输入门店简介" />
+              </el-form-item>
+            </el-col>
+          </el-col>
+          <el-col :span="24">
+            <el-col v-bind="grid">
+              <el-form-item label="门店手机号：" label-for="phone" prop="phone">
+                <el-input v-model="formItem.phone" type="number" placeholder="请输入门店手机号" />
+              </el-form-item>
+            </el-col>
+          </el-col>
+          <el-col :span="24">
+            <el-col v-bind="grid">
+              <el-form-item label="门店地址：" label-for="address" prop="address">
                 <Cascader
                   :data="addresData"
                   :value="formItem.address"
                   v-model="formItem.address"
-                  @on-change="handleChange"
+                  @change="handleChange"
                 ></Cascader>
-              </FormItem>
-            </Col>
-          </Col>
-          <Col span="24">
-            <Col v-bind="grid">
-              <FormItem label="详细地址：" label-for="detailed_address" prop="detailed_address">
-                <Input v-model="formItem.detailed_address" placeholder="请输入详细地址" />
-              </FormItem>
-            </Col>
-          </Col>
-          <Col span="24">
-            <Col v-bind="grid">
-              <FormItem label="核销时效：" label-for="valid_time">
+              </el-form-item>
+            </el-col>
+          </el-col>
+          <el-col :span="24">
+            <el-col v-bind="grid">
+              <el-form-item label="详细地址：" label-for="detailed_address" prop="detailed_address">
+                <el-input v-model="formItem.detailed_address" placeholder="请输入详细地址" />
+              </el-form-item>
+            </el-col>
+          </el-col>
+          <el-col :span="24">
+            <el-col v-bind="grid">
+              <el-form-item label="核销时效：" label-for="valid_time">
                 <DatePicker
                   :editable="false"
-                  @on-change="onchangeDate"
+                  @change="onchangeDate"
                   :value="formItem.valid_time"
                   v-model="formItem.valid_time"
                   format="yyyy/MM/dd"
@@ -63,41 +63,41 @@
                   split-panels
                   placeholder="请选择核销时效"
                 ></DatePicker>
-              </FormItem>
-            </Col>
-          </Col>
-          <Col span="24">
-            <Col v-bind="grid">
-              <FormItem label="门店营业：" label-for="day_time">
+              </el-form-item>
+            </el-col>
+          </el-col>
+          <el-col :span="24">
+            <el-col v-bind="grid">
+              <el-form-item label="门店营业：" label-for="day_time">
                 <TimePicker
                   type="timerange"
-                  @on-change="onchangeTime"
+                  @change="onchangeTime"
                   v-model="formItem.day_time"
                   format="HH:mm:ss"
                   :value="formItem.day_time"
                   placement="bottom-end"
                   placeholder="请选择营业时间"
                 ></TimePicker>
-              </FormItem>
-            </Col>
-          </Col>
-          <Col span="24">
-            <Col v-bind="grid">
-              <FormItem label="门店logo：" prop="image">
+              </el-form-item>
+            </el-col>
+          </el-col>
+          <el-col :span="24">
+            <el-col v-bind="grid">
+              <el-form-item label="门店logo：" prop="image">
                 <div class="picBox" @click="modalPicTap('单选')">
                   <div class="pictrue" v-if="formItem.image"><img v-lazy="formItem.image" /></div>
                   <div class="upLoad acea-row row-center-wrapper" v-else>
                     <Icon type="ios-camera-outline" size="26" class="iconfont" />
                   </div>
                 </div>
-              </FormItem>
-            </Col>
-          </Col>
-          <Col span="24">
-            <Col v-bind="grid">
-              <FormItem label="经纬度：" label-for="status2" prop="latlng">
+              </el-form-item>
+            </el-col>
+          </el-col>
+          <el-col :span="24">
+            <el-col v-bind="grid">
+              <el-form-item label="经纬度：" label-for="status2" prop="latlng">
                 <Tooltip>
-                  <Input
+                  <el-input
                     search
                     enter-button="查找位置"
                     v-model="formItem.latlng"
@@ -107,18 +107,18 @@
                   />
                   <div slot="content">请点击查找位置选择位置</div>
                 </Tooltip>
-              </FormItem>
-            </Col>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button type="primary" class="ml20" @click="handleSubmit('formItem')">提交</Button>
-          </Col>
-        </Row>
+              </el-form-item>
+            </el-col>
+          </el-col>
+        </el-row>
+        <el-row >
+          <el-col v-bind="grid">
+            <el-button type="primary" class="ml20" @click="handleSubmit('formItem')">提交</el-button>
+          </el-col>
+        </el-row>
         <Spin size="large" fix v-if="spinShow"></Spin>
-      </Form>
-    </Card>
+      </el-form>
+    </el-card>
 
     <Modal
       v-model="modalPic"
@@ -256,7 +256,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 100;
+      return this.isMobile ? undefined : '100px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
diff --git a/template/admin/src/pages/setting/themeStyle/index.vue b/template/admin/src/pages/setting/themeStyle/index.vue
index 888e8a9f5..56ed9d734 100644
--- a/template/admin/src/pages/setting/themeStyle/index.vue
+++ b/template/admin/src/pages/setting/themeStyle/index.vue
@@ -4,32 +4,32 @@
       <span class="ivu-page-header-title mr20">{{ $route.meta.title }}</span>
       <div>
         <div style="float: right">
-          <Button class="bnt" type="primary" @click="submit">保存</Button>
+          <el-button class="bnt" type="primary" @click="submit">保存</el-button>
         </div>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt" :style="'min-height:' + clientHeight + 'px'">
-      <Form :label-width="labelWidth">
-        <FormItem label="选择配色方案：">
-          <RadioGroup v-model="current" @on-change="changeColor">
-            <Radio :label="1" border class="box">天空蓝<i class="iconfont iconxuanzhong6"></i></Radio>
-            <Radio :label="2" border class="box green">生鲜绿<i class="iconfont iconxuanzhong6"></i></Radio>
-            <Radio :label="3" border class="box red">热情红<i class="iconfont iconxuanzhong6"></i></Radio>
-            <Radio :label="4" border class="box pink">魅力粉<i class="iconfont iconxuanzhong6"></i></Radio>
-            <Radio :label="5" border class="box orange">活力橙<i class="iconfont iconxuanzhong6"></i></Radio>
-          </RadioGroup>
-        </FormItem>
-        <FormItem label="当前风格示例：">
+    <el-card :bordered="false" shadow="never" class="ivu-mt" :style="'min-height:' + clientHeight + 'px'">
+      <el-form :label-width="labelWidth">
+        <el-form-item label="选择配色方案：">
+          <el-radio-group v-model="current" @change="changeColor">
+            <el-radio :label="1" border class="box">天空蓝<i class="iconfont iconxuanzhong6"></i></el-radio>
+            <el-radio :label="2" border class="box green">生鲜绿<i class="iconfont iconxuanzhong6"></i></el-radio>
+            <el-radio :label="3" border class="box red">热情红<i class="iconfont iconxuanzhong6"></i></el-radio>
+            <el-radio :label="4" border class="box pink">魅力粉<i class="iconfont iconxuanzhong6"></i></el-radio>
+            <el-radio :label="5" border class="box orange">活力橙<i class="iconfont iconxuanzhong6"></i></el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="当前风格示例：">
           <div class="acea-row row-top">
             <div class="pictrue" v-for="(item, index) in picList" :key="index">
               <img :src="item.image" />
             </div>
           </div>
-        </FormItem>
-      </Form>
-    </Card>
+        </el-form-item>
+      </el-form>
+    </el-card>
     <!--<div class="footer acea-row row-center-wrapper">-->
-    <!--<Button type="primary" @click="submit">保存</Button>-->
+    <!--<el-button type="primary" @click="submit">保存</el-button>-->
     <!--</div>-->
   </div>
 </template>
@@ -62,7 +62,7 @@ export default {
   computed: {
     ...mapState('admin/layout', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 100;
+      return this.isMobile ? undefined : '110px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -130,9 +130,7 @@ export default {
 
 <style scoped lang="stylus">
 .box {
-  height: 40px;
   width: 100px;
-  line-height: 40px;
   text-align: center;
 }
 
diff --git a/template/admin/src/pages/setting/user/index.vue b/template/admin/src/pages/setting/user/index.vue
index 1c4b4f8a9..a523967bb 100644
--- a/template/admin/src/pages/setting/user/index.vue
+++ b/template/admin/src/pages/setting/user/index.vue
@@ -1,33 +1,33 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="160" label-position="right">
-        <FormItem label="头像">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form ref="formValidate" :model="formValidate" :rules="ruleValidate" label-width="160px" label-position="right">
+        <el-form-item label="头像">
           <div class="avatar" @click="avatarMoadl = true">
             <img v-if="formValidate.head_pic" :src="formValidate.head_pic" alt="" />
             <img v-else src="../../../assets/images/f.png" alt="" />
           </div>
-        </FormItem>
-        <FormItem label="账号" prop="">
-          <Input type="text" v-model="account" :disabled="true" class="input"></Input>
-        </FormItem>
-        <FormItem label="姓名" prop="real_name">
-          <Input type="text" v-model="formValidate.real_name" class="input"></Input>
-        </FormItem>
-        <FormItem label="原始密码" prop="pwd">
-          <Input type="password" v-model="formValidate.pwd" class="input"></Input>
-        </FormItem>
-        <FormItem label="新密码" prop="new_pwd">
-          <Input type="password" v-model="formValidate.new_pwd" class="input"></Input>
-        </FormItem>
-        <FormItem label="确认新密码" prop="conf_pwd">
-          <Input type="password" v-model="formValidate.conf_pwd" class="input"></Input>
-        </FormItem>
-        <FormItem>
-          <Button type="primary" @click="handleSubmit('formValidate')">提交</Button>
-        </FormItem>
-      </Form>
-    </Card>
+        </el-form-item>
+        <el-form-item label="账号" prop="">
+          <el-input type="text" v-model="account" :disabled="true" class="input"></el-input>
+        </el-form-item>
+        <el-form-item label="姓名" prop="real_name">
+          <el-input type="text" v-model="formValidate.real_name" class="input"></el-input>
+        </el-form-item>
+        <el-form-item label="原始密码" prop="pwd">
+          <el-input type="password" v-model="formValidate.pwd" class="input"></el-input>
+        </el-form-item>
+        <el-form-item label="新密码" prop="new_pwd">
+          <el-input type="password" v-model="formValidate.new_pwd" class="input"></el-input>
+        </el-form-item>
+        <el-form-item label="确认新密码" prop="conf_pwd">
+          <el-input type="password" v-model="formValidate.conf_pwd" class="input"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleSubmit('formValidate')">提交</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
     <Modal v-model="avatarMoadl" footer-hide title="头像上传" width="700">
       <CropperImg v-if="avatarMoadl" @uploadImgSuccess="uploadImgSuccess"></CropperImg>
     </Modal>
@@ -45,7 +45,7 @@ export default {
     ...mapState('media', ['isMobile']),
     ...mapState('userLevel', ['categoryId']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
diff --git a/template/admin/src/pages/setting/userFile/index.vue b/template/admin/src/pages/setting/userFile/index.vue
index 6105b8ea2..b30238d26 100644
--- a/template/admin/src/pages/setting/userFile/index.vue
+++ b/template/admin/src/pages/setting/userFile/index.vue
@@ -1,21 +1,21 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="160" label-position="right">
-        <FormItem label="账号" prop="">
-          <Input type="text" v-model="account" :disabled="true" class="input"></Input>
-        </FormItem>
-        <FormItem label="文件管理新密码" prop="file_pwd">
-          <Input type="password" v-model="formValidate.file_pwd" class="input"></Input>
-        </FormItem>
-        <FormItem label="文件管理确认新密码" prop="conf_file_pwd">
-          <Input type="password" v-model="formValidate.conf_file_pwd" class="input"></Input>
-        </FormItem>
-        <FormItem>
-          <Button type="primary" @click="handleSubmit('formValidate')">提交</Button>
-        </FormItem>
-      </Form>
-    </Card>
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form ref="formValidate" :model="formValidate" :rules="ruleValidate" label-width="160px" label-position="right">
+        <el-form-item label="账号" prop="">
+          <el-input type="text" v-model="account" :disabled="true" class="input"></el-input>
+        </el-form-item>
+        <el-form-item label="文件管理新密码" prop="file_pwd">
+          <el-input type="password" v-model="formValidate.file_pwd" class="input"></el-input>
+        </el-form-item>
+        <el-form-item label="文件管理确认新密码" prop="conf_file_pwd">
+          <el-input type="password" v-model="formValidate.conf_file_pwd" class="input"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleSubmit('formValidate')">提交</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
   </div>
 </template>
 
@@ -28,7 +28,7 @@ export default {
     ...mapState('media', ['isMobile']),
     ...mapState('userLevel', ['categoryId']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
diff --git a/template/admin/src/pages/setting/verifyOrder/index.vue b/template/admin/src/pages/setting/verifyOrder/index.vue
index 21f511a7b..3279bad12 100644
--- a/template/admin/src/pages/setting/verifyOrder/index.vue
+++ b/template/admin/src/pages/setting/verifyOrder/index.vue
@@ -1,21 +1,23 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form ref="formValidate" :model="formValidate" :label-width="80" @submit.native.prevent>
-        <Row :gutter="24" type="flex">
-          <Col span="24" class="ivu-text-left">
-            <FormItem label="核销日期：">
-              <RadioGroup
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form ref="formValidate" :model="formValidate" label-width="85px" @submit.native.prevent>
+        <el-row :gutter="24">
+          <el-col :span="24" class="ivu-text-left">
+            <el-form-item label="核销日期：">
+              <el-radio-group
                 v-model="formValidate.data"
                 type="button"
                 class="mr"
-                @on-change="selectChange(formValidate.data)"
+                @change="selectChange(formValidate.data)"
               >
-                <Radio :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{ item.text }}</Radio>
-              </RadioGroup>
+                <el-radio-button :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{
+                  item.text
+                }}</el-radio-button>
+              </el-radio-group>
               <DatePicker
                 :editable="false"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="daterange"
@@ -23,90 +25,134 @@
                 placeholder="请选择时间"
                 style="width: 200px"
               ></DatePicker>
-            </FormItem>
-          </Col>
-          <Col span="12" class="ivu-text-left">
-            <FormItem label="筛选条件：">
-              <Input enter-button placeholder="请输入搜索内容" v-model="formValidate.real_name" style="width: 430px">
-                <Select v-model="field_key" slot="prepend" style="width: 80px">
-                  <Option value="all">全部</Option>
-                  <Option value="order_id">订单号</Option>
-                  <Option value="uid">UID</Option>
-                  <Option value="real_name">用户姓名</Option>
-                  <Option value="user_phone">用户电话</Option>
-                  <Option value="title">商品名称(模糊)</Option>
-                </Select>
-              </Input>
-            </FormItem>
-          </Col>
-          <Col span="12" class="mr">
-            <FormItem label="选择门店：" label-for="store_name">
-              <Select
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="ivu-text-left">
+            <el-form-item label="筛选条件：">
+              <el-input enter-button placeholder="请输入搜索内容" v-model="formValidate.real_name" style="width: 430px">
+                <el-select v-model="field_key" slot="prepend" style="width: 80px">
+                  <el-option value="all" label="全部"></el-option>
+                  <el-option value="order_id" label="订单号"></el-option>
+                  <el-option value="uid" label="UID"></el-option>
+                  <el-option value="real_name" label="用户姓名"></el-option>
+                  <el-option value="user_phone" label="用户电话"></el-option>
+                  <el-option value="title" label="商品名称(模糊)"></el-option>
+                </el-select>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="mr">
+            <el-form-item label="选择门店：" label-for="store_name">
+              <el-select
                 v-model="formValidate.store_id"
                 element-id="store_id"
                 clearable
-                @on-change="userSearchs"
+                @change="userSearchs"
                 style="width: 430px"
               >
-                <Option v-for="item in storeSelectList" :value="item.id" :key="item.id">{{ item.name }}</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col span="12" class="mr">
-            <FormItem label="" label-for="store_name">
-              <Button type="primary" class="mr15" @click="userSearchs">搜索</Button>
-              <Button class="mr15" @click="refresh">刷新</Button>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns"
+                <el-option
+                  v-for="item in storeSelectList"
+                  :value="item.id"
+                  :key="item.id"
+                  :label="item.name"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="mr">
+            <el-form-item label="" label-for="store_name">
+              <el-button type="primary" class="mr15" @click="userSearchs">搜索</el-button>
+              <el-button class="mr15" @click="refresh">刷新</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="orderList"
         ref="table"
         :loading="loading"
-        highlight-row
-        no-data-text="暂无数据"
-        no-filtered-data-text="暂无筛选结果"
+        highlight-current-row
+        empty-text="暂无数据"
         class="orderData mt25"
       >
-        <template slot-scope="{ row, index }" slot="name"> {{ row.nickname }}/{{ row.uid }} </template>
-        <template slot-scope="{ row, index }" slot="spread_nickname">
-          <a href="javascript:void(0);" @click="referenceInfo(row.spread_uid)">{{ row.spread_nickname }}</a>
-        </template>
-        <template slot-scope="{ row, index }" slot="info">
-          <div class="tabBox" v-for="(val, i) in row._info" :key="i">
-            <div class="tabBox_img">
-              <img
-                v-lazy="
-                  val.cart_info.productInfo.attrInfo
-                    ? val.cart_info.productInfo.attrInfo.image
-                    : val.cart_info.productInfo.image
-                "
-              />
+        <el-table-column label="订单号" min-width="180">
+          <template slot-scope="scope">
+            <span>{{ scope.row.order_id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户信息" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.nickname }}/{{ scope.row.uid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="推荐人信息" min-width="120">
+          <template slot-scope="scope">
+            <a href="javascript:void(0);" @click="referenceInfo(scope.row.spread_uid)">{{
+              scope.row.spread_nickname
+            }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品信息" min-width="300">
+          <template slot-scope="scope">
+            <div class="tabBox" v-for="(val, i) in scope.row._info" :key="i">
+              <div class="tabBox_img">
+                <img
+                  v-lazy="
+                    val.cart_info.productInfo.attrInfo
+                      ? val.cart_info.productInfo.attrInfo.image
+                      : val.cart_info.productInfo.image
+                  "
+                />
+              </div>
+              <span class="tabBox_tit"
+                >{{ val.cart_info.productInfo.store_name + ' | '
+                }}{{ val.cart_info.productInfo.attrInfo ? val.cart_info.productInfo.attrInfo.suk : '' }}</span
+              >
+              <span class="tabBox_pice">{{ '￥' + val.cart_info.truePrice + ' x ' + val.cart_info.cart_num }}</span>
             </div>
-            <span class="tabBox_tit"
-              >{{ val.cart_info.productInfo.store_name + ' | '
-              }}{{ val.cart_info.productInfo.attrInfo ? val.cart_info.productInfo.attrInfo.suk : '' }}</span
-            >
-            <span class="tabBox_pice">{{ '￥' + val.cart_info.truePrice + ' x ' + val.cart_info.cart_num }}</span>
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="status_name">
-          {{ row.status_name.status_name }}
-        </template>
-      </Table>
+          </template>
+        </el-table-column>
+        <el-table-column label="实际支付" min-width="90">
+          <template slot-scope="scope">
+            <span>{{ scope.row.pay_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="核销员" min-width="90">
+          <template slot-scope="scope">
+            <span>{{ scope.row.clerk_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="核销门店" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.store_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="支付状态" min-width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.pay_type_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单状态" min-width="80">
+          <template slot-scope="scope">
+            <span> {{ scope.row.status_name.status_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="下单时间" min-width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <referrer-info ref="info"></referrer-info>
   </div>
 </template>
@@ -144,60 +190,7 @@ export default {
       },
       timeVal: [],
       storeSelectList: [],
-      columns: [
-        {
-          title: '订单号',
-          key: 'order_id',
-          minWidth: 180,
-          sortable: true,
-        },
-        {
-          title: '用户信息',
-          slot: 'name',
-          minWidth: 120,
-        },
-        {
-          title: '推荐人信息',
-          slot: 'spread_nickname',
-          minWidth: 120,
-        },
-        {
-          title: '商品信息',
-          slot: 'info',
-          minWidth: 300,
-        },
-        {
-          title: '实际支付',
-          key: 'pay_price',
-          minWidth: 90,
-        },
-        {
-          title: '核销员',
-          key: 'clerk_name',
-          minWidth: 90,
-        },
-        {
-          title: '核销门店',
-          key: 'store_name',
-          minWidth: 120,
-        },
-        {
-          title: '支付状态',
-          key: 'pay_type_name',
-          minWidth: 80,
-        },
-        {
-          title: '订单状态',
-          slot: 'status_name',
-          minWidth: 80,
-        },
-        {
-          title: '下单时间',
-          key: 'add_time',
-          minWidth: 130,
-          sortable: true,
-        },
-      ],
+
       orderList: [],
       loading: false,
       total: 0,
@@ -249,10 +242,6 @@ export default {
           that.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     referenceInfo(uid) {
       this.$refs.info.isTemplate = true;
       this.$refs.info.verifySpreadInfo(uid);
diff --git a/template/admin/src/pages/statistic/balance/index.vue b/template/admin/src/pages/statistic/balance/index.vue
index 88e76cd52..fc6962491 100644
--- a/template/admin/src/pages/statistic/balance/index.vue
+++ b/template/admin/src/pages/statistic/balance/index.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mb-16">
+    <el-card :bordered="false" shadow="never" class="ivu-mb-16">
       <dateRadio @selectDate="onSelectDate"></dateRadio>
       <DatePicker
         :editable="false"
         :clearable="false"
-        @on-change="onchangeTime"
+        @change="onchangeTime"
         :value="timeVal"
         format="yyyy/MM/dd"
         type="daterange"
@@ -15,72 +15,96 @@
         :options="options"
         class="mr20"
       ></DatePicker>
-    </Card>
+    </el-card>
     <cards-data :cardLists="cardLists" v-if="cardLists.length >= 0"></cards-data>
-    <Card class="ivu-mb-16" :bordered="false" dis-hover>
+    <el-card class="ivu-mb-16" :bordered="false" shadow="never">
       <h3>余额使用趋势</h3>
       <echarts-new :option-data="optionData" :styles="style" height="100%" width="100%" v-if="optionData"></echarts-new>
-    </Card>
+    </el-card>
     <Spin size="large" fix v-if="spinShow"></Spin>
     <div class="code-row-bg">
-      <Card :bordered="false" dis-hover class="ivu-mt">
+      <el-card :bordered="false" shadow="never" class="ivu-mt">
         <div class="acea-row row-between-wrapper">
           <h3 class="header-title">余额来源分析</h3>
           <div class="change-style" @click="echartLeft = !echartLeft">切换样式</div>
         </div>
         <div class="ech-box">
           <echarts-from v-if="echartLeft" ref="visitChart" :infoList="infoList" echartsTitle="circle"></echarts-from>
-          <Table
+          <el-table
             v-show="!echartLeft"
             ref="selection"
-            :columns="columns"
             :data="tabList"
             :loading="loading"
-            no-data-text="暂无数据"
-            highlight-row
-            no-filtered-data-text="暂无筛选结果"
+            empty-text="暂无数据"
+            highlight-current-row
+            
           >
-            <template slot-scope="{ row }" slot="percent">
-              <div class="percent-box">
-                <div class="line">
-                  <div class="bg"></div>
-                  <div class="percent" :style="'width:' + row.percent + '%;'"></div>
+            <el-table-column type="index" label="序号" width="50"> </el-table-column>
+            <el-table-column label="来源" min-width="80">
+              <template slot-scope="scope">
+                <span>{{ scope.row.name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="金额" min-width="130">
+              <template slot-scope="scope">
+                <span>{{ scope.row.value }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="占比率" min-width="130">
+              <template slot-scope="scope">
+                <div class="percent-box">
+                  <div class="line">
+                    <div class="bg"></div>
+                    <div class="percent" :style="'width:' + scope.row.percent + '%;'"></div>
+                  </div>
+                  <div class="num">{{ scope.row.percent }}%</div>
                 </div>
-                <div class="num">{{ row.percent }}%</div>
-              </div>
-            </template>
-          </Table>
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
-      </Card>
-      <Card :bordered="false" dis-hover class="ivu-mt ml10">
+      </el-card>
+      <el-card :bordered="false" shadow="never" class="ivu-mt ml10">
         <div class="acea-row row-between-wrapper">
           <h3 class="header-title">余额消耗</h3>
           <div class="change-style" @click="echartRight = !echartRight">切换样式</div>
         </div>
         <div class="ech-box">
           <echarts-from v-if="echartRight" ref="visitChart" :infoList="infoList2" echartsTitle="circle"></echarts-from>
-          <Table
+          <el-table
             v-show="!echartRight"
             ref="selection"
-            :columns="columns"
             :data="tabList2"
-            :loading="loading2"
-            no-data-text="暂无数据"
-            highlight-row
-            no-filtered-data-text="暂无筛选结果"
+            v-loading="loading2"
+            empty-text="暂无数据"
+            highlight-current-row
+            
           >
-            <template slot-scope="{ row }" slot="percent">
-              <div class="percent-box">
-                <div class="line">
-                  <div class="bg"></div>
-                  <div class="percent" :style="'width:' + row.percent + '%;'"></div>
+            <el-table-column type="index" label="序号" width="50"> </el-table-column>
+            <el-table-column label="来源" min-width="80">
+              <template slot-scope="scope">
+                <span>{{ scope.row.name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="金额" min-width="130">
+              <template slot-scope="scope">
+                <span>{{ scope.row.value }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="占比率" min-width="130">
+              <template slot-scope="scope">
+                <div class="percent-box">
+                  <div class="line">
+                    <div class="bg"></div>
+                    <div class="percent" :style="'width:' + scope.row.percent + '%;'"></div>
+                  </div>
+                  <div class="num">{{ scope.row.percent }}%</div>
                 </div>
-                <div class="num">{{ row.percent }}%</div>
-              </div>
-            </template>
-          </Table>
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
-      </Card>
+      </el-card>
     </div>
   </div>
 </template>
@@ -144,32 +168,6 @@ export default {
       optionData: {},
       spinShow: false,
       options: this.$timeOptions,
-      columns: [
-        {
-          title: '序号',
-          type: 'index',
-          width: 60,
-          align: 'center',
-        },
-        {
-          title: '来源',
-          key: 'name',
-          minWidth: 80,
-          align: 'center',
-        },
-        {
-          title: '金额',
-          width: 180,
-          key: 'value',
-          align: 'center',
-        },
-        {
-          title: '占比率',
-          slot: 'percent',
-          minWidth: 100,
-          align: 'center',
-        },
-      ],
       tabList: [],
       tabList2: [],
     };
diff --git a/template/admin/src/pages/statistic/integral/index.vue b/template/admin/src/pages/statistic/integral/index.vue
index ca20a9a73..7c1072c6c 100644
--- a/template/admin/src/pages/statistic/integral/index.vue
+++ b/template/admin/src/pages/statistic/integral/index.vue
@@ -1,21 +1,21 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form ref="formValidate" :model="formValidate" class="tabform" @submit.native.prevent>
-        <Row :gutter="24" type="flex">
-          <Col span="24">
-            <FormItem label="订单时间：">
-              <RadioGroup
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form ref="formValidate" :model="formValidate" class="tabform" @submit.native.prevent>
+        <el-row :gutter="24" >
+          <el-col :span="24">
+            <el-form-item label="订单时间：">
+              <el-radio-group
                 v-model="formValidate.data"
                 type="button"
-                @on-change="selectChange(formValidate.data)"
+                @change="selectChange(formValidate.data)"
                 class="mr"
               >
-                <Radio :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{ item.text }}</Radio>
-              </RadioGroup>
+                <el-radio-button :label="item.val" v-for="(item, i) in fromList.fromTxt" :key="i">{{ item.text }}</el-radio-button>
+              </el-radio-group>
               <DatePicker
                 :editable="false"
-                @on-change="onchangeTime"
+                @change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="daterange"
@@ -23,15 +23,15 @@
                 placeholder="请选择时间"
                 style="width: 200px"
               ></DatePicker>
-            </FormItem> </Col
-        ></Row>
-      </Form>
-    </Card>
+            </el-form-item> </el-col
+        ></el-row>
+      </el-form>
+    </el-card>
     <cards-data :cardLists="cardLists" v-if="cardLists.length >= 0"></cards-data>
     <echarts-new :option-data="optionData" :styles="style" height="100%" width="100%" v-if="optionData"></echarts-new>
     <Spin size="large" fix v-if="spinShow"></Spin>
     <div class="code-row-bg">
-      <Card :bordered="false" dis-hover class="ivu-mt">
+      <el-card :bordered="false" shadow="never" class="ivu-mt">
         <div class="acea-row row-between-wrapper">
           <div class="header-title">积分来源</div>
           <div>切换样式</div>
@@ -43,8 +43,8 @@
           width="100%"
           v-if="optionData"
         ></echarts-new>
-      </Card>
-      <Card :bordered="false" dis-hover class="ivu-mt">
+      </el-card>
+      <el-card :bordered="false" shadow="never" class="ivu-mt">
         <div class="acea-row row-between-wrapper">
           <div class="header-title">积分消耗</div>
           <div>切换样式</div>
@@ -56,7 +56,7 @@
           width="100%"
           v-if="optionData"
         ></echarts-new>
-      </Card>
+      </el-card>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/pages/statistic/order/index.vue b/template/admin/src/pages/statistic/order/index.vue
index 5400a7f33..e682ad80d 100644
--- a/template/admin/src/pages/statistic/order/index.vue
+++ b/template/admin/src/pages/statistic/order/index.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mb-16">
+    <el-card :bordered="false" shadow="never" class="ivu-mb-16">
       <dateRadio @selectDate="onSelectDate"></dateRadio>
       <DatePicker
         :editable="false"
         :clearable="false"
-        @on-change="onchangeTime"
+        @change="onchangeTime"
         :value="timeVal"
         format="yyyy/MM/dd"
         type="daterange"
@@ -15,72 +15,96 @@
         :options="options"
         class="mr20"
       ></DatePicker>
-    </Card>
+    </el-card>
     <cards-data :cardLists="cardLists" v-if="cardLists.length >= 0"></cards-data>
-    <Card class="ivu-mb-16" :bordered="false" dis-hover>
+    <el-card class="ivu-mb-16" :bordered="false" shadow="never">
       <h3>营业趋势</h3>
       <echarts-new :option-data="optionData" :styles="style" height="100%" width="100%" v-if="optionData"></echarts-new>
-    </Card>
+    </el-card>
     <Spin size="large" fix v-if="spinShow"></Spin>
     <div class="code-row-bg">
-      <Card :bordered="false" dis-hover class="ivu-mt">
+      <el-card :bordered="false" shadow="never" class="ivu-mt">
         <div class="acea-row row-between-wrapper">
           <h3 class="header-title">订单来源分析</h3>
           <div class="change-style" @click="echartLeft = !echartLeft">切换样式</div>
         </div>
         <div class="ech-box">
           <echarts-from v-if="echartLeft" ref="visitChart" :infoList="infoList" echartsTitle="circle"></echarts-from>
-          <Table
+          <el-table
             v-show="!echartLeft"
             ref="selection"
-            :columns="columns"
             :data="tabList"
-            :loading="loading"
-            no-data-text="暂无数据"
-            highlight-row
-            no-filtered-data-text="暂无筛选结果"
+            v-loading="loading"
+            empty-text="暂无数据"
+            highlight-current-row
+            
           >
-            <template slot-scope="{ row }" slot="percent">
-              <div class="percent-box">
-                <div class="line">
-                  <div class="bg"></div>
-                  <div class="percent" :style="'width:' + row.percent + '%;'"></div>
+            <el-table-column type="index" label="序号" width="50"> </el-table-column>
+            <el-table-column label="来源" min-width="80">
+              <template slot-scope="scope">
+                <span>{{ scope.row.name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="金额" min-width="130">
+              <template slot-scope="scope">
+                <span>{{ scope.row.value }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="占比率" min-width="130">
+              <template slot-scope="scope">
+                <div class="percent-box">
+                  <div class="line">
+                    <div class="bg"></div>
+                    <div class="percent" :style="'width:' + scope.row.percent + '%;'"></div>
+                  </div>
+                  <div class="num">{{ scope.row.percent }}%</div>
                 </div>
-                <div class="num">{{ row.percent }}%</div>
-              </div>
-            </template>
-          </Table>
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
-      </Card>
-      <Card :bordered="false" dis-hover class="ivu-mt">
+      </el-card>
+      <el-card :bordered="false" shadow="never" class="ivu-mt">
         <div class="acea-row row-between-wrapper">
           <h3 class="header-title">订单类型分析</h3>
           <div class="change-style" @click="echartRight = !echartRight">切换样式</div>
         </div>
         <div class="ech-box">
           <echarts-from v-if="echartRight" ref="visitChart" :infoList="infoList2" echartsTitle="circle"></echarts-from>
-          <Table
+          <el-table
             v-show="!echartRight"
             ref="selection"
-            :columns="columns"
             :data="tabList2"
             :loading="loading2"
-            no-data-text="暂无数据"
-            highlight-row
-            no-filtered-data-text="暂无筛选结果"
+            empty-text="暂无数据"
+            highlight-current-row
+            
           >
-            <template slot-scope="{ row }" slot="percent">
-              <div class="percent-box">
-                <div class="line">
-                  <div class="bg"></div>
-                  <div class="percent" :style="'width:' + row.percent + '%;'"></div>
+            <el-table-column type="index" label="序号" width="50"> </el-table-column>
+            <el-table-column label="来源" min-width="80">
+              <template slot-scope="scope">
+                <span>{{ scope.row.name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="金额" min-width="130">
+              <template slot-scope="scope">
+                <span>{{ scope.row.value }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="占比率" min-width="130">
+              <template slot-scope="scope">
+                <div class="percent-box">
+                  <div class="line">
+                    <div class="bg"></div>
+                    <div class="percent" :style="'width:' + scope.row.percent + '%;'"></div>
+                  </div>
+                  <div class="num">{{ scope.row.percent }}%</div>
                 </div>
-                <div class="num">{{ row.percent }}%</div>
-              </div>
-            </template>
-          </Table>
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
-      </Card>
+      </el-card>
     </div>
   </div>
 </template>
@@ -150,32 +174,7 @@ export default {
       optionData: {},
       spinShow: false,
       options: this.$timeOptions,
-      columns: [
-        {
-          title: '序号',
-          type: 'index',
-          width: 60,
-          align: 'center',
-        },
-        {
-          title: '来源',
-          key: 'name',
-          minWidth: 80,
-          align: 'center',
-        },
-        {
-          title: '金额',
-          width: 180,
-          key: 'value',
-          align: 'center',
-        },
-        {
-          title: '占比率',
-          slot: 'percent',
-          minWidth: 100,
-          align: 'center',
-        },
-      ],
+
       tabList: [],
       tabList2: [],
     };
diff --git a/template/admin/src/pages/statistic/product/components/productInfo.vue b/template/admin/src/pages/statistic/product/components/productInfo.vue
index 21a17d8b1..ae541999c 100644
--- a/template/admin/src/pages/statistic/product/components/productInfo.vue
+++ b/template/admin/src/pages/statistic/product/components/productInfo.vue
@@ -1,9 +1,9 @@
 <template>
-  <Card :bordered="false" dis-hover class="ivu-mt">
+  <el-card :bordered="false" shadow="never" class="ivu-mt">
     <div class="acea-row row-between-wrapper mb20">
       <div class="header-title">
         商品概况
-        <Poptip word-wrap width="500" trigger="hover" placement="right-start">
+        <el-tooltip effect="light" word-wrap width="500" trigger="hover" placement="right-start">
           <Icon type="ios-information-circle-outline" />
           <div slot="content">
             <div>商品浏览量</div>
@@ -37,13 +37,13 @@
             <div>在选定条件下， 付款人数 / 访客数</div>
             <br />
           </div>
-        </Poptip>
+        </el-tooltip>
       </div>
       <div class="acea-row">
         <DatePicker
           :editable="false"
           :clearable="false"
-          @on-change="onchangeTime"
+          @change="onchangeTime"
           :value="timeVal"
           format="yyyy/MM/dd"
           type="daterange"
@@ -53,8 +53,8 @@
           class="mr15"
           :options="options"
         ></DatePicker>
-        <Button type="primary" class="mr15" @click="onSeach">查询</Button>
-        <Button type="primary" @click="excel">导出</Button>
+        <el-button type="primary" class="mr15" @click="onSeach">查询</el-button>
+        <el-button type="primary" @click="excel">导出</el-button>
       </div>
     </div>
     <div class="acea-row mb20">
@@ -81,7 +81,7 @@
     </div>
     <echarts-new :option-data="optionData" :styles="style" height="100%" width="100%" v-if="optionData"></echarts-new>
     <Spin size="large" fix v-if="spinShow"></Spin>
-  </Card>
+  </el-card>
 </template>
 
 <script>
diff --git a/template/admin/src/pages/statistic/product/components/productRanking.vue b/template/admin/src/pages/statistic/product/components/productRanking.vue
index 0047f4a62..964dc2a14 100644
--- a/template/admin/src/pages/statistic/product/components/productRanking.vue
+++ b/template/admin/src/pages/statistic/product/components/productRanking.vue
@@ -1,15 +1,15 @@
 <template>
-  <Card :bordered="false" dis-hover class="ivu-mt-16">
+  <el-card :bordered="false" shadow="never" class="ivu-mt-16">
     <div class="acea-row row-between-wrapper mb20">
       <div class="header-title">商品排行</div>
       <div class="acea-row">
-        <Select v-model="formValidate.sort" style="width: 200px" class="mr20" @on-change="changeMenu">
-          <Option v-for="item in list" :value="item.val" :key="item.val">{{ item.name }}</Option>
-        </Select>
+        <el-select v-model="formValidate.sort" style="width: 200px" class="mr20" @change="changeMenu">
+          <el-option v-for="item in list" :value="item.val" :key="item.val" :label="item.name"></el-option>
+        </el-select>
         <DatePicker
           :editable="false"
           :clearable="false"
-          @on-change="onchangeTime"
+          @change="onchangeTime"
           :value="timeVal"
           format="yyyy/MM/dd"
           type="datetimerange"
@@ -19,42 +19,86 @@
           :options="options"
           class="mr20"
         ></DatePicker>
-        <Button type="primary" class="mr20" @click="getList">查询</Button>
+        <el-button type="primary" class="mr20" @click="getList">查询</el-button>
       </div>
     </div>
-    <Table
+    <el-table
       ref="selection"
-      :columns="columns4"
       :data="tabList"
-      :loading="loading"
-      no-data-text="暂无数据"
-      highlight-row
-      no-filtered-data-text="暂无筛选结果"
+      v-loading="loading"
+      empty-text="暂无数据"
+      highlight-current-row
+      
     >
-      <template slot-scope="{ row, index }" slot="image">
-        <div class="tabBox_img" v-viewer>
-          <img v-lazy="row.image" />
-        </div>
-      </template>
-      <template slot-scope="{ row, index }" slot="profit">
-        <span v-text="$tools.accMul(row.profit, 100).toFixed(2) + '%'"></span>
-      </template>
-      <template slot-scope="{ row, index }" slot="repeats">
-        <span v-text="$tools.accMul(row.repeats, 100) + '%'"></span>
-      </template>
-      <template slot-scope="{ row, index }" slot="changes">
-        <span>{{ $tools.accMul(row.changes, 100) + '%' }}</span>
-      </template>
-      <template slot-scope="{ row, index }" slot="action">
-        <a @click="look(row)">查看</a>
-      </template>
-    </Table>
+      <el-table-column label="商品图片" min-width="90">
+        <template slot-scope="scope">
+          <div class="tabBox_img" v-viewer>
+            <img v-lazy="scope.row.image" />
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品名称" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.store_name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="浏览量" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.visit }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="访客数" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.user }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="加购件数" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.cart }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="下单件数" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.orders }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="支付件数" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.pay }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="支付金额" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.price }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="毛利率(%)" min-width="130">
+        <template slot-scope="scope">
+          <span v-text="$tools.accMul(scope.row.profit, 100).toFixed(2) + '%'"></span>
+        </template>
+      </el-table-column>
+      <el-table-column label="收藏数" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.collect }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="访客-支付转化率(%)" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ $tools.accMul(scope.row.changes, 100) + '%' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" fixed="right" width="80">
+        <template slot-scope="scope">
+          <a @click="look(scope.row)">查看</a>
+        </template>
+      </el-table-column>
+    </el-table>
     <!-- 商品弹窗 -->
     <div v-if="isProductBox">
       <div class="bg" @click="isProductBox = false"></div>
       <goodsDetail :goodsId="goodsId"></goodsDetail>
     </div>
-  </Card>
+  </el-card>
 </template>
 
 <script>
@@ -82,69 +126,6 @@ export default {
       loading: false,
       tabList: [],
       total: 0,
-      columns4: [
-        {
-          title: '商品图片',
-          slot: 'image',
-          minWidth: 80,
-        },
-        {
-          title: '商品名称',
-          width: 180,
-          key: 'store_name',
-        },
-        {
-          title: '浏览量',
-          key: 'visit',
-          minWidth: 100,
-        },
-        {
-          title: '访客数',
-          key: 'user',
-          minWidth: 100,
-        },
-        {
-          title: '加购件数',
-          key: 'cart',
-          minWidth: 100,
-        },
-        {
-          title: '下单件数',
-          key: 'orders',
-          minWidth: 100,
-        },
-        {
-          title: '支付件数',
-          key: 'pay',
-          minWidth: 100,
-        },
-        {
-          title: '支付金额',
-          key: 'price',
-          minWidth: 100,
-        },
-        {
-          title: '毛利率(%)',
-          slot: 'profit',
-          minWidth: 100,
-        },
-        {
-          title: '收藏数',
-          key: 'collect',
-          minWidth: 100,
-        },
-        {
-          title: '访客-支付转化率(%)',
-          slot: 'changes',
-          minWidth: 120,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 80,
-        },
-      ],
       goodsId: '',
       isProductBox: false,
       list: [
diff --git a/template/admin/src/pages/statistic/transaction/components/toDay.vue b/template/admin/src/pages/statistic/transaction/components/toDay.vue
index f56e83395..83b09305d 100644
--- a/template/admin/src/pages/statistic/transaction/components/toDay.vue
+++ b/template/admin/src/pages/statistic/transaction/components/toDay.vue
@@ -1,7 +1,7 @@
 <template>
-  <Card :bordered="false" dis-hover class="ivu-mt">
-    <Row>
-      <Col v-if="statisticsData" class="br" v-bind="grid">
+  <el-card :bordered="false" shadow="never" class="ivu-mt">
+    <el-row>
+      <el-col v-if="statisticsData" class="br" v-bind="grid">
         <div>
           <div class="title mb15">今日订单金额</div>
           <div class="price">
@@ -17,8 +17,8 @@
           :option-data="optionData"
           :styles="style"
         />
-      </Col>
-      <Col v-if="statisticsData" v-bind="grid">
+      </el-col>
+      <el-col v-if="statisticsData" v-bind="grid">
         <div class="pl25">
           <div class="toDay">
             <span class="toDay-title spBlock mb10">今日订单数</span>
@@ -95,9 +95,9 @@
             </span>
           </div>
         </div>
-      </Col>
-    </Row>
-  </Card>
+      </el-col>
+    </el-row>
+  </el-card>
 </template>
 
 <script>
diff --git a/template/admin/src/pages/statistic/transaction/components/transaction.vue b/template/admin/src/pages/statistic/transaction/components/transaction.vue
index 2ad281849..d25ae5ccb 100644
--- a/template/admin/src/pages/statistic/transaction/components/transaction.vue
+++ b/template/admin/src/pages/statistic/transaction/components/transaction.vue
@@ -1,9 +1,9 @@
 <template>
-  <Card :bordered="false" dis-hover class="ivu-mt-16">
+  <el-card :bordered="false" shadow="never" class="ivu-mt-16">
     <div class="acea-row row-between-wrapper mb20">
       <div class="header-title">
         交易概况
-        <Poptip word-wrap width="500" trigger="hover" placement="right-start">
+        <el-tooltip effect="light" word-wrap width="500" trigger="hover" placement="right-start">
           <Icon type="ios-information-circle-outline" />
           <div slot="content">
             <div>营业额</div>
@@ -36,13 +36,13 @@
             <div>商品退款金额</div>
             <div>用户成功退款的商品金额</div>
           </div>
-        </Poptip>
+        </el-tooltip>
       </div>
       <div class="acea-row">
         <DatePicker
           :editable="false"
           :clearable="false"
-          @on-change="onchangeTime"
+          @change="onchangeTime"
           :value="timeVal"
           format="yyyy/MM/dd"
           type="daterange"
@@ -52,8 +52,8 @@
           class="mr20"
           :options="options"
         ></DatePicker>
-        <Button type="primary" class="mr20" @click="onSeach">查询</Button>
-        <Button type="primary" @click="excel">导出</Button>
+        <el-button type="primary" class="mr20" @click="onSeach">查询</el-button>
+        <el-button type="primary" @click="excel">导出</el-button>
       </div>
     </div>
     <div class="acea-row mb20">
@@ -88,7 +88,7 @@
     </div>
     <echarts-new :option-data="optionData" :styles="style" height="100%" width="100%" v-if="optionData"></echarts-new>
     <Spin size="large" fix v-if="spinShow"></Spin>
-  </Card>
+  </el-card>
 </template>
 
 <script>
diff --git a/template/admin/src/pages/statistic/user/components/userInfo.vue b/template/admin/src/pages/statistic/user/components/userInfo.vue
index d72e15677..8461944fb 100644
--- a/template/admin/src/pages/statistic/user/components/userInfo.vue
+++ b/template/admin/src/pages/statistic/user/components/userInfo.vue
@@ -1,9 +1,9 @@
 <template>
-  <Card :bordered="false" dis-hover class="ivu-mt-16">
+  <el-card :bordered="false" shadow="never" class="ivu-mt-16">
     <div class="acea-row row-between-wrapper">
       <div class="header-title mb20">
         用户概况
-        <Poptip word-wrap width="500" trigger="hover" placement="right-start">
+        <el-tooltip effect="light" word-wrap width="500" trigger="hover" placement="right-start">
           <Icon type="ios-information-circle-outline" />
           <div slot="content">
             <div>访客数</div>
@@ -42,12 +42,12 @@
             <div>累积成交用户数</div>
             <div>筛选时间截止时，下单并支付成功的用户</div>
           </div>
-        </Poptip>
+        </el-tooltip>
       </div>
     </div>
-    <div class="mb20" style="padding-left: 25px">
-      <Row>
-        <Col v-bind="grid" v-for="(item, index) in list" :key="index">
+    <div class="mb20" >
+      <el-row>
+        <el-col v-bind="grid" v-for="(item, index) in list" :key="index">
           <div class="acea-row mb30 fwn">
             <div class="iconCrl mr15" :class="item.colors">
               <i class="iconfont" :class="item.icon"></i>
@@ -65,12 +65,12 @@
               /></span>
             </div>
           </div>
-        </Col>
-      </Row>
+        </el-col>
+      </el-row>
     </div>
     <echarts-new :option-data="optionData" :styles="style" height="100%" width="100%" v-if="optionData"></echarts-new>
     <Spin size="large" fix v-if="spinShow"></Spin>
-  </Card>
+  </el-card>
 </template>
 
 <script>
@@ -97,7 +97,7 @@ export default {
       spinShow: false,
       grid: {
         xl: 4,
-        lg: 8,
+        lg: 4,
         md: 12,
         sm: 24,
         xs: 24,
diff --git a/template/admin/src/pages/statistic/user/components/userRegion.vue b/template/admin/src/pages/statistic/user/components/userRegion.vue
index ac2bd0d81..580a6af92 100644
--- a/template/admin/src/pages/statistic/user/components/userRegion.vue
+++ b/template/admin/src/pages/statistic/user/components/userRegion.vue
@@ -1,26 +1,36 @@
 <template>
-  <Row :gutter="16">
-    <Col :xs="24" :sm="24" :md="24" :lg="18">
-      <Card :bordered="false" dis-hover class="ivu-mt-16">
+  <el-row :gutter="16">
+    <el-col :xs="24" :sm="24" :md="24" :lg="18">
+      <el-card :bordered="false" shadow="never" class="ivu-mt-16">
         <div class="acea-row row-between-wrapper">
           <div class="header-title mb20">用户地域分布</div>
         </div>
-        <Row>
-          <Col :xs="24" :sm="24" :md="24" :lg="10">
+        <el-row>
+          <el-col :xs="24" :sm="24" :md="24" :lg="10">
             <div class="echarts">
               <div :style="{ height: '400px', width: '100%' }" ref="myEchart"></div>
             </div>
-          </Col>
-          <Col :xs="24" :sm="24" :md="24" :lg="14">
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="14">
             <div class="tables">
-              <Table height="400" :columns="columns1" :data="resdataList"></Table>
+              <el-table height="400" :columns="columns1" :data="resdataList">
+                <el-table-column :label="item.title" :min-width="100" v-for="(item, index) in columns1" :key="index">
+                  <template slot-scope="scope">
+                    <template v-if="item.key">
+                      <div>
+                        <span>{{ scope.row[item.key] }}</span>
+                      </div>
+                    </template>
+                  </template>
+                </el-table-column>
+              </el-table>
             </div>
-          </Col>
-        </Row>
-      </Card>
-    </Col>
-    <Col :xs="24" :sm="24" :md="24" :lg="6">
-      <Card :bordered="false" dis-hover class="ivu-mt-16">
+          </el-col>
+        </el-row>
+      </el-card>
+    </el-col>
+    <el-col :xs="24" :sm="24" :md="24" :lg="6">
+      <el-card :bordered="false" shadow="never" class="ivu-mt-16">
         <div class="acea-row row-between-wrapper">
           <div class="header-title mb20">用户性别比例</div>
         </div>
@@ -31,9 +41,9 @@
           width="100%"
           v-if="optionData"
         ></echarts-new>
-      </Card>
-    </Col>
-  </Row>
+      </el-card>
+    </el-col>
+  </el-row>
 </template>
 
 <script>
diff --git a/template/admin/src/pages/statistic/user/components/wechetInfo.vue b/template/admin/src/pages/statistic/user/components/wechetInfo.vue
index 55c2ed5b0..575326493 100644
--- a/template/admin/src/pages/statistic/user/components/wechetInfo.vue
+++ b/template/admin/src/pages/statistic/user/components/wechetInfo.vue
@@ -1,9 +1,9 @@
 <template>
-  <Card :bordered="false" dis-hover class="ivu-mt-16">
+  <el-card :bordered="false" shadow="never" class="ivu-mt-16">
     <div class="acea-row row-between-wrapper">
       <div class="header-title mb20">
         公众号用户概括
-        <Poptip word-wrap width="500" trigger="hover" placement="right-start">
+        <el-tooltip effect="light" word-wrap width="500" trigger="hover" placement="right-start">
           <Icon type="ios-information-circle-outline" />
           <div slot="content">
             <div>新增关注用户数</div>
@@ -21,7 +21,7 @@
             <div>累积取关用户数</div>
             <div>筛选时间截止时，取消关注公众号的用户数量</div>
           </div>
-        </Poptip>
+        </el-tooltip>
       </div>
     </div>
     <div class="acea-row mb20">
@@ -48,7 +48,7 @@
     </div>
     <echarts-new :option-data="optionData" :styles="style" height="100%" width="100%" v-if="optionData"></echarts-new>
     <Spin size="large" fix v-if="spinShow"></Spin>
-  </Card>
+  </el-card>
 </template>
 
 <script>
diff --git a/template/admin/src/pages/statistic/user/index.vue b/template/admin/src/pages/statistic/user/index.vue
index 97cdb6a3f..4351987c4 100644
--- a/template/admin/src/pages/statistic/user/index.vue
+++ b/template/admin/src/pages/statistic/user/index.vue
@@ -1,23 +1,23 @@
 <template>
   <div class="article-manager">
     <div class="i-layout-page-header">
-      <Form ref="formInline" :model="formInline" inline>
-        <FormItem class="mr20">
+      <el-form ref="formInline" :model="formInline" inline>
+        <el-form-item class="mr20">
           用户渠道:
-          <Select v-model="channel_type" style="width: 300px" placeholder="用户渠道" @on-change="changeTxt">
-            <Option value="all">全部</Option>
-            <Option value="wechat">公众号</Option>
-            <Option value="routine">小程序</Option>
-            <Option value="h5">H5</Option>
-            <Option value="pc">PC</Option>
-          </Select>
-        </FormItem>
-        <FormItem>
+          <el-select size="small" v-model="channel_type" style="width: 300px" placeholder="用户渠道" @change="changeTxt">
+            <el-option value="all" label="全部"></el-option>
+            <el-option value="wechat" label="公众号"></el-option>
+            <el-option value="routine" label="小程序"></el-option>
+            <el-option value="h5" label="H5"></el-option>
+            <el-option value="pc" label="PC"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
           选择时间:
           <DatePicker
             :editable="false"
             :clearable="false"
-            @on-change="onchangeTime"
+            @change="onchangeTime"
             :value="timeVal"
             format="yyyy/MM/dd"
             type="daterange"
@@ -27,14 +27,14 @@
             class="mr20"
             :options="options"
           ></DatePicker>
-        </FormItem>
-        <FormItem>
-          <Button type="primary" @click="handleSubmit('formInline')">查询</Button>
-        </FormItem>
-        <FormItem>
-          <Button type="primary" @click="excel">导出</Button>
-        </FormItem>
-      </Form>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleSubmit('formInline')">查询</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="excel">导出</el-button>
+        </el-form-item>
+      </el-form>
     </div>
     <user-info :formInline="formInline" ref="userInfos" key="1"></user-info>
     <wechet-info :formInline="formInline" ref="wechetInfos" v-if="isShow" key="2"></wechet-info>
diff --git a/template/admin/src/pages/system/auth/index copy.vue b/template/admin/src/pages/system/auth/index copy.vue
index 894404fad..ea1034833 100644
--- a/template/admin/src/pages/system/auth/index copy.vue	
+++ b/template/admin/src/pages/system/auth/index copy.vue	
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="auth acea-row row-between-wrapper">
         <div class="acea-row row-middle">
           <Icon type="ios-bulb-outline" class="iconIos blue" v-if="status === 1" />
@@ -26,13 +26,13 @@
           <!--<div class="code blue">授权申请已提交，请等待审核</div>-->
           <!--</div>-->
         </div>
-        <Button @click="toCrmeb()" v-if="status === 1">进入官网</Button>
-        <Button type="primary" @click="isTemplate = true" v-else>申请授权</Button>
-        <!--<Button type="primary" @click="isTemplate = true" v-else-if="status === -1 || status === -9">申请授权</Button>-->
-        <!--<Button type="primary" @click="isTemplate = true" v-else-if="status === 2">重新申请</Button>-->
-        <!--<Button class="grey" v-else-if="status === 0">审核中</Button>-->
+        <el-button @click="toCrmeb()" v-if="status === 1">进入官网</el-button>
+        <el-button type="primary" @click="isTemplate = true" v-else>申请授权</el-button>
+        <!--<el-button type="primary" @click="isTemplate = true" v-else-if="status === -1 || status === -9">申请授权</el-button>-->
+        <!--<el-button type="primary" @click="isTemplate = true" v-else-if="status === 2">重新申请</el-button>-->
+        <!--<el-button class="grey" v-else-if="status === 0">审核中</el-button>-->
       </div>
-    </Card>
+    </el-card>
     <Modal
       v-model="isTemplate"
       scrollable
@@ -44,8 +44,8 @@
       @on-cancel="cancel"
     >
       <div class="article-manager">
-        <Card :bordered="false" dis-hover>
-          <Form
+        <el-card :bordered="false" shadow="never">
+          <el-form
             ref="formItem"
             :model="formItem"
             :label-width="labelWidth"
@@ -53,25 +53,25 @@
             :rules="ruleValidate"
             @submit.native.prevent
           >
-            <Row type="flex" :gutter="24">
-              <Col span="24">
-                <Col>
-                  <FormItem label="企业名称：" prop="company_name" label-for="company_name">
-                    <Input v-model="formItem.company_name" placeholder="请填写您的企业名称" />
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <Col>
-                  <FormItem label="企业域名：" prop="domain_name" label-for="domain_name">
-                    <Input v-model="formItem.domain_name" :disabled="true" placeholder="请输入域名，格式：baidu.com" />
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <Col>
-                  <FormItem label="订单号：" label-for="order_id" prop="order_id">
-                    <Input
+            <el-row  :gutter="24">
+              <el-col :span="24">
+                <el-col>
+                  <el-form-item label="企业名称：" prop="company_name" label-for="company_name">
+                    <el-input v-model="formItem.company_name" placeholder="请填写您的企业名称" />
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-col>
+                  <el-form-item label="企业域名：" prop="domain_name" label-for="domain_name">
+                    <el-input v-model="formItem.domain_name" :disabled="true" placeholder="请输入域名，格式：baidu.com" />
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-col>
+                  <el-form-item label="订单号：" label-for="order_id" prop="order_id">
+                    <el-input
                       v-model="formItem.order_id"
                       placeholder="请输入您在淘宝或小程序购买的源码订单号"
                       class="customer"
@@ -79,35 +79,35 @@
                       <a slot="append" target="_blank" href="http://www.crmeb.com/web/auth/query.html"
                         >联系客服获取订单号</a
                       >
-                    </Input>
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <Col>
-                  <FormItem label="手机号：" label-for="phone" prop="phone">
-                    <Input v-model="formItem.phone" type="number" placeholder="负责人电话" />
-                  </FormItem>
-                </Col>
-              </Col>
-              <Col span="24">
-                <Col>
-                  <FormItem label="验证码：" label-for="captcha" prop="captcha">
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-col>
+                  <el-form-item label="手机号：" label-for="phone" prop="phone">
+                    <el-input v-model="formItem.phone" type="number" placeholder="负责人电话" />
+                  </el-form-item>
+                </el-col>
+              </el-col>
+              <el-col :span="24">
+                <el-col>
+                  <el-form-item label="验证码：" label-for="captcha" prop="captcha">
                     <div class="acea-row row-middle code">
-                      <Input v-model="formItem.captcha" placeholder="验证码" class="input" />
+                      <el-input v-model="formItem.captcha" placeholder="验证码" class="input" />
                       <img @click="captchsChang" :src="captchs" class="pictrue" />
                     </div>
-                  </FormItem>
-                </Col>
-              </Col>
-            </Row>
-            <Row type="flex">
-              <Col span="24">
-                <Button type="primary" @click="handleSubmit('formItem')" class="submit">提交</Button>
-              </Col>
-            </Row>
-          </Form>
-        </Card>
+                  </el-form-item>
+                </el-col>
+              </el-col>
+            </el-row>
+            <el-row >
+              <el-col :span="24">
+                <el-button type="primary" @click="handleSubmit('formItem')" class="submit">提交</el-button>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-card>
       </div>
     </Modal>
   </div>
@@ -122,7 +122,7 @@ export default {
     ...mapState('media', ['isMobile']),
     ...mapState('userLevel', ['categoryId']),
     labelWidth() {
-      return this.isMobile ? undefined : 85;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
diff --git a/template/admin/src/pages/system/auth/index.vue b/template/admin/src/pages/system/auth/index.vue
index a099114c7..7d8bf0a90 100644
--- a/template/admin/src/pages/system/auth/index.vue
+++ b/template/admin/src/pages/system/auth/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="auth acea-row row-between-wrapper">
         <div class="acea-row row-middle">
           <Icon type="ios-bulb-outline" class="iconIos blue" />
@@ -13,14 +13,14 @@
             <div class="code">未授权</div>
           </div>
         </div>
-        <!-- <Button class="grey" @click="toCrmeb()" v-if="status === 1">进入官网</Button> -->
+        <!-- <el-button class="grey" @click="toCrmeb()" v-if="status === 1">进入官网</el-button> -->
         <div>
-          <Button type="primary" @click="toCrmeb()" v-if="status === 1">进入官网</Button>
-          <Button type="primary" @click="payment('bz')" v-if="status !== 1">购买授权</Button>
+          <el-button type="primary" @click="toCrmeb()" v-if="status === 1">进入官网</el-button>
+          <el-button type="primary" @click="payment('bz')" v-if="status !== 1">购买授权</el-button>
         </div>
       </div>
-    </Card>
-    <Card :bordered="false" dis-hover class="ivu-mt" v-if="!copyright && status == 1">
+    </el-card>
+    <el-card :bordered="false" shadow="never" class="ivu-mt" v-if="!copyright && status == 1">
       <!-- v-if="copyright == '0' && status == 1" -->
       <div class="auth acea-row row-between-wrapper">
         <div class="acea-row row-middle">
@@ -31,19 +31,19 @@
             <div class="pro_price" v-if="productStatus">￥{{ price }}</div>
           </div>
         </div>
-        <Button type="primary" @click="payment('copyright')">立即购买</Button>
+        <el-button type="primary" @click="payment('copyright')">立即购买</el-button>
       </div>
-    </Card>
-    <Card :bordered="false" dis-hover class="ivu-mt" v-if="copyright">
+    </el-card>
+    <el-card :bordered="false" shadow="never" class="ivu-mt" v-if="copyright">
       <div class="auth acea-row row-between-wrapper">
         <div class="acea-row row-middle">
           <span class="iconfont iconbanquan iconIos blue"></span>
           <div class="acea-row row-middle">
             <span class="update">修改授权信息:</span>
-            <Input style="width: 460px" v-model="copyrightText" />
+            <el-input style="width: 460px" v-model="copyrightText" />
           </div>
         </div>
-        <Button type="primary" @click="saveCopyRight">保存</Button>
+        <el-button type="primary" @click="saveCopyRight">保存</el-button>
       </div>
       <div class="authorized">
         <div>
@@ -57,7 +57,7 @@
         </div>
       </div>
       <span class="prompt">建议尺寸：宽290px*高100px</span>
-    </Card>
+    </el-card>
 
     <Modal
       v-model="isTemplate"
@@ -105,7 +105,7 @@ export default {
     ...mapState('admin/layout', ['isMobile']),
     ...mapState('admin/userLevel', ['categoryId']),
     labelWidth() {
-      return this.isMobile ? undefined : 85;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
diff --git a/template/admin/src/pages/system/backendRouting/debugging.vue b/template/admin/src/pages/system/backendRouting/debugging.vue
index eae90794e..586f736a8 100644
--- a/template/admin/src/pages/system/backendRouting/debugging.vue
+++ b/template/admin/src/pages/system/backendRouting/debugging.vue
@@ -1,22 +1,22 @@
 <template>
   <div class="content" v-if="interfaceData">
     <div class="head">
-      <Input v-model="interfaceData.path">
+      <el-input v-model="interfaceData.path">
         <template #prepend>
-          <Select v-model="interfaceData.method" style="width: 120px">
-            <Option v-for="(item, index) in requestTypeList" :key="index" :value="item.value">{{ item.label }}</Option>
-          </Select>
+          <el-select v-model="interfaceData.method" style="width: 120px">
+            <el-option v-for="(item, index) in requestTypeList" :key="index" :value="item.value" :label="item.label"></el-option>
+          </el-select>
         </template>
-      </Input>
-      <Button class="ml20" type="primary" @click="requestData">请求</Button>
-      <Button v-if="codes" class="ml10 copy-btn" type="success" @click="insertCopy()">复制结果</Button>
+      </el-input>
+      <el-button class="ml20" type="primary" @click="requestData">请求</el-button>
+      <el-button v-if="codes" class="ml10 copy-btn" type="success" @click="insertCopy()">复制结果</el-button>
     </div>
     <div class="params">
-      <Tabs class="mt10" v-model="paramsType" @on-click="changeTab">
-        <TabPane label="Params" name="Params"> </TabPane>
-        <TabPane label="Body" name="Body"> </TabPane>
-        <TabPane label="Header" name="Header"> </TabPane>
-      </Tabs>
+      <el-tabs class="mt10" v-model="paramsType" @tag-click="changeTab">
+        <el-tab-pane label="Params" name="Params"> </el-tab-pane>
+        <el-tab-pane label="Body" name="Body"> </el-tab-pane>
+        <el-tab-pane label="Header" name="Header"> </el-tab-pane>
+      </el-tabs>
       <div v-show="paramsType === 'Params'">
         <vxe-table
           class="mt10"
@@ -83,13 +83,13 @@
             </template>
           </vxe-column>
         </vxe-table>
-        <Button class="mt10" type="primary" @click="insertEvent('xTable')">添加参数</Button>
+        <el-button class="mt10" type="primary" @click="insertEvent('xTable')">添加参数</el-button>
       </div>
       <div v-show="paramsType === 'Body'">
-        <RadioGroup v-model="bodyType" class="mt10">
-          <Radio label="form-data"></Radio>
-          <Radio label="json"></Radio>
-        </RadioGroup>
+        <el-radio-group v-model="bodyType" class="mt10">
+          <el-radio label="form-data"></el-radio>
+          <el-radio label="json"></el-radio>
+        </el-radio-group>
         <vxe-table
           v-if="bodyType == 'form-data'"
           class="mt10"
@@ -157,10 +157,10 @@
           </vxe-column>
         </vxe-table>
         <div v-else>
-          <Input v-model="jsonBody" type="textarea" :rows="8" placeholder="请求数据" />
+          <el-input v-model="jsonBody" type="textarea" :rows="8" placeholder="请求数据" />
         </div>
-        <Button v-if="bodyType == 'form-data'" class="mt10" type="primary" @click="insertEvent('yTable')"
-          >添加参数</Button
+        <el-button v-if="bodyType == 'form-data'" class="mt10" type="primary" @click="insertEvent('yTable')"
+          >添加参数</el-button
         >
       </div>
 
@@ -200,7 +200,7 @@
             </template>
           </vxe-column>
         </vxe-table>
-        <Button class="mt10" type="primary" @click="insertEvent('zTable')">添加参数</Button>
+        <el-button class="mt10" type="primary" @click="insertEvent('zTable')">添加参数</el-button>
         <!-- <h4 class="mt10 title">全局Header参数</h4>
         <vxe-table
           class="mt10"
diff --git a/template/admin/src/pages/system/backendRouting/index.vue b/template/admin/src/pages/system/backendRouting/index.vue
index 145f22af2..5945824f7 100644
--- a/template/admin/src/pages/system/backendRouting/index.vue
+++ b/template/admin/src/pages/system/backendRouting/index.vue
@@ -2,19 +2,19 @@
   <div>
     <div>
       <div class="tabs">
-        <Tabs v-model="apiType">
-          <TabPane label="管理端接口" name="adminapi"></TabPane>
-          <TabPane label="用户端接口" name="api"></TabPane>
-          <TabPane label="客服端接口" name="kefuapi"></TabPane>
-          <TabPane label="对外接口" name="outapi"></TabPane>
-        </Tabs>
+        <el-tabs v-model="apiType">
+          <el-tab-pane label="管理端接口" name="adminapi"></el-tab-pane>
+          <el-tab-pane label="用户端接口" name="api"></el-tab-pane>
+          <el-tab-pane label="客服端接口" name="kefuapi"></el-tab-pane>
+          <el-tab-pane label="对外接口" name="outapi"></el-tab-pane>
+        </el-tabs>
       </div>
       <div class="main">
         <div class="ivu-mt mr20 card-tree">
           <div class="tree">
             <div class="main-btn">
-              <Button class="mb5 mr10" style="flex: 1" type="primary" @click="clickMenu(4)" long>新增分类</Button>
-              <Button class="mr10" type="success" @click="syncRoute()">同步</Button>
+              <el-button class="mb5 mr10" style="flex: 1" type="primary" @click="clickMenu(4)" long>新增分类</el-button>
+              <el-button class="mr10" type="success" @click="syncRoute()">同步</el-button>
             </div>
 
             <vue-tree-list
@@ -45,25 +45,24 @@
                     }"
                     >{{ slotProps.model.name }}</span
                   >
-                  <Dropdown
+                  <el-dropdown
+                    size="small"
                     transfer
-                    @on-click="
+                    @command="
                       (name) => {
                         clickMenu(name, slotProps.model);
                       }
                     "
                   >
-                    <a href="javascript:void(0)">
-                      <Icon class="add" type="ios-more" />
-                    </a>
-                    <template #list>
-                      <DropdownMenu>
-                        <DropdownItem name="1" v-if="!slotProps.model.method">新增接口</DropdownItem>
-                        <DropdownItem name="2" v-if="!slotProps.model.method">编辑分类名</DropdownItem>
-                        <DropdownItem name="3">删除</DropdownItem>
-                      </DropdownMenu>
+                    <span class="el-dropdown-link"> <Icon class="add" type="ios-more" /></span>
+                    <template slot="dropdown">
+                      <el-dropdown-menu>
+                        <el-dropdown-item command="1" v-if="!slotProps.model.method">新增接口</el-dropdown-item>
+                        <el-dropdown-item command="2" v-if="!slotProps.model.method">编辑分类名</el-dropdown-item>
+                        <el-dropdown-item command="3">删除</el-dropdown-item>
+                      </el-dropdown-menu>
                     </template>
-                  </Dropdown>
+                  </el-dropdown>
                 </div>
               </template>
               <!-- 新建文件夹 -->
@@ -94,36 +93,36 @@
             </vue-tree-list>
           </div>
         </div>
-        <Card :bordered="false" dis-hover class="ivu-mt right-card">
+        <el-card :bordered="false" shadow="never" class="ivu-mt right-card">
           <div class="data">
             <div class="eidt-sub">
               <div class="name">
                 {{ formValidate.name }}
               </div>
               <div>
-                <Button type="info" class="submission mr20" @click="debugging()">调试</Button>
-                <Button v-if="formValidate.id" type="primary" class="submission mr20" @click="isEdit = !isEdit">{{
+                <el-button type="info" class="submission mr20" @click="debugging()">调试</el-button>
+                <el-button v-if="formValidate.id" type="primary" class="submission mr20" @click="isEdit = !isEdit">{{
                   isEdit ? '返回' : '编辑'
-                }}</Button>
-                <Button v-if="isEdit" type="primary" class="submission" @click="handleSubmit('formValidate')"
-                  >保存</Button
+                }}</el-button>
+                <el-button v-if="isEdit" type="primary" class="submission" @click="handleSubmit('formValidate')"
+                  >保存</el-button
                 >
               </div>
             </div>
-            <Form
+            <el-form
               class="formValidate mt20"
               ref="formValidate"
               :rules="ruleValidate"
               :model="formValidate"
-              :label-width="100"
+              label-width="100px"
               :label-position="labelPosition"
               @submit.native.prevent
             >
-              <Row :gutter="24" type="flex">
-                <Col span="24">
+              <el-row :gutter="24">
+                <el-col :span="24">
                   <div class="title">接口信息</div>
-                  <FormItem label="接口名称：" prop="name">
-                    <Input
+                  <el-form-item label="接口名称：" prop="name">
+                    <el-input
                       v-if="isEdit"
                       class="perW20"
                       type="text"
@@ -132,19 +131,22 @@
                       placeholder="请输入"
                     />
                     <span v-else>{{ formValidate.name || '' }}</span>
-                  </FormItem>
-                  <FormItem label="请求类型：" prop="name">
-                    <Select v-if="isEdit" v-model="formValidate.method" style="width: 120px">
-                      <Option v-for="(item, index) in requestTypeList" :key="index" :value="item.value">{{
-                        item.label
-                      }}</Option>
-                    </Select>
+                  </el-form-item>
+                  <el-form-item label="请求类型：" prop="name">
+                    <el-select v-if="isEdit" v-model="formValidate.method" style="width: 120px">
+                      <el-option
+                        v-for="(item, index) in requestTypeList"
+                        :key="index"
+                        :value="item.value"
+                        :label="item.label"
+                      ></el-option>
+                    </el-select>
                     <span v-else class="req-method" :style="'background-color:' + methodColor">{{
                       formValidate.method || ''
                     }}</span>
-                  </FormItem>
-                  <FormItem label="功能描述：" prop="name">
-                    <Input
+                  </el-form-item>
+                  <el-form-item label="功能描述：" prop="name">
+                    <el-input
                       v-if="isEdit"
                       class="perW20"
                       type="textarea"
@@ -153,8 +155,8 @@
                       placeholder="请输入"
                     />
                     <span v-else class="text-area">{{ formValidate.describe || '--' }}</span>
-                  </FormItem>
-                  <FormItem label="所属分类：" prop="name" v-if="isEdit">
+                  </el-form-item>
+                  <el-form-item label="所属分类：" prop="name" v-if="isEdit">
                     <el-cascader
                       v-model="formValidate.cate_id"
                       size="small"
@@ -162,33 +164,27 @@
                       :props="{ checkStrictly: true, multiple: false, emitPath: false, value: 'id', label: 'name' }"
                       clearable
                     ></el-cascader>
-                  </FormItem>
-                  <FormItem label="是否公共：" prop="name">
-                    <Switch v-if="isEdit" v-model="formValidate.type" :true-value="1" :false-value="0">
-                      <template #open>
-                        <span>是</span>
-                      </template>
-                      <template #close>
-                        <span>否</span>
-                      </template>
-                    </Switch>
+                  </el-form-item>
+                  <el-form-item label="是否公共：" prop="name">
+                    <el-switch v-if="isEdit" v-model="formValidate.type" :active-value="1" :inactive-value="0">
+                    </el-switch>
                     <span v-else class="text-area">{{ formValidate.type ? '是' : '否' }}</span>
-                  </FormItem>
-                </Col>
-              </Row>
-              <Row :gutter="24" type="flex">
-                <Col span="24">
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="24">
+                <el-col :span="24">
                   <div class="title">调用方式</div>
-                  <FormItem label="路由地址：" prop="path">
+                  <el-form-item label="路由地址：" prop="path">
                     <span>{{ formValidate.path || '' }}</span>
-                  </FormItem>
-                  <FormItem label="文件地址：" prop="path">
+                  </el-form-item>
+                  <el-form-item label="文件地址：" prop="path">
                     <span>{{ formValidate.file_path || '' }}</span>
-                  </FormItem>
-                  <FormItem label="方法名：" prop="path">
+                  </el-form-item>
+                  <el-form-item label="方法名：" prop="path">
                     <span>{{ formValidate.action || '' }}</span>
-                  </FormItem>
-                  <FormItem label="请求参数：">
+                  </el-form-item>
+                  <el-form-item label="请求参数：">
                     <vxe-table
                       resizable
                       show-overflow
@@ -257,9 +253,11 @@
                       </vxe-column>
                     </vxe-table>
 
-                    <Button class="mt10" v-if="isEdit" type="primary" @click="insertEvent('xTable')">添加参数</Button>
-                  </FormItem>
-                  <FormItem label="返回参数：">
+                    <el-button class="mt10" v-if="isEdit" type="primary" @click="insertEvent('xTable')"
+                      >添加参数</el-button
+                    >
+                  </el-form-item>
+                  <el-form-item label="返回参数：">
                     <vxe-table
                       resizable
                       show-overflow
@@ -317,15 +315,17 @@
                         </template>
                       </vxe-column>
                     </vxe-table>
-                    <Button class="mt10" v-if="isEdit" type="primary" @click="insertEvent('resTable')">添加参数</Button>
-                  </FormItem>
-                </Col>
-              </Row>
-              <Row :gutter="24" type="flex">
-                <Col span="24">
+                    <el-button class="mt10" v-if="isEdit" type="primary" @click="insertEvent('resTable')"
+                      >添加参数</el-button
+                    >
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row :gutter="24">
+                <el-col :span="24">
                   <div class="title">调用示例</div>
-                  <FormItem label="请求数据示例：" prop="request_example">
-                    <Input
+                  <el-form-item label="请求数据示例：" prop="request_example">
+                    <el-input
                       v-if="isEdit"
                       class="perW20"
                       type="textarea"
@@ -334,9 +334,9 @@
                       placeholder="请输入"
                     />
                     <span v-else class="text-area">{{ formValidate.request_example || '' }}</span>
-                  </FormItem>
-                  <FormItem label="返回数据示例：" prop="response_example">
-                    <Input
+                  </el-form-item>
+                  <el-form-item label="返回数据示例：" prop="response_example">
+                    <el-input
                       v-if="isEdit"
                       class="perW20"
                       type="textarea"
@@ -345,8 +345,8 @@
                       placeholder="请输入"
                     />
                     <span v-else class="text-area">{{ formValidate.response_example || '' }}</span>
-                  </FormItem>
-                  <FormItem label="错误码：">
+                  </el-form-item>
+                  <el-form-item label="错误码：">
                     <vxe-table
                       resizable
                       show-overflow
@@ -387,20 +387,20 @@
                         </template>
                       </vxe-column>
                     </vxe-table>
-                    <Button class="mt10" v-if="isEdit" type="primary" @click="insertEvent('codeTable')"
-                      >添加参数</Button
+                    <el-button class="mt10" v-if="isEdit" type="primary" @click="insertEvent('codeTable')"
+                      >添加参数</el-button
                     >
-                  </FormItem>
-                </Col>
-              </Row>
-              <!-- <Row :gutter="24" type="flex">
-              <Col span="24">
-                <FormItem>
-                  <Button type="primary" class="submission" @click="handleSubmit('formValidate')">保存</Button>
-                </FormItem>
-              </Col>
-            </Row> -->
-            </Form>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <!-- <el-row :gutter="24" >
+              <el-col :span="24">
+                <el-form-item>
+                  <el-button type="primary" class="submission" @click="handleSubmit('formValidate')">保存</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row> -->
+            </el-form>
           </div>
           <!-- <div v-else class="nothing">
           <div class="box" @click="clickMenu(4)">
@@ -416,12 +416,12 @@
             <div class="text">新建接口</div>
           </div>
         </div> -->
-        </Card>
+        </el-card>
       </div>
     </div>
     <Modal v-model="nameModal" title="分组名称" :loading="loading" @on-ok="asyncOK">
       <label>分组名称：</label>
-      <Input v-model="value" placeholder="请输入分组名称" style="width: 85%" />
+      <el-input v-model="value" placeholder="请输入分组名称" style="width: 85%" />
     </Modal>
     <Drawer v-model="debuggingModal" :title="formValidate.name" width="70%" footer-hide :loading="loading">
       <debugging
@@ -592,7 +592,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 50;
+      return this.isMobile ? undefined : '50px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
diff --git a/template/admin/src/pages/system/clear/index.vue b/template/admin/src/pages/system/clear/index.vue
index b81d57a95..6969cb924 100644
--- a/template/admin/src/pages/system/clear/index.vue
+++ b/template/admin/src/pages/system/clear/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <div class="acea-row row-center clear_tit">
-      <Button type="primary" @click="clearCache" class="mr20">清除缓存</Button>
-      <Button type="primary" @click="clearlog">清除日志</Button>
+      <el-button type="primary" @click="clearCache" class="mr20">清除缓存</el-button>
+      <el-button type="primary" @click="clearlog">清除日志</el-button>
     </div>
   </div>
 </template>
diff --git a/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue b/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue
index c01fd7be3..af76684ad 100644
--- a/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue
+++ b/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue
@@ -1,13 +1,8 @@
 <template>
   <div class="main">
     <Alert closable> crud生成说明 不能生成系统自带的表；已经生成过的表还能继续生成 </Alert>
-    <Form ref="foundation" :model="foundation" :rules="foundationRules" :label-width="100">
-      <FormItem label="菜单">
-        <!-- <Select class="form-width" v-model="foundation.pid">
-          <Option value="beijing">New York</Option>
-          <Option value="shanghai">London</Option>
-          <Option value="shenzhen">Sydney</Option>
-        </Select> -->
+    <el-form ref="foundation" :model="foundation" :rules="foundationRules" label-width="100px">
+      <el-form-item label="菜单">
         <el-cascader
           class="form-width"
           v-model="foundation.pid"
@@ -17,90 +12,24 @@
           clearable
         ></el-cascader>
         <div class="tip">选项，选择的菜单成功后会自动写入到此菜单下</div>
-      </FormItem>
-      <FormItem label="菜单名称">
-        <Input class="form-width" v-model="foundation.menuName" placeholder="请输入菜单名称"></Input>
+      </el-form-item>
+      <el-form-item label="菜单名称">
+        <el-input class="form-width" v-model="foundation.menuName" placeholder="请输入菜单名称"></el-input>
         <div class="tip">
           生成菜单为可选项，不填写默认生成的菜单名称将为表名；生成后会把自动生成的权限默认加入该菜单下
         </div>
-      </FormItem>
-      <FormItem label="模块名" prop="modelName">
-        <Input class="form-width" v-model="foundation.modelName" placeholder="请输入模块名"></Input>
+      </el-form-item>
+      <el-form-item label="模块名" prop="modelName">
+        <el-input class="form-width" v-model="foundation.modelName" placeholder="请输入模块名"></el-input>
         <div class="tip">模块名称为中文或者英文，用在接口名称前缀、表单头部标题</div>
-      </FormItem>
-      <FormItem label="表名" prop="tableName">
-        <Input class="form-width" v-model="foundation.tableName" placeholder="请输入表名"></Input>
+      </el-form-item>
+      <el-form-item label="表名" prop="tableName">
+        <el-input class="form-width" v-model="foundation.tableName" placeholder="请输入表名"></el-input>
         <div class="tip">
           用于生成CRUD指定的表名，不需要携带表前缀；对于生成过的表将不能在进行生成；或者可以删除对应的文件重新生成！对应系统中重要的数据表将不允许生成！
         </div>
-      </FormItem>
-      <!-- <FormItem label="是否存在">
-        <RadioGroup v-model="foundation.isTable" @on-change="changeRadio">
-          <Radio :label="1">是</Radio>
-          <Radio :label="0">否</Radio>
-        </RadioGroup>
-        <div class="tip">
-          数据库表可以生成系统存在的，也可以选择【否】后手动生成；如果不满足使用需求可以先在数据库中创建表，然后选择【是】再进行操作
-        </div>
-      </FormItem> -->
-      <!-- <FormItem label="字段配置">
-        <Button type="primary" @click="addRow">{{ foundation.isTable ? '获取字段' : '添加一行' }}</Button>
-        <div>
-          <Table
-            ref="selection"
-            :columns="columns"
-            :data="tableField"
-            no-data-text="暂无数据"
-            highlight-row
-            :loading="loading"
-            max-height="600"
-            size="small"
-            no-filtered-data-text="暂无筛选结果"
-          >
-            <template slot-scope="{ row, index }" slot="field">
-              <span v-if="foundation.isTable">{{ row.field }}</span>
-              <Input v-else :disabled="disabledInput(index)" v-model="tableField[index].field"></Input>
-            </template>
-            <template slot-scope="{ row, index }" slot="field_type">
-              <span v-if="foundation.isTable">{{ row.field_type }}</span>
-              <Select v-else v-model="tableField[index].field_type" @on-change="changeItemField($event, index)">
-                <Option v-for="item in columnTypeList" :value="item" :key="item">{{ item }}</Option>
-              </Select>
-            </template>
-            <template slot-scope="{ row, index }" slot="limit">
-              <span v-if="foundation.isTable">{{ row.limit }}</span>
-              <Input v-else v-model="tableField[index].limit" :disabled="disabledInput(index)"></Input>
-            </template>
-            <template slot-scope="{ row, index }" slot="default">
-              <span v-if="foundation.isTable">{{ row.default }}</span>
-              <Input v-else v-model="tableField[index].default" :disabled="disabledInput(index)"></Input>
-            </template>
-            <template slot-scope="{ row, index }" slot="comment">
-              <span v-if="foundation.isTable">{{ row.comment }}</span>
-              <Input v-else v-model="tableField[index].comment" :disabled="disabledInput(index)"></Input>
-            </template>
-            <template slot-scope="{ row, index }" slot="required">
-              <Checkbox v-model="tableField[index].required" :disabled="disabledInput(index)"></Checkbox>
-            </template>
-            <template slot-scope="{ row, index }" slot="is_table">
-              <Checkbox v-model="tableField[index].is_table" :disabled="disabledInput(index)"></Checkbox>
-            </template>
-            <template slot-scope="{ row, index }" slot="table_name">
-              <Input v-model="tableField[index].table_name" :disabled="disabledInput(index)"></Input>
-            </template>
-            <template slot-scope="{ row, index }" slot="from_type">
-              <Select v-model="tableField[index].from_type" :disabled="disabledInput(index)">
-                <Option v-for="item in fromTypeList" :value="item.value" :key="item.value">{{ item.label }}</Option>
-              </Select>
-            </template>
-            <template slot-scope="{ row, index }" slot="action">
-              <a v-if="!foundation.isTable" @click="del(row, index)">删除</a>
-              <span v-else>--</span>
-            </template>
-          </Table>
-        </div>
-      </FormItem> -->
-    </Form>
+      </el-form-item>
+    </el-form>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/system/codeGeneration/components/StorageLoc.vue b/template/admin/src/pages/system/codeGeneration/components/StorageLoc.vue
index a319014e2..86517d60d 100644
--- a/template/admin/src/pages/system/codeGeneration/components/StorageLoc.vue
+++ b/template/admin/src/pages/system/codeGeneration/components/StorageLoc.vue
@@ -10,44 +10,44 @@
         <p>5、确保前端/admin/src目录、后端app目录有写入创建文件权限</p>
       </template>
     </Alert>
-    <Form ref="foundation" :model="storage" :rules="storageRules" :label-width="130">
-      <FormItem label="生成controller位置">
-        <Input class="form-width" v-model="storage.controller" disabled placeholder="请输入"></Input>
+    <el-form ref="foundation" :model="storage" :rules="storageRules" label-width="130px">
+      <el-form-item label="生成controller位置">
+        <el-input class="form-width" v-model="storage.controller" disabled placeholder="请输入"></el-input>
         <div class="tip">生成后端控制器文件存放位置</div>
-      </FormItem>
-      <FormItem label="生成service位置">
-        <Input class="form-width" v-model="storage.service" disabled placeholder="请输入"></Input>
+      </el-form-item>
+      <el-form-item label="生成service位置">
+        <el-input class="form-width" v-model="storage.service" disabled placeholder="请输入"></el-input>
         <div class="tip">生成后端service文件存放位置</div>
-      </FormItem>
-      <FormItem label="生成dao位置">
-        <Input class="form-width" v-model="storage.dao" disabled placeholder="请输入"></Input>
+      </el-form-item>
+      <el-form-item label="生成dao位置">
+        <el-input class="form-width" v-model="storage.dao" disabled placeholder="请输入"></el-input>
         <div class="tip">生成后端dao文件存放位置</div>
-      </FormItem>
-      <FormItem label="生成model位置">
-        <Input class="form-width" v-model="storage.model" disabled placeholder="请输入"></Input>
+      </el-form-item>
+      <el-form-item label="生成model位置">
+        <el-input class="form-width" v-model="storage.model" disabled placeholder="请输入"></el-input>
         <div class="tip">生成后端model文件存放位置</div>
-      </FormItem>
-      <FormItem label="生成route位置">
-        <Input class="form-width" v-model="storage.route" disabled placeholder="请输入"></Input>
+      </el-form-item>
+      <el-form-item label="生成route位置">
+        <el-input class="form-width" v-model="storage.route" disabled placeholder="请输入"></el-input>
         <div class="tip">生成后端路由存放位置</div>
-      </FormItem>
-      <FormItem label="生成validate位置">
-        <Input class="form-width" v-model="storage.validate" disabled placeholder="请输入"></Input>
+      </el-form-item>
+      <el-form-item label="生成validate位置">
+        <el-input class="form-width" v-model="storage.validate" disabled placeholder="请输入"></el-input>
         <div class="tip">生成后端验证器存放位置</div>
-      </FormItem>
-      <FormItem label="生成pages位置">
-        <Input class="form-width" v-model="storage.pages" disabled placeholder="请输入"></Input>
+      </el-form-item>
+      <el-form-item label="生成pages位置">
+        <el-input class="form-width" v-model="storage.pages" disabled placeholder="请输入"></el-input>
         <div class="tip">生成前端页面文件存放位置</div>
-      </FormItem>
-      <FormItem label="生成api位置">
-        <Input class="form-width" v-model="storage.api" disabled placeholder="请输入"></Input>
+      </el-form-item>
+      <el-form-item label="生成api位置">
+        <el-input class="form-width" v-model="storage.api" disabled placeholder="请输入"></el-input>
         <div class="tip">生成前端api接口文件存放位置</div>
-      </FormItem>
-      <FormItem label="生成router位置">
-        <Input class="form-width" v-model="storage.router" disabled placeholder="请输入"></Input>
+      </el-form-item>
+      <el-form-item label="生成router位置">
+        <el-input class="form-width" v-model="storage.router" disabled placeholder="请输入"></el-input>
         <div class="tip">生成前端路由存放位置</div>
-      </FormItem>
-    </Form>
+      </el-form-item>
+    </el-form>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/system/codeGeneration/components/TableForm.vue b/template/admin/src/pages/system/codeGeneration/components/TableForm.vue
index c1b6643c8..d6e6ef72c 100644
--- a/template/admin/src/pages/system/codeGeneration/components/TableForm.vue
+++ b/template/admin/src/pages/system/codeGeneration/components/TableForm.vue
@@ -18,81 +18,110 @@
       </template>
     </Alert>
     <div class="df">
-      <Button class="mr20" type="primary" @click="addRow">添加一行</Button>
-      <Checkbox class="mr10" v-model="isCreate" @on-change="addCreate">添加与修改时间</Checkbox>
-      <Checkbox class="mr10" v-model="isDelete" @on-change="addDelete">伪删除</Checkbox>
+      <el-button class="mr20" type="primary" @click="addRow">添加一行</el-button>
+      <el-checkbox class="mr10" v-model="isCreate" @change="addCreate">添加与修改时间</el-checkbox>
+      <el-checkbox class="mr10" v-model="isDelete" @change="addDelete">伪删除</el-checkbox>
     </div>
     <div>
-      <Table
+      <el-table
         ref="selection"
-        :columns="columns"
         :data="tableField"
-        no-data-text="暂无数据"
-        highlight-row
-        :loading="loading"
+        empty-text="暂无数据"
+        highlight-current-row
+        v-loading="loading"
         max-height="600"
         size="small"
-        no-filtered-data-text="暂无筛选结果"
+        
       >
-        <template slot-scope="{ row, index }" slot="field">
-          <Input
-            :disabled="disabledInput(index)"
-            v-model="tableField[index].field"
-            @on-blur="changeField(index)"
-          ></Input>
-        </template>
-        <template slot-scope="{ row, index }" slot="field_type">
-          <Select
-            v-model="tableField[index].field_type"
-            :disabled="disabledInput(index)"
-            @on-change="changeItemField($event, index)"
-          >
-            <Option v-for="item in columnTypeList" :value="item" :key="item">{{ item }}</Option>
-          </Select>
-        </template>
-        <template slot-scope="{ row, index }" slot="limit">
-          <Input v-model="tableField[index].limit" :disabled="disabledInput(index)"></Input>
-        </template>
-        <template slot-scope="{ row, index }" slot="default">
-          <Input v-model="tableField[index].default" :disabled="disabledInput(index)"></Input>
-        </template>
-        <template slot-scope="{ row, index }" slot="comment">
-          <Input
-            v-model="tableField[index].comment"
-            :disabled="disabledInput(index)"
-            @on-change="(e) => changeComment(e, index)"
-          ></Input>
-        </template>
-        <template slot-scope="{ row, index }" slot="required">
-          <Checkbox v-model="tableField[index].required" :disabled="disabledInput(index)"></Checkbox>
-        </template>
-        <template slot-scope="{ row, index }" slot="is_table">
-          <Checkbox v-model="tableField[index].is_table" :disabled="disabledInput(index)"></Checkbox>
-        </template>
-        <template slot-scope="{ row, index }" slot="table_name">
-          <Input v-model="tableField[index].table_name" :disabled="disabledInput(index)"></Input>
-        </template>
-        <template slot-scope="{ row, index }" slot="from_type">
-          <Select v-model="tableField[index].from_type" :disabled="disabledInput(index)">
-            <Option v-for="item in fromTypeList" :value="item.value" :key="item.value">{{ item.label }}</Option>
-          </Select>
-        </template>
-        <template slot-scope="{ row, index }" slot="options">
-          <div class="table-options" v-if="['select', 'radio', 'checkbox'].includes(tableField[index].from_type)">
-            <Select>
-              <Option v-for="item in tableField[index].options" :value="item.value" :key="item.value">{{
-                item.label
-              }}</Option>
-            </Select>
-            <Icon class="create" type="md-create" @click="eidtOptions(index)" />
-          </div>
-          <div v-else>--</div>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a v-if="!tableField[index].primaryKey && !disabledInput(index)" @click="del(row, index)">删除</a>
-          <span v-else>--</span>
-        </template>
-      </Table>
+        <el-table-column label="字段名称" min-width="100">
+          <template slot-scope="scope">
+            <el-input
+              :disabled="disabledInput(scope.$index)"
+              v-model="scope.row.field"
+              @blur="changeField(scope.$index)"
+            ></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column label="字段类型" min-width="130">
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.field_type"
+              :disabled="disabledInput(scope.$index)"
+              @change="changeItemField($event, scope.$index)"
+            >
+              <el-option v-for="item in columnTypeList" :value="item" :key="item" :label="item"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column label="长度" min-width="130">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.limit" :disabled="disabledInput(scope.$index)"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column label="默认值" min-width="130">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.default" :disabled="disabledInput(scope.$index)"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column label="字段描述" min-width="130">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.comment"
+              :disabled="disabledInput(scope.$index)"
+              @change="(e) => changeComment(e, scope.$index)"
+            ></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column label="列表" min-width="130">
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.is_table" :disabled="disabledInput(scope.$index)"></el-checkbox>
+          </template>
+        </el-table-column>
+        <el-table-column label="列表名" min-width="130">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.table_name" :disabled="disabledInput(scope.$index)"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column label="表单类型" min-width="130">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.from_type" :disabled="disabledInput(scope.$index)">
+              <el-option
+                v-for="item in fromTypeList"
+                :value="item.value"
+                :key="item.value"
+                :label="item.label"
+              ></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column label="字典配置" min-width="130">
+          <template slot-scope="scope">
+            <div class="table-options" v-if="['select', 'radio', 'checkbox'].includes(scope.row.from_type)">
+              <el-select>
+                <el-option
+                  v-for="item in scope.row.options"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+                ></el-option>
+              </el-select>
+              <Icon class="create" type="md-create" @click="eidtOptions(scope.$index)" />
+            </div>
+            <div v-else>--</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="必填" min-width="130">
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.required" :disabled="disabledInput(scope.$index)"></el-checkbox>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="100">
+          <template slot-scope="scope">
+            <a v-if="!scope.row.primaryKey && !disabledInput(scope.$index)" @click="del(row, scope.$index)">删除</a>
+            <span v-else>--</span>
+          </template>
+        </el-table-column>
+      </el-table>
     </div>
     <Modal
       v-model="optionsModal"
@@ -106,8 +135,8 @@
     >
       <div class="options-list">
         <div class="item" v-for="(item, index) in optionsList" :key="index">
-          <Input class="mr10" v-model="item.label" placeholder="label" style="width: 150px" />
-          <Input class="mr10" v-model="item.value" placeholder="value" style="width: 150px" />
+          <el-input class="mr10" v-model="item.label" placeholder="label" style="width: 150px" />
+          <el-input class="mr10" v-model="item.value" placeholder="value" style="width: 150px" />
           <Icon v-if="index == optionsList.length - 1" class="add" type="md-add-circle" @click="addOneOptions" />
           <Icon v-if="index > 0" class="add" type="md-remove-circle" @click="delOneOptions(index)" />
         </div>
@@ -367,7 +396,7 @@ export default {
       }
     },
     changeField(index) {
-      console.log(this.tableField[index].field)
+      console.log(this.tableField[index].field);
       if (this.tableField[index].field) {
         for (let i = 0; i < this.tableField.length; i++) {
           const e = this.tableField[i];
diff --git a/template/admin/src/pages/system/codeGeneration/index.vue b/template/admin/src/pages/system/codeGeneration/index.vue
index eeacffc12..9961ceddd 100644
--- a/template/admin/src/pages/system/codeGeneration/index.vue
+++ b/template/admin/src/pages/system/codeGeneration/index.vue
@@ -3,31 +3,31 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <router-link :to="{ path: $routeProStr + '/system/code_generation_list' }"
-          ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
+          ><el-button icon="ios-arrow-back" size="small" type="text">返回</el-button></router-link
         >
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span class="ivu-page-header-title mr20" style="padding: 0">添加功能</span>
       </div>
     </div>
     <div class="message">
-      <Card :bordered="false" dis-hover class="">
+      <el-card :bordered="false" shadow="never" class="">
         <Steps :current="currentTab">
           <Step :title="item.label" v-for="(item, index) in headerList" :key="index"></Step>
         </Steps>
-      </Card>
+      </el-card>
     </div>
     <div class="pt10 tab-1" v-show="currentTab == '0'">
-      <Card :bordered="false" dis-hover class="ivu-mt">
+      <el-card :bordered="false" shadow="never" class="ivu-mt">
         <FoundationForm
           ref="Foundation"
           :foundation="formItem.foundation"
           :tableField="tableField"
           @storageData="storageData"
         />
-      </Card>
+      </el-card>
     </div>
     <div class="pt10" v-show="currentTab == '1'">
-      <Card :bordered="false" dis-hover class="ivu-mt">
+      <el-card :bordered="false" shadow="never" class="ivu-mt">
         <TableForm
           ref="TableForm"
           :foundation="formItem.foundation"
@@ -35,17 +35,17 @@
           :id="id"
           @storageData="storageData"
         />
-      </Card>
+      </el-card>
     </div>
     <div class="pt10" v-show="currentTab == '2'">
-      <Card :bordered="false" dis-hover class="ivu-mt">
+      <el-card :bordered="false" shadow="never" class="ivu-mt">
         <StorageLoc :storage="formItem.storage" />
-      </Card>
+      </el-card>
     </div>
-    <Card :bordered="false" class="btn" dis-hover>
-      <Button class="mr20" @click="beforeTab">上一步</Button>
-      <Button type="primary" @click="nextTab">{{ currentTab == 2 ? '提交' : '下一步' }}</Button>
-    </Card>
+    <el-card :bordered="false" class="btn" shadow="never">
+      <el-button class="mr20" @click="beforeTab">上一步</el-button>
+      <el-button type="primary" @click="nextTab">{{ currentTab == 2 ? '提交' : '下一步' }}</el-button>
+    </el-card>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/system/codeGeneration/list.vue b/template/admin/src/pages/system/codeGeneration/list.vue
index 2ab2b10b9..eab8f261a 100644
--- a/template/admin/src/pages/system/codeGeneration/list.vue
+++ b/template/admin/src/pages/system/codeGeneration/list.vue
@@ -1,52 +1,65 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Button type="primary" @click="groupAdd()" class="mr20">添加功能</Button>
-      <!-- <Button type="success" @click="buildCode()" class="mr20">重新发布</Button> -->
-      <Table
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-button type="primary" @click="groupAdd()" class="mr20">添加功能</el-button>
+      <!-- <el-button type="success" @click="buildCode()" class="mr20">重新发布</el-button> -->
+      <el-table
         :columns="columns1"
         :data="tabList"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="statuss">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">显示</span>
-            <span slot="close">隐藏</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row, '编辑')">查看</a>
-          <Divider type="vertical" />
-          <a @click="editItem(row)">编辑</a>
-          <Divider type="vertical" />
-          <a @click="downLoad(row)">下载</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="菜单名" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="表名" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.table_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="表备注" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.table_comment }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="添加时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row, '编辑')">查看</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="editItem(scope.row)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="downLoad(scope.row)">下载</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <Drawer
       :class-name="className"
       title="Create"
@@ -70,12 +83,12 @@
         <span>{{ title }}</span>
       </p>
       <div class="file" style="height: 100%">
-        <Button class="save" type="primary" @click="pwdModal = true">保存</Button>
+        <el-button class="save" type="primary" @click="pwdModal = true">保存</el-button>
 
         <div class="file-box">
           <div class="file-fix"></div>
           <div class="file-content">
-            <!-- <Tabs
+            <!-- <el-tabs
               type="card"
               v-model="indexEditor"
               style="height: 100%"
@@ -84,7 +97,7 @@
               closable
               @on-tab-remove="handleTabRemove"
             >
-              <TabPane
+              <el-tab-pane
                 v-for="value in editorIndex"
                 :key="value.index"
                 :name="value.index.toString()"
@@ -96,12 +109,12 @@
                   :id="'container_' + value.index"
                   style="height: 100%; min-height: calc(100vh - 110px)"
                 ></div>
-              </TabPane>
-            </Tabs> -->
+              </el-tab-pane>
+            </el-tabs> -->
             <el-tabs v-model="indexEditor" type="card" @tab-click="toggleEditor">
               <el-tab-pane v-for="value in editorIndex" :key="value.index">
                 <span slot="label">
-                  <el-tooltip class="item" effect="dark" :content="value.title" placement="top">
+                  <el-tooltip effect="light" class="item" :content="value.title" placement="top">
                     <span>{{ value.file_name }}</span>
                   </el-tooltip>
                 </span>
@@ -123,8 +136,8 @@
 
       <!-- </Modal> -->
       <!-- <div class="demo-drawer-footer">
-        <Button style="margin-right: 8px" @click="modals = false">关闭</Button>
-        <Button type="primary" @click="modals = false">保存</Button>
+        <el-button style="margin-right: 8px" @click="modals = false">关闭</el-button>
+        <el-button type="primary" @click="modals = false">保存</el-button>
       </div> -->
     </Drawer>
     <Modal
@@ -149,7 +162,7 @@
       @on-ok="crudSaveFile"
       @on-cancel="pwdModal = false"
     >
-      <Input v-model="pwd" type="password" placeholder="请输入文件管理密码"></Input>
+      <el-input v-model="pwd" type="password" placeholder="请输入文件管理密码"></el-input>
     </Modal>
   </div>
 </template>
@@ -160,7 +173,7 @@ import { crudList, crudDet, crudDownload, crudSaveFile } from '@/api/systemCodeG
 import * as monaco from 'monaco-editor';
 import { getCookies, removeCookies } from '@/libs/util';
 import Setting from '@/setting';
-import { Input } from 'view-design';
+// import { el-input } from 'view-design';
 export default {
   data() {
     return {
@@ -249,7 +262,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -321,10 +334,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.formValidate.page = 1;
diff --git a/template/admin/src/pages/system/configTab/index.vue b/template/admin/src/pages/system/configTab/index.vue
index 38e301948..6f446bce2 100644
--- a/template/admin/src/pages/system/configTab/index.vue
+++ b/template/admin/src/pages/system/configTab/index.vue
@@ -1,40 +1,40 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="是否显示：">
-              <Select v-model="formValidate.status" placeholder="请选择" clearable @on-change="userSearchs">
-                <Option value="1">显示</Option>
-                <Option value="0">不显示</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="分类名称：" label-for="status2">
-              <Input
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="是否显示：">
+              <el-select v-model="formValidate.status" placeholder="请选择" clearable @change="userSearchs">
+                <el-option value="1" label="显示"></el-option>
+                <el-option value="0" label="不显示"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="分类名称：" label-for="status2">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入分类名称"
                 v-model="formValidate.title"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button type="primary" icon="md-add" @click="classAdd" class="mr20">添加配置分类</Button>
-          </Col>
-        </Row>
-      </Form>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-button type="primary" icon="md-add" @click="classAdd" class="mr20">添加配置分类</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
       <vxe-table
         :border="false"
         class="vxeTable mt25"
@@ -51,40 +51,37 @@
         <vxe-table-column field="eng_title" title="分类字段" min-width="150"></vxe-table-column>
         <vxe-table-column field="statuss" title="状态" min-width="150">
           <template v-slot="{ row }">
-            <i-switch
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
               v-model="row.status"
               :value="row.status"
-              :true-value="1"
-              :false-value="0"
-              @on-change="onchangeIsShow(row)"
+              @change="onchangeIsShow(row)"
               size="large"
             >
-              <span slot="open">显示</span>
-              <span slot="close">隐藏</span>
-            </i-switch>
+            </el-switch>
           </template>
         </vxe-table-column>
         <vxe-table-column field="action" title="操作" min-width="150" fixed="right">
           <template v-slot="{ row, index }">
             <a @click="goList(row)">配置列表</a>
-            <Divider type="vertical" />
+            <el-divider direction="vertical"></el-divider>
             <a @click="edit(row)">编辑</a>
-            <Divider type="vertical" />
+            <el-divider direction="vertical"></el-divider>
             <a @click="del(row, '删除分类', index)">删除</a>
           </template>
         </vxe-table-column>
       </vxe-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
 
     <!-- 新建  编辑表单-->
     <edit-from ref="edits" :update="true" :FromData="FromData" @submitFail="submitFail"></edit-from>
@@ -124,7 +121,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -200,10 +197,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.formValidate.page = 1;
diff --git a/template/admin/src/pages/system/configTab/list.vue b/template/admin/src/pages/system/configTab/list.vue
index 99ec22263..e3d610fbe 100644
--- a/template/admin/src/pages/system/configTab/list.vue
+++ b/template/admin/src/pages/system/configTab/list.vue
@@ -3,74 +3,105 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <router-link :to="{ path: $routeProStr + '/system/config/system_config_tab/index' }"
-          ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
+          ><el-button icon="ios-arrow-back" size="small" type="text">返回</el-button></router-link
         >
-        <Divider type="vertical" />
+        <el-divider direction="vertical"></el-divider>
         <span class="ivu-page-header-title mr20" style="padding: 0" v-text="$route.meta.title"></span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row type="flex">
-        <Col v-bind="grid">
-          <Button type="primary" @click="goIndex" class="mr20">配置分类</Button>
-          <Button type="primary" icon="md-add" @click="configureAdd">添加配置</Button>
-        </Col>
-      </Row>
-      <Divider dashed />
-      <Table
-        :columns="columns1"
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row>
+        <el-col v-bind="grid">
+          <el-button type="primary" @click="goIndex" class="mr20">配置分类</el-button>
+          <el-button type="primary" icon="md-add" @click="configureAdd">添加配置</el-button>
+        </el-col>
+      </el-row>
+      <el-divider direction="vertical" dashed />
+      <el-table
         :data="classList"
         ref="table"
         :loading="loading"
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="values">
-          <span
-            v-if="row.type === 'text' || row.type === 'textarea' || row.type === 'radio' || row.type === 'checkbox'"
-            >{{ row.value }}</span
-          >
-          <div class="valBox acea-row" v-if="row.type === 'upload' && row.upload_type === 3">
-            <div v-if="row.value.length">
-              <div class="valPicbox acea-row row-column-around" v-for="(item, index) in row.value" :key="index">
-                <div class="valPicbox_pic"><Icon type="md-document" /></div>
-                <span class="valPicbox_sp">{{ item.filename }}</span>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="配置名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.info }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="字段变量" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.menu_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="字段类型" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.type }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="值" min-width="130">
+          <template slot-scope="scope">
+            <span
+              v-if="
+                scope.row.type === 'text' ||
+                scope.row.type === 'textarea' ||
+                scope.row.type === 'radio' ||
+                scope.row.type === 'checkbox'
+              "
+              >{{ scope.row.value }}</span
+            >
+            <div class="valBox acea-row" v-if="scope.row.type === 'upload' && scope.row.upload_type === 3">
+              <div v-if="scope.row.value.length">
+                <div
+                  class="valPicbox acea-scope.row scope.row-column-around"
+                  v-for="(item, index) in scope.row.value"
+                  :key="index"
+                >
+                  <div class="valPicbox_pic"><Icon type="md-document" /></div>
+                  <span class="valPicbox_sp">{{ item.filename }}</span>
+                </div>
               </div>
             </div>
-          </div>
-          <div class="valBox acea-row" v-if="row.type === 'upload' && row.upload_type !== 3">
-            <div v-if="row.value.length">
-              <div class="valPicbox acea-row row-column-around" v-for="(item, index) in row.value" :key="index">
-                <div class="valPicbox_pic"><img v-lazy="item.filepath" /></div>
-                <span class="valPicbox_sp">{{ item.filename }}</span>
+            <div class="valBox acea-row" v-if="scope.row.type === 'upload' && scope.row.upload_type !== 3">
+              <div v-if="scope.row.value.length">
+                <div class="valPicbox acea-row row-column-around" v-for="(item, index) in scope.row.value" :key="index">
+                  <div class="valPicbox_pic"><img v-lazy="item.filepath" /></div>
+                  <span class="valPicbox_sp">{{ item.filename }}</span>
+                </div>
               </div>
             </div>
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="statuss">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">显示</span>
-            <span slot="close">隐藏</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row)">编辑</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除分类', index)">删除</a>
-        </template>
-      </Table>
-      <!--            <div class="acea-row row-right page">-->
-      <!--                <Page :total="total" show-elevator show-total @on-change="pageChange"-->
-      <!--                      :page-size="formValidate.limit"/>-->
-      <!--            </div>-->
-    </Card>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否显示" min-width="130">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              :value="scope.row.status"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+              active-text="显示"
+              inactive-text="隐藏"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="120">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row)">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除分类', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
 
     <!-- 新建 表单-->
     <Modal
@@ -83,14 +114,14 @@
       :z-index="1"
       width="700"
     >
-      <Tabs v-model="typeFrom.type" @on-click="onhangeTab" class="tabsName">
-        <TabPane label="文本框 " name="0"></TabPane>
-        <TabPane label="多行文本框" name="1"></TabPane>
-        <TabPane label="单选框" name="2"></TabPane>
-        <TabPane label="文件上传" name="3"></TabPane>
-        <TabPane label="多选框" name="4"></TabPane>
-        <TabPane label="下拉框" name="5"></TabPane>
-      </Tabs>
+      <el-tabs v-model="typeFrom.type" @tag-click="onhangeTab" class="tabsName">
+        <el-tab-pane label="文本框 " name="0"></el-tab-pane>
+        <el-tab-pane label="多行文本框" name="1"></el-tab-pane>
+        <el-tab-pane label="单选框" name="2"></el-tab-pane>
+        <el-tab-pane label="文件上传" name="3"></el-tab-pane>
+        <el-tab-pane label="多选框" name="4"></el-tab-pane>
+        <el-tab-pane label="下拉框" name="5"></el-tab-pane>
+      </el-tabs>
       <form-create
         v-if="rules.length != 0"
         :rule="rules"
@@ -130,44 +161,6 @@ export default {
         limit: 20,
       },
       total: 0,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '配置名称',
-          key: 'info',
-          minWidth: 130,
-        },
-        {
-          title: '字段变量',
-          key: 'menu_name',
-          minWidth: 140,
-        },
-        {
-          title: '字段类型',
-          key: 'type',
-          minWidth: 90,
-        },
-        {
-          title: '值',
-          slot: 'values',
-          minWidth: 230,
-        },
-        {
-          title: '是否显示',
-          slot: 'statuss',
-          minWidth: 90,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 120,
-        },
-      ],
       FromData: null,
       FromRequestData: {},
       modalTitleSs: '',
@@ -194,8 +187,7 @@ export default {
   },
   methods: {
     // 点击tab
-    onhangeTab(name) {
-      this.typeFrom.type = name;
+    onhangeTab() {
       this.classAdd();
     },
     // 新增表单
diff --git a/template/admin/src/pages/system/crontab/createModal.vue b/template/admin/src/pages/system/crontab/createModal.vue
index 236bb9486..f5de3a8f0 100644
--- a/template/admin/src/pages/system/crontab/createModal.vue
+++ b/template/admin/src/pages/system/crontab/createModal.vue
@@ -8,92 +8,105 @@
       @on-cancel="modal = true"
       @on-visible-change="initData"
     >
-      <Form ref="formValidate" :model="formValidate" :label-width="97" label-colon>
-        <FormItem label="任务名称" required>
-          <Row :gutter="16">
-            <Col span="20">
-              <Select v-model="formValidate.mark" label-in-value @on-change="taskChange">
-                <Option v-for="(value, name) in task" :key="name" :value="name">{{ value }}</Option>
-              </Select>
-            </Col>
-          </Row>
-        </FormItem>
-        <FormItem label="执行周期" required>
-          <Row :gutter="14">
-            <Col span="4">
-              <Select v-model="formValidate.type">
-                <Option v-for="item in typeList" :key="item.value" :value="item.value">{{ item.name }}</Option>
-              </Select>
-            </Col>
-            <Col v-if="formValidate.type == 6" span="4">
-              <Select v-model="formValidate.week">
-                <Option v-for="item in 7" :key="item" :value="item">{{ item | formatWeek }}</Option>
-              </Select>
-            </Col>
-            <Col v-if="[4, 7].includes(formValidate.type)" span="4">
+      <el-form ref="formValidate" :model="formValidate" :label-width="97" label-colon>
+        <el-form-item label="任务名称" required>
+          <el-row :gutter="16">
+            <el-col :span="20">
+              <el-select v-model="formValidate.mark" label-in-value @change="taskChange">
+                <el-option v-for="(value, name) in task" :key="name" :value="name" :label="value"></el-option>
+              </el-select>
+            </el-col>
+          </el-row>
+        </el-form-item>
+        <el-form-item label="执行周期" required>
+          <el-row :gutter="14">
+            <el-col :span="4">
+              <el-select v-model="formValidate.type">
+                <el-option
+                  v-for="item in typeList"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="item.name"
+                ></el-option>
+              </el-select>
+            </el-col>
+            <el-col v-if="formValidate.type == 6" :span="4">
+              <el-select v-model="formValidate.week">
+                <el-option v-for="item in 7" :key="item" :value="item" :label="`${item | formatWeek}`"></el-option>
+              </el-select>
+            </el-col>
+            <el-col v-if="[4, 7].includes(formValidate.type)" :span="4">
               <div class="input-number-wrapper">
-                <InputNumber
+                <el-input-number
+                  controls-position="right"
                   v-model="formValidate.day"
                   :max="formValidate.type === 4 ? 10000 : 31"
                   :min="1"
-                ></InputNumber>
+                ></el-input-number>
                 <span class="suffix">日</span>
               </div>
-            </Col>
-            <Col v-if="[3, 4, 5, 6, 7].includes(formValidate.type)" span="4">
+            </el-col>
+            <el-col v-if="[3, 4, 5, 6, 7].includes(formValidate.type)" :span="4">
               <div class="input-number-wrapper">
-                <InputNumber v-model="formValidate.hour" :max="23" :min="0"></InputNumber>
+                <el-input-number
+                  controls-position="right"
+                  v-model="formValidate.hour"
+                  :max="23"
+                  :min="0"
+                ></el-input-number>
                 <span class="suffix">时</span>
               </div>
-            </Col>
-            <Col span="4" v-if="[2, 3, 4, 5, 6, 7].includes(formValidate.type)">
+            </el-col>
+            <el-col :span="4" v-if="[2, 3, 4, 5, 6, 7].includes(formValidate.type)">
               <div class="input-number-wrapper">
-                <InputNumber
+                <el-input-number
+                  controls-position="right"
                   v-model="formValidate.minute"
                   :max="formValidate.type === 2 ? 36000 : 59"
                   :min="0"
-                ></InputNumber>
+                ></el-input-number>
                 <span class="suffix">分</span>
               </div>
-            </Col>
-            <Col span="4" v-if="[1, 5, 6, 7].includes(formValidate.type)">
+            </el-col>
+            <el-col :span="4" v-if="[1, 5, 6, 7].includes(formValidate.type)">
               <div class="input-number-wrapper">
-                <InputNumber
+                <el-input-number
+                  controls-position="right"
                   v-model="formValidate.second"
                   :max="formValidate.type === 1 ? 36000 : 59"
                   :min="0"
-                ></InputNumber>
+                ></el-input-number>
                 <span class="suffix">秒</span>
               </div>
-            </Col>
-          </Row>
-          <Row :gutter="12">
+            </el-col>
+          </el-row>
+          <el-row :gutter="12">
             <div class="trip">{{ trip }}</div>
-          </Row>
-        </FormItem>
-        <FormItem label="任务说明">
-          <Row :gutter="10">
-            <Col span="20">
-              <Input
+          </el-row>
+        </el-form-item>
+        <el-form-item label="任务说明">
+          <el-row :gutter="10">
+            <el-col :span="20">
+              <el-input
                 v-model="formValidate.content"
                 type="textarea"
                 :autosize="{ minRows: 5, maxRows: 5 }"
                 placeholder="请输入任务说明"
-              ></Input>
-            </Col>
-          </Row>
-        </FormItem>
-        <FormItem label="是否开启">
-          <Row :gutter="10">
-            <Col span="12">
-              <i-switch v-model="formValidate.is_open" :true-value="1" :false-value="0" size="large">
+              ></el-input>
+            </el-col>
+          </el-row>
+        </el-form-item>
+        <el-form-item label="是否开启">
+          <el-row :gutter="10">
+            <el-col :span="12">
+              <el-switch :active-value="1" :inactive-value="0" v-model="formValidate.is_open" size="large">
                 <span slot="open">开启</span>
                 <span slot="close">关闭</span>
-              </i-switch>
-            </Col>
-          </Row>
-        </FormItem>
-      </Form>
+              </el-switch>
+            </el-col>
+          </el-row>
+        </el-form-item>
+      </el-form>
     </Modal>
   </div>
 </template>
@@ -309,4 +322,7 @@ export default {
   padding-left: 15px;
   color: #aaa;
 }
+/deep/ .el-input-number__increase,/deep/ .el-input-number__decrease{
+  display none
+}
 </style>
diff --git a/template/admin/src/pages/system/crontab/index.vue b/template/admin/src/pages/system/crontab/index.vue
index 6b6312a3d..93b5785f0 100644
--- a/template/admin/src/pages/system/crontab/index.vue
+++ b/template/admin/src/pages/system/crontab/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <Card :bordered="false" dis-hover>
-    <Alert closable="true">
+  <el-card :bordered="false" shadow="never">
+    <Alert :closable="true">
       <template slot="desc">
         启动定时任务两种方式：<br />
         1、使用命令启动：php think timer start
@@ -8,28 +8,51 @@
         2、使用接口触发定时任务，建议每分钟调用一次，接口地址 https://您的域名/api/crontab/run
       </template>
     </Alert>
-    <Button type="primary" @click="addTask">添加定时任务</Button>
-    <Table :columns="columns" :data="tableData" :loading="loading" class="ivu-mt">
-      <template slot-scope="{ row }" slot="execution_cycle">
-        <span>{{ taskTrip(row) }}</span>
-      </template>
-      <template slot-scope="{ row }" slot="is_open">
-        <i-switch v-model="row.is_open" :true-value="1" :false-value="0" size="large" @on-change="handleChange(row)">
-          <span slot="open">开启</span>
-          <span slot="close">关闭</span>
-        </i-switch>
-      </template>
-      <template slot-scope="{ row }" slot="action">
-        <a @click="edit(row.id)">编辑</a>
-        <Divider type="vertical" />
-        <a @click="handleDelete(row, '删除秒杀商品', index)">删除</a>
-      </template>
-    </Table>
+    <el-button type="primary" @click="addTask">添加定时任务</el-button>
+    <el-table :columns="columns" :data="tableData" :loading="loading" class="ivu-mt">
+      <el-table-column label="title" min-width="150">
+        <template slot-scope="scope">
+          <span>{{ scope.row.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="任务说明" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.content }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="执行周期" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ taskTrip(scope.row) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否开启" min-width="130">
+        <template slot-scope="scope">
+          <el-switch
+            class="defineSwitch"
+            :active-value="1"
+            :inactive-value="0"
+            v-model="scope.row.is_open"
+            size="large"
+            @change="handleChange(scope.row)"
+            active-text="开启"
+            inactive-text="关闭"
+          >
+          </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" fixed="right" width="170">
+        <template slot-scope="scope">
+          <a @click="edit(scope.row.id)">编辑</a>
+          <el-divider direction="vertical"></el-divider>
+          <a @click="handleDelete(scope.row, '删除秒杀商品', index)">删除</a>
+        </template>
+      </el-table-column>
+    </el-table>
     <div class="acea-row row-right page">
-      <Page :total="total" :current="page" show-elevator show-total @on-change="pageChange" :page-size="limit" />
+      <pagination v-if="total" :total="total" :page.sync="page" :limit.sync="limit" @pagination="getList" />
     </div>
     <creatTask ref="addTask" @submitAsk="getList"></creatTask>
-  </Card>
+  </el-card>
 </template>
 
 <script>
@@ -160,10 +183,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.page = index;
-      this.getList();
-    },
   },
 };
 </script>
diff --git a/template/admin/src/pages/system/error/error-content.vue b/template/admin/src/pages/system/error/error-content.vue
index 0f1f9397e..e58b5e4f0 100644
--- a/template/admin/src/pages/system/error/error-content.vue
+++ b/template/admin/src/pages/system/error/error-content.vue
@@ -1,17 +1,17 @@
 <template>
   <div>
-    <Row class="acea-row row-middle list">
-      <Col :xs="24" :sm="12" :md="12" :lg="12" class="acea-row row-right right">
+    <el-row class="acea-row row-middle list">
+      <el-col :xs="24" :sm="12" :md="12" :lg="12" class="acea-row row-right right">
         <img :src="src" :alt="code" class="pictrue" />
-      </Col>
-      <Col :xs="24" :sm="12" :md="12" :lg="12" class="acea-row row-left left">
+      </el-col>
+      <el-col :xs="24" :sm="12" :md="12" :lg="12" class="acea-row row-left left">
         <div>
           <h1 class="num">{{ code }}</h1>
           <div class="desc">{{ desc }}</div>
-          <Button type="primary" size="large" @click="backHome">返回首页</Button>
+          <el-button type="primary" size="large" @click="backHome">返回首页</el-button>
         </div>
-      </Col>
-    </Row>
+      </el-col>
+    </el-row>
   </div>
 </template>
 <style scoped lang="less">
diff --git a/template/admin/src/pages/system/file/index.vue b/template/admin/src/pages/system/file/index.vue
index e92535dcd..d37be9f5b 100644
--- a/template/admin/src/pages/system/file/index.vue
+++ b/template/admin/src/pages/system/file/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="box" ref="picBox">
         <upload-file v-if="uploadShow" :isShow="0" :pageLimit="pageLimit"></upload-file>
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 <script>
diff --git a/template/admin/src/pages/system/group/components/groupFrom.vue b/template/admin/src/pages/system/group/components/groupFrom.vue
index f3095c40a..fd3a7840a 100644
--- a/template/admin/src/pages/system/group/components/groupFrom.vue
+++ b/template/admin/src/pages/system/group/components/groupFrom.vue
@@ -10,51 +10,51 @@
       :mask-closable="false"
       @on-cancel="handleReset"
     >
-      <Form ref="formValidate" :model="formValidate" :label-width="100" :rules="ruleValidate" @submit.native.prevent>
-        <Row type="flex" :gutter="24">
-          <Col span="24">
-            <FormItem label="数据组名称：" prop="name">
-              <Input v-model="formValidate.name" placeholder="请输入数据组名称" style="width: 90%"></Input>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="数据字段：" prop="config_name">
-              <Input v-model="formValidate.config_name" placeholder="请输入数据字段" style="width: 90%"></Input>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="数据简介：" prop="info">
-              <Input v-model="formValidate.info" placeholder="请输入数据简介" style="width: 90%"></Input>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <FormItem label="数类型：" prop="cate_id">
-              <RadioGroup v-model="formValidate.cate_id">
-                <Radio :label="0">默认</Radio>
-                <Radio :label="1">数据</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col span="24" v-for="(item, index) in formValidate.typelist" :key="index">
-            <Col v-bind="grid">
-              <FormItem
+      <el-form ref="formValidate" :model="formValidate" label-width="100px" :rules="ruleValidate" @submit.native.prevent>
+        <el-row  :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="数据组名称：" prop="name">
+              <el-input v-model="formValidate.name" placeholder="请输入数据组名称" style="width: 90%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="数据字段：" prop="config_name">
+              <el-input v-model="formValidate.config_name" placeholder="请输入数据字段" style="width: 90%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="数据简介：" prop="info">
+              <el-input v-model="formValidate.info" placeholder="请输入数据简介" style="width: 90%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="数类型：" prop="cate_id">
+              <el-radio-group v-model="formValidate.cate_id">
+                <el-radio :label="0">默认</el-radio>
+                <el-radio :label="1">数据</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-for="(item, index) in formValidate.typelist" :key="index">
+            <el-col v-bind="grid">
+              <el-form-item
                 :label="'字段' + (index + 1) + '：'"
                 :prop="'typelist.' + index + '.name.value'"
                 :rules="{ required: true, message: '请输入字段名称：姓名', trigger: 'blur' }"
               >
-                <Input v-model="item.name.value" placeholder="字段名称：姓名"></Input>
-              </FormItem>
-            </Col>
-            <Col v-bind="grid" class="goupBox">
-              <FormItem
+                <el-input v-model="item.name.value" placeholder="字段名称：姓名"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col v-bind="grid" class="goupBox">
+              <el-form-item
                 :prop="'typelist.' + index + '.title.value'"
                 :rules="{ required: true, message: '请输入字段配置名', trigger: 'blur' }"
               >
-                <Input v-model="item.title.value" placeholder="字段配置名：name"></Input>
-              </FormItem>
-            </Col>
-            <Col v-bind="grid" prop="type" class="goupBox mr15">
-              <FormItem
+                <el-input v-model="item.title.value" placeholder="字段配置名：name"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col v-bind="grid" prop="type" class="goupBox mr15">
+              <el-form-item
                 :prop="'typelist.' + index + '.type.value'"
                 :rules="{ required: true, message: '请选择字段类型', trigger: 'change' }"
               >
@@ -67,39 +67,39 @@
                   <i-option value="upload">单图</i-option>
                   <i-option value="uploads">多图</i-option>
                 </i-select>
-              </FormItem>
-            </Col>
-            <Col span="1">
+              </el-form-item>
+            </el-col>
+            <el-col span="1">
               <Icon type="ios-close-circle-outline" class="cur" @click="delGroup(index)" />
-            </Col>
-            <Col
-              span="24"
+            </el-col>
+            <el-col
+              :span="24"
               v-if="item.type.value === 'radio' || item.type.value === 'checkbox' || item.type.value === 'select'"
             >
-              <FormItem
+              <el-form-item
                 :prop="'typelist.' + index + '.param.value'"
                 :rules="{ required: true, message: '请输入参数方式', trigger: 'blur' }"
               >
-                <Input
+                <el-input
                   type="textarea"
                   :rows="4"
                   :placeholder="item.param.placeholder"
                   v-model="item.param.value"
                   style="width: 90%"
-                ></Input>
-              </FormItem>
-            </Col>
-          </Col>
-          <Col>
-            <FormItem>
-              <Button type="primary" @click="addType">添加字段</Button>
-            </FormItem>
-          </Col>
-          <Col span="24">
-            <Button type="primary" long @click="handleSubmit('formValidate')" :disabled="valids">提交</Button>
-          </Col>
-        </Row>
-      </Form>
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-col>
+          <el-col>
+            <el-form-item>
+              <el-button type="primary" @click="addType">添加字段</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-button type="primary" long @click="handleSubmit('formValidate')" :disabled="valids">提交</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
     </Modal>
   </div>
 </template>
diff --git a/template/admin/src/pages/system/group/index.vue b/template/admin/src/pages/system/group/index.vue
index d67049091..196b6d447 100644
--- a/template/admin/src/pages/system/group/index.vue
+++ b/template/admin/src/pages/system/group/index.vue
@@ -1,74 +1,81 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="数据搜索：" label-for="status2">
-              <Input
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="数据搜索：" label-for="status2">
+              <el-input
                 search
                 enter-button
                 placeholder="请输入ID,KEY,数据组名称,简介"
                 v-model="formValidate.title"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button type="primary" icon="md-add" @click="groupAdd('添加数据组')" class="mr20">添加数据组</Button>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-button type="primary" icon="md-add" @click="groupAdd('添加数据组')" class="mr20">添加数据组</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tabList"
         ref="table"
         class="mt25"
         :loading="loading"
-        highlight-row
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="statuss">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">显示</span>
-            <span slot="close">隐藏</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="goList(row)">数据列表</a>
-          <Divider type="vertical" />
-          <a @click="edit(row, '编辑')">编辑</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除数据组', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="KEY" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.config_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="数据组名称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="简介" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.info }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="goList(scope.row)">数据列表</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="edit(scope.row, '编辑')">编辑</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(scope.row, '删除数据组', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!-- 新增 编辑-->
     <group-from
       ref="groupfroms"
@@ -104,34 +111,7 @@ export default {
       loading: false,
       tabList: [],
       total: 0,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: 'KEY',
-          key: 'config_name',
-          minWidth: 130,
-        },
-        {
-          title: '数据组名称',
-          key: 'name',
-          minWidth: 130,
-        },
-        {
-          title: '简介',
-          key: 'info',
-          minWidth: 130,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 150,
-        },
-      ],
+
       FromData: null,
       titleFrom: '',
       groupId: 0,
@@ -141,7 +121,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -172,10 +152,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.formValidate.page = 1;
diff --git a/template/admin/src/pages/system/group/list.vue b/template/admin/src/pages/system/group/list.vue
index 9b48ff6f3..bac805b14 100644
--- a/template/admin/src/pages/system/group/list.vue
+++ b/template/admin/src/pages/system/group/list.vue
@@ -3,15 +3,15 @@
     <div class="i-layout-page-header header-title">
       <div class="fl_header">
         <router-link v-if="$route.params.id != 49" :to="{ path: $routeProStr + '/system/config/system_group/index' }"
-          ><Button icon="ios-arrow-back" size="small" type="text">返回</Button></router-link
+          ><el-button icon="ios-arrow-back" size="small" type="text">返回</el-button></router-link
         >
-        <Divider v-if="$route.params.id != 49" type="vertical" />
+        <el-divider direction="vertical" v-if="$route.params.id != 49" />
         <span class="ivu-page-header-title mr20" style="padding: 0" v-text="$route.meta.title"></span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row class="ivu-mt box-wrapper">
-        <Col :xs="24" :sm="24" :md="6" :lg="4" class="left-wrapper" v-if="!$route.params.id && groupAll.length">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row class="ivu-mt box-wrapper">
+        <el-col :xs="24" :sm="24" :md="6" :lg="4" class="left-wrapper" v-if="!$route.params.id && groupAll.length">
           <Menu :theme="theme3" :active-name="sortName" width="auto">
             <MenuGroup>
               <MenuItem
@@ -25,73 +25,89 @@
               </MenuItem>
             </MenuGroup>
           </Menu>
-        </Col>
-        <Col :xs="24" :sm="24" :md="$route.params.id ? 24 : 17" :lg="$route.params.id ? 24 : 20" ref="rightBox">
-          <Form
+        </el-col>
+        <el-col :xs="24" :sm="24" :md="$route.params.id ? 24 : 17" :lg="$route.params.id ? 24 : 20" ref="rightBox">
+          <el-form
             ref="formValidate"
             :model="formValidate"
             :label-width="labelWidth"
             :label-position="labelPosition"
             @submit.native.prevent
           >
-            <Row type="flex" :gutter="24">
-              <Col v-bind="grid">
-                <FormItem label="是否显示：">
-                  <Select v-model="formValidate.status" placeholder="请选择" clearable @on-change="userSearchs">
-                    <Option value="1">显示</Option>
-                    <Option value="0">不显示</Option>
-                  </Select>
-                </FormItem>
-              </Col>
-            </Row>
-            <Row type="flex">
-              <Col v-bind="grid">
-                <Button type="primary" icon="md-add" @click="groupAdd('添加数据')" class="mr20">添加数据</Button>
-              </Col>
-            </Row>
-          </Form>
-          <Table
+            <el-row :gutter="24">
+              <el-col v-bind="grid">
+                <el-form-item label="是否显示：">
+                  <el-select v-model="formValidate.status" placeholder="请选择" clearable @change="userSearchs">
+                    <el-option value="1" label="显示"></el-option>
+                    <el-option value="0" label="不显示"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col v-bind="grid">
+                <el-button type="primary" icon="md-add" @click="groupAdd('添加数据')" class="mr20">添加数据</el-button>
+              </el-col>
+            </el-row>
+          </el-form>
+          <el-table
             :columns="columns1"
             :data="tabList"
             ref="table"
             class="mt25"
             :loading="loading"
-            highlight-row
+            highlight-current-row
             no-userFrom-text="暂无数据"
             no-filtered-userFrom-text="暂无筛选结果"
           >
-            <template slot-scope="{ row, index }" slot="status">
-              <i-switch
-                v-model="row.status"
-                :value="row.status"
-                :true-value="1"
-                :false-value="0"
-                @on-change="onchangeIsShow(row)"
-                size="large"
-              >
-                <span slot="open">显示</span>
-                <span slot="close">隐藏</span>
-              </i-switch>
-            </template>
-            <template slot-scope="{ row, index }" slot="action">
-              <a @click="edit(row, '编辑')">编辑</a>
-              <Divider type="vertical" />
-              <a @click="del(row, '删除这条信息', index)">删除</a>
-            </template>
-          </Table>
+            <el-table-column
+              :label="item.title"
+              :min-width="item.minWidth"
+              v-for="(item, index) in columns1"
+              :key="index"
+            >
+              <template slot-scope="scope">
+                <template v-if="item.key">
+                  <div v-if="item.key !== 'slide'">
+                    <span>{{ scope.row[item.key] }}</span>
+                  </div>
+                  <div v-else>
+                    <div class="tabBox_img" v-viewer>
+                      <img v-lazy="scope.row[item.key][0]" />
+                    </div>
+                  </div>
+                </template>
+                <template v-else-if="item.slot === 'status'">
+                  <el-switch
+                    :active-value="1"
+                    :inactive-value="0"
+                    v-model="scope.row.status"
+                    :value="scope.row.status"
+                    @change="onchangeIsShow(scope.row)"
+                    size="large"
+                  >
+                  </el-switch>
+                </template>
+                <template v-else-if="item.slot === 'action'">
+                  <a @click="edit(scope.row, '编辑')">编辑</a>
+                  <el-divider direction="vertical"></el-divider>
+                  <a @click="del(scope.row, '删除这条信息', index)">删除</a>
+                </template>
+              </template>
+            </el-table-column>
+          </el-table>
           <div class="acea-row row-right page">
-            <Page
+            <pagination
+              v-if="total"
               :total="total"
-              :current="formValidate.page"
-              show-elevator
-              show-total
-              @on-change="pageChange"
-              :page-size="formValidate.limit"
+              :page.sync="formValidate.page"
+              :limit.sync="formValidate.limit"
+              @pagination="getList"
             />
           </div>
-        </Col>
-      </Row>
-    </Card>
+        </el-col>
+      </el-row>
+    </el-card>
   </div>
 </template>
 
@@ -140,7 +156,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -281,10 +297,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.formValidate.page = 1;
diff --git a/template/admin/src/pages/system/group/pc.vue b/template/admin/src/pages/system/group/pc.vue
index 6c05a848f..c7e34fd70 100644
--- a/template/admin/src/pages/system/group/pc.vue
+++ b/template/admin/src/pages/system/group/pc.vue
@@ -4,13 +4,13 @@
       <span class="ivu-page-header-title mr20">{{ $route.meta.title }}</span>
       <div>
         <div style="float: right">
-          <Button class="bnt" type="primary" @click="save">保存</Button>
+          <el-button class="bnt" type="primary" @click="save">保存</el-button>
         </div>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row class="box-wrapper">
-        <Col :xs="24" :sm="24" :md="6" :lg="3">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row class="box-wrapper">
+        <el-col :xs="24" :sm="24" :md="6" :lg="3">
           <div class="left_box">
             <div class="left_cont" :class="pageId == 1 ? 'on' : ''" @click="menu(1)">网站LOGO</div>
             <div class="left_cont" :class="pageId == 'pc_home_banner' ? 'on' : ''" @click="menu('pc_home_banner')">
@@ -18,9 +18,9 @@
             </div>
             <div class="left_cont" :class="pageId == 3 ? 'on' : ''" @click="menu(3)">客服页面广告</div>
           </div>
-        </Col>
+        </el-col>
         <div style="display: flex; width: 83%">
-          <Col v-if="pageId == 1 || pageId == 'pc_home_banner'" class="pciframe" :bordered="false" dis-hover>
+          <el-col v-if="pageId == 1 || pageId == 'pc_home_banner'" class="pciframe" :bordered="false" shadow="never">
             <img src="../../../assets/images/pcbanner.png" class="pciframe-box" />
             <div v-if="pageId == 1" class="logoimg">
               <img :src="pclogo" />
@@ -33,15 +33,15 @@
                 </swiper-slide>
               </swiper>
             </div>
-          </Col>
-          <Col v-if="pageId == 3" class="pciframe" :bordered="false" dis-hover>
+          </el-col>
+          <el-col v-if="pageId == 3" class="pciframe" :bordered="false" shadow="never">
             <img src="../../../assets/images/kefu.png" class="pciframe-box" />
             <div class="box3_sile">
               <!-- {{formValidate}} -->
               <div v-html="formValidate.content"></div>
             </div>
-          </Col>
-          <Col v-if="pageId == 'pc_home_banner'">
+          </el-col>
+          <el-col v-if="pageId == 'pc_home_banner'">
             <div class="content">
               <div class="right-box">
                 <div class="hot_imgs">
@@ -73,14 +73,14 @@
                           <div class="info-item">
                             <span>图片名称：</span>
                             <div class="input-box">
-                              <Input v-model="item.title" placeholder="请填写名称" />
+                              <el-input v-model="item.title" placeholder="请填写名称" />
                             </div>
                           </div>
                           <div class="info-item">
                             <span>链接地址：</span>
                             <!-- @click="link(index) icon="ios-arrow-forward" "-->
                             <div class="input-box">
-                              <Input v-model="item.url" placeholder="选择链接" />
+                              <el-input v-model="item.url" placeholder="选择链接" />
                             </div>
                           </div>
                         </div>
@@ -109,20 +109,20 @@
                   </div>
                   <template>
                     <div class="add-btn">
-                      <Button
+                      <el-button
                         type="primary"
                         ghost
                         style="width: 100px; height: 35px; background-color: #1890ff; color: #ffffff"
                         @click="addBox"
                         >添加图片
-                      </Button>
+                      </el-button>
                     </div>
                   </template>
                 </div>
               </div>
             </div>
-          </Col>
-          <Col v-if="pageId == 1">
+          </el-col>
+          <el-col v-if="pageId == 1">
             <div class="content">
               <div class="right-box">
                 <div class="hot_imgs">
@@ -159,16 +159,16 @@
                 </div>
               </div>
             </div>
-          </Col>
-          <Col v-if="pageId == 3" :xs="24" :sm="24" :md="12" :lg="14" style="margin-left: 40px">
+          </el-col>
+          <el-col v-if="pageId == 3" :xs="24" :sm="24" :md="12" :lg="14" style="margin-left: 40px">
             <div class="table_box">
-              <Row type="flex">
-                <Col v-bind="grid">
+              <el-row >
+                <el-col v-bind="grid">
                   <div class="title">隐私权限页面展示：</div>
-                </Col>
-              </Row>
+                </el-col>
+              </el-row>
               <div>
-                <Form
+                <el-form
                   class="form"
                   ref="formValidate"
                   :model="formValidate"
@@ -178,18 +178,18 @@
                   @submit.native.prevent
                 >
                   <div class="goodsTitle acea-row"></div>
-                  <FormItem label="" prop="content" style="margin: 0px">
+                  <el-form-item label="" prop="content" style="margin: 0px">
                     <WangEditor :content="content" @editorContent="getEditorContent"></WangEditor>
-                  </FormItem>
-                </Form>
+                  </el-form-item>
+                </el-form>
               </div>
             </div>
-          </Col>
+          </el-col>
         </div>
-      </Row>
-    </Card>
+      </el-row>
+    </el-card>
     <!-- <div class="save">
-			<Button type="primary" @click="save" >保存</Button>
+			<el-button type="primary" @click="save" >保存</el-button>
 		</div> -->
     <linkaddress ref="linkaddres" @linkUrl="linkUrl"></linkaddress>
   </div>
@@ -297,7 +297,7 @@ export default {
   computed: {
     ...mapState('admin/layout', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 120;
+      return this.isMobile ? undefined : '120px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
diff --git a/template/admin/src/pages/system/group/visualization.vue b/template/admin/src/pages/system/group/visualization.vue
index 09a1c6612..7fcc1cd06 100644
--- a/template/admin/src/pages/system/group/visualization.vue
+++ b/template/admin/src/pages/system/group/visualization.vue
@@ -4,7 +4,7 @@
       <span class="ivu-page-header-title mr20">{{ $route.meta.title }}</span>
       <div>
         <div style="float: right">
-          <Button class="bnt" type="primary" @click="save">保存</Button>
+          <el-button class="bnt" type="primary" @click="save">保存</el-button>
         </div>
       </div>
     </div>
@@ -59,7 +59,7 @@
           </div>
         </div>
       </div>
-      <div v-if="name == 'admin_login_slide'" class="pciframe" :bordered="false" dis-hover>
+      <div v-if="name == 'admin_login_slide'" class="pciframe" :bordered="false" shadow="never">
         <img src="../../../assets/images/pclogin.png" class="pciframe-box" />
         <div class="pcmoddile_goods">
           <div class="nofont" v-if="tabList.list == ''">暂无照片，请添加~</div>
@@ -96,7 +96,7 @@
         "
         class="iframe"
         :bordered="false"
-        dis-hover
+        shadow="never"
       >
         <iframe :src="url" class="iframe-box" frameborder="0"></iframe>
         <div class="moddile"></div>
@@ -151,13 +151,13 @@
       </div>
       <div v-if="a == 1" style="margin-left: 40px">
         <div class="table_box">
-          <div type="flex">
+          <div>
             <div v-bind="grid">
               <div class="title">隐私权限页面展示：</div>
             </div>
           </div>
           <div>
-            <Form
+            <el-form
               class="form"
               ref="formValidate"
               :model="formValidate"
@@ -167,14 +167,14 @@
               @submit.native.prevent
             >
               <div class="goodsTitle acea-row"></div>
-              <FormItem label="" prop="content" style="margin: 0px">
+              <el-form-item label="" prop="content" style="margin: 0px">
                 <WangEditor
                   style="width: 90%"
                   :content="formValidate.content"
                   @editorContent="getEditorContent"
                 ></WangEditor>
-              </FormItem>
-            </Form>
+              </el-form-item>
+            </el-form>
           </div>
         </div>
       </div>
@@ -190,95 +190,128 @@
       </div>
       <div v-if="name == 'sign_day_num'" style="margin-left: 20px">
         <div class="table_box">
-          <div type="flex">
+          <div>
             <div v-bind="grid">
               <div class="title">签到天数设置</div>
-              <Button
+              <el-button
                 type="primary"
                 icon="md-add"
                 @click="groupAdd('添加数据')"
                 style="margin-left: 14px; margin-top: 30px"
-                >添加数据</Button
+                >添加数据</el-button
               >
             </div>
           </div>
           <div class="table">
-            <Table
-              :columns="columns1"
+            <el-table
               :data="cmsList"
               ref="table"
               class="mt25"
               :loading="loading"
-              highlight-row
+              highlight-current-row
               no-userFrom-text="暂无数据"
               no-filtered-userFrom-text="暂无筛选结果"
             >
-              <template slot-scope="{ row, index }" slot="status">
-                <i-switch
-                  v-model="row.status"
-                  :value="row.status"
-                  :true-value="1"
-                  :false-value="0"
-                  @on-change="onchangeIsShow(row)"
-                  size="large"
-                >
-                  <span slot="open">显示</span>
-                  <span slot="close">隐藏</span>
-                </i-switch>
-              </template>
-              <template slot-scope="{ row, index }" slot="action">
-                <a @click="edit(row, '编辑')">编辑</a>
-                <Divider type="vertical" />
-                <a @click="del(row, '删除这条信息', index)">删除</a>
-              </template>
-            </Table>
+              <el-table-column label="编号" width="80">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.id }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="第几天" min-width="80">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.day }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="获取积分" min-width="80">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.sign_num }}</span>
+                </template>
+              </el-table-column>
+
+              <el-table-column label="是否可用" min-width="80">
+                <template slot-scope="scope">
+                  <el-switch
+                    :active-value="1"
+                    :inactive-value="0"
+                    v-model="scope.row.status"
+                    :value="scope.row.status"
+                    @change="onchangeIsShow(scope.row)"
+                    size="large"
+                  >
+                  </el-switch>
+                </template>
+              </el-table-column>
+              <el-table-column label="排序" min-width="80">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.sort }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" fixed="right" width="150">
+                <template slot-scope="scope">
+                  <a @click="edit(scope.row, '编辑')">编辑</a>
+                  <el-divider direction="vertical"></el-divider>
+                  <a @click="del(scope.row, '删除这条信息', index)">删除</a>
+                </template>
+              </el-table-column>
+            </el-table>
           </div>
         </div>
       </div>
       <div v-if="name == 'user_recharge_quota'" style="margin-left: 20px">
         <div class="table_box">
-          <div type="flex">
+          <div>
             <div v-bind="grid">
               <div class="title">充值金额设置</div>
-              <Button
+              <el-button
                 type="primary"
                 icon="md-add"
                 @click="groupAdd('添加数据')"
                 style="margin-left: 14px; margin-top: 30px"
-                >添加数据</Button
+                >添加数据</el-button
               >
             </div>
           </div>
           <div class="table">
-            <Table
-              :columns="columns1"
+            <el-table
               :data="sginList.list"
               ref="table"
               class="mt25"
               :loading="loading"
-              highlight-row
+              highlight-current-row
               no-userFrom-text="暂无数据"
               no-filtered-userFrom-text="暂无筛选结果"
             >
-              <template slot-scope="{ row, index }" slot="status">
-                <i-switch
-                  v-model="row.status"
-                  :value="row.status"
-                  :true-value="1"
-                  :false-value="0"
-                  @on-change="onchangeIsShow(row)"
-                  size="large"
-                >
-                  <span slot="open">显示</span>
-                  <span slot="close">隐藏</span>
-                </i-switch>
-              </template>
-              <template slot-scope="{ row, index }" slot="action">
-                <a @click="edit(row, '编辑')">编辑</a>
-                <Divider type="vertical" />
-                <a @click="del(row, '删除这条信息', index)">删除</a>
-              </template>
-            </Table>
+              <el-table-column
+                :label="item.title"
+                :min-width="item.minWidth"
+                v-for="(item, index) in columns1"
+                :key="index"
+              >
+                <template slot-scope="scope">
+                  <template v-if="item.key">
+                    <div>
+                      <span>{{ scope.row[item.key] }}</span>
+                    </div>
+                  </template>
+                  <template v-else-if="item.slot === 'status'">
+                    <el-switch
+                      :active-value="1"
+                      :inactive-value="0"
+                      v-model="scope.row.status"
+                      :value="scope.row.status"
+                      @change="onchangeIsShow(scope.row)"
+                      size="large"
+                    >
+                    </el-switch>
+                  </template>
+                  <template v-else-if="item.slot === 'action'">
+                    <a @click="edit(scope.row, '编辑')">编辑</a>
+                    <el-divider direction="vertical"></el-divider>
+                    <a @click="del(scope.row, '删除这条信息', index)">删除</a>
+                  </template>
+                </template>
+              </el-table-column>
+            </el-table>
           </div>
         </div>
       </div>
@@ -334,13 +367,13 @@
                       <div class="info-item">
                         <span>图片名称：</span>
                         <div class="input-box">
-                          <Input v-model="item.comment" placeholder="请填写名称" />
+                          <el-input v-model="item.comment" placeholder="请填写名称" />
                         </div>
                       </div>
                       <div class="info-item">
                         <span>链接地址：</span>
                         <div class="input-box" @click="link(index)">
-                          <Input v-model="item.link" icon="ios-arrow-forward" readonly placeholder="选择链接" />
+                          <el-input v-model="item.link" icon="ios-arrow-forward" readonly placeholder="选择链接" />
                         </div>
                       </div>
                     </div>
@@ -369,13 +402,13 @@
               </div>
               <template>
                 <div class="add-btn">
-                  <Button
+                  <el-button
                     type="primary"
                     ghost
                     style="width: 100px; height: 35px; background-color: #1890ff; color: #ffffff"
                     @click="addBox"
                     >添加图片
-                  </Button>
+                  </el-button>
                 </div>
               </template>
             </div>
@@ -389,23 +422,21 @@
             <div class="title-text">建议尺寸：750 * 1334px，拖拽图片可调整图片顺序哦，最多添加五张</div>
             <div class="list-box">
               <div>
-                <Form :model="formItem" :label-width="80">
-                  <FormItem label="开屏广告:">
-                    <i-switch v-model="formItem.status" :true-value="1" :false-value="0" size="large">
-                      <span slot="开">开启</span>
-                      <span slot="关">关闭</span>
-                    </i-switch>
-                  </FormItem>
-                  <FormItem label="广告时间:">
-                    <Input
+                <el-form :model="formItem" label-width="85px">
+                  <el-form-item label="开屏广告:">
+                    <el-switch :active-value="1" :inactive-value="0" v-model="formItem.status" size="large">
+                    </el-switch>
+                  </el-form-item>
+                  <el-form-item label="广告时间:">
+                    <el-input
                       v-model.number="formItem.time"
                       type="number"
                       placeholder="请输入开屏广告时间"
                       style="width: 150px"
-                    ></Input>
+                    ></el-input>
                     单位(秒)
-                  </FormItem>
-                </Form>
+                  </el-form-item>
+                </el-form>
               </div>
               <draggable class="dragArea list-group" :list="tabList.list" group="peoples" handle=".move-icon">
                 <div class="item" v-for="(item, index) in tabList.list" :key="index">
@@ -425,13 +456,13 @@
                     <div class="info-item">
                       <span>图片名称：</span>
                       <div class="input-box">
-                        <Input v-model="item.comment" placeholder="请填写名称" />
+                        <el-input v-model="item.comment" placeholder="请填写名称" />
                       </div>
                     </div>
                     <div class="info-item">
                       <span>链接地址：</span>
                       <div class="input-box" @click="link(index)">
-                        <Input v-model="item.link" icon="ios-arrow-forward" readonly placeholder="选择链接" />
+                        <el-input v-model="item.link" icon="ios-arrow-forward" readonly placeholder="选择链接" />
                       </div>
                     </div>
                   </div>
@@ -460,13 +491,13 @@
             </div>
             <template v-if="tabList.list.length < 5">
               <div class="add-btn">
-                <Button
+                <el-button
                   type="primary"
                   ghost
                   style="width: 100px; height: 35px; background-color: #1890ff; color: #ffffff"
                   @click="addBox"
                   >添加图片
-                </Button>
+                </el-button>
               </div>
             </template>
           </div>
@@ -518,7 +549,7 @@ export default {
       };
     },
     labelWidth() {
-      return this.isMobile ? undefined : 120;
+      return this.isMobile ? undefined : '120px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
diff --git a/template/admin/src/pages/system/maintain/systemCleardata/index.vue b/template/admin/src/pages/system/maintain/systemCleardata/index.vue
index 85d62d68e..261b80fca 100644
--- a/template/admin/src/pages/system/maintain/systemCleardata/index.vue
+++ b/template/admin/src/pages/system/maintain/systemCleardata/index.vue
@@ -7,31 +7,31 @@
         <span>清除数据请谨慎，清除就无法恢复哦！</span>
       </span>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row type="flex" :gutter="24">
-        <Col v-bind="grid" class="mb20" v-for="(item, index) in tabList" :key="index">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row  :gutter="24">
+        <el-col v-bind="grid" class="mb20" v-for="(item, index) in tabList" :key="index">
           <div class="clear_box">
             <span class="clear_box_sp1" v-text="item.title"></span>
             <span class="clear_box_sp2" v-text="item.tlt"></span>
-            <Button
+            <el-button
               :type="item.typeName"
               v-text="item.typeName === 'primary' ? '立即更换' : '立即清理'"
               @click="onChange(item)"
-            ></Button>
+            ></el-button>
           </div>
-        </Col>
-      </Row>
-    </Card>
+        </el-col>
+      </el-row>
+    </el-card>
     <!-- 更换域名-->
     <Modal v-model="modals" class="tableBox" scrollable closable title="更换域名" :mask-closable="false">
       <div class="acea-row row-column">
         <span>请输入需要替换的域名，格式为：http://域名。</span>
         <span>替换规则：会使用当前[设置]里面的[网站域名]去替换成当前您输入的域名。</span>
         <span class="mb15">替换成功后再去更换[网站域名]。</span>
-        <Input v-model="value6" type="textarea" :rows="4" placeholder="请输入网站域名..." />
+        <el-input v-model="value6" type="textarea" :rows="4" placeholder="请输入网站域名..." />
       </div>
       <div slot="footer">
-        <Button type="primary" size="large" long @click="changeYU">确定</Button>
+        <el-button type="primary" size="large" long @click="changeYU">确定</el-button>
       </div>
     </Modal>
   </div>
diff --git a/template/admin/src/pages/system/maintain/systemDatabackup/index.vue b/template/admin/src/pages/system/maintain/systemDatabackup/index.vue
index 8955dbff1..799f139f3 100644
--- a/template/admin/src/pages/system/maintain/systemDatabackup/index.vue
+++ b/template/admin/src/pages/system/maintain/systemDatabackup/index.vue
@@ -1,84 +1,179 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt listbox">
-      <Tabs class="mb30">
-        <TabPane label="数据库列表">
-          <Card :bordered="false" dis-hover class="tableBox mt10">
-            <div slot="title">
+    <el-card :bordered="false" shadow="never" class="ivu-mt listbox">
+      <el-tabs class="mb30">
+        <el-tab-pane label="数据库列表">
+          <el-card :bordered="false" shadow="never" class="tableBox">
+            <div class="mb10">
               <!--              <span class="ivu-pl-8 mr10">数据库表列表</span>-->
-              <Button type="primary" class="mr10" @click="getBackup">备份</Button>
-              <Button type="primary" class="mr10" @click="getOptimize">优化表</Button>
-              <Button type="primary" class="mr10" @click="getRepair">修复表</Button>
-              <Button type="primary" class="mr10" @click="exportData(1)">导出文件</Button>
+              <el-button type="primary" class="mr10" @click="getBackup">备份</el-button>
+              <el-button type="primary" class="mr10" @click="getOptimize">优化表</el-button>
+              <el-button type="primary" class="mr10" @click="getRepair">修复表</el-button>
+              <el-button type="primary" class="mr10" @click="exportData(1)">导出文件</el-button>
             </div>
-            <Table
+            <el-table
               ref="selection"
-              :columns="columns"
               :data="tabList2"
-              :loading="loading"
-              no-data-text="暂无数据"
-              @on-selection-change="onSelectTab"
-              size="small"
-              no-filtered-data-text="暂无筛选结果"
+              v-loading="loading"
+              empty-text="暂无数据"
+              
+              @select="onSelectTab"
+              @select-all="onSelectTab"
             >
-              <template slot-scope="{ row, index }" slot="comment">
-                <div class="mark">
-                  <div v-if="row.is_edit" class="table-mark" @click="isEditMark(row)">{{ row.comment }}</div>
-                  <Input ref="mark" v-else v-model="row.comment" @on-blur="isEditBlur(row, 0)"></Input>
-                </div>
-              </template>
-              <template slot-scope="{ row }" slot="action">
-                <a @click="Info(row)">详情</a>
-              </template>
-            </Table>
-          </Card>
+              <el-table-column type="selection" width="55"> </el-table-column>
+              <el-table-column label="表名称" min-width="100">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.name }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="备注" min-width="100">
+                <template slot-scope="scope">
+                  <div class="mark">
+                    <div v-if="scope.row.is_edit" class="table-mark" @click="isEditMark(scope.row)">
+                      {{ scope.row.comment }}
+                    </div>
+                    <el-input
+                      ref="mark"
+                      v-else
+                      v-model="scope.row.comment"
+                      @blur="isEditBlur(scope.row, 0)"
+                    ></el-input>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column label="类型" min-width="100">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.engine }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="大小" min-width="100">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.data_length }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="更新时间" min-width="100">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.update_time }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="行数" min-width="100">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.rows }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" fixed="right" width="70">
+                <template slot-scope="scope">
+                  <a @click="Info(scope.row)">详情</a>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-card>
           <!-- 详情模态框-->
           <Drawer :closable="false" width="740" v-model="modals" :title="'[ ' + rows.name + ' ]' + rows.comment">
-            <Table
+            <el-table
               ref="selection"
-              :columns="columns2"
               :data="tabList3"
               :loading="loading2"
-              no-data-text="暂无数据"
+              empty-text="暂无数据"
               max-height="600"
               size="small"
-              no-filtered-data-text="暂无筛选结果"
+              
             >
-              <template slot-scope="{ row, index }" slot="COLUMN_COMMENT">
-                <div class="mark">
-                  <div v-if="row.is_edit" class="table-mark" @click="isEditMark(row)">{{ row.COLUMN_COMMENT }}</div>
-                  <Input ref="mark" v-else v-model="row.COLUMN_COMMENT" @on-blur="isEditBlur(row, 1)"></Input>
-                </div>
-              </template>
-            </Table>
+              <el-table-column label="字段名" min-width="100">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.COLUMN_NAME }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="数据类型" min-width="100">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.COLUMN_TYPE }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="默认值" min-width="100">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.COLUMN_DEFAULT }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="允许非空" min-width="100">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.IS_NULLABLE }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="自动递增" min-width="100">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.EXTRA }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="备注" min-width="100">
+                <template slot-scope="scope">
+                  <div class="mark">
+                    <div v-if="scope.row.is_edit" class="table-mark" @click="isEditMark(scope.row)">
+                      {{ scope.row.COLUMN_COMMENT }}
+                    </div>
+                    <el-input
+                      ref="mark"
+                      v-else
+                      v-model="scope.row.COLUMN_COMMENT"
+                      @blur="isEditBlur(scope.row, 1)"
+                    ></el-input>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
           </Drawer>
-        </TabPane>
-        <TabPane label="备份列表">
-          <Card :bordered="false" dis-hover class="">
-            <Table
+        </el-tab-pane>
+        <el-tab-pane label="备份列表">
+          <el-card :bordered="false" shadow="never" class="">
+            <el-table
               ref="selection"
-              :columns="columns4"
               :data="tabList"
               :loading="loading3"
-              no-data-text="暂无数据"
-              highlight-row
+              empty-text="暂无数据"
+              highlight-current-row
               size="small"
-              no-filtered-data-text="暂无筛选结果"
+              
             >
-              <template slot-scope="{ row, index }" slot="action">
-                <a @click="ImportFile(row)">导入</a>
-                <Divider type="vertical" />
-                <a @click="del(row, '删除该备份', index)">删除</a>
-                <Divider type="vertical" />
-                <a @click="download(row)">下载</a>
-              </template>
-            </Table>
-          </Card>
-        </TabPane>
-      </Tabs>
-    </Card>
+              <el-table-column label="备份名称" min-width="200">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.filename }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="part" min-width="100">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.part }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="大小" min-width="100">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.size }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="compress" min-width="100">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.compress }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="时间" min-width="100">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.backtime }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" fixed="right" width="140">
+                <template slot-scope="scope">
+                  <a @click="ImportFile(scope.row)">导入</a>
+                  <el-divider direction="vertical"></el-divider>
+                  <a @click="del(scope.row, '删除该备份', index)">删除</a>
+                  <el-divider direction="vertical"></el-divider>
+                  <a @click="download(scope.row)">下载</a>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-card>
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
     <Modal v-model="markModal" title="修改备注" @on-ok="ok" @on-cancel="cancel" @on-visible-change="cancel">
-      <Input v-model="mark"></Input>
+      <el-input v-model="mark"></el-input>
     </Modal>
   </div>
 </template>
@@ -105,117 +200,9 @@ export default {
       modals: false,
       loading: false,
       tabList: [],
-      columns4: [
-        {
-          title: '备份名称',
-          key: 'filename',
-          minWidth: 200,
-          sortable: true,
-        },
-        {
-          title: 'part',
-          key: 'part',
-          minWidth: 100,
-        },
-        {
-          title: '大小',
-          key: 'size',
-          minWidth: 150,
-        },
-        {
-          title: 'compress',
-          key: 'compress',
-          minWidth: 100,
-        },
-        {
-          title: '时间',
-          key: 'backtime',
-          minWidth: 150,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 80,
-        },
-      ],
       tabList2: [],
-      columns: [
-        {
-          type: 'selection',
-          width: 60,
-          align: 'center',
-        },
-        {
-          title: '表名称',
-          key: 'name',
-          minWidth: 200,
-          sortable: true,
-        },
-        {
-          title: '备注',
-          slot: 'comment',
-          minWidth: 200,
-        },
-        {
-          title: '类型',
-          key: 'engine',
-          minWidth: 130,
-          sortable: true,
-        },
-        {
-          title: '大小',
-          key: 'data_length',
-          minWidth: 130,
-          sortable: true,
-        },
-        {
-          title: '更新时间',
-          key: 'update_time',
-          minWidth: 150,
-          sortable: true,
-        },
-        {
-          title: '行数',
-          key: 'rows',
-          minWidth: 100,
-          sortable: true,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 80,
-        },
-      ],
       selectionList: [],
       tabList3: [],
-      columns2: [
-        {
-          title: '字段名',
-          key: 'COLUMN_NAME',
-        },
-        {
-          title: '数据类型',
-          key: 'COLUMN_TYPE',
-        },
-        {
-          title: '默认值',
-          key: 'COLUMN_DEFAULT',
-        },
-        {
-          title: '允许非空',
-          key: 'IS_NULLABLE',
-        },
-        {
-          title: '自动递增',
-          key: 'EXTRA',
-        },
-        {
-          title: '备注',
-          slot: 'COLUMN_COMMENT',
-        },
-      ],
       rows: {},
       dataList: {},
       loading2: false,
diff --git a/template/admin/src/pages/system/maintain/systemFile/components/codemirror.vue b/template/admin/src/pages/system/maintain/systemFile/components/codemirror.vue
index ce34b88fc..01c75f12d 100644
--- a/template/admin/src/pages/system/maintain/systemFile/components/codemirror.vue
+++ b/template/admin/src/pages/system/maintain/systemFile/components/codemirror.vue
@@ -1,9 +1,9 @@
 <template>
   <Modal v-model="modals_son" scrollable footer-hide closable :title="title" :mask-closable="false" width="900">
-    <Button type="primary" id="savefile" class="mr5 mb15" @click="savefile">保存</Button>
-    <Button id="undo" class="mr5 mb15" @click="undofile">撤销</Button>
-    <Button id="redo" class="mr5 mb15" @click="redofile">回退</Button>
-    <Button id="refresh" class="mb15" @click="refreshfile">刷新</Button>
+    <el-button type="primary" id="savefile" class="mr5 mb15" @click="savefile">保存</el-button>
+    <el-button id="undo" class="mr5 mb15" @click="undofile">撤销</el-button>
+    <el-button id="redo" class="mr5 mb15" @click="redofile">回退</el-button>
+    <el-button id="refresh" class="mb15" @click="refreshfile">刷新</el-button>
     <textarea ref="mycode" class="codesql public_text" v-model="code" style="height: 80vh"></textarea>
     <Spin size="large" fix v-if="spinShow"></Spin>
   </Modal>
diff --git a/template/admin/src/pages/system/maintain/systemFile/components/loginFrom.vue b/template/admin/src/pages/system/maintain/systemFile/components/loginFrom.vue
index e36d258d5..ee411296e 100644
--- a/template/admin/src/pages/system/maintain/systemFile/components/loginFrom.vue
+++ b/template/admin/src/pages/system/maintain/systemFile/components/loginFrom.vue
@@ -1,24 +1,24 @@
 <template>
-  <Row type="flex">
-    <Col span="24">
+  <el-row >
+    <el-col :span="24">
       <div class="index_from page-account-container">
         <div class="page-account-top">
           <span class="page-account-top-tit">文件管理登录</span>
         </div>
-        <Form ref="formInline" :model="formInline" :rules="ruleInline" @submit.native.prevent>
-          <!-- <FormItem prop="sms_account" class="maxInpt">
-            <Input type="text" v-model="formInline.account" prefix="ios-contact-outline" placeholder="请输入手机号" />
-          </FormItem> -->
-          <FormItem prop="sms_token" class="maxInpt">
-            <Input type="password" v-model="formInline.password" prefix="ios-lock-outline" placeholder="请输入密码" />
-          </FormItem>
-          <FormItem class="maxInpt">
-            <Button type="primary" long size="large" @click="handleSubmit('formInline')" class="btn">登录</Button>
-          </FormItem>
-        </Form>
+        <el-form ref="formInline" :model="formInline" :rules="ruleInline" @submit.native.prevent>
+          <!-- <el-form-item prop="sms_account" class="maxInpt">
+            <el-input type="text" v-model="formInline.account" prefix="ios-contact-outline" placeholder="请输入手机号" />
+          </el-form-item> -->
+          <el-form-item prop="sms_token" class="maxInpt">
+            <el-input type="password" v-model="formInline.password" prefix="ios-lock-outline" placeholder="请输入密码" />
+          </el-form-item>
+          <el-form-item class="maxInpt">
+            <el-button type="primary" long size="large" @click="handleSubmit('formInline')" class="btn">登录</el-button>
+          </el-form-item>
+        </el-form>
       </div>
-    </Col>
-  </Row>
+    </el-col>
+  </el-row>
 </template>
 
 <script>
diff --git a/template/admin/src/pages/system/maintain/systemFile/index.vue b/template/admin/src/pages/system/maintain/systemFile/index.vue
index 8116f6ec3..266b78d30 100644
--- a/template/admin/src/pages/system/maintain/systemFile/index.vue
+++ b/template/admin/src/pages/system/maintain/systemFile/index.vue
@@ -3,21 +3,47 @@
     <div class="i-layout-page-header header-title">
       <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Table
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-table
         ref="selection"
-        :columns="columns4"
         :data="tabList"
-        :loading="loading"
-        no-data-text="暂无数据"
-        highlight-row
-        no-filtered-data-text="暂无筛选结果"
+        v-loading="loading"
+        empty-text="暂无数据"
+        highlight-current-row
+        
       >
-        <template slot-scope="{ row }" slot="nickname">
-          <span>{{ row.admin_id + ' / ' + row.admin_name }}</span>
-        </template>
-      </Table>
-    </Card>
+        <el-table-column label="类型" width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.type }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="文件地址" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.filename }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="校验码" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.cthash }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="上次访问时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.atime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="上次修改时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.mtime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="上次改变时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.ctime }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
   </div>
 </template>
 
@@ -29,38 +55,6 @@ export default {
     return {
       loading: false,
       tabList: [],
-      columns4: [
-        {
-          title: '类型',
-          key: 'type',
-          minWidth: 100,
-        },
-        {
-          title: '文件地址',
-          key: 'filename',
-          minWidth: 250,
-        },
-        {
-          title: '校验码',
-          key: 'cthash',
-          minWidth: 200,
-        },
-        {
-          title: '上次访问时间',
-          key: 'atime',
-          minWidth: 150,
-        },
-        {
-          title: '上次修改时间',
-          key: 'mtime',
-          minWidth: 150,
-        },
-        {
-          title: '上次改变时间',
-          key: 'ctime',
-          minWidth: 150,
-        },
-      ],
     };
   },
   created() {
diff --git a/template/admin/src/pages/system/maintain/systemFile/login.vue b/template/admin/src/pages/system/maintain/systemFile/login.vue
index 496463b69..6fc32e86d 100644
--- a/template/admin/src/pages/system/maintain/systemFile/login.vue
+++ b/template/admin/src/pages/system/maintain/systemFile/login.vue
@@ -1,17 +1,17 @@
 <template>
   <div>
-    <Row type="flex">
-      <Col span="24">
+    <el-row >
+      <el-col :span="24">
         <div class="index_from page-account-container">
           <div class="page-account-top">
             <span class="page-account-top-tit">文件管理登录</span>
           </div>
-          <Form ref="formInline" :model="formInline" :rules="ruleInline" @submit.native.prevent>
-            <!-- <FormItem prop="sms_account" class="maxInpt">
-            <Input type="text" v-model="formInline.account" prefix="ios-contact-outline" placeholder="请输入手机号" />
-          </FormItem> -->
-            <FormItem prop="sms_token" class="maxInpt">
-              <Input
+          <el-form ref="formInline" :model="formInline" :rules="ruleInline" @submit.native.prevent>
+            <!-- <el-form-item prop="sms_account" class="maxInpt">
+            <el-input type="text" v-model="formInline.account" prefix="ios-contact-outline" placeholder="请输入手机号" />
+          </el-form-item> -->
+            <el-form-item prop="sms_token" class="maxInpt">
+              <el-input
                 type="password"
                 size="large"
                 v-model="formInline.password"
@@ -19,14 +19,14 @@
                 placeholder="请输入密码"
               />
               <div class="trip">提示：密码配置在 /config/filesystem.php 文件中修改 'password' => '密码'</div>
-            </FormItem>
-            <FormItem class="maxInpt">
-              <Button type="primary" long size="large" @click="handleSubmit('formInline')" class="btn">登录</Button>
-            </FormItem>
-          </Form>
+            </el-form-item>
+            <el-form-item class="maxInpt">
+              <el-button type="primary" long size="large" @click="handleSubmit('formInline')" class="btn">登录</el-button>
+            </el-form-item>
+          </el-form>
         </div>
-      </Col>
-    </Row>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
@@ -102,7 +102,7 @@ export default {
 <style scoped lang="stylus">
 
 .maxInpt{
-    max-width: 400px;
+    max-width: 500px;
     margin-left: auto;
     margin-right: auto;
 }
@@ -113,7 +113,7 @@ export default {
   align-items: center;
 }
 .trip{
-    width: 450px;
+    width: 580px;
     text-align: left;
     color: #aaa;
 }
diff --git a/template/admin/src/pages/system/maintain/systemFile/opendir.vue b/template/admin/src/pages/system/maintain/systemFile/opendir.vue
index bd5cd28a1..0b004ae03 100644
--- a/template/admin/src/pages/system/maintain/systemFile/opendir.vue
+++ b/template/admin/src/pages/system/maintain/systemFile/opendir.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div v-if="isShowList" class="backs-box">
         <div class="backs">
           <span class="back" @click="goBack(false)"><Icon type="md-arrow-round-back" class="icon" /></span>
@@ -11,40 +11,50 @@
         </div>
         <span class="refresh" @click="refreshRoute"><Icon type="md-refresh" class="icon" /></span>
       </div>
-      <Table
+      <el-table
         v-if="isShowList"
         ref="selection"
-        :columns="columns4"
         :data="tabList"
-        :loading="loading"
-        no-data-text="暂无数据"
+        v-loading="loading"
+        empty-text="暂无数据"
         class="mt20"
-        no-filtered-data-text="暂无筛选结果"
+        
       >
-        <template slot-scope="{ row }" slot="filename">
-          <div @click="currentChange(row)">
-            <Icon type="ios-folder-outline" v-if="row.isDir" class="mr5" />
-            <Icon type="ios-document-outline" v-else class="mr5" />
-            <span>{{ row.filename }}</span>
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="isWritable">
-          <span v-text="row.isWritable ? '是' : '否'"></span>
-        </template>
-        <template slot-scope="{ row, index }" slot="mark">
-          <div class="mark">
-            <div v-if="row.is_edit" class="table-mark" @click="isEditMark(row)">{{ row.mark }}</div>
-            <Input ref="mark" v-else v-model="row.mark" @on-blur="isEditBlur(row)"></Input>
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="open(row)" v-if="row.isDir">打开</a>
-          <a @click="edit(row)" v-else>编辑</a>
-          <!-- <Divider type="vertical" />
-          <a @click.stop="mark(row)">备注</a> -->
-        </template>
-      </Table>
-    </Card>
+        <el-table-column label="文件/文件夹名" min-width="150">
+          <template slot-scope="scope">
+            <div @click="currentChange(scope.row)">
+              <Icon type="ios-folder-outline" v-if="scope.row.isDir" class="mr5" />
+              <Icon type="ios-document-outline" v-else class="mr5" />
+              <span>{{ scope.row.filename }}</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="文件/文件夹大小" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.size }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新时间" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.mtime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="120">
+          <template slot-scope="scope">
+            <div class="mark">
+              <div v-if="scope.row.is_edit" class="table-mark" @click="isEditMark(scope.row)">{{ scope.row.mark }}</div>
+              <el-input ref="mark" v-else v-model="scope.row.mark" @blur="isEditBlur(scope.row)"></el-input>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="60">
+          <template slot-scope="scope">
+            <a @click="open(scope.row)" v-if="scope.row.isDir">打开</a>
+            <a @click="edit(scope.row)" v-else>编辑</a>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
     <Modal
       :class-name="className"
       v-model="modals"
@@ -65,15 +75,15 @@
         />
       </p>
       <div style="height: 100%">
-        <Button type="primary" id="savefile" class="diy-button" @click="savefile(indexEditor)">保存</Button>
-        <Button id="refresh" class="diy-button" @click="refreshfile">刷新</Button>
+        <el-button type="primary" id="savefile" class="diy-button" @click="savefile(indexEditor)">保存</el-button>
+        <el-button id="refresh" class="diy-button" @click="refreshfile">刷新</el-button>
 
         <div class="file-box">
           <div class="show-info">
             <div class="show-text" :title="navItem.pathname">目录: {{ navItem.pathname }}</div>
             <div class="diy-button-list">
-              <Button class="diy-button" @click="goBack(true)">返回上一级</Button>
-              <Button class="diy-button" @click="getList(true, true)">刷新</Button>
+              <el-button class="diy-button" @click="goBack(true)">返回上一级</el-button>
+              <el-button class="diy-button" @click="getList(true, true)">刷新</el-button>
             </div>
           </div>
           <div class="file-left">
@@ -99,16 +109,16 @@
           </div>
           <div class="file-fix"></div>
           <div class="file-content">
-            <Tabs
+            <el-tabs
               type="card"
               v-model="indexEditor"
               style="height: 100%"
-              @on-click="toggleEditor"
+              @tag-click="toggleEditor"
               :animated="false"
               closable
-              @on-tab-remove="handleTabRemove"
+              @tab-remove="handleTabRemove"
             >
-              <TabPane
+              <el-tab-pane
                 v-for="value in editorIndex"
                 :key="value.index"
                 :name="value.index.toString()"
@@ -117,8 +127,8 @@
                 v-if="value.tab"
               >
                 <div ref="container" :id="'container_' + value.index" style="height: 100%; min-height: 560px"></div>
-              </TabPane>
-            </Tabs>
+              </el-tab-pane>
+            </el-tabs>
           </div>
           <Spin size="large" fix v-if="spinShow"></Spin>
         </div>
@@ -130,20 +140,20 @@
         {{ formTitle
         }}<span :title="contextData ? contextData.pathname : ''">{{ contextData ? contextData.pathname : '' }}</span>
       </div>
-      <Form ref="formInline" :model="formFile" :rules="ruleInline" inline>
-        <FormItem prop="filename" class="diy-file">
-          <Input type="text" class="diy-file" v-model="formFile.filename" placeholder="请输入名字">
+      <el-form ref="formInline" :model="formFile" :rules="ruleInline" inline>
+        <el-form-item prop="filename" class="diy-file">
+          <el-input type="text" class="diy-file" v-model="formFile.filename" placeholder="请输入名字">
             <Icon type="ios-folder-open-outline" slot="prepend"></Icon>
-          </Input>
-        </FormItem>
-        <FormItem>
-          <Button class="diy-button" @click="handleSubmit('formInline')">确定</Button>
-        </FormItem>
-        <FormItem>
-          <Button class="diy-button" @click="formExit()">取消</Button>
-        </FormItem>
+          </el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button class="diy-button" @click="handleSubmit('formInline')">确定</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button class="diy-button" @click="formExit()">取消</el-button>
+        </el-form-item>
         <div class="form-mask" v-show="formShow"></div>
-      </Form>
+      </el-form>
     </div>
   </div>
 </template>
@@ -200,41 +210,7 @@ export default {
       spinShow: false,
       loading: false,
       tabList: [],
-      columns4: [
-        {
-          title: '文件/文件夹名',
-          slot: 'filename',
-          minWidth: 150,
-          back: '返回上级',
-          sortable: true,
-        },
-        // {
-        //   title: '文件/文件夹路径',
-        //   key: 'real_path',
-        //   minWidth: 150,
-        // },
-        {
-          title: '文件/文件夹大小',
-          key: 'size',
-          minWidth: 100,
-        },
-        {
-          title: '更新时间',
-          key: 'mtime',
-          minWidth: 150,
-          sortable: true,
-        },
-        {
-          title: '备注',
-          slot: 'mark',
-          minWidth: 150,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          width: 100,
-        },
-      ],
+     
       formItem: {
         //记录当前路径信息，获取文件列表时使用
         dir: '',
@@ -520,8 +496,8 @@ export default {
           return e.pathname === data.pathname;
         });
         if (i > -1) {
-          that.toggleEditor(i);
           that.indexEditor = i.toString();
+          that.toggleEditor();
         } else {
           let index = that.editorIndex.length;
           // 创建tabs
@@ -809,8 +785,8 @@ export default {
      * 切换选项卡
      * @param {Object} index
      */
-    toggleEditor(index) {
-      index = Number(index);
+    toggleEditor() {
+      let index = Number(this.indexEditor);
       this.code = this.editorList[index].oldCode; //设置文件打开时的代码
       this.editor = this.editorList[index].editor; //设置编辑器实例
     },
diff --git a/template/admin/src/pages/system/maintain/systemLog/index.vue b/template/admin/src/pages/system/maintain/systemLog/index.vue
index c69f90881..0332920bd 100644
--- a/template/admin/src/pages/system/maintain/systemLog/index.vue
+++ b/template/admin/src/pages/system/maintain/systemLog/index.vue
@@ -1,30 +1,30 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="table_box">
-        <Form
+        <el-form
           ref="formValidate"
           :label-width="labelWidth"
           :label-position="labelPosition"
           class="tabform"
           @submit.native.prevent
         >
-          <Row :gutter="24" type="flex" justify="end">
-            <Col span="24" class="ivu-text-left">
-              <FormItem :label="fromList.title + '：'">
-                <RadioGroup
+          <el-row :gutter="24" justify="end">
+            <el-col :span="24" class="ivu-text-left">
+              <el-form-item :label="fromList.title + '：'">
+                <el-radio-group
                   type="button"
                   v-model="formValidate.data"
                   class="mr15"
-                  @on-change="selectChange(formValidate.data)"
+                  @change="selectChange(formValidate.data)"
                 >
-                  <Radio :label="itemn.val" v-for="(itemn, indexn) in fromList.fromTxt" :key="indexn">
+                  <el-radio-button :label="itemn.val" v-for="(itemn, indexn) in fromList.fromTxt" :key="indexn">
                     {{ itemn.text }}
-                  </Radio>
-                </RadioGroup>
+                  </el-radio-button>
+                </el-radio-group>
                 <DatePicker
                   :editable="false"
-                  @on-change="onchangeTime"
+                  @change="onchangeTime"
                   :value="timeVal"
                   format="yyyy/MM/dd"
                   type="daterange"
@@ -32,71 +32,94 @@
                   placeholder="请选择时间"
                   style="width: 200px"
                 ></DatePicker>
-              </FormItem>
-            </Col>
-            <Col span="24" class="ivu-text-left">
-              <Col :xl="5" :lg="12" :md="12" :sm="24" :xs="24" class="sex_box">
-                <FormItem label="名称：">
-                  <Select v-model="formValidate.admin_id" style="width: 90%" clearable @on-change="userSearchs">
-                    <Option :value="item.id" v-for="(item, index) in dataList" :key="index">{{
-                      item.real_name
-                    }}</Option>
-                  </Select>
-                </FormItem>
-              </Col>
-              <!--<Col :xl="5" :lg="12" :md="12" :sm="24" :xs="24">-->
-              <!--<FormItem label="行为：">-->
-              <!--<Input  placeholder="请输入行为" v-model="formValidate.pages" style="width: 90%;" clearable></Input>-->
-              <!--</FormItem>-->
-              <!--</Col>-->
-              <Col :xl="5" :lg="12" :md="12" :sm="24" :xs="24" class="subscribe_box">
-                <FormItem label="链接：">
-                  <Input placeholder="请输入链接" v-model="formValidate.path" style="width: 90%" clearable></Input>
-                </FormItem>
-              </Col>
-              <Col :xl="5" :lg="12" :md="12" :sm="24" :xs="24" class="subscribe_box">
-                <FormItem label="IP：">
-                  <Input placeholder="请输入IP" v-model="formValidate.ip" style="width: 90%" clearable></Input>
-                </FormItem>
-              </Col>
-              <Col :xl="3" :lg="12" :md="3" :sm="24" :xs="24" class="btn_box">
-                <!--<FormItem>-->
-                <Button type="primary" icon="ios-search" label="default" class="userSearch" @click="userSearchs"
-                  >搜索</Button
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" class="ivu-text-left">
+              <el-col :xl="5" :lg="12" :md="12" :sm="24" :xs="24" class="sex_box">
+                <el-form-item label="名称：">
+                  <el-select v-model="formValidate.admin_id" style="width: 90%" clearable @change="userSearchs">
+                    <el-option
+                      :value="item.id"
+                      v-for="(item, index) in dataList"
+                      :key="index"
+                      :label="item.real_name"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <!--<el-col :xl="5" :lg="12" :md="12" :sm="24" :xs="24">-->
+              <!--<el-form-item label="行为：">-->
+              <!--<el-input  placeholder="请输入行为" v-model="formValidate.pages" style="width: 90%;" clearable></el-input>-->
+              <!--</el-form-item>-->
+              <!--</el-col>-->
+              <el-col :xl="5" :lg="12" :md="12" :sm="24" :xs="24" class="subscribe_box">
+                <el-form-item label="链接：">
+                  <el-input
+                    placeholder="请输入链接"
+                    v-model="formValidate.path"
+                    style="width: 90%"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xl="5" :lg="12" :md="12" :sm="24" :xs="24" class="subscribe_box">
+                <el-form-item label="IP：">
+                  <el-input placeholder="请输入IP" v-model="formValidate.ip" style="width: 90%" clearable></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xl="3" :lg="12" :md="3" :sm="24" :xs="24" class="btn_box">
+                <!--<el-form-item>-->
+                <el-button type="primary" icon="ios-search" label="default" class="userSearch" @click="userSearchs"
+                  >搜索</el-button
                 >
-                <!--</FormItem>-->
-              </Col>
-            </Col>
-          </Row>
-        </Form>
+                <!--</el-form-item>-->
+              </el-col>
+            </el-col>
+          </el-row>
+        </el-form>
       </div>
-      <Table
-        ref="selection"
-        :columns="columns4"
-        :data="tabList"
-        :loading="loading"
-        no-data-text="暂无数据"
-        highlight-row
-        no-filtered-data-text="暂无筛选结果"
-      >
-        <template slot-scope="{ row }" slot="nickname">
-          <span>{{ row.admin_id + ' / ' + row.admin_name }}</span>
-        </template>
-        <template slot-scope="{ row, index }" slot="add_time">
-          <span> {{ row.add_time | formatDate }}</span>
-        </template>
-      </Table>
+      <el-table ref="selection" :data="tabList" :loading="loading" empty-text="暂无数据" highlight-current-row>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="ID/名称" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.admin_id + ' / ' + scope.row.admin_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="链接" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.path }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作ip" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.ip }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="类型" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.type }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作时间" min-width="100">
+          <template slot-scope="scope">
+            <span> {{ scope.row.add_time | formatDate }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="formValidate.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="formValidate.limit"
+          :page.sync="formValidate.page"
+          :limit.sync="formValidate.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -142,50 +165,14 @@ export default {
       loading: false,
       tabList: [],
       total: 0,
-      columns4: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: 'ID/名称',
-          slot: 'nickname',
-          minWidth: 100,
-        },
-        // {
-        //     title: '行为',
-        //     key: 'page',
-        //     minWidth: 150
-        // },
-        {
-          title: '链接',
-          key: 'path',
-          minWidth: 300,
-        },
-        {
-          title: '操作ip',
-          key: 'ip',
-          minWidth: 150,
-        },
-        {
-          title: '类型',
-          key: 'type',
-          minWidth: 100,
-        },
-        {
-          title: '操作时间',
-          slot: 'add_time',
-          minWidth: 150,
-        },
-      ],
+
       dataList: [],
     };
   },
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -235,10 +222,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.formValidate.page = index;
-      this.getList();
-    },
     // 搜索
     userSearchs() {
       this.formValidate.page = 1;
diff --git a/template/admin/src/pages/system/onlineUpgrade/index.vue b/template/admin/src/pages/system/onlineUpgrade/index.vue
index 6d46915a4..b1aa46e85 100644
--- a/template/admin/src/pages/system/onlineUpgrade/index.vue
+++ b/template/admin/src/pages/system/onlineUpgrade/index.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="upgrade">
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="header">
         <div>当前版本<span class="v"></span><span class="num">{{$store.state.userInfo.version}}</span></div>
         <div class="info title">
@@ -10,14 +10,14 @@
           <li>{{upgradeStatus.title}}</li>
         </ul>
         </div>
-        <Button v-if="currentTab == 1 && upgradeStatus.status == 1" type="primary" class="primary btn update" @click="update()">立即更新</Button>
+        <el-button v-if="currentTab == 1 && upgradeStatus.status == 1" type="primary" class="primary btn update" @click="update()">立即更新</el-button>
       </div>
-    </Card>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    </el-card>
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
         <div>
-          <Tabs v-model="currentTab" @on-click="handleClick">
-            <TabPane :label="item.label" :name="item.value.toString()" v-for="item in headerList" :key="item.id"/>
-          </Tabs>
+          <el-tabs v-model="currentTab" @tag-click="handleClick">
+            <el-tab-pane :label="item.label" :name="item.value.toString()" v-for="item in headerList" :key="item.id"/>
+          </el-tabs>
         </div>
           <div class="contentTime" v-if="currentTab == 1">
             <div class="acea-row row-top on" @mouseenter="quearyEvear(item.id,index)" v-for="(item, index) in upgradeList" :key="index" :class="{active:index==dynamic}">
@@ -36,8 +36,8 @@
                             </Panel>
                         </Collapse>
                     </TimelineItem>
-                    <Button v-if="item.client_package_link" type="success"  class="primary btn" @click="downloadFile(item.client_package_link)">移动端源码</Button>
-                    <Button v-if="item.pc_package_link" type="primary" class="primary btn1" @click="downloadFile(item.pc_package_link)">PC端源码</Button>
+                    <el-button v-if="item.client_package_link" type="success"  class="primary btn" @click="downloadFile(item.client_package_link)">移动端源码</el-button>
+                    <el-button v-if="item.pc_package_link" type="primary" class="primary btn1" @click="downloadFile(item.pc_package_link)">PC端源码</el-button>
                 </Timeline>
             </div>
         </div>
@@ -62,14 +62,14 @@
                             </Panel>
                         </Collapse>
                     </TimelineItem>
-                    <!-- <Button v-if="item.data_status == 1" type="primary" class="primary btn" @click="handleDownload(item)">数据库备份</Button>
-                    <Button v-if="item.file_status == 1" type="primary" class="primary btn1" @click="exports(item)">导出文件</Button> -->
+                    <!-- <el-button v-if="item.data_status == 1" type="primary" class="primary btn" @click="handleDownload(item)">数据库备份</el-button>
+                    <el-button v-if="item.file_status == 1" type="primary" class="primary btn1" @click="exports(item)">导出文件</el-button> -->
                 </Timeline>
             </div>
         </div>
         </Scroll>
 
-    </Card>
+    </el-card>
     <!-- 免责声明 -->
     <Modal :loading="modal_loading" v-model="declaration" width="340" height="96" :closable="false" class-name="vertical-center-modal" :mask-closable="false">
         <p slot="header" class="header-modal">
@@ -79,8 +79,8 @@
           <p v-html="upgradeAgreement.content"></p>
         </div>
         <div slot="footer" class="footer">
-            <Button class="cancel" shape="circle" @click="reject">拒绝</Button>
-            <Button shape="circle" type="primary" @click="agree()">同意</Button>
+            <el-button class="cancel" shape="circle" @click="reject">拒绝</el-button>
+            <el-button shape="circle" type="primary" @click="agree()">同意</el-button>
         </div>
     </Modal>
     <!-- 升级 -->
@@ -104,7 +104,7 @@
           <div class="wait">正在更新，请耐心等候～</div>
         </div>
         <div slot="footer">
-          <!-- <div v-if="upgradeProgress.speed == '100.0'"><Button class="back" type="primary" shape="circle" @click="updateModal = false">确认</Button></div> -->
+          <!-- <div v-if="upgradeProgress.speed == '100.0'"><el-button class="back" type="primary" shape="circle" @click="updateModal = false">确认</el-button></div> -->
         </div>
         <div v-if="upgradeProgress.speed == '100.0'" class="describe">
           <i-circle :percent="100" stroke-color="#5cb85c">
@@ -119,8 +119,8 @@
           <div class="success">升级失败</div>
         </div> -->
         <div v-if="upgradeProgress.speed == '100.0'" slot="footer" class="footer2">
-          <Button class="confirm" type="primary" shape="circle" @click="back()">确认</Button>
-          <!-- <div><Button class="back" shape="circle" @click="backSure()">返回</Button></div> -->
+          <el-button class="confirm" type="primary" shape="circle" @click="back()">确认</el-button>
+          <!-- <div><el-button class="back" shape="circle" @click="backSure()">返回</el-button></div> -->
         </div>
     </Modal>
 </div>
@@ -230,9 +230,9 @@ export default {
         this.getUpgradeLogList();
       }
     },
-    handleClick(tab, event) {
+    handleClick() {
       this.page = 1
-      if(tab == 1){
+      if(this.currentTab == 1){
         this.getupgradeableList();
       } else {
         this.upgradeLogList = []
diff --git a/template/admin/src/pages/system/systemMenus/components/menusFrom.vue b/template/admin/src/pages/system/systemMenus/components/menusFrom.vue
index 153b0dc08..52bba4f42 100644
--- a/template/admin/src/pages/system/systemMenus/components/menusFrom.vue
+++ b/template/admin/src/pages/system/systemMenus/components/menusFrom.vue
@@ -11,114 +11,114 @@
       @on-cancel="handleReset"
       @on-visible-change="visible"
     >
-      <Form ref="formValidate" :model="formValidate" :label-width="110" @submit.native.prevent>
-        <!-- <Row type="flex" :gutter="24">
-          <Col span="24">
-            <FormItem label="类型：">
-              <RadioGroup v-model="formValidate.auth_type" @on-change="changeRadio">
-                <Radio :label="item.value" v-for="(item, i) in optionsRadio" :key="i">
+      <el-form ref="formValidate" :model="formValidate" label-width="110px" @submit.native.prevent>
+        <!-- <el-row  :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="类型：">
+              <el-radio-group v-model="formValidate.auth_type" @change="changeRadio">
+                <el-radio :label="item.value" v-for="(item, i) in optionsRadio" :key="i">
                   <Icon type="social-apple"></Icon>
                   <span>{{ item.label }}</span>
-                </Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-        </Row> -->
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem :label="!authType ? '接口名称：' : '按钮名称：'" prop="menu_name">
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row  :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item :label="!authType ? '接口名称：' : '按钮名称：'" prop="menu_name">
               <div class="add">
-                <Input v-model="formValidate.menu_name" :placeholder="!authType ? '请输入接口名称' : '请输入按钮名称'">
-                </Input>
-                <!-- <Button class="ml10 df" v-show="!authType" @click="getRuleList()" icon="ios-apps"></Button> -->
+                <el-input v-model="formValidate.menu_name" :placeholder="!authType ? '请输入接口名称' : '请输入按钮名称'">
+                </el-input>
+                <!-- <el-button class="ml10 df" v-show="!authType" @click="getRuleList()" icon="ios-apps"></el-button> -->
               </div>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="父级分类：">
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="父级分类：">
               <Cascader :data="menuList" change-on-select v-model="formValidate.path" filterable></Cascader>
-            </FormItem>
-          </Col>
-          <!-- <Col v-bind="grid" v-if="!authType">
-            <FormItem label="请求方式：" prop="methods">
-              <Select v-model="formValidate.methods">
-                <Option value="">请求</Option>
-                <Option value="GET">GET</Option>
-                <Option value="POST">POST</Option>
-                <Option value="PUT">PUT</Option>
-                <Option value="DELETE">DELETE</Option>
-              </Select>
-            </FormItem>
-          </Col> -->
-          <!-- <Col v-bind="grid" v-if="!authType">
-            <FormItem label="接口地址：">
-              <Input v-model="formValidate.api_url" placeholder="请输入接口地址" prop="api_url"></Input>
-            </FormItem>
-          </Col> -->
-          <Col v-bind="grid" v-show="authType">
-            <FormItem label="路由地址：" prop="menu_path">
-              <Input v-model="formValidate.menu_path" placeholder="请输入路由地址" @on-change="changeUnique">
+            </el-form-item>
+          </el-col>
+          <!-- <el-col v-bind="grid" v-if="!authType">
+            <el-form-item label="请求方式：" prop="methods">
+              <el-select v-model="formValidate.methods">
+                <el-option value="">请求</el-option>
+                <el-option value="GET">GET</el-option>
+                <el-option value="POST">POST</el-option>
+                <el-option value="PUT">PUT</el-option>
+                <el-option value="DELETE">DELETE</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col v-bind="grid" v-if="!authType">
+            <el-form-item label="接口地址：">
+              <el-input v-model="formValidate.api_url" placeholder="请输入接口地址" prop="api_url"></el-input>
+            </el-form-item>
+          </el-col> -->
+          <el-col v-bind="grid" v-show="authType">
+            <el-form-item label="路由地址：" prop="menu_path">
+              <el-input v-model="formValidate.menu_path" placeholder="请输入路由地址" @change="changeUnique">
                 <template #prepend>
                   <span>{{ $routeProStr }}</span>
                 </template>
-              </Input>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="权限标识：" prop="unique_auth">
-              <Input v-model="formValidate.unique_auth" placeholder="请输入权限标识"></Input>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid" v-if="authType">
-            <FormItem label="图标：">
-              <Input
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="权限标识：" prop="unique_auth">
+              <el-input v-model="formValidate.unique_auth" placeholder="请输入权限标识"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid" v-if="authType">
+            <el-form-item label="图标：">
+              <el-input
                 v-model="formValidate.icon"
                 placeholder="请选择图标，点击右面图标"
                 icon="ios-appstore"
                 @on-click="iconClick"
-              ></Input>
-            </FormItem>
-          </Col>
+              ></el-input>
+            </el-form-item>
+          </el-col>
 
-          <Col v-bind="grid" v-if="authType">
-            <FormItem label="排序：">
-              <Input type="number" v-model="formValidate.sort" placeholder="请输入排序" number></Input>
-            </FormItem>
-          </Col>
-          <!-- <Col v-bind="grid" v-show="authType">
-            <FormItem label="隐藏菜单：">
-              <RadioGroup v-model="formValidate.is_show_path">
-                <Radio :label="item.value" v-for="(item, i) in isShowPathRadio" :key="i">
+          <el-col v-bind="grid" v-if="authType">
+            <el-form-item label="排序：">
+              <el-input type="number" v-model="formValidate.sort" placeholder="请输入排序" number></el-input>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col v-bind="grid" v-show="authType">
+            <el-form-item label="隐藏菜单：">
+              <el-radio-group v-model="formValidate.is_show_path">
+                <el-radio :label="item.value" v-for="(item, i) in isShowPathRadio" :key="i">
                   <Icon type="social-apple"></Icon>
                   <span>{{ item.label }}</span>
-                </Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col> -->
-          <Col v-bind="grid">
-            <FormItem label="状态：">
-              <RadioGroup v-model="formValidate.is_show">
-                <Radio :label="item.value" v-for="(item, i) in isShowRadio" :key="i">
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col> -->
+          <el-col v-bind="grid">
+            <el-form-item label="状态：">
+              <el-radio-group v-model="formValidate.is_show">
+                <el-radio :label="item.value" v-for="(item, i) in isShowRadio" :key="i">
                   <Icon type="social-apple"></Icon>
                   <span>{{ item.label }}</span>
-                </Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
       <template #footer>
-        <Button @click="modals = false">取消</Button>
-        <Button type="primary" @click="handleSubmit('formValidate')" :disabled="valids">提交</Button>
+        <el-button @click="modals = false">取消</el-button>
+        <el-button type="primary" @click="handleSubmit('formValidate')" :disabled="valids">提交</el-button>
       </template>
     </Modal>
     <Modal v-model="modal12" scrollable width="600" title="图标选择" footer-hide>
-      <Input
+      <el-input
         v-model="iconVal"
         placeholder="输入关键词搜索,注意全是英文"
         clearable
         style="width: 300px"
-        @on-change="upIcon(iconVal)"
+        @change="upIcon(iconVal)"
         ref="search"
       />
       <div class="trees-coadd">
@@ -135,7 +135,7 @@
     </Modal>
     <Modal v-model="ruleModal" scrollable width="1100" title="权限列表" footer-hide @on-visible-change="modalchange">
       <div class="search-rule">
-        <Input
+        <el-input
           class="mr10"
           v-model="searchRule"
           placeholder="输入关键词搜索"
@@ -143,8 +143,8 @@
           style="width: 300px"
           ref="search"
         />
-        <Button class="mr10" type="primary" @click="searchRules">搜索</Button>
-        <Button @click="init">重置</Button>
+        <el-button class="mr10" type="primary" @click="searchRules">搜索</el-button>
+        <el-button @click="init">重置</el-button>
       </div>
       <div class="rule">
         <div
diff --git a/template/admin/src/pages/system/systemMenus/index.vue b/template/admin/src/pages/system/systemMenus/index.vue
index c2555c5b1..f31537284 100644
--- a/template/admin/src/pages/system/systemMenus/index.vue
+++ b/template/admin/src/pages/system/systemMenus/index.vue
@@ -1,34 +1,34 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="roleData"
         :model="roleData"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="规则状态：">
-              <Select v-model="roleData.is_show" placeholder="请选择" clearable @on-change="getData">
-                <Option value="1">显示</Option>
-                <Option value="0">不显示</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="按钮名称：" prop="status2" label-for="status2">
-              <Input v-model="roleData.keyword" search enter-button placeholder="请输入按钮名称" @on-search="getData" />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button type="primary" @click="menusAdd('添加规则')" icon="md-add">添加规则 </Button>
-          </Col>
-        </Row>
-      </Form>
+        <el-row  :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="规则状态：">
+              <el-select v-model="roleData.is_show" placeholder="请选择" clearable @change="getData">
+                <el-option value="1" label="显示"></el-option>
+                <el-option value="0" label="不显示"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="按钮名称：" prop="status2" label-for="status2">
+              <el-input v-model="roleData.keyword" search enter-button placeholder="请输入按钮名称" @on-search="getData" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row >
+          <el-col v-bind="grid">
+            <el-button type="primary" @click="menusAdd('添加规则')" icon="md-add">添加规则 </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
       <vxe-table
         :border="false"
         class="vxeTable mt25"
@@ -51,17 +51,13 @@
         </vxe-table-column>
         <vxe-table-column field="flag" title="规则状态" min-width="120">
           <template v-slot="{ row }">
-            <i-switch
+            <el-switch :active-value="1"  :inactive-value="0"
               v-model="row.is_show"
               :value="row.is_show"
-              :true-value="1"
-              :false-value="0"
-              @on-change="onchangeIsShow(row)"
+              @change="onchangeIsShow(row)"
               size="large"
             >
-              <span slot="open">开启</span>
-              <span slot="close">关闭</span>
-            </i-switch>
+             </el-switch>
           </template>
         </vxe-table-column>
         <vxe-table-column field="mark" title="备注" min-width="120"></vxe-table-column>
@@ -69,18 +65,18 @@
           <template v-slot="{ row }">
             <span>
               <a @click="addRoute(row)" v-if="row.auth_type === 1">添加权限</a>
-              <Divider type="vertical" v-if="row.auth_type === 1" />
+              <el-divider direction="vertical" v-if="row.auth_type === 1" />
               <a @click="addE(row, '添加子菜单')" v-if="row.auth_type === 1">添加子菜单</a>
               <!-- <a @click="addE(row, '添加规则')" v-else>添加规则</a> -->
             </span>
-            <Divider type="vertical" v-if="row.auth_type === 1" />
+            <el-divider direction="vertical" v-if="row.auth_type === 1" />
             <a @click="edit(row, '编辑')">编辑</a>
-            <Divider type="vertical" />
+            <el-divider direction="vertical"></el-divider>
             <a @click="del(row, '删除规则')">删除</a>
           </template>
         </vxe-table-column>
       </vxe-table>
-    </Card>
+    </el-card>
     <menus-from
       :formValidate="formValidate"
       :titleFrom="titleFrom"
@@ -102,7 +98,7 @@
         <Alert
           >基础接口，可多选，并且添加后不会再展示出现；删除权限后才会出现；公共接口，可多选，并且添加后会继续展示；</Alert
         >
-        <Input
+        <el-input
           class="mr10"
           v-model="searchRule"
           placeholder="输入关键词搜索"
@@ -112,8 +108,8 @@
           @on-enter="searchRules"
           @on-clear="searchRules"
         />
-        <Button class="mr10" type="primary" @click="searchRules">搜索</Button>
-        <Button @click="init">重置</Button>
+        <el-button class="mr10" type="primary" @click="searchRules">搜索</el-button>
+        <el-button @click="init">重置</el-button>
       </div>
       <div class="route-list">
         <div class="tree">
@@ -143,9 +139,6 @@
           </div>
         </div>
       </div>
-      <!-- <Tabs v-model="routeType" @on-click="changTab">
-        <TabPane :label="item.name" :name="'' + index" v-for="(item, index) in foundationList" :key="item"></TabPane>
-      </Tabs> -->
     </Modal>
   </div>
 </template>
@@ -213,7 +206,7 @@ export default {
   computed: {
     ...mapState('admin/layout', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
diff --git a/template/admin/src/pages/system/systemUpgradeclient/index.vue b/template/admin/src/pages/system/systemUpgradeclient/index.vue
index d3f7f949d..e1bed6265 100644
--- a/template/admin/src/pages/system/systemUpgradeclient/index.vue
+++ b/template/admin/src/pages/system/systemUpgradeclient/index.vue
@@ -5,51 +5,20 @@
         <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
       </div>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
       <div class="header">
         <div>当前版本<span class="v">V</span><span class="num">1.5</span></div>
         <div class="info">更新说明：已升级至最新版本，无需更新</div>
       </div>
       <div class="contentTime">
         <div class="acea-row row-top on">
-          <div class="time">2020-07-15</div>
-          <Timeline class="list">
-            <TimelineItem>
-              <Icon type="md-radio-button-on" slot="dot"></Icon>
-              <Collapse simple v-model="Panel" class="collapse">
-                <Panel name="1" hide-arrow>
-                  正式版 v1.4<Icon type="ios-arrow-down" />
-                  <Button type="primary" class="primary">下载更新</Button>
-                  <p slot="content" class="info">
-                    史蒂夫·乔布斯（Steve
-                    Jobs），1955年2月24日生于美国加利福尼亚州旧金山，美国发明家、企业家、美国苹果公司联合创办人。史蒂夫·乔布斯（Steve
-                    Jobs），1955年2月24日生于美国加利福尼亚州旧金山，美国发明家、企业家、美国苹果公司联合创办人。史蒂夫·乔布斯（Steve
-                    Jobs），1955年2月24日生于美国加利福尼亚州旧金山，美国发明家、企业家、美国苹果公司联合创办人。
-                  </p>
-                </Panel>
-              </Collapse>
-            </TimelineItem>
-          </Timeline>
         </div>
         <div class="acea-row row-top">
-          <div class="time">2020-07-15</div>
           <Timeline class="list">
-            <TimelineItem>
-              <Icon type="md-radio-button-off" slot="dot" />
-              <Collapse simple>
-                <Panel hide-arrow>
-                  正式版 v1.4<Icon type="ios-arrow-down" />
-                  <p slot="content" class="info">
-                    史蒂夫·乔布斯（Steve
-                    Jobs），1955年2月24日生于美国加利福尼亚州旧金山，美国发明家、企业家、美国苹果公司联合创办人。
-                  </p>
-                </Panel>
-              </Collapse>
-            </TimelineItem>
           </Timeline>
         </div>
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/user/cancel/handle/task.vue b/template/admin/src/pages/user/cancel/handle/task.vue
index a7e688c10..0a9def85b 100644
--- a/template/admin/src/pages/user/cancel/handle/task.vue
+++ b/template/admin/src/pages/user/cancel/handle/task.vue
@@ -10,25 +10,25 @@
     width="950"
     @on-cancel="handleReset"
   >
-    <Form
+    <el-form
       ref="levelFrom"
       :model="levelFrom"
       :label-width="labelWidth"
       :label-position="labelPosition"
       @submit.native.prevent
     >
-      <Row type="flex" :gutter="24">
-        <Col v-bind="grid">
-          <FormItem label="状态：">
-            <Select v-model="levelFrom.is_show" placeholder="是否显示" clearable @on-change="userSearchs">
-              <Option value="1">显示</Option>
-              <Option value="0">不显示</Option>
-            </Select>
-          </FormItem>
-        </Col>
-        <Col v-bind="grid">
-          <FormItem label="等级名称：" prop="status2" label-for="status2">
-            <Input
+      <el-row :gutter="24">
+        <el-col v-bind="grid">
+          <el-form-item label="状态：">
+            <el-select v-model="levelFrom.is_show" placeholder="是否显示" clearable @change="userSearchs">
+              <el-option value="1" label="显示"></el-option>
+              <el-option value="0" label="不显示"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-bind="grid">
+          <el-form-item label="等级名称：" prop="status2" label-for="status2">
+            <el-input
               search
               enter-button
               v-model="levelFrom.name"
@@ -36,61 +36,96 @@
               @on-search="userSearchs"
               style="width: 100%"
             />
-          </FormItem>
-        </Col>
-      </Row>
-    </Form>
-    <Divider dashed />
-    <Row type="flex">
-      <Col v-bind="grid" class="mb15">
-        <Button type="primary" icon="md-add" @click="add">添加等级任务</Button>
-      </Col>
-      <Col span="24" class="userAlert">
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-divider direction="vertical" dashed />
+    <el-row>
+      <el-col v-bind="grid" class="mb15">
+        <el-button type="primary" icon="md-add" @click="add">添加等级任务</el-button>
+      </el-col>
+      <el-col :span="24" class="userAlert">
         <Alert show-icon closable>添加等级任务,任务类型中的{$num}会自动替换成限定数量+系统预设的单位生成任务名</Alert>
-      </Col>
-    </Row>
-    <Divider dashed />
-    <Table
-      :columns="columns1"
+      </el-col>
+    </el-row>
+    <el-divider direction="vertical" dashed />
+    <el-table
       :data="levelLists"
       ref="table"
       :loading="loading"
       no-userFrom-text="暂无数据"
       no-filtered-userFrom-text="暂无筛选结果"
     >
-      <template slot-scope="{ row, index }" slot="is_shows">
-        <i-switch
-          v-model="row.is_show"
-          :value="row.is_show"
-          :true-value="1"
-          :false-value="0"
-          size="large"
-          @on-change="onchangeIsShow(row)"
-        >
-          <span slot="open">显示</span>
-          <span slot="close">隐藏</span>
-        </i-switch>
-      </template>
-      <template slot-scope="{ row, index }" slot="is_musts">
-        <i-switch
-          v-model="row.is_must"
-          :value="row.is_must"
-          :true-value="1"
-          :false-value="0"
-          size="large"
-          @on-change="onchangeIsMust(row)"
-        >
-          <span slot="open">全部完成</span>
-          <span slot="close">达成其一</span>
-        </i-switch>
-      </template>
-      <template slot-scope="{ row, index }" slot="action">
-        <a @click="edit(row)">编辑 | </a>
-        <a @click="del(row, '删除等级任务', index)"> 删除</a>
-      </template>
-    </Table>
+      <el-table-column label="ID" width="80">
+        <template slot-scope="scope">
+          <span>{{ scope.row.id }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="等级名称" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.level_name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="任务名称" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否显示" min-width="130">
+        <template slot-scope="scope">
+          <el-switch
+            class="defineSwitch"
+            :active-value="1"
+            :inactive-value="0"
+            v-model="scope.row.is_show"
+            :value="scope.row.is_show"
+            size="large"
+            @change="onchangeIsShow(scope.row)"
+            active-text="显示"
+            inactive-text="隐藏"
+          >
+          </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="务必达成" min-width="130">
+        <template slot-scope="scope">
+          <el-switch
+            class="defineSwitch"
+            :active-value="1"
+            :inactive-value="0"
+            v-model="scope.row.is_must"
+            :value="scope.row.is_must"
+            :true-value="1"
+            :false-value="0"
+            size="large"
+            @change="onchangeIsMust(scope.row)"
+            active-text="全部"
+            inactive-text="其一"
+          >
+          </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="任务说明" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.illustrate }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" fixed="right" width="170">
+        <template slot-scope="scope">
+          <a @click="edit(scope.row)">编辑 | </a>
+          <a @click="del(scope.row, '删除等级任务', index)"> 删除</a>
+        </template>
+      </el-table-column>
+    </el-table>
     <div class="acea-row row-right page">
-      <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="levelFrom.limit" />
+      <pagination
+        v-if="total"
+        :total="total"
+        :page.sync="levelFrom.page"
+        :limit.sync="levelFrom.limit"
+        @pagination="getList"
+      />
     </div>
     <!-- 新建 编辑表单-->
     <edit-from ref="edits" :FromData="FromData" @submitFail="submitFail" :titleType="titleType"></edit-from>
@@ -106,7 +141,6 @@ export default {
   components: { editFrom },
   data() {
     return {
-      // levelIds: this.levelId,
       grid: {
         xl: 10,
         lg: 10,
@@ -124,54 +158,8 @@ export default {
       total: 0,
       levelLists: [],
       loading: false,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          sortable: true,
-          width: 80,
-        },
-        {
-          title: '等级名称',
-          key: 'level_name',
-          minWidth: 100,
-        },
-        {
-          title: '任务名称',
-          key: 'name',
-          minWidth: 120,
-        },
-        {
-          title: '排序',
-          sort: 'grade',
-          sortable: true,
-          minWidth: 100,
-        },
-        {
-          title: '是否显示',
-          slot: 'is_shows',
-          minWidth: 110,
-        },
-        {
-          title: '务必达成',
-          slot: 'is_musts',
-          minWidth: 135,
-        },
-        {
-          title: '任务说明',
-          key: 'illustrate',
-          minWidth: 120,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 120,
-        },
-      ],
       FromData: null,
       ids: 0,
-      modalTitleSs: '',
       titleType: 'task',
     };
   },
@@ -179,7 +167,7 @@ export default {
     ...mapState('media', ['isMobile']),
     ...mapState('userLevel', ['levelId']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -229,10 +217,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.levelFrom.page = index;
-      this.getList();
-    },
     // 修改显示隐藏
     onchangeIsShow(row) {
       let data = {
diff --git a/template/admin/src/pages/user/cancel/index.vue b/template/admin/src/pages/user/cancel/index.vue
index f59ecfd3f..67a50f8dc 100644
--- a/template/admin/src/pages/user/cancel/index.vue
+++ b/template/admin/src/pages/user/cancel/index.vue
@@ -1,77 +1,112 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="levelFrom"
         :model="levelFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="状态：" label-for="status1">
-              <!-- <Select
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="状态：" label-for="status1">
+              <!-- <el-select
                 v-model="levelFrom.status"
                 placeholder="请选择"
                 clearable
                 element-id="status1"
-                @on-change="userSearchs"
+                @change="userSearchs"
               >
-                <Option value="0">待审核</Option>
-                <Option value="1">通过</Option>
-                <Option value="1">拒绝</Option>
-              </Select> -->
-              <RadioGroup v-model="levelFrom.status" type="button" @on-change="userSearchs(levelFrom.status)">
-                <Radio label="">全部</Radio>
-                <Radio label="0">待审核</Radio>
-                <Radio label="1">通过</Radio>
-                <Radio label="2">拒绝</Radio>
-              </RadioGroup>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="用户搜索：" label-for="title">
-              <Input
+                <el-option value="0">待审核</el-option>
+                <el-option value="1">通过</el-option>
+                <el-option value="1">拒绝</el-option>
+              </el-select> -->
+              <el-radio-group v-model="levelFrom.status" type="button" @change="userSearchs(levelFrom.status)">
+                <el-radio-button label="">全部</el-radio-button>
+                <el-radio-button label="0">待审核</el-radio-button>
+                <el-radio-button label="1">通过</el-radio-button>
+                <el-radio-button label="2">拒绝</el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="用户搜索：" label-for="title">
+              <el-input
                 search
                 enter-button
                 v-model="levelFrom.keywords"
                 placeholder="请输入用户昵称/ID/手机号"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="levelLists"
         ref="table"
         class="mt25"
         :loading="loading"
-        highlight-row
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="agree(row)">同意</a>
-          <Divider type="vertical" />
-          <a @click="refuse(row)">拒绝</a>
-          <Divider type="vertical" />
-          <a @click="remark(row)">备注</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="昵称" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="手机号" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.phone }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.status }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="申请时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核时间" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.up_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.remark }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="agree(scope.row)">同意</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="refuse(scope.row)">拒绝</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="remark(scope.row)">备注</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="levelFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="levelFrom.limit"
+          :page.sync="levelFrom.page"
+          :limit.sync="levelFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!-- 等级任务-->
     <remark ref="remark" @submitFail="submitFail"></remark>
   </div>
@@ -96,49 +131,6 @@ export default {
       },
       id: '',
       loading: false,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '昵称',
-          key: 'name',
-          minWidth: 100,
-        },
-        {
-          title: '手机号',
-          key: 'phone',
-          minWidth: 100,
-        },
-        {
-          title: '状态',
-          key: 'status',
-          minWidth: 120,
-        },
-        {
-          title: '申请时间',
-          key: 'add_time',
-          minWidth: 100,
-        },
-        {
-          title: '审核时间',
-          key: 'up_time',
-          minWidth: 100,
-        },
-        {
-          title: '备注',
-          key: 'remark',
-          minWidth: 100,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 120,
-        },
-      ],
       levelFrom: {
         status: '',
         keywords: '',
@@ -155,7 +147,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -231,10 +223,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.levelFrom.page = index;
-      this.getList();
-    },
     // 表格搜索
     userSearchs() {
       this.levelFrom.page = 1;
diff --git a/template/admin/src/pages/user/grade/agreement/index.vue b/template/admin/src/pages/user/grade/agreement/index.vue
index 7b996eb4e..d01ee5ec1 100644
--- a/template/admin/src/pages/user/grade/agreement/index.vue
+++ b/template/admin/src/pages/user/grade/agreement/index.vue
@@ -1,25 +1,23 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form :label-width="80" @submit.native.prevent>
-        <FormItem label="协议名称：">
-          <Input v-model="agreement.title"></Input>
-        </FormItem>
-        <FormItem label="协议内容：">
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form label-width="85px" @submit.native.prevent>
+        <el-form-item label="协议名称：">
+          <el-input v-model="agreement.title"></el-input>
+        </el-form-item>
+        <el-form-item label="协议内容：">
           <WangEditor :content="agreement.content" @editorContent="getEditorContent"></WangEditor>
-        </FormItem>
-        <FormItem label="开启状态：">
-          <i-switch v-model="agreement.status" size="large" :true-value="1" :false-value="0">
-            <span slot="open">开启</span>
-            <span slot="close">关闭</span>
-          </i-switch>
-        </FormItem>
-        <FormItem>
-          <Button type="primary" @click="memberAgreementSave">保存</Button>
-        </FormItem>
-      </Form>
+        </el-form-item>
+        <el-form-item label="开启状态：">
+          <el-switch :active-value="1"  :inactive-value="0" v-model="agreement.status" size="large">
+           </el-switch>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="memberAgreementSave">保存</el-button>
+        </el-form-item>
+      </el-form>
       <Spin fix v-if="spinShow"></Spin>
-    </Card>
+    </el-card>
   </div>
 </template>
 
diff --git a/template/admin/src/pages/user/grade/card/index.vue b/template/admin/src/pages/user/grade/card/index.vue
index 21fb27a80..189658b96 100644
--- a/template/admin/src/pages/user/grade/card/index.vue
+++ b/template/admin/src/pages/user/grade/card/index.vue
@@ -1,76 +1,112 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form :model="gradeFrom" :label-width="labelWidth" :label-position="labelPosition" @submit.native.prevent>
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="批次名称：" label-for="title">
-              <Input
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form :model="gradeFrom" :label-width="labelWidth" :label-position="labelPosition" @submit.native.prevent>
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="批次名称：" label-for="title">
+              <el-input
                 search
                 enter-button
                 v-model="gradeFrom.title"
                 placeholder="请输入批次名称"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button type="primary" icon="md-add" @click="addBatch" class="mr20">添加批次</Button>
-            <Button @click="getMemberScan">下载二维码</Button>
-          </Col>
-        </Row>
-      </Form>
-      <Table
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-button type="primary" icon="md-add" @click="addBatch" class="mr20">添加批次</el-button>
+            <el-button @click="getMemberScan">下载二维码</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         class="mt25"
         :columns="columns"
         :data="tbody"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="status">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">激活</span>
-            <span slot="close">冻结</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <template>
-            <Dropdown @on-click="changeMenu(row, $event, index)" :transfer="true">
-              <a href="javascript:void(0)">
-                更多
-                <Icon type="ios-arrow-down"></Icon>
-              </a>
-              <DropdownMenu slot="list">
-                <DropdownItem name="1">编辑批次名</DropdownItem>
-                <DropdownItem name="2">查看卡列表</DropdownItem>
-                <DropdownItem name="3">导出</DropdownItem>
-              </DropdownMenu>
-            </Dropdown>
+        <el-table-column label="编号" width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
           </template>
-        </template>
-      </Table>
+        </el-table-column>
+        <el-table-column label="批次名称" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="体验天数" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.use_day }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="发卡总数量" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.total_num }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="使用数量" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.use_num }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="制卡时间" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否激活" min-width="100">
+          <template slot-scope="scope">
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              :value="scope.row.status"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.remark }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="制卡时间" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.add_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <el-dropdown size="small" @command="changeMenu(scope.row, $event, index)" :transfer="true">
+              <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i> </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="1">编辑批次名</el-dropdown-item>
+                <el-dropdown-item command="2">查看卡列表</el-dropdown-item>
+                <el-dropdown-item command="3">导出</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="gradeFrom.page"
-          :page-size="gradeFrom.limit"
-          show-elevator
-          show-total
-          @on-change="pageChange"
+          :page.sync="gradeFrom.page"
+          :limit.sync="gradeFrom.limit"
+          @pagination="getMemberBatch"
         />
       </div>
-    </Card>
+    </el-card>
     <Modal v-model="modal" title="添加批次" footer-hide>
       <form-create v-model="fapi" :rule="rule" @submit="onSubmit"></form-create>
     </Modal>
@@ -275,7 +311,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -353,11 +389,6 @@ export default {
           break;
       }
     },
-    // 分页
-    pageChange(index) {
-      this.gradeFrom.page = index;
-      this.getMemberBatch();
-    },
     // 添加批次弹窗
     addBatch() {
       this.fapi.resetFields();
diff --git a/template/admin/src/pages/user/grade/card/list.vue b/template/admin/src/pages/user/grade/card/list.vue
index 729e14ab2..888597a6a 100644
--- a/template/admin/src/pages/user/grade/card/list.vue
+++ b/template/admin/src/pages/user/grade/card/list.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formData"
         :model="table"
         :label-width="labelWidth"
@@ -9,57 +9,87 @@
         inline
         @submit.native.prevent
       >
-        <FormItem label="卡号：" style="width: 200px">
-          <Input v-model="table.card_number" placeholder="请输入卡号" />
-        </FormItem>
-        <FormItem label="手机号：" style="width: 200px">
-          <Input v-model="table.phone" placeholder="请输入手机号" />
-        </FormItem>
-        <FormItem label="是否领取：" style="width: 200px">
-          <Select clearable v-model="table.is_use">
-            <Option value="1">已领取</Option>
-            <Option value="0">未领取</Option>
-          </Select>
-        </FormItem>
-        <FormItem>
-          <Button type="primary" @click="formSubmit">搜索</Button>
-        </FormItem>
-      </Form>
-      <Table
-        :columns="columns1"
+        <el-form-item label="卡号：" style="width: 200px">
+          <el-input v-model="table.card_number" placeholder="请输入卡号" />
+        </el-form-item>
+        <el-form-item label="手机号：" style="width: 200px">
+          <el-input v-model="table.phone" placeholder="请输入手机号" />
+        </el-form-item>
+        <el-form-item label="是否领取：" style="width: 200px">
+          <el-select clearable v-model="table.is_use">
+            <el-option value="1" label="已领取"></el-option>
+            <el-option value="0" label="未领取"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="formSubmit">搜索</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
         :data="data1"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="status">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">激活</span>
-            <span slot="close">冻结</span>
-          </i-switch>
-        </template>
-      </Table>
+        <el-table-column label="编号" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="卡号" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.card_number }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="密码" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.card_password }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="领取人名称" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.username }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="领取人电话" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.phone }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="领取时间" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.use_time }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否激活" min-width="100">
+          <template slot-scope="scope">
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              :value="scope.row.status"
+              @change="onchangeIsShow(scope.row)"
+              size="large"
+              active-text="激活"
+              inactive-text="冻结"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="table.page"
-          :page-size="table.limit"
-          show-elevator
-          show-total
-          @on-change="pageChange"
+          :page.sync="table.page"
+          :limit.sync="table.limit"
+          @pagination="getMemberCard"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -76,52 +106,6 @@ export default {
   },
   data() {
     return {
-      columns1: [
-        {
-          title: '编号',
-          key: 'id',
-          minWidth: 100,
-          align: 'center',
-        },
-        {
-          title: '卡号',
-          key: 'card_number',
-          minWidth: 105,
-          align: 'center',
-        },
-        {
-          title: '密码',
-          key: 'card_password',
-          align: 'center',
-          minWidth: 100,
-        },
-        {
-          title: '领取人名称',
-          key: 'username',
-          align: 'center',
-
-          minWidth: 100,
-        },
-        {
-          title: '领取人电话',
-          key: 'phone',
-          align: 'center',
-
-          minWidth: 100,
-        },
-        {
-          title: '领取时间',
-          key: 'use_time',
-          align: 'center',
-
-          minWidth: 100,
-        },
-        {
-          title: '是否激活',
-          slot: 'status',
-          minWidth: 100,
-        },
-      ],
       data1: [],
       loading: false,
       total: 0,
@@ -137,7 +121,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -179,11 +163,6 @@ export default {
       this.table.page = 1;
       this.getMemberCard();
     },
-    // 分页
-    pageChange(index) {
-      this.table.page = index;
-      this.getMemberCard();
-    },
   },
 };
 </script>
diff --git a/template/admin/src/pages/user/grade/record/index.vue b/template/admin/src/pages/user/grade/record/index.vue
index 4453a97ef..80321ca4e 100644
--- a/template/admin/src/pages/user/grade/record/index.vue
+++ b/template/admin/src/pages/user/grade/record/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="formValidate"
         :model="formValidate"
         :label-width="labelWidth"
@@ -9,27 +9,27 @@
         class="tabform"
         @submit.native.prevent
       >
-        <Row :gutter="24" type="flex" justify="end">
-          <Col span="24" class="ivu-text-left">
-            <Col span="7" class="ivu-text-left">
-              <FormItem label="会员类型：">
-                <Select v-model="formValidate.member_type" clearable @on-change="userSearchs">
-                  <Option v-for="item in treeSelect" :value="item.id" :key="item.id">{{ item.label }}</Option>
-                </Select>
-              </FormItem>
-            </Col>
-            <Col span="7" class="ivu-text-left ml20">
-              <FormItem label="支付方式：">
-                <Select v-model="formValidate.pay_type" clearable @on-change="paySearchs">
-                  <Option v-for="item in payList" :value="item.val" :key="item.val">{{ item.label }}</Option>
-                </Select>
-              </FormItem>
-            </Col>
-            <Col span="7" class="ivu-text-left ml20">
-              <FormItem label="购买时间：">
+        <el-row :gutter="24" justify="end">
+          <el-col :span="24" class="ivu-text-left">
+            <el-col :span="7" class="ivu-text-left">
+              <el-form-item label="会员类型：">
+                <el-select v-model="formValidate.member_type" clearable @change="userSearchs">
+                  <el-option v-for="item in treeSelect" :value="item.id" :key="item.id" :label="item.label"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="7" class="ivu-text-left ml20">
+              <el-form-item label="支付方式：">
+                <el-select v-model="formValidate.pay_type" clearable @change="paySearchs">
+                  <el-option v-for="item in payList" :value="item.val" :key="item.val" :label="item.label"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="7" class="ivu-text-left ml20">
+              <el-form-item label="购买时间：">
                 <DatePicker
                   :editable="false"
-                  @on-change="onchangeTime"
+                  @change="onchangeTime"
                   :value="timeVal"
                   format="yyyy/MM/dd"
                   type="datetimerange"
@@ -38,11 +38,11 @@
                   style="width: 90%"
                   :options="options"
                 ></DatePicker>
-              </FormItem>
-            </Col>
-            <Col span="7" class="ivu-text-left">
-              <FormItem label="搜索：">
-                <Input
+              </el-form-item>
+            </el-col>
+            <el-col :span="7" class="ivu-text-left">
+              <el-form-item label="搜索：">
+                <el-input
                   search
                   enter-button
                   @on-search="selChange"
@@ -52,45 +52,70 @@
                   style="width: 90%; display: inline-table"
                   class="mr"
                 />
-              </FormItem>
-            </Col>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="thead"
+              </el-form-item>
+            </el-col>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="tbody"
         ref="table"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        size="small"
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <!--<template slot-scope="{ row, index }" slot="status">-->
-        <!--<i-switch-->
-        <!--v-model="row.status"-->
-        <!--:value="row.status"-->
-        <!--:true-value="1"-->
-        <!--:false-value="0"-->
-        <!--@on-change="onchangeIsShow(row)"-->
-        <!--size="large"-->
-        <!--&gt;-->
-        <!--<span slot="open">激活</span>-->
-        <!--<span slot="close">冻结</span>-->
-        <!--</i-switch>-->
-        <!--</template>-->
-      </Table>
+        <el-table-column label="订单号" width="170">
+          <template slot-scope="scope">
+            <span>{{ scope.row.order_id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户名" min-width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.user.nickname }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="手机号码" min-width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.user.phone || '--' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="会员类型" min-width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.member_type }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="有效期限（天）" min-width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.vip_day === -1 ? '永久' : scope.row.vip_day }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="支付金额（元）" min-width="50">
+          <template slot-scope="scope">
+            <span>{{ scope.row.pay_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="支付方式" min-width="30">
+          <template slot-scope="scope">
+            <span>{{ scope.row.pay_type }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="购买时间" min-width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.pay_time }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="tablePage.page"
-          :page-size="tablePage.limit"
-          show-elevator
-          show-total
-          @on-change="pageChange"
+          :page.sync="tablePage.page"
+          :limit.sync="tablePage.limit"
+          @pagination="getMemberRecord"
         />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -277,7 +302,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -331,11 +356,6 @@ export default {
           this.$Message.error(err.msg);
         });
     },
-    // 分页
-    pageChange(index) {
-      this.tablePage.page = index;
-      this.getMemberRecord();
-    },
   },
 };
 </script>
diff --git a/template/admin/src/pages/user/grade/right/index.vue b/template/admin/src/pages/user/grade/right/index.vue
index ec3263160..bb7730e7d 100644
--- a/template/admin/src/pages/user/grade/right/index.vue
+++ b/template/admin/src/pages/user/grade/right/index.vue
@@ -3,68 +3,88 @@
     <div class="i-layout-page-header header-title">
       <span class="ivu-page-header-title">{{ $route.meta.title }}</span>
     </div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Table
-        :columns="thead"
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-table
         :data="tbody"
         :loading="loading"
-        highlight-row
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row }" slot="image">
-          <div class="image-wrap" v-viewer>
-            <img v-lazy="row.image" />
-          </div>
-        </template>
-        <template slot-scope="{ row }" slot="status">
-          <i-switch
-            v-model="row.status"
-            :value="row.status"
-            :true-value="1"
-            :false-value="0"
-            size="large"
-            @on-change="statusChange(row)"
-          >
-            <span slot="open">启用</span>
-            <span slot="close">禁用</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row }" slot="action">
-          <a @click="edit(row)">编辑</a>
-        </template>
-      </Table>
+        <el-table-column label="权益名称" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="展示名称" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.show_title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="权益图标" min-width="120">
+          <template slot-scope="scope">
+            <div class="image-wrap" v-viewer>
+              <img v-lazy="scope.row.image" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="权益简介" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.explain }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="权益状态" min-width="120">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.status"
+              size="large"
+              @change="statusChange(scope.row)"
+              active-text="启用"
+              inactive-text="禁用"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a @click="edit(scope.row)">编辑</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page :total="total" :current="page" :page-size="limit" show-elevator show-total @on-change="pageChange" />
+        <pagination v-if="total" :total="total" :page.sync="page" :limit.sync="limit" @pagination="getRightList" />
       </div>
-    </Card>
+    </el-card>
     <Modal v-model="modal1" title="编辑会员权益" footer-hide :z-index="555">
-      <Form ref="form" :model="form" :rules="rules" :label-width="80">
-        <Input v-model="form.id" style="display: none"></Input>
-        <Input v-model="form.status" style="display: none"></Input>
-        <Input v-model="form.right_type" style="display: none"></Input>
-        <FormItem label="权益名称" prop="title">
-          <Input v-model.trim="form.title" placeholder="请输入权益名称" disabled></Input>
-        </FormItem>
-        <FormItem label="展示名称" prop="show_title">
-          <Input v-model.trim="form.show_title" placeholder="请输入展示名称"></Input>
-        </FormItem>
-        <FormItem label="权益图标" prop="image">
+      <el-form ref="form" :model="form" :rules="rules" label-width="85px">
+        <el-input v-model="form.id" style="display: none"></el-input>
+        <el-input v-model="form.status" style="display: none"></el-input>
+        <el-input v-model="form.right_type" style="display: none"></el-input>
+        <el-form-item label="权益名称" prop="title">
+          <el-input v-model.trim="form.title" placeholder="请输入权益名称" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="展示名称" prop="show_title">
+          <el-input v-model.trim="form.show_title" placeholder="请输入展示名称"></el-input>
+        </el-form-item>
+        <el-form-item label="权益图标" prop="image">
           <div class="image-group" @click="callImage">
             <img v-if="form.image" v-lazy="form.image" />
             <Icon v-else type="ios-camera-outline" size="26" />
           </div>
-          <Input v-model="form.image" style="display: none"></Input>
-        </FormItem>
-        <FormItem label="权益简介" prop="show_title">
-          <Input
+          <el-input v-model="form.image" style="display: none"></el-input>
+        </el-form-item>
+        <el-form-item label="权益简介" prop="show_title">
+          <el-input
             v-model.trim="form.explain"
             type="textarea"
             :autosize="{ minRows: 2, maxRows: 10 }"
             placeholder="请输入权益简介"
-          ></Input>
-        </FormItem>
-        <FormItem
+          ></el-input>
+        </el-form-item>
+        <el-form-item
           v-show="form.right_type !== 'coupon' && form.right_type !== 'vip_price'"
           :label="
             form.right_type === 'offline' || form.right_type === 'express' || form.right_type === 'vip_price'
@@ -73,12 +93,12 @@
           "
           prop="number"
         >
-          <InputNumber v-model="form.number" :min="1"></InputNumber>
-        </FormItem>
-        <FormItem>
-          <Button type="primary" @click="formSubmit('form')">提交</Button>
-        </FormItem>
-      </Form>
+          <el-input-number controls-position="right" v-model="form.number" :min="1"></el-input-number>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="formSubmit('form')">提交</el-button>
+        </el-form-item>
+      </el-form>
     </Modal>
     <Modal v-model="modal2" width="950px" scrollable footer-hide closable title="选择权益图标" :z-index="888">
       <uploadPictures
@@ -101,32 +121,6 @@ export default {
   components: { uploadPictures },
   data() {
     return {
-      thead: [
-        {
-          title: '权益名称',
-          key: 'title',
-        },
-        {
-          title: '展示名称',
-          key: 'show_title',
-        },
-        {
-          title: '权益图标',
-          slot: 'image',
-        },
-        {
-          title: '权益简介',
-          key: 'explain',
-        },
-        {
-          title: '权益状态',
-          slot: 'status',
-        },
-        {
-          title: '操作',
-          slot: 'action',
-        },
-      ],
       tbody: [],
       loading: false,
       total: 0,
@@ -212,11 +206,6 @@ export default {
       this.form.explain = row.explain;
       this.form.number = row.number;
     },
-    // 分页
-    pageChange(index) {
-      this.page = index;
-      this.getRightList();
-    },
     // 修改
     rightSave() {
       memberRightSave(this.form)
diff --git a/template/admin/src/pages/user/grade/type/index.vue b/template/admin/src/pages/user/grade/type/index.vue
index 232babcc8..6edc760fb 100644
--- a/template/admin/src/pages/user/grade/type/index.vue
+++ b/template/admin/src/pages/user/grade/type/index.vue
@@ -1,38 +1,75 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Button type="primary" @click="addType">添加类型</Button>
-      <Table
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-button type="primary" @click="addType">添加类型</el-button>
+      <el-table
         class="mt25"
-        :columns="thead"
         :data="tbody"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="is_del">
-          <i-switch
-            v-model="row.is_del"
-            :value="row.is_del"
-            :true-value="0"
-            :false-value="1"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">启用</span>
-            <span slot="close">禁用</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a href="javascript:" @click="editType(row)">编辑</a>
-          <Divider type="vertical" v-if="row.type !== 'free' && row.type !== 'ever'" />
-          <a v-if="row.type !== 'free' && row.type !== 'ever'" href="javascript:" @click="del(row, '删除类型', index)"
-            >删除</a
-          >
-        </template>
-      </Table>
-    </Card>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="会员名" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.title }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="有限期（天）" min-width="130">
+          <template slot-scope="scope">
+            <span>{{ scope.row.vip_day === -1 ? '永久' : scope.row.vip_day }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="原价" min-width="90">
+          <template slot-scope="scope">
+            <span>{{ scope.row.price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠价" min-width="90">
+          <template slot-scope="scope">
+            <span>{{ scope.row.pre_price }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="排序" min-width="90">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sort }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否开启" min-width="90">
+          <template slot-scope="scope">
+            <el-switch
+              class="defineSwitch"
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.is_del"
+              :value="scope.row.is_del"
+              @change="onchangeIsShow(row)"
+              size="large"
+              active-text="启用"
+              inactive-text="禁用"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="170">
+          <template slot-scope="scope">
+            <a href="javascript:" @click="editType(scope.row)">编辑</a>
+            <el-divider direction="vertical" v-if="scope.row.type !== 'free' && scope.row.type !== 'ever'" />
+            <a
+              v-if="scope.row.type !== 'free' && scope.row.type !== 'ever'"
+              href="javascript:"
+              @click="del(scope.row, '删除类型', index)"
+              >删除</a
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
     <Modal v-model="modal" :title="`${rowModelType}${rowEdit && rowEdit.title}会员`" footer-hide @on-cancel="cancel">
       <form-create v-model="fapi" :rule="rule" @submit="onSubmit"></form-create>
     </Modal>
@@ -46,43 +83,6 @@ export default {
   name: 'list',
   data() {
     return {
-      thead: [
-        {
-          title: 'ID',
-          key: 'id',
-        },
-        {
-          title: '会员名',
-          key: 'title',
-        },
-        {
-          title: '有限期（天）',
-          key: 'vip_day',
-          render: (h, params) => {
-            return h('span', params.row.vip_day === -1 ? '永久' : params.row.vip_day);
-          },
-        },
-        {
-          title: '原价',
-          key: 'price',
-        },
-        {
-          title: '优惠价',
-          key: 'pre_price',
-        },
-        {
-          title: '排序',
-          key: 'sort',
-        },
-        {
-          title: '是否开启',
-          slot: 'is_del',
-        },
-        {
-          title: '操作',
-          slot: 'action',
-        },
-      ],
       tbody: [],
       loading: false,
       modal: false,
diff --git a/template/admin/src/pages/user/group/index.vue b/template/admin/src/pages/user/group/index.vue
index 99be47262..7362e00ee 100644
--- a/template/admin/src/pages/user/group/index.vue
+++ b/template/admin/src/pages/user/group/index.vue
@@ -1,36 +1,48 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Row type="flex">
-        <Col v-bind="grid">
-          <Button v-auth="['admin-user-group']" type="primary" icon="md-add" @click="add">添加分组</Button>
-        </Col>
-      </Row>
-      <Table
-        :columns="columns1"
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-row>
+        <el-col v-bind="grid">
+          <el-button v-auth="['admin-user-group']" type="primary" icon="md-add" @click="add">添加分组</el-button>
+        </el-col>
+      </el-row>
+      <el-table
         :data="groupLists"
         ref="table"
         class="mt25"
-        :loading="loading"
-        highlight-row
+        v-loading="loading"
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="icons">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.icon" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <a @click="edit(row.id)">修改</a>
-          <Divider type="vertical" />
-          <a @click="del(row, '删除分组', index)">删除</a>
-        </template>
-      </Table>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="分组" min-width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.group_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <a @click="edit(row.id)">修改</a>
+            <el-divider direction="vertical"></el-divider>
+            <a @click="del(row, '删除分组', index)">删除</a>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="groupFrom.limit" />
+        <pagination
+          v-if="total"
+          :total="total"
+          :page.sync="groupFrom.page"
+          :limit.sync="groupFrom.limit"
+          @pagination="getList"
+        />
       </div>
-    </Card>
+    </el-card>
   </div>
 </template>
 
@@ -49,24 +61,7 @@ export default {
         xs: 24,
       },
       loading: false,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '分组名称',
-          key: 'group_name',
-          minWidth: 600,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 120,
-        },
-      ],
+
       groupFrom: {
         page: 1,
         limit: 15,
@@ -78,7 +73,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'left';
@@ -107,10 +102,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.groupFrom.page = index;
-      this.getList();
-    },
     // 修改
     edit(id) {
       this.$modalForm(groupAddApi(id)).then(() => this.getList());
diff --git a/template/admin/src/pages/user/label/index.vue b/template/admin/src/pages/user/label/index.vue
index 7332a075c..147279862 100644
--- a/template/admin/src/pages/user/label/index.vue
+++ b/template/admin/src/pages/user/label/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <Row class="ivu-mt box-wrapper">
-      <Col v-bind="grid1" class="left-wrapper">
+    <el-row class="ivu-mt box-wrapper">
+      <el-col v-bind="grid1" class="left-wrapper">
         <Menu :theme="theme3" :active-name="sortName" width="auto">
           <MenuGroup>
             <MenuItem
@@ -31,56 +31,68 @@
             </MenuItem>
           </MenuGroup>
         </Menu>
-      </Col>
-      <Col v-bind="grid2" ref="rightBox">
-        <Card :bordered="false" dis-hover>
-          <Row type="flex">
-            <Col>
-              <Button v-auth="['admin-user-label_add']" type="primary" icon="md-add" @click="add">添加标签</Button>
-              <Button
+      </el-col>
+      <el-col v-bind="grid2" ref="rightBox">
+        <el-card :bordered="false" shadow="never">
+          <el-row>
+            <el-col>
+              <el-button v-auth="['admin-user-label_add']" type="primary" icon="md-add" @click="add"
+                >添加标签</el-button
+              >
+              <el-button
                 v-auth="['admin-user-label_add']"
                 type="success"
                 icon="md-add"
                 @click="addSort"
                 style="margin-left: 10px"
-                >添加分类</Button
+                >添加分类</el-button
               >
-            </Col>
-          </Row>
-          <Table
-            :columns="columns1"
+            </el-col>
+          </el-row>
+          <el-table
             :data="labelLists"
             ref="table"
             class="mt25"
-            :loading="loading"
-            highlight-row
+            v-loading="loading"
+            highlight-current-row
             no-userFrom-text="暂无数据"
             no-filtered-userFrom-text="暂无筛选结果"
           >
-            <template slot-scope="{ row, index }" slot="icons">
-              <div class="tabBox_img" v-viewer>
-                <img v-lazy="row.icon" />
-              </div>
-            </template>
-            <template slot-scope="{ row, index }" slot="action">
-              <a @click="edit(row.id)">修改</a>
-              <Divider type="vertical" />
-              <a @click="del(row, '删除分组', index)">删除</a>
-            </template>
-          </Table>
+            <el-table-column label="ID" width="80">
+              <template slot-scope="scope">
+                <span>{{ scope.row.id }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="标签名称" width="80">
+              <template slot-scope="scope">
+                <span>{{ scope.row.label_name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="分类名称" min-width="80">
+              <template slot-scope="scope">
+                <span>{{ scope.row.cate_name }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column fixed="right" label="操作" width="100">
+              <template slot-scope="scope">
+                <a @click="edit(row.id)">修改</a>
+                <el-divider direction="vertical"></el-divider>
+                <a @click="del(row, '删除分组', index)">删除</a>
+              </template>
+            </el-table-column>
+          </el-table>
           <div class="acea-row row-right page">
-            <Page
+            <pagination
+              v-if="total"
               :total="total"
-              :model-value="labelFrom.page"
-              show-elevator
-              show-total
-              @on-change="pageChange"
-              :page-size="labelFrom.limit"
+              :page.sync="labelFrom.page"
+              :limit.sync="labelFrom.limit"
+              @pagination="getList"
             />
           </div>
-        </Card>
-      </Col>
-    </Row>
+        </el-card>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
@@ -107,31 +119,6 @@ export default {
       },
 
       loading: false,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          align: 'center',
-          width: 80,
-        },
-        {
-          title: '标签名称',
-          key: 'label_name',
-          align: 'left',
-        },
-        {
-          title: '分类名称',
-          key: 'cate_name',
-          align: 'center',
-        },
-
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          width: 120,
-        },
-      ],
       labelFrom: {
         page: 1,
         limit: 15,
@@ -148,7 +135,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -177,10 +164,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.labelFrom.page = index;
-      this.getList();
-    },
     // 修改
     edit(id) {
       this.$modalForm(userLabelAddApi(id)).then(() => this.getList());
diff --git a/template/admin/src/pages/user/level/handle/task.vue b/template/admin/src/pages/user/level/handle/task.vue
index a7e688c10..6e881cf26 100644
--- a/template/admin/src/pages/user/level/handle/task.vue
+++ b/template/admin/src/pages/user/level/handle/task.vue
@@ -10,25 +10,25 @@
     width="950"
     @on-cancel="handleReset"
   >
-    <Form
+    <el-form
       ref="levelFrom"
       :model="levelFrom"
       :label-width="labelWidth"
       :label-position="labelPosition"
       @submit.native.prevent
     >
-      <Row type="flex" :gutter="24">
-        <Col v-bind="grid">
-          <FormItem label="状态：">
-            <Select v-model="levelFrom.is_show" placeholder="是否显示" clearable @on-change="userSearchs">
-              <Option value="1">显示</Option>
-              <Option value="0">不显示</Option>
-            </Select>
-          </FormItem>
-        </Col>
-        <Col v-bind="grid">
-          <FormItem label="等级名称：" prop="status2" label-for="status2">
-            <Input
+      <el-row :gutter="24">
+        <el-col v-bind="grid">
+          <el-form-item label="状态：">
+            <el-select v-model="levelFrom.is_show" placeholder="是否显示" clearable @change="userSearchs">
+              <el-option value="1" label="显示"></el-option>
+              <el-option value="0" label="不显示"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-bind="grid">
+          <el-form-item label="等级名称：" prop="status2" label-for="status2">
+            <el-input
               search
               enter-button
               v-model="levelFrom.name"
@@ -36,61 +36,96 @@
               @on-search="userSearchs"
               style="width: 100%"
             />
-          </FormItem>
-        </Col>
-      </Row>
-    </Form>
-    <Divider dashed />
-    <Row type="flex">
-      <Col v-bind="grid" class="mb15">
-        <Button type="primary" icon="md-add" @click="add">添加等级任务</Button>
-      </Col>
-      <Col span="24" class="userAlert">
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-divider direction="vertical" dashed />
+    <el-row>
+      <el-col v-bind="grid" class="mb15">
+        <el-button type="primary" icon="md-add" @click="add">添加等级任务</el-button>
+      </el-col>
+      <el-col :span="24" class="userAlert">
         <Alert show-icon closable>添加等级任务,任务类型中的{$num}会自动替换成限定数量+系统预设的单位生成任务名</Alert>
-      </Col>
-    </Row>
-    <Divider dashed />
-    <Table
-      :columns="columns1"
+      </el-col>
+    </el-row>
+    <el-divider direction="vertical" dashed />
+    <el-table
       :data="levelLists"
       ref="table"
       :loading="loading"
       no-userFrom-text="暂无数据"
       no-filtered-userFrom-text="暂无筛选结果"
     >
-      <template slot-scope="{ row, index }" slot="is_shows">
-        <i-switch
-          v-model="row.is_show"
-          :value="row.is_show"
-          :true-value="1"
-          :false-value="0"
-          size="large"
-          @on-change="onchangeIsShow(row)"
-        >
-          <span slot="open">显示</span>
-          <span slot="close">隐藏</span>
-        </i-switch>
-      </template>
-      <template slot-scope="{ row, index }" slot="is_musts">
-        <i-switch
-          v-model="row.is_must"
-          :value="row.is_must"
-          :true-value="1"
-          :false-value="0"
-          size="large"
-          @on-change="onchangeIsMust(row)"
-        >
-          <span slot="open">全部完成</span>
-          <span slot="close">达成其一</span>
-        </i-switch>
-      </template>
-      <template slot-scope="{ row, index }" slot="action">
-        <a @click="edit(row)">编辑 | </a>
-        <a @click="del(row, '删除等级任务', index)"> 删除</a>
-      </template>
-    </Table>
+      <el-table-column label="ID" width="80">
+        <template slot-scope="scope">
+          <span>{{ scope.row.id }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="等级名称" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.level_name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="任务名称" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否显示" min-width="130">
+        <template slot-scope="scope">
+          <el-switch
+            class="defineSwitch"
+            :active-value="1"
+            :inactive-value="0"
+            v-model="scope.row.is_show"
+            :value="scope.row.is_show"
+            size="large"
+            @change="onchangeIsShow(scope.row)"
+            active-text="显示"
+            inactive-text="隐藏"
+          >
+          </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="务必达成" min-width="130">
+        <template slot-scope="scope">
+          <el-switch
+            class="defineSwitch"
+            :active-value="1"
+            :inactive-value="0"
+            v-model="scope.row.is_must"
+            :value="scope.row.is_must"
+            :true-value="1"
+            :false-value="0"
+            size="large"
+            @change="onchangeIsMust(scope.row)"
+            active-text="全部"
+            inactive-text="其一"
+          >
+          </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="任务说明" min-width="130">
+        <template slot-scope="scope">
+          <span>{{ scope.row.illustrate }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" fixed="right" width="170">
+        <template slot-scope="scope">
+          <a @click="edit(scope.row)">编辑 | </a>
+          <a @click="del(scope.row, '删除等级任务', index)"> 删除</a>
+        </template>
+      </el-table-column>
+    </el-table>
     <div class="acea-row row-right page">
-      <Page :total="total" show-elevator show-total @on-change="pageChange" :page-size="levelFrom.limit" />
+      <pagination
+        v-if="total"
+        :total="total"
+        :page.sync="levelFrom.page"
+        :limit.sync="levelFrom.limit"
+        @pagination="getList"
+      />
     </div>
     <!-- 新建 编辑表单-->
     <edit-from ref="edits" :FromData="FromData" @submitFail="submitFail" :titleType="titleType"></edit-from>
@@ -124,51 +159,6 @@ export default {
       total: 0,
       levelLists: [],
       loading: false,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          sortable: true,
-          width: 80,
-        },
-        {
-          title: '等级名称',
-          key: 'level_name',
-          minWidth: 100,
-        },
-        {
-          title: '任务名称',
-          key: 'name',
-          minWidth: 120,
-        },
-        {
-          title: '排序',
-          sort: 'grade',
-          sortable: true,
-          minWidth: 100,
-        },
-        {
-          title: '是否显示',
-          slot: 'is_shows',
-          minWidth: 110,
-        },
-        {
-          title: '务必达成',
-          slot: 'is_musts',
-          minWidth: 135,
-        },
-        {
-          title: '任务说明',
-          key: 'illustrate',
-          minWidth: 120,
-        },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 120,
-        },
-      ],
       FromData: null,
       ids: 0,
       modalTitleSs: '',
@@ -179,7 +169,7 @@ export default {
     ...mapState('media', ['isMobile']),
     ...mapState('userLevel', ['levelId']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '75px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -229,10 +219,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.levelFrom.page = index;
-      this.getList();
-    },
     // 修改显示隐藏
     onchangeIsShow(row) {
       let data = {
diff --git a/template/admin/src/pages/user/level/index.vue b/template/admin/src/pages/user/level/index.vue
index e0c44889f..fb6db375a 100644
--- a/template/admin/src/pages/user/level/index.vue
+++ b/template/admin/src/pages/user/level/index.vue
@@ -1,134 +1,132 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt">
+      <el-form
         ref="levelFrom"
         :model="levelFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row type="flex" :gutter="24">
-          <Col v-bind="grid">
-            <FormItem label="状态：" label-for="status1">
-              <Select
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="状态：" label-for="status1">
+              <el-select
                 v-model="levelFrom.is_show"
                 placeholder="请选择"
                 clearable
                 element-id="status1"
-                @on-change="userSearchs"
+                @change="userSearchs"
               >
-                <Option value="1">显示</Option>
-                <Option value="0">不显示</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col v-bind="grid">
-            <FormItem label="等级名称：" label-for="title">
-              <Input
+                <el-option value="1" label="显示"></el-option>
+                <el-option value="0" label="不显示"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-bind="grid">
+            <el-form-item label="等级名称：" label-for="title">
+              <el-input
                 search
                 enter-button
                 v-model="levelFrom.title"
                 placeholder="请输入等级名称"
                 @on-search="userSearchs"
               />
-            </FormItem>
-          </Col>
-        </Row>
-        <Row type="flex">
-          <Col v-bind="grid">
-            <Button v-auth="['admin-user-level_add']" type="primary" icon="md-add" @click="add">添加用户等级</Button>
-          </Col>
-        </Row>
-      </Form>
-      <Table
-        :columns="columns1"
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-bind="grid">
+            <el-button v-auth="['admin-user-level_add']" type="primary" icon="md-add" @click="add"
+              >添加用户等级</el-button
+            >
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
         :data="levelLists"
         ref="table"
         class="mt25"
         :loading="loading"
-        highlight-row
+        highlight-current-row
         no-userFrom-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
       >
-        <template slot-scope="{ row, index }" slot="level_icons">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.icon" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="icons">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.image" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="is_forevers">
-          <i-switch
-            v-model="row.is_forever"
-            :value="row.is_forever"
-            :true-value="1"
-            :false-value="0"
-            :disabled="true"
-            size="large"
-          >
-            <span slot="open">永久</span>
-            <span slot="close">非永久</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="is_pays">
-          <i-switch
-            v-model="row.is_pay"
-            :value="row.is_pay"
-            :true-value="1"
-            :false-value="0"
-            :disabled="true"
-            size="large"
-          >
-            <span slot="open">付费</span>
-            <span slot="close">免费</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="is_shows">
-          <i-switch
-            v-model="row.is_show"
-            :value="row.is_show"
-            :true-value="1"
-            :false-value="0"
-            @on-change="onchangeIsShow(row)"
-            size="large"
-          >
-            <span slot="open">显示</span>
-            <span slot="close">隐藏</span>
-          </i-switch>
-        </template>
-        <template slot-scope="{ row, index }" slot="action">
-          <!--          <a @click="edit(row)">编辑</a>-->
-          <!--          <Divider type="vertical" />-->
-          <template>
-            <Dropdown @on-click="changeMenu(row, $event, index)" :transfer="true">
-              <a href="javascript:void(0)">
-                更多
-                <Icon type="ios-arrow-down"></Icon>
-              </a>
-              <DropdownMenu slot="list">
-                <!--                                                <DropdownItem name="1">等级任务</DropdownItem>-->
-                <DropdownItem name="3">编辑等级</DropdownItem>
-                <DropdownItem name="2">删除等级</DropdownItem>
-              </DropdownMenu>
-            </Dropdown>
+        <el-table-column label="ID" width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
           </template>
-        </template>
-      </Table>
+        </el-table-column>
+        <el-table-column label="等级图标" min-width="100">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.icon" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="等级背景图" min-width="100">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.image" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="等级名称" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="等级" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.grade }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="享受折扣" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.discount }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="经验值要求" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.exp_num }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否显示" min-width="100">
+          <template slot-scope="scope">
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="scope.row.is_show"
+              :value="scope.row.is_show"
+              size="large"
+              @change="onchangeIsShow(scope.row)"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-dropdown size="small" @command="changeMenu(row, $event, index)" :transfer="true">
+              <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i> </span>
+              <el-dropdown-menu slot="dropdown">
+                <!--                                                <el-dropdown-item name="1">等级任务</el-dropdown-item>-->
+                <el-dropdown-item command="3">编辑等级</el-dropdown-item>
+                <el-dropdown-item command="2">删除等级</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+      </el-table>
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="levelFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="levelFrom.limit"
+          :page.sync="levelFrom.page"
+          :limit.sync="levelFrom.limit"
+          @pagination="getList"
         />
       </div>
-    </Card>
+    </el-card>
     <!-- 等级任务-->
     <task-list ref="tasks"></task-list>
   </div>
@@ -151,74 +149,6 @@ export default {
         xs: 24,
       },
       loading: false,
-      columns1: [
-        {
-          title: 'ID',
-          key: 'id',
-          width: 80,
-        },
-        {
-          title: '等级图标',
-          slot: 'level_icons',
-          minWidth: 100,
-        },
-        {
-          title: '等级背景图',
-          slot: 'icons',
-          minWidth: 100,
-        },
-        {
-          title: '等级名称',
-          key: 'name',
-          minWidth: 120,
-        },
-        {
-          title: '等级',
-          key: 'grade',
-          minWidth: 100,
-        },
-        {
-          title: '享受折扣',
-          key: 'discount',
-          minWidth: 100,
-        },
-        {
-          title: '经验值要求',
-          key: 'exp_num',
-          minWidth: 100,
-        },
-        // {
-        //     title: '有效时间',
-        //     key: 'valid_date',
-        //     minWidth: 120
-        // },
-        // {
-        //     title: '是否永久',
-        //     slot: 'is_forevers',
-        //     minWidth: 130
-        // },
-        // {
-        //     title: '是否付费',
-        //     slot: 'is_pays',
-        //     minWidth: 120
-        // },
-        {
-          title: '是否显示',
-          slot: 'is_shows',
-          minWidth: 80,
-        },
-        // {
-        //   title: '等级说明',
-        //   key: 'explain',
-        //   minWidth: 120,
-        // },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 80,
-        },
-      ],
       levelFrom: {
         is_show: '',
         title: '',
@@ -243,7 +173,7 @@ export default {
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 75;
+      return this.isMobile ? undefined : '85px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -320,10 +250,6 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.levelFrom.page = index;
-      this.getList();
-    },
     // 添加
     add() {
       this.levelId = 0;
diff --git a/template/admin/src/pages/user/list/handle/userDetails.vue b/template/admin/src/pages/user/list/handle/userDetails.vue
index 895b76109..d6bec1804 100644
--- a/template/admin/src/pages/user/list/handle/userDetails.vue
+++ b/template/admin/src/pages/user/list/handle/userDetails.vue
@@ -13,60 +13,67 @@
           </div>
         </div>
         <div class="edit-btn">
-          <Button v-if="!isEdit" type="primary" @click="edit">编辑</Button>
-          <Button v-if="isEdit" class="mr20" @click="edit">取消</Button>
-          <Button v-if="isEdit" type="primary" @click="editSave">保存</Button>
+          <el-button v-if="!isEdit" type="primary" @click="edit">编辑</el-button>
+          <el-button v-if="isEdit" class="mr20" @click="edit">取消</el-button>
+          <el-button v-if="isEdit" type="primary" @click="editSave">保存</el-button>
         </div>
       </div>
 
-      <Row type="flex" justify="space-between" class="mt25">
-        <!-- <Col span="4" class="user_menu">
+      <el-row justify="space-between" class="mt25">
+        <!-- <el-col :span="4" class="user_menu">
           <Menu :theme="theme2" :active-name="activeName" @on-select="changeType">
             <MenuItem :name="item.val" v-for="(item, index) in list" :key="index">
               
             </MenuItem>
           </Menu>
-        </Col> -->
-        <Col span="24">
-          <Tabs class="mb20" :value="activeName" @on-click="changeType">
-            <TabPane :name="item.val" v-for="(item, index) in list" :key="index" :label="item.label"></TabPane>
-          </Tabs>
-        </Col>
+        </el-col> -->
+        <el-col :span="24">
+          <el-tabs class="mb20" :value="activeName" @tag-click="changeType">
+            <el-tab-pane :name="item.val" v-for="(item, index) in list" :key="index" :label="item.label"></el-tab-pane>
+          </el-tabs>
+        </el-col>
 
-        <Col span="24">
+        <el-col :span="24">
           <template v-if="activeName === 'user'">
             <userEditForm ref="editForm" :userId="userId" @success="getDetails(userId)" v-if="isEdit"></userEditForm>
             <user-info :ps-info="psInfo" v-else></user-info>
           </template>
           <template v-else>
-            <Table
-              :columns="columns"
+            <el-table
               :data="userLists"
               max-height="400"
               ref="table"
-              :loading="loading"
+              v-loading="loading"
               no-userFrom-text="暂无数据"
               no-filtered-userFrom-text="暂无筛选结果"
             >
-              <template slot-scope="{ row }" slot="number">
-                <div :class="row.pm ? 'plusColor' : 'reduceColor'">
-                  {{ row.pm ? '+' + row.number : '-' + row.number }}
-                </div>
-              </template>
-            </Table>
+              <el-table-column :label="item.title" min-width="120" v-for="(item, index) in columns" :key="index">
+                <template slot-scope="scope">
+                  <template v-if="item.key">
+                    <div>
+                      <span>{{ scope.row[item.key] }}</span>
+                    </div>
+                  </template>
+                  <template v-else-if="item.slot === 'number'">
+                    <div :class="scope.row.pm ? 'plusColor' : 'reduceColor'">
+                      {{ scope.row.pm ? '+' + scope.row.number : '-' + scope.row.number }}
+                    </div>
+                  </template>
+                </template>
+              </el-table-column>
+            </el-table>
             <div class="acea-row row-right page">
-              <Page
+              <pagination
+                v-if="total"
                 :total="total"
-                :current="userFrom.page"
-                show-elevator
-                show-total
-                @on-change="pageChange"
-                :page-size="userFrom.limit"
+                :page.sync="userFrom.page"
+                :limit.sync="userFrom.limit"
+                @pagination="changeType"
               />
             </div>
           </template>
-        </Col>
-      </Row>
+        </el-col>
+      </el-row>
     </Drawer>
   </div>
 </template>
@@ -147,17 +154,12 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    pageChange(index) {
-      this.userFrom.page = index;
-      this.changeType(this.userFrom.type);
-    },
     // tab选项
-    changeType(name) {
+    changeType() {
       this.loading = true;
-      this.userFrom.type = name;
-      this.activeName = name;
+      this.userFrom.type = this.activeName;
       this.isEdit = false;
-      if (name == 'user') return;
+      if (this.activeName == 'user') return;
       if (this.userFrom.type === '') {
         this.userFrom.type = 'order';
       }
diff --git a/template/admin/src/pages/user/list/handle/userEdit.vue b/template/admin/src/pages/user/list/handle/userEdit.vue
index d31c33142..5995ebc99 100644
--- a/template/admin/src/pages/user/list/handle/userEdit.vue
+++ b/template/admin/src/pages/user/list/handle/userEdit.vue
@@ -1,21 +1,21 @@
 <template>
   <div>
-    <Form ref="formItem" :rules="ruleValidate" :model="formItem" :label-width="100" @submit.native.prevent>
-      <FormItem label="用户ID：" v-if="formItem.uid">
-        <Input class="form-sty" disabled v-model="formItem.uid" placeholder="请输入编号" style="width: 80%"></Input>
-      </FormItem>
-      <FormItem label="真实姓名：" prop="real_name">
-        <Input
+    <el-form ref="formItem" :rules="ruleValidate" :model="formItem" label-width="100px" @submit.native.prevent>
+      <el-form-item label="用户ID：" v-if="formItem.uid">
+        <el-input class="form-sty" disabled v-model="formItem.uid" placeholder="请输入编号" style="width: 80%"></el-input>
+      </el-form-item>
+      <el-form-item label="真实姓名：" prop="real_name">
+        <el-input
           class="form-sty"
           v-model.trim="formItem.real_name"
           placeholder="请输入真实姓名"
           style="width: 80%"
-        ></Input>
-      </FormItem>
-      <FormItem label="手机号码：" prop="phone">
-        <Input class="form-sty" v-model="formItem.phone" placeholder="请输入手机号码" style="width: 80%"></Input>
-      </FormItem>
-      <FormItem label="生日：">
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="手机号码：" prop="phone">
+        <el-input class="form-sty" v-model="formItem.phone" placeholder="请输入手机号码" style="width: 80%"></el-input>
+      </el-form-item>
+      <el-form-item label="生日：">
         <DatePicker
           class="form-sty"
           type="date"
@@ -23,58 +23,56 @@
           placeholder="请选择生日"
           style="width: 80%"
           format="yyyy-MM-dd"
-          @on-change="formItem.birthday = $event"
+          @change="formItem.birthday = $event"
         ></DatePicker>
-      </FormItem>
-      <FormItem label="身份证号：">
-        <Input class="form-sty" v-model.trim="formItem.card_id" placeholder="请输入身份证号" style="width: 80%"></Input>
-      </FormItem>
-      <FormItem label="用户地址：">
-        <Input class="form-sty" v-model="formItem.addres" placeholder="请输入用户地址" style="width: 80%"></Input>
-      </FormItem>
-      <FormItem label="用户备注：">
-        <Input class="form-sty" v-model="formItem.mark" placeholder="请输入用户备注" style="width: 80%"></Input>
-      </FormItem>
-      <FormItem label="登录密码：" prop="pwd">
-        <Input
+      </el-form-item>
+      <el-form-item label="身份证号：">
+        <el-input class="form-sty" v-model.trim="formItem.card_id" placeholder="请输入身份证号" style="width: 80%"></el-input>
+      </el-form-item>
+      <el-form-item label="用户地址：">
+        <el-input class="form-sty" v-model="formItem.addres" placeholder="请输入用户地址" style="width: 80%"></el-input>
+      </el-form-item>
+      <el-form-item label="用户备注：">
+        <el-input class="form-sty" v-model="formItem.mark" placeholder="请输入用户备注" style="width: 80%"></el-input>
+      </el-form-item>
+      <el-form-item label="登录密码：" prop="pwd">
+        <el-input
           class="form-sty"
           type="password"
           v-model="formItem.pwd"
           placeholder="请输入登录密码（修改用户可不填写，不填写不修改原密码）"
           style="width: 80%"
-        ></Input>
-      </FormItem>
-      <FormItem label="确认密码：" prop="true_pwd">
-        <Input
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="确认密码：" prop="true_pwd">
+        <el-input
           class="form-sty"
           type="password"
           v-model="formItem.true_pwd"
           placeholder="请输入确认密码（修改用户可不填写，不填写不修改原密码）"
           style="width: 80%"
-        ></Input>
-      </FormItem>
+        ></el-input>
+      </el-form-item>
 
-      <FormItem label="用户等级：">
-        <Select v-model="formItem.level" class="form-sty" clearable>
-          <Option v-for="(item, index) in infoData.levelInfo" :key="index" :value="item.id">{{ item.name }}</Option>
-        </Select>
-      </FormItem>
-      <FormItem label="用户分组：">
-        <Select v-model="formItem.group_id" class="form-sty" clearable>
-          <Option v-for="(item, index) in infoData.groupInfo" :key="index" :value="item.id">{{
-            item.group_name
-          }}</Option>
-        </Select>
-      </FormItem>
-      <FormItem label="用户标签：">
-        <!-- <Select v-model="formItem.label_id">
-          <Option
+      <el-form-item label="用户等级：">
+        <el-select v-model="formItem.level" class="form-sty" clearable>
+          <el-option v-for="(item, index) in infoData.levelInfo" :key="index" :value="item.id" :label="item.name"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="用户分组：">
+        <el-select v-model="formItem.group_id" class="form-sty" clearable>
+          <el-option v-for="(item, index) in infoData.groupInfo" :key="index" :value="item.id" :label="item.group_name"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="用户标签：">
+        <!-- <el-select v-model="formItem.label_id">
+          <el-option
             v-for="(item, index) in infoData.labelInfo"
             :key="index"
             :value="item.value"
-            >{{ item.label }}</Option
+            >{{ item.label }}</el-option
           >
-        </Select> -->
+        </el-select> -->
         <div style="display: flex">
           <div class="labelInput acea-row row-between-wrapper" @click="openLabel">
             <div style="width: 90%">
@@ -89,28 +87,28 @@
           </div>
           <span class="addfont" @click="addLabel">新增标签</span>
         </div>
-      </FormItem>
-      <FormItem label="推广资格：">
-        <RadioGroup v-model="formItem.spread_open" class="form-sty">
-          <Radio :label="1">启用</Radio>
-          <Radio :label="0">禁用</Radio>
-        </RadioGroup>
+      </el-form-item>
+      <el-form-item label="推广资格：">
+        <el-radio-group v-model="formItem.spread_open" class="form-sty">
+          <el-radio :label="1">启用</el-radio>
+          <el-radio :label="0">禁用</el-radio>
+        </el-radio-group>
         <div class="tip">禁用用户的推广资格后，在任何分销模式下该用户都无分销权限</div>
-      </FormItem>
-      <FormItem label="推广权限：">
-        <RadioGroup v-model="formItem.is_promoter" class="form-sty">
-          <Radio :label="1">开启</Radio>
-          <Radio :label="0">锁定</Radio>
+      </el-form-item>
+      <el-form-item label="推广权限：">
+        <el-radio-group v-model="formItem.is_promoter" class="form-sty">
+          <el-radio :label="1">开启</el-radio>
+          <el-radio :label="0">锁定</el-radio>
           <div class="tip">指定分销模式下，开启或关闭用户的推广权限</div>
-        </RadioGroup>
-      </FormItem>
-      <FormItem label="用户状态：">
-        <RadioGroup v-model="formItem.status" class="form-sty">
-          <Radio :label="1">开启</Radio>
-          <Radio :label="0">锁定</Radio>
-        </RadioGroup>
-      </FormItem>
-    </Form>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="用户状态：">
+        <el-radio-group v-model="formItem.status" class="form-sty">
+          <el-radio :label="1">开启</el-radio>
+          <el-radio :label="0">锁定</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
 
     <Modal v-model="labelShow" scrollable title="请选择用户标签" :closable="false" width="500" :footer-hide="true">
       <userLabel
diff --git a/template/admin/src/pages/user/list/handle/userEditForm.vue b/template/admin/src/pages/user/list/handle/userEditForm.vue
index f795fde2a..75b764080 100644
--- a/template/admin/src/pages/user/list/handle/userEditForm.vue
+++ b/template/admin/src/pages/user/list/handle/userEditForm.vue
@@ -1,45 +1,45 @@
 <template>
   <div class="user-info">
-    <Form ref="formItem" :rules="ruleValidate" :model="formItem" :label-width="100" @submit.native.prevent>
+    <el-form ref="formItem" :rules="ruleValidate" :model="formItem" label-width="100px" @submit.native.prevent>
       <div class="section">
         <div class="section-hd">基本信息</div>
         <div class="section-bd">
           <div class="item">
-            <FormItem label="用户ID：">
-              <Input class="form-sty" disabled v-model="formItem.uid" placeholder="请输入编号"></Input>
-            </FormItem>
+            <el-form-item label="用户ID：">
+              <el-input class="form-sty" disabled v-model="formItem.uid" placeholder="请输入编号"></el-input>
+            </el-form-item>
           </div>
           <div class="item">
-            <FormItem label="真实姓名：" prop="real_name">
-              <Input class="form-sty" v-model.trim="formItem.real_name" placeholder="请输入真实姓名"></Input>
-            </FormItem>
+            <el-form-item label="真实姓名：" prop="real_name">
+              <el-input class="form-sty" v-model.trim="formItem.real_name" placeholder="请输入真实姓名"></el-input>
+            </el-form-item>
           </div>
           <div class="item">
-            <FormItem label="手机号码：" prop="phone">
-              <Input class="form-sty" v-model="formItem.phone" placeholder="请输入手机号码"></Input>
-            </FormItem>
+            <el-form-item label="手机号码：" prop="phone">
+              <el-input class="form-sty" v-model="formItem.phone" placeholder="请输入手机号码"></el-input>
+            </el-form-item>
           </div>
           <div class="item">
-            <FormItem label="生日：">
+            <el-form-item label="生日：">
               <DatePicker
                 class="form-sty"
                 type="date"
                 :value="formItem.birthday"
                 placeholder="请选择生日"
                 format="yyyy-MM-dd"
-                @on-change="formItem.birthday = $event"
+                @change="formItem.birthday = $event"
               ></DatePicker>
-            </FormItem>
+            </el-form-item>
           </div>
           <div class="item">
-            <FormItem label="身份证号：">
-              <Input class="form-sty" v-model.trim="formItem.card_id" placeholder="请输入身份证号"></Input>
-            </FormItem>
+            <el-form-item label="身份证号：">
+              <el-input class="form-sty" v-model.trim="formItem.card_id" placeholder="请输入身份证号"></el-input>
+            </el-form-item>
           </div>
           <div class="item">
-            <FormItem label="用户地址：">
-              <Input class="form-sty" v-model="formItem.addres" placeholder="请输入用户地址"></Input>
-            </FormItem>
+            <el-form-item label="用户地址：">
+              <el-input class="form-sty" v-model="formItem.addres" placeholder="请输入用户地址"></el-input>
+            </el-form-item>
           </div>
         </div>
       </div>
@@ -47,24 +47,24 @@
         <div class="section-hd">密码</div>
         <div class="section-bd">
           <div class="item">
-            <FormItem label="登录密码：" prop="pwd">
-              <Input
+            <el-form-item label="登录密码：" prop="pwd">
+              <el-input
                 class="form-sty"
                 type="password"
                 v-model="formItem.pwd"
                 placeholder="请输入登录密码（修改用户可不填写，不填写不修改原密码）"
-              ></Input>
-            </FormItem>
+              ></el-input>
+            </el-form-item>
           </div>
           <div class="item">
-            <FormItem label="确认密码：" prop="true_pwd">
-              <Input
+            <el-form-item label="确认密码：" prop="true_pwd">
+              <el-input
                 class="form-sty"
                 type="password"
                 v-model="formItem.true_pwd"
                 placeholder="请输入确认密码（修改用户可不填写，不填写不修改原密码）"
-              ></Input>
-            </FormItem>
+              ></el-input>
+            </el-form-item>
           </div>
         </div>
       </div>
@@ -72,25 +72,21 @@
         <div class="section-hd">用户概况</div>
         <div class="section-bd">
           <div class="item">
-            <FormItem label="用户等级：">
-              <Select v-model="formItem.level" class="form-sty" clearable>
-                <Option v-for="(item, index) in infoData.levelInfo" :key="index" :value="item.id">{{
-                  item.name
-                }}</Option>
-              </Select>
-            </FormItem>
+            <el-form-item label="用户等级：">
+              <el-select v-model="formItem.level" class="form-sty" clearable>
+                <el-option v-for="(item, index) in infoData.levelInfo" :key="index" :value="item.id" :label="item.name"></el-option>
+              </el-select>
+            </el-form-item>
           </div>
           <div class="item">
-            <FormItem label="用户分组：">
-              <Select v-model="formItem.group_id" class="form-sty" clearable>
-                <Option v-for="(item, index) in infoData.groupInfo" :key="index" :value="item.id">{{
-                  item.group_name
-                }}</Option>
-              </Select>
-            </FormItem>
+            <el-form-item label="用户分组：">
+              <el-select v-model="formItem.group_id" class="form-sty" clearable>
+                <el-option v-for="(item, index) in infoData.groupInfo" :key="index" :value="item.id" :label="item.group_name"></el-option>
+              </el-select>
+            </el-form-item>
           </div>
           <div class="item lang">
-            <FormItem label="用户标签：">
+            <el-form-item label="用户标签：">
               <div style="display: flex">
                 <div class="labelInput acea-row row-between-wrapper" @click="openLabel">
                   <div style="width: 90%">
@@ -105,33 +101,33 @@
                 </div>
                 <span class="addfont" @click="addLabel">新增标签</span>
               </div>
-            </FormItem>
+            </el-form-item>
           </div>
           <div class="item lang">
-            <FormItem label="推广资格：">
-              <RadioGroup v-model="formItem.spread_open" class="form-sty">
-                <Radio :label="1">开启</Radio>
-                <Radio :label="0">关闭</Radio>
-              </RadioGroup>
+            <el-form-item label="推广资格：">
+              <el-radio-group v-model="formItem.spread_open" class="form-sty">
+                <el-radio :label="1">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
+              </el-radio-group>
               <div class="tip">关闭用户的推广资格后，在任何分销模式下该用户都无分销权限</div>
-            </FormItem>
+            </el-form-item>
           </div>
           <div class="item lang">
-            <FormItem label="推广权限：">
-              <RadioGroup v-model="formItem.is_promoter" class="form-sty">
-                <Radio :label="1">开启</Radio>
-                <Radio :label="0">关闭</Radio>
+            <el-form-item label="推广权限：">
+              <el-radio-group v-model="formItem.is_promoter" class="form-sty">
+                <el-radio :label="1">开启</el-radio>
+                <el-radio :label="0">关闭</el-radio>
                 <div class="tip">指定分销模式下，开启或关闭用户的推广权限</div>
-              </RadioGroup>
-            </FormItem>
+              </el-radio-group>
+            </el-form-item>
           </div>
           <div class="item lang">
-            <FormItem label="用户状态：">
-              <RadioGroup v-model="formItem.status" class="form-sty">
-                <Radio :label="1">开启</Radio>
-                <Radio :label="0">锁定</Radio>
-              </RadioGroup>
-            </FormItem>
+            <el-form-item label="用户状态：">
+              <el-radio-group v-model="formItem.status" class="form-sty">
+                <el-radio :label="1">开启</el-radio>
+                <el-radio :label="0">锁定</el-radio>
+              </el-radio-group>
+            </el-form-item>
           </div>
         </div>
       </div>
@@ -139,19 +135,19 @@
         <div class="section-hd">用户备注</div>
         <div class="section-bd">
           <div class="item">
-            <FormItem label="用户备注：">
-              <Input
+            <el-form-item label="用户备注：">
+              <el-input
                 class="form-sty"
                 type="textarea"
                 :rows="5"
                 v-model="formItem.mark"
                 placeholder="请输入用户备注"
-              ></Input>
-            </FormItem>
+              ></el-input>
+            </el-form-item>
           </div>
         </div>
       </div>
-    </Form>
+    </el-form>
     <Modal v-model="labelShow" scrollable title="请选择用户标签" :closable="false" width="500" :footer-hide="true">
       <userLabel
         v-if="labelShow"
diff --git a/template/admin/src/pages/user/list/index.vue b/template/admin/src/pages/user/list/index.vue
index 8017b8a34..028ad2a92 100644
--- a/template/admin/src/pages/user/list/index.vue
+++ b/template/admin/src/pages/user/list/index.vue
@@ -1,43 +1,45 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt listbox">
-      <Tabs @on-click="onClickTab" class="mb30">
-        <TabPane :label="item.name" :name="item.type" v-for="(item, index) in headeNum" :key="index" />
-      </Tabs>
-      <Form
+    <el-card :bordered="false" shadow="never" class="ivu-mt listbox">
+      <el-tabs v-model="userFrom.user_type" @tab-click="onClickTab" class="mb10">
+        <el-tab-pane :label="item.name" :name="item.type" v-for="(item, index) in headeNum" :key="index" />
+      </el-tabs>
+      <el-form
         ref="userFrom"
         :model="userFrom"
         :label-width="labelWidth"
         :label-position="labelPosition"
         @submit.native.prevent
       >
-        <Row :gutter="16">
-          <Col v-bind="grid">
-            <FormItem label="用户搜索：" label-for="nickname">
-              <Input v-model="userFrom.nickname" placeholder="请输入用户" element-id="nickname" clearable>
-                <Select v-model="field_key" slot="prepend" style="width: 80px">
-                  <Option value="all">全部</Option>
-                  <Option value="uid">UID</Option>
-                  <Option value="phone">手机号</Option>
-                  <Option value="nickname">用户昵称</Option>
-                </Select>
-              </Input>
-            </FormItem>
-          </Col>
-          <Col span="12" class="ivu-text-left userFrom" v-if="!collapse">
-            <FormItem>
-              <Button type="primary" icon="ios-search" label="default" class="mr15" @click="userSearchs">搜索</Button>
-              <Button class="ResetSearch" @click="reset('userFrom')">重置</Button>
+        <el-row :gutter="24">
+          <el-col v-bind="grid">
+            <el-form-item label="用户搜索：" label-for="nickname">
+              <el-input v-model="userFrom.nickname" placeholder="请输入用户" element-id="nickname" clearable>
+                <el-select v-model="field_key" slot="prepend" style="width: 100px">
+                  <el-option value="all" label="全部"></el-option>
+                  <el-option value="uid" label="UID"></el-option>
+                  <el-option value="phone" label="手机号"></el-option>
+                  <el-option value="nickname" label="用户昵称"></el-option>
+                </el-select>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="ivu-text-left userFrom" v-if="!collapse">
+            <el-form-item>
+              <el-button type="primary" icon="ios-search" label="default" class="mr15" @click="userSearchs"
+                >搜索</el-button
+              >
+              <el-button class="ResetSearch" @click="reset('userFrom')">重置</el-button>
               <a class="ivu-ml-8 font14 ml10" @click="collapse = !collapse">
                 <template v-if="!collapse"> 展开 <Icon type="ios-arrow-down" /> </template>
                 <template v-else> 收起 <Icon type="ios-arrow-up" /> </template>
               </a>
-            </FormItem>
-          </Col>
+            </el-form-item>
+          </el-col>
           <template v-if="collapse">
-            <Col span="18">
-              <Col v-bind="grid">
-                <FormItem label="用户标签：" label-for="label_id">
+            <el-col ::span="18">
+              <el-col v-bind="grid">
+                <el-form-item label="用户标签：" label-for="label_id">
                   <div class="labelInput acea-row row-between-wrapper" @click="openSelectLabel">
                     <div style="width: 90%">
                       <div v-if="selectDataLabel.length">
@@ -53,119 +55,132 @@
                     </div>
                     <div class="ivu-icon ivu-icon-ios-arrow-down"></div>
                   </div>
-                </FormItem>
-              </Col>
-              <Col v-bind="grid">
-                <FormItem label="下单次数：" label-for="pay_count">
-                  <Select v-model="pay_count" placeholder="请选择下单次数" element-id="pay_count" clearable>
-                    <Option value="all">全部</Option>
-                    <Option value="-1">0次</Option>
-                    <Option value="0">1次以上</Option>
-                    <Option value="1">2次以上</Option>
-                    <Option value="2">3次以上</Option>
-                    <Option value="3">4次以上</Option>
-                    <Option value="4">5次以上</Option>
-                  </Select>
-                </FormItem>
-              </Col>
-            </Col>
-            <Col span="18">
-              <Col v-bind="grid">
-                <FormItem label="用户分组：" label-for="group_id">
-                  <Select v-model="group_id" placeholder="请选择用户分组" element-id="group_id" clearable>
-                    <Option value="all">全部</Option>
-                    <Option :value="item.id" v-for="(item, index) in groupList" :key="index">{{
-                      item.group_name
-                    }}</Option>
-                  </Select>
-                </FormItem>
-              </Col>
-              <Col v-bind="grid">
-                <FormItem label="用户等级：" label-for="level">
-                  <Select v-model="level" placeholder="请选择用户等级" element-id="level" clearable>
-                    <Option value="all">全部</Option>
-                    <Option :value="item.id" v-for="(item, index) in levelList" :key="index">{{ item.name }}</Option>
-                  </Select>
-                </FormItem>
-              </Col>
-            </Col>
-            <Col span="18">
-              <!-- <Col v-bind="grid">
-                <FormItem label="性别：" label-for="sex">
-                  <RadioGroup v-model="userFrom.sex" type="button">
-                    <Radio label="">
+                </el-form-item>
+              </el-col>
+              <el-col v-bind="grid">
+                <el-form-item label="下单次数：" label-for="pay_count">
+                  <el-select v-model="pay_count" placeholder="请选择下单次数" element-id="pay_count" clearable>
+                    <el-option value="all" label="全部"></el-option>
+                    <el-option value="-1" label="0次"></el-option>
+                    <el-option value="0" label="1次以上"></el-option>
+                    <el-option value="1" label="2次以上"></el-option>
+                    <el-option value="2" label="3次以上"></el-option>
+                    <el-option value="3" label="4次以上"></el-option>
+                    <el-option value="4" label="5次以上"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-col>
+            <el-col :span="18">
+              <el-col v-bind="grid">
+                <el-form-item label="用户分组：" label-for="group_id">
+                  <el-select v-model="group_id" placeholder="请选择用户分组" element-id="group_id" clearable>
+                    <el-option value="all" label="全部"></el-option>
+                    <el-option
+                      :value="item.id"
+                      v-for="(item, index) in groupList"
+                      :key="index"
+                      :label="item.group_name"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col v-bind="grid">
+                <el-form-item label="用户等级：" label-for="level">
+                  <el-select v-model="level" placeholder="请选择用户等级" element-id="level" clearable>
+                    <el-option value="all" label="全部">全部</el-option>
+                    <el-option
+                      :value="item.id"
+                      v-for="(item, index) in levelList"
+                      :key="index"
+                      :label="item.name"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-col>
+            <el-col :span="18">
+              <!-- <el-col v-bind="grid">
+                <el-form-item label="性别：" label-for="sex">
+                  <el-radio-group v-model="userFrom.sex" type="button">
+                    <el-radio-button label="">
                       <span>全部</span>
-                    </Radio>
-                    <Radio label="1">
+                    </el-radio-button>
+                    <el-radio-button label="1">
                       <span>男</span>
-                    </Radio>
-                    <Radio label="2">
+                    </el-radio-button>
+                    <el-radio-button label="2">
                       <span>女</span>
-                    </Radio>
-                    <Radio label="0">
+                    </el-radio-button>
+                    <el-radio-button label="0">
                       <span>保密</span>
-                    </Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col> -->
-              <Col v-bind="grid">
-                <FormItem label="身份：" label-for="is_promoter">
-                  <RadioGroup v-model="userFrom.is_promoter" type="button">
-                    <Radio label="">
+                    </el-radio-button>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col> -->
+              <el-col v-bind="grid">
+                <el-form-item label="身份：" label-for="is_promoter">
+                  <el-radio-group v-model="userFrom.is_promoter" type="button">
+                    <el-radio-button label="">
                       <span>全部</span>
-                    </Radio>
-                    <Radio label="1">
+                    </el-radio-button>
+                    <el-radio-button label="1">
                       <span>推广员</span>
-                    </Radio>
-                    <Radio label="0">
+                    </el-radio-button>
+                    <el-radio-button label="0">
                       <span>普通用户</span>
-                    </Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col>
-              <Col v-bind="grid">
-                <FormItem label="付费会员：" label-for="isMember">
-                  <!-- <Select
+                    </el-radio-button>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col v-bind="grid">
+                <el-form-item label="付费会员：" label-for="isMember">
+                  <!-- <el-select
                     v-model="userFrom.isMember"
                     placeholder="请选择付费会员"
                     element-id="isMember"
                     clearable
-                    @on-change="changeMember"
+                    @change="changeMember"
                   >
-                    <Option :value="1">是</Option>
-                    <Option :value="0">否</Option>
-                  </Select> -->
-                  <RadioGroup v-model="userFrom.isMember" type="button">
-                    <Radio label="">
+                    <el-option :value="1">是</el-option>
+                    <el-option :value="0">否</el-option>
+                  </el-select> -->
+                  <el-radio-group v-model="userFrom.isMember" type="button">
+                    <el-radio-button label="">
                       <span>全部</span>
-                    </Radio>
-                    <Radio label="1">
+                    </el-radio-button>
+                    <el-radio-button label="1">
                       <span>是</span>
-                    </Radio>
-                    <Radio label="0">
+                    </el-radio-button>
+                    <el-radio-button label="0">
                       <span>否</span>
-                    </Radio>
-                  </RadioGroup>
-                </FormItem>
-              </Col>
-            </Col>
-            <Col span="18">
-              <Col v-bind="grid">
-                <FormItem label="访问情况：" label-for="user_time_type">
-                  <Select v-model="user_time_type" placeholder="请选择访问情况" element-id="user_time_type" clearable>
-                    <Option value="">全部</Option>
-                    <Option value="visitno">时间段未访问</Option>
-                    <Option value="visit">时间段访问过</Option>
-                    <Option value="add_time">首次访问</Option>
-                  </Select>
-                </FormItem>
-              </Col>
-              <Col v-bind="grid" v-if="user_time_type">
-                <FormItem label="访问时间：" label-for="user_time">
-                  <!--<DatePicker clearable @on-change="onchangeTime" v-model="timeVal" :value="timeVal"  format="yyyy/MM/dd" type="daterange" placement="bottom-end" placeholder="选择时间" v-width="'100%'"></DatePicker>-->
+                    </el-radio-button>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-col>
+            <el-col :span="18">
+              <el-col v-bind="grid">
+                <el-form-item label="访问情况：" label-for="user_time_type">
+                  <el-select
+                    v-model="user_time_type"
+                    placeholder="请选择访问情况"
+                    element-id="user_time_type"
+                    clearable
+                  >
+                    <el-option value="" label="全部"></el-option>
+                    <el-option value="visitno" label="时间段未访问"></el-option>
+                    <el-option value="visit" label="时间段访问过"></el-option>
+                    <el-option value="add_time" label="首次访问"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col v-bind="grid" v-if="user_time_type">
+                <el-form-item label="访问时间：" label-for="user_time">
+                  <!--<DatePicker clearable @change="onchangeTime" v-model="timeVal" :value="timeVal"  format="yyyy/MM/dd" type="daterange" placement="bottom-end" placeholder="选择时间" v-width="'100%'"></DatePicker>-->
                   <DatePicker
                     :editable="false"
-                    @on-change="onchangeTime"
+                    @change="onchangeTime"
                     :value="timeVal"
                     format="yyyy/MM/dd"
                     type="datetimerange"
@@ -175,51 +190,55 @@
                     class="mr20"
                     :options="options"
                   ></DatePicker>
-                </FormItem>
-              </Col>
-            </Col>
-            <Col span="18">
-              <Col v-bind="grid">
-                <FormItem label="地区：" label-for="country">
-                  <Select
+                </el-form-item>
+              </el-col>
+            </el-col>
+            <el-col :span="18">
+              <el-col v-bind="grid">
+                <el-form-item label="地区：" label-for="country">
+                  <el-select
                     v-model="userFrom.country"
                     placeholder="请选择国家"
                     element-id="country"
                     clearable
-                    @on-change="changeCountry"
+                    @change="changeCountry"
                   >
-                    <Option value="domestic">中国</Option>
-                    <Option value="abroad">外国</Option>
-                  </Select>
-                </FormItem>
-              </Col>
-              <Col v-bind="grid" v-if="userFrom.country === 'domestic'">
-                <FormItem label="省份：">
-                  <Cascader :data="addresData" :value="address" v-model="address" @on-change="handleChange"></Cascader>
-                </FormItem>
-              </Col>
-            </Col>
+                    <el-option value="domestic" label="中国"></el-option>
+                    <el-option value="abroad" label="外国"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col v-bind="grid" v-if="userFrom.country === 'domestic'">
+                <el-form-item label="省份：">
+                  <Cascader :data="addresData" :value="address" v-model="address" @change="handleChange"></Cascader>
+                </el-form-item>
+              </el-col>
+            </el-col>
           </template>
-        </Row>
-        <Row v-if="collapse">
-          <Col span="13" class="ivu-text-right userFrom">
-            <FormItem>
-              <Button type="primary" icon="ios-search" label="default" class="mr15" @click="userSearchs">搜索</Button>
-              <Button class="ResetSearch" @click="reset('userFrom')">重置</Button>
+        </el-row>
+        <el-row v-if="collapse">
+          <el-col :span="13" class="ivu-text-right userFrom">
+            <el-form-item>
+              <el-button type="primary" icon="ios-search" label="default" class="mr15" @click="userSearchs"
+                >搜索</el-button
+              >
+              <el-button class="ResetSearch" @click="reset('userFrom')">重置</el-button>
               <a class="ivu-ml-8 font14 ml10" @click="collapse = !collapse">
                 <template v-if="!collapse"> 展开 <Icon type="ios-arrow-down" /> </template>
                 <template v-else> 收起 <Icon type="ios-arrow-up" /> </template>
               </a>
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-      <Divider dashed />
-      <Row type="flex" justify="space-between" class="mt20">
-        <Col span="24">
-          <Button v-auth="['admin-user-save']" type="primary" class="mr10" @click="edit({ uid: 0 })">添加用户</Button>
-          <Button v-auth="['admin-user-coupon']" class="mr10" @click="onSend">发送优惠券</Button>
-          <Button
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-divider direction="vertical" dashed />
+      <el-row justify="space-between" class="mt20">
+        <el-col ::span="24">
+          <el-button v-auth="['admin-user-save']" type="primary" class="mr10" @click="edit({ uid: 0 })"
+            >添加用户</el-button
+          >
+          <el-button v-auth="['admin-user-coupon']" class="mr10" @click="onSend">发送优惠券</el-button>
+          <el-button
             v-auth="['admin-wechat-news']"
             class="greens mr10"
             size="default"
@@ -228,96 +247,131 @@
           >
             <Icon type="md-list"></Icon>
             发送图文消息
-          </Button>
-          <Button v-auth="['admin-user-group_set']" class="mr10" @click="setGroup">批量设置分组</Button>
-          <Button v-auth="['admin-user-set_label']" class="mr10" @click="setLabel">批量设置标签</Button>
-          <Button class="mr10" icon="ios-share-outline" @click="exportList">导出</Button>
+          </el-button>
+          <el-button v-auth="['admin-user-group_set']" class="mr10" @click="setGroup">批量设置分组</el-button>
+          <el-button v-auth="['admin-user-set_label']" class="mr10" @click="setLabel">批量设置标签</el-button>
+          <el-button class="mr10" icon="ios-share-outline" @click="exportList">导出</el-button>
 
-          <!-- <Button v-auth="['admin-user-synchro']" class="mr20" @click="synchro">同步公众号用户</Button> -->
-        </Col>
-        <Col span="24" class="userAlert" v-if="selectionList.length">
+          <!-- <el-button v-auth="['admin-user-synchro']" class="mr20" @click="synchro">同步公众号用户</el-button> -->
+        </el-col>
+        <el-col ::span="24" class="userAlert" v-if="selectionList.length">
           <Alert show-icon>
             已选择<i class="userI"> {{ selectionList.length }} </i>项</Alert
           >
-        </Col>
-      </Row>
-      <Table
-        :columns="columns"
+        </el-col>
+      </el-row>
+      <el-table
         :data="userLists"
         class="mt10"
         ref="table"
-        highlight-row
-        :loading="loading"
-        no-userFrom-text="暂无数据"
+        highlight-current-row
+        v-loading="loading"
+        empty-text="暂无数据"
         no-filtered-userFrom-text="暂无筛选结果"
-        @on-sort-change="sortChanged"
-        @on-select="handleSelectRow"
-        @on-select-cancel="handleCancelRow"
-        @on-select-all="handleSelectAll"
-        @on-select-all-cancel="handleSelectAll"
+        @sort-change="sortChanged"
+        @select="handleSelectRow"
+        @select-all="handleSelectAll"
       >
-        <template slot-scope="{ row, index }" slot="avatars">
-          <div class="tabBox_img" v-viewer>
-            <img v-lazy="row.avatar" />
-          </div>
-        </template>
-        <template slot-scope="{ row, index }" slot="nickname">
-          <div class="acea-row">
-            <Icon type="md-male" v-show="row.sex === '男'" color="#2db7f5" size="15" class="mr5" />
-            <Icon type="md-female" v-show="row.sex === '女'" color="#ed4014" size="15" class="mr5" />
-            <div v-text="row.nickname"></div>
-          </div>
-          <div v-if="row.is_del == 1" style="color: red">用户已注销</div>
-          <!-- <div v-show="row.vip_name" class="vipName">{{row.vip_name}}</div> -->
-        </template>
-        <template slot-scope="{ row, index }" slot="isMember">
-          <div>{{ row.isMember ? '是' : '否' }}</div>
-        </template>
-        <!--                <template slot-scope="{ row, index }" slot="status">-->
-        <!--                    <i-switch v-model="row.status" :value="row.status" :true-value="1" :false-value="0" @on-change="onchangeIsShow(row)" size="large">-->
-        <!--                        <span slot="open">显示</span>-->
-        <!--                        <span slot="close">隐藏</span>-->
-        <!--                    </i-switch>-->
-        <!--                </template>-->
-        <template slot-scope="{ row, index }" slot="action">
-          <template v-if="row.is_del != 1">
-            <a @click="userDetail(row)">详情</a>
+        <el-table-column type="expand">
+          <template slot-scope="scope">
+            <expandRow :row="scope.row"></expandRow>
+          </template>
+        </el-table-column>
+        <el-table-column type="selection" width="55"> </el-table-column>
+        <el-table-column label="用户ID" min-width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.uid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户ID" min-width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.uid }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="头像" min-width="60">
+          <template slot-scope="scope">
+            <div class="tabBox_img" v-viewer>
+              <img v-lazy="scope.row.avatar" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="姓名" min-width="150">
+          <template slot-scope="scope">
+            <div class="acea-row">
+              <Icon type="md-male" v-show="scope.row.sex === '男'" color="#2db7f5" size="15" class="mr5" />
+              <Icon type="md-female" v-show="scope.row.sex === '女'" color="#ed4014" size="15" class="mr5" />
+              <div v-text="scope.row.nickname"></div>
+            </div>
+            <div v-if="scope.row.is_del == 1" style="color: red">用户已注销</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="付费会员" min-width="90">
+          <template slot-scope="scope">
+            <div>{{ scope.row.isMember ? '是' : '否' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户等级" min-width="90">
+          <template slot-scope="scope">
+            <div>{{ scope.row.level }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="分组" min-width="100">
+          <template slot-scope="scope">
+            <div>{{ scope.row.group_id }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="手机号" min-width="100">
+          <template slot-scope="scope">
+            <div>{{ scope.row.phone }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户类型" min-width="100">
+          <template slot-scope="scope">
+            <div>{{ scope.row.user_type }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="余额" prop="now_money" min-width="100" :sortable="true">
+          <template slot-scope="scope">
+            <div>{{ scope.row.now_money }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="120">
+          <template slot-scope="scope">
+            <template v-if="scope.row.is_del != 1">
+              <a @click="userDetail(row)">详情</a>
 
-            <Divider type="vertical" />
-            <Dropdown @on-click="changeMenu(row, $event, index)" :transfer="true">
-              <a href="javascript:void(0)">
-                更多
-                <Icon type="ios-arrow-down"></Icon>
-              </a>
-              <DropdownMenu slot="list">
-                <!-- <DropdownItem name="1">编辑</DropdownItem> -->
-                <DropdownItem name="2">积分余额</DropdownItem>
-                <DropdownItem name="3">赠送会员</DropdownItem>
-                <!--                                <DropdownItem name="4" v-if="row.vip_name">清除等级</DropdownItem>-->
-                <DropdownItem name="5">设置分组</DropdownItem>
-                <DropdownItem name="6">设置标签</DropdownItem>
-                <DropdownItem name="7">修改上级推广人</DropdownItem>
-                <DropdownItem name="8" v-if="row.spread_uid">清除上级推广人</DropdownItem>
-              </DropdownMenu>
-            </Dropdown>
+              <el-divider direction="vertical"></el-divider>
+              <el-dropdown size="small" @command="changeMenu(scope.row, $event, scope.$index)" :transfer="true">
+                <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i> </span>
+                <el-dropdown-menu slot="dropdown">
+                  <!-- <el-dropdown-item command="1">编辑</el-dropdown-item> -->
+                  <el-dropdown-item command="2">积分余额</el-dropdown-item>
+                  <el-dropdown-item command="3">赠送会员</el-dropdown-item>
+                  <!--                                <el-dropdown-item command="4" v-if="row.vip_name">清除等级</el-dropdown-item>-->
+                  <el-dropdown-item command="5">设置分组</el-dropdown-item>
+                  <el-dropdown-item command="6">设置标签</el-dropdown-item>
+                  <el-dropdown-item command="7">修改上级推广人</el-dropdown-item>
+                  <el-dropdown-item command="8" v-if="scope.row.spread_uid">清除上级推广人</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+            <template v-else>
+              <div v-if="scope.row.is_del == 1" style="color: red">已注销</div>
+            </template>
           </template>
-          <template v-else>
-            <div v-if="row.is_del == 1" style="color: red">已注销</div>
-          </template>
-        </template>
-      </Table>
+        </el-table-column>
+      </el-table>
 
       <div class="acea-row row-right page">
-        <Page
+        <pagination
+          v-if="total"
           :total="total"
-          :current="userFrom.page"
-          show-elevator
-          show-total
-          @on-change="pageChange"
-          :page-size="userFrom.limit"
+          :page.sync="userFrom.page"
+          :limit.sync="userFrom.limit"
+          @pagination="pageChange"
         />
       </div>
-    </Card>
+    </el-card>
     <!-- 编辑表单 积分余额-->
     <edit-from ref="edits" :FromData="FromData" @submitFail="submitFail"></edit-from>
     <!-- 发送优惠券-->
@@ -338,8 +392,8 @@
     </Modal>
     <!--修改推广人-->
     <Modal v-model="promoterShow" scrollable title="修改推广人" class="order_box" :closable="false">
-      <Form ref="formInline" :model="formInline" :label-width="100" @submit.native.prevent>
-        <FormItem v-if="formInline" label="选择推广人：" prop="image">
+      <el-form ref="formInline" :model="formInline" label-width="100px" @submit.native.prevent>
+        <el-form-item v-if="formInline" label="选择推广人：" prop="image">
           <div class="picBox" @click="customer">
             <div class="pictrue" v-if="formInline.image">
               <img v-lazy="formInline.image" />
@@ -348,11 +402,11 @@
               <Icon type="md-person" size="26" />
             </div>
           </div>
-        </FormItem>
-      </Form>
+        </el-form-item>
+      </el-form>
       <div slot="footer">
-        <Button type="primary" @click="putSend('formInline')">提交</Button>
-        <Button @click="cancel('formInline')">取消</Button>
+        <el-button type="primary" @click="putSend('formInline')">提交</el-button>
+        <el-button @click="cancel('formInline')">取消</el-button>
       </div>
     </Modal>
     <Modal v-model="customerShow" scrollable title="请选择商城用户" :closable="false" width="50%">
@@ -371,8 +425,8 @@
     <Drawer :closable="false" width="700" v-model="modals" title="用户信息填写">
       <userEdit ref="userEdit" v-if="modals" :userData="userData"></userEdit>
       <div class="demo-drawer-footer">
-        <Button style="margin-right: 8px" @click="modals = false">取消</Button>
-        <Button type="primary" @click="setUser">提交</Button>
+        <el-button style="margin-right: 8px" @click="modals = false">取消</el-button>
+        <el-button type="primary" @click="setUser">提交</el-button>
       </div>
     </Drawer>
     <!-- 用户标签 -->
@@ -587,81 +641,6 @@ export default {
       label_id: '',
       user_time_type: '',
       pay_count: '',
-      columns: [
-        {
-          type: 'expand',
-          width: 40,
-          render: (h, params) => {
-            return h(expandRow, {
-              props: {
-                row: params.row,
-              },
-            });
-          },
-        },
-        {
-          type: 'selection',
-          width: 60,
-          align: 'center',
-        },
-        {
-          title: '用户ID',
-          key: 'uid',
-          width: 80,
-        },
-        {
-          title: '头像',
-          slot: 'avatars',
-          minWidth: 60,
-        },
-        {
-          title: '姓名',
-          slot: 'nickname',
-          minWidth: 150,
-        },
-        {
-          title: '付费会员',
-          slot: 'isMember',
-          minWidth: 90,
-        },
-        {
-          title: '用户等级',
-          key: 'level',
-          minWidth: 90,
-        },
-        {
-          title: '分组',
-          key: 'group_id',
-          minWidth: 100,
-        },
-        {
-          title: '手机号',
-          key: 'phone',
-          minWidth: 100,
-        },
-        {
-          title: '用户类型',
-          key: 'user_type',
-          minWidth: 100,
-        },
-        {
-          title: '余额',
-          key: 'now_money',
-          sortable: 'custom',
-          minWidth: 100,
-        },
-        // {
-        //     title: '状态',
-        //     slot: 'status',
-        //     minWidth: 100
-        // },
-        {
-          title: '操作',
-          slot: 'action',
-          fixed: 'right',
-          minWidth: 120,
-        },
-      ],
       userLists: [],
       FromData: null,
       selectionList: [],
@@ -675,14 +654,14 @@ export default {
         limit: '',
       },
       labelLists: [],
-      selectedIds: new Set(), //选中合并项的id
+      selectedIds: [], //选中合并项的id
       ids: [],
     };
   },
   computed: {
     ...mapState('media', ['isMobile']),
     labelWidth() {
-      return this.isMobile ? undefined : 100;
+      return this.isMobile ? undefined : '100px';
     },
     labelPosition() {
       return this.isMobile ? 'top' : 'right';
@@ -801,9 +780,8 @@ export default {
           this.$Message.error(res.msg);
         });
     },
-    onClickTab(type) {
+    onClickTab() {
       this.userFrom.page = 1;
-      this.userFrom.user_type = type;
       this.getList();
     },
     userGroup() {
@@ -1104,9 +1082,8 @@ export default {
         });
       });
     },
-    pageChange(index) {
+    pageChange() {
       this.selectionList = [];
-      this.userFrom.page = index;
       this.getList();
     },
     // 搜索
@@ -1199,25 +1176,18 @@ export default {
       // this.getList();
     },
     // 排序
-    sortChanged(e) {
-      this.userFrom[e.key] = e.order;
+    sortChanged(e, props, order) {
+      console.log(e, props, order);
+      this.userFrom[e.prop] = e.order;
       this.getList();
     },
     //全选和取消全选时触发
     handleSelectAll(selection) {
-      if (selection.length === 0) {
-        //获取table的数据；
-        let data = this.$refs.table.data;
-        data.forEach((item) => {
-          if (this.selectedIds.has(item.uid)) {
-            this.selectedIds.delete(item.uid);
-          }
-        });
-      } else {
-        selection.forEach((item) => {
-          this.selectedIds.add(item.uid);
-        });
-      }
+      let ids = [];
+      selection.map((e) => {
+        ids.push(e.uid);
+      });
+      this.selectedIds = ids;
       this.$nextTick(() => {
         //确保dom加载完毕
         this.setChecked();
@@ -1225,15 +1195,12 @@ export default {
     },
     //  选中某一行
     handleSelectRow(selection, row) {
-      this.selectedIds.add(row.uid);
-      this.$nextTick(() => {
-        //确保dom加载完毕
-        this.setChecked();
+      console.log(selection);
+      let ids = [];
+      selection.map((e) => {
+        ids.push(e.uid);
       });
-    },
-    //  取消某一行
-    handleCancelRow(selection, row) {
-      this.selectedIds.delete(row.uid);
+      this.selectedIds = ids;
       this.$nextTick(() => {
         //确保dom加载完毕
         this.setChecked();
diff --git a/template/admin/src/pages/user/list/tableExpand.vue b/template/admin/src/pages/user/list/tableExpand.vue
index d3a5b0b43..8a589fb5b 100644
--- a/template/admin/src/pages/user/list/tableExpand.vue
+++ b/template/admin/src/pages/user/list/tableExpand.vue
@@ -1,47 +1,47 @@
 <template>
   <div>
-    <Row class="expand-row">
-      <Col span="6">
+    <el-row class="expand-row">
+      <el-col :span="6">
         <span class="expand-key">首次访问：</span>
         <span class="expand-value"> {{ row.add_time | formatDate }}</span>
-      </Col>
-      <Col span="6">
+      </el-col>
+      <el-col :span="6">
         <span class="expand-key">近次访问：</span>
         <span class="expand-value">{{ row.last_time | formatDate }}</span>
-      </Col>
-      <Col span="6">
+      </el-col>
+      <el-col :span="6">
         <span class="expand-key">身份证号：</span>
         <span class="expand-value">{{ row.card_id }}</span>
-      </Col>
-      <Col span="6">
+      </el-col>
+      <el-col :span="6">
         <span class="expand-key">真实姓名：</span>
         <span class="expand-value">{{ row.real_name }}</span>
-      </Col>
-    </Row>
-    <Row class="expand-row">
-      <Col span="6">
+      </el-col>
+    </el-row>
+    <el-row class="expand-row">
+      <el-col :span="6">
         <span class="expand-key">标签：</span>
         <span class="expand-value">{{ row.labels }}</span>
-      </Col>
-      <Col span="6">
+      </el-col>
+      <el-col :span="6">
         <span class="expand-key">生日：</span>
         <span class="expand-value">{{ row.birthday }}</span>
-      </Col>
-      <Col span="6">
+      </el-col>
+      <el-col :span="6">
         <span class="expand-key">推荐人：</span>
         <span class="expand-value">{{ row.spread_uid_nickname }}</span>
-      </Col>
-      <Col span="6">
+      </el-col>
+      <el-col :span="6">
         <span class="expand-key">地址：</span>
         <span class="expand-value">{{ row.addres }}</span>
-      </Col>
-    </Row>
-    <Row class="expand-row">
-      <Col span="6">
+      </el-col>
+    </el-row>
+    <el-row class="expand-row">
+      <el-col :span="6">
         <span class="expand-key">备注：</span>
         <span class="expand-value">{{ row.mark }}</span>
-      </Col>
-    </Row>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
@@ -66,5 +66,6 @@ export default {
 <style scoped>
 .expand-row {
   margin-bottom: 16px;
+  margin-left: 20px;
 }
 </style>
diff --git a/template/admin/src/router/modules/marketing.js b/template/admin/src/router/modules/marketing.js
index 60019d433..70163e718 100644
--- a/template/admin/src/router/modules/marketing.js
+++ b/template/admin/src/router/modules/marketing.js
@@ -210,15 +210,6 @@ export default {
       },
       component: () => import('@/pages/marketing/storeIntegral/create'),
     },
-    {
-      path: 'store_integral/add_store_integral',
-      name: `${pre}addStoreIntegral`,
-      meta: {
-        auth: ['marketing-store_integral-create'],
-        title: '批量添加积分商品',
-      },
-      component: () => import('@/pages/marketing/storeIntegral/addStoreIntegral'),
-    },
     {
       path: 'store_integral/order_list',
       name: `${pre}storeIntegralOrder`,
diff --git a/template/admin/src/router/modules/order.js b/template/admin/src/router/modules/order.js
index 728d6d728..492a365b7 100644
--- a/template/admin/src/router/modules/order.js
+++ b/template/admin/src/router/modules/order.js
@@ -32,15 +32,6 @@ export default {
       },
       component: () => import('@/pages/order/orderList/index'),
     },
-    {
-      path: 'split_list',
-      name: `${pre}split_list`,
-      meta: {
-        auth: ['admin-order-storeOrder-index'],
-        title: '子订单列表',
-      },
-      component: () => import('@/pages/order/orderList/splitList.vue'),
-    },
     {
       path: 'offline',
       name: `${pre}offline`,
diff --git a/template/admin/src/setting.js b/template/admin/src/setting.js
index 84a509ef8..08b6c3d06 100644
--- a/template/admin/src/setting.js
+++ b/template/admin/src/setting.js
@@ -1,5 +1,5 @@
 // 请求接口地址 如果没有配置自动获取当前网址路径
-const VUE_APP_API_URL = process.env.VUE_APP_API_URL || `${location.origin}/adminapi`;
+const VUE_APP_API_URL = 'https://bz.wuht.net/adminapi' || process.env.VUE_APP_API_URL || `${location.origin}/adminapi`;
 
 const Setting = {
   // 路由前缀
diff --git a/template/admin/src/store/module/themeConfig.js b/template/admin/src/store/module/themeConfig.js
index 65a4a1191..ed3a359a2 100644
--- a/template/admin/src/store/module/themeConfig.js
+++ b/template/admin/src/store/module/themeConfig.js
@@ -67,7 +67,6 @@ const themeConfigModule = {
       isGrayscale: false,
       // 是否开启色弱模式
       isInvert: false,
-
       /**
        * 其它设置
        */
diff --git a/template/admin/src/styles/style.css b/template/admin/src/styles/style.css
index 92f8b8035..b3e44e8a2 100644
--- a/template/admin/src/styles/style.css
+++ b/template/admin/src/styles/style.css
@@ -727,3 +727,30 @@ body {
 .pl10 {
   padding-left: 10px;
 }
+.el-switch__label * {
+  font-size: 12px;
+  line-height: 20px !important;
+}
+.defineSwitch .el-switch__label {
+  position: absolute;
+  display: none;
+  color: #fff !important;
+}
+/*打开时文字位置设置*/
+.defineSwitch .el-switch__label--right {
+  z-index: 1;
+  right: -8px; /*不同场景下可能不同，自行调整*/
+}
+/*关闭时文字位置设置*/
+.defineSwitch .el-switch__label--left {
+  z-index: 1;
+  left: 22px; /*不同场景下可能不同，自行调整*/
+}
+/*显示文字*/
+.defineSwitch .el-switch__label.is-active {
+  display: block;
+}
+.defineSwitch.el-switch .el-switch__core,
+.defineSwitch.el-switch .el-switch__label {
+  width: 55px !important; /*开关按钮的宽度大小*/
+}
diff --git a/template/admin/src/theme/element.scss b/template/admin/src/theme/element.scss
index 12a001a2c..998ec5bcf 100644
--- a/template/admin/src/theme/element.scss
+++ b/template/admin/src/theme/element.scss
@@ -270,3 +270,24 @@
 .el-alert__title {
   word-break: break-all;
 }
+
+// tooltip
+.el-tooltip__popper.is-light {
+  border-color: #f2f2f2 !important;
+}
+
+.el-tooltip__popper .popper__arrow,
+.el-tooltip__popper .popper__arrow::after {
+  color: #f2f2f2 !important;
+}
+// 下拉菜单
+.el-dropdown {
+  font-size: 12px !important;
+}
+.el-dropdown-link {
+  cursor: pointer;
+  color: #2d8cf0;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
diff --git a/template/admin/src/theme/variables.scss b/template/admin/src/theme/variables.scss
index 01da603b0..9e9d520d5 100644
--- a/template/admin/src/theme/variables.scss
+++ b/template/admin/src/theme/variables.scss
@@ -94,7 +94,7 @@
   border-color: var(--prev-color-primary);
 }
 
-/* Radio 单选框
+/* el-radio 单选框
 ------------------------------- */
 .el-radio,
 .el-checkbox {
@@ -133,7 +133,7 @@
   border-color: var(--prev-border-color-base);
 }
 
-/* Checkbox 多选框
+/* el-checkbox 多选框
 ------------------------------- */
 .el-checkbox__input.is-checked + .el-checkbox__label,
 .el-checkbox-button__inner:hover {
@@ -168,14 +168,14 @@
   border-color: var(--prev-border-color-base);
 }
 
-/* Input 输入框、InputNumber 计数器
+/* el-input 输入框、InputNumber 计数器
 ------------------------------- */
 // input-number
 .el-input__inner:focus,
 .el-input-number__decrease:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled),
 .el-input-number__increase:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled),
 .el-textarea__inner:focus {
-  border-color: var(--prev-color-primary) !important;
+  // border-color: var(--prev-color-primary) !important;
 }
 .el-input-number__increase:hover,
 .el-input-number__decrease:hover {
@@ -236,7 +236,7 @@ $positions: 'top', 'right', 'bottom', 'left';
   background-color: var(--prev-color-hover);
 }
 
-/* Select 选择器
+/* el-select 选择器
 ------------------------------- */
 .el-range-editor.is-active,
 .el-range-editor.is-active:hover,
@@ -301,7 +301,7 @@ $positions: 'top', 'right', 'bottom', 'left';
   background-color: var(--prev-color-hover);
 }
 
-/* Switch 开关
+/* el-switch 开关
 ------------------------------- */
 .el-switch.is-checked .el-switch__core {
   border-color: var(--prev-color-primary) !important;
@@ -490,15 +490,16 @@ $positions: 'top', 'right', 'bottom', 'left';
   color: var(--prev-color-text-primary);
 }
 
-/* Form 表单
+/* el-form 表单
 ------------------------------- */
 .el-form {
   .el-form-item:last-of-type {
-    margin-bottom: 0 !important;
+    // margin-bottom: 0 !important;
   }
 }
 .el-form-item__label {
   color: var(--prev-color-text-regular);
+  font-size: 12px !important;
 }
 
 /* Table 表格
@@ -809,7 +810,7 @@ $positions: 'top', 'right', 'bottom', 'left';
 
 /* Popover 弹出框
 ------------------------------- */
-.el-popover {
+.el-tooltip {
   background-color: var(--prev-bg-white);
   border-color: var(--prev-border-color-lighter);
   color: var(--prev-color-text-regular);
@@ -818,7 +819,7 @@ $positions: 'top', 'right', 'bottom', 'left';
   color: var(--prev-color-text-primary);
 }
 
-/* Card 卡片
+/* el-card 卡片
 ------------------------------- */
 .el-card {
   color: var(--prev-color-text-primary);
diff --git a/template/admin/src/utils/componentSize.js b/template/admin/src/utils/componentSize.js
index 0f6e82556..a5277b948 100644
--- a/template/admin/src/utils/componentSize.js
+++ b/template/admin/src/utils/componentSize.js
@@ -1,4 +1,4 @@
 import { Local } from '@/utils/storage.js';
 
 // 全局组件大小
-export const globalComponentSize = Local.get('themeConfigPrev') ? Local.get('themeConfigPrev').globalComponentSize : '';
+export const globalComponentSize = Local.get('themeConfigPrev') ? Local.get('themeConfigPrev').globalComponentSize : 'small';
diff --git a/template/admin/src/utils/scroll-to.js b/template/admin/src/utils/scroll-to.js
new file mode 100644
index 000000000..98dfbe00f
--- /dev/null
+++ b/template/admin/src/utils/scroll-to.js
@@ -0,0 +1,65 @@
+Math.easeInOutQuad = function (t, b, c, d) {
+  t /= d / 2;
+  if (t < 1) {
+    return (c / 2) * t * t + b;
+  }
+  t--;
+  return (-c / 2) * (t * (t - 2) - 1) + b;
+};
+
+//requestAnimationFrame用于智能动画 http://goo.gl/sx5sts
+var requestAnimFrame = (function () {
+  return (
+    window.requestAnimationFrame ||
+    window.webkitRequestAnimationFrame ||
+    window.mozRequestAnimationFrame ||
+    function (callback) {
+      window.setTimeout(callback, 1000 / 60);
+    }
+  );
+})();
+
+/**
+ * 因为要检测滚动元素太难了，把它们都移动就行了
+ * @param {number} amount
+ */
+function move(amount) {
+  document.documentElement.scrollTop = amount;
+  document.body.parentNode.scrollTop = amount;
+  document.body.scrollTop = amount;
+}
+
+function position() {
+  return document.documentElement.scrollTop || document.body.parentNode.scrollTop || document.body.scrollTop;
+}
+
+/**
+ * @param {number} to
+ * @param {number} duration
+ * @param {Function} callback
+ */
+export function scrollTo(to, duration, callback) {
+  const start = position();
+  const change = to - start;
+  const increment = 20;
+  let currentTime = 0;
+  duration = typeof duration === 'undefined' ? 500 : duration;
+  var animateScroll = function () {
+    // 增加次数
+    currentTime += increment;
+    // 用Math函数找到这个值
+    var val = Math.easeInOutQuad(currentTime, start, change, duration);
+    // 移动这个元素
+    move(val);
+    // 动画是否结束
+    if (currentTime < duration) {
+      requestAnimFrame(animateScroll);
+    } else {
+      if (callback && typeof callback === 'function') {
+        //动画已经完成，进行回调
+        callback();
+      }
+    }
+  };
+  animateScroll();
+}
diff --git a/template/admin/src/vendor/Export2Excel.js b/template/admin/src/vendor/Export2Excel.js
index 15b326016..5bd57e6fd 100644
--- a/template/admin/src/vendor/Export2Excel.js
+++ b/template/admin/src/vendor/Export2Excel.js
@@ -33,7 +33,7 @@ function generateArray(table) {
         }
       });
 
-      //Handle Row Span
+      //Handle el-row Span
       if (rowspan || colspan) {
         rowspan = rowspan || 1;
         colspan = colspan || 1;
diff --git a/template/admin/vue.config.js b/template/admin/vue.config.js
index 14dc7ac7f..8fc65dbce 100644
--- a/template/admin/vue.config.js
+++ b/template/admin/vue.config.js
@@ -98,11 +98,6 @@ module.exports = {
     config.resolve.alias.set('@api', resolve('src/api'));
     // node
     config.node.set('__dirname', true).set('__filename', true);
-    // 判断是否需要加入模拟数据
-    const entry = config.entry('app');
-    if (Setting.isMock) {
-      entry.add('@/mock').end();
-    }
     config.plugin('monaco').use(new MonacoWebpackPlugin());
   },
 
diff --git a/template/uni-app/config/app.js b/template/uni-app/config/app.js
index 6c3a4c7bd..fc1a75738 100644
--- a/template/uni-app/config/app.js
+++ b/template/uni-app/config/app.js
@@ -2,13 +2,13 @@ module.exports = {
 	// 小程序配置
 	// #ifdef MP || APP-PLUS
 	// 请求域名 格式： https://您的域名
-	HTTP_REQUEST_URL: `https://demo.crmeb.com`,
+	HTTP_REQUEST_URL: `https://v4.crmeb.net`,
 	// #endif
 
 	// H5配置
 	// #ifdef H5
 	//H5接口是浏览器地址，非单独部署不用修改
-	HTTP_REQUEST_URL: window.location.protocol + "//" + window.location.host,
+	HTTP_REQUEST_URL: `https://bz.wuht.net` || window.location.protocol + "//" + window.location.host,
 	// #endif 
 
 	// 以下配置在不做二开的前提下,不需要做任何的修改
diff --git a/template/uni-app/manifest.json b/template/uni-app/manifest.json
index cfadfdf0c..22572a60f 100644
--- a/template/uni-app/manifest.json
+++ b/template/uni-app/manifest.json
@@ -181,7 +181,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx1234567890",
+        "appid" : "wx3b82801238ca1b57",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
diff --git a/template/uni-app/pages/index/diy/components/pictureCube.vue b/template/uni-app/pages/index/diy/components/pictureCube.vue
index 22cd534be..08fefb52e 100644
--- a/template/uni-app/pages/index/diy/components/pictureCube.vue
+++ b/template/uni-app/pages/index/diy/components/pictureCube.vue
@@ -7,7 +7,7 @@
 		</view>
 		<view class="advertItem02 acea-row" v-if="style==1">
 			<view class="item" v-for="(item,index) in picList" :key="index" @click="goDetail(item)">
-				<image :src="item.image" mode="aspectFill" :style="'height:'+ imageH +'rpx;'"></image>
+				<image :src="item.image" mode="widthFix" :style="'height:'+ imageH +'rpx;'"></image>
 			</view>
 		</view>
 		<view class="advertItem02 advertItem03 acea-row" v-if="style==2">