diff --git a/my/commission/index.vue b/my/commission/index.vue
index 387f714..8fb9d13 100644
--- a/my/commission/index.vue
+++ b/my/commission/index.vue
@@ -108,7 +108,7 @@
项目金额 :
- ￥{{item.price}}
+ ￥{{item.priceTotal}}
diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index 8d40d27..88f9991 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -1884,6 +1884,7 @@
if (res.code == 0) {
that.getOrder()
websocketUtils.uploadAudioStart(); //开启音频录制
+ uni.hideLoading();
} else {
that.$queue.showToast(res.msg);
}
@@ -1906,8 +1907,10 @@
if (res.confirm) {
let data = {
ordersId: e.ordersId,
- accomplishLongitude: that.longitude,
- accomplishLatitude: that.latitude,
+ accomplishLongitude: '125.430647',
+ accomplishLatitude: '43.880721',
+ // accomplishLongitude: that.longitude,
+ // accomplishLatitude: that.latitude,
jsFwcn:that.checkbox2,
jsPjtag:that.selectedString,
jsTsbz:that.textareaTxt
@@ -1916,23 +1919,24 @@
let resA = await post('/app/artificer/accomplishOrders', data);
if(resA.code==0||resA.code==200){
- that.$refs.popupW.close("bottom");
- that.getOrder();
+ that.$refs.popupW.close("bottom");
+ that.getOrder();
websocketUtils.uploadAudioEnd(); //关闭音频上传
uni.showToast({
title:'操作成功！'
- })
+ });
+ uni.hideLoading();
// uni.switchTab({
// url:'/pages/order/index'
// })
}else{
uni.showToast({
icon:'error',
- title:'操作失败！'
+ title:resA.msg
})
+ uni.hideLoading();
}
- uni.hideLoading();
// let resB = await getXZX("/app/material/selectMaterialArtificer?artificerId=" +
// artificerId + "&page=" +
@@ -2770,7 +2774,7 @@
}
.popup-content{
width: 100%;
- height: 540px;
+ height: 600px;
background: #FFFFFF;
border-top-left-radius: 56rpx;
border-top-right-radius: 56rpx;
diff --git a/pages.json b/pages.json
index 80bc0b3..d4f93c1 100644
--- a/pages.json
+++ b/pages.json
@@ -463,7 +463,6 @@
"bounce": "none",
"scrollIndicator": "none",
"titleNView": {
- "titleColor": "#FFFFFF",
"backgroundImage": "linear-gradient(to bottom, #294856, #1a615b)"
}
}
diff --git a/pages/index/addClock.vue b/pages/index/addClock.vue
index 363803b..588e3e4 100644
--- a/pages/index/addClock.vue
+++ b/pages/index/addClock.vue
@@ -65,7 +65,7 @@
服务地址 : {{item.address}}
- 项目金额 : ￥{{item.price}}
+ 项目金额 : ￥{{item.priceTotal}}
本单收益:
￥{{item.artificerMoneyTotal}}
@@ -104,7 +104,7 @@
服务地址 : {{item.address}}
- 项目金额 : ￥{{item.price}}
+ 项目金额 : ￥{{item.priceTotal}}
本单收益:
￥{{item.artificerMoneyTotal}}
diff --git a/pages/index/currentIncome.vue b/pages/index/currentIncome.vue
index 4ae37d8..47bdff3 100644
--- a/pages/index/currentIncome.vue
+++ b/pages/index/currentIncome.vue
@@ -48,7 +48,7 @@
服务地址 : {{item.address}}
- 项目金额 : ￥{{item.price}}
+ 项目金额 : ￥{{item.priceTotal}}
本单收益:
￥{{item.artificerMoneyTotal}}
diff --git a/pages/index/currentPoints.vue b/pages/index/currentPoints.vue
index 9c6bdcd..2a3623f 100644
--- a/pages/index/currentPoints.vue
+++ b/pages/index/currentPoints.vue
@@ -60,7 +60,7 @@
服务地址 : {{item.accomplishAddress}}
- 项目金额 : ￥{{item.price}}
+ 项目金额 : ￥{{item.priceTotal}}
本单收益:
￥{{item.artificerMoneyTotal}}
diff --git a/pages/index/currentYeji.vue b/pages/index/currentYeji.vue
index f00fd73..8a9ef00 100644
--- a/pages/index/currentYeji.vue
+++ b/pages/index/currentYeji.vue
@@ -48,10 +48,10 @@
服务地址 : {{item.address}}
- 项目金额 :￥{{item.price}}
+ 项目金额 :￥{{item.priceTotal}}
本单收益:
- ￥{{item.artificerMoneyTotal}}
+ ￥{{item.artificerMoneyTotal}}
diff --git a/pages/index/previousAdditions.vue b/pages/index/previousAdditions.vue
index 6ecaa99..8597c1e 100644
--- a/pages/index/previousAdditions.vue
+++ b/pages/index/previousAdditions.vue
@@ -68,7 +68,7 @@
服务地址 : {{item.address}}
- 项目金额 : ￥{{item.price}}
+ 项目金额 : ￥{{item.priceTotal}}
本单收益:
￥{{item.artificerMoneyTotal}}
@@ -107,7 +107,7 @@
服务地址 : {{item.address}}
- 项目金额 : ￥{{item.price}}
+ 项目金额 : ￥{{item.priceTotal}}
本单收益:
￥{{item.artificerMoneyTotal}}
diff --git a/pages/index/previousEarnings.vue b/pages/index/previousEarnings.vue
index 4175328..639e7cc 100644
--- a/pages/index/previousEarnings.vue
+++ b/pages/index/previousEarnings.vue
@@ -48,7 +48,7 @@
服务地址 : {{item.address}}
- 项目金额 : ￥{{item.price}}
+ 项目金额 : ￥{{item.priceTotal}}
本单收益:
￥{{item.artificerMoneyTotal}}
diff --git a/pages/index/previousPoints.vue b/pages/index/previousPoints.vue
index 1d4f70e..25c093f 100644
--- a/pages/index/previousPoints.vue
+++ b/pages/index/previousPoints.vue
@@ -62,7 +62,7 @@
服务地址 : {{item.accomplishAddress}}
- 项目金额 : ￥{{item.price}}
+ 项目金额 : ￥{{item.priceTotal}}
本单收益:
￥{{item.artificerMoneyTotal}}
diff --git a/pages/index/previousYeji.vue b/pages/index/previousYeji.vue
index 4741110..7adb4f3 100644
--- a/pages/index/previousYeji.vue
+++ b/pages/index/previousYeji.vue
@@ -45,7 +45,7 @@
服务地址 : {{item.address}}
- 项目金额 : ￥{{item.price}}
+ 项目金额 : ￥{{item.priceTotal}}
本单收益:
￥{{item.artificerMoney}}
diff --git a/unpackage/release/apk/__UNI__B37C795__20240705152122.apk b/unpackage/release/apk/__UNI__B37C795__20240705152122.apk
deleted file mode 100644
index d6f1dec..0000000
Binary files a/unpackage/release/apk/__UNI__B37C795__20240705152122.apk and /dev/null differ
diff --git a/unpackage/release/apk/__UNI__B37C795__20240706174700.apk b/unpackage/release/apk/__UNI__B37C795__20240706174700.apk
deleted file mode 100644
index a839a72..0000000
Binary files a/unpackage/release/apk/__UNI__B37C795__20240706174700.apk and /dev/null differ
diff --git a/unpackage/release/apk/__UNI__B37C795__20240710142649.apk b/unpackage/release/apk/__UNI__B37C795__20240710142649.apk
deleted file mode 100644
index 8f0da1c..0000000
Binary files a/unpackage/release/apk/__UNI__B37C795__20240710142649.apk and /dev/null differ
diff --git a/unpackage/release/apk/__UNI__B37C795__20240711172718.apk b/unpackage/release/apk/__UNI__B37C795__20240711172718.apk
deleted file mode 100644
index 8d8f90e..0000000
Binary files a/unpackage/release/apk/__UNI__B37C795__20240711172718.apk and /dev/null differ