优化

src/main/vue/src/components/ImgItem.vue

@@ -15,10 +15,10 @@
                     <el-button v-if="img.statusFlag==1" icon="el-icon-check" type="success" circle size="mini"></el-button>
                     <el-button @click="changeStatus(1)" v-else icon="el-icon-check" type="success" circle plain size="mini"></el-button>
                     <el-button v-if="img.statusFlag==2" type="danger" icon="el-icon-close" circle size="mini"></el-button>
-                    <el-button @click="dialogFormVisible=true" v-else type="danger" icon="el-icon-close" circle plain size="mini"></el-button>
+                    <el-button @click="dialogFormVisible=true,detailRemarkFlag=''" v-else type="danger" icon="el-icon-close" circle plain size="mini"></el-button>
                 </template>
 
-                <el-button v-if="img.statusFlag==2" @click="dialogFormVisible=true" icon="el-icon-edit" circle plain size="mini"></el-button>
+                <el-button  @click="dialogFormVisible=true,detailRemarkFlag='1'" icon="el-icon-edit" circle plain size="mini"></el-button>
 
             </div>
             <div class="check" v-if="imgStyle=='upload'">
@@ -90,6 +90,7 @@ export default {
     },
     data() {
         return {
+            detailRemarkFlag:"",
             imageStyle: {
                 backgroundColor: '#ebebeb'
             },
@@ -225,6 +226,9 @@ export default {
                     statusFlag: 2,
                     detailRemark: this.remark
                 }
+                if(this.detailRemarkFlag){
+                    data.detailRemarkFlag=this.detailRemarkFlag
+                }
                 this.$http.post({
                     url: '/orderImage/repair',
                     data: data

src/main/vue/src/components/OrderItem.vue

@@ -72,7 +72,7 @@
                         </template>
 
                         <template v-if="statusName=='待审片'">
-                            <el-button type="primary" size="mini" v-if="info.orderRepairList.length==0" @click="goNext('orderExamine')">去审核</el-button>
+                            <el-button type="primary" size="mini" v-if="isFirstRepair" @click="goNext('orderExamine')">去审核</el-button>
                         </template>
                         <template v-if="statusName=='待评论'">
                             <div style="display:block">
@@ -170,6 +170,15 @@ export default {
             return str
 
 
+        },
+        isFirstRepair(){
+            var result=true
+            if(this.info.orderRepairList!=0){
+                if(this.info.orderRepairList[0].statusFlag!=0){
+                    result=false
+                }
+            }
+            return true
         }
     },
     methods: {

src/main/vue/src/components/SingleUploadTitle.vue

@@ -54,9 +54,13 @@ export default {
             type: Number,
             default: 178
         },
-        nowIndex:{
-            type:Number,
-            default:-1
+        nowIndex: {
+            type: Number,
+            default: -1
+        },
+        needName: {
+            type: String,
+            default: ''
         }
     },
     data() {
@@ -75,11 +79,11 @@ export default {
             } else {
                 newVal = res.data;
             }
-            if(this.nowIndex!=-1){
-                var img=newVal
-                newVal={
-                    img:img,
-                    index:this.nowIndex
+            if (this.nowIndex != -1) {
+                var img = newVal
+                newVal = {
+                    img: img,
+                    index: this.nowIndex
                 }
             }
             this.$emit('input', newVal);
@@ -88,7 +92,30 @@ export default {
             this.loading = false;
         },
         beforeUpload(file) {
+
+
+            const isJPG = (file.type === 'image/jpeg' || file.type === 'image/png');
+            if (!isJPG) {
+                return false
+            }
+
+            if (this.needName) {
+                if (file.name != this.needName) {
+                    this.$message({
+                        message: '文件名无法匹配，请检查文件',
+                        type: 'warning'
+                    });
+                    return false
+                }
+            }
+
+
+
+
+
+
             this.loading = true;
+            this.$emit('start')
             return true;
         },
         updateImageUrl(url) {

src/main/vue/src/emUI.less

@@ -385,3 +385,19 @@ a{
     text-overflow: ellipsis;
     white-space: nowrap;
 }
+
+
+.el-tag--info{
+    color:#333;
+}
+
+
+.applyContent .el-dialog__body{
+    padding-top: 10px;
+    border-top:1px solid #ebebeb;
+}
+
+
+.upload-demo .el-upload-list{
+    // display: none;
+}

src/main/vue/src/entries/index.html

@@ -48,6 +48,18 @@
     } else {
 
     }
+
+
+    document.oncontextmenu = function() {
+        return false;
+    };
+    document.onkeydown = function() {
+        if (window.event && window.event.keyCode == 123) {
+            event.keyCode = 0;
+            event.returnValue = false;
+            return false;
+        }
+    };
 </script>
 
 </html>

src/main/vue/src/pagesPre/ChatContent.vue

@@ -333,7 +333,6 @@ export default {
                     userId: this.userInfo.userId,
                 }, 1)
             }
-
         },
         del(item, index) {
             console.log(item)

src/main/vue/src/pagesPre/GuaranteeMoney.vue

@@ -83,7 +83,7 @@ export default {
         return {
             form: {
                 money: '',
-                isRead: true
+                isRead: false
             },
             rules: {
                 money: [

src/main/vue/src/pagesPre/MemberMoney.vue

@@ -0,0 +1,420 @@
+<template>
+    <div class="container">
+
+        <div class="pageTitle">
+            我的余额
+        </div>
+
+        <div class="point">
+
+            <div class="point-item">
+                <div class="title">
+                    账户余额
+                </div>
+                <div class="val">
+                    {{userInfo.moneyCoin}}
+                </div>
+            </div>
+
+            <el-button type="primary" class="apply" @click="imageDialogVisible=true">申请提现</el-button>
+
+        </div>
+
+        <el-table class="pointTable" :data="tableData" row-key="id" ref="table" style="margin-top:10px">
+
+            <el-table-column prop="remark" label="来源/用途" min-width="320" align="center">
+            </el-table-column>
+
+            <el-table-column prop="money" label="余额变化" min-width="100" align="center">
+            </el-table-column>
+
+            <el-table-column prop="createTime" label="日期" min-width="200" align="center">
+            </el-table-column>
+
+            <el-table-column prop="typeFlag" label="备注" min-width="100" align="center">
+            </el-table-column>
+
+        </el-table>
+        <div class="pagination-wrapper">
+
+            <el-pagination v-if="totalNumber>pageSize" background @current-change="currentPageChange" :page-size="pageSize" layout="total, prev, pager, next" :total="totalNumber">
+            </el-pagination>
+        </div>
+
+        <el-dialog class="applyContent" title="申请提现" width="50%" :visible.sync="imageDialogVisible" size="small">
+            <el-tabs v-model="activeName">
+                <el-tab-pane label="微信" name="0">
+                    <el-form :model="formData" ref="form" :rules="rules" label-width="80px" label-position="right" size="small" style="max-width:400px;">
+                        <el-form-item prop="money" label="提现金额">
+                            <el-input-number v-model="formData.money" :step="100" :min="0"></el-input-number>
+                        </el-form-item>
+
+                        <el-form-item prop="wechat" label="提现到的微信账号">
+                            <el-input-number v-model="formData.wechat" :step="100" :min="0"></el-input-number>
+                        </el-form-item>
+
+                    </el-form>
+
+                </el-tab-pane>
+                <el-tab-pane label="支付宝" name="1">
+                    <el-form :model="formData" ref="form" :rules="rules" label-width="80px" label-position="right" size="small" style="max-width:400px;">
+                        <el-form-item prop="money" label="提现金额">
+                            <el-input-number v-model="formData.money" :step="100" :min="0"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="wechat" label="提现到的支付宝账号">
+                            <el-input-number v-model="formData.wechat" :step="100" :min="0"></el-input-number>
+                        </el-form-item>
+                    </el-form>
+                </el-tab-pane>
+                <el-tab-pane label="银行卡" name="2">
+                    <el-form :model="formData" ref="form" :rules="rules" label-width="80px" label-position="right" size="small" style="max-width:400px;">
+                        <el-form-item prop="money" label="提现金额">
+                            <el-input-number v-model="formData.money" :step="100" :min="0"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="wechat" label="提现到的支付宝账号">
+                            <el-input-number v-model="formData.wechat" :step="100" :min="0"></el-input-number>
+                        </el-form-item>
+                    </el-form>
+                </el-tab-pane>
+            </el-tabs>
+        </el-dialog>
+
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
+
+export default {
+    created() {
+        this.getData();
+    },
+    data() {
+        return {
+            formData: {
+                money: ''
+            },
+            rules: {
+                money: [
+                    { required: true, message: '提现金额不能为空', trigger: 'blur' },
+                ]
+            },
+            totalNumber: 0,
+            totalPage: 10,
+            currentPage: 1,
+            pageSize: 10,
+            tableData: [],
+            filter1: '',
+            filter2: '',
+            tableColumns: [
+                {
+                    label: '用户',
+                    value: 'userId',
+                    show: true
+                },
+                {
+                    label: '订单',
+                    value: 'orderId',
+                    show: true
+                },
+                {
+                    label: '变化数量',
+                    value: 'money',
+                    show: true
+                },
+                {
+                    label: '剩余金额',
+                    value: 'balance',
+                    show: true
+                },
+                {
+                    label: '类型',
+                    value: 'typeFlag',
+                    show: true
+                },
+                {
+                    label: '备注',
+                    value: 'remark',
+                    show: true
+                },
+            ],
+            multipleMode: false,
+            showAdvancedQueryDialog: false,
+            advancedQueryFields: [],
+            showTableSortDialog: false,
+            tableSortFields: [],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            advancedQueryColumns: [
+                {
+                    label: '用户',
+                    value: 'user_id'
+                },
+                {
+                    label: '订单',
+                    value: 'order_id'
+                },
+                {
+                    label: '变化数量',
+                    value: 'money'
+                },
+                {
+                    label: '剩余金额',
+                    value: 'balance'
+                },
+                {
+                    label: '类型',
+                    value: 'type_flag'
+                },
+                {
+                    label: '备注',
+                    value: 'remark'
+                },
+            ],
+            advancedQuerySearchKey: '',
+            orderByStr: '',
+            imgSrc: '',
+            imageDialogVisible: true,
+            activeName: '0'
+        }
+    },
+    computed: {
+        ...mapState(['userInfo']),
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    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,
+                userId: this.userInfo.id
+            }
+
+
+
+            this.$http.get({
+                url: '/memberCoin/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();
+            }
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/memberPoint',
+                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);
+            }
+        },
+        advancedQuery() {
+
+            this.advancedQuerySearchKey = '';
+
+            if (this.advancedQueryFields.length > 0) {
+
+                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);
+                    }
+                })
+
+                if (templist.length > 0) {
+
+                    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.orderByStr = '';
+
+            if (this.tableSortFields.length > 0) {
+
+                var templist = [];
+
+                this.tableSortFields.forEach(item => {
+                    if (item.name && item.order) {
+                        var tempItem = item.name + '_,' + item.order;
+                        templist.push(tempItem);
+                    }
+                })
+
+                if (templist.length > 0) {
+
+                    this.orderByStr = templist.join('_;');
+                }
+            }
+
+            this.getData();
+            this.showTableSortDialog = false;
+        },
+        exportExcel() {
+            window.location.href = this.$baseUrl + "/memberPoint/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: '/memberPoint/del',
+                    data: { id: row.id }
+                })
+            }).then(() => {
+                this.$message.success('删除成功');
+                this.getData();
+            }).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;
+        },
+
+    }
+}
+</script>
+<style lang="less" scoped>
+.container {
+    background: rgba(255, 255, 255, 1);
+    border-radius: 4px;
+    border: 1px solid rgba(234, 234, 234, 1);
+    min-height: 612px;
+    padding: 0 25px 0 39px;
+
+    .pageTitle {
+        font-size: 14px;
+        font-family: MicrosoftYaHei;
+        font-weight: bold;
+        color: rgba(51, 51, 51, 1);
+        line-height: 19px;
+        padding: 21px 0 9px;
+        border-bottom: 1px solid #ebebeb;
+    }
+
+    .point {
+        // width: 953px;
+        height: 106px;
+        background: rgba(255, 253, 236, 1);
+        line-height: 106px;
+        margin-top: 5px;
+        box-sizing: border-box;
+        font-size: 0;
+        text-align: center;
+
+        position: relative;
+
+        .apply {
+            position: absolute;
+            right: 100px;
+            top: 30px;
+        }
+
+        .point-item {
+            display: inline-block;
+
+            vertical-align: middle;
+            text-align: center;
+
+            .title {
+                font-size: 14px;
+                font-family: MicrosoftYaHei;
+                color: rgba(51, 51, 51, 1);
+                line-height: 19px;
+            }
+
+            .val {
+                font-size: 36px;
+                font-family: MicrosoftYaHei;
+                color: rgba(251, 110, 8, 1);
+                line-height: 47px;
+            }
+        }
+    }
+}
+</style>

