Browse Source

后台提交

suochencheng 7 years ago
parent
commit
c5287f25b5

+ 2 - 2
src/main/java/com/izouma/awesomeadmin/dao/BannerInfoMapper.xml

@@ -275,7 +275,7 @@
             </trim>
             ,
         </if>
-        id desc
+        location , rank desc, id desc
     </select>
     <select id="queryAllBannerInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.BannerInfo">
         select <include refid="Base_Column_List"/> from banner_info
@@ -377,7 +377,7 @@
             ,
         </if>
 
-        id desc
+        location , rank desc, id desc
     </select>
     <select id="queryBannerInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.BannerInfo">
         select <include refid="Base_Column_List"/> from banner_info

+ 2 - 2
src/main/java/com/izouma/awesomeadmin/dao/DistrictInfoMapper.xml

@@ -243,7 +243,7 @@
             </trim>
             ,
         </if>
-        id desc
+       rank desc, id desc
     </select>
     <select id="queryAllDistrictInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.DistrictInfo">
         select <include refid="Base_Column_List"/> from district_info
@@ -337,7 +337,7 @@
             ,
         </if>
 
-        id desc
+        rank desc , id desc
     </select>
     <select id="queryDistrictInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.DistrictInfo">
         select <include refid="Base_Column_List"/> from district_info

+ 2 - 2
src/main/java/com/izouma/awesomeadmin/dao/QuickLinksMapper.xml

@@ -259,7 +259,7 @@
             </trim>
             ,
         </if>
-        id desc
+        type_flag, rank desc , id desc
     </select>
     <select id="queryAllQuickLinks" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.QuickLinks">
         select <include refid="Base_Column_List"/> from quick_links
@@ -357,7 +357,7 @@
             ,
         </if>
 
-        id desc
+        type_flag, rank desc , id desc
     </select>
     <select id="queryQuickLinks" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.QuickLinks">
         select <include refid="Base_Column_List"/> from quick_links

+ 31 - 1
src/main/vue/src/pages/BannerInfos.vue

@@ -30,7 +30,7 @@
             <el-table-column type="index" min-width="50" align="center">
             </el-table-column>
 
-            <el-table-column v-if="isColumnShow('location')" prop="location" label="位置" min-width="100">
+            <el-table-column v-if="isColumnShow('location')" prop="location" :formatter="locationFormatter" label="位置" min-width="100">
             </el-table-column>
 
             <el-table-column v-if="isColumnShow('title')" prop="title" label="标题" min-width="100">
@@ -244,6 +244,22 @@ export default {
             orderByStr: '',
             imgSrc: '',
             imageDialogVisible: false,
+            locationOptions: [
+                { label: '首页banner', value: '1' }, 
+                { label: '首页修图消息', value: '2' }, 
+                { label: '首页影楼消息', value: '4' },
+                { label: '首页样片消息', value: '5' },
+                { label: '首页营销消息', value: '6' },
+                { label: '首页周边消息', value: '7' },
+                { label: '修图banner', value: '8' },
+                { label: '影楼banner', value: '9' },
+                { label: '样片banner', value: '10' },
+                { label: '营销banner', value: '11' },
+                { label: '周边banner', value: '12' },
+                { label: '关于我们banner', value: '13' },
+                { label: '加入我们banner', value: '14' },
+                { label: '联系我们banner', value: '15' },
+                ],
         }
     },
     computed: {
@@ -429,6 +445,20 @@ export default {
             this.imageDialogVisible = true;
         },
 
+        locationFormatter(row, column, cellValue) {
+            if (cellValue) {
+                var location = '';
+                this.locationOptions.forEach(item => {
+                    if (item.value == Number(cellValue)) {
+                        location = item.label;
+                    }
+                })
+
+                return location;
+            }
+
+        },
+
     }
 }
 </script>

+ 8 - 8
src/main/vue/src/pages/OrderImage.vue

@@ -11,16 +11,16 @@
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="storeId" label="店铺">
                 <el-input v-model="formData.storeId" :disabled="'storeId'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="originalImage" label="原片地址">
-                <el-input v-model="formData.originalImage" :disabled="'originalImage'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="originalSize" label="原片大小">
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                         <el-form-item prop="originalImage" label="原片地址">
+                 <single-upload v-model="formData.originalImage" :disabled="'originalImage'==subColumn"></single-upload>
+             </el-form-item>
+                                                                                                                                                                                <el-form-item prop="originalSize" label="原片大小">
                 <el-input v-model="formData.originalSize" :disabled="'originalSize'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="finishedImage" label="成片地址">
