Merge remote-tracking branch 'origin/develop' into xodud1202

src/main/resources/config/application-run.yml

@@ -36,22 +36,22 @@ has-ssl: true
 
 upload:
     default:
-        target.path: /app/was/deploy/wivismall.front/data
+        target.path: /usr/local/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png|bmp|txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //image.istyle24.com/Upload
+        view: //image.istyle24.com
     goods:
-        target.path: /app/was/deploy/wivismall.front/data/goods
+        target.path: /usr/local/data/style24/productimage
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
         view: //image.istyle24.com/Upload/ProductImage
     image:
-        target.path: /app/was/deploy/wivismall.front/data
+        target.path:  /usr/local/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //image.istyle24.com/Upload
+        view: //image.istyle24.com
 
-download.path: /app/was/deploy/wivismall.front/data
+download.path: /usr/local/data
 
 # SMTP
 mail:
@@ -75,7 +75,7 @@ usafe.guarantee:
 # PG
 pg:
     kcp:
-        log.dir: E:/Run/Payplus
+        log.dir: /logs/style24/kcpLogs/front
         gw:
             url: paygw.kcp.co.kr
             port: 8090

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html

@@ -1301,6 +1301,7 @@
 					}
 				}else{
 					$obj = $('.pop_option_select .select_custom.item_opt1.item_opt1_1');
+					ridx = 1;  // 입점은 1로 고정
 				}	
 			//	$obj.html('');
 			//	$obj.append(tag);

src/main/webapp/WEB-INF/views/web/goods/GoodsDetailFormWeb.html

@@ -1412,6 +1412,7 @@
 					
 				}else{
 					$obj = $('.form_field .select_custom.item_opt2.item_opt2_1');
+					ridx = 1;  // 입점은 1로 고정
 				}	
 				
 				$.each(result.dataList, function(idx, item) {