1004749546@qq.com 4 years ago
parent
commit
354b28fe1c

+ 2 - 2
pages/agreement/agreement.vue

@@ -2,10 +2,10 @@
 	<view class="content">
 	<view class="content">
 		<view class="page-content">
 		<view class="page-content">
 			<view class="page-care agreement">
 			<view class="page-care agreement">
-				<view class="title">-分类垃圾录入端用户服务协议(声明)-</view>
+				<view class="title">-乐色超人(骑手端)用户服务协议(声明)-</view>
 				<view class="xy-cons">
 				<view class="xy-cons">
 					<view class="MsoNormal">
 					<view class="MsoNormal">
-						“分类垃圾录入端用户小程序”(以下简称“用户小程序”)由陕西智享亿家环保科技有限公司(以下简称“本公司”)提供。用户在登录用户小程序时,均被视为已经仔细阅读本条款并完全同意。凡以任何方式登录本用户小程序,包括但不限于接受用户小程序服务、直接或间接使用本用户小程序资料、第三方链接等,均被视为自愿接受本用户小程序相关声明和用户服务协议的约束。
+						“乐色超人(骑手端)用户小程序”(以下简称“用户小程序”)由陕西智享亿家环保科技有限公司(以下简称“本公司”)提供。用户在登录用户小程序时,均被视为已经仔细阅读本条款并完全同意。凡以任何方式登录本用户小程序,包括但不限于接受用户小程序服务、直接或间接使用本用户小程序资料、第三方链接等,均被视为自愿接受本用户小程序相关声明和用户服务协议的约束。
 					</view>
 					</view>
 					<view class="MsoNormal">
 					<view class="MsoNormal">
 						一、用户小程序使用
 						一、用户小程序使用

+ 7 - 8
pages/index/index.vue

@@ -13,27 +13,24 @@
 			<view class="title">今日统计</view>
 			<view class="title">今日统计</view>
 			<view class="header-cont">
 			<view class="header-cont">
 				<view class="cont-item">
 				<view class="cont-item">
-					<text v-if="!titleStatus" >{{numTotal}}</text>
-					<!-- <u-loading :show="titleStatus"></u-loading> -->
+					<text >{{numTotal}}</text>
 					<view>完成订单数(个)</view>
 					<view>完成订单数(个)</view>
 				</view>
 				</view>
 				<view class="cont-item">
 				<view class="cont-item">
-					<!-- <u-loading :show="titleStatus"></u-loading> -->
-					<text v-if="!titleStatus" >{{weightTotal}}</text>
+					<text>{{weightTotal}}</text>
 					<view>回收重量(kg)</view>
 					<view>回收重量(kg)</view>
 				</view>
 				</view>
 				<view class="cont-item">
 				<view class="cont-item">
-					<!-- <u-loading :show="titleStatus"></u-loading> -->
-					<text v-if="!titleStatus" >{{moneyTotal}}</text>
+					<text >{{moneyTotal}}</text>
 					<view>交易金额(元)</view>
 					<view>交易金额(元)</view>
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
 		<!-- 接单按钮 -->
 		<!-- 接单按钮 -->
-		<view v-if="workStatus==0 && hasLogin" @click="changeWorkStateFun(1)" class="btn-view start-btn">
+		<view v-show="workStatus==0 && hasLogin" @click="changeWorkStateFun(1)" class="btn-view start-btn">
 			点击开始接单
 			点击开始接单
 		</view>
 		</view>
-		<view v-if="workStatus==1 && hasLogin" @click="changeWorkStateFun(0)" class="btn-view end-btn">
+		<view v-show="workStatus==1 && hasLogin" @click="changeWorkStateFun(0)" class="btn-view end-btn">
 			接单中(点击停止接单)
 			接单中(点击停止接单)
 		</view>
 		</view>
 		<!-- 待处理订单 -->
 		<!-- 待处理订单 -->
@@ -310,6 +307,7 @@
 			border-radius: 24rpx;
 			border-radius: 24rpx;
 			color: #fff;
 			color: #fff;
 			margin: 20rpx 0;
 			margin: 20rpx 0;
+			height: 224rpx;
 			.title {
 			.title {
 				padding: 18rpx 34rpx;
 				padding: 18rpx 34rpx;
 				font-size: 32rpx;
 				font-size: 32rpx;
@@ -319,6 +317,7 @@
 			display: flex;
 			display: flex;
 			align-items: center;
 			align-items: center;
 			justify-content: space-between;
 			justify-content: space-between;
+			flex: 1;
 			padding: 20rpx 34rpx;
 			padding: 20rpx 34rpx;
 			.cont-item{
 			.cont-item{
 				display: flex;
 				display: flex;

+ 2 - 2
pages/login/login.vue

@@ -26,7 +26,7 @@
 				<text @click="toYsPage()">
 				<text @click="toYsPage()">
 				      《乐色超人(骑手端)用户协议》
 				      《乐色超人(骑手端)用户协议》
 				</text>
 				</text>
-				及 <text>
+				及 <text @click="toYsPage()">
 				      《隐私政策》
 				      《隐私政策》
 				    </text>
 				    </text>
 			</view>
 			</view>
@@ -79,7 +79,7 @@
 					url: '/pages/index/index'
 					url: '/pages/index/index'
 				})
 				})
 			},
 			},