-                <el-input v-model="formData.finishedImage" :disabled="'finishedImage'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="finishedSize" label="成片大小">
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                         <el-form-item prop="finishedImage" label="成片地址">
+                 <single-upload v-model="formData.finishedImage" :disabled="'finishedImage'==subColumn"></single-upload>
+             </el-form-item>
+                                                                                                                                                                                <el-form-item prop="finishedSize" label="成片大小">
                 <el-input v-model="formData.finishedSize" :disabled="'finishedSize'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="dealUser" label="修图人">

+ 10 - 2
src/main/vue/src/pages/OrderImages.vue

@@ -70,8 +70,12 @@
                                 prop="originalImage"
                                 label="原片地址"
                                 min-width="100">
+                            <template slot-scope="{row}">
+                                <img :src="row.originalImage" @click="showImg(row.originalImage)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                            </template>
+
                         </el-table-column>
-                                                                
+                                                                    
                                             <el-table-column
                                 v-if="isColumnShow('originalSize')"
                                 prop="originalSize"
@@ -84,8 +88,12 @@
                                 prop="finishedImage"
                                 label="成片地址"
                                 min-width="100">
+                            <template slot-scope="{row}">
+                                <img :src="row.finishedImage" @click="showImg(row.finishedImage)" style="width: 100px;height: 100px;vertical-align: middle;" />
+                            </template>
+
                         </el-table-column>
-                                                                
+                                                                    
                                             <el-table-column
                                 v-if="isColumnShow('finishedSize')"
                                 prop="finishedSize"

+ 38 - 3
src/main/vue/src/pages/OrderRepairs.vue

@@ -43,7 +43,22 @@
                     min-width="50"
                     align="center">
             </el-table-column>
-                                                                                                                                                                                                    
+                            
+                                            <el-table-column
+                                v-if="isColumnShow('id')"
+                                prop="id"
+                                label="id"
+                                min-width="100">
+                        </el-table-column>
+                                                                                                                                                    
+                                            <el-table-column
+                                v-if="isColumnShow('createTime')"
+                                prop="createTime"
+                                label="创建时间"
+                                :formatter="DateTimeFormatter"
+                                min-width="100">
+                        </el-table-column>
+                                                                                            
                                             <el-table-column
                                 v-if="isColumnShow('userId')"
                                 prop="userId"
@@ -92,6 +107,8 @@
                     min-width="150"
             >
                 <template slot-scope="scope">
+                    <el-button @click="$router.push({path:'/OrderRepairDetails',query:{column:scope.row.id+',repairId'}})" type="primary" size="small" plain>详情
+            </el-button>
                             <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
@@ -227,7 +244,17 @@
                 filter1: '',
                 filter2: '',
                 tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'id',
+                                value: 'id',
+                                show: true
+                            },
+                                                                                                                                                                                                                                    {
+                                label: '创建时间',
+                                value: 'createTime',
+                                show: true
+                            },
+                                                                                                                                            {
                                 label: '用户',
                                 value: 'userId',
                                 show: true
@@ -265,7 +292,15 @@
                 tableSortFields: [],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'id',
+                                value: 'id'
+                            },
+                                                                                                                                                                                                                                    {
+                                label: '创建时间',
+                                value: 'create_time'
+                            },
+                                                                                                                                            {
                                 label: '用户',
                                 value: 'user_id'
                             },

+ 85 - 90
src/main/vue/src/pages/QuickLinks.vue

@@ -1,32 +1,27 @@
 <template>
     <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="typeFlag" 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="typeFlag" label="类型">
                 <template>
-                    <el-select v-model="formData.typeFlag" clearable  placeholder="请选择" :disabled="'typeFlag'==subColumn">
-                        <el-option
-                                v-for="item in typeFlagOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
+                    <el-select v-model="formData.typeFlag" clearable placeholder="请选择" :disabled="'typeFlag'==subColumn">
+                        <el-option v-for="item in typeFlagOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </template>
             </el-form-item>
