添加ios钻石支付

vedio/components/coin-popup/coin-popup.vue

@@ -49,15 +49,24 @@
 						<view class="section">
 							<view class="pack-box">
 								<view class="pack-item"
-									:style="item.largeType !=='vip' ?'background: #f5f5f5;':'background: #f4c98b;'"
+									:style="item.largeType !=='vip' ?'background: #f5f5f5;':'background: #f5f5f5;'"
 									:class="[{active: index==selectedIndex}]" v-for='(item, index) in vipList'
 									:key='index' @click="choosePack(item, index)">
 									<view style="display: flex;flex-direction: column;align-items: center;">
 
-										<view class="price row">
+										<view v-if="os=='android'" class="price row">
 											{{item.firstPayPrice}}元
 										</view>
 
+										<view v-else style="display: flex;align-items: center;font-size: 40rpx;
+																					color: #f2b068;
+																					font-weight: 700;">
+											<image style="width: 50rpx;height: 50rpx;display: flex;margin-right: 10rpx;"
+												src="@/static/ic_zuan.png">
+											</image>
+											+{{multiply(item.firstPayPrice)}}
+										</view>
+
 										<view class="name row" v-if="item.title!=null&&item.title!=''">
 											{{item.title}}
 										</view>
@@ -89,7 +98,7 @@
 						<view style="display: flex;flex-direction: column;align-items: center;">
 							<view style="font-size: 29rpx;color: gray;margin-top: 16rpx;">
 								客服时间工作日 9:00-18:00</view>
-							<button class="button2" open-type="im" data-im-id="578292405">在线客服</button>
+							<button class="button2" open-type="im" data-im-id="kaixinhaha7785">在线客服</button>
 						</view>
 					</scroll-view>
 				</view>
