修正了错误弹窗

common/http.interceptor.js

@@ -4,17 +4,18 @@ const install = (Vue, vm) => {
         baseUrl: 'https://dmmall.sdbairui.com//storeapi',
 		loadingText: '努力加载中~',
 		loadingTime: 800,
-		// 设置自定义头部content-type
+		originalData: true,
-		// header: {
+	
-        //     "Authorization" : "122"
-		// }
-		// ......
     });
     Vue.prototype.$u.http.interceptor.request = (config) => {
         const token = uni.getStorageSync('token');
 		config.header.Authorization = 'Bearer' + " " + token;
 		return config;
-    }
+	}
+	Vue.prototype.$u.http.interceptor.response = (res) => {
+		// todo 判断状态码
+		return res.data;
+	}
 }
 
 export default {

components/order-item/index.vue

@@ -2,14 +2,7 @@
 	<view class="item" @click="toDetailsPage">
 		<image></image>
 		<view class="goods">
-			
+			<view class="status" v-if="cur==4">待处理订单</view>
-			<view class="goods_num">
-				<view class="number">
-					编号:1234567890123456
-				</view>
-				<view class="order" v-if="cur==4">已完成订单</view>
-				<view class="order" v-else>待处理订单</view>
-			</view>
 			<view class="name u-line-1">心机小黑裙连衣裙赫本风夏季爆款...</view>
 			<view class="info">
 				<view class="num">共一件商品</view>
@@ -57,26 +50,6 @@ export default {
 		flex-direction: column;
 		align-items: flex-start;
 		justify-content: center;
-		.goods_num{
-			display: flex;
-			justify-content: space-between;
-			width: 100%;
-			margin-bottom: 18rpx;
-			.number{
-				font-size:22rpx;
-				font-family:PingFang SC;
-				font-weight:400;
-				color:rgba(153,153,153,1);
-				line-height:36rpx;
-			}
-			.order{
-				font-size:26rpx;
-				font-family:PingFang SC;
-				font-weight:400;
-				color:rgba(255,49,49,1);
-				line-height:36rpx;
-			}
-		}
 		.status {
 			align-self: flex-end;
 			font-size: 26rpx;

package-lock.json

@@ -6,8 +6,13 @@
   "dependencies": {
     "uview-ui": {
       "version": "1.5.2",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.2.tgz",
+      "integrity": "sha512-FV9G+gZTAZKEE2m85ahIbIRiC/fdzTl+eNXDIMBoyc9b+fQWQhEtmAfu6huu7AtKuTI6gfqaYn6WGcmqYvr76w=="
+=======
       "resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.5.2.tgz?cache=0&sync_timestamp=1594781920423&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuview-ui%2Fdownload%2Fuview-ui-1.5.2.tgz",
       "integrity": "sha1-4jDud0TIBjMJe74GU+IyvJSyAwk="
+>>>>>>> fa383397b331ec0091096becf886f978cc1277fc
     }
   }
 }

pages/index/index.vue

@@ -32,14 +32,12 @@
 				<scroll-view scroll-y style="height: 100%;width: 100%;">
 					<view class="complaint">
 						<view class="select-container">
-							<view class="title">选择订单号</view>
+							<view class="title">选择骑手</view>
-							<view class="select" v-if="JSON.stringify(worker) != '{}'">
+							<view class="worker" v-if="JSON.stringify(worker) != '{}'">
-								<!-- <view>{{ worker.label + " " + worker.name }}</view>
+								<view>{{ worker.company + " " + worker.name }}</view>
-								<u-icon name="edit-pen"></u-icon> -->
+								<u-icon name="edit-pen" @click="worker={}"></u-icon>
-								<view class="order_num"><text>{{ worker.label}}</text><text> {{ worker.name }}</text></view>
-								<image src="/static/image/home/5.png" @click="open()"></image>
 							</view>
-							<view v-else class="select" @click="show = true">
+							<view v-else class="select" @click="showSelect=true">
 								<view>请选择</view>
 								<image src="/static/image/home/5.png"></image>
 							</view>
@@ -72,34 +70,7 @@
 			<image src="/static/home/1.png"></image>
 			<view class="text" @click="release()">发布</view>
 		</view>
-		<!-- <u-select v-model="showSelect" mode="mutil-column-auto" :list="workerList" @confirm="setWorker"></u-select> -->
+		<u-select v-model="showSelect" mode="mutil-column-auto" :list="workerList" @confirm="setWorker"></u-select>
-		<u-popup v-model="show" mode="bottom" >
-			<view class="popup_cont" >
-				<view class="rider">
-					<text>选择骑手</text>
-					<image src="../../static/image/tosign/noes.png" @click="show = false"></image>
-				</view>
-				<swiper  style="height: 30vh"   vertical="true">
-					<swiper-item class="swiper-item" >
-						<scroll-view scroll-y class="order-list">
-							<view class="checkd">
-								<u-radio-group v-model="value" @change="radioGroupChange" class="posi">
-									<label v-for="(item, index) in workerList" :key="index" class="check" @confirm="setWorker">
-										<view class="">{{item.name}}</view>
-										<view class="">{{item.label}}</view>
-										<view class="">{{item.company}}</view>
-										<u-radio @change="radioChange(item)" :name="item.id":disabled="item.disabled" shape="circle" active-color="rgba(255, 120, 15, 1)" wrap ="true"></u-radio>
-									</label>
-								</u-radio-group>
-							</view>
-						</scroll-view>
-					</swiper-item>
-				</swiper>
-				<view class="bottom_btn" style="width: 100%;background-color: #fff;">
-					<view class="wash-btn" @click="confirm()">确认</view>
-				</view>
-			</view>
-		</u-popup>
 		<u-popup v-model="showComplaint" mode="center" border-radius="10">
 			<view class="confirm-complaint">
 				<view class="text">
@@ -159,45 +130,34 @@ export default {
 			worker: {},
 			workerList: [
 				{
-					label: '1826789742312345',
+					label: '百世快递公司',
-					id:'1',
+					children: [
-					name:'芳芳',
+						{
-					disabled: false
+							label: '小米'
+						},
+						{
+							label: '小亮'
+						}
+					]
 				},
 				{
-					label: '1826789742312345',
+					label: '中通快递公司',
-					id:'2',
+					children: [
-					name:'张三',
+						{
-					disabled: false
+							label: '小红'
+						}
+					]
 				},
 				{
-					label: '1826789742312345',
+					label: '申通快递公司',
-					id:'3',
+					children: [
-					name:'李四',
+						{
-					disabled: false
+							label: '小蓝'
-				},
+						}
-				{
+					]
-					label: '1826789742312345',
-					id:'4',
-					name:'王五',
-					disabled: false
-				},
-				{
-					label: '1826789742312345',
-					id:'5',
-					name:'阿郎',
-					disabled: false
-				},
-				{
-					label: '1826789742312345',
-					id:'6',
-					name:'阿娘',
-					disabled: false
 				}
 			],
-			publishstate:true,
+			publishstate:true
-			value: 'orange',
-			show: false
 		}
 	},
 	components: {
@@ -210,36 +170,18 @@ export default {
 		release(){
 			this.publishstate = true
 		},
-		confirm(){
-			this.show=false
-		},
-		open(){
-			this.show = true
-		},
-		// 选中某个单选框时，由radio时触发
-		radioChange(e) {
-			this.worker = {
-				label: e.label,
-				name: e.name,
-				company:e.company
-			}
-		},
-		// 选中任一radio时，由radio-group触发
-		radioGroupChange(e) {
-			// console.log(e);
-		},
 		publish(){
 
 		},
 		setWorker(e) {
 			// console.log(e);
-			
+			this.worker = {
+				company: e[0].label,
+				name: e[1].label
+			}
 		},
 		tabsChange(index) {
 			this.swiperCurrent = index;
-			if(this.swiperCurrent == 3){
-				this.worker ={}
-			}
 		},
 		animationfinish(e) {
 			let current = e.detail.current;
@@ -278,7 +220,7 @@ export default {
 	}
 	.swiper-item {
 		.complaint {
-			margin: 0rpx 30rpx 0;
+			margin: 0 30rpx;
 			padding: 75rpx 30rpx;
 			background-color: #ffffff;
 			.select-container {
@@ -292,7 +234,7 @@ export default {
 				}
 				.select {
 					padding: 18rpx 20rpx;
-					width: 470rpx;
+					width: 490rpx;
 					height: 60rpx;
 					background: rgba(236,236,236,1);
 					border-radius: 6rpx;
@@ -307,11 +249,6 @@ export default {
 						width: 24rpx;
 						height: 13rpx;
 					}
-					.order_num{
-						width: 367rpx;
-						display: flex;
-						justify-content: space-between;
-					}
 				}
 				.worker {
 					display: flex;
@@ -438,110 +375,5 @@ export default {
 			height: 37rpx;
 		}
 	}
-		.popup_cont{
-			border-top: 1px solid RGBA(239, 236, 240, 1);
-			background-color: #fff;
-			width: 100%;
-			height: 562rpx;
-			line-height: 80rpx;
-			font-size:28rpx;
-			font-family:PingFang SC;
-			font-weight:400;
-			color:rgba(102,102,102,1);
-			transform: scale(1);
-			/* top: 0px; */
-			transition-duration: 0.3s;
-			
-			> uni-swiper {
-				flex: 1;
-				height: 100vh;
-				
-				.order-list{
-					height: 30vh;
-					padding-bottom: 140rpx;
-				}
-			}
-			.rider{
-				border-radius:20px 20px 0px 0px;
-				font-size:30rpx;
-				font-family:PingFang SC;
-				font-weight:500;
-				color:rgba(51,51,51,1);
-				height:88rpx;
-				width: 100%;
-				padding-left: 30rpx;
-				border-bottom: 1px solid rgba(236, 236, 236, 1);
-				
-				>image{
-					width: 32rpx;
-					height: 32rpx;
-					vertical-align: middle;
-					float: right;
-					padding-top: 30rpx;
-					padding-right:30rpx
-					
-				}
-			}
-			
-			.store{
-				>view{
-					padding-left: 30rpx;
-					padding-top: 30rpx;
-					>image{
-					width:60rpx;
-					height:60rpx;
-					border-radius:50%;
-					vertical-align: middle;
-					padding-right:13rpx
-					}
-				}
-				
-				font-size:28rpx;
-				font-family:PingFang SC;
-				font-weight:400;
-				color:rgba(51,51,51,1);
-				line-height: 60rpx;
-				
-			}
-			.checkd{
-				>radio-group .uni-list-cell{
-					display: flex;
-					flex-wrap: nowrap;
-					width: 100%;
-					padding-bottom: 140rpx;
-				}
-				.posi{
-					margin-bottom: 80rpx;
-					
-					.check{
-					display: flex;
-					width: 100%;
-					justify-content: space-around;
-				}
-				}
-				
-			}
-			.bottom_btn{
-				position: fixed;
-				width: 100%;
-				height: 140rpx;
-				bottom: 0;
-				
-			}
-			.wash-btn {
-				width: 690rpx;
-				height: 98rpx;
-				background: rgba(255,120,15,1);
-				border-radius: 49rpx;
-				position: absolute;
-				bottom: 40rpx;
-				left: 50%;
-				transform: translate(-50%, 0);
-				font-size: 36rpx;
-				color:rgba(255,255,255,1);
-				text-align: center;
-				line-height: 98rpx;
-			}
-		}
 }
 </style>

pages/login/login.vue

@@ -76,7 +76,9 @@
 						})
 					}
 					
-				})	
+				}).catch((res)=>{
+					console.log(res)
+				})
 			}
 		},
 		onLoad(){

pages/release/tosign.vue

@@ -472,5 +472,6 @@
 		left: 0;
 		right: 0;
 		margin: auto;
+		z-index: 10;
 	}
 </style>