update

mobile-code/src/components/module/app-order-list.vue

@@ -1,18 +1,20 @@
 <template>
 	<div class="list-module">
-		<div class="list-left">
-			<div class="image">
-				<img :src="info.smallImgList[0] | default_img" alt="商品图片" />
+		<block v-if="!$util.isEmpty(info)">
+			<div class="list-left">
+				<div class="image">
+					<img :src="imgUrl | default_img" alt="商品图片" />
+				</div>
+				<div class="list-msg">
+					<div class="title">{{ info.goodsName || info.title }}</div>
+					<div class="desc">{{ info.goodsStyle || info.goodsStyleName }}</div>
+				</div>
 			</div>
-			<div class="list-msg">
-				<div class="title">{{ info.goodsName }}</div>
-				<div class="desc">{{ info.goodsStyle }}</div>
+			<div class="list-right">
+				<div class="price">￥{{ info.price || info.unitPrice }}</div>
+				<div class="num">*{{ info.buyNum || info.num }}</div>
 			</div>
-		</div>
-		<div class="list-right">
-			<div class="price">￥{{ info.price }}</div>
-			<div class="num">*{{ info.buyNum }}</div>
-		</div>
+		</block>
 	</div>
 </template>
 
@@ -28,6 +30,14 @@ export default {
 	data() {
 		return {}
 	},
+	computed: {
+		imgUrl() {
+			if (!this.$util.isEmpty(this.info)) return ''
+			return this.info.smallCoverUrl ? this.info.smallCoverUrl : this.info.smallImgList[0]
+		}
+	},
+	mounted() {
+	},
 	methods: {}
 }
 </script>
@@ -43,24 +53,24 @@ export default {
 				width: 140px;
 			}
 			.list-msg {
-                margin-left: 20px;
+				margin-left: 20px;
 				.title {
 					font-size: 28px;
-                    color: $fontColor2;
-                    margin-bottom: 10px;
+					color: $fontColor2;
+					margin-bottom: 10px;
 				}
 				.desc {
 					color: $fontColor3;
 				}
 			}
-        }
-        .list-right {
-            text-align: right;
-            color: $fontColor2;
-            .price {
-                margin-bottom: 70px;
-                color: #333;
-            }
-        }
+		}
+		.list-right {
+			text-align: right;
+			color: $fontColor2;
+			.price {
+				margin-bottom: 70px;
+				color: #333;
+			}
+		}
 	}
 </style>

mobile-code/src/filters/index.js

@@ -16,3 +16,11 @@ Vue.filter('default_img', function(url) {
 
 	return url
 })
+
+Vue.filter('default_avatar', function(url) {
+	if (!url) {
+		return require('@/static/images/user/attr-default.png')
+	}
+
+	return url
+})

mobile-code/src/pages/callback/index.vue

@@ -65,7 +65,7 @@
 		</div>
 		<!-- 支付密码弹窗 -->
 		<modal-module :show="passwordModal" @cancel="modalCancel" @click="passwordModalClick" :maskClosable="false" title="支付密码" padding="30rpx 30rpx">
-			<block v-slot:content>
+			<template v-slot:content>
 				<div class="app-modal-input-wrap">
 					<div class="inp-list-line">
 						<!-- <div class="line-label">支付密码</div> -->
@@ -74,7 +74,7 @@
 						</div>
 					</div>
 				</div>
-			</block>
+			</template>
 		</modal-module>
 	</div>
 </template>
