页面修改

pages/order/index/index.vue

@@ -64,7 +64,12 @@
 								<u-button shape="circle" size="medium" :custom-style="themCustomStyle" v-on:click.stop="payment(item)" v-if="item.OrderStatus == '1'">立即支付</u-button>
 								<u-button shape="circle" size="medium" :custom-style="item.OrderStatus == '3' ? customStyle : themCustomStyle"
 								 v-if="item.OrderStatus != '1'" @click.stop="buy(item)">再次购买</u-button>
-								<u-button shape="circle" size="medium" :custom-style="customStyle" v-if="item.OrderStatus == '3'" @click="shouhuoHandler(item.OrderId)">确认收货</u-button>
+								<template v-if="u&&u.TenantId==29">
+									<u-button shape="circle" size="medium" :custom-style="customStyle" v-if="item.OrderStatus == '3'" @click="shouhuoHandler(item.OrderId)">确认</u-button>
+								</template>
+								<template v-else>
+									<u-button shape="circle" size="medium" :custom-style="customStyle" v-if="item.OrderStatus == '3'" @click="shouhuoHandler(item.OrderId)">确认收货</u-button>
+								</template>
 							</view>
 						</view>
 					</view>
@@ -91,7 +96,7 @@
 				</view>
 			</view>
 		</u-popup>
-		<u-modal v-model="showReviceModal" content="是否确认收货？" :show-cancel-button="true" :show-title="false" @confirm="submitReviceGoodHandler"
+		<u-modal v-model="showReviceModal" :content="contentStr" :show-cancel-button="true" :show-title="false" @confirm="submitReviceGoodHandler"
 		 :border-radius="20"></u-modal>
 		<good-list :list="goodData" v-if="showGoodList" @close="closeGoodListHandler"></good-list>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth='goback'></auth>
@@ -182,6 +187,7 @@
 					loading: "努力加载中",
 					nomore: "没有更多了",
 				},
+				contentStr: "是否确认收货？",
 			};
 		},
 		created() {
@@ -260,6 +266,9 @@
 			shouhuoHandler(id) {
 				this.showReviceModal = true;
 				this.submitId = id;
+				if (this.u && this.u.TenantId == 29) {
+					this.contentStr = "是否确认订单?";
+				}
 			},
 			submitReviceGoodHandler() { //确认收货
 				let that = this
@@ -321,7 +330,6 @@
 				this.Cancelmsg.OrderId = e.OrderId;
 				this.Cancelmsg.Type = e.OrderStatus == 1 ? 1 : 2;
 			},
-
 			// 待付款立即支付
 			payment(e) {
 				let list = []

pages/order/order-detail.vue

@@ -124,12 +124,12 @@
 			</view>
 			<view class="block" v-if="orders.CustomFormInfo&&orders.CustomFormInfo.length>0">
 				<view class="order-info-item">
-				  <template v-for="(subItem,subIndex) in orders.CustomFormInfo">
-				  	<view class="field" v-if="(subItem.CompKey=='SingleLineText'||subItem.CompKey=='MultiLineText')&&subItem.CompData.TextValue!=''">
-				  		<view class="label">{{subItem.CompData.Name}}：</view>
-				  		<view class="content">{{ subItem.CompData.TextValue }}</view>
-				  	</view>
-				  </template>
+					<template v-for="(subItem,subIndex) in orders.CustomFormInfo">
+						<view class="field" v-if="(subItem.CompKey=='SingleLineText'||subItem.CompKey=='MultiLineText')&&subItem.CompData.TextValue!=''">
+							<view class="label">{{subItem.CompData.Name}}：</view>
+							<view class="content">{{ subItem.CompData.TextValue }}</view>
+						</view>
+					</template>
 				</view>
 			</view>
 			<view class="block">
@@ -177,8 +177,15 @@
 			</view>
 			<view class="btn-box" v-if="orders.OrderStatus != '5'&&isShowBtn">
 				<view class="item" v-if="orders.OrderStatus == '3'">
-					<u-button shape="circle" size="medium" @click="shouhuoHandler" :custom-style="themCustomStyle">确认收货
-					</u-button>
+					<template v-if="u&&u.TenantId==29">
+						<u-button shape="circle" size="medium" @click="shouhuoHandler" :custom-style="themCustomStyle">确认
+						</u-button>
+					</template>
+					<template v-else>
+						<u-button shape="circle" size="medium" @click="shouhuoHandler" :custom-style="themCustomStyle">确认收货
+						</u-button>
+					</template>
+
 				</view>
 				<view class="item" v-if="orders.OrderStatus == '1'">
 					<u-button shape="circle" size="medium" :custom-style="themCustomStyle" v-on:click.stop="payment(orders)">立即支付</u-button>
@@ -229,7 +236,7 @@
 				</view>
 			</view>
 		</u-popup>
-		<u-modal v-model="showReviceModal" content="是否确认收货？" :show-cancel-button="true" :show-title="false" @confirm="submitReviceGoodHandler"
+		<u-modal v-model="showReviceModal" :content="contentStr" :show-cancel-button="true" :show-title="false" @confirm="submitReviceGoodHandler"
 		 :border-radius="20"></u-modal>
 		<u-toast ref="uToast" />
 		<payCom v-if="payBtn&&u.TenantId!=27" :payInfo="payInfo" @closePay="closePay"></payCom>
@@ -306,6 +313,7 @@
 				NewUserId: 0, //zk新增
 				isShowBtn: true,
 				path: '',
+				contentStr: "是否确认收货？",
 			};
 		},
 		onLoad(option) {
@@ -344,6 +352,9 @@
 			},
 			shouhuoHandler() {
 				this.showReviceModal = true;
+				if (this.u && this.u.TenantId == 29) {
+					this.contentStr = "是否确认订单?";
+				}
 			},
 			goExpressHandler(express, no, id) {
 				uni.navigateTo({