commit -m 优化

common/config/config.js

@@ -10,6 +10,7 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
-    URL_CONFIG = 'https://spi.caimei365.com'
+    URL_CONFIG = 'https://spi-b.caimei365.com'
+    // URL_CONFIG = 'https://spi.caimei365.com'
 }
 export default URL_CONFIG

components/cm-module/homeIndex/hotProduct.vue

@@ -13,18 +13,18 @@
 								</view>
 								<view class="" v-if="hasLogin">
 									<template v-if="userIdentity == 4">
-										<view class="title-none" v-show="item.price1TextFlag == '1'">
+										<view class="title-none" v-show="item.priceFlag == '1'">
 											<text class="p big">￥未公开价格</text>
 										</view>
-										<view class="title-none" v-show="item.price1TextFlag == '2'">
+										<view class="title-none" v-show="item.priceFlag == '2'">
 											<text class="p big">￥价格仅会员可见</text>
 										</view>
-										<view class="price tui-skeleton-rect" v-show="item.price1TextFlag == '0'" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
+										<view class="price tui-skeleton-rect" v-show="item.priceFlag == '0'" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
 											<text class="p sm">￥</text>
 											<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
 											<template v-if="item.actStatus==1">
 												<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-													{{item.promotions.name}}<text v-if="hasLogin && item.price1TextFlag != '1'">:￥{{item.price | NumFormat}}</text>
+													{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != '1'">:￥{{item.price | NumFormat}}</text>
 												</view>
 												<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 											</template>
@@ -35,15 +35,15 @@
 									</template>
 									<template v-if="userIdentity == 3">
 										<template v-if="item.supplierId == shopId">
-											<view class="title-none" v-if="item.price1TextFlag == '1'">
-												<text class="p big">未公开价格</text>
+											<view class="title-none" v-if="item.priceFlag == '1'">
+												<text class="p big">￥未公开价格</text>
 											</view>
 											<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.promotions) ? 'none' : ''">
 												<text class="p sm">￥</text>
 												<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
 												<template v-if="item.actStatus==1">
 													<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-														{{item.promotions.name}}<text v-if="hasLogin && item.price1TextFlag != '1'">:￥{{item.price | NumFormat}} {{ shopId }}{{item.supplierId }}</text>
+														{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != '1'">:￥{{item.price | NumFormat}} {{ shopId }}{{item.supplierId }}</text>
 													</view>
 													<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 												</template>
@@ -62,15 +62,15 @@
 										</template>
 									</template>
 									<template v-else>
-										<view class="title-none" v-if="item.price1TextFlag == '1'">
-											<text class="p big">未公开价格</text>
+										<view class="title-none" v-if="item.priceFlag == '1'">
+											<text class="p big">￥未公开价格</text>
 										</view>
 										<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.promotions) ? 'none' : ''">
 											<text class="p sm">￥</text>
 											<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
 											<template v-if="item.actStatus==1">
 												<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-													{{item.promotions.name}}<text v-if="hasLogin && item.price1TextFlag != '1'">:￥{{item.price | NumFormat}}</text>