@@ -133,6 +133,10 @@ export default {
 		// 支付相关块 =======================================================
 		// 余额支付
 		_balancePay() {
+			if (!this.form.payPassword) {
+				this.$msg('请先输入支付密码!')
+				return false
+			}
 			balancePay({
 				payPassword: this.form.payPassword,
 				orderSn: this.option.orderSn,
@@ -188,25 +192,24 @@ export default {
 		},
 		// 初始样式
 		initClass(val) {
-			val = parseInt(val)
 			switch (val) {
-				case 1:
+				case '1':
 					this.pageTit = '待支付'
 					this.contentClass = 'awaitPayYe'
 					break
-				case 2:
+				case '2':
 					this.pageTit = '待支付'
 					this.contentClass = 'awaitPayWx'
 					break
-				case 3:
+				case '3':
 					this.pageTit = '支付成功'
 					this.contentClass = 'successPay'
 					break
-				case 4:
+				case '4':
 					this.pageTit = '评价成功'
 					this.contentClass = 'successEval'
 					break
-				case 5:
+				case '5':
 					this.pageTit = '支付成功'
 					this.contentClass = 'successPayCode'
 					break
@@ -219,9 +222,6 @@ export default {
 			uni.setNavigationBarTitle({
 				title: this.pageTit
 			})
-
-			console.log(val)
-			console.log(this.contentClass)
 		}
 	}
 }

mobile-code/src/pages/home/user.vue

@@ -2,7 +2,7 @@
 	<div class="app-main app-content">
 		<div class="user-wrap">
 			<!-- 未登录 -->
-			<template v-if="true">
+			<template v-if="$util.isEmpty(shopUser)">
 				<div class="no-login-attr login-attr-wrap">
 					<img src="../../static/images/user/attr-default.png" alt mode="widthFix" />
 				</div>
@@ -15,21 +15,21 @@
 				<div class="is-login-attr">
 					<div class="user-wrap-top">
 						<div class="user-blo-left">
-							<div class="user-name">冯宝宝</div>
+							<div class="user-name">{{ shopUser.userName }}</div>
 							<div class="user-level">
 								<div class="user-level-icon">
 									<img src alt />
 								</div>
-								<div>成长值 280/1000</div>
+								<div>成长值 {{ shopUser.userAsset.growth }}/{{ shopUser.userAsset.nextLevelGrowth }}</div>
 							</div>
 						</div>
 						<div class="user-blo-right login-attr-wrap">
-							<img src="../../static/images/user/attr-default.png" alt />
+							<img :src="shopUser.avatarUrl | default_avatar" alt="头像" />
 						</div>
 					</div>
 					<div class="user-wrap-bottom">
 						<div class="level-lint"></div>
-						<div>ID 13927762</div>
+						<div>ID {{ shopUser.id }}</div>
 					</div>
 				</div>
 			</template>
@@ -37,7 +37,7 @@
 		<div class="surplus-wrap">
 			<div class="surplus-left">
 				<div>我的余额(¥)</div>
-				<div class="my-surplus">0.00</div>
+				<div class="my-surplus">{{ shopUser.userAsset.balance || 0.00 }}</div>
 			</div>
 			<div class="surplus-right">
 				<button class="button-com">充值</button>
@@ -49,7 +49,7 @@
 				<tui-list-cell class="tui-list" :arrow="true" @click="$util.pageTo('/pages/order/list')">
 					<div class="list-wrap">
 						<div class="list-label">我的订单</div>
-						<div class="list-text">2</div>
+						<!-- <div class="list-text">{{ shopUser.userAsset.totalBuyNum }}</div> -->
 					</div>
 				</tui-list-cell>
 				<tui-list-cell class="tui-list" :arrow="true" @click="$util.pageTo('/pages/interest/invite')">
@@ -77,7 +77,7 @@
 		</div>
 		<div class="list-content">
 			<tui-list-view title class="tui-list-view">
-				<tui-list-cell class="tui-list" :last="true" @click="detail">
+				<tui-list-cell class="tui-list" :last="true" @click="logoutFn()">
 					<div class="list-wrap">
 						<div class="list-label">退出登录</div>
 					</div>
@@ -93,11 +93,14 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 // import AppFooter from '@/components/app-footer'
 import TuiListView from '@/components/plugin/list-view'
 import TuiListCell from '@/components/plugin/list-cell'
 import LoginPopup from '@/pages/home/components/login-popup'
 import AppTrademark from '@/components/module/app-trademark'
+// api
+import { getShopUser } from '@/utils/auth'
 export default {
 	name: 'user',
 	components: {
@@ -113,13 +116,25 @@ export default {
 			stepIndex: 0
 		}
 	},
-	onLoad(option) {},
+	computed: {
+		...mapGetters({ shopUser: 'getShopUser' })
+	},
+	onLoad(option) {
+		this.init()
+	},
 	methods: {
+		init() {
+			getShopUser()
+		},
 		showPopup() {
 			this.popupShow = true
 		},
 		hidePopup() {
 			this.popupShow = false
+		},
+		logoutFn() {
+			uni.clearStorageSync()
+			location.reload()
 		}
 	}
 }

mobile-code/src/pages/order/list.vue

@@ -6,7 +6,9 @@
 				<div class="app-price">{{ item.status | constantfilter('ORDER_STATUS') }}</div>
 			</div>
 			<div class="list-blo">
-				<list-module v-for="(item, subIndex) in 2" :key="subIndex" />
+				<block v-if="!$util.isEmpty(item.goodsInfoList)">
+					<list-module v-for="(items, subIndex) in item.goodsInfoList" :key="subIndex" :info="items" />
+				</block>
 			</div>
 			<div class="list-bottom flex-center-between">
 				<div>
@@ -14,10 +16,13 @@
 					<span class="app-size-30 app-bold">¥{{ item.actPrice }}</span>
 				</div>
 				<block v-if="item.status == 0">
-					<button class="button-com red" @click="$util.pageTo({
-						url: '/pages/order/detail',
+					<button class="button-com red" @click.stop="$util.pageTo({
+						url: '/pages/callback/index',
 						query: {
-							id: item.id
+							pagestatus: 1,
+							orderSn: item.orderSn,
+							totalPrice: item.prePrice,
+							couponId: item.couponId
 						}
 					})">立即付款</button>
 				</block>