Pārlūkot izejas kodu

合利宝支付

zhengjinyi 3 gadi atpakaļ
vecāks
revīzija
24566f9deb

+ 5 - 9
components/cm-module/orderDetails/goodsList.vue

@@ -96,30 +96,26 @@
 						<view class="text">{{ item.note ? item.note : '' }}</view>
 					</view>
 				</view>
-				<view class="goods-pros-b clearfix">
+				<view class="goods-pros-b clearfix" v-if="information.onlinePayFlag == 0">
 					<view class="pros-price-view" v-if="item.isHandelShow">
 						<view class="price-view-le">商品总额:</view>
 						<view class="price-view-ri">¥{{ item.totalAmount | NumFormat }}</view>
 					</view>
 					<view class="pros-price-view" v-if="item.isHandelShow">
 						<view class="price-view-le">优惠:</view>
-						<view class="price-view-ri">¥{{ item.totalAmount | NumFormat }}</view>
-					</view>
-					<view class="pros-price-view" v-if="item.isHandelShow">
-						<view class="price-view-le">余额抵扣:</view>
-						<view class="price-view-ri">¥{{ item.totalAmount | NumFormat }}</view>
+						<view class="price-view-ri">¥{{ item.eachDiscount | NumFormat }}</view>
 					</view>
 					<view class="pros-price-view" v-if="item.isHandelShow">
 						<view class="price-view-le">应付金额:</view>
-						<view class="price-view-ri">¥{{ item.totalAmount | NumFormat }}</view>
+						<view class="price-view-ri">¥{{ item.realPay | NumFormat }}</view>
 					</view>
 					<view class="pros-price-view" v-if="item.isHandelShow">
 						<view class="price-view-le">已付金额:</view>
-						<view class="price-view-ri">¥{{ item.totalAmount | NumFormat }}</view>
+						<view class="price-view-ri">¥{{ item.receiptAmount | NumFormat }}</view>
 					</view>
 					<view class="pros-price-view">
 						<view class="price-view-le">待付金额:</view>
-						<view class="price-view-ri red">¥{{ item.totalAmount | NumFormat }}</view>
+						<view class="price-view-ri red">¥{{ item.obligation | NumFormat }}</view>
 					</view>
 					<view class="pros-price-btn">
 						<view class="btn" @click="handelShowDetails(item)">

+ 15 - 15
pages/user/operator/list.vue

@@ -2,7 +2,7 @@
 	<view class="container operator clearfix">
 		<view class="operator-top clearfix">
 			<view class="operator-title">
-				<view class="head"><image :src="clubImage == null ? 'https://static.caimei365.com/app/img/icon/icon-club@3x.png' : clubImage" mode=""></image></view>
+				<view class="head"><image :src="clubImage" mode=""></image></view>
 				<view class="title">{{clubName}}</view>
 			</view>
 			<view class="operator-search">
