From c35641acd894c8131c23646c644ad28bca95522b Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Thu, 11 Jul 2024 17:24:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/u-action-sheets.vue                | 235 ++++++++++++++++++
 my/order/revenueDetails.vue                   |  43 ++--
 pages/index/addClock.vue                      |   2 +-
 pages/index/index.vue                         |   8 +-
 pages/my/user.vue                             |  15 +-
 .../u-action-sheet/u-action-sheet.vue         |  23 +-
 6 files changed, 277 insertions(+), 49 deletions(-)
 create mode 100644 components/u-action-sheets.vue

diff --git a/components/u-action-sheets.vue b/components/u-action-sheets.vue
new file mode 100644
index 0000000..4804269
--- /dev/null
+++ b/components/u-action-sheets.vue
@@ -0,0 +1,235 @@
+<template>
+	<u-popup mode="bottom" :border-radius="borderRadius" :popup="false" v-model="value" :maskCloseAble="maskCloseAble"
+	    length="auto" :safeAreaInsetBottom="safeAreaInsetBottom" @close="popupClose" :z-index="uZIndex">
+		<view class="u-tips u-border-bottom" v-if="tips.text" :style="[tipsStyle]">
+			{{tips.text}}
+		</view>
+		<block v-for="(item, index) in list" :key="index">
+			<view 
+				@touchmove.stop.prevent 
+				@tap="itemClick(index)" 
+				:style="[itemStyle(index)]" 
+				class="u-action-sheet-item u-line-1" 
+				:class="[index < list.length - 1 ? 'u-border-bottom' : '']"
+				:hover-stay-time="150"
+			>
+				<text>{{item.text}}</text>
+				<text class="u-action-sheet-item__subtext u-line-1" v-if="item.subText">{{item.subText}}</text>
+			</view>
+		</block>
+		<input class="gongli" type="number" placeholder="请输入免费公里数" v-model="inpValue"/>
+		<view class="u-gab" v-if="cancelBtn">
+		</view>
+		<view @touchmove.stop.prevent class="u-actionsheet-cancel u-action-sheet-item" hover-class="u-hover-class"
+		    :hover-stay-time="150" v-if="cancelBtn" @tap="close">{{cancelText}}</view>
+	</u-popup>
+</template>
+
+<script>
+	/**
+	 * actionSheet 操作菜单
+	 * @description 本组件用于从底部弹出一个操作菜单，供用户选择并返回结果。本组件功能类似于uni的uni.showActionSheetAPI，配置更加灵活，所有平台都表现一致。
+	 * @tutorial https://www.uviewui.com/components/actionSheet.html
+	 * @property {Array<Object>} list 按钮的文字数组，见官方文档示例
+	 * @property {Object} tips 顶部的提示文字，见官方文档示例
+	 * @property {String} cancel-text 取消按钮的提示文字
+	 * @property {Boolean} cancel-btn 是否显示底部的取消按钮（默认true）
+	 * @property {Number String} border-radius 弹出部分顶部左右的圆角值，单位rpx（默认0）
+	 * @property {Boolean} mask-close-able 点击遮罩是否可以关闭（默认true）
+	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配（默认false）
+	 * @property {Number String} z-index z-index值（默认1075）
+	 * @property {String} cancel-text 取消按钮的提示文字
+	 * @event {Function} click 点击ActionSheet列表项时触发
+	 * @event {Function} close 点击取消按钮时触发
+	 * @example <u-action-sheet :list="list" @click="click" v-model="show"></u-action-sheet>
+	 */
+	export default {
+		name: "u-action-sheet",
+		props: {
+			// 点击遮罩是否可以关闭actionsheet
+			maskCloseAble: {
+				type: Boolean,
+				default: true,
+				chuzuValue:''
+			},
+			// 按钮的文字数组，可以自定义颜色和字体大小，字体单位为rpx
+			list: {
+				type: Array,
+				default () {
+					// 如下
+					// return [{
+					// 	text: '确定',
+					// 	color: '',
+					// 	fontSize: ''
+					// }]
+					return [];
+				}
+			},
+			// 顶部的提示文字
+			tips: {
+				type: Object,
+				default () {
+					return {
+						text: '',
+						color: '',
+						fontSize: '26'
+					}
+				}
+			},
+		
+			// 底部的取消按钮
+			cancelBtn: {
+				type: Boolean,
+				default: true
+			},
+			// 是否开启底部安全区适配，开启的话，会在iPhoneX机型底部添加一定的内边距
+			safeAreaInsetBottom: {
+				type: Boolean,
+				default: false
+			},
+			// 通过双向绑定控制组件的弹出与收起
+			value: {
+				type: Boolean,
+				default: false
+			},
+			// 弹出的顶部圆角值
+			borderRadius: {
+				type: [String, Number],
+				default: 0
+			},
+			// 弹出的z-index值
+			zIndex: {
+				type: [String, Number],
+				default: 0
+			},
+			// 取消按钮的文字提示
+			cancelText: {
+				type: String,
+				default: '取消'
+			}
+		},
+		data(){
+			return{
+				inpValue:''
+			}
+		},
+		computed: {
+			
+			// 顶部提示的样式
+			tipsStyle() {
+				let style = {};
+				if (this.tips.color) style.color = this.tips.color;
+				if (this.tips.fontSize) style.fontSize = this.tips.fontSize + 'rpx';
+				return style;
+			},
+			// 操作项目的样式
+			itemStyle() {
+				return (index) => {
+					let style = {};
+					if (this.list[index].color) style.color = this.list[index].color;
+					if (this.list[index].fontSize) style.fontSize = this.list[index].fontSize + 'rpx';
+					// 选项被禁用的样式
+					if (this.list[index].disabled) style.color = '#c0c4cc';
+					return style;
+				}
+			},
+			uZIndex() {
+				// 如果用户有传递z-index值，优先使用
+				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
+			}
+		},
+		mounted() {
+			console.log("listShow",this.listShow)
+		},
+		methods: {
+			chuzuInp(e){
+				this.chuzuValue=e.detail.value
+			},
+			// 点击取消按钮
+			close() {
+				// 发送input事件，并不会作用于父组件，而是要设置组件内部通过props传递的value参数
+				// 这是一个vue发送事件的特殊用法
+				this.popupClose();
+				this.$emit('close');
+			},
+			// 弹窗关闭
+			popupClose() {
+				this.$emit('input', false);
+			},
+			// 点击某一个item
+			itemClick(index) {
+				// disabled的项禁止点击
+				var that=this;
+				if(that.list[index].disabled) return;
+				if(index=='1'){
+					console.log("this.inpValue",this.inpValue)
+					if(that.inpValue!=''){
+						that.$emit('tripWayData', this.inpValue);
+						that.$emit('click', index);
+						that.$emit('input', false);
+					}else{
+						that.$emit('tripWayData',' ');
+						uni.showToast({
+							icon:'error',
+							title:"请输入免费公里数"
+						})
+					}
+				}else{
+					that.$emit('tripWayData',' ');
+					that.$emit('click', index);
+					that.$emit('input', false);
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import '../libs/css/style.components.scss';
+	/deep/.gongli{
+		text-align: center;
+		height: 50px;
+		border-top: 1px solid #e4e7ed;
+	}
+	.chuzuinp{
+		height: 40px;
+		width: 90%;
+		background: #f7f7f7;
+		margin: 5px auto;
+		text-align: center;
+		border-radius: 30px;
+		
+	}
+	.u-tips {
+		font-size: 26rpx;
+		text-align: center;
+		padding: 34rpx 0;
+		line-height: 1;
+		color: $u-tips-color;
+	}
+
+	.u-action-sheet-item {
+		@include vue-flex;;
+		line-height: 1;
+		justify-content: center;
+		align-items: center;
+		font-size: 32rpx;
+		padding: 34rpx 0;
+		flex-direction: column;
+	}
+	
+	.u-action-sheet-item__subtext {
+		font-size: 24rpx;
+		color: $u-tips-color;
+		margin-top: 20rpx;
+	}
+
+	.u-gab {
+		height: 12rpx;
+		background-color: rgb(234, 234, 236);
+	}
+
+	.u-actionsheet-cancel {
+		color: $u-main-color;
+	}
+</style>
diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index 01d0e0c..c4a379f 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -142,7 +142,8 @@
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目收益</span>
-							<span class="mian-view-list-text">￥{{order.oldProjectBenefits}}</span>
+							<span class="mian-view-list-text" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span>
+							<span class="mian-view-list-text" v-else>￥{{order.projectBenefits}}</span>
 						</view>
 						
 						<view class="mian-content-list">
@@ -248,7 +249,8 @@
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目收益</span>
-							<span class="mian-view-list-text"> ￥{{order.oldProjectBenefits}}</span>
+							<span class="mian-view-list-text" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span>
+							<span class="mian-view-list-text" v-else>￥{{order.projectBenefits}}</span>
 						</view>
 						<!-- <view class="mian-view-list">
 							<span class="mian-view-list-title">优惠券</span>
@@ -462,7 +464,8 @@
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目收益</span>
-							<span class="mian-view-list-text">￥{{order.projectBenefits}}</span>
+							<span class="mian-view-list-text" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span>
+							<span class="mian-view-list-text" v-else>￥{{order.projectBenefits}}</span>
 						</view>
 						<view class="mian-content-list">
 							<span class="mian-content-list-title">是否提前结束</span>
@@ -521,7 +524,8 @@
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目收益</span>
-							<span class="mian-view-list-text"> ￥{{order.projectBenefits}}</span>
+							<span class="mian-view-list-text" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span>
+							<span class="mian-view-list-text" v-else>￥{{order.projectBenefits}}</span>
 						</view>
 						<!-- <view class="mian-view-list">
 							<span class="mian-view-list-title">优惠券</span>
@@ -731,7 +735,8 @@
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目收益</span>
-							<span class="mian-view-list-text"> ￥{{order.projectBenefits}}</span>
+							<span class="mian-view-list-text" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span>
+							<span class="mian-view-list-text" v-else>￥{{order.projectBenefits}}</span>
 						</view>
 						<view class="mian-content-list">
 							<span class="mian-content-list-title">是否提前结束</span>
@@ -753,7 +758,8 @@
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目收益</span>
-							<span class="mian-view-list-text"> ￥{{order.projectBenefits}}</span>
+							<span class="mian-view-list-text" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span>
+							<span class="mian-view-list-text" v-else>￥{{order.projectBenefits}}</span>
 						</view>
 						<!-- <view class="mian-view-list">
 							<span class="mian-view-list-title">优惠券</span>
@@ -971,7 +977,8 @@
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目收益</span>
-							<span class="mian-view-list-text">￥{{order.projectBenefits}}</span>
+							<span class="mian-view-list-text" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span>
+							<span class="mian-view-list-text" v-else>￥{{order.projectBenefits}}</span>
 						</view>
 						<view class="mian-content-list">
 							<span class="mian-content-list-title">是否提前结束</span>
@@ -993,7 +1000,8 @@
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目收益</span>
-							<span class="mian-view-list-text"> ￥{{order.projectBenefits}}</span>
+							<span class="mian-view-list-text" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span>
+							<span class="mian-view-list-text" v-else>￥{{order.projectBenefits}}</span>
 						</view>
 						<!-- <view class="mian-view-list">
 							<span class="mian-view-list-title">优惠券</span>
@@ -1205,7 +1213,8 @@
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目收益</span>
-							<span class="mian-view-list-text">￥{{order.oldProjectBenefits}}</span>
+							<span class="mian-view-list-text" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span>
+							<span class="mian-view-list-text" v-else>￥{{order.projectBenefits}}</span>
 						</view>
 						<view class="mian-content-list">
 							<span class="mian-content-list-title">是否提前结束</span>
@@ -1264,8 +1273,10 @@
 						</view>
 						<view class="mian-view-list">
 							<span class="mian-view-list-title">项目收益</span>
-							<span class="mian-view-list-text"> ￥{{order.oldProjectBenefits}}</span>
+							<span class="mian-view-list-text" v-if="order.isSupplement">￥{{order.oldProjectBenefits}}</span>
+							<span class="mian-view-list-text" v-else>￥{{order.projectBenefits}}</span>
 						</view>
+						
 						<!-- <view class="mian-view-list">
 							<span class="mian-view-list-title">优惠券</span>
 							<span class="mian-view-list-text" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</span>
@@ -1903,16 +1914,13 @@
 							that.$queue.showLoading('提交中...')
 							let resA = await post('/app/artificer/accomplishOrders', data);
 							uni.hideLoading();
-							try {
 								if (resA.code == 0||resA.code==200) {
 									websocketUtils.uploadAudioEnd(); //关闭音频上传
 									uni.showToast({
 										title:'操作成功！'
 									})
 									this.$refs.popupW.close('bottom');
-									uni.switchTab({
-										url:'/pages/order/index'
-									})
+									
 								} else {
 									uni.showToast({
 										icon:'error',
@@ -1920,9 +1928,10 @@
 									})
 									// that.$queue.showToast(resA.msg);
 								}
-							} catch (e) {
-								//TODO handle the exception
-							}
+								uni.switchTab({
+									url:'/pages/order/index'
+								})
+							
 							// let resB = await getXZX("/app/material/selectMaterialArtificer?artificerId=" +
 							// 	artificerId + "&page=" +
 							// 	(this
diff --git a/pages/index/addClock.vue b/pages/index/addClock.vue
index c7ed203..eec5a4d 100644
--- a/pages/index/addClock.vue
+++ b/pages/index/addClock.vue
@@ -32,7 +32,7 @@
 						<span class="view-title-left-text" v-if="orderType == 2">本期{{isSfwc=='1'?'已加钟':'未加钟'}}订单</span>
 						<span class="view-title-left-text" v-if="orderType == 3">本期{{isSfwc=='1'?'已充值':'未充值'}}订单</span>
 					</view>
-					<view class="view-title-right">订单数量: {{listData.length}}</view>
+					<view class="view-title-right">订单数量: {{listData.totalCount}}</view>
 				</view>
 				<!--本期加钟 充值 订单-->
 				<view class="mina-view" v-if="isSfwc=='1'" v-for="item in listData" :key="item.id" @click="goOder(item)">
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 26f2621..146d476 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -895,18 +895,18 @@ export default {
 						this.homePageCountNum[0].num = res?.data?.currentPeriodOrdersSum;
 						
 						let formathomePageCountNum = (res?.data?.currentPeriodAddBellsSum * 1) * 100;
-						this.homePageCountNum[1].num = Math.floor(formathomePageCountNum) + "%";
+						this.homePageCountNum[1].num = Math.ceil(formathomePageCountNum) + "%";
 						this.homePageCountNumOne=this.homePageCountNum[1].num;
 						
 						let currentPeriodRechargeSum = ((res?.data?.currentPeriodRechargeSum * 1) * 100);
-						this.homePageCountNum[2].num = Math.floor(currentPeriodRechargeSum) + "%";
+						this.homePageCountNum[2].num = Math.ceil(currentPeriodRechargeSum) + "%";
 						this.homePageCountNumTwo=this.homePageCountNum[2].num;
 						
-						this.currentWholeIncome = Math.floor(res?.data?.currentPerformance);
+						this.currentWholeIncome = Math.ceil(res?.data?.currentPerformance);
 						this.currentRealIncome = res?.data?.earnings;
 						this.currentIntegral = res?.data?.integral;
 						this.maxStatus = res?.data.maxStatus;
-						this.currentRechargeNum = Math.floor(res?.data?.currentPeriodRechargeSum);
+						this.currentRechargeNum = Math.ceil(res?.data?.currentPeriodRechargeSum);
 						this.longUpgradeDescriptionSet = {
 							differenceOutstandingAchievement: res?.data?.differenceOutstandingAchievement,
 							differenceIntegral: res?.data?.differenceIntegral,
diff --git a/pages/my/user.vue b/pages/my/user.vue
index 78a5d6a..306f5cf 100644
--- a/pages/my/user.vue
+++ b/pages/my/user.vue
@@ -42,12 +42,14 @@
 				<image src="../../static/images/my/right.png" style="width: 12rpx;height: 21rpx;"></image>
 			</view>
 		</view>
-		<u-action-sheet :list="cxList" v-model="show" @click="cxCallback"></u-action-sheet>
+		<uActionSheet :list="cxList" @tripWayData="tripWayData" v-model="show" @click="cxCallback"></uActionSheet>
 	</view>
 </template>
 
 <script>
+	import uActionSheet from '../../components/u-action-sheets.vue'
 	export default {
+		components:{uActionSheet},
 		data() {
 			return {
 				tripWayNum:'',
@@ -74,6 +76,9 @@
 			this.getArtificer();
 		},
 		methods: {
+			tripWayData(e){
+				this.tripWayNum=e;
+			},
 			//获取理疗师的信息
 			getArtificer() {
 				this.$Request.getT("/app/artificer/selectArtificer").then(res => {
@@ -83,13 +88,7 @@
 				});
 			},
 			cxCallback(index) {
-				if(index=='0'||index=='1'){
-					this.setChuXing(index + 1)
-				}else{
-					var that=this;
-					that.tripWayNum = uni.getStorageSync('tripWayNum');
-					that.setChuXing(index+1,that.tripWayNum)
-				}
+				this.setChuXing(index+1,this.tripWayNum)
 			},
 			setChuXing(tripWay,tripWayNum) {
 				this.$queue.showLoading('设置中...')
diff --git a/uview-ui/components/u-action-sheet/u-action-sheet.vue b/uview-ui/components/u-action-sheet/u-action-sheet.vue
index adaa849..93e0c2c 100644
--- a/uview-ui/components/u-action-sheet/u-action-sheet.vue
+++ b/uview-ui/components/u-action-sheet/u-action-sheet.vue
@@ -137,9 +137,7 @@
 			console.log("listShow",this.listShow)
 		},
 		methods: {
-			chuzuInp(e){
-				this.chuzuValue=e.detail.value
-			},
+		
 			// 点击取消按钮
 			close() {
 				// 发送input事件，并不会作用于父组件，而是要设置组件内部通过props传递的value参数
@@ -155,22 +153,9 @@
 			itemClick(index) {
 				// disabled的项禁止点击
 				var that=this;
-				// if(that.list[index].disabled) return;
-				if(index=='1'){
-					if(that.chuzuValue!=undefined){
-						uni.setStorageSync('tripWayNum',this.chuzuValue)
-						that.$emit('click', index);
-						that.$emit('input', false);
-					}else{
-						uni.showToast({
-							icon:'error',
-							title:"请输入免费公里数"
-						})
-					}
-				}else{
-					that.$emit('click', index);
-					that.$emit('input', false);
-				}
+				if(that.list[index].disabled) return;
+				that.$emit('click', index);
+				that.$emit('input', false);
 			}
 		}
 	}