This commit is contained in:
Mr.jiang 2024-07-13 13:45:15 +08:00
parent a102824869
commit 62245d0307
15 changed files with 24 additions and 21 deletions

View File

@ -108,7 +108,7 @@
<view class="mian-bottom-xiang shouyi-text"> <view class="mian-bottom-xiang shouyi-text">
项目金额 : 项目金额 :
<span style="color: #FF6000;font-weight: bold;"> <span style="color: #FF6000;font-weight: bold;">
{{item.price}} {{item.priceTotal}}
</span> </span>
</view> </view>
<view class="mian-bottom-shou"> <view class="mian-bottom-shou">

View File

@ -1884,6 +1884,7 @@
if (res.code == 0) { if (res.code == 0) {
that.getOrder() that.getOrder()
websocketUtils.uploadAudioStart(); // websocketUtils.uploadAudioStart(); //
uni.hideLoading();
} else { } else {
that.$queue.showToast(res.msg); that.$queue.showToast(res.msg);
} }
@ -1906,8 +1907,10 @@
if (res.confirm) { if (res.confirm) {
let data = { let data = {
ordersId: e.ordersId, ordersId: e.ordersId,
accomplishLongitude: that.longitude, accomplishLongitude: '125.430647',
accomplishLatitude: that.latitude, accomplishLatitude: '43.880721',
// accomplishLongitude: that.longitude,
// accomplishLatitude: that.latitude,
jsFwcn:that.checkbox2, jsFwcn:that.checkbox2,
jsPjtag:that.selectedString, jsPjtag:that.selectedString,
jsTsbz:that.textareaTxt jsTsbz:that.textareaTxt
@ -1916,23 +1919,24 @@
let resA = await post('/app/artificer/accomplishOrders', data); let resA = await post('/app/artificer/accomplishOrders', data);
if(resA.code==0||resA.code==200){ if(resA.code==0||resA.code==200){
that.$refs.popupW.close("bottom"); that.$refs.popupW.close("bottom");
that.getOrder(); that.getOrder();
websocketUtils.uploadAudioEnd(); // websocketUtils.uploadAudioEnd(); //
uni.showToast({ uni.showToast({
title:'操作成功!' title:'操作成功!'
}) });
uni.hideLoading();
// uni.switchTab({ // uni.switchTab({
// url:'/pages/order/index' // url:'/pages/order/index'
// }) // })
}else{ }else{
uni.showToast({ uni.showToast({
icon:'error', icon:'error',
title:'操作失败!' title:resA.msg
}) })
uni.hideLoading();
} }
uni.hideLoading();
// let resB = await getXZX("/app/material/selectMaterialArtificer?artificerId=" + // let resB = await getXZX("/app/material/selectMaterialArtificer?artificerId=" +
// artificerId + "&page=" + // artificerId + "&page=" +
@ -2770,7 +2774,7 @@
} }
.popup-content{ .popup-content{
width: 100%; width: 100%;
height: 540px; height: 600px;
background: #FFFFFF; background: #FFFFFF;
border-top-left-radius: 56rpx; border-top-left-radius: 56rpx;
border-top-right-radius: 56rpx; border-top-right-radius: 56rpx;

View File

@ -463,7 +463,6 @@
"bounce": "none", "bounce": "none",
"scrollIndicator": "none", "scrollIndicator": "none",
"titleNView": { "titleNView": {
"titleColor": "#FFFFFF",
"backgroundImage": "linear-gradient(to bottom, #294856, #1a615b)" "backgroundImage": "linear-gradient(to bottom, #294856, #1a615b)"
} }
} }

View File

@ -65,7 +65,7 @@
服务地址 : {{item.address}} 服务地址 : {{item.address}}
</view> </view>
<view class="mian-bottom"> <view class="mian-bottom">
<view class="mian-bottom-xiang shouyi-text">项目金额 : {{item.price}}</view> <view class="mian-bottom-xiang shouyi-text">项目金额 : {{item.priceTotal}}</view>
<view class="mian-bottom-shou"> <view class="mian-bottom-shou">
<span class="shouyi-text">本单收益: </span> <span class="shouyi-text">本单收益: </span>
<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoneyTotal}}</span> <span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoneyTotal}}</span>
@ -104,7 +104,7 @@
服务地址 : {{item.address}} 服务地址 : {{item.address}}
</view> </view>
<view class="mian-bottom"> <view class="mian-bottom">
<view class="mian-bottom-xiang add-text">项目金额 : {{item.price}}</view> <view class="mian-bottom-xiang add-text">项目金额 : {{item.priceTotal}}</view>
<view class="mian-bottom-shou"> <view class="mian-bottom-shou">
<span class="add-text">本单收益: </span> <span class="add-text">本单收益: </span>
<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoneyTotal}}</span> <span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoneyTotal}}</span>

View File

