Browse Source

commit -m 测试优化替换正式icon

zhengjinyi 4 năm trước cách đây
mục cha
commit
3fecd40423
38 tập tin đã thay đổi với 452 bổ sung439 xóa
  1. 1 1
      components/cm-module/cm-seller/user.vue
  2. 355 351
      components/cm-module/homeIndex/hotProduct.vue
  3. 1 1
      components/cm-module/homeIndex/index.vue
  4. 8 8
      components/cm-module/homeIndex/navbars.vue
  5. 1 1
      components/cm-module/supplier/banner.vue
  6. 1 1
      components/cm-module/supplier/supplierDetails.vue
  7. 1 1
      components/cm-module/supplier/user.vue
  8. 1 1
      components/uni-grade/uni-grade.vue
  9. 1 1
      pages/authorization/authorization.vue
  10. 4 4
      pages/goods/instrument-details.vue
  11. 2 2
      pages/goods/product.vue
  12. 7 17
      pages/login/apply-supplier.vue
  13. 3 5
      pages/login/apply.vue
  14. 3 3
      pages/login/information.vue
  15. 2 2
      pages/login/register-select.vue
  16. 25 4
      pages/login/register-supplier.vue
  17. 1 1
      pages/search/search-instrument.vue
  18. 1 1
      pages/search/search-order.vue
  19. 1 1
      pages/search/search-second.vue
  20. 1 1
      pages/search/search-supplier.vue
  21. 1 1
      pages/tabBar/home/home.vue
  22. 2 2
      pages/tabBar/user/user.vue
  23. 2 2
      pages/user/operator/list.vue
  24. 1 1
      pages/user/order/order-list.vue
  25. 1 1
      second/pages/form/form.vue
  26. 2 2
      second/pages/form/introduce.vue
  27. 3 3
      second/pages/product/product-list.vue
  28. 1 1
      seller/pages/club/allClub-list.vue
  29. 1 1
      seller/pages/club/club-list.vue
  30. 1 1
      seller/pages/club/list.vue
  31. 1 1
      seller/pages/login/login.vue
  32. 1 1
      seller/pages/order/order-historylist.vue
  33. 1 1
      seller/pages/order/order-list.vue
  34. 1 1
      seller/pages/search/search-order.vue
  35. 1 1
      supplier/pages/login/share-login.vue
  36. 8 8
      supplier/pages/user/information.vue
  37. 3 3
      supplier/pages/user/my-shop.vue
  38. 1 1
      supplier/pages/user/operator/list.vue

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

@@ -12,7 +12,7 @@
 							<text class="u-tips">协销人员</text>
 						</view>
 					</view>
-					<view class="header-icon"><image :src="headpic == null? 'http://static-b.caimei365.com/app/img/icon/icon-seller@3x.png' : headpic" mode=""></image></view>
+					<view class="header-icon"><image :src="headpic == null? 'https://static.caimei365.com/app/img/icon/icon-seller@3x.png' : headpic" mode=""></image></view>
 				</view>
 				<!-- 订单 -->
 				<view class="user-order">

+ 355 - 351
components/cm-module/homeIndex/hotProduct.vue

