update

mobile-code/src/App.vue

@@ -16,8 +16,10 @@ export default {
 		uni.setStorageSync('account', extConfig.account)
 		// #endif
 		// 开发
-		// uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfMTI1NDM3NDAifQ.eyJpc3MiOiJodHRwczpcL1wvYXBpLm0uaHVhbWwuY29tIiwiYXVkIjoiaHR0cHM6XC9cL2FwaS5tLmh1YW1sLmNvbSIsImp0aSI6IjBfMTI1NDM3NDAiLCJpYXQiOjE1NzkzNTI5OTIsIm5iZiI6MTU3OTM1Mjk5MiwiZXhwIjoxNTg3OTkyOTkyLCJ1bmlxdWVJZCI6IjEyNTQzNzQwIiwic291cmNlSWQiOjB9.ugv2pHO9wooDPEGkCZzPjf2bZIOxEHB2rL_t_DzMgC4')
-		// uni.setStorageSync('account', '12358')
+		if (process.env.NODE_ENV == 'development') {
+			uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImp0aSI6IjBfMTI1NDM3NDUifQ.eyJpc3MiOiJodHRwczpcL1wvYXBpLmIuaHVhbWwuY29tIiwiYXVkIjoiaHR0cHM6XC9cL2FwaS5iLmh1YW1sLmNvbSIsImp0aSI6IjBfMTI1NDM3NDUiLCJpYXQiOjE1ODA3MTA1NjEsIm5iZiI6MTU4MDcxMDU2MSwiZXhwIjoxNTg5MzUwNTYxLCJ1bmlxdWVJZCI6IjEyNTQzNzQ1Iiwic291cmNlSWQiOjB9.kHrIKm0MUOnX8fCDjOXwd7wQ4jOSEV8gvwR4H4hn_hQ')
+			uni.setStorageSync('account', '12362')
+		}
 	},
 	onShow() {
 		// this.isLogin()

mobile-code/src/admin/home/member.vue

@@ -15,7 +15,10 @@
 						<div class="tui-msg-item">
 							<div class="tui-msg-name">
                                 <div>{{item.userName}}</div>
-							    <appVipModule class="level-img" :text="`VIP ${item.userAsset.memberLevel}`" />
+							    <appVipModule v-if="item.isMember" class="level-img" :text="`VIP ${item.userAsset.memberLevel || ''}`" />
+								<div v-else class="normal-img">
+									<div class="vip-text">普通用户</div>
+								</div>
                             </div>
 							<div class="tui-msg-content">
                                 <div>
@@ -161,11 +164,25 @@ export default {
                 width: 74px;
                 /deep/.vip-text {
                     top: 0;
-                    left: 12px;
+                    left: 20px;
                     font-weight: 400;
                     transform: scale(0.5);
                 }
             }
+			.normal-img {
+                width: 70px;
+				padding: 2px 6px;
+				color: #999;
+				background-color: #F0F2F6;
+				border-radius: 20px;
+				.vip-text {
+					font-size: 24px;
+                	transform: scale(0.6);
+					position: relative;
+					top: -2px;
+					left: -8px;
+				}
+			}
             .iconfont {
                 color: #00AAED;
             }

mobile-code/src/admin/home/workbench.vue

@@ -30,7 +30,7 @@
 		<!-- 订单总览 -->
 		<div class="module-com order-wrap">
 			<div class="total-blo">
-				<div class="total-list" v-for="(item, index) in orderData" :key="index">
+				<div class="total-list" v-for="(item, index) in orderData" :key="index" @click="pageToFn(item)">
 					<div class="list-num">{{ item.value }}</div>
 					<div class="app-color-3">{{ item.name }}</div>
 				</div>
@@ -68,7 +68,7 @@
 				</div>
 			</div>
 		</div>
-		<fab-module />
+		<!-- <fab-module /> -->
 	</div>
 </template>
 
@@ -96,11 +96,13 @@ export default {
 			orderData: [
 				{
 					name: '待付款',
-					value: 0
+					value: 0,
+					url: '/admin/order/list'
 				},
 				{
 					name: '待配送',
-					value: 0
+					value: 0,
+					url: '/admin/order/list'
 				},
 				{
 					name: '配送中',
@@ -115,7 +117,7 @@ export default {
 					value: 0
 				},
 				{
-					name: '待退款',
+					name: '全部',
 					value: 0
 				}
 			],
@@ -217,7 +219,7 @@ export default {
 					this.orderData[2].value = asset.sendingOrder
 					this.orderData[3].value = asset.unNoticeOrder
 					this.orderData[4].value = asset.finishOrder
-					this.orderData[5].value = asset.cancelOrder
+					this.orderData[5].value = asset.totalOrder
 					// 总览数据
 					this.totalData[0].value = asset.totalMember
 					this.totalData[1].value = asset.totalFans

mobile-code/src/official/pay.vue

@@ -81,7 +81,7 @@ export default {
 		},
 		// 支付成功
 		paySuccess() {
-			alert('支付成功!')
+			// alert('支付成功!')
 			this.$util.pageTo({
 				url: '/official/callback',
 				type: 2,

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

@@ -52,7 +52,8 @@
 						<button class="button-com default" @click="pageTo({
 							url: '/pages/order/detail',
 							query: {
-								orderSn: option.orderSn
+								orderSn: option.orderSn,
+								id: option.id
 							}
 						})">查看订单</button>
 						<button class="button-com" @click="pageTo({
@@ -131,7 +132,9 @@ export default {
 		}
 	},
 	onLoad() {
-		// this.init()
+		if (this.pagestatus) {
+			this.init()
+		}
 	},
 	methods: {
 		init() {
@@ -172,14 +175,15 @@ export default {
 			})
 		},
 		paySuccess(res) {
-			alert('支付成功!')
+			// alert('支付成功!')
 			this.$util.pageTo({
 				url: '/pages/callback/index',
 				type: 2,
 				query: {
 					pagestatus: 3,
-					orderSn: this.option.orderSn,
-					payDiscountPrice: res.data.discountAmount
+					// orderSn: this.option.orderSn,
+					payDiscountPrice: res.data.discountAmount,
+					...this.option
 				}
 			})
 		},

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

@@ -186,12 +186,13 @@ export default {
 		},
 		// 支付成功
 		paySuccess() {
-			alert('支付成功!')
+			// alert('支付成功!')
 			this.$util.pageTo({
 				url: '/pages/callback/index',
 				type: 2,
 				query: {
-					pagestatus: 3
+					pagestatus: 3,
+					...this.params
 					// orderSn: this.option.orderSn,
 					// payDiscountPrice: res.data.discountAmount
 				}