jf

pages.json

@@ -643,85 +643,724 @@
 				"navigationBarBackgroundColor":"#72E3B4",
 				"navigationBarTextStyle":"white",
 			    "navigationBarTitleText": "店铺二维码",
-			    "enablePullDownRefresh": false
+			    "enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/merchant/finance",
-			"style" :                                                                                    
-			{
-				"navigationBarBackgroundColor":"#ffffff",
-				"navigationBarTextStyle":"black",
-			    "navigationBarTitleText": "店铺财务",
-			    "enablePullDownRefresh": false
+			"path": "pages/moments/details",
+			"style": {
+				"navigationBarTitleText": "文章页",
+				"app-plus": {
+					"titleNView": false
+				}
 			}
 		},
 		{
-			"path" : "pages/merchant/storeData",
-			"style" :                                                                                    
-			{
-				"navigationBarBackgroundColor":"#72E3B4",
-				"navigationBarTextStyle":"white",
-			    "navigationBarTitleText": "店铺数据",
-			    "enablePullDownRefresh": false
+			"path": "pages/public/login",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
 			}
 		},
 		{
-			"path" : "pages/merchant/onlineOrder",
-			"style" :                                                                                    
-			{
-				"navigationBarBackgroundColor":"#ffffff",
-				"navigationBarTextStyle":"black",
-			    "navigationBarTitleText": "在线下单",
-			    "enablePullDownRefresh": false
+			"path": "pages/public/wxLogin",
+			"style": {
+				"navigationBarTitleText": "微信登录",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
 			}
 		},
 		{
-			"path" : "pages/wallet/openMember",
-			"style" :                                                                                    
+			"path": "pages/public/forget",
+			"style": {
+				"navigationBarTitleText": "忘记密码",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		}, {
+			"path": "pages/product/classify",
+			"style": {
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		}, {
+			"path": "pages/product/giftBag",
+			"style": {
+				"navigationBarTitleText": "联盟礼包"
+			}
+		}, {
+			"path": "pages/myteam/myteam",
+			"style": {
+				"navigationBarTitleText": "我的团队",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/merchant/merchant",
+			"style": {
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#75E5B6",
+				"navigationBarTitleText": "商家中心",
+				"app-plus": {
+					"titleNView": {
+						//隐藏title
+						// "type": "transparent"
+
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/merchant/order",
+			"style": {
+				"navigationBarTitleText": "订单管理",
+				"navigationBarBackgroundColor": "#52C696",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/product/product",
+			"style": {
+				"navigationBarTitleText": "详情展示",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		}, {
+			"path": "pages/product/search",
+			"style": {
+				"enablePullDownRefresh": true,
+				// #ifdef MP
+				"navigationStyle": "custom",
+				// #endif
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": {
+						"searchInput": {
+							"backgroundColor": "rgba(231, 231, 231,.7)",
+							"borderRadius": "16px",
+							"placeholder": "请输入关键字",
+							"disabled": false,
+							"placeholderColor": "#606266",
+							"align": "left"
+						},
+						"buttons": [{
+							"text": "搜索",
+							"fontSize": "14",
+							"color": "#303133",
+							"background": "rgba(0,0,0,0)",
+							"width": "40px"
+						}]
+					}
+				},
+				// #endif
+				"navigationBarTitleText": "搜索"
+			}
+		}, {
+			"path": "pages/set/set",
+			"style": {
+				"navigationBarTitleText": "设置"
+			}
+		},
+		{
+			"path": "pages/set/about",
+			"style": {
+				"navigationBarTitleText": "关于我们"
+			}
+		},
+		{
+			"path": "pages/set/password",
+			"style": {
+				"navigationBarTitleText": "修改密码"
+			}
+		},
+		{
+			"path": "pages/set/phone",
+			"style": {
+				"navigationBarTitleText": "绑定手机号"
+			}
+		},
+		{
+			"path": "pages/product/reply",
+			"style": {
+				"navigationBarTitleText": "评论"
+			}
+		}, {
+			"path": "pages/order/evaluate",
+			"style": {
+				"navigationBarTitleText": "评论"
+			}
+		},
+		{
+			"path": "pages/userinfo/userinfo",
+			"style": {
+				"navigationBarTitleText": "修改资料"
+			}
+		}, {
+			"path": "pages/cart/cart",
+			"style": {
+				"navigationBarTitleText": "购物车"
+			}
+		}, {
+			"path": "pages/user/user",
+			"style": {
+				// #ifndef MP-WEIXIN
+				"navigationStyle": "custom",
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false
+					// {
+					//         "type": "transparent",
+					//         "buttons": [{
+					//                         "fontSrc": "/static/yticon.ttf",
+					//                         "text": "\ue60f",
+					//                         "fontSize": "24",
+					//                         "color": "#303133",
+					//                         "width": "46px",
+					//                         "background": "rgba(0,0,0,0)"
+					//                 },
+					//                 {
+					//                         "fontSrc": "/static/yticon.ttf",
+					//                         "text": "\ue744",
+					//                         "fontSize": "28",
+					//                         "color": "#303133",
+					//                         "background": "rgba(0,0,0,0)",
+					//                         "redDot": true
+					//                 }
+					//         ]
+					// }
+				},
+				// #endif
+				"navigationBarTitleText": "个人中心"
+			}
+		}, {
+			"path": "pages/detail/detail",
+			"style": {
+				"navigationBarTitleText": "",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		}, {
+			"path": "pages/order/order",
+			"style": {
+				"navigationBarTitleText": "我的订单",
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		}, {
+			"path": "pages/order/refundOrder",
+			"style": {
+				"navigationBarTitleText": "退款订单",
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		}, {
+			"path": "pages/order/orderDetail",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		}, {
+			"path": "pages/order/orderRefund",
+			"style": {
+				"navigationBarTitleText": "申请退款"
+			}
+		}, {
+			"path": "pages/order/createOrder",
+			"style": {
+				"navigationBarTitleText": "创建订单"
+			}
+		}, {
+			"path": "pages/address/address",
+			"style": {
+				"navigationBarTitleText": "收货地址"
+			}
+		}, {
+			"path": "pages/address/shopList",
+			"style": {
+				"navigationBarTitleText": "门店列表",
+				"app-plus": {
+					"titleNView": {
+						"searchInput": {
+							"backgroundColor": "rgba(231, 231, 231,.7)",
+							"borderRadius": "16px",
+							"placeholder": "请输入关键字",
+							"placeholderColor": "#606266",
+							"align": "left"
+						},
+						"buttons": [{
+							"text": "搜索",
+							"fontSize": "14",
+							"color": "#303133",
+							"background": "rgba(0,0,0,0)",
+							"width": "40px"
+						}]
+					}
+				}
+			}
+		}, {
+			"path": "pages/address/addressManage",
+			"style": {
+				"navigationBarTitleText": "新增修改地址"
+			}
+		}, {
+			"path": "pages/money/pay",
+			"style": {
+				"navigationBarTitleText": "支付"
+			}
+		},
+		{
+			"path": "pages/money/paySuccess",
+			"style": {
+				"navigationBarTitleText": "支付成功"
+			}
+		}, {
+			"path": "pages/award/award",
+			"style": {
+				"navigationBarTitleText": "我的佣金",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		}, {
+			"path": "pages/award/withdrawal",
+			"style": {
+				"navigationBarTitleText": "奖励提现"
+			}
+		}, {
+			"path": "pages/scoreAccumulate/scoreAccumulate",
+			"style": {
+				"navigationBarTitleText": "我的积分",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		}, {
+			"path": "pages/notice/notice",
+			"style": {
+				"navigationBarTitleText": "通知"
+			}
+		}, {
+			"path": "pages/category/category",
+			"style": {
+				"navigationBarTitleText": "分类",
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": {
+						"searchInput": {
+							"backgroundColor": "rgba(231, 231, 231,.7)",
+							"borderRadius": "16px",
+							"placeholder": "商品搜索",
+							"disabled": true,
+							"placeholderColor": "#606266",
+							"align": "left"
+						}
+					}
+				}
+			}
+		}, {
+			"path": "pages/product/list",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "商品列表"
+			}
+		},
+		{
+			"path": "pages/product/listSearch",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "商品列表"
+			}
+		},
+		{
+			"path": "pages/wallet/wallet",
+			"style": {
+				"navigationBarTitleText": "我的余额",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/wallet/freezeList",
+			"style": {
+				"navigationBarTitleText": "冻结记录"
+			}
+		},
+		{
+			"path": "pages/wallet/account",
+			"style": {
+				"navigationBarTitleText": "提现账号"
+			}
+		},
+		{
+			"path": "pages/wallet/withdrawal",
+			"style": {
+				"navigationBarTitleText": "余额提现"
+			}
+		},
+		{
+			"path": "pages/wallet/recharge",
+			"style": {
+				"navigationBarTitleText": "充值"
+			}
+		},
+		{
+			"path": "pages/favorites/favorites",
+			"style": {
+				"navigationBarTitleText": "收藏夹"
+			}
+		}, {
+			"path": "pages/sign/index",
+			"style": {
+				"navigationBarTitleText": "每日签到",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/redirect/redirect",
+			"style": {
+				"navigationBarTitleText": "微信登录跳转页面",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/integral/index",
+			"style": {
+				"navigationBarTitleText": "积分商城"
+			}
+		},
+		{
+			"path": "pages/shareQrCode/index",
+			"style": {
+				"navigationBarTitleText": "邀请好友",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/shareQrCode/wechatQr",
+			"style": {
+				"navigationBarTitleText": "关注公众号"
+			}
+		},
+		{
+			"path": "pages/seckill/seckill",
+			"style": {
+				"navigationBarTitleText": "限时抢购"
+			}
+		},
+		{
+			"path": "pages/groupBooking/index",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "超值拼团"
+			}
+		},
+		{
+			"path": "pages/groupBooking/detail",
+			"style": {
+				"navigationBarTitleText": "拼团详细",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/groupBooking/inviteImg",
+			"style": {
+				"navigationBarTitleText": "拼团邀请图",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		}, {
+			"path": "pages/award/withdmoenys",
+			"style": {
+				"navigationBarTitleText": "转余额"
+			}
+		},
+		// {
+		// 	"path": "pages/coupon/details",
+		// 	"style": {
+		// 		"navigationBarTitleText": "付款",
+		// 		"app-plus": {
+		// 			"titleNView":{
+		// 				"backgroundColor": "#5DBC7C",
+		// 				"titleColor":"#FFFFFF"
+		// 			}
+		// 		},
+		// 		"h5":{
+		// 			"titleNView":{
+		// 				"backgroundColor": "#5DBC7C",
+		// 				"titleColor":"#FFFFFF"
+		// 			}
+		// 		}
+		// 	}
+		// },
+		{
+			"path": "pages/received/index",
+			"style": {
+				"navigationBarTitleText": "收付款",
+				"app-plus": {
+					"titleNView": {
+						"backgroundColor": "#5DBC7C",
+						"titleColor": "#FFFFFF"
+					}
+				},
+				"h5": {
+					"titleNView": {
+						"backgroundColor": "#5DBC7C",
+						"titleColor": "#FFFFFF"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/received/list",
+			"style": {
+				"navigationBarTitleText": "收付款记录",
+				"app-plus": {
+					"titleNView": {
+						"backgroundColor": "#5DBC7C",
+						"titleColor": "#FFFFFF"
+					}
+				},
+				"h5": {
+					"titleNView": {
+						"backgroundColor": "#5DBC7C",
+						"titleColor": "#FFFFFF"
+					}
+				}
+			}
+		},
+		// {
+		// 	"path": "pages/received/paySuccess",
+		// 	"style": {
+		// 		"navigationBarTitleText": "付款成功",
+		// 		"app-plus": {
+		// 			"titleNView":{
+		// 				"backgroundColor": "#5DBC7C",
+		// 				"titleColor":"#FFFFFF"
+		// 			}
+		// 		},
+		// 		"h5":{
+		// 			"titleNView":{
+		// 				"backgroundColor": "#5DBC7C",
+		// 				"titleColor":"#FFFFFF"
+		// 			}
+		// 		}
+		// 	}
+		// },
+		{
+			"path": "pages/coupon/consumer",
+			"style": {
+				"navigationBarTitleText": "我的消费券",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/shoping/index",
+			"style": {
+				"navigationBarTitleText": "店铺信息",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/shoping/list",
+			"style": {
+				"navigationBarTitleText": "店铺信息",
+				"app-plus": {
+					"titleNView": {
+						"searchInput": {
+							"backgroundColor": "rgba(231, 231, 231,.7)",
+							"borderRadius": "16px",
+							"placeholder": "请输入关键字",
+							"placeholderColor": "#606266",
+							"align": "left"
+						}
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/contract/agreement",
+			"style": {
+				"navigationBarTitleText": "注册协议"
+			}
+		},
+		{
+			"path": "pages/contract/privacy",
+			"style": {
+				"navigationBarTitleText": "隐私政策"
+			}
+		},
+		{
+			"path": "pages/contract/start",
+			"style": {
+				"navigationBarTitleText": "授权页",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		}
+
+		, {
+			"path": "pages/merchant/commodity",
+			"style": {
+				"navigationBarTitleText": "商品管理",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+
+		}, {
+			"path": "pages/merchant/Addcommodity",
+			"style": {
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"navigationBarTextStyle": "black",
+				"navigationBarTitleText": "添加商品",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/merchant/compileCommodity",
+			"style": {
+				"navigationBarTitleText": "商品管理",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+
+		}, {
+			"path": "pages/merchant/vipDetail",
+			"style": {
+				"navigationBarBackgroundColor": "#72E3B4",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "店铺会员",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/merchant/storeQr",
+			"style": {
+				"navigationBarBackgroundColor": "#72E3B4",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "店铺二维码",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/merchant/finance",
+			"style": {
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black",
+				"navigationBarTitleText": "店铺财务",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/merchant/onlineOrder",
+			"style": {
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black",
+				"navigationBarTitleText": "在线下单",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/wallet/openMember",
+			"style": {
+				"navigationBarBackgroundColor": "#363533",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "开通会员",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/merchant/storeData",
+			"style": {
+				"navigationBarBackgroundColor": "#72E3B4",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "店铺数据",
+				"enablePullDownRefresh": false
+			}
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#FFFFFF",
+		"backgroundColor": "#f8f8f8"
+	},
+	"tabBar": {
+		"color": "#C0C4CC",
+		"selectedColor": "#5DBC7C",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/index/index",
+				"iconPath": "static/tabBar/tab-home.png",
+				"selectedIconPath": "static/tabBar/tab-home-current.png",
+				"text": "首页"
+			},
 			{
-				"navigationBarBackgroundColor":"#363533",
-				"navigationBarTextStyle":"white",
-			    "navigationBarTitleText": "开通会员",
-			    "enablePullDownRefresh": false
+				"pagePath": "pages/category/category",
+				"iconPath": "static/tabBar/tab-cate.png",
+				"selectedIconPath": "static/tabBar/tab-cate-current.png",
+				"text": "分类"
+			},
+			{
+				"pagePath": "pages/cart/cart",
+				"iconPath": "static/tabBar/tab-cart.png",
+				"selectedIconPath": "static/tabBar/tab-cart-current.png",
+				"text": "购物车"
+			},
+			{
+				"pagePath": "pages/user/user",
+				"iconPath": "static/tabBar/tab-my.png",
+				"selectedIconPath": "static/tabBar/tab-my-current.png",
+				"text": "我的"
 			}
-		}
-    ],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#FFFFFF",
-		"backgroundColor": "#f8f8f8"
-	},
-	"tabBar": {
-		"color": "#C0C4CC",
-		"selectedColor": "#5DBC7C",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "pages/index/index",
-				"iconPath": "static/tabBar/tab-home.png",
-				"selectedIconPath": "static/tabBar/tab-home-current.png",
-				"text": "首页"
-			},
-			{
-				"pagePath": "pages/category/category",
-				"iconPath": "static/tabBar/tab-cate.png",
-				"selectedIconPath": "static/tabBar/tab-cate-current.png",
-				"text": "分类"
-			},
-			{
-				"pagePath": "pages/cart/cart",
-				"iconPath": "static/tabBar/tab-cart.png",
-				"selectedIconPath": "static/tabBar/tab-cart-current.png",
-				"text": "购物车"
-			},
-			{
-				"pagePath": "pages/user/user",
-				"iconPath": "static/tabBar/tab-my.png",
-				"selectedIconPath": "static/tabBar/tab-my-current.png",
-				"text": "我的"
-			}
-		]
-	}
+		]
+	}
 }

pages/award/award.vue

@@ -1,21 +1,19 @@
 <template>
 	<view class="content">
 		<view class="content-money">
-			<view class="money-box flex">
+			<view class="money-box">
+				<view class="bg"><image src="../../static/img/yong.png" mode=""></image></view>
+				<view class="body-title">
+					<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+					<view class="header">我的佣金</view>
+				</view>
 				<view>
-					<view class="text">可提现佣金（元）</view>
 					<view class="money">{{ money | getMoneyStyle }}</view>
 				</view>
-				<navigator url="/pages/wallet/freezeList">
-					<view>
-						<view class="text">冻结佣金（元）</view>
-						<view class="money">{{ freezeMoney | getMoneyStyle }}</view>
-					</view>
-				</navigator>
 			</view>
 			<!-- <view class="moneyTx" @click="navto('./withdrawal')">提现</view> -->
 			<!-- <view class="moneyTxs" @click="navto('./withdmoenys')" >转余额</view> -->
-			<view class="flex buttom-box">
+			<!-- <view class="flex buttom-box">
 				<view class="buttom" @click="navto('./withdrawal')">
 					<view class="icon"><image class="icon-img" src="/static/icon/i6.png" mode="aspectFit"></image></view>
 					<text class="font-size-sm">提现</text>
@@ -25,7 +23,7 @@
 					<view class="icon"><image class="icon-img" src="/static/icon/i7.png" mode="aspectFit"></image></view>
 					<text class="font-size-sm">转余额</text>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="navbar">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
@@ -54,6 +52,7 @@
 				</scroll-view>
 			</swiper-item>
 		</swiper>
+		<view class="btn" @click="navto('/pages/award/withdrawal')">立即提现</view>
 	</view>
 </template>
 
@@ -131,6 +130,11 @@ export default {
 				url: e
 			});
 		},
+		//返回上一页面
+		toBack() {
+			console.log(111);
+			uni.navigateBack({});
+		},
 		//获取收入支出信息
 		async loadData(source) {
 			//这里是将订单挂载到tab列表下
@@ -198,71 +202,68 @@ page {
 .content-money {
 	padding-bottom: 30rpx;
 	background: $page-color-base;
-	.moneyTx {
-		position: absolute;
-		top: 150rpx;
-		right: 0rpx;
-		width: 150rpx;
-		padding: 10rpx 30rpx;
-		border: 2px solid #ffffff;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #ffffff;
-		line-height: 1;
-		font-size: $font-base;
-	}
-	.moneyTxs {
-		position: absolute;
-		top: 220rpx;
-		right: 0rpx;
-		width: 150rpx;
-		padding: 10rpx 30rpx;
-		border: 2px solid #ffffff;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #ffffff;
-		line-height: 1;
-		font-size: $font-base;
-	}
-	.buttom-box {
-		background-color: #ffffff;
-		text-align: center;
-		margin: 0 30rpx;
-		padding: 20rpx 0;
-		border-radius: $border-radius-sm;
-		margin-top: -60rpx;
-		.buttom {
-			font-size: $font-lg;
-			flex-grow: 1;
-		}
-		.interval {
-			width: 2px;
-			height: 60rpx;
-			background-color: #eeeeee;
-		}
-		.icon {
-			height: 50rpx;
-			width: 48rpx;
-			margin: 0 auto;
-			.icon-img {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
 }
 .money-box {
 	background-color: $base-color;
 	padding-top: var(--status-bar-height);
-	height: 368rpx;
+	height: 468rpx;
 	color: #ffffff;
 	text-align: center;
-	justify-content: space-around;
-	.text {
-		font-size: $font-sm;
+	justify-content: center;
+	position: relative;
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 32rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.goback-box {
+			position: absolute;
+			z-index: 10;
+			left: 24rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+		.goback {
+			width: 30rpx;
+			height: 36rpx;
+		}
+	}
+	.bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		image {
+			width: 100%;
+			height: 100%;
+		}
 	}
 	.money {
+		position: relative;
+		z-index: 10;
 		font-size: 56rpx;
+		height: 388rpx;
+		line-height: 288rpx;
 	}
 }
 
@@ -330,4 +331,20 @@ page {
 		background-color: #ffffff;
 	}
 }
+.btn {
+	position: fixed;
+	bottom: 40rpx;
+	left: 50%;
+	width: 674rpx;
+	height: 88rpx;
+	background: #52c696;
+	border-radius: 44rpx;
+	margin-left: -337rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	text-align: center;
+	line-height: 88rpx;
+	color: #ffffff;
+}
 </style>

pages/award/withdrawal.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<uni-notice-bar single="true" text="每月25号到月底可提现上月结算余额"></uni-notice-bar>
+		<!-- <uni-notice-bar single="true" text="每月25号到月底可提现上月结算余额"></uni-notice-bar> -->
 		<view class="content-money">
 			<view class="flex ">
 				<view class="buttom">
@@ -22,13 +22,13 @@
 				<view class="buttom" @click="withdrawal = money">全部提现</view>
 			</view>
 		</view>
-		<view class="row-box">
+		<!-- <view class="row-box">
 			<view class="title">手续费</view>
 			<view class="row">
 				<text class="tit">￥</text>
 				<view class="placeholder">{{ withdrawal * 0.01*charge }}</view>
 			</view>
-		</view>
+		</view> -->
 		<!-- #ifndef MP-WEIXIN -->
 		<view class="list">
 			<radio-group @change="tabRadio">

pages/coupon/consumer.vue

@@ -1,26 +1,44 @@
 <template>
 	<view class="content">
-		<!-- <view class="navbar">
+		<view class="content-money">
+			<view class="money-box">
+				<view class="bg"><image src="../../static/img/consumer.png" mode=""></image></view>
+				<view class="body-title">
+					<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+					<view class="header">我的消费券</view>
+				</view>
+				<view>
+					<view class="money">{{ money | getMoneyStyle }}</view>
+				</view>
+			</view>
+		</view>
+		<view class="navbar">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view> -->
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+		</view>
+		<swiper :current="tabCurrentIndex" :style="{ height: maxheight + 'px' }" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
 				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
 					<!-- 空白页 -->
 					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+
 					<!-- 订单列表 -->
-					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
-						<view class="title-box">
-							<view class="title">
-								<text>{{ item.mark }}</text>
+					<view class="itemList" v-for="(items, indexs) in tabItem.orderList" :key="indexs">
+						<!-- <view class='font-size-lg padding-l-30 bg-gray padding-v-10'>
+							{{items.time}}
+						</view> -->
+						<view v-for="(item, index) in items.list" :key="index" class="order-item flex">
+							<view class="title-box">
+								<view class="title">
+									<text>{{ item.title }}</text>
+								</view>
+								<view class="time">
+									<text>{{ item.add_time }}</text>
+								</view>
 							</view>
-							<view class="time">
-								<text>{{ item.add_time }}</text>
+							<view class="money">
+								<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
 							</view>
 						</view>
-						<view class="money">
-							<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
-						</view>
 					</view>
 					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
 				</scroll-view>
@@ -30,38 +48,120 @@
 </template>
 
 <script>
-	
-import { consumerList } from '@/api/integral.js';
+import { spreadCommission, userBalance, rechargemoneys } from '@/api/wallet.js';
+// import { mapState } from 'vuex';
+import { getMoneyStyle } from '@/utils/rocessor.js';
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
+// #ifdef H5
+import { weixindata } from '@/utils/wxAuthorized';
+// #endif
 export default {
+	filters: {
+		getMoneyStyle
+	},
+
 	components: {
 		empty,
 		uniLoadMore
 	},
+	// computed: {
+	// 	...mapState(['weichatObj'])
+	// },
 	onReady() {
-		
+		let obj = this;
+		// 初始化获取页面高度
+		uni.createSelectorQuery()
+			.select('.content')
+			.fields(
+				{
+					size: true
+				},
+				data => {
+					// 初始化获取头部高度
+					uni.createSelectorQuery()
+						.select('.content-money')
+						.fields(
+							{
+								size: true
+							},
+							es => {
+								// 保存头部高度
+								obj.maxheight = data.height - es.height - 40;
+							}
+						)
+						.exec();
+				}
+			)
+			.exec();
 	},
 	data() {
 		return {
+			// 头部图高度
+			maxheight: '',
 			tabCurrentIndex: 0,
 			navList: [
 				{
-					state: 0,
-					text: '全部',
+					state: 1,
+					text: '支出',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
+				{
+					state: 2,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				}
 			],
+			money: ''
 		};
 	},
+	onLoad(options) {
+		let bool = uni.getStorageSync('weichatBrowser');
+		if (bool) {
+			// 加载微信信息
+			weixindata();
+		}
+	},
 	onShow() {
-		// 载入积分数据
 		this.loadData();
+		// 获取用户余额
+		userBalance({}).then(({ data }) => {
+			this.money = data.now_money;
+		});
 	},
 	methods: {
+		// ToChangeInto() {
+		// 	// #ifdef H5
+		// 	this.weichatObj.scanQRCode({
+		// 		needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+		// 		scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
+		// 		success: function(res) {
+		// 			let result = JSON.parse(res.resultStr);
+
+		// 			rechargemoneys({
+		// 				id: result.id,
+		// 				money: result.money
+		// 			})
+		// 				.then(({ data }) => {
+		// 					uni.showModal({
+		// 						title: '标题',
+		// 						content: '成功',
+		// 						showCancel: false
+		// 					});
+		// 				})
+		// 				.catch(e => {
+		// 					console.log(e);
+		// 				});
+		// 		}
+		// 	});
+		// 	// #endif
+		// },
 		// 页面跳转
 		navto(e) {
 			uni.navigateTo({
@@ -85,15 +185,17 @@ export default {
 			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
 
-			consumerList(
+			spreadCommission(
 				{
 					page: navItem.page,
 					limit: navItem.limit
-				}
+				},
+				state
 			)
 				.then(({ data }) => {
 					if (data.length > 0) {
 						navItem.orderList = navItem.orderList.concat(data);
+						console.log(navItem.orderList);
 						navItem.page++;
 					}
 					if (navItem.limit == data.length) {
@@ -111,7 +213,11 @@ export default {
 					console.log(e);
 				});
 		},
-
+		//返回上一页面
+		toBack() {
+			console.log(111);
+			uni.navigateBack({});
+		},
 		//swiper 切换
 		changeTab(e) {
 			this.tabCurrentIndex = e.target.current;
@@ -129,7 +235,76 @@ export default {
 page {
 	background: #ffffff;
 	height: 100%;
+	padding: 0;
 }
+.content-money {
+	padding-bottom: 30rpx;
+	background: $page-color-base;
+}
+.money-box {
+	background-color: $base-color;
+	padding-top: var(--status-bar-height);
+	height: 468rpx;
+	color: #ffffff;
+	text-align: center;
+	justify-content: center;
+	position: relative;
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 32rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.goback-box {
+			position: absolute;
+			z-index: 10;
+			left: 24rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+		.goback {
+			width: 30rpx;
+			height: 36rpx;
+		}
+	}
+	.bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.money {
+		position: relative;
+		z-index: 10;
+		font-size: 56rpx;
+		height: 388rpx;
+		line-height: 288rpx;
+	}
+}
+
 .navbar {
 	display: flex;
 	height: 40px;
@@ -165,7 +340,6 @@ page {
 // 列表
 
 .swiper-box {
-	height: calc(100% - 44px);
 	padding-top: 10rpx;
 	.order-item {
 		padding: 20rpx 30rpx;

pages/merchant/Addcommodity.vue

@@ -0,0 +1,507 @@
+<template>
+	<view class="center">
+		<view class="input-box flex" @click="clickSearch">
+			<view class=" input-content flex">
+				<view class="iconfont iconsearch"></view>
+				<view class="input"><input type="text" disabled value="商品搜索" /></view>
+			</view>
+		</view>
+		<view class="mp-height"></view>
+		<scroll-view scroll-x="true" class="class-box flex" :scroll-left="scrollLeft" :scroll-with-animation="true">
+			<view @click="tabClass(item, idx)" class="item" v-for="(item, idx) in indexList" :key="idx">
+				<view class="time" :class="{ action: idx == classIndex }">{{ item }}</view>
+			</view>
+		</scroll-view>
+		<view class="line"></view>
+		<swiper class="list-Box" :current="classIndex" @change="swiperChange" duration="500">
+			<swiper-item class="list-item" v-for="(ls, idx) in indexList">
+				<!-- 空白页 -->
+				<scroll-view scroll-y="true" class="list">
+					<view class="goodsList-item flex" v-for="(lss, ind) in ls.dataList" @click="check('item', ind, idx)">
+						<view class="iconfont iconroundcheckfill checkbox" :class="{ checked: lss.checked }"></view>
+						<view class="img"><image :src="lss.image" mode="scaleToFill"></image></view>
+						<view class="text">
+							<view class="spname">{{ lss.store_name }}</view>
+							<view class="price">
+								<text>￥</text>
+								{{ lss.price }}
+							</view>
+						</view>
+						<view class="yishou">已售{{ lss.sales }}</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+		<view class="btn flex">
+			<view class="checkAllbox" @click="check('all')">
+				<view class="iconfont iconroundcheckfill checkalls" :class="{ checked: allChecked }"></view>
+				<view class="quanxuan">全选</view>
+			</view>
+			<view class="btn-box flex"><view class="button" style="margin-left: 20rpx;" @click="submit()">添加</view></view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { getProducts, choseProducts } from '@/api/product.js';
+import { getList } from '@/api/category.js';
+import { mapState, mapMutations } from 'vuex';
+import empty from '@/components/empty';
+export default {
+	components: {
+		empty
+	},
+	data() {
+		return {
+			chose: [], //选择的商品id，
+			allChecked: false,
+			indexList: ['家居','服装','首饰','食品'],
+			topNavWidth: '12%', //设置导航默认宽度
+			classIndex: 0, //当前进行中的活动
+			itemWidht: 0, //顶部分类宽度
+			loadingType: 'more', //加载更多状态
+			actionClassInd: 0,
+			page: 1,
+			limit: 10
+		};
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo', 'baseURL', 'urlFile']),
+		// 计算左侧距离
+		scrollLeft() {
+			if (this.classIndex > 1) {
+				return this.itemWidht * (this.classIndex - 1.5);
+			} else {
+				return 0;
+			}
+		}
+	},
+	onLoad() {
+		// 载入分类
+		this.loadData();
+	},
+	methods: {
+		async loadData(type = 'add', loading) {
+			// let obj = this;
+			// let data = {
+			// 	page: obj.page,
+			// 	limit: obj.limit
+			// };
+			// //没有更多直接返回
+			// if (type === 'add') {
+			// 	if (obj.loadingType === 'nomore') {
+			// 		return;
+			// 	}
+			// 	obj.loadingType = 'loading';
+			// } else {
+			// 	obj.loadingType = 'more';
+			// }
+			// if (type === 'refresh') {
+			// 	// 清空数组
+			// 	obj.page = 1;
+			// }
+			// getList({})
+			// 	.then(({ data }) => {
+			// 		console.log('------',data);
+			// 		obj.indexList = data.map(e => {
+			// 			e.dataList = [];
+			// 			e.loadingType = 'more';
+			// 			e.page = 1;
+			// 			e.limit = 10;
+			// 			return e;
+			// 		});
+			// 		obj.classIndex = 0;
+			// 		obj.getDataList(obj.indexList[obj.classIndex]);
+			// 		if (obj.indexList.length <= 4) {
+			// 			// 当数量小于等于4的时候自适应宽度
+			// 			obj.topNavWidth = 100 / obj.indexList.length + '%';
+			// 		} else {
+			// 			// 页面渲染完毕后加载scroll-view左侧距离
+			// 			obj.$nextTick(() => {
+			// 				obj.numClassWidht();
+			// 			});
+			// 		}
+			// 	})
+			// 	.catch(err => {
+			// 		console.log(err);
+			// 	})
+		},
+		getDataList(item, type = 'add') {
+			const obj = this;
+			const requestData = {
+				page: item.page,
+				limit: item.limit,
+				cid: item.id,
+				can_chose: 1
+			};
+			// 判断数据是否加载中
+			if (item.loadingType == 'nomore' || item.loadingType == 'loading') {
+				return;
+			}
+			// 判断是否重新加载数据
+			if (type == 'refresh') {
+				item.dataList = [];
+			}
+			// 设置数据加载中
+			item.loadingType = 'loading';
+			return new Promise((ok, erro) => {
+				getProducts(requestData)
+					.then(({ data }) => {
+						console.log(item.dataList);
+						if (item.limit == data.length) {
+							item.page++;
+							item.loadingType = 'more';
+						} else {
+							item.loadingType = 'nomore';
+						}
+						if (type === 'refresh') {
+							if (loading == 1) {
+								uni.hideLoading();
+							} else {
+								uni.stopPullDownRefresh();
+							}
+						}
+						this.$set(item.dataList, 'loaded', true);
+					})
+					.catch(err => {
+						console.log(err);
+					});
+			});
+		},
+		swiperChange(e) {
+			const obj = this;
+			obj.classIndex = e.target.current;
+			obj.getDataList(obj.indexList[obj.classIndex], 'tabChange');
+			obj.allChecked = true;
+
+			if (obj.indexList[obj.classIndex].dataList.length > 0) {
+				let list = obj.indexList[obj.classIndex].dataList;
+
+				for (let i = 0; i < list.length; i++) {
+					if (!list[i].checked) {
+						obj.allChecked = false;
+						break;
+					}
+				}
+			} else {
+				obj.allChecked = false;
+			}
+		},
+		tabClass(item, index) {
+			const obj = this;
+			obj.classIndex = index;
+			obj.actionClassInd = index;
+			let ls = obj.indexList[obj.actionClassInd];
+			obj.allChecked = true;
+			if (obj.indexList[obj.classIndex].dataList.length > 0) {
+				let list = obj.indexList[obj.classIndex].dataList;
+				for (let i = 0; i < list.length; i++) {
+					if (!list[i].checked) {
+						obj.allChecked = false;
+						break;
+					}
+				}
+			} else {
+				obj.allChecked = false;
+			}
+
+			// 判断当前数据是否已经加载完毕
+			if (ls.loadingType == 'more') {
+				// this.getDataList(ls);
+			}
+		},
+		check(type, index, erindex) {
+			const obj = this;
+			if (type === 'item') {
+				const list = obj.indexList[erindex].dataList;
+				list[index].checked = !list[index].checked;
+				if (list[index].checked) {
+					if (!obj.chose.includes(list[index].id)) {
+						obj.chose.push(list[index].id);
+					}
+				} else {
+					if (obj.chose.includes(list[index].id)) {
+						// console.log(list[index].id);
+						let aid = list[index];
+						console.log(aid);
+						let index = obj.chose.indexOf(aid);
+						obj.chose.splice(index, 1);
+					}
+				}
+				this.allChecked = true;
+				for (let i = 0; i < list.length; i++) {
+					if (!list[i].checked) {
+						this.allChecked = false;
+					}
+				}
+			} else {
+				const checked = !obj.allChecked;
+				const list = obj.indexList[obj.classIndex].dataList;
+				list.forEach(item => {
+					item.checked = checked;
+				});
+				obj.allChecked = checked;
+				if (obj.allChecked) {
+					list.forEach(item => {
+						if (!obj.chose.includes(item.id)) {
+							obj.chose.push(item.id);
+						}
+					});
+				} else {
+					list.forEach(item => {
+						if (obj.chose.includes(item.id)) {
+							let index = obj.chose.indexOf(item.id);
+							obj.chose.splice(index, 1);
+						}
+					});
+				}
+			}
+		},
+		numClassWidht() {
+			uni.createSelectorQuery()
+				.select('.center')
+				.fields(
+					{
+						size: true
+					},
+					data => {
+						// 设置项目宽度
+						// console.log(data);
+						this.itemWidht = Math.floor((data.width / 750) * 187.5);
+					}
+				)
+				.exec();
+		},
+
+		// clickSearch() {
+		// 	uni.navigateTo({
+		// 		url: '/pages/product/search'
+		// 	});
+		// },
+		navTo(url) {
+			uni.navigateTo({
+				url
+			});
+		},
+		submit() {
+			const obj = this;
+			// obj.chose = [];
+
+			// let indexCd = obj.indexList.length;
+			// for(let i = 0; i < indexCd; i++){
+			// 	let dataCd = obj.indexList[i].dataList.length;
+			// 	for(let j = 0; j < dataCd; j++){
+			// 		if(obj.indexList[i].dataList[j].checked){
+			// 			obj.chose=obj.chose.concat(obj.indexList[i].dataList[j].id);
+			// 		}
+			// 	}
+			// }
+			console.log(obj.chose);
+			if (obj.chose.length != 0) {
+				choseProducts({ ids: obj.chose })
+					.then(() => {
+						obj.$api.msg('添加商品成功');
+						this.loadData();
+					})
+					.catch(err => {
+						console.log(err);
+					});
+			} else {
+				obj.$api.msg('请选择要添加的数据');
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	height: 100%;
+	margin: 0;
+	padding: 0;
+	background-color: #ffffff;
+}
+.center {
+	height: 100%;
+}
+.class-box {
+	background: #ffffff;
+	white-space: nowrap;
+	height: 78rpx;
+	.item {
+		text-align: center;
+		display: inline-block;
+		color: $font-color-base;
+		margin: 26rpx 34rpx 15rpx 29rpx;
+		background-color: #fff;
+		line-height: 1;
+		.time {
+			font-family: PingFang SC;
+			font-weight: bold;
+			font-size: 30rpx;
+			padding-bottom: 19rpx;
+			&.action {
+				border-bottom: 4rpx solid #52C696;
+			}
+		}
+	}
+}
+
+.input-box {
+	margin-top: -5px;
+	padding: 25rpx;
+	background-color: #ffffff;
+	height: 100rpx;
+	.input-content {
+		border-radius: 99rpx;
+		flex-grow: 1;
+		padding: 5rpx 30rpx;
+		background: #ebebeb;
+		.iconsearch {
+			font-size: 50rpx;
+			color: #999999;
+		}
+		.input {
+			margin-left: 19rpx;
+			flex-grow: 1;
+			color: #999999;
+			input {
+				font-size: 26rpx;
+
+				color: #999999;
+			}
+		}
+	}
+	.input-button {
+		padding-left: 20rpx;
+		font-size: $font-base;
+		height: 100%;
+	}
+}
+.line {
+	width: 100%;
+	height: 24rpx;
+	background-color: #f8f8f8;
+}
+.list-Box {
+	height: calc(100vh - 200px);
+	.list-item {
+		height: 100%;
+		.list {
+			height: 100%;
+		}
+	}
+}
+.goodsList-item {
+	position: relative;
+	justify-content: flex-start;
+	width: 100%;
+	padding: 30rpx;
+	.checkbox {
+		display: flex;
+		flex-shrink: 0;
+		font-size: 32rpx;
+		color: #eeeeee;
+		background: #eeeeee;
+		border-radius: 50px;
+	}
+	.img {
+		margin-left: 28rpx;
+		width: 146rpx;
+		height: 146rpx;
+		background: #f0f0f0;
+		border-radius: 10px;
+		image {
+			width: 146rpx;
+			height: 146rpx;
+		}
+	}
+	.text {
+		position: relative;
+		padding-left: 35rpx;
+		height: 146rpx;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		white-space: nowrap;
+		.spname {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+			text-overflow: ellipsis;
+			overflow: hidden;
+		}
+		.earning {
+			width: 275rpx;
+			padding: 7rpx;
+			margin-top: 12rpx;
+			background: #fee1d7;
+			border-radius: 5rpx;
+			text-align: center;
+			font-size: 20rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #fc4141;
+			line-height: 1;
+		}
+		.price {
+			margin-top: 19rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #ff0000;
+			font-size: 36rpx;
+			text {
+				font-size: 24rpx;
+			}
+		}
+	}
+	.yishou {
+		position: absolute;
+		right: 29rpx;
+		bottom: 40rpx;
+	}
+}
+.btn {
+	position: fixed;
+	bottom: 0;
+	width: 100%;
+	height: 100rpx;
+	justify-content: space-between;
+	padding: 0 39rpx 0 54rpx;
+	line-height: 1;
+	border-top: 1rpx solid #f0f0f0;
+	.checkAllbox {
+		display: flex;
+		.checkalls {
+			font-size: 32rpx;
+			color: #eeeeee;
+			background: #eeeeee;
+			border-radius: 50px;
+		}
+		.quanxuan {
+			margin-left: 16rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #1d2023;
+		}
+	}
+	.button {
+		width: 160rpx;
+		height: 64rpx;
+		background: #52C696;
+		border-radius: 32rpx;
+		color: #ffffff;
+		text-align: center;
+		line-height: 64rpx;
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+	}
+}
+.checkAllbox .checkalls.checked,
+.goodsList-item .checkbox.checked {
+	color: #52C696;
+	background: #ffffff;
+}
+</style>

pages/merchant/commodity.vue

@@ -1,240 +1,317 @@
-<template>
-	<view class="content">
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item"
-				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-					<!-- 已上架 -->
-					<view class="commodity-box" >
-						<view class="commodity" v-for="item in 10">
-							<view class="commodity-detail">
-								<view class="commodity-img">
-									<image src="../../static/user/ground.png" mode=""></image>
-								</view>
-								<view class="commodity-content">
-									<view class="top">
-										满园春11111111111111111111111111111111111
-									</view>
-									<view class="bottom">
-										<view class="price">
-											<text class="text">￥</text>999
-										</view>
-										<view class="status">
-											已上架
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-						<!-- <view class="input">
-							添加商品
-						</view> -->
-					</view>
-					
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-
-	export default {
-		data() {
-			return {
-				tabCurrentIndex: 0,
-				navList: [{
-						state: 0,
-						text: '全部',
-						orderList: [],
-						page: 1, //当前页面
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 0,
-						text: '已上架',
-						orderList: [],
-						page: 1, //当前页面
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 0,
-						text: '已下架',
-						orderList: [],
-						page: 1, //当前页面
-						limit: 10 //每次信息条数
-					}
-				]
-			};
-		},
-		methods: {
-			//顶部tab点击
-			tabClick(index) {
-				this.tabCurrentIndex = index;
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	page,
-	.content {
-		background: $page-color-base;
-		height: 100%;
-	}
-
-	.swiper-box {
-		height: calc(100% - 40px);
-	}
-
-	.list-scroll-content {
-		height: 100%;
-	}
-
-	.commodity-box {
-		width: 750rpx;
-		// margin: 20rpx 0;
-		// background-color: #FFFFFF;
-
-		.commodity {
-			width: 750rpx;
+<template>
+	<view class="content">
+		<view class="status_bar"><!-- 这里是状态栏 --></view>
+		<view class="content-money">
+			<view class="money-box">
+				<view class="goback-box" @click="toBack">
+					<image class="goback" src="../../static/img/back.png" mode=""></image>
+					</view>
+				<view class="header">商品管理</view>
+				<view class="bianj" @click="nav('/pages/merchant/compileCommodity')">
+					编辑
+				</view>
+			</view>
+		</view>
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+					<!-- 已上架 -->
+					<view class="commodity-box">
+						<view class="commodity" v-for="item in 10">
+							<view class="commodity-detail">
+								<view class="commodity-img"><image src="../../static/user/ground.png" mode=""></image></view>
+								<view class="commodity-content">
+									<view class="top">满园春11111111111111111111111111111111111</view>
+									<view class="bottom">
+										<view class="price">
+											<text class="text">￥</text>
+											999
+										</view>
+										<view class="status">已上架</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+		<view class="input" @click="nav('/pages/merchant/Addcommodity')">添加商品</view>
+	</view>
+</template>
+
+<script>
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+
+export default {
+	data() {
+		return {
+			tabCurrentIndex: 0,
+			navList: [
+				{
+					state: 0,
+					text: '全部',
+					orderList: [],
+					loadingType: 'more',
+					page: 1, //当前页面
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 0,
+					text: '已上架',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页面
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 0,
+					text: '已下架',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页面
+					limit: 10 //每次信息条数
+				}
+			]
+		};
+	},
+	onLoad() {
+		this.loadData();
+	},
+	methods: {
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		},
+		changeTab(index) {
+			this.tabCurrentIndex = index.detail.current;
+		},
+		loadData() {
 			
-			background-color: #FFFFFF;
-			.checkbox1 {
-
-				font-size: 44rpx;
-				line-height: 1;
-				padding: 4rpx;
-				color: $font-color-disabled;
-				background: red;
-				border-radius: 50rpx;
-			}
-
-			.commodity-detail {
-				padding: 30rpx 0;
-				padding: 30 34rpx 0 30rpx;
-				display: flex;
-
-				.commodity-img {
-					margin: 0 30rpx;
-					width: 147rpx;
-					height: 146rpx;
-					border-radius: 10rpx;
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-
-				.commodity-content {
-					width: 500rpx;
-					display: flex;
-					flex-direction: column;
-					justify-content: space-between;
-
-					.top {
-
-						white-space: nowrap;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						font-size: 28rpx;
-						font-family: PingFangSC;
-						font-weight: 500;
-						color: #333333;
-					}
-
-					.bottom {
-
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-
-						.price {
-							font-size: 36rpx;
-							font-family: PingFang SC;
-							font-weight: bold;
-							color: #FD5B23;
-							.text{
-								font-size: 24rpx;
-								font-family: PingFang SC;
-								font-weight: bold;
-								color: #FD5B23;
-							}
-						}
-
-						.status {
-							
-							width: 80rpx;
-							height: 34rpx;
-							background: #FEE1D7;
-							border-radius: 5rpx;
-							font-size: 20rpx;
-							font-family: PingFangSC;
-							font-weight: 500;
-							color: #FD5B23;
-						}
-					}
-				}
-			}
-		}
-		.input{
-			margin: 30rpx;
-			text-align: center;
-			position: absolute;
-			bottom: 0;
-			width: 674rpx;
-			height: 88rpx;
-			background: #52C696;
-			border-radius: 44rpx;
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			line-height: 88rpx;
-			color: #FFFFFF;
-		}
-	}
-
-	.navbar {
-		display: flex;
-		height: 40px;
-		padding: 0 5px;
-		background: #fff;
-		box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-		position: relative;
-		z-index: 10;
-
-		.nav-item {
-			flex: 1;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 100%;
-			font-size: 12px;
-			color: $font-color-dark;
-			position: relative;
-
-			&.current {
-				color: $base-color;
-
-				&:after {
-					content: '';
-					position: absolute;
-					left: 50%;
-					bottom: 0;
-					transform: translateX(-50%);
-					width: 44px;
-					height: 0;
-					border-bottom: 2px solid $base-color;
-				}
-			}
-		}
-	}
+		},
+		// 点击返回 我的页面
+		toBack() {
+			uni.navigateBack({
+				
+			})
+		},
+		choose() {
+			this.isBian = !this.isBian;
+		},
+		nav(url){
+			uni.navigateTo({
+				url
+			})
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+	height: 100%;
+}
+
+.swiper-box {
+	height: calc(100% - 40px);
+}
+
+.list-scroll-content {
+	height: 100%;
+}
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
+	background: #ffffff;
+}
+.money-box {
+	height: 80rpx;
+	color: #000000;
+	text-align: center;
+	font-size: 35rpx;
+	position: relative;
+	background-color: #FFFFFF;
+	.header {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 80rpx;
+		font-size: 32rpx;
+		font-weight: 700;
+		z-index: 99;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.bianj {
+		position: absolute;
+		right: 28rpx;
+		height: 80rpx;
+		font-size: 28rpx;
+		font-family: PingFangSC;
+		font-weight: 400;
+		color: #333333;
+		z-index: 99;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.goback-box {
+		position: absolute;
+		left: 24rpx;
+		top: 0;
+		height: 80rpx;
+		display: flex;
+		align-items: center;
+	}
+	.goback {
+		z-index: 100;
+		width: 20rpx;
+		height: 34rpx;
+	}
+}
+
+.commodity-box {
+	width: 750rpx;
+	// margin: 20rpx 0;
+	// background-color: #FFFFFF;
+
+	.commodity {
+		width: 750rpx;
+
+		background-color: #ffffff;
+		.checkbox1 {
+			font-size: 44rpx;
+			line-height: 1;
+			padding: 4rpx;
+			color: $font-color-disabled;
+			background: red;
+			border-radius: 50rpx;
+		}
+
+		.commodity-detail {
+			padding: 30rpx 0;
+			padding: 30 34rpx 0 30rpx;
+			display: flex;
+
+			.commodity-img {
+				margin: 0 30rpx;
+				width: 147rpx;
+				height: 146rpx;
+				border-radius: 10rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.commodity-content {
+				width: 500rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				padding: 10rpx 0;
+				.top {
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					font-size: 28rpx;
+					font-family: PingFangSC;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.bottom {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					.price {
+						font-size: 36rpx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #fd5b23;
+						.text {
+							font-size: 24rpx;
+							font-family: PingFang SC;
+							font-weight: bold;
+							color: #fd5b23;
+						}
+					}
+
+					.status {
+						padding: 6rpx;
+						background: #fee1d7;
+						border-radius: 5rpx;
+						font-size: 20rpx;
+						font-family: PingFangSC;
+						font-weight: 500;
+						color: #fd5b23;
+					}
+				}
+			}
+		}
+	}
+}
+
+.navbar {
+	display: flex;
+	height: 40px;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 12px;
+		color: $font-color-dark;
+		position: relative;
+
+		&.current {
+			color: $base-color;
+
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid $base-color;
+			}
+		}
+	}
+}
+.input {
+	position: fixed;
+	bottom: 38rpx;
+	left: 30rpx;
+	text-align: center;
+	width: 674rpx;
+	height: 88rpx;
+	background: #52c696;
+	border-radius: 44rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	line-height: 88rpx;
+	color: #ffffff;
+}
 </style>

pages/merchant/compileCommodity.vue

@@ -0,0 +1,405 @@
+<template>
+	<view class="content">
+		<view class="status_bar"><!-- 这里是状态栏 --></view>
+		<view class="content-money">
+			<view class="money-box">
+				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/img/back.png" mode=""></image></view>
+				<view class="header">商品管理</view>
+				<view class="bianj" @click="nav('/pages/merchant/commodity')">完成</view>
+			</view>
+		</view>
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+					<!-- 已上架 -->
+					<view class="commodity-box">
+						<view class="goodsList-item flex" v-for="(lss, ind) in tabItem.orderList" @click="check('item', ind, tabIndex)">
+							<view class="iconfont iconroundcheckfill checkbox" :class="{ checked: lss.checked }"></view>
+							<view class="img"><image :src="lss.image" mode="scaleToFill"></image></view>
+							<view class="text">
+								<view class="spname">{{ lss.store_name }}</view>
+								<view class="price">
+									<text>￥</text>
+									{{ lss.price }}
+								</view>
+							</view>
+							<view class="yishou">已售{{ lss.sales }}</view>
+						</view>
+						<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+		<view class="btn flex">
+			<view class="checkAllbox" @click="check('all')">
+				<view class="iconfont iconroundcheckfill checkalls" :class="{ checked: allChecked }"></view>
+				<view class="quanxuan">全选</view>
+			</view>
+			<view class="btn-box flex"><view class="button" style="margin-left: 20rpx;" @click="submit()">下架</view></view>
+		</view>
+	</view>
+</template>
+
+<script>
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+
+export default {
+	data() {
+		return {
+			tabCurrentIndex: 0,
+			allChecked: false,
+			navList: [
+				{
+					state: 0,
+					text: '全部',
+					orderList: [],
+					loadingType: 'more',
+					page: 1, //当前页面
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 0,
+					text: '已上架',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页面
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 0,
+					text: '已下架',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页面
+					limit: 10 //每次信息条数
+				}
+			]
+		};
+	},
+	onLoad() {
+		this.loadData();
+	},
+	methods: {
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		},
+		changeTab(index) {
+			this.tabCurrentIndex = index.detail.current;
+			const obj = this;
+			// obj.getDataList(obj.indexList[obj.classIndex], 'tabChange');
+			obj.allChecked = true;
+
+			if (obj.indexList[obj.classIndex].dataList.length > 0) {
+				let list = obj.indexList[obj.classIndex].dataList;
+
+				for (let i = 0; i < list.length; i++) {
+					if (!list[i].checked) {
+						obj.allChecked = false;
+						break;
+					}
+				}
+			} else {
+				obj.allChecked = false;
+			}
+		},
+		loadData() {
+			
+		},
+		// 点击返回 我的页面
+		toBack() {
+			uni.navigateBack({});
+		},
+		choose() {
+			this.isBian = !this.isBian;
+		},
+		nav(url) {
+			uni.navigateTo({
+				url
+			});
+		},
+		check(type, index, erindex) {
+			const obj = this;
+			if (type === 'item') {
+				const list = obj.indexList[erindex].dataList;
+				list[index].checked = !list[index].checked;
+				if (list[index].checked) {
+					if (!obj.chose.includes(list[index].id)) {
+						obj.chose.push(list[index].id);
+					}
+				} else {
+					if (obj.chose.includes(list[index].id)) {
+						// console.log(list[index].id);
+						let aid = list[index];
+						console.log(aid);
+						let index = obj.chose.indexOf(aid);
+						obj.chose.splice(index, 1);
+					}
+				}
+				this.allChecked = true;
+				for (let i = 0; i < list.length; i++) {
+					if (!list[i].checked) {
+						this.allChecked = false;
+					}
+				}
+			} else {
+				const checked = !obj.allChecked;
+				const list = obj.indexList[obj.classIndex].dataList;
+				list.forEach(item => {
+					item.checked = checked;
+				});
+				obj.allChecked = checked;
+				if (obj.allChecked) {
+					list.forEach(item => {
+						if (!obj.chose.includes(item.id)) {
+							obj.chose.push(item.id);
+						}
+					});
+				} else {
+					list.forEach(item => {
+						if (obj.chose.includes(item.id)) {
+							let index = obj.chose.indexOf(item.id);
+							obj.chose.splice(index, 1);
+						}
+					});
+				}
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+	height: 100%;
+}
+
+.swiper-box {
+	height: calc(100% - 40px);
+}
+
+.list-scroll-content {
+	height: 100%;
+}
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
+	background: #ffffff;
+}
+.money-box {
+	height: 80rpx;
+	color: #000000;
+	text-align: center;
+	font-size: 35rpx;
+	position: relative;
+	background-color: #ffffff;
+	.header {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 80rpx;
+		font-size: 32rpx;
+		font-weight: 700;
+		z-index: 99;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.bianj {
+		position: absolute;
+		right: 28rpx;
+		height: 80rpx;
+		font-size: 28rpx;
+		font-family: PingFangSC;
+		font-weight: 400;
+		color: #333333;
+		z-index: 99;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.goback-box {
+		position: absolute;
+		left: 24rpx;
+		top: 0;
+		height: 80rpx;
+		display: flex;
+		align-items: center;
+	}
+	.goback {
+		z-index: 100;
+		width: 20rpx;
+		height: 34rpx;
+	}
+}
+
+.commodity-box {
+	width: 750rpx;
+	.goodsList-item {
+		position: relative;
+		justify-content: flex-start;
+		width: 100%;
+		padding: 30rpx;
+		.checkbox {
+			display: flex;
+			flex-shrink: 0;
+			font-size: 32rpx;
+			color: #eeeeee;
+			background: #eeeeee;
+			border-radius: 50px;
+		}
+		.img {
+			margin-left: 28rpx;
+			width: 146rpx;
+			height: 146rpx;
+			background: #f0f0f0;
+			border-radius: 10px;
+			image {
+				width: 146rpx;
+				height: 146rpx;
+			}
+		}
+		.text {
+			position: relative;
+			padding-left: 35rpx;
+			height: 146rpx;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			white-space: nowrap;
+			.spname {
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+				text-overflow: ellipsis;
+				overflow: hidden;
+			}
+			.earning {
+				width: 275rpx;
+				padding: 7rpx;
+				margin-top: 12rpx;
+				background: #fee1d7;
+				border-radius: 5rpx;
+				text-align: center;
+				font-size: 20rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #fc4141;
+				line-height: 1;
+			}
+			.price {
+				margin-top: 19rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #ff0000;
+				font-size: 36rpx;
+				text {
+					font-size: 24rpx;
+				}
+			}
+		}
+		.yishou {
+			position: absolute;
+			right: 29rpx;
+			bottom: 40rpx;
+		}
+	}
+}
+
+.navbar {
+	display: flex;
+	height: 40px;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 12px;
+		color: $font-color-dark;
+		position: relative;
+
+		&.current {
+			color: $base-color;
+
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid $base-color;
+			}
+		}
+	}
+}
+.input {
+	position: fixed;
+	bottom: 38rpx;
+	left: 30rpx;
+	text-align: center;
+	width: 674rpx;
+	height: 88rpx;
+	background: #52c696;
+	border-radius: 44rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	line-height: 88rpx;
+	color: #ffffff;
+}
+.btn {
+	position: fixed;
+	bottom: 0;
+	width: 100%;
+	height: 100rpx;
+	justify-content: space-between;
+	padding: 0 39rpx 0 54rpx;
+	line-height: 1;
+	border-top: 1rpx solid #f0f0f0;
+	.checkAllbox {
+		display: flex;
+		.checkalls {
+			font-size: 32rpx;
+			color: #eeeeee;
+			background: #eeeeee;
+			border-radius: 50px;
+		}
+		.quanxuan {
+			margin-left: 16rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #1d2023;
+		}
+	}
+	.button {
+		width: 160rpx;
+		height: 64rpx;
+		background: #52c696;
+		border-radius: 32rpx;
+		color: #ffffff;
+		text-align: center;
+		line-height: 64rpx;
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+	}
+}
+</style>

pages/merchant/merchant.vue

@@ -4,53 +4,36 @@
 		<view class="content">
 			<view class="userInfo">
 				<view class="userInfo-box">
-					<view class="userInfo-img">
-						<image class="portrait" src="../../static/error/missing-face.png"></image>
-					</view>
+					<view class="userInfo-img"><image class="portrait" src="../../static/error/missing-face.png"></image></view>
 					<view class="userInfo-xinxi">
-						<view class="title">
-							<text>满园春泰州店</text>
-						</view>
-						<view class="phone">
-							<text>19999999999</text>
-						</view>
-					</view>
-					<view class="balance">
-						可用余额￥20000
+						<view class="title"><text>满园春泰州店</text></view>
+						<view class="phone"><text>19999999999</text></view>
 					</view>
+					<view class="balance">可用余额￥20000</view>
 				</view>
 			</view>
 			<view class="userInfoList">
-				<view class="userInfoList-top">
-					<view class="top">
-						<image src="../../static/merchant/saoma.png" mode=""></image>
-					</view>
+				<view class="userInfoList-top" @click="sao()">
+					<view class="top"><image src="../../static/merchant/saoma.png" mode=""></image></view>
 					扫码核销
 				</view>
 				<view class="userInfoList-top" @click="navTo('/pages/merchant/storeQr')">
-					<view class="top">
-						<image src="../../static/merchant/erweima.png" mode=""></image>
-					</view>
+					<view class="top"><image src="../../static/merchant/erweima.png" mode=""></image></view>
 					店铺二维码
 				</view>
 				<view class="userInfoList-bottom" @click="navTo('/pages/merchant/finance')">
-					<view class="bottom">
-						<image src="../../static/merchant/money.png" mode=""></image>
-					</view>
+					<view class="bottom"><image src="../../static/merchant/money.png" mode=""></image></view>
 					店铺财务
 				</view>
-				<view class="userInfoList-bottom">
-					<view class="bottom">
-						<image src="../../static/merchant/order.png" mode=""></image>
-					</view>
+				<view class="userInfoList-bottom" @click="navTo('/pages/merchant/order')">
+					<view class="bottom"><image src="../../static/merchant/order.png" mode=""></image></view>
 					订单管理
 				</view>
 				<view class="userInfoList-bottom" @click="navTo('/pages/merchant/commodity')">
-					<view class="bottom">
-						<image src="../../static/merchant/shop.png" mode=""></image>
-					</view>
+					<view class="bottom"><image src="../../static/merchant/shop.png" mode=""></image></view>
 					商品管理
 				</view>
+				
 				<view class="userInfoList-bottom" @click="navTo('/pages/merchant/onlineOrder')">
 					<view class="bottom">
 						<image src="../../static/merchant/xiadan.png" mode=""></image>
@@ -58,15 +41,11 @@
 					在线下单
 				</view>
 				<view class="userInfoList-bottom" @click="navTo('/pages/merchant/vipDetail')">
-					<view class="bottom">
-						<image src="../../static/merchant/vip.png" mode=""></image>
-					</view>
+					<view class="bottom"><image src="../../static/merchant/vip.png" mode=""></image></view>
 					店铺会员
 				</view>
 				<view class="userInfoList-bottom" @click="navTo('/pages/merchant/storeData')">
-					<view class="bottom">
-						<image src="../../static/merchant/dianpu.png" mode=""></image>
-					</view>
+					<view class="bottom"><image src="../../static/merchant/dianpu.png" mode=""></image></view>
 					店铺数据
 				</view>
 			</view>
@@ -75,162 +54,177 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-
-			};
+export default {
+	data() {
+		return {};
+	},
+	methods: {
+		//跳转
+		navTo(url) {
+			uni.navigateTo({
+				url
+			});
 		},
-		methods:{
-			//跳转
-			navTo(url){
-				uni.navigateTo({
-					url
-				})
-			}
+		//调取扫描二维码
+		sao() {
+			let obj = this;
+			// #ifndef H5
+			uni.scanCode({
+				success(e) {
+					obj.orderVerific(e.result);
+				}
+			});
+			// #endif
+			// #ifdef H5
+			this.weichatObj.scanQRCode({
+				needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+				scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
+				success: function(res) {
+					obj.orderVerific(res.resultStr); // 当needResult 为 1 时，扫码返回的结果
+				}
+			});
+			// #endif
 		}
 	}
+};
 </script>
 
 <style lang="scss">
-	page {
-		height: 100%;
-		background-color: #EEEDED;
-		padding: 0;
-		margin: 0;
-	}
-
-	.content {
-		background-color: #EEEDED;
-		margin: 0 30rpx;
-		display: flex;
-		flex-direction: column;
-
-	}
-
-	.background {
-		width: 100%;
-		height: 220rpx;
-		background-color: #75E5B6;
-	}
-
-	.userInfo {
-		margin-top: -110rpx;
+page {
+	height: 100%;
+	background-color: #eeeded;
+	padding: 0;
+	margin: 0;
+}
+
+.content {
+	background-color: #eeeded;
+	margin: 0 30rpx;
+	display: flex;
+	flex-direction: column;
+}
+
+.background {
+	width: 100%;
+	height: 220rpx;
+	background-color: #75e5b6;
+}
+
+.userInfo {
+	margin-top: -110rpx;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	background-color: #f9f9f9;
+	border-radius: 19rpx;
+	width: 100%;
+	height: 300rpx;
+
+	.userInfo-box {
 		display: flex;
 		flex-direction: column;
-		justify-content: center;
-		background-color: #F9F9F9;
-		border-radius: 19rpx;
-		width: 100%;
-		height: 300rpx;
-
-		.userInfo-box {
-
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-
-			.userInfo-img {
-				margin: -65rpx 0 0 0;
-				width: 130rpx;
-				height: 130rpx;
-				border: 5rpx solid #fff;
-				border-radius: 50%;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
+		align-items: center;
+
+		.userInfo-img {
+			margin: -65rpx 0 0 0;
+			width: 130rpx;
+			height: 130rpx;
+			border: 5rpx solid #fff;
+			border-radius: 50%;
+
+			image {
+				width: 100%;
+				height: 100%;
 			}
+		}
 
-			.userInfo-xinxi {
-				.title {
-					margin: 20rpx 0;
-					font-size: 32rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #333333;
-					line-height: 21rpx;
-				}
-
-				.phone {
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #666666;
-					line-height: 21rpx;
-					margin-bottom: 40rpx;
-				}
+		.userInfo-xinxi {
+			.title {
+				margin: 20rpx 0;
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+				line-height: 21rpx;
 			}
 
-			.balance {
-				text-align: center;
-				width: 500rpx;
-				height: 60rpx;
-				background: #52C696;
-				border-radius: 30rpx;
+			.phone {
 				font-size: 28rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #FFFFFF;
-				line-height: 60rpx;
+				color: #666666;
+				line-height: 21rpx;
+				margin-bottom: 40rpx;
 			}
 		}
 
-	}
-
-	.userInfoList {
-		display: flex;
-		flex-wrap:wrap;
-		justify-content: space-between;
-		.userInfoList-top {
-			position: relative;
-			margin: 15rpx 0 ;
-			display: flex;
-			
-			justify-content: center;
-			align-items: center;
-			width: 340rpx;
-			height: 100rpx;
-			background: #FFFFFF;
-			border-radius: 20rpx;
-			font-size: 30rpx;
+		.balance {
+			text-align: center;
+			width: 500rpx;
+			height: 60rpx;
+			background: #52c696;
+			border-radius: 30rpx;
+			font-size: 28rpx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #4D4D4D;
-			line-height: 21rpx;
-
-			.top {
-				position: absolute;
-				margin-left: -230rpx;
-				width: 50rpx;
-				height: 50rpx;
+			color: #ffffff;
+			line-height: 60rpx;
+		}
+	}
+}
+
+.userInfoList {
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-between;
+	.userInfoList-top {
+		position: relative;
+		margin: 15rpx 0;
+		display: flex;
 
-				image {
-					width: 100%;
-					height: 100%;
-				}
+		justify-content: center;
+		align-items: center;
+		width: 340rpx;
+		height: 100rpx;
+		background: #ffffff;
+		border-radius: 20rpx;
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #4d4d4d;
+		line-height: 21rpx;
+
+		.top {
+			position: absolute;
+			margin-left: -230rpx;
+			width: 50rpx;
+			height: 50rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
 			}
 		}
-		.userInfoList-bottom{
-			margin-bottom: 15rpx;
-			width: 340rpx;
-			height: 250rpx;
-			background: #F9F9F9;
-			border-radius: 20rpx;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			.bottom{
-				margin-bottom: 20rpx;
-				width: 68rpx;
-				height: 68rpx;
-				image{
-					width: 100%;
-					height: 100%;
-				}
+	}
+	.userInfoList-bottom {
+		margin-bottom: 15rpx;
+		width: 340rpx;
+		height: 250rpx;
+		background: #f9f9f9;
+		border-radius: 20rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		.bottom {
+			margin-bottom: 20rpx;
+			width: 68rpx;
+			height: 68rpx;
+			image {
+				width: 100%;
+				height: 100%;
 			}
 		}
 	}
+}
 </style>

pages/merchant/order.vue

@@ -0,0 +1,198 @@
+<template>
+	<view class="center">
+		<view class="input-box flex">
+			<view class=" input-content flex">
+				<view class="iconfont iconsearch"></view>
+				<view class="input"><input type="text" disabled placeholder="输入关键字" /></view>
+			</view>
+		</view>
+		<view class="main" v-for="(item, index) in list" :key="index">
+			<view class="top flex">
+				<view class="userinfo clamp">用户ID：{{ item.userID }}</view>
+				<view class="type">{{ item.type == 1 ? '待收货' : item.type == 2 ? '待发货' : item.type == 3 ? '待付款' : '已完成' }}</view>
+			</view>
+			<view class="mainbox">
+				<view class="bg"><image src="" mode=""></image></view>
+				<view class="main-info flex">
+					<view class="main-left">
+						<view class="name clamp">{{ item.name }}</view>
+						<view class="order">订单编号：{{ item.orderID }}</view>
+						<view class="ordertype">{{ item.store_type == 1 ? '别店订单' : '本店订单' }}</view>
+					</view>
+					<view class="main-right">
+						<view class="price">￥{{ item.price }}</view>
+						<view class="num">x{{ item.num }}</view>
+					</view>
+				</view>
+			</view>
+			<view class="item-btm">共一件商品 合计：￥{{ item.sum }}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			list: [
+				{
+					name: '满园春防脱发保湿滋养护法素',
+					price: '24.9',
+					num: '1',
+					orderID: '55648785545',
+					userID: '李丹丹',
+					sum: '24.9',
+					type: 1,
+					store_type: 1
+				},
+				{
+					name: '满园春防脱发保湿滋养护法素',
+					price: '24.9',
+					num: '1',
+					orderID: '55648785545',
+					userID: '李丹丹',
+					sum: '24.9',
+					type: 1,
+					store_type: 1
+				}
+			]
+		};
+	},
+	onLoad() {},
+	methods: {}
+};
+</script>
+
+<style lang="scss">
+page {
+	height: 100%;
+	background: #f6f4f4;
+}
+.input-box {
+	width: 100%;
+	padding: 25rpx;
+	background-color: #52c696;
+	z-index: 999;
+	height: 60px;
+	.iconsearch {
+		padding-left: 30%;
+		font-size: 50rpx;
+		color: #9f9f9f;
+	}
+	.input-content {
+		border-radius: 99rpx;
+		color: #9f9f9f;
+		flex-grow: 1;
+		padding: 10rpx 30rpx;
+		background-color: #ffffff;
+		.input {
+			flex-grow: 1;
+			input {
+				font-size: $font-lg;
+			}
+		}
+	}
+	.input-button {
+		padding-left: 20rpx;
+		font-size: $font-lg;
+		height: 100%;
+	}
+}
+.main {
+	padding: 30rpx 30rpx 60rpx 30rpx;
+	width: 700rpx;
+	margin: 20rpx auto 0;
+	background: #ffffff;
+	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
+	border-radius: 10rpx;
+	.top {
+		align-items: center;
+		.userinfo {
+			max-width: 70%;
+			font-size: 24rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #666666;
+		}
+		.type {
+			font-size: 28rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #52c696;
+		}
+	}
+	.mainbox {
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		margin-top: 30rpx;
+		align-items: flex-start;
+		.bg {
+			flex-shrink: 0;
+			width: 160rpx;
+			height: 160rpx;
+			background: #4cd964;
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.main-info {
+			justify-content: space-between;
+			align-items: flex-start;
+			width: 100%;
+			.main-left {
+				padding-left: 10rpx;
+				.name {
+					max-width: 338rpx;
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #3f454b;
+				}
+				.order {
+					margin-top: 10rpx;
+					font-size: 24rpx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #666666;
+				}
+				.ordertype {
+					width: 120rpx;
+					margin-top: 10rpx;
+					background: #ffeae5;
+					border-radius: 5rpx;
+					font-size: 20rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #ff6f0f;
+					text-align: center;
+				}
+			}
+			.main-right {
+				text-align: right;
+				padding-top: 6rpx;
+				.price {
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+				.num {
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+				}
+			}
+		}
+	}
+	.item-btm {
+		text-align: right;
+		font-size: 26rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #333333;
+	}
+}
+</style>

pages/myteam/myteam.vue

@@ -2,29 +2,20 @@
 	<view class="content">
 		<view class="content-money">
 			<view class="money-box">
-				<!-- <view class="text">当前总积分</view>
-				<view class="money">{{ userInfo.integral | getMoneyStyle }}</view> -->
-				<image :src="userInfo.avatar" class="andr-mt-avatar andr-mt-avatarBd"></image>
-				<view class="text">{{ userInfo.nickname }}</view>
-				<!--<view class="text">试用赠予次数:5(暂时固定值,需要动态修改)</view>-->
-			</view>
-			<!-- <view class="moneyTx" @click="navto('/pages/wallet/recharge')">充值</view> -->
-			<!-- <view class="flex buttom-box">
-				<view class="buttom" @click="navto('/pages/wallet/recharge')">
-					<view class="icon"><image class="icon-img" src="/static/icon/i5.png" mode="aspectFit"></image></view>
-					<text>充值</text>
+				<view class="bg"><image src="../../static/img/team.png" mode=""></image></view>
+				<view class="body-title">
+					<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+					<view class="header">我的团队</view>
 				</view>
-				<view class="interval"></view>
-				<view class="buttom" @click="navto('/pages/award/award')">
-					<view class="icon"><image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></image></view>
-					<text>我的奖励</text>
+				<view>
+					<view class="money">共<text>{{ all }}</text>人</view>
 				</view>
-			</view> -->
+			</view>
 		</view>
 		<view class="navbar">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">
+				<text>{{ item.num }}</text>
 				<text>{{ item.text }}</text>
-				<text>{{ item.num || '' }}</text>
 			</view>
 		</view>
 		<swiper :current="tabCurrentIndex" :style="{ height: maxheight + 'rpx' }" class="swiper-box" duration="300" @change="changeTab">
@@ -53,13 +44,9 @@
 import { spreadPeople } from '@/api/myteam.js';
 import { userinfo } from '@/api/user.js';
 import { mapState, mapMutations } from 'vuex';
-import { getMoneyStyle } from '@/utils/rocessor.js';
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
 export default {
-	filters: {
-		getMoneyStyle
-	},
 	components: {
 		empty,
 		uniLoadMore
@@ -89,7 +76,7 @@ export default {
 			navList: [
 				{
 					state: 0,
-					text: '一级团队',
+					text: '一级推广',
 					loadingType: 'more',
 					num: 0, //人数
 					orderList: [],
@@ -98,7 +85,7 @@ export default {
 				},
 				{
 					state: 1,
-					text: '二级团队',
+					text: '二级推广',
 					num: 0, //团队人数
 					loadingType: 'more',
 					orderList: [],
@@ -106,7 +93,7 @@ export default {
 					limit: 10 //每次信息条数
 				}
 			],
-			money: ''
+			all: '0'
 		};
 	},
 	onLoad(options) {},
@@ -128,6 +115,11 @@ export default {
 				url: e
 			});
 		},
+		//返回上一页面
+		toBack() {
+			console.log(111);
+			uni.navigateBack({});
+		},
 		//获取收入支出信息
 		async loadData(source) {
 			let obj = this;
@@ -194,73 +186,82 @@ page {
 	background: #ffffff;
 	height: 100%;
 }
+
 .content-money {
-	padding-bottom: 30rpx;
 	background: $page-color-base;
-	// border: 2px solid #ffffff;
-	.moneyTx {
-		position: absolute;
-		top: 150rpx;
-		right: 0rpx;
-		width: 150rpx;
-		padding: 10rpx 30rpx;
-		border: 2px solid #ffffff;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #ffffff;
-		line-height: 1;
-		font-size: $font-base;
-	}
-	.buttom-box {
-		background-color: #ffffff;
-		text-align: center;
-		margin: 0 30rpx;
-		padding: 20rpx 0;
-		border-radius: $border-radius-sm;
-		margin-top: -60rpx;
-		.buttom {
-			font-size: $font-lg;
-			flex-grow: 1;
-		}
-		.interval {
-			width: 2px;
-			height: 60rpx;
-			background-color: #eeeeee;
-		}
-		.icon {
-			height: 50rpx;
-			width: 48rpx;
-			margin: 0 auto;
-			.icon-img {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
 }
 .money-box {
 	background-color: $base-color;
 	padding-top: var(--status-bar-height);
-	// height: 368rpx;
-	height: 180rpx;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
+	height: 468rpx;
 	color: #ffffff;
-	// text-align: center;
-	.text {
-		// padding-top: 147rpx;
-		font-size: $font-sm;
+	text-align: center;
+	justify-content: center;
+	position: relative;
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 32rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.goback-box {
+			position: absolute;
+			z-index: 10;
+			left: 24rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+		.goback {
+			width: 30rpx;
+			height: 36rpx;
+		}
+	}
+	.bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		image {
+			width: 100%;
+			height: 100%;
+		}
 	}
 	.money {
-		font-size: 56rpx;
+		position: relative;
+		z-index: 10;
+		font-size: 36rpx;
+		height: 388rpx;
+		line-height: 288rpx;
+		text{
+			font-size: 82rpx;
+		}
 	}
 }
 
 .navbar {
+	width: 700rpx;
+	margin: -60rpx auto 0;
 	display: flex;
-	height: 40px;
+	height: 120rpx;
 	padding: 0 5px;
 	background: #fff;
 	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
@@ -269,6 +270,7 @@ page {
 	.nav-item {
 		flex: 1;
 		display: flex;
+		flex-direction: column;
 		justify-content: center;
 		align-items: center;
 		height: 100%;
@@ -293,7 +295,7 @@ page {
 // 列表
 
 .swiper-box {
-	padding-top: 10rpx;
+	padding-top: 30rpx;
 	.order-item {
 		padding: 20rpx 30rpx;
 		line-height: 1.5;

pages/scoreAccumulate/scoreAccumulate.vue

@@ -1,27 +1,44 @@
 <template>
 	<view class="content">
-		<!-- <view class="navbar">
+		<view class="content-money">
+			<view class="money-box">
+				<view class="bg"><image src="../../static/img/integral.png" mode=""></image></view>
+				<view class="body-title">
+					<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+					<view class="header">我的积分</view>
+				</view>
+				<view>
+					<view class="money">{{ money | getMoneyStyle }}</view>
+				</view>
+			</view>
+		</view>
+		<view class="navbar">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view> -->
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+		</view>
+		<swiper :current="tabCurrentIndex" :style="{ height: maxheight + 'px' }" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
 				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
 					<!-- 空白页 -->
 					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
 
 					<!-- 订单列表 -->
-					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
-						<view class="title-box">
-							<view class="title">
-								<text>{{ item.mark }}</text>
+					<view class="itemList" v-for="(items, indexs) in tabItem.orderList" :key="indexs">
+						<!-- <view class='font-size-lg padding-l-30 bg-gray padding-v-10'>
+							{{items.time}}
+						</view> -->
+						<view v-for="(item, index) in items.list" :key="index" class="order-item flex">
+							<view class="title-box">
+								<view class="title">
+									<text>{{ item.title }}</text>
+								</view>
+								<view class="time">
+									<text>{{ item.add_time }}</text>
+								</view>
 							</view>
-							<view class="time">
-								<text>{{ item.add_time }}</text>
+							<view class="money">
+								<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
 							</view>
 						</view>
-						<view class="money">
-							<text>{{ (item.pm == 0 ? '-' : '+') + item.number }}</text>
-						</view>
 					</view>
 					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
 				</scroll-view>
@@ -31,38 +48,120 @@
 </template>
 
 <script>
-	
-import { integrallist } from '@/api/integral.js';
+import { spreadCommission, userBalance, rechargemoneys } from '@/api/wallet.js';
+// import { mapState } from 'vuex';
+import { getMoneyStyle } from '@/utils/rocessor.js';
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
+// #ifdef H5
+import { weixindata } from '@/utils/wxAuthorized';
+// #endif
 export default {
+	filters: {
+		getMoneyStyle
+	},
+
 	components: {
 		empty,
 		uniLoadMore
 	},
+	// computed: {
+	// 	...mapState(['weichatObj'])
+	// },
 	onReady() {
-		
+		let obj = this;
+		// 初始化获取页面高度
+		uni.createSelectorQuery()
+			.select('.content')
+			.fields(
+				{
+					size: true
+				},
+				data => {
+					// 初始化获取头部高度
+					uni.createSelectorQuery()
+						.select('.content-money')
+						.fields(
+							{
+								size: true
+							},
+							es => {
+								// 保存头部高度
+								obj.maxheight = data.height - es.height - 40;
+							}
+						)
+						.exec();
+				}
+			)
+			.exec();
 	},
 	data() {
 		return {
+			// 头部图高度
+			maxheight: '',
 			tabCurrentIndex: 0,
 			navList: [
 				{
-					state: 0,
-					text: '全部',
+					state: 1,
+					text: '支出',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
+				{
+					state: 2,
+					text: '收入',
+					loadingType: 'more',
+					orderList: [],
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				}
 			],
+			money: ''
 		};
 	},
+	onLoad(options) {
+		let bool = uni.getStorageSync('weichatBrowser');
+		if (bool) {
+			// 加载微信信息
+			weixindata();
+		}
+	},
 	onShow() {
-		// 载入积分数据
 		this.loadData();
+		// 获取用户余额
+		userBalance({}).then(({ data }) => {
+			this.money = data.now_money;
+		});
 	},
 	methods: {
+		// ToChangeInto() {
+		// 	// #ifdef H5
+		// 	this.weichatObj.scanQRCode({
+		// 		needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+		// 		scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
+		// 		success: function(res) {
+		// 			let result = JSON.parse(res.resultStr);
+
+		// 			rechargemoneys({
+		// 				id: result.id,
+		// 				money: result.money
+		// 			})
+		// 				.then(({ data }) => {
+		// 					uni.showModal({
+		// 						title: '标题',
+		// 						content: '成功',
+		// 						showCancel: false
+		// 					});
+		// 				})
+		// 				.catch(e => {
+		// 					console.log(e);
+		// 				});
+		// 		}
+		// 	});
+		// 	// #endif
+		// },
 		// 页面跳转
 		navto(e) {
 			uni.navigateTo({
@@ -86,7 +185,7 @@ export default {
 			// 修改当前对象状态为加载中
 			navItem.loadingType = 'loading';
 
-			integrallist(
+			spreadCommission(
 				{
 					page: navItem.page,
 					limit: navItem.limit
@@ -96,6 +195,7 @@ export default {
 				.then(({ data }) => {
 					if (data.length > 0) {
 						navItem.orderList = navItem.orderList.concat(data);
+						console.log(navItem.orderList);
 						navItem.page++;
 					}
 					if (navItem.limit == data.length) {
@@ -113,7 +213,11 @@ export default {
 					console.log(e);
 				});
 		},
-
+		//返回上一页面
+		toBack() {
+			console.log(111);
+			uni.navigateBack({});
+		},
 		//swiper 切换
 		changeTab(e) {
 			this.tabCurrentIndex = e.target.current;
@@ -131,7 +235,76 @@ export default {
 page {
 	background: #ffffff;
 	height: 100%;
+	padding: 0;
+}
+.content-money {
+	padding-bottom: 30rpx;
+	background: $page-color-base;
 }
+.money-box {
+	background-color: $base-color;
+	padding-top: var(--status-bar-height);
+	height: 468rpx;
+	color: #ffffff;
+	text-align: center;
+	justify-content: center;
+	position: relative;
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 32rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.goback-box {
+			position: absolute;
+			z-index: 10;
+			left: 24rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+		.goback {
+			width: 30rpx;
+			height: 36rpx;
+		}
+	}
+	.bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.money {
+		position: relative;
+		z-index: 10;
+		font-size: 56rpx;
+		height: 388rpx;
+		line-height: 288rpx;
+	}
+}
+
 .navbar {
 	display: flex;
 	height: 40px;
@@ -167,7 +340,6 @@ page {
 // 列表
 
 .swiper-box {
-	height: calc(100% - 44px);
 	padding-top: 10rpx;
 	.order-item {
 		padding: 20rpx 30rpx;

pages/user/user.vue

@@ -125,10 +125,10 @@
 			<!-- 浏览历史 -->
 			<view class="history-section ">
 				<uni-list>
-					<uni-list-item v-if="isShowIllegality" title="我的推广" @click="navTo('/pages/wallet/wallet')" thumb="/static/user/tuiguang.png"></uni-list-item>
-					<uni-list-item title="邀请海报" @click="navTo('/pages/myteam/myteam')" thumb="/static/user/haibao.png"></uni-list-item>
+					<uni-list-item v-if="isShowIllegality" title="我的推广" @click="navTo('/pages/myteam/myteam')" thumb="/static/user/tuiguang.png"></uni-list-item>
+					<uni-list-item title="邀请海报" @click="navTo('/pages/shareQrCode/index')" thumb="/static/user/haibao.png"></uni-list-item>
 					<uni-list-item title="我的收藏" @click="navTo('/pages/favorites/favorites')" thumb="/static/user/collect.png"></uni-list-item>
-					<uni-list-item title="收货地址" @click="navTo('/pages/shareQrCode/index')" thumb="/static/user/address.png"></uni-list-item>
+					<uni-list-item title="收货地址" @click="navTo('/pages/address/address')" thumb="/static/user/address.png"></uni-list-item>
 					<uni-list-item title="商家入口" @click="navTo('/pages/merchant/merchant')" thumb="/static/user/shopping.png"></uni-list-item>
 				</uni-list>
 			</view>

pages/wallet/recharge.vue

@@ -1,11 +1,19 @@
 <template>
 	<view class="content">
+		<view class="yue">
+			<view class="font">当前余额</view>
+			<view class="money">￥{{ nowmoney | getMoneyStyle }}</view>
+		</view>
 		<view class="row-box">
 			<view class="title">充值金额</view>
 			<view class="row">
 				<text class="tit">￥</text>
 				<input class="input" type="number" v-model="money" placeholder="请输入充值金额" placeholder-class="placeholder" />
 			</view>
+			<view class="xian"></view>
+			<view class="moneyBtn-box">
+				<view class="moneyBtn" v-for="(item, index) in moneyList" :class="{ current: choose == index }" :key="index" @click="changemoney(item, index)">{{ item }}元</view>
+			</view>
 		</view>
 
 		<view class="list" v-if="!weichatBsrowser">
@@ -32,7 +40,7 @@
 				</label>
 			</radio-group>
 		</view>
-		<button class="add-btn up" :class="{ 'active-bg': payLoding }" @click="!payLoding ? confirm() : ''">确认充值</button>
+		<button class="add-btn up" :class="{ 'active-bg': payLoding }" @click="!payLoding ? confirm() : ''">立即充值</button>
 	</view>
 </template>
 
@@ -46,6 +54,8 @@ export default {
 	},
 	data() {
 		return {
+			moneyList: [300, 200, 150, 100, 50],
+			choose: -1,
 			// #ifdef APP-PLUS
 			type: 'weixinapp',
 			// #endif
@@ -164,6 +174,10 @@ export default {
 				//判断是否还有数据， 有改为 more， 没有改为noMore
 				navItem.loadingType = 'more';
 			}, 600);
+		},
+		changemoney(item, index) {
+			this.choose = index;
+			this.money = item;
 		}
 	}
 };
@@ -173,7 +187,24 @@ export default {
 page {
 	height: 100%;
 }
-
+.yue {
+	display: flex;
+	justify-content: space-between;
+	padding: 30rpx 48rpx 30rpx 26rpx;
+	background: #ffffff;
+	.font {
+		font-size: 28rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #333333;
+	}
+	.money {
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #FF6F0F;
+	}
+}
 .add-btn {
 	&.modified {
 		color: $base-color;
@@ -195,7 +226,7 @@ page {
 }
 .row-box {
 	margin-top: 30rpx;
-	padding: 20rpx 30rpx;
+	padding: 20rpx 0rpx 20rpx 30rpx;
 	background: #fff;
 	.title {
 		font-size: $font-base + 2rpx;
@@ -227,6 +258,27 @@ page {
 			font-size: $font-base;
 		}
 	}
+	.xian {
+		width: 700rpx;
+		height: 1rpx;
+		background: #e6e6e6;
+		margin-bottom: 16rpx;
+	}
+	.moneyBtn-box {
+		display: flex;
+		justify-content: flex-start;
+		flex-wrap: wrap;
+		.moneyBtn {
+			margin-right: 30rpx;
+			width: 210rpx;
+			height: 70rpx;
+			background: #f0f0f0;
+			border-radius: 4px;
+			margin-top: 30rpx;
+			text-align: center;
+			line-height: 70rpx;
+		}
+	}
 }
 .list {
 	padding-left: 30rpx;
@@ -270,4 +322,8 @@ page {
 .active-bg {
 	background-color: $color-gray !important;
 }
+.current {
+	background: $base-color!important;
+	color: #fff;
+}
 </style>

pages/wallet/wallet.vue

@@ -1,26 +1,16 @@
 <template>
 	<view class="content">
 		<view class="content-money">
-			<view class="money-box flex">
+			<view class="money-box">
+				<view class="bg"><image src="../../static/img/money.png" mode=""></image></view>
+				<view class="body-title">
+					<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
+					<view class="header">我的余额</view>
+				</view>
 				<view>
-					<view class="text">余额（元）</view>
 					<view class="money">{{ money | getMoneyStyle }}</view>
 				</view>
 			</view>
-			<view class="moneyTx" @click="navto('/pages/wallet/recharge')">充值</view>
-			<view class="moneyTxs" @click="navto('/pages/wallet/withdrawal')">提现</view>
-			<!-- <view class="moneyTxss" @click="ToChangeInto">转入</view> -->
-			<!-- <view class="flex buttom-box">
-				<view class="buttom" @click="ToChangeInto">
-					<view class="icon"><image class="icon-img" src="/static/icon/i1.png" mode="aspectFit"></image></view>
-					<text>收款</text>
-				</view>
-				<view class="buttom" @click="navto('/pages/coupon/details')">
-					<view class="icon"><image class="icon-img" src="/static/icon/i5.png" mode="aspectFit"></image></view>
-					<text>付款</text>
-				</view>
-				<view class="interval"></view>
-			</view> -->
 		</view>
 		<view class="navbar">
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
@@ -54,6 +44,7 @@
 				</scroll-view>
 			</swiper-item>
 		</swiper>
+		<view class="btn" @click="navto('/pages/wallet/recharge')">立即充值</view>
 	</view>
 </template>
 
@@ -223,7 +214,11 @@ export default {
 					console.log(e);
 				});
 		},
-
+		//返回上一页面
+		toBack() {
+			console.log(111);
+			uni.navigateBack({});
+		},
 		//swiper 切换
 		changeTab(e) {
 			this.tabCurrentIndex = e.target.current;
@@ -246,86 +241,68 @@ page {
 .content-money {
 	padding-bottom: 30rpx;
 	background: $page-color-base;
-	.moneyTx {
-		position: absolute;
-		top: 150rpx;
-		right: 0rpx;
-		width: 150rpx;
-		padding: 10rpx 30rpx;
-		border: 2px solid #ffffff;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #ffffff;
-		line-height: 1;
-		font-size: $font-base;
-	}
-
-	.moneyTxs {
-		position: absolute;
-		top: 210rpx;
-		right: 0rpx;
-		width: 150rpx;
-		padding: 10rpx 30rpx;
-		border: 2px solid #ffffff;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #ffffff;
-		line-height: 1;
-		font-size: $font-base;
-	}
-
-	.moneyTxss {
-		position: absolute;
-		top: 270rpx;
-		right: 0rpx;
-		width: 150rpx;
-		padding: 10rpx 30rpx;
-		border: 2px solid #ffffff;
-		border-top-left-radius: 99rpx;
-		border-bottom-left-radius: 99rpx;
-		color: #ffffff;
-		line-height: 1;
-		font-size: $font-base;
-	}
-	.buttom-box {
-		background-color: #ffffff;
-		text-align: center;
-		margin: 0 30rpx;
-		padding: 20rpx 0;
-		border-radius: $border-radius-sm;
-		margin-top: -60rpx;
-		.buttom {
-			font-size: $font-lg;
-			flex-grow: 1;
-		}
-		.interval {
-			width: 2px;
-			height: 60rpx;
-			background-color: #eeeeee;
-		}
-		.icon {
-			height: 50rpx;
-			width: 48rpx;
-			margin: 0 auto;
-			.icon-img {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
 }
 .money-box {
 	background-color: $base-color;
 	padding-top: var(--status-bar-height);
-	height: 368rpx;
+	height: 468rpx;
 	color: #ffffff;
 	text-align: center;
 	justify-content: center;
-	.text {
-		font-size: $font-sm;
+	position: relative;
+	.body-title {
+		height: 80rpx;
+		text-align: center;
+		font-size: 35rpx;
+		position: relative;
+		.header {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #fffeff;
+			height: 80rpx;
+			font-size: 32rpx;
+			font-weight: 700;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.goback-box {
+			position: absolute;
+			z-index: 10;
+			left: 24rpx;
+			top: 0;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+		}
+		.goback {
+			width: 30rpx;
+			height: 36rpx;
+		}
+	}
+	.bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		image {
+			width: 100%;
+			height: 100%;
+		}
 	}
 	.money {
+		position: relative;
+		z-index: 10;
 		font-size: 56rpx;
+		height: 388rpx;
+		line-height: 288rpx;
 	}
 }
 
@@ -393,4 +370,20 @@ page {
 		background-color: #ffffff;
 	}
 }
+.btn {
+	position: fixed;
+	bottom: 40rpx;
+	left: 50%;
+	width: 674rpx;
+	height: 88rpx;
+	background: #52c696;
+	border-radius: 44rpx;
+	margin-left: -337rpx;
+	font-size: 36rpx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	text-align: center;
+	line-height: 88rpx;
+	color: #ffffff;
+}
 </style>