1004749546@qq.com 4 years ago
parent
commit
9c799d08d0
4 changed files with 61 additions and 77 deletions
  1. 4 4
      App.vue
  2. 7 9
      pages/index/index.vue
  3. 49 63
      pages/order/waitOrderDetail.vue
  4. 1 1
      pages/userCenter/index.vue

+ 4 - 4
App.vue

@@ -1,9 +1,9 @@
 <script>
 <script>
-	const uat_domain = 'https://rider.test.sxzxyj.net' // 预发布
-	// const uat_domain = 'http://192.168.16.217:8305' // 本地
+	// const uat_domain = 'https://rider.test.sxzxyj.net' // 预发布
+	const uat_domain = 'http://192.168.16.224:8309' // 本地
 	const pro_domain = 'https://gather.zyucgj.cn' // 生产
 	const pro_domain = 'https://gather.zyucgj.cn' // 生产
-	const uat_URL = uat_domain+'/gc-gather/' // 预发布
-	const pro_URL = pro_domain+'/gc-gather/'  // 生产
+	const uat_URL = uat_domain+'/gc-rider/' // 预发布
+	const pro_URL = pro_domain+'/gc-rider/'  // 生产
 	const buildType = 1 // 打包环境对应类型,1 生产 0 预发布
 	const buildType = 1 // 打包环境对应类型,1 生产 0 预发布
 	const buildURL = buildType ? pro_URL : uat_URL // 打包后实际对应的url
 	const buildURL = buildType ? pro_URL : uat_URL // 打包后实际对应的url
 	const envText = ['预发布环境','生产环境']
 	const envText = ['预发布环境','生产环境']

+ 7 - 9
pages/index/index.vue

@@ -43,7 +43,7 @@
 				<view class="cont-item-right flex_1 flex flex_column justify_between">
 				<view class="cont-item-right flex_1 flex flex_column justify_between">
 					<view class="flex align_center justify_between">
 					<view class="flex align_center justify_between">
 						<view class="flex_1 bold ellipsis-one">{{item.name}}</view>
 						<view class="flex_1 bold ellipsis-one">{{item.name}}</view>
-						<view @click="intoPage()" class="do-btn">去处理</view>
+						<view @click="intoWaitOrderDetail()" class="do-btn">去处理</view>
 					</view>
 					</view>
 					 <view class="greey-font flex align_center justify_between">
 					 <view class="greey-font flex align_center justify_between">
 						 <view class="dizhi ellipsis-one">{{item.addrDetail}}</view>
 						 <view class="dizhi ellipsis-one">{{item.addrDetail}}</view>
