chao преди 4 години
родител
ревизия
e2eaa9efcf

+ 1 - 1
src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8009
+  port: 8100
 spring:
   application:
     # 指定服务名

+ 1 - 1
src/main/resources/config/beta/application-beta.yml

@@ -41,7 +41,7 @@ spring:
 #日志配置
 logging:
   file:
-    path: /mnt/newdatadrive/data/runtime/tomcat-instance/caimei365-www/logs
+    path: /mnt/newdatadrive/data/runtime/tomcat-instance/www/logs
   level:
     root: info
 

+ 1 - 1
src/main/resources/config/prod/application-prod.yml

@@ -41,7 +41,7 @@ spring:
 #日志配置
 logging:
   file:
-    path: /mnt/newdatadrive/data/runtime/tomcat-instance/caimei365-www/logs
+    path: /mnt/newdatadrive/data/runtime/tomcat-instance/www/logs
   level:
     root: info
 

+ 4 - 4
src/main/resources/templates/product/detail.html

@@ -155,10 +155,10 @@
                     </div>
                 </div>
                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
-                   <div  class="btnBox" v-if="priceObj.priceFlag==2 && priceObj.userIdentity!=2">
-                      <a class="upgrade" href="/user/setting/upgrade.html">升级会员查看价格</a>
-                   </div>
-                    <div class="btnBox" v-else-if="priceObj.priceFlag==0 || (priceObj.priceFlag==2 && priceObj.userIdentity==2)">
+                    <div  class="btnBox" v-if="priceObj.priceFlag==2 && priceObj.userIdentity==4">
+                        <a class="upgrade" href="/user/setting/upgrade.html">升级会员查看价格</a>
+                    </div>
+                    <div class="btnBox" v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2)">
                         <a href="javascript:void(0);" class="cart icon" @click='addShopCart()'>加入购物车</a>
                         <a href="javascript:void(0);" class="buy" @click="buyNowSubmit()">立即购买</a>
                     </div>