更新骑手送达短信记录和满减问题

src/router/index.js

@@ -85,6 +85,10 @@ const mainRoutes = {
 
   {path: '/missionRun', component: _import('runErrands/mission'), name: 'missionRun', meta: { title: '跑腿任务',isTab: true} },
   {path: '/orderCenterRun', component: _import('runErrands/orderCenter'), name: 'orderCenterRun', meta: { title: '跑腿订单',isTab: true} },
+
+  {path: '/duanxinlistRun', component: _import('runErrands/duanxinlist'), name: 'duanxinlistRun', meta: { title: '短信记录',isTab: true} },
+  {path: '/duanxinmobanRun', component: _import('runErrands/duanxinmoban'), name: 'duanxinmobanRun', meta: { title: '短信模板记录',isTab: true} },
+
   {path: '/financeListRun', component: _import('runErrands/financeList'), name: 'financeListRun', meta: { title: '跑腿财务中心',isTab: true} },
   {path: '/business', component: _import('business/business'), name: 'business', meta: {title: '申诉中心', isTab: true}},
   {path: '/autonym', component: _import('autonym/autonym'), name: 'autonym', meta: { title: '实名认证',isTab: true} },
@@ -148,7 +152,9 @@ router.beforeEach((to, from, next) => {
   // 添加动态(菜单)路由
   // 1. 已经添加 or 全局路由, 直接访问
   // 2. 获取菜单列表, 添加并保存本地存储
+  console.log(userId,'测试',menuList)
   if(userId!='' && menuList &&( menuList=='[]' || menuList.length==0)){
+    console.log(userId,'测试1221')
   	http({
   		url: http.adornUrl('sys/menu/nav'),
   		method: 'get',
@@ -171,8 +177,10 @@ router.beforeEach((to, from, next) => {
   		router.push({name: 'login'})
   	})
   }else if (router.options.isAddDynamicMenuRoutes || fnCurrentRouteType(to, globalRoutes) === 'global') {
+    console.log(userId,'测试12')
     next()
   } else {
+    console.log(userId,'测试123')
     http({
       url: http.adornUrl('sys/menu/nav'),
       method: 'get',
@@ -219,6 +227,7 @@ function fnCurrentRouteType (route, globalRoutes = []) {
  */
 function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
   var temp = []
+  console.log(menuList,'list列表')
   for (var i = 0; i < menuList.length; i++) {
     if (menuList[i].list && menuList[i].list.length >= 1) {
       temp = temp.concat(menuList[i].list)
@@ -249,6 +258,7 @@ function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
       routes.push(route)
     }
   }
+  console.log(temp,'路由')
   if (temp.length >= 1) {
     fnAddDynamicMenuRoutes(temp, routes)
   } else {

src/utils/httpRequest.js

@@ -44,7 +44,8 @@ http.interceptors.response.use(response => {
 http.adornUrl = (actionName) => {
   // 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截!
   // return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl) + actionName
-	return 'https://mxys.chuanghai-tech.com/sqx_fast/' + actionName
+	// return 'https://mxys.chuanghai-tech.com/sqx_fast/' + actionName
+  return 'https://www.daweilinli.com/sqx_fast/' + actionName
 	// return 'http://192.168.0.131:8171/sqx_fast/' + actionName
 }
 

src/views/finance/financeList.vue

@@ -18,6 +18,14 @@
 						<icon-svg name="shousuo" class="site-sidebar__menu-icon"></icon-svg>
 					</span>
 				</div>
+				<div style="position: relative;display: inline-block;margin:5px;">
+					<span>店铺名称：</span>
+					<el-input style="width: 200px;" @keydown.enter.native="phoneSelect" placeholder="请输入店铺名称"
+						v-model="shopName"></el-input>&nbsp;&nbsp;
+					<span @click="phoneSelect" style="position: absolute;right: 18px;top:8px;">
+						<icon-svg name="shousuo" class="site-sidebar__menu-icon"></icon-svg>
+					</span>
+				</div>
 				<!-- <div style="margin:5px;display: inline-block;">
 					<span>手机号:</span>
 					<el-input style="width: 150px;" @keydown.enter.native="phoneSelect" clearable placeholder="请输入手机号"
@@ -43,6 +51,9 @@
 						type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择截止时间">
 					</el-date-picker>
 				</div>
+				<div style="position: relative;display: inline-block;margin:5px;">
+					<span>提现总金额：{{ totalMoney }}</span>
+				</div>
 			</div>
 			<div style="display: inline-block;">
 				<el-button style="margin:10px;" size="mini" type="primary" icon="document" @click="phoneSelect">查询
@@ -68,6 +79,14 @@
 						<span v-if="scope.row.classify==2">微信提现</span>
 					</template>
 				</el-table-column>
+				<el-table-column prop="orderNumber" label="转账订单号" width="150">
+				</el-table-column>
+				<el-table-column prop="shopName" label="店铺名称" width="100">
+					<template slot-scope="scope">
+						<span v-if="scope.row.shopName">{{scope.row.shopName!='null' ? scope.row.shopName : '无'}}</span>
+						<span v-else>无</span>
+					</template>
+				</el-table-column>
 				<el-table-column prop="zhifubao" label="支付宝账号" width="150">
 					<template slot-scope="scope">
 						<span style="color: #4f9dec;cursor: pointer;" @click="updates(scope.row)"
@@ -96,6 +115,10 @@
 				</el-table-column>
 				<el-table-column prop="money" label="提现金额" width="100">
 				</el-table-column>
+				<el-table-column prop="rate" label="手续费" width="100">
+				</el-table-column>
+				<el-table-column prop="currentBalance" label="当前余额" width="100">
+				</el-table-column>
 				<el-table-column prop="state" label="状态" width="100">
 					<template slot-scope="scope">
 						<span style="color: #4f9dec;cursor: pointer;" v-if="scope.row.state == 0">待转账</span>
@@ -109,8 +132,7 @@
 				</el-table-column>
 				<el-table-column prop="outAt" label="转账/拒绝时间" width="180">
 				</el-table-column>
-				<el-table-column prop="orderNumber" label="转账订单号" width="150">
-				</el-table-column>
+				
 				<el-table-column fixed="right" label="操作" width="150">
 					<template slot-scope="scope">
 						<el-button size="mini" type="primary" :disabled="!isAuth('financeList:transfer')||scope.row.state != 0"
@@ -418,6 +440,81 @@
         </el-col> -->
 			</el-row>
 		</el-tab-pane>
+		<!-- 保证金记录 -->
+		<el-tab-pane label="保证金记录" name="sevened">
+			<div style="margin:2% 0;display: inline-block;">
+				<div style="position: relative;display: inline-block;margin:5px;">
+					<span>店铺名称：</span>
+					<el-input style="width: 200px;" @keydown.enter.native="baozhengSelect" placeholder="请输入店铺名称"
+						v-model="shopName3"></el-input>&nbsp;&nbsp;
+					<span @click="baozhengSelect" style="position: absolute;right: 18px;top:8px;">
+						<icon-svg name="shousuo" class="site-sidebar__menu-icon"></icon-svg>
+					</span>
+				</div>
+				<div style="position: relative;display: inline-block;">
+					<span>状态：</span>
+					<el-select v-model="indentState3" style="width:150px;margin-left: 10px;"
+						@change="baozhengSelect(indentState3)">
+						<el-option v-for="item in statesnum3" :key="item.value" :label="item.label" :value="item.value">
+						</el-option>
+					</el-select>&nbsp;&nbsp;
+				</div>
+				<div style="margin:5px;display: inline-block;">
+					<span>开始时间：</span>
+					<el-date-picker style="width: 160px;margin-left: 10px;" v-model="startTime" align="right"
+						type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始时间">
+					</el-date-picker>&nbsp;&nbsp;&nbsp;
+				</div>
+				<div style="margin:5px;display: inline-block;">
+					<span>截止时间：</span>
+					<el-date-picker style="width: 160px;margin-left: 10px;" v-model="endTime" align="right"
+						type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择截止时间">
+					</el-date-picker>
+				</div>
+				<div style="position: relative;display: inline-block;margin:5px;">
+					<span>保证金提现总额：{{ totalbaoMoney }}</span>
+				</div>
+			</div>
+			<div style="display: inline-block;">
+				<el-button style="margin:10px;" size="mini" type="primary" icon="document" @click="baozhengcha">查询
+				</el-button>
+				<el-button style="margin:10px;" size="mini" type="primary" icon="document" @click="cleans3">重置
+				</el-button>
+				<el-button style='margin-left:15px;' size="mini" type="warning" icon="document" @click="exportBtn3" >导出Excel
+				</el-button>
+			</div>
+			<div style="color: orange;"> * 导出提示：导出数据前请进行时间或者状态等筛选，否则导出数据量过多易出现卡顿或系统崩溃</div>
+			<el-table v-loading="tableDataLoading" :data="baozhengData">
+				<el-table-column type="selection">
+				</el-table-column>
+				<el-table-column fixed prop="id" label="编号">
+				</el-table-column>
+				<el-table-column prop="shopName3" label="店铺名称">
+					<template slot-scope="scope">
+						<span v-if="scope.row.shopName">{{scope.row.shopName!='null' ? scope.row.shopName : '无'}}</span>
+						<span v-else>无</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="content" label="保证金金额">
+				</el-table-column>
+				<el-table-column prop="type" label="状态">
+					<template slot-scope="scope">
+						<span v-if="scope.row.type == 1">充值</span>
+						<span v-if="scope.row.type == 2">提现</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="createTime" label="提现时间">
+				</el-table-column>
+				<!-- <el-table-column prop="orderNumber" label="保证金订单号"> -->
+				</el-table-column>
+			</el-table>
+			<div style="text-align: center;margin-top: 10px;">
+				<el-pagination @size-change="handleSizeChange2" @current-change="handleCurrentChange2"
+					:page-sizes="[10, 15, 20, 30]" :page-size="limit" :current-page="page"
+					layout="total,sizes, prev, pager, next" :total="totalnum3">
+				</el-pagination>
+			</div>
+		</el-tab-pane>
 
 	</el-tabs>
 </template>
@@ -465,8 +562,25 @@
 						label: '已拒绝'
 					}
 				],
+				indentState3: '',
+				statesnum3: [{
+						value: '',
+						label: '全部'
+					},
+					{
+						value: 1,
+						label: '充值'
+					}, {
+						value: 2,
+						label: '提现'
+					}
+				],
 				phone: '',
 				zhifubaoName: '',
+				shopName:'',
+				shopName3:'',
+				totalMoney:'',//提现总金额
+				totalbaoMoney:'',//保证金提现总额
 				content: '',
 				startTime: '',
 				endTime: '',
@@ -474,6 +588,7 @@
 				type: -1,
 				totalnum: 0,
 				totalnum2: 0,
+				totalnum3: 0,
 				sqxTotal: '',
 				userTotal: '',
 				taunTotal: '',
@@ -490,6 +605,7 @@
 				tableDataLoading2: false,
 				tableDataLoading3: false,
 				tableData: [],
+				baozhengData:[],
 				rechargeData: [],
 				rechgeData: {},
 				withdrawData: {},
@@ -824,7 +940,7 @@
 				this.$set(this.info, 'stockDate', defaultDate)
 			},
 			handleSizeChange(val) {
-				this.size = val
+				this.limit = val
 				this.dataSelect()
 			},
 			handleCurrentChange(val) {
@@ -832,13 +948,21 @@
 				this.dataSelect()
 			},
 			handleSizeChange1(val) {
-				this.size = val
+				this.limit = val
 				this.rechargeSelect()
 			},
 			handleCurrentChange1(val) {
 				this.page = val
 				this.rechargeSelect()
 			},
+			handleSizeChange2(val) {
+				this.limit = val
+				this.baozhengSelect()
+			},
+			handleCurrentChange2(val) {
+				this.page = val
+				this.baozhengSelect()
+			},
 			handleClick(tab, event) {
 				if (tab._props.label == '提现管理') {
 					this.page = 1
@@ -861,6 +985,10 @@
 					this.page = 1
 					this.limit = 10
 					this.rechargeSelect()
+				}if (tab._props.label == '保证金记录') {
+					this.page = 1
+					this.limit = 10
+					this.baozhengSelect()
 				}
 			},
 			// 支付宝账号查询
@@ -891,6 +1019,20 @@
 					this.tableData = returnData.list
 					this.totalnum = returnData.totalCount
 				})
+				//提现总金额
+				this.$http({
+					url: this.$http.adornUrl('cash/selectPayTotal'),
+					method: 'get',
+					params: this.$http.adornParams({
+						'page': this.page,
+						'limit': this.limit,
+						'zhifubao': this.zhifubao
+					})
+				}).then(({
+					data
+				}) => {
+					this.totalMoney=data.data
+				})
 			},
 			// 支付宝名称
 			qdselect() {
@@ -920,6 +1062,20 @@
 					this.tableData = returnData.list
 					this.totalnum = returnData.totalCount
 				})
+				//提现总金额
+				this.$http({
+					url: this.$http.adornUrl('cash/selectPayTotal'),
+					method: 'get',
+					params: this.$http.adornParams({
+						'page': this.page,
+						'limit': this.limit,
+						'zhifubaoName': this.zhifubaoName
+					})
+				}).then(({
+					data
+				}) => {
+					this.totalMoney=data.data
+				})
 			},
 			// 获取数据列表
 			dataSelect() {
@@ -931,6 +1087,7 @@
 						'page': this.page,
 						'limit': this.limit,
 						'zhifubaoName': this.zhifubaoName,
+						'shopName':this.shopName,
 						'zhifubao': this.zhifubao,
 						'type': 2,
 						'state': this.indentState,
@@ -946,6 +1103,69 @@
 					this.tableData = returnData.list
 					this.totalnum = returnData.totalCount
 				})
+				//提现总金额
+				this.$http({
+					url: this.$http.adornUrl('cash/selectPayTotal'),
+					method: 'get',
+					params: this.$http.adornParams({
+						// 'page': this.page,
+						// 'limit': this.limit,
+						'zhifubaoName': this.zhifubaoName,
+						'shopName':this.shopName,
+						'zhifubao': this.zhifubao,
+						'type': 2,
+						'state': this.indentState,
+						'phone': this.phone,
+						'startTime': this.startTime,
+						'endTime': this.endTime,
+					})
+				}).then(({
+					data
+				}) => {
+					this.totalMoney=data.data
+				})
+			},
+			// 保证金记录
+			baozhengSelect() {
+				this.tableDataLoading = true
+				this.$http({
+					url: this.$http.adornUrl('/wallet/list'),
+					method: 'get',
+					params: this.$http.adornParams({
+						'page': this.page,
+						'limit': this.limit,
+						'shopName':this.shopName3,
+						'type': this.indentState3,
+						'classify': 2,
+						'startTime': this.startTime,
+						'endTime': this.endTime,
+					})
+				}).then(({
+					data
+				}) => {
+					this.tableDataLoading = false
+					let returnData = data.data
+					this.baozhengData = returnData.list
+					this.totalnum3 = returnData.totalCount
+				})
+				//保证金提现总金额
+				this.$http({
+					url: this.$http.adornUrl('/wallet/statistics'),
+					method: 'get',
+					params: this.$http.adornParams({
+						// 'page': this.page,
+						// 'limit': this.limit,
+						'shopName':this.shopName3,
+						'type': this.indentState3,
+						'classify': 2,
+						'startTime': this.startTime,
+						'endTime': this.endTime,
+					})
+				}).then(({
+					data
+				}) => {
+					this.totalbaoMoney=data.data
+				})
 			},
 			// 收入统计
 			incomeSelect() {
@@ -1056,6 +1276,7 @@
 			cleans2() {
 				this.zhifubao = ''
 				this.zhifubaoName = ''
+				this.shopName=''
 				this.page = 1
 				this.indentState = ''
 				this.phone = ''
@@ -1063,6 +1284,20 @@
 				this.endTime = ''
 				this.dataSelect()
 			},
+			//保证金查询
+			baozhengcha() {
+				this.page = 1
+				this.baozhengSelect()
+			},
+			// 保证金重置
+			cleans3() {
+				this.shopName3=''
+				this.page = 1
+				this.indentState3 = ''
+				this.startTime = ''
+				this.endTime = ''
+				this.baozhengSelect()
+			},
 			// 导出
 			exportBtn() {
 				
@@ -1074,6 +1309,7 @@
 						// 'page': page,
 						// 'size': this.size,
 						'zhifubaoName': this.zhifubaoName,
+						'shopName':this.shopName,
 						'zhifubao': this.zhifubao,
 						'type': 2,
 						'state': this.indentState,
@@ -1101,6 +1337,42 @@
 					}
 				})
 			},
