commit-m 供应商主页

common/css/iconfont.scss

@@ -4,7 +4,7 @@
 	font-family: iconfont;
 	font-weight: normal;
 	font-style: normal;
-	src: url('https://at.alicdn.com/t/font_1519039_wxc8pjw5tfh.ttf') format('truetype');
+	src: url('~@/static/iconfont/iconfont.ttf') format('truetype');
 }
 .iconfont {
 	font-family: "iconfont" !important;
@@ -13,6 +13,18 @@
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }
+.icon-shouhuodizhiguanli:before {
+  content: "\e6de";
+}
+
+.icon-jigouziliao:before {
+  content: "\e6dd";
+}
+
+.icon-zhanghuyuemingxi:before {
+  content: "\e6dc";
+}
+
 .icon-juxingweigouxuan:before {
   content: "\e6d6";
 }

components/cm-module/cm-seller/home.vue

@@ -157,7 +157,7 @@
 	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
 	import authorize from '@/common/config/authorize.js'
 	import modalLayer from "@/components/modal-layer"
-	import cmCustom from '@/components/cm-module/home/cm-custom.vue'
+	import cmCustom from '@/components/cm-module/homeIndex/customer.vue'
 	import activityAlert from '@/components/cm-module/activity/activity_on_1.vue'
 	import uniStars from '@/components/uni-stars/uni-stars.vue'
 	import { userInfoLogin, queryHomeInfo } from "@/api/use.js"

components/cm-module/cm-seller/user.vue

@@ -28,7 +28,7 @@
 								<text 	v-if="beforeConfirmCount>0" 
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 										:class="[beforeConfirmCount < 10 ? 'goleft':'']">
-										{{beforeConfirmCount == 99? '99+' : beforeConfirmCount}}
+										{{beforeConfirmCount >= 99? '99+' : beforeConfirmCount}}
 								</text>
 							</view>
 							<text class="order-t">待确认</text>
@@ -39,7 +39,7 @@
 								<text  v-if="beforePayCount >0" 
 									   class="uni-badge uni-badge-error uni-small uni-badge--small icon-num " 
 									   :class="[beforePayCount < 10 ? 'goleft':'']">
-									   {{beforePayCount == 99? '99+' : beforePayCount}}
+									   {{beforePayCount >= 99? '99+' : beforePayCount}}
 								</text>
 							</view>
 							<text class="order-t">待付款</text>
@@ -50,7 +50,7 @@
 								<text   v-if="beforeShipCount >0" 
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 										:class="[beforeShipCount < 10 ? 'goleft':'']">
-										{{beforeShipCount == 99? '99+' : beforeShipCount}}
+										{{beforeShipCount >= 99? '99+' : beforeShipCount}}
 								</text>
 							</view>
 							<text class="order-t">待发货</text>
@@ -61,7 +61,7 @@
 								<text 	v-if="shippedCount>0" 
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 										:class="[shippedCount < 10 ? 'goleft':'']">
-										{{shippedCount == 99? '99+' : shippedCount}}
+										{{shippedCount >= 99? '99+' : shippedCount}}
 								</text>
 							</view>
 							<text class="order-t">已发货</text>
@@ -72,7 +72,7 @@
 								<text 	v-if="refundsCount >0"
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 										:class="[refundsCount < 10 ? 'goleft':'']">
-										{{refundsCount == 99 ? '99+' : refundsCount}}
+										{{refundsCount >= 99 ? '99+' : refundsCount}}
 								</text>
 							</view>
 							<text class="order-t">退货/款</text>
@@ -218,6 +218,7 @@
 		width: 100%;
 		position: relative;
 		background-size: cover;
