diff --git a/src/api/shop.js b/src/api/shop.js index a9eb4bb..128db8d 100644 --- a/src/api/shop.js +++ b/src/api/shop.js @@ -639,4 +639,13 @@ export function queryShopUserFlow(params) { method: "get", params }); +} + +// 商品列表 V2 +export function tbProductListV2(params) { + return request({ + url: `/api/tbProduct/list/v2`, + method: "get", + params + }); } \ No newline at end of file diff --git a/src/assets/images/shop_editor_bg.png b/src/assets/images/shop_editor_bg.png new file mode 100644 index 0000000..da3a58a Binary files /dev/null and b/src/assets/images/shop_editor_bg.png differ diff --git a/src/views/login.vue b/src/views/login.vue index 9372f5e..241d39e 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -170,7 +170,8 @@ export default { user.password = encrypt(user.password) this.$store.dispatch('Login', user).then(() => { this.loading = false - this.$router.push({ path: this.redirect || '/' }) + // this.$router.push({ path: this.redirect || '/' }) + window.location.href = './' }).catch(() => { this.loading = false this.getCode() diff --git a/src/views/product/index.vue b/src/views/product/index.vue index c7ecd5a..f3810e1 100644 --- a/src/views/product/index.vue +++ b/src/views/product/index.vue @@ -56,18 +56,27 @@ - + - + + + + @@ -98,8 +107,9 @@
- +
@@ -108,7 +118,7 @@ import Sortable from 'sortablejs' import dayjs from 'dayjs' import settings from '@/settings' -import { tbProduct, tbShopCategoryGet, tbProductDelete, tbProductIsHot, upProSort } from '@/api/shop' +import { tbProductListV2, tbShopCategoryGet, tbProductDelete, tbProductIsHot, upProSort } from '@/api/shop' export default { data() { return { @@ -131,7 +141,7 @@ export default { } }, async mounted() { - console.log(this.$route.query.productId,'tiaoshi1') + console.log(this.$route.query.productId, 'tiaoshi1') if (this.$route.query.productId) { this.query.productId = this.$route.query.productId } @@ -212,14 +222,14 @@ export default { } this.tableData.loading = true - console.log(this.query,'调试2') - const res = await tbProduct({ + console.log(this.query, '调试2') + const res = await tbProductListV2({ page: this.tableData.page, size: this.tableData.size, name: this.query.name, categoryId: this.query.categoryId, id: this.query.productId, - typeEnum: this.query.typeEnum, + type: this.query.typeEnum, shopId: localStorage.getItem('shopId') }) this.tableData.loading = false @@ -230,9 +240,9 @@ export default { } }, handleSizeChange(val) { - this.tableData.size = val - this.getTableData() - }, + this.tableData.size = val + this.getTableData() + }, // 获取商品分类列表 async tbShopCategoryGet() { try { diff --git a/src/views/shop/components/collectMoneyCode.vue b/src/views/shop/components/collectMoneyCode.vue index 4c4d8ff..a310ddb 100644 --- a/src/views/shop/components/collectMoneyCode.vue +++ b/src/views/shop/components/collectMoneyCode.vue @@ -2,18 +2,18 @@
- + 下载收款码 - 下载收款码样式 +
diff --git a/src/views/shop/components/fitment.vue b/src/views/shop/components/fitment.vue new file mode 100644 index 0000000..272319b --- /dev/null +++ b/src/views/shop/components/fitment.vue @@ -0,0 +1,617 @@ + + + + + \ No newline at end of file diff --git a/src/views/shop/shop_configuration.vue b/src/views/shop/shop_configuration.vue index 3476d7e..8eb896e 100644 --- a/src/views/shop/shop_configuration.vue +++ b/src/views/shop/shop_configuration.vue @@ -15,7 +15,7 @@ - + @@ -33,6 +33,7 @@ import goxcx from './components/goxcx' import notifications from './notifications/index.vue' import ShopMode from './components/shopMode.vue' import CollectMoneyCode from './components/collectMoneyCode.vue' +import Fitment from './components/fitment.vue' export default { components: { shopInfo, @@ -43,11 +44,12 @@ export default { goxcx, notifications, ShopMode, - CollectMoneyCode + CollectMoneyCode, + Fitment }, data() { return { - activeName: '1', + activeName: '5', shopId: localStorage.getItem('shopId') } }