|
|
@@ -38,6 +38,16 @@
|
|
|
v-if="i.remark!='book'"></u-icon>
|
|
|
</view>
|
|
|
</view>
|
|
|
+ <view class="list">
|
|
|
+ <view class="tit">选择渔船</view>
|
|
|
+ <view class="typeItem">
|
|
|
+ <view class="txt" v-for="(t,i) in types" :key="i" @click="typeIndex=i" :class="typeIndex==i?'on':''">
|
|
|
+ {{t}}
|
|
|
+ <image v-if="typeIndex==i" src="https://i.ringzle.com/file/20240320/b458b03f8f654a51a921656b8aa955de.png"></image>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
<view class="btn">
|
|
|
<text @click="hexiao">开始发船</text>
|
|
|
</view>
|
|
|
@@ -49,6 +59,18 @@
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
+ typeIndex:null,
|
|
|
+ types: ['浙嵊渔休30015',
|
|
|
+ '浙嵊渔休30016',
|
|
|
+ '浙嵊渔休30017',
|
|
|
+ '浙嵊渔休30018',
|
|
|
+ '浙嵊渔休30019',
|
|
|
+ '浙嵊渔休30020',
|
|
|
+ '浙嵊渔休30021',
|
|
|
+ '浙嵊渔休30022',
|
|
|
+ '浙嵊渔休30023',
|
|
|
+ '浙嵊渔休30025',
|
|
|
+ ],
|
|
|
date: new Date().Format('yyyy-MM-dd'),
|
|
|
show: false,
|
|
|
data: [],
|
|
|
@@ -85,7 +107,9 @@
|
|
|
this.orderInfo = res.data.data;
|
|
|
this.keyName = this.orderInfo.playDate + this.orderInfo.playTime + this.boatNo;
|
|
|
console.log(uni.getStorageSync(this.keyName))
|
|
|
- this.data = JSON.parse(uni.getStorageSync(this.keyName)) || [];
|
|
|
+ if(uni.getStorageSync(this.keyName)){
|
|
|
+ this.data = JSON.parse(uni.getStorageSync(this.keyName)) || [];
|
|
|
+ }
|
|
|
console.log(this.data)
|
|
|
}
|
|
|
})
|
|
|
@@ -141,11 +165,16 @@
|
|
|
},
|
|
|
hexiao() {
|
|
|
if (this.data.length == 0) {
|
|
|
- this.$showToast('请选择核销人')
|
|
|
+ return this.$showToast('请选择核销人')
|
|
|
+ }
|
|
|
+ if (this.typeIndex==null) {
|
|
|
+ return this.$showToast('请选择渔船')
|
|
|
}
|
|
|
+ let boatCode=this.types[this.typeIndex];
|
|
|
this.$api.post('/scenic/order/sailWriteOff', {
|
|
|
orderType: this.orderInfo.orderType,
|
|
|
- touristList: this.data
|
|
|
+ touristList: this.data,
|
|
|
+ boatCode:boatCode
|
|
|
}).then(res => {
|
|
|
if (res.data.code == 0) {
|
|
|
uni.redirectTo({
|
|
|
@@ -202,6 +231,7 @@
|
|
|
display: flex;
|
|
|
gap: 36rpx;
|
|
|
justify-content: space-between;
|
|
|
+
|
|
|
|
|
|
.n {
|
|
|
margin-bottom: 20rpx;
|
|
|
@@ -232,7 +262,7 @@
|
|
|
background-color: #fff;
|
|
|
color: #333;
|
|
|
padding: 0 24rpx 36rpx;
|
|
|
- margin: 20rpx 0;
|
|
|
+ margin: 20rpx 0 0;
|
|
|
background: #fff;
|
|
|
border-radius: 16rpx;
|
|
|
|
|
|
@@ -284,6 +314,7 @@
|
|
|
padding: 0 24rpx 0;
|
|
|
border-radius: 16rpx;
|
|
|
background-color: #fff;
|
|
|
+ margin-top: 20rpx;
|
|
|
|
|
|
.tit {
|
|
|
font-size: 36rpx;
|
|
|
@@ -291,7 +322,39 @@
|
|
|
color: #111;
|
|
|
padding: 36rpx 0 17rpx;
|
|
|
}
|
|
|
-
|
|
|
+ .typeItem{
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ flex-wrap: wrap;
|
|
|
+ gap:20rpx 0;
|
|
|
+ padding-bottom: 50rpx;
|
|
|
+ .txt{
|
|
|
+ display: inline-block;
|
|
|
+ width: 316rpx;
|
|
|
+ height: 80rpx;
|
|
|
+ background: #fff;
|
|
|
+ border-radius: 16rpx;
|
|
|
+ text-align: center;
|
|
|
+ line-height: 80rpx;
|
|
|
+ border: 2rpx solid #EFEFEF;
|
|
|
+ color:#333;
|
|
|
+ position: relative;
|
|
|
+ &.on{
|
|
|
+ color:#007A69 ;
|
|
|
+ background: rgba(0,122,105,0.06);
|
|
|
+ border: 2rpx solid #007A69;
|
|
|
+ image{
|
|
|
+ position: absolute;
|
|
|
+ bottom: 0;
|
|
|
+ right: 0;
|
|
|
+ width: 34rpx;
|
|
|
+ height: 26rpx;
|
|
|
+ z-index: 11;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
.item {
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