+													{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != '1'">:￥{{item.price | NumFormat}}</text>
 												</view>
 												<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 											</template>
@@ -86,7 +86,7 @@
 										<uni-grader :grade="Number(item.priceGrade)"></uni-grader>
 										<template v-if="item.actStatus==1">
 											<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-												{{item.promotions.name}}<text v-if="hasLogin && item.price1TextFlag != '1'">:￥{{item.price | NumFormat}}</text>
+												{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != '1'">:￥{{item.price | NumFormat}}</text>
 											</view>
 											<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 										</template>

components/cm-module/supplier/user.vue

@@ -4,7 +4,7 @@
 		<view class="user-section">
 			<view class="header" :style="{height:(CustomBar+90)-StatusBar+'px',paddingTop:CustomBar+'px',background:'url('+ bgImgUrl +')',backgroundSize:'cover'}">
 				<view class="header-main" v-if="hasLogin">
-					<view class="header-icon"><image :src="headpic == null? '../../../static/temp/icon-seller@3x.png' : headpic" mode=""></image></view>
+					<view class="header-icon"><image :src="headpic ? headpic : defalutLogo" mode=""></image></view>
 					<view class="header-text">
 						<view class="user-item">
 							<text class="u-h1">{{name}}</text>
@@ -91,6 +91,7 @@
 	</view>
 </template>
 <script>
+	import defalutLogo from '@/static/temp/logo@3x.png'
 	import authorize from '@/common/config/authorize.js'
 	import uniBadge from '@/components/uni-badge/uni-badge.vue'
 	import { mapState,mapMutations } from 'vuex'
@@ -114,6 +115,7 @@
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				StatusBar: this.StatusBar,
+				defalutLogo:defalutLogo,
 				bgImgUrl:'https://img.caimei365.com/group1/M00/03/B0/Cmis217Z_i6ASHobAAhl69yz3SM078.png',
 				name:'这里是供应商的名字',
 				headpic:'',

h5/pages/activity/activity.vue

@@ -1,6 +1,8 @@
 <template>
 	<view class="activity">
 	   <web-view :webview-styles="webviewStyles" :src="activityPath"></web-view>
+	   <!-- 侧边 -->
+	   <scroll-top v-if="isScrollTop"></scroll-top>
 	</view>
 </template>
 
@@ -14,22 +16,23 @@
 	                }
 	            },
 				productID:'',
-				activityPath:''
+				activityPath:'',
+				isScrollTop:false
 	        }
 	    },
 		onLoad(option) {
 			console.log(option)
 			switch(option.id){
 				case '277':
-					this.activityPath = 'https://spi-b.caimei365.com/caimei-h5/html/2020/caimeih5_01.html'
+					this.activityPath = 'https://static-b.caimei365.com/app/caimei-h5/html/2020/caimeih5_01.html'
 					uni.setNavigationBarTitle({title:'三昭国际优惠'});
 					break;
 				case '278':
-					this.activityPath = 'https://spi-b.caimei365.com/caimei-h5/html/2020/caimeih5_02.html'
+					this.activityPath = 'https://static-b.caimei365.com/app/caimei-h5/html/2020/caimeih5_02.html'
 					uni.setNavigationBarTitle({title:'点斗优惠'});
 					break;
 				case '223':
-					this.activityPath = 'https://spi-b.caimei365.com/caimei-h5/html/2020/caimeih5_03.html'
+					this.activityPath = 'https://static-b.caimei365.com/app/caimei-h5/html/2020/caimeih5_03.html'
 					uni.setNavigationBarTitle({title:'品牌OEM服务'});
 					break;
 			}
@@ -37,7 +40,14 @@
 		},
 		methods:{
 			
-		}
+		},
+		onPageScroll(e){//实时获取到滚动的值
+			if(e.scrollTop>600){
+				this.isScrollTop = true
+			}else{
+				this.isScrollTop = false
+			}	
+		},
 	}
 </script>
 	

pages/login/password.vue

@@ -288,7 +288,7 @@
 			display: flex;
 			height: 80rpx;
 			border-top: 1px solid #F7F7F7;
-			margin-bottom: 112rpx;
+			margin-bottom: 80rpx;
 			position: relative;
 			.nav-item{
 				display: flex;
@@ -382,12 +382,12 @@
 						display: flex;
 						flex-direction: column;
 						align-items: center;
-						border-radius: 14rpx;
+						border-radius: 6rpx;
 						margin-top: 10rpx;
 						image{
 							width: 180rpx;
 							height: 88rpx;
-							border-radius: 14rpx;
+							border-radius: 6rpx;
 						}
 					}
 					.vscod-refresh{

pages/user/address/address.vue

@@ -272,17 +272,17 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		width: 702rpx;
+		width: 600rpx;
 		height: 88rpx;
 		font-size: $font-size-28;
 		line-height: 88rpx;
 		color: #FFFFFF;
 		text-align: center;
 		background: $btn-confirm;
-		border-radius: 14rpx;
+		border-radius: 44rpx;
 	}
 	.adds-btn{
-		width: 702rpx;
+		width: 600rpx;
 		height: 88rpx;
 		font-size: 28rpx;
 		line-height: 88rpx;
@@ -290,7 +290,7 @@
 		margin: 0 auto;
 		text-align: center;
 		background: #000000;
-		border-radius: 14rpx;
+		border-radius: 44rpx;
 	}
 </style>
 