src/main/vue/src/pagesPre/OrderExamine.vue

@@ -294,7 +294,6 @@ export default {
                 }).then(res => {
                     if (res.success) {
 
-
                     }
                 })
             }
@@ -302,15 +301,27 @@ export default {
                 url: '/userOrder/update',
                 data: {
                     id: this.orderInfo.id,
-                    statusFlag: 5
+                    statusFlag: 3
                 }
             }).then(res => {
                 if (res.success) {
-                    this.$message.success('提交成功');
-                    history.back()
+                    // this.$message.success('提交成功');
+                    // history.back()
 
+                    this.$http.post({
+                        url: '/userOrder/confirm',
+                        data: {
+                            id: this.orderInfo.id,
+                        }
+                    }).then(res2 => {
+                        if (res2.success) {
+                            this.$message.success('提交成功');
+                            history.back()
+                        }
+                    })
                 }
             })
+
         },
         getRepair() {
             this.$http.post({

src/main/vue/src/pagesPre/OrderUpload.vue

@@ -6,19 +6,30 @@
             <el-button type="primary" v-if="canUploadNum>0" class="btn" @click="dialogVisible=true,upLoadImg=[],addImage=[],num=0">上传图片</el-button>
         </div>
 
+        <!-- <el-upload class="upload-demo" :file-list="upLoadImg" drag :limit="canUploadNum" :action="url" :before-upload="handleOn" multiple :on-success='handleSuccess' :on-remove="handleRemove">
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">将文件拖到此处，或
+                <em>点击上传</em>
+            </div>
+            <div class="el-upload__tip" slot="tip">只能上传RGB图片类型的jpg/png文件，当前已上传{{addImage.length}}张图片，还可以上传{{canUploadNum-addImage.length}}张</div>
+        </el-upload> -->
+
         <el-dialog title="上传图片" :visible.sync="dialogVisible" width="400px" :close-on-click-modal='false'>
-            <el-upload class="upload-demo" :file-list="upLoadImg" drag :limit="canUploadNum" :action="url" :before-upload="handleOn" multiple :on-success='handleSuccess' :on-remove="handleRemove">
+            <div v-if="tip.length>0" class="tip" style="margin-bottom:10px;">
+                <template v-if="tip[0].indexOf('正在压缩')!=-1">
+                    <i class="el-icon-loading"></i>{{tip[0]}}请不要关闭窗口耐心等待
+                </template>
+                <template v-else>
+                    {{tip[0]}}
+                </template>
+            </div>
+            <el-upload class="upload-demo" :file-list="upLoadImg" drag :action="url" :before-upload="handleOn" :on-progress='handleProgress' multiple :on-success='handleSuccess' :on-remove="handleRemove" :on-error='handleError'>
                 <i class="el-icon-upload"></i>
                 <div class="el-upload__text">将文件拖到此处，或
                     <em>点击上传</em>
                 </div>
-                <div class="el-upload__tip" slot="tip">只能上传RGB图片类型的jpg/png文件，当前已上传{{addImage.length}}张图片，还可以上传{{canUploadNum-addImage.length}}张</div>
+                <div class="el-upload__tip" slot="tip">只能上传RGB图片类型的jpg/png文件,已上传/总张数：{{orderImage.length}} / {{orderInfo.quantity}}</div>
             </el-upload>
-
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" :loading="loading" @click="upload">确 定</el-button>
-            </span>
         </el-dialog>
 
         <div class="content">
@@ -37,8 +48,8 @@
         </div>
 
         <div class="bottom">
-            <span v-if="canUploadNum>0">当前已上传{{orderImage.length}}张图片，还需上传{{canUploadNum}}张</span>
-            <span v-else>全部{{orderImage.length}}张图片</span>
+            <span>已上传/总张数：{{orderImage.length}} / {{orderInfo.quantity}}</span>
+            <span v-if="canUploadNum<0" style="color:red;margin-left:10px">超出{{0-canUploadNum}}张</span>
             <el-button style="float:right;margin:10px;" v-if='canSubmit&&canUploadNum==0' type="warning" class="btn" @click="submit">确定</el-button>
 
         </div>
@@ -96,7 +107,14 @@ export default {
             }
 
             return num
-        }
+        },
+        orderImgId() {
+            var list = []
+            this.orderImage.forEach(item => {
+                list.push(item.id)
+            })
+            return list
+        },
     },
     data() {
         return {
@@ -107,7 +125,9 @@ export default {
             canSubmit: true,
             upLoadImg: [],
             num: 0,
-            loading: false
+            loading: false,
+            tip: [],
+            realNum: 0
         }
     },
     methods: {
@@ -120,8 +140,11 @@ export default {
                 }
             }).then(res => {
                 if (res.success) {
+                    res.data.forEach(item => {
+                        item.isSuccess = true
+                    })
                     this.orderImage = res.data
-
+                    this.realNum = res.data.length
                 }
             })
         },