+			// 保证金导出
+			exportBtn3() {
+				
+				this.$http({
+					url: this.$http.adornUrl('cash/excelPayDetails'),
+					method: 'get',
+					responseType: 'blob',
+					params: this.$http.adornParams({
+						// 'page': page,
+						// 'size': this.size,
+						'shopName':this.shopName3,
+						'type': this.indentState3,
+						'classify':2 ,
+						'startTime': this.startTime,
+						'endTime': this.endTime,
+					})
+				}).then(({
+					data
+				}) => {
+					let blob = new Blob([data], {
+						type: 'application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+					})
+					if (window.navigator.msSaveOrOpenBlob) {
+						navigator.msSaveBlob(blob)
+					} else {
+						let url = window.URL.createObjectURL(blob)
+						let elink = document.createElement('a')
+						elink.download = '提现记录列表.xlsx'
+						elink.style.display = 'none'
+						elink.href = url
+						document.body.appendChild(elink)
+						elink.click()
+						document.body.removeChild(elink)
+					}
+				})
+			},
 		},
 		mounted() {
 			this.dataSelect()
@@ -1139,4 +1411,4 @@
 	.text_color span {
 		margin-right: 5px;
 	}
-</style>
+</style>

src/views/mission/mission.vue

@@ -388,7 +388,10 @@
 			</div>
 		</el-dialog>
 
+
 	</el-tabs>
+	
+	
 </template>
 
 <script>

src/views/riderScheduling/riderScheduling.vue

@@ -102,7 +102,7 @@
 				center:'',
 				map:'',
 				lists:[],
-				index1:0,
+				index1:0,
         adminUrl:'',
 			}
 		},
