commit -m 器械

pages/goods/product.vue

@@ -942,7 +942,6 @@ export default {
 					// }, 2000)
 					if(this.product.productType === 2 && (this.userIdentity != 1 || this.userIdentity != 3)){
 						this.handleShowProductType()
-						return
 					}
 					if ((this.hasLogin && this.userIdentity == 2) || this.userIdentity == 4) {
 						this.ProductCartNumber()
@@ -959,8 +958,8 @@ export default {
 				})
 		},
 		handleShowProductType(){// 根据用户弹窗提示
-			this.modal1 = true
 			if(!this.hasLogin){//游客
+				this.modal1 = true
 				this.contentModalText1 = '该商品仅限医美类机构查看，请注册医美机构后继续查看。有采美账号的，请直接登录。'
 				this.modalButton1 = [
 					{ text: '关闭', type: 'gray',plain: true },
@@ -969,8 +968,11 @@ export default {
 					  plain: false
 					}
 				]
+				return
 			}else{
 				if(this.userIdentity === 4 ){// 普通机构
+					console.log('222222222')
+					this.modal1 = true
 					this.contentModalText1 = '该商品仅限医美类机构查看，请升级为医美机构后继续查看。'
 					this.modalButton1 = [
 						{ text: '关闭', type: 'gray',plain: true },
@@ -979,8 +981,13 @@ export default {
 						  plain: false
 						}
 					]
+					return
 				}else if( this.userIdentity === 2 ){//会员机构
+					console.log('333333333')
+					console.log('userIdentity',this.userIdentity)
+					console.log('firstClubType',this.firstClubType)
 					if(this.firstClubType != 1){
+						this.modal1 = true
 						this.contentModalText1 = '该商品仅限医美类机构查看，您暂无权限。您可去机构资料页面查看机构类型。'
 						this.modalButton1 = [
 							{ text: '关闭', type: 'gray',plain: true },
@@ -989,6 +996,7 @@ export default {
 							  plain: false
 							}
 						]
+						return
 					}
 				}
 			}

pages/seller/cart/cart.vue

@@ -46,6 +46,7 @@
 										</view>
 										<view class="pros-img" @click.stop="navToListPage(pros.productId)">
 											<image :src="pros.image ? pros.image : ''" alt="" />
+											<view class="pros-type" v-if="pros.productType == 2">医疗器械</view>
 										</view>
 										<view class="pros-product">
 											<view class="producttitle" @click.stop="navToListPage(pros.productId)">
@@ -188,6 +189,7 @@
 									<text class="img-tip">失效</text>
 									<view class="pros-img">
 										<image :src="failure.mainImage ? failure.mainImage : ''" alt="" />
+										<view class="pros-type" v-if="failure.productType == 2">医疗器械</view>
 									</view>
 									<view class="pros-product">
 										<view class="producttitle">{{ failure.name }}</view>
@@ -1263,11 +1265,27 @@ page {
 			border-radius: 10rpx;
 			margin: 0 20rpx;
 			border: 1px solid #f3f3f3;
+			position: relative;
 			image {
 				width: 210rpx;
 				height: 210rpx;
 				border-radius: 10rpx;
 			}
+			.pros-type{
+				width: 64rpx;
+				height: 64rpx;
+				text-align: justify;
+				box-sizing: border-box;
+				padding: 10rpx;
+				border-radius: 0 0 8rpx 8rpx;
+				background-color: #33CCBF;
+				font-size: $font-size-22;
+				color: #FFFFFF;
+				line-height: 25rpx;
+				position: absolute;
+				top: 0;
+				right: 10rpx;
+			}
 		}
 	}
 	.goods-pros-b {

pages/service/news-detailes.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="container clearfix rich-text-temp">
+		<view class="content-title">{{ title }}</view>
 		<rich-text-template ref="childTemplate"></rich-text-template>
 	</view>
 </template>
@@ -14,7 +15,7 @@
 		},
 		data() {
 			return{
-				serverUrl: '',
+				title:'',
 				type: 'introduction'
 			}
 		},
@@ -26,8 +27,8 @@
 				this.CommonService.GetNewsCapacity({id:id}).then(response =>{
 					let data =response.data
 					let html = this.$api.adaptRichTextImg(data.capacity)
+					this.title = data.title
 					this.$refs.childTemplate.html = html
-					uni.setNavigationBarTitle({title:data.title})
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
@@ -40,4 +41,13 @@
 	page{
 		background-color: #FFFFFF;
 	}
+	.content-title{
+		width: 100%;
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: center;
+		color: #333333;
+		font-size: $font-size-32;
+		font-weight: bold;
+	}
 </style>

pages/tabBar/home/index.vue

@@ -172,7 +172,7 @@
 					this.skeletonShow = false
                     this.navBarsList = data.topMenuList
                     this.couponEntry = data.couponEntry
-                    this.newsList = data.annhade
+                    this.newsList = data.annlist
                     if(!this.hasLogin && this.couponEntry == 1){
                     	if(uni.getStorageSync('isActivitySwitch')){
                     		this.$store.commit('setActivity',false)