suochencheng пре 7 година
родитељ
комит
801f412ab1

Разлика између датотеке није приказан због своје велике величине
+ 46 - 0
src/main/java/com/izouma/awesomeadmin/dao/StoreInfoMapper.xml


+ 16 - 0
src/main/java/com/izouma/awesomeadmin/model/StoreInfo.java

@@ -32,6 +32,8 @@ public class StoreInfo{
     private Integer rank;
     private Integer rank;
     private Integer responseTime;
     private Integer responseTime;
     private Integer reworkRate;
     private Integer reworkRate;
+    private Integer hotFlag;
+    private Integer homeFlag;
 
 
 private String searchKey;
 private String searchKey;
 
 
@@ -213,6 +215,20 @@ private String orderByStr;
     public void setReworkRate(Integer reworkRate){
     public void setReworkRate(Integer reworkRate){
         this.reworkRate = reworkRate;
         this.reworkRate = reworkRate;
     }
     }
+    public Integer getHotFlag(){
+        return this.hotFlag;
+    }
+
+    public void setHotFlag(Integer hotFlag){
+        this.hotFlag = hotFlag;
+    }
+    public Integer getHomeFlag(){
+        return this.homeFlag;
+    }
+
+    public void setHomeFlag(Integer homeFlag){
+        this.homeFlag = homeFlag;
+    }
 
 
 public String getSearchKey() {
 public String getSearchKey() {
     return searchKey;
     return searchKey;

+ 6 - 4
src/main/java/com/izouma/awesomeadmin/web/StoreInfoController.java

@@ -132,10 +132,10 @@ public class StoreInfoController {
         String sheetName = "store_info";
         String sheetName = "store_info";
         String titleName = "店铺信息数据表";
         String titleName = "店铺信息数据表";
         String fileName = "店铺信息表";
         String fileName = "店铺信息表";
-        int columnNumber = 24;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "用户ID" ,   "用户" ,   "店铺名称" ,   "服务类型" ,   "描述" ,   "头像" ,   "省" ,   "市" ,   "区" ,   "详细地址" ,   "银行卡号" ,   "开户行" ,   "开户人" ,   "信誉等级" ,   "可用" ,   "排序" ,   "响应时间" ,   "返片率"  };
-        String[][] dataList = new String[storeInfos.size()][24];
+        int columnNumber = 26;
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "用户ID" ,   "用户" ,   "店铺名称" ,   "服务类型" ,   "描述" ,   "头像" ,   "省" ,   "市" ,   "区" ,   "详细地址" ,   "银行卡号" ,   "开户行" ,   "开户人" ,   "信誉等级" ,   "可用" ,   "排序" ,   "响应时间" ,   "返片率" ,   "热门" ,   "首页"  };
+        String[][] dataList = new String[storeInfos.size()][26];
 
 
         for (int i = 0; i < storeInfos.size(); i++) {
         for (int i = 0; i < storeInfos.size(); i++) {
 
 
@@ -163,6 +163,8 @@ public class StoreInfoController {
                         dataList[i][21] = String.valueOf(storeInfos.get(i).getRank());
                         dataList[i][21] = String.valueOf(storeInfos.get(i).getRank());
                         dataList[i][22] = String.valueOf(storeInfos.get(i).getResponseTime());
                         dataList[i][22] = String.valueOf(storeInfos.get(i).getResponseTime());
                         dataList[i][23] = String.valueOf(storeInfos.get(i).getReworkRate());
                         dataList[i][23] = String.valueOf(storeInfos.get(i).getReworkRate());
+                        dataList[i][24] = String.valueOf(storeInfos.get(i).getHotFlag());
+                        dataList[i][25] = String.valueOf(storeInfos.get(i).getHomeFlag());
                     }
                     }
 
 
 
 

+ 78 - 78
src/main/vue/src/pages/AboutUs.vue

@@ -1,108 +1,108 @@
 <template>
 <template>
     <div>
     <div>
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
-                 style="max-width: 500px;">
-                                                                                                                                                                                                                                    <el-form-item prop="title" label="标题">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+            <el-form-item prop="title" label="标题">
                 <el-input v-model="formData.title" :disabled="'title'==subColumn"></el-input>
                 <el-input v-model="formData.title" :disabled="'title'==subColumn"></el-input>
             </el-form-item>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     <el-form-item prop="image" label="图片">
-                 <single-upload v-model="formData.image" :disabled="'image'==subColumn"></single-upload>
-             </el-form-item>
-                                                                                                                                            <el-form-item>
+            <el-form-item prop="description" label="介绍">
+                <el-input type="textarea" v-model="formData.description" :disabled="'description'==subColumn" :autosize="{ minRows: 2, maxRows: 20}"></el-input>
+            </el-form-item>
+            <el-form-item prop="image" label="图片">
+                <single-upload v-model="formData.image" :disabled="'image'==subColumn"></single-upload>
+            </el-form-item>
+            <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
-                <el-button @click="$router.go(-1)">取消</el-button>
             </el-form-item>
             </el-form-item>
         </el-form>
         </el-form>
     </div>
     </div>
 </template>
 </template>
 <script>
 <script>
-    import formValidator from '../formValidator'
+import formValidator from '../formValidator'
 
 
-    export default {
-        created() {
-            if (this.$route.query.column) {
-                this.subColumn = this.$route.query.column.split(',')[1];
-                this.subValue = this.$route.query.column.split(',')[0];
-            }
+export default {
+    created() {
+        if (this.$route.query.column) {
+            this.subColumn = this.$route.query.column.split(',')[1];
+            this.subValue = this.$route.query.column.split(',')[0];
+        }
 
 
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/aboutUs/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
+        if (this.$route.query.id) {
+            this.$http.get({
+                url: '/aboutUs/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
 
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-                        this.formData = res.data;
+
+                    this.formData = res.data;
 
 
                     if (this.$route.query.column) {
                     if (this.$route.query.column) {
                         this.formData[this.subColumn] = this.subValue;
                         this.formData[this.subColumn] = this.subValue;
                     }
                     }
-                    }
-                })
-            }else {
-                if (this.$route.query.column) {
-                    this.formData[this.subColumn] = this.subValue;
                 }
                 }
+            })
+        } else {
+            if (this.$route.query.column) {
+                this.formData[this.subColumn] = this.subValue;
             }
             }
+        }
 
 
-                                                                                                                                                                                                                                                                                },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                                                                                                                                                                                                },
-                                                                                    subColumn: '',
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+            },
+            subColumn: '',
             subValue: '',
             subValue: '',
         }
         }
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
         },
         },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http.post({
-                    url: this.formData.id ? '/aboutUs/update' : '/aboutUs/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            },
-            onDelete() {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
-                    return this.$http.post({
+        submit() {
+            var data = JSON.parse(JSON.stringify(this.formData));
+            this.$http.post({
+                url: this.formData.id ? '/aboutUs/update' : '/aboutUs/save',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.$message.success('成功');
+                    //this.$router.go(-1);
+                } else {
+                    this.$message.warning('失败')
+                }
+            });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
                     url: '/aboutUs/del',
                     url: '/aboutUs/del',
                     data: { id: this.formData.id }
                     data: { id: this.formData.id }
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.$router.go(-1);
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
                 })
                 })
-            },
-        }
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.$router.go(-1);
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
     }
     }