@@ -159,12 +159,12 @@
 				                //标注点击事件
 				                qq.maps.event.addListener(marker, 'click', function () {
 									console.log('nnnnnnnn',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;
+									var that = this
+                  console.log("window.location.href",window.location.href)
+                  if(window.location.href=='https://mxys.chuanghai-tech.com/wm-admin/'){
+                    window.location.href="/wm-admin/#/userDetail?userId="+latlngs[n].styleId;
+                  }else{
+                    window.location.href="/userDetail?userId="+latlngs[n].styleId;
                   }
 
 										 // hash变化时触发
@@ -318,20 +318,20 @@
 				this.$toast('获取Ip定位失败--', err.message)
 			})
 			// this.getMyLocation()
-			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()
-        }
+			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/duanxinlist.vue

@@ -0,0 +1,224 @@
+<template>
+	<div>
+		<div style="display: inline-block;">
+			<span>状态：</span>
+			<el-select v-model="successFlag" style="width:150px;margin-left: 10px;" @change="select()">
+				<el-option v-for="item in statesnum2" :key="item.value" :label="item.label" :value="item.value">
+				</el-option>
+			</el-select>&nbsp;&nbsp;
+			<div style="position: relative;display: inline-block;">
+				<span>订单id：</span>
+				<el-input style="width: 200px;" @keydown.enter.native="select" placeholder="请输入订单编号" v-model="orderId">
+				</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="sendTo">
+				</el-input>&nbsp;&nbsp;
+			</div>
+			<div style="margin:5px;display: inline-block;">
+					<span>开始时间：</span>
+					<el-date-picker style="width: 160px;margin-left: 10px;" v-model="startTime" align="right"
+						type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始时间">
+					</el-date-picker>&nbsp;&nbsp;&nbsp;
+				</div>
+				<div style="margin:5px;display: inline-block;">
+					<span>截止时间：</span>
+					<el-date-picker style="width: 160px;margin-left: 10px;" v-model="endTime" align="right"
+						type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择截止时间">
+					</el-date-picker>
+				</div>
+			<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>
+			<!-- <el-button style='margin:0 0 20px 20px;' v-if="isAuth('autonym:tongguo')" size="mini" type="primary"
+				icon="document" @click="passClick()" :disabled="checkBoxData.length <= 0">通过</el-button> -->
+		</div>
+		<el-table v-loading="tableDataLoading" :data="duanxinData.list">
+		  <el-table-column fixed prop="complaintId" label="编号" width="80">
+			 <template slot-scope="scope">
+					  <span>{{scope.$index+1}}</span>
+				  </template>
+		  </el-table-column>
+		  <el-table-column prop="orderId" label="订单id" width="200" align="center">
+		  </el-table-column>
+		  <el-table-column prop="successFlag" label="发送状态" width="150">
+			<template slot-scope="scope">
+					  <div v-if="scope.row.successFlag==0">发送失败</div>
+					  <div v-if="scope.row.successFlag==1">发送成功</div>
+				  </template>
+		  </el-table-column>
+		  <el-table-column prop="sendContent" label="短信内容" width="180"></el-table-column>
+		  <el-table-column prop="sendResult" label="发送结果" width="120" align="center">
+		  </el-table-column>
+		  <el-table-column prop="sendTo" label="接受人" width="180"></el-table-column>
+		  <el-table-column prop="sendTime" label="发送时间" width="100"></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="duanxinData.totalCount">
+			</el-pagination>
+		</div>
+	</div>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				limit: 10,
+				page: 1,
+				activeName: 'first',
+				tableDataLoading: false,
+				dialogFormVisible: false,
+				tableData: [],
+				checkBoxData: [], //多选框选择的值
+				helpTakeId:'',
+				info: {
+					stockDate: this.getNowTime(), //日期
+				},
+				info1: {
+					stockDate1: this.getNowTime1(), //日期
+				},
+				info2: {
+					stockDate2: this.getNowTime2(), //日期
+				},
+				startTime: '',
+				endTime: '',
+				orderId:'',
+				sendTo:'',
+				statesnum2: [{
+					label: '全部',
+					value: ''
+					},
+					{
+					label: '发送成功',
+					value: 1
+					},
+					{
+					label: '发送失败',
+					value: 0
+					},
+				],
+				successFlag:'',
+				duanxinData:[],
+				// info: {
+				// 	stockDate: this.getNowTime(), //日期
+				// },
+				// info1: {
+				// 	stockDate1: this.getNowTime1(), //日期
+				// },
+				// info2: {
+				// 	stockDate2: this.getNowTime2(), //日期
+				// },
+			}
+		},
+		methods: {
+			handleSizeChange(val) {
+				this.limit = val;
+				this.dataSelect()
+			},
+			handleCurrentChange(val) {
+				this.page = val;
+				this.dataSelect()
+			},
+			//处理默认选中当前日期
+			getNowTime1() {
+				var now = new Date();
+				var year = now.getFullYear(); //得到年份
+				var month = now.getMonth(); //得到月份
+				var date = now.getDate(); //得到日期
+				var hh = now.getHours() < 10 ? "0" + now.getHours() : now.getHours();
+				var mm = now.getMinutes() < 10 ? "0" + now.getMinutes() : now.getMinutes();
+				var ss = now.getSeconds() < 10 ? "0" + now.getSeconds() : now.getSeconds();
+				month = month + 1;
+				month = month.toString().padStart(2, "0");
+				date = date.toString().padStart(2, "0");
+				var defaultDate = `${year}-${month}-${date} ${hh}:${mm}:${ss}`;
+				return defaultDate;
+				this.$set(this.info, "stockDate", defaultDate);
+			},
+			getNowTime2() {
+				var now = new Date();
+				var year = now.getFullYear(); //得到年份
+				var month = now.getMonth(); //得到月份
+				var date = now.getDate(); //得到日期
+				month = month + 1;
+				month = month.toString().padStart(2, "0");
+				date = date.toString().padStart(2, "0");
+				var defaultDate = `${year}-${month}-${date}`;
+				return defaultDate;
+				this.$set(this.info, "stockDate", defaultDate);
+			},
+			//处理默认选中当前日期
+			getNowTime() {
+				var now = new Date()
+				var year = now.getFullYear() //得到年份
+				var month = now.getMonth() - now.getMonth() //得到月份
+				var date = now.getDate() - now.getDate() + 1 //得到日期
+				month = month + 1
+				month = month.toString().padStart(2, '0')
+				date = date.toString().padStart(2, '0')
+				var defaultDate = `${year}-${month}-${date}`
+				return defaultDate
+				this.$set(this.info, 'stockDate', defaultDate)
+			},
+			// 查询
+			select() {
+				this.page = 1
+				this.limit = 10
+				this.dataSelect()
+			},
+			// 重置
+			cleans() {
+				this.orderId = ''
+				this.successFlag = ''
+				this.sendTo = ''
+				this.startTime = ''
+				this.endTime = ''
+				this.page = 1
+				this.dataSelect()
+			},
+			// 获取派单数据列表
+			dataSelect() {
+				// if (this.endTime == '') {
+				// 	  this.endTime = this.info2.stockDate2
+				//   }
+				//   if (this.startTime == '') {
+				// 	  this.startTime = this.info.stockDate
+				//   }
+				this.tableDataLoading = true
+				this.$http({
+					url: this.$http.adornUrl('admin/tb-indent-sms/log'),
+					method: 'get',
+					params: this.$http.adornParams({
+					'page': this.page,
+					'limit': this.limit,
+					'orderId': this.orderId,//订单id
+					'successFlag': this.successFlag,//是否发送成功
+					'sendTo': this.sendTo,//接受人
+					'startTime': this.startTime,//开始时间
+					'endTime': this.endTime,//结束时间
+					})
+				}).then(({
+					data
+				}) => {
+					if (data && data.code === 0) {
+					this.tableDataLoading = false
+					let returnData = data.data
+					this.duanxinData = returnData
+					}
+				})
+			}
+		},
+		mounted() {
+			this.dataSelect()
+		}
+	};
+</script>
+
+<style>
+
+</style>