@@ -132,7 +155,6 @@ export default {
             // if(this.changeRemark.j)
         },
         handleRemove(file, fileList) {
-            console.log(file, fileList);
             var list = []
             fileList.forEach(item => {
                 item.response.data.forEach(todo => {
@@ -144,18 +166,61 @@ export default {
         },
         handleSuccess(res) {
             console.log(res)
-            res.data.forEach(item => {
-                this.addImage.push(item)
+            var tips = [...this.tip]
+            tips.forEach((item, index) => {
+                var list = item.split('文件正在压缩')
+                if (list[0] === res.data[0].imageName) {
+                    tips.splice(index, 1)
+                }
             })
+            tips.splice(0, 0, res.data[0].imageName + '文件上传成功')
+            this.tip = tips
+            setTimeout(() => {
+                var tips = [...this.tip]
+                tips.forEach((item, index) => {
+                    if (item.indexOf('文件上传成功') != -1) {
+                        tips.splice(index, 1)
+                    }
+                })
+                this.tip = tips
+            }, 1000)
 
-            if (this.addImage.length == this.num) {
-                this.loading = false
+
+            if (this.orderImgId.indexOf(res.data[0].id) == -1) {
+                this.orderImage.splice(0,0,res.data[0])
             }
+            else {
+                this.orderImage.splice(this.orderImgId.indexOf(res.data[0].id), 1, res.data[0])
+            }
+
+        },
+        handleError(file, fileList) {
+            this.num = list.length
+        },
+        handleProgress(e, file) {
+            console.log(e, file)
+            if (e.percent == 100) {
+                this.tip.splice(0, 0, file.name + '文件正在压缩')
+            }
+
         },
         handleOn(file, fileList) {
-            this.loading = true
-            this.num++
-            console.log(this.num)
+            console.log(fileList)
+            const isJPG = (file.type === 'image/jpeg' || file.type === 'image/png');
+            if (!isJPG) {
+                // this.$message.error('上传头像图片只能是 JPG 格式!');
+            }
+            else {
+                this.loading = true
+                this.num++
+
+
+            }
+
+
+
+
+            return isJPG
         },
         delImg(index) {
             this.addImage.splice(index, 1)

src/main/vue/src/pagesPre/OrderUploadChange.vue

@@ -1,12 +1,12 @@
 <template>
-    <div class="container">
+    <div class="container" v-loading='loading' element-loading-text="上传图片中，时间或许会很久，请耐心等待哦！">
         <div class="top" v-if="orderInfo.productInfo">
             <span>订单号:{{orderInfo.orderCode}}</span>
             <span style="margin-left:20px;">{{orderInfo.productInfo.title}}</span>
             <el-select v-if="!isChange" size="mini" style="float:right;margin-top:25px;width:120px" clearable v-model="unFinished" placeholder="筛选状态" @change="getImage">
-                <el-option key="0" label="未上传" value="1">
+                <el-option key="1" label="未上传" value="1">
                 </el-option>
-                <el-option key="1" label="已上传" value="0">
+                <el-option key="0" label="已上传" value="0">
                 </el-option>
             </el-select>
             <el-button type="primary" size="mini" style="float:right;margin-top:25px;margin-right:20px" class="btn" plain @click="dialogVisible=true,upLoadImg=[],addImage=[],num=0">批量上传</el-button>
@@ -23,7 +23,7 @@
                 <div class="imgList" style="margin-top:50px;">
                     <div class="title" style="color:#FB6E08">成<br/>片</div>
                     <div style="display:inline-block;vertical-align: middle" v-for="(item,index) in orderImage">
-                        <single-upload-title v-if="!item.finishedImage||item.statusFlag==2" class="box" :nowIndex='index' :url='url' @input="changeImg" :title='"上传成片"' :width='120' :height='150'>
+                        <single-upload-title v-if="!item.finishedImage||item.statusFlag==2" class="box" :needName='item.imageName' :nowIndex='index' :url='url' @input="changeImg" @start='loading=true' :title='"上传成片"' :width='120' :height='150'>
                         </single-upload-title>
                         <img-item v-if="item.finishedImage" :isChange='isChange' @changeRemark="changeRemark" :label='"finishedImage"' :index='index' :img='item' :imgStyle='"storeUpload"' @delImg='getImage' style="display:inline-block;margin:0 30px 0 0;vertical-align: middle;"></img-item>
 
@@ -50,7 +50,15 @@
         </div>
 
         <el-dialog title="上传图片" :visible.sync="dialogVisible" width="400px" :close-on-click-modal='false'>
-            <el-upload class="upload-demo" :file-list="upLoadImg" drag :action="url" multiple :before-upload="handleOn" :on-success='handleSuccess' :on-remove="handleRemove">
+            <div v-if="tip.length>0" class="tip" style="margin-bottom:10px;">
+                <template v-if="tip[0].indexOf('正在压缩')!=-1">
+                    <i class="el-icon-loading"></i>{{tip[0]}}请不要关闭窗口耐心等待
+                </template>
+                <template v-else>
+                    {{tip[0]}}
+                </template>
+            </div>
+            <el-upload class="upload-demo" :file-list="upLoadImg" drag :action="url" multiple :before-upload="handleOn" :on-success='handleSuccess' :on-progress='handleProgress' :on-remove="handleRemove">
                 <i class="el-icon-upload"></i>
                 <div class="el-upload__text">将文件拖到此处，或
                     <em>点击上传</em>
@@ -58,10 +66,10 @@
                 <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，当前已上传{{addImage.length}}张图片，还可以上传张</div>
             </el-upload>
 
-            <span slot="footer" class="dialog-footer">
+            <!-- <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
                 <el-button type="primary" @click="upload" :loading="isLoading">确 定</el-button>
-            </span>
+            </span> -->
         </el-dialog>
 
     </div>
@@ -98,6 +106,22 @@ export default {
             this.isChange = true
         }
 
+        // //获取全部修图数量
+        // this.$http.get({
+        //     url: '/orderImage/page',
+        //     data: {
+        //         orderId: this.$route.query.orderId,
+        //         currentPage: 1,
+        //         pageNumber: 1,
+        //         repairId: this.$route.query.repairId,
+        //     }
+        // }).then(res => {
+        //     if (res.success) {
+
+        //         this.allNumber = res.data.page.totalNumber;
+        //     }
+        // })
+
 
 
     },
@@ -116,10 +140,18 @@ export default {
             }
 
             return num
+        },
+        orderImgId() {
+            var list = []
+            this.orderImage.forEach(item => {
+                list.push(item.id)
+            })
+            return list
         }
     },
     data() {
         return {
+            tip: [],
             orderInfo: {},
             dialogVisible: false,
             addImage: [],
@@ -135,13 +167,24 @@ export default {
             notUp: 0,
             allNumber: 0,
             num: 0,
-            isLoading: false
+            isLoading: false,
+            loading: false
         }
     },
     methods: {
-        handleOn() {
-            this.num++
-            this.isLoading = true
+        handleOn(file) {
+            const isJPG = (file.type === 'image/jpeg' || file.type === 'image/png');
+            if (!isJPG) {
+                // this.$message.error('上传头像图片只能是 JPG 格式!');
+            }
+            else {
+                this.num++
+                this.isLoading = true
+            }
+
+
+
+            return isJPG
         },
         changeRemark() {
             if (!this.repairId) {
@@ -183,7 +226,12 @@ export default {
                 pageNumber: 7,
             }
 
+            //普通审核筛选
+            if (this.unFinished) {
+                data.unFinished = this.unFinished
+            }
 
+            //返修筛选
             if (this.$route.query.repairId) {
                 data.repairId = this.$route.query.repairId
                 if (data.unFinished == '1') {
@@ -206,8 +254,11 @@ export default {
                 if (res.success) {
                     this.orderImage = res.data.pp
                     this.totalNumber = res.data.page.totalNumber;
+                    this.allNumber = res.data.page.totalNumber;
                 }
             })
+
+            //未上传数量
             this.$http.get({
                 url: '/orderImage/all',
                 data: {
@@ -220,20 +271,7 @@ export default {
                 this.notUp = res.data.length
             })
 
-            this.$http.get({
-                url: '/orderImage/page',
-                data: {
-                    orderId: this.$route.query.orderId,
-                    currentPage: 1,
-                    pageNumber: 1,
-                    repairId: this.$route.query.repairId,
-                }
-            }).then(res => {
-                if (res.success) {
 
-                    this.allNumber = res.data.page.totalNumber;
-                }
-            })
         },
         chooseImg(index) {
             console.log(index)
@@ -253,13 +291,37 @@ export default {
             this.addImage = list
             this.num = this.addImage.length
         },
-        handleSuccess(res) {
-            res.data.forEach(item => {
-                this.addImage.push(item)
+        handleProgress(e, file) {
+            if (e.percent == 100) {
+                this.tip.splice(0, 0, file.name + '文件正在压缩')
+            }
+        },
+        handleSuccess(res, flie) {
+            console.log(res)
+            var tips = [...this.tip]
+            tips.forEach((item, index) => {
+                var list = item.split('文件正在压缩')
+                if (list[0] === flie.name) {
+                    tips.splice(index, 1)
+                }
             })
-            if (this.num == this.addImage.length) {
-                this.isLoading = false
+            tips.splice(0, 0, flie.name + '文件上传成功')
+            this.tip = tips
+            setTimeout(() => {
+                var tips = [...this.tip]
+                tips.forEach((item, index) => {
+                    if (item.indexOf('文件上传成功') != -1) {
+                        tips.splice(index, 1)
+                    }
+                })
+                this.tip = tips
+            }, 1000)
+            if (res.success) {
+                if (this.orderImgId.indexOf(res.data[0].id) != -1) {
+                    this.orderImage.splice(this.orderImgId.indexOf(res.data[0].id), 1, res.data[0])
+                }
             }
+
         },
         delImg(index) {
             this.addImage.splice(index, 1)
@@ -324,7 +386,7 @@ export default {
                 }
             })
             if (this.$route.query.repairId) {
-                if (this.orderInfo.orderRepairList.length == 3) {
+                if (this.orderInfo.orderRepairList.length == 3 && this.orderInfo.orderRepairList[this.orderInfo.orderRepairList.length - 1].typeFlag == 2) {
                     this.$http.post({
                         url: '/orderRepair/update',
                         data: {
@@ -337,15 +399,27 @@ export default {
                                 url: '/userOrder/update',
                                 data: {
                                     id: this.orderInfo.id,
-                                    statusFlag: 5
+                                    statusFlag: 3
                                 }
                             }).then(res2 => {
                                 if (res2.success) {
-                                    this.$message.success('提交成功');
-                                    history.back()
-
+                                    // this.$message.success('提交成功');
+                                    // history.back()
+
+                                    this.$http.post({
+                                        url: '/userOrder/confirm',
+                                        data: {
+                                            id: this.orderInfo.id,
+                                        }
+                                    }).then(res3 => {
+                                        if (res3.success) {
+                                            this.$message.success('提交成功');
+                                            history.back()
+                                        }
+                                    })
                                 }
                             })
+
                         }
                     })
                 }
@@ -384,7 +458,9 @@ export default {
 
         },
         changeImg(newVal) {
-            this.updateImg(newVal.index, newVal.img.url, newVal.img.imageSize, newVal.artworkUrl)
+            this.$message.success('提交成功');
+            this.loading = false
+            this.getImage()
         },
         updateImg(index, img, size, artworkUrl) {
             this.$http.post({
@@ -399,7 +475,7 @@ export default {
             }).then(res => {
                 if (res.success) {
                     this.getImage()
-                    this.$message.success('提交成功');
+
                 }
             })
         }

src/main/vue/src/pagesPre/SetStoreInfo.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-form :model="formData" :rules="rules" ref="storeInfo" label-width="100px" label-position="right" size="small" style="max-width: 600px;">
+    <el-form :model="formData" :rules="rules" ref="storeInfo" label-width="100px" label-position="right"  style="max-width: 600px;">
         <el-form-item prop="storeName" label="店铺名称">
             <el-input maxlength="30" v-model="formData.storeName" style="width:320px;" :disabled="'storeName'==subColumn" placeholder="中英文、数字或字符（30字以内）"></el-input>
         </el-form-item>

src/main/vue/src/pagesPre/StoreChat.vue

@@ -28,9 +28,10 @@
                 <div class="left">
                     <div class="left-content">
                         <div class="left-item" :class="{active:chatUserId==item.userId}" v-for="(item,index) in storeConversationList" @click="readAll(item)">
-                            <img class="icon" :src="item.userInfo.icon+'?x-oss-process=image/resize,m_fill,h_40,w_40'" alt="">
+                            <!-- {{item.id}} -->
+                            <img class="icon" :src="item.userInfo?(item.userInfo.icon+'?x-oss-process=image/resize,m_fill,h_40,w_40'):''" alt="">
                             <div class="chatName">
-                                <div class="name">{{item.userInfo.nickname}}</div>
+                                <div class="name">{{item.userInfo?item.userInfo.nickname:"未知用户"}}</div>
                                 <div class="subtitle" v-if="item.chatInfo">{{item.chatInfo.content}}</div>
                             </div>
                             <div class="time" v-if="item.amount">
@@ -156,6 +157,16 @@ export default {
                 }
             })
 
+            this.updateusersSession()
+
+            if (this.chatUserId) {
+                this.getChatInfo(this.chatUserId)
+                this.goBottom()
+            }
+
+
+        },
+        updateusersSession() {
             this.$http.get({
                 url: '/usersSession/all',
                 data: {
@@ -169,13 +180,6 @@ export default {
             }).catch(e => {
                 console.log(e)
             })
-
-            if (this.chatUserId) {
-                this.getChatInfo(this.chatUserId)
-                this.goBottom()
-            }
-
-
         },
         readAll(item, type) {
             this.$http.get({
@@ -192,6 +196,7 @@ export default {
             this.chatUserId = item.userId
             this.getChatInfo(item.userId)
             this.goBottom()
+            this.updateusersSession()
         },
         getChatInfo(id) {
             this.chatList = []
@@ -309,7 +314,9 @@ export default {
         onReceiveMessage(message) {
             console.log(message)
             if (this.chatUserId == message.userId) {
+                message.typeFlag = Number(message.typeFlag)
                 message.icon = this.chatList[0].icon
+                console.log(message.typeFlag)
                 this.chatList.push(message)
                 this.goBottom()
                 this.readAll({
@@ -318,19 +325,7 @@ export default {
                 }, 1)
             }
             else {
-                this.$http.get({
-                    url: '/usersSession/all',
-                    data: {
-                        storeId: this.myStoreInfo.id,
-                        type: 0
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.$store.commit('updateStoreConversationList', res.data)
-                    }
-                }).catch(e => {
-                    console.log(e)
-                })
+                this.updateusersSession()
             }
 
         },
@@ -450,6 +445,7 @@ export default {
     -moz-box-direction: normal;
     flex-direction: column;
     -webkit-flex-direction: column;
+    // overflow: auto;
 
     .top {
         display: flex;
@@ -478,6 +474,8 @@ export default {
         -webkit-flex: 1;
         display: flex;
         align-self: stretch;
+        overflow: hidden;
+
         .left {
             width: 25%;
             overflow: auto;
@@ -548,6 +546,7 @@ export default {
         }
         .right {
             width: 75%;
+            // height:;
             display: flex;
             flex-direction: column;
             .chatList {

src/main/vue/src/pagesPre/Submit.vue

@@ -195,11 +195,11 @@ export default {
             var money = 0;
             if (this.productInfo.productPriceList.length > 0) {
                 this.productInfo.productPriceList.forEach(item => {
-                    if (item.maxCounts && item.minCounts && this.num < item.maxCounts && this.num >= item.minCounts) {
+                    if (item.maxCounts && item.minCounts && this.num <= item.maxCounts && this.num >= item.minCounts) {
                         money = item.price
                     } else if (!item.maxCounts && this.num >= item.minCounts) {
                         money = item.price
-                    } else if (!item.minCounts && this.num < item.maxCounts) {
+                    } else if (!item.minCounts && this.num <= item.maxCounts) {
                         money = item.price
                     }
                 })

src/main/vue/src/pagesPre/UserCenterHome.vue

@@ -14,11 +14,11 @@
             <router-link :to="{name:'userSet',query:{activeName:'second'}}" class="top-item" style="width:22%;line-height:45px;">
                 我的收货地址
             </router-link>
-            <div class="top-item" style="width:22%">
+            <router-link :to="{name:'memberMoney'}" class="top-item" style="width:22%">
                 <div>我的余额</div>
                 <div style="color:rgb(253, 149, 1);font-size:16px;margin-top:3px;font-weight:bold;">{{userInfo.moneyCoin}}</div>
-            </div>
-             <router-link :to="{name:'memberPoint'}" class="top-item" style="width:22%;line-height:45px;">
+            </router-link>
+            <router-link :to="{name:'memberPoint'}" class="top-item" style="width:22%;line-height:45px;">
                 我的积分
             </router-link>
         </div>

src/main/vue/src/pagesPre/UserShop.vue

@@ -11,10 +11,10 @@
                     </div>
                 </div>
             </div>
-            <div class="top-item" style="width:15%">
+            <router-link :to="{name:'memberMoney'}" class="top-item" style="width:15%">
                 <div>账户余额</div>
                 <div style="color:rgb(253, 149, 1);font-size:16px;margin-top:3px;font-weight:bold;">{{userInfo.moneyCoin}}</div>
-            </div>
+            </router-link>
             <router-link :to="{name:'shopOrder'}" class="top-item" style="width:15%;line-height:45px;">
                 店铺订单
             </router-link>

src/main/vue/src/routerPre/index.js

@@ -189,6 +189,17 @@ const router = new Router({
                     pageMenu: '个人中心',
                     pageMenu2: '首页',
                 }
+            }, {
+                path: '/memberMoney',
+                name: 'memberMoney',
+                component: () =>
+                    import ('../pagesPre/MemberMoney'),
+                meta: {
+                    title: '账户余额',
+                    checkLogin: true,
+                    pageMenu: '个人中心',
+                    pageMenu2: '无',
+                }
             }, {
                 path: '/orderUpload',
                 name: 'orderUpload',
@@ -319,7 +330,7 @@ const router = new Router({
                     title: '上传修图',
                     checkLogin: true,
                     pageMenu: '商家中心',
-                    pageMenu2: '首页',
+                    pageMenu2: '无',
                 }
             }, {
                 path: '/storeComment',

src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.da4f73e09f989b1618ebd295c1c6c122.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.1945b3838764b540fcf9.js></script><script type=text/javascript src=/static/js/vendor.832e20a11a56148d6761.js></script><script type=text/javascript src=/static/js/admin.3725b6b904015686c98e.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.da4f73e09f989b1618ebd295c1c6c122.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.5600a103b30387cce166.js></script><script type=text/javascript src=/static/js/vendor.5ea22418dbbc96d13497.js></script><script type=text/javascript src=/static/js/admin.631c1407151da134355c.js></script></body></html>

src/main/webapp/WEB-INF/html/index.html

@@ -5,7 +5,7 @@
             position: absolute;
             top: 0;
             left: 0;
-        }</style><link href=/static/css/index.c8acfafea2357997d2e0b2f2d5aece17.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.1945b3838764b540fcf9.js></script><script type=text/javascript src=/static/js/vendor.832e20a11a56148d6761.js></script><script type=text/javascript src=/static/js/index.4588d739a6c5e382f7bf.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        }</style><link href=/static/css/index.c3f81ededc7f761ef715571998831ee4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.5600a103b30387cce166.js></script><script type=text/javascript src=/static/js/vendor.5ea22418dbbc96d13497.js></script><script type=text/javascript src=/static/js/index.cf2571da6eae8bd4f073.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
     var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
     var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
     var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;
@@ -24,4 +24,16 @@
 
     } else {
 
-    }</script></html>
+    }
+
+
+    document.oncontextmenu = function() {
+        return false;
+    };
+    document.onkeydown = function() {
+        if (window.event && window.event.keyCode == 123) {
+            event.keyCode = 0;
+            event.returnValue = false;
+            return false;
+        }
+    };</script></html>

src/main/webapp/static/js/128.ea71240b3370ae2096f3.js

@@ -1 +0,0 @@
-webpackJsonp([128],{V8wA:function(t,e){},izdZ:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});r("NYxO");var i={created:function(){this.getIframeSrc()},data:function(){return{iframeSrc:"/404"}},computed:{height:function(){return window.innerHeight-104+"px"}},methods:{getIframeSrc:function(){this.iframeSrc=this.$route.query.code}},watch:{$route:function(){this.getIframeSrc()}}},n={render:function(){var t=this.$createElement;return(this._self._c||t)("iframe",{staticClass:"iframe",attrs:{src:this.iframeSrc,height:this.height,width:"100%"}})},staticRenderFns:[]};var c=r("VU/8")(i,n,!1,function(t){r("V8wA")},"data-v-6d20da16",null);e.default=c.exports}});

src/main/webapp/static/js/140.59a022539a3556f38ba4.js

@@ -1 +0,0 @@
-webpackJsonp([140],{"7pWu":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var a={name:"home",data:function(){return{aboutInfo:{},bannerList:[]}},mounted:function(){var t=this;this.$http.get({url:"/aboutUs/getOne",data:{id:1}}).then(function(n){n.success&&(t.aboutInfo=n.data)}).catch(function(t){console.log(t)}),this.$http.get({url:"/bannerInfo/all",data:{location:13}}).then(function(n){n.success&&(t.bannerList=n.data)}).catch(function(t){console.log(t)})},computed:{},methods:{scrollMenu:function(){}}},s={render:function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("div",{staticClass:"conatiner"},[e("el-carousel",{staticClass:"swiper banner",class:[1==t.bannerList.length?"noButton":""],attrs:{height:"220px",interval:4e3}},[t._l(t.bannerList,function(n){return[e("el-carousel-item",{style:{backgroundImage:"url("+n.imageUrl+")"}},[n.url?e("a",{attrs:{href:n.url}}):t._e()])]})],2),t._v(" "),e("div",{staticClass:"content"},[t._m(0),t._v(" "),e("div",{staticClass:"content-content"},[e("div",{staticClass:"content-img",style:{backgroundImage:"url("+t.aboutInfo.image+")"}}),t._v(" "),e("div",{staticClass:"content-text"},[e("div",{staticClass:"title"},[t._v(t._s(t.aboutInfo.title))]),t._v(" "),e("div",{staticClass:"content-all",domProps:{innerHTML:t._s(t.aboutInfo.description)}})])])])],1)},staticRenderFns:[function(){var t=this.$createElement,n=this._self._c||t;return n("div",{staticClass:"name"},[n("div",{staticClass:"kuai"}),this._v(" "),n("span",[this._v("关于我们")])])}]};var i=e("VU/8")(a,s,!1,function(t){e("gjue")},"data-v-44fef9b8",null);n.default=i.exports},gjue:function(t,n){}});