7-26

pages/money/pay.vue

@@ -5,14 +5,14 @@
 			<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)">
 				<text class="icon iconfont iconweixin"></text>
 				<view class="con">
 					<text class="tit">微信支付</text>
 					<text>推荐使用微信支付</text>
 				</view>
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 1"></radio></label>
-			</view> -->
+			</view>
 			<!-- #ifdef APP-PLUS -->
 			<!-- <view class="type-item b-b" @click="changePayType(2)">
 				<text class="icon iconfont iconzhifubao"></text>
@@ -20,7 +20,7 @@
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 2"></radio></label>
 			</view> -->
 			<!-- #endif -->
-			<view class="type-item b-b" @click="changePayType(2)">
+			<view class="type-item b-b" @click="changePayType(2)" v-if="money != 0">
 				<text class="icon iconfont iconzhifubao"></text>
 				<view class="con"><text class="tit">支付宝支付</text></view>
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 2"></radio></label>
@@ -45,8 +45,8 @@ import { mapState } from 'vuex';
 export default {
 	data() {
 		return {
-			payType: 2, //支付类型
-			payName: 'alipay',
+			payType: 3, //支付类型
+			payName: 'yue',
 			orderInfo: {},
 			money: 0.0, //订单金额
 			now_money: 0.0, //余额
@@ -55,7 +55,7 @@ export default {
 			payLoding: false, //判断是否支付中
 			type: '', //判断是否从订单中进入
 			// #ifdef H5
-			froms: '', //保存h5中数据来源对象
+			froms: 'weixinh5', //保存h5中数据来源对象
 			// #endif
 			pinkid: '' //保存拼团商品id
 		};
@@ -99,7 +99,7 @@ export default {
 		changePayType(type) {
 			this.payType = type;
 			if (this.payType == 1) {
-				this.payName = 'weixin_s';
+				this.payName = 'weixin';
 			}
 			if (this.payType == 2) {
 				this.payName = 'alipay';
@@ -114,7 +114,7 @@ export default {
 			orderPay({
 				uni: obj.orderId,
 				// #ifdef H5
-				from: obj.froms ? 'weixin_s' : 'H5', //来源
+				from: obj.froms ? 'weixinh5' : 'H5', //来源
 				// #endif
 				// #ifdef MP-WEIXIN
 				from: 'routine', //来源
@@ -133,7 +133,7 @@ export default {
 							obj.$api.msg(msg);
 						}
 					}
-					if (obj.payName == 'weixin_s' || obj.payName == 'routine') {
+					if (obj.payName == 'routine') {
 						let da = e.data.result.jsConfig;
 						console.log(da,'da++++++++++++++++++++++++++++')
 						console.log(da,'da+++++++++++++')
@@ -172,6 +172,9 @@ export default {
 						// #endif
 					
 						
+					}
+					if(obj.payName == 'weixin') {
+						window.location.href=e.data.result.jsConfig.mweb_url
 					}
 					if(obj.payName == 'alipay') {
 						// console.log(e.data.result.jsConfig.expend.pay_info,'e.data.result.jsConfig.expend.pay_info')
@@ -220,7 +223,7 @@ export default {
 			obj.payLoding = true;
 			// #ifdef H5
 			// 获取当前是否为微信浏览器
-			obj.froms = uni.getStorageSync('weichatBrowser') || '';
+			// obj.froms = uni.getStorageSync('weichatBrowser') || '';
 			// #endif
 			// 判断是否为未支付订单中跳转进入
 			if (obj.type != 1) {
@@ -248,7 +251,7 @@ export default {
 				payType: obj.payName,
 				mark: prepage.desc, //备注
 				// #ifdef H5
-				from: obj.froms ? 'weixin_s' : 'H5', //来源
+				from: obj.froms ? 'weixinh5' : 'H5', //来源
 				// #endif
 				// #ifdef MP-WEIXIN
 				from: 'routine', //来源

pages/user/withdrawal.vue

@@ -106,6 +106,11 @@
 			<input class="input" type="text" v-model="bank_name" placeholder="请输入所属银行"
 				placeholder-class="placeholder" />
 		</view>
+		<view class="row b-b" v-if="type == 'bank'">
+			<text class="tit">所属支行</text>
+			<input class="input" type="text" v-model="bank_belonging" placeholder="请输入所属支行"
+				placeholder-class="placeholder" />
+		</view>
 		<button class="add-btn up" @click="confirm">提交申请</button>
 		<!-- <button class="add-btn modified" v-if="!weichatBsrowser" @click="navTo('/pages/money/account')">账号管理</button> -->
 	</view>
@@ -156,6 +161,7 @@
 				bank_code: '',
 				bank_people: '',
 				bank_name: '',
+				bank_belonging: '',
 				// #ifdef H5
 				weichatBsrowser: false,
 				// #endif
@@ -252,6 +258,7 @@
 					data.name = this.bank_people;
 					data.bankname = this.bank_name;
 					data.cardnum = this.bank_code;
+					data.bank_belonging = this.bank_belonging
 				}
 				if(this.type == 'weixin') {
 					console.log('weixin');

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>环球优购</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.ead01763.js></script><script src=/index/static/js/index.79318e9e.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.ead01763.js></script><script src=/index/static/js/index.43bfd804.js></script></body></html>