修改视频会员接口

api/goods.js

@@ -62,11 +62,22 @@ export function getCouponType(data) {
 // 获取虚拟商品列表
 export function getVirtuallist(data) {
 	return request({
-		url: '/zswl-cloud-shop/yqd/getCatalogList',
+		// url: '/zswl-cloud-shop/yqd/getCatalogList',
+		url: '/springbatchservice/video2/rechargeProduct',
 		data
 	})
 }
 
+// 创建虚拟商品订单
+export function creatVirtualOrder(data) {
+	return request({
+		url: '/springbatchservice/video2/creatOrder',
+		method:'post',
+		data
+	})
+}
+
+
 // 获取虚拟商品信息
 export function getVirtualInfo(data) {
 	return request({

detail/virtualGoods/detail.vue

@@ -0,0 +1,250 @@
+<template>
+	<view class="virtualGoods-detail">
+		<view class="content">
+			<!-- <view class="popup-title">会员充值</view> -->
+			<view class="goods-box">
+				<image class="icon" :src="chooseInfo.mainImg" mode=""></image>
+				<view class="goods-info">
+					<view class="goods-title">
+						{{chooseInfo.item_name}}
+					</view>
+					<view class="goods-desc">
+						{{chooseInfo.catalogName}}
+					</view>
+				</view>
+				<view class="price">
+					￥{{Number(chooseInfo.channel_price).toFixed(2)}}
+				</view>
+			</view>
+
+			<view class="notice">
+				暂不提供IOS用户进行充值业务
+			</view>
+
+			<u--form labelPosition="top" :model="form" ref="uForm" borderBottom labelWidth="180rpx" :labelStyle="{'color': '#222222',
+		'font-weight': 'bold','line-height':'60rpx','font-size': '28rpx'}">
+				<u-form-item label="账号类型" borderBottom ref="item1">
+					<view class="type-box" @click="show = true">
+						<view class="">
+							{{type}}
+						</view>
+						<image class="icon" src="../../static/right.png" mode=""></image>
+					</view>
+				</u-form-item>
+				<u-form-item label="充值账号" prop="account" borderBottom ref="item1">
+					<u--input v-model.trim="form.account" placeholder="请输入充值账号" border="none"></u--input>
+				</u-form-item>
+			</u--form>
+			<view class="goods-describe">
+
+				<rich-text :nodes="chooseInfo.goodsDescribe"></rich-text>
+			</view>
+			<button class="btn" type="default" :loading="loading" @click="handleBuy">确认</button>
+		</view>
+		
+		<u-modal :show="iosShow" content='暂不提供IOS用户进行充值业务' @confirm="iosShow = false"></u-modal>
+		
+		<!-- 选择账号类型 -->
+		<u-picker :show="show" :value='shopIndex' keyName="label" :closeOnClickOverlay="false" :columns="list" @confirm="choose" @cancel="show = false"></u-picker>
+		
+	</view>
+</template>
+
+<script>
+	import {SHOP_ID} from '@/utils/config.js'
+	export default {
+		data() {
+			return {
+				show:false,
+				iosShow: false,
+				chooseInfo: {channel_price:0},
+				type:'手机号',
+				form:{
+					account:'',
+					accountType:1,
+					productId:''
+				},
+				list:[
+					[
+						{
+							label:'手机号',
+							value:1,
+						},
+						{
+							label:'QQ号',
+							value:2,
+						},
+						{
+							label:'其他',
+							value:0,
+						},
+					]
+				]
+			}
+		},
+		methods: {
+			choose(val){
+				console.log(val.value[0]);
+				this.type = val.value[0].label
+				this.form.accountType = val.value[0].value
+				this.$nextTick(()=>{
+					this.show = false
+				})
+			},
+			// 创建订单
+			handleBuy() {
+				if (uni.getStorageSync('token')) {
+					if(JSON.parse(uni.getStorageSync('userInfo')).setMealCode == 0){
+						if(!this.form.account) return uni.showToast({
+							title:'请输入充值账号',
+							icon:'none'
+						})
+						let that = this
+						uni.getSystemInfo({
+							success(res){
+								console.log(res.osName);
+								if(res.osName == 'ios'){
+									that.show = false
+									that.iosShow = true
+								}else{
+									let info = {
+										price:Number(that.chooseInfo.channel_price).toFixed(2),
+										goodsName:that.chooseInfo.item_name,
+										accountType:that.form.accountType,
+										rechargeAccount:that.form.account,
+										productId:that.chooseInfo.product_id
+									}
+									uni.navigateTo({
+										url:`/detail/virtualGoods/pay`,
+										  success: function(res) {
+											// 通过eventChannel向被打开页面传送数据
+											res.eventChannel.emit('pay', info)
+										  }
+									})
+								}
+							}
+						})
+					}else{
+						uni.showModal({
+							title:'此商品需要开通会员才能购买',
+							cancelText:'下次再说',
+							confirmText:'立即开通',
+							success(res) {
+								if(res.confirm){
+									uni.navigateTo({
+										url:'/my/memberCenter/index'
+									})
+								}
+							}
+						})
+					}
+					
+					
+				} else {
+					uni.showModal({
+						title:'请登录',
+						confirmText:'去登录',
+						success(res){
+							console.log(res);
+							if(res.confirm){
+								uni.navigateTo({
+									url:'/login/login/login?redirect=/detail/virtualGoods/index'
+								})
+							}
+						}
+					})
+				}
+			
+			}
+		},
+		onLoad() {
+			let that = this
+			const eventChannel = this.getOpenerEventChannel();
+			eventChannel.on('data', function(data) {
+				console.log('da',data);
+				that.chooseInfo = data
+				
+			})
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.virtualGoods-detail {
+		.content{
+			padding: 24rpx;
+			.popup-title{
+				font-size: 32rpx;
+				font-weight: bold;
+				color: #222222;
+			}
+			.type-box{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				.icon{
+					width: 40rpx;
+					height: 40rpx;
+				}
+			}
+			.goods-box{
+				display: flex;
+				margin-top: 28rpx;
+				.icon{
+					width: 160rpx;
+					height: 160rpx;
+					border-radius: 16rpx;
+					background: #F0F0F0;
+				}
+				.goods-info{
+					display: flex;
+					flex-direction: column;
+					justify-content: space-around;
+					flex: 1;
+					margin-left: 20rpx;
+					.goods-title{
+						color: #222222;
+						font-weight: bold;
+						font-size: 36rpx;
+					}
+					.goods-desc{
+						font-size: 28rpx;
+						color: #AAAAAA;
+					}
+				}
+				.price{
+					color: $uni-color-primary;
+					font-size: 36rpx;
+					font-weight: bold;
+					align-self: center;
+				}
+			}
+			.notice{
+				font-size: 24rpx;
+				color: #AAAAAA;
+				padding: 26rpx 0;
+				border-bottom: 2rpx solid #F0F0F0;
+			}
+			.goods-describe{
+				color: #222222;
+				font-size: 24rpx;
+				max-height: 480rpx;
+				padding-top: 28rpx;
+				overflow: auto;
+			}
+			.btn{
+				position: fixed;
+				left: 30rpx;
+				bottom: env(safe-area-inset-bottom);
+				width: 690rpx;
+				height: 80rpx;
+				line-height: 80rpx;
+				background: $uni-color-primary;
+				border-radius: 46rpx;
+				margin-top: 54rpx;
+				font-size: 28rpx;
+				color: #fff;
+			}
+		}
+	}
+</style>

detail/virtualGoods/index.vue

@@ -1,19 +1,19 @@
 <template>
 	<view class="virtual">
 		
-		<view class="box" v-for="(item,index) in goodsData" :key="index">
-			<view class="goods-item" v-for="i in item.goods" :key="i.mainId" @click="handleItem(i,item.name)">
+		<view class="box" :key="index">
+			<view class="goods-item" v-for="(item,index) in goodsData" :key="index" @click="handleItem(item,item.name)">
 				<image class="icon" :src="i.mainImg" mode=""></image>
 				<view class="goods-info">
 					<view class="goods-title">
-						{{i.name}}
+						{{item.item_name}}
 					</view>
 					<view class="goods-desc">
-						{{item.name}}
+						{{item.item_name}}
 					</view>
 				</view>
 				<view class="price">
-					￥{{i.calcPrice}}
+					￥{{Number(item.channel_price).toFixed(2)}}
 				</view>
 			</view>
 		</view>
@@ -25,7 +25,7 @@
 					<image class="icon" :src="chooseInfo.mainImg" mode=""></image>
 					<view class="goods-info">
 						<view class="goods-title">
-							{{chooseInfo.name}}
+							{{chooseInfo.item_name}}
 						</view>
 						<view class="goods-desc">
 							{{chooseInfo.catalogName}}
@@ -34,7 +34,7 @@
 					<view class="price">
 						<u-loading-icon v-if="loadingPrice" text="获取价格中"></u-loading-icon>
 						<template v-else>
-							￥{{chooseInfo.price}}
+							￥{{chooseInfo.channel_price}}
 						</template>
 					</view>
 				</view>
@@ -83,9 +83,17 @@
 			handleItem(item,catalogName) {
 				console.log(item,catalogName);
 				this.chooseInfo = JSON.parse(JSON.stringify(item) ) 
-				this.chooseInfo.catalogName = catalogName
-				this.show = true
-				this.getVirtualInfo(item.mainId)
+				this.chooseInfo.catalogName = catalogName ||'无'
+				// this.show = true
+				let that = this
+				uni.navigateTo({
+					url:`/detail/virtualGoods/detail`,
+					  success: function(res) {
+						// 通过eventChannel向被打开页面传送数据
+						res.eventChannel.emit('data', that.chooseInfo)
+					  }
+				})
+				// this.getVirtualInfo(item.mainId)
 			},
 			 open() {
 			},
@@ -99,87 +107,20 @@
 				getVirtuallist().then(res=>{
 					uni.hideLoading()
 					if(res.state == 'Success'){
-						this.goodsData = res.content
-					}
-				})
-			},
-			getVirtualInfo(commodityId){
-				this.loadingPrice = true
-				getVirtualInfo({commodityId}).then(res=>{
-					this.loadingPrice = false
-					if(res.state == 'Success'){
-						this.chooseInfo.price = res.content.realPrice
+						this.goodsData = res.content.products
 					}
 				})
 			},
-			// 创建订单
-			handleBuy() {
-				if (uni.getStorageSync('token')) {
-					if(JSON.parse(uni.getStorageSync('userInfo')).setMealCode != 0){
-						if(!this.form.account) return uni.showToast({
-							title:'请输入充值账号',
-							icon:'none'
-						})
-						let that = this
-						uni.getSystemInfo({
-							success(res){
-								console.log(res.osName);
-								if(res.osName == 'ios'){
-									that.show = false
-									that.iosShow = true
-								}else{
-									let info = {
-										goodsId:that.chooseInfo.mainId,
-										goodsName:that.chooseInfo.name,
-										realPrice:that.chooseInfo.calcPrice,
-										goodsImg:that.chooseInfo.mainImg,
-										goodsDescribe:that.chooseInfo.catalogName,
-										shopId:SHOP_ID,
-										extend:JSON.stringify({account:that.form.account})
-									}
-									uni.navigateTo({
-										url:`/detail/virtualGoods/pay`,
-										  success: function(res) {
-											// 通过eventChannel向被打开页面传送数据
-											res.eventChannel.emit('pay', info)
-										  }
-									})
-								}
-							}
-						})
-					}else{
-						uni.showModal({
-							title:'此商品需要开通会员才能购买',
-							cancelText:'下次再说',
-							confirmText:'立即开通',
-							success(res) {
-								if(res.confirm){
-									uni.navigateTo({
-										url:'/my/memberCenter/index'
-									})
-								}
-							}
-						})
-					}
-					
-					
-				} else {
-					uni.showModal({
-						title:'请登录',
-						confirmText:'去登录',
-						success(res){
-							console.log(res);
-							if(res.confirm){
-								uni.navigateTo({
-									url:'/login/login/login?redirect=/detail/virtualGoods/index'
-								})
-							}
-						}
-					})
-				}
-				
-			
-			}
+			// getVirtualInfo(commodityId){
+			// 	this.loadingPrice = true
+			// 	getVirtualInfo({commodityId}).then(res=>{
+			// 		this.loadingPrice = false
+			// 		if(res.state == 'Success'){
+			// 			this.chooseInfo.price = res.content.realPrice
+			// 		}
+			// 	})
+			// },
+		
 		},
 		created() {
 			this.getVirtuallist()
@@ -279,67 +220,6 @@
 				align-self: center;
 			}
 		}
-		.content{
-			padding: 24rpx;
-			.popup-title{
-				font-size: 32rpx;
-				font-weight: bold;
-				color: #222222;
-			}
-			.goods-box{
-				display: flex;
-				margin-top: 28rpx;
-				.icon{
-					width: 160rpx;
-					height: 160rpx;
-					border-radius: 16rpx;
-					background: #F0F0F0;
-				}
-				.goods-info{
-					display: flex;
-					flex-direction: column;
-					justify-content: space-around;
-					flex: 1;
-					margin-left: 20rpx;
-					.goods-title{
-						color: #222222;
-						font-weight: bold;
-						font-size: 36rpx;
-					}
-					.goods-desc{
-						font-size: 28rpx;
-						color: #AAAAAA;
-					}
-				}
-				.price{
-					color: $uni-color-primary;
-					font-size: 36rpx;
-					font-weight: bold;
-					align-self: center;
-				}
-			}
-			.notice{
-				font-size: 24rpx;
-				color: #AAAAAA;
-				padding: 26rpx 0;
-				border-bottom: 2rpx solid #F0F0F0;
-			}
-			.goods-describe{
-				color: #222222;
-				font-size: 24rpx;
-				max-height: 480rpx;
-				padding-top: 28rpx;
-				overflow: auto;
-			}
-			.btn{
-				width: 688rpx;
-				height: 80rpx;
-				line-height: 80rpx;
-				background: linear-gradient(283deg, #F8D48C 0%, #FBDDA6 100%);
-				border-radius: 46rpx;
-				margin-top: 54rpx;
-				font-size: 28rpx;
-			}
-		}
+		
 	}
 </style>

detail/virtualGoods/pay.vue

@@ -1,15 +1,6 @@
 <template>
 	<view class="pay">
 
-		<!-- <view class="shop-info" v-if="!isVisual">
-			<view class="shop-name">
-				{{info.shopName}}
-			</view>
-			<view class="address">
-				{{info.address}}
-			</view>
-		</view> -->
-
 		<view class="pay-info">
 			<view class="goods-info">
 				<image class="goods-img" :src="info.goodsImg" mode=""></image>
@@ -21,14 +12,14 @@
 						{{info.goodsDescribe}}
 					</view>
 					<view class="price">
-						￥{{info.realPrice}}
+						￥{{info.price}}
 					</view>
 				</view>
 			</view>
 
 			
 
-			<view class="coupon">
+<!-- 			<view class="coupon">
 				<view class="label">
 					优惠券
 				</view>
@@ -36,17 +27,17 @@
 					暂无可用
 					<image class="icon" src="@/static/jiantou-icon.png" mode=""></image>
 				</view>
-			</view>
+			</view> -->
 
 		</view>
 		
-		<view class="input-box" v-if="isVisual">
+		<view class="input-box">
 			
 			<view class="label">
 				充值账号
 			</view>
 			<view class="value">
-				{{form.account}}
+				{{createQuery.rechargeAccount}}
 			</view>
 		</view>
 
@@ -57,7 +48,7 @@
 					合计:
 				</view>
 				<view class="price">
-					¥ {{info.realPrice}}
+					¥ {{info.price}}
 				</view>
 			</view>
 
@@ -72,7 +63,7 @@
 		calculate
 	} from '@/api/order.js';
 	import {
-		creat
+		creatVirtualOrder
 	} from '@/api/goods.js'
 	import {
 		creatPayOrder,
@@ -86,8 +77,13 @@
 				isVisual:false,//是否是虚拟商品
 				loading: false,
 				info: {},
-				form:{
-					account:''
+				createQuery:{
+				  "accountType": 0,
+				  "extendParameter": "",
+				  "number": 1,
+				  "outTradeNo": "",
+				  "productId": 0,
+				  "rechargeAccount": ""
 				},
 				query: {
 					"msgType": "wx.unifiedOrder",
@@ -126,33 +122,16 @@
 					})
 					let that = this
 					if (!this.payData.timeStamp) {
-						// 处理扩展字段  暂时只有研学商品和视频会员  视频会员是字符串的JSON  研学是字符串
-						let extend 
-						try{
-							if(JSON.parse(this.info.extend)){
-								extend = this.info.extend
-							}
-						}catch(e){
-							extend = this.info.reservationTime || ''
-						}
 						
-						creat({
-							discountId: (this.info.couponId || this.info.couponId == -1) ? [this.info.couponId
-							] : [],
-							extend,
-							channel:'ZhongShu',
-							goodsList: this.info.goodsId ? [this.info.goodsId] : [],
-							idempotent: guid(),
-							shopId: this.info.shopId
-						}).then(res => {
+						creatVirtualOrder(this.createQuery).then(res => {
 							this.loading = false
 							if (res.state == 'Success') {
-								if (!this.info.realPrice) { //价格为0
-									uni.hideLoading()
-									uni.reLaunch({
-										url: '/my/order/index'
-									})
-								} else {
+								// if (!this.info.realPrice) { //价格为0
+								// 	uni.hideLoading()
+								// 	uni.reLaunch({
+								// 		url: '/my/order/index'
+								// 	})
+								// } else {
 									this.query.orderNo = res.content.orderNo
 									this.query.subOpenId = JSON.parse(uni.getStorageSync('userInfo')).openId
 									this.query.orderDesc = this.info.goodsName
@@ -203,7 +182,7 @@
 										})
 
 									})
-								}
+								// }
 
 							}
 						})
@@ -258,16 +237,12 @@
 			let that = this
 			const eventChannel = this.getOpenerEventChannel();
 			eventChannel.on('pay', function(data) {
-				that.info = data
-				try{
-					let extend = JSON.parse(that.info.extend)
-					if(extend.account){
-						that.isVisual = true
-						that.form.account = extend.account
-					}
-				}catch(e){
-					//TODO handle the exception
-				}
+				that.createQuery.rechargeAccount = data.rechargeAccount
+				that.createQuery.accountType = data.accountType
+				that.createQuery.productId = data.productId
+				that.info.goodsName = data.goodsName
+				that.info.price = data.price
+			
 				console.log('data', data);
 			})
 		}

