diff --git a/src/views/manage/mkConfig/index.vue b/src/views/manage/mkConfig/index.vue
index ca4ecef..0861ada 100644
--- a/src/views/manage/mkConfig/index.vue
+++ b/src/views/manage/mkConfig/index.vue
@@ -116,7 +116,7 @@
+
+ :disabled="dialog.type == 'preview'" clearable @visible-change="getProductAllList">
@@ -223,9 +223,9 @@ import { listProductCategory } from '@/api/manage/productCategory';
import { listVendor } from '@/api/manage/vendor';
onMounted(() => {
getList();
+ getProductAllList(true); //商品列表
getlistVendor(); //供应商列表
getProductCategoryList(); //商品类别列表
- getProductAllList(); //商品列表 下拉选择 不分页
});
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const mkConfigList = ref([]);
@@ -505,13 +505,17 @@ const getlistVendor = async () => {
listVendorList.value = res.rows;
}
/**
- * 商品列表 下拉选择
+ * 商品列表 下拉选择 //商品列表 下拉选择 不分页
*/
const productAllList=ref([]);
-const getProductAllList=()=>{
- productAll({status:1}).then(res=>{
- Object.assign(productAllList.value,res.data)
- })
+const getProductAllList=(e:any)=>{
+ console.log(e);
+
+ if (e) {
+ productAll({status:1}).then(res=>{
+ Object.assign(productAllList.value,res.data)
+ })
+ }
}
/**
* 格式化商品类别名称
diff --git a/src/views/manage/mkPostcard/index.vue b/src/views/manage/mkPostcard/index.vue
index 6ea5605..3abcef9 100644
--- a/src/views/manage/mkPostcard/index.vue
+++ b/src/views/manage/mkPostcard/index.vue
@@ -14,8 +14,9 @@
-
+
+
@@ -58,7 +59,8 @@
未上架
- 已上架
+ 审核中
+ 已上架
@@ -67,7 +69,7 @@
上架
- 下架
-
+
@@ -215,9 +217,11 @@ const getList = async () => {
* 查询景点下拉列表
*/
const contentAllList= ref([]);
-const getContentAll = async () => {
- const res = await contentAll({type:'0',status:2});
- Object.assign(contentAllList.value, res);
+const getContentAll = async (e:any) => {
+ if (e) {
+ const res = await contentAll({type:'0',status:2});
+ Object.assign(contentAllList.value, res);
+ }
}
/** 取消按钮 */
const cancel = () => {
@@ -355,7 +359,6 @@ const handlePostcard = async (row:MkPostcardVO)=>{
}
onMounted(() => {
getList();
- getContentAll();
nextTick(() => {
autoTableHeight.value = proxy?.autoTableHeight();
});
diff --git a/src/views/manage/product/index.vue b/src/views/manage/product/index.vue
index 3eb655e..cba4c25 100644
--- a/src/views/manage/product/index.vue
+++ b/src/views/manage/product/index.vue
@@ -53,9 +53,9 @@
-
- 未上架
- 已上架
+
+
@@ -76,7 +76,7 @@
上架
下架
+ v-if="scope.row.status==2">下架
编辑
diff --git a/src/views/manage/scenic/index.vue b/src/views/manage/scenic/index.vue
index 6d70777..f2ca7ea 100644
--- a/src/views/manage/scenic/index.vue
+++ b/src/views/manage/scenic/index.vue
@@ -112,15 +112,15 @@
- 1{{
- scope.row.pubNotebookCount }}
+ {{
+ scope.row.recommendNotebookCount }}
1{{
- scope.row.notebookCommentCount }}
+ scope.row.commentCount }}
{
/** 删除按钮操作 */
const handleDelete = async (row?: TagVO) => {
const _ids = row?.id || ids.value;
- await proxy?.$modal.confirm('是否确认删除标签编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false));
+ await proxy?.$modal.confirm('是否确认删除标签名称为"' + row.title + '"的数据项?').finally(() => (loading.value = false));
await delTag(_ids);
proxy?.$modal.msgSuccess('删除成功');
await getList();