pages/user/address/addressManage.vue

@@ -269,12 +269,12 @@
 		margin: 0 auto;
 		text-align: center;
 		background: $btn-confirm;
-		border-radius: 14rpx;
+		border-radius: 44rpx;
 		margin-top: 80rpx;
 	}
 	.add-btn.disabled{
 		background: #F8F8F8;
-		border-radius: 14rpx;
+		border-radius: 44rpx;
 	}
 </style>
 

pages/user/setting/phone.vue

@@ -3,7 +3,7 @@
 		<view class="register-main first clearfix">
 			<view class="register-row clearfix">
 				<view class="register-from">
-					<view class="label">原手机号</view>
+					<view class="label">原手机号:</view>
 					<view class="row-input">{{bindMobile}}</view>
 				</view>
 			</view>
@@ -32,7 +32,7 @@
 				<view class="register-btn"  @click="bindMobileCheck">确定</view>
 			</view>
 			<view class="register-text clearfix">
-				<view >注意：本操作更换的是供应商联系人的手机号，不是运营人员的手机号！</view>
+				<view >注意：本操作更换的是机构联系人的手机号，不是运营人员的手机号！</view>
 			</view>
 		</view>
 	</view>
@@ -219,14 +219,14 @@
 				}
 				.register-from{
 					width: 702rpx;
-					height: 40rpx;
+					height: 64rpx;
 					padding: 24rpx 0;
 					position: relative;
 					.label{
 						text-align: left;
 						font-size: $font-size-28;
 						color: #666666;
-						line-height: 40rpx;
+						line-height: 64rpx;
 						float: left;
 					}
 					.row-input{
@@ -234,9 +234,9 @@
 						padding-left:10rpx;
 						font-size: $font-size-28;
 						color: $text-color;
-						line-height: 40rpx;
+						line-height: 64rpx;
 						float: left;
-						height: 40rpx;
+						height: 64rpx;
 						&.none{
 							color: #999999;
 						}
@@ -264,12 +264,14 @@
 							color:#E15616;
 							text-align: center;
 							border-radius: 45rpx;
+							font-size: $font-size-24;
 							&.none{
 								background: #F7F7F7;
 							}
 						}
 						&.disabled{
 							background: #F7F7F7;
+							border: 2rpx solid #F7F7F7;
 							.row-input{
 								background: #F7F7F7;
 								color: #999999;
@@ -277,7 +279,7 @@
 						}
 					}
 					&.btn{
-						margin-top: 10rpx;
+						margin-top: 20rpx;
 					}
 				}
 				

services/ajax.env.js

@@ -10,6 +10,7 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
-    URL_CONFIG = 'https://spi.caimei365.com'
+	URL_CONFIG = 'https://spi-b.caimei365.com'
+    // URL_CONFIG = 'https://spi.caimei365.com'
 }
 export default URL_CONFIG

supplier/pages/user/operator/addoperator.vue

@@ -93,7 +93,6 @@
 					height: 40rpx;
 					padding: 24rpx 0;
 					background: #FFFFFF;
-					border-radius: 44rpx;
 					margin-bottom: 40rpx;
 					font-size: $font-size-28;
 					color: $text-color;

supplier/pages/user/operator/list.vue

@@ -2,7 +2,7 @@
 	<view class="container operator clearfix">
 		<view class="operator-top clearfix">
 			<view class="operator-title">
-				<view class="head"><image :src="shopLogo == null ? '../../../static/temp/icon-club@3x.png' : shopLogo" mode=""></image></view>
+				<view class="head"><image :src="shopLogo ? shopLogo : defalutLogo" mode=""></image></view>
 				<view class="title">{{shopName}}</view>
 			</view>
 			<view class="operator-search">
