9月19 前台提交

src/main/vue/src/components/MiniHead.vue

@@ -30,7 +30,7 @@
                         </el-dropdown>
                         <el-button type="text" style="vertical-align: middle;margin-left:15px;color:#333" @click="goNext('userCenterHome')" size="small">个人中心</el-button>
 
-                        <el-button type="text" style="vertical-align: middle;margin-left:15px;color:#333" @click="goShop" size="small">店铺中心</el-button>
+                        <el-button type="text" v-if="isStore"  style="vertical-align: middle;margin-left:15px;color:#333" @click="goShop" size="small">店铺中心</el-button>
                     </div>
 
                 </div>
@@ -64,6 +64,15 @@ export default {
             }
             return city
         },
+        isStore(){
+            var result=false
+            if(this.userInfo){
+                if(this.userInfo.storeFlag=='Y'){
+                    result=true
+                }
+            }
+            return result
+        }
     },
     watch: {
         $route() {

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

@@ -17,7 +17,7 @@
                 <div>
                     <img :src="info.userInfo.icon" style="width:50px;height:50px;border-radius:100%;display:block;margin:auto;" alt="">
                     <div style="margin:10px;font-size:16px;font-weight:bold;text-align:center;color:#000">{{info.userInfo.nickname}}</div>
-                    <el-rate style="text-align:center" :disabled="true" v-model="starLevel" :colors="['#99A9BF', '#F7BA2A', '#FF9900']">
+                    <el-rate style="text-align:center" :disabled="true" v-model="info.productComment.starLevel" :colors="['#99A9BF', '#F7BA2A', '#FF9900']">
                     </el-rate>
                     <div style="text-align:center">{{info.productComment.commentCount}}人评论</div>
                 </div>
@@ -39,7 +39,7 @@
                 </div>
                 <span style="width:56px;color:#FD9501">{{info.unitPrice}}</span>
                 <span style="width:56px">{{info.quantity}}</span>
-                <template v-if="info.productType==0 && info.statusFlag>1&&type=='user'">
+                <template v-if="info.productType==0 && info.statusFlag>1&&type=='user'&&info.statusFlag!=8">
                     <div class="preview" @click="goNext('orderPreview')">
                         <img src="../assetsPre/prePhoto.png" alt="">
                         <span>照片预览</span>
@@ -118,6 +118,12 @@
                         <template v-if="statusName=='待修图'">
                             <el-button type="primary" size="mini" @click="goNextquery('orderUploadChange',{type:1})">上传修图</el-button>
                         </template>
+                        <template v-if="statusName=='订单完成'&&!info.commentFlag">
+                            <div style="display:block">
+                                <el-button type="warining" size="mini" @click="comment=true">评价对方</el-button>
+                            </div>
+
+                        </template>
                     </span>
                 </div>
             </div>
@@ -171,6 +177,24 @@
             <el-progress style="margin:10px auto" type="circle" :percentage="temp" :status="isSuccess?'success':''"></el-progress>
 
         </el-dialog>
+
+        <el-dialog :title="'评价'+info.orderCode" :visible.sync="comment" width="20%">
+            <div style="padding:20px 0">
+                <img :src="info.userInfo.icon" style="width:50px;height:50px;border-radius:100%;display:block;margin:auto;" alt="">
+                <div style="margin:10px;font-size:16px;font-weight:bold;text-align:center;color:#000">{{info.userInfo.nickname}}</div>
+                <el-rate style="text-align:center" v-model="commentInfo.starLevel" :colors="['#99A9BF', '#F7BA2A', '#FF9900']">
+                </el-rate>
+
+                <el-input type="textarea" style="margin-top:20px;" :rows="2" placeholder="请输入评价内容" v-model="commentInfo.content">
+                </el-input>
+
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="comment = false">取 消</el-button>
+                <el-button type="primary" @click="submitComment">确 定</el-button>
+            </span>
+        </el-dialog>
+
     </div>
 </template>
 
@@ -195,14 +219,13 @@ export default {
             isSuccess: false,
             tip: '',
             temp: 0,
-            starLevel:0
-        }
-    },
-    created(){
-        if(this.info.productComment){
-            if(this.info.productComment.starLevel){
-                this.starLevel=Number(this.info.productComment.starLevel)
-            }
+            starLevel: 0,
+            comment: false,
+            commentInfo: {
+                starLevel: 5,
+                content: ''
+            },
+            isComment: false
         }
     },
     computed: {
@@ -379,6 +402,23 @@ export default {
                 }).then(res => {
                     if (res.success) {
                         this.$message.success('取消成功');
+                        this.$http.get({
+                            url: '/userOrder/getOne',
+                            data: {
+                                id: this.info.id
+                            }
+                        }).then(res => {
+                            if (res.success) {
+                                if ( res.data.productComment.starLevel) {
+                                     res.data.productComment.starLevel = Number( res.data.productComment.starLevel)
+                                }
+                                else {
+                                     res.data.productComment.starLevel = 0
+                                }
+                                this.$emit('changeData', res.data)
+                            }
+                        })
+
                     } else {
                         this.$message.warning('失败')
                     }
@@ -386,6 +426,28 @@ export default {
             }).catch(() => {
 
             });
+        },
+        submitComment() {
+            this.$http.post({
+                url: '/productComment/save',
+                data: {
+                    productId: this.info.productId,
+                    orderId: this.info.id,
+                    userId: this.info.userId,
+                    storeId: this.info.storeId,
+                    context: this.commentInfo.content,
+                    starLevel: this.commentInfo.starLevel,
+                    typeFlag: 1,
+                }
+            }).then(res => {
+                this.comment = false
+                if (res.success) {
+                    this.$message.success('评价成功')
+                    this.$emit('changeorderinfo', this.info.id)
+                } else {
+                    this.$message.warning('失败')
+                }
+            });
         }
     }
 }