@@ -137,6 +146,9 @@
 			};
 		},
 		methods: {
+			multiply(num) {
+				return parseInt(num * 10);
+			},
 			// 支付完成回调
 			paySuccess(largeType) {
 				this.$emit('paySuccess', largeType);
@@ -200,11 +212,6 @@
 				this.handlePay();
 			},
 			handlePay() {
-				if (this.os == 'ios') {
-					message.notify('暂不支持ios支付');
-					return
-				}
-
 				let that = this;
 				let vipBean = this.vipList[this.selectedIndex];
 				this.post({
@@ -251,20 +258,8 @@
 				}
 
 				let that = this;
-				if (this.os == 'ios') {
-					if (!tt.canIUse('getOrderPayment.object.imId')) {
-						message.notify('请升级抖音APP版本');
-						return
-					}
-
-					if (ttData.imId == null) {
-						message.notify('暂不支付ios支付，请更换设备');
-						return
-					}
-
 				tt.getOrderPayment({
 					orderId: oid,
-						imId: ttData.imId,
 					success(res) {
 						that.queryOrderStatus(largeType, ttData.tidStr);
 					},
@@ -273,25 +268,9 @@
 							// 4-支付取消
 
 						}
-
 						// message.notify(res.errMsg);
 					},
 				});
-				} else {
-					tt.getOrderPayment({
-						orderId: oid,
-						success(res) {
-							that.queryOrderStatus(largeType, ttData.tidStr);
-						},
-						fail(res) {
-							if (res.errNo == '4') {
-								// 4-支付取消
-
-							}
-							// message.notify(res.errMsg);
-						},
-					});
-				}
 			},
 			queryOrderStatus(largeType, tid) {
 				let that = this;

vedio/pagesA/vipPay/vipPay.vue

@@ -5,15 +5,24 @@
 			<view class="section">
 				<view class="pack-box">
 					<view class="pack-item"
-						:style="item.largeType !=='vip' ?'background: #f5f5f5;':'background: #f4c98b;'"
+						:style="item.largeType !=='vip' ?'background: #f5f5f5;':'background: #f5f5f5;'"
 						:class="[{active: index==selectedIndex}]" v-for='(item, index) in pointList' :key='index'
 						@click="choosePack(item, index)">
 						<view style="display: flex;flex-direction: column;align-items: center;">
 
-							<view class="price row">
+							<view v-if="os=='android'" class="price row">
 								{{item.firstPayPrice}}元
 							</view>
 
+							<view v-else style="display: flex;align-items: center;font-size: 40rpx;
+																		color: #f2b068;
+																		font-weight: 700;">
+								<image style="width: 50rpx;height: 50rpx;display: flex;margin-right: 10rpx;"
+									src="@/static/ic_zuan.png">
+								</image>
+								+{{multiply(item.firstPayPrice)}}
+							</view>
+
 							<view class="name row" v-if="item.title!=null&&item.title!=''">
 								{{item.title}}
 							</view>
@@ -41,15 +50,24 @@
 			<view class="section">
 				<view class="pack-box">
 					<view class="pack-item"
-						:style="item.largeType !=='vip' ?'background: #f5f5f5;':'background: #f4c98b;'"
+						:style="item.largeType !=='vip' ?'background: #f5f5f5;':'background: #f5f5f5;'"
 						:class="[{active: index==selectedVipIndex}]" v-for='(item, index) in vipList' :key='index'
 						@click="choosePack2(item, index)">
 						<view style="display: flex;flex-direction: column;align-items: center;">
 
-							<view class="price row">
+							<view v-if="os=='android'" class="price row">
 								{{item.firstPayPrice}}元
 							</view>
 
+							<view v-else style="display: flex;align-items: center;font-size: 40rpx;
+																		color: #f2b068;
+																		font-weight: 700;">
+								<image style="width: 50rpx;height: 50rpx;display: flex;margin-right: 10rpx;"
+									src="@/static/ic_zuan.png">
+								</image>
+								+{{multiply(item.firstPayPrice)}}
+							</view>
+
 							<view class="name row" v-if="item.title!=null&&item.title!=''">
 								{{item.title}}
 							</view>
@@ -126,7 +144,7 @@
 				btnText: '',
 				userBean: {},
 				os: 'android',
-				showKefuPop:false
+				showKefuPop: false
 			}
 		},
 		onLoad(options) {
@@ -167,13 +185,27 @@
 							if (that.pointList[i].activityType == 1) {
 								that.selectedIndex = i;
 								let cashStr = that.pointList[i].firstPayPrice
+
+								if (that.os == 'ios') {
+									that.btnText = "立即支付" + that.multiply(cashStr) + "钻石"
+								} else {
 									that.btnText = "立即支付" + cashStr + "元"
+								}
+
 								if (that.pointList[i].yhqRateBalance != null) {
 									let tempYhq = new Decimal(cashStr).sub(new Decimal(that.pointList[i]
 										.yhqRateBalance)).toNumber()
+
+									if (that.os == 'ios') {
+										that.btnText = "立即支付" + that.multiply(that.pointList[i]
+											.yhqRateBalance) + "钻石,已优惠" +
+											that.multiply(tempYhq) + "钻石"
+									} else {
 										that.btnText = "立即支付" + that.pointList[i].yhqRateBalance + "元,已优惠" +
 											tempYhq + "元"
 									}
+
+								}
 								if (that.pointList[i].weixin) {
 									that.wxShowFlag = true
 									that.isZfb = false
@@ -188,12 +220,23 @@
 
 					if (that.pointList != null && that.pointList.length > 0 && that.selectedIndex == 0) {
 						let cashStr = that.pointList[0].firstPayPrice
+						if (that.os == 'ios') {
+							that.btnText = "立即支付" + that.multiply(cashStr) + "钻石"
+						} else {
 							that.btnText = "立即支付" + cashStr + "元"
+						}
 						if (that.pointList[0].yhqRateBalance != null) {
 							let tempYhq = new Decimal(cashStr).sub(new Decimal(that.pointList[0]
 								.yhqRateBalance)).toNumber()
-							that.btnText = "立即支付" + that.pointList[0].yhqRateBalance + "元,已优惠" + tempYhq +
-								"元"
+								
+								if (that.os == 'ios') {
+									that.btnText = "立即支付" + that.multiply(that.pointList[i]
+										.yhqRateBalance) + "钻石,已优惠" +
+										that.multiply(tempYhq) + "钻石"
+								} else {
+									that.btnText = "立即支付" + that.pointList[i].yhqRateBalance + "元,已优惠" +
+										tempYhq + "元"
+								}
 						}
 						if (that.pointList[0].weixin) {
 							that.wxShowFlag = true
@@ -207,6 +250,9 @@
 			});
 		},
 		methods: {
+			multiply(num) {
+				return parseInt(num * 10);
+			},
 			loadData() {
 
 			},
@@ -221,20 +267,41 @@
 				if (this.selectedIndex == -1) {
 					// vip充值
 					let cashStr = this.vipList[this.selectedVipIndex].firstPayPrice
+					if (that.os == 'ios') {
+						that.btnText = "立即支付" + that.multiply(cashStr) + "钻石"
+					} else {
 						that.btnText = "立即支付" + cashStr + "元"
+					}
 					if (that.vipList[this.selectedVipIndex].yhqRateBalance != null) {
 						let tempYhq = new Decimal(cashStr).sub(new Decimal(that.vipList[this.selectedVipIndex]
 							.yhqRateBalance)).toNumber()
+						if (that.os == 'ios') {
+							that.btnText = "立即支付" + that.multiply(that.vipList[selectedVipIndex]
+								.yhqRateBalance) + "钻石,已优惠" +
+								that.multiply(tempYhq) + "钻石"
+						} else {
 							that.btnText = "立即支付" + that.vipList[this.selectedVipIndex].yhqRateBalance + "元,已优惠" + tempYhq +
 								"元"
 						}
+						
+					}
 				} else {
 					let cashStr = this.pointList[this.selectedIndex].firstPayPrice
+					if (that.os == 'ios') {
+						that.btnText = "立即支付" + that.multiply(cashStr) + "钻石"
+					} else {
 						that.btnText = "立即支付" + cashStr + "元"
+					}
 					if (that.pointList[this.selectedIndex].yhqRateBalance != null) {
 						let tempYhq = new Decimal(cashStr).sub(new Decimal(that.pointList[this.selectedIndex]
 							.yhqRateBalance)).toNumber()
+						if (that.os == 'ios') {
+							that.btnText = "立即支付" + that.multiply(that.pointList[this.selectedIndex].yhqRateBalance) + "钻石,已优惠" +
+								that.multiply(tempYhq) + "钻石"
+						} else {
 							that.btnText = "立即支付" + that.pointList[this.selectedIndex].yhqRateBalance + "元,已优惠" + tempYhq + "元"
+							
+						}
 					}
 				}
 			},
@@ -246,20 +313,40 @@
 				if (this.selectedIndex == -1) {
 					// vip充值
 					let cashStr = this.vipList[this.selectedVipIndex].firstPayPrice
+					if (that.os == 'ios') {
+						that.btnText = "立即支付" + that.multiply(cashStr) + "钻石"
+					} else {
 						that.btnText = "立即支付" + cashStr + "元"
+					}
 					if (that.vipList[this.selectedVipIndex].yhqRateBalance != null) {
 						let tempYhq = new Decimal(cashStr).sub(new Decimal(that.vipList[this.selectedVipIndex]
 							.yhqRateBalance)).toNumber()
+							if (that.os == 'ios') {
+								that.btnText = "立即支付" + that.multiply(that.vipList[selectedVipIndex]
+									.yhqRateBalance) + "钻石,已优惠" +
+									that.multiply(tempYhq) + "钻石"
+							} else {
 								that.btnText = "立即支付" + that.vipList[this.selectedVipIndex].yhqRateBalance + "元,已优惠" + tempYhq +
 									"元"
 							}
+					}
 				} else {
 					let cashStr = this.pointList[this.selectedIndex].firstPayPrice
+					if (that.os == 'ios') {
+						that.btnText = "立即支付" + that.multiply(cashStr) + "钻石"
+					} else {
 						that.btnText = "立即支付" + cashStr + "元"
+					}
 					if (that.pointList[this.selectedIndex].yhqRateBalance != null) {
 						let tempYhq = new Decimal(cashStr).sub(new Decimal(that.pointList[this.selectedIndex]
 							.yhqRateBalance)).toNumber()
+						if (that.os == 'ios') {
+							that.btnText = "立即支付" + that.multiply(that.pointList[this.selectedIndex].yhqRateBalance) + "钻石,已优惠" +
+								that.multiply(tempYhq) + "钻石"
+						} else {
 							that.btnText = "立即支付" + that.pointList[this.selectedIndex].yhqRateBalance + "元,已优惠" + tempYhq + "元"
+							
+						}
 					}
 				}
 			},
@@ -274,11 +361,6 @@
 				// this.$refs.alertDialog.open();
 			},
 			handlePay() {
-				if (this.os == 'ios') {
-					message.notify('暂不支持ios支付');
-					return
-				}
-				
 				let that = this;
 				let vipBean = this.pointList[this.selectedIndex];
 				if (this.selectedIndex == -1) {
@@ -326,25 +408,6 @@
 				}
 
 				let that = this;
-				if (this.os == 'ios') {
-					if (!tt.canIUse('getOrderPayment.object.imId')) {
-						message.notify('请升级抖音APP版本.');
-						return
-					}
-
-					tt.getOrderPayment({
-						orderId: oid,
-						imId: ttData.imId,
-						immediate: true,
-						success(res) {
-							that.queryOrderStatus(largeType, ttData.tidStr);
-						},
-						fail(res) {
-							console.log('ios=ttPay res.errMsg', res)
-							// message.notify(res.errMsg);
-						},
-					});
-				} else {
 				tt.getOrderPayment({
 					orderId: oid,
 					success(res) {
@@ -355,7 +418,6 @@
 						// message.notify(res.errMsg);
 					},
 				});
-				}
 			},
 			queryOrderStatus(largeType, tid) {
 				let that = this;

vedio/pagesD/payRecord/payRecord.vue

@@ -11,7 +11,15 @@
 						<view style="font-size: 26rpx;color: gray;margin-top: 16rpx;">付款时间：{{item.createtime}}</view>
 						<view style="font-size: 26rpx;color: gray;margin-top: 1rpx;">订单编号：{{item.orderid}}</view>
 					</view>
-					<view style="display: flex;align-items: center;margin-right: 8rpx;font-size: 36rpx;color: red;">
+					<view v-if="item.detailChannel=='DIAMOND'"
+						style="display: flex;align-items: center;margin-right: 8rpx;font-size: 36rpx;color: #f2b068;">
+						<image style="width: 50rpx;height: 50rpx;display: flex;margin-right: 10rpx;"
+							src="@/static/ic_zuan.png">
+						</image>
+						{{multiply(item.balance)}}
+					</view>
+					<view v-else
+						style="display: flex;align-items: center;margin-right: 8rpx;font-size: 36rpx;color: red;">
 						￥{{item.balance}}
 					</view>
 				</view>
@@ -36,7 +44,7 @@
 		data() {
 			return {
 				dataList: [],
-				showKefuPop:false
+				showKefuPop: false
 			};
 		},
 		methods: {
@@ -45,6 +53,9 @@
 					this.$refs.paging.refresh();
 				}
 			},
+			multiply(num) {
+				return parseInt(num * 10);
+			},
 			queryList(page, size) {
 				this.post({
 					url: '/vip/getOrderList',