xuhaolan 4 vuotta sitten
vanhempi
commit
6d426ed220
3 muutettua tiedostoa jossa 14 lisäystä ja 10 poistoa
  1. 12 9
      pages/money/pay.vue
  2. 1 0
      pages/money/recharge.vue
  3. 1 1
      store/index.js

+ 12 - 9
pages/money/pay.vue

@@ -5,7 +5,7 @@
 			<text class="price">{{ money }}</text>
 		</view>
 		<view class="pay-type-list">
-			<view class="type-item b-b" @click="changePayType(1)">
+			<view class="type-item b-b" @click="changePayType(1)" v-if="bool">
 				<text class="icon iconfont iconweixin"></text>
 				<view class="con">
 					<text class="tit">微信支付</text>
@@ -54,6 +54,9 @@ import { balance } from '@/api/wallet.js';
 import { createOrderkey,computedOrderkey,orderPay } from '@/api/order.js';
 import { getUserInfo } from '@/api/user.js';
 import { mapState } from 'vuex';
+// #ifdef H5
+import weixinObj from "@/plugin/jweixin-module/index.js";
+// #endif
 export default {
 	data() {
 		return {
@@ -77,16 +80,16 @@ export default {
 			pinkid: '' ,//保存拼团商品id
 			'gp_now_money':0,
 			'integral':0,
-			is_gp:0//1为公排0不是公排
+			is_gp:0,//1为公排0不是公排
+			bool: true
 		};
 	},
-	computed: {
-		// #ifdef H5
-		...mapState(['weichatObj'])
-		// #endif
-	},
 	onLoad(options) {
-		
+		this.bool = uni.getStorageSync('weichatBrowser');
+		if(!this.bool) {
+			this.payType = 3
+			this.payName = 'weixin'
+		}
 		if (options.type == 1) {
 			this.type = 1;
 			this.orderId = options.ordid;
@@ -203,7 +206,7 @@ export default {
 						};
 						// #ifdef H5
 						if(obj.payName == 'weixin'){
-						obj.weichatObj.chooseWXPay(data);
+weixinObj.chooseWXPay(data);
 						}
 						// #endif
 						// #ifdef MP-WEIXIN

+ 1 - 0
pages/money/recharge.vue

@@ -57,6 +57,7 @@
 import { getMoneyStyle } from '@/utils/rocessor.js';
 // #ifdef H5
 import { rechargeWechat,userBalance,extractBank} from '@/api/wallet.js';
+import weixinObj from "@/plugin/jweixin-module/index.js";
 // #endif
 // #ifdef MP
 import { rechargeRoutine } from '@/api/wallet.js';

+ 1 - 1
store/index.js

@@ -6,7 +6,7 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	state: {
 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
-		baseURL:'http://gp.frp.liuniu946.com',//请求地址配置 
+		baseURL:'http://gp.liuniu946.com',//请求地址配置 
 		urlFile:'/index',//项目部署所在文件夹
 		loginInterceptor:false,//是否打开强制登录
 		// #ifdef H5 || MP-WEIXIN