From 82735e4d46ac7b9969facef2acc8f8e793b68f71 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 15 九月 2025 16:11:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/packaging-worker/packaging-worker.vue | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/small-program/pages/packaging-worker/packaging-worker.vue b/small-program/pages/packaging-worker/packaging-worker.vue
index 85f3044..75139ff 100644
--- a/small-program/pages/packaging-worker/packaging-worker.vue
+++ b/small-program/pages/packaging-worker/packaging-worker.vue
@@ -44,20 +44,13 @@
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
</view>
- <view class="list-item-row">
- <view class="list-item-row-label">鐢ㄥ伐鏁伴噺<b>*</b></view>
- <view class="list-item-row-val">
- <input type="number" v-model="form.priceNum2" @blur="getPrice" placeholder="璇疯緭鍏�" />
- <text>浜�</text>
- </view>
- </view>
- <view class="list-item-row" v-if="viewStatus">
+ <view class="list-item-row" >
<view class="list-item-row-label">闇�姹傝ˉ鍏�</view>
<view class="list-item-row-val">
<textarea v-model="form.supplement" cols="30" rows="10" placeholder="濡傛灉鏈夌壒娈婅姹傦紝璇峰湪姝ゅ璇存槑" maxlength="200"></textarea>
</view>
</view>
- <view class="list-item-row" v-if="viewStatus">
+ <view class="list-item-row" >
<view class="list-item-row-label">鍥剧墖</view>
<view class="list-item-row-upload">
<view class="upload-item" v-for="(item, index) in form.multifileList" :key="index">
@@ -70,10 +63,10 @@
</view>
</view>
</view>
- <view class="list-item-zk" @click="viewStatus = !viewStatus">
+ <!-- <view class="list-item-zk" @click="viewStatus = !viewStatus">
<text>{{viewStatus ? '鏀惰捣' : '琛ュ厖闇�姹�'}}</text>
<u-icon :name="viewStatus ? 'arrow-up' : 'arrow-down'" color="#00BC12" size="16"></u-icon>
- </view>
+ </view> -->
</view>
<view class="list-item">
<view class="list-item-label">
@@ -88,16 +81,23 @@
<view class="list-item-row-label" v-if="form.carType === 1">宸ヤ綔鏃堕暱<b>*</b></view>
<view class="list-item-row-label" v-if="form.carType === 2">鍖呰閲嶉噺<b>*</b></view>
<view class="list-item-row-val">
- <input v-model="form.priceNum1" :disabled="form.carType === 0" @blur="getPrice" type="number" placeholder="璇疯緭鍏�" />
+ <input v-model="form.priceNum1" :disabled="form.carType === 0" @blur="getPrice" type="digit" placeholder="璇疯緭鍏�" />
<text v-if="form.carType === 0">澶�</text>
<text v-if="form.carType === 1">灏忔椂</text>
<text v-if="form.carType === 2">鏂�</text>
</view>
</view>
<view class="list-item-row">
+ <view class="list-item-row-label">鐢ㄥ伐鏁伴噺<b>*</b></view>
+ <view class="list-item-row-val">
+ <input type="digit" v-model="form.priceNum2" @blur="getPrice" placeholder="璇疯緭鍏�" />
+ <text>浜�</text>
+ </view>
+ </view>
+ <view class="list-item-row">
<view class="list-item-row-label">璐圭敤鏍囧噯<b>*</b></view>
<view class="list-item-row-val">
- <input v-model="form.price" type="number" @blur="getPrice" placeholder="璇疯緭鍏�" />
+ <input v-model="form.price" type="digit" @blur="getPrice" placeholder="璇疯緭鍏�" />
<text>{{form.priceUnit}}</text>
</view>
</view>
@@ -207,7 +207,7 @@
{ name: '鎸夐噸閲忎粯璐�', id: 2 }
],
cateList: [],
- viewStatus: false,
+ viewStatus: true,
workDays: 0
};
},
@@ -227,11 +227,13 @@
if (!this.form.multifileList) {
this.form.multifileList = []
}
+ this.workDays = res.data.totalDays
// this.clickType()
}
})
} else {
+ this.form.linkName = this.userInfo.name
this.form.linkPhone = this.userInfo.telephone
this.form.priceNum1 = option.days
this.form.startDate = option.startDate
@@ -294,8 +296,9 @@
this.$u.api.getTotal({
price: Number(this.form.price) * 100,
priceNum1: this.form.priceNum1,
- priceNum2: this.form.priceNum2,
+ priceNum2: this.form.priceNum2,
type: this.form.type,
+ carType:this.form.carType ,
workType: this.form.workType
}).then(res => {
if (res.code === 200) {
--
Gitblit v1.9.3