+		border-radius: 0 0 100rpx 100rpx;
 	}	
 	.header-main{
 		width: 702rpx;

pages.json

@@ -516,10 +516,29 @@
 			"root": "supplier",
 			"pages": [
 				{
+					"path": "pages/index/index",
+					"style": {
+						"navigationBarTitleText": "采美采购商城",
+						"enablePullDownRefresh":true,
+						"navigationStyle":"custom"
+					}
+				},{
 					"path": "pages/login/bind-operator",
 					"style": {
 						"navigationBarTitleText": "绑定微信"
 					}
+				},{
+					"path": "pages/user/my-product",
+					"style": {
+						"navigationBarTitleText": "我的商品",
+						"enablePullDownRefresh":true
+					}
+				},{
+					"path": "pages/user/my-shop",
+					"style": {
+						"navigationBarTitleText": "店铺主页",
+						"enablePullDownRefresh":true
+					}
 				},{
 					"path": "pages/login/share-login",
 					"style": {
@@ -538,6 +557,12 @@
 						"enablePullDownRefresh":true,
 						"navigationStyle":"custom"
 					}
+				},{
+					"path": "pages/order/order-list",
+					"style": {
+						"navigationBarTitleText": "我的订单",
+						"enablePullDownRefresh":true
+					}
 				},{
 					"path": "pages/order/order-service-details",
 					"style": {

pages/login/bindOperator.vue

@@ -350,9 +350,9 @@
 			}
 		}
 		.login-btn{
-			width: 702rpx;
+			width: 600rpx;
 			height: 88rpx;
-			border-radius: 14rpx;
+			border-radius: 44rpx;
 			font-size: $font-size-28;
 			line-height: 88rpx;
 			color: #FFFFFF;

pages/login/bindemail.vue

@@ -177,7 +177,7 @@
 					width: 303rpx;
 					height: 88rpx;
 					margin: 0 24rpx;
-					border-radius: 14rpx;
+					border-radius: 44rpx;
 					font-size: $font-size-28;
 					line-height: 88rpx;
 					color: #FFFFFF;

pages/login/bindwechat.vue

@@ -335,9 +335,9 @@
 			}
 		}
 		.login-btn{
-			width: 702rpx;
+			width: 600rpx;
 			height: 88rpx;
-			border-radius: 14rpx;
+			border-radius: 44rpx;
 			font-size: $font-size-28;
 			line-height: 88rpx;
 			color: #FFFFFF;

pages/login/login.vue

@@ -1,8 +1,7 @@
 <template>
 	<view class="container login" v-if="isWxAuthorize">
 		<view class="login-main">
-			<image class="logo" src="../../static/login-logo@3x.png" mode=""></image>
-			<text class="logo-text">生美/医美采购服务平台</text>
+			<image class="logo" src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/logo.png" mode=""></image>
 		</view>
 		<view class="login-form">
 			<view class="login-input">
@@ -123,38 +122,32 @@
 			display: flex;
 			flex-direction: column;
 			align-items: center;
-			height: 198rpx;
-			padding: 140rpx 0 60rpx 0;
+			height: 189rpx;
+			padding:60rpx 0 40rpx 0;
+			margin-bottom: 70rpx;
 			.logo{
-				width: 138rpx;
-				height: 118rpx;
+				width:467rpx;
+				height: 189rpx;
 				display: block;
 			}
-			.logo-text{
-				font-size: 30rpx;
-				line-height: 44rpx;
-				color: $color-system;
-				font-weight: 600;
-				margin-top: 20rpx;
-			}
 		}
 		.login-input{
-			width: 654rpx;
-			height: 40rpx;
-			padding: 24rpx;
+			width: 600rpx;
+			height: 88rpx;
+			padding: 24rpx 40rpx;
 			margin: 0 auto;
-			margin-bottom: 20rpx;
+			margin-bottom: 30rpx;
 			background: #F7F7F7;
-			border-radius: 14rpx;
+			border-radius: 44rpx;
 			position: relative;
+			box-sizing: border-box;
 			.input{
 				width: 100%;
 				height: 100%;
 				background: #F7F7F7;
 				font-size: $font-size-28;
-				line-height: 40rpx;
+				line-height: 88rpx;
 				color: #333333;
-				border-radius: 14rpx;
 			}
 			.iconfont{
 				position: absolute;
@@ -186,9 +179,9 @@
 			}
 		}
 		.login-btn{
-			width: 702rpx;
+			width: 600rpx;
 			height: 88rpx;
-			border-radius: 14rpx;
+			border-radius: 44rpx;
 			font-size: $font-size-28;
 			line-height: 88rpx;
 			color: #FFFFFF;
@@ -197,9 +190,9 @@
 			background: $btn-confirm;
 		}
 		.login-btn-last{
-			width: 702rpx;
+			width: 600rpx;
 			height: 86rpx;
-			border-radius: 14rpx;
+			border-radius: 44rpx;
 			font-size: $font-size-28;
 			line-height: 88rpx;
 			color: $color-system;

pages/login/logincode.vue

@@ -2,8 +2,7 @@
 <template>
 	<view class="container login">
 		<view class="login-main">
-			<image class="logo" src="../../static/login-logo@3x.png" mode=""></image>
-			<text class="logo-text">生美/医美采购服务平台</text>
+			<image class="logo" src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/logo.png" mode=""></image>
 		</view>
 		<view class="login-input">
 			<input type="number" 
@@ -97,50 +96,46 @@
 			display: flex;
 			flex-direction: column;
 			align-items: center;
-			height: 198rpx;
-			padding: 170rpx 0 60rpx 0;
+			height: 189rpx;
+			padding:60rpx 0 40rpx 0;
+			margin-bottom: 70rpx;
 			.logo{
-				width: 138rpx;
-				height: 118rpx;
+				width:467rpx;
+				height: 189rpx;
 				display: block;
 			}
-			.logo-text{
-				font-size: 30rpx;
-				line-height: 44rpx;
-				color: $color-system;
-				font-weight: 600;
-				margin-top: 20rpx;
-			}
 		}
 		.login-input{
-			width: 654rpx;
-			height: 40rpx;
-			padding: 24rpx;
+			width: 600rpx;
+			height: 88rpx;
+			padding: 24rpx 40rpx;
 			margin: 0 auto;
-			margin-bottom: 24rpx;
+			margin-bottom: 30rpx;
 			background: #F7F7F7;
-			border-radius: 14rpx;
+			border-radius: 44rpx;
+			position: relative;
+			box-sizing: border-box;
 			.input{
 				width: 100%;
 				height: 100%;
 				background: #F7F7F7;
 				font-size: $font-size-28;
-				line-height: 40rpx;
+				line-height: 88rpx;
 				color: #333333;
-				border-radius: 14rpx;
 			}
 		}
 		.login-row{
-			padding: 0 24rpx;
+			padding: 0 75rpx;
 			font-size: $font-size-28;
 			line-height: 40rpx;
 			color: #E15616;
 			margin-bottom: 48rpx;
+			text-align: right;
 		}
 		.login-btn{
-			width: 702rpx;
+			width: 600rpx;
 			height: 88rpx;
-			border-radius: 14rpx;
+			border-radius: 44rpx;
 			font-size: $font-size-28;
 			line-height: 88rpx;
 			color: #FFFFFF;
@@ -149,9 +144,9 @@
 			background: $btn-confirm;
 		}
 		.login-btn-last{
-			width: 702rpx;
+			width: 600rpx;
 			height: 86rpx;
-			border-radius: 14rpx;
+			border-radius: 44rpx;
 			font-size: $font-size-28;
 			line-height: 88rpx;
 			color: $color-system;

pages/login/password.vue

@@ -358,6 +358,7 @@
 					float: left;
 					background: $btn-confirm;
 					padding: 0;
+					border-radius: 44rpx;
 					.input{
 						width: 263rpx;
 						height: 88rpx;
@@ -366,7 +367,7 @@
 						color: #FFFFFF;
 						background: $btn-confirm;
 						text-align: center;
-						border-radius: 14rpx;
+						border-radius: 44rpx;
 						&.none{
 							background: #F7F7F7;
 						}
@@ -428,9 +429,9 @@
 			}
 		}
 		.login-btn{
-			width: 702rpx;
+			width: 600rpx;
 			height: 88rpx;
-			border-radius: 14rpx;
+			border-radius: 44rpx;
 			font-size: $font-size-28;
 			line-height: 88rpx;
 			color: #FFFFFF;

pages/tabBar/user/user.vue

@@ -46,7 +46,7 @@
 								<text 	v-if="confirmedCount>0 && hasLogin" 
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 										:class="[confirmedCount < 10 ? 'goleft':'']">
-										{{confirmedCount == 99? '99+' : confirmedCount}}
+										{{confirmedCount >= 99? '99+' : confirmedCount}}
 								</text>
 							</view>
 							<text class="order-t">待确认</text>
@@ -57,7 +57,7 @@
 								<text  v-if="paymentCount >0 && hasLogin" 
 									   class="uni-badge uni-badge-error uni-small uni-badge--small icon-num " 
 									   :class="[paymentCount < 10 ? 'goleft':'']">
-									   {{paymentCount == 99? '99+' : paymentCount}}
+									   {{paymentCount >= 99? '99+' : paymentCount}}
 								</text>
 							</view>
 							<text class="order-t">待付款</text>
@@ -68,7 +68,7 @@
 								<text   v-if="waitShipmentsCount >0 && hasLogin" 
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 										:class="[waitShipmentsCount < 10 ? 'goleft':'']">
-										{{waitShipmentsCount == 99? '99+' : waitShipmentsCount}}
+										{{waitShipmentsCount >= 99? '99+' : waitShipmentsCount}}
 								</text>
 							</view>
 							<text class="order-t">待发货</text>
@@ -79,7 +79,7 @@
 								<text 	v-if="shipmentsCount>0 && hasLogin" 
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 										:class="[shipmentsCount < 10 ? 'goleft':'']">
-										{{shipmentsCount == 99? '99+' : shipmentsCount}}
+										{{shipmentsCount >= 99? '99+' : shipmentsCount}}
 								</text>
 							</view>
 							<text class="order-t">已发货</text>
@@ -90,7 +90,7 @@
 								<text 	v-if="salesReturnCount >0 && hasLogin"
 										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 										:class="[salesReturnCount < 10 ? 'goleft':'']">
-										{{salesReturnCount == 99? '99+' : salesReturnCount}}
+										{{salesReturnCount >= 99? '99+' : salesReturnCount}}
 								</text>
 							</view>
 							<text class="order-t">退货/款</text>
@@ -115,16 +115,19 @@
 				</view>
 				<view class="list-cell-item">
 					<view class="list-cell"  v-for="(item, index) in firstList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
+						<text class="cell-icon"><text class="iconfont" :class="item.icon"></text></text>
 						<text class="cell-tit">{{item.name}}</text>
 						<text class="cell-more iconfont icon-xiayibu"></text>
 					</view>
 				</view>
 				<view class="list-cell-item">
 					<view class="list-cell" hover-class="cell-hover" :hover-stay-time="50">
+						<text class="cell-icon"><text class="iconfont icon-lianxiwomen" :class="item.icon"></text></text>
 						<text class="cell-tit">联系我们</text>
 						<text class="cell-more" @click="toPhone">{{contactNumber}}</text>
 					</view>
 					<view class="list-cell last" @click="this.$api.navigateTo('/pages/user/about/about')" hover-class="cell-hover" :hover-stay-time="50">
+						<text class="cell-icon"><text class="iconfont icon-guanyuwomen" :class="item.icon"></text></text>
 						<text class="cell-tit">关于我们</text>
 						<text class="cell-more iconfont icon-xiayibu"></text>
 					</view>
@@ -181,11 +184,11 @@
 				shipmentsCount:0,  //已发货角标
 				salesReturnCount:'',//退货/款角标
 				firstList:[
-					{name:'运营人员管理',path:'/pages/user/operator/list'},
-					{name:'账户余额明细',path:'/pages/user/account/account'},
-					{name:'收货地址管理',path:'/pages/user/address/address'},
-					{name:'机构资料',path:'/pages/login/information'},
-					{name:'账户设置',path:'/pages/user/setting/setting'},
+					{name:'运营人员管理',path:'/pages/user/operator/list',icon:'icon-yunyingrenyuanguanli'},
+					{name:'账户余额明细',path:'/pages/user/account/account',icon:'icon-zhanghuyuemingxi'},
+					{name:'收货地址管理',path:'/pages/user/address/address',icon:'icon-shouhuodizhiguanli'},
+					{name:'机构资料',path:'/pages/login/information',icon:'icon-jigouziliao'},
+					{name:'账户设置',path:'/pages/user/setting/setting',icon:'icon-zhanghushezhi'},
 				]
 			}
 		},
@@ -613,14 +616,24 @@
 		position:relative;
 		background: $bg-color;
 		justify-content: center;
-		// border-bottom: 1px solid #EBEBEB;
+		border-bottom: 1px solid #EBEBEB;
 		&.cell-hover{
 			background:#fafafa;
 		}
+		.cell-icon{
+			width: 60rpx;
+			height: 100rpx;
+			line-height: 100rpx;
+			text-align: center;
+			.iconfont{
+				font-size: $font-size-34;
+				color: #666666;
+			}
+		}
 		.cell-more{
 			align-self: baseline;
 			font-size:$font-size-28;
-			color:$text-color;
+			color:#666666;
 			margin-left:10rpx;
 			.txt{
 				color: #FB4343;
@@ -630,7 +643,7 @@
 		.cell-tit{
 			flex: 1;
 			font-size: $font-size-28;
-			color: $text-color;
+			color: #666666;
 			margin-right:10rpx;
 		}
 		.cell-tip{