更新骑手接单池和转单

common/config.js

@@ -1,13 +1,14 @@
 // const ROOTPATH1 = "https://mxys.chuanghai-tech.com/sqx_fast";
 const ROOTPATH1 = "https://www.daweilinli.com/sqx_fast";
+// const ROO2 = "https://mxys.chuanghai-tech.com/sqx_fast";
 const ROO2 = "https://www.daweilinli.com/sqx_fast";
 // const ROOTPATH = "https://mxys.chuanghai-tech.com/sqx_fast";
 const ROOTPATH = "https://www.daweilinli.com/sqx_fast";
+const APIHOST2 = "https://www.daweilinli.com/sqx_fast";
+// const APIHOST2 = "https://mxys.chuanghai-tech.com/sqx_fast";
 const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"; //联系客服
 const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"; //聊天
-const APIHOST122="https://www.daweilinli.com/sqx_fast"
 
-const ROOTPATH123 = "https://mxys.chuanghai-tech.com/sqx_fast";
 
 // const ROOTPATH1 = "http://192.168.0.119:8171/sqx_fast";
 // const ROOTPATH = "http://192.168.0.119:8171/sqx_fast";
@@ -20,6 +21,4 @@ module.exports = {
 	APIHOST2: ROO2,
 	WSHOST: ROOTPATH2,
 	WSHOST1: ROOTPATH3,
-	APIHOST122:APIHOST122,
-	ROOTPATH123:ROOTPATH123,
 };

common/httpRequest.js

@@ -229,168 +229,6 @@ module.exports = {
 			})
 		}
 	},
-	// 测试大魏
-	postJson2: function(url, data, header) {
-		header = header || "application/json";
-		url = this.config("APIHOST122") + url;
-		// let token = uni.getStorageSync("token");
-		let token = uni.getStorageSync("token");
-		if (token) {
-			return new Promise((succ, error) => {
-				uni.request({
-					url: url,
-					data: data,
-					method: "POST",
-					header: {
-						"content-type": header,
-						"token": token
-					},
-					success: function(result) {
-						// console.error(result);
-						if (result.data.code == 401 && token) {
-							uni.removeStorageSync("token")
-							uni.removeStorageSync("userId")
-							uni.removeStorageSync("phone")
-							uni.removeStorageSync("openid")
-							uni.removeStorageSync("userName")
-							uni.removeStorageSync("relation")
-							uni.removeStorageSync("relation_id")
-							uni.removeStorageSync("isInvitation")
-							uni.removeStorageSync("zhiFuBao")
-							uni.removeStorageSync("zhiFuBaoName")
-	
-							uni.showModal({
-								title: '提示',
-								content: '用户信息失效，请重新登录！',
-								showCancel: false, // 是否显示取消按钮，默认为 true // 是否显示取消按钮，默认为 true
-								success: function(res) {
-									if (res.confirm) {
-										uni.redirectTo({
-											url: '/pages/login/login'
-										})
-									}
-								}
-							});
-						}
-						succ.call(self, result.data)
-					},
-					fail: function(e) {
-						error.call(self, e)
-					}
-				})
-			})
-		} else {
-			return new Promise((succ, error) => {
-				uni.request({
-					url: url,
-					data: data,
-					method: "POST",
-					header: {
-						"content-type": header,
-					},
-					success: function(result) {
-						succ.call(self, result.data)
-					},
-					fail: function(e) {
-						error.call(self, e)
-					}
-				})
-			})
-		}
-	},
-	// 测试大魏
-	getT2: function(url, data, header) {
-		header = header || "application/x-www-form-urlencoded";
-		url = this.config("APIHOST122") + url;
-		let token = uni.getStorageSync("token");
-		if (token) {
-			return new Promise((succ, error) => {
-				uni.request({
-					url: url,
-					data: data,
-					method: "GET",
-					header: {
-						"content-type": header,
-						"token": token
-					},
-					success: function(result) {
-						if (result.data.code == 401 && token) {
-							uni.removeStorageSync("token")
-							uni.removeStorageSync("userId")
-							uni.removeStorageSync("phone")
-							uni.removeStorageSync("openid")
-							uni.removeStorageSync("userName")
-							uni.removeStorageSync("relation")
-							uni.removeStorageSync("relation_id")
-							uni.removeStorageSync("isInvitation")
-							uni.removeStorageSync("zhiFuBao")
-							uni.removeStorageSync("zhiFuBaoName")
-	
-							uni.showModal({
-								title: '提示',
-								content: '用户信息失效，请重新登录！',
-								showCancel: false, // 是否显示取消按钮，默认为 true // 是否显示取消按钮，默认为 true
-								success: function(res) {
-									if (res.confirm) {
-										uni.redirectTo({
-											url: '/pages/login/login'
-										})
-									}
-								}
-							});
-						}
-						succ.call(self, result.data)
-					},
-					fail: function(e) {
-						error.call(self, e)
-					}
-				})
-			})
-		} else {
-			return new Promise((succ, error) => {
-				uni.request({
-					url: url,
-					data: data,
-					method: "GET",
-					header: {
-						"content-type": header
-					},
-					success: function(result) {
-						if (result.data.code == 401) {
-							uni.removeStorageSync("token")
-							uni.removeStorageSync("userId")
-							uni.removeStorageSync("phone")
-							uni.removeStorageSync("openid")
-							uni.removeStorageSync("userName")
-							uni.removeStorageSync("relation")
-							uni.removeStorageSync("relation_id")
-							uni.removeStorageSync("isInvitation")
-							uni.removeStorageSync("zhiFuBao")
-							uni.removeStorageSync("zhiFuBaoName")
-	
-							uni.showModal({
-								title: '提示',
-								content: '用户信息失效，请重新登录！',
-								showCancel: false, // 是否显示取消按钮，默认为 true // 是否显示取消按钮，默认为 true
-								success: function(res) {
-									if (res.confirm) {
-										uni.redirectTo({
-											url: '/pages/login/login'
-										})
-									}
-								}
-							});
-						}
-						succ.call(self, result.data)
-					},
-					fail: function(e) {
-						error.call(self, e)
-					}
-				})
-			})
-		}
-	
-	},
 	getT: function(url, data, header) {
 		header = header || "application/x-www-form-urlencoded";
 		url = this.config("APIHOST1") + url;

common/queue.js

@@ -18,11 +18,13 @@ module.exports = {
 	},
 	//全局域名 部分html中需要单独替换 需要修改config中的网络请求域名
 	publicYuMing() {
-		return 'https://mxys.chuanghai-tech.com'
+		// return 'https://mxys.chuanghai-tech.com'
+		return 'https://www.daweilinli.com'
 	},
 	//全局域名 部分html中需要单独替换 需要修改config中的网络请求域名
 	publicYuMingAll() {
-		return 'https://mxys.chuanghai-tech.com/sqx_fast'
+		// return 'https://mxys.chuanghai-tech.com/sqx_fast'
+		return 'https://www.daweilinli.com/sqx_fast'
 	},
 	minMoney() {
 		return uni.getStorageSync("minMoney") ? uni.getStorageSync("minMoney") : '0.3'

pages.json

@@ -171,13 +171,14 @@
 				"navigationBarTitleText": "忘记密码",
 				"enablePullDownRefresh": false
 			}
-		}, {
-			"path": "pages/login/running_rider/running_rider",
-			"style": {
-				"navigationBarTitleText": "骑手注册",
-				"enablePullDownRefresh": false
-			}
 		}
