更新一些问题

src/router/index.js

@@ -111,6 +111,7 @@ const mainRoutes = {
 	{ path: '/integralDetail', component: _import('integral/integralDetail'), name: 'integralDetail', meta: { title: '活动详情',isTab: false} },
 	
 	{ path: '/couponShop', component: _import('coupon/couponShop'), name: 'couponShop', meta: { title: '优惠券管理',isTab: false} },
+  {path: '/commentList', component: _import('message/commentList'), name: 'commentList', meta: {title: '评价列表', isTab: true}},
 	],
   beforeEnter (to, from, next) {
     let token = Vue.cookie.get('token')

src/views/business/business.vue

@@ -46,7 +46,7 @@
         <el-table-column prop="illegal" label="投诉类型" width="150">
           <template slot-scope="scope">
 					<div v-if="scope.row.type==1">{{scope.row.illegal}}</div>
-					<div v-if="scope.row.type==2">{{scope.row.shopIllegal}}</div>
+					<div v-if="scope.row.type==2">{{scope.row.illegal}}</div>
 				</template>
         </el-table-column>
         <el-table-column prop="wrongExplain" label="违规说明" width="180"></el-table-column>

src/views/common/home.vue

@@ -382,6 +382,15 @@
         				</div>
         			</div>
         		</el-col>
+            <el-col :span="6" class="cards">
+              <div class="box">
+                <div class="box_num">
+                  <div class="box_color">同城外卖收入</div>
+                  <div class="text_color">
+                    <span>{{platformData.tcwmMoneySum ? platformData.tcwmMoneySum : 0}}</span>元</div>
+                </div>
+              </div>
+            </el-col>
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">

src/views/message/commentList.vue

@@ -0,0 +1,218 @@
+<template>
+	<div>
+		<div style="margin:2% 0;display: inline-block;">
+			<span>是否满意：</span>
+			<el-select v-model="campus" style="width:150px;margin-left: 10px;" @change="select(campus)">
+				<el-option v-for="item in homeData1" :key="item.value" :label="item.label" :value="item.value">
+				</el-option>
+			</el-select>&nbsp;&nbsp;&nbsp;
+		</div>
+		<div style="position: relative;display: inline-block;">
+			<span>评价用户：</span>
+			<el-input style="width: 200px;" @keydown.enter.native="select" placeholder="请输入评价用户" v-model="nickName">
+			</el-input>&nbsp;&nbsp;
+		</div>
+		<div style="position: relative;display: inline-block;">
+			<span>骑手昵称：</span>
+			<el-input style="width: 200px;" @keydown.enter.native="select" placeholder="请输入骑手昵称" v-model="riderName">
+			</el-input>&nbsp;&nbsp;
+		</div>
+		<div style="position: relative;display: inline-block;">
+			<span>订单号：</span>
+			<el-input style="width: 200px;" @keydown.enter.native="select" placeholder="请输入订单号" v-model="indentNumber">
+			</el-input>&nbsp;&nbsp;
+		</div>
+		<div style="display: inline-block;">
+			<el-button style="margin-left:15px;" size="mini" type="primary" icon="document" @click="select">查询
+			</el-button>
+			<el-button style="margin-left:15px;" size="mini" type="primary" icon="document" @click="cleans">重置
+			</el-button>
+		</div>
+			<el-table v-loading="tableDataLoading" :data="tableData.records">
+				<el-table-column prop="evaluateId" label="编号" width="80">
+				</el-table-column>
+				
+				<el-table-column prop="indentNumber" label="评价订单号" width="200">
+				</el-table-column>
+				<el-table-column prop="indent" label="评价用户" width="150">
+					<template slot-scope="scope">
+						<span v-if="scope.row.user&&scope.row.user.nickName" style="color: #4f9dec;cursor: pointer;" @click="updataDetails(scope.row.userId)">
+							{{ scope.row.user.nickName ? scope.row.user.nickName : '未绑定' }}
+						</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="indent" label="骑手昵称" width="150">
+					<template slot-scope="scope">
+						<span v-if="scope.row.riderUser&&scope.row.riderUser.nickName" style="color: #4f9dec;cursor: pointer;" @click="updataDetails(scope.row.riderUserId)">
+							{{ scope.row.riderUser.nickName ? scope.row.riderUser.nickName : '未绑定' }}
+						</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="evaluateMessage" label="评价内容">
+				</el-table-column>
+				<el-table-column prop="satisfactionFlag" label="是否满意" width="160">
+					<template slot-scope="scope">
+						<span v-if="scope.row.satisfactionFlag == '0'">满意</span>
+						<span v-if="scope.row.satisfactionFlag == '1'">不满意</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="createTime" label="评价时间" width="160">
+				</el-table-column>
+			</el-table>
+			<div style="text-align: center;margin-top: 10px;">
+				<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+					:page-sizes="[10, 20, 30, 40]" :page-size="limit" :current-page="page"
+					layout="total,sizes, prev, pager, next,jumper" :total="tableData.total">
+				</el-pagination>
+			</div>
+
+	</div>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				limit: 10,
+				page: 1,
+				state: 2,
+				userEmail: '',
+				url: '',
+				title: '',
+				type: '',
+				id: '',
+				types: [{
+						value: 'word',
+						label: '文字'
+					},
+					{
+						value: 'url',
+						label: '链接'
+					}
+				],
+				form: {
+					id: '',
+					title: '',
+					url: '',
+					type: '',
+					state: '',
+					types: [{
+							value: 'word',
+							label: '文字'
+						},
+						{
+							value: 'url',
+							label: '链接'
+						}
+					],
+				},
+				phone: '',
+				content: '',
+				flag: '',
+				flags: [{
+						value: 1,
+						label: '单个用户'
+					},
+					{
+						value: 2,
+						label: '全部用户'
+					}
+				],
+				formLabelWidth: '200px',
+				activeName: 'first',
+				tableDataLoading: false,
+				dialogFormVisible1: false,
+				dialogFormVisible2: false,
+				dialogFormVisible: false,
+				tableData: {},
+				campus: null,
+				homeData1: [{
+						value: null,
+						label: '全部'
+					},{
+						value: 0,
+						label: '满意'
+					},
+					{
+						value: 1,
+						label: '不满意'
+					}
+				],
+				indentNumber:'',
+				nickName:'',
+				riderName:'',
+			}
+		},
+		methods: {
+			// 详情跳转
+			updataDetails(userId) {
+				this.$router.push({
+					path: '/userDetail',
+					query: {
+						userId: userId
+					}
+				});
+			},
+			handleSizeChange(val) {
+				this.limit = val;
+				this.dataSelect()
+			},
+			handleCurrentChange(val) {
+				this.page = val;
+				this.dataSelect()
+			},
+			handleClick(tab, event) {
+				if (tab._props.label == '反馈列表') {
+					this.page = 1
+					this.limit = 10
+					this.state = 2
+					this.dataSelect()
+				}
+			},
+			
+			// 获取数据列表
+			dataSelect() {
+				this.tableDataLoading = true
+				this.$http({
+					url: this.$http.adornUrl('adminevaluate/selectEvaluate'),
+					method: 'get',
+					params: this.$http.adornParams({
+						'page': this.page,
+						'limit': this.limit,
+						'satisfactionFlag': this.campus,
+						'indentNumber': this.indentNumber,
+						'nickName': this.nickName,
+						'riderName': this.riderName,
+					})
+				}).then(({
+					data
+				}) => {
+					this.tableDataLoading = false
+					let returnData = data.data;
+					this.tableData = returnData
+
+				})
+			},
+			select() {
+				this.page = 1
+				this.dataSelect()
+			},
+			// 重置
+			cleans() {
+				this.page = 1
+				this.campus = null
+				this.indentNumber = ''
+				this.nickName = ''
+				this.riderName = ''
+				this.dataSelect()
+			},
+		},
+		mounted() {
+			this.dataSelect()
+		}
+	};
+</script>
+
+<style>
+
+</style>