-                                                                                                                                                                                                                        <el-form-item prop="linkName" label="链接名">
+            <el-form-item prop="linkName" label="链接名">
                 <el-input v-model="formData.linkName" :disabled="'linkName'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="url" label="地址">
+            <el-form-item prop="url" label="地址">
                 <el-input v-model="formData.url" :disabled="'url'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark" label="备注">
+            <el-form-item prop="remark" label="备注">
                 <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="rank" label="排序">
+            <el-form-item prop="rank" label="排序">
                 <el-input v-model="formData.rank" :disabled="'rank'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                        <el-form-item>
+            <el-form-item>
                 <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>
@@ -35,101 +30,101 @@
     </div>
 </template>
 <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: '/quickLinks/getOne',
+                data: {
+                    id: this.$route.query.id
+                }
+            }).then(res => {
+                if (res.success) {
 
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/quickLinks/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) {
                         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: {
-                                                                                                                                                                                                                        typeFlag:
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                typeFlag:
                     [
-                                                {required: true, message: '请输入 类型', trigger: 'blur'},
-                                                                    ],
-                                                                linkName:
+                        { required: true, message: '请输入 类型', trigger: 'blur' },
+                    ],
+                linkName:
                     [
-                                                {required: true, message: '请输入 链接名', trigger: 'blur'},
-                                                                    ],
-                                                                                                                        },
-                                                                        typeFlagOptions:[{ label: '友情链接', value: '1' }, { label: '快速链接', value: '2' },{ label: 'ICP认证', value: '3' }],
-                                                                subColumn: '',
+                        { required: true, message: '请输入 链接名', trigger: 'blur' },
+                    ],
+            },
+            typeFlagOptions: [{ label: '友情链接', value: '1' }, { label: '快速链接', value: '2' }, { label: 'ICP认证', value: '3' }],
+            subColumn: '',
             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 ? '/quickLinks/update' : '/quickLinks/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 ? '/quickLinks/update' : '/quickLinks/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: '/quickLinks/del',
                     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>
 <style lang="less" scoped>
 </style>

+ 277 - 313
src/main/vue/src/pages/QuickLinkss.vue

@@ -1,25 +1,22 @@
 <template>
     <div>
         <div class="filters-container">
-        
+
             <el-input placeholder="关键字" size="small" v-model="filter1" clearable class="filter-item"></el-input>
             <el-button @click="searchData" type="primary" size="small" icon="el-icon-search" class="filter-item">搜索
             </el-button>
-            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small"
-                       icon="el-icon-search" class="filter-item">高级查询
+            <el-button @click="showAdvancedQueryDialog = !showAdvancedQueryDialog" type="primary" size="small" icon="el-icon-search" class="filter-item">高级查询
             </el-button>
-            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small"
-                       icon="el-icon-sort" class="filter-item">排序
+            <el-button @click="showTableSortDialog = !showTableSortDialog" type="primary" size="small" icon="el-icon-sort" class="filter-item">排序
             </el-button>
-            <el-button @click="$router.push({path:'/quickLinks',query:{column:$route.query.column}})" type="primary"
-                       size="small" icon="el-icon-edit"
-                       class="filter-item">添加
+            <el-button @click="$router.push({path:'/quickLinks',query:{column:$route.query.column}})" type="primary" size="small" icon="el-icon-edit" class="filter-item">添加
             </el-button>
             <el-button @click="exportExcel" type="primary" size="small" icon="el-icon-share" class="filter-item">导出EXCEL
             </el-button>
             <el-dropdown trigger="click" size="medium" class="table-column-filter">
                 <span>
-                  筛选数据<i class="el-icon-arrow-down el-icon--right"></i>
+                    筛选数据
+                    <i class="el-icon-arrow-down el-icon--right"></i>
                 </span>
                 <el-dropdown-menu slot="dropdown" class="table-column-filter-wrapper">
                     <el-checkbox v-for="item in tableColumns" :key="item.value" v-model="item.show">{{item.label}}
@@ -27,65 +24,29 @@
                 </el-dropdown-menu>
             </el-dropdown>
         </div>
-        <el-table
-                :data="tableData"
-                :height="tableHeight"
-                row-key="id"
-                ref="table">
-            <el-table-column
-                    v-if="multipleMode"
-                    align="center"
-                    type="selection"
-                    width="50">
+        <el-table :data="tableData" :height="tableHeight" row-key="id" ref="table">
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50">
+            </el-table-column>
+            <el-table-column type="index" min-width="50" align="center">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('typeFlag')" prop="typeFlag" label="类型" :formatter="TypeFlagFormatter" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('linkName')" prop="linkName" label="链接名" min-width="100">
             </el-table-column>
