From f79b4282f73759f2e4b696720cdf11581cca7ef2 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 21 八月 2025 19:19:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/demand-hall/demand-hall.vue | 14 +++
small-program/pages/using-workers/using-workers.vue | 42 +++++----
small-program/pages/index/index.vue | 72 +++++++++++------
small-program/pages/withdrawal/withdrawal.vue | 18 +++-
small-program/pages/order-details/order-details.vue | 4
small-program/pages/freight/freight.vue | 46 ++++++-----
small-program/pages/success/success.vue | 1
7 files changed, 125 insertions(+), 72 deletions(-)
diff --git a/small-program/pages/demand-hall/demand-hall.vue b/small-program/pages/demand-hall/demand-hall.vue
index 635bcbd..0a4e6e9 100644
--- a/small-program/pages/demand-hall/demand-hall.vue
+++ b/small-program/pages/demand-hall/demand-hall.vue
@@ -36,7 +36,10 @@
</view>
<!-- 鍙戝崟鏂� -->
<view class="index-list" v-if="typeViewId === 0">
- <view class="index-list-item" v-for="(item, index) in orderList" :key="index" @click="jumpDesc(item)">
+ <view class="index-list-wu" v-if="orderList.length === 0">
+ <text>宸插姞杞藉叏閮ㄦ暟鎹�</text>
+ </view>
+ <view class="index-list-item" v-for="(item, index) in orderList" :key="index" @click="jumpDesc(item)" v-else>
<view class="index-list-item-head">
<view class="index-list-item-head-l">
<view class="xoam"></view>
@@ -450,6 +453,15 @@
width: 100%;
padding: 20rpx 30rpx;
box-sizing: border-box;
+ .index-list-wu {
+ width: 100%;
+ margin-top: 40rpx;
+ text-align: center;
+ text {
+ font-size: 30rpx;
+ color: #666666;
+ }
+ }
.index-list-item {
width: 100%;
padding: 30rpx;
diff --git a/small-program/pages/freight/freight.vue b/small-program/pages/freight/freight.vue
index a56325a..b575336 100644
--- a/small-program/pages/freight/freight.vue
+++ b/small-program/pages/freight/freight.vue
@@ -92,8 +92,10 @@
<view class="list-item-row-label">杩愯緭閲嶉噺/鏁伴噺<b>*</b></view>
<view class="list-item-row-val">
<input type="text" v-model="form.transportNum" placeholder="璇疯緭鍏�" />
- <text @click="show4 = true">{{form.transportUnit}}</text>
- <u-icon name="arrow-down" color="#111111" size="16"></u-icon>
+ <view @click="show4 = true" style="width: 100%; flex-shrink: 0; display: flex; align-items: center; justify-content: flex-end;">
+ <text>{{form.transportUnit}}</text>
+ <u-icon name="arrow-down" color="#111111" size="16"></u-icon>
+ </view>
</view>
</view>
<view class="list-item-row" v-if="viewStatus">
@@ -342,6 +344,9 @@
},
// 鎻愪氦璁㈠崟
submit() {
+ if (!this.form.carUnit) {
+ return uni.showToast({ title: '璇烽�夋嫨璐ц溅鍨嬪彿', icon: 'none' })
+ }
if (!this.form.transportTypeName) {
return uni.showToast({ title: '璇烽�夋嫨杩愯緭鍝佺', icon: 'none' })
}
@@ -419,24 +424,25 @@
var that = this;
uni.chooseImage({
success: (chooseImageRes) => {
- const tempFilePaths = chooseImageRes.tempFilePaths;
- uni.uploadFile({
- url: this.$baseUrl + '/web/public/upload',
- filePath: tempFilePaths[0],
- name: 'file',
- formData: {
- 'folder': 'orders'
- },
- success: (uploadFileRes) => {
- const res = JSON.parse(uploadFileRes.data)
- that.form.multifileList.push({
- fileurl: res.data.imgaddr,
- name: res.data.originname,
- url: res.data.url,
- type: 0
- })
- }
- });
+ for (let i = 0; i < chooseImageRes.tempFilePaths.length; i++) {
+ uni.uploadFile({
+ url: this.$baseUrl + '/web/public/upload',
+ filePath: chooseImageRes.tempFilePaths[i],
+ name: 'file',
+ formData: {
+ 'folder': 'orders'
+ },
+ success: (uploadFileRes) => {
+ const res = JSON.parse(uploadFileRes.data)
+ that.form.multifileList.push({
+ fileurl: res.data.imgaddr,
+ name: res.data.originname,
+ url: res.data.url,
+ type: 0
+ })
+ }
+ });
+ }
}
});
},
diff --git a/small-program/pages/index/index.vue b/small-program/pages/index/index.vue
index f8c2695..ed7f456 100644
--- a/small-program/pages/index/index.vue
+++ b/small-program/pages/index/index.vue
@@ -415,18 +415,39 @@
async onLoad() {
await this.$onLaunched;
- if (this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}') {
+ if (this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}' && this.userInfo.useIdentity === 1) {
this.getOrderList()
- this.getCategoryLists()
+ }
+
+ this.getCategoryLists()
+ this.getDictInfo()
+
+ if (this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}') {
+ this.form.linkPhone = this.userInfo.telephone
}
this.qqmapsdk = new QQMapWX({
key: '4PXBZ-JLBC7-LCLXG-P2SZX-C4HYE-LDBLQ'
});
- this.form.linkPhone = this.userInfo.telephone
-
- this.getDictInfo()
+ uni.$on('clear', (data) => {
+ this.form.startDate = ''
+ this.form.endDate = ''
+ this.form.latitude = ''
+ this.form.longitude = ''
+ this.form.location = ''
+ this.form.locationEnd = ''
+ this.form.wayInfoDTOList = []
+ this.form.workType = 0
+ this.form.days = ''
+ this.form.locationRemark = ''
+ this.form.supplement = ''
+ this.form.multifileList = []
+ this.form.linkName = ''
+ this.form.estimatedAccount = ''
+ this.form.price = ''
+ this.form.address = ''
+ })
},
onShow(options) {
this.typeViewId = 0
@@ -461,7 +482,7 @@
this.form.location = ''
this.form.locationEnd = ''
this.form.wayInfoDTOList = []
- this.form.workType = ''
+ this.form.workType = 0
this.form.days = ''
this.form.locationRemark = ''
this.form.supplement = ''
@@ -649,24 +670,25 @@
uploadImg() {
uni.chooseImage({
success: (chooseImageRes) => {
- const tempFilePaths = chooseImageRes.tempFilePaths;
- uni.uploadFile({
- url: this.$baseUrl + '/web/public/upload',
- filePath: tempFilePaths[0],
- name: 'file',
- formData: {
- 'folder': 'orders'
- },
- success: (uploadFileRes) => {
- const res = JSON.parse(uploadFileRes.data)
- this.form.multifileList.push({
- fileurl: res.data.imgaddr,
- name: res.data.originname,
- url: res.data.url,
- type: 0
- })
- }
- });
+ for (let i = 0; i < chooseImageRes.tempFilePaths.length; i++) {
+ uni.uploadFile({
+ url: this.$baseUrl + '/web/public/upload',
+ filePath: chooseImageRes.tempFilePaths[i],
+ name: 'file',
+ formData: {
+ 'folder': 'orders'
+ },
+ success: (uploadFileRes) => {
+ const res = JSON.parse(uploadFileRes.data)
+ this.form.multifileList.push({
+ fileurl: res.data.imgaddr,
+ name: res.data.originname,
+ url: res.data.url,
+ type: 0
+ })
+ }
+ });
+ }
}
});
},
@@ -1697,7 +1719,7 @@
flex-shrink: 0;
}
text {
- flex: 1;
+ width: 470rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index ee98882..a6a75f6 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -7,12 +7,12 @@
<view class="order-head-status">{{info.statusName || ''}}</view>
<view class="order-head-info">{{getStatusInfo()}}</view>
</view>
- <view class="order-quxiao">
+ <view class="order-quxiao" v-if="userInfo.useIdentity != 0">
<view class="order-quxiao-btn" @click="show = true" v-if="userInfo.id === info.acceptMemberId && info.status ===2">鍙栨秷璁㈠崟</view>
<view class="order-quxiao-btn" @click="show = true" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 || info.status ===1|| info.status ===2)">鍙栨秷璁㈠崟</view>
<view class="order-quxiao-btn1" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 || info.status ===1|| info.status ===2)" @click="jumpEdit()">淇敼璁㈠崟</view>
</view>
- <view class="order-user" v-if="userInfo.id === info.releaseMemberId">
+ <view class="order-user" v-if="userInfo.id === info.releaseMemberId && userInfo.useIdentity != 0">
<view class="order-user-info">
<view class="user-info-l">
<view class="user-info-l-image">
diff --git a/small-program/pages/success/success.vue b/small-program/pages/success/success.vue
index 48c6b78..4b954d3 100644
--- a/small-program/pages/success/success.vue
+++ b/small-program/pages/success/success.vue
@@ -23,6 +23,7 @@
},
methods: {
toIndex() {
+ uni.$emit('clear')
uni.switchTab({
url: '/pages/index/index'
});
diff --git a/small-program/pages/using-workers/using-workers.vue b/small-program/pages/using-workers/using-workers.vue
index c49c649..379a5c5 100644
--- a/small-program/pages/using-workers/using-workers.vue
+++ b/small-program/pages/using-workers/using-workers.vue
@@ -23,8 +23,11 @@
</view>
<view class="list-item-row">
<view class="list-item-row-label">鍦扮偣鎻忚堪</view>
- <view class="list-item-row-val">
+ <!-- <view class="list-item-row-val">
<input type="text" v-model="form.locationRemark" placeholder="璇疯緭鍏�" />
+ </view> -->
+ <view class="list-item-row-val">
+ <textarea v-model="form.locationRemark" cols="30" rows="10" placeholder="璇疯緭鍏�" maxlength="200"></textarea>
</view>
</view>
</template>
@@ -314,24 +317,25 @@
uploadImg() {
uni.chooseImage({
success: (chooseImageRes) => {
- const tempFilePaths = chooseImageRes.tempFilePaths;
- uni.uploadFile({
- url: this.$baseUrl + '/web/public/upload',
- filePath: tempFilePaths[0],
- name: 'file',
- formData: {
- 'folder': 'orders'
- },
- success: (uploadFileRes) => {
- const res = JSON.parse(uploadFileRes.data)
- this.form.multifileList.push({
- fileurl: res.data.imgaddr,
- name: res.data.originname,
- url: res.data.url,
- type: 0
- })
- }
- });
+ for (let i = 0; i < chooseImageRes.tempFilePaths.length; i++) {
+ uni.uploadFile({
+ url: this.$baseUrl + '/web/public/upload',
+ filePath: chooseImageRes.tempFilePaths[i],
+ name: 'file',
+ formData: {
+ 'folder': 'orders'
+ },
+ success: (uploadFileRes) => {
+ const res = JSON.parse(uploadFileRes.data)
+ this.form.multifileList.push({
+ fileurl: res.data.imgaddr,
+ name: res.data.originname,
+ url: res.data.url,
+ type: 0
+ })
+ }
+ });
+ }
}
});
}
diff --git a/small-program/pages/withdrawal/withdrawal.vue b/small-program/pages/withdrawal/withdrawal.vue
index 5e058c1..0f9b211 100644
--- a/small-program/pages/withdrawal/withdrawal.vue
+++ b/small-program/pages/withdrawal/withdrawal.vue
@@ -11,13 +11,17 @@
<text>鎻愮幇鍒拌处</text>
<text>寰俊闆堕挶</text>
</view>
+ <view class="content-title">鐪熷疄濮撳悕</view>
+ <view class="content-input" style="margin-bottom: 40rpx;">
+ <input style="font-weight: 500;" type="text" v-model="name" @input="changeName" placeholder="寰俊瀹炲悕璁よ瘉濮撳悕" />
+ </view>
<view class="content-title">鎻愮幇閲戦</view>
<view class="content-input">
<view class="content-input-icon">
<image src="/static/icon/ic_money@2x.png" mode="widthFix"></image>
</view>
- <input type="number" v-model="amount" @input="changeAmount" placeholder="璇疯緭鍏ユ彁鐜伴噾棰�" />
- <view class="content-input-btn" @click="inputAll">鍏ㄩ儴鎻愮幇</view>
+ <input type="digit" v-model="amount" @input="changeAmount" placeholder="璇疯緭鍏ユ彁鐜伴噾棰�" />
+ <view class="content-input-btn" @click="inputAll">鍏ㄩ儴鎻愮幇</view>
</view>
<view class="content-tips">{{tips}}</view>
<view class="content-button" @click="submit">2灏忔椂鍒拌处锛岀‘璁ゆ彁鐜�</view>
@@ -38,10 +42,12 @@
wxTips:'',
canTransfer:false,
changing1:false,
- amount: null
+ amount: null,
+ name:''
};
},
onLoad(){
+ this.name = this.userInfo.name
var that =this
that.canTransfer = false
if (wx.canIUse('requestMerchantTransfer')) {
@@ -74,7 +80,7 @@
uni.navigateTo({
url: '/pages/balance-details/balance-details'
})
- },
+ },
inputAll(){
this.amount = ((this.userInfo.amount|| 0)/100).toFixed(2)
},
@@ -88,11 +94,13 @@
package: param.packageInfo,
success: (res) => {
// res.err_msg灏嗗湪椤甸潰灞曠ず鎴愬姛鍚庤繑鍥炲簲鐢ㄦ椂杩斿洖ok锛屽苟涓嶄唬琛ㄤ粯娆炬垚鍔�
+ console.log(res)
uni.navigateTo({
url: '/pages/withdrawal-successful/withdrawal-successful'
})
},
fail: (res) => {
+ console.log("22222222222222",res)
uni.showToast({
title:'瀵逛笉璧凤紝鎻愮幇澶辫触銆�'+res.err_msg
})
@@ -136,7 +144,7 @@
}
this.changing1 = true
var that = this
- var param ={amount:this.amount }
+ var param ={amount:this.amount,name:this.name }
that.$u.api.applyWithdrawal(param)
.then(res =>{
if(res.code ===200){
--
Gitblit v1.9.3