From 40f52e42782c5312299ae52a0b38339269cac558 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 17 Jun 2025 14:03:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/order/offline.js                      | 24 +++--
 src/api/order/reserve.js                      | 25 +++--
 src/api/superStore/device.js                  |  2 +-
 src/api/superStore/orderShenhe.js             | 15 +--
 src/api/superStore/salesSummary.js            |  2 +-
 src/api/superStore/superOrder.js              | 97 +------------------
 .../accountCenter/account/consume/index.vue   |  2 +-
 .../canteen/base/canteenStall/area/index.vue  |  2 +-
 .../base/canteenStall/canteen/index.vue       | 17 ++--
 .../canteen/base/canteenStall/stall/index.vue |  8 +-
 .../canteen/base/mobile/bannerList/index.vue  | 20 +++-
 src/views/canteen/dish/dish/index.vue         | 21 +++-
 .../canteen/order/offlineManagement/index.vue | 61 +++++++++---
 .../canteen/order/reserveManagement/index.vue | 71 ++++++++++----
 .../canteen/reportCenter/consumeSum/index.vue |  4 +-
 .../canteen/superstore/doubleScreen/index.vue | 12 +--
 .../components/MaterialDialog.vue             | 15 ++-
 src/views/canteen/superstore/super/index.vue  | 52 +++++-----
 .../canteen/superstore/superOrder/index.vue   | 35 +++----
 src/views/monitor/job/log.vue                 |  2 +-
 src/views/system/dict/data.vue                |  2 +-
 src/views/system/role/authUser.vue            |  2 +-
 src/views/system/user/authRole.vue            |  2 +-
 23 files changed, 234 insertions(+), 259 deletions(-)

diff --git a/src/api/order/offline.js b/src/api/order/offline.js
index 8cab4949..326b1bd6 100644
--- a/src/api/order/offline.js
+++ b/src/api/order/offline.js
@@ -17,18 +17,7 @@ export function orderPageListApi(data) {
         pageSize:data.pageSize
       }
     })
-}
-// 订单详情
-export function orderDetailInfoApi(data) {
-    return request({
-      url: '/smart-canteen/api/v2/web/order/info',
-      method: 'post',
-      headers: {
-          "merchant-id":"378915229716713472",
-      },
-      data: data
-    })
-}
+} 
 
 // 订单-部分退款
 export function refundOrderPartApi(data) {
@@ -67,7 +56,16 @@ export function writeOffOrderApi(data) {
     })
 }
 
-
+//获取订单评价
+export function getEvaluaOrderDetailApi(orderId) {
+    return request({
+      url: '/smart-canteen/cook_evalua_order/orderId/'+orderId,
+      method: 'get',
+      headers: {
+          "merchant-id":"378915229716713472",
+      }
+    })
+  }
 
 
 
diff --git a/src/api/order/reserve.js b/src/api/order/reserve.js
index 77b5196d..094f8c0e 100644
--- a/src/api/order/reserve.js
+++ b/src/api/order/reserve.js
@@ -15,18 +15,7 @@ export function orderPageListApi(data) {
       }
     })
 }