-			toYs(){
+			toYsPage(){
 				uni.navigateTo({
 				uni.navigateTo({
 					url: '/pages/agreement/agreement'
 					url: '/pages/agreement/agreement'
 				})
 				})

+ 1 - 1
pages/login/phoneLogin.vue

@@ -26,7 +26,7 @@
 				<text @click="toYsPage()">
 				<text @click="toYsPage()">
 				      《乐色超人(骑手端)用户协议》
 				      《乐色超人(骑手端)用户协议》
 				</text>
 				</text>
-				及 <text>
+				及 <text @click="toYsPage()">
 				      《隐私政策》
 				      《隐私政策》
 				    </text>
 				    </text>
 			</view>
 			</view>

+ 1 - 1
pages/order/hisOrderDetail.vue

@@ -268,7 +268,7 @@
 					}
 					}
 					
 					
 					.item-type{
 					.item-type{
-						width: 128rpx;
+						padding: 0 20rpx;
 						height: 56rpx;
 						height: 56rpx;
 						border: 1px solid #979797;
 						border: 1px solid #979797;
 						opacity: 1;
 						opacity: 1;

+ 15 - 5
pages/userCenter/index.vue

@@ -17,28 +17,38 @@
 		</view>
 		</view>
 		<!-- 列表 -->
 		<!-- 列表 -->
 		<view class="list-container">
 		<view class="list-container">
-			<navigator url="/pages/order/historyOrder" class="list-item flex align_center justify_between">
+			<navigator v-if="hasLogin" url="/pages/order/historyOrder" class="list-item flex align_center justify_between">
 				<view class="flex align_center">
 				<view class="flex align_center">
 					<view class="t-icon icon t-icon-icon_order"></view>
 					<view class="t-icon icon t-icon-icon_order"></view>
 					<text>历史订单</text>
 					<text>历史订单</text>
 				</view>
 				</view>
 				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
 				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
 			</navigator>
 			</navigator>
-			<navigator url="/pages/recoveryTotal/index" class="list-item flex align_center justify_between">
+			<navigator v-if="hasLogin" url="/pages/recoveryTotal/index" class="list-item flex align_center justify_between">
 				<view class="flex align_center">
 				<view class="flex align_center">
 					<view class="t-icon icon t-icon-icon_statistics"></view>
 					<view class="t-icon icon t-icon-icon_statistics"></view>
 					<text>回收统计</text>
 					<text>回收统计</text>
 				</view>
 				</view>
 				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
 				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
 			</navigator>
 			</navigator>
-			<navigator url="/pages/userCenter/changePwd" class="list-item flex align_center justify_between">
+			<navigator v-if="hasLogin" url="/pages/userCenter/changePwd" class="list-item flex align_center justify_between">
 				<view class="flex align_center">
 				<view class="flex align_center">
 					<view class="t-icon icon t-icon-icon_modify"></view>
 					<view class="t-icon icon t-icon-icon_modify"></view>
 					<text>修改密码</text>
 					<text>修改密码</text>
 				</view>
 				</view>
 				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
 				<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
 			</navigator>
 			</navigator>
-			<view @click="quitSys" class="list-item flex align_center justify_between">
+			<view @click="checkUpdate" class="list-item flex align_center justify_between">
+				<view class="flex align_center">
+					<u-icon class="icon" name="error-circle" color="#5c655eb0" size="48"></u-icon>
+					<text>版本检查</text>
+				</view>
+				<view>
+					<text>{{version}}</text>
+					<u-icon name="arrow-right" color="#9DA8B5" size="32"></u-icon>
+				</view>
+			</view>
+			<view v-if="hasLogin" @click="quitSys" class="list-item flex align_center justify_between">
 				<view class="flex align_center">
 				<view class="flex align_center">
 					<view class="t-icon icon t-icon-icon_out"></view>
 					<view class="t-icon icon t-icon-icon_out"></view>
 					<text>退出登录</text>
 					<text>退出登录</text>
@@ -218,6 +228,7 @@
 			.icon{
 			.icon{
 				width: 48rpx;
 				width: 48rpx;
 				height: 48rpx;
 				height: 48rpx;
+				margin-right: 30rpx;
 			}
 			}
 			.list-item{
 			.list-item{
 				padding: 32rpx 36rpx;
 				padding: 32rpx 36rpx;
@@ -225,7 +236,6 @@
 				text{
 				text{
 					font-size: 34rpx;
 					font-size: 34rpx;
 					color: #191919;
 					color: #191919;
-					margin-left: 30rpx;
 				}
 				}
 			}
 			}
 			.margin-bot{
 			.margin-bot{

BIN
static/CLOTHES.png


BIN
static/camera.png


BIN
static/edit.png


BIN
static/index/chuyu.png


BIN
static/index/jianzhu.png


BIN
static/index/logo-active.png


BIN
static/index/logo.png


BIN
static/index/other.png


BIN
static/loading.gif


BIN
static/price/bg__steel.png


BIN
static/price/bg_aper_flower.png


BIN
static/price/bg_aper_miscellaneous.png


BIN
static/price/bg_aper_thick.png


BIN
static/price/bg_aper_yellow.png


BIN
static/price/bg_clothes.png


BIN
static/price/bg_magazine.png


BIN
static/price/bg_newspaper.png


BIN
static/price/bg_thin.png


BIN
static/user_icon_password.png