From 5bc195f39caa1656af9402a519e19c04d32e4ae1 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Thu, 29 Feb 2024 17:58:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=80=E4=BD=8E=E5=88=A9?=
 =?UTF-8?q?=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/news3/vipPrice.vue | 56 +++++++++++++++++++++++++++++++++++-----
 pages/user/index.vue     |  4 +--
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/pages/news3/vipPrice.vue b/pages/news3/vipPrice.vue
index 9e26c1c..e248b91 100644
--- a/pages/news3/vipPrice.vue
+++ b/pages/news3/vipPrice.vue
@@ -38,7 +38,7 @@
 							<text v-else style="color: #8F8F8F;">请设置</text>
 						</view>
 						<view class="rangeInput fix">
-							<input type="text" :min="5" style="border: none;" @input="onRate($event,index_1,index_2)"
+							<input type="text" style="border: none;" @input="onRate($event,index_1,index_2)"
 								placeholder="请设置" v-model="val.add_price_rate" />
 						</view>
 						<view class="profit">
@@ -58,8 +58,19 @@
 					</view>
 				</view>
 			</view>
-			<view class="ruleText" v-if="type==1">
-				备注：利润低于_元的商品不展示在商城里。
+			<view class="price_rat" v-if="type==0">
+				<view class="price_set">
+					<view class="price_txt">
+						<text>最低利润：</text><input type="text" :min="5" style="border: none;" placeholder="请输入最低利润"
+							v-model="add_price_rate" />
+					</view>
+					<view class="price_bnt">
+						确认
+					</view>
+				</view>
+				<view class="ruleText" v-if="type==0">
+					备注：利润低于_元的商品不展示在商城里。
+				</view>
 			</view>
 		</view>
 		<view class="price-fd">
@@ -92,6 +103,9 @@
 			}
 		},
 		onLoad(op) {
+			uni.setNavigationBarTitle({
+				title: op.type == 0 ? '会员价' : '分销价'
+			})
 			this.type = op.type
 			this.getCategory()
 
@@ -251,9 +265,9 @@
 			// 计算利润率
 			onRate(e, index_1, index_2) {
 				let rate = Number(e.detail.value)
-				if (5 > rate) {
+				if (0 > rate) {
 					this.list[this.index_1].price_list[this.index_2].add_price_rate = ''
-					return this.$toast('最低利率不能低于5%')
+					return this.$toast('最低利率不能低于0%')
 				}
 				this.list[this.index_1].price_list[this.index_2].startProfit = Number((this.list[this.index_1].price_list[
 						this
@@ -390,8 +404,38 @@
 		padding-bottom: 60upx;
 	}
 
+	.price_rat {
+		margin-top: 20rpx;
+		padding: 40rpx;
+		background: #fff;
+	}
+
+	.price_set {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+	}
+
+	.price_bnt {
+		width: 140upx;
+		height: 60upx;
+		background: linear-gradient(180deg, #FD5D06 0%, #F3211A 100%);
+		border-radius: 20px;
+		opacity: 1;
+		font-size: 28upx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 60upx;
+		text-align: center;
+	}
+.price_txt{
+	display: flex;
+	align-items: center;
+}
 	.ruleText {
-		margin: 30rpx 50rpx;
+		margin-top: 10rpx;
 		font-size: 28upx;
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 400;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index da9e146..bf29f68 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -227,7 +227,7 @@
 						<image :src="$picUrl+'/static/user/unpay.png'" class="label_11"></image>
 						<view class="text-group_21">
 							<text class="text_71"
-								v-if="orderTodoInfo.service_order.confirm_number">{{orderTodoInfo.service_order.confirm_number}}</text>
+								v-if="orderTodoInfo.service_order.service_number">{{orderTodoInfo.service_order.service_number}}</text>
 							<text class="text_81">待服务</text>
 						</view>
 					</view>
@@ -235,7 +235,7 @@
 						<image :src="$picUrl+'/static/user/unsend.png'" class="label_11"></image>
 						<view class="text-group_21">
 							<text class="text_71"
-								v-if="orderTodoInfo.service_order.service_number">{{orderTodoInfo.service_order.service_number}}</text>
+								v-if="orderTodoInfo.service_order.confirm_number">{{orderTodoInfo.service_order.confirm_number}}</text>
 							<text class="text_81">待派单</text>
 						</view>
 					</view>