lhl 3 years ago
parent
commit
5ed224265b
28 changed files with 365 additions and 341 deletions
  1. 6 3
      components/returnButton.vue
  2. 1 1
      pages.json
  3. 80 6
      pages/product/groupBooking/productGroup.vue
  4. 44 13
      pages/redirect/redirect.vue
  5. 17 14
      pages/set/set.vue
  6. 6 4
      pages/user/award.vue
  7. 108 247
      pages/user/shareQrCode.vue
  8. 1 1
      pages/user/user.vue
  9. 101 39
      pages/user/withdrawal.vue
  10. BIN
      unpackage/dist/build/h5/h5.rar
  11. 1 13
      unpackage/dist/build/h5/index.html
  12. 0 0
      unpackage/dist/build/h5/static/js/index.c33995df.js
  13. 0 0
      unpackage/dist/build/h5/static/js/index.f25d84cb.js
  14. 0 0
      unpackage/dist/build/h5/static/js/pages-product-groupBooking-detail.3a6e80ed.js
  15. 0 0
      unpackage/dist/build/h5/static/js/pages-product-groupBooking-productGroup.460bdf9a.js
  16. 0 0
      unpackage/dist/build/h5/static/js/pages-product-groupBooking-productGroup.c3dc92b2.js
  17. 0 0
      unpackage/dist/build/h5/static/js/pages-redirect-redirect.1a6689f4.js
  18. 0 0
      unpackage/dist/build/h5/static/js/pages-redirect-redirect.95b18648.js
  19. 0 0
      unpackage/dist/build/h5/static/js/pages-set-set.0a0c5370.js
  20. 0 0
      unpackage/dist/build/h5/static/js/pages-set-set.114ac0a1.js
  21. 0 0
      unpackage/dist/build/h5/static/js/pages-user-award.25afef2b.js
  22. 0 0
      unpackage/dist/build/h5/static/js/pages-user-award.c4a2ede2.js
  23. 0 0
      unpackage/dist/build/h5/static/js/pages-user-shareQrCode.1ec77227.js
  24. 0 0
      unpackage/dist/build/h5/static/js/pages-user-shareQrCode.57d7af87.js
  25. 0 0
      unpackage/dist/build/h5/static/js/pages-user-user.83b3bb3a.js
  26. 0 0
      unpackage/dist/build/h5/static/js/pages-user-user.e070eefe.js
  27. 0 0
      unpackage/dist/build/h5/static/js/pages-user-withdrawal.ee80005d.js
  28. 0 0
      unpackage/dist/build/h5/static/js/pages-user-withdrawal.f3c74fe8.js

+ 6 - 3
components/returnButton.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="content">
+	<view class="content" :style="{'bottom': btmSize + 'rpx'}">
 		<view class="retun-Box" @click="navTo('/pages/order/order?state=0')">
 			<image class="return-img" src=".././static/tabBar/dingdan.png"></image>
 			<view class="return-text">订单</view>