src/views/runErrands/duanxinmoban.vue

@@ -0,0 +1,304 @@
+<template>
+	<div>
+		<div style="display: inline-block;">
+			<span>状态：</span>
+			<el-select v-model="status1" style="width:150px;margin-left: 10px;" @change="select()">
+				<el-option v-for="item in statesnum2" :key="item.value" :label="item.label" :value="item.value">
+				</el-option>
+			</el-select>&nbsp;&nbsp;
+			<div style="position: relative;display: inline-block;">
+				<span>模板名称：</span>
+				<el-input style="width: 200px;" @keydown.enter.native="select" placeholder="请输入模板名称" v-model="templateName1">
+				</el-input>&nbsp;&nbsp;
+			</div>
+			<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>
+			<!-- <el-button style='margin:0 0 20px 20px;' v-if="isAuth('autonym:tongguo')" size="mini" type="primary"
+				icon="document" @click="passClick()" :disabled="checkBoxData.length <= 0">通过</el-button> -->
+		</div>
+		<div style="float: right;margin-right:2%;">
+			<el-button :disabled="!isAuth('duanxinmoban:add')" icon="document" size="mini" style="margin: 10px 0;"
+				type="primary" @click="addNotice">添加模板</el-button>
+		</div>
+		<el-table v-loading="tableDataLoading" :data="duanxinData.list">
+		  <el-table-column fixed prop="complaintId" label="编号" width="80">
+			 <template slot-scope="scope">
+					  <span>{{scope.$index+1}}</span>
+				  </template>
+		  </el-table-column>
+		  <el-table-column prop="id" label="订单id" width="200" align="center">
+		  </el-table-column>
+		  <el-table-column prop="status" label="状态" width="150">
+			<template slot-scope="scope">
+					  <div v-if="scope.row.status=='1'">启用</div>
+					  <div v-if="scope.row.status=='0'">不启用</div>
+				  </template>
+		  </el-table-column>
+		  <el-table-column prop="templateName" label="模板名称" width="180"></el-table-column>
+		  <el-table-column prop="templateContent" label="短信内容" width="180"></el-table-column>
+		  <el-table-column prop="platformCode" label="第三方平台模板code" width="120" align="center">
+		  </el-table-column>
+		  <el-table-column prop="platformType" label="第三方平台类型" width="150">
+			<template slot-scope="scope">
+					  <div v-if="scope.row.platformType==1">腾讯</div>
+				  </template>
+		  </el-table-column>
+		  <el-table-column label="操作" width="230" fixed="right">
+			<template slot-scope="scope">
+				<el-button :disabled="!isAuth('duanxinmoban:update')" size="mini" type="primary"
+					@click="updates( scope.row)" style="margin: 5px;">修改信息
+				</el-button>
+				<el-button size="mini" type="danger"
+					:disabled="!isAuth('duanxinmoban:delete')" @click="deletes(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]" :page-size="limit" :current-page="page"
+				layout="total,sizes, prev, pager, next,jumper" :total="duanxinData.totalCount">
+			</el-pagination>
+		</div>
+		<!-- 添加短信模板 -->
+		<el-dialog :visible.sync="dialogFormVisible" center :title="titles">
+			<div style="margin-bottom: 10px;">
+				<span style="width: 200px;display: inline-block;text-align: right;">模板名称：</span>
+				<el-input v-model="templateName" placeholder="请输入模板名称" style="width:50%;"></el-input>
+			</div>
+			<div style="margin-bottom: 10px;">
+				<span style="width: 200px;display: inline-block;text-align: right;">模板内容：</span>
+				<el-input v-model="templateContent" placeholder="请输入模板内容" style="width:50%;"></el-input>
+			</div>
+			<div style="margin-bottom: 10px;">
+				<span style="width: 200px;display: inline-block;text-align: right;">是否启用：</span>
+				<el-radio-group v-model="status">
+					<el-radio :label="'0'">不启用</el-radio>
+					<el-radio :label="'1'">启用</el-radio>
+				</el-radio-group>
+			</div>
+			<div>
+				<div id="container1" style="width:80%;height:500px;margin-left: 10%;"></div>
+			</div>
+			<div slot="footer" class="dialog-footer">
+				<el-button @click="dialogFormVisible = false">取 消</el-button>
+				<el-button type="primary" @click="releasNoticeTo()">确 定</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				limit: 10,
+				page: 1,
+				activeName: 'first',
+				tableDataLoading: false,
+				dialogFormVisible: false,
+				templateName:'',
+				templateName1:'',
+				platformType:'',
+				statesnum2: [{
+					label: '全部',
+					value: ''
+					},
+					{
+					label: '不启用',
+					value: '0'
+					},
+					{
+					label: '启用',
+					value: '1'
+					},
+				],
+				platformCode:'',
+				status:'',
+				status1:'',
+				duanxinData:[],
+				templateContent:'',
+				titles: '添加',
+				id:'',
+			}
+		},
+		methods: {
+			handleSizeChange(val) {
+				this.limit = val;
+				this.dataSelect()
+			},
+			handleCurrentChange(val) {
+				this.page = val;
+				this.dataSelect()
+			},
+			// 查询
+			select() {
+				this.page = 1
+				this.limit = 10
+				this.dataSelect()
+			},
+			// 重置
+			cleans() {
+				this.templateName1 = ''
+				this.platformType = ''
+				this.status1 = ''
+				this.page = 1
+				this.dataSelect()
+			},
+			//添加模板
+			addNotice(){
+				this.titles = '添加'
+				this.platformCode='1400879272'
+				this.templateName = ''
+				this.platformType = '1'
+				this.templateContent=''
+				this.status = ''
+				this.dialogFormVisible = true
+			},
+			// 添加模板
+			releasNoticeTo() {
+				if (this.templateName == '') {
+					this.$notify({
+						title: '提示',
+						duration: 1800,
+						message: '请输入模板名称',
+						type: 'warning'
+					})
+					return
+				}
+				if (this.templateContent == '') {
+					this.$notify({
+						title: '提示',
+						duration: 1800,
+						message: '请输入模板内容',
+						type: 'warning'
+					})
+					return
+				}
+				var datas = {}
+				datas.templateName = this.templateName
+				datas.templateContent=this.templateContent
+				datas.platformCode = this.platformCode
+				datas.platformType = this.platformType
+				datas.status = this.status
+
+				var url = 'admin/tb-indent-sms/template'
+				if (this.titles == '添加') {
+					var zhuang='post'
+
+				}
+				if (this.titles == '修改') {
+					var zhuang='put'
+					datas.id = this.id
+				}
+				this.$http({
+					url: this.$http.adornUrl(url),
+					method: zhuang,
+					data: this.$http.adornData(datas)
+				}).then(({
+					data
+				}) => {
+					if (data.code == 0) {
+						this.dialogFormVisible = false
+						this.$message({
+							message: '操作成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.dataSelect()
+							}
+						})
+					} else {
+						this.$message({
+							message: data.msg,
+							type: 'warning',
+							duration: 1500,
+							onClose: () => {}
+						})
+					}
+
+				})
+			},
+			// 修改弹框
+			updates( rows) {
+				console.log('修改')
+				console.log(rows.status)
+				this.titles = '修改'
+				this.id = rows.id
+				this.templateName = rows.templateName
+				this.platformCode='1400879272'
+				this.platformType = '1'
+				this.templateContent=rows.templateContent
+
+				if (rows.status!=null) {
+					this.status = rows.status
+				}else{
+					this.status = '1'
+				}
+				this.dialogFormVisible = true
+
+			},
+			// 删除模板
+			deletes(row) {
+				let delid = [row.id]
+				this.$confirm(`确定删除此条信息?`, '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					this.$http({
+						url: this.$http.adornUrl('admin/tb-indent-sms/template'),
+						method: 'delete',
+						data: this.$http.adornData(delid)
+					}).then(({
+						data
+					}) => {
+						if (data.code == 0) {
+							this.$message({
+								message: '删除成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.dataSelect()
+								}
+							})
+						}
+					})
+				}).catch(() => {})
+
+			},
+			// 获取派单数据列表
+			dataSelect() {
+				this.tableDataLoading = true
+				this.$http({
+					url: this.$http.adornUrl('admin/tb-indent-sms/template'),
+					method: 'get',
+					params: this.$http.adornParams({
+					'page': this.page,
+					'limit': this.limit,
+					'templateName': this.templateName1,//模板名称
+					'platformType': this.platformType,//平台类型
+					'status': this.status1,//状态
+					})
+				}).then(({
+					data
+				}) => {
+					if (data && data.code === 0) {
+					this.tableDataLoading = false
+					let returnData = data.data
+					this.duanxinData = returnData
+					}
+				})
+			}
+		},
+		mounted() {
+			this.dataSelect()
+		}
+	};
+</script>
+
+<style>
+
+</style>

