Merge remote-tracking branch 'origin/developerC' into developerC

src/main/resources/static/js/product/detail.js

@@ -60,6 +60,7 @@ var productDetail = new Vue({
         productCouponList: [],						// 优惠券弹窗列表
         collectionType:false,                       // 商品收藏状态
         supportingList:[],
+        productDetailChose:2,
         defaultSupportingList:[],
         isShowSupportingList:false,
         isShowMoreButton:false,
@@ -174,6 +175,7 @@ var productDetail = new Vue({
                     _self.productTypeName = product.typeName;
                     _self.recommendType = product.recommendType ? product.recommendType : 0;
                     _self.archiveId = product.archiveId; // 保存资料列表id
+                    _self.productDetailChose = product.productDetailChose; // 同资质机构显示商品详情
                     if (product.userLike && product.userLike == 1) {// 商品收藏
                         _self.collectionType = true
                     } else {

src/main/resources/templates/product/detail.html

@@ -459,7 +459,17 @@
                         <p>暂无商品信息</p>
                     </template>
                     <template v-else>
-                        <div th:utext="${product.detailInfo}"></div>
+                        <template v-if="productDetailChose == 1">
+                            <div th:utext="${product.detailInfo}"></div>
+                        </template>
+                        <template v-else>
+                            <template v-if="GLOBAL_USER_ID>0 && ( GLOBAL_USER_IDENTITY === 2 || GLOBAL_USER_IDENTITY === 3)">
+                                <div th:utext="${product.detailInfo}"></div>
+                            </template>
+                            <template v-else-if="GLOBAL_USER_ID == 0 || GLOBAL_USER_ID>0 && ( GLOBAL_USER_IDENTITY === 4)">
+                                <div th:utext="${product.commonDetailInfo}"></div>
+                            </template>
+                        </template>
                     </template>
                 </div>
                 <div class="item" v-if="tabsIndex == 1">