src/main/vue/src/emUI.less

@@ -429,3 +429,10 @@ a{
 .el-message-box__message{
     word-break: break-all;
 }
+
+
+.imgList img{
+    width: 100%;
+    display: block;
+    height: auto!important;
+}

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

@@ -4,7 +4,7 @@
         </el-alert>
         <el-form-item prop="money" label="需缴纳金额" style="margin-top:30px;">
             <el-input v-model="form.money" style="width:146px"></el-input>
-            <span style='font-size:12px;color:rgba(253,149,1,1);'>注：5000元起。</span>
+            <span style='font-size:12px;color:rgba(253,149,1,1);'>注：{{formatMoney}}元起。</span>
         </el-form-item>
         <el-form-item label-width="0" prop='isRead' style="border-bottom:1px solid #ebebeb;">
 
@@ -92,11 +92,11 @@ export default {
                         validator: (rule, value, callback) => {
                             if (!value) {
                                 callback(new Error('请填写缴纳金额'));
-                            } else if (parseInt(value) >= 5000) {
+                            } else if (parseInt(value) >= this.formatMoney) {
                                 callback();
                             }
                             else {
-                                callback(new Error('缴纳金额5000元起'));
+                                callback(new Error('缴纳金额'+this.formatMoney+'元起'));
                             }
                         }, trigger: 'blur'
                     }
@@ -114,13 +114,26 @@ export default {
                     }
                 ]
             },