src/views/selfShop/shopAmend.vue

@@ -26,7 +26,7 @@
 						</el-select>
 					</el-col>
 					<el-col :span="8">
-						<span>商品原价：</span>
+						<span>商品原价(选填)：</span>
 						<el-input style="width:200px;" class="margin15" placeholder="请输入商品原价" type="number" :min="0"
 							:controls="false" v-model="originalMoney" autosize></el-input>
 					</el-col>
@@ -36,12 +36,12 @@
 							:controls="false" v-model="goodsMoney" autosize></el-input>
 					</el-col>
 					<el-col :span="8">
-						<span>打包费：</span>
+						<span>打包费(选填)：</span>
 						<el-input style="width:200px;" class="margin15" placeholder="请输入打包费" type="number" :min="0"
 							:controls="false" v-model="packMoney" autosize></el-input>
 					</el-col>
 					<el-col :span="8">
-						<span>商品销量：</span>
+						<span>商品销量(选填)：</span>
 						<el-input style="width:200px;" class="margin15" placeholder="请输入商品销量" type="number" :min="0"
 							:controls="false" v-model="sales" autosize></el-input>
 					</el-col>
@@ -59,7 +59,7 @@
 						</el-select>
 					</el-col>
 					<el-col :span="8">
-						<span>商品简介：</span>
+						<span>商品简介(选填)：</span>
 						<el-input style="width:200px;" class="margin15" placeholder="请输入商品简介" type="text"
 							:controls="false" v-model="goodsDescribe" autosize></el-input>
 					</el-col>
