[处理冲突删除打包无意义文件]

pages/goods/confirmOrder.vue

@@ -212,18 +212,19 @@
 									}, 3000);
 								},
 								fail: (err) => {
+									console.log(err.errMsg)
 									uni.showToast({
-										title: '支付失败',
+										title: '支付被取消',
 										duration: 3000,
 										mask: true,
 										icon: 'none'
 									})
-									setTimeout(() => {
-										uni.navigateTo({
-											url: '/pages/goods/payStatus?success=false'
-										})
-										this.canPay = true
-									}, 3000);
+									// setTimeout(() => {
+									// 	uni.navigateTo({
+									// 		url: '/pages/goods/payStatus?success=false'
+									// 	})
+									// 	this.canPay = true
+									// }, 3000);
 								}
 							})
 						} else {
@@ -263,7 +264,7 @@
 								},
 								fail: (err) => {
 									uni.showToast({
-										title: '支付失败' + err,
+										title: '支付被取消',
 										duration: 3000,
 										mask: true,
 										icon: 'none'

pages/goods/details.vue

@@ -215,32 +215,14 @@
 				this.coupons = res.coupons
 			})
 		},
-		// onBackPress({
-		// 	from
-		// }) {
-		// 	if (from == 'backbutton' && uniShare.isShow ) {
-		// 		this.$nextTick(function() {
-		// 			uniShare.hide()
-		// 		})
-		// 		return uniShare.isShow;
-		// 	}
-		// },
 		methods: {
 			// 提交购买单
 			buyGoods() {
 				let token = this.$store.getters.getToken
 				if (token == '') {
-					let userLogin = new userAuth()
-					userLogin.Login()
+					this.$Router.push({name: 'Login'})
 					return
 				}
-				// this.$Router.push({
-				// 	name: 'Buy',
-				// 	params: {
-				// 		skuId: this.goodsObj.skus[0].sku_id,
-				// 		qty	 : this.goodsObj.skus[0].number
-				// 	}
-				// })
 				uni.navigateTo({
 					url: '/pages/goods/confirmOrder?qty=1&type=2&goods_sku_id=' + this.goodsObj.skus[0].sku_id
 				})

pages/login/login.vue

@@ -230,13 +230,13 @@
 					margin: 0;
 					border-radius: 0;
 					border-left: solid 1rpx $border-color;
-					color: $text-price;
+					color: $mian-color;
 					font-size: $title-size-lg;
 					&::after {
 						border: none;
 					}
 					&[disabled] {
-						color: rgba($color: $text-price, $alpha: .6);
+						color: rgba($color: $mian-color, $alpha: .6);
 						background: $border-color-lg;
 					}
 				}
@@ -294,7 +294,7 @@
 			font-size: $title-size-sm;
 			color: $text-gray;
 			view {
-				color: $text-price;
+				color: $mian-color;
 				display: inline-block;
 				padding: 0 10rpx;
 			}

pages/market/details.vue

@@ -63,15 +63,14 @@
 				<radio-group class="pay-group" @change="payType">
 					<view class="item">
 						<label>
-							<radio class="pay-radio" value="eb" checked color="#8b64fd" />
-							<view class="pay-title">易货额支付</view>
-							<view class="pay-sub-title">可用{{account.eb}}，冻结{{account.frozenEb}}</view>
+							<radio class="pay-radio" value="wechat" checked color="#8b64fd" />
+							<view class="pay-title">微信支付</view>
 						</label>
 					</view>
 					<view class="item">
 						<label>
-							<radio class="pay-radio" value="wechat" color="#8b64fd" />
-							<view class="pay-title">微信支付</view>
+							<radio class="pay-radio" value="alipay" color="#8b64fd" />
+							<view class="pay-title">支付宝支付</view>
 						</label>
 					</view>
 				</radio-group>
@@ -87,16 +86,12 @@
 	export default {
 		data() {
 			return {
-				payValue: 'eb',
+				payValue: 'wechat',
 				orderNo : '',
 				price	: '0.00',
 				stock	: 1,
 				loding	: true,
-				info	: {},
-				account	: {
-					eb		: '0.00',
-					frozenEb: '0.00'
-				}
+				info	: {}
 			};
 		},
 		onShow() {
@@ -124,8 +119,7 @@
 			openLay(){
 				let token = this.$store.getters.getToken
 				if(token == ''){
-					let userLogin = new userAuth()
-					userLogin.Login()
+					this.$Router.push({name: 'Login'})
 					return
 				}
 				this.$refs.buyLay.open('bottom')
@@ -152,47 +146,24 @@
 			},
 			// 支付
 			orderPay(){
-				let data = {}
 				marketsPay(this.orderNo, this.payValue).then(res => {
 					switch (this.payValue){
-						case 'eb':
-							this.$refs.payLay.close()
-							this.$Router.push({
-								name	: 'payResults',
-								params	: {
-									index: 1,
-									price: this.price,
-									type : 'eb',
-									total: '可在我的资产下我的权证中查看购买的数字权证'
-								}
-							})
-							break
 						case 'wechat':
-							this.wxPay(JSON.parse(res))
+							
+							break
+						case 'alipay':
+							cashierPay.pay('alipay', res, 'market').then(payRes => {
+								console.log(payRes)
+							})
 							break
 					}
 				}).catch(err => {
+					console.log(err)
 					uni.showToast({
 						title: err.message,
 						icon : 'none'
 					})
 				})
-			},
-			// 微信支付
-			wxPay(payConfig){
-				uni.requestPayment({
-					provider	: 'wxpay',
-					orderInfo	: payConfig,
-					success		: payRes => {
-						console.log(payRes)
-					},
-					fail		: payErr => {
-						uni.showToast({
-							title: payErr.errMsg,
-							icon : 'none'
-						})
-					}
-				})
 			}
 		}
 	}

pages/vip/vip.vue

@@ -282,7 +282,7 @@
 				getAliPayConfig(orderId, {
 					type: 'app'
 				}).then(res => {
-					cashierPay.pay('alipay', res.wechat).then(payRes => {
+					cashierPay.pay('alipay', res.wechat, 'vip').then(payRes => {
 						this.idenInfo()
 					})
 				}).catch(err => {
@@ -298,7 +298,7 @@
 					type: 'app'
 				}).then(res => {
 					let payConfig = JSON.parse(res)
-					cashierPay.pay('wxpay', payConfig).then(payRes => {
+					cashierPay.pay('wxpay', payConfig, 'vip').then(payRes => {
 						this.idenInfo()
 					})
 				}).catch(err => {