@@ -14,7 +14,10 @@
 <script>
 export default {
 	props: {
-		
+		btmSize: {
+			type: Number,
+			default: 330
+		}
 	},
 	data() {
 		return {
@@ -43,7 +46,7 @@ export default {
 .content {
 	position: fixed;
 	right: 0;
-	bottom: 330rpx;
+	// bottom: 330rpx;
 	.retun-Box {
 		border-radius: 50%;
 		background: #FFFFFF;

+ 1 - 1
pages.json

@@ -249,7 +249,7 @@
 		{
 			"path": "pages/set/phone",
 			"style": {
-				"navigationBarTitleText": "实名认证"
+				"navigationBarTitleText": "绑定手机号"
 			}
 		},
 		{

+ 80 - 6
pages/product/groupBooking/productGroup.vue

@@ -5,9 +5,26 @@
 		<!-- 拼团倒计时 -->
 		<group-time :goodsObjact="goodsObjact" :key='goodsObjact.product_price' :seckillObj="seckillObj"></group-time>
 		<!-- 拼团标题 -->
-		<group-content :goodsObjact="goodsObjact"></group-content>
+		<group-content :goodsObjact="goodsObjact"></group-content>
+		
 		<!-- 拼团到货时间及优惠 -->
-		<discounts :mark='goodsObjact.mark' :Info="goodsObjact.info" @clickCoupon="Getcoupon" :showCoupon='false'></discounts>
+		<discounts :mark='goodsObjact.mark' :Info="goodsObjact.info" @clickCoupon="Getcoupon" :showCoupon='false'></discounts>
+		<view class="p-list">
+			<view class="p-list-tit">这些人刚开团成功,可一键参与拼团</view>
+			<scroll-view scroll-y="true" class="p-list-wrap">
+				<view class="p-list-item flex" v-for="item in pList">
+					<view class="p-item-img">
+						<image :src="item.avatar" mode=""></image>
+					</view>
+					<view class="p-item-name clamp">
+						{{item.nickname}}
+					</view>
+					<view class="p-item-btn" @click="OneClickPT(item)">
+						一键参团
+					</view>
+				</view>
+			</scroll-view>
+		</view>
 		<!-- 规格信息 -->
 		<!-- <fresh-detail :goodsObjact="goodsObjact"></fresh-detail> -->
 		<!-- <view class="uni-padding-wrap pinklistbox" v-if="pinkTlist.length > 0">
@@ -122,7 +139,7 @@
 			</view>
 		</view>
 		<!-- 返回按钮 -->
-		<return-button></return-button>
+		<return-button :btmSize="500"></return-button>
 
 	</view>
 </template>
@@ -235,7 +252,8 @@
 				pink_type: 1, //拼团类别
 				show: false, // 是否显示底部按钮
 				recommendedlist:[],// 大家都在拼
-				specClass: 'none' //显示隐藏弹窗
+				specClass: 'none' ,//显示隐藏弹窗
+				pList: [],//在拼团list
 			};
 
 		},
@@ -425,7 +443,8 @@
 				
 				groupGoods({}, this.goodsid).then(function({
 					data
-				}) {
+				}) {
+					obj.pList = data.pink
 					let goods = data.storeInfo;
 					obj.goodsObjact = goods;
 					console.log(obj.goodsObjact, 88)
@@ -543,7 +562,13 @@
 				}
 			},
 			// 阻止触发上级事件
-			stopPrevent() {}
+			stopPrevent() {},
+			OneClickPT(item) {
+				console.log(item)
+				uni.navigateTo({
+					url: '/pages/product/groupBooking/detail?id=' + item.id
+				})
+			}
 		}
 	};
 </script>
@@ -930,5 +955,54 @@
 				line-height: 34rpx;
 			}
 		}
+	}
+	.p-list {
+		width: 100%;
+		height: 300rpx;
+		background-color: #fff;
+		margin: 20rpx 0;
+		.p-list-tit {
+			padding-left: 20rpx;
+			line-height: 80rpx;
+			font-size: 28rpx;
+		}
+		.p-list-wrap {
+			height: 220rpx;
+			.p-list-item {
+				height: 110rpx;
+				width: 100%;
+				// background-color: #009688;
+				padding: 0 30rpx;
+				.p-item-img {
+					flex-grow: 0;
+					width: 70rpx;
+					height: 70rpx;
+					border-radius: 50%;
+					// background-color: red;
+					image {
+						width: 70rpx;
+						height: 70rpx;
+						border-radius: 50%;
+					}
+				}
+				.p-item-name {
+					flex-grow: 1;
+					padding-left: 50rpx;
+					line-height: 110rpx;
+					font-size: 26rpx;
+				}
+				.p-item-btn {
+					width: 130rpx;
+					height: 60rpx;
+					background-color: #df2e24;
+					color: #fff;
+					border-radius: 10rpx;
+					line-height: 60rpx;
+					text-align: center;
+					font-size: 24rpx;
+				}
+			}
+		}
+		
 	}
 </style>

+ 44 - 13
pages/redirect/redirect.vue

@@ -94,20 +94,51 @@ export default {
 				// 用于处理缓存bug
 				if (ur=='pages/product/product') {
 					ur = '/pages/index/index'
+				}
+				if (e.data.phone) {
+					uni.switchTab({
+						url: ur,
+						fail(e) {
+							console.log(e);
+							uni.navigateTo({
+								url: ur,
+								fail(e) {
+									console.log(e);
+									uni.switchTab({
+										url: '/pages/index/index'
+									});
+								}
+							});
+						}
+					});
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: '请先绑定手机号',
+						showCancel: false,
+						success: res => {
+							uni.navigateTo({
+								url: '/pages/set/phone'
+							});
+						},
+						fail(e) {
+							console.log(e);
+						}
+					});
 				}
