2021-5-24 change user

pages.json

@@ -1,535 +1,547 @@
-{
-	"pages": [{
-			"path": "pages/index/index",
-			"style": {
-				"enablePullDownRefresh": true,
-				// #ifdef MP
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent",
-						"searchInput": {
-							"backgroundColor": "rgba(231, 231, 231,.7)",
-							"borderRadius": "16px",
-							"placeholder": "搜索关键字",
-							"disabled": true,
-							"placeholderColor": "#606266",
-							"align": "center"
-						},
-						"buttons": [{
-								"fontSrc": "/static/yticon.ttf",
-								"text": "\ue60d",
-								"fontSize": "26",
-								"color": "#303133",
-								"float": "left",
-								"background": "rgba(0,0,0,0)"
-							},
-							{
-								"fontSrc": "/static/yticon.ttf",
-								"text": "\ue744",
-								"fontSize": "27",
-								"color": "#303133",
-								"background": "rgba(0,0,0,0)"
-							}
-						]
-					}
-				},
-				// #endif
-				"navigationBarTitleText": "商城首页"
-			}
-		},
-		{
-			"path": "pages/index/sign",
-			"style": {
-				"navigationBarTitleText": "每日签到",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},{
-			"path": "pages/public/register",
-			"style": {
-				"navigationBarTitleText": "注册",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		}, {
-			"path": "pages/public/login",
-			"style": {
-				"navigationBarTitleText": "登录",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/public/wxLogin",
-			"style": {
-				"navigationBarTitleText": "微信登录",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/public/forget",
-			"style": {
-				"navigationBarTitleText": "忘记密码",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/product/groupBooking/index",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "超值拼团"
-			}
-		},
-		{
-			"path": "pages/product/groupBooking/detail",
-			"style": {
-				"navigationBarTitleText": "拼团列表",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/product/groupBooking/productCollage",//拼团商品
-			"style": {
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				},
-				"navigationBarTitleText":"商品详情"
-			}
-		},
-		{
-			"path": "pages/product/groupBooking/inviteImg",
-			"style": {
-				"navigationBarTitleText": "拼团邀请图",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/product/groupBooking/productGroup",
-			"style": {
-				"navigationBarTitleText": "拼团详情展示",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		// {
-		// 	"path": "pages/product/groupBooking/groupdetails",
-		// 	"style": {
-		// 		"navigationBarTitleText": "拼团详情",
-		// 		"app-plus": {
-		// 			"titleNView": false
-		// 		}
-		// 	}
-		// },
-		{
-			"path": "pages/product/reply",
-			"style": {
-				"navigationBarTitleText": "商品评价",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/product/product",
-			"style": {
-				"navigationBarTitleText": "详情展示",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/product/seckill",
-			"style": {
-				"navigationBarTitleText": "限时秒杀"
-			}
-		},
-		{
-			"path": "pages/product/list",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "商品列表"
-			}
-		},
-		{
-			"path": "pages/product/search",
-			"style": {
-				"enablePullDownRefresh": true,
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP || APP-PLUS
-				"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/product/classify",
-			"style": {
-				"navigationStyle": "custom",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/set/set",
-			"style": {
-				"navigationBarTitleText": "设置"
-			}
-		},
-		{
-			"path": "pages/set/address",
-			"style": {
-				"navigationBarTitleText": "收货地址"
-			}
-		},
-		{
-			"path": "pages/set/addressManage",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/set/phone",
-			"style": {
-				"navigationBarTitleText": "实名认证"
-			}
-		},
-		{
-			"path": "pages/set/password",
-			"style": {
-				"navigationBarTitleText": "修改密码"
-			}
-		},
-		{
-			"path": "pages/set/userinfo",
-			"style": {
-				"navigationBarTitleText": "修改资料"
-			}
-		}, {
-			"path": "pages/cart/cart",
-			"style": {
-				"navigationBarTitleText": "购物车"
-			}
-		},
-		
-		{
-			"path": "pages/user/user",
-			"style": {
-				// #ifndef MP-WEIXIN
-				"navigationStyle": "custom",
-				// "app-plus": {
-				// 	"bounce": "none",
-				// 	"titleNView": {
-				// 		"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/user/award",
-			"style": {
-				"navigationBarTitleText": "奖励明细",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/user/withdrawal",
-			"style": {
-				"navigationBarTitleText": "奖励提现"
-			}
-		},
-		{
-			"path": "pages/user/notice",
-			"style": {
-				"navigationBarTitleText": "通知"
-			}
-		},
-		{
-			"path": "pages/user/favorites",
-			"style": {
-				"navigationBarTitleText": "收藏夹"
-			}
-		}, {
-			"path": "pages/user/coupon",
-			"style": {
-				"navigationBarTitleText": "我的卡卷"
-			}
-		},
-		{
-			"path": "pages/user/scoreAccumulate",
-			"style": {
-				"navigationBarTitleText": "积分明细"
-			}
-		},
-		{
-			"path": "pages/order/order",
-			"style": {
-				"navigationBarTitleText": "我的订单",
-				"app-plus": {
-					"bounce": "none"
-				}
-			}
-		},
-		{
-			"path": "pages/order/expressInfo",
-			"style": {
-				"navigationBarTitleText": "快递详情"
-			}
-		},
-		{
-			"path": "pages/order/orderDetail",
-			"style": {
-				"navigationBarTitleText": "订单详情",
-				"app-plus": {
-					"bounce": "none"
-				}
-			}
-		},
-		{
-			"path": "pages/order/evaluate",
-			"style": {
-				"navigationBarTitleText": "评论"
-			}
-		},
-		{
-			"path": "pages/order/orderRefund",
-			"style": {
-				"navigationBarTitleText": "申请退款"
-			}
-		},
-		{
-			"path": "pages/order/createOrder",
-			"style": {
-				"navigationBarTitleText": "创建订单"
-			}
-		},  {
-			"path": "pages/money/pay",
-			"style": {
-				"navigationBarTitleText": "支付"
-			}
-		},
-		{
-			"path": "pages/money/paySuccess",
-			"style": {
-				"navigationBarTitleText": "支付成功"
-			}
-		},
-		{
-			"path": "pages/money/wallet",
-			"style": {
-				"navigationBarTitleText": "我的钱包",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/money/account",
-			"style": {
-				"navigationBarTitleText": "提现账号"
-			}
-		},
-		{
-			"path": "pages/money/withdrawal",
-			"style": {
-				"navigationBarTitleText": "提现"
-			}
-		},
-		{
-			"path": "pages/money/recharge",
-			"style": {
-				"navigationBarTitleText": "充值"
-			}
-		},
-		{
-			"path": "pages/category/category",
-			"style": {
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP
-				"app-plus": {
-					"bounce": "none",
-					"titleNView": {
-						"searchInput": {
-							"backgroundColor": "rgba(231, 231, 231,.7)",
-							"borderRadius": "16px",
-							"placeholder": "商品搜索",
-							"disabled": true,
-							"placeholderColor": "#606266",
-							"align": "left"
-						}
-					}
-				},
-				// #endif
-				"navigationBarTitleText": "分类"
-			}
-		},
-		{
-			"path": "pages/redirect/redirect",
-			"style": {
-				"navigationBarTitleText": "微信登录跳转页面",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/user/shareQrCode",
-			"style": {
-				"navigationBarTitleText": "邀请好友"
-			}
-		}
-	],
-	"subPackages": [
-		{
-			"root": "pages/activity",
-			"name": "activity",
-			"pages":[{
-					"path": "goods_bargain/index",
-					"style": {
-						"navigationStyle": "custom"
-						// #ifdef MP
-						,"navigationBarTextStyle": "#fff"
-						// #endif
-					}
-				},
-				{
-					"path": "goods_bargain_details/index",
-					"style": {
-						"navigationStyle": "custom"
-						// #ifdef MP
-						,"navigationBarTextStyle": "#fff"
-						// #endif
-					}
-				},
-				{
-					"path": "bargain/index",
-					"style": {
-						"navigationBarTitleText": "砍价记录"
-					}
-				}
-			]
-		}
-	],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#FFFFFF",
-		"backgroundColor": "#f8f8f8"
-	},
-	"tabBar": {
-		"color": "#C0C4CC",
-		"selectedColor": "#901B21",
-		"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": [{
+			"path": "pages/index/index",
+			"style": {
+				"enablePullDownRefresh": true,
+				// #ifdef MP
+				"navigationStyle": "custom",
+				// #endif
+				// #ifndef MP
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent",
+						"searchInput": {
+							"backgroundColor": "rgba(231, 231, 231,.7)",
+							"borderRadius": "16px",
+							"placeholder": "搜索关键字",
+							"disabled": true,
+							"placeholderColor": "#606266",
+							"align": "center"
+						},
+						"buttons": [{
+								"fontSrc": "/static/yticon.ttf",
+								"text": "\ue60d",
+								"fontSize": "26",
+								"color": "#303133",
+								"float": "left",
+								"background": "rgba(0,0,0,0)"
+							},
+							{
+								"fontSrc": "/static/yticon.ttf",
+								"text": "\ue744",
+								"fontSize": "27",
+								"color": "#303133",
+								"background": "rgba(0,0,0,0)"
+							}
+						]
+					}
+				},
+				// #endif
+				"navigationBarTitleText": "商城首页"
+			}
+		},
+		{
+			"path": "pages/index/sign",
+			"style": {
+				"navigationBarTitleText": "每日签到",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},{
+			"path": "pages/public/register",
+			"style": {
+				"navigationBarTitleText": "注册",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		}, {
+			"path": "pages/public/login",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/public/wxLogin",
+			"style": {
+				"navigationBarTitleText": "微信登录",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/public/forget",
+			"style": {
+				"navigationBarTitleText": "忘记密码",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/product/groupBooking/index",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "超值拼团",
+				"navigationBarBackgroundColor": "#901b21",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/product/groupBooking/detail",
+			"style": {
+				"navigationBarTitleText": "拼团列表",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/product/groupBooking/productCollage",//拼团商品
+			"style": {
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				},
+				"navigationBarTitleText":"商品详情"
+			}
+		},
+		{
+			"path": "pages/product/groupBooking/inviteImg",
+			"style": {
+				"navigationBarTitleText": "拼团邀请图",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/product/groupBooking/productGroup",
+			"style": {
+				"navigationBarTitleText": "拼团详情展示",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		// {
+		// 	"path": "pages/product/groupBooking/groupdetails",
+		// 	"style": {
+		// 		"navigationBarTitleText": "拼团详情",
+		// 		"app-plus": {
+		// 			"titleNView": false
+		// 		}
+		// 	}
+		// },
+		{
+			"path": "pages/product/reply",
+			"style": {
+				"navigationBarTitleText": "商品评价",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/product/product",
+			"style": {
+				"navigationBarTitleText": "详情展示",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/product/seckill",
+			"style": {
+				"navigationBarTitleText": "限时秒杀",
+				"navigationBarBackgroundColor": "#901b21",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/product/pointsExchange",
+			"style": {
+				"navigationBarTitleText": "积分兑换",
+				"navigationBarBackgroundColor": "#901b21",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/product/list",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "商品列表"
+			}
+		},
+		{
+			"path": "pages/product/search",
+			"style": {
+				"enablePullDownRefresh": true,
+				// #ifdef APP-PLUS
+				"navigationStyle": "custom",
+				// #endif
+				// #ifndef MP || APP-PLUS
+				"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/product/classify",
+			"style": {
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/set/set",
+			"style": {
+				"navigationBarTitleText": "设置"
+			}
+		},
+		{
+			"path": "pages/set/address",
+			"style": {
+				"navigationBarTitleText": "收货地址"
+			}
+		},
+		{
+			"path": "pages/set/addressManage",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/set/phone",
+			"style": {
+				"navigationBarTitleText": "实名认证"
+			}
+		},
+		{
+			"path": "pages/set/password",
+			"style": {
+				"navigationBarTitleText": "修改密码"
+			}
+		},
+		{
+			"path": "pages/set/userinfo",
+			"style": {
+				"navigationBarTitleText": "修改资料"
+			}
+		}, {
+			"path": "pages/cart/cart",
+			"style": {
+				"navigationBarTitleText": "购物车"
+			}
+		},
+		
+		{
+			"path": "pages/user/user",
+			"style": {
+				// #ifndef MP-WEIXIN
+				"navigationStyle": "custom",
+				// "app-plus": {
+				// 	"bounce": "none",
+				// 	"titleNView": {
+				// 		"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/user/award",
+			"style": {
+				"navigationBarTitleText": "奖励明细",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/user/withdrawal",
+			"style": {
+				"navigationBarTitleText": "奖励提现"
+			}
+		},
+		{
+			"path": "pages/user/notice",
+			"style": {
+				"navigationBarTitleText": "通知"
+			}
+		},
+		{
+			"path": "pages/user/favorites",
+			"style": {
+				"navigationBarTitleText": "收藏夹"
+			}
+		}, {
+			"path": "pages/user/coupon",
+			"style": {
+				"navigationBarTitleText": "我的卡卷"
+			}
+		},
+		{
+			"path": "pages/user/scoreAccumulate",
+			"style": {
+				"navigationBarTitleText": "积分明细"
+			}
+		},
+		{
+			"path": "pages/order/order",
+			"style": {
+				"navigationBarTitleText": "我的订单",
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/order/expressInfo",
+			"style": {
+				"navigationBarTitleText": "快递详情"
+			}
+		},
+		{
+			"path": "pages/order/orderDetail",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/order/evaluate",
+			"style": {
+				"navigationBarTitleText": "评论"
+			}
+		},
+		{
+			"path": "pages/order/orderRefund",
+			"style": {
+				"navigationBarTitleText": "申请退款"
+			}
+		},
+		{
+			"path": "pages/order/createOrder",
+			"style": {
+				"navigationBarTitleText": "创建订单"
+			}
+		},  {
+			"path": "pages/money/pay",
+			"style": {
+				"navigationBarTitleText": "支付"
+			}
+		},
+		{
+			"path": "pages/money/paySuccess",
+			"style": {
+				"navigationBarTitleText": "支付成功"
+			}
+		},
+		{
+			"path": "pages/money/wallet",
+			"style": {
+				"navigationBarTitleText": "我的钱包",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/money/account",
+			"style": {
+				"navigationBarTitleText": "提现账号"
+			}
+		},
+		{
+			"path": "pages/money/withdrawal",
+			"style": {
+				"navigationBarTitleText": "提现"
+			}
+		},
+		{
+			"path": "pages/money/recharge",
+			"style": {
+				"navigationBarTitleText": "充值"
+			}
+		},
+		{
+			"path": "pages/category/category",
+			"style": {
+				// #ifdef APP-PLUS
+				"navigationStyle": "custom",
+				// #endif
+				// #ifndef MP
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": {
+						"searchInput": {
+							"backgroundColor": "rgba(231, 231, 231,.7)",
+							"borderRadius": "16px",
+							"placeholder": "商品搜索",
+							"disabled": true,
+							"placeholderColor": "#606266",
+							"align": "left"
+						}
+					}
+				},
+				// #endif
+				"navigationBarTitleText": "分类"
+			}
+		},
+		{
+			"path": "pages/redirect/redirect",
+			"style": {
+				"navigationBarTitleText": "微信登录跳转页面",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/user/shareQrCode",
+			"style": {
+				"navigationBarTitleText": "邀请好友"
+			}
+		}
+	],
+	"subPackages": [
+		{
+			"root": "pages/activity",
+			"name": "activity",
+			"pages":[{
+					"path": "goods_bargain/index",
+					"style": {
+						"navigationStyle": "custom"
+						// #ifdef MP
+						,"navigationBarTextStyle": "#fff"
+						// #endif
+					}
+				},
+				{
+					"path": "goods_bargain_details/index",
+					"style": {
+						"navigationStyle": "custom"
+						// #ifdef MP
+						,"navigationBarTextStyle": "#fff"
+						// #endif
+					}
+				},
+				{
+					"path": "bargain/index",
+					"style": {
+						"navigationBarTitleText": "砍价记录"
+					}
+				}
+			]
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#FFFFFF",
+		"backgroundColor": "#f8f8f8"
+	},
+	"tabBar": {
+		"color": "#C0C4CC",
+		"selectedColor": "#901B21",
+		"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/index/index.vue

@@ -36,7 +36,7 @@
 		<!-- 秒杀title -->
 		<view class="m-tap">
 			<image src="../../static/img/seckill.png" mode=""></image>
-			<text class="iconfont iconenter" @click="loadMore()">更多</text>
+			<text class="iconfont iconenter" @click="loadMore('/pages/product/seckill')">更多</text>
 		</view>
 		<!-- 秒杀商品 -->
 		<view class="sckill-wrapper">
@@ -80,7 +80,7 @@
 		<!-- 超值拼团title -->
 		<view class="m-tap">
 			<image src="../../static/img/groupBooking.png" mode=""></image>
-			<text class="iconfont iconenter" @click="loadMore()">更多</text>
+			<text class="iconfont iconenter" @click="loadMore('/pages/product/groupBooking/index')">更多</text>
 		</view>
 		<!-- 超值拼团商品 -->
 		<view class="groupBooking-wrapper">
@@ -147,7 +147,7 @@
 		<!-- 积分兑换title -->
 		<view class="m-tap">
 			<image src="../../static/img/exchange.png" mode=""></image>
-			<text class="iconfont iconenter" @click="loadMore()">更多</text>
+			<text class="iconfont iconenter" @click="loadMore('/pages/product/pointsExchange')">更多</text>
 		</view>
 		<!-- 积分兑换商品 -->
 		<view class="exchange-wrapper">
@@ -812,8 +812,11 @@ export default {
 				url: item.wap_url
 			});
 		},
-		loadMore() {
+		loadMore(url) {
 			console.log('加载更多');
+			uni.navigateTo({
+				url: url
+			});
 		}
 	}
 };

pages/product/pointsExchange.vue

@@ -0,0 +1,140 @@
+<template>
+	<view class="exchange-wrapper">
+		<view class="exgood-wrapper">
+			<view class="ex-img-wrapper"><image src="../../static/img/ex1.jpg" mode=""></image></view>
+			<view class="exgood-title">湿热肝上火气肺痰煲湿热肝上火气肺痰煲</view>
+			<view class="ex-addr">
+				<image src="../../static/img/shop.png" mode="" class="name-img"></image>
+				子臣台州旗舰店
+				<image src="../../static/img/point.png" mode="" class="point-img"></image>
+				200m
+			</view>
+			<view class="ex-price">
+				￥26+20
+				<text class="tx1">积分</text>
+				<text class="tx2">￥99</text>
+			</view>
+		</view>
+		<view class="exgood-wrapper">
+			<view class="ex-img-wrapper"><image src="../../static/img/ex1.jpg" mode=""></image></view>
+			<view class="exgood-title">湿热肝上火气肺痰煲湿热肝上火气肺痰煲</view>
+			<view class="ex-addr">
+				<image src="../../static/img/shop.png" mode="" class="name-img"></image>
+				子臣台州旗舰店
+				<image src="../../static/img/point.png" mode="" class="point-img"></image>
+				200m
+			</view>
+			<view class="ex-price">
+				￥26+20
+				<text class="tx1">积分</text>
+				<text class="tx2">￥99</text>
+			</view>
+		</view>
+		<view class="exgood-wrapper">
+			<view class="ex-img-wrapper"><image src="../../static/img/ex1.jpg" mode=""></image></view>
+			<view class="exgood-title">湿热肝上火气肺痰煲湿热肝上火气肺痰煲</view>
+			<view class="ex-addr">
+				<image src="../../static/img/shop.png" mode="" class="name-img"></image>
+				子臣台州旗舰店
+				<image src="../../static/img/point.png" mode="" class="point-img"></image>
+				200m
+			</view>
+			<view class="ex-price">
+				￥26+20
+				<text class="tx1">积分</text>
+				<text class="tx2">￥99</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style lang="scss">
+	.exchange-wrapper {
+		// background-color: #fff;
+		width: 696rpx;
+		// height: 100rpx;
+		margin: 28rpx auto 39rpx;
+		// padding: 0 27rpx;
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+		flex-wrap: wrap;
+		.exgood-wrapper {
+			width: 342rpx;
+			height: 540rpx;
+			box-shadow: 0px 4px 18px 0px rgba(144, 27, 33, 0.13);
+			margin-bottom: 20rpx;
+			.ex-img-wrapper {
+				width: 342rpx;
+				height: 338rpx;
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.exgood-title {
+				margin-top: 33rpx;
+				padding-left: 21rpx;
+				font-size: 30rpx;
+				font-weight: bold;
+				color: #333333;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+			.ex-addr {
+				margin-top: 16rpx;
+				padding-left: 22rpx;
+				height: 22rpx;
+				font-size: 22rpx;
+				font-weight: 500;
+				color: #dcb876;
+				image {
+					height: 22rpx;
+				}
+				.name-img {
+					width: 26rpx;
+					margin: 0 4rpx -3rpx 0;
+				}
+				.point-img {
+					width: 16rpx;
+					margin: 0 4rpx -3rpx 14rpx;
+				}
+			}
+			.ex-price {
+				margin-top: 17rpx;
+				padding-left: 22rpx;
+				font-size: 36rpx;
+				font-weight: bold;
+				color: #901b21;
+				vertical-align: bottom;
+				.tx1 {
+					font-size: 24rpx;
+					vertical-align: baseline;
+					position: relative;
+					top: -2rpx;
+				}
+				.tx2 {
+					margin-left: 9rpx;
+					font-size: 26rpx;
+					font-weight: 500;
+					text-decoration: line-through;
+					color: #9d9d9d;
+					line-height: 35rpx;
+				}
+			}
+			.bg {
+				position: absolute;
+				top: 0;
+				width: 342rpx;
+				height: 540rpx;
+				background-image: url(../../static/img/bg3.png);
+				background-size: 100% 100%;
+			}
+		}
+	}
+	
+</style>

pages/product/seckill.vue

@@ -1,403 +1,411 @@
-<template>
-	<view class="seckillBox">
-		<scroll-view scroll-x="true" class="class-box flex b-t" :scroll-left="scrollLeft" :scroll-with-animation="true">
-			<view @click="tabClass(idx)" class="item" :style="{ width: topNavWidth }" v-for="(item, idx) in indexList" :key="idx">
-				<view class="time" :class="{ action: idx == classIndex }">{{ item.time }}</view>
-				<view class="status" :class="{ action: idx == classIndex }">{{ item.state }}</view>
-			</view>
-		</scroll-view>
-		<swiper class="list-Box" :current="classIndex" @change="swiperChange" duration="500">
-			<swiper-item class="list-item" v-for="(ls, idx) in indexList">
-				<view class=" b-b position-relative">
-					<view class="title-box flex ">
-						<view class="title-box-left">
-							<text v-if="ls.status == 1">抢购中先下先得哦！</text>
-							<text v-if="ls.status == 2">精品好货即将开抢！</text>
-							<text v-if="ls.status == 0">本场已结束，下次早点来哦！</text>
-						</view>
-						<view class="title-box-right flex">
-							<text class="tip" v-if="ls.status == 1">距离结束</text>
-							<text class="tip" v-if="ls.status == 2">距离开始</text>
-							<uni-countdown
-								color="#F9F9F8"
-								background-color="#666666"
-								v-if="ls.status == 1 || ls.status == 2"
-								:show-day="false"
-								:hour="ls.stopTimeH"
-								:minute="ls.stopTimeM"
-								:second="ls.stopTimeS"
-							></uni-countdown>
-						</view>
-					</view>
-				</view>
-				<scroll-view scroll-y="true" class="list" @scrolltolower="getList(classIndex)">
-					<view class="goodsList-item flex" :key="ind" v-for="(lss, ind) in ls.dataList">
-						<image :src="lss.image" lazy-load mode="scaleToFill"></image>
-						<view class="goodsList-content">
-							<view class="title clamp">
-								<text>{{ lss.title }}</text>
-							</view>
-							<view class="slider flex">
-								<view class="slider-box"><view class="slider-action" :style="{ width: lss.percent + '%' }"></view></view>
-								<view class="sales-nub">已抢{{ lss.percent + '%' }}</view>
-							</view>
-							<view class="goods-money flex">
-								<view class="money-box">
-									<view class="money">
-										<text class="font-size-sm">￥</text>
-										{{ lss.price }}
-									</view>
-									<view class="otMoney-box">
-										<text class="otMoney">￥{{ lss.ot_price }}</text>
-									</view>
-								</view>
-								<view @click="navProduct(ls, ind)" class="cart" :class="{ 'seckill-action': ls.status == 1 }">
-									{{ ls.status == 1 ? '去抢购' : ls.status == 2 ? '未开始' : '已结束' }}
-								</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="ls.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import { getSeckillList, getSeckillClass } from '@/api/product.js';
-import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
-import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import { timeComputed } from '@/utils/rocessor.js';
-export default {
-	components: {
-		uniCountdown,
-		uniLoadMore
-	},
-	data() {
-		return {
-			indexList: [], //分类列表
-			showTime: '', //显示的时间
-			showTImeId: '', //显示时间id用于查询数据
-			// 判断是否所有活动已经结束
-			stop: false, //活动是否已经结束
-			show: false, //是否显示活动
-			status: 0, //获取状态值1为有活动开始中 2为活动未开始 0为活动已经结束
-			topNavWidth: '25%', //设置导航默认宽度
-			classIndex: 0, //当前进行中的活动
-			itemWidht: 0 //顶部分类宽度
-		};
-	},
-	computed: {
-		// 计算左侧距离
-		scrollLeft() {
-			if (this.classIndex > 1) {
-				return this.itemWidht * (this.classIndex - 1.5);
-			} else {
-				return 0;
-			}
-		}
-	},
-	onLoad: function(e) {
-		// 载入分类
-		this.getClass();
-	},
-	methods: {
-		//抢购时间切换时触发效果
-		swiperChange(e) {
-			this.classIndex = e.target.current;
-			this.getList(this.classIndex, 'tabChange');
-		},
-		// 获取项目宽度
-		numClassWidht() {
-			uni.createSelectorQuery()
-				.select('.seckillBox')
-				.fields(
-					{
-						size: true
-					},
-					data => {
-						// 设置项目宽度
-						this.itemWidht = Math.floor((data.width / 750) * 187.5);
-					}
-				)
-				.exec();
-		},
-		// 切换当前选中的秒杀活动
-		tabClass(ind) {
-			// 保存当前选中的对象
-			this.classIndex = ind;
-		},
-		// 跳转到商品详情
-		navProduct(ls, ind) {
-			if (ls.status == 1) {
-				let data = ls.dataList[ind];
-
-				uni.navigateTo({
-					url: '/pages/product/product?id=' + data.id + '&type=1'
-				});
-			}
-		},
-		// 获取商品
-		getList(ind, source) {
-			// 获取数据对象
-			let date = this.indexList[ind];
-			console.log(date, source);
-			if (source === 'tabChange' && date.loaded === true) {              
-				//tab切换只有第一次需要加载数据
-				return;
-			}
-			if (date.loadingType === 'noMore') {
-				//防止重复加载
-				return;
-			}
-			if (date.loadingType === 'loading') {
-				//防止重复加载
-				return;
-			}
-			// 修改当前对象状态为加载中
-			date.loadingType = 'loading';
-			getSeckillList(
-				{
-					page: date.page,
-					limit: date.limit
-				},
-				date.id
-			)
-				.then(e => {
-					date.dataList.push(...e.data);
-					// 查询翻页增加
-					date.page++;
-					// 判断是否可以继续加载
-					if (date.limit == e.data.length) {
-						date.loadingType = 'more';
-					} else {
-						date.loadingType = 'noMore';
-					}
-					// 设置当前数据已加载完毕
-					this.$set(date, 'loaded', true);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		// 获取秒杀时间段
-		getClass() {
-			let obj = this;
-			getSeckillClass({})
-				.then(({ data }) => {
-					obj.indexList = data.seckillTime.map((e, ind) => {
-						// 初始化翻页页数
-						e.page = 1;
-						// 初始每次加载的数据条数
-						e.limit = 6;
-						// 创建储存订单数据
-						e.dataList = [];
-						// 初始化加载
-						e.loadingType = 'more';
-						let ar = e;
-						// 判断是否为进行中的活动
-						if (ar.status === 1) {
-							// 计算倒计时时间
-							obj.timeComputed(ar.stop * 1000, ar);
-						} else {
-							// 获取距离开始还需要多少时间
-							let arTime = ar.time.split(':');
-							let h = arTime[0];
-							let m = arTime[1];
-							let time = new Date();
-							// 设置时间
-							time.setHours(h, m, 0);
-							// 计算倒计时时间
-							obj.timeComputed(time.getTime(), ar);
-						}
-
-						return e;
-					});
-					// 获取当前活动中的下标值
-					obj.classIndex = data.seckillTimeIndex;
-					// 获取当前显示中对象的数据
-					obj.$nextTick(() => {
-						obj.getList(obj.classIndex);
-					});
-					if (obj.indexList.length <= 4) {
-						// 当数量小于等于4的时候自适应宽度
-						obj.topNavWidth = 100 / obj.indexList.length + '%';
-					} else {
-						// 页面渲染完毕后加载scroll-view左侧距离
-						obj.$nextTick(() => {
-							obj.numClassWidht();
-						});
-					}
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		// 计算倒计时时间
-		timeComputed(da, ar) {
-			let obj = this;
-			// 计算时间，保存需要多少时间到期
-			let stopTime = timeComputed(da);
-			console.log(stopTime);
-			ar.stopTimeH = stopTime.hours;
-			ar.stopTimeM = stopTime.minutes;
-			ar.stopTimeS = stopTime.seconds;
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page,
-.seckillBox {
-	min-height: 100%;
-	height: 100%;
-}
-// 头部时间段样式
-.class-box {
-	white-space: nowrap;
-	height: 60px;
-	.item {
-		text-align: center;
-		display: inline-block;
-		color: $font-color-base;
-		padding: 11.5px 5px;
-		background-color: #ffffff;
-		line-height: 1;
-		.time {
-			font-size: 16px;
-			padding-bottom: 3px;
-			&.action {
-				color: $color-red;
-			}
-		}
-		.status {
-			font-size: 12px;
-			margin: 0 auto;
-			width: 60px;
-			padding: 3px 0;
-			&.action {
-				color: #ffffff;
-				border-radius: 99px;
-				background-color: $color-red;
-			}
-		}
-	}
-}
-// 列表上方标题样式
-.title-box {
-	margin-top: 10px;
-	padding: 10px;
-	background-color: #ffffff;
-	.title-box-left {
-		font-size: 15px;
-		color: $font-color-base;
-	}
-	.title-box-right {
-		.tip {
-			font-size: 15px;
-			color: #999999;
-			padding-right: 5px;
-		}
-
-		/deep/ .uni-countdown__number {
-			border-radius: 3px;
-			width: 22px;
-		}
-		/deep/ .uni-countdown__splitor,
-		/deep/ .uni-countdown__number {
-			height: 20px;
-			line-height: 18px;
-		}
-	}
-}
-// 列表样式
-.list-Box {
-	height: calc(100% - 60px);
-	.list {
-		height: calc(100% - 55px);
-	}
-}
-// 商品列表
-$slider-color: #fe9398; //滑块左侧颜色
-.goodsList-item {
-	background-color: #ffffff;
-	padding: 30rpx;
-	border-bottom: 1px solid $border-color-light;
-	image {
-		flex-shrink: 0;
-		border-radius: $border-radius-sm;
-		height: 180rpx;
-		width: 180rpx;
-	}
-	.slider {
-		margin-top: 15rpx;
-		justify-content: flex-start;
-		.slider-box {
-			width: 196rpx;
-			border-radius: 99px;
-			border: 1px solid $slider-color;
-			height: 16rpx;
-			.slider-action {
-				background-color: $slider-color;
-				height: 100%;
-			}
-		}
-		.sales-nub {
-			color: $font-color-light;
-			font-size: 24rpx;
-			padding-left: 20rpx;
-		}
-	}
-	.goodsList-content {
-		margin-left: 20rpx;
-		flex-grow: 1;
-		height: 180rpx;
-		position: relative;
-		.title {
-			font-size: $font-base;
-			color: $font-color-dark;
-			font-weight: 500;
-			width: 0;
-			min-width: 100%;
-		}
-		.goods-money {
-			position: absolute;
-			left: 0;
-			bottom: 0;
-			width: 100%;
-			.money-box {
-				.money {
-					font-size: $font-lg + 10rpx;
-					color: $color-red;
-					font-weight: bold;
-				}
-				.otMoney-box {
-					font-size: $font-sm;
-					.otMoney {
-						color: $font-color-light;
-						padding-right: 20rpx;
-						text-decoration: line-through;
-					}
-					.sales {
-						color: $font-color-light;
-					}
-				}
-			}
-			.cart {
-				font-size: $font-base;
-				border-radius: 99px;
-				padding: 15rpx 30rpx;
-				line-height: 1;
-				color: #ffffff;
-				background-color: $color-gray;
-				&.seckill-action {
-					border: 1px solid $color-red;
-					background-color: $color-red;
-				}
-			}
-		}
-	}
-}
-</style>
+<template>
+	<view class="seckillBox">
+		<scroll-view scroll-x="true" class="class-box flex b-t" :scroll-left="scrollLeft" :scroll-with-animation="true">
+			<view @click="tabClass(idx)" class="item" :style="{ width: topNavWidth }" v-for="(item, idx) in indexList" :key="idx" :class="{ isaction: idx == classIndex }">
+				<view class="time" :class="{ action: idx == classIndex }">{{ item.time }}</view>
+				<view class="status" :class="{ action: idx == classIndex }">{{ item.state }}</view>
+			</view>
+		</scroll-view>
+		<swiper class="list-Box" :current="classIndex" @change="swiperChange" duration="500">
+			<swiper-item class="list-item" v-for="(ls, idx) in indexList" :key="idx">
+				<view class=" b-b position-relative">
+					<view class="title-box flex ">
+						<view class="title-box-left">
+							<text v-if="ls.status == 1">抢购中先下先得哦！</text>
+							<text v-if="ls.status == 2">精品好货即将开抢！</text>
+							<text v-if="ls.status == 0">本场已结束，下次早点来哦！</text>
+						</view>
+						<view class="title-box-right flex">
+							<text class="tip" v-if="ls.status == 1">距离结束</text>
+							<text class="tip" v-if="ls.status == 2">距离开始</text>
+							<uni-countdown
+								color="#F9F9F8"
+								background-color="#666666"
+								v-if="ls.status == 1 || ls.status == 2"
+								:show-day="false"
+								:hour="ls.stopTimeH"
+								:minute="ls.stopTimeM"
+								:second="ls.stopTimeS"
+							></uni-countdown>
+						</view>
+					</view>
+				</view>
+				<scroll-view scroll-y="true" class="list" @scrolltolower="getList(classIndex)">
+					<view class="goodsList-item flex" :key="ind" v-for="(lss, ind) in ls.dataList">
+						<image :src="lss.image" lazy-load mode="scaleToFill"></image>
+						<view class="goodsList-content">
+							<view class="title clamp">
+								<text>{{ lss.title }}</text>
+							</view>
+							<view class="slider flex">
+								<view class="slider-box"><view class="slider-action" :style="{ width: lss.percent + '%' }"></view></view>
+								<view class="sales-nub">已抢{{ lss.percent + '%' }}</view>
+							</view>
+							<view class="goods-money flex">
+								<view class="money-box">
+									<view class="money">
+										<text class="font-size-sm">￥</text>
+										{{ lss.price }}
+									</view>
+									<view class="otMoney-box">
+										<text class="otMoney">￥{{ lss.ot_price }}</text>
+									</view>
+								</view>
+								<view @click="navProduct(ls, ind)" class="cart" :class="{ 'seckill-action': ls.status == 1 }">
+									{{ ls.status == 1 ? '去抢购' : ls.status == 2 ? '未开始' : '已结束' }}
+								</view>
+							</view>
+						</view>
+					</view>
+					<uni-load-more :status="ls.loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+import { getSeckillList, getSeckillClass } from '@/api/product.js';
+import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import { timeComputed } from '@/utils/rocessor.js';
+export default {
+	components: {
+		uniCountdown,
+		uniLoadMore
+	},
+	data() {
+		return {
+			indexList: [], //分类列表
+			showTime: '', //显示的时间
+			showTImeId: '', //显示时间id用于查询数据
+			// 判断是否所有活动已经结束
+			stop: false, //活动是否已经结束
+			show: false, //是否显示活动
+			status: 0, //获取状态值1为有活动开始中 2为活动未开始 0为活动已经结束
+			topNavWidth: '25%', //设置导航默认宽度
+			classIndex: 0, //当前进行中的活动
+			itemWidht: 0 //顶部分类宽度
+		};
+	},
+	computed: {
+		// 计算左侧距离
+		scrollLeft() {
+			if (this.classIndex > 1) {
+				return this.itemWidht * (this.classIndex - 1.5);
+			} else {
+				return 0;
+			}
+		}
+	},
+	onLoad: function(e) {
+		// 载入分类
+		this.getClass();
+	},
+	methods: {
+		//抢购时间切换时触发效果
+		swiperChange(e) {
+			this.classIndex = e.target.current;
+			this.getList(this.classIndex, 'tabChange');
+		},
+		// 获取项目宽度
+		numClassWidht() {
+			uni.createSelectorQuery()
+				.select('.seckillBox')
+				.fields(
+					{
+						size: true
+					},
+					data => {
+						// 设置项目宽度
+						this.itemWidht = Math.floor((data.width / 750) * 187.5);
+					}
+				)
+				.exec();
+		},
+		// 切换当前选中的秒杀活动
+		tabClass(ind) {
+			// 保存当前选中的对象
+			this.classIndex = ind;
+		},
+		// 跳转到商品详情
+		navProduct(ls, ind) {
+			if (ls.status == 1) {
+				let data = ls.dataList[ind];
+
+				uni.navigateTo({
+					url: '/pages/product/product?id=' + data.id + '&type=1'
+				});
+			}
+		},
+		// 获取商品
+		getList(ind, source) {
+			// 获取数据对象
+			let date = this.indexList[ind];
+			console.log(date, source);
+			if (source === 'tabChange' && date.loaded === true) {              
+				//tab切换只有第一次需要加载数据
+				return;
+			}
+			if (date.loadingType === 'noMore') {
+				//防止重复加载
+				return;
+			}
+			if (date.loadingType === 'loading') {
+				//防止重复加载
+				return;
+			}
+			// 修改当前对象状态为加载中
+			date.loadingType = 'loading';
+			getSeckillList(
+				{
+					page: date.page,
+					limit: date.limit
+				},
+				date.id
+			)
+				.then(e => {
+					date.dataList.push(...e.data);
+					// 查询翻页增加
+					date.page++;
+					// 判断是否可以继续加载
+					if (date.limit == e.data.length) {
+						date.loadingType = 'more';
+					} else {
+						date.loadingType = 'noMore';
+					}
+					// 设置当前数据已加载完毕
+					this.$set(date, 'loaded', true);
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+		// 获取秒杀时间段
+		getClass() {
+			let obj = this;
+			getSeckillClass({})
+				.then(({ data }) => {
+					obj.indexList = data.seckillTime.map((e, ind) => {
+						// 初始化翻页页数
+						e.page = 1;
+						// 初始每次加载的数据条数
+						e.limit = 6;
+						// 创建储存订单数据
+						e.dataList = [];
+						// 初始化加载
+						e.loadingType = 'more';
+						let ar = e;
+						// 判断是否为进行中的活动
+						if (ar.status === 1) {
+							// 计算倒计时时间
+							obj.timeComputed(ar.stop * 1000, ar);
+						} else {
+							// 获取距离开始还需要多少时间
+							let arTime = ar.time.split(':');
+							let h = arTime[0];
+							let m = arTime[1];
+							let time = new Date();
+							// 设置时间
+							time.setHours(h, m, 0);
+							// 计算倒计时时间
+							obj.timeComputed(time.getTime(), ar);
+						}
+
+						return e;
+					});
+					// 获取当前活动中的下标值
+					obj.classIndex = data.seckillTimeIndex;
+					// 获取当前显示中对象的数据
+					obj.$nextTick(() => {
+						obj.getList(obj.classIndex);
+					});
+					if (obj.indexList.length <= 4) {
+						// 当数量小于等于4的时候自适应宽度
+						obj.topNavWidth = 100 / obj.indexList.length + '%';
+					} else {
+						// 页面渲染完毕后加载scroll-view左侧距离
+						obj.$nextTick(() => {
+							obj.numClassWidht();
+						});
+					}
+				})
+				.catch(e => {
+					console.log(e);
+				});
+		},
+		// 计算倒计时时间
+		timeComputed(da, ar) {
+			let obj = this;
+			// 计算时间，保存需要多少时间到期
+			let stopTime = timeComputed(da);
+			console.log(stopTime);
+			ar.stopTimeH = stopTime.hours;
+			ar.stopTimeM = stopTime.minutes;
+			ar.stopTimeS = stopTime.seconds;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.seckillBox {
+	min-height: 100%;
+	height: 100%;
+}
+// 头部时间段样式
+.class-box {
+	white-space: nowrap;
+	height: 60px;
+	.item {
+		text-align: center;
+		display: inline-block;
+		color: #fff;
+		padding: 11.5px 5px;
+		background-color: #901b21;
+		line-height: 1;
+		.time {
+			font-size: 16px;
+			padding-bottom: 3px;
+			&.action {
+				color: #901b21;
+				background-color: #fff;
+			}
+		}
+		.status {
+			font-size: 12px;
+			margin: 0 auto;
+			width: 60px;
+			padding: 3px 0;
+			&.action {
+				width: 100%;
+				height: 100%;
+				color: #901b21;
+				// border-radius: 99px;
+				background-color: #fff;
+			}
+		}
+		
+	}
+	.isaction {
+		color: #901b21;
+		background-color: #fff;
+	}
+}
+// 列表上方标题样式
+.title-box {
+	margin-top: 10px;
+	padding: 10px;
+	background-color: #ffffff;
+	.title-box-left {
+		font-size: 15px;
+		color: $font-color-base;
+	}
+	.title-box-right {
+		.tip {
+			font-size: 15px;
+			color: #999999;
+			padding-right: 5px;
+		}
+
+		/deep/ .uni-countdown__number {
+			border-radius: 3px;
+			width: 22px;
+		}
+		/deep/ .uni-countdown__splitor,
+		/deep/ .uni-countdown__number {
+			height: 20px;
+			line-height: 18px;
+		}
+	}
+}
+// 列表样式
+.list-Box {
+	height: calc(100% - 60px);
+	.list {
+		height: calc(100% - 55px);
+	}
+}
+// 商品列表
+$slider-color: #fe9398; //滑块左侧颜色
+.goodsList-item {
+	background-color: #ffffff;
+	padding: 30rpx;
+	border-bottom: 1px solid $border-color-light;
+	image {
+		flex-shrink: 0;
+		border-radius: $border-radius-sm;
+		height: 180rpx;
+		width: 180rpx;
+	}
+	.slider {
+		margin-top: 15rpx;
+		justify-content: flex-start;
+		.slider-box {
+			width: 196rpx;
+			border-radius: 99px;
+			border: 1px solid $slider-color;
+			height: 16rpx;
+			.slider-action {
+				background-color: $slider-color;
+				height: 100%;
+			}
+		}
+		.sales-nub {
+			color: $font-color-light;
+			font-size: 24rpx;
+			padding-left: 20rpx;
+		}
+	}
+	.goodsList-content {
+		margin-left: 20rpx;
+		flex-grow: 1;
+		height: 180rpx;
+		position: relative;
+		.title {
+			font-size: $font-base;
+			color: $font-color-dark;
+			font-weight: 500;
+			width: 0;
+			min-width: 100%;
+		}
+		.goods-money {
+			position: absolute;
+			left: 0;
+			bottom: 0;
+			width: 100%;
+			.money-box {
+				.money {
+					font-size: $font-lg + 10rpx;
+					color: $color-red;
+					font-weight: bold;
+				}
+				.otMoney-box {
+					font-size: $font-sm;
+					.otMoney {
+						color: $font-color-light;
+						padding-right: 20rpx;
+						text-decoration: line-through;
+					}
+					.sales {
+						color: $font-color-light;
+					}
+				}
+			}
+			.cart {
+				font-size: $font-base;
+				border-radius: 99px;
+				padding: 15rpx 30rpx;
+				line-height: 1;
+				color: #ffffff;
+				background-color: $color-gray;
+				&.seckill-action {
+					border: 1px solid $color-red;
+					background-color: $color-red;
+				}
+			}
+		}
+	}
+}
+</style>

pages/user/user.vue

@@ -9,11 +9,12 @@
 						<view class="portrait-box"><image class="portrait" :src="userInfo.avatar || '/static/error/missing-face.png'"></image></view>
 						<view class="info-box">
 							<view class="username">{{ userInfo.nickname || '游客' }}</view>
-							<view class="font-size-sm" v-if="userInfo.spread_uid">邀请码:{{ userInfo.spread_uid }}</view>
+							<!-- <view class="font-size-sm" v-if="userInfo.spread_uid">邀请码:{{ userInfo.spread_uid }}</view> -->
+							<view class="font-size-sm">{{'11111111111'|hiddenphone}}</view>
 						</view>
 					</view>
 					<view class="config iconfont">
-						<text class="setting iconsetting" @click="navTo('/pages/set/set')"></text>
+						<text class="setting " @click="navTo('/pages/set/set')"><image src="../../static/img/set.png" mode=""></image></text>
 						<!-- <text class="message iconmessage" @click="navTo('/pages/user/notice')"></text> -->
 					</view>
 				</view>
@@ -46,9 +47,36 @@
 				@touchmove="coverTouchmove"
 				@touchend="coverTouchend"
 			> -->
-				<!-- <image class="arc" src="/static/img/arc.png"></image> -->
+				<!-- <image class="arc" src="/static/img/arc.png"></image> -->
+			<view class="balance">
+				<view class="balance-top">
+					<view class="withdraw">
+						可提现 ￥<text class="withdraw-num">2689</text>
+					</view>
+					<view class="btn">
+						立刻提现
+					</view>
+				</view>
+				<view class="balance-main">
+					<view class="tj-item" @click="navTo('/pages/money/wallet')">
+						<text>我的余额</text>
+						<text class="num">{{ userInfo.now_money || '0.00' }}</text>
+					</view>
+					<!-- <view class="jg"></view> -->
+					<view class="tj-item" @click="navTo('/pages/user/scoreAccumulate')">
+						<text>我的积分</text>
+						<text class="num">{{ userInfo.integral || '0.00' }}</text>
+					</view>
+					<!-- <view class="jg"></view> -->
+					<view class="tj-item" @click="navTo('/pages/user/award')">
+						<text>我的推广</text>
+						<!-- <text>我的佣金</text> -->
+						<text class="num">{{ userInfo.brokerage_price || '0.00' }}</text>
+					</view>
+				</view>
+			</view>
 			<view class="cover-container">
-				<view class="tj-sction">
+				<!-- <view class="tj-sction">
 					<view class="tj-item" @click="navTo('/pages/money/wallet')">
 						<text>我的余额</text>
 						<text class="num">{{ userInfo.now_money || '0.00' }}</text>
@@ -58,11 +86,11 @@
 						<text class="num">{{ userInfo.integral || '0.00' }}</text>
 					</view>
 					<view class="tj-item" @click="navTo('/pages/user/award')">
-						<text>我的推广</text>
+						<text>我的推广</text> -->
 						<!-- <text>我的佣金</text> -->
-						<text class="num">{{ userInfo.brokerage_price || '0.00' }}</text>
+		<!-- 				<text class="num">{{ userInfo.brokerage_price || '0.00' }}</text>
 					</view>
-				</view>
+				</view> -->
 				<!-- 订单 -->
 
 				<view class="item-box">
@@ -124,26 +152,37 @@
 						<text>我的工具</text>
 						<!-- <text class="iconfont iconenter" @click="loadMore()"></text> -->
 					</view>
-					<view class="order-section">
+					<view class="order-section">
+						<view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover" :hover-stay-time="50" v-if="userIdentity">
+							<view class="icon"><image class="icon-img" src="/static/icon/u6.png" mode="aspectFit"></image></view>
+							<text>提货管理</text>
+						</view>
+						<view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover" :hover-stay-time="50" v-if="userIdentity">
+							<view class="icon"><image class="icon-img" src="/static/icon/u7.png" mode="aspectFit"></image></view>
+							<text>退货管理</text>
+						</view>
 						<view class="order-item" @click="navTo('/pages/money/wallet')" hover-class="common-hover" :hover-stay-time="50">
 							<view class="icon"><image class="icon-img" src="/static/icon/u1.png" mode="aspectFit"></image></view>
-							<text>我的钱包</text>
+							<text>推广海报</text>
 						</view>
 						<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover" :hover-stay-time="50">
 							<view class="icon"><image class="icon-img" src="/static/icon/u2.png" mode="aspectFit"></image></view>
-							<text>奖励明细</text>
+							<text>收货地址</text>
 						</view>
 						<view class="order-item" @click="navTo('/pages/user/award')" hover-class="common-hover" :hover-stay-time="50">
-							<view class="icon"><image class="icon-img" src="/static/icon/u3.png" mode="aspectFit"></image></view>
-							<text>积分明细</text>
+							<view class="icon" v-if="userIdentity"><image class="icon-img" src="/static/icon/u8.png" mode="aspectFit"></image></view>
+							<view class="icon" v-else><image class="icon-img" src="/static/icon/u3.png" mode="aspectFit"></image></view>
+							<text>联系客服</text>
 						</view>
 						<view class="order-item" @click="navTo('/pages/order/order?state=4')" hover-class="common-hover" :hover-stay-time="50">
 							<view class="icon"><image class="icon-img" src="/static/icon/u4.png" mode="aspectFit"></image></view>
-							<text>通用币</text>
+							<text>关于我们</text>
 						</view>
 					</view>
 				</view>
-
+				<view class="foot-wrapper" @click="changeIdentity">
+					{{userIdentity ?'会员页面预览点这里':'客服页面预览点这里'}}
+				</view>
 				<!-- 浏览历史 -->
 				<!-- <view class="history-section icon">
 					<view class="sec-header">
@@ -191,7 +230,8 @@ export default {
 			coverTransition: '0s',
 			moving: false,
 			userDowm: 0, //卡片升级专属高度
-			userMaxDowm: 0 //卡片最高高度
+			userMaxDowm: 0 ,//卡片最高高度,
+			userIdentity: false
 		};
 	},
 	onShow() {
@@ -239,6 +279,12 @@ export default {
 	// #endif
 	computed: {
 		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
+	},
+	filters: {
+		hiddenphone(value) {
+			
+			return value.substring(0,3) + '****' + value.substring(7,12)
+		}
 	},
 	methods: {
 		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
@@ -325,6 +371,9 @@ export default {
 			this.moving = false;
 			this.coverTransition = 'transform 0.3s cubic-bezier(.21,1.93,.53,.64)';
 			this.coverTransform = 'translateY(0px)';
+		},
+		changeIdentity() {
+			this.userIdentity = !this.userIdentity
 		}
 	}
 };
@@ -356,19 +405,26 @@ page {
 }
 .vheigh {
 	height: var(--status-bar-height);
-	background-color: $base-color;
+	// background-color: $base-color;
+	background-color: #f6f1ed;
 }
 .user-section {
-	height: 435rpx;
+	height: 380rpx;
 	padding: 15rpx 30rpx 0;
-	position: relative;
+	position: relative;
+	// background-image: url(../../static/img/main_bg.png);
+	// background-size: 100% 100%;
+
 	.bg {
 		position: absolute;
 		left: 0;
 		top: 0;
 		width: 100%;
 		height: 100%;
-		background-color: $base-color;
+		// background-color: $base-color;
+		background-image: url(../../static/img/main_bg.png);
+		background-size: 100% 100%;
+		// color: #000;
 	}
 }
 .user-info-box {
@@ -380,11 +436,11 @@ page {
 	position: relative;
 	z-index: 1;
 	.detail {
-		height: 130rpx;
+		height: 120rpx;
 		.portrait-box {
 			height: 100%;
 			.portrait {
-				width: 130rpx;
+				width: 120rpx;
 				height: 100%;
 				border: 5rpx solid #fff;
 				border-radius: 50%;
@@ -392,7 +448,8 @@ page {
 		}
 		.info-box {
 			margin-left: 20rpx;
-			line-height: 1.5;
+			line-height: 1.5;
+			color: #000;
 			.username {
 				font-size: $font-lg + 6rpx;
 				height: 100%;
@@ -401,11 +458,18 @@ page {
 	}
 	.config {
 		font-size: 48rpx;
-		height: 130rpx;
+		height: 120rpx;
 		position: relative;
 		left: -32rpx;
 		bottom: -41rpx;
-		.setting {
+		.setting {
+			display: inline-block;
+			width: 44rpx;
+			height: 40rpx;
+			image {
+				width: 100%;
+				height: 100%;
+			}
 			// margin-right: 51rpx;
 			// margin-top: 50rpx;
 			// position: absolute;
@@ -464,7 +528,7 @@ page {
 }
 .cover-container {
 	background: $page-color-base;
-	margin-top: -150rpx;
+	// margin-top: -150rpx;
 	padding: 0 30rpx;
 	position: relative;
 	background: #f5f5f5;
@@ -511,14 +575,18 @@ page {
 	}
 	.order-section {
 		@extend %section;
-		padding: 28rpx 0;
+		padding: 28rpx 0;
+		flex-wrap: wrap;
+		justify-content: start;
 		.order-item {
 			@extend %flex-center;
-			width: 120rpx;
+			width: 25%;
 			height: 120rpx;
 			border-radius: 10rpx;
 			font-size: $font-sm;
-			color: $font-color-dark;
+			color: $font-color-dark;
+			margin-bottom: 10rpx;
+			
 		}
 		.iconfont {
 			font-size: 48rpx;
@@ -593,5 +661,87 @@ page {
 	// background: #3B3B3B;
 	background-image: url(../../static/img/main_bg.png);
 	background-size: 100% 100%;
+}
+.balance {
+	position: relative;
+	margin-top: -150rpx;
+	top: -150rpx;
+	width: 710rpx;
+	height: 299rpx;
+	margin: 0 auto;
+	border-radius: 10rpx;
+	// background-color: $base-color;
+	padding-top: 37rpx;
+	margin-bottom: -150rpx;
+	background-image: url(../../static/img/bg4.png);
+	background-size: 100% 100%;
+	
+	.balance-top {
+		padding: 0 31rpx 0 19rpx;
+		height: 54rpx;
+		// margin-top: -150rpx;
+		// background-color: #bfa;
+		display: flex;
+		justify-content: space-between;
+		.withdraw {
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+			line-height: 48rpx;
+			.withdraw-num {
+				font-size: 37rpx;
+			}
+			
+		}
+		.btn {
+			width: 160rpx;
+			height: 54rpx;
+			text-align: center;
+			line-height: 54rpx;
+			background: #FFFFFF;
+			opacity: 0.7;
+			border-radius: 27rpx;
+			font-weight: bold;
+			color: #901B21;
+		}
+	}
+	.balance-main {
+		margin-top: 52rpx;
+		display: flex;
+		height: 117rpx;
+		color: #fff;
+		.tj-item {
+			display: flex;
+			flex-direction: column;
+			flex-grow: 1;
+			text-align: center;
+			font-size: 26rpx;
+			font-weight: 500;
+			.num {
+				margin-top: 32rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+			}
+		}
+		.jg {
+			width: 2rpx;
+			height: 81rpx;
+			margin-top: 18rpx;
+			background-color: #c5868a;;
+		}
+	}
+}
+.foot-wrapper {
+	width: 373rpx;
+	height: 79rpx;
+	background: #FFFFFF;
+	box-shadow: 0px 3px 10px 0px rgba(180, 183, 187, 0.8);
+	border-radius: 11rpx;
+	margin: 46rpx auto 20rpx;
+	text-align: center;
+	line-height: 79rpx;
+	font-size: 30rpx;
+	font-weight: bold;
+	color: #901B21;
 }
 </style>