Переглянути джерело

医美机构可见度修改

zhengjinyi 3 роки тому
батько
коміт
3804a8ec20

+ 3 - 3
src/main/resources/config/dev/application-dev.yml

@@ -55,9 +55,9 @@ logging:
 caimei:
   siteEnv: 0 #网站环境,(2:正式环境,1:测试环境,0:开发环境)
   spiServer: http://192.168.2.68:8008
-  coreServer: https://core-b.caimei365.com
-  #coreServer: http://192.168.2.68:18002
-  #coreServer: http://192.168.2.75:18002
+#  coreServer: https://core-b.caimei365.com
+#  coreServer: http://192.168.2.68:18002
+  coreServer: http://192.168.2.75:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: http:localhost:8009
   destPath: D:/_PLAN_WORKSPACE/test/static

+ 1 - 1
src/main/resources/static/js/base.js

@@ -17,7 +17,7 @@ if(localStorage.getItem('userInfo')){
     GLOBAL_CLUB_TYPE = globalUserData.firstClubType ? globalUserData.firstClubType : null;
     if (GLOBAL_USER_ID === 5261 || GLOBAL_USER_ID === 10947 || GLOBAL_USER_ID === 11579) {
         GLOBAL_USER_IDENTITY = 1;
-    }else(GLOBAL_CLUB_TYPE == 1){
+    }else if(GLOBAL_CLUB_TYPE == 1){
         GLOBAL_USER_IDENTITY = 5;
     }
 } else {

+ 1 - 1
src/main/resources/templates/index.html

@@ -205,7 +205,7 @@
                                                             <em class="price_grade_club"><span>¥</span>会员可见</em>
                                                         </template>
                                                         <!--机构价仅医美机构可见-->
-                                                        <template v-else-if="pros.product.priceFlag==3 && GLOBAL_USER_IDENTITY === 4">
+                                                        <template v-else-if="pros.product.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
                                                             <em class="price_grade_club"><span>¥</span>仅医美机构可见</em>
                                                         </template>
                                                         <template v-else>

+ 1 - 1
src/main/resources/templates/product/list.html

@@ -216,7 +216,7 @@
                                 ¥会员可见
                             </div>
                             <!--机构价仅会员可见 && 用户是普通机构-->
-                            <div class="main_price_unde" v-else-if="p.priceFlag==3 && GLOBAL_USER_IDENTITY === 4">
+                            <div class="main_price_unde" v-else-if="p.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
                                 ¥仅医美机构可见
                             </div>
                             <!--供应商除自己的商品外,也显示价格等级-->

+ 1 - 0
src/main/resources/templates/shopping/cart.html

@@ -195,6 +195,7 @@
                         <em v-else-if="cart.status==5">价格仅会员可见,您不能购买</em>
                         <em v-else-if="cart.status==6">未公开价格</em>
                         <em v-else-if="cart.status==7">库存不足</em>
+                        <em v-else-if="cart.status==8">价格仅医美机构可见</em>
                         <em v-else>商品已失效</em>
                     </div>
                     <div v-if="isPC" class="c6"><span class="del" @click="deleteCartOne(cart.productId)">×<em class="tips">删除</em></span></div>