From fa6f5949d7ab92a9d95ac1e216d42cea50a8d733 Mon Sep 17 00:00:00 2001
From: Richie <280645618@qq.com>
Date: Mon, 24 Mar 2025 13:05:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=81=E5=9F=9F=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oms/controller/ShopController.java        |  3 ++
 vue/src/api/offline/shop.js                   | 44 -------------------
 vue/src/views/shop/index.vue                  | 40 +++++++++++++++++
 .../shop/index.vue => shop/offline_shop.vue}  | 19 +++++---
 .../shop/{shop_index.vue => online_shop.vue}  |  2 +-
 5 files changed, 56 insertions(+), 52 deletions(-)
 delete mode 100644 vue/src/api/offline/shop.js
 create mode 100644 vue/src/views/shop/index.vue
 rename vue/src/views/{offline/shop/index.vue => shop/offline_shop.vue} (95%)
 rename vue/src/views/shop/{shop_index.vue => online_shop.vue} (99%)

diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java
index e42f2394..8665598a 100644
--- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java
+++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java
@@ -79,6 +79,9 @@ public class ShopController extends BaseController {
     @PostMapping("/shop")
     public AjaxResult add(@RequestBody OShop shop)
     {
+        if(shop.getType()==null) return AjaxResult.error("请选择店铺平台");
+        shop.setModifyOn(System.currentTimeMillis()/1000);
+
 //        shop.setCreateTime(new Date());
         return toAjax(shopService.save(shop));
     }
diff --git a/vue/src/api/offline/shop.js b/vue/src/api/offline/shop.js
deleted file mode 100644
index 29732d38..00000000
--- a/vue/src/api/offline/shop.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// import request from '@/utils/request'
-//
-// // 查询店铺列表
-// export function listShop(query) {
-//   return request({
-//     url: '/api/offline-api/shop/list',
-//     method: 'get',
-//     params: query
-//   })
-// }
-//
-// // 查询店铺详细
-// export function getShop(id) {
-//   return request({
-//     url: '/api/offline-api/shop/' + id,
-//     method: 'get'
-//   })
-// }
-//
-// // 新增店铺
-// export function addShop(data) {
-//   return request({
-//     url: '/api/offline-api/shop',
-//     method: 'post',
-//     data: data
-//   })
-// }
-//
-// // 修改店铺
-// export function updateShop(data) {
-//   return request({
-//     url: '/api/offline-api/shop',
-//     method: 'put',
-//     data: data
-//   })
-// }
-//
-// // 删除店铺
-// export function delShop(id) {
-//   return request({
-//     url: '/api/offline-api/shop/' + id,
-//     method: 'delete'
-//   })
-// }
diff --git a/vue/src/views/shop/index.vue b/vue/src/views/shop/index.vue
new file mode 100644
index 00000000..10b5f1f0
--- /dev/null
+++ b/vue/src/views/shop/index.vue
@@ -0,0 +1,40 @@
+<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-tabs>
+
+  </div>
+</template>
+
+<script>
+import OfflineShop  from "@/views/shop/offline_shop.vue";
+import OnlineShop  from "@/views/shop/online_shop.vue";
+
+export default {
+  name: "ShopIndex",
+  components:{OfflineShop,OnlineShop},
+  data() {
+    return {
+      activeName: 'OnlineShop'
+    };
+  },
+  created() {
+
+  },
+  mounted() {
+
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event);
+    }
+  }
+};
+</script>
diff --git a/vue/src/views/offline/shop/index.vue b/vue/src/views/shop/offline_shop.vue
similarity index 95%
rename from vue/src/views/offline/shop/index.vue
rename to vue/src/views/shop/offline_shop.vue
index 8f3ab36a..7b974a27 100644
--- a/vue/src/views/offline/shop/index.vue
+++ b/vue/src/views/shop/offline_shop.vue
@@ -93,9 +93,11 @@
         <el-form-item label="店铺名" prop="name">
           <el-input v-model="form.name" placeholder="请输入店铺名" />
         </el-form-item>
-<!--        <el-form-item label="店铺平台" prop="remark">-->
-<!--          <el-input v-model="form.remark" 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="请输入描述" />
@@ -112,10 +114,10 @@
 </template>
 
 <script>
-import { listShop, getShop, delShop, addShop, updateShop } from "@/api/offline/shop";
 
+import { listShop,addShop,getShop,updateShop,delShop } from "@/api/shop/shop";
 export default {
-  name: "Shop",
+  name: "OfflineShop",
   data() {
     return {
       // 遮罩层
@@ -140,10 +142,12 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        name: null
+        name: null,
+        platform: 999
       },
       // 表单参数
       form: {
+        type: '999'
       },
       // 获取token表单
       tokenForm:{
@@ -153,7 +157,7 @@ export default {
       // 表单校验
       rules: {
         name: [{ required: true, message: "店铺名不能为空", trigger: "blur" }],
-        platform: [{ required: true, message: "请选择平台", trigger: "change" }],
+        type: [{ required: true, message: "请选择平台", trigger: "change" }],
       }
     };
   },
@@ -180,6 +184,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        type: '999'
       };
       this.resetForm("form");
     },
diff --git a/vue/src/views/shop/shop_index.vue b/vue/src/views/shop/online_shop.vue
similarity index 99%
rename from vue/src/views/shop/shop_index.vue
rename to vue/src/views/shop/online_shop.vue
index 801da66f..863834cd 100644
--- a/vue/src/views/shop/shop_index.vue
+++ b/vue/src/views/shop/online_shop.vue
@@ -217,7 +217,7 @@ import {getTaoOAuthUrl, getTaoToken} from "@/api/tao/shop";
 import {float} from "quill/ui/icons";
 import {getPddOAuthUrl,getPddToken} from "@/api/pdd/shop";
 export default {
-  name: "Shop",
+  name: "OnlineShop",
   data() {
     return {
       // 遮罩层