-            <el-table-column
-                    type="index"
-                    min-width="50"
-                    align="center">
+
+            <el-table-column v-if="isColumnShow('url')" prop="url" label="地址" min-width="100">
             </el-table-column>
-                                                                                                                                                                                                    
-                                            <el-table-column
-                                v-if="isColumnShow('typeFlag')"
-                                prop="typeFlag"
-                                label="类型"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('linkName')"
-                                prop="linkName"
-                                label="链接名"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('url')"
-                                prop="url"
-                                label="地址"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('remark')"
-                                prop="remark"
-                                label="备注"
-                                min-width="100">
-                        </el-table-column>
-                                                                
-                                            <el-table-column
-                                v-if="isColumnShow('rank')"
-                                prop="rank"
-                                label="排序"
-                                min-width="100">
-                        </el-table-column>
-                                                            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    min-width="150"
-            >
+
+            <el-table-column v-if="isColumnShow('remark')" prop="remark" label="备注" min-width="100">
+            </el-table-column>
+
+            <el-table-column v-if="isColumnShow('rank')" prop="rank" label="排序" min-width="100">
+            </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="scope">
-                            <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
             </el-table-column>
@@ -99,15 +60,7 @@
                     <el-button size="small" @click="toggleMultipleMode(false)">取消</el-button>
                 </el-button-group>
             </div>
-            <el-pagination
-                    background
-                    @size-change="pageSizeChange"
-                    @current-change="currentPageChange"
-                    :current-page="currentPage"
-                    :page-sizes="[10, 20, 30, 40, 50]"
-                    :page-size="pageSize"
-                    layout="total, sizes, prev, pager, next, jumper"
-                    :total="totalNumber">
+            <el-pagination background @size-change="pageSizeChange" @current-change="currentPageChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalNumber">
             </el-pagination>
         </div>
         <el-dialog title="高级查询" :visible.sync="showAdvancedQueryDialog">
@@ -128,16 +81,14 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
                 <el-table-column prop="searchMethod" label="搜索方式" width="150" align="center">
                     <template slot-scope="{row}">
                         <el-select v-model="row.searchMethod">
-                            <el-option v-for="item in searchMethods" :label="item" :value="item"
-                                       :key="item"></el-option>
+                            <el-option v-for="item in searchMethods" :label="item" :value="item" :key="item"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -167,8 +118,7 @@
                     <template slot-scope="{row}">
                         <el-select v-model="row.name">
 
-                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value"
-                                       :key="item.value"></el-option>
+                            <el-option v-for="item in advancedQueryColumns" :label="item.label" :value="item.value" :key="item.value"></el-option>
                         </el-select>
                     </template>
                 </el-table-column>
@@ -202,270 +152,284 @@
     </div>
 </template>
 <script>
