commit -m 修改

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

@@ -27,7 +27,7 @@
 							</view>
 							<view v-else class="no-data">
 								<view class="box" @click.stop="navToListPage(small,2)">
-									<image src="https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg"></image>
+									<image :src="small.crmIcon ? small.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
 									<view class="text">全部商品</view>
 								</view>
 							</view>

components/cm-module/supplier/category.vue

@@ -27,7 +27,7 @@
 							</view>
 							<view v-else class="no-data">
 								<view class="box" @click.stop="navToListPage(small,2)">
-									<image src="https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg"></image>
+									<image :src="small.crmIcon ? small.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
 									<view class="text">全部商品</view>
 								</view>
 							</view>

pages/goods/cart.vue

@@ -1173,6 +1173,7 @@
 						justify-content: center;
 						align-items: center;
 						border: 2rpx solid #ffe6dc;
+						border-radius: 30rpx;
 						.iconfont{
 							font-size: $font-size-24;
 							padding:0 20rpx;
@@ -1181,6 +1182,12 @@
 							line-height: 48rpx;
 							font-weight: bold;
 							background: #fef6f3;
+							&.icon-jianhao{
+								border-radius: 30rpx 0 0 30rpx;
+							}
+							&.icon-jiahao{
+								border-radius: 0 30rpx 30rpx 0;
+							}
 						}
 						.btn-input{
 							width: 62rpx;

pages/goods/goods-instrument.vue

@@ -95,8 +95,31 @@
 					this.$util.msg(error.msg,2000)
 				})
 			},
