zqwang 1 anno fa
parent
commit
30e7109cd9

+ 2 - 2
common/http.js

@@ -56,10 +56,10 @@ export default {
 		}
 		// #endif
 		options.url = this.config.baseUrl + options.url;
-		console.log('options.url ', options.url)
+		// console.log('options.url ', options.url)
 		return new Promise((resolve, reject) => {
 			options.success = (e) => {
-				console.log(e, 'successsuccesssuccesssuccesssuccess')
+				// console.log(e, 'successsuccesssuccesssuccesssuccess')
 				let res = e.data;
 				if (e.statusCode === 200) {
 					if (res.code == 500201) {

+ 15 - 5
pages/client/components/pay/recharge.vue

@@ -1,6 +1,10 @@
 <template>
 	<view class="re-body pd16_15">
-		<p class="ft14">账户余额<span class="ft14 kb-txt">{{user_info.total_coin}}</span>K币</p>
+		<p v-if="is_player" class="ft14">账户余额<span class="ft14 kb-txt">{{user_info.total_coin}}</span>K币</p>
+		<view v-if="is_player ==  false" style="margin: 10px 0;"> 
+			<p  class="ft18">请选择充值金额 <label class="ft14" style="float: right;">账户余额<span class="ft14 kb-txt">{{user_info.total_coin}}</span>K币</label></p>
+			<text class="ft14" style="font-weight: bold;padding-top: 10px;display: block;">1元=100K币</text>
+		</view>
 		<view class="box options-box">
 			<block v-for="(item,key) in list" :key="key">
 				<view @click="selectItem(item)" class="box mt16  options-item"
@@ -40,7 +44,7 @@
 	import {
 		getOptions,
 		getPayInfo
-	} from "@/common/apis/recharge.js"
+	} from "@/common/apis/recharge.js"
 	export default {
 		props: {
 			user_info:{}, // 用户信息
@@ -70,7 +74,7 @@
 		created() {
 			// props 会暴露到 `this` 上
 			this.get_options();
-			console.log(this.user_info, 'getOptions', this.list)
+			// console.log(this.user_info, 'getOptions', this.list)
 		},
 		methods: {
 			loginAct() {
@@ -99,8 +103,14 @@
 					video_id:this.video_info && this.video_info.video_id ? this.video_info.video_id :1,
 					video_series_sequence:this.video_info && this.video_info.video_series_sequence  ? this.video_info.video_series_sequence :1,
 				};
-				let res = await getPayInfo(params);
-				console.log('getPayInfo',res);
+				// #ifdef MP-WEIXIN  
+				
+					let res = await getPayInfo(params);
+					return this.$emit();
+				// #endif
+				
+				return this.$emit();
+				// console.log('getPayInfo',res);
 			}
 		}
 	}

+ 9 - 6
pages/client/components/pay/style/recharge.css

@@ -21,8 +21,8 @@
 }
 
 .options-item {
-	box-sizing: border-box;
-	height: 230rpx;
+	height: 230rpx;
+	box-sizing: border-box;
 	display: flex;
 	flex-direction: column;
 	width: calc((100% - 20rpx) / 2);
@@ -30,11 +30,12 @@
 	max-width: calc((100% - 20rpx) / 2);
 	background-color: #ececec;
 	margin: 10rpx 0px 10rpx 20rpx;
-	border-radius: 10rpx;
+	border-radius: 10rpx;
+	overflow: hidden;
 }
 
 .options-item:nth-child(2n+1) {
-	margin-left: 0rpx;
+	margin-left: 0rpx; 
 }
 
 .pirice-txt {
@@ -42,10 +43,11 @@
 }
 
 .cz-desc-txt{
-	padding: 12rpx 0;
-	border-radius: 0 0 6px 6px;
+	padding: 13rpx 0;
+	border-radius: 0 0 4px 4px;
 }
 .given-txt{
+	padding: 13rpx 10px;
 	border-top: solid 1rpx #9e9e9e1f;
 }
 .vip{
@@ -60,6 +62,7 @@
 	padding-right:  20rpx; ; 
 }
 .select_text{
+	padding: 13rpx 10px;
 	background-color:  #ff5722;	
 	color: #fff;
 }

+ 2 - 1
pages/client/pay/pay.vue

@@ -1,5 +1,6 @@
 <template>
-	<view class="">
+	<view class="body">
+	
 		<recharge :user_info="user_info"> </recharge>
 	</view>
 </template>

+ 2 - 9
pages/client/pay/style/pay.css

@@ -1,14 +1,7 @@
 .body{
 	background-color: #fff;
 }
-.textdesc{
-	display: flex;
-	flex-direction: column;
-}
 
-.textdesc text{
-	
-}
-.kb-txt{
-	color: #FF9800;;
+.cz-desc-txt{
+	padding-left: 20px;
 }