src/views/riderScheduling/riderScheduling.vue

@@ -102,7 +102,8 @@
 				center:'',
 				map:'',
 				lists:[],
-				index1:0,
+				index1:0,
+        adminUrl:'',
 			}
 		},
 		methods: {
@@ -158,8 +159,14 @@
 				                //标注点击事件
 				                qq.maps.event.addListener(marker, 'click', function () {
 									console.log('nnnnnnnn',latlngs[n].styleId)
-									var that = this
-									window.location.href="/userDetail?userId="+latlngs[n].styleId;
+									var that = this
+                  console.log("window.location.href",window.location.href)
+                  if(window.location.href=='https://daweilinli.com/wm-admin/'){
+                    window.location.href="/wm-admin/#/userDetail?userId="+latlngs[n].styleId;
+                  }else{
+                    window.location.href="/userDetail?userId="+latlngs[n].styleId;
+                  }
+
 										 // hash变化时触发
 										 window.onhashchange = function(){
 										    //  console.log('current hash:', window.location.hash);
@@ -241,11 +248,11 @@
 								obj['styleId'] = data.data[i].userId
 								arr.push(new qq.maps.LatLng(data.data[i].lat, data.data[i].lng))
 								arr1.push(obj)
-								
+
 							}
 						}
 						for (var j in data.data) {
-							
+
 							if(data.data[j].lat && data.data[j].lng){
 								this.longitude = data.data[j].lng
 								this.latitude = data.data[j].lat
@@ -260,7 +267,7 @@
 						this.setMap();
 
 					}else{
-						
+
 						this.longitude = '108.948024,'
 						this.latitude = '34.263161'
 						this.$message({
@@ -306,12 +313,26 @@
 				console.log('获取Ip定位成功----')
 				this.longitude = res.result.location.lng
 				this.latitude = res.result.location.lat
-			
+
 			}).catch(err => {
 				this.$toast('获取Ip定位失败--', err.message)
 			})
 			// this.getMyLocation()
-			this.dataSelect()
+			this.dataSelect()
+
+     this.$http({
+       url: this.$http.adornUrl('common/type/20'),
+       method: 'get',
+       data: this.$http.adornData({})
+      }).then(({
+        data
+      }) => {
+        if (data.code == 0) {
+
+          this.adminUrl = data.data.value
+          // this.xianshi2()
+        }
+      })
 
 		}
 	}

src/views/runErrands/bannerList.vue

@@ -287,7 +287,7 @@
 				page: 1,
 				limit: 10,
 				size: 5,
-				classify: 1,
+				classify: 7,
 				openValue: 1,
 				closeValue: 2,
 				name: '',

src/views/selfShop/shopAdmin.vue

@@ -102,7 +102,7 @@
       </el-table-column>
      <el-table-column prop="goodsLabel" label="标签">
       </el-table-column>
-      <el-table-column prop="salesVolume" label="商品销量">
+      <el-table-column prop="sales" label="商品销量">
       </el-table-column>
       <el-table-column prop="sort" label="排序" width="150">
       				<template slot-scope="scope">

src/views/selfShop/shopAmend.vue

@@ -43,7 +43,7 @@
 					<el-col :span="8">
 						<span>商品销量：</span>
 						<el-input style="width:200px;" class="margin15" placeholder="请输入商品销量" type="number" :min="0"
-							:controls="false" v-model="salesVolume" autosize></el-input>
+							:controls="false" v-model="sales" autosize></el-input>
 					</el-col>
 					<!-- <el-col :span="8">
             <span>库存：</span>
@@ -432,6 +432,7 @@
 				sku: [],
 				img: '',
 				salesVolume: '',
+				sales:'',
 				inventory: '',
 				goodsSynopsis: '',
 				status: 0,
@@ -666,6 +667,7 @@
 					this.originalMoney = returnData.originalMoney;
 					this.packMoney = returnData.packMoney
 					this.salesVolume = returnData.salesVolume;
+					this.sales = returnData.sales;
 					this.inventory = returnData.inventory;
 					this.classifyId = returnData.classifyId;
 					this.goodsDescribe = returnData.goodsDescribe;
@@ -795,7 +797,7 @@
 					return
 				}
 
-				if (this.salesVolume === '') {
+				if (this.sales === '') {
 					this.$notify({
 						title: '提示',
 						duration: 1800,
@@ -892,6 +894,7 @@
 						'packMoney': this.packMoney,
 						'memberPrice': this.memberPrice,
 						'salesVolume': this.salesVolume,
+						'sales':this.sales,
 						'inventory': this.inventory,
 						'goodsSynopsis': this.goodsSynopsis,
 						'status': this.status,

src/views/selfShop/shopPublish.vue

@@ -47,7 +47,7 @@
           <el-col :span="8">
             <span>商品销量：</span>
             <el-input style="width:200px;" class="margin15" placeholder="请输入商品销量" type="number" :min="0"
-              :controls="false" v-model="salesVolume" autosize></el-input>
+              :controls="false" v-model="sales" autosize></el-input>
           </el-col>
           <!-- <el-col :span="8">
             <span>库存：</span>
@@ -515,6 +515,7 @@
         sku: [],
         img: '',
         salesVolume: '',
+				sales:'',
         status: 0,
         goodsPicture: '',
         typeDatas: [],
@@ -693,6 +694,7 @@
 				this.inventory = ''
 				this.originalMoney = ''
 				this.salesVolume = ''
+				this.sales = ''
 				this.goodsDescribe = ''
 				this.postagePrice = ''
 				this.status = ''
@@ -820,7 +822,7 @@
         }
 
 
-        if (this.salesVolume == '') {
+        if (this.sales == '') {
           this.$notify({
             title: '提示',
             duration: 1800,
@@ -928,6 +930,7 @@
             'memberPrice': this.memberPrice,
             'inventory': this.inventory,
             'salesVolume': this.salesVolume,
+						'sales':this.sales,
             'status': this.status,
             'goodsCover': this.goodsCover,
             'goodsDescribe': this.goodsDescribe,
@@ -1192,6 +1195,7 @@
       this.inventory = ''
       this.originalMoney = ''
       this.salesVolume = ''
+			this.sales = ''
       this.goodsDescribe = ''
       this.postagePrice = ''
       this.status = ''

src/views/selfShop/specification.vue

@@ -265,7 +265,7 @@
       },
       handleClose(tag, j, item) {
         var detailarr = item.detail.split(',')
-        detailarr.splice(detailarr.indexOf('tag'), 1)
+        detailarr.splice(j, 1)
         if (detailarr.length < 1) {
           this.$message({
             title: '提示',
@@ -430,7 +430,7 @@
       },
       handleClose1(tag, j, item) {
         var detailarr = item.detail.split(',')
-        detailarr.splice(detailarr.indexOf('tag'), 1)
+        detailarr.splice(j, 1)
         if (detailarr.length < 1) {
           this.$message({
             title: '提示',

src/views/shopsList/pingjiaList.vue

@@ -10,15 +10,15 @@
     </div>
 
     <div style="margin:2% 0;display: inline-block;">
-     <div style="position: relative;display: inline-block;margin: 10px 0px;">
-       <span>筛选类型：</span>
-       <el-select v-model="grade" style="width:150px;margin-left: 10px;" @change="animeDat2(grade)">
-         <el-option v-for="item in scoreTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
-       </el-select>&nbsp;&nbsp;&nbsp;
-     </div>
-     <el-button style="margin-left:15px;" size="mini" type="primary" icon="document" @click="dataSelect">查询
-     </el-button>
-     <el-button style="margin-left:15px;" size="mini" type="primary" icon="document" @click="cleans2">重置</el-button>
+      <div style="position: relative;display: inline-block;margin: 10px 0px;">
+        <span>筛选类型：</span>
+        <el-select v-model="grade" style="width:150px;margin-left: 10px;" @change="animeDat2(grade)">
+          <el-option v-for="item in scoreTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
+        </el-select>&nbsp;&nbsp;&nbsp;
+      </div>
+      <el-button style="margin-left:15px;" size="mini" type="primary" icon="document" @click="dataSelect">查询
+      </el-button>
+      <el-button style="margin-left:15px;" size="mini" type="primary" icon="document" @click="cleans2">重置</el-button>
     </div>
     <el-table v-loading="tableDataLoading" :data="tableData.list">
       <el-table-column fixed prop="id" label="编号" width="80">
@@ -42,7 +42,8 @@
 
       <el-table-column prop="nickName" label="用户" width="150">
         <template slot-scope="scope">
-          <span style="color: #4f9dec;cursor: pointer;" @click='goUserInfo(scope.row.userId)'>{{scope.row.nickName ? scope.row.nickName : '暂无'}}</span>
+          <span style="color: #4f9dec;cursor: pointer;"
+            @click='goUserInfo(scope.row.userId)'>{{scope.row.nickName ? scope.row.nickName : '暂无'}}</span>
         </template>
       </el-table-column>
 
@@ -50,57 +51,63 @@
       </el-table-column>
       <el-table-column prop="score" label="评分" width="80">
       </el-table-column>
-<!--      <el-table-column prop="image" label="评价图" width="100">
+      <el-table-column prop="evaluateMessage" label="评论图片" width="280">
         <template slot-scope="scope">
-          <div style="display: inline-block; margin: 3px;">
-            <el-popover v-if="scope.row&&scope.row.newImage" placement="top-start" title="" trigger="hover" v-for="item in scope.row.newImage" :key="item">
-              <img style="width: 50px; height: 50px" :src="item" alt="" slot="reference">
-              <img style="width: 300px; height: auto" :src="item" alt="">
-            </el-popover>
+          <div v-if="scope.row.pictures">
+            <span v-for="(item,index) in scope.row.pictures.split(',')" :key="index">
+              <el-popover placement="top-start" title="" trigger="hover">
+                <img style="width: 50px; height: 50px;margin: 3px;" :src="item" alt="" slot="reference">
+                <img style="width: 200px; height: 200px" :src="item" alt="">
+              </el-popover>
+            </span>
           </div>
-
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column prop="evaluateMessage" label="评价内容">
         <template slot-scope="scope">
           <el-popover placement="top-start" title="" trigger="hover">
-            <div style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;overflow: hidden;max-height:80px;" slot="reference">{{scope.row.evaluateMessage}}</div>
+            <div
+              style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;overflow: hidden;max-height:80px;"
+              slot="reference">{{scope.row.evaluateMessage}}</div>
             <div style="width: 400px;">{{scope.row.evaluateMessage}}</div>
           </el-popover>
         </template>
       </el-table-column>
-			<el-table-column prop="evaluateMessage" label="评论图片" width="280">
-			  <template slot-scope="scope">
-			  	<div v-if="scope.row.pictures">
-			  		<span v-for="(item,index) in scope.row.pictures.split(',')" :key="index">
-			  			<el-popover placement="top-start" title="" trigger="hover">
-			  				<img style="width: 50px; height: 50px;margin: 3px;" :src="item" alt="" slot="reference">
-			  				<img style="width: 200px; height: 200px" :src="item" alt="">
-			  			</el-popover>
-			  		</span>
-			  	</div>
-			  </template>
-			</el-table-column>
+      <el-table-column prop="evaluateMessage" label="评论图片" width="280">
+        <template slot-scope="scope">
+          <div v-if="scope.row.pictures">
+            <span v-for="(item,index) in scope.row.pictures.split(',')" :key="index">
+              <el-popover placement="top-start" title="" trigger="hover">
+                <img style="width: 50px; height: 50px;margin: 3px;" :src="item" alt="" slot="reference">
+                <img style="width: 200px; height: 200px" :src="item" alt="">
+              </el-popover>
+            </span>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column prop="createTime" label="时间" width="150">
       </el-table-column>
       <el-table-column prop="shopReplyMessage" label="商家回复内容">
         <template slot-scope="scope">
           <el-popover placement="top-start" title="" trigger="hover">
-            <div style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;overflow: hidden;max-height:80px;" slot="reference">{{scope.row.shopReplyMessage}}</div>
+            <div
+              style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;overflow: hidden;max-height:80px;"
+              slot="reference">{{scope.row.shopReplyMessage}}</div>
             <div style="width: 400px;">{{scope.row.shopReplyMessage}}</div>
           </el-popover>
         </template>
       </el-table-column>
       <el-table-column prop="ordersPayMoney" label="操作" width="80">
-      	<template slot-scope="scope">
-      		<el-button size="mini" :disabled="!isAuth('shopsList:deletePl')" type="warning" icon="document" @click="deleteBtn(scope.row)">删除</el-button>
-      	</template>
+        <template slot-scope="scope">
+          <el-button size="mini" :disabled="!isAuth('shopsList:deletePl')" type="warning" icon="document"
+            @click="deleteBtn(scope.row)">删除</el-button>
+        </template>
       </el-table-column>
     </el-table>
     <div style="text-align: center;margin-top: 10px;">
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :page-sizes="[10, 20, 30, 40,100]" :page-size="limit" :current-page="page" layout="total,sizes, prev, pager, next"
-        :total="tableData.totalCount">
+        :page-sizes="[10, 20, 30, 40,100]" :page-size="limit" :current-page="page"
+        layout="total,sizes, prev, pager, next" :total="tableData.totalCount">
       </el-pagination>
     </div>
   </div>
@@ -114,10 +121,10 @@
         page: 1,
         activeName: 'first',
         tableDataLoading: false,
-        grade:'',
+        grade: '',
         dialogFormVisible: false,
         tableData: {},
-        scoreTypes: [{//后台定义 1 2差评 3 4中评 5是好评
+        scoreTypes: [{ //后台定义 1 2差评 3 4中评 5是好评
             label: '全部',
             value: ''
           },
@@ -134,25 +141,25 @@
             value: 3
           },
         ],
-        shopId:'',
+        shopId: '',
       }
     },
     methods: {
       //提交查询
       animeDat2(state) {
         this.page = 1
-        this.grade=state;
+        this.grade = state;
         this.dataSelect()
       },
 
-      cleans2(){
+      cleans2() {
         this.page = 1
-        this.grade='';
+        this.grade = '';
         this.dataSelect()
       },
 
       //查看用户详情
-      goUserInfo(userId){
+      goUserInfo(userId) {
         this.$router.push({
           path: '/userDetail',
           query: {
@@ -181,7 +188,7 @@
             'page': this.page,
             'limit': this.limit,
             'shopId': this.shopId,
-            'grade':this.grade,
+            'grade': this.grade,
           })
         }).then(({
           data
@@ -190,8 +197,8 @@
           let returnData = data.data.pageUtils;
 
           for (var i = 0; i < returnData.list.length; i++) {
-            if(returnData.list[0].image){
-              returnData.list[0].newImage=returnData.list[0].image.split(',')
+            if (returnData.list[0].image) {
+              returnData.list[0].newImage = returnData.list[0].image.split(',')
             }
           }
 
@@ -204,41 +211,40 @@
         this.$router.back()
       },
       // 删除评论
-      deleteBtn(row){
+      deleteBtn(row) {
         this.$confirm(`确定要删除评论吗?`, '提示', {
-        	confirmButtonText: '确定',
-        	cancelButtonText: '取消',
-        	type: 'warning'
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }).then(() => {
-        	this.$http({
-        		url: this.$http.adornUrl('admin/order/deleteEvaluate'),
-        		method: 'post',
-        		params: this.$http.adornParams({
-        			'evaluateId': row.id
-        		})
-        	}).then(({
-        		data
-        	}) => {
-        		if(data.code==0){
-        			this.$message({
-        				message: '取消成功',
-        				type: 'success',
-        				duration: 1500,
-        				onClose: () => {
-        					this.dataSelect()
-        				}
-        			})
-        		}else{
-        			this.$message({
-        				message: data.msg,
-        				type: 'warning',
-        				duration: 1500,
-        				onClose: () => {
-        				}
-        			})
-        		}
-
-        	})
+          this.$http({
+            url: this.$http.adornUrl('admin/order/deleteEvaluate'),
+            method: 'post',
+            params: this.$http.adornParams({
+              'evaluateId': row.id
+            })
+          }).then(({
+            data
+          }) => {
+            if (data.code == 0) {
+              this.$message({
+                message: '取消成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.dataSelect()
+                }
+              })
+            } else {
+              this.$message({
+                message: data.msg,
+                type: 'warning',
+                duration: 1500,
+                onClose: () => {}
+              })
+            }
+
+          })
         }).catch(() => {})
       },
     },
@@ -251,4 +257,4 @@
 
 <style>
 
-</style>
+</style>

src/views/shopsList/shopAdmin.vue

@@ -117,7 +117,7 @@
           </el-table-column>
           <el-table-column prop="goodsLabel" label="标签">
           </el-table-column>
-          <el-table-column prop="salesVolume" label="商品销量">
+          <el-table-column prop="sales" label="商品销量">
           </el-table-column>
           <el-table-column prop="sort" label="排序" width="150">
             <template slot-scope="scope">
@@ -318,7 +318,7 @@
           </el-table-column>
           <el-table-column prop="goodsLabel" label="标签">
           </el-table-column>
-          <el-table-column prop="salesVolume" label="商品销量">
+          <el-table-column prop="sales" label="商品销量">
           </el-table-column>
           <el-table-column prop="status" label="商品状态">
             <template slot-scope="scope">
@@ -1111,7 +1111,7 @@
       },
       handleClose(tag, j, item) {
         var detailarr = item.detail.split(',')
-        detailarr.splice(detailarr.indexOf('tag'), 1)
+        detailarr.splice(j, 1)
         if (detailarr.length < 1) {
           this.$message({
             title: '提示',
@@ -1256,7 +1256,7 @@
       },
       handleClose1(tag, j, item) {
         var detailarr = item.detail.split(',')
-        detailarr.splice(detailarr.indexOf('tag'), 1)
+        detailarr.splice(j, 1)
         if (detailarr.length < 1) {
           this.$message({
             title: '提示',

src/views/shopsList/shopsList.vue

@@ -1203,9 +1203,9 @@
 					this.sort =1
 				}
 				
-				if(rows.exemptErrandFlag==1){
-					this.exemptMinMoney = 0
-				}
+				// if(rows.exemptErrandFlag==1){
+				// 	this.exemptMinMoney = 0
+				// }
 				this.putawayFlag = rows.putawayFlag
 				this.distributionDistance = rows.distributionDistance
 				this.storeAddress = []

src/views/user/userDetail.vue

@@ -1215,7 +1215,7 @@
           </el-pagination>
         </div>
       </el-tab-pane>
-			<el-tab-pane label="我的评论" name="wdpl">
+			<el-tab-pane label="我评论的店铺" name="wdpl">
 			  <el-table v-loading="tableDataLoading" :data="pinglunsData.records">
 			    <el-table-column prop="id" label="编号" width="80">
 			    </el-table-column>
@@ -1257,6 +1257,88 @@
 			    </el-pagination>
 			  </div>
 			</el-tab-pane>
+			<el-tab-pane label="我评价的骑手" name="pinglun">
+				<div style="margin:2% 0;display: inline-block;">
+					<span>是否满意：</span>
+					<el-select v-model="campus" style="width:150px;margin-left: 10px;" @change="animeDat2(campus)">
+						<el-option v-for="item in homeData1" :key="item.value" :label="item.label" :value="item.value">
+						</el-option>
+					</el-select>&nbsp;&nbsp;&nbsp;
+				</div>
+				<el-table v-loading="tableDataLoading" :data="autonymData.records">
+					<el-table-column prop="evaluateId" label="编号" width="80">
+					</el-table-column>
+			
+					<el-table-column prop="indentNumber" label="评价订单号" width="200">
+					</el-table-column>
+			
+					<el-table-column prop="indent" label="骑手昵称" width="150">
+						<template slot-scope="scope">
+							<span v-if="scope.row.riderUser&&scope.row.riderUser.nickName"
+								style="color: #4f9dec;cursor: pointer;" @click="updates(scope.row.riderUserId)">
+								{{ scope.row.riderUser.nickName ? scope.row.riderUser.nickName : '未绑定' }}
+							</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="evaluateMessage" label="评价内容">
+					</el-table-column>
+					<el-table-column prop="satisfactionFlag" label="是否满意" width="160">
+						<template slot-scope="scope">
+							<span v-if="scope.row.satisfactionFlag == '0'">满意</span>
+							<span v-if="scope.row.satisfactionFlag == '1'">不满意</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="createTime" label="评价时间" width="160">
+					</el-table-column>
+				</el-table>
+				<div style="text-align: center;margin-top: 10px;">
+					<el-pagination @size-change="handleSizeChange9" @current-change="handleCurrentChange9"
+						:page-sizes="[10, 15, 20]" :page-size="limit" :current-page="page"
+						layout="total,sizes, prev, pager, next,jumper" :total="autonymData.total">
+					</el-pagination>
+				</div>
+			</el-tab-pane>
+			<el-tab-pane label="骑手的评价" name="qishou">
+				<div style="margin:2% 0;display: inline-block;">
+					<span>是否满意：</span>
+					<el-select v-model="campus" style="width:150px;margin-left: 10px;" @change="animeDat2(campus)">
+						<el-option v-for="item in homeData1" :key="item.value" :label="item.label" :value="item.value">
+						</el-option>
+					</el-select>&nbsp;&nbsp;&nbsp;
+				</div>
+				<el-table v-loading="tableDataLoading" :data="autonymData.records">
+					<el-table-column prop="evaluateId" label="编号" width="80">
+					</el-table-column>
+			
+					<el-table-column prop="indentNumber" label="评价订单号" width="200">
+					</el-table-column>
+					<el-table-column prop="indent" label="评价用户" width="150">
+						<template slot-scope="scope">
+							<span v-if="scope.row.user&&scope.row.user.nickName" style="color: #4f9dec;cursor: pointer;"
+								@click="updates(scope.row.userId)">
+								{{ scope.row.user.nickName ? scope.row.user.nickName : '未绑定' }}
+							</span>
+						</template>
+					</el-table-column>
+			
+					<el-table-column prop="evaluateMessage" label="评价内容">
+					</el-table-column>
+					<el-table-column prop="satisfactionFlag" label="是否满意" width="160">
+						<template slot-scope="scope">
+							<span v-if="scope.row.satisfactionFlag == '0'">满意</span>
+							<span v-if="scope.row.satisfactionFlag == '1'">不满意</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="createTime" label="评价时间" width="160">
+					</el-table-column>
+				</el-table>
+				<div style="text-align: center;margin-top: 10px;">
+					<el-pagination @size-change="handleSizeChange9" @current-change="handleCurrentChange9"
+						:page-sizes="[10, 15, 20]" :page-size="limit" :current-page="page"
+						layout="total,sizes, prev, pager, next,jumper" :total="autonymData.total">
+					</el-pagination>
+				</div>
+			</el-tab-pane>
       <!-- 不可提现添加金额 -->
       <el-dialog title="修改金额" :visible.sync="dialogFormVisible1" center>
         <div style="margin-bottom: 10px;">
@@ -1548,6 +1630,7 @@
           district: '', //区
         },
 				pinglunsData:{},
+				campus:'',
       }
     },
     methods: {
@@ -1717,11 +1800,23 @@
           this.page = 1
           this.liaotianSelectQs()
         }
-				if (tab._props.label == '我的评论') {
+				if (tab._props.label == '我评论的店铺') {
 				  this.limit = 10
 				  this.page = 1
 				  this.pinglunsSelect()
 				}
+				if (tab._props.label == '我评价的骑手') {
+					this.page = 1
+					this.limit = 10
+					this.types = 1
+					this.autonymSelect()
+				}
+				if (tab._props.label == '骑手的评价') {
+					this.page = 1
+					this.limit = 10
+					this.types = 2
+					this.autonymSelect()
+				}
 				
       },
       // 消息推送
@@ -1915,7 +2010,14 @@
 			  this.page = val
 			  this.pinglunsSelect()
 			},
-			
+			handleSizeChange91(val) {
+				this.limit = val
+				this.autonymSelect()
+			},
+			handleCurrentChange91(val) {
+				this.page = val
+				this.autonymSelect()
+			},
 			
       timeDate2() {
         this.rechargeSelect()
@@ -3011,6 +3113,42 @@
 			    this.pinglunsData = returnData
 			  })
 			},
+			// 我的评价
+			autonymSelect() {
+				let userId = this.$route.query.userId
+				if (this.types == 1) {
+					var userid1 = userId
+					var userid2 = ''
+				} else {
+					var userid1 = ''
+					var userid2 = userId
+				}
+				this.$http({
+					url: this.$http.adornUrl('adminevaluate/selectEvaluate'),
+					method: 'get',
+					params: this.$http.adornParams({
+						'userId': userid1,
+						'page': this.page,
+						'limit': this.limit,
+						'satisfactionFlag': this.campus,
+						'indentNumber': '',
+						'nickName': '',
+						'riderName': '',
+						'riderUserId': userid2,
+					})
+				}).then(({
+					data
+				}) => {
+			
+					this.tableDataLoading = false
+					let returnData = data.data
+					this.autonymData = returnData
+				})
+			},
+			// 筛选信息
+			animeDat2(state) {
+				this.autonymSelect()
+			},
     },
     mounted() {
       this.dataSelect()

src/views/user/userDetail1.vue

@@ -23,7 +23,7 @@
                   <td class="border-rt">
                     {{ tablenum.riderMoney ? `${tablenum.riderMoney}元` : '0元' }}
                   </td>
-                  <!-- <th>本月邀请数量</th>
+                  <!-- <th>本月邀请数量</th>`````````
                   <td class = "border-rt">{{ tablenum.inviteCount ? `${tablenum.inviteCount}人` : '0人' }}</td> -->
                 </tr>
                 <!-- <tr>
@@ -124,7 +124,7 @@
                 </tr>
                 <tr>
                   <th>微信名称</th>
-                  <td>{{ tableData.userName }}</td>
+                  <td>{{ tableData.nickName }}</td>
                   <th>支付宝账号</th>
                   <td>{{ tableData.zhiFuBao ? tableData.zhiFuBao : '未绑定' }}</td>
                   <th>支付宝姓名</th>
@@ -737,8 +737,8 @@
           </el-table-column>
           <el-table-column prop="riderlat" label="完成时骑手纬度度">
           </el-table-column>
-          <el-table-column prop="warrantyPeriod" label="保修期" width="160">
-          </el-table-column>
+          <!-- <el-table-column prop="warrantyPeriod" label="保修期" width="160">
+          </el-table-column> -->
           <el-table-column prop="createTime" label="创建时间" width="160">
           </el-table-column>
           <el-table-column prop="state" label="状态" fixed="right" width="160">
@@ -1215,7 +1215,130 @@
           </el-pagination>
         </div>
       </el-tab-pane>
-
+			<el-tab-pane label="我评论的店铺" name="wdpl">
+			  <el-table v-loading="tableDataLoading" :data="pinglunsData.records">
+			    <el-table-column prop="id" label="编号" width="80">
+			    </el-table-column>
+			    <el-table-column prop="shopName" label="商户名称">
+			    </el-table-column>
+			    <el-table-column prop="goodsName" label="商品名称">
+			    </el-table-column>
+				<el-table-column prop="orderNumber" label="订单号">
+				</el-table-column>
+			    <el-table-column prop="evaluateMessage" label="信息内容" width="280">
+			    </el-table-column>
+				<el-table-column prop="evaluateMessage" label="评论图片" width="280">
+				  <template slot-scope="scope">
+				  	<div v-if="scope.row.pictures">
+				  		<span v-for="(item,index) in scope.row.pictures.split(',')" :key="index">
+				  			<el-popover placement="top-start" title="" trigger="hover">
+				  				<img style="width: 50px; height: 50px;margin: 3px;" :src="item" alt="" slot="reference">
+				  				<img style="width: 200px; height: 200px" :src="item" alt="">
+				  			</el-popover>
+				  		</span>
+				  	</div>
+				  </template>
+				</el-table-column>
+				<el-table-column prop="shopReplyMessage" label="商家回复内容">
+				  <template slot-scope="scope">
+				    <el-popover placement="top-start" title="" trigger="hover">
+				      <div style="display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 3;overflow: hidden;max-height:80px;" slot="reference">{{scope.row.shopReplyMessage}}</div>
+				      <div style="width: 400px;">{{scope.row.shopReplyMessage}}</div>
+				    </el-popover>
+				  </template>
+				</el-table-column>
+			    <el-table-column prop="createTime" label="创建时间" width="150">
+			    </el-table-column>
+			  </el-table>
+			  <div style="text-align: center;margin-top: 10px;">
+			    <el-pagination @size-change="handleSizeChangePls" @current-change="handleCurrentChangePls"
+			      :page-sizes="[10, 20, 30, 50, 100]" :page-size="limit" :current-page="page"
+			      layout="total,sizes, prev, pager, next,jumper" :total="pinglunsData.total">
+			    </el-pagination>
+			  </div>
+			</el-tab-pane>
+			<el-tab-pane label="我评价的骑手" name="pinglun">
+				<div style="margin:2% 0;display: inline-block;">
+					<span>是否满意：</span>
+					<el-select v-model="campus" style="width:150px;margin-left: 10px;" @change="animeDat2(campus)">
+						<el-option v-for="item in homeData1" :key="item.value" :label="item.label" :value="item.value">
+						</el-option>
+					</el-select>&nbsp;&nbsp;&nbsp;
+				</div>
+				<el-table v-loading="tableDataLoading" :data="autonymData.records">
+					<el-table-column prop="evaluateId" label="编号" width="80">
+					</el-table-column>
+			
+					<el-table-column prop="indentNumber" label="评价订单号" width="200">
+					</el-table-column>
+			
+					<el-table-column prop="indent" label="骑手昵称" width="150">
+						<template slot-scope="scope">
+							<span v-if="scope.row.riderUser&&scope.row.riderUser.nickName"
+								style="color: #4f9dec;cursor: pointer;" @click="updates(scope.row.riderUserId)">
+								{{ scope.row.riderUser.nickName ? scope.row.riderUser.nickName : '未绑定' }}
+							</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="evaluateMessage" label="评价内容">
+					</el-table-column>
+					<el-table-column prop="satisfactionFlag" label="是否满意" width="160">
+						<template slot-scope="scope">
+							<span v-if="scope.row.satisfactionFlag == '0'">满意</span>
+							<span v-if="scope.row.satisfactionFlag == '1'">不满意</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="createTime" label="评价时间" width="160">
+					</el-table-column>
+				</el-table>
+				<div style="text-align: center;margin-top: 10px;">
+					<el-pagination @size-change="handleSizeChange9" @current-change="handleCurrentChange9"
+						:page-sizes="[10, 15, 20]" :page-size="limit" :current-page="page"
+						layout="total,sizes, prev, pager, next,jumper" :total="autonymData.total">
+					</el-pagination>
+				</div>
+			</el-tab-pane>
+			<el-tab-pane label="骑手的评价" name="qishou">
+				<div style="margin:2% 0;display: inline-block;">
+					<span>是否满意：</span>
+					<el-select v-model="campus" style="width:150px;margin-left: 10px;" @change="animeDat2(campus)">
+						<el-option v-for="item in homeData1" :key="item.value" :label="item.label" :value="item.value">
+						</el-option>
+					</el-select>&nbsp;&nbsp;&nbsp;
+				</div>
+				<el-table v-loading="tableDataLoading" :data="autonymData.records">
+					<el-table-column prop="evaluateId" label="编号" width="80">
+					</el-table-column>
+			
+					<el-table-column prop="indentNumber" label="评价订单号" width="200">
+					</el-table-column>
+					<el-table-column prop="indent" label="评价用户" width="150">
+						<template slot-scope="scope">
+							<span v-if="scope.row.user&&scope.row.user.nickName" style="color: #4f9dec;cursor: pointer;"
+								@click="updates(scope.row.userId)">
+								{{ scope.row.user.nickName ? scope.row.user.nickName : '未绑定' }}
+							</span>
+						</template>
+					</el-table-column>
+			
+					<el-table-column prop="evaluateMessage" label="评价内容">
+					</el-table-column>
+					<el-table-column prop="satisfactionFlag" label="是否满意" width="160">
+						<template slot-scope="scope">
+							<span v-if="scope.row.satisfactionFlag == '0'">满意</span>
+							<span v-if="scope.row.satisfactionFlag == '1'">不满意</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="createTime" label="评价时间" width="160">
+					</el-table-column>
+				</el-table>
+				<div style="text-align: center;margin-top: 10px;">
+					<el-pagination @size-change="handleSizeChange9" @current-change="handleCurrentChange9"
+						:page-sizes="[10, 15, 20]" :page-size="limit" :current-page="page"
+						layout="total,sizes, prev, pager, next,jumper" :total="autonymData.total">
+					</el-pagination>
+				</div>
+			</el-tab-pane>
       <!-- 不可提现添加金额 -->
       <el-dialog title="修改金额" :visible.sync="dialogFormVisible1" center>
         <div style="margin-bottom: 10px;">
@@ -1506,6 +1629,8 @@
           city: '', //市
           district: '', //区
         },
+				pinglunsData:{},
+				campus:'',
       }
     },
     methods: {
@@ -1675,6 +1800,24 @@
           this.page = 1
           this.liaotianSelectQs()
         }
+				if (tab._props.label == '我评论的店铺') {
+				  this.limit = 10
+				  this.page = 1
+				  this.pinglunsSelect()
+				}
+				if (tab._props.label == '我评价的骑手') {
+					this.page = 1
+					this.limit = 10
+					this.types = 1
+					this.autonymSelect()
+				}
+				if (tab._props.label == '骑手的评价') {
+					this.page = 1
+					this.limit = 10
+					this.types = 2
+					this.autonymSelect()
+				}
+				
       },
       // 消息推送
       magNotice() {
@@ -1859,6 +2002,23 @@
         this.page = val
         this.liaotianSelect()
       },
+			handleSizeChangePls(val) {
+			  this.limit = val
+			  this.pinglunsSelect()
+			},
+			handleCurrentChangePls(val) {
+			  this.page = val
+			  this.pinglunsSelect()
+			},
+			handleSizeChange91(val) {
+				this.limit = val
+				this.autonymSelect()
+			},
+			handleCurrentChange91(val) {
+				this.page = val
+				this.autonymSelect()
+			},
+			
       timeDate2() {
         this.rechargeSelect()
       },
@@ -2933,6 +3093,62 @@
           this.huihuaData = returnData
         })
       },
+			// 我的评论
+			pinglunsSelect() {
+				let userId = this.$route.query.userId
+			  this.tableDataLoading = true
+			  this.$http({
+			    url: this.$http.adornUrl('admin/order/getEvaluateList'),
+			    method: 'get',
+			    params: this.$http.adornParams({
+			      'page': this.page,
+			      'limit': this.limit,
+			      'userId': userId,
+			    })
+			  }).then(({
+			    data
+			  }) => {
+			    this.tableDataLoading = false
+			    let returnData = data.data;
+			    this.pinglunsData = returnData
+			  })
+			},
+			// 我的评价
+			autonymSelect() {
+				let userId = this.$route.query.userId
+				if (this.types == 1) {
+					var userid1 = userId
+					var userid2 = ''
+				} else {
+					var userid1 = ''
+					var userid2 = userId
+				}
+				this.$http({
+					url: this.$http.adornUrl('adminevaluate/selectEvaluate'),
+					method: 'get',
+					params: this.$http.adornParams({
+						'userId': userid1,
+						'page': this.page,
+						'limit': this.limit,
+						'satisfactionFlag': this.campus,
+						'indentNumber': '',
+						'nickName': '',
+						'riderName': '',
+						'riderUserId': userid2,
+					})
+				}).then(({
+					data
+				}) => {
+			
+					this.tableDataLoading = false
+					let returnData = data.data
+					this.autonymData = returnData
+				})
+			},
+			// 筛选信息
+			animeDat2(state) {
+				this.autonymSelect()
+			},
     },
     mounted() {
       this.dataSelect()