-			NavToDetailPage(floor) {//跳转
-				this.$api.FlooryNavigateTo(floor)
+			NavToDetailPage(pros) {//跳转
+				if(pros.linkType){
+					const typeMap = {
+					 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.title}`,
+					 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
+						4:`/h5/pages/activity/activity?title=${pros.crmTitle}&link=${pros.crmLink}`,
+					 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
+					 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
+					 	8:`/h5/pages/activity/activity-list`,
+					 	9:`/second/pages/form/introduce`,
+					 	10:`/second/pages/product/product-list`,
+					 	11:`/second/pages/form/form`,
+					 	12:`/search/pages/search/search?keyWord=${pros.linkParam.keyword}`,
+					 	13:`/h5/pages/article/path?link=${pros.link}`,
+					 	14:`/h5/pages/article/path?link=${pros.link}`,
+					 	15:`/h5/pages/article/path?link=${pros.link}`,
+					 	17:`/pages/login/register-select`,
+					 	18:`/h5/pages/article/path?link=${pros.link}`,
+					 	19:`/search/pages/search/search-supplier?keyWord=${pros.linkParam.keyword}`
+					}
+					const url = typeMap[pros.linkType];
+					uni.navigateTo({
+					  	url:url
+					})
+				}
 			},
 			ButtonNavigateTo(linkType,linkId,linkHref,keyword) {//跳转
 				this.$api.BannerNavigateTo(linkType,linkId,linkHref,keyword)

pages/goods/product.vue

@@ -1720,16 +1720,30 @@
 					display: flex;
 					justify-content: center;
 					align-items: center;
+					border:2rpx solid #ffe6dc;
+					border-radius: 30rpx;
+					height: 48rpx;
+					margin-left: 20rpx;
 					.iconfont{
-						font-size: $font-size-32;
+						font-size: $font-size-24;
 						padding:0 20rpx;
-						font-size: $text-color;
+						color: #999999;
+						text-align: center;
+						line-height: 48rpx;
+						font-weight: bold;
+						background: #fef6f3;
+						&.icon-jianhao{
+							border-radius: 30rpx 0 0 30rpx;
+						}
+						&.icon-jiahao{
+							border-radius: 0 30rpx 30rpx 0;
+						}
 					}
 					.btn-input{
 						width: 62rpx;
 						height: 48rpx;
 						line-height: 48rpx;
-						background: #F8F8F8;
+						background: #FFFFFF;
 						border-radius: 4rpx;
 						text-align: center;
 						font-size: $font-size-28;

pages/tabBar/cart/cart.vue

@@ -1169,6 +1169,7 @@
 						justify-content: center;
 						align-items: center;
 						border: 2rpx solid #ffe6dc;
+						border-radius: 30rpx;
 						.iconfont{
 							font-size: $font-size-24;
 							padding:0 20rpx;
@@ -1177,6 +1178,12 @@
 							line-height: 48rpx;
 							font-weight: bold;
 							background: #fef6f3;
+							&.icon-jianhao{
+								border-radius: 30rpx 0 0 30rpx;
+							}
+							&.icon-jiahao{
+								border-radius: 0 30rpx 30rpx 0;
+							}
 						}
 						.btn-input{
 							width: 62rpx;

pages/tabBar/category/index.vue

@@ -26,7 +26,7 @@
 							</view>
 							<view v-else class="no-data">
 								<view class="box" @click.stop="navToListPage(small,2)">
-									<image src="https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg"></image>
+									<image :src="small.crmIcon ? small.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
 									<view class="text">全部商品</view>
 								</view>
 							</view>

pages/user/regularPurchase/regularPurchase.vue

@@ -352,16 +352,30 @@
 					display: flex;
 					justify-content: center;
 					align-items: center;
+					border: 2rpx solid #ffe6dc;
+					border-radius: 30rpx;
+					height: 48rpx;
+					margin-left: 20rpx;
 					.iconfont{
-						font-size: $font-size-32;
+						font-size: $font-size-24;
 						padding:0 20rpx;
-						font-size: $text-color;
+						color: #999999;
+						text-align: center;
+						line-height: 48rpx;
+						font-weight: bold;
+						background: #fef6f3;
+						&.icon-jianhao{
+							border-radius: 30rpx 0 0 30rpx;
+						}
+						&.icon-jiahao{
+							border-radius: 0 30rpx 30rpx 0;
+						}
 					}
 					.btn-input{
 						width: 62rpx;
 						height: 48rpx;
 						line-height: 48rpx;
-						background: #F8F8F8;
+						background: #FFFFFF;
 						border-radius: 4rpx;
 						text-align: center;
 						font-size: $font-size-28;

seller/pages/cart/buyagain.vue

@@ -356,16 +356,30 @@
 					display: flex;
 					justify-content: center;
 					align-items: center;
+					border: 2rpx solid #ffe6dc;
+					border-radius: 30rpx;
+					height: 48rpx;
+					margin-left: 20rpx;
 					.iconfont{
-						font-size: $font-size-32;
+						font-size: $font-size-24;
 						padding:0 20rpx;
-						font-size: $text-color;
+						color: #999999;
+						text-align: center;
+						line-height: 48rpx;
+						font-weight: bold;
+						background: #fef6f3;
+						&.icon-jianhao{
+							border-radius: 30rpx 0 0 30rpx;
+						}
+						&.icon-jiahao{
+							border-radius: 0 30rpx 30rpx 0;
+						}
 					}
 					.btn-input{
 						width: 62rpx;
 						height: 48rpx;
 						line-height: 48rpx;
-						background: #F8F8F8;
+						background: #FFFFFF;
 						border-radius: 4rpx;
 						text-align: center;
 						font-size: $font-size-28;

seller/pages/cart/cart.vue

@@ -1183,14 +1183,23 @@
 						display: flex;
 						justify-content: center;
 						align-items: center;
+						border: 2rpx solid #ffe6dc;
+						border-radius: 30rpx;
+						height: 48rpx;
 						.iconfont{
 							font-size: $font-size-24;
 							padding:0 20rpx;
-							color: $text-color;
+							color: #999999;
 							text-align: center;
 							line-height: 48rpx;
 							font-weight: bold;
-							background: #ffe6dc;
+							background: #fef6f3;
+							&.icon-jianhao{
+								border-radius: 30rpx 0 0 30rpx;
+							}
+							&.icon-jiahao{
+								border-radius: 0 30rpx 30rpx 0;
+							}
 						}
 						.btn-input{
 							width: 62rpx;

seller/pages/cart/immediately.vue

@@ -569,16 +569,30 @@
 					display: flex;
 					justify-content: center;
 					align-items: center;
+					border: 2rpx solid #ffe6dc;
+					border-radius: 30rpx;
+					height: 48rpx;
+					margin-left: 20rpx;
 					.iconfont{
-						font-size: $font-size-32;
+						font-size: $font-size-24;
 						padding:0 20rpx;
-						font-size: $text-color;
+						color: #999999;
+						text-align: center;
+						line-height: 48rpx;
+						font-weight: bold;
+						background: #fef6f3;
+						&.icon-jianhao{
+							border-radius: 30rpx 0 0 30rpx;
+						}
+						&.icon-jiahao{
+							border-radius: 0 30rpx 30rpx 0;
+						}
 					}
 					.btn-input{
-						width: 100rpx;
+						width: 80rpx;
 						height: 48rpx;
 						line-height: 48rpx;
-						background: #F8F8F8;
+						background: #FFFFFF;
 						border-radius: 4rpx;
 						text-align: center;
 						font-size: $font-size-28;

seller/pages/cart/second.vue

@@ -451,16 +451,30 @@
 					display: flex;
 					justify-content: center;
 					align-items: center;
+					border: 2rpx solid #ffe6dc;
+					border-radius: 30rpx;
+					height: 48rpx;
+					margin-left: 20rpx;
 					.iconfont{
-						font-size: $font-size-32;
+						font-size: $font-size-24;
 						padding:0 20rpx;
-						font-size: $text-color;
+						color: #999999;
+						text-align: center;
+						line-height: 48rpx;
+						font-weight: bold;
+						background: #fef6f3;
+						&.icon-jianhao{
+							border-radius: 30rpx 0 0 30rpx;
+						}
+						&.icon-jiahao{
+							border-radius: 0 30rpx 30rpx 0;
+						}
 					}
 					.btn-input{
-						width: 100rpx;
+						width: 80rpx;
 						height: 48rpx;
 						line-height: 48rpx;
-						background: #F8F8F8;
+						background: #FFFFFF;
 						border-radius: 4rpx;
 						text-align: center;
 						font-size: $font-size-28;

seller/pages/club/allClub-list.vue

@@ -340,7 +340,7 @@
 						height: 60rpx;
 						padding: 0 20rpx;
 						line-height: 60rpx;
-						border-radius: 10rpx;
+						border-radius: 30rpx;
 						font-size: $font-size-24;
 						color: #FFFFFF;
 						text-align: center;

seller/pages/club/club-list.vue

@@ -347,7 +347,7 @@
 						width: 156rpx;
 						height: 60rpx;
 						line-height: 60rpx;
-						border-radius: 10rpx;
+						border-radius: 30rpx;
 						font-size: $font-size-24;
 						color: $text-color;
 						text-align: center;

seller/pages/login/register.vue

@@ -1079,7 +1079,7 @@
 			.register-btn{
 				width: 702rpx;
 				height: 88rpx;
-				border-radius: 14rpx;
+				border-radius: 44rpx;
 				font-size: $font-size-28;
 				line-height: 88rpx;
 				color: #FFFFFF;

services/ajax.env.js

@@ -4,12 +4,12 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
 	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-t.caimei365.com'	 //采美测试地址
+    // URL_CONFIG = 'https://spi-t.caimei365.com'	 //采美测试地址
     // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	// URL_CONFIG = 'https://spi.caimei365.com'
+	URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
-	URL_CONFIG = 'https://spi-b.caimei365.com'
-    // URL_CONFIG = 'https://spi.caimei365.com'
+	// URL_CONFIG = 'https://spi-b.caimei365.com'
+    URL_CONFIG = 'https://spi.caimei365.com'
 }
 export default URL_CONFIG