movie/movieDetail.vue

@@ -232,10 +232,40 @@
 				this.movie_cinemas()
 			},
 			goChooseSeat(sessionId){
-				console.log(sessionId);
-				uni.navigateTo({
-					url:`./chooseSeat?movieId=${this.query.movieId}&cinemaId=${this.cinemaId}&sessionId=${sessionId}`
-				})
+				if(uni.getStorageSync('token')){
+					if(JSON.parse(uni.getStorageSync('userInfo')).setMealCode != 0){
+						uni.navigateTo({
+							url:`./chooseSeat?movieId=${this.query.movieId}&cinemaId=${this.cinemaId}&sessionId=${sessionId}`
+						})
+					}else{
+						uni.showModal({
+							title:'此商品需要开通会员才能购买',
+							cancelText:'下次再说',
+							confirmText:'立即开通',
+							success(res) {
+								if(res.confirm){
+									uni.navigateTo({
+										url:'/my/memberCenter/index'
+									})
+								}
+							}
+						})
+					}
+					
+				}else{
+					return uni.showModal({
+						title:'请登录',
+						confirmText:'去登录',
+						success(res){
+							if(res.confirm){
+								uni.navigateTo({
+									url:'/login/login/login?redirect=/special/water'
+								})
+							}
+						}
+					})
+				}
+				
 			},
 			handleItem(id){
 				this.showMovie = true

my/order/detail.vue

@@ -82,7 +82,7 @@
 				</view>
 			</view>
 			
-			<view class="content code-box"  v-if="info.goodsList[0].jobFlowMap != 'P802'&&info.goodsList[0].goodsState == 'WAIT_USE'&&info.goodsList[0].goodsName!='二维码支付'">
+			<view class="content code-box"  v-if="info.goodsList[0].jobFlowMap != 'video2'&&info.goodsList[0].jobFlowMap != 'P802'&&info.goodsList[0].goodsState == 'WAIT_USE'&&info.goodsList[0].goodsName!='二维码支付'">
 					<view class="title">
 						券码信息
 					</view>
@@ -240,7 +240,7 @@
 					充值账号
 				</view>
 				<view class="value">
-					{{info.goodsList[0].extend.account}}
+					{{info.goodsList[0].extend.rechargeAccount}}
 				</view>
 			</view>
 			
@@ -281,7 +281,7 @@
 				</view>
 			</view>
 			
-			<view class="content apply-box" v-else-if="(info.goodsList[0].goodsState == 'WAIT_USE'||info.goodsList[0].goodsState == 'USED')&&info.goodsList[0].refundLog.refund != 'REFUSAL_REFUND'&&isRefund()&&info.goodsList[0].jobFlowMap !== 'XiaoJu'&&info.goodsList[0].jobFlowMap != 'P802'" @click="apply">
+			<view class="content apply-box" v-else-if="(info.goodsList[0].goodsState == 'WAIT_USE'||info.goodsList[0].goodsState == 'USED')&&info.goodsList[0].refundLog.refund != 'REFUSAL_REFUND'&&isRefund()&&info.goodsList[0].jobFlowMap !== 'XiaoJu'&&info.goodsList[0].jobFlowMap != 'video2'&&info.goodsList[0].jobFlowMap != 'P802'" @click="apply">
 				<view class="label">
 					退款申请
 				</view>
@@ -509,13 +509,13 @@
 				payDetails(orderNo).then(res=>{
 					this.pageLoading = false
 					this.info = res.content
-					if(this.info.goodsList[0].jobFlowMap == 'P802'){
+					if(this.info.goodsList[0].jobFlowMap =='video2'||this.info.goodsList[0].jobFlowMap =='P802'){
 						this.isVisual = true
 					}
 					if(!this.info.goodsList[0].refundLog){
 						this.info.goodsList[0].refundLog = {}
 					}
-					if(this.info.goodsList[0].jobFlowMap != 'P802'&&this.info.goodsList[0].goodsState == 'WAIT_USE'&&this.info.goodsList[0].goodsName!='二维码支付'){
+					if(this.info.goodsList[0].jobFlowMap != 'video2'&&this.info.goodsList[0].jobFlowMap != 'P802'&&this.info.goodsList[0].goodsState == 'WAIT_USE'&&this.info.goodsList[0].goodsName!='二维码支付'){
 					
 						qrCode(this.info.goodsList[0].id).then(res=>{
 							this.loading = false

pages.json

@@ -150,6 +150,12 @@
 						"navigationBarTitleText": "会员充值"
 					}
 				},
+				{
+					"path": "virtualGoods/detail",
+					"style": {
+						"navigationBarTitleText": "会员充值"
+					}
+				},
 				{
 					"path": "virtualGoods/pay",
 					"style": {

pages/index/index.vue

@@ -295,7 +295,7 @@
 									uni.setStorageSync('location',JSON.stringify({latitude:res.latitude,longitude:res.longitude}))
 									if(that.query.regionCode){//选择了城市
 									console.log('选择了城市',that.city);
-										that.city = uni.getStorageSync('HomeCity')
+										that.city = uni.getStorageSync('HomeCity') || uni.getStorageSync('city')
 										resolve()
 									}else{//没选择城市
 									console.log('没选择城市',that.city);
@@ -309,7 +309,7 @@
 											that.query.regionCode = res.content.geoAddressComponent.adcode.substr(0,4) +'00'
 											that.city = res.content.geoAddressComponent.city
 											uni.setStorageSync('city',res.content.geoAddressComponent.city)
-											getDistrict({boundary:1,keyword:'成都',sub_admin:1}).then(r=>{
+											getDistrict({boundary:1,keyword:that.city,sub_admin:1}).then(r=>{
 												console.log('区域',r);
 												let data = []
 												r.content.districts&&r.content.districts[0].districts.map((item,index)=>{
@@ -607,7 +607,7 @@
 							let city = this.city.replace('市','')
 							res.content.content.forEach(item=>{
 								if(item.name.indexOf(city) != -1){
-									 this.query.regionCode = item.code
+									 // this.query.regionCode = item.code
 									 resolve()
 								}
 							})
@@ -684,7 +684,7 @@
 				this.getCityList().then(()=>{
 					this.search()
 				})
-				this.cityList()
+				// this.cityList()
 				uni.stopPullDownRefresh()
 			})
 		},