-    import {mapState} from 'vuex'
-    import {format} from 'date-fns'
-    import zh from 'date-fns/locale/zh_cn'
-
-    export default {
-        created() {
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 20,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: '类型',
+                    value: 'typeFlag',
+                    show: true
+                },
+                {
+                    label: '链接名',
+                    value: 'linkName',
+                    show: true
+                },
+                {
+                    label: '地址',
+                    value: 'url',
+                    show: true
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                    show: true
+                },
+                {
+                    label: '排序',
+                    value: 'rank',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: '类型',
+                    value: 'type_flag'
+                },
+                {
+                    label: '链接名',
+                    value: 'link_name'
+                },
+                {
+                    label: '地址',
+                    value: 'url'
+                },
+                {
+                    label: '备注',
+                    value: 'remark'
+                },
+                {
+                    label: '排序',
+                    value: 'rank'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: false,
+            typeFlagOptions: [{ label: '友情链接', value: '1' }, { label: '快速链接', value: '2' }, { label: 'ICP认证', value: '3' }],
+        }
+    },
+    computed: {
+        ...mapState(['tableHeight']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        pageSizeChange(size) {
+            this.currentPage = 1;
+            this.pageSize = size;
             this.getData();
         },
-        data() {
-            return {
-                totalNumber: 0,
-                totalPage: 10,
-                currentPage: 1,
-                pageSize: 20,
-                tableData: [],
-                filter1: '',
-                filter2: '',
-                tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
-                                label: '类型',
-                                value: 'typeFlag',
-                                show: true
-                            },
-                                                                                                {
-                                label: '链接名',
-                                value: 'linkName',
-                                show: true
-                            },
-                                                                                                {
-                                label: '地址',
-                                value: 'url',
-                                show: true
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark',
-                                show: true
-                            },
-                                                                                                {
-                                label: '排序',
-                                value: 'rank',
-                                show: true
-                            },
-                                                            ],
-                multipleMode: false,
-                showAdvancedQueryDialog: false,
-                advancedQueryFields: [],
-                showTableSortDialog: false,
-                tableSortFields: [],
-                searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-                advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
-                                label: '类型',
-                                value: 'type_flag'
-                            },
-                                                                                                {
-                                label: '链接名',
-                                value: 'link_name'
-                            },
-                                                                                                {
-                                label: '地址',
-                                value: 'url'
-                            },
-                                                                                                {
-                                label: '备注',
-                                value: 'remark'
-                            },
-                                                                                                {
-                                label: '排序',
-                                value: 'rank'
-                            },
-                                                            ],
-                advancedQuerySearchKey: '',
-                orderByStr: '',
-                imgSrc: '',
-                imageDialogVisible: false,
-            }
+        currentPageChange(page) {
+            this.currentPage = page;
+            this.getData();
         },
