Forráskód Böngészése

commit -m 大额银联

zhengjinyi 3 éve
szülő
commit
a558445b37

+ 3 - 2
components/cm-module/orderDetails/paymentRecord.vue

@@ -13,8 +13,8 @@
 			</view>
 			<view class="record-list" v-else>
 				<view class="record-item" v-for="(item,index) in discernReceiptList" :key="index">
-					<view class="item-time tt">{{item.receiptDate}}</view>
-					<view class="item-time pp">{{payTypeText(item.payType)}}</view>
+					<view class="item-time tt">{{ item.receiptDate }}</view>
+					<view class="item-time pp">{{ item.payTypeStr }}</view>
 					<view class="item-time mm">¥{{item.associateAmount.toFixed(2)}}</view>
 				</view>
 			</view>
@@ -64,6 +64,7 @@
 						14:'支付宝',
 						15:'微信支付',
 						16:'余额抵扣',
+						18:'大额银联转账',
 					}
 				Object.keys(stateTextObject).forEach(key => {
 					if(key == state){

+ 7 - 0
pages.json

@@ -301,6 +301,13 @@
                         "navigationStyle": "custom"
                     }
                 },
+                {
+                    "path": "order/order-success-tips",
+                    "style": {
+                        "navigationBarTitleText": "支付结果",
+                        "navigationStyle": "custom"
+                    }
+                },
                 {
                     "path": "order/order-payment",
                     "style": {

+ 1 - 1
pages/goods/product.vue

@@ -829,7 +829,7 @@ export default {
 					this.shop = response.data.shop
 					this.shopId = response.data.shopId
 					this.product = response.data
-					if(this.shopId == 10235){
+					if(this.shopId == 1161){
 						this.isShowCaimeiShop = true
 					}
 					if (this.product.userLike && this.product.userLike == 1) {

+ 5 - 2
pages/search/search-supplier.vue

@@ -209,8 +209,11 @@
 				})
 				return Array
 			},
-			goSupplier(value){//跳供应商资料页
-				this.$api.navigateTo('/pages/supplier/user/my-shop?shopId='+value)
+			goSupplier(shopId){//跳供应商资料页
+				if(shopId == 1161){
+					return
+				}
+				this.$api.navigateTo('/pages/supplier/user/my-shop?shopId='+shopId)
 			},
 		},
 		onReachBottom() {

+ 8 - 7
pages/second/form/form-seller.vue

@@ -1,7 +1,7 @@
 <template name="secondHandrelease">
 	<view class="fleaMarketForm">
 		<view class="bannerimg"><image src="https://static.caimei365.com/app/img/bg/secondbg.jpg"></image></view>
-		<view class="my-maintenance" :style="{ paddingBottom: isIphoneX ? '270rpx' : '168rpx' }">
+		<view class="my-maintenance" :style="{ paddingBottom: isIphoneX ? '270rpx' : '250rpx' }">
 			<view class="newsTitle">
 				<view class="nestext">
 					欢迎您来到采美365网二手商品市场,您可以在这里发布二手设备、产品信息,
@@ -691,12 +691,12 @@
 					this.$util.msg('请输入商品名称',2000)
 					return
 				}
-				// if(this.secondParams.secondHandType ==2) {
-				// 	if (this.secondParams.maturityYears=='') {
-				// 		 this.$util.msg('请输入产品到期日',2000);
-				// 		 return
-				// 	} 
-				// }
+				if(this.secondParams.publishIdentity === 2) {
+					if (this.secondParams.companyName=='') {
+						 this.$util.msg('请输入公司名称',2000)
+						 return
+					} 
+				}
 				if(!this.$api.isNumber(this.secondParams.price)){
 					  this.$util.msg('请输入交易价',2000)
 						return
@@ -975,6 +975,7 @@
 				margin-bottom: 10rpx;
 				box-sizing: border-box;
 				float: left;
+				color: #333333;
 				.icon-yixuanze{
 					margin-right: 10rpx;
 					color: #E15616;

+ 9 - 8
pages/second/form/form.vue

@@ -1,7 +1,7 @@
 <template name="secondHandrelease">
 	<view class="fleaMarketForm">
 		<view class="bannerimg"><image src="https://static.caimei365.com/app/img/bg/secondbg.jpg"></image></view>
-		<view class="my-maintenance" :style="{ paddingBottom: isIphoneX ? '270rpx' : '168rpx' }">
+		<view class="my-maintenance" :style="{ paddingBottom: isIphoneX ? '270rpx' : '250rpx' }">
 			<view class="newsTitle">
 				<view class="nestext">
 					欢迎您来到采美365网二手商品市场,您可以在这里发布二手设备、产品信息,
@@ -689,14 +689,14 @@
 				}
 				if(this.secondParams.name == ''){
 					this.$util.msg('请输入商品名称',2000)
-					return
+					return 
+				}
+				if(this.secondParams.publishIdentity === 2) {
+					if (this.secondParams.companyName=='') {
+						 this.$util.msg('请输入公司名称',2000);
+						 return
+					} 
 				}
-				// if(this.secondParams.secondHandType ==2) {
-				// 	if (this.secondParams.maturityYears=='') {
-				// 		 this.$util.msg('请输入产品到期日',2000);
-				// 		 return
-				// 	} 
-				// }
 				if(!this.$api.isNumber(this.secondParams.price)){
 					  this.$util.msg('请输入交易价',2000)
 						return
@@ -975,6 +975,7 @@
 				margin-bottom: 10rpx;
 				box-sizing: border-box;
 				float: left;
+				color: #333333;
 				.icon-yixuanze{
 					margin-right: 10rpx;
 					color: #E15616;

+ 4 - 4
pages/second/form/introduce.vue

@@ -52,7 +52,7 @@
 	                  </view>
 	                  <view class="content_list">
 	                    <view class="content_list">2.自主发布</view>
-	                    <text class="content-text"> 卖家每上传一款商品,占据一个展示位,<text class="bluefont">平台收取每款商品100元的展示费用 ,有效期为<text style="font-size: 48px">6</text>个月</text>
+	                    <text class="content-text"> 卖家每上传一款商品,占据一个展示位,<text class="bluefont">有效期为<text style="font-size: 48px">3</text>个月</text>
 	                           平台提供与该商品匹配的详情信息以及文章信息,降低买家决策成本,以促进销售。特殊政策除外(如特定免费时段)。</text>
 	                  </view>
 	                   <view class="content_list">
@@ -103,13 +103,13 @@
 		},
 		methods:{
 			gotoform:function(){
-				this.$api.navigateTo('/pages/second/form/form');
+				this.$api.navigateTo('/pages/second/form/form')
 			},
 			gotolist:function(){
-				this.$api.navigateTo('/pages/second/product/product-list');
+				this.$api.navigateTo('/pages/second/product/product-list')
 			},
 			gotorepair:function(){
-				this.$api.navigateTo('/pages/h5/article/page?linkType=7');
+				this.$api.navigateTo('/pages/h5/article/page?linkType=7')
 			},
 		},
 		

+ 10 - 5
pages/user/order/order-pay.vue

@@ -256,12 +256,17 @@
 			},
 			handleClick(){// 查询是否支付成功
 				this.PayService.PayOrderFindOrderStatus({mbOrderId:this.mbOrderId}).then(response =>{
-					let data =  {
-						  payAmount:this.payAmount,
-						  orderId:this.orderId,
-						  type:response.data.data === '1' ? 'success' : 'error'
+					const data = response.data.data
+					const linkData =  {
+							  payAmount:this.payAmount,
+							  orderId:this.orderId,
+							  type:data.status === '1' ? 'success' : 'error'
 						}
-					this.$api.navigateTo(`/pages/user/order/order-success?data=${JSON.stringify({ data: data })}`)
+					if(data.status === '1'){
+						this.$api.navigateTo(`/pages/user/order/order-success?data=${JSON.stringify({ data: linkData })}`)
+					}else{
+						this.$api.navigateTo(`/pages/user/order/order-success-tips?data=${JSON.stringify({ data: linkData })}`)
+					}	
 				})
 			},
 			hideMobel(){

+ 149 - 0
pages/user/order/order-success-tips.vue

@@ -0,0 +1,149 @@
+<template>
+	<view class="container cashier">
+		<cu-custom :navbar-data='nvabarData'></cu-custom>
+		<view class="container-cash clearfix" :style="{marginTop:CustomBar+'px'}">
+			<view class="container-wrapper">
+				<view class="cash-icon">
+					<image class="icon-image" :src="StaticUrl + '/icon/icon-paywring@2x.png'" mode=""></image>
+				</view>
+				<view class="cash-text">
+					大额银联转账耗时较久,大致需要 <text class="tx">5-15分钟</text> 才能
+					到账成功。后续您可在订单详情页面查看订单的
+					已支付金额和订单状态。
+				</view>
+			</view>
+			<view class="container-button">
+				<view class="btn btn-home" @click="this.$api.switchTabTo('/pages/tabBar/home/index')">回到首页</view>
+				<view class="btn btn-open" @click="details">查看订单</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				orderId:0,
+				nvabarData: {		//顶部自定义导航
+					haveBack:false,
+					haveHome:true,
+					showCapsule:1, // 是否显示左上角图标  1表示显示  0表示不显示,
+					showSearch: 0,
+					title: '支付结果',  // 导航栏 中间的标题
+					textLeft:this.$store.state.isIphone
+				},
+				payType:'',
+				payStatus:false,
+				amuntMoney:0,
+				successText:'本次支付失败',
+				StaticUrl: this.$Static,
+				isIphoneX:this.$store.state.isIphoneX,
+				CustomBar:this.CustomBar,// 顶部导航栏高度
+				
+			}
+		},
+		filters:{
+			NumFormat(value) {
+			    //处理金额
+			    if (value) {
+			        return Number(value).toFixed(2)
+			    } else {
+			        return '0.00'
+			    }
+			}
+		},
+		onLoad(option) {
+			this.initData(option)
+		},
+		methods:{
+			initData(option){
+				const data = JSON.parse(option.data)
+				this.orderId = data.data.orderId
+				this.payType = data.data.type
+				this.amuntMoney = data.data.payAmount
+				if(this.payType == 'success'){
+					this.payStatus = true
+					this.successText = '本次支付成功'
+				}else{
+					this.payStatus = false
+					this.successText = '本次支付失败'
+				}
+				console.log(this.orderId)
+			},
+			toAgainPay(){
+				this.$api.navigateBack(2)
+			},
+			details(){
+				this.$api.redirectTo('/pages/user/order/order-details?type=share&orderId='+this.orderId)
+			}
+		},
+		onShow() {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		height: auto !important;
+	}
+	.container-cash{
+		width: 100%;
+		.container-wrapper{
+			width:100%;
+			height: auto;
+			padding: 120rpx 24rpx 0 24rpx;
+			box-sizing: border-box;
+			.cash-icon{
+				width: 100%;
+				height: 260rpx;
+				text-align: center;
+				.icon-image{
+					width: 260rpx;
+					height: 260rpx;
+					margin: 0 auto;
+					display: block;
+				}
+			}
+			.cash-text{
+				width: 100%;
+				height: 90rpx;
+				box-sizing: border-box;
+				padding: 0 50rpx;
+				text-align: center;
+				font-size: $font-size-26;
+				color: $text-color;
+				line-height: 44rpx;
+				padding-bottom: 40rpx;
+				.tx{
+					color: $color-system;
+				}
+			}
+		}
+		.container-button{
+			width: 100%;
+			box-sizing: border-box;
+			padding: 80rpx 75rpx;
+			.btn{
+				width: 100%;
+				height: 90rpx;
+				border-radius: 50rpx;
+				line-height: 90rpx;
+				box-sizing: border-box;
+				text-align: center;
+				font-size: $font-size-26;
+				color: #FFFFFF;
+				margin: 24rpx 0;
+				&.btn-open{
+					background:#FFFFFF;
+					border: 1px solid $color-system;
+					color: $color-system;
+				}
+				&.btn-home{
+					background:$btn-confirm;
+				}
+			}
+		}
+	}
+</style>