@@ -215,8 +240,10 @@
name: "",
number: '',
category_id: [],
- phase:[],
- list_price: '',
+ phase:[],
+ time:'',
+ list_price: '',
+ is_top:0,
is_visible: 1,
is_sell: 1,
show_price: 0,
@@ -370,7 +397,9 @@
this.form.is_visible = res.is_visible?res.is_visible:0
this.form.is_sell = res.is_sell?res.is_sell:0
- this.form.show_price = res.show_price?res.show_price:0
+ this.form.show_price = res.show_price?res.show_price:0
+ this.form.is_top = res.is_top?res.is_top:0
+ this.form.time = res.time ? res.time : this.$moment().format('YYYY-MM-DD HH:mm:ss')
res.product_details.map(item => {
item.type = this.productDetailsKeyList[item.key]['type']
if (this.productDetailsKeyList[item.key].type === 'select') {
@@ -399,7 +428,8 @@
if (newVal) {
if (this.type === 'editor') {
this.getDetail()
- } else {
+ } else {
+ this.form.time = this.$moment().format('YYYY-MM-DD HH:mm:ss')
for (var k in this.productDetailsKeyList) {
if (this.productDetailsKeyList[k]["type"] === 'select') {
this.form.product_details.push({
@@ -422,8 +452,10 @@
name: "",
number: '',
category_id: [],
- phase:[],
- list_price: '',
+ phase:[],
+ time:'',
+ list_price: '',
+ is_top:0,
is_visible: 1,
is_sell: 1,
show_price: 0,
@@ -446,11 +478,11 @@
flex-basis: 100%;
}
- ::v-deep .is_sell,
- ::v-deep .is_visible,
- ::v-deep .show_price {
- flex-basis: 50%;
- }
+ // ::v-deep .is_sell,
+ // ::v-deep .is_visible,
+ // ::v-deep .show_price {
+ // flex-basis: 50%;
+ // }
::v-deep .el-checkbox__input .el-checkbox__inner {
border-radius: 50%;
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 139d209..1df1800 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -12,7 +12,7 @@
-
+
@@ -35,6 +35,12 @@
+
+
+
+
+
+
search
@@ -100,6 +106,7 @@
number:'',
category_id:[],
is_sell:'',
+ is_top:'',
show_price:'',
is_visible:'',
page: 1,
@@ -183,6 +190,12 @@
return 'Need to log in'
}
}
+ },
+ {
+ prop: 'time',
+ label: 'Release Time',
+ align: 'center',
+ width: 180,
}
]
@@ -215,6 +228,7 @@
this.select.name = ''
this.select.number = ''
this.select.is_sell = ''
+ this.select.is_top = ''
this.select.show_price = ''
this.select.is_visible = ''
this.select.category_id = []
@@ -223,7 +237,9 @@
async getList() {
const res = await index({
...this.select,
- category_id:this.select.category_id,
+ category_id:this.select.category_id,
+ sort_name:'time',
+ sort_type:'desc',
filter: [{
key: 'name',
op: 'like',
@@ -236,6 +252,10 @@
key: 'is_sell',
op: 'like',
value: this.select.is_sell
+ },{
+ key: 'is_top',
+ op: 'like',
+ value: this.select.is_top
},{
key: 'show_price',
op: 'like',
@@ -254,8 +274,8 @@
page: 1,
page_size: 999,
type: 2,
- sort_name: 'sort',
- sort_type: 'ASC'
+ sort_name: 'time',
+ sort_type: 'desc'
})
this.categoryList = res.data
},
diff --git a/src/views/product/phase.vue b/src/views/product/phase.vue
index 2a501fb..e124367 100644
--- a/src/views/product/phase.vue
+++ b/src/views/product/phase.vue
@@ -99,10 +99,10 @@
label: 'Name',
align: 'left',
}, {
- prop: 'sort',
- label: 'Sort',
- align: 'left',
- width: 100
+ prop: 'time',
+ label: 'Release Time',
+ align: 'center',
+ width: 180
}]
}
@@ -133,8 +133,8 @@
page_size: this.select.page_size,
page: this.select.page,
type:this.select.type,
- sort_type: 'ASC',
- sort_name: 'sort',
+ sort_type: 'desc',
+ sort_name: 'time',
name:this.select.name,
is_recommend:this.select.is_recommend
diff --git a/src/views/resource/catalog.vue b/src/views/resource/catalog.vue
index 1ec1568..eb9c60b 100644
--- a/src/views/resource/catalog.vue
+++ b/src/views/resource/catalog.vue
@@ -78,7 +78,7 @@
align: 'left',
},{
prop: 'date',
- label: 'Relase Time',
+ label: 'Release Time',
align: 'left',
width:180
},{
diff --git a/src/views/resource/faq.vue b/src/views/resource/faq.vue
index 9d1b200..3cba044 100644
--- a/src/views/resource/faq.vue
+++ b/src/views/resource/faq.vue
@@ -73,7 +73,7 @@
align: 'left',
},{
prop: 'date',
- label: 'Relase Time',
+ label: 'Release Time',
align: 'left',
width:180
},{
diff --git a/src/views/resource/files.vue b/src/views/resource/files.vue
index f75748c..d03fb01 100644
--- a/src/views/resource/files.vue
+++ b/src/views/resource/files.vue
@@ -27,7 +27,7 @@
-
+
-
-
+
+
@@ -18,57 +18,57 @@
row-key="id" border default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-
+
-
+
- {{scope.row.manager?scope.row.manager.name:"无"}}
+ {{scope.row.manager?scope.row.manager.name:""}}
-
+
- {{scope.row.leader?scope.row.leader.name:"无"}}
+ {{scope.row.leader?scope.row.leader.name:""}}
-
+
-
+
-
-
+ ghost>sub department
+
+
-
+
-
+
-
+
-
+
+ placeholder="Please Input" :trigger-on-focus="false" @select="handleSelectManager">
-
+
+ placeholder="Please Input" :trigger-on-focus="false" @select="handleSelectLeader">
-
+
@@ -108,12 +108,12 @@
leader: "",
sortnumber: 0,
icon: "",
- pname: "上级部门"
+ pname: "Parent Department"
},
rules: {
name: [{
required: true,
- message: '请输入部门名称',
+ message: 'Please Input',
trigger: 'blur'
}]
},
@@ -187,14 +187,14 @@
if (valid) {
save(that.form).then(response => {
console.log(response)
- this.$Message.success('操作成功');
+ this.$Message.success('Success');
that.dialogFormVisible = false;
that.load();
}).catch(error => {
reject(error)
})
} else {
- this.$Message.error('数据校验失败');
+ this.$Message.error('Error');
return false;
}
});
@@ -208,12 +208,12 @@
var that = this;
if (obj) {
this.$Modal.confirm({
- title: '确认要删除数据？',
+ title: 'Are you sure to delete it？',
onOk: () => {
del({
id: obj.id
}).then(response => {
- this.$Message.success('操作成功');
+ this.$Message.success('Success');
that.load();
}).catch(error => {
console.log(error)
diff --git a/src/views/system/dictionary.vue b/src/views/system/dictionary.vue
index 92f45f3..9983b86 100644
--- a/src/views/system/dictionary.vue
+++ b/src/views/system/dictionary.vue
@@ -3,12 +3,12 @@
-
+
-
-
+
+
@@ -18,105 +18,105 @@
row-key="id" border default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+ ghost>delete
@@ -124,8 +124,8 @@
@@ -155,7 +155,7 @@
dialogFormVisible: false,
formLabelWidth: "120px",
form: {
- pname: "根级别",
+ pname: "Root Level",
number: "",
id: "",
pid: "0",
@@ -174,17 +174,17 @@
rules: {
name: [{
required: true,
- message: '请输入菜单名称',
+ message: 'Please Input',
trigger: 'blur'
}],
url: [{
required: true,
- message: '请输入菜单路径',
+ message: 'Please Input',
trigger: 'blur'
}],
visible: [{
required: true,
- message: '请选择是否显示',
+ message: 'Please Select',
trigger: 'blur'
}],
},
@@ -210,11 +210,11 @@
if (obj.id) {
delDetail(obj.id).then(response => {
- this.$message.success("操作成功");
+ this.$message.success("Success");
this.form.detail_list.splice(index, 1);
}).catch(error => {
//reject(error)
- this.$message.error("操作失败");
+ this.$message.error("Error");
})
} else {
this.form.detail_list.splice(index, 1);
@@ -284,21 +284,21 @@
if (that.form.id) {
save(that.form).then(response => {
console.log(response)
- this.$Message.success('操作成功');
+ this.$Message.success('Success');
that.dialogFormVisible = false;
that.load();
}).catch(error => {})
} else {
store(that.form).then(response => {
console.log(response)
- this.$Message.success('操作成功');
+ this.$Message.success('Success');
that.dialogFormVisible = false;
that.load();
}).catch(error => {})
}
} else {
- this.$Message.error('数据校验失败');
+ this.$Message.error('Error');
return false;
}
});
@@ -312,10 +312,10 @@
var that = this;
if (obj) {
this.$Modal.confirm({
- title: '确认要删除数据？',
+ title: 'Are you sure to delete it？',
onOk: () => {
del(obj.id).then(response => {
- this.$Message.success('操作成功');
+ this.$Message.success('Success');
that.load();
}).catch(error => {
console.log(error)
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index 221b580..b761809 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -5,7 +5,7 @@
@@ -38,17 +38,17 @@
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
-
+
-
+
-
-
-
+
+
+
-
+
-
+
sub menu
edit
delete
+
-
+
-
+
-
+
@@ -109,21 +110,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -152,15 +153,15 @@
-
+
-
-
+
+
-
+
@@ -174,7 +175,7 @@
justify-content: space-between;
"
>
-
+
新增add
@@ -258,7 +259,7 @@ export default {
visible: "1",
sortnumber: 0,
icon: "",
- pname: "根菜单",
+ pname: "Root Menu",
api_prefix: "",
auth_node_tagsArr: [],
auth_node_tags: "",
@@ -268,14 +269,14 @@ export default {
tag: [
{
required: true,
- message: "请输入标识",
+ message: "Please Input",
trigger: "blur",
},
],
name: [
{
required: true,
- message: "请输入名称",
+ message: "Please Input",
trigger: "blur",
},
],
@@ -284,35 +285,35 @@ export default {
name: [
{
required: true,
- message: "请输入菜单名称",
+ message: "Please Input",
trigger: "blur",
},
],
url: [
{
required: true,
- message: "请输入菜单路径",
+ message: "Please Input",
trigger: "blur",
},
],
path: [
{
required: true,
- message: "请输入路由",
+ message: "Please Input",
trigger: "blur",
},
],
icon: [
{
required: true,
- message: "请输入图标",
+ message: "Please Input",
trigger: "blur",
},
],
visible: [
{
required: true,
- message: "请选择是否显示",
+ message: "Please Select",
trigger: "blur",
},
],
@@ -342,7 +343,7 @@ export default {
storeAuth(that.actionForm)
.then((response) => {
console.log(response);
- this.$Message.success("操作成功");
+ this.$Message.success("Success");
that.dialogOptFormVisible = false;
that.loadAuth();
})
@@ -350,7 +351,7 @@ export default {
reject(error);
});
} else {
- this.$Message.error("数据校验失败");
+ this.$Message.error("Error");
return false;
}
});
@@ -469,7 +470,7 @@ export default {
save(that.form)
.then((response) => {
console.log(response);
- this.$Message.success("操作成功");
+ this.$Message.success("Success");
that.dialogFormVisible = false;
that.load();
})
@@ -477,7 +478,7 @@ export default {
reject(error);
});
} else {
- this.$Message.error("数据校验失败");
+ this.$Message.error("Error");
return false;
}
});
@@ -492,13 +493,13 @@ export default {
var that = this;
if (obj) {
this.$Modal.confirm({
- title: "确认要删除数据？",
+ title: "Are you sure to delete it?",
onOk: () => {
del({
id: obj.id,
})
.then((response) => {
- this.$Message.success("操作成功");
+ this.$Message.success("Success");
that.load();
})
.catch((error) => {
diff --git a/src/views/system/permission.vue b/src/views/system/permission.vue
index 0ed51dd..87a92d0 100644
--- a/src/views/system/permission.vue
+++ b/src/views/system/permission.vue
@@ -3,7 +3,7 @@
-
+
@@ -15,7 +15,7 @@
- 角色列表
+ Role List
@@ -30,8 +30,8 @@
- 菜单列表
-
+ Menu List
+
@@ -234,7 +234,7 @@ export default {
var checkedList = this.$refs.tree.getCheckedNodes()
console.log(checkedList)
if (checkedList.length == 0) {
- this.$message.error('请选择菜单')
+ this.$message.error('Please Select')
return false
}
let data = {}
@@ -256,7 +256,7 @@ export default {
data.permission_list = permission
setPermissions(data).then(response => {
console.log(response)
- this.$Message.success('操作成功')
+ this.$Message.success('Success')
that.dialogFormVisible = false
that.load()
}).catch(error => {
diff --git a/src/views/system/role.vue b/src/views/system/role.vue
index 60b2696..9ed9b28 100644
--- a/src/views/system/role.vue
+++ b/src/views/system/role.vue
@@ -3,13 +3,13 @@
-
+
-
+
-
+
- 所有
- 部门
- 私有
+ All
+ Department
+ Private
-
+
-
+
-
+
{{setForm.name}}
-
-
+
+ filter-placeholder="please select" v-model="setForm.ids" :data="userdata">
@@ -127,7 +127,7 @@
rules: {
name: [{
required: true,
- message: '请输入角色名称',
+ message: 'Please Input',
trigger: 'blur'
}],
},
@@ -187,12 +187,12 @@
submitSet() {
let that = this;
if (that.setForm.ids.length == 0) {
- this.$Message.error("请选择人员");
+ this.$Message.error("Please Select People");
return false;
}
set(that.setForm).then(response => {
- this.$Message.success('操作成功');
+ this.$Message.success('Success');
that.load();
that.dialogSetVisible = false;
}).catch(error => {
@@ -203,12 +203,12 @@
var that = this;
if (obj) {
this.$Modal.confirm({
- title: '确认要删除数据？',
+ title: 'Are you sure to delete it？',
onOk: () => {
del({
id: obj.id
}).then(response => {
- this.$Message.success('操作成功');
+ this.$Message.success('Success');
that.load();
}).catch(error => {
console.log(error)
@@ -227,14 +227,14 @@
if (valid) {
save(that.form).then(response => {
console.log(response)
- this.$Message.success('操作成功');
+ this.$Message.success('Success');
that.load();
that.dialogFormVisible = false;
}).catch(error => {
reject(error)
})
} else {
- this.$Message.error('数据校验失败');
+ this.$Message.error('error');
return false;
}
});
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index dd59bdf..10d60a1 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -3,13 +3,13 @@
-
+
-
-
-
+
+
+
@@ -19,57 +19,57 @@
-
+
-
+
-
+
{{ item.name }}
-
+
- 选择角色
+ select role
{{role.name}}
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
@@ -120,19 +120,19 @@
rules: {
name: [{
required: true,
- message: '请输入姓名',
+ message: 'Please Input',
trigger: 'blur'
}
],
username: [{
required: true,
- message: '请输入用户名',
+ message: 'Please Input',
trigger: 'blur'
}
],
password: [{
required: true,
- message: '请输入密码',
+ message: 'Please Input',
trigger: 'blur',
}]
},
@@ -204,12 +204,12 @@
var that = this;
if (obj) {
this.$Modal.confirm({
- title: '确认要删除数据？',
+ title: 'Are you sure to delete it？',
onOk: () => {
del({
id: obj.id
}).then(response => {
- this.$Message.success('操作成功');
+ this.$Message.success('Success');
that.load();
}).catch(error => {
console.log(error)
@@ -239,14 +239,14 @@
if (valid) {
save(that.form).then(response => {
//console.log(response)
- this.$Message.success('操作成功');
+ this.$Message.success('Success');
that.load();
that.dialogFormVisible = false;
}).catch(error => {
//reject(error)
})
} else {
- this.$Message.error('数据校验失败');
+ this.$Message.error('Error');
console.log('error submit!!');
return false;
}
@@ -265,7 +265,7 @@
return p.checked;
}).length;
if (len == 0) {
- this.$message.error("请选择角色");
+ this.$message.error("Please select role");
return false;
}
var arr = [];
@@ -278,7 +278,7 @@
role_id: arr,
id: id
}).then(response => {
- this.$Message.success('操作成功');
+ this.$Message.success('Success');
that.load();
document.body.click();
}).catch(error => {
diff --git a/vue.config.js b/vue.config.js
index 2e40aa3..e1ec061 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,7 +25,7 @@ module.exports = {
* Detail: https://cli.vuejs.org/config/#publicpath
*/
publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
- outputDir: '/Users/mac/Documents/朗业/2024/s-美国赛分/saifen/public/admin',
+ outputDir: '/Users/mac/Documents/朗业/2024/s-美国赛分/saifen/public/admin_test',
assetsDir: 'static',
css: {
loaderOptions: { // 向 CSS 相关的 loader 传递选项