@@ -83,8 +83,8 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'	
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
+	import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
+	import tuiNomore from '@/components/tui-components/nomore/nomore'
 	export default {
 		components:{
 			tuiLoadmore,
@@ -125,19 +125,19 @@
 			}
 		},
 		onLoad(){				
-			this.setScrollHeight();
+			this.setScrollHeight()
 		},
 		methods: {
 			setScrollHeight() {
 				// 窗口高度 - 底部距离
 				setTimeout(()=> {
-					const query = wx.createSelectorQuery().in(this);
-					query.selectAll('.add-btn').boundingClientRect();
+					const query = wx.createSelectorQuery().in(this)
+					query.selectAll('.add-btn').boundingClientRect()
 					query.exec(res => {
 						if(res[0][0]){
 							let winHeight = this.$api.getWindowHeight(),
-								eleTop = res[0][0].top - 1;
-								this.scrollHeight =  eleTop;
+								eleTop = res[0][0].top - 1
+								this.scrollHeight =  eleTop
 						}
 					})
 				}, 500)
@@ -153,8 +153,8 @@
 						this.isEmpty = false
 						this.hasNextPage = response.data.hasNextPage
 						this.operatorList =responseData.results
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
+						this.pullFlag = false
+						setTimeout(()=>{this.pullFlag = true},500)
 						if(this.hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
@@ -177,8 +177,8 @@
 					if(responseData.results&&responseData.results.length > 0){
 						this.hasNextPage = response.data.hasNextPage
 						this.operatorList = this.operatorList.concat(responseData.results) 
-						this.pullFlag = false;// 防上拉暴滑
-						setTimeout(()=>{this.pullFlag = true;},500)
+						this.pullFlag = false// 防上拉暴滑
+						setTimeout(()=>{this.pullFlag = true},500)
 						if(this.hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
@@ -292,10 +292,10 @@
 		onShow() {
 			this.$api.getComStorage('clubInfo').then((resolve) =>{
 				this.clubName = resolve.name
-				this.clubImage = resolve.image ? resolve.image : ''
+				this.clubImage = resolve.image ? resolve.image : 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'
 				this.listQuery.userId = resolve.userId
-				this.listQuery.pageNum = 1;
-				this.InitOperatorList();
+				this.listQuery.pageNum = 1
+				this.InitOperatorList()
 			})
 		}
 	}

+ 4 - 4
pages/user/order/order-pay-list.vue

@@ -187,8 +187,8 @@ page {
 					color: #333333;
 				}
 				.info-view {
-					height: 36rpx;
-					line-height: 36rpx;
+					height: 40rpx;
+					line-height: 40rpx;
 					color: #999999;
 					text-overflow: ellipsis;
 					display: -webkit-box;
@@ -200,10 +200,10 @@ page {
 					color: #999999;
 				}
 				.info-price {
-					height: 38rpx;
+					height: 40rpx;
 					width: 100%;
 					float: left;
-					line-height: 38rpx;
+					line-height: 40rpx;
 					font-size: $font-size-26;
 					.price {
 						color: #333333;

+ 2 - 1
pages/user/order/order-payhlb.vue

@@ -365,6 +365,7 @@
 				width: 662rpx;
 				height: 420rpx;
 				padding: 64rpx 44rpx 0 44rpx;
+				border-radius: 0 0 60rpx 60rpx;
 				background: url(https://img.caimei365.com/group1/M00/03/BD/Cmis218elN6AY6VeAAqw4n3n4nw186.png) no-repeat;
 				background-size: cover;
 				float: left;
@@ -428,7 +429,7 @@
 					height: 184rpx;
 					padding: 24rpx;
 					background: #FFFFFF;
-					border-radius: 20rpx;
+					border-radius: 28rpx;
 					box-shadow:0 2px 6px rgba(255, 77, 0, .17);
 					position: absolute;
 					bottom: -92rpx;

+ 6 - 6
utils/mixins/wechatPay.js

@@ -39,11 +39,11 @@ const wechatPay = {
 			        // 微信支付成功回调
 			        uni.reLaunch({url: '/pages/tabBar/user/user'})
 			    } else {
-			        this.$util.msg('用户取消支付~',2000)
+			        this.$util.msg('支付失败~',2000)
 			    }
 			 } catch (error) {
                 // 微信支付失败
-                this.$util.msg(error.msg,2000)
+                this.$util.msg('支付失败~',2000)
 			 } 
         },
         // 微信支付优惠券
@@ -68,11 +68,11 @@ const wechatPay = {
 			        // 微信支付成功回调
 			        uni.reLaunch({url: '/pages/tabBar/user/user'})
 			    } else {
-			        this.$util.msg('用户取消支付~',2000)
+			        this.$util.msg('支付失败~',2000)
 			    }
 			 } catch (error) {
                 // 微信支付失败
-                this.$util.msg(error.msg,2000)
+                this.$util.msg('支付失败~',2000)
 			 } 
         },
         // 微信支付超级会员
@@ -90,11 +90,11 @@ const wechatPay = {
 			        // 微信支付成功回调
 			        uni.reLaunch({url: '/pages/tabBar/user/user'})
 			    } else {
-			        this.$util.msg('用户取消支付~',2000)
+			        this.$util.msg('支付失败~',2000)
 			    }
 			 } catch (error) {
                 // 微信支付失败
-                this.$util.msg(error.msg,2000)
+                this.$util.msg('支付失败~',2000)
 			 } 
         }
     }