-            dialogVisible: false
+            dialogVisible: false,
+            systemConfig: {},
+            formatMoney:0
         }
     },
     computed: {
         ...mapState(['userInfo']),
     },
     mounted() {
+        this.$http.get({
+            url: '/systemConfig/getOne?id=1',
+        }).then(res => {
+            if (res.success) {
+                if (res.data) {
+                    this.systemConfig = res.data
+                    this.formatMoney=this.userInfo.companyFlag=='Y'?res.data.companyDeposit:res.data.personalDeposit
+                }
+
+            }
+        })
 
     },
     methods: {

src/main/vue/src/pagesPre/Login.vue

@@ -60,7 +60,7 @@
                                             </div>
                                         </template>
                                         <template slot='append'>
-                                            <div class="send" @click="sendCode">{{isSend?'已发送('+num+')S':'发送验证码'}}</div>
+                                            <div class="send" :disabled='isSend' @click="sendCode">{{isSend?'已发送('+num+')S':'发送验证码'}}</div>
                                         </template>
                                     </el-input>
 
@@ -110,7 +110,7 @@ export default {
         }
     },
     computed: {
-        ...mapState(['brefName','msgCode']),
+        ...mapState(['brefName', 'msgCode']),
     },
 
     methods: {
@@ -135,7 +135,7 @@ export default {
                     }).then(res => {
                         this.loading = false;
                         if (res.success) {
-
+                            this.$message.success('登录成功')
                             if (this.brefName) {
                                 history.back()
                             }
@@ -177,7 +177,7 @@ export default {
                     }).then(res => {
                         this.loading = false;
                         if (res.success) {
-
+                            this.$message.success('登录成功')
                             if (this.brefName) {
                                 history.back()
                             }
@@ -204,41 +204,50 @@ export default {
                 return
             }
 
-            this.isSend = true
-            this.getTime()
+            // this.isSend = true
+            // this.getTime()
+            this.checkHas({ phone: this.userInfo.phone }).then((result) => {
 
-            this.sendMeg(this.userInfo.phone,this.msgCode['登录确认']).then((json) => {
-                if (json.success) {
-                    this.$message.success('发送成功')
-                    this.realCode = json.data
-                    this.isSend = true
-                    this.getTime()
+                if (result) {
+                    this.sendMeg(this.userInfo.phone, this.msgCode['登录确认']).then((json) => {
+                        if (json.success) {
+                            this.$message.success('发送成功')
+                            this.realCode = json.data
+                            this.isSend = true
+                            this.getTime()
+                        }
+                        else {
+                            this.$message.warning(json.error)
+                        }
+                    })
                 }
                 else {
-                    this.$message.warning(json.error)
+                    this.$message.warning('该手机号未绑定用户')
                 }
             })
         },
         sendMessage() {
-            new Promise((resolve, reject) => {
-                this.$http.post({
-                    url: '/rong/sendCode',
-                    data: {
-                        phone: this.userInfo.phone,
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('验证码发送成功！');
-                        this.realCode = res.data
-                        this.isSend = true
-                        this.getTime()
-                    }
-                }).catch(() => {
-                    this.$message.error('验证码发送失败！');
-                    this.isSend = false
-                    this.num = 0
-                })
+            this.checkHas({ phone: this.userInfo.phone }).then((result) => {
+                console.log(result)
+                if (result) {
+                    // this.sendMeg(this.userInfo.phone, this.msgCode['登录确认']).then((json) => {
+                    //     if (json.success) {
+
+                    //         this.$message.success('验证码发送成功！');
+                    //         this.realCode = json.data
+                    //         this.isSend = true
+                    //         this.getTime()
+                    //     }
+                    //     else {
+                    //         this.$message.warning(json.error)
+                    //     }
+                    // })
+                }
+                else {
+                    this.$message.warning('该手机号未绑定用户')
+                }
             })
+
         },
         getTime() {
             if (this.num > 0) {

src/main/vue/src/pagesPre/Product.vue

@@ -43,9 +43,14 @@
                     <span style="color:#666;margin-left:12px;">已售</span>
                     <span style="color:#FB6E08;margin-left:5px;">{{shopInfo.salesVolume}}份</span>
                 </div>
+                <!-- <div class="comment">
+
+                </div> -->
                 <div class="comment">
                     <span>数量</span>
                     <el-input-number class="buyNum" size="mini" v-model="num" :min="1"></el-input-number>
+                    <span style="margin-left:20px">库存</span>
+                    <span style="color:#FB6E08;margin-left:5px;">{{shopInfo.inventory||0}}</span>
                 </div>
 
                 <!-- <button  @click="buy">立即购买</button> -->
@@ -88,7 +93,8 @@
             <el-tabs class="goodsTab" v-model="activeName">
                 <el-tab-pane label="商品详情" name="first">
                     <div class="imgList">
-                        <img :src="item.image" v-for="item in shopInfo.productImageList" alt="">
+                        <div v-html="shopInfo.productDetail"></div>
+                        <!-- <img :src="item.image" v-for="item in shopInfo.productImageList" alt=""> -->
                     </div>
                 </el-tab-pane>
                 <el-tab-pane label="服务详情" name="second">
@@ -108,7 +114,7 @@ export default {
     data() {
         return {
             shopInfo: {
-                productPriceList:[]
+                productPriceList: []
             },
             activeName: 'first',
             goodsList: [],
@@ -121,11 +127,11 @@ export default {
     },
     computed: {
         ...mapState(['userInfo']),
-        storeFlag(){
-            var result=false
-            if(this.userInfo){
-                if(this.userInfo.storeFlag=='N'){
-                    result=true
+        storeFlag() {
+            var result = false
+            if (this.userInfo) {
+                if (this.userInfo.storeFlag == 'N') {
+                    result = true
                 }
             }
             return result
@@ -213,15 +219,25 @@ export default {
                 return
             }
 
+            var inventory = this.shopInfo.inventory || 0
+
+            if (this.num > inventory) {
+                this.$message({
+                    message: '库存不足不能购买',
+                    type: 'warning'
+                });
+            }
+            else {
+                this.$router.push({
+                    name: 'submit',
+                    query: {
+                        productId: this.shopInfo.id,
+                        storeId: this.shopInfo.storeId,
+                        num: this.num
+                    }
+                })
+            }
 
-            this.$router.push({
-                name: 'submit',
-                query: {
-                    productId: this.shopInfo.id,
-                    storeId: this.shopInfo.storeId,
-                    num: this.num
-                }
-            })
         }
     }
 }
@@ -264,7 +280,7 @@ export default {
         right: 0;
         top: 0;
 
-          width: 50px;
+        width: 50px;
         height: 30px;
 
         background-position: center center;

src/main/vue/src/pagesPre/ProductInfo.vue

@@ -80,10 +80,11 @@
                     </el-table-column>
                 </el-table>
             </el-form-item>
-            <el-form-item label="详情图片">
-                <el-upload :action="url" :file-list="fileList" list-type="picture-card" :on-success="handleSuccess" :on-remove="handleRemove">
+            <el-form-item label="商品详情">
+                <rich-text :height='500' v-model="formData.productDetail"></rich-text>
+                <!-- <el-upload :action="url" :file-list="fileList" list-type="picture-card" :on-success="handleSuccess" :on-remove="handleRemove">
                     <i class="el-icon-plus"></i>
-                </el-upload>
+                </el-upload> -->
                 <span style="color:#999;font-size:12px;">最佳尺寸 宽度大于1150px 高度不限</span>
             </el-form-item>
             <el-form-item prop="onShelf" label="上下架">
@@ -122,6 +123,7 @@
 import { mapState } from 'vuex'
 import formValidator from '../formValidator'
 const baseUrl = process.env.NODE_ENV === 'production' ? '../' : 'http://localhost:8080';
+import RichText from '../components/RichText'
 export default {
     created() {
 
@@ -137,10 +139,10 @@ export default {
 
                     this.formData = res.data;
                     this.levelNum = res.data.productPriceList
-                    res.data.productImageList.forEach(item => {
-                        item.url = item.image
-                    })
-                    this.fileList = res.data.productImageList
+                    // res.data.productImageList.forEach(item => {
+                    //     item.url = item.image
+                    // })
+                    // this.fileList = res.data.productImageList
 
 
                     this.formData.hotFlag = this.formData.hotFlag == 1 ? true : false;
@@ -232,7 +234,7 @@ export default {
             }).then(res => {
                 if (res.success) {
                     this.savePrice(0, this.formData.id ? this.formData.id : res.data)
-                    this.saveImage(0, this.formData.id ? this.formData.id : res.data)
+                    // this.saveImage(0, this.formData.id ? this.formData.id : res.data)
                     this.$message.success('成功');
                     this.$router.go(-1);
                 } else {
@@ -404,6 +406,9 @@ export default {
                 return Number(this.levelNum[index - 1].maxCounts) + 1
             }
         }
+    },
+    components:{
+        RichText
     }
 }
 </script>

src/main/vue/src/pagesPre/ShopOrder.vue

@@ -20,8 +20,8 @@
             <el-menu-item index="7">订单回收站</el-menu-item>
         </el-menu>
 
-        <el-input size="mini" placeholder="商品名称/订单号" v-model="searchKey" class="orderSearch">
-            <el-button slot="append" icon="el-icon-search" @click="search"></el-button>
+        <el-input size="mini" placeholder="商品名称" v-model="searchKey" class="orderSearch">
+            <el-button slot="append" icon="el-icon-search" @click="currentPageChange(1)"></el-button>
         </el-input>
 
         <div class="list">
@@ -40,7 +40,7 @@
                 </div>
                 <div class="orderList" style="min-height:562px">
 
-                    <order-item  @changeorderinfo="changeorderinfo" v-for="item in orderList" :info="item"  :type='"shop"'></order-item>
+                    <order-item @changeorderinfo="changeorderinfo" v-for="item in orderList" :info="item" :type='"shop"'></order-item>
 
                 </div>
             </template>
@@ -74,7 +74,7 @@ export default {
         }
     },
     computed: {
-        ...mapState(['userInfo','myStoreInfo'])
+        ...mapState(['userInfo', 'myStoreInfo'])
     },
     mounted() {
         this.getData({})
@@ -169,12 +169,23 @@ export default {
             data.storeId = this.myStoreInfo.id
             data.pageNumber = 3
             data.currentPage = this.currentPage
+            if (this.searchKey) {
+                data.advancedQuery = 'AND_,product_name_,like_,' + this.searchKey
+            }
             this.$http.get({
                 url: '/userOrder/page',
                 data: data
             }).then(res => {
                 if (res.success) {
                     this.totalNumber = res.data.page.totalNumber;
+                    res.data.pp.forEach(item => {
+                        if (item.productComment.starLevel) {
+                            item.productComment.starLevel = Number(item.productComment.starLevel)
+                        }
+                        else {
+                            item.productComment.starLevel = 0
+                        }
+                    })
                     this.orderList = res.data.pp
                 }
             }).catch(e => {
@@ -185,15 +196,21 @@ export default {
             this.$http.get({
                 url: '/userOrder/getOne',
                 data: {
-                    id:id
+                    id: id
                 }
             }).then(res => {
                 if (res.success) {
-                   this.orderList.forEach((item,index)=>{
-                       if(item.id==id){
-                           this.$set(this.orderList,index,res.data)
-                       }
-                   })
+                    this.orderList.forEach((item, index) => {
+                        if (item.id == id) {
+                            if (res.data.productComment.starLevel) {
+                                res.data.productComment.starLevel = Number(res.data.productComment.starLevel)
+                            }
+                            else {
+                                res.data.productComment.starLevel = 0
+                            }
+                            this.$set(this.orderList, index, res.data)
+                        }
+                    })
                 }
             }).catch(e => {
                 console.log(e)

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

@@ -219,11 +219,11 @@ export default {
             var str = ''
             if (this.productInfo.productPriceList) {
                 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) {
                         str = item.minCounts + '到' + item.maxCounts + '张优惠'
                     } else if (!item.maxCounts && this.num >= item.minCounts) {
                         str = item.minCounts + '张以上优惠'
-                    } else if (!item.minCounts && this.num < item.maxCounts) {
+                    } else if (!item.minCounts && this.num <= item.maxCounts) {
                         str = item.maxCounts + '张以下优惠'
                     }
                 })
@@ -234,11 +234,11 @@ export default {
             var str = ''
             if (this.productInfo.productPriceList) {
                 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) {
                         str = item.name
                     } else if (!item.maxCounts && this.num >= item.minCounts) {
                         str = item.name
-                    } else if (!item.minCounts && this.num < item.maxCounts) {
+                    } else if (!item.minCounts && this.num <= item.maxCounts) {
                         str = item.name
                     }
                 })
@@ -268,11 +268,11 @@ export default {
             var id = ''
             if (this.productInfo.productPriceList) {
                 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) {
                         id = item.id
                     } else if (!item.maxCounts && this.num >= item.minCounts) {
                         id = item.id
-                    } else if (!item.minCounts && this.num < item.maxCounts) {
+                    } else if (!item.minCounts && this.num <= item.maxCounts) {
                         id = item.id
                     }
                 })
@@ -295,6 +295,18 @@ export default {
 
                 return
             }
+
+            var inventory = this.productInfo.inventory || 0
+
+            if (this.num > inventory) {
+                this.$message({
+                    message: '库存不足不能购买',
+                    type: 'warning'
+                });
+                return
+            }
+
+
             var data = {
                 productId: this.$route.query.productId,
                 storeId: this.$route.query.storeId,
@@ -575,7 +587,7 @@ export default {
                         top: -20px;
                         transform: rotate(45deg);
                         text-align: center;
-                        i{
+                        i {
                             position: absolute;
                             bottom: 0;
                             left: 12px;

src/main/vue/src/pagesPre/UserCenter.vue

@@ -42,8 +42,8 @@
                     </el-aside>
                     <el-main :style="{paddingLeft:nowMenuList.length>0?'20px':0}">
 
-                        <el-alert v-if="coveListNum>0&&pageMenu=='商家中心'&&pageName=='商家首页'" :title="'当前有'+coveListNum+'条未读消息，请尽快去客户咨询处回复。'" type="warning" show-icon style='margin-bottom:10px;'>
-                        </el-alert>
+                        <!-- <el-alert v-if="coveListNum>0&&pageMenu=='商家中心'&&pageName=='商家首页'" :title="'当前有'+coveListNum+'条未读消息，请尽快去客户咨询处回复。'" type="warning" show-icon style='margin-bottom:10px;'>
+                        </el-alert> -->
 
                         <router-view ref='child' @startChat='startChat'></router-view>
                     </el-main>

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

@@ -29,7 +29,7 @@
 
         <div class="content">
             <div class="orderList">
-                <order-item v-for="item in orderList" :info='item' @startChat='startChat'></order-item>
+                <order-item v-for="item in orderList" :info='item' @startChat='startChat' @changeData='changeData'></order-item>
             </div>
         </div>
     </div>
@@ -58,6 +58,14 @@ export default {
             }
         }).then(res => {
             if (res.success) {
+                 res.data.pp.forEach(item => {
+                        if (item.productComment.starLevel) {
+                            item.productComment.starLevel = Number(item.productComment.starLevel)
+                        }
+                        else {
+                            item.productComment.starLevel = 0
+                        }
+                    })
                 this.orderList = res.data.pp
             }
         }).catch(e => {
@@ -69,6 +77,13 @@ export default {
     methods: {
         startChat(id) {
             this.$emit('startChat', id)
+        },
+        changeData(json) {
+            this.orderList.forEach((item, index) => {
+                if (item.id == json.id) {
+                    this.$set(this.orderList, index, json)
+                }
+            })
         }
 
     },

src/main/vue/src/pagesPre/UserOrder.vue

@@ -20,8 +20,8 @@
             <el-menu-item index="7">订单回收站</el-menu-item>
         </el-menu>
 
-        <el-input size="mini" placeholder="商品名称/订单号" v-model="searchKey" class="orderSearch">
-            <el-button slot="append" icon="el-icon-search" @click="search"></el-button>
+        <el-input size="mini" placeholder="商品名称" v-model="searchKey" class="orderSearch">
+            <el-button slot="append" icon="el-icon-search" @click="currentPageChange(1)"></el-button>
         </el-input>
 
         <div class="list">
@@ -40,7 +40,7 @@
                 </div>
                 <div class="orderList" style="min-height:562px">
                     <template v-for="item in orderList">
-                        <order-item :info="item" @startChat='startChat'></order-item>
+                        <order-item :info="item" @startChat='startChat' @changeData='changeData'></order-item>
 
                     </template>
 
@@ -82,8 +82,8 @@ export default {
         this.getData({})
     },
     methods: {
-        startChat(id){
-            this.$emit('startChat',id)
+        startChat(id) {
+            this.$emit('startChat', id)
         },
         currentPageChange(page) {
             this.currentPage = page;
@@ -174,17 +174,35 @@ export default {
             data.userId = this.userInfo.id
             data.pageNumber = 3
             data.currentPage = this.currentPage
+            if(this.searchKey){
+                data.advancedQuery= 'AND_,product_name_,like_,'+this.searchKey
+            }
             this.$http.get({
                 url: '/userOrder/page',
                 data: data
             }).then(res => {
                 if (res.success) {
                     this.totalNumber = res.data.page.totalNumber;
+                     res.data.pp.forEach(item => {
+                        if (item.productComment.starLevel) {
+                            item.productComment.starLevel = Number(item.productComment.starLevel)
+                        }
+                        else {
+                            item.productComment.starLevel = 0
+                        }
+                    })
                     this.orderList = res.data.pp
                 }
             }).catch(e => {
                 console.log(e)
             })
+        },
+        changeData(json) {
+            this.orderList.forEach((item, index) => {
+                if (item.id == json.id) {
+                    this.$set(this.orderList, index, json)
+                }
+            })
         }
 
     },

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

@@ -80,6 +80,14 @@ export default {
             }
         }).then(res => {
             if (res.success) {
+                res.data.pp.forEach(item => {
+                    if (item.productComment.starLevel) {
+                        item.productComment.starLevel = Number(item.productComment.starLevel)
+                    }
+                    else {
+                        item.productComment.starLevel = 0
+                    }
+                })
                 this.orderList = res.data.pp
             }
         }).catch(e => {
@@ -115,6 +123,12 @@ export default {
                 if (res.success) {
                     this.orderList.forEach((item, index) => {
                         if (item.id == id) {
+                            if (res.data.productComment.starLevel) {
+                                res.data.productComment.starLevel = Number(res.data.productComment.starLevel)
+                            }
+                            else {
+                                res.data.productComment.starLevel = 0
+                            }
                             this.$set(this.orderList, index, res.data)
                         }
                     })

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.470b815a4495aa03ba49.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/admin.664edccac69172836820.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.63987a9bddf8511a124d.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/admin.b12be61dbedd5d5392f6.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.4aa258c2c1b2bff4f53738e082369b6f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.470b815a4495aa03ba49.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/index.2501542d9b5be4abbdde.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        }</style><link href=/static/css/index.89cbf8d7f7908ec8be99781623cda0de.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.63987a9bddf8511a124d.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/index.a4e9186ab709e5158daf.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;