feat:提交代码，2.0.0发版

src/pages/user/index.vue

@@ -568,7 +568,8 @@
 						<view class=" sign-content">
 
 							<!-- 用户 -->
-							<image  v-if="userInfo?.originator_id_old" mode="widthFix"  class="sign-icon" :src="IMG_CDN_URL+'user_xx_icon.png'" />
+							<!-- v-if="userInfo?.originator_id_old" -->
+							<image  v-if="userInfo?.originator_id_old"     mode="widthFix"  class="sign-icon" :src="IMG_CDN_URL+'user_xx_icon.png'" />
 							<image mode="widthFix"   class="sign-new-icon"  :class="'sign-icon-'+userInfo?.user_group" :src="dealUserType(userInfo?.user_group)" />
 
 							<!-- 市区县代理 -->
@@ -899,7 +900,7 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: center;
-		height: 50rpx;
+		padding-top: 10rpx;
 		flex-wrap: wrap;
 
 		.sign-icon {
@@ -909,35 +910,40 @@
 		}
 		
 		.sign-icon-1{
-			width: 180rpx !important;
+			width: 190rpx !important;
 			margin-right: -40rpx;
-			margin-left: -30rpx;
+			margin-left: -40rpx;
 		}
 		
 		.sign-icon-2{
 			margin-right: -30rpx;
-			margin-left: -30rpx;
+			margin-left: -36rpx;
 		}
 		.sign-icon-3{
-			width: 180rpx !important;
+			width: 190rpx !important;
 			margin-right: -16rpx;
 			margin-left: -16rpx;
 		}
 		.sign-icon-4{
 			margin-right: 0rpx;
 			margin-left: 0rpx;
+			margin-top: 8rpx;
 		}
 		.sign-icon-5{
 			margin-right: 0rpx;
 			margin-left: 0rpx;
+			margin-top: 8rpx;
 		}
 		.sign-icon-6{
 			margin-right:0rpx;
 			margin-left: 0rpx;
+			margin-top: 8rpx;
 		}
 		.sign-icon-7{
+			width: 180rpx !important;
 			margin-right: -20rpx;
 			margin-left: -15rpx;
+			margin-top: 8rpx;
 		}
 		
 		.sign-new-icon{
@@ -947,14 +953,14 @@
 
 		.sign-btn {
 			padding: 0 30rpx;
-			height: 40rpx;
-			line-height: 40rpx;
+			height: 44rpx;
+			line-height: 44rpx;
 			text-align: center;
 			font-size: 26rpx;
 			margin-left: 20rpx;
 			color: #FD1642;
 			background-color: #fff;
-			border-radius: 20rpx;
+			border-radius: 44rpx;
 		}
 	}
 </style>

src/subPages/pages/store/product/other.vue

@@ -84,7 +84,7 @@ onLoad((options: any) => {
   // if (options.platform && options.id) {
   uni.showLoading({
     title: '数据加载中',
-    icon: 'none',
+    mask: 'true',
   })
   mergeProductDetail(data)
   loadProductDetail(data)
@@ -162,7 +162,7 @@ function loadProductDetail(product: Partial<IProductDetail>) {
            getJdLink(product.id,jdProduct.discount_link).then(res=>{
 			   console.log("===res",res);
 			   state.JDUrl=res.data.url
-		   })
+		   }).finally(()=>{	 uni.hideLoading()})
 		   
 		    // console.log(jdProduct)
 		    mergeProductDetailclone({
@@ -173,7 +173,6 @@ function loadProductDetail(product: Partial<IProductDetail>) {
 		      ...jdProduct,
 		    })
 
-		    uni.hideLoading()
       })
 	  }
     else { // 未登录的