-
-// 订单详情
-export function orderDetailInfoApi(data) {
-    return request({
-      url: '/smart-canteen/api/v2/web/order/info',
-      method: 'post',
-      headers: {
-          "merchant-id":"378915229716713472",
-      },
-      data: data
-    })
-}
+ 
 
 // 订单-部分退款
 export function refundOrderPartApi(data) {
@@ -65,8 +54,16 @@ export function writeOffOrderApi(data) {
 }
 
 
-
-
+//获取订单评价
+export function getEvaluaOrderDetailApi(orderId) {
+    return request({
+      url: '/smart-canteen/cook_evalua_order/orderId/'+orderId,
+      method: 'get',
+      headers: {
+          "merchant-id":"378915229716713472",
+      }
+    })
+  }
 
 
 
diff --git a/src/api/superStore/device.js b/src/api/superStore/device.js
index 48a8c0fe..159ad24b 100644
--- a/src/api/superStore/device.js
+++ b/src/api/superStore/device.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 通过区域Id查询超市
 export function getSupermarketByAreaApi(data) {
     return request({
-      url: '/smart-canteen/supermarket_info/list',
+      url: '/smart-canteen/supermarket_info/listAll',
       method: 'get',
       headers: {
           "merchant-id":"378915229716713472",
diff --git a/src/api/superStore/orderShenhe.js b/src/api/superStore/orderShenhe.js
index 5a865578..2847124b 100644
--- a/src/api/superStore/orderShenhe.js
+++ b/src/api/superStore/orderShenhe.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 通过区域Id查询超市
 export function getSupermarketByAreaApi(data) {
     return request({
-      url: '/smart-canteen/supermarket_info/list',
+      url: '/smart-canteen/supermarket_info/listAll',
       method: 'get',
       headers: {
           "merchant-id":"378915229716713472",
@@ -110,18 +110,7 @@ export function refundOrderPageListApi(data) {
       },
       data: data
     })
-}
-// 订单详情
-export function orderDetailInfoApi(data) {
-    return request({
-      url: '/smart-canteen/api/v2/web/order/info',
-      method: 'post',
-      headers: {
-          "merchant-id":"378915229716713472",
-      },
-      data: data
-    })
-}
+} 
 
 // 订单-部分退款
 export function refundOrderPartApi(data) {
diff --git a/src/api/superStore/salesSummary.js b/src/api/superStore/salesSummary.js
index c9dbaf4e..d7c7b37c 100644
--- a/src/api/superStore/salesSummary.js
+++ b/src/api/superStore/salesSummary.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 // 通过区域Id查询超市
 export function getSupermarketByAreaApi(data) {
     return request({
-      url: '/smart-canteen/supermarket_info/list',
+      url: '/smart-canteen/supermarket_info/listAll',
       method: 'get',
       headers: {
           "merchant-id":"378915229716713472",
diff --git a/src/api/superStore/superOrder.js b/src/api/superStore/superOrder.js
index 0a54910f..b36d3277 100644
--- a/src/api/superStore/superOrder.js
+++ b/src/api/superStore/superOrder.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 通过区域Id查询超市
 export function getSupermarketByAreaApi(data) {
     return request({
-      url: '/smart-canteen/supermarket_info/list',
+      url: '/smart-canteen/supermarket_info/listAll',
       method: 'get',
       headers: {
           "merchant-id":"378915229716713472",
@@ -11,87 +11,7 @@ export function getSupermarketByAreaApi(data) {
       params: data
     })
   }
-
-// 通过区域Id查询食堂
-export function getCanteenByAreaApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/canteen/list-all-auth-canteen',
-    method: 'post',
-    headers: {
-        "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
-// 通过食堂Id查询档口
-export function getStallByCanteenApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/canteen/list-multiple-auth-stall',
-    method: 'post',
-    headers: {
-        "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
-
-// 订单类型
-export function orderTypeListApi(data) {
-    return request({
-        url: '/smart-canteen/api/v2/order/enums/type-list',
-        method: 'post',
-        headers: {
-            "merchant-id":"378915229716713472",
-        },
-        data: data
-    })
-}
-// 配送方式
-export function deliveryTypeListApi(data) {
-    return request({
-        url: '/smart-canteen/api/v2/alloc/canteen/list-delivery-type-enum',
-        method: 'post',
-        headers: {
-            "merchant-id":"378915229716713472",
-        },
-        data: data
-    })
-}
-
-
-// 订单状态
-export function orderStateListApi(data) {
-    return request({
-      url: '/smart-canteen/api/v2/order/enums/state-mix-list',
-      method: 'post',
-      headers: {
-          "merchant-id":"378915229716713472",
-      },
-      data: data
-    })
-}
-// 订单支付状态
-export function orderPayAllTypeApi(data) {
-    return request({
-      url: '/smart-canteen/api/v2/pay/all/type',
-      method: 'get',
-      headers: {
-          "merchant-id":"378915229716713472",
-      },
-      params: data
-    })
-}
-// 核身方式
-export function orderNuclearModeListApi(data) {
-    return request({
-      url: '/smart-canteen/api/v2/order/enums/nuclear/mode-list',
-      method: 'post',
-      headers: {
-          "merchant-id":"378915229716713472",
-      },
-      data: data
-    })
-}
+    
 
 // 订单列表-分页
 export function orderPageListApi(data) {
@@ -107,18 +27,7 @@ export function orderPageListApi(data) {
         pageSize:data.pageSize
       }
     })
-}
-// 订单详情
-export function orderDetailInfoApi(data) {
-    return request({
-      url: '/smart-canteen/api/v2/web/order/info',
-      method: 'post',
-      headers: {
-          "merchant-id":"378915229716713472",
-      },
-      data: data
-    })
-}
+} 
 
 // 订单-部分退款
 export function refundOrderPartApi(data) {
diff --git a/src/views/canteen/accountCenter/account/consume/index.vue b/src/views/canteen/accountCenter/account/consume/index.vue
index 756ea879..17491900 100644
--- a/src/views/canteen/accountCenter/account/consume/index.vue
+++ b/src/views/canteen/accountCenter/account/consume/index.vue
@@ -90,7 +90,7 @@
                 <span>{{ (scope.row.amount/100).toFixed(2) }}</span>
             </template> 
         </el-table-column>
-        <el-table-column label="钱包余额" align="center" prop="walletBal" :show-overflow-tooltip="true">
+        <el-table-column label="钱包总数" align="center" prop="walletBal" :show-overflow-tooltip="true">
           <template slot-scope="scope">
                 <span>{{ (scope.row.walletBal/100).toFixed(2) }}</span>
             </template> 
diff --git a/src/views/canteen/base/canteenStall/area/index.vue b/src/views/canteen/base/canteenStall/area/index.vue
index 81d64a2f..462f1911 100644
--- a/src/views/canteen/base/canteenStall/area/index.vue
+++ b/src/views/canteen/base/canteenStall/area/index.vue
@@ -104,7 +104,7 @@
             </el-form-item>
           </el-form> 
   
-          <el-table v-loading="loading" :data="typeList" border height="600">
+          <el-table v-loading="loading" :data="typeList" border height="800">
             <el-table-column label="序号" align="center" width="80" type="index">
                   <template slot-scope="scope">
                       <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
diff --git a/src/views/canteen/base/canteenStall/canteen/index.vue b/src/views/canteen/base/canteenStall/canteen/index.vue
index 55dec066..df0f548d 100644
--- a/src/views/canteen/base/canteenStall/canteen/index.vue
+++ b/src/views/canteen/base/canteenStall/canteen/index.vue
@@ -45,7 +45,7 @@
             <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="食堂名称" align="center" prop="canteenName" :show-overflow-tooltip="true" width="150" fixed="left"/>
+        <el-table-column label="食堂名称" align="center" prop="canteenName" :show-overflow-tooltip="true" width="150"/>
         <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="180"/>
         <el-table-column label="负责人" align="center" prop="manager" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="联系电话" align="center" prop="contactTel" :show-overflow-tooltip="true" width="120"/>
@@ -388,23 +388,21 @@
         }, 
         /** 提交按钮 */
         submitForm: function() {
-            console.log(this.baseForm)
-            console.log(this.rangeTime)
+            // console.log(this.baseForm)
+            console.log(this.checkUrlList)
             this.$refs["baseForm"].validate(valid => {//基本设置表单校验
             if (valid) {
               this.baseForm.bizStartTime=this.rangeTime[0]
-              this.baseForm.bizEndTime=this.rangeTime[1]
-              this.baseForm.imgUrl = this.checkUrlList[0] 
-              let param = this.baseForm
+              this.baseForm.bizEndTime=this.rangeTime[1] 
               if (this.canteenId != "") {
                 param.canteenId = this.canteenId
-                updateCanteenApi(param).then(response => {
+                updateCanteenApi(this.baseForm).then(response => {
                       this.$modal.msgSuccess("修改成功");
                       this.open = false;
                       this.getList();
                   });
               } else {
-                  addCanteenApi(param).then(response => {
+                  addCanteenApi(this.baseForm).then(response => {
                       this.$modal.msgSuccess("新增成功");
                       this.open = false;
                       this.getList();
@@ -433,8 +431,10 @@
                 if (res.code == 200) {
                     this.checkUrlList.push(res.data.url)
                     this.checkUrlNameList.push(res.data.name)
+                    this.$set(this.baseForm,"imgUrl",res.data.url) 
                 } else { 
                     this.$modal.msgError(res.msg)
+                    this.$set(this.baseForm,"imgUrl","") 
                 }
             })
             .catch((error) => { 
@@ -464,6 +464,7 @@
             })
             this.checkUrlNameList.splice(sum, 1)
             this.checkUrlList.splice(sum, 1)
+            this.$set(this.baseForm,"imgUrl","") 
         },
         //图片点击查看
         handlePictureCardPreview(file) {
diff --git a/src/views/canteen/base/canteenStall/stall/index.vue b/src/views/canteen/base/canteenStall/stall/index.vue
index d0bbccd5..e4576775 100644
--- a/src/views/canteen/base/canteenStall/stall/index.vue
+++ b/src/views/canteen/base/canteenStall/stall/index.vue
@@ -54,7 +54,7 @@
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="档口名称" align="center" prop="stallName" :show-overflow-tooltip="true" width="180" fixed="left"/>
+      <el-table-column label="档口名称" align="center" prop="stallName" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="160"/>
       <el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" width="160"/>
       <el-table-column label="负责人" align="center" prop="manager" :show-overflow-tooltip="true" width="80"/>
@@ -637,7 +637,6 @@ export default {
           if (valid) {
             this.baseForm.bizStartTime=this.rangeTime[0]
             this.baseForm.bizEndTime=this.rangeTime[1]
-            this.baseForm.imgUrl = this.checkUrlList[0] 
             this.baseForm.basicStallMealtimeList = this.mealtimeList
             let param = this.baseForm
             if (this.stallId != "") {
@@ -710,9 +709,11 @@ export default {
           imgUpLoadTwo(param).then((res) => {
               if (res.code == 200) {
                   this.checkUrlList.push(res.data.url)
-                  this.checkUrlNameList.push(res.data.name)
+                  this.checkUrlNameList.push(res.data.name) 
+                  this.$set(this.baseForm,"imgUrl",res.data.url) 
               } else { 
                   this.$modal.msgError(res.msg)
+                  this.$set(this.baseForm,"imgUrl","") 
               }
           })
           .catch((error) => { 
@@ -742,6 +743,7 @@ export default {
           })
           this.checkUrlNameList.splice(sum, 1)
           this.checkUrlList.splice(sum, 1)
+          this.$set(this.baseForm,"imgUrl","") 
       },
       //图片点击查看
       handlePictureCardPreview(file) {
diff --git a/src/views/canteen/base/mobile/bannerList/index.vue b/src/views/canteen/base/mobile/bannerList/index.vue
index db6eea80..1e10a807 100644
--- a/src/views/canteen/base/mobile/bannerList/index.vue
+++ b/src/views/canteen/base/mobile/bannerList/index.vue
@@ -23,7 +23,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="tableListData" border size="mini"> 
+        <el-table v-loading="loading" :data="tableListData" border size="mini" height="800"> 
             <el-table-column label="序号" align="center" width="80" type="index">
                 <template scope="scope"> 
                     <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
@@ -133,6 +133,7 @@
                                 :on-change="handleFileChange"
                                 :on-success="handleAvatarSuccess"
                                 :class="{ disabled: uploadDisabled }"
+                                :before-upload="handleBeforeUpload"
                                 :on-preview="handlePictureCardPreview"
                                 :on-remove="handleRemove"
                             >
@@ -283,9 +284,9 @@ export default {
         }, 
         /** 提交按钮 */
         submitForm: function() {
+            console.log(this.form)
             this.$refs["form"].validate(valid => {
             if (valid) {
-                this.form.imgUrl = this.checkUrlList[0]
                 if (this.form.id != undefined) {
                     updateCarouselApi(this.form).then(response => {
                         this.$modal.msgSuccess("修改成功");
@@ -332,10 +333,11 @@ export default {
             imgUpLoadTwo(param).then((res) => {
                 if (res.code == 200) {
                     this.checkUrlList.push(res.data.url)
-                    this.checkUrlNameList.push(res.data.name)
-                    this.form.imgUrl = this.checkUrlList[0]
+                    this.checkUrlNameList.push(res.data.name) 
+                    this.$set(this.form,"imgUrl",res.data.url) 
                 } else { 
                     this.$modal.msgError(res.msg)
+                    this.$set(this.form,"imgUrl","") 
                 }
             })
             .catch((error) => { 
@@ -363,7 +365,7 @@ export default {
                         this.checkUrlList=[]
                         this.fileList=[]
                         // 清空当前上传的文件
-                        this.form[fileType] = '' 
+                        this.$set(this.form,"imgUrl","") 
                         this.$refs['form'].validateField(fileType)
                        
                     }
@@ -378,6 +380,13 @@ export default {
         handleAvatarSuccess(res, file) {
             console.log('success')
         },
+        handleBeforeUpload(file) { 
+            const isLt = file.size / 1024 / 1024 < 5
+            if (!isLt) {
+                this.$modal.msgError(`图片大小不能超过 5 MB`)
+                return false
+            }
+        },
         handleExceed(files, fileList) {
             this.$message.warning('最多只可以上传一张图片')
         },
@@ -390,6 +399,7 @@ export default {
             })
             this.checkUrlNameList.splice(sum, 1)
             this.checkUrlList.splice(sum, 1)
+            this.$set(this.form,"imgUrl","") 
         },
         //图片点击查看
         handlePictureCardPreview(file) {
diff --git a/src/views/canteen/dish/dish/index.vue b/src/views/canteen/dish/dish/index.vue
index cf97f894..a8c5f7af 100644
--- a/src/views/canteen/dish/dish/index.vue
+++ b/src/views/canteen/dish/dish/index.vue
@@ -506,6 +506,7 @@
                           list-type="picture-card"
                           accept=".png, .jpg, .jpeg"
                           :on-success="handleAvatarSuccess"
+                          :before-upload="handleBeforeUpload"
                           :class="{ disabled: uploadDisabled }"
                           :on-preview="handlePictureCardPreview"
                           :on-remove="handleRemove"
@@ -845,7 +846,7 @@
           effectId:null,
           suitIdList:[],
           remark:"",
-          imageUr:"",
+          imageUrl:"",
           dishesNutrition:{}
         },
         formTable:[],
@@ -1116,7 +1117,7 @@
           effectId:null,
           suitIdList:[],
           remark:"",
-          imageUr:"",
+          imageUrl:"",
           dishesNutrition:{}
         }
         this.formTable=[]
@@ -1297,8 +1298,7 @@
         this.$refs.baseForm.validate(valid => {
           if (valid) {
             if(!this.btnLoading){
-            this.btnLoading=true
-            this.baseForm.imageUrl = this.checkUrlList[0];
+            this.btnLoading=true 
             this.baseForm.arr = this.checkUrlList;
             let param = {...this.baseForm}
             if(param.sizeType==1){
@@ -1400,11 +1400,13 @@
           imgUpLoadTwo(param).then((res) => {
               if (res.code == 200) {
                   this.checkUrlList.push(res.data.url)
-                  this.checkUrlNameList.push(res.data.name) 
+                  this.checkUrlNameList.push(res.data.name)
+                  this.$set(this.baseForm,"imageUrl",res.data.url) 
               } else {
                   this.fileList=[]
                   this.checkUrlList=[]
                   this.checkUrlNameList=[]
+                  this.$set(this.baseForm,"imageUrl",'') 
                   this.$modal.msgError(res.msg)
               }
           }).catch((error) => { 
@@ -1417,6 +1419,14 @@
       handleAvatarSuccess(res, file) {
           console.log('success')
       },
+      // 上传之前
+      handleBeforeUpload(file) { 
+          const isLt = file.size / 1024 / 1024 < 5
+          if (!isLt) {
+              this.$modal.msgError(`图片大小不能超过 5 MB`)
+              return false
+          }
+      },
       handleExceed(files, fileList) {
           this.$message.warning('最多只可以上传一张图片')
       },
@@ -1429,6 +1439,7 @@
           })
           this.checkUrlNameList.splice(sum, 1)
           this.checkUrlList.splice(sum, 1)
+          this.$set(this.baseForm,"imageUrl",'') 
       },
       //图片点击查看
       handlePictureCardPreview(file) {
diff --git a/src/views/canteen/order/offlineManagement/index.vue b/src/views/canteen/order/offlineManagement/index.vue
index 3de483d8..beb34ad3 100644
--- a/src/views/canteen/order/offlineManagement/index.vue
+++ b/src/views/canteen/order/offlineManagement/index.vue
@@ -191,7 +191,7 @@
             >详情</el-button>
             <el-button
               size="mini"
-              type="text" v-if="scope.row.orderState==1||scope.row.orderState==2"
+              type="text" v-if="scope.row.orderState==1||scope.row.orderState==2||scope.row.orderState==5"
               @click="handleRefundPart(scope.row)" 
             >部分退款</el-button>
             <el-button
@@ -199,6 +199,11 @@
                 type="text" v-if="scope.row.orderState==1||scope.row.orderState==2||scope.row.orderState==4"
                 @click="handleRefund(scope.row)" 
             >退单</el-button>
+            <el-button
+                size="mini" 
+                type="text" v-if="scope.row.commentState==1"
+                @click="checkEvaluate(scope.row)" 
+            >评价</el-button>
             <!-- <el-button
                 size="mini" 
                 type="text" v-if="scope.row.orderState==1"
@@ -415,18 +420,18 @@
                 </el-table-column>
                 <el-table-column label="可退款数量" align="center" prop="unRefundNum" :show-overflow-tooltip="true"/>
                 <el-table-column label="已退款数量" align="center" prop="refundNum" :show-overflow-tooltip="true"/>
-                <el-table-column label="退款金额" align="center" prop="refundAmount" :show-overflow-tooltip="true">
+                <el-table-column label="已退款金额" align="center" prop="refundAmount" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
                         <span>{{ (scope.row.refundAmount/100).toFixed(2) }}</span>
                     </template> 
                 </el-table-column>
 
-                <el-table-column label="退款数量" align="center" prop="goRefundNum" :show-overflow-tooltip="true" width="100">
+                <el-table-column label="退款数量" align="center" prop="goRefundNum" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
                         <el-input v-model="scope.row.goRefundNum" placeholder="退款数量" maxlength="20" clearable style="width: 100%" @change="inputNum(scope.row)"  @input="(v)=>(scope.row.goRefundNum=v.replace(/[^\d]/g,''))"/> 
                     </template> 
                 </el-table-column>
-                <el-table-column label="退款金额" align="center" prop="refundMoney" :show-overflow-tooltip="true" width="100">
+                <el-table-column label="退款金额" align="center" prop="refundMoney" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
                         <span>{{ (scope.row.refundMoney/100).toFixed(2) }}</span>
                     </template> 
@@ -456,7 +461,23 @@
                 <el-button @click="openPart=false">取 消</el-button>
             </div>
       </el-dialog>
-
+      <!-- 评价弹窗 -->
+      <el-dialog title="订单评价" :visible.sync="openEva" width="500px" append-to-body>
+        <div style="width: 100%;height: 200px;overflow-y: auto;">
+        <div v-for="(item,index) in evaluateList" :key="index" style="display: flex;width: 100%;margin-bottom: 15px;align-items: center;">
+            <div style="width: 35%;word-break: break-all;font-size: 16px;text-align: center;">
+                {{ item.dishesName }}
+            </div>
+            <div style="width: 65%;">
+                <el-rate v-model="item.starLevel" size="large" disabled text-color="#ff9900"></el-rate>
+            </div>
+        </div> 
+        </div>
+        <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="openEva=false">确 定</el-button>
+        <el-button @click="openEva=false">取 消</el-button>
+        </div>
+      </el-dialog>
       <!-- 提醒对话框 -->
       <el-dialog :title="handleType+'提醒'" :visible.sync="openRemind" width="40%" append-to-body>
         <div class="remind-question">请问是否对以下可{{handleType}}订单进行{{handleType}}操作？</div>
@@ -480,7 +501,7 @@
   <script>  
   import { deptTreeSelect } from '@/api/system/user'
   import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi } from "@/api/base/stall"; 
-  import { orderPageListApi,orderDetailInfoApi,refundOrderPartApi,refundOrderApi,writeOffOrderApi,syncOrderPayStateApi } from "@/api/order/offline";
+  import { orderPageListApi,refundOrderPartApi,refundOrderApi,writeOffOrderApi,syncOrderPayStateApi,getEvaluaOrderDetailApi } from "@/api/order/offline";
   
   export default {
     name: "",
@@ -580,7 +601,8 @@
         ableList:[],
         unableList:[], 
         openRemind:false,
-
+        openEva:false,
+        evaluateList:[],
       };
     },
     created() { 
@@ -680,13 +702,7 @@
             });
         },
         /** 修改按钮操作 */
-        handleView(row) { 
-            // let param = {
-            //     orderId:row.orderId
-            // }
-            // orderDetailInfoApi(param).then(response => {
-            //     this.orderInfoData = response.data
-            // }); 
+        handleView(row) {
             this.orderInfoData = Object.assign({}, row) 
             this.open = true;  
         },
@@ -738,7 +754,9 @@
                         }
                         this.getList()
                         this.openPart = false; 
-                    });
+                    }).catch(err => {
+                        console.log(111)
+                    })
                 }
             }
             if(this.refundType==2){
@@ -789,6 +807,17 @@
                 this.$modal.msgSuccess("核销成功");
             }).catch(() => {});
         },
+        /** 评价按钮操作 */
+        checkEvaluate(row) {
+            this.evaluateList = []
+            getEvaluaOrderDetailApi(row.orderId).then(response => {
+                console.log(response)
+                this.evaluateList = response.data.detailList;
+                this.openEva = true
+            }).catch(err => {
+                
+            })
+        }, 
         // ----订单批量操作------
         handleOrderSelectionChange(selection){
             this.batchIds = selection.map((item) => item.orderId) 
@@ -816,7 +845,7 @@
             this.ableList = []
             this.unableList = [] 
             this.batchList.forEach(item=>{
-            if(item.orderState==1){
+            if(item.orderState==1||item.orderState==5){
                 this.ableList.push(item)
             }else{
                 this.unableList.push(item)
diff --git a/src/views/canteen/order/reserveManagement/index.vue b/src/views/canteen/order/reserveManagement/index.vue
index a89a4da6..5d29c618 100644
--- a/src/views/canteen/order/reserveManagement/index.vue
+++ b/src/views/canteen/order/reserveManagement/index.vue
@@ -195,7 +195,7 @@
           >详情</el-button>
           <el-button
             size="mini"
-            type="text" v-if="scope.row.orderState==1||scope.row.orderState==2"
+            type="text" v-if="scope.row.orderState==1||scope.row.orderState==2||scope.row.orderState==5"
             @click="handleRefundPart(scope.row)" 
           >部分退款</el-button>
           <el-button
@@ -205,9 +205,14 @@
           >退单</el-button>
           <el-button
             size="mini" 
-            type="text" v-if="scope.row.orderState==1"
+            type="text" v-if="scope.row.orderState==1||scope.row.orderState==5"
             @click="writeOffOrder(scope.row)" 
-          >核销</el-button>  
+          >核销</el-button>
+          <el-button
+            size="mini" 
+            type="text" v-if="scope.row.commentState==1"
+            @click="checkEvaluate(scope.row)" 
+          >评价</el-button>  
         </template>
       </el-table-column>
     </el-table>
@@ -369,7 +374,7 @@
               </el-col>
           </el-row>
 
-          <el-table :data="orderDetailList"  @selection-change="handleSelectionChange" :row-key="(row)=>{return row.detailId}" v-if="refundType==1">
+          <el-table :data="orderDetailList" ref="multiplePartTable" @selection-change="handleSelectionChange" :row-key="(row)=>{return row.detailId}" v-if="refundType==1">
               <el-table-column type="selection" width="50" align="center" :selectable="selectable"/>
               <el-table-column label="菜品名称" align="center" prop="goodsName" :show-overflow-tooltip="true"/>
               <el-table-column label="菜品单价" align="center" prop="salePrice" :show-overflow-tooltip="true">
@@ -385,18 +390,18 @@
               </el-table-column>
               <el-table-column label="可退款数量" align="center" prop="unRefundNum" :show-overflow-tooltip="true"/>
               <el-table-column label="已退款数量" align="center" prop="refundNum" :show-overflow-tooltip="true"/>
-              <el-table-column label="退款金额" align="center" prop="refundAmount" :show-overflow-tooltip="true">
+              <el-table-column label="已退款金额" align="center" prop="refundAmount" :show-overflow-tooltip="true">
                   <template slot-scope="scope">
                       <span>{{ (scope.row.refundAmount/100).toFixed(2) }}</span>
                   </template> 
               </el-table-column>
 
-              <el-table-column label="退款数量" align="center" prop="goRefundNum" :show-overflow-tooltip="true" width="100">
+              <el-table-column label="退款数量" align="center" prop="goRefundNum" :show-overflow-tooltip="true">
                   <template slot-scope="scope">
                       <el-input v-model="scope.row.goRefundNum" placeholder="退款数量" maxlength="20" clearable style="width: 100%" @change="inputNum(scope.row)"  @input="(v)=>(scope.row.goRefundNum=v.replace(/[^\d]/g,''))"/> 
                   </template> 
               </el-table-column>
-              <el-table-column label="退款金额" align="center" prop="refundMoney" :show-overflow-tooltip="true" width="100">
+              <el-table-column label="退款金额" align="center" prop="refundMoney" :show-overflow-tooltip="true">
                   <template slot-scope="scope">
                       <span>{{ (scope.row.refundMoney/100).toFixed(2) }}</span>
                   </template> 
@@ -426,6 +431,23 @@
               <el-button @click="openPart=false">取 消</el-button>
           </div>
     </el-dialog>
+    <!-- 评价弹窗 -->
+    <el-dialog title="订单评价" :visible.sync="openEva" width="500px" append-to-body>
+      <div style="width: 100%;height: 200px;overflow-y: auto;">
+        <div v-for="(item,index) in evaluateList" :key="index" style="display: flex;width: 100%;margin-bottom: 15px;align-items: center;">
+            <div style="width: 35%;word-break: break-all;font-size: 16px;text-align: center;">
+                {{ item.dishesName }}
+            </div>
+            <div style="width: 65%;">
+                <el-rate v-model="item.starLevel" size="large" disabled text-color="#ff9900"></el-rate>
+            </div>
+        </div> 
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="openEva=false">确 定</el-button>
+        <el-button @click="openEva=false">取 消</el-button>
+      </div>
+    </el-dialog>
 
     <!-- 提醒对话框 -->
     <el-dialog :title="handleType+'提醒'" :visible.sync="openRemind" width="40%" append-to-body>
@@ -449,7 +471,7 @@
 import { deptTreeSelect } from '@/api/system/user'
 import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi } from "@/api/base/stall";
 
-import { orderPageListApi,orderDetailInfoApi,refundOrderPartApi,refundOrderApi,writeOffOrderApi,syncOrderPayStateApi } from "@/api/order/reserve";
+import { orderPageListApi,refundOrderPartApi,refundOrderApi,writeOffOrderApi,syncOrderPayStateApi,getEvaluaOrderDetailApi } from "@/api/order/reserve";
 
 export default {
   name: "",
@@ -549,6 +571,8 @@ export default {
       ableList:[],
       unableList:[], 
       openRemind:false,
+      openEva:false,
+      evaluateList:[],
     };
   },
   created() { 
@@ -648,13 +672,7 @@ export default {
           });
       },
       /** 修改按钮操作 */
-      handleView(row) { 
-        //   let param = {
-        //       orderId:row.orderId
-        //   }
-        //   orderDetailInfoApi(param).then(response => {
-        //       this.orderInfoData = response.data
-        //   });
+      handleView(row) {
           this.orderInfoData = Object.assign({}, row) 
           this.open = true; 
       },
@@ -703,13 +721,16 @@ export default {
                       orderPartRefundDetailList:this.refundList,
                       orderId:this.rowData.orderId
                   }
-                  refundOrderPartApi(param).then(response => {
+                    refundOrderPartApi(param).then(response => {
                       if(response.code==200){
                           this.$modal.msgSuccess("退款成功");
                       }
                       this.getList()
                       this.openPart = false; 
-                  });
+                    }).catch(err => {
+                        this.refundList = []
+                        this.$refs.multiplePartTable.clearSelection() 
+                    })
               }
           }
           if(this.refundType==2){
@@ -760,6 +781,17 @@ export default {
               this.$modal.msgSuccess("核销成功");
           }).catch(() => {});
       },
+      /** 评价按钮操作 */
+      checkEvaluate(row) {
+        this.evaluateList = []
+        getEvaluaOrderDetailApi(row.orderId).then(response => {
+            console.log(response)
+            this.evaluateList = response.data.detailList;
+            this.openEva = true
+        }).catch(err => {
+            
+        })
+      }, 
       // ----订单批量操作------
       handleOrderSelectionChange(selection){
         this.batchIds = selection.map((item) => item.orderId) 
@@ -787,7 +819,7 @@ export default {
         this.ableList = []
         this.unableList = [] 
         this.batchList.forEach(item=>{
-          if(item.orderState==1){
+          if(item.orderState==1||item.orderState==5){
             this.ableList.push(item)
           }else{
             this.unableList.push(item)
@@ -883,4 +915,7 @@ export default {
     align-items: center;
     justify-content: center;
   }
+  ::v-deep .el-rate__icon{
+    font-size: 30px;
+  }
 </style>
diff --git a/src/views/canteen/reportCenter/consumeSum/index.vue b/src/views/canteen/reportCenter/consumeSum/index.vue
index 7824a768..44840c7b 100644
--- a/src/views/canteen/reportCenter/consumeSum/index.vue
+++ b/src/views/canteen/reportCenter/consumeSum/index.vue
@@ -54,11 +54,11 @@
                 <span>{{ (scope.row.payableAmount/100).toFixed(2) }}</span>
             </template> 
         </el-table-column>
-        <el-table-column label="折扣金额" align="center" prop="discountsAmount" :show-overflow-tooltip="true">
+        <!-- <el-table-column label="折扣金额" align="center" prop="discountsAmount" :show-overflow-tooltip="true">
             <template slot-scope="scope">
                 <span>{{ (scope.row.discountsAmount/100).toFixed(2) }}</span>
             </template> 
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="实际消费金额" align="center" prop="realAmount" :show-overflow-tooltip="true">
             <template slot-scope="scope">
                 <span>{{ (scope.row.realAmount/100).toFixed(2) }}</span>
diff --git a/src/views/canteen/superstore/doubleScreen/index.vue b/src/views/canteen/superstore/doubleScreen/index.vue
index 75888df7..e815310f 100644
--- a/src/views/canteen/superstore/doubleScreen/index.vue
+++ b/src/views/canteen/superstore/doubleScreen/index.vue
@@ -294,8 +294,7 @@
             //查询-区域树
             handleTreeChange(e){ 
                 let param= {
-                    "areaId":this.queryParams.areaId,
-                    "pagenation":true
+                    "areaId":this.queryParams.areaId
                 }
                 getSupermarketByAreaApi(param).then((response) => {
                     this.supermarketOptions=response.rows||[]
@@ -349,8 +348,7 @@
             handleUpdate(row) {
                 this.reset();  
                 let param= {
-                    "areaId":row.areaId,
-                    "pagenation":true
+                    "areaId":row.areaId
                 }
                 getSupermarketByAreaApi(param).then((response) => {
                     this.supermarketOptions2=response.rows||[]
@@ -365,8 +363,7 @@
             handleView(row) {
                 this.reset();  
                 let param= {
-                    "areaId":row.areaId,
-                    "pagenation":true
+                    "areaId":row.areaId
                 }
                 getSupermarketByAreaApi(param).then((response) => {
                     this.supermarketOptions2=response.rows||[]
@@ -384,8 +381,7 @@
             handleTreeChange2(val){ 
                 setTimeout(()=>{  
                     let param= {
-                        "areaId":val,
-                        "pagenation":true
+                        "areaId":val
                     }
                     getSupermarketByAreaApi(param).then((response) => {
                         this.supermarketOptions2=response.rows||[]
diff --git a/src/views/canteen/superstore/shopMaterial/components/MaterialDialog.vue b/src/views/canteen/superstore/shopMaterial/components/MaterialDialog.vue
index 296deccb..65b7c9f3 100644
--- a/src/views/canteen/superstore/shopMaterial/components/MaterialDialog.vue
+++ b/src/views/canteen/superstore/shopMaterial/components/MaterialDialog.vue
@@ -149,6 +149,7 @@
                         list-type="picture-card"
                         accept=".png, .jpg, .jpeg"
                         :on-success="handleAvatarSuccess"
+                        :before-upload="handleBeforeUpload"
                         :class="{ disabled: uploadDisabled }" 
                         :on-remove="handleRemove"
                     >
@@ -237,6 +238,8 @@ export default {
   },
   methods: {
     handelOpen(){
+      this.fileList=[]
+      this.checkUrlList=[]
       this.getAreaTreeData();//获取区域树 
       this.getDrpUnitList();//获取单位类型下拉  
     },
@@ -313,8 +316,7 @@ export default {
         //   });
         // }
       });
-    },  
-
+    },   
     setFormData(row){
       console.log(row)
       // this.form = Object.assign({}, row)
@@ -415,6 +417,14 @@ export default {
             this.$modal.msgError(error)
         })
     },
+    // 上传之前
+    handleBeforeUpload(file) { 
+        const isLt = file.size / 1024 / 1024 < 5
+        if (!isLt) {
+            this.$modal.msgError(`图片大小不能超过 5 MB`)
+            return false
+        }
+    },
     handleAvatarSuccess(res, file) {
         console.log('success')
     },
@@ -430,6 +440,7 @@ export default {
         })
         this.checkUrlNameList.splice(sum, 1)
         this.checkUrlList.splice(sum, 1)
+        this.$set(this.form,"imgUrl","")
     },
     //数字输入
     handleNumericInput(field, event) {
diff --git a/src/views/canteen/superstore/super/index.vue b/src/views/canteen/superstore/super/index.vue
index 3741fd43..d5d75d5b 100644
--- a/src/views/canteen/superstore/super/index.vue
+++ b/src/views/canteen/superstore/super/index.vue
@@ -60,11 +60,11 @@
         </el-table-column>
         <el-table-column label="管理员" align="center" prop="manager" :show-overflow-tooltip="true" width="100"/>
         <el-table-column label="更新时间" align="center" prop="updateTime" :show-overflow-tooltip="true" width="160"/>
-        <el-table-column label="收款码" align="center" prop="payCodeUrl" :show-overflow-tooltip="true" width="120">
+        <!-- <el-table-column label="收款码" align="center" prop="payCodeUrl" :show-overflow-tooltip="true" width="120">
           <template slot-scope="scope">
             <span>未开启</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
@@ -191,7 +191,7 @@
                         </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <!-- <el-col :span="12">
                   <el-form-item label="是否关联出入库" prop="ifRelateDrp">
                     <el-switch
                       v-model="baseForm.ifRelateDrp"
@@ -201,7 +201,7 @@
                       :inactive-value="2">
                     </el-switch>
                   </el-form-item>
-                </el-col>
+                </el-col> -->
                 <el-col :span="12">
                   <el-form-item label="超市图片">
                     <el-upload
@@ -884,8 +884,7 @@
       };
     },
     created() {
-      this.getTreeData();
-      this.getWareHouse();
+      this.getTreeData(); 
       this.getList();
       // this.mgruserListByRole();
 
@@ -907,11 +906,9 @@
         getTreeData() {
           systemAreaTreeApi({}).then((response) => {
             this.treeOptions = response.data;
-            console.log(this.treeOptions)
           });
         },
-        handleTreeChange(e){
-            console.log(e)
+        handleTreeChange(e){ 
             let param = {
                 areaId:e
             }
@@ -920,13 +917,6 @@
                 this.queryParams.warehouseId = null
             });
         },
-
-        getWareHouse() {
-            drpWareHousePageApi({}).then(response => {
-                this.wareHouseOptions = response.rows
-                this.wareHouseOptions2 = response.rows
-            });
-        },
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1;
@@ -983,12 +973,12 @@
             console.log(row)
             this.reset();
             this.baseForm = Object.assign({}, row)
-            // let param = {
-            //     areaIdList:[this.baseForm.areaId]
-            // }
-            // drpWareHousePageApi(param).then(response => {
-            //     this.wareHouseOptions2 = response.rows
-            // });
+            let param = {
+                areaId:this.baseForm.areaId
+            }
+            drpWareHousePageApi(param).then(response => {
+                this.wareHouseOptions2 = response.rows 
+            });
             if(row.imgUrl){
                 this.fileList=[{url:row.imgUrl}]
                 this.checkUrlList=[row.imgUrl]
@@ -1023,6 +1013,8 @@
                       this.open = false;
                       this.loadingBtn = false;
                       this.getList();
+                  }).catch(() => {
+                      this.loadingBtn = false;
                   });
               } else {
                   insertSupermarketApi(param).then(response => {
@@ -1030,6 +1022,8 @@
                       this.open = false;
                       this.loadingBtn = false;
                       this.getList();
+                  }).catch(() => {
+                      this.loadingBtn = false;
                   });
               }
             }
@@ -1037,13 +1031,13 @@
         },
         //基础设置-选择区域
         handleTreeChange2(val){
-            // let param = {
-            //     areaIdList:[val]
-            // }
-            // drpWareHousePageApi(param).then(response => {
-            //     this.wareHouseOptions2 = response.rows
-            //     this.baseForm.warehouseId = null
-            // });
+            let param = {
+                areaId:val
+            }
+            drpWareHousePageApi(param).then(response => {
+                this.wareHouseOptions2 = response.rows;
+                this.$set(this.baseForm,"warehouseId",null)
+            });
         },
         //商户类用户
         mgruserListByRole(){
diff --git a/src/views/canteen/superstore/superOrder/index.vue b/src/views/canteen/superstore/superOrder/index.vue
index d18ca76b..a5733ca7 100644
--- a/src/views/canteen/superstore/superOrder/index.vue
+++ b/src/views/canteen/superstore/superOrder/index.vue
@@ -14,7 +14,7 @@
                 :picker-options="pickerOptions" >
             </el-date-picker>
         </el-form-item>
-        <el-form-item label="所属区域" prop="areaId">
+        <!-- <el-form-item label="所属区域" prop="areaId">
             <el-cascader v-model="queryParams.areaId"
             :options="treeAreaOptions" :filterable="true" style="width: 220px" :show-all-levels="false"
             :props="{  
@@ -32,7 +32,7 @@
                     :value="item.supermarketId"
                 ></el-option>
             </el-select> 
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="所属组织" prop="deptIdList">  
             <el-cascader v-model="queryParams.deptIdList"
             :options="deptOptions" :filterable="true" style="width: 220px" :show-all-levels="false"
@@ -50,9 +50,9 @@
         <el-form-item label="订单号">
             <el-input v-model="queryParams.orderId" placeholder="请输入订单号" maxlength="20" clearable style="width: 220px"/>
         </el-form-item>
-        <el-form-item label="商品名称">
+        <!-- <el-form-item label="商品名称">
             <el-input v-model="queryParams.goodsSearchInfo" placeholder="请输入商品名称" maxlength="20" clearable style="width: 220px"/>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="订单状态">
             <el-select v-model="queryParams.orderStateList" clearable multiple collapse-tags style="width: 220px"> 
                 <el-option
@@ -63,7 +63,7 @@
                     />
             </el-select>  
         </el-form-item>
-        <el-form-item label="支付方式">
+        <!-- <el-form-item label="支付方式">
             <el-select v-model="queryParams.payStateList" clearable multiple collapse-tags style="width: 220px"> 
                 <el-option
                     v-for="dict in dict.type.sm_order_pay_type"
@@ -72,7 +72,7 @@
                     :value="Number(dict.value)"
                     />
             </el-select>  
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -164,7 +164,7 @@
             >退单</el-button>
             <el-button
               size="mini"
-              type="text" v-if="scope.row.orderState==1||scope.row.orderState==2"
+              type="text" v-if="scope.row.orderState==1||scope.row.orderState==2||scope.row.orderState==5"
               @click="handleRefundPart(scope.row)" 
             >部分退款</el-button>
             <!--  
@@ -318,12 +318,12 @@
                     </template> 
                 </el-table-column>
   
-                <el-table-column label="退款数量" align="center" prop="goRefundNum" :show-overflow-tooltip="true" width="100">
+                <el-table-column label="退款数量" align="center" prop="goRefundNum" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
                         <el-input v-model="scope.row.goRefundNum" placeholder="退款数量" maxlength="20" clearable style="width: 100%" @change="inputNum(scope.row)"  @input="(v)=>(scope.row.goRefundNum=v.replace(/[^\d]/g,''))"/> 
                     </template> 
                 </el-table-column>
-                <el-table-column label="退款金额" align="center" prop="refundMoney" :show-overflow-tooltip="true" width="100">
+                <el-table-column label="退款金额" align="center" prop="refundMoney" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
                         <span>{{ (scope.row.refundMoney/100).toFixed(2) }}</span>
                     </template> 
@@ -367,8 +367,8 @@
   
   <script>
   import { deptTreeSelect } from '@/api/system/user'
-  import { systemAreaTreeApi,getCanteenByAreaApi } from "@/api/base/stall"; 
-  import { orderPageListApi,orderDetailInfoApi,refundOrderPartApi,refundOrderApi,writeOffOrderApi,syncOrderPayStateApi } from "@/api/superStore/superOrder";
+  import { systemAreaTreeApi } from "@/api/base/stall"; 
+  import { getSupermarketByAreaApi,orderPageListApi,refundOrderPartApi,refundOrderApi,writeOffOrderApi,syncOrderPayStateApi } from "@/api/superStore/superOrder";
   export default {
     name: "",
     dicts: ['sys_user_type','sm_order_type','sm_order_status','sm_order_pay_type'], 
@@ -475,10 +475,9 @@
         },
         handleAreaChange(e){ 
             let param= {
-                areaId:this.queryParams.areaId,
-                canteenType:2
+                areaId:this.queryParams.areaId
             }
-            getCanteenByAreaApi(param).then((response) => {
+            getSupermarketByAreaApi(param).then((response) => {
                 this.supermarketOptions=response.rows||[]
                 this.queryParams.canteenId = null
             });
@@ -538,13 +537,7 @@
             });
         },
         /** 修改按钮操作 */
-        handleView(row) { 
-            // let param = {
-            //     orderId:row.orderId
-            // }
-            // orderDetailInfoApi(param).then(response => {
-            //     this.orderInfoData = response.data
-            // }); 
+        handleView(row) {
             this.orderInfoData = Object.assign({}, row) 
             this.open = true; 
         },
diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
index 94cbf52b..496d0786 100644
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -241,7 +241,7 @@ export default {
     },
     // 返回按钮
     handleClose() {
-      const obj = { path: "/monitor/job" };
+      const obj = { path: "/canteen/monitor/job" };
       this.$tab.closeOpenPage(obj);
     },
     /** 搜索按钮操作 */
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 765dfad3..9abec266 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -326,7 +326,7 @@ export default {
     },
     /** 返回按钮操作 */
     handleClose() {
-      const obj = { path: "/system/dict" };
+      const obj = { path: "/canteen/system/dict" };
       this.$tab.closeOpenPage(obj);
     },
     /** 重置按钮操作 */
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 17a461c1..135c4f17 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -151,7 +151,7 @@ export default {
     },
     // 返回按钮
     handleClose() {
-      const obj = { path: "/system/role" };
+      const obj = { path: "/canteen/system/role" };
       this.$tab.closeOpenPage(obj);
     },
     /** 搜索按钮操作 */
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index b282fd32..666ca77a 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -109,7 +109,7 @@ export default {
     },
     /** 关闭按钮 */
     close() {
-      const obj = { path: "/system/user" };
+      const obj = { path: "/canteen/system/user" };
       this.$tab.closeOpenPage(obj);
     },
   },