@@ -126,7 +126,7 @@
 			checkLogin().then(res => {
 			checkLogin().then(res => {
 				this.hasLogin = res.status == 200
 				this.hasLogin = res.status == 200
 				if(this.hasLogin){
 				if(this.hasLogin){
-					this.pageInit()
+					// this.pageInit()
 				} else {
 				} else {
 					this.noDataText = '您尚未登录或登录已过期,完成登录后可查看录入信息!'
 					this.noDataText = '您尚未登录或登录已过期,完成登录后可查看录入信息!'
 				}
 				}
@@ -193,7 +193,7 @@
 				// }
 				// }
 			},
 			},
 			// 进入待处理订单详情
 			// 进入待处理订单详情
-			intoPage(){
+			intoWaitOrderDetail(){
 				uni.navigateTo({
 				uni.navigateTo({
 					url: '/pages/order/waitOrderDetail'
 					url: '/pages/order/waitOrderDetail'
 				})
 				})
@@ -264,12 +264,10 @@
 			},
 			},
 			// 打开垃圾数据录入页面
 			// 打开垃圾数据录入页面
 			intoPage(item) {
 			intoPage(item) {
-				const flag=item ? item.gatherId : ''
-				console.log(flag,'---------hangid,;;;;')
-				let url = flag ? `/pages/index/addData?id=${flag}` : `/pages/index/addData`
-				// uni.navigateTo({
-				//     url: url
-				// })
+				
+				uni.navigateTo({
+				    url: url
+				})
 				if(!this.hasLogin){
 				if(!this.hasLogin){
 					uni.showModal({
 					uni.showModal({
 					  title: '提示',
 					  title: '提示',

+ 49 - 63
pages/order/waitOrderDetail.vue

@@ -4,71 +4,18 @@
 			<!-- 订单状态 -->
 			<!-- 订单状态 -->
 			<view class="order-status">
 			<view class="order-status">
 				<view class="status-title flex align_center justify_center">
 				<view class="status-title flex align_center justify_center">
-					<view class="t-icon icon t-icon-icon_complete"></view>
+					<view class="t-icon icon t-icon-icon_service"></view>
 				{{orderInfo.orderStateDictValue}}
 				{{orderInfo.orderStateDictValue}}
 				</view>
 				</view>
 				<view class="status-care">
 				<view class="status-care">
 					预约时间:2021-05-10 15:10:05
 					预约时间:2021-05-10 15:10:05
 				</view>
 				</view>
 			</view>
 			</view>
-			<!-- 服务信息 -->
-			<view class="info-main">
-				<view class="flex align_center">
-					<view class="new-left">
-						陕西省西安市未央区华
-						帝金座602室
-					</view>
-				</view>
-				<view class="time flex align_center justify_between">
-					<text>百果园(贞观路店)</text>
-					<view class="flex align_center">
-						<view class="t-icon phone t-icon-icon_phone"></view>
-						<text>18092252287</text>
-					</view>
-				</view>
-			</view>
-			<!-- 预约信息 -->
-			<view class="item-info">
-				<view class="item flex justify_between">
-					<text>预约品类</text>
-					<text>纸品类,金属类</text>
-				</view>
-				<view class="item flex justify_between">
-					<text>预约重量</text>
-					<text>50-100kg</text>
-				</view>
-			</view>
-			<!-- 订单信息 -->
-			<view class="item-info">
-				<!-- <view class="item flex justify_between">
-					<text class="item-title">订单信息</text>
-				</view> -->
-				<view class="item flex justify_between">
-					<text>订单编号</text>
-					<text>202102022225</text>
-				</view>
-				<view class="item flex justify_between">
-					<text>下单时间</text>
-					<text>2021-04-19 15:33</text>
-				</view>
-				<view class="item flex justify_between">
-					<text>服务时间</text>
-					<text>2021-04-19 15:33</text>
-				</view>
-			</view>
-			<!-- 图片 -->
-			<view class="item-info">
-				<view class="item-title flex justify_between">
-					<text>图片</text>
-				</view>
-				<view class="item flex">
-					<u-image class="img-icon" :src="item.icon?item.icon:'../../static/img/mddef.jpg'" border-radius="16" width="160" height="160"></u-image>
-				</view>
-			</view>
 			<!-- 回收品类明细 -->
 			<!-- 回收品类明细 -->
 			<view class="item-info">
 			<view class="item-info">
-				<view class="item-title flex justify_between">
-					<text>回收品类明细</text>
+				<view class="item-title">
+					<view>回收品类明细</view>
+					<view class="care">(切换分类可输入不同回收物的价格和重量)</view>
 				</view>
 				</view>
 				<view class="item flex">
 				<view class="item flex">
 					<view class="item-type active">
 					<view class="item-type active">
@@ -78,9 +25,15 @@
 						纸质类
 						纸质类
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="item flex justify_between">
-					<text>黄纸1.24元/kg</text>
-					<text>5kg/6.20元</text>
+				<view class="item flex justify_between align_center">
+					<view class="flex flex_1 align_center">
+						<text>黄纸</text>
+						<u-input :custom-style="inputLeftStyle" input-align="center" :clearable="false" v-model="value" placeholder="" type="number" />元/kg
+					</view>
+					<view class="flex flex_1 align_center">
+						<u-input class="flex_1" input-align="center" :clearable="false" v-model="value" placeholder="请输入重量" type="number" />kg
+						<text>/0.00元</text>
+					</view>
 				</view>
 				</view>
 			</view>
 			</view>
 			<!-- 金额 -->
 			<!-- 金额 -->
@@ -94,6 +47,22 @@
 					<text>线下</text>
 					<text>线下</text>
 				</view>
 				</view>
 			</view>
 			</view>
+			<!-- 服务信息 -->
+			<view class="info-main">
+				<view class="flex align_center">
+					<view class="new-left">
+						陕西省西安市未央区华
+						帝金座602室
+					</view>
+				</view>
+				<view class="time flex align_center justify_between">
+					<text>百果园(贞观路店)</text>
+					<view class="flex align_center">
+						<view class="t-icon phone t-icon-icon_phone"></view>
+						<text>18092252287</text>
+					</view>
+				</view>
+			</view>
 		</view>
 		</view>
 	</view>
 	</view>
 </template>
 </template>
@@ -106,7 +75,7 @@
 				orderInfo: {
 				orderInfo: {
 					id: '',
 					id: '',
 					createDate: '2021-05-10 15:22',
 					createDate: '2021-05-10 15:22',
-					orderStateDictValue: '已完成',
+					orderStateDictValue: '待服务',
 					storeName: '昆仑润滑·车领主 (西咸新区-...',
 					storeName: '昆仑润滑·车领主 (西咸新区-...',
 					location: '2.9km',
 					location: '2.9km',
 					orderState:'WAIT_PAY',
 					orderState:'WAIT_PAY',
@@ -146,7 +115,16 @@
 				orderId: '', // 订单id
 				orderId: '', // 订单id
 				leftTime: null,
 				leftTime: null,
 				payFinish: false , // 是否支付成功
 				payFinish: false , // 是否支付成功
-				focus: false
+				focus: false,
+				inputLeftStyle: {
+					Width: '120rpx',
+					borderBottom: '1px solid #707070',
+					padding: '0rpx 10rpx',
+					color: '#191919'
+				},
+				inputRightStyle: {
+					
+				}
 			}
 			}
 		},
 		},
 		onLoad(options) {
 		onLoad(options) {
@@ -366,6 +344,11 @@
 					font-size: 32rpx;
 					font-size: 32rpx;
 					color: #181818;
 					color: #181818;
 					padding-top: 28rpx;
 					padding-top: 28rpx;
+					.care{
+						font-size: 24rpx;
+						color: #FF2C5C;
+						margin-top: 10rpx;
+					}
 				}
 				}
 				.item{
 				.item{
 					padding: 28rpx 0;
 					padding: 28rpx 0;
@@ -380,7 +363,10 @@
 					&:last-child{
 					&:last-child{
 						border-bottom: none;
 						border-bottom: none;
 					}
 					}
-					
+					.input-left{
+						padding: 6rpx;
+						border-bottom: 1px solid #707070;
+					}
 					.item-type{
 					.item-type{
 						width: 128rpx;
 						width: 128rpx;
 						height: 56rpx;
 						height: 56rpx;

+ 1 - 1
pages/userCenter/index.vue

@@ -9,7 +9,7 @@
 			<view class="user-info">
 			<view class="user-info">
 				<view v-if="hasLogin" class="user-info-item">{{userData.stationName || ''}}</view>
 				<view v-if="hasLogin" class="user-info-item">{{userData.stationName || ''}}</view>
 				<view v-if="hasLogin" class="user-info-item">{{userData.gatherName||''}} {{userData.gatherPhone || ''}}</view>
 				<view v-if="hasLogin" class="user-info-item">{{userData.gatherName||''}} {{userData.gatherPhone || ''}}</view>
-				<view v-if="!hasLogin"  class="user-info-item">
+				<view @click="toLoginPage" v-if="!hasLogin"  class="user-info-item">
 					请点击登录
 					请点击登录
 				</view>
 				</view>
 				<!-- <u-button v-else="!hasLogin" plain size="mini" shape="circle" @click="toLoginPage">立即登录</u-button> -->
 				<!-- <u-button v-else="!hasLogin" plain size="mini" shape="circle" @click="toLoginPage">立即登录</u-button> -->