+		// , {
+		// 	"path": "pages/login/running_rider/running_rider",
+		// 	"style": {
+		// 		"navigationBarTitleText": "骑手注册",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// }
         ,{
             "path" : "pages/riderMy/myAccount/Txmoney/Txmoney",
             "style" :                                                                                    

pages/index/buyOrder/buyOrder.vue

@@ -221,6 +221,7 @@
 		<!-- 订单信息 -->
 		<view class="order_box">
 			<view class="order_title">订单信息</view>
+			<view style="padding:0 30rpx;color:#FF7F00">{{orderDelites.shopName}}</view>
 			<view class="order_list">
 				<view class="order_name">订单号码</view>
 				<view class="order_numbers" @click="copyOrder(orderDelites.indentNumber)">{{orderDelites.indentNumber}}

pages/index/index.vue

@@ -22,8 +22,18 @@
 		</u-tabs>
 
 		<view class="content">
+			<!-- 新任务，展示所有商家时 -->
+			<view class="tabs_box" :class="{dis:current == 0}" v-if="!ifrenwu">
+				<view class="list_box2" v-for="(item,index) in list_shanghu" :key="index"
+					@click="dingdetails(item.shopId)">
+					<view style="line-height: 40px;font-size: 20px;margin-left: 20px;">{{item.shopName}}     
+						<text style="font-size: 16px;margin-left: 80px;">订单数：{{item.countOfWaitAccept}}单</text>
+					</view>
+				</view>
+			</view>
 			<!-- 新任务 -->
-			<view class="tabs_box" :class="{dis:current == 0}">
+			<view class="tabs_box" :class="{dis:current == 0}" v-if="ifrenwu">
+				<view class="box_btn5" @click.stop="fanhuiShang">返回</view>
 				<!-- 下线中 -->
 				<view class="list_box" v-for="(item,index) in list_box" :key="index" v-show="seen"
 					@click="binddetails(item.indentNumber,item.indentType)">
@@ -35,12 +45,13 @@
 						<view class="box_one" v-if="item.indentType==5">同城外卖</view>
 						<view class="box_two" v-if="item.indentType==4 &&item.serviceType">{{item.serviceType}}
 						</view>
-						<view style="padding:0 10rpx;color:#FF7F00">{{item.shopName}}</view>
 						<view class="box_two box_two1" v-if="item.itemType!=null||item.itemWeight!=null">
 							{{item.itemType}}&nbsp;{{item.itemWeight}}
 						</view>
 						<view class="box_three" v-if="item.indentType==4&&item.tool">{{item.tool}}</view>
 					</view>
+					<view style="padding:0 10rpx;color:#FF7F00">{{item.shopName}}</view>
+					<view style="padding:0 10rpx">订单编号：{{item.indentNumber}}</view>
 					<!-- 同城服务 -->
 					<view class="part2" v-if="item.indentType==4">
 
@@ -137,7 +148,6 @@
 						<view class="box_one" v-if="item.indentType==5">同城外卖</view>
 						<view class="box_two" v-if="item.indentType==4 &&item.serviceType">{{item.serviceType}}
 						</view>
-						<view style="padding:0 10rpx;color:#FF7F00">{{item.shopName}}</view>
 						<view class="box_two box_two1" v-if="item.itemType!=null||item.itemWeight!=null">
 							{{item.itemType}}&nbsp;{{item.itemWeight}}
 						</view>
@@ -147,6 +157,8 @@
 						<view style="position: absolute;right: 0;font-size: 22rpx;color: #999;">{{item.createTime}}
 						</view>
 					</view>
+					<view style="padding:0 30rpx;color:#FF7F00">{{item.shopName}}</view>
+					<view style="padding:0 30rpx">订单编号：{{item.indentNumber}}</view>
 					<!-- 同城服务 -->
 					<view class="part2" v-if="item.indentType==4">
 						<view class="box_add">
@@ -334,6 +346,8 @@
 							<view class="type_name" v-if="item.indentType == 5">同城外卖</view>
 							<view class="city_text" v-if="item.itemType">{{item.itemType}}</view>
 						</view>
+						<view style="padding:0 30rpx;color:#FF7F00">{{item.shopName}}</view>
+						<view style="padding:0 30rpx">订单编号：{{item.indentNumber}}</view>
 						<!-- 帮我送/帮我取 地址 -->
 						<view class="city_address" v-if="item.indentType == 1 || item.indentType == 2">
 							<view class="fh_box">
@@ -477,6 +491,8 @@
 							<view class="type_name" v-if="item.indentType == 5">同城外卖</view>
 							<view class="city_text" v-if="item.itemType">{{item.itemType}}</view>
 						</view>
+						<view style="padding:0 30rpx;color:#FF7F00">{{item.shopName}}</view>
+						<view style="padding:0 30rpx">订单编号：{{item.indentNumber}}</view>
 						<!-- 帮我送/帮我取 -->
 						<view class="city_address" v-if="item.indentType == 1 || item.indentType == 2">
 							<view class="fh_box">
@@ -814,6 +830,7 @@
 				}],
 				current: 0,
 				page: 1,