@ -48,7 +48,7 @@
服务地址 : {{item.address}} 服务地址 : {{item.address}}
</view> </view>
<view class="mian-bottom"> <view class="mian-bottom">
<view class="mian-bottom-xiang shouyi-text">项目金额 : {{item.price}}</view> <view class="mian-bottom-xiang shouyi-text">项目金额 : {{item.priceTotal}}</view>
<view class="mian-bottom-shou"> <view class="mian-bottom-shou">
<span class="shouyi-text">本单收益: </span> <span class="shouyi-text">本单收益: </span>
<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoneyTotal}}</span> <span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoneyTotal}}</span>

View File

@ -60,7 +60,7 @@
服务地址 : {{item.accomplishAddress}} 服务地址 : {{item.accomplishAddress}}
</view> </view>
<view class="mian-bottom"> <view class="mian-bottom">
<view class="mian-bottom-xiang shouyi-text">项目金额 : {{item.price}}</view> <view class="mian-bottom-xiang shouyi-text">项目金额 : {{item.priceTotal}}</view>
<view class="mian-bottom-shou"> <view class="mian-bottom-shou">
<span class="shouyi-text">本单收益: </span> <span class="shouyi-text">本单收益: </span>
<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoneyTotal}}</span> <span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoneyTotal}}</span>

View File

@ -48,10 +48,10 @@
服务地址 : {{item.address}} 服务地址 : {{item.address}}
</view> </view>
<view class="mian-bottom"> <view class="mian-bottom">
<view class="mian-bottom-xiang shouyi-text">项目金额 :<span style="color: #FF6000;font-weight: bold;">{{item.price}}</span></view> <view class="mian-bottom-xiang shouyi-text">项目金额 :<span>{{item.priceTotal}}</span></view>
<view class="mian-bottom-shou"> <view class="mian-bottom-shou">
<span class="shouyi-text">本单收益: </span> <span class="shouyi-text">本单收益: </span>
<span class="shouyi-text">{{item.artificerMoneyTotal}}</span> <span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoneyTotal}}</span>
</view> </view>
</view> </view>
</view> </view>

View File

@ -68,7 +68,7 @@
服务地址 : {{item.address}} 服务地址 : {{item.address}}
</view> </view>
<view class="mian-bottom"> <view class="mian-bottom">
<view class="mian-bottom-xiang shouyi-text">项目金额 : {{item.price}}</view> <view class="mian-bottom-xiang shouyi-text">项目金额 : {{item.priceTotal}}</view>
<view class="mian-bottom-shou"> <view class="mian-bottom-shou">
<span class="shouyi-text">本单收益: </span> <span class="shouyi-text">本单收益: </span>
<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoneyTotal}}</span> <span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoneyTotal}}</span>
@ -107,7 +107,7 @@
服务地址 : {{item.address}} 服务地址 : {{item.address}}
</view> </view>
<view class="mian-bottom"> <view class="mian-bottom">
<view class="mian-bottom-xiang shouyi-text">项目金额 : {{item.price}}</view> <view class="mian-bottom-xiang shouyi-text">项目金额 : {{item.priceTotal}}</view>
<view class="mian-bottom-shou"> <view class="mian-bottom-shou">
<span class="shouyi-text">本单收益: </span> <span class="shouyi-text">本单收益: </span>
<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoneyTotal}}</span> <span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoneyTotal}}</span>

View File

@ -48,7 +48,7 @@
服务地址 : {{item.address}} 服务地址 : {{item.address}}
</view> </view>
<view class="mian-bottom"> <view class="mian-bottom">
<view class="mian-bottom-xiang shouyi-text">项目金额 : {{item.price}}</view> <view class="mian-bottom-xiang shouyi-text">项目金额 : {{item.priceTotal}}</view>
<view class="mian-bottom-shou"> <view class="mian-bottom-shou">
<span class="shouyi-text">本单收益: </span> <span class="shouyi-text">本单收益: </span>
<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoneyTotal}}</span> <span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoneyTotal}}</span>

View File

@ -62,7 +62,7 @@
服务地址 : {{item.accomplishAddress}} 服务地址 : {{item.accomplishAddress}}
</view> </view>
<view class="mian-bottom"> <view class="mian-bottom">
<view class="mian-bottom-xiang shouyi-text">项目金额 : {{item.price}}</view> <view class="mian-bottom-xiang shouyi-text">项目金额 : {{item.priceTotal}}</view>
<view class="mian-bottom-shou"> <view class="mian-bottom-shou">
<span class="shouyi-text">本单收益: </span> <span class="shouyi-text">本单收益: </span>
<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoneyTotal}}</span> <span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoneyTotal}}</span>

View File

@ -45,7 +45,7 @@
服务地址 : {{item.address}} 服务地址 : {{item.address}}
</view> </view>
<view class="mian-bottom"> <view class="mian-bottom">
<view class="mian-bottom-xiang shouyi-text">项目金额 : {{item.price}}</view> <view class="mian-bottom-xiang shouyi-text">项目金额 : {{item.priceTotal}}</view>
<view class="mian-bottom-shou"> <view class="mian-bottom-shou">
<span class="shouyi-text">本单收益: </span> <span class="shouyi-text">本单收益: </span>
<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoney}}</span> <span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.artificerMoney}}</span>