lilei 4 anni fa
parent
commit
9598aaece4
6 ha cambiato i file con 110 aggiunte e 68 eliminazioni
  1. 56 0
      pages/index/bg.less
  2. 35 60
      pages/index/index.vue
  3. 18 8
      pages/userAuth/userAuth.vue
  4. BIN
      static/chengzhong.png
  5. BIN
      static/ldbg.png
  6. 1 0
      store/index.js

+ 56 - 0
pages/index/bg.less

@@ -1,3 +1,59 @@
+<!-- 背景动画 -->
+		<view class="windmill">
+			<view class="windmill__sun"></view>
+			<view class="windmill__slice-4">
+				<view></view>
+			</view>
+			<view class="windmill__slice-3">
+				<view class="windmill__tree-left"></view>
+				<view class="windmill__tree-right"></view>
+			</view>
+			<view class="windmill__slice-2">
+				<view class="windmill__tree-right"></view>
+				<view class="windmill__tree-middle"></view>
+				<view class="windmill__tree-left"></view>
+				</view><view class="windmill__clouds">
+				<view class="windmill__cloud"></view>
+				<view class="windmill__cloud"></view>
+				<view class="windmill__cloud"></view>
+				<view class="windmill__cloud"></view>
+				<view class="windmill__cloud"></view>
+				<view class="windmill__cloud"></view>
+			</view>
+			<!-- <view class="windmill__windmill">
+				<view class="windmill__blades">
+					<view class="windmill__blade"></view>
+					<view class="windmill__blade"></view>
+					<view class="windmill__blade"></view>
+					<view class="windmill__blade"></view>
+				</view>
+			</view> -->
+			<view class="windmill__snowflakes">
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+				<view class="windmill__snowflake"></view>
+			</view>
+		</view>
+
 .windmill {
 	position: absolute;
 	width: 100%;

+ 35 - 60
pages/index/index.vue

@@ -1,59 +1,7 @@
 <template>
 	<view class="bg">
-		<!-- 背景动画 -->
-		<view class="windmill">
-			<view class="windmill__sun"></view>
-			<view class="windmill__slice-4">
-				<view></view>
-			</view>
-			<view class="windmill__slice-3">
-				<view class="windmill__tree-left"></view>
-				<view class="windmill__tree-right"></view>
-			</view>
-			<view class="windmill__slice-2">
-				<view class="windmill__tree-right"></view>
-				<view class="windmill__tree-middle"></view>
-				<view class="windmill__tree-left"></view>
-				</view><view class="windmill__clouds">
-				<view class="windmill__cloud"></view>
-				<view class="windmill__cloud"></view>
-				<view class="windmill__cloud"></view>
-				<view class="windmill__cloud"></view>
-				<view class="windmill__cloud"></view>
-				<view class="windmill__cloud"></view>
-			</view>
-			<!-- <view class="windmill__windmill">
-				<view class="windmill__blades">
-					<view class="windmill__blade"></view>
-					<view class="windmill__blade"></view>
-					<view class="windmill__blade"></view>
-					<view class="windmill__blade"></view>
-				</view>
-			</view> -->
-			<view class="windmill__snowflakes">
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-				<view class="windmill__snowflake"></view>
-			</view>
+		<view class="bgimg">
+			<u-image width="622rpx" height="953rpx" src="/static/ldbg.png"></u-image>
 		</view>
 		<!-- 称重 -->
 		<view class="content">
@@ -82,6 +30,7 @@
 </template>
 
 <script>
+	import {getLookUpDatas} from '@/api/data.js'
 	export default {
 		data() {
 			return {
@@ -111,10 +60,24 @@
 				_this.connectBlue()
 			})
 		},
+		onShow() {
+			// 获取订单状态数据字典
+			this.getCodeList('RUBBISH_TYPE','vuex_rubbishType')
+		},
 		onUnload() {
 			uni.$off('blueReConnect')
 		},
 		methods: {
+			// 获取数据字典
+			getCodeList(code,key) {
+				getLookUpDatas({
+					type: code
+				}).then(res => {
+					if (res.status == 200) {
+						this.$u.vuex(key, res.data)
+					}
+				})
+			},
 			// 查看投递记录
 			toTdRecord(){
 				uni.navigateTo({
@@ -479,11 +442,23 @@
 </script>
 
 <style lang="less">
-	@import url("bg.less");
+	// @import url("bg.less");
 	.bg{
 		height: 100vh;
 		width: 100%;
 		position: relative;
+		background-color: #015a50;
+	}
+	.bgimg{
+		position: absolute;
+		z-index: 100;
+		width: 100%;
+		height: 100vh;
+		top: 0;
+		left: 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
 	}
 	.content{
 		display: flex;
@@ -507,7 +482,7 @@
 	}
 	.cz-box{
 		text-align: center;
-		background: #fff;
+		background: #01c9b2;
 		border-radius: 300rpx;
 		box-shadow: 3rpx 3rpx 10rpx rgba(0,0,0,0.4);
 	}
@@ -522,7 +497,7 @@
 	}
 	.tits{
 		padding: 20rpx 0;
-		color: #ef9f2e;
+		color: #FFFFFF;
 	}
 	.devList{
 		width: 80%;
@@ -530,11 +505,11 @@
 	}
 	.bindDev{
 		margin: 20rpx 0;
-		padding: 20rpx 40rpx;
-		background: rgba(255,255,255,0.8);
+		padding: 15rpx 40rpx;
+		background: rgba(19,22,30,0.8);
 		box-shadow: 2rpx 2rpx 8rpx rgba(0,0,0,0.2);
 		border-radius: 100rpx;
-		color: #666666;
+		color: #FFFFFF;
 	}
 	.devList > view{
 		display: flex;

+ 18 - 8
pages/userAuth/userAuth.vue

@@ -17,12 +17,12 @@
 			<view class="form-row">
 				<view><text class="red">*</text>投递类型</view>
 				<view class="form-grid">
-					<view v-for="(item,index) in 8" :key="item" :class="index==0?'active':''">
+					<view v-for="(item,index) in rubbishtype" :key="item.id" :class="index==0?'active':''">
 						<view class="imgs">
-							<u-image src="/static/RECYCLING.png" width="70rpx" height="70rpx"></u-image>
+							<u-image :src="`/static/${item.code}.png`" width="70rpx" height="70rpx"></u-image>
 						</view>
 						<view class="info">
-							<view>废旧纸张</view>
+							<view>{{item.dispName}}</view>
 							<view class="texts">200g/1乐豆</view>
 						</view>
 					</view>
@@ -32,7 +32,7 @@
 		<view class="step2" v-if="current==1">
 			<view class="form-row form-flex">
 				<view>投递手机号</view>
-				<view>13709146191</view>
+				<view>{{formData.phone}}</view>
 			</view>
 			<view class="form-row form-flex">
 				<view>用户乐豆余额</view>
@@ -100,7 +100,8 @@
 					washWeight:0
 				},
 				blueConnect: true,
-				deviceId: null
+				deviceId: null,
+				rubbishtype: []
 			}
 		},
 		computed: {
@@ -165,6 +166,9 @@
 					_this.reConnect(0)
 				}
 			})
+			
+			// 投递类型
+			this.rubbishtype = this.$store.state.vuex_rubbishType
 		},
 		onUnload() {
 			uni.$off('blueConnectClose')
@@ -200,7 +204,13 @@
 					})
 					return
 				}
-				
+				if(this.formData.phone.length!=11){
+					uni.showToast({
+						icon: 'none',
+						title: '请输入正确的手机号码'
+					})
+					return
+				}
 				this.current = this.current + 1
 			},
 			prev(){
@@ -321,8 +331,8 @@
 			}
 		}
 		.active{
-			border-color: #4792d8;
-			background-color: #55aaff;
+			border-color: #e69900;
+			background-color: #ffaa00;
 			color: #FFFFFF;
 			.texts{
 				color: #FFFFFF;

BIN
static/chengzhong.png


BIN
static/ldbg.png


+ 1 - 0
store/index.js

@@ -103,6 +103,7 @@ const store = new Vuex.Store({
 		vuex_socket: null,
 		vuex_wsMessageData: '',
 		vuex_heartInterId: null,
+		vuex_rubbishType: [],
 		// 当前网络连接状态
 		vuex_netStatus: '',
 		// 客服电话