+				list_shanghu:[],
 				list_box: [],
 				list_tip: [],
 				take_list: [],
@@ -857,7 +874,7 @@
 				shouhuoma: '',
 				userId: '', //用户id
 				checkCertification: '', //是否实名认证
-				receivingPettern: 2, //1近单模式  2同城模式
+				receivingPettern: '2', //1近单模式  2同城模式
 				province: '',
 				city: '',
 				district: '',
@@ -872,13 +889,14 @@
 				count: 3,
 				duanxin:[],//发送的短信
 				qiPhone:'',//骑手电话
+				ifrenwu:false,
+				shopId:'',
 			}
 		},
 		onHide() {
 			clearInterval(this.time)
 		},
 		onLoad() {
-			this.qiPhone=uni.getStorageSync('phone')
 			uni.showLoading({
 				title: '加载中...'
 
@@ -888,10 +906,12 @@
 				this.longitude = dizhi.longitude
 				this.latitude = dizhi.latitude
 			}
-			this.taskData()
+			this.getShanglist()
+			// this.taskData()
 			let that = this
 			this.time = setInterval(function() {
-				that.taskData()
+				this.getShanglist()
+				// that.taskData()
 				that.getLocation()
 			}, 5000)
 			
@@ -1175,6 +1195,7 @@
 						that.seen = res.data.onLineFlag == 1 ? false : true
 						// that.xddcheck = res.data.isSendMsg == 2 ? false : true;
 						that.checkCertification = res.data.checkCertification
+						this.qiPhone=res.data.phone
 						uni.setStorageSync('phone',res.data.phone)
 						uni.setStorageSync("checkCertification", res.data.checkCertification);
 						if (that.seen) {
@@ -1192,7 +1213,8 @@
 								that.latitude = res.latitude
 								that.locationUpdate(that.longitude, that.latitude)
 								if (that.current == 0) {
-									that.taskData()
+									this.getShanglist()
+									// that.taskData()
 								} else if (that.current == 1) {
 									that.indentState = 3
 									that.taskDataJ()
@@ -1230,7 +1252,9 @@
 					uni.showLoading({
 						title: '加载中...'
 					})
-					this.taskData()
+					this.ifrenwu=false
+					this.getShanglist()
+					// this.taskData()
 				} else if (index == 1) { //待取货
 					uni.showLoading({
 						title: '加载中...'
@@ -1310,11 +1334,23 @@
 					lat: lat,
 				}).then(res => {
 					console.log('位置信息更新', res)
-					that.taskData()
+					this.getShanglist()
+					// that.taskData()
 				});
 				// }, 600000)
 
 			},
+			//跳转某商家订单
+			dingdetails(shopId){
+				this.shopId=shopId
+				this.ifrenwu=true
+				this.taskData()
+			},
+			//返回商户
+			fanhuiShang(){
+				this.ifrenwu=false
+				this.getShanglist()
+			},
 			// 跳转订单详情
 			binddetails(id, types) {
 				// #ifdef MP-WEIXIN
@@ -1426,6 +1462,7 @@
 							}).then(res => {
 								if (res.code == 0) {
 									that.page = 1
+									// this.getShanglist()
 									that.taskData()
 									uni.showToast({
 										title: '接单成功',
@@ -1440,6 +1477,7 @@
 										duration: 1500
 									});
 									that.page = 1
+									this.getShanglist()
 									that.taskData()
 								}
 							});
@@ -1483,15 +1521,43 @@
 				console.log('第一个')
 				this.show = true
 			},
+			//获取接单池各商家列表
+			getShanglist(){
+				this.$Request.postJson('/app/tbindent/find-new-indent-group-by-shop', {
+					buyTpye:"",// 购买类型 0：骑手就近购买；1：用户指定地址购买"
+					indentType: this.indentType,
+					limit: 10,
+					page: this.page,
+					receivingPattern: this.receivingPettern,
+					riderLat: this.latitude,
+					riderLng: this.longitude
+				}).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						if (res.data.list.length > 0) {
+						}
+						this.totalCount = res.data.totalCount
+						if (this.page == 1) {
+							this.list_shanghu = res.data.list
+						} else {
+							this.list_shanghu = this.list_shanghu.concat(list)
+						}
+					}
+					this.$forceUpdate()
+					uni.stopPullDownRefresh();
+				});
+			},
 			// 获取新任务数据
 			taskData() {
-				this.$Request.postJson('/app/tbindent/findNewIndent', {
+				this.$Request.postJson('/app/tbindent/find-new-indent', {
+					buyTpye:"",// 购买类型 0：骑手就近购买；1：用户指定地址购买"
 					page: this.page,
 					limit: 10,
-					riderlat: this.longitude,
-					riderlng: this.latitude,
-					receivingPettern: this.receivingPettern,
+					receivingPattern: this.receivingPettern,
 					indentType: this.indentType,
+					shopId: this.shopId,
+					riderLat: this.latitude,
+					riderLng: this.longitude
 				}).then(res => {
 					uni.hideLoading()
 					if (res.data) {
@@ -1601,12 +1667,12 @@
 
 				if (e == true) {
 
-					this.receivingPettern = 1
+					this.receivingPettern = '1'
 				}
 				if (e == false) {
 					// this.checked = false
 					// this.check = true
-					this.receivingPettern = 2
+					this.receivingPettern = '2'
 				}
 				console.log(e)
 			},
@@ -1634,12 +1700,12 @@
 				if (e == true) {
 					// this.checked = true
 					// this.check = false
-					this.receivingPettern = 2
+					this.receivingPettern = '2'
 				}
 				if (e == false) {
 					// this.checked = false
 					// this.check = true
-					this.receivingPettern = 1
+					this.receivingPettern = '1'
 				}
 			},
 			// 打开类型选择模态框
@@ -1748,6 +1814,7 @@
 					this.longitude = this.quyuLongitude
 					this.latitude = this.quyuLatitude
 				}
+				this.getShanglist()
 				this.taskData()
 			},
 			// 订单详情
@@ -1971,7 +2038,7 @@
 			// 获取确认送达短信模板
 			querenduanxin() {
 				// this.$Request.postT('/app/tb-indent-sms/template', {
-				this.$Request.getT2('/app/tb-indent-sms/template', {
+				this.$Request.getT('/app/tb-indent-sms/template', {
 					// indentNumber: this.indentNumber,
 					// itemCode: this.shouhuoma
 				}).then(res => {
@@ -2014,7 +2081,7 @@
 				// var year = date.getFullYear();
 				// let Rcode = year + that.shouhuoma
 				// that.$Request.postT('/app/tbindent/riderDelivery', {
-				this.$Request.postJson2('/app/tbindent/riderDelivery', {
+				this.$Request.postJson('/app/tbindent/riderDelivery', {
 					imgs:tupian,
 					smsTemplateId:this.duanxin[0].id,
 					indentNumber: that.indentNumber,
@@ -2106,12 +2173,13 @@
 					icon: 'none'
 				})
 			}
-
+			this.getShanglist()
 			this.taskData();
 		},
 		onPullDownRefresh: function() {
 			this.page = 1;
 			if (this.current == 0) {
+				this.getShanglist()
 				this.taskData();
 			} else {
 				this.taskDataJ();
@@ -2299,6 +2367,15 @@
 		margin-top: 20rpx;
 		padding-bottom: 20rpx;
 	}
+	.list_box2{
+		width: 90%;
+		margin: 0 auto;
+		height: auto;
+		background: #FFFFFF;
+		border-radius: 23rpx;
+		box-shadow: 0rpx 5rpx 5rpx 0rpx rgba(198, 186, 181, 0.20);
+		margin-top: 20rpx;
+	}
 
 	.part1 {
 		width: 90%;
@@ -2514,6 +2591,18 @@
 		letter-spacing: 2rpx;
 		border-radius: 8rpx;
 	}
+	.box_btn5{
+		width: 16%;
+		margin-left: 40rpx;
+		background: #FF7F00;
+		height: 60rpx;
+		color: white;
+		text-align: center;
+		line-height: 60rpx;
+		font-size: 31rpx;
+		letter-spacing: 2rpx;
+		border-radius: 8rpx;
+	}
 
 	.part_six {
 		width: 90%;

pages/index/orderdetail/orderdetail.vue

@@ -186,10 +186,11 @@
 
 		<!-- 转单 -->
 		<u-popup v-model="showOrder" mode="center" border-radius="18" :closeable="closeable" close-icon="close-circle"
-			close-icon-size="45" width="580rpx" height="400rpx">
+			close-icon-size="45" width="580rpx" height="600rpx">
 			<view class="receipt_code">
-				<view class="code_title">填写手机号码</view>
+				<view class="code_title">填写转单信息（二选一即可）</view>
 				<u-input v-model="phone" type="number" placeholder="填写转单人手机号码" :border="border" />
+				<u-input v-model="zhuanName" type="text" placeholder="填写转单人姓名" :border="border" />
 				<view class="sure" style="margin-top: 40rpx;" @click="zhuandan">确定</view>
 			</view>
 		</u-popup>
@@ -286,6 +287,7 @@
 				indentId: '',
 				showOrder: false,
 				phone: '',
+				zhuanName:'',//转单人姓名
 				alertPhone:false,//确认收货拍照弹出框
 				alertduan:false,//确认收货选择短信框
 				goodsPicture: [],
@@ -328,13 +330,15 @@
 		methods: {
 			zhuanOrder(indentId) {
 				this.phone = ''
+				this.zhuanName=''
 				this.indentId = indentId
 				this.showOrder = true
 			},
 			zhuandan() {
 				this.$Request.postT('/app/tbindent/transferOfOrder', {
 					indentId: this.indentId,
-					phone: this.phone
+					phone: this.phone,
+					realName:this.zhuanName
 				}).then(res => {
 					if (res.code == 0) {
 						this.phone = ''
@@ -636,7 +640,7 @@
 			// 获取确认送达短信模板
 			querenduanxin() {
 				// this.$Request.postT('/app/tb-indent-sms/template', {
-				this.$Request.getT2('/app/tb-indent-sms/template', {
+				this.$Request.getT('/app/tb-indent-sms/template', {
 					// indentNumber: this.indentNumber,
 					// itemCode: this.shouhuoma
 				}).then(res => {
@@ -659,7 +663,7 @@
 				var tupian=this.goodsPicture.toString()
 				let that = this
 
-				that.$Request.postJson2('/app/tbindent/riderDelivery', {
+				that.$Request.postJson('/app/tbindent/riderDelivery', {
 					imgs:tupian,
 					smsTemplateId:this.duanxin[0].id,
 					indentNumber: that.indentNumber,

pages/login/login.vue

@@ -233,11 +233,11 @@
 					});
 				}
 			},
-			bindriderlogin() {
-				uni.navigateTo({
-					url: '/pages/login/running_rider/running_rider'
-				})
-			},
+			// bindriderlogin() {
+			// 	uni.navigateTo({
+			// 		url: '/pages/login/running_rider/running_rider'
+			// 	})
+			// },
 			forgetPwd() {
 				uni.navigateTo({
 					url: '/pages/login/forgetPwd'

pages/riderMy/approve/approve.vue

@@ -269,7 +269,7 @@
 							signType: res.data.signType,
 							paySign: res.data.sign,
 							success: function(res) {
-								console.log(res)
+								console.log('实名'+res)
 								uni.hideLoading();
 								uni.showToast({
 									title: '实名认证提交成功',
@@ -326,11 +326,15 @@
 					sourceType: ['album', 'camera'],
 					success: res => {
 						for (let i = 0; i < 1; i++) {
+							let token = uni.getStorageSync('token');
 							that.$queue.showLoading("上传中...");
 							uni.uploadFile({ // 上传接口
-								url: configurl.APIHOST2 + '/sqx_fast/alioss/upload', //真实的接口地址
+								url: configurl.APIHOST2 + '/alioss/upload', //真实的接口地址
 								// url: 'https://mxys.chuanghai-tech.com/sqx_fast/alioss/upload',
 								filePath: res.tempFilePaths[i],
+								header: {
+									token: token
+								},
 								name: 'file',
 								success: (uploadFileRes) => {
 									console.log(uploadFileRes)

pages/riderMy/order.vue

@@ -49,6 +49,8 @@
 							<view class="type_name" v-if="item.indentType == 5">同城外卖</view>
 							<view class="city_text" v-if="item.itemType">{{item.itemType}}</view>
 						</view>
+						<view style="padding:0 30rpx;color:#FF7F00">{{item.shopName}}</view>
+						<view style="padding:0 30rpx">订单编号：{{item.indentNumber}}</view>
 						<view class="city_address" v-if="item.indentType == 1 || item.indentType == 2">
 							<view class="fh_box">
 								<view class="fh_image">
@@ -169,6 +171,8 @@
 							<view class="type_name" v-if="item.indentType == 5">同城外卖</view>
 							<view class="city_text" v-if="item.itemType">{{item.itemType}}</view>
 						</view>
+						<view style="padding:0 30rpx;color:#FF7F00">{{item.shopName}}</view>
+						<view style="padding:0 30rpx">订单编号：{{item.indentNumber}}</view>
 						<view class="city_address" v-if="item.indentType == 1 || item.indentType == 2">
 							<view class="fh_box">
 								<view class="fh_image">
@@ -293,6 +297,8 @@
 							<view class="type_name" v-if="item.indentType == 5">同城外卖</view>
 							<view class="city_text" v-if="item.itemType">{{item.itemType}}</view>
 						</view>
+						<view style="padding:0 30rpx;color:#FF7F00">{{item.shopName}}</view>
+						<view style="padding:0 30rpx">订单编号：{{item.indentNumber}}</view>
 						<view class="city_address" v-if="item.indentType == 1 || item.indentType == 2">
 							<view class="fh_box">
 								<view class="fh_image">
@@ -419,6 +425,8 @@
 							<view class="type_name" v-if="item.indentType == 5">同城外卖</view>
 							<view class="city_text" v-if="item.itemType">{{item.itemType}}</view>
 						</view>
+						<view style="padding:0 30rpx;color:#FF7F00">{{item.shopName}}</view>
+						<view style="padding:0 30rpx">订单编号：{{item.indentNumber}}</view>
 						<view class="city_address" v-if="item.indentType == 1 || item.indentType == 2">
 							<view class="fh_box">
 								<view class="fh_image">
@@ -545,6 +553,8 @@
 							<view class="type_name" v-if="item.indentType == 5">同城外卖</view>
 							<view class="city_text" v-if="item.itemType">{{item.itemType}}</view>
 						</view>
+						<view style="padding:0 30rpx;color:#FF7F00">{{item.shopName}}</view>
+						<view style="padding:0 30rpx">订单编号：{{item.indentNumber}}</view>
 						<view class="city_address" v-if="item.indentType == 1 || item.indentType == 2">
 							<view class="fh_box">
 								<view class="fh_image">
@@ -671,6 +681,8 @@
 							<view class="type_name" v-if="item.indentType == 5">同城外卖</view>
 							<view class="city_text" v-if="item.itemType">{{item.itemType}}</view>
 						</view>
+						<view style="padding:0 30rpx;color:#FF7F00">{{item.shopName}}</view>
+						<view style="padding:0 30rpx">订单编号：{{item.indentNumber}}</view>
 						<view class="city_address" v-if="item.indentType == 1 || item.indentType == 2">
 							<view class="fh_box">
 								<view class="fh_image">
@@ -1104,7 +1116,7 @@
 			// 获取确认送达短信模板
 			querenduanxin() {
 				// this.$Request.postT('/app/tb-indent-sms/template', {
-				this.$Request.getT2('/app/tb-indent-sms/template', {
+				this.$Request.getT('/app/tb-indent-sms/template', {
 					// indentNumber: this.indentNumber,
 					// itemCode: this.shouhuoma
 				}).then(res => {
@@ -1127,7 +1139,7 @@
 				var tupian=this.goodsPicture.toString()
 				console.log(this.goodsPicture.toString())
 				// this.$Request.postT('/app/tbindent/riderDelivery', {
-				this.$Request.postJson2('/app/tbindent/riderDelivery', {
+				this.$Request.postJson('/app/tbindent/riderDelivery', {
 					imgs:tupian,
 					smsTemplateId:this.duanxin[0].id,
 					indentNumber: this.indentNumber,

pages/riderMy/riderMy.vue

@@ -252,7 +252,7 @@
 				});
 				uni.uploadFile({
 					// url: config.APIHOST1 + '/alioss/upload', //仅为示例，非真实的接口地址
-					url: configurl.APIHOST2+'/sqx_fast/alioss/upload', //仅为示例，非真实的接口地址
+					url: configurl.APIHOST2+'/alioss/upload', //仅为示例，非真实的接口地址
 					filePath: e.detail.avatarUrl,
 					header: {
 						token: token

pages/riderMy/set/yijian.vue

@@ -7,7 +7,7 @@
 		<view class="feedback-body"><textarea placeholder="请详细描述你的问题和意见..." v-model="sendDate.content"
 				class="feedback-textare" /></view>
 		<view v-if="XCXIsSelect !='否'">
-			<view class="feedback-title"><text>QQ/邮箱</text></view>
+			<view class="feedback-title"><text>联系方式</text></view>
 			<view class="feedback-body"><input class="feedback-input" v-model="sendDate.contact"
 					placeholder="方便我们联系你 " /></view>
 
@@ -93,7 +93,7 @@
 				if (!this.sendDate.contact) {
 					uni.showToast({
 						icon: 'none',
-						title: '请填写QQ或邮箱'
+						title: '请填写联系方式'
 					});
 					return;
 				}

unpackage/dist/dev/mp-weixin/app.json

@@ -23,7 +23,6 @@
     "pages/riderMy/myOnline/myOnline",
     "pages/login/login",
     "pages/login/forgetPwd",
-    "pages/login/running_rider/running_rider",
     "pages/riderMy/myAccount/Txmoney/Txmoney",
     "pages/riderMy/order",
     "pages/riderMy/set/xieyi",

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -152,6 +152,15 @@ button::after {
 	margin-top: 20rpx;
 	padding-bottom: 20rpx;
 }
+.list_box2{
+	width: 90%;
+	margin: 0 auto;
+	height: auto;
+	background: #FFFFFF;
+	border-radius: 23rpx;
+	box-shadow: 0rpx 5rpx 5rpx 0rpx rgba(198, 186, 181, 0.20);
+	margin-top: 20rpx;
+}
 .part1 {
 	width: 90%;
 	margin: 0 auto;
@@ -341,6 +350,18 @@ button::after {
 	letter-spacing: 2rpx;
 	border-radius: 8rpx;
 }
+.box_btn5{
+	width: 16%;
+	margin-left: 40rpx;
+	background: #FF7F00;
+	height: 60rpx;
+	color: white;
+	text-align: center;
+	line-height: 60rpx;
+	font-size: 31rpx;
+	letter-spacing: 2rpx;
+	border-radius: 8rpx;
+}
 .part_six {
 	width: 90%;
 	margin: 0 auto;

unpackage/dist/dev/mp-weixin/pages/login/running_rider/running_rider.json

@@ -1,11 +0,0 @@
-{
-  "navigationBarTitleText": "骑手注册",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "u-form": "/uview-ui/components/u-form/u-form",
-    "u-form-item": "/uview-ui/components/u-form-item/u-form-item",
-    "u-input": "/uview-ui/components/u-input/u-input",
-    "u-checkbox-group": "/uview-ui/components/u-checkbox-group/u-checkbox-group",
-    "u-checkbox": "/uview-ui/components/u-checkbox/u-checkbox"
-  }
-}

unpackage/dist/dev/mp-weixin/pages/login/running_rider/running_rider.wxss

@@ -1,172 +0,0 @@
-
-page {
-	background: #F5F5F5;
-}
-.content {
-	width: 100%;
-}
-.user_box {
-	width: 90%;
-	margin: 0 auto;
-	height: 360rpx;
-	background: #ffffff;
-	margin-top: 30rpx;
-	border-radius: 18rpx;
-	padding-top: 10rpx;
-}
-.u-form-item {
-	padding: 0rpx 0 !important;
-	font-weight: bold !important;
-	/* margin-left: 40rpx !important; */
-	line-height: 40rpx !important;
-	margin-top: 20rpx;
-}
-.u-input__input {
-	font-size: 25rpx !important;
-	font-weight: 400 !important;
-}
-
-/* 实名认证 */
-.user_upload {
-	width: 90%;
-	margin: 0 auto;
-	/* height: 500rpx; */
-	background: #ffffff;
-	margin-top: 50rpx;
-	border-radius: 18rpx;
-}
-.upload_name {
-	width: 90%;
-	margin: 0 auto;
-	height: 80rpx;
-	line-height: 80rpx;
-	font-size: 27rpx;
-	font-weight: bold;
-}
-.upload_box {
-	width: 90%;
-	margin: 0 auto;
-}
-.upload {
-	width: 100%;
-	height: 300rpx;
-	border: 1rpx dashed;
-	margin-bottom: 37rpx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-.box {
-	width: 300rpx;
-	text-align: center;
-}
-.upload_image image {
-	width: 73rpx;
-	height: 60rpx;
-}
-.upload_tit {
-	font-size: 23rpx;
-	color: #353535;
-}
-
-/* 缴纳保证金 */
-.deposit {
-	width: 90%;
-	margin: 0 auto;
-	height: 135rpx;
-	margin-top: 20rpx;
-	background: #FFFFFF;
-	display: flex;
-	border-radius: 18rpx;
-}
-.deposit_left {
-	flex: 2;
-	margin-left: 25rpx;
-	margin-top: 25rpx;
-}
-.deposit_name {
-	color: #FF9707;
-	font-size: 26rpx;
-	font-weight: bold;
-	letter-spacing: 2rpx;
-}
-.deposit_tit {
-	font-size: 22rpx;
-	color: #999999;
-	margin-top: 10rpx;
-}
-.deposit_right {
-	flex: 1;
-	color: #F1413D;
-	display: flex;
-	justify-content: flex-end;
-	align-items: center;
-	margin-right: 25rpx;
-}
-.sure_submit {
-	width: 90%;
-	margin: 0 auto;
-	height: 100rpx;
-	display: flex;
-	justify-content: left;
-	align-items: center;
-	margin-bottom: 90rpx;
-}
-
-/*  checkbox */
-.u-checkbox__label {
-	font-size: 23rpx !important;
-	color: #888888 !important;
-}
-.u-checkbox__icon-wrap--circle {
-	width: 26rpx !important;
-	height: 26rpx !important;
-}
-
-/* 底部 tabbar */
-.tabbar {
-	width: 100%;
-	height: 100rpx;
-	background: #ffffff;
-	position: fixed;
-	bottom: 0rpx;
-	left: 0rpx;
-	right: 0rpx;
-	display: flex;
-}
-.tabbar_price {
-	flex: 1;
-	margin-left: 50rpx;
-	display: flex;
-	justify-content: left;
-	align-items: center;
-	color: black;
-	font-size: 30rpx;
-	font-weight: bold;
-	letter-spacing: 2rpx;
-}
-.tabbar_price text {
-	color: red;
-	font-weight: 500;
-	font-size: 28rpx;
-}
-.tabbar_btn {
-	flex: 1;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-.btn {
-	background: #ff6a04;
-	border-radius: 41rpx;
-	width: 220rpx;
-	height: 74rpx;
-	text-align: center;
-	line-height: 74rpx;
-	color: white;
-	font-size: 25rpx;
-	letter-spacing: 1rpx;
-}
-
-
-

unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.wxml

@@ -1 +0,0 @@
-<view class="u-checkbox-group u-clearfix data-v-703eade0"><slot></slot></view>

unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.wxss

@@ -1,28 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* uni.scss */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-

unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "u-icon": "/uview-ui/components/u-icon/u-icon"
-  },
-  "component": true
-}

unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.wxss

@@ -1,81 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* uni.scss */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.u-checkbox.data-v-54acf820 {
-  display: inline-flex;
-  align-items: center;
-  overflow: hidden;
-  -webkit-user-select: none;
-          user-select: none;
-  line-height: 1.8;
-}
-.u-checkbox__icon-wrap.data-v-54acf820 {
-  color: #606266;
-  flex: none;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  box-sizing: border-box;
-  width: 42rpx;
-  height: 42rpx;
-  color: transparent;
-  text-align: center;
-  transition-property: color, border-color, background-color;
-  font-size: 20px;
-  border: 1px solid #c8c9cc;
-  transition-duration: 0.2s;
-}
-.u-checkbox__icon-wrap--circle.data-v-54acf820 {
-  border-radius: 100%;
-}
-.u-checkbox__icon-wrap--square.data-v-54acf820 {
-  border-radius: 6rpx;
-}
-.u-checkbox__icon-wrap--checked.data-v-54acf820 {
-  color: #fff;
-  background-color: #2979ff;
-  border-color: #2979ff;
-}
-.u-checkbox__icon-wrap--disabled.data-v-54acf820 {
-  background-color: #ebedf0;
-  border-color: #c8c9cc;
-}
-.u-checkbox__icon-wrap--disabled--checked.data-v-54acf820 {
-  color: #c8c9cc !important;
-}
-.u-checkbox__label.data-v-54acf820 {
-  word-wrap: break-word;
-  margin-left: 10rpx;
-  margin-right: 24rpx;
-  color: #606266;
-  font-size: 30rpx;
-}
-.u-checkbox__label--disabled.data-v-54acf820 {
-  color: #c8c9cc;
-}
-