diff --git a/vue/src/views/pdd/goods/goods_list.vue b/vue/src/views/pdd/goods/goods_list.vue
index b3d2e84e..3d14f90a 100644
--- a/vue/src/views/pdd/goods/goods_list.vue
+++ b/vue/src/views/pdd/goods/goods_list.vue
@@ -322,7 +322,7 @@ export default {
           console.log('拉取PDD商品接口返回=====',response)
           if(response.code === 1401) {
             MessageBox.confirm('Token已过期，需要重新授权！请前往店铺列表重新获取授权！', '系统提示', { confirmButtonText: '前往授权', cancelButtonText: '取消', type: 'warning' }).then(() => {
-              this.$router.push({path:"/shop/shop_list",query:{platform:5}})
+              this.$router.push({path:"/shop/shop_list",query:{type:300}})
               // isRelogin.show = false;
               // store.dispatch('LogOut').then(() => {
               // location.href = response.data.tokenRequestUrl+'?shopId='+this.queryParams.shopId
diff --git a/vue/src/views/shop/index.vue b/vue/src/views/shop/index.vue
index 10b5f1f0..515ec4d2 100644
--- a/vue/src/views/shop/index.vue
+++ b/vue/src/views/shop/index.vue
@@ -1,39 +1,476 @@
 <template>
   <div class="app-container">
-    <el-tabs v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane label="平台店铺" name="OnlineShop">
-        <online-shop></online-shop>
-      </el-tab-pane>
-      <el-tab-pane label="私域店铺" name="OfflineShop" lazy>
-        <offline-shop></offline-shop>
-      </el-tab-pane>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="店铺名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入店铺名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+       <el-form-item label="平台" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择平台" clearable>
+         <el-option
+            v-for="item in typeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
 
-    </el-tabs>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          @click="handleDelete"
+          :disabled="multiple"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="shopList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="店铺ID" align="center" prop="id" width="100" />
+      <el-table-column label="店铺名" align="left" prop="name" />
+      <el-table-column label="平台" align="left" prop="type" >
+        <template slot-scope="scope">
+          <el-tag >{{typeList.find(x=>x.id === scope.row.type)?typeList.find(x=>x.id === scope.row.type).name:''}}</el-tag>
+        </template>
+      </el-table-column>
+       <el-table-column label="店铺ID" align="center" prop="sellerId" />
+       <el-table-column label="accessToken" align="center" prop="accessToken" />
+      <el-table-column label="描述" align="center" prop="remark" />
+      <el-table-column label="状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.status===1">启用</el-tag>
+          <el-tag v-if="scope.row.status===0">禁用</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+
+<!--            <el-button-->
+<!--              type="primary"-->
+<!--              plain-->
+<!--              icon="el-icon-s-goods"-->
+<!--              size="mini"-->
+<!--              @click="handleGoodsList(scope.row)"-->
+<!--            >店铺商品管理</el-button>-->
+<!--          <el-button-->
+<!--            type="primary"-->
+<!--            plain-->
+<!--            icon="el-icon-edit"-->
+<!--            size="mini"-->
+<!--            @click="handleLogistics(scope.row)"-->
+<!--          >快递公司库</el-button>-->
+
+          <el-row>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['shop:shop:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['shop:shop:remove']"
+          >删除</el-button>
+          </el-row>
+          <el-button
+            v-if="scope.row.type===100 || scope.row.type===200 || scope.row.type===280 || scope.row.type===300|| scope.row.type===400"
+            type="success"
+            plain
+            icon="el-icon-refresh"
+            size="mini"
+            @click="handleUpdateToken(scope.row)"
+          >更新AccessToken</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改店铺对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="平台" prop="type">
+          <el-select v-model="form.type" placeholder="请选择平台">
+            <el-option
+              v-for="item in typeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="店铺名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入店铺名" />
+        </el-form-item>
+
+        <el-form-item label="店铺卖家Id" prop="sellerId">
+          <el-input v-model="form.sellerId" placeholder="请输入卖家Id名" />
+        </el-form-item>
+        <el-form-item label="AppKey" prop="appKey">
+          <el-input v-model="form.appKey" placeholder="请输入AppKey" />
+        </el-form-item>
+        <el-form-item label="AppSecret" prop="appSecret">
+          <el-input v-model="form.appSecret" placeholder="请输入AppSecret" />
+        </el-form-item>
+        <el-form-item label="回调URL" prop="apiRedirectUrl">
+          <el-input v-model="form.apiRedirectUrl" placeholder="请输入回调URL" />
+        </el-form-item>
+        <el-form-item label="描述" prop="remark">
+          <el-input type="textarea" v-model="form.remark" placeholder="请输入描述" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="form.status" placeholder="状态">
+            <el-option label="启用" value="1"></el-option>
+            <el-option label="禁用" value="0"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="authOpen" width="500px" append-to-body>
+      <el-form ref="tokenForm" :model="tokenForm"  :rules="rules" label-width="120px">
+        <el-descriptions >
+        <el-descriptions-item label="授权URL"> {{ tokenForm.url }}</el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions v-if="tokenForm.shopType === 100">
+          <el-descriptions-item label="请设置淘宝开放平台回调URL"> http://127.0.0.1:8088/api/oms-api/tao/code_callback</el-descriptions-item>
+        </el-descriptions>
+        <div slot="footer" class="dialog-footer">
+          请手动复制上面的URL到浏览器中访问
+        </div>
+        <el-form-item label="top_session" prop="code" v-if="tokenForm.shopType===100">
+          <el-input type="textarea" v-model="tokenForm.code" placeholder="请复制淘宝授权后跳转页面的top_session参数值到这里" />
+        </el-form-item>
+        <el-form-item label="code" prop="code" v-if="tokenForm.shopType!==100">
+          <el-input type="textarea" v-model="tokenForm.code" placeholder="请把授权后的code复制到这里" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="getTokenSubmit">确 定</el-button>
+        <el-button type="primary" @click="getTokenUrl" size="mini">去授权</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+<!--      <div slot="footer" class="dialog-footer">-->
+<!--        请手动复制上面的URL到浏览器中访问-->
+<!--      </div>-->
+    </el-dialog>
 
   </div>
 </template>
 
 <script>
-import OfflineShop  from "@/views/shop/offline_shop.vue";
-import OnlineShop  from "@/views/shop/online_shop.vue";
+import { listShop,listPlatform, getShop, delShop, addShop, updateShop } from "@/api/shop/shop";
+import {getJdOAuthUrl, getJdToken} from "@/api/jd/shop";
+import {getTaoOAuthUrl,saveSessionKey} from "@/api/tao/shop_api";
+import {getPddOAuthUrl,getPddToken} from "@/api/pdd/shop";
+import {updateDouToken} from "@/api/dou/shop";
 
 export default {
-  name: "ShopIndex",
-  components:{OfflineShop,OnlineShop},
+  name: "Shop",
   data() {
     return {
-      activeName: 'OnlineShop'
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 店铺表格数据
+      shopList: [],
+      typeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      authOpen: false,
+      apiOpen: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        type: null
+      },
+      // 表单参数
+      form: {
+        type:null
+      },
+      // 获取token表单
+      tokenForm:{
+        shopId: null,
+        shopType: null,
+        code:null
+      },
+      // 表单校验
+      rules: {
+        name: [{ required: true, message: "店铺名不能为空", trigger: "blur" }],
+        type: [{ required: true, message: "请选择平台", trigger: "change" }],
+        sellerId: [{ required: true, message: "不能为空", trigger: "change" }],
+
+        // appKey: [{ required: true, message: "不能为空", trigger: "change" }],
+        // appSecret: [{ required: true, message: "不能为空", trigger: "change" }],
+        status: [{ required: true, message: "不能为空", trigger: "change" }],
+      }
     };
   },
   created() {
-
+    listPlatform().then(res => {
+      this.typeList = res.rows;
+    })
+    this.getList();
   },
   mounted() {
-
+    if(this.$route.query.type){
+      // listPlatform({status:0}).then(res => {
+      //   this.typeList = res.rows;
+      this.queryParams.type = parseInt(this.$route.query.type)
+      this.getList()
+      // })
+    }
   },
   methods: {
-    handleClick(tab, event) {
-      console.log(tab, event);
+    /** 查询店铺列表 */
+    getList() {
+      this.loading = true;
+      listShop(this.queryParams).then(response => {
+        this.shopList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.apiOpen = false;
+      this.authOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        status:'1'
+      };
+      this.resetForm("form");
+    },
+    getTokenUrl(){
+      console.log("手动跳转授权")
+      window.location.href = this.tokenForm.url
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加店铺";
+    },
+    handleUpdateToken(row){
+     console.log("获取token",row)
+      if(row.type === 200 || row.type === 280){
+        getJdOAuthUrl({shopId:row.id}).then(response => {
+          console.log("获取token=====jd ",response)
+          this.authOpen = true;
+          this.title = "更新店铺授权";
+          this.tokenForm.url = response.data
+          this.tokenForm.shopId = row.id
+          this.tokenForm.shopType = row.type
+        })
+      }else if(row.type ===100){
+        getTaoOAuthUrl({shopId:row.id}).then(response => {
+          console.log("获取token=====tao ",response)
+          this.authOpen = true;
+          this.title = "更新店铺授权";
+          this.tokenForm.url = response.data
+          this.tokenForm.shopId = row.id
+          this.tokenForm.shopType = row.type
+        })
+      }else if(row.type ===300){
+        getPddOAuthUrl({shopId:row.id}).then(response => {
+          console.log("获取token=====pdd ",response)
+          this.authOpen = true;
+          this.title = "更新店铺授权";
+          this.tokenForm.url = response.data
+          this.tokenForm.shopId = row.id
+          this.tokenForm.shopType = row.type
+        })
+      }else if(row.type===400){
+        updateDouToken({shopId:row.id}).then(resp=>{
+          if(resp.code === 200){
+            this.$modal.msgSuccess("Token更新成功")
+            this.getList()
+          }else{
+            this.$modal.msgError(resp.msg)
+          }
+
+        })
+      }else{
+        this.$modal.msgError('暂时不支持')
+      }
+
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getShop(id).then(response => {
+        this.form = response.data;
+        this.form.status = response.data.status+''
+        // this.$nextTick(()=>{
+        //   this.form.type = response.data.type;
+        // })
+
+        this.open = true;
+        this.title = "修改店铺";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateShop(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.apiOpen = false
+              this.getList();
+            });
+          } else {
+            addShop(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    getTokenSubmit(){
+      this.$refs["tokenForm"].validate(valid => {
+        if (valid) {
+          console.log("=====更新token=====",this.tokenForm)
+          if(this.tokenForm.shopType === 100){
+            saveSessionKey(this.tokenForm).then(resp=>{
+              this.authOpen = false
+              this.$modal.msgSuccess("SessionKey保存成功");
+              this.getList()
+            });
+          } else if(this.tokenForm.shopType === 200 || this.tokenForm.shopType === 280){
+            getJdToken(this.tokenForm).then(response => {
+              this.authOpen = false
+              this.$modal.msgSuccess("授权成功");
+              this.getList()
+            });
+          }else if(this.tokenForm.shopType === 300){
+            getPddToken(this.tokenForm).then(response => {
+              this.authOpen = false
+              this.$modal.msgSuccess("授权成功");
+              this.getList()
+            });
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除店铺编号为"' + ids + '"的数据项？').then(function() {
+        return delShop(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    handleGoodsList(row){
+      console.log('=======商品list=====',row)
+      if(row.type === 1){
+        this.$router.push({path:'/shop/goods/tao_goods_list',query:{shopId:row.id}})
+      }else if(row.type === 2){
+        this.$router.push({path:'/shop/goods/jd_goods_list',query:{shopId:row.id}})
+      }else if(row.type === 3){
+        this.$router.push({path:'/shop/goods/dou_goods_list',query:{shopId:row.id}})
+      }else if(row.type === 4){
+        this.$router.push({path:'/shop/goods/pdd_goods_list',query:{shopId:row.id}})
+      }
+    },
+    handleLogistics(row) {
+      if(row.type === 1){
+        this.$router.push({path:"/shop/logistics_companies",query:{id:row.type}})
+      }else  if(row.type === 2){
+        this.$router.push({path:"/shop/logistics_companies",query:{id:row.type,shopId:row.id}})
+      } else  if(row.type === 3){
+        this.$router.push({path:"/shop/logistics_companies",query:{id:row.type,shopId:row.id}})
+      } else  if(row.type === 4){
+        this.$router.push({path:"/shop/logistics_companies",query:{id:row.type,shopId:row.id}})
+      }
     }
   }
 };
diff --git a/vue/src/views/shop/offline_shop.vue b/vue/src/views/shop/offline_shop.vue
deleted file mode 100644
index 06fda1a7..00000000
--- a/vue/src/views/shop/offline_shop.vue
+++ /dev/null
@@ -1,334 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="店铺名" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入店铺名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['shop:shop:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['shop:shop:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['shop:shop:remove']"
-        >删除</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="shopList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="店铺ID" align="center" prop="id" width="100" />
-      <el-table-column label="店铺名" align="left" prop="name" />
-      <el-table-column label="店铺备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['shop:shop:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['shop:shop:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改店铺对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="店铺名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入店铺名" />
-        </el-form-item>
-        <el-form-item label="平台" prop="type">
-          <el-select v-model="form.type" placeholder="请选择店铺平台">
-            <el-option label="私域渠道" value="999" ></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="店铺备注" prop="remark">
-          <el-input type="textarea" v-model="form.remark" placeholder="请输入描述" />
-        </el-form-item>
-
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-
-import { listShop,addShop,getShop,updateShop,delShop } from "@/api/shop/shop";
-export default {
-  name: "OfflineShop",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 店铺表格数据
-      shopList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: null,
-        type: 999
-      },
-      // 表单参数
-      form: {
-        type: '999'
-      },
-      // 获取token表单
-      tokenForm:{
-        shopId: null,
-        shopType: null
-      },
-      // 表单校验
-      rules: {
-        name: [{ required: true, message: "店铺名不能为空", trigger: "blur" }],
-        type: [{ required: true, message: "请选择平台", trigger: "change" }],
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询店铺列表 */
-    getList() {
-      this.loading = true;
-      listShop(this.queryParams).then(response => {
-        this.shopList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.apiOpen = false;
-      this.authOpen = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        type: '999'
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加店铺";
-    },
-    handleUpdateToken(row){
-     console.log("获取token",row)
-      if(row.type === 2 || row.type === 5){
-        getJdOAuthUrl({shopId:row.id}).then(response => {
-          console.log("获取token=====jd ",response)
-          this.authOpen = true;
-          this.title = "更新店铺授权";
-          this.tokenForm.url = response.data
-          this.tokenForm.shopId = row.id
-          this.tokenForm.shopType = row.type
-        })
-      }else if(row.type ===1){
-        getTaoOAuthUrl({shopId:row.id}).then(response => {
-          console.log("获取token=====tao ",response)
-          this.authOpen = true;
-          this.title = "更新店铺授权";
-          this.tokenForm.url = response.data
-          this.tokenForm.shopId = row.id
-          this.tokenForm.shopType = row.type
-        })
-      }else if(row.type ===4){
-        getOAuthUrl({shopId:row.id}).then(response => {
-          console.log("获取token=====pdd ",response)
-          this.authOpen = true;
-          this.title = "更新店铺授权";
-          this.tokenForm.url = response.data
-          this.tokenForm.shopId = row.id
-          this.tokenForm.shopType = row.type
-        })
-      }
-
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getShop(id).then(response => {
-        this.form = response.data;
-        this.$nextTick(()=>{
-          this.form.type = response.data.type+'';
-        })
-
-        this.open = true;
-        this.title = "修改店铺";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateShop(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.apiOpen = false
-              this.getList();
-            });
-          } else {
-            addShop(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    getTokenSubmit(){
-      this.$refs["tokenForm"].validate(valid => {
-        if (valid) {
-          console.log("=====更新token=====",this.tokenForm)
-          if(this.tokenForm.shopType === 2 || this.tokenForm.shopType === 5){
-            getJdToken(this.tokenForm).then(response => {
-              this.authOpen = false
-              this.$modal.msgSuccess("授权成功");
-
-            });
-          }else if(this.tokenForm.shopType === 4){
-            getPddToken(this.tokenForm).then(response => {
-              this.authOpen = false
-              this.$modal.msgSuccess("授权成功");
-
-            });
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除店铺编号为"' + ids + '"的数据项？').then(function() {
-        return delShop(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    handleGoodsList(row){
-      console.log('=======商品list=====',row)
-      if(row.type === 1){
-        this.$router.push({path:'/shop/goods/tao_goods_list',query:{shopId:row.id}})
-      }else if(row.type === 2){
-        this.$router.push({path:'/shop/goods/jd_goods_list',query:{shopId:row.id}})
-      }else if(row.type === 3){
-        this.$router.push({path:'/shop/goods/dou_goods_list',query:{shopId:row.id}})
-      }else if(row.type === 4){
-        this.$router.push({path:'/shop/goods/pdd_goods_list',query:{shopId:row.id}})
-      }
-    },
-    handleLogistics(row) {
-      if(row.type === 1){
-        this.$router.push({path:"/shop/logistics_companies",query:{id:row.type}})
-      }else  if(row.type === 2){
-        this.$router.push({path:"/shop/logistics_companies",query:{id:row.type,shopId:row.id}})
-      } else  if(row.type === 3){
-        this.$router.push({path:"/shop/logistics_companies",query:{id:row.type,shopId:row.id}})
-      } else  if(row.type === 4){
-        this.$router.push({path:"/shop/logistics_companies",query:{id:row.type,shopId:row.id}})
-      }
-    }
-  }
-};
-</script>
diff --git a/vue/src/views/shop/online_shop.vue b/vue/src/views/shop/online_shop.vue
deleted file mode 100644
index acd6724f..00000000
--- a/vue/src/views/shop/online_shop.vue
+++ /dev/null
@@ -1,468 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="店铺名" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入店铺名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-       <el-form-item label="平台" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择平台" clearable>
-         <el-option
-            v-for="item in typeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleDelete"
-          :disabled="multiple"
-        >删除</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="shopList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="店铺ID" align="center" prop="id" width="100" />
-      <el-table-column label="店铺名" align="left" prop="name" />
-      <el-table-column label="平台" align="left" prop="type" >
-        <template slot-scope="scope">
-          <el-tag >{{typeList.find(x=>x.id === scope.row.type)?typeList.find(x=>x.id === scope.row.type).name:''}}</el-tag>
-        </template>
-      </el-table-column>
-       <el-table-column label="店铺ID" align="center" prop="sellerId" />
-       <el-table-column label="accessToken" align="center" prop="accessToken" />
-      <el-table-column label="描述" align="center" prop="remark" />
-      <el-table-column label="状态" align="center" prop="status" >
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.status===1">启用</el-tag>
-          <el-tag v-if="scope.row.status===0">禁用</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-
-<!--            <el-button-->
-<!--              type="primary"-->
-<!--              plain-->
-<!--              icon="el-icon-s-goods"-->
-<!--              size="mini"-->
-<!--              @click="handleGoodsList(scope.row)"-->
-<!--            >店铺商品管理</el-button>-->
-<!--          <el-button-->
-<!--            type="primary"-->
-<!--            plain-->
-<!--            icon="el-icon-edit"-->
-<!--            size="mini"-->
-<!--            @click="handleLogistics(scope.row)"-->
-<!--          >快递公司库</el-button>-->
-
-          <el-row>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['shop:shop:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['shop:shop:remove']"
-          >删除</el-button>
-          </el-row>
-          <el-button
-            v-if="scope.row.type===100 || scope.row.type===200 || scope.row.type===280 || scope.row.type===300|| scope.row.type===400"
-            type="success"
-            plain
-            icon="el-icon-refresh"
-            size="mini"
-            @click="handleUpdateToken(scope.row)"
-          >更新AccessToken</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改店铺对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="平台" prop="type">
-          <el-select v-model="form.type" placeholder="请选择平台">
-            <el-option
-              v-for="item in typeList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="店铺名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入店铺名" />
-        </el-form-item>
-
-        <el-form-item label="店铺卖家Id" prop="sellerId">
-          <el-input v-model="form.sellerId" placeholder="请输入卖家Id名" />
-        </el-form-item>
-        <el-form-item label="AppKey" prop="appKey">
-          <el-input v-model="form.appKey" placeholder="请输入AppKey" />
-        </el-form-item>
-        <el-form-item label="AppSecret" prop="appSecret">
-          <el-input v-model="form.appSecret" placeholder="请输入AppSecret" />
-        </el-form-item>
-        <el-form-item label="回调URL" prop="apiRedirectUrl">
-          <el-input v-model="form.apiRedirectUrl" placeholder="请输入回调URL" />
-        </el-form-item>
-        <el-form-item label="描述" prop="remark">
-          <el-input type="textarea" v-model="form.remark" placeholder="请输入描述" />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select v-model="form.status" placeholder="状态">
-            <el-option label="启用" value="1"></el-option>
-            <el-option label="禁用" value="0"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog :title="title" :visible.sync="authOpen" width="500px" append-to-body>
-      <el-form ref="tokenForm" :model="tokenForm"  :rules="rules" label-width="120px">
-        <el-descriptions >
-        <el-descriptions-item label="授权URL"> {{ tokenForm.url }}</el-descriptions-item>
-        </el-descriptions>
-        <el-descriptions v-if="tokenForm.shopType === 100">
-          <el-descriptions-item label="请设置淘宝开放平台回调URL"> http://127.0.0.1:8088/api/oms-api/tao/code_callback</el-descriptions-item>
-        </el-descriptions>
-        <div slot="footer" class="dialog-footer">
-          请手动复制上面的URL到浏览器中访问
-        </div>
-        <el-form-item label="top_session" prop="code" v-if="tokenForm.shopType===100">
-          <el-input type="textarea" v-model="tokenForm.code" placeholder="请复制淘宝授权后跳转页面的top_session参数值到这里" />
-        </el-form-item>
-        <el-form-item label="code" prop="code" v-if="tokenForm.shopType!==100">
-          <el-input type="textarea" v-model="tokenForm.code" placeholder="请把授权后的code复制到这里" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="getTokenSubmit">确 定</el-button>
-        <el-button type="primary" @click="getTokenUrl" size="mini">去授权</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-<!--      <div slot="footer" class="dialog-footer">-->
-<!--        请手动复制上面的URL到浏览器中访问-->
-<!--      </div>-->
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-import { listShop,listPlatform, getShop, delShop, addShop, updateShop } from "@/api/shop/shop";
-import {getJdOAuthUrl, getJdToken} from "@/api/jd/shop";
-import {getTaoOAuthUrl,saveSessionKey} from "@/api/tao/shop_api";
-import {getPddOAuthUrl,getPddToken} from "@/api/pdd/shop";
-import {updateDouToken} from "@/api/dou/shop";
-
-export default {
-  name: "Shop",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 店铺表格数据
-      shopList: [],
-      typeList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      authOpen: false,
-      apiOpen: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: null,
-        type: null
-      },
-      // 表单参数
-      form: {
-        type:null
-      },
-      // 获取token表单
-      tokenForm:{
-        shopId: null,
-        shopType: null,
-        code:null
-      },
-      // 表单校验
-      rules: {
-        name: [{ required: true, message: "店铺名不能为空", trigger: "blur" }],
-        type: [{ required: true, message: "请选择平台", trigger: "change" }],
-        sellerId: [{ required: true, message: "不能为空", trigger: "change" }],
-
-        // appKey: [{ required: true, message: "不能为空", trigger: "change" }],
-        // appSecret: [{ required: true, message: "不能为空", trigger: "change" }],
-        status: [{ required: true, message: "不能为空", trigger: "change" }],
-      }
-    };
-  },
-  created() {
-    listPlatform().then(res => {
-      this.typeList = res.rows;
-    })
-    this.getList();
-  },
-  methods: {
-    /** 查询店铺列表 */
-    getList() {
-      this.loading = true;
-      listShop(this.queryParams).then(response => {
-        this.shopList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.apiOpen = false;
-      this.authOpen = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        status:'1'
-      };
-      this.resetForm("form");
-    },
-    getTokenUrl(){
-      console.log("手动跳转授权")
-      window.location.href = this.tokenForm.url
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加店铺";
-    },
-    handleUpdateToken(row){
-     console.log("获取token",row)
-      if(row.type === 200 || row.type === 280){
-        getJdOAuthUrl({shopId:row.id}).then(response => {
-          console.log("获取token=====jd ",response)
-          this.authOpen = true;
-          this.title = "更新店铺授权";
-          this.tokenForm.url = response.data
-          this.tokenForm.shopId = row.id
-          this.tokenForm.shopType = row.type
-        })
-      }else if(row.type ===100){
-        getTaoOAuthUrl({shopId:row.id}).then(response => {
-          console.log("获取token=====tao ",response)
-          this.authOpen = true;
-          this.title = "更新店铺授权";
-          this.tokenForm.url = response.data
-          this.tokenForm.shopId = row.id
-          this.tokenForm.shopType = row.type
-        })
-      }else if(row.type ===300){
-        getPddOAuthUrl({shopId:row.id}).then(response => {
-          console.log("获取token=====pdd ",response)
-          this.authOpen = true;
-          this.title = "更新店铺授权";
-          this.tokenForm.url = response.data
-          this.tokenForm.shopId = row.id
-          this.tokenForm.shopType = row.type
-        })
-      }else if(row.type===400){
-        updateDouToken({shopId:row.id}).then(resp=>{
-          if(resp.code === 200){
-            this.$modal.msgSuccess("Token更新成功")
-            this.getList()
-          }else{
-            this.$modal.msgError(resp.msg)
-          }
-
-        })
-      }else{
-        this.$modal.msgError('暂时不支持')
-      }
-
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getShop(id).then(response => {
-        this.form = response.data;
-        this.form.status = response.data.status+''
-        // this.$nextTick(()=>{
-        //   this.form.type = response.data.type;
-        // })
-
-        this.open = true;
-        this.title = "修改店铺";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateShop(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.apiOpen = false
-              this.getList();
-            });
-          } else {
-            addShop(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    getTokenSubmit(){
-      this.$refs["tokenForm"].validate(valid => {
-        if (valid) {
-          console.log("=====更新token=====",this.tokenForm)
-          if(this.tokenForm.shopType === 100){
-            saveSessionKey(this.tokenForm).then(resp=>{
-              this.authOpen = false
-              this.$modal.msgSuccess("SessionKey保存成功");
-              this.getList()
-            });
-          } else if(this.tokenForm.shopType === 200 || this.tokenForm.shopType === 280){
-            getJdToken(this.tokenForm).then(response => {
-              this.authOpen = false
-              this.$modal.msgSuccess("授权成功");
-              this.getList()
-            });
-          }else if(this.tokenForm.shopType === 300){
-            getPddToken(this.tokenForm).then(response => {
-              this.authOpen = false
-              this.$modal.msgSuccess("授权成功");
-              this.getList()
-            });
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除店铺编号为"' + ids + '"的数据项？').then(function() {
-        return delShop(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    handleGoodsList(row){
-      console.log('=======商品list=====',row)
-      if(row.type === 1){
-        this.$router.push({path:'/shop/goods/tao_goods_list',query:{shopId:row.id}})
-      }else if(row.type === 2){
-        this.$router.push({path:'/shop/goods/jd_goods_list',query:{shopId:row.id}})
-      }else if(row.type === 3){
-        this.$router.push({path:'/shop/goods/dou_goods_list',query:{shopId:row.id}})
-      }else if(row.type === 4){
-        this.$router.push({path:'/shop/goods/pdd_goods_list',query:{shopId:row.id}})
-      }
-    },
-    handleLogistics(row) {
-      if(row.type === 1){
-        this.$router.push({path:"/shop/logistics_companies",query:{id:row.type}})
-      }else  if(row.type === 2){
-        this.$router.push({path:"/shop/logistics_companies",query:{id:row.type,shopId:row.id}})
-      } else  if(row.type === 3){
-        this.$router.push({path:"/shop/logistics_companies",query:{id:row.type,shopId:row.id}})
-      } else  if(row.type === 4){
-        this.$router.push({path:"/shop/logistics_companies",query:{id:row.type,shopId:row.id}})
-      }
-    }
-  }
-};
-</script>