-        computed: {
-            ...mapState(['tableHeight']),
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        getData() {
+
+            var data = {
+                currentPage: this.currentPage,
+                pageNumber: this.pageSize,
+                searchKey: this.filter1,
+                advancedQuery: this.advancedQuerySearchKey,
+                orderByStr: this.orderByStr,
             }
-        },
-        methods: {
-            pageSizeChange(size) {
-                this.currentPage = 1;
-                this.pageSize = size;
-                this.getData();
-            },
-            currentPageChange(page) {
-                this.currentPage = page;
-                this.getData();
-            },
-            getData() {
-
-                var data = {
-                    currentPage: this.currentPage,
-                    pageNumber: this.pageSize,
-                    searchKey: this.filter1,
-                    advancedQuery: this.advancedQuerySearchKey,
-                    orderByStr: this.orderByStr,
-                }
 
-                if (this.$route.query.column) {
-                    var tempColumn = this.$route.query.column;
-                    data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-                }
+            if (this.$route.query.column) {
+                var tempColumn = this.$route.query.column;
+                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
+            }
 
-                this.$http.get({
-                    url: '/quickLinks/page',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.totalNumber = res.data.page.totalNumber;
-                        this.tableData = res.data.pp;
-                    }
-                })
-            },
-            isColumnShow(column) {
-                var row = this.tableColumns.find(i => i.value === column);
-                return row ? row.show : false;
-            },
-            toggleMultipleMode(multipleMode) {
-                this.multipleMode = multipleMode;
-                if (!multipleMode) {
-                    this.$refs.table.clearSelection();
+            this.$http.get({
+                url: '/quickLinks/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    this.tableData = res.data.pp;
                 }
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: '/quickLinks',
-                    query: {
-                        id: row.id,
-                        column: this.$route.query.column,
-                    }
-                })
-            },
-            operation1() {
-                this.$notify({
-                    title: '提示',
-                    message: this.selection
-                });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            addField() {
-                this.advancedQueryFields.push({
-                    link: 'AND',
-                    name: '',
-                    searchMethod: '=',
-                    value: '',
-                });
-            },
-            removeField(i) {
-                if (this.advancedQueryFields.length > 0) {
-                    this.advancedQueryFields.splice(i, 1);
+            })
+        },
+        isColumnShow(column) {
+            var row = this.tableColumns.find(i => i.value === column);
+            return row ? row.show : false;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/quickLinks',
+                query: {
+                    id: row.id,
+                    column: this.$route.query.column,
                 }
-            },
-            advancedQuery() {
+            })
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        addField() {
+            this.advancedQueryFields.push({
+                link: 'AND',
+                name: '',
+                searchMethod: '=',
+                value: '',
+            });
+        },
+        removeField(i) {
+            if (this.advancedQueryFields.length > 0) {
+                this.advancedQueryFields.splice(i, 1);
+            }
+        },
+        advancedQuery() {
 
-                this.advancedQuerySearchKey = '';
+            this.advancedQuerySearchKey = '';
 
-                if (this.advancedQueryFields.length > 0) {
+            if (this.advancedQueryFields.length > 0) {
 
-                    var templist = [];
+                var templist = [];
 
-                    this.advancedQueryFields.forEach(item => {
-                        if (item.link && item.name && item.searchMethod && item.value) {
-                            var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                            templist.push(tempItem);
-                        }
-                    })
+                this.advancedQueryFields.forEach(item => {
+                    if (item.link && item.name && item.searchMethod && item.value) {
+                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
+                        templist.push(tempItem);
+                    }
+                })
 
-                    if (templist.length > 0) {
+                if (templist.length > 0) {
 
-                        this.advancedQuerySearchKey = templist.join('_;');
-                    }
+                    this.advancedQuerySearchKey = templist.join('_;');
                 }
+            }
 
-                this.getData();
-                this.showAdvancedQueryDialog = false;
-            },
-            addSortField() {
-                this.tableSortFields.push({
-                    name: '',
-                    order: 'asc',
-                });
-            },
-            removeSortField(i) {
-                if (this.tableSortFields.length > 0) {
-                    this.tableSortFields.splice(i, 1);
-                }
-            },
-            tableSortQuery() {
+            this.getData();
+            this.showAdvancedQueryDialog = false;
+        },
+        addSortField() {
+            this.tableSortFields.push({
+                name: '',
+                order: 'asc',
+            });
+        },
+        removeSortField(i) {
+            if (this.tableSortFields.length > 0) {
+                this.tableSortFields.splice(i, 1);
+            }
+        },
+        tableSortQuery() {
 
-                this.orderByStr = '';
+            this.orderByStr = '';
 
-                if (this.tableSortFields.length > 0) {
+            if (this.tableSortFields.length > 0) {
 
-                    var templist = [];
+                var templist = [];
 
-                    this.tableSortFields.forEach(item => {
-                        if (item.name && item.order) {
-                            var tempItem = item.name + '_,' + item.order;
-                            templist.push(tempItem);
-                        }
-                    })
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
+                    }
+                })
 
-                    if (templist.length > 0) {
+                if (templist.length > 0) {
 
-                        this.orderByStr = templist.join('_;');
-                    }
+                    this.orderByStr = templist.join('_;');
                 }
+            }
 
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.$baseUrl + "/quickLinks/exportExcel?searchKey="
+                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
+        },
+        searchData() {
+            this.currentPage = 1;
+            this.getData();
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复,确认要删除么?', '警告', { type: 'error' }).then(() => {
+                return this.$http.post({
+                    url: '/quickLinks/del',
+                    data: { id: row.id }
+                })
+            }).then(() => {
+                this.$message.success('删除成功');
                 this.getData();
-                this.showTableSortDialog = false;
-            },
-            exportExcel() {
-                window.location.href = this.$baseUrl + "/quickLinks/exportExcel?searchKey="
-                        + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey+"&orderByStr=" + this.orderByStr;
-            },
-            searchData() {
-                this.currentPage = 1;
-                this.getData();
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复,确认要删除么?', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post({
-                        url: '/quickLinks/del',
-                        data: {id: row.id}
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                }).catch(action => {
-                    if (action === 'cancel') {
-                        this.$message.info('删除取消');
-                    } else {
-                        this.$message.error('删除失败');
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message.info('删除取消');
+                } else {
+                    this.$message.error('删除失败');
+                }
+            })
+        },
+        DateTimeFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
+            }
+
+        },
+        DateFormatter(row, column, cellValue) {
+            if (cellValue) {
+                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
+            }
+
+        },
+        showImg(img) {
+            this.imgSrc = img;
+            this.imageDialogVisible = true;
+        },
+
+        TypeFlagFormatter(row, column, cellValue) {
+            if (cellValue) {
+                var location = '';
+                this.typeFlagOptions.forEach(item => {
+                    if (item.value == Number(cellValue)) {
+                        location = item.label;
                     }
                 })
-            },
-            DateTimeFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD HH:mm', {locale: zh})
-                }
 
-            },
-            DateFormatter(row, column, cellValue) {
-                if (cellValue) {
-                    return format(cellValue, 'YYYY/MM/DD', {locale: zh})
-                }
+                return location;
+            }
 