-				uni.switchTab({
-					url: ur,
-					fail(e) {
-						uni.navigateTo({
-							url: ur,
-							fail(e) {
-								uni.navigateTo({
-									url: '/pages/index/index',
-								});
-							}
-						});
-					}
-				});
+				// uni.switchTab({
+				// 	url: ur,
+				// 	fail(e) {
+				// 		uni.navigateTo({
+				// 			url: ur,
+				// 			fail(e) {
+				// 				uni.navigateTo({
+				// 					url: '/pages/index/index',
+				// 				});
+				// 			}
+				// 		});
+				// 	}
+				// });
 			}).catch((e) => {
 				uni.showModal({
 					title: '错误',

+ 17 - 14
pages/set/set.vue

@@ -1,24 +1,27 @@
 <template>
 	<view class="container">
 		<uni-list>
-		    <uni-list-item title="个人资料" @click="navTo('/pages/set/userinfo')" ></uni-list-item>
-			<uni-list-item title="修改密码" @click="navTo('/pages/set/password')" ></uni-list-item>
-		    <uni-list-item title="实名认证" @click="navTo('/pages/set/phone')" ></uni-list-item>
+		    <uni-list-item title="个人资料" @click="navTo('/pages/set/userinfo')" ></uni-list-item>
+			<!-- #ifdef APP-PLUS -->
+			<uni-list-item title="修改密码" @click="navTo('/pages/set/password')" ></uni-list-item>
+			<!-- #endif -->
+		    <uni-list-item title="绑定手机" @click="navTo('/pages/set/phone')" ></uni-list-item>
 		    <uni-list-item title="收货地址" @click="navTo('/pages/set/address')" ></uni-list-item>
 		</uni-list>
-		<uni-list class="margin-t-20">
+		<!-- <uni-list class="margin-t-20">
 		    <uni-list-item title="消息推送" :switch-checked='true' :show-switch="true" :show-arrow="false" switch-color='#5dbc7c'  @switchChange='switchChange'> 
 			</uni-list-item>
-		</uni-list>
-		
-		<uni-list class="margin-t-20">
-		    <uni-list-item title="清除缓存" ></uni-list-item>
-		    <uni-list-item title="检查更新" >
-				<template slot="right">
-					当前版本 1.0.3
-				</template>
-			</uni-list-item>
-		</uni-list>
+		</uni-list> -->
+		<!-- #ifdef APP-PLUS -->
+		<uni-list class="margin-t-20">
+		    <uni-list-item title="清除缓存" ></uni-list-item>
+		    <uni-list-item title="检查更新" >
+				<template slot="right">
+					当前版本 1.0.3
+				</template>
+			</uni-list-item>
+		</uni-list>
+		<!-- #endif -->
 		<view class="list-cell log-out-btn" @click="toLogout">
 			<text class="cell-tit">退出登录</text>
 		</view>

+ 6 - 4
pages/user/award.vue

@@ -9,7 +9,7 @@
 			<view class="flex buttom-box">
 				<view class="buttom" @click="navto('/pages/money/recharge')">
 					<view class="icon"><image src="/static/icon/i6.png" mode="aspectFill" class="icon-img"></image></view>
-					<text>统计</text>
+					<text>充值</text>
 				</view>
 				<view class="interval"></view>
 				<view class="buttom" @click="navto('./withdrawal')">
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import { spreadCommission, userBalance } from '@/api/wallet.js';
+import { spreadCommission, userBalance, extractBank } from '@/api/wallet.js';
 import { mapState, mapMutations } from 'vuex';
 import { getMoneyStyle } from '@/utils/rocessor.js';
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
@@ -109,8 +109,10 @@ export default {
 	onShow() {
 		this.loadData();
 		//获取用户余额
-		userBalance({}).then(({ data }) => {
-			this.money = data.commissionCount;
+		extractBank({}).then(({ data }) => {
+			this.money = data.commissionCount;
+			// this.minPrice = data.minPrice;
+			// this.freeze = data.incommissionCount;
 		});
 	},
 	methods: {

+ 108 - 247
pages/user/shareQrCode.vue

@@ -1,282 +1,143 @@
 <template>
-	<view class="content">
-		<!-- <view class="qrimg">
-			<tki-qrcode
-				:cid="cid"
-				ref="qrcode"
-				:val="val"
-				:size="size"
-				:unit="unit"
-				:background="background"
-				:foreground="foreground"
-				:pdground="pdground"
-				:icon="icon"
-				:iconSize="iconSize"
-				:lv="lv"
-				:onval="onval"
-				:loadMake="loadMake"
-				:usingComponents="usingComponents"
-				@result="qrR"
-			/>
-		</view> -->
-		<!-- #ifndef MP-ALIPAY -->
-		<canvas :class="{ qrimg: !loading }" @longtap="alertCanv" id="qrShareBox" canvas-id="qrShareBox" class="tki-qrcode-canvas" />
-		<!-- #endif -->
-		<!-- #ifdef MP-ALIPAY -->
-		<canvas :class="{ qrimg: !loading }" @longtap="alertCanv" id="qrShareBox" class="tki-qrcode-canvas" />
-		<!-- #endif -->
-		<view :style="{ display: loading ? 'none' : 'block' }" class="tki-qrcode-canvas"><image :src="ctxSrc" mode="scaleToFill" class="tki-qrcode-canvas"></image></view>
-		<view class="share-bottom flex" :class="{ 'action-share-bottom': !loading }" @click="loading ? showImg() : ''">
-			<text>{{ loading ? '点击生成图片' : '长按二维码下载' }}</text>
-		</view>
+	<view class="container">
+		<image @longtap="bc_code" class="backImg" :src="backImg"></image>
+		<view class="tki-qrcode"><canvas @longtap="bc_code" canvas-id="qrcode" /></view>
 	</view>
 </template>
 
 <script>
-// import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue';
 import { spreadBanner } from '@/api/user.js';
 export default {
 	// components: { tkiQrcode },
 	data() {
 		return {
-			cid: 'tki-qrcode-canvas', //canvasId,页面存在多个二维码组件时需设置不同的ID
-			size: 180, //生成的二维码大小
-			unit: 'upx', //大小单位尺寸
-			// show: true,//默认使用组件中的image标签显示二维码
-			val: '', //要生成的内容
-			background: '#ffffff', //二维码背景色
-			foreground: '#333333', //二维码前景色
-			pdground: '#333333', //二维码角标色
-			icon: '', //二维码图标URL(必须是本地图片,网络图需要先下载至本地)
-			iconSize: 40, //二维码图标大小
-			lv: 3, //容错级别
-			onval: false, //监听val值变化自动重新生成二维码
-			loadMake: false, //组件初始化完成后自动生成二维码,val需要有值
-			usingComponents: false, //是否使用了自定义组件模式(主要是为了修复非自定义组件模式时 v-if 无法生成二维码的问题)
-			showLoading: false, //是否显示loading
-			loadingText: '二维码生成中', //loading文字
-			src: '', // 二维码生成后的图片地址或base64
-			ratio: 1, //页面比例用于计算
-			ctxSrc: '', //要显示的图片
-			loading: true,//是否载入图片中
-			canHeight: '',//画布高度
-			canWeidth: ''//画布宽度
+			url: '',
+			backImg: '',
+			userInfo: ''
 		};
 	},
 	onLoad() {
-		this.loadCodeList()
+		this.spread();
 	},
-	onReady() {
-		let obj = this;
-		let query = uni.createSelectorQuery();
-		// 获取页面比例
-		query
-			.select('.content')
-			.fields(
-				{
-					size: true
-				},
-				e => {
-					// 保存比例
-					this.ratio = e.width / 750;
-				}
-			)
-			.exec();
-		// 获取画布宽高信息
-		query
-			.select('#qrShareBox')
-			.fields(
-				{
-					size: true
-				},
-				e => {
-					// 保存画布宽高信息
-					obj.canHeight = e.height;
-					obj.canWeidth = e.width;
-				}
-			)
-			.exec();
+	computed: {
+		cpSize() {
+			if (this.unit == 'upx') {
+				return uni.upx2px(this.size);
+			} else {
+				return this.size;
+			}
+		}
 	},
 	methods: {
-		loadCodeList() {
-			// 加载二维码信息
+		spread() {
+			uni.showLoading({
+				title: '加载中'
+			});
+			let obj = this;
 			spreadBanner({
-				// #ifdef H5
+				//#ifdef H5
 				type: 2,
-				// #endif
-				// #ifdef MP
-				type: 1
-				// #endif
-			}).then(e => {
-				// #ifdef MP
-				// 保存二维码图片
-				uni.downloadFile({
-					url: e.data[0].wap_posterQr,
-					success(res) {
-						if (res.errMsg == 'downloadFile:ok') {
-							obj.src = res.tempFilePath;
-							// 生成画布
-							obj.loadImg(obj.src);
-							uni.hideLoading();
-						}
-						console.log(res);
-					},
-					fail(e) {
-						console.log(e);
-					}
-				})
-				// #endif
-				// #ifdef H5
-					// 保存二维码图片
-					this.src =  e.data[0].wap_posterQr;
-					// 生成画布
-					this.loadImg(e.data[0].wap_posterQr);
-				// #endif
-				
-			}).catch((e) => {
-					uni.showModal({
-						title: '生成失败请刷新页面',
-						showCancel: false
-					});
-					uni.hideLoading();
-				});;
-		},
-		// 长按画布事件
-		alertCanv() {
-			uni.showModal({
-				title: '请先点击生成图片再下载',
-				showCancel: false
+				//#endif
+				//#ifdef MP
+				type:1,
+				//#endif
+				//#ifdef APP-PLUS
+				type:2,
+				//#endif
+			}).then(({ data }) => {
+				console.log(data);
+				//#ifdef MP
+				obj.backImg = data[0].poster;
+				//#endif
+				//#ifdef H5
+				obj.backImg = data[0].wap_poster;
+				//#endif
+				//#ifdef APP-PLUS
+				obj.backImg = data[0].wap_poster;
+				//#endif
+				uni.hideLoading();
 			});
 		},
-		// 生成图片
-		showImg() {
-			uni.showLoading({
-				title: '图片生成中',
-				mask: true
-			});
-			let obj = this;
-			//因为和uni.showLoading载入效果冲突需要延迟执行生成图片方法
-			setTimeout(function() {
-				uni.canvasToTempFilePath({
-					x: 0,
-					y: 0,
-					width: obj.canWeidth,
-					height: obj.canHeight,
-					destWidth: obj.canWeidth,
-					destHeight: obj.canHeight,
-					fileType: 'jpg',
-					quality: 1,
-					canvasId: 'qrShareBox',
-					success: res => {
-						uni.hideLoading();
-						uni.showModal({
-							title: '创建成功,长按二维码下载图片',
-							showCancel: false
+		bc_code() {
+			let that = this;
+			console.log('保存二维码', this.backImg);
+			uni.downloadFile({
+				//获得二维码的临时地址
+				url: this.backImg,
+				success: res => {
+					//console.log('获取url',res)
+					if (res.statusCode == 200) {
+						uni.saveImageToPhotosAlbum({
+							filePath: res.tempFilePath, //传入临时地址
+							success() {
+								that.$api.msg('保存成功'); //封装的提示
+							},
+							fail() {
+								that.$api.msg('保存失败');
+							}
 						});
-						// 显示生成的图片
-						obj.loading = false;
-						// 保存图片base64
-						obj.ctxSrc = res.tempFilePath;
-					},
-					fail(e) {
-						console.log(e);
 					}
-				});
-			}, 50);
-		},
-		// 开始渲染画布
-		loadImg(src) {
-			const obj = this;
-			const cavWidth=523;//画布宽度
-			const cavHeight=700;//画布高度
-			const ratio = obj.ratio;//获取页面比例
-			const ctxBg = '/static/img/img14.jpg'; //画布背景
-			let context = uni.createCanvasContext('qrShareBox');
-			const codeSize = obj.size * ratio; //计算二维码大小
-			const codeX = ((cavWidth - obj.size) * ratio) / 2; //二维码所在x轴位置
-			const codeY = cavHeight * ratio; //二维码所在y轴位置
-			const codeBoxColor = '#FFFFFF'; //包裹框颜色
-			const codeBoxWidht = 0; //包裹边框宽度
-			const codeBoxSize = (codeBoxWidht / 2) * ratio; //计算二维码白色包裹框大小
-			const codeBoxX = codeX - codeBoxSize; //包裹框初始X轴
-			const codeBoxY = codeY - codeBoxSize; //包裹框初始Y轴
-			const codeBoxEnd = codeSize + codeBoxWidht * ratio; //计算包裹框大小
-			const fontTop = codeY + codeBoxEnd + (codeBoxWidht + 20) * this.ratio; //文字距离上边距高度
-			const fontSize = 24 * ratio; //文字大小
-			const fontText = ''; //文字内容
-			const fontLeft = (codeSize - fontSize * fontText.length) / 2 + codeX; //文字左侧距离
-			// 插入背景图片
-			context.drawImage(ctxBg, 0, 0, obj.canWeidth, obj.canHeight);
-			// // 插入文字
-			context.setFontSize(fontSize);
-			context.fillText(fontText, fontLeft, fontTop);
-			// 插入边框
-			context.beginPath();//开始画线
-			context.setLineJoin('round'); //边框类型
-			context.setLineWidth(codeBoxWidht * ratio);
-			context.setStrokeStyle(codeBoxColor); //设置包裹框颜色
-			context.strokeRect(codeBoxX, codeBoxY, codeBoxEnd, codeBoxEnd);
-			context.stroke();//渲染线条
-			// 插入二维码
-			context.drawImage(src, codeX, codeY, codeSize, codeSize);
-			// 开始渲染
-			context.draw();
-		},
-		// 創建二维码
-		creatQrcode() {
-			this.$refs.qrcode._makeCode();
-		},
-		// 保存二维码到图库
-		saveQrcode() {
-			this.$refs.qrcode._saveCode();
-		},
-		// 生成二维码后返回base64
-		qrR(res) {
-			this.src = res;
-		},
-		//清空二维码(清空二维码会触发result回调 返回值为空)
-		clearQrcode(e) {
-			this.$refs.qrcode._clearCode();
-			this.val = '';
+				}
+			});
 		}
 	}
 };
 </script>
 
 <style lang="scss">
-.content {
-	padding-top: 30rpx;
+page {
+	width: 100%;
+	min-height: 100%;
+	.container {
+		width: 100%;
+		height: 100%;
+	}
 }
-// #qrShareBox {
-// 	position: absolute;
-// 	left: -9999rpx;
-// 	top: -9999rpx;
-// }
-
-.qrimg {
+.backImg {
 	position: absolute;
-	left: -9999rpx;
-	top: -9999rpx;
+	width: 100%;
+	height: 100%;
+}
+.portrait {
+	width: 100%;
+	text-align: center;
+	padding-top: 80rpx;
+	padding-bottom: 30rpx;
+	image {
+		width: 250rpx;
+		height: 250rpx;
+	}
 }
-.tki-qrcode-canvas {
-	// width: 700rpx;
-	// height: 1245rpx;
-	width: 532rpx;
-	height: 945rpx;
-	margin: 0 auto;
+.text {
+	text-align: center;
+	width: 100%;
+	color: #ffffff;
+	font-size: 55rpx;
+	letter-spacing: 15rpx;
 }
-.share-bottom {
-	width: 560rpx;
-	height: 80rpx;
+.uid-name {
+	padding: 50rpx 0rpx;
+	text-align: center;
+	width: 100%;
 	color: #ffffff;
-	background-color: $base-color;
-	margin: 0 auto;
-	font-size: $font-lg - 2rpx;
-	margin-top: 30rpx;
-	border-radius: 99rpx;
-	justify-content: center;
-	&.action-share-bottom {
-		background-color: $color-gray;
-	}
+}
+.copy-btn {
+	color: #ffffff;
+	background-color: #4ba6ed;
+	border-radius: 50rpx;
+	width: 170rpx;
+	line-height: 70rpx;
+	margin: 0rpx auto;
+	text-align: center;
+}
+.tki-qrcode {
+	position: fixed;
+	bottom: 10%;
+	left: 30%;
+}
+canvas {
+	width: 150px;
+	height: 150px;
+	margin: auto;
 }
 </style>

+ 1 - 1
pages/user/user.vue

@@ -151,7 +151,7 @@
 						<uni-list-item title="我的收藏" @click="navTo('/pages/user/favorites')" thumb="/static/icon/img02.png"></uni-list-item>
 						<uni-list-item title="收货地址" @click="navTo('/pages/set/address')" thumb="/static/icon/img05.png"></uni-list-item>
 						<uni-list-item title="邀请好友" @click="navTo('/pages/user/shareQrCode')" thumb="/static/icon/img10.png"></uni-list-item>
-						<!-- <uni-list-item title="关于我们" @click="navTo('/pages/shareQrCode/index')" thumb="/static/icon/img09.png"></uni-list-item> -->
+						<uni-list-item title="绑定手机号" @click="navTo('/pages/set/phone')" thumb="/static/icon/img09.png"></uni-list-item>
 					</uni-list>
 				</view>
 			</view>

+ 101 - 39
pages/user/withdrawal.vue

@@ -1,17 +1,17 @@
 <template>
 	<view class="content">
-		<uni-notice-bar single="true" text="每月25号到月底可提现上月结算余额"></uni-notice-bar>
+		<uni-notice-bar single="true" text="实际到账70%,剩余30%转化为响亮积分"></uni-notice-bar>
 		<view class="content-money">
-			<view class="flex ">
+			<view class="flex " style="width: 750rpx;justify-content: space-around;margin-left: 0;">
 				<view class="buttom">
 					<view class="icon">{{ money | getMoneyStyle }}</view>
 					<text class="text">可提现佣金</text>
 				</view>
-				<view class="interval"></view>
+				<!-- <view class="interval"></view>
 				<view class="buttom">
 					<view class=" icon">{{ freeze | getMoneyStyle }}</view>
 					<text class="text">待审核提现佣金</text>
-				</view>
+				</view> -->
 			</view>
 		</view>
 		<view class="row-box">
@@ -23,9 +23,9 @@
 			</view>
 		</view>
 		<!-- #ifndef MP-WEIXIN -->
-		<view class="list" v-if="!weichatBsrowser">
+		<view class="list" >
 			<radio-group @change="tabRadio">
-				<label>
+				<!-- <label>
 					<view class="box">
 						<view class="icon iconfont iconweixin1"></view>
 						<view class="title-box">
@@ -33,7 +33,7 @@
 						</view>
 						<view class="right"><radio value="weixin" color="#5dbc7c" :checked="type == 'weixin'" /></view>
 					</view>
-				</label>
+				</label> -->
 				<label>
 					<view class="box">
 						<view class="icon iconfont iconzhifubao"></view>
@@ -67,8 +67,28 @@
 			</radio-group>
 		</view>
 		<!-- #endif -->
+		<view class="row b-b" v-if="type == 'alipay'">
+			<text class="tit">支付宝账号</text>
+			<input class="input" type="text" v-model="alipay_code" placeholder="请输入支付宝账号" placeholder-class="placeholder" />
+		</view>
+		<view class="row b-b" v-if="type == 'alipay'">
+			<text class="tit">支付宝姓名</text>
+			<input class="input" type="text" v-model="alipay_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_code" 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_people" 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_name" 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>
+		<!-- <button class="add-btn modified" v-if="!weichatBsrowser" @click="navTo('/pages/money/account')">账号管理</button> -->
 	</view>
 </template>
 
@@ -85,13 +105,18 @@ export default {
 	},
 	data() {
 		return {
-			type: 'weixin', //提现方式
+			type: 'alipay', //提现方式
 			money: '0.00', //可提现金额
 			freeze: '0.0', //冻结金额
 			withdrawal: '', //提现金额
 			minPrice: '', //最少提现金额
 			aliData: {},
 			bankData: {},
+			alipay_code: '',
+			alipay_name: '',
+			bank_code: '',
+			bank_people: '',
+			bank_name: '',
 			// #ifdef H5
 			weichatBsrowser: false
 			// #endif
@@ -103,28 +128,28 @@ export default {
 		// #endif
 		//加载提现信息
 		this.loadData();
-		// 加载提款账号信息
-		this.loadAli();
-		this.loadBank();
+		// // 加载提款账号信息
+		// this.loadAli();
+		// this.loadBank();
 	},
 	methods: {
 		// 更新数据
-		dataUp() {
-			this.loadAli();
-			this.loadBank();
-		},
-		//加载数据
-		async loadAli(source) {
-			aliInfo({}).then(e => {
-				this.aliData = e.data;
-			});
-		},
-		// 加载银行卡信息
-		async loadBank() {
-			bankInfo({}).then(e => {
-				this.bankData = e.data;
-			});
-		},
+		// dataUp() {
+		// 	this.loadAli();
+		// 	this.loadBank();
+		// },
+		// //加载数据
+		// async loadAli(source) {
+		// 	aliInfo({}).then(e => {
+		// 		this.aliData = e.data;
+		// 	});
+		// },
+		// // 加载银行卡信息
+		// async loadBank() {
+		// 	bankInfo({}).then(e => {
+		// 		this.bankData = e.data;
+		// 	});
+		// },
 		// 加载余额信息
 		async loadData() {
 			extractBank({}).then(({ data }) => {
@@ -152,22 +177,35 @@ export default {
 			};
 
 			if (this.withdrawal < this.minPrice) {
-			uni.showToast({
-				title: '提现金额不可少于'+this.minPrice,
-				duration: 2000,
-				mask: false,
-				icon: 'none',
-			})
+				uni.showToast({
+					title: '提现金额不可少于' + this.minPrice,
+					duration: 2000,
+					mask: false,
+					icon: 'none'
+				});
 				return;
 			}
+			// if (this.type == 'alipay') {
+			// 	console.log('alipay');
+			// 	data.name = this.aliData.fullname;
+			// 	data.alipay_code = this.aliData.alino;
+			// }
+			// if (this.type == 'bank') {
+			// 	console.log(bank);
+			// 	data.name = this.bankData.fullname;
+			// 	data.bankname = this.bankData.bank;
+			// 	data.cardnum = this.bankData.bankno;
+			// }
 			if (this.type == 'alipay') {
-				data.name = this.aliData.fullname;
-				data.alipay_code = this.aliData.alino;
+				console.log('alipay');
+				data.name = this.alipay_name;
+				data.alipay_code = this.alipay_code;
 			}
 			if (this.type == 'bank') {
-				data.name = this.bankData.fullname;
-				data.bankname = this.bankData.bank;
-				data.cardnum = this.bankData.bankno;
+				console.log(bank);
+				data.name = this.bank_people;
+				data.bankname = this.bank_name;
+				data.cardnum = this.bank_code;
 			}
 
 			extractCash(data)
@@ -318,4 +356,28 @@ page {
 	width: 45rpx;
 	height: 45rpx;
 }
+.row {
+	display: flex;
+	align-items: center;
+	position: relative;
+	padding: 0 30upx;
+	height: 110upx;
+	background: #fff;
+
+	.tit {
+		flex-shrink: 0;
+		width: 250upx;
+		font-size: 30upx;
+		color: $font-color-dark;
+	}
+	.input {
+		flex: 1;
+		font-size: 30upx;
+		color: $font-color-dark;
+	}
+	.iconlocation {
+		font-size: 36upx;
+		color: $font-color-light;
+	}
+}
 </style>

BIN
unpackage/dist/build/h5/h5.rar


+ 1 - 13
unpackage/dist/build/h5/index.html

@@ -1,14 +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)'))
-<<<<<<< HEAD
-            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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.fd8e0a16.js></script><script src=/index/static/js/index.9b9dd0f4.js></script></body></html>
-=======
-<<<<<<< HEAD
-            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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.520954c1.js></script><script src=/index/static/js/index.c33995df.js></script></body></html>
-=======
-<<<<<<< HEAD
-            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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.fd8e0a16.js></script><script src=/index/static/js/index.fbde1233.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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.520954c1.js></script><script src=/index/static/js/index.18db8cbc.js></script></body></html>
->>>>>>> 36454b703a427b7eecd45bbd3f7a0b56c9aa477d
->>>>>>> bdca7df13a2787003bb166924df55385c0b76707
->>>>>>> e955fff7507f10fc73416bad158f3bc09a0b2f94
+            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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.fd8e0a16.js></script><script src=/index/static/js/index.f25d84cb.js></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/index.c33995df.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/index.f25d84cb.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-groupBooking-detail.3a6e80ed.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-groupBooking-productGroup.460bdf9a.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-product-groupBooking-productGroup.c3dc92b2.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-redirect-redirect.1a6689f4.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-redirect-redirect.95b18648.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-set.0a0c5370.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-set.114ac0a1.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-award.25afef2b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-award.c4a2ede2.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-shareQrCode.1ec77227.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-shareQrCode.57d7af87.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-user.83b3bb3a.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-user.e070eefe.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-withdrawal.ee80005d.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-withdrawal.f3c74fe8.js


Some files were not shown because too many files changed in this diff