lhl 9 ヶ月 前
コミット
8935c77a32
5 ファイル変更30 行追加9 行削除
  1. 1 1
      .hbuilderx/launch.json
  2. 2 2
      manifest.json
  3. 1 4
      pages/index/index.vue
  4. 1 1
      pages/index/zero.vue
  5. 25 1
      pages/money/pay.vue

+ 1 - 1
.hbuilderx/launch.json

@@ -19,7 +19,7 @@
             "type" : "uniCloud"
         },
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         }
     ]

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "精联惠选",
     "appid" : "__UNI__991D0D9",
     "description" : "精联惠选",
-    "versionName" : "1.3.3",
-    "versionCode" : 133,
+    "versionName" : "1.3.4",
+    "versionCode" : 134,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

+ 1 - 4
pages/index/index.vue

@@ -37,13 +37,10 @@
 		<!-- 公告 end -->
 		<view class="jg">
 		</view>
-		<!-- #ifdef APP-PLUS -->
 		<video src="../../static/video/v1.mp4" controls class="gsjs" ref="inv" id="myVideo" autoplay></video>
+		<!-- #ifdef APP-PLUS -->
 		<ad adpid="1108185255" @load="onload" @close="onclose" @error="onerror"></ad>
 		<!-- #endif -->
-		<!-- #ifdef H5 -->
-		<video src="https://chat.yiqushangshi.com/wap/video/v1.mp4" controls class="gsjs" :muted="muted" ref="inv" id="myVideo"></video>
-		<!-- #endif -->
 		<!-- 商品列表 start -->
 		<!-- <view class="hot-wrap">
 			<view class="hot-top flex">

+ 1 - 1
pages/index/zero.vue

@@ -26,7 +26,7 @@
 		</view>
 		<view class="flex banne">
 			<image src="../../static/img/zjf.png" mode="" @click="navto('/pages/zero/task')"></image>
-			<image src="../../static/img/yj.png" mode="" @click="navto('/pages/zero/chou')"></image>
+			<image src="../../static/img/yj.png" mode="" @click="navto('/pages/index/dkf')"></image>
 		</view>
 		<view class="flex nav">
 			<view class="nav-item" v-for="(item,index) in navList" :class="{'action': current == index}"

+ 25 - 1
pages/money/pay.vue

@@ -20,6 +20,15 @@
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 2"></radio></label>
 			</view>
 			<!-- #endif -->
+			<view class="type-item" @click="changePayType(4)" v-if="is_zero==1">
+				<!-- <text class="icon iconfont iconyue"></text> -->
+				<image src="../../static/icon/task1.png" class="icon iconfont" mode="widthFix" style="width: 40rpx;height: 40rpx;margin-right: 50rpx;"></image>
+				<view class="con">
+					<text class="tit">阅读积分</text>
+					<text>可用阅读积分 ¥{{ userInfo.points }}</text>
+				</view>
+				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 4"></radio></label>
+			</view>
 			<view class="type-item" @click="changePayType(3)" v-if="is_zero==0">
 				<text class="icon iconfont iconyue"></text>
 				<view class="con">
@@ -43,6 +52,7 @@ import weichatObj from '@/plugin/jweixin-module/index.js';
 export default {
 	data() {
 		return {
+			now_points: 0,
 			payType: 2, //支付类型
 			payName: 'ali',
 			orderInfo: {},
@@ -109,6 +119,9 @@ export default {
 			if (this.payType == 3) {
 				this.payName = 'yue';
 			}
+			if (this.payType == 4) {
+				this.payName = 'points';
+			}
 		},
 		// 支付金额
 		orderMoneyPay() {
@@ -232,6 +245,17 @@ export default {
 				});
 				return;
 			}
+			// if (obj.payName == 'yue' && +obj.now_money < obj.money) {
+			// 	uni.showModal({
+			// 		title: '提示',
+			// 		content: '账户阅读积分不足!',
+			// 		showCancel: false,
+			// 		success: res => {},
+			// 		fail: () => {},
+			// 		complete: () => {}
+			// 	});
+			// 	return;
+			// }
 			uni.showLoading({
 				title: '支付中',
 				mask: true
@@ -305,7 +329,7 @@ export default {
 					// 保存订单号
 					obj.orderId = data.result.orderId;
 					// 判断是否为消费积分支付
-					if (obj.payName == 'yue') {
+					if (obj.payName == 'yue' || obj.payName == 'points') {
 						if (status == 200 && data.status == 'SUCCESS') {
 							obj.paySuccessTo();
 						} else {