+}
 </script>
 </script>
 <style lang="less" scoped>
 <style lang="less" scoped>
 </style>
 </style>

+ 81 - 85
src/main/vue/src/pages/ContactUs.vue

@@ -1,125 +1,121 @@
 <template>
 <template>
     <div>
     <div>
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
-                 style="max-width: 500px;">
-                                                                                                                                                                                                                                    <el-form-item prop="companyName" label="公司名称">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+            <el-form-item prop="companyName" label="公司名称">
                 <el-input v-model="formData.companyName" :disabled="'companyName'==subColumn"></el-input>
                 <el-input v-model="formData.companyName" :disabled="'companyName'==subColumn"></el-input>
             </el-form-item>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="telephone" label="电话">
+            <el-form-item prop="telephone" label="电话">
                 <el-input v-model="formData.telephone" :disabled="'telephone'==subColumn"></el-input>
                 <el-input v-model="formData.telephone" :disabled="'telephone'==subColumn"></el-input>
             </el-form-item>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="faxes" label="传真">
+            <el-form-item prop="faxes" label="传真">
                 <el-input v-model="formData.faxes" :disabled="'faxes'==subColumn"></el-input>
                 <el-input v-model="formData.faxes" :disabled="'faxes'==subColumn"></el-input>
             </el-form-item>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="postcode" label="邮编">