@@ -315,7 +315,7 @@
 				</div>
 			</div>
 			<div class="tinymce-content" style="display: flex;padding-top: 30px;">
-				<div style="width:90px;">商品详情：</div>
+				<div style="width:90px;">商品详情(选填)：</div>
 				<!-- <quill-editor ref="myTextEditor" v-model="goodsSynopsis" :options="quillOption"
         	style="padding-bottom: 50px;height: 300px;width: 72%;display: inline-table;margin-bottom: 60px;">
         </quill-editor> -->
@@ -770,13 +770,14 @@
 					return
 				}
 				if (this.originalMoney === '') {
-					this.$notify({
-						title: '提示',
-						duration: 1800,
-						message: '请输入商品原价',
-						type: 'warning'
-					});
-					return
+					this.originalMoney =this.goodsMoney
+					// this.$notify({
+					// 	title: '提示',
+					// 	duration: 1800,
+					// 	message: '请输入商品原价',
+					// 	type: 'warning'
+					// });
+					// return
 				}
 				if (this.goodsMoney === '') {
 					this.$notify({
@@ -788,23 +789,25 @@
 					return
 				}
 				if (this.packMoney === '') {
-					this.$notify({
-						title: '提示',
-						duration: 1800,
-						message: '请输入打包费',
-						type: 'warning'
-					});
-					return
+					this.packMoney ='0'
+					// this.$notify({
+					// 	title: '提示',
+					// 	duration: 1800,
+					// 	message: '请输入打包费',
+					// 	type: 'warning'
+					// });
+					// return
 				}
 
 				if (this.sales === '') {
-					this.$notify({
-						title: '提示',
-						duration: 1800,
-						message: '请输入商品销量',
-						type: 'warning'
-					});
-					return
+					this.sales =0
+					// this.$notify({
+					// 	title: '提示',
+					// 	duration: 1800,
+					// 	message: '请输入商品销量',
+					// 	type: 'warning'
+					// });
+					// return
 				}
 				// if (this.inventory === '') {
 				//   this.$notify({
@@ -824,15 +827,25 @@
 					});
 					return
 				}
