订单详情提示弹窗修改

pages/seller/order/order-historylist.vue

@@ -233,7 +233,7 @@
 			</swiper-item>
 		</swiper>
 		<!-- 分享弹窗 -->
-		<share-alert v-if="isShareModal" :orderId="btnoRderID" @shareConfirm="onShareAppMessage"> </share-alert>
+		<share-alert v-if="isShareModal" :shareType="isShareType" :orderId="btnoRderID" @shareConfirm="onShareAppMessage"> </share-alert>
 		<!-- 透明模态层 -->
 		<modal-layer v-if="isModalLayer"></modal-layer>
 		<!-- 再来一单弹窗 -->
@@ -310,6 +310,7 @@ export default {
 			skeletonShow: true,
 			isClickChange: false,
 			isShareModal: false, //控制分享弹窗
+			isShareType:2,
 			isSeller: false,
 			isModalLayer: false,
 			loadding: false,
@@ -526,7 +527,6 @@ export default {
 			}
 		},
 		handOrderAgain(orderId) {
-			// 再来一单
 			this.aganOrderId = orderId
 			this.SellerService.SellerCreateOrderAgain({
 				confirmFlag: 0,
@@ -536,9 +536,9 @@ export default {
 				.then(res => {
 					if (res.code == 0) {
 						this.$api.setStorage('orderUserInfo', {
-							clubID: res.data.clubId,
+							clubId: res.data.clubId,
 							againBuyProductIds: res.data.productIds,
-							userID: res.data.userId
+							userId: res.data.userId
 						})
 						this.$api.navigateTo('/pages/seller/cart/cart')
 					}

pages/user/order/order-details.vue

@@ -96,6 +96,18 @@
 			:beanNumber="beanNumber"
 			@cancel="handleBeanlClick"
 		></activityBean>
+		<!-- 提示弹窗 -->
+		<tui-modal
+			:show="modal"
+			@click="handleClick"
+			:content="contentModalText"
+			:button="modalButton"
+			color="#333"
+			:size="32"
+			shape="circle"
+			:maskClosable="false"
+		>
+		</tui-modal>
 	</view>
 </template>
 
@@ -172,7 +184,19 @@ export default {
 			orderSubmitType: false, //自主订单
 			beansType: 1,
 			beanNumber: 0,
-			isActivityBean: false
+			isActivityBean: false,
+			modal:false,
+			contentModalText: '订单查询失败,请稍候重试~', //操作文字提示语句
+			modalButton: [
+				{
+					text: '确定',
+					customStyle: {
+						color: '#fff',
+						bgColor: 'linear-gradient(90deg, #F28F31 0%, #E15616 100%)'
+					},
+					plain: false
+				}
+			],
 		}
 	},
 	onLoad(option) {
@@ -259,11 +283,13 @@ export default {
 					}
 				})
 				.catch(error => {
-					this.$util.modal('提示', '订单查询失败，请稍后重试~', '确定', '', false, () => {
-						this.$api.switchTabTo('/pages/tabBar/home/index')
-					})
+					this.modal = true
 				})
 		},
+		handleClick(){
+			this.modal = false
+			this.$api.switchTabTo('/pages/tabBar/home/index')
+		},
 		handButtonConfirm(data) {
 			//监听点击时间的按钮类型并执行...
 			this.handShowAlert(data)
@@ -302,7 +328,7 @@ export default {
 				if(data.balanceFlag == 1){// 0可以走余额抵扣，1不能走余额抵扣
 					this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${data.orderId}`)
 				}else{
-					switch (dataCode) {
+					switch (data.code) {
 						case 1:
 							this.isPayModel = true
 							this.modelType = 1

pages/user/order/order-payhlb.vue

@@ -257,6 +257,13 @@
 					this.$util.msg('网银支付的金额必须大于￥10.00',2000)
 					return
 				}
+				if( this.payType == '1'){
+					if(this.payAmount != this.payableAmount){
+						this.contentModalText = '企业网银支付每次收取的手续费较高，建议一次性全额付款。'
+						this.modal = true
+						return
+					}
+				}
 				this.PayService.PayOrderPayLink({unpaidAmount:this.payAmount,shopOrderId:this.shopOrderId,payType:this.payType}).then(response =>{
 					this.payHttpUrl = response.data
 					this.isShowTip = true