+            <el-form-item prop="postcode" label="邮编">
                 <el-input v-model="formData.postcode" :disabled="'postcode'==subColumn"></el-input>
                 <el-input v-model="formData.postcode" :disabled="'postcode'==subColumn"></el-input>
             </el-form-item>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="address" label="地址">
+            <el-form-item prop="address" label="地址">
                 <el-input v-model="formData.address" :disabled="'address'==subColumn"></el-input>
                 <el-input v-model="formData.address" :disabled="'address'==subColumn"></el-input>
             </el-form-item>
             </el-form-item>
-                                                                                                                                                                                                                                                                                        <el-form-item>
+            <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
-                <el-button @click="$router.go(-1)">取消</el-button>
             </el-form-item>
             </el-form-item>
         </el-form>
         </el-form>
     </div>
     </div>
 </template>
 </template>
 <script>
 <script>
-    import formValidator from '../formValidator'
+import formValidator from '../formValidator'
 
 
-    export default {
-        created() {
-            if (this.$route.query.column) {
-                this.subColumn = this.$route.query.column.split(',')[1];
-                this.subValue = this.$route.query.column.split(',')[0];
-            }
+export default {
+    created() {
+        if (this.$route.query.column) {
+            this.subColumn = this.$route.query.column.split(',')[1];
+            this.subValue = this.$route.query.column.split(',')[0];
+        }
+
+        if (this.$route.query.id) {
+            this.$http.get({
+                url: '/contactUs/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
 
 
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/contactUs/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
 
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    
-                        this.formData = res.data;
+                    this.formData = res.data;
 
 
                     if (this.$route.query.column) {
                     if (this.$route.query.column) {
                         this.formData[this.subColumn] = this.subValue;
                         this.formData[this.subColumn] = this.subValue;
                     }
                     }
-                    }
-                })
-            }else {
-                if (this.$route.query.column) {
-                    this.formData[this.subColumn] = this.subValue;
                 }
                 }
+            })
+        } else {
+            if (this.$route.query.column) {
+                this.formData[this.subColumn] = this.subValue;
             }
             }
+        }
 
 
-                                                                                                                                                                                                                                                                                                                                        },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                                                                                                                                        companyName:
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                companyName:
                     [
                     [
-                                                {required: true, message: '请输入 公司名称', trigger: 'blur'},
-                                                                    ],
-                                                                telephone:
+                        { required: true, message: '请输入 公司名称', trigger: 'blur' },
+                    ],
+                telephone:
                     [
                     [
-                                                {required: true, message: '请输入 电话', trigger: 'blur'},
-                                                                    ],
-                                                                                                                        },
-                                                                                                    subColumn: '',
+                        { required: true, message: '请输入 电话', trigger: 'blur' },
+                    ],
+            },
+            subColumn: '',
             subValue: '',
             subValue: '',
         }
         }
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
         },
         },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http.post({
-                    url: this.formData.id ? '/contactUs/update' : '/contactUs/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            },
-            onDelete() {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
-                    return this.$http.post({
+        submit() {
+            var data = JSON.parse(JSON.stringify(this.formData));
+            this.$http.post({
+                url: this.formData.id ? '/contactUs/update' : '/contactUs/save',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.$message.success('成功');
+                } else {
+                    this.$message.warning('失败')
+                }
+            });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
                     url: '/contactUs/del',
                     url: '/contactUs/del',
                     data: { id: this.formData.id }
                     data: { id: this.formData.id }
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.$router.go(-1);
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
                 })
                 })
-            },
-        }
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.$router.go(-1);
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
     }
     }
