提交

pages.json

@@ -1,29 +1,23 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTitleText": "登录"
-			}
-		}, {
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "维沙采购商城",
 				"enablePullDownRefresh": true
 			}
 		}, {
-			"path": "pages/login/authorize",
+			"path": "pages/authorization/authorization",
 			"style": {
 				"navigationBarTitleText": "微信授权"
 			}
-		},
-		{
-			"path": "pages/authorization/authorization",
+		}, {
+			"path": "pages/login/login",
 			"style": {
-				"navigationBarTitleText": "微信授权",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "登录"
 			}
-		}, {
+		},
+		{
 			"path": "pages/tabBar/category/index",
 			"style": {
 				"navigationBarTitleText": "分类",
@@ -50,6 +44,11 @@
 		{
 			"root": "pages/user/", //机构个人中心模块
 			"pages": [{
+					"path": "club/club-list",
+					"style": {
+						"navigationBarTitleText": "机构列表"
+					}
+				}, {
 					"path": "cart/cart",
 					"style": {
 						"navigationBarTitleText": "购物车"
@@ -61,12 +60,7 @@
 						"navigationBarTitleText": "立即下单"
 					}
 				},
-				{
-					"path": "club/club-list",
-					"style": {
-						"navigationBarTitleText": "机构列表"
-					}
-				},
+
 				{
 					"path": "address/addressManage",
 					"style": {

pages/authorization/authorization.vue

@@ -1,9 +1,8 @@
 <template>
 	<view class="container login" :style="{paddingTop:CustomBar+'px'}">
-		<cu-custom :navbar-data='nvabarData' @navigateBack="hanldNavigateBack"></cu-custom>
+		<!-- <cu-custom :navbar-data='nvabarData' @navigateBack="hanldNavigateBack"></cu-custom> -->
 		<view class="login-main">
-			<image class="logo" src="https://static.caimei365.com/app/img/icon/login-logo@3x.png" mode=""></image>
-			<text class="logo-text">生美/医美采购服务平台</text>
+			<image class="logo" src="../../static/ws/logo.png" mode="widthFix"></image>
 		</view>
 		<view class="login-content">
 			<text>您暂未授权采美采购小程序获取您的信息，将无法正常使用小程序的功能。如需正常使用，请点击“授权”按钮，并允许头像、昵称等信息的授权。</text>
@@ -116,11 +115,12 @@
 			flex-direction: column;
 			align-items: center;
 			height: auto;
-			padding:200rpx 0 0 0;
+			padding:80rpx 0 0 0;
 			.logo{
-				width: 200rpx;
-				height: 170rpx;
+				width:152rpx;
+				height: 152rpx;
 				display: block;
+				border-radius: 50%;
 			}
 			.logo-text{
 				font-size: $font-size-40;
@@ -131,9 +131,9 @@
 		}
 		.login-content{
 			width: 580rpx;
-			margin: 95rpx auto;
-			line-height: 40rpx;
-			font-size: $font-size-24;
+			margin: 70rpx auto;
+			line-height: 48rpx;
+			font-size: 26rpx;
 			color: #666666;
 			text-align: justify;
 		}
@@ -145,8 +145,8 @@
 			align-items: center;
 			margin: 0 auto;
 			.login-btn{
-				width: 630rpx;
-				height: 80rpx;
+				width: 600rpx;
+				height: 90rpx;
 				border-radius: 40rpx;
 				font-size: $font-size-32;
 				line-height: 80rpx;
@@ -159,8 +159,8 @@
 				&.back{
 					height: 76rpx;
 					background: #FFFFFF;
-					border: 1px solid #08A267;
-					color: #08A267;
+					border: 1px solid #666;
+					color: #666;
 					margin-top: 30rpx;
 				}
 			}

pages/index/index.vue

@@ -6,7 +6,7 @@
 			<view class="user-info">
 				<image src="@/static/ws/default_avatar.png" mode="widthFix"></image>
 				<view class="ws-login" @click="toAuthorize">请登录</view>
-				<!-- <view class="user-text"> 瑞恺迪光电科技有限公司有限公司撒娇观看了 </view> -->
+				<!-- <view class="user-text"> 瑞恺迪光电科技有限公司有限公司 </view> -->
 			</view>
 			<!-- 背景图 -->
 			<image class="user-bg" src="@/static/ws/user_bg.png" mode="widthFix"></image>
@@ -16,30 +16,30 @@
 		<view class="order-wrap">
 			<view class="more">
 				<text class="title">我的订单</text>
-				<view> <text class="more-right">全部订单</text> <text class="iconfont iconchakangengduo"></text> </view>
+				<view> <text class="more-right">全部订单</text> <text class="iconfont icon-chakangengduo"></text> </view>
 			</view>
 			<view class="line"></view>
 			<view class="order-nav">
 				<view class="order-nav-item">
-					<image src="../../static/ws/dh_dqr_01.png" mode="widthFix"></image> <text>待确认</text>
+					<image src="@/static/ws/dh_dqr_01.png" mode="widthFix"></image> <text>待确认</text>
 				</view>
 				<view class="order-nav-item">
-					<image src="../../static/ws/dh_dfk_02.png" mode="widthFix"></image> <text>待付款</text>
+					<image src="@/static/ws/dh_dfk_02.png" mode="widthFix"></image> <text>待付款</text>
 				</view>
 				<view class="order-nav-item">
-					<image src="../../static/ws/dh_dfh_03.png" mode="widthFix"></image> <text>待发货</text>
+					<image src="@/static/ws/dh_dfh_03.png" mode="widthFix"></image> <text>待发货</text>
 				</view>
 				<view class="order-nav-item">
-					<image src="../../static/ws/dh_yfh_04.png" mode="widthFix"></image> <text>已发货</text>
+					<image src="@/static/ws/dh_yfh_04.png" mode="widthFix"></image> <text>已发货</text>
 				</view>
 				<view class="order-nav-item"> <image src="../../static/ws/dh_tk_05.png" mode="widthFix"></image> <text>退款</text> </view>
 			</view>
 		</view>
 		<!-- 订单状态区域END -->
 		<!-- 帮机构下单 -->
-		<view class="place-order">
-			<view class="place-left"> <text class="iconfont iconbangjigouxiadan"></text> <text class="title">帮机构下单</text> </view>
-			<text class="iconfont iconchakangengduo"></text>
+		<view class="place-order" @click="toClubList">
+			<view class="place-left"> <text class="iconfont icon-bangjigouxiadan"></text> <text class="title">帮机构下单</text> </view>
+			<text class="iconfont icon-chakangengduo"></text>
 		</view>
 		<!-- 帮机构下单END -->
 		<!-- 客服 -->
@@ -100,9 +100,14 @@ export default {
 		...mapState(['hasLogin', 'userInfo'])
 	},
 	methods: {
-		toAuthorize(){
+		toClubList() {
 			uni.navigateTo({
-				url:'/pages/login/authorize'
+				url: '../user/club/club-list'
+			})
+		},
+		toAuthorize() {
+			uni.navigateTo({
+				url: '/pages/authorization/authorization'
 			})
 		},
 		getUserInfo() {
@@ -410,7 +415,7 @@ export default {
 	background: linear-gradient(to right, #fccd90, #b6762f);
 	color: #fff;
 	border-radius: 24rpx;
-	.iconfont{
+	.iconfont {
 		font-size: 30rpx;
 		margin-right: 6rpx;
 	}

pages/login/authorize.vue

@@ -1,61 +0,0 @@
-<template>
-	<view class="container">
-		<view class="authorize">
-			<image src="../../static/ws/logo.png" mode="widthFix"></image>
-			<view class="text">
-				您暂未授权<text>维沙采购商城</text>小程序获取您的信息将无法正常使用小程序的功能，如需正常使用，请点击 “<text>授权</text>” 按钮打开头像，昵称等信息的授权
-			</view>
-			<view class="btns">
-				<button type="primary">微信授权</button>
-				<button type="default">取消</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-</script>
-
-<style lang="scss">
-	.container{
-		overflow: hidden;
-	}
-	.authorize{
-		width: 572rpx;
-		margin: 180rpx auto 0;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		image{
-			width: 152rpx;
-			height: 152rpx;
-			border-radius: 50%;
-		}
-		.text{
-			font-size: 26rpx;
-			line-height: 48rpx;
-			margin: 60rpx 0;
-			color: #666;
-			text{
-				color: #333;
-			}
-		}
-		.btns{
-			button{
-				width: 540rpx;
-				height: 90rpx;
-				border-radius: 45rpx;
-				font-size: 30rpx;
-				line-height: 90rpx;
-				text-align: center;
-				margin-top: 20rpx;
-				&:last-child{
-					background-color: #fff;
-					border: 1rpx solid #b4b4b4;
-					box-sizing: border-box;
-				}
-			}
-			
-		}
-	}
-</style>

pages/login/login.vue

@@ -2,9 +2,11 @@
 	<view class="container login">
 		<view class="login-main"> <image class="logo" src="/static/ws/logo.png" mode="widthFix"></image> </view>
 		<view class="login-title"> <image src="/static/ws/invitation_code.png" mode="widthFix"></image> <text>邀请码</text> </view>
-		<view class="login-input"> <vcode-input ref="VcodeInput" @vcodeInput="vcodeInput"></vcode-input> </view>
-		<view class="logo-message"><text>邀请码错误，请联系采美客服获取最新邀请码</text> </view>
-		<button class="login-btn">登录</button>
+		<view class="login-input">
+			<!-- 邀请码输入框 -->
+			<vcode-input ref="VcodeInput" @vcodeInput="vcodeInput"></vcode-input>
+		</view>
+		<view class="logo-message"><text>邀请码错误，请联系采美客服获取最新邀请码</text> </view> <button class="login-btn">登录</button>
 	</view>
 </template>
 
@@ -154,7 +156,7 @@ export default{
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		&::before{
+		&::before {
 			content: '!';
 			display: block;
 			width: 22rpx;

pages/user/club/club-list.vue

@@ -24,24 +24,30 @@
 			</view>
 			<view v-else class="club-list">
 				<scroll-view scroll-y="true" >
-					<view class="list" v-for="(item, index) in clubList" :key="index">
+					<view class="list">
 						<view class="list-left">
-							<view class="list-head"><image :src="item.headpic ? item.headpic : 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image></view>
+							<view class="list-head"><image src="https://static.caimei365.com/app/img/icon/icon-club@3x.png" mode=""></image></view>
 						</view>
 						<view class="list-item">
 							<view class="list-title">
-								<text class="list-name">{{item.name}}</text>
-								<text class="list-hist" @click.stop="_goHistory(item)"><text class="iconfont icon-dingdanxuanzhong"></text>订单列表</text>
+								<text class="list-name">机构名称名称</text>
 							</view>
-							<view class="list-opea">
-								<view class="btn org" @click.stop="_goImmediately(item)">
-									<text>立即下单</text>
+							<view class="list-contact">
+								<view class="list-row">
+									<text class="iconfont icon-lianxiren"></text>
+									<text>李艳华</text>
+								</view>
+								<view class="list-row">
+									<text class="iconfont icon-dianhua"></text>
+									<text>18888888888</text>
 								</view>
-								<view class="btn gre" @click.stop="_goSecond(item)">
-									<text>二手下单</text>
+							</view>
+							<view class="list-opea">
+								<view class="btn border-btn" @click.stop="_goHistory()">
+									<text>订单列表</text>
 								</view>
-								<view class="btn yel" @click.stop="_goBuyagain(item)">
-									<text>再次购买</text>
+								<view class="btn border-btn" @click.stop="_goImmediately()">
+									<text>立即下单</text>
 								</view>
 							</view>
 						</view>
@@ -323,35 +329,41 @@
 						-webkit-line-clamp: 1;
 						overflow: hidden;
 					}
-					.list-hist{
-						display: block;
-						float: right;
-						color: #E19B30;
-						font-size: $font-size-24;
-						text-align: right;
-						padding-right: 30rpx;
-						.icon-dingdanxuanzhong{
-							font-size: $font-size-34;
-							color: #E19B30;
+				}
+				.list-contact{
+					.list-row{
+						display: flex;
+						justify-content: flex-start;
+						align-items: center;
+						text{
+							font-size: 24rpx;
+						}
+						.iconfont{
+							font-size: 24rpx;
 						}
 					}
 				}
 				.list-opea{
 					width: 100%;
 					display: flex;
+					justify-content: flex-end;
 					flex: 4;
 					color: #166CE1;
 					flex-direction: row;
 					align-items: center;
 					.btn{
-						width: 156rpx;
-						height: 60rpx;
+						width: 160rpx; 
+						height: 56rpx;
 						line-height: 60rpx;
 						border-radius: 30rpx;
 						font-size: $font-size-24;
 						color: $text-color;
 						text-align: center;
 						margin: 0 17rpx;
+						border: 1px solid #333333;
+						&.border-btn{
+							color: #333;
+						}
 						&.org{
 							background:rgba(22,225,77,.1);
 							color: #16E14D;