diff --git a/package.json b/package.json index 1aaf39a..1b5eca3 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "vue-json-excel": "^0.3.0", "vue-qr": "^4.0.9", "vue-router": "^3.2.0", + "crypto-js": "^4.0.0", "vuex": "^3.4.0", "vuex-persistedstate": "^4.1.0" }, diff --git a/src/assets/free.png b/src/assets/free.png new file mode 100644 index 0000000..ab0b17d Binary files /dev/null and b/src/assets/free.png differ diff --git a/src/components/AiCopyFromTemu.vue b/src/components/AiCopyFromTemu.vue index d734917..2a20f75 100644 --- a/src/components/AiCopyFromTemu.vue +++ b/src/components/AiCopyFromTemu.vue @@ -157,8 +157,9 @@ export default { goods_id: this.goodsId }}).then((res) => { if (!res.goods) { - this.isCopying = false - Message.error("获取商品信息失败,采集失败") + //this.isCopying = false + //Message.error("获取商品信息失败,采集失败") + this.addToDraft() return } this.goods = res.goods diff --git a/src/components/AiProductDetail.vue b/src/components/AiProductDetail.vue index fc781fa..3047ade 100644 --- a/src/components/AiProductDetail.vue +++ b/src/components/AiProductDetail.vue @@ -28,7 +28,7 @@ import { DualAxes } from '@antv/g2plot' export default { name: "AiProductDetail", - props: ['params'], + props: ['params', 'url'], components: { AiProductDropDown }, @@ -47,7 +47,7 @@ export default { }, methods: { init() { - this.$http.post('/api/monitorDetail/queryProductDetail',null,{ + this.$http.post(this.url ? this.url: '/api/monitorDetail/queryProductDetail',null,{ params: { goodsId: this.params.goodsId, monitorId: this.params.monitorId diff --git a/src/components/AiProductDropDown.vue b/src/components/AiProductDropDown.vue index cb96f8a..a497a0f 100644 --- a/src/components/AiProductDropDown.vue +++ b/src/components/AiProductDropDown.vue @@ -8,6 +8,7 @@ 查看详情 加入收藏 取消收藏 + 加入分组 商品采集 访问商品 访问店铺 @@ -24,6 +25,32 @@ @close="handleClose"> + + + + + + + + + + + + + + + diff --git a/src/view/selection/newproducttrack/newproduct/components/Detail.vue b/src/view/selection/newproducttrack/newproduct/components/Detail.vue new file mode 100644 index 0000000..154573a --- /dev/null +++ b/src/view/selection/newproducttrack/newproduct/components/Detail.vue @@ -0,0 +1,412 @@ + + + + + diff --git a/src/view/selection/newproducttrack/newproductgroup/Index.vue b/src/view/selection/newproducttrack/newproductgroup/Index.vue new file mode 100644 index 0000000..faa052c --- /dev/null +++ b/src/view/selection/newproducttrack/newproductgroup/Index.vue @@ -0,0 +1,57 @@ + + + + + + diff --git a/src/view/selection/newproducttrack/newproductgroup/components/Detail.vue b/src/view/selection/newproducttrack/newproductgroup/components/Detail.vue new file mode 100644 index 0000000..4428938 --- /dev/null +++ b/src/view/selection/newproducttrack/newproductgroup/components/Detail.vue @@ -0,0 +1,235 @@ + + + + + diff --git a/src/view/selection/newproducttrack/newproductgroup/components/List.vue b/src/view/selection/newproducttrack/newproductgroup/components/List.vue new file mode 100644 index 0000000..3d4c593 --- /dev/null +++ b/src/view/selection/newproducttrack/newproductgroup/components/List.vue @@ -0,0 +1,318 @@ + + + + + diff --git a/src/view/selection/storetrack/components/Detail.vue b/src/view/selection/storetrack/components/Detail.vue index 7ab7749..68581f0 100644 --- a/src/view/selection/storetrack/components/Detail.vue +++ b/src/view/selection/storetrack/components/Detail.vue @@ -33,10 +33,6 @@ 查询 - -
- -