+}
 </script>
 </script>
 <style lang="less" scoped>
 <style lang="less" scoped>
 </style>
 </style>

+ 75 - 79
src/main/vue/src/pages/JoinUs.vue

@@ -1,114 +1,110 @@
 <template>
 <template>
     <div>
     <div>
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
-                 style="max-width: 500px;">
-                                                                                                                                                                                                                                                        <el-form-item prop="manifesto" label="招聘宣言">
-                <el-input type="textarea" v-model="formData.manifesto" :disabled="'manifesto'==subColumn"></el-input>
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
+            <el-form-item prop="manifesto" label="招聘宣言">
+                <el-input type="textarea" v-model="formData.manifesto" :disabled="'manifesto'==subColumn" :autosize="{ minRows: 2, maxRows: 20}"></el-input>
             </el-form-item>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                        <el-form-item prop="email" label="邮箱">
+            <el-form-item prop="email" label="邮箱">
                 <el-input v-model="formData.email" :disabled="'email'==subColumn"></el-input>
                 <el-input v-model="formData.email" :disabled="'email'==subColumn"></el-input>
             </el-form-item>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="telephone" label="联系方式">
+            <el-form-item prop="telephone" label="联系方式">
                 <el-input v-model="formData.telephone" :disabled="'telephone'==subColumn"></el-input>
                 <el-input v-model="formData.telephone" :disabled="'telephone'==subColumn"></el-input>
             </el-form-item>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="zhaopin" label="招聘网站">
+            <el-form-item prop="zhaopin" label="招聘网站">
                 <el-input v-model="formData.zhaopin" :disabled="'zhaopin'==subColumn"></el-input>
                 <el-input v-model="formData.zhaopin" :disabled="'zhaopin'==subColumn"></el-input>
             </el-form-item>
             </el-form-item>
-                                                                                                                                                                                                                                                                                        <el-form-item>
+            <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
-                <el-button @click="$router.go(-1)">取消</el-button>
             </el-form-item>
             </el-form-item>
         </el-form>
         </el-form>
     </div>
     </div>
 </template>
 </template>
 <script>
 <script>
-    import formValidator from '../formValidator'
+import formValidator from '../formValidator'
 
 
-    export default {
-        created() {
-            if (this.$route.query.column) {
-                this.subColumn = this.$route.query.column.split(',')[1];
-                this.subValue = this.$route.query.column.split(',')[0];
-            }
+export default {
+    created() {
+        if (this.$route.query.column) {
+            this.subColumn = this.$route.query.column.split(',')[1];
+            this.subValue = this.$route.query.column.split(',')[0];
+        }
+
+        if (this.$route.query.id) {
+            this.$http.get({
+                url: '/joinUs/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
 
 
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/joinUs/getOne',
-                    data: {
-                        id: this.$route.query.id
-                    }
-                }).then(res => {
-                    if (res.success) {
 
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-                        this.formData = res.data;
+                    this.formData = res.data;
 
 
                     if (this.$route.query.column) {
                     if (this.$route.query.column) {
                         this.formData[this.subColumn] = this.subValue;
                         this.formData[this.subColumn] = this.subValue;
                     }
                     }
-                    }
-                })
-            }else {
-                if (this.$route.query.column) {
-                    this.formData[this.subColumn] = this.subValue;
                 }
                 }
+            })
+        } else {
+            if (this.$route.query.column) {
+                this.formData[this.subColumn] = this.subValue;
             }
             }
+        }
 
 
-                                                                                                                                                                                                                                                                                                            },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                                                                                                                                                                                                                            },
-                                                                                            subColumn: '',
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+            },
+            subColumn: '',
             subValue: '',
             subValue: '',
         }
         }
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
         },
         },