@@ -1,359 +1,363 @@
-<template name="hotProduct">
-	<view>
-		<view class="container clearfix">
-			<view class="title-header">推荐专区</view>
-			<view class="recommend-list">
-				<swiper class="tui-banner-swiper" :autoplay="false" :interval="5000" :duration="500" :circular="true" @change="swiperChange">
-					<swiper-item v-for="(product,index) in hotProductList" :key="index">
-						<view class="floor-item clearfix" v-for="(item, idx) in product" :key="idx" @click.stop="navToDetailPage(item.id)">
-							<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
-							<image class="item-icon-type" :src="iconNew" mode="" v-if="item.actType === 2"></image>
-							<image class="item-icon-type" :src="iconHot" mode="" v-if="item.actType === 1"></image>
-							<view class="floor-item-content">
-								<view class="title tui-skeleton-rect">
-									<text class="mclap">{{item.name}}</text>
-								</view>
-								<view class="floor-item-act">
-									<template v-if="userIdentity === 3">
-										<template v-if="item.actStatus===1">
-											<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-												{{item.promotions.name}}
-												<text v-if="hasLogin && item.priceFlag != 1 && item.supplierId == shopId">:¥{{item.price | NumFormat}}</text>
-											</view>
-											<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-										</template>
-										<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
-											<view class="floor-tags">阶梯价格</view>	
-										</template>
-									</template>	
-									<template v-else>
-										<template v-if="item.actStatus===1">
-											<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-												{{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>
-										<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
-											<view class="floor-tags">阶梯价格</view>	
-										</template>
-									</template>
-								</view>	
-								<view v-if="hasLogin">
-									<template v-if="userIdentity == 3">
-										<template v-if="item.supplierId == shopId">
-											<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>
-											</view>
-										</template>	
-										<template v-else>
-											<view class="no-price">
-												<view class="p-stars">
-													<text class="p-no">¥</text>
-													<uni-grader :grade="Number(item.priceGrade)" :margin="14"></uni-grader>
-												</view>
-											</view>	
-										</template>
-									</template>
-									<template v-else-if="userIdentity ===4">
-										<view class="title-none" v-if="item.priceFlag === '1'">
-											<text class="p big">¥未公开价格</text>
-										</view>
-										<view class="title-none"  v-if="item.priceFlag === '2'">
-											<text class="p big">¥价格仅会员可见</text>
-										</view>
-										<view class="price tui-skeleton-rect" v-if="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>
-										</view>
-									</template>
-									<template v-else>
-										<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>
-										</view>
-									</template>
-								</view>
-								<view v-else class="no-price">
-									<view class="p-stars">
-										<text class="p-no">¥</text>
-										<uni-grader :grade="Number(item.priceGrade)" :margin="14"></uni-grader>
-									</view>
-								</view>	
-							</view>
-						</view>
-					</swiper-item>
-				</swiper>
-				<view class="swiper__recommenddots-box" v-if="hotProductList.length > 1">
-					<view v-for="(item,idx) in hotProductList" 
-						  :key="idx" 
-						  :class="[idx===swiperCurrent?'swiper__dots-long':'none']" 
-						  :data-index="swiperCurrent" class="swiper__dots-item">
-					</view>	  
-				</view>
-			</view>
-		</view>
+<template name="hotProduct">
+	<view>
+		<view class="container clearfix">
+			<view class="title-header">推荐专区</view>
+			<view class="recommend-list">
+				<swiper class="tui-banner-swiper" :autoplay="false" :interval="5000" :duration="500" :circular="true" @change="swiperChange">
+					<swiper-item v-for="(product,index) in hotProductList" :key="index">
+						<view class="floor-item clearfix" v-for="(item, idx) in product" :key="idx" @click.stop="navToDetailPage(item.id)">
+							<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
+							<image class="item-icon-type" :src="iconNew" mode="" v-if="item.actType === 2"></image>
+							<image class="item-icon-type" :src="iconHot" mode="" v-if="item.actType === 1"></image>
+							<view class="floor-item-content">
+								<view class="title tui-skeleton-rect">
+									<text class="mclap">{{item.name}}</text>
+								</view>
+								<view class="floor-item-act">
+									<template v-if="userIdentity === 3">
+										<template v-if="item.actStatus===1">
+											<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
+												{{item.promotions.name}}
+												<text v-if="hasLogin && item.priceFlag != 1 && item.supplierId == shopId">:¥{{item.price | NumFormat}}</text>
+											</view>
+											<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+										</template>
+										<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
+											<view class="floor-tags">阶梯价格</view>	
+										</template>
+									</template>	
+									<template v-else>
+										<template v-if="item.actStatus===1">
+											<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
+												{{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>
+										<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
+											<view class="floor-tags">阶梯价格</view>	
+										</template>
+									</template>
+								</view>	
+								<view v-if="hasLogin">
+									<template v-if="userIdentity == 3">
+										<template v-if="item.supplierId == shopId">
+											<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>
+											</view>
+										</template>	
+										<template v-else>
+											<view class="no-price">
+												<view class="p-stars">
+													<text class="p-no">¥</text>
+													<uni-grader :grade="Number(item.priceGrade)" :margin="14"></uni-grader>
+												</view>
+											</view>	
+										</template>
+									</template>
+									<template v-else-if="userIdentity ===4">
+										<view class="title-none" v-if="item.priceFlag === '1'">
+											<text class="p big">¥未公开价格</text>
+										</view>
+										<view class="title-none"  v-if="item.priceFlag === '2'">
+											<text class="p big">¥价格仅会员可见</text>
+										</view>
+										<view class="price tui-skeleton-rect" v-if="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>
+										</view>
+									</template>
+									<template v-else>
+										<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>
+										</view>
+									</template>
+								</view>
+								<view v-else class="no-price">
+									<view class="p-stars">
+										<text class="p-no">¥</text>
+										<uni-grader :grade="Number(item.priceGrade)" :margin="14"></uni-grader>
+									</view>
+								</view>	
+							</view>
+						</view>
+					</swiper-item>
+				</swiper>
+				<view class="swiper__recommenddots-box" v-if="hotProductList.length > 1">
+					<view v-for="(item,idx) in hotProductList" 
+						  :key="idx" 
+						  :class="[idx===swiperCurrent?'swiper__dots-long':'none']" 
+						  :data-index="swiperCurrent" class="swiper__dots-item">
+					</view>	  
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
-<script>
-	import { mapState,mapMutations} from 'vuex';
-	import uniGrader from '@/components/uni-grade/uni-grade.vue'
-	export default{
-		name:"hotProduct",
-		components:{
-			uniGrader
-		},
-		props:{
-			list:{
-				type:Array
-			},
-			userIdentity:{
-				type:Number
-			}
-		},
-		data() {
-			return{
-				current:100,
-				swiperCurrent:0,
-				hotProductList:[],
-				pageSize:4,
-				shopId:0,
-				iconNew:'http://static-b.caimei365.com/app/img/icon/icon-new.png',
-				iconHot:'http://static-b.caimei365.com/app/img/icon/icon-hot.png',
-			}
-		},
-		filters: {
			NumFormat:function(text) {//处理金额
				return Number(text).toFixed(2);
			},
		},
-		created(){
-			this.initData(this.list)
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo','isActivity'])
-		},
-		methods:{
-			initData(res){
-				this.$api.getStorage().then((resolve) =>{
-					this.shopId = resolve.shopID
-				})
-				if(res.length>0){
-					for (var i = 0, j = res.length; i < j; i += this.pageSize) {
-						this.hotProductList.push(res.slice(i, i + this.pageSize));
-					}
-				}
-			},
-			PromotionsFormat(promo){//促销活动类型数据处理
-				if(promo!=null){
-					if(promo.type == 1 && promo.mode == 1){
-						return true
-					}else{
-						return false
-					}
-				}
-				return false
-			},
-			tabClick(index) {//轮播图切换
-				this.current = index;
-			},
-			swiperChange(e) {//轮播切换
-				const index = e.detail.current;
-				this.swiperCurrent = index;
-			},
-			navToDetailPage(id) {//跳转商品详情页
-				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
-			}
-		}
+<script>
+	import { mapState,mapMutations} from 'vuex';
+	import uniGrader from '@/components/uni-grade/uni-grade.vue'
+	export default{
+		name:"hotProduct",
+		components:{
+			uniGrader
+		},
+		props:{
+			list:{
+				type:Array
+			},
+			userIdentity:{
+				type:Number
+			}
+		},
+		data() {
+			return{
+				current:100,
+				swiperCurrent:0,
+				hotProductList:[],
+				pageSize:4,
+				shopId:0,
+				iconNew:'https://static.caimei365.com/app/img/icon/icon-new.png',
+				iconHot:'https://static.caimei365.com/app/img/icon/icon-hot.png',
+			}
+		},
+		filters: {			
+			NumFormat:function(text) {//处理金额				
+				return Number(text).toFixed(2);			
+			},		
+		},
+		created(){
+			this.initData(this.list)
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo','isActivity'])
+		},
+		methods:{
+			initData(res){
+				this.$api.getStorage().then((resolve) =>{
+					this.shopId = resolve.shopID
+				})
+				if(res.length>0){
+					for (var i = 0, j = res.length; i < j; i += this.pageSize) {
+						this.hotProductList.push(res.slice(i, i + this.pageSize));
+					}
+				}
+			},
+			PromotionsFormat(promo){//促销活动类型数据处理
+				if(promo!=null){
+					if(promo.type == 1 && promo.mode == 1){
+						return true
+					}else{
+						return false
+					}
+				}
+				return false
+			},
+			tabClick(index) {//轮播图切换
+				this.current = index;
+			},
+			swiperChange(e) {//轮播切换
+				const index = e.detail.current;
+				this.swiperCurrent = index;
+			},
+			navToDetailPage(id) {//跳转商品详情页
+				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
+			}
+		}
 	}
 </script>
 
-<style lang="scss">
-	.container{
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-		.title-header{
-			width: 100%;
-			height: 80rpx;
-			line-height: 80rpx;
-			text-align: left;
-			font-weight: bold;
-			font-size: $font-size-34;
-			color: $text-color;
-			padding: 0 24rpx;
-			box-sizing: border-box;
-		}
-		.recommend-list{
-			width: 100%;
-			height: 1140rpx;
-			position: relative;
-			padding-bottom: 20rpx;
-			.tui-banner-swiper {
-				width: 702rpx;
-				margin: 0 auto;
-				background: #F7F7F7;
-				padding: 0 24rpx 0 24rpx;
-				height: 1140rpx;
-				overflow: hidden;
-				transform: translateY(0);
-				.floor-item{
-					width: 341rpx;
-					height: auto;
-					margin-right: 20rpx;
-					font-size: $font-size-24;
-					color: $text-color;
-					background: #FFFFFF;
-					line-height: 36rpx;
-					border-radius: 2rpx;
-					margin-bottom: 20rpx;
-					float: left;
-					box-sizing: border-box;
-					padding-bottom: 10rpx;
-					position: relative;
-					&:nth-child(2n){
-						margin-right: 0;
-					}
-					.item-icon-type{
-						width: 48rpx;
-						height: 62rpx;
-						display: block;
-						position: absolute;
-						top: 20rpx;
-						right: 20rpx;
-					}
-					.item-img{
-						width: 341rpx;
-						height: 341rpx;
-						border-radius: 2rpx 2rpx 0 0;
-						display: block;
-						margin-bottom: 20rpx;
-					}
-					.floor-item-content{
-						width: 311rpx;
-						padding: 0 20rpx;
-					}
-					.floor-item-act{
-						display: block;
-						width: 100%;
-						height: 32rpx;
-						text-align: center;
-						box-sizing: border-box;
-					}
-					.floor-tags{
-						height: 28rpx;
-						border-radius: 6rpx;
-						background-color: #FFFFFF;
-						line-height: 28rpx;
-						color: $color-system;
-						text-align: center;
-						display: inline-block;
-						padding:0 16rpx;
-						font-size: $font-size-20;
-						border: 1px solid #E15616;
-						float: left;
-					}
-					.title-none{
-						font-size: $font-size-26;
-						color: #FF2A2A;
-						line-height: 70rpx;
-						.btn{
-							display: inline-block;
-							float: right;
-							width: 112rpx;
-							height: 44rpx;
-							background: $btn-confirm;
-							line-height: 44rpx;
-							font-size: $font-size-24;
-							color: #FFFFFF;
-							text-align: center;
-							border-radius: 22rpx;
-							margin-top: 17rpx;
-						}
-					}
-					.title{
-						width: 100%;
-						height: 72rpx;
-						display: flex;
-						line-height: 36rpx;
-						flex-direction: column;
-						margin-bottom: 15rpx;
-						padding: 0;
-						.mclap{
-							width: 100%;
-							line-height:40rpx;
-							text-overflow:ellipsis;
-							display: -webkit-box;
-							word-break: break-all;
-							-webkit-box-orient: vertical;
-							-webkit-line-clamp: 2;
-							overflow: hidden;
-							font-size: 26rpx;
-						}
-					}
-					.no-price{
-						height: 54rpx;
-						line-height: 54rpx;
-						display: flex;
-						box-sizing: border-box;
-						.p-no{
-							font-size: $font-size-30;
-							color: $text-color;
-							display: block;
-							float: left;
-						}
-						.p-stars{
-							float: left;
-						}
-					}
-					.price{
-						color: #FF2A2A;
-						line-height:54rpx;
-						&.none{
-							text-decoration: line-through;
-							color: #999999;
-						}
-						.sm{
-							font-size: $font-size-24;
-						}
-						.big{
-							font-size: $font-size-28;
-						}
-					}
-				}
-			}
-		}	
-		.swiper__recommenddots-box{
-			position: absolute;
-			bottom: 0;
-			left: 0;
-			right: 0;
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			flex: 1;
-			flex-direction: row;
-			justify-content: center;
-			align-items: center;
-			height: 60rpx;
-			.swiper__dots-item{
-				width: 8rpx;
-				height: 8rpx;
-				border-radius: 100%;
-				margin-left: 6px;
-				background-color:rgba(225,86,22,.3);
-			}
-			.swiper__dots-long{
-				width: 32rpx;
-				height: 8rpx;
-				border-radius: 4rpx;
-				background-color: #e15616;
-				transition: all 0.4s;
-			}
-		}
+<style lang="scss">
+	.container{
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
+		.title-header{
+			width: 100%;
+			height: 80rpx;
+			line-height: 80rpx;
+			text-align: left;
+			font-weight: bold;
+			font-size: $font-size-34;
+			color: $text-color;
+			padding: 0 24rpx;
+			box-sizing: border-box;
+		}
+		.recommend-list{
+			width: 100%;
+			height: 1140rpx;
+			position: relative;
+			padding-bottom: 20rpx;
+			.tui-banner-swiper {
+				width: 702rpx;
+				margin: 0 auto;
+				background: #F7F7F7;
+				padding: 0 24rpx 0 24rpx;
+				height: 1140rpx;
+				overflow: hidden;
+				transform: translateY(0);
+				.floor-item{
+					width: 341rpx;
+					height: auto;
+					margin-right: 20rpx;
+					font-size: $font-size-24;
+					color: $text-color;
+					background: #FFFFFF;
+					line-height: 36rpx;
+					border-radius: 2rpx;
+					margin-bottom: 20rpx;
+					float: left;
+					box-sizing: border-box;
+					padding-bottom: 10rpx;
+					position: relative;
+					&:nth-child(2n){
+						margin-right: 0;
+					}
+					.item-icon-type{
+						width: 48rpx;
+						height: 62rpx;
+						display: block;
+						position: absolute;
+						top: 20rpx;
+						right: 20rpx;
+					}
+					.item-img{
+						width: 341rpx;
+						height: 341rpx;
+						border-radius: 2rpx 2rpx 0 0;
+						display: block;
+						margin-bottom: 20rpx;
+					}
+					.floor-item-content{
+						width: 311rpx;
+						padding: 0 20rpx;
+					}
+					.floor-item-act{
+						display: block;
+						width: 100%;
+						height: 32rpx;
+						text-align: center;
+						box-sizing: border-box;
+					}
+					.floor-tags{
+						height: 28rpx;
+						border-radius: 6rpx;
+						background-color: #FFFFFF;
+						line-height: 28rpx;
+						color: $color-system;
+						text-align: center;
+						display: inline-block;
+						padding:0 16rpx;
+						font-size: $font-size-20;
+						border: 1px solid #E15616;
+						float: left;
+					}
+					.title-none{
+						font-size: $font-size-26;
+						color: #FF2A2A;
+						line-height: 70rpx;
+						.btn{
+							display: inline-block;
+							float: right;
+							width: 112rpx;
+							height: 44rpx;
+							background: $btn-confirm;
+							line-height: 44rpx;
+							font-size: $font-size-24;
+							color: #FFFFFF;
+							text-align: center;
+							border-radius: 22rpx;
+							margin-top: 17rpx;
+						}
+					}
+					.title{
+						width: 100%;
+						height: 72rpx;
+						display: flex;
+						line-height: 36rpx;
+						flex-direction: column;
+						margin-bottom: 15rpx;
+						padding: 0;
+						.mclap{
+							width: 100%;
+							line-height:40rpx;
+							text-overflow:ellipsis;
+							display: -webkit-box;
+							word-break: break-all;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 2;
+							overflow: hidden;
+							font-size: 26rpx;
+						}
+					}
+					.no-price{
+						height: 54rpx;
+						line-height: 54rpx;
+						display: flex;
+						box-sizing: border-box;
+						.p-no{
+							font-size: $font-size-30;
+							color: $text-color;
+							display: block;
+							float: left;
+						}
+						.p-stars{
+							float: left;
+						}
+					}
+					.price{
+						color: #FF2A2A;
+						line-height:54rpx;
+						&.none{
+							text-decoration: line-through;
+							color: #999999;
+						}
+						.sm{
+							font-size: $font-size-24;
+						}
+						.big{
+							font-size: $font-size-28;
+						}
+					}
+				}
+			}
+		}	
+		.swiper__recommenddots-box{
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			right: 0;
+			/* #ifndef APP-NVUE */
+			display: flex;
+			/* #endif */
+			flex: 1;
+			flex-direction: row;
+			justify-content: center;
+			align-items: center;
+			height: 60rpx;
+			.swiper__dots-item{
+				width: 8rpx;
+				height: 8rpx;
+				border-radius: 100%;
+				margin-left: 6px;
+				background-color:rgba(225,86,22,.3);
+			}
+			.swiper__dots-long{
+				width: 32rpx;
+				height: 8rpx;
+				border-radius: 4rpx;
+				background-color: #e15616;
+				transition: all 0.4s;
+			}
+		}
 	}
 </style>

+ 1 - 1
components/cm-module/homeIndex/index.vue

@@ -124,7 +124,7 @@
 				</view>
 				<view class="f-text tui-skeleton-fillet">
 					<view class="">
-						<image class="logo" src="http://static-b.caimei365.com/app/img/icon/logo-c@2x.png" mode=""></image>
+						<image class="logo" src="https://static.caimei365.com/app/img/icon/logo-c@2x.png" mode=""></image>
 						<text class="">采美365网</text>
 					</view>
 				</view>

+ 8 - 8
components/cm-module/homeIndex/navbars.vue

@@ -24,14 +24,14 @@
 			return{
 				current:100,
 				navList:[
-					{icon:'http://static-b.caimei365.com/app/img/icon/icon-nav1.png'},
-					{icon:'http://static-b.caimei365.com/app/img/icon/icon-nav2.png'},
-					{icon:'http://static-b.caimei365.com/app/img/icon/icon-nav3.png'},
-					{icon:'http://static-b.caimei365.com/app/img/icon/icon-nav4.png'},
-					{icon:'http://static-b.caimei365.com/app/img/icon/icon-nav5.png'},
-					{icon:'http://static-b.caimei365.com/app/img/icon/icon-nav6.png'},
-					{icon:'http://static-b.caimei365.com/app/img/icon/icon-nav7.png'},
-					{icon:'http://static-b.caimei365.com/app/img/icon/icon-nav8.png'},
+					{icon:'https://static.caimei365.com/app/img/icon/icon-nav1.png'},
+					{icon:'https://static.caimei365.com/app/img/icon/icon-nav2.png'},
+					{icon:'https://static.caimei365.com/app/img/icon/icon-nav3.png'},
+					{icon:'https://static.caimei365.com/app/img/icon/icon-nav4.png'},
+					{icon:'https://static.caimei365.com/app/img/icon/icon-nav5.png'},
+					{icon:'https://static.caimei365.com/app/img/icon/icon-nav6.png'},
+					{icon:'https://static.caimei365.com/app/img/icon/icon-nav7.png'},
+					{icon:'https://static.caimei365.com/app/img/icon/icon-nav8.png'},
 				]
 			}
 		},

+ 1 - 1
components/cm-module/supplier/banner.vue

@@ -33,7 +33,7 @@
 		data() {
 			return{
 				current:0,
-				defaultbanner:'http://static-b.caimei365.com/app/img/bg/icon-defaultbanner.png'
+				defaultbanner:'https://static.caimei365.com/app/img/bg/icon-defaultbanner.png'
 			}
 		},
 		created(){

+ 1 - 1
components/cm-module/supplier/supplierDetails.vue

@@ -2,7 +2,7 @@
 	<!-- 供应商信息 -->
 	<view class="supplier clearfix">
 		<view class="product-supplier" @click="goSupplier">
-			<view class="logo"><img :src="shopData.logo ? shopData.logo : 'http://static-b.caimei365.com/app/img/icon/icon-shoplogo.png'" alt=""></view>
+			<view class="logo"><img :src="shopData.logo ? shopData.logo : 'https://static.caimei365.com/app/img/icon/icon-shoplogo.png'" alt=""></view>
 			<view class="main">
 				<view class="name">{{ shopData.name }}</view>
 				<view class="massgs">

+ 1 - 1
components/cm-module/supplier/user.vue

@@ -113,7 +113,7 @@
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				StatusBar: this.StatusBar,
-				defalutLogo:'http://static-b.caimei365.com/app/img/icon/logo@3x.png',
+				defalutLogo:'https://static.caimei365.com/app/img/icon/logo@3x.png',
 				bgImgUrl:'https://img.caimei365.com/group1/M00/03/B0/Cmis217Z_i6ASHobAAhl69yz3SM078.png',
 				name:'这里是供应商的名字',
 				headpic:'',

+ 1 - 1
components/uni-grade/uni-grade.vue

@@ -18,7 +18,7 @@
 		},
 		data() {
 			return {
-				path:'http://static-b.caimei365.com/app/img/icon/'
+				path:'https://static.caimei365.com/app/img/icon/'
 			};
 		},
 		methods:{

+ 1 - 1
pages/authorization/authorization.vue

@@ -2,7 +2,7 @@
 	<view class="container login" :style="{paddingTop:CustomBar+'px'}">
 		<cu-custom :navbar-data='nvabarData' @navigateBack="hanldNavigateBack"></cu-custom>
 		<view class="login-main">
-			<image class="logo" src="http://static-b.caimei365.com/app/img/icon/login-logo@3x.png" mode=""></image>
+			<image class="logo" src="https://static.caimei365.com/app/img/icon/login-logo@3x.png" mode=""></image>
 			<text class="logo-text">生美/医美采购服务平台</text>
 		</view>
 		<view class="login-content">

+ 4 - 4
pages/goods/instrument-details.vue

@@ -49,7 +49,7 @@
 			</view>	
 			<view class="product-details service" v-show="tabCurrentIndex == 0">
 				<view class="content tui-banner product-rich-text tui-skeleton-rect">
-					<parser :html="crmDetailList[tabCurrentIndex].content" :img-mode="widthFix"></parser>
+					<parser :html="this.$api.adaptRichTextImg(crmDetailList[tabCurrentIndex].content)" :img-mode="widthFix"></parser>
 				</view>
 			</view>	
 			<view class="product-details service" v-show="tabCurrentIndex == 1">
@@ -82,11 +82,11 @@
 			<view class="product-details contact clearfix">
 				<!-- 联系 -->
 				<view class="instrument-contact-title">
-					<image src="http://static-b.caimei365.com/app/img/icon/icon-title-bg.png" mode=""></image>
+					<image src="https://static.caimei365.com/app/img/icon/icon-title-bg.png" mode=""></image>
 				</view>
 				<view class="instrument-contact-cell">
 					<view class="cell-icon">
-						<image src="http://static-b.caimei365.com/app/img/icon/icon-kefus.png" mode=""></image>
+						<image src="https://static.caimei365.com/app/img/icon/icon-kefus.png" mode=""></image>
 					</view>
 					<view class="cell-text">
 						<view class="cell-text-p">0755-22907771转806</view>
@@ -95,7 +95,7 @@
 				</view>
 				<view class="instrument-contact-cell">
 					<view class="cell-icon">
-						<image src="http://static-b.caimei365.com/app/img/icon/icon-phone.png" mode=""></image>
+						<image src="https://static.caimei365.com/app/img/icon/icon-phone.png" mode=""></image>
 					</view>
 					<view class="cell-text">
 						<view class="cell-text-p">产品设备:18948339365</view>

+ 2 - 2
pages/goods/product.vue

@@ -89,7 +89,7 @@
 						<text class="iconfont icon-xiayibu"></text>
 					</view>
 					<view class="product-supplier" @click="goSupplier">
-						<view class="logo"><img :src="shop.logo ? shop.logo :'http://static-b.caimei365.com/app/img/icon/icon-shoplogo.png'" alt=""></view>
+						<view class="logo"><img :src="shop.logo ? shop.logo :'https://static.caimei365.com/app/img/icon/icon-shoplogo.png'" alt=""></view>
 						<view class="main">
 							<view class="name">{{shop.name}}</view>
 							<view class="massgs">
@@ -284,7 +284,7 @@
 		data(){
 			return{			
 				html:'<div style="text-align: center;color:#333333;">暂无内容</div>',
-				productNoneImage:'http://static-b.caimei365.com/app/img/icon/icon-pnone.png',
+				productNoneImage:'https://static.caimei365.com/app/img/icon/icon-pnone.png',
 				mode:'round',
 				iconClass:'icon-aixin',
 				iconColor:'#ff9100',

+ 7 - 17
pages/login/apply-supplier.vue

@@ -101,7 +101,7 @@
 				<view class="register-from radio">
 					<radio-group @change="radioChange">
 						<label class="row-input" v-for="(item, index) in supplierList" :key="item.value">
-							<radio class="row-radio" :value="item.value" :checked="index === current" color="#E15616"/>
+							<radio class="row-radio" :value="item.value" :checked="item.value === shopInfo.secondShopType" color="#E15616"/>
 							<view class="row-text">{{item.name}}</view>
 						</label>
 					</radio-group>
@@ -460,21 +460,11 @@
 				if(this.customItemValue==''){
 					this.$util.msg('请输入自定义主营内容',2000);
 				}else{
-					if(this.isOrganizationType == 1){
-						let item = {value:`${this.supplierMedicaCampList.length+1}`,name:this.customItemValue,checked:true}
-						if(this.checkedArray(this.customItemValue,this.mentuzCampList)){
-							this.$util.msg('主营内容已存在!',2000)
-						}else{
-							this.mentuzCampList.push(item)
-						}
+					let item = {value:`${this.supplierMedicaCampList.length+1}`,name:this.customItemValue,checked:true}
+					if(this.checkedArray(this.customItemValue,this.supplierMedicaCampList)){
+						this.$util.msg('主营内容已存在!',2000)
 					}else{
-						let item = {value:`${this.medicaCampList.length+1}`,name:this.customItemValue,checked:true}
-						if(this.checkedArray(this.customItemValue,this.medicaCampList)){
-							this.$util.msg('主营内容已存在!',2000)
-						}else{
-							this.medicaCampList.push(item)
-						}
-						
+						this.supplierMedicaCampList.push(item)
 					}
 				}
 			},
@@ -485,7 +475,7 @@
 					}
 				}
 				return false;
-			 },
+			},
 		},
 		onShow() {
 			if(this.isPreviewImage){
@@ -653,7 +643,7 @@
 						float: left;
 					}
 					.row-input{
-						width: 560rpx;
+						width: 500rpx;
 						padding-left:10rpx;
 						font-size: $font-size-28;
 						color: $text-color;

+ 3 - 5
pages/login/apply.vue

@@ -72,7 +72,7 @@
 					<view class="label">营业执照</view>
 					<view class="upload-picture">
 						<view class="upload-none" v-if="uploadBusinessImage === ''"  @click="chooseBusinessImage">
-							<image src="http://static-b.caimei365.com/app/img/upload/club-zizhi.png"></image>
+							<image src="https://static.caimei365.com/app/img/upload/club-zizhi.png"></image>
 						</view>
 						<view class="upload-image" v-else>
 							<image :src="uploadBusinessImage" mode="" @click="viewBusinessImage"></image>
@@ -88,7 +88,7 @@
 					<view class="label">门头照</view>
 					<view class="upload-picture">
 						<view class="upload-none" v-if="uploadMentuzImage === ''" @click="chooseMentuzImage">
-							<image src="http://static-b.caimei365.com/app/img/upload/club-zizhi.png"></image>
+							<image src="https://static.caimei365.com/app/img/upload/club-zizhi.png"></image>
 						</view>
 						<view class="upload-image" v-else>
 							<image :src="uploadMentuzImage" mode=""  @click="viewMentuzImage"></image>
@@ -123,7 +123,7 @@
 					<view class="label zz">医疗执业许可证</view>
 					<view class="upload-picture">
 						<view class="upload-none" v-if="uploadMedicalImage === ''" @click="chooseMedicalImage">
-							<image src="http://static-b.caimei365.com/app/img/upload/club-zizhi.png"></image>
+							<image src="https://static.caimei365.com/app/img/upload/club-zizhi.png"></image>
 							</view>
 						<view class="upload-image" v-else>
 							<image :src="uploadMedicalImage" mode=""  @click="viewMedicalImage"></image>
@@ -335,8 +335,6 @@
 						if(organizationClub.mainpro == "" || organizationClub.mainpro == null){
 							this.mentuzCampList = this.mentuzCampNullList
 							this.medicaCampList = this.medicaCampNullList
-							console.log(this.medicaCampList)
-							console.log(this.mentuzCampList)
 						}else{
 							if(this.firstClubType == '1'){
 								this.mentuzCampList = this.setNewMainpro(organizationClub.mainpro)

+ 3 - 3
pages/login/information.vue

@@ -76,7 +76,7 @@
 					<view class="label">营业执照</view>
 					<view class="upload-picture">
 						<view class="upload-none" v-if="uploadBusinessImage == ''"  @click="chooseBusinessImage">
-							<image src="http://static-b.caimei365.com/app/img/upload/club-zizhi.png"></image>
+							<image src="https://static.caimei365.com/app/img/upload/club-zizhi.png"></image>
 						</view>
 						<view class="upload-image" v-else>
 							<image :src="uploadBusinessImage" mode="" @click="viewBusinessImage"></image>
@@ -92,7 +92,7 @@
 					<view class="label">门头照</view>
 					<view class="upload-picture">
 						<view class="upload-none" v-if="uploadMentuzImage == ''" @click="chooseMentuzImage">
-							<image src="http://static-b.caimei365.com/app/img/upload/club-door.png"></image>
+							<image src="https://static.caimei365.com/app/img/upload/club-door.png"></image>
 						</view>
 						<view class="upload-image" v-else>
 							<image :src="uploadMentuzImage" mode=""  @click="viewMentuzImage"></image>
@@ -127,7 +127,7 @@
 					<view class="label zz">医疗执业许可证</view>
 					<view class="upload-picture">
 						<view class="upload-none" v-if="uploadMedicalImage == ''||uploadMedicalImage == null" @click="chooseMedicalImage">
-							<image src="http://static-b.caimei365.com/app/img/upload/club-yiliao.png"></image>
+							<image src="https://static.caimei365.com/app/img/upload/club-yiliao.png"></image>
 						</view>
 						<view class="upload-image" v-else>
 							<image :src="uploadMedicalImage" mode=""  @click="viewMedicalImage"></image>

+ 2 - 2
pages/login/register-select.vue

@@ -6,14 +6,14 @@
 			<view class="main-item">
 				<view class="item" @click.stop="this.$api.navigateTo('/pages/login/register')">
 					<view class="icon">
-						<image src="http://static-b.caimei365.com/app/img/icon/icon-club.png" mode=""></image>
+						<image src="https://static.caimei365.com/app/img/icon/icon-club.png" mode=""></image>
 					</view>
 					<view class="text by">采购方(买家)</view>
 					<view class="text-small">医院机构/美容会所/个人买家</view>
 				</view>
 				<view class="item" @click.stop="this.$api.navigateTo('/pages/login/register-supplier')">
 					<view class="icon">
-						<image src="http://static-b.caimei365.com/app/img/icon/icon-supplier.png" mode=""></image>
+						<image src="https://static.caimei365.com/app/img/icon/icon-supplier.png" mode=""></image>
 					</view>
 					<view class="text my">供应商(卖家)</view>
 					<view class="text-small">仪器/产品/服务供应商</view>

+ 25 - 4
pages/login/register-supplier.vue

@@ -478,7 +478,12 @@
 					this.$util.msg('请勾选同意协议',2000);
 					return
 				}
-				let postParmas =  Object.assign(this.firstParmas,this.twoParmas,this.threeParmas);
+				let mainproList =[]
+				this.supplierMedicaCampList.forEach(item =>{
+					mainproList.push(item.name)
+				})
+				this.threeParmas.mainpro = mainproList.join('/')
+				let postParmas =  Object.assign(this.firstParmas,this.twoParmas,this.threeParmas)
 				this.UserService.appSupplierRegister(postParmas).then(response =>{
 					this.$util.modal('','您的资料已提交成功,系统将在1-2个工作日内进行审核~','知道了','',false,() =>{
 						this.$api.switchTabTo('/pages/tabBar/home/index')
@@ -562,9 +567,25 @@
 					this.isDisabled = false
 				}
 			},
-			addCustomItem(){//添加主营内容
-				let item = {value:`${this.supplierMedicaCampList.length+1}`,name:this.customItemValue,checked:true}
-				this.supplierMedicaCampList.push(item)
+			addCustomItem(){
+				if(this.customItemValue==''){
+					this.$util.msg('请输入自定义主营内容',2000);
+				}else{
+					let item = {value:`${this.supplierMedicaCampList.length+1}`,name:this.customItemValue,checked:true}
+					if(this.checkedArray(this.customItemValue,this.supplierMedicaCampList)){
+						this.$util.msg('主营内容已存在!',2000)
+					}else{
+						this.supplierMedicaCampList.push(item)
+					}
+				}
+			},
+			checkedArray(content,arr){//判断主营内容是否已存在
+				for(var i in arr){
+					if(arr[i].name == content){
+						return true;
+					}
+				}
+				return false;
 			},
 			agreeCheck() {
 				this.isCheck = !this.isCheck

+ 1 - 1
pages/search/search-instrument.vue

@@ -53,7 +53,7 @@
 				isShowClose:false,
 				isEmpty:false,
 				isFocus:true,
-				productNoneImage:'http://static-b.caimei365.com/app/img/icon/icon-pnone.png',
+				productNoneImage:'https://static.caimei365.com/app/img/icon/icon-pnone.png',
 				nomoreText: '上拉显示更多',
 				loadding: false,
 				pullUpOn: true,

+ 1 - 1
pages/search/search-order.vue

@@ -35,7 +35,7 @@
 									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 									<text class="bage-text tui-skeleton-fillet">订单号:{{order.orderNo}}</text>
-									<image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+									<image class="bage-icon" src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 								</view>
 								<view class="order-title-b">
 									<view class="order-title-btxt tui-skeleton-fillet">下单时间:{{order.orderTime}}</view>

+ 1 - 1
pages/search/search-second.vue

@@ -13,7 +13,7 @@
 				 :productid="item.productID" @click.stop="navToDetailPage(item.productID)">
 				    <view class="itemImg onhref" >
 				        <image :src="item.imageList[0]" class="bigImg"></image>
-						<image src="http://static-b.caimei365.com/app/img/icon/yishou.png" class="yishou_bg" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0"></image>
+						<image src="https://static.caimei365.com/app/img/icon/yishou.png" class="yishou_bg" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0"></image>
 				    </view>
 				   <view class="ItemInfo">
 						<text class="infotag news" v-if="item.sold==0&&item.newAdded==1">新</text>

+ 1 - 1
pages/search/search-supplier.vue

@@ -90,7 +90,7 @@
 				isShowClose:false,
 				isEmpty:false,
 				isFocus:true,
-				productNoneImage:'http://static-b.caimei365.com/app/img/icon/icon-pnone.png',
+				productNoneImage:'https://static.caimei365.com/app/img/icon/icon-pnone.png',
 				nomoreText: '上拉显示更多',
 				loadding: false,
 				pullUpOn: true,

+ 1 - 1
pages/tabBar/home/home.vue

@@ -141,7 +141,7 @@
 				</view>
 				<view class="f-text tui-skeleton-fillet">
 					<view class="">
-						<image class="logo" src="http://static-b.caimei365.com/app/img/icon/logo-c@2x.png" mode=""></image>
+						<image class="logo" src="https://static.caimei365.com/app/img/icon/logo-c@2x.png" mode=""></image>
 						<text class="">采美365网</text>
 					</view>
 				</view>

+ 2 - 2
pages/tabBar/user/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? 'http://static-b.caimei365.com/app/img/icon/icon-club@3x.png' : headpic" mode=""></image></view>
+					<view class="header-icon"><image :src="headpic == null? 'https://static.caimei365.com/app/img/icon/icon-club@3x.png' : headpic" mode=""></image></view>
 					<view class="header-text">
 						<view class="user-item">
 							<text class="u-h1">{{name}}</text>
@@ -16,7 +16,7 @@
 				</view>
 				<view class="header-main-none" v-else>
 					<view class="header-icon" @click="navigator('/pages/login/login')">
-						<image src="http://static-b.caimei365.com/app/img/icon/icon-club@3x.png" mode=""></image>
+						<image src="https://static.caimei365.com/app/img/icon/icon-club@3x.png" mode=""></image>
 					</view>
 					<view class="header-text">
 						<view class="user-item">

+ 2 - 2
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="clubImage == null ? 'http://static-b.caimei365.com/app/img/icon/icon-club@3x.png' : clubImage" mode=""></image></view>
+				<view class="head"><image :src="clubImage == null ? 'https://static.caimei365.com/app/img/icon/icon-club@3x.png' : clubImage" mode=""></image></view>
 				<view class="title">{{clubName}}</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 : 'http://static-b.caimei365.com/app/img/icon/icon-seller@3x.png'" mode=""></image></view>
+							<view class="list-head"><image :src="item.headimgurl ? item.headimgurl : 'https://static.caimei365.com/app/img/icon/icon-seller@3x.png'" mode=""></image></view>
 							<view class="list-tel">
 								<text class="txt">{{item.linkName}}</text>
 								<text class="txt">{{item.mobile}}</text>

+ 1 - 1
pages/user/order/order-list.vue

@@ -25,7 +25,7 @@
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 										<text class="bage-text tui-skeleton-fillet">订单号:{{order.orderNo}}</text>
-										<image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+										<image class="bage-icon" src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 									</view>
 									<view class="order-title-b">
 										<view class="order-title-btxt tui-skeleton-fillet">下单时间:{{order.orderTime}}</view>

+ 1 - 1
second/pages/form/form.vue

@@ -1,6 +1,6 @@
 <template name="secondHandrelease">
 	<view class="fleaMarketForm">
-	     <view class="bannerimg"><image src="http://static-b.caimei365.com/app/img/bg/secondbg.jpg"></image></view>
+	     <view class="bannerimg"><image src="https://static.caimei365.com/app/img/bg/secondbg.jpg"></image></view>
 	      <view class="my-maintenance" >
 	            <view class="newsTitle">
 					<view class="nestext">欢迎您来到采美365网二手商品市场,您可以在这里发布二手

+ 2 - 2
second/pages/form/introduce.vue

@@ -2,7 +2,7 @@
 	<view class="fleaMarket">
 	      <view class="second-hand-wrapper">
 	            <view class="top_title">
-	                <view ><image src="http://static-b.caimei365.com/app/img/icon/icon-logo2.png" mode=""></image></view>
+	                <view ><image src="https://static.caimei365.com/app/img/icon/icon-logo2.png" mode=""></image></view>
 	                <view class="right-title">
 	                    <text class="right-one">二手市场</text>
 	                    <text class="right-two">SECOND-HANDMARKET</text>
@@ -126,7 +126,7 @@ page{
 	background-image: linear-gradient(#FF7676, #E15616);
 }
 .second-hand-wrapper {
-	background-image: url("http://static-b.caimei365.com/app/img/bg/bg22.png");
+	background-image: url("https://static.caimei365.com/app/img/bg/bg22.png");
 	background-position: 50% 9%;
 	background-repeat: no-repeat;
 	background-size: 100%;

+ 3 - 3
second/pages/product/product-list.vue

@@ -8,7 +8,7 @@
 			</view>
 		</view>
 		<view class="ListImg" v-if="searchHide">
-			<image src="http://static-b.caimei365.com/app/img/bg/banner.png" class="banner-img"></image>
+			<image src="https://static.caimei365.com/app/img/bg/banner.png" class="banner-img"></image>
 		</view>
 		<view class="main-content" v-if="searchHide">
 			<view class="secondTitle">
@@ -36,7 +36,7 @@
 					 :productid="item.productID" @click.stop="navToDetailPage(item.productID)">
 		                <view class="itemImg onhref" >
 		                    <image :src="item.imageList[0]" class="bigImg"></image>
-							<image src="http://static-b.caimei365.com/app/img/icon/yishou.png" class="yishou_bg" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0"></image>
+							<image src="https://static.caimei365.com/app/img/icon/yishou.png" class="yishou_bg" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0"></image>
 		                </view>
 		               <view class="ItemInfo">
 							<text class="infotag news" v-if="item.sold==0&&item.newAdded==1">新</text>
@@ -70,7 +70,7 @@
 					</view>
 					</scroll-view>
 		            <view class="no-content" v-show="showflag" :class="showflag?'show':''">
-		                <image src="http://static-b.caimei365.com/app/img/bg/kong_m.png"  />
+		                <image src="https://static.caimei365.com/app/img/bg/kong_m.png"  />
 		                <view class="error-message">
 		                    <view>该分类下面没有商品,请更换其它分类</view>
 		                </view>

+ 1 - 1
seller/pages/club/allClub-list.vue

@@ -25,7 +25,7 @@
 			<view v-else class="club-list">
 					<view class="list" v-for="(item, index) in clubList" :key="index">
 						<view class="list-left">
-							<view class="list-head"><image :src="item.headpic ? item.headpic : 'http://static-b.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image></view>
+							<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-tel">
 								<text class="txt">{{item.name == null ? item.username : item.name}}</text>
 								<text class="txt sm">

+ 1 - 1
seller/pages/club/club-list.vue

@@ -26,7 +26,7 @@
 				<scroll-view scroll-y="true" >
 					<view class="list" v-for="(item, index) in clubList" :key="index">
 						<view class="list-left">
-							<view class="list-head"><image :src="item.headpic ? item.headpic : 'http://static-b.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image></view>
+							<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>
 						<view class="list-item">
 							<view class="list-title">

+ 1 - 1
seller/pages/club/list.vue

@@ -33,7 +33,7 @@
 				<scroll-view scroll-y="true" >
 					<view class="list" v-for="(item, index) in clubList" :key="index">
 						<view class="list-left">
-							<view class="list-head"><image :src="item.headpic ? item.headpic : 'http://static-b.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image></view>
+							<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-tel">
 								<text class="txt">{{item.userIdentity ===2 ? item.name : item.linkMan1}}</text>
 								<text class="txt sm">

+ 1 - 1
seller/pages/login/login.vue

@@ -2,7 +2,7 @@
 	<view class="container login" :style="{paddingTop:CustomBar+'px'}" v-if="isSeller">
 		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
 		<view class="login-main">
-			<image class="logo" src="http://static-b.caimei365.com/app/img/icon/login-logo@3x.png" mode=""></image>
+			<image class="logo" src="https://static.caimei365.com/app/img/icon/login-logo@3x.png" mode=""></image>
 			<text class="logo-text">生美/医美采购服务平台</text>
 		</view>
 		<view class="login-form">

+ 1 - 1
seller/pages/order/order-historylist.vue

@@ -28,7 +28,7 @@
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 										<text class="bage-text tui-skeleton-fillet">订单号:{{order.orderNo}}({{order.orderID}})</text>
-										<image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+										<image class="bage-icon" src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 									</view>
 									<view class="order-title-b">
 										<view class="order-title-btxt tui-skeleton-fillet">下单时间:{{order.orderTime}}</view>

+ 1 - 1
seller/pages/order/order-list.vue

@@ -37,7 +37,7 @@
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 										<text class="bage-text tui-skeleton-fillet">订单号:{{order.orderNo}}({{order.orderID}})</text>
-										<image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+										<image class="bage-icon" src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 									</view>
 									<view class="order-title-b">
 										<view class="order-title-btxt tui-skeleton-fillet">下单时间:{{order.orderTime}}</view>

+ 1 - 1
seller/pages/search/search-order.vue

@@ -35,7 +35,7 @@
 									<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 									<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>
 									<text class="bage-text tui-skeleton-fillet">订单号:{{order.orderNo}}({{order.orderID}})</text>
-									<image class="bage-icon" src="http://static-b.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
+									<image class="bage-icon" src="https://static.caimei365.com/app/img/icon/icon-type@3x.png" mode="widthFix" v-if="order.secondHandOrderFlag == 1"></image>
 								</view>
 								<view class="order-title-b">
 									<view class="order-title-btxt tui-skeleton-fillet">下单时间:{{order.orderTime}}</view>

+ 1 - 1
supplier/pages/login/share-login.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container login">
 		<view class="login-main">
-			<image class="logo" src="http://static-b.caimei365.com/app/img/icon/login-logo@3x.png" mode=""></image>
+			<image class="logo" src="https://static.caimei365.com/app/img/icon/login-logo@3x.png" mode=""></image>
 			<text class="logo-text">生美/医美采购服务平台</text>
 		</view>
 		<view class="login-input">

+ 8 - 8
supplier/pages/user/information.vue

@@ -852,7 +852,7 @@
 					height: 180rpx;
 					display: inline-block;
 				 .file-zizhi{
-					background: url('http://static-b.caimei365.com/app/img/upload/club-yiliao.png') no-repeat;
+					background: url('https://static.caimei365.com/app/img/upload/club-yiliao.png') no-repeat;
 					width:100%;
 					height:100%;
 					background-size: 100% 100%;
@@ -861,31 +861,31 @@
 					width: 100%;
 					height:100%; 
 					&.file-biss{
-						background: url('http://static-b.caimei365.com/app/img/upload/club-zizhi.png') no-repeat;
+						background: url('https://static.caimei365.com/app/img/upload/club-zizhi.png') no-repeat;
 						background-size: 100% 100%;
 						}
 					&.file-logo{
-						background: url('http://static-b.caimei365.com/app/img/upload/icon-logo.png') no-repeat;
+						background: url('https://static.caimei365.com/app/img/upload/icon-logo.png') no-repeat;
 						background-size: 100% 100%;
 						}
 					&.file-produce{
-						background: url('http://static-b.caimei365.com/app/img/upload/icon-produce.png') no-repeat;
+						background: url('https://static.caimei365.com/app/img/upload/icon-produce.png') no-repeat;
 						background-size: 100% 100%;
 						}
 					&.file-health{
-						background: url('http://static-b.caimei365.com/app/img/upload/icon-health.png') no-repeat;
+						background: url('https://static.caimei365.com/app/img/upload/icon-health.png') no-repeat;
 						background-size: 100% 100%;
 						}
 					&.file-tax{
-						background: url('http://static-b.caimei365.com/app/img/upload/icon-tax.png') no-repeat;
+						background: url('https://static.caimei365.com/app/img/upload/icon-tax.png') no-repeat;
 						background-size: 100% 100%;
 						}
 					&.file-honor{
-						background: url('http://static-b.caimei365.com/app/img/upload/icon-honor.png') no-repeat;
+						background: url('https://static.caimei365.com/app/img/upload/icon-honor.png') no-repeat;
 						background-size: 100% 100%;
 						}
 					&.file-product{
-						background: url('http://static-b.caimei365.com/app/img/upload/icon-product.png') no-repeat;
+						background: url('https://static.caimei365.com/app/img/upload/icon-product.png') no-repeat;
 						background-size: 100% 100%;
 						}
 						

+ 3 - 3
supplier/pages/user/my-shop.vue

@@ -13,7 +13,7 @@
 			<view class="container-shop tui-skeleton">
 				<!-- 轮播 -->
 				<view class="product-supplier" @click="goSupplier">
-					<view class="logo"><img :src="shopLogo ? shopLogo : 'http://static-b.caimei365.com/app/img/icon/icon-shoplogo.png'" alt=""></view>
+					<view class="logo"><img :src="shopLogo ? shopLogo : 'https://static.caimei365.com/app/img/icon/icon-shoplogo.png'" alt=""></view>
 					<view class="main">
 						<view class="name">{{ shopName }}</view>
 						<view class="massgs">
@@ -247,8 +247,8 @@
 				shopId:0,
 				iconClass:'icon-aixin',
 				iconColor:'#ff9100',
-				iconNoneData:'http://static-b.caimei365.com/app/img/icon/icon-prnone.png',
-				iconNoneData1:'http://static-b.caimei365.com/app/img/icon/icon-pbnone.png',
+				iconNoneData:'https://static.caimei365.com/app/img/icon/icon-prnone.png',
+				iconNoneData1:'https://static.caimei365.com/app/img/icon/icon-pbnone.png',
 				isScrollTop:false,
 				shopName:'',
 				shopLogo:'',

+ 1 - 1
supplier/pages/user/operator/list.vue

@@ -93,7 +93,7 @@
 				shopId:'',
 				shopName:'',
 				shopLogo:'',
-				defalutLogo:'http://static-b.caimei365.com/app/img/icon/logo@3x.png',
+				defalutLogo:'https://static.caimei365.com/app/img/icon/logo@3x.png',
 				isEmpty:false,
 				nomoreText: '上拉显示更多',
 				hasNextPage:false,