@@ -27,7 +27,7 @@
 				<scroll-view scroll-y="true" >
 					<view class="list" v-for="(item, index) in operatorList" :key="index" @click.stop="showOperatorModel(item)">
 						<view class="list-left">
-							<view class="list-head"><image :src="item.headimgurl ? item.headimgurl : '../../../static/temp/icon-seller@3x.png'" mode=""></image></view>
+							<view class="list-head"><image :src="item.headimgurl ? item.headimgurl : defalutLogo" mode=""></image></view>
 							<view class="list-tel">
 								<text class="txt">{{item.linkName}}</text>
 								<text class="txt">{{item.mobile}}</text>
@@ -80,6 +80,7 @@
 </template>
 
 <script>
+	import defalutLogo from '@/static/temp/logo@3x.png'
 	import authorize from '@/common/config/authorize.js'	
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
@@ -93,6 +94,7 @@
 				shopId:'',
 				shopName:'',
 				shopLogo:'',
+				defalutLogo:defalutLogo,
 				isEmpty:false,
 				nomoreText: '上拉显示更多',
 				hasNextPage:false,

supplier/pages/user/setting/password.vue

@@ -288,7 +288,7 @@
 			display: flex;
 			height: 80rpx;
 			border-top: 1px solid #F7F7F7;
-			margin-bottom: 112rpx;
+			margin-bottom: 80rpx;
 			position: relative;
 			.nav-item{
 				display: flex;
@@ -383,12 +383,12 @@
 						display: flex;
 						flex-direction: column;
 						align-items: center;
-						border-radius: 14rpx;
+						border-radius: 6rpx;
 						margin-top: 10rpx;
 						image{
 							width: 180rpx;
 							height: 88rpx;
-							border-radius: 14rpx;
+							border-radius: 6rpx;
 						}
 					}
 					.vscod-refresh{

supplier/pages/user/setting/phone.vue

@@ -3,7 +3,7 @@
 		<view class="register-main first clearfix">
 			<view class="register-row clearfix">
 				<view class="register-from">
-					<view class="label">原手机号</view>
+					<view class="label">原手机号:</view>
 					<view class="row-input">{{bindMobile}}</view>
 				</view>
 			</view>
@@ -198,7 +198,7 @@
 				// margin-bottom: 20rpx;
 				border-bottom: 2rpx solid #e1e1e1;
 				.register-title{
-					line-height: 60rpx;
+					line-height: 64rpx;
 					font-size: $font-size-32;
 					color: $text-color;
 					text-align: left;
@@ -219,14 +219,14 @@
 				}
 				.register-from{
 					width: 702rpx;
-					height: 40rpx;
+					height: 64rpx;
 					padding: 24rpx 0;
 					position: relative;
 					.label{
 						text-align: left;
 						font-size: $font-size-28;
 						color: #666666;
-						line-height: 40rpx;
+						line-height: 64rpx;
 						float: left;
 					}
 					.row-input{
@@ -234,9 +234,9 @@
 						padding-left:10rpx;
 						font-size: $font-size-28;
 						color: $text-color;
-						line-height: 40rpx;
+						line-height: 64rpx;
 						float: left;
-						height: 40rpx;
+						height: 64rpx;
 						&.none{
 							color: #999999;
 						}
@@ -264,12 +264,14 @@
 							color:#E15616;
 							text-align: center;
 							border-radius: 45rpx;
+							font-size: $font-size-24;
 							&.none{
 								background: #F7F7F7;
 							}
 						}
 						&.disabled{
 							background: #F7F7F7;
+							border: 2rpx solid #F7F7F7;
 							.row-input{
 								background: #F7F7F7;
 								color: #999999;
@@ -277,7 +279,7 @@
 						}
 					}
 					&.btn{
-						margin-top: 10rpx;
+						margin-top: 20rpx;
 					}
 				}