pages/money/pay.vue

@@ -85,8 +85,9 @@
 					'paytype':that.payType
 				}, res => {
 					console.log("pay client:" +that.$api.req.client)
+					console.log(res)
 					if (res.status == 0) {
-						if(paytype ==1){
+						if(that.paytype ==1){
 							if(that.$api.req.client=="WECHAT"){
 								var data = res.data
 								that.paydata = res.data;
@@ -97,9 +98,10 @@
 							}
 							
 						}
-						if(paytype ==2){
+						if(that.paytype ==2){
+							console.log("pay type:" +that.paytype)
 							if(that.$api.req.client=="H5"){
-								location.href = res.payurl;
+								location.href = res.data.payurl;
 							}
 							
 						}
@@ -110,7 +112,7 @@
 							showCancel: false,
 							success: function(res) {
 								uni.redirectTo({
-									url: '../order/order?status=1'
+									url: '../order/order?state=1'
 								})
 							}
 						})

pages/set/set.vue

@@ -5,14 +5,19 @@
 				<image class="m-pic" src="/static/set-nickname.png"></image>
 				<text class="cell-tit">昵&nbsp;&nbsp;&nbsp;&nbsp;称</text>
 			</view>
-			<text class="cell-more">{{userInfo.nickname}}</text>
+			<text class="cell-more">{{userInfo.nickname?userInfo.nickname:'游客'}}</text>
 		</view>
 		<view class="list-cell  m-t" @click="alterHeade()">
 			<view class="m-items">
 				<image class="m-pic" src="/static/set-head.png"></image>
 				<text class="cell-tit">头&nbsp;&nbsp;&nbsp;&nbsp;像</text>
 			</view>
+			<!-- #ifdef MP-WEIXIN-->
 			<image class="m-head" :src="userInfo.portrait"></image>
+			<!-- #endif -->
+			<!-- #ifndef MP-WEIXIN -->
+			<image class="m-head" :src="userInfo.cover_image?userInfo.cover_image:'/static/missing-face.png'"></image>
+			<!-- #endif -->
 		</view>
 		<view class="list-cell  m-t" @click="navTo('/pages/setPhone/setPhone')">
 			<view class="m-items">
@@ -101,8 +106,11 @@
 					content: '确定要退出登录么',
 					success: (e) => {
 						if (e.confirm) {
-							this.$api.req.userLogout({}, res => {
-								that.navTo('/pages/index/index');
+							this.$api.req.userLogout({}, res => {
+								uni.clearStorageSync();
+								uni.switchTab({
+									url: '/pages/index/index'
+								});
 							});
 						}
 					}

pages/user/user.vue

@@ -3,7 +3,13 @@
 		<view class="user-section">
 			<view class="user-info-box">
 				<view class="portrait-box">
+					<!-- #ifdef MP-WEIXIN-->
 					<image class="portrait" :src="userInfo.portrait"></image>
+					<!-- #endif -->
+					<!-- #ifndef MP-WEIXIN -->
+					<image class="portrait" :src="userInfo.cover_image?userInfo.cover_image:'/static/missing-face.png'">
+					</image>
+					<!-- #endif -->
 				</view>
 				<view class="info-box">
 					<text class="username">{{userInfo.nickname}}</text>
@@ -12,14 +18,16 @@
 			</view>
 			<view class="info-desc" v-if="userInfo.walletaddress!==''">
 				<view class="desc">区块链地址：{{userInfo.walletaddress}}</view>
-				<image src="/static/menu-copy.png" @click="copyConnection(userInfo.walletaddress)" align="right" class="menu-copy"></image>
+				<image src="/static/menu-copy.png" @click="copyConnection(userInfo.walletaddress)" align="right"
+					class="menu-copy"></image>
 			</view>
 			<!-- <view class="menuCode">
 				<image class="code" src="/static/menu-code.png"></image>
 			</view> -->
 		</view>
 
-		<view class="cover-container" @touchstart="coverTouchstart" @touchmove="coverTouchmove" @touchend="coverTouchend">
+		<view class="cover-container" @touchstart="coverTouchstart" @touchmove="coverTouchmove"
+			@touchend="coverTouchend">
 			<view class="history-section icon">
 				<view class="view-item" @click="navTo('/pages/order/order?state=0')">
 					<view class="item">
@@ -99,9 +107,9 @@
 		},
 		onLoad() {
 			// this.getUerInfo();
-		},
-		onShow(){
-			this.getUerInfo();
+		},
+		onShow() {
+			this.getUerInfo();
 		},
 		// #ifndef MP
 		onNavigationBarButtonTap(e) {
@@ -128,7 +136,16 @@
 			getUerInfo() {
 				let that = this;
 				this.$api.req.getUserInfo({}, res => {
-					if (res.data.isLogin) that.userInfo = res.data.userInfo;
+					if (res.data.isLogin) {
+						that.userInfo = res.data.userInfo;
+					} else {
+						Object.assign(that.userInfo, {
+							nickname: "游客",
+							portrait: "/static/missing-face.png",
+							phone: "欢迎您!",
+							walletaddress: ""
+						});
+					}
 				});
 
 			},

utils/mixin/index.js

@@ -6,52 +6,80 @@ Vue.mixin({
 			userInfo: {
 				nickname: "游客",
 				portrait: "/static/missing-face.png",
-				phone: "欢迎您!",
-				walletaddress:""
+				phone: "欢迎您!",
+				walletaddress: ""
 			},
 		}
 	},
-	methods: {
+	methods: {
 		//跳转
 		navTo(url) {
 			uni.navigateTo({
 				url
 			});
-		},
+		},
 		//返回带刷新
 		back() {
 			uni.$emit('refreshData');
 			uni.navigateBack({
 				delta: 1
 			})
-		},
-		// 复制功能
-		copyConnection(getData) {
-			var _this = this;
-			// #ifndef H5
-			uni.getClipboardData({
-				success: function(res) {
-					console.log(res.data);
-				}
-			})
-			uni.setClipboardData({
-				data: getData,
-				success: function() {
-					uni.showToast({
-						icon: 'success',
-						title: "复制成功",
-						duration: 2000,
-					});
-				}
-			})
-			// #endif
-		},
-		// 数字前面补零
-		seqid00000(num, length) {
-			for (var len = (num + "").length; len < length; len = num.length) {
-				num = "0" + num;
-			}
-			return num;
 		},
+		// 复制功能
+		copyConnection(getData) {
+			var _this = this;
+			// #ifndef H5
+			uni.getClipboardData({
+				success: function(res) {
+					console.log(res.data);
+				}
+			})
+			uni.setClipboardData({
+				data: getData,
+				success: function() {
+					uni.showToast({
+						icon: 'success',
+						title: "复制成功",
+						duration: 2000,
+					});
+				}
+			})
+			// #endif
+			//#ifdef H5
+			const result = this.h5Copy(getData)
+			if (result === false) {
+				uni.showToast({
+					title: '不支持',
+				})
+			} else {
+				uni.showToast({
+					title: '复制成功',
+					icon: 'none'
+				})
+			}
+			// #endif
+		},
+		// 数字前面补零
+		seqid00000(num, length) {
+			for (var len = (num + "").length; len < length; len = num.length) {
+				num = "0" + num;
+			}
+			return num;
+		},
+		h5Copy(content) {
+			if (!document.queryCommandSupported('copy')) {
+				// 不支持
+				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
+		}
 	}
 });