chenrui 4 years ago
parent
commit
6409b7e7dc

+ 1 - 1
components/uni-navbar/uni-navbar.vue

@@ -5,7 +5,7 @@
 				<u-icon name="arrow-left" color="#2979ff" size="28"></u-icon>
 			</view>
 			<view v-if="isMap" class="navbar-action_item last map-bar" @tap="toMap">
-				<u-image class="map-icon" width="30rpx" height="30rpx" src="/static/map-icon.png"></u-image>
+				<u-image class="map-icon" width="20rpx" height="30rpx" src="/static/map-icon.png"></u-image>
 				<view class="item-label">配送地图</view>
 			</view>
 	  </view>

+ 6 - 6
pages.json

@@ -58,7 +58,7 @@
 			"path": "pages/userCenter/index",
 			"style": {
 				"navigationBarTitleText": "个人中心",
-				"navigationBarBackgroundColor": "#2ab4e5",
+				"navigationBarBackgroundColor": "#01c9b2",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -88,20 +88,20 @@
 	},
 	"tabBar": {
 		"color": "#7A7E83",
-		"selectedColor": "#2ab4e5",
+		"selectedColor": "#01c9b2",
 		"backgroundColor": "#ffffff",
 		"fontSize": "14px",
 		"list": [
 		{
 			"pagePath": "pages/index/index",
-			"iconPath": "static/tabbar/record.png",
-			"selectedIconPath": "static/tabbar/record-active.png",
+			"iconPath": "static/tabbar/unclean.png",
+			"selectedIconPath": "static/tabbar/unclean-active.png",
 			"text": "待清运"
 		},
 		{
 			"pagePath": "pages/cleared/index",
-			"iconPath": "static/tabbar/record.png",
-			"selectedIconPath": "static/tabbar/record-active.png",
+			"iconPath": "static/tabbar/cleared.png",
+			"selectedIconPath": "static/tabbar/cleared-active.png",
 			"text": "已清运"
 		},
 		{

+ 24 - 7
pages/cleared/chooseNetwork.vue

@@ -5,7 +5,9 @@
 		<view class="choose-network-header">
 			<view class="checked-all">
 				<u-checkbox
+					v-if="listdata.length>0"
 					class="checked-all-c"
+					active-color="#01c9b2"
 					@change="checkedAll" 
 					v-model="isCheckedAll"
 					label-size="26"
@@ -13,7 +15,7 @@
 				>全选</u-checkbox>
 			</view>
 			<view class="choose-checked" @tap="openScreen=true">
-				已选:<text>{{checkedNum}}</text>
+				已选:<text>{{checkedList.length}}</text>
 				<image class="filter-icon" src="@/static/filter.png"></image>
 			</view>
 		</view>
@@ -24,6 +26,7 @@
 					<u-checkbox
 						class="cell-item-checkbox"
 						@change="checkboxChange($event, index)"
+						active-color="#01c9b2"
 						v-model="item.checked"
 						:name="item.id">
 					</u-checkbox>
@@ -31,16 +34,16 @@
 						<view class="cell-item-info">
 							<view class="cell-item-info-network">
 								咸阳市秦都区文彩舫东区
-								<u-badge type="success" :count="8" :offset="[-10,-32]" size="mini"></u-badge>
+								<u-badge type="success" bgColor="#c90101" :count="8" :offset="[-10,-32]" size="mini"></u-badge>
 							</view>
 							<view class="cell-item-info-weight">
 								<view class="cell-item-weight-bar">
 									15.25kg
-									<u-badge class="badge" type="primary" count="总" :offset="[0,0]"></u-badge>
+									<u-badge class="badge" type="primary" bgColor="#01c9b2" count="总" :offset="[0,0]"></u-badge>
 								</view>
 								<view class="cell-item-weight-bar">
 									15.25kg
-									<u-badge class="badge" type="warning" count="最大" :offset="[0,0]"></u-badge>
+									<u-badge class="badge" type="warning" bgColor="#05695d" count="最大" :offset="[0,0]"></u-badge>
 								</view>
 							</view>
 						</view>
@@ -54,7 +57,7 @@
 			</view>
 		</scroll-view>
 		<view class="footer-bar">
-			<u-button class="footer-handle-btn handle-btn" :custom-style="btnStyle" shape="circle" @click="openScan" size="medium" type="primary">
+			<u-button class="footer-handle-btn handle-btn" hover-class="none" :custom-style="btnStyle" shape="circle" @click="handleAdd" size="medium" type="primary">
 				<text>加入待清运清单</text>
 			</u-button>
 		</view>
@@ -68,7 +71,7 @@
 		components: { searchModal },
 		data(){
 			return{
-				listdata: [],
+				listdata: [{id:1},{id:2}],
 				pageNo: 1,  //  当前页码
 				pageSize: 40,  //  每页条数
 				total: 0,  //  数据总条数
@@ -77,25 +80,37 @@
 				scrollTop: 0,  //  滚动条位置
 				isCheckedAll: false,  //  全选状态
 				checkedNum: 0,  //  已选个数
+				checkedList: [],  //  已选清运网点
 				openScreen: false, //  是否打开筛选
 				searchForm: {
 					//  查询条件
 					bundleName: '',  //  网点名称
 					custMobile: '', // 排序方式
 				},
+				btnStyle: {  //  自定义按钮样式
+					borderColor: '#07c160',
+					backgroundColor: '#07c160',
+					width: '100%'
+				},
 			}
 		},
 		onShow() {
-			this.refresh({})
+			// this.refresh({})
 		},
 		methods: {
+			//  加入清运单
+			handleAdd(){
+				
+			},
 			// 选中某个复选框时,由checkbox时触发
 			checkboxChange(e,ind) {
 				this.listdata[ind].checked = e.value
 				let len = 0
+				this.checkedList = []
 				this.listdata.map(item => {
 					if(item.checked){
 						len++
+						this.checkedList.push(item.id)
 					}
 				})
 				this.checkedNum = len
@@ -104,10 +119,12 @@
 			checkedAll(e) {
 				this.isCheckedAll = e
 				let len = 0
+				this.checkedList = []
 				this.listdata.map(val => {
 					val.checked = e.value ? true : false
 					if(val.checked){
 						len++
+						this.checkedList.push(val.id)
 					}
 				})
 				this.checkedNum = len

+ 4 - 4
pages/cleared/index.vue

@@ -48,22 +48,22 @@
 	export default {
 		data() {
 			return {
-				listdata: [],
+				listdata: [{},{}],
 				pageNo: 1,  //  当前页码
 				pageSize: 10,  //  每页条数
 				total: 0,  //  数据总条数
 				noDataText: '暂无数据',  //  列表请求状态提示语
 				status: 'loadmore',  //  加载中状态
 				customBtnStyle: {  //  撤销单据  自定义按钮样式
-					borderColor: '#2ab4e5',
-					backgroundColor: '#2ab4e5',
+					borderColor: '#01c9b2',
+					backgroundColor: '#01c9b2',
 					color: '#fff'
 				},
 				scrollTop: 0,  //  滚动条位置
 			}
 		},
 		onShow() {
-			this.refresh({})
+			// this.refresh({})
 		},
 		methods:{
 			// 获取查询参数 刷新列表

+ 2 - 2
pages/cleared/network.vue

@@ -27,10 +27,10 @@
 			</view>
 			<!-- 设备列表 -->
 			<view class="details-dev">
-				<view class="details-dev-box" v-for="item in deviceData">
+				<view class="details-dev-box" v-for="item in deviceData" :key="item.id">
 					<view class="details-dev-title">设备编号:<text>{{ item.srcDeviceCode }}</text></view>
 					<view class="details-dev-cons">
-						<view class="dev-item" v-for="boxItem in item.deviceTypeBoxList">
+						<view class="dev-item" v-for="boxItem in item.deviceTypeBoxList" :key="boxItem.id">
 							<view class="item-pic-con">
 								<text v-if="boxItem.flag==1" class="full-sign">已满</text>
 								<u-image mode="aspectFit" height="80" width="80" :src="`/static/${boxItem.rubbishType}.png`" class="type-sign"></u-image>

+ 4 - 6
pages/cleared/searchModal.vue

@@ -49,8 +49,8 @@ export default {
 	data() {
 		return {
 			customBtnStyle: {  //  自定义按钮样式
-				borderColor: '#e84131',
-				backgroundColor: '#e84131',
+				borderColor: '#07c160',
+				backgroundColor: '#07c160',
 				color: '#fff'
 			},
 			isShow: this.visible, // 显示隐藏
@@ -59,10 +59,8 @@ export default {
 				custMobile: '', // 客户手机
 			},
 			list: [
-				{ label: '风', value: '11' },
-				{ label: '花', value: '22' },
-				{ label: '雪', value: '33' },
-				{ label: '月', value: '44' },
+				{ label: '按内置单箱体最大投放量降序', value: '11' },
+				{ label: '按网点可回收物投放总量降序', value: '22' }
 			],
 			openSort: false,  //  选择
 			custMobileName: '请选择',

+ 16 - 11
pages/index/index.vue

@@ -10,16 +10,16 @@
 						<view class="cell-item-info">
 							<view class="cell-item-info-network">
 								咸阳市秦都区文彩舫东区
-								<u-badge type="success" :count="8" :offset="[-10,-32]" size="mini"></u-badge>
+								<u-badge type="success" bgColor="#c90101" :count="8" :offset="[-10,-32]" size="mini"></u-badge>
 							</view>
 							<view class="cell-item-info-weight">
 								<view class="cell-item-weight-bar">
 									15.25kg
-									<u-badge class="badge" type="primary" count="总" :offset="[0,0]"></u-badge>
+									<u-badge class="badge" type="primary" bgColor="#01c9b2" count="总" :offset="[0,0]"></u-badge>
 								</view>
 								<view class="cell-item-weight-bar">
 									15.25kg
-									<u-badge class="badge" type="warning" count="最大" :offset="[0,0]"></u-badge>
+									<u-badge class="badge" type="warning" bgColor="#05695d" count="最大" :offset="[0,0]"></u-badge>
 								</view>
 							</view>
 						</view>
@@ -35,12 +35,12 @@
 		</scroll-view>
 		
 		<view class="footer-bar">
-			<u-button class="footer-handle-btn scan-btn" :custom-style="btnStyle" shape="circle" @click="openScan" size="medium" type="primary">
+			<u-button class="footer-handle-btn scan-btn" hover-class="none" :custom-style="scanBtnStyle" shape="circle" @click="clearingOutlets" size="medium" type="primary">
 				<u-icon name="scan" class="btn-icon" :size="28" color="#fff"></u-icon>
 				<text>扫码清运</text>
 			</u-button>
-			<u-button class="footer-handle-btn" :custom-style="btnStyle" shape="circle" @click="openQuery" size="medium">
-				<u-icon name="plus" class="btn-icon" :size="28" color="#fff"></u-icon>
+			<u-button class="footer-handle-btn" hover-class="none" :custom-style="btnStyle" shape="circle" @click="openQuery" size="medium">
+				<u-icon name="plus" class="btn-icon" :size="28" color="#606266"></u-icon>
 				<text>增加清运网点</text>
 			</u-button>
 		</view>
@@ -52,28 +52,33 @@
 	export default {
 		data() {
 			return {
-				listdata: [],
+				listdata: [{},{}],
 				pageNo: 1,  //  当前页码
 				pageSize: 40,  //  每页条数
 				total: 0,  //  数据总条数
 				noDataText: '暂无数据',  //  列表请求状态提示语
 				status: 'loadmore',  //  加载中状态
 				customBtnStyle: {  //  自定义按钮样式
-					borderColor: '#2ab4e5',
-					backgroundColor: '#2ab4e5',
+					borderColor: '#01c9b2',
+					backgroundColor: '#01c9b2',
 					color: '#fff'
 				},
 				scrollTop: 0,  //  滚动条位置
+				scanBtnStyle: {  //  自定义按钮样式
+					borderColor: '#07c160',
+					backgroundColor: '#07c160',
+					width: '100%'
+				},
 				btnStyle: {  //  自定义按钮样式
 					width: '100%'
 				}
 			}
 		},
 		onShow() {
-			this.refresh({})
+			// this.refresh({})
 		},
 		methods:{
-			(){
+			clearingOutlets(){
 				if(this.listdata.length==0){
 					uni.showToast({ title: '请先选择待清运网点,再进行扫码清运', icon: 'none' })
 				}else{

+ 4 - 3
pages/login/login.vue

@@ -6,11 +6,11 @@
 					<u-image src="/static/logo.jpg" width="140" height="140" ></u-image>
 				</view>
 				<view class="login-btns">
-					<u-button shape="circle" :custom-style="wxButton" class="login-btn" type="success" :hair-line="false" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+					<u-button shape="circle" hover-class="none" :custom-style="wxButton" class="login-btn" type="success" :hair-line="false" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
 						微信授权登录
 					</u-button>
 					<u-gap height="30"></u-gap>
-					<u-button shape="circle" :custom-style="phoneButton" class="login-btn" @click="pwLogin" type="primary">
+					<u-button shape="circle" hover-class="none" :custom-style="phoneButton" class="login-btn" @click="pwLogin" type="primary">
 						账号密码登录
 					</u-button>
 				</view>
@@ -138,10 +138,11 @@
 <style lang="scss" scoped>
 	.login-content {
 		width: 100%;
-		height: 100%;
+		height: 100vh;
 		padding: 40upx;
 		display: flex;
 		flex-direction: column;
+		background-color: #fff;
 		> view{
 			text-align: center;
 			&:first-child{

+ 2 - 2
pages/userCenter/changePwd.vue

@@ -42,8 +42,8 @@
 				},
 				loading: false,
 				customBtnStyle: {  //  自定义按钮样式
-					borderColor: '#2ab4e5',
-					backgroundColor: '#2ab4e5',
+					borderColor: '#07c160',
+					backgroundColor: '#07c160',
 					color: '#fff'
 				},
 			}

+ 4 - 5
pages/userCenter/index.vue

@@ -14,13 +14,12 @@
 		<view class="user-list">
 			<u-cell-group>
 				<u-cell-item icon="file-text" icon-size="40" :icon-style="{color:'#ffaa00'}" index="0" @click="toPage" title="服务协议及隐私政策"></u-cell-item>
-				<!-- <u-cell-item icon="info-circle" icon-size="38" :icon-style="{color:'#55aa00'}" index="1" @click="toPage" title="关于我们"></u-cell-item> -->
-				<u-cell-item icon="lock" icon-size="38" :icon-style="{color:'#00aaff'}" index="2" @click="toPage" title="修改密码"></u-cell-item>
+				<u-cell-item icon="lock" icon-size="38" :icon-style="{color:'#00aaff'}" index="1" @click="toPage" title="修改密码"></u-cell-item>
 			</u-cell-group>
 		</view>
 		<!-- 退出 -->
 		<view class="user-btn">
-			<u-button type="success" :custom-style="quitButton" @click="quitSys" shape="circle">退出登录</u-button>
+			<u-button type="success" hover-class="none" :custom-style="quitButton" @click="quitSys" shape="circle">退出登录</u-button>
 		</view>
 	</view>
 </template>
@@ -34,7 +33,7 @@
 				quitButton: {
 					borderRadius:'100rpx',
 					fontSize:'30rpx',
-					background: '#2ab4e5'
+					background: '#01c9b2'
 				},
 				userInfoData: null,  //  用户信息
 				userAvatarUrl: ''  //  用户头像
@@ -111,7 +110,7 @@
 	.user-content{
 		width: 100%;
 		.user-head{
-			background: #2ab4e5;
+			background: #01c9b2;
 			display: flex;
 			align-items: center;
 			padding: 35rpx 55rpx;

BIN
static/filter.png


BIN
static/map-icon.png


BIN
static/tabbar/cleared-active.png


BIN
static/tabbar/cleared.png


BIN
static/tabbar/record-active.png


BIN
static/tabbar/record.png


BIN
static/tabbar/unclean-active.png


BIN
static/tabbar/unclean.png


BIN
static/tabbar/user-active.png


BIN
static/tabbar/user.png