-        methods: {
-            onSave() {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.submit();
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            submit() {
-                var data = JSON.parse(JSON.stringify(this.formData));
-                this.$http.post({
-                    url: this.formData.id ? '/joinUs/update' : '/joinUs/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.$router.go(-1);
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            },
-            onDelete() {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
-                    return this.$http.post({
+        submit() {
+            var data = JSON.parse(JSON.stringify(this.formData));
+            this.$http.post({
+                url: this.formData.id ? '/joinUs/update' : '/joinUs/save',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.$message.success('成功');
+                } else {
+                    this.$message.warning('失败')
+                }
+            });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
                     url: '/joinUs/del',
                     url: '/joinUs/del',
                     data: { id: this.formData.id }
                     data: { id: this.formData.id }
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.$router.go(-1);
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
-                    }
                 })
                 })
-            },
-        }
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.$router.go(-1);
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
     }
     }
+}
 </script>
 </script>
 <style lang="less" scoped>
 <style lang="less" scoped>
 </style>
 </style>

+ 10 - 4
src/main/vue/src/pages/StoreInfo.vue

@@ -55,6 +55,12 @@
             </el-form-item>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="reworkRate" label="返片率">
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="reworkRate" label="返片率">
                 <el-input v-model="formData.reworkRate" :disabled="'reworkRate'==subColumn"></el-input>
                 <el-input v-model="formData.reworkRate" :disabled="'reworkRate'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="hotFlag" label="热门">
+                <el-input v-model="formData.hotFlag" :disabled="'hotFlag'==subColumn"></el-input>
+            </el-form-item>
+                                                                                                                                                                                                                                                                                                                            <el-form-item prop="homeFlag" label="首页">
+                <el-input v-model="formData.homeFlag" :disabled="'homeFlag'==subColumn"></el-input>
             </el-form-item>
             </el-form-item>
                                                                                                                                                                                                                                                                                         <el-form-item>
                                                                                                                                                                                                                                                                                         <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
@@ -83,7 +89,7 @@
                 }).then(res => {
                 }).then(res => {
                     if (res.success) {
                     if (res.success) {
 
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
                         this.formData = res.data;
                         this.formData = res.data;
 
 
                     if (this.$route.query.column) {
                     if (this.$route.query.column) {
@@ -97,14 +103,14 @@
                 }
                 }
             }
             }
 
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
         data() {
         data() {
             return {
             return {
                 saving: false,
                 saving: false,
                 formData: {},
                 formData: {},
                 rules: {
                 rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    },
-                                                                                                                                                                                                            subColumn: '',
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
+                                                                                                                                                                                                                            subColumn: '',
             subValue: '',
             subValue: '',
         }
         }
         },
         },

+ 32 - 0
src/main/vue/src/pages/StoreInfos.vue

@@ -173,6 +173,20 @@
                                 label="返片率"
                                 label="返片率"
                                 min-width="100">
                                 min-width="100">
                         </el-table-column>
                         </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('hotFlag')"
+                                prop="hotFlag"
+                                label="热门"
+                                min-width="100">
+                        </el-table-column>
+                                                                
+                                            <el-table-column
+                                v-if="isColumnShow('homeFlag')"
+                                prop="homeFlag"
+                                label="首页"
+                                min-width="100">
+                        </el-table-column>
                                                             <el-table-column
                                                             <el-table-column
                     label="操作"
                     label="操作"
                     align="center"
                     align="center"
@@ -404,6 +418,16 @@
                                 label: '返片率',
                                 label: '返片率',
                                 value: 'reworkRate',
                                 value: 'reworkRate',
                                 show: true
                                 show: true
+                            },
+                                                                                                {
+                                label: '热门',
+                                value: 'hotFlag',
+                                show: true
+                            },
+                                                                                                {
+                                label: '首页',
+                                value: 'homeFlag',
+                                show: true
                             },
                             },
                                                             ],
                                                             ],
                 multipleMode: false,
                 multipleMode: false,
@@ -484,6 +508,14 @@
                                                                                                 {
                                                                                                 {
                                 label: '返片率',
                                 label: '返片率',
                                 value: 'rework_rate'
                                 value: 'rework_rate'
+                            },
+                                                                                                {
+                                label: '热门',
+                                value: 'hot_flag'
+                            },
+                                                                                                {
+                                label: '首页',
+                                value: 'home_flag'
                             },
                             },
                                                             ],
                                                             ],
                 advancedQuerySearchKey: '',
                 advancedQuerySearchKey: '',

Неке датотеке нису приказане због велике количине промена