-            },
-            showImg(img) {
-                this.imgSrc = img;
-                this.imageDialogVisible = true;
-            },
+        },
 
-        }
     }
+}
 </script>
 <style lang="less" scoped>
-
 </style>

+ 14 - 4
src/main/vue/src/pages/UserOrder.vue

@@ -44,10 +44,20 @@
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="payMode" label="支付方式">
                 <el-input v-model="formData.payMode" :disabled="'payMode'==subColumn"></el-input>
             </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="payTime" label="支付时间">
-                <el-input v-model="formData.payTime" :disabled="'payTime'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="remark" label="备注">
+                                                                                                                                                                                                                                                                                                                                                                                                                        <el-form-item prop="payTime" label="支付时间">
+                            <template>
+                                <div class="block">
+                                    <el-date-picker
+                                            v-model="formData.payTime"
+                                            type="datetime"
+                                            value-format="timestamp"
+                                            placeholder="选择日期"
+                                            :disabled="'payTime'==subColumn">
+                                    </el-date-picker>
+                                </div>
+                            </template>
+                        </el-form-item>
+                                                                                                                                                                                                                                            <el-form-item prop="remark" label="备注">
                 <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                             <el-form-item prop="showFlag" label="显示标识">

+ 48 - 4
src/main/vue/src/pages/UserOrders.vue

@@ -43,7 +43,22 @@
                     min-width="50"
                     align="center">
             </el-table-column>
-                                                                                                                                                                                                    
+                            
+                                            <el-table-column
+                                v-if="isColumnShow('id')"
+                                prop="id"
+                                label="id"
+                                min-width="100">
+                        </el-table-column>
+                                                                                                                                                    
+                                            <el-table-column
+                                v-if="isColumnShow('createTime')"
+                                prop="createTime"
+                                label="创建时间"
+                                :formatter="DateTimeFormatter"
+                                min-width="100">
+                        </el-table-column>
+                                                                                            
                                             <el-table-column
                                 v-if="isColumnShow('userId')"
                                 prop="userId"
@@ -146,6 +161,7 @@
                                 v-if="isColumnShow('payTime')"
                                 prop="payTime"
                                 label="支付时间"
+                                :formatter="DateTimeFormatter"
                                 min-width="100">
                         </el-table-column>
                                                                 
@@ -180,9 +196,19 @@
                     label="操作"
                     align="center"
                     fixed="right"
-                    min-width="150"
+                    min-width="100"
             >
                 <template slot-scope="scope">
+                    <el-button @click="$router.push({path:'/OrderImages',query:{column:scope.row.id+',orderId'}})" type="primary" size="small" plain>图片
+            </el-button>
+                    <el-button @click="$router.push({path:'/OrderAddresss',query:{column:scope.row.id+',orderId'}})" type="primary" size="small" plain>地址
+            </el-button>
+                    <el-button @click="$router.push({path:'/OrderLogisticss',query:{column:scope.row.id+',orderId'}})" type="primary" size="small" plain>物流
+            </el-button>
+                    <el-button @click="$router.push({path:'/OrderRepairs',query:{column:scope.row.id+',orderId'}})" type="primary" size="small" plain>返修
+            </el-button>
+                    <el-button @click="$router.push({path:'/OrderInvoices',query:{column:scope.row.id+',orderId'}})" type="primary" size="small" plain>发票
+            </el-button>
                             <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
                     <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
@@ -318,7 +344,17 @@
                 filter1: '',
                 filter2: '',
                 tableColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'id',
+                                value: 'id',
+                                show: true
+                            },
+                                                                                                                                                                                                                                    {
+                                label: '创建时间',
+                                value: 'createTime',
+                                show: true
+                            },
+                                                                                                                                            {
                                 label: '用户',
                                 value: 'userId',
                                 show: true
@@ -421,7 +457,15 @@
                 tableSortFields: [],
                 searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
                 advancedQueryColumns: [
-                                                                                                                                                                                                                                                                                                                                                {
+                                                                        {
+                                label: 'id',
+                                value: 'id'
+                            },
+                                                                                                                                                                                                                                    {
+                                label: '创建时间',
+                                value: 'create_time'
+                            },
+                                                                                                                                            {
                                 label: '用户',
                                 value: 'user_id'
                             },