hwq 4 anos atrás
pai
commit
ca79387a67

+ 2 - 2
api/wallet.js

@@ -99,9 +99,9 @@ export function balance(data) {
 }
 
 //积分明细
-export function integral(data,state) {
+export function integral(data) {
 	return request({
-		url: '/api/integral/list'+state,
+		url: '/api/integral/list',
 		method: 'get',
 		data
 	});

+ 7 - 12
pages.json

@@ -166,11 +166,8 @@
 			"path": "pages/user/award",
 			"style": {
 				"navigationBarTitleText": "奖励明细",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
+				"navigationBarBackgroundColor":"#D7EEB6",
+				"navigationBarTextStyle":"black"
 			}
 		},
 		{
@@ -275,11 +272,9 @@
 			"path": "pages/money/wallet",
 			"style": {
 				"navigationBarTitleText": "我的钱包",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
+				"navigationBarBackgroundColor":"#D7EEB6",
+				"navigationBarTextStyle":"black"
+				
 			}
 		},
 		{
@@ -402,8 +397,8 @@
 			},
 			{
 				"pagePath": "pages/story/story",
-				"iconPath": "static/tabBar/tab-cart.png",
-				"selectedIconPath": "static/tabBar/tab-cart-current.png",
+				"iconPath": "static/tabBar/tab-store.png",
+				"selectedIconPath": "static/tabBar/tab-store-current.png",
 				"text": "品牌故事"
 			},
 			{

+ 4 - 3
pages/money/recharge.vue

@@ -32,7 +32,7 @@
 							<view class="title"><text>微信充值</text></view>
 							
 						</view>
-						<view class="right"><radio value="weixin" color="#FF4343" :checked="type == 'weixin'" /></view>
+						<view class="right"><radio value="weixin" color="#6EAB4E" :checked="type == 'weixin'" /></view>
 					</view>
 				</label>
 				<!-- #endif -->
@@ -255,7 +255,7 @@ page {
 		color: $base-color;
 	}
 	&.up {
-		background: linear-gradient(-35deg, #FF4343, #FF4343);
+		background: #6EAB4E;
 		color: #fff;
 	}
 	display: flex;
@@ -391,6 +391,7 @@ page {
 	}
 }
 .current {
-	background: linear-gradient(-35deg, #F8DD4F, #FBEB77) !important;
+	background: #6EAB4E !important;
+	color: #fff !important;
 }
 </style>

+ 1 - 1
pages/money/wallet.vue

@@ -349,7 +349,7 @@ page {
 	right: 39rpx;
 	width: 674rpx;
 	height: 88rpx;
-	background: $base-color;
+	background: linear-gradient(-35deg, #F8DD4F, #FBEB77);
 	border-radius: 44rpx;
 	color: #fff;
 	text-align: center;

+ 1 - 9
pages/story/story.vue

@@ -131,12 +131,6 @@
 					//防止重复加载
 					return;
 				}
-				if (source == 'tabChange') {
-					uni.showLoading({
-						title: "加载中...",
-						mask: true
-					})
-				}
 				navItem.loadingType = 'loading';
 				article({
 					page: navItem.page,
@@ -144,9 +138,7 @@
 				}, navItem.cid).then(({
 					data
 				}) => {
-					if (source == 'tabChange' && navItem.loaded != false) {
-						uni.hideLoading()
-					}
+					
 					console.log(data)
 					let list = data.map(item => {
 						return item

+ 4 - 4
pages/user/award.vue

@@ -222,7 +222,7 @@ page {
 	// background-color: $base-color;
 	// padding-top: var(--status-bar-height);
 	height: 400rpx;
-	color: #ff4c4c;
+	color: #3F7C1F;
 	text-align: center;
 	position: relative;
 	image {
@@ -243,12 +243,12 @@ page {
 		// margin: auto 0;
 		font-size: 56rpx;
 		font-weight: bold;
-		color: #ff4c4c;
+		color: #3F7C1F;
 		position: relative;
 		.money-icon {
 			font-size: 38rpx;
 			font-weight: bold;
-			color: #ff4c4c;
+			color: #3F7C1F;
 		}
 	}
 }
@@ -326,7 +326,7 @@ page {
 		width: 674rpx;
 		height: 88rpx;
 		line-height: 88rpx;
-		background: #ff4c4c;
+		background: linear-gradient(-35deg, #F8DD4F, #FBEB77);
 		border-radius: 44rpx;
 		font-size: 36rpx;
 		font-family: PingFang SC;

+ 173 - 170
pages/user/integral.vue

@@ -7,9 +7,7 @@
 		</view>
 		<!-- 收入和支出 -->
 		<view class="navbar">
-			<view class="nav-item" v-for="(item, index) in navList" :key="index"
-				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-
+			<view class="nav-item" v-for="(item, index) in navList" :key="index" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
 		</view>
 		<swiper class="swiper-box" :current="tabCurrentIndex" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
@@ -18,210 +16,215 @@
 				<!-- 推广奖励 -->
 				<scroll-view class="scorll" scroll-y="true">
 					<view class="cost">
-						<view class="award" v-for="item in tabItem ">
+						<view class="award" v-for="item in tabItem.orderList">
 							<view class="award-left">
-								<view class="text">消费赠送</view>
-								<view class="time">2021-8-26 09:30</view>
+								<view class="text clamp">{{ item.mark }}</view>
+								<view class="time">{{ item.add_time }}</view>
 							</view>
-							<view class="award-right">+200</view>
+							<view class="award-right">{{ pm == 1 ? '-' : '+' }}{{ item.number }}</view>
 						</view>
 					</view>
 				</scroll-view>
-
+				<uni-load-more :status="tabItem.loadingType"></uni-load-more>
 			</swiper-item>
 		</swiper>
 	</view>
 </template>
 
 <script>
-	// 组件
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-	import empty from '@/components/empty';
-	//接口
-	import { integral } from '@/api/wallet.js';
-	export default {
-		components: {
-			empty,
-			uniLoadMore
+// 组件
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+//接口
+import { integral } from '@/api/wallet.js';
+export default {
+	components: {
+		empty,
+		uniLoadMore
+	},
+	data() {
+		return {
+			height: '',
+			tabCurrentIndex: 0,
+			navList: [
+				{
+					state: 1,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 0,
+					text: '支出',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				}
+			],
+			list: [],
+			money: ''
+		};
+	},
+	onLoad() {
+		this.loadData();
+	},
+	methods: {
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange');
 		},
-		data() {
-			return {
-				height: '',
-				tabCurrentIndex: 0,
-				navList: [
-					{
-						state: 0,
-						text: '收入',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 1,
-						text: '支出',
-						loadingType: 'more',
-						orderList: [],
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					}
-				],
-				list: [],
-				money: ''
-			}
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
 		},
-		methods: {
-			//swiper 切换
-			changeTab(e) {
-				this.tabCurrentIndex = e.target.current;
-				this.loadData('tabChange')
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-			},
-			loadData(type) {
-				let obj = this
-				let index = obj.tabCurrentIndex
-				let navItem = obj.navList[index]
-				if(navItem.loadingType == 'loading' || navItem.loadingType == 'noMore') {
-					return 
-				}
-				if(type == 'tabChange' && navItem.loaded == 'loaded') {
-					return 
-				}
-				navItem.loadingType == 'loading';
-				integral({
-					page: navItem.page,
-					limit: navItem.limit
-				},navItem.state).then( res => {
-					console.log(res)
-				})
-				
+		loadData(type) {
+			let obj = this;
+			let index = obj.tabCurrentIndex;
+			let navItem = obj.navList[index];
+			if (navItem.loadingType == 'loading' || navItem.loadingType == 'noMore') {
+				return;
+			}
+			if (type == 'tabChange' && navItem.loaded == 'loaded') {
+				return;
 			}
+			navItem.loadingType == 'loading';
+			integral({
+				page: navItem.page,
+				limit: navItem.limit,
+				pm: navItem.state
+			}).then(res => {
+				navItem.orderList = navItem.orderList.concat(res.data);
+				if (navItem.limit == res.data.length) {
+					navItem.loadingType = 'more';
+					return;
+				} else {
+					navItem.loadingType = 'noMore';
+				}
+				uni.hideLoading();
+				this.$set(navItem, 'loaded', true);
+			});
 		}
 	}
+};
 </script>
 
 <style lang="scss">
-	.container {
-		width: 750rpx;
-		height: 1334rpx;
-		background-color: #f1f1f1;
-
-		.header {
-			position: relative;
-			image {
-				width: 750rpx;
-				height: 400rpx;
-			}
-
-			.money {
-				font-size: 72rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #3F7C1F;
-				position: absolute;
-				top: 50%;
-				left: 50%;
-				transform: translate(-50% ,-50%);
-			}
+.container {
+	width: 750rpx;
+	height: 1334rpx;
+	background-color: #f1f1f1;
+
+	.header {
+		position: relative;
+		image {
+			width: 750rpx;
+			height: 400rpx;
 		}
 
-		.swiper-box {
-			height: calc(100% - 500rpx);
-			background-color: #FFFFFF;
+		.money {
+			font-size: 72rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #3f7c1f;
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
 		}
+	}
 
-		.scorll {
-			height: 90%;
-		}
+	
 
-		.navbar {
-			display: flex;
-			height: 100rpx;
-			padding: 0 5rpx;
-			background: #fff;
-			box-shadow: 0 1rpx 5rpx rgba(0, 0, 0, 0.06);
-			position: relative;
-			z-index: 10;
-			margin-top: 25rpx;
+	
 
-			.nav-item {
-				flex: 1;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				height: 100%;
-				font-size: 15px;
-				color: #999999;
-				position: relative;
+	.navbar {
+		display: flex;
+		height: 100rpx;
+		padding: 0 5rpx;
+		background: #fff;
+		box-shadow: 0 1rpx 5rpx rgba(0, 0, 0, 0.06);
+		position: relative;
+		z-index: 10;
+		margin-top: 25rpx;
 
-				&.current {
-					color: #333333;
+		.nav-item {
+			flex: 1;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			font-size: 15px;
+			color: #999999;
+			position: relative;
 
-					&:after {
-						content: '';
-						position: absolute;
-						left: 50%;
-						bottom: 0;
-						transform: translateX(-50%);
-						width: 44px;
-						height: 0;
-						border-bottom: 2px solid #3F7C1F;
-					}
+			&.current {
+				color: #333333;
+
+				&:after {
+					content: '';
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 44px;
+					height: 0;
+					border-bottom: 2px solid #3f7c1f;
 				}
 			}
 		}
+	}
 
-		.cost {
-			width: 750rpx;
-			height: auto;
-			background-color: #fff;
-
-			.award {
-				width: 701rpx;
-				height: 132rpx;
-				border-bottom: 1px solid #F0F4F8;
-				margin-left: 25rpx;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-
-				.award-left {
-					width: 221rpx;
-					height: 40rpx;
-					margin-left: 30rpx;
-					margin-bottom: 35rpx;
-
-					.text {
-						width: 182rpx;
-						height: 30rpx;
-						font-size: 30rpx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #666666;
-						margin-bottom: 16rpx;
-					}
+	.cost {
+		width: 750rpx;
+		height: auto;
+		background-color: #fff;
 
-					.time {
-						width: 221rpx;
-						height: 20rpx;
-						font-size: 26rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #AEAEAE;
-					}
+		.award {
+			width: 100%;
+			border-bottom: 1px solid #f0f4f8;
+			padding: 20rpx 25rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.award-left {
+				width: 60%;
+				.text {
+					width: 100%;
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #666666;
+					margin-bottom: 16rpx;
 				}
 
-				.award-right {
-					font-size: 36rpx;
+				.time {
+					font-size: 26rpx;
 					font-family: PingFang SC;
-					font-weight: bold;
-					color: #FF0000;
-					margin-right: 30rpx;
+					font-weight: 500;
+					color: #aeaeae;
 				}
 			}
+
+			.award-right {
+				font-size: 36rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #ff0000;
+				margin-right: 30rpx;
+			}
 		}
 	}
+}
+.swiper-box {
+		height: calc(100% - 536rpx);
+		background-color: #ffffff;
+	}
+// .tab-content {
+// 	height: calc(100% - 260px);
+// }
 </style>

+ 92 - 276
pages/user/shareQrCode.vue

@@ -1,307 +1,123 @@
 <template>
-	<view class="andr-shQ-padL30 andr-shQ-padR30 andr-shQ-Flex andr-shQ-FlexDirC">
-		<view class="andr-shQ-w100B andr-shQ-Flex andr-shQ-JusCC">
-			<swiper class="imgw750h375 matop"  :indicator-dots="false" :current="current" @change="currentChange" >
-				<swiper-item v-for="(item, index) in rwmListArr" :key="index"><image :src="item.wap_poster" mode="aspectFit" class="imgw750h375" /></swiper-item>
-			</swiper>
-		</view>
-		<view class="baocun" @click="comfirm(userInfo.uid+'')">复制邀请码</view>
-		<!-- #ifdef H5 -->
-		<!-- <view class="baocun">长按二维码保存图片</view> -->
-		
-		<!-- #endif -->
-		<!-- #ifdef MP-WEIXIN -->
-		<view class="baocun" @click="seav">保存图片并转发</view>
-		<!-- <button open-type="share" class="baocun btn" v-if="scLoading == 2">分享到微信</button> -->
-		<!-- #endif -->
+	<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 { mapState } from 'vuex';
 import { spreadBanner } from '@/api/user.js';
-import { interceptor, saveUrl } from '@/utils/loginUtils';
-// #ifdef H5
-import { weixindata } from '@/utils/wxAuthorized';
-// #endif
 export default {
+	// components: { tkiQrcode },
 	data() {
 		return {
-			rwmListArr: [],
-			current: 0,
-			imgSrc: ''
+			url: '',
+			backImg:'',
+			userInfo:''
 		};
 	},
-	onLoad(option) {
-		uni.showLoading({
-			title: '邀请图生成中',
-			mask: true
-		});
-		// 判断是否强制登录
-		this.loadCodeList();
-		// #ifdef MP-WEIXIN
-		uni.authorize({
-			scope: 'scope.writePhotosAlbum',
-			complete() {}
-		});
-		// #endif
-	},
-	onShow() {
-		if (this.loginInterceptor && !this.hasLogin) {
-			saveUrl();
-			// 登录拦截
-			interceptor();
-		}
+	onLoad() {
+		this.spread();
 	},
-    //下拉刷新
-    onPullDownRefresh() {
-    	let obj = this;
-    	//监听下拉刷新动作的执行方法,每次手动下拉刷新都会执行一次
-    	setTimeout(function() {
-    		obj.loadCodeList();
-    		uni.stopPullDownRefresh(); //停止下拉刷新动画
-    	}, 1000);
-    },
 	computed: {
-		...mapState(['weichatObj', 'baseURL', 'urlFile']),
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-	},
-	methods: {
-		comfirm(text) {
-			// let text = this.userInfo.uid
-			console.log(text);
-			const result = this.uniCopy(text);
-			if (result === false) {
-				uni.showToast({
-					title: '不支持'
-				});
-			} else {
-				uni.showToast({
-					title: '复制成功',
-					icon: 'none'
-				});
-			}
-			// this.$refs.popup.close();
-		},
-		uniCopy(content) {
-			/**
-			 * 小程序端 和 app端的复制逻辑
-			 */
-			//#ifndef H5
-			uni.setClipboardData({
-				data: content,
-				success: function() {
-					console.log('success');
-					return true;
+			cpSize() {
+				if(this.unit == "upx"){
+					return uni.upx2px(this.size)
+				}else{
+					return this.size
 				}
-			});
-			//#endif
-		
-			/**
-			 * H5端的复制逻辑
-			 */
-			// #ifdef H5
-			if (!document.queryCommandSupported('copy')) {
-				//为了兼容有些浏览器 queryCommandSupported 的判断
-				// 不支持
-				return false;
 			}
-			let textarea = document.createElement('textarea');
-			textarea.value = content;
-			textarea.readOnly = 'readOnly';
-			document.body.appendChild(textarea);
-			textarea.select(); // 选择对象
-			textarea.setSelectionRange(0, content.length); //核心
-			let result = document.execCommand('copy'); // 执行浏览器复制命令
-			textarea.remove();
-			return result;
-			// #endif
-		},
-		loadCodeList() {
-			let self = this;
-			// 加载二维码信息
-			// let andrUid = uni.getStorageSync('andrUid')||'';
+	},
+	methods: {
+		spread(){
+			let obj = this;
 			spreadBanner({
-				// #ifdef H5
-				type: 2,
-				// #endif
-				// #ifdef MP
-				type: 1,
-				// #endif
-			}).then(e => {
-				if (e.status == 200) {
-					console.log(e.data)
-					self.rwmListArr = e.data;
-					// #ifdef H5
-					self.imgSrc = self.rwmListArr[0].wap_poster;
-					// #endif
-					// #ifdef MP-WEIXIN
-					self.imgSrc = self.rwmListArr[0].poster;
-					// #endif
-				}
-				uni.hideLoading();
+				type:2
+			}).then(({ data }) => {
+				console.log(data)
+				obj.backImg = data[0].wap_poster;
 			});
 		},
-		currentChange(e) {
-			this.current = e.detail.current;
-		},
-		// onShareAppMessage(options){
-		// 	console.log(options,'options')
-		// 	let userInfo = uni.getStorageSync('userInfo');
-		// 	console.log(userInfo)
-		//   let obj = this;
-		//   // 设置菜单中的转发按钮触发转发事件时的转发内容
-		//   let shareObj = {
-		//     title: "邀请好友领券",        // 默认是小程序的名称(可以写slogan等)
-		//     path: '/pages/index/index?spread='+userInfo.uid,        // 默认是当前页面,必须是以‘/’开头的完整路径
-		//     imageUrl: obj.imgSrc,
-		//     success: function(res){
-		//       // 转发成功之后的回调
-		//       if(res.errMsg == 'shareAppMessage:ok'){
-		//       }
-		//     },
-		//     fail: function(){
-		//       // 转发失败之后的回调
-		//       if(res.errMsg == 'shareAppMessage:fail cancel'){
-		//         // 用户取消转发
-		//       }else if(res.errMsg == 'shareAppMessage:fail'){
-		//         // 转发失败,其中 detail message 为详细失败信息
-		//       }
-		//     }
-		//   };
-		//   // 来自页面内的按钮的转发
-		//   if( options.from == 'button' ){
-		//     // 此处可以修改 shareObj 中的内容
-		//     shareObj.path = '/pages/index/index?spread='+userInfo.uid;
-		//         console.log(shareObj.path,'shareObj.path')
-		//   }
-		//   // 返回shareObj
-		//   return shareObj;
-		// },
-		// scClick() {
-		// 	let self = this;
-		// 	// #ifdef H5
-		// 	self.imgSrc = self.rwmListArr[self.current].wap_poster;
-		// 	// #endif
-		// 	// #ifdef MP-WEIXIN
-		// 	self.imgSrc = self.rwmListArr[self.current].poster;
-		// 	// #endif
-		// },
-		// #ifdef MP-WEIXIN
-		seav() {
-			uni.getImageInfo({
-				src: this.imgSrc,
-				complete: function (result) {
-					let path = result.path;
-					uni.getSetting({
-						success(res) {
-							console.log(res)
-							if (!res.authSetting['scope.writePhotosAlbum']) {
-								uni.authorize({
-									scope:'scope.writePhotosAlbum',
-									success(res) {
-										uni.saveImageToPhotosAlbum({
-											filePath:path,
-											complete(result) {
-											}
-										});
-									},
-									complete(result) {
-									    uni.showToast({
-									         title: '请先授权保存图片',
-									         duration: 2000,
-											 icon:'none'
-									    });
-										obj.seav();
-									}
-								})
-							}else{
-								uni.saveImageToPhotosAlbum({
-									filePath:path,
-									complete(result) {
-									     uni.showToast({
-									         title: '保存图片成功!',
-									         duration: 2000,
-											 icon:'none'
-									     });
-									}
-								});
+		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('保存失败')
 							}
-						}
-					});
+						})
+					}
 				}
-			});
-		}
-		// #endif
-	}
-};
+			})
+		},
+	},
+}
 </script>
 
 <style lang="scss">
-.imgw750h375 {
-	width: 700rpx;
-	height: 958rpx;
-}
-.matop{
-	margin-top: 40rpx;
-}
-.andr-shQ-padL30 {
-	padding-left: 30rpx;
-}
-.andr-shQ-padR30 {
-	padding-right: 30rpx;
-}
-.andr-shQ-Flex {
-	display: flex;
-}
-.andr-shQ-FlexDirC {
-	flex-direction: column;
-}
-.andr-shQ-w100B {
+	page{
+		width: 100%;
+		min-height: 100%;
+		.container{
+			width: 100%;
+			height: 100%;	
+		}
+	}
+	.backImg{
+		position: absolute;
+		width: 100%;
+		height: 100%;
+	}
+.portrait{
 	width: 100%;
+	text-align: center;
+	padding-top: 80rpx;
+	padding-bottom: 30rpx;
+	image{
+		width: 250rpx;
+		height: 250rpx;
+	}
 }
-.andr-shQ-JusCC {
-	justify-content: center;
-}
-.andr-shQ-marginT30 {
-	margin-top: 30rpx;
-}
-.andr-shQ-bgc06B163 {
-	background-color: $base-color;
+.text{
+	text-align: center;
+	width: 100%;
+	color: #FFFFFF;
+	font-size:55rpx;
+	letter-spacing:15rpx;
 }
-.andr-shQ-cFFF {
-	color: #ffffff;
+.uid-name{
+	padding: 50rpx 0rpx;
+	text-align: center;
+	width: 100%;
+	color: #FFFFFF;
 }
-.andr-shQ-bdR50 {
+.copy-btn{
+	color: #FFFFFF;
+	background-color: #4BA6ED;
 	border-radius: 50rpx;
-}
-.andr-shQ-h86 {
-	height: 86rpx;
-}
-.andr-shQ-AIC {
-	align-items: center;
-}
-.baocun {
-	color: #ffffff;
-	background: $base-color;
+	width: 170rpx;
+	line-height: 70rpx;
+	margin: 0rpx auto;
 	text-align: center;
-	width: 80%;
-	margin: 50rpx auto;
-	font-size: 28rpx;
-	padding: 25rpx 0rpx;
-	border-radius: 50rpx;
 }
-.btn{
-	padding: 0rpx 0rpx !important;
-	margin: 0rpx auto;
-	margin-bottom: 100rpx;
+.tki-qrcode{
+	position: fixed;
+	bottom: 10%;
+	left: 30%;
 }
-/* #ifdef H5 */
-.cbnagan {
-	width: 80%;
-	background: $base-color;
-	margin: 50rpx auto;
-	font-size: 28rpx;
-	text-align: center;
+canvas{
+	width:150px;
+	height: 150px;
+	margin: auto;
+	
 }
-/* #endif */
-</style>
+</style>

+ 1 - 1
pages/user/user.vue

@@ -75,7 +75,7 @@
 					<view class="text">我的接点</view>
 					<image class="jiantou" src="../../static/img/img32.png" mode="scaleToFill"></image>
 				</view>
-				<view class="ul-btm">
+				<view class="ul-btm" @click="nav('/pages/user/shareQrCode')">
 					<image src="../../static/img/img28.png" mode="scaleToFill"></image>
 					<view class="text">邀请海报</view>
 					<image class="jiantou" src="../../static/img/img32.png" mode="scaleToFill"></image>

BIN
static/tabBar/dingdan.png


BIN
static/tabBar/home.png


BIN
static/tabBar/tab-cart-current.png


BIN
static/tabBar/tab-cart.png


BIN
static/tabBar/tab-cate-current.png


BIN
static/tabBar/tab-cate.png


BIN
static/tabBar/tab-home-current.png


BIN
static/tabBar/tab-home.png


BIN
static/tabBar/tab-my-current.png


BIN
static/tabBar/tab-my.png


BIN
static/tabBar/tab-store-current.png


BIN
static/tabBar/tab-store.png