-				if (this.goodsDescribe == '') {
+				if (this.img.length == 0) {
 					this.$notify({
 						title: '提示',
 						duration: 1800,
-						message: '请输入商品详情',
+						message: '请选择商品轮播图',
 						type: 'warning'
 					});
 					return
 				}
+				if (this.goodsDescribe == '') {
+					this.goodsDescribe ='无'
+					// this.$notify({
+					// 	title: '提示',
+					// 	duration: 1800,
+					// 	message: '请输入商品详情',
+					// 	type: 'warning'
+					// });
+					// return
+				}
 				if (this.guige == 1) {
 					if (this.ruleId === 0 || this.ruleId === '') {
 						this.$notify({

src/views/selfShop/shopPublish.vue

@@ -30,7 +30,7 @@
 				<el-input style="width:200px;" class="margin15" placeholder="请输入商户号"  v-model="merchants" autosize></el-input>
 			</el-col> -->
           <el-col :span="8">
-            <span>商品原价：</span>
+            <span>商品原价(选填)：</span>
             <el-input style="width:200px;" class="margin15" placeholder="请输入商品原价" type="number" :min="0"
               :controls="false" v-model="originalMoney" autosize></el-input>
           </el-col>
@@ -40,12 +40,12 @@
               :controls="false" v-model="goodsMoney" autosize></el-input>
           </el-col>
           <el-col :span="8">
-            <span>打包费：</span>
+            <span>打包费(选填)：</span>
             <el-input style="width:200px;" class="margin15" placeholder="请输入打包费" type="number" :min="0"
               :controls="false" v-model="packMoney" autosize></el-input>
           </el-col>
           <el-col :span="8">
-            <span>商品销量：</span>
+            <span>商品销量(选填)：</span>
             <el-input style="width:200px;" class="margin15" placeholder="请输入商品销量" type="number" :min="0"
               :controls="false" v-model="sales" autosize></el-input>
           </el-col>
@@ -62,7 +62,7 @@
             </el-select>
           </el-col> -->
           <el-col :span="8">
-            <span>商品简介：</span>
+            <span>商品简介(选填)：</span>
             <el-input style="width:200px;" class="margin15" placeholder="请输入商品简介" type="text" :controls="false"
               v-model="goodsDescribe" autosize></el-input>
           </el-col>
@@ -419,7 +419,7 @@
       </div> -->
       </div>
       <div class="tinymce-content" style="display: flex;">
-        <div style="width:90px;">商品详情：</div>
+        <div style="width:90px;">商品详情(选填)：</div>
         <!-- <textarea id="tinymceId" :value="goodsDescribe" class="tinymce-textarea" /> -->
         <!-- <quill-editor ref="myTextEditor" v-model="goodsSynopsis" :options="quillOption"
           style="padding-bottom: 50px;height: 300px;width: 72%;display: inline-table;margin-bottom: 60px;">
@@ -637,7 +637,7 @@
           this.originalMoney = '0'
         }
         if (this.goodsMoney == '') {
-          this.goodsMoney = '0'
+          this.goodsMoney = this.goodsMoney
         }
         this.$http({
           url: this.$http.adornUrl('admin/goods/onlyFormatAttr'),
@@ -776,13 +776,14 @@
           return
         }
         if (this.originalMoney == '') {
-          this.$notify({
-            title: '提示',
-            duration: 1800,
-            message: '请输入商品原价',
-            type: 'warning'
-          });
-          return
+          this.originalMoney =this.goodsMoney
+          // this.$notify({
+          //   title: '提示',
+          //   duration: 1800,
+          //   message: '请输入商品原价',
+          //   type: 'warning'
+          // });
+          // return
         }
         // if (this.originalMoney < 1) {
         //   this.$notify({
@@ -803,33 +804,36 @@
           return
         }
         if (this.packMoney == '') {
-          this.$notify({
-            title: '提示',
-            duration: 1800,
-            message: '请输入打包费',
-            type: 'warning'
-          });
-          return
+          this.packMoney ='0'
+          // this.$notify({
+          //   title: '提示',
+          //   duration: 1800,
+          //   message: '请输入打包费',
+          //   type: 'warning'
+          // });
+          // return
         }
         if (this.goodsDescribe == '') {
-          this.$notify({
-            title: '提示',
-            duration: 1800,
-            message: '请输入简介',
-            type: 'warning'
-          });
-          return
+          this.goodsDescribe ='无'
+          // this.$notify({
+          //   title: '提示',
+          //   duration: 1800,
+          //   message: '请输入简介',
+          //   type: 'warning'
+          // });
+          // return
         }
 
 
         if (this.sales == '') {
-          this.$notify({
-            title: '提示',
-            duration: 1800,
-            message: '请输入商品销量',
-            type: 'warning'
-          });
-          return
+          this.sales ='0'
+          // this.$notify({
+          //   title: '提示',
+          //   duration: 1800,
+          //   message: '请输入商品销量',
+          //   type: 'warning'
+          // });
+          // return
         }
 		if(this.guige==1){
 			if (this.ruleId === 0||this.ruleId ==='') {
@@ -852,15 +856,24 @@
           });
           return
         }
-        if (this.goodsDescribe == '') {
+        if (this.potost.length == 0) {
           this.$notify({
             title: '提示',
             duration: 1800,
-            message: '请输入商品详情',
+            message: '请选择商品轮播图',
             type: 'warning'
           });
           return
         }
+        // if (this.goodsDescribe == '') {
+        //   this.$notify({
+        //     title: '提示',
+        //     duration: 1800,
+        //     message: '请输入商品详情',
+        //     type: 'warning'
+        //   });
+        //   return
+        // }
         // if (this.inventory == '') {
         //   this.$notify({
         //     title: '提示',
@@ -880,13 +893,14 @@
           return
         }
 				if (this.goodsParticularsPicture.length == 0) {
-				  this.$notify({
-				    title: '提示',
-				    duration: 1800,
-				    message: '请上传商品详情图',
-				    type: 'warning'
-				  });
-				  return
+        this.goodsParticularsPicture=['https://moxuanyunshang.oss-cn-beijing.aliyuncs.com/xiangqing/12ecc56005731327e02f42f0d851848.png']
+				  // this.$notify({
+				  //   title: '提示',
+				  //   duration: 1800,
+				  //   message: '请上传商品详情图',
+				  //   type: 'warning'
+				  // });
+				  // return
 				}
         
 				if(this.guige==0){

src/views/selfShop/specification.vue

@@ -100,6 +100,7 @@
     </el-dialog>
     <!-- 修改规格 -->
     <el-dialog title="修改规格" customClass="customWidth" :visible.sync="dialogFormVisible1">
+      <div style="color:red;">此处修改的规格不会改变已生成的商品，如想更改商品信息请去商品列表更新商品</div>
       <el-form :model="form">
         <el-form-item label="规格标题：">
           <el-input v-model="form.ruleName" style="width:200px;" placeholder="请输入分类名称"></el-input>

src/views/shopsList/shopAdmin.vue

@@ -360,6 +360,7 @@
       </el-dialog>
       <!-- 修改规格 -->
       <el-dialog title="修改规格" customClass="customWidth" :visible.sync="dialogFormVisible2">
+        <div style="color:red;">此处修改的规格不会改变已生成的商品，如想更改商品信息请去商品列表更新商品</div>
         <el-form :model="form">
           <el-form-item label="规格标题：">
             <el-input v-model="form.ruleName" style="width:200px;" placeholder="请输入分类名称"></el-input>

src/views/shopsList/shopsList.vue

@@ -109,6 +109,11 @@
 				</el-table-column>
 				<el-table-column label="最低起送金额" prop="minimumDelivery">
 				</el-table-column>
+				<el-table-column label="是否开启满减" prop="enableFullReductionFlag">
+					<template slot-scope="scope">
+						<span>{{scope.row.enableFullReductionFlag==0?'开启':'关闭'}}</span>
+					</template>
+				</el-table-column>
 				<el-table-column label="是否开启平台配送" prop="autoSendOrder">
 					<template slot-scope="scope">
 						<span>{{scope.row.autoSendOrder==0?'开启':'关闭'}}</span>
@@ -397,6 +402,13 @@
 				<el-input v-model="minimumDelivery" placeholder="请输入最低起送金额" type="text" style="width:50%;"></el-input>
 			</div>
 			<div style="margin-bottom: 10px;">
+				<span style="width: 200px;display: inline-block;text-align: right;">是否开启满减：</span>
+				<el-radio-group v-model="enableFullReductionFlag">
+					<el-radio :label="0">开启</el-radio>
+					<el-radio :label="1">关闭</el-radio>
+				</el-radio-group>
+			</div>
+			<div style="margin-bottom: 10px;">
 				<span style="width: 200px;display: inline-block;text-align: right;">是否开启平台配送：</span>
 				<el-radio-group v-model="autoSendOrder">
 					<el-radio :label="0">开启</el-radio>
@@ -796,6 +808,7 @@
 				errandMoney: 0,
 				exemptMinMoney: 0,
 				minimumDelivery: 0,
+				enableFullReductionFlag:1,
 				autoSendOrder: 1,
 				autoAcceptOrder: 1,
 				sort:1,
@@ -909,6 +922,7 @@
 				this.distributionDistance = 3000
 				this.exemptMinMoney = 0
 				this.minimumDelivery = 0
+				this.enableFullReductionFlag=1
 				this.autoSendOrder = 1
 				this.autoAcceptOrder = 1
 				this.sort = 1
@@ -1077,6 +1091,7 @@
 				datas.distributionDistance = this.distributionDistance
 				datas.exemptMinMoney = this.exemptMinMoney
 				datas.minimumDelivery = this.minimumDelivery
+				datas.enableFullReductionFlag=this.enableFullReductionFlag
 				datas.autoSendOrder = this.autoSendOrder
 				datas.autoAcceptOrder = this.autoAcceptOrder
 				datas.sort = this.sort
@@ -1185,6 +1200,12 @@
 					this.exemptErrandFlag = rows.exemptErrandFlag
 				}
 
+				if (rows.enableFullReductionFlag!=null) {
+					this.enableFullReductionFlag = rows.enableFullReductionFlag
+					console.log('rows.enableFullReductionFlag',rows.enableFullReductionFlag)
+				}else{
+					this.enableFullReductionFlag = 1
+				}
 				if (rows.autoSendOrder!=null) {
 					this.autoSendOrder = rows.autoSendOrder
 					console.log('rows.autoSendOrder',rows.autoSendOrder)