jmyPay/scanPay.git

			@@ -39,14 +39,15 @@
			font-size: 13px;
			color: #999
			}

			.btn {
			font-size: 13px;
			color: #1E8BE0
			}
			</style>
			<span class="txt">微信搜索或直接点击打开</span>
			<span class="txt">微信搜索或点击打开</span>
			<span class="btn">【冀优邮】</span>
			<span class="txt">小程序，享受更多优惠</span>
			<span class="txt">小程序，享更多优惠！</span>
			</script>
			</wx-open-launch-weapp>
			</view>
			@@ -57,9 +58,15 @@
			<!-- <u-icon name="coupon-fill" size="60rpx" color="#D31F28"></u-icon> -->
			<view class="u-font-32 u-flex-1 u-m-h-16">优惠券</view>
			<view @click="showCoupon" class="u-flex">
			<view v-if="couponInfo.id" class="tag-pain">
			满{{ parseFloat((couponInfo.thresholdValue / 100).toFixed(2)) }}元减{{ parseFloat((couponInfo.discount / 100).toFixed(2)) }}元
			</view>
			<block v-if="couponInfo.id">
			<view v-if="couponInfo.discountType==1" class="tag-pain">
			满{{ $utils.fenToYuan(couponInfo.thresholdValue) }}元减{{ $utils.fenToYuan(couponInfo.discount) }}元券
			</view>
			<view v-if="couponInfo.discountType==2" class="tag-pain">
			{{ $utils.accMul(couponInfo.discount, 10) }}折券
			</view>
			</block>

			<view v-else class="u-font-28 lh-1 u-tips-color">请选择</view>
			<u-icon class="u-m-l-10" name="arrow-right" color="#999" size="16"></u-icon>
			</view>
			@@ -82,6 +89,7 @@
			</view>
			</block>
			<button class="pay-it" @click="pay">付款</button>
			<view v-if="bordShow" style="height: 470rpx"></view>
			<!-- 数字键盘 -->
			<u-popup zIndex="500" :show="bordShow" :overlay="false" @close="bordShow = false">
			<key-bord @changeMoney="changeMoney" :num.sync="money" @close="bordShow = false" @pay="pay"></key-bord>
			@@ -90,32 +98,43 @@
			<u-popup v-if="payWay==2" mode="bottom" :closeable="true" :show="couponShow" @close="couponShow = false" :round="10">
			<view class="u-font-32 color-333 u-text-center u-p-t-30">优惠券</view>
			<view v-if="checkCoupon.id" class="choose-coupon">
			已选择优惠券1张，共抵扣￥{{ parseFloat((checkCoupon.discount / 100).toFixed(2)) }}
			已选择优惠券1张，可抵扣￥{{ discount1 }}
			</view>
			<scroll-view scroll-y class="u-p-30 coupon-list">
			<view @click="clickCoupon(item)" class="u-m-b-24 u-flex coupon" v-for="(item, index) in couponList" :key="index">
			<view style="color: #D31F28;" class="u-p-h-28">
			<view class="font-bold">
			<text class="u-font-36">￥</text>
			<text class="money">{{ parseFloat(item.discount / 100) }}</text>
			</view>
			<view class="u-font-24 u-m-t-20">满{{ parseFloat(item.thresholdValue / 100) }}元使用</view>
			</view>
			<view class="butt"></view>
			<view class="u-p-30 u-flex-1 u-flex">
			<view class="u-flex-1">
			<view class="u-font-28 color-333 u-line-2">{{ item.name }}</view>
			<view class="u-font-22 color-999 u-m-t-20">
			有效期至：{{ $u.timeFormat(item.outTime, 'yyyy-mm-dd hh:MM') }}
			<u-loadmore v-if="!couponList" status="loading"/>
			<u-empty v-else-if="couponList.length===0" mode="coupon" icon="/static/no_coupon.png" text="暂无优惠券可用!"></u-empty>
			<block v-else>
			<view @click="clickCoupon(item)" class="u-m-b-24 u-flex coupon" v-for="(item, index) in couponList" :key="index">
			<view class="num-box">
			<view v-if="item.discountType==1" class="font-bold" style="color: #D31F28;">
			<text class="u-font-36">￥</text>
			<text class="money">{{ $utils.fenToYuan(item.discount) }}</text>
			</view>
			<view v-if="item.discountType==2" class="font-bold" style="color: #D31F28;">
			<text class="money">{{ $utils.accMul(item.discount, 10) }}</text>
			<text class="u-font-36">折</text>
			</view>
			<view v-if="item.orderMax" class="u-font-24 u-m-t-20">低于{{ $utils.fenToYuan(item.orderMax) }}元可用</view>
			<view v-else-if="item.thresholdValue" class="u-font-24 u-m-t-20">满{{ $utils.fenToYuan(item.thresholdValue) }}元可用</view>
			<view v-else class="u-font-24 u-m-t-20">无门槛</view>
			</view>
			<u-icon v-if="item.id==checkCoupon.id" name="checkmark-circle-fill" color="#D31F28" size="20">
			</u-icon>
			<view class="butt"></view>
			<view class="u-p-30 u-flex-1 u-flex">
			<view class="u-flex-1">
			<view class="u-font-32 color-333 u-line-2">{{ item.name }}</view>
			<view class="u-font-22 color-999 u-m-t-20">
			有效期至：{{ $u.timeFormat(item.outTime, 'yyyy-mm-dd hh:MM') }}
			</view>
			</view>
			<u-icon v-if="item.id==checkCoupon.id" name="checkmark-circle-fill" color="#D31F28" size="24">
			</u-icon>
			</view>
			</view>
			</view>
			</block>
			</scroll-view>
			<view @click="getCoupon" class="coupon-btn">确定</view>
			</u-popup>
			<!-- 备注弹窗 -->
			<u-modal showCancelButton :show="showRemark" title="备注" confirmColor="#D31F28" @close="showRemark = false" @cancel="showRemark = false" @confirm="showRemark = false">
			<view style="border: 1rpx solid #eee;width: 100%">
			<u--textarea v-model="buyerNote" placeholder="请输入备注内容" maxlength="100" none count></u--textarea>
			@@ -146,7 +165,8 @@
			saveOrder,
			} from 'common/api/index'

			import wx from 'weixin-js-sdk'; // 使用js-sdk
			import wx from 'weixin-js-sdk';
			import {accMul, fenToYuan} from 'common/util' // 使用js-sdk

			export default {
			data() {
			@@ -158,7 +178,7 @@
			buyerNote: '',
			showRemark: false,
			UNIONID: null,
			payWay: this.$utils.getPlat(), //2 维信 5支付宝
			payWay: this.$utils.getPlat(), //2 维信 5支付宝 15云闪付
			cid: '', //码牌id C扫B静态码时有
			activityQrcodeId: '', //动态收款码 C扫B动态码时有
			shopId: '', //商户id C扫B动态码时有
			@@ -177,7 +197,7 @@
			isNew: false, // 是否新用户，新用户查询不到积分和银行卡
			canReset: false,
			couponShow: false, // 优惠券弹窗
			couponList: [], // 优惠券
			couponList: null, // 优惠券
			couponInfo: {
			id: '',
			discount: 0,
			@@ -191,16 +211,36 @@
			};
			},
			computed: {
			discount1() {
			if(!(this.money \|\| 0)\|\|!this.checkCoupon.id){
			return 0
			}
			if (this.checkCoupon.discountType == 1) {
			const num = this.$utils.fenToYuan(this.couponInfo.discount)
			return parseFloat(num);
			}
			const dis = 1 - parseFloat(this.checkCoupon.discount)
			const dic = Math.floor(this.$utils.accMul(this.money,100) * dis)
			return this.$utils.fenToYuan(dic).toFixed(2);
			},
			discount() {
			let num = 0;
			num = (this.couponInfo.discount / 100).toFixed(2);
			return parseFloat(num);
			if(!(this.money \|\| 0)\|\|!this.couponInfo.id){
			return 0
			}
			if (this.couponInfo.discountType == 1) {
			const num = this.$utils.fenToYuan(this.couponInfo.discount)
			return parseFloat(num);
			}
			const dis = 1 - parseFloat(this.couponInfo.discount)
			const dic = Math.floor(this.$utils.accMul(this.money,100) * dis)
			return this.$utils.fenToYuan(dic).toFixed(2);
			},
			payMoney() {
			let num = 0;
			num = Number((this.money \|\| 0) * 100) - this.couponInfo.discount;
			num = num > 0 ? (num / 100).toFixed(2) : '0.00';
			return parseFloat(num);
			if(this.discount===0\|\|!Number(this.money \|\| 0)){
			return 0
			}
			const num = this.$utils.accMul(this.money,100) - this.$utils.accMul(this.discount,100);
			return this.$utils.fenToYuan(num).toFixed(2);
			}
			},
			onLoad(opt) {
			@@ -208,7 +248,7 @@
			uni.setStorageSync('SHOPID', opt.shopId)
			uni.setStorageSync('SMONEY', opt.smoney)
			uni.setStorageSync('AQCI', opt.activityQrcodeId)
			this.UNIONID = uni.getStorageSync('UNIONID' + this.payWay) \|\| null
			this.UNIONID = uni.getStorageSync('UNIONID') \|\| null
			this.isNew = uni.getStorageSync('IS_NEW')
			if (opt.smoney) {
			this.smoney = opt.smoney
			@@ -228,16 +268,19 @@
			this.cid = opt.cid
			this.init()
			}
			if (opt.code \|\| opt.auth_code) {
			if (opt.code \|\| opt.auth_code \|\| opt.userAuthCode) {
			let params = {
			code: opt.code
			}
			let code = opt.code
			if (this.payWay == 2&&opt.state == 1 ) {
			if (this.payWay == 2 && opt.state == 1) { //微信
			params.getUserInfo = 1
			}
			if (this.payWay == 5) {
			if (this.payWay == 5) { //支付宝
			params.code = opt.auth_code
			}
			if (this.payWay == 15) { //云闪付
			code = opt.userAuthCode
			}
			const cd = uni.getStorageSync('cd')
			if (code === cd) {
			@@ -285,17 +328,23 @@
			getToken(res) {
			this.token = res.token
			if (res.openid) {
			uni.setStorageSync('OPENID' + this.payWay, res.openid)
			uni.setStorageSync('OPENID', res.openid)
			}
			if (res.unionid) {
			uni.setStorageSync('UNIONID' + this.payWay, res.unionid)
			uni.setStorageSync('UNIONID', res.unionid)
			}
			if (res.aLiUserId) {
			uni.setStorageSync('ALIUSERID', res.aLiUserId)
			}
			if (res.cloudPayUserId) {
			uni.setStorageSync('UNIONPAYID', res.cloudPayUserId)
			}
			this.UNIONID = res.unionid
			uni.setStorageSync(ACCESSTOKEN, res.token)
			uni.setStorageSync('IS_NEW', res.isNew)
			this.isNew = res.isNew
			if (!res.isNew) {
			this.showCoupon()
			if (!res.isNew && !uni.$u.test.isEmpty(this.money)) {
			this.queryUseSweepPayCoupon()
			}
			},
			/授权unionid/
			@@ -310,6 +359,16 @@
			// 更新金额
			changeMoney(str) {
			this.money = str;
			this.couponInfo = {
			id: '',
			discount: 0,
			thresholdValue: 0
			} // 优惠券内容
			this.checkCoupon = {
			id: null,
			discount: 0,
			thresholdValue: 0
			}
			},
			// 展示键盘
			showBord() {
			@@ -348,10 +407,10 @@
			res.logoImage = config.baseURL + res.logoImage
			}
			this.shopInfo = res
			}).catch(() => {
			}).catch((err) => {
			clearTimeout(timer)
			this.shopInfo.scanFlag = 0
			this.tips = '当前用户过多，请稍后重试～_～'
			this.tips = err.description \|\| '当前用户过多，请稍后重试～_～'
			this.loading = false
			})

			@@ -377,22 +436,32 @@
			},
			// 获取会员相关信息
			showCoupon() {
			if(this.UNIONID){
			//获取用户优惠券
			queryUseSweepPayCoupon({
			params: {
			applyPayWayStr: this.payWay,
			cusid: this.shopInfo.id,
			money: Number(this.money * 100),
			}
			}).then(res => {
			this.couponList = res
			this.couponShow = true
			})
			}else{
			if (this.UNIONID) {
			if (uni.$u.test.isEmpty(this.money)) {
			uni.$u.toast('请输入金额！')
			return
			}
			this.couponList = null
			this.couponShow = true
			this.queryUseSweepPayCoupon()
			} else {
			this.toRegister()
			}

			},
			//获取用户优惠券
			queryUseSweepPayCoupon() {
			queryUseSweepPayCoupon({
			params: {
			score: 0,
			applyPayWayStr: this.payWay,
			cusid: this.shopInfo.id,
			money: this.$utils.accMul(this.money,100),
			}
			}).then(res => {
			this.couponList = res
			}).catch(() => {
			this.couponList = []
			})
			},
			//选择优惠券
			clickCoupon(item) {
			@@ -422,6 +491,8 @@
			// 金额 this.money
			uni.showLoading()
			const params = {
			money: this.$utils.accMul(this.money,100),
			shopId: this.shopInfo.id,
			payWay: this.payWay,
			buyerNote: this.buyerNote,
			score: 0,
			@@ -431,8 +502,6 @@
			params.activityQrcodeId = this.activityQrcodeId
			}
			if (this.cid) {
			params.money = Number(this.money * 100)
			params.shopId = this.shopInfo.id
			params.cid = this.cid
			}
			//生成订单
			@@ -447,6 +516,9 @@
			}
			if (this.payWay == 5) {
			this.aliPay(res.paymentData)
			}
			if (this.payWay == 15) {
			this.aliPay(res.paymentUrl)
			}
			} catch (e) {
			//TODO handle the exception
			@@ -504,9 +576,11 @@
			});
			},
			closeOrder() {
			closeOrder({params:{
			id: this.orderId,
			}}).then(res => {
			closeOrder({
			params: {
			id: this.orderId,
			}
			}).then(res => {
			})
			}
			}
			@@ -535,7 +609,6 @@

			.money {
			font-size: 40rpx;
			color: #333;
			}


			@@ -700,7 +773,10 @@
			position: relative;
			overflow: hidden;
			}

			.num-box{
			width: 200rpx;
			text-align: center;
			}
			.choose-coupon {
			margin: 32rpx 32rpx 0;
			border-radius: 10rpx;
			@@ -712,7 +788,7 @@

			.coupon-list {
			box-sizing: border-box;
			height: calc(50vh - 44px);
			height: calc(60vh - 44px);
			}