|
@@ -17,19 +17,7 @@
|
|
<view class="form-row">
|
|
<view class="form-row">
|
|
<view><text class="red">*</text>投递类型</view>
|
|
<view><text class="red">*</text>投递类型</view>
|
|
<view class="form-grid">
|
|
<view class="form-grid">
|
|
- <view class="active">
|
|
|
|
- <view>废旧纸张</view>
|
|
|
|
- <view class="texts">200g/1乐豆</view>
|
|
|
|
- </view>
|
|
|
|
- <view>
|
|
|
|
- <view>废旧纸张</view>
|
|
|
|
- <view class="texts">200g/1乐豆</view>
|
|
|
|
- </view>
|
|
|
|
- <view>
|
|
|
|
- <view>废旧纸张</view>
|
|
|
|
- <view class="texts">200g/1乐豆</view>
|
|
|
|
- </view>
|
|
|
|
- <view>
|
|
|
|
|
|
+ <view :class="item==0?'active':''" v-for="item in 8" :key="item">
|
|
<view>废旧纸张</view>
|
|
<view>废旧纸张</view>
|
|
<view class="texts">200g/1乐豆</view>
|
|
<view class="texts">200g/1乐豆</view>
|
|
</view>
|
|
</view>
|
|
@@ -43,7 +31,7 @@
|
|
</view>
|
|
</view>
|
|
<view class="form-row form-flex">
|
|
<view class="form-row form-flex">
|
|
<view>用户乐豆余额</view>
|
|
<view>用户乐豆余额</view>
|
|
- <view><text>560</text></view>
|
|
|
|
|
|
+ <view class="flex-row"><text>560</text><u-image width="30rpx" height="30rpx" src="/static/ledou.png"></u-image></view>
|
|
</view>
|
|
</view>
|
|
<view class="form-row form-flex">
|
|
<view class="form-row form-flex">
|
|
<view>投递类型</view>
|
|
<view>投递类型</view>
|
|
@@ -58,7 +46,7 @@
|
|
</view>
|
|
</view>
|
|
<view class="form-row form-flex">
|
|
<view class="form-row form-flex">
|
|
<view>可兑换乐豆数</view>
|
|
<view>可兑换乐豆数</view>
|
|
- <view><text class="nums">10</text></view>
|
|
|
|
|
|
+ <view class="flex-row"><text class="nums">10</text><u-image width="30rpx" height="30rpx" src="/static/ledou.png"></u-image></view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
<view class="buttons">
|
|
<view class="buttons">
|
|
@@ -67,6 +55,15 @@
|
|
<view v-if="current==1"><u-button shape="circle" @click="submit()" :custom-style="customStyle" type="primary">提交</u-button></view>
|
|
<view v-if="current==1"><u-button shape="circle" @click="submit()" :custom-style="customStyle" type="primary">提交</u-button></view>
|
|
</view>
|
|
</view>
|
|
|
|
|
|
|
|
+ <!-- 注意事项 -->
|
|
|
|
+ <view class="notes">
|
|
|
|
+ <view>注意事项:</view>
|
|
|
|
+ <view>
|
|
|
|
+ <view>1.请等待电子秤数据稳定后,再点击提交按钮</view>
|
|
|
|
+ <view>2.提交数据时,请仔细检查投递重量是否正确</view>
|
|
|
|
+ <view>3.下次称重时,记得将上次称重的物品取下,避免重发提交数据</view>
|
|
|
|
+ </view>
|
|
|
|
+ </view>
|
|
<!-- 提交确认弹框 -->
|
|
<!-- 提交确认弹框 -->
|
|
<u-modal v-model="showOk" :duration="50" show-cancel-button @confirm="confirm" @cancel="cancel">
|
|
<u-modal v-model="showOk" :duration="50" show-cancel-button @confirm="confirm" @cancel="cancel">
|
|
<view class="slot-content">
|
|
<view class="slot-content">
|
|
@@ -94,7 +91,8 @@
|
|
formData:{
|
|
formData:{
|
|
address: '',
|
|
address: '',
|
|
phone: '',
|
|
phone: '',
|
|
- washType: '0'
|
|
|
|
|
|
+ washType: '0',
|
|
|
|
+ washWeight:0
|
|
},
|
|
},
|
|
blueConnect: true,
|
|
blueConnect: true,
|
|
deviceId: null
|
|
deviceId: null
|
|
@@ -102,8 +100,10 @@
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
balanceData() {
|
|
balanceData() {
|
|
|
|
+ this.cancel()
|
|
|
|
+
|
|
let data = this.$store.state.vuex_balanceData
|
|
let data = this.$store.state.vuex_balanceData
|
|
- console.log(data.split(','))
|
|
|
|
|
|
+ console.log(data)
|
|
let weight = data.split(',')[2]
|
|
let weight = data.split(',')[2]
|
|
let uit = ''
|
|
let uit = ''
|
|
let fh = ''
|
|
let fh = ''
|
|
@@ -134,7 +134,9 @@
|
|
weight = Number(weight)
|
|
weight = Number(weight)
|
|
uit = 'g'
|
|
uit = 'g'
|
|
}
|
|
}
|
|
|
|
+
|
|
console.log(weight,uit,fh,'weight end')
|
|
console.log(weight,uit,fh,'weight end')
|
|
|
|
+ this.washWeight = weight
|
|
return fh + weight
|
|
return fh + weight
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -201,6 +203,14 @@
|
|
},
|
|
},
|
|
submit(){
|
|
submit(){
|
|
let that = this
|
|
let that = this
|
|
|
|
+ console.log(this.washWeight,'this.washWeight')
|
|
|
|
+ if(this.washWeight==0){
|
|
|
|
+ uni.showToast({
|
|
|
|
+ icon: 'none',
|
|
|
|
+ title: '投递重量不能是0,请投放称重'
|
|
|
|
+ })
|
|
|
|
+ return
|
|
|
|
+ }
|
|
// 判断设备仍然连接中
|
|
// 判断设备仍然连接中
|
|
uni.getBluetoothDevices({
|
|
uni.getBluetoothDevices({
|
|
success(res) {
|
|
success(res) {
|
|
@@ -242,6 +252,11 @@
|
|
padding: 40rpx 0;
|
|
padding: 40rpx 0;
|
|
border-bottom: 1px solid #f8f8f8;
|
|
border-bottom: 1px solid #f8f8f8;
|
|
}
|
|
}
|
|
|
|
+ .flex-row{
|
|
|
|
+ display: flex;
|
|
|
|
+ align-items: center;
|
|
|
|
+ justify-content: flex-end;
|
|
|
|
+ }
|
|
.form-flex{
|
|
.form-flex{
|
|
display: flex;
|
|
display: flex;
|
|
align-items: center;
|
|
align-items: center;
|
|
@@ -280,7 +295,7 @@
|
|
flex-wrap: wrap;
|
|
flex-wrap: wrap;
|
|
justify-content: space-around;
|
|
justify-content: space-around;
|
|
> view{
|
|
> view{
|
|
- width: 45%;
|
|
|
|
|
|
+ width: 30%;
|
|
border: 1px solid #eee;
|
|
border: 1px solid #eee;
|
|
margin: 20rpx 0;
|
|
margin: 20rpx 0;
|
|
padding: 20rpx;
|
|
padding: 20rpx;
|
|
@@ -311,6 +326,23 @@
|
|
padding: 0 5%;
|
|
padding: 0 5%;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ .notes{
|
|
|
|
+ background: #fff3dc;
|
|
|
|
+ border:1px solid #efb564;
|
|
|
|
+ margin-top: 60rpx;
|
|
|
|
+ border-radius: 10rpx;
|
|
|
|
+ > view{
|
|
|
|
+ &:first-child{
|
|
|
|
+ padding: 20rpx;
|
|
|
|
+ }
|
|
|
|
+ &:last-child{
|
|
|
|
+ padding: 0 20rpx;
|
|
|
|
+ > view{
|
|
|
|
+ padding: 10rpx 20rpx;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
.slot-content{
|
|
.slot-content{
|
|
padding: 25rpx 50rpx 50rpx;
|
|
padding: 25rpx 50rpx 50rpx;
|
|
}
|
|
}
|