Merge branch 'dev_2.3_shops' into grey

# Conflicts:
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.Brandmodel.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.CateSize.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.CateSizeAttr.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.Porattr.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.SizeAttribute.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.Sizelibrary.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.color.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/baserule.color.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/brand.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/brand.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/category.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/category.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/common.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/common.Login.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/customService.BlackList.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.audit.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.basegoods.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.basegoods.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.basegoods.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.basegoods.Info.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.batchSetPortal.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.batchUpdateStudentPrice.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.cod.Brand.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.cod.Goods.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.cod.Upload.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.limitcategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.netsale.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.netsale.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.netsale.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.price.BrandCooperation.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.price.PriceChange.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.priceExport.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.priceManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.specialgoods.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.yohoCoin.Audit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/goods.yohoCoin.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.articleCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.author.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.brandConcern.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.comment.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.info.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.info.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.plusStar.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.plusStarCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.tag.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/guang.tagCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/help.Category.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/help.Content.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/libs.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.BrandCoupon.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponList.AddOrUpdate.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponList.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.PublicCoupon.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.Send.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.SendHistory.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.CouponSend.UseHistory.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.LimitCode.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.LimitCode.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.LimitCode.Info.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.ProductPool.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.PromotionCode.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.PromotionCode.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.QueryCoupon.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.Vip.Add.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/marketing.Vip.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.activitytemplate.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.activitytemplate.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.activitytemplate.Product.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.category.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.category.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponActivity.Add.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponActivity.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponActivity.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.couponSend.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.entrance.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.generateLinks.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.hotRankTag.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.hotsuggest.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.icon.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.limit.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.limit.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.notice.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.officialAccounts.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.officialAccounts.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.payment.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.salecategory.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.salecategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.salecategory.TagMgmt.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.shopsVersionUpdate.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.staticFile.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.subject.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.suggest.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.version.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.webshare.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.webshare.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/operations.ziplist.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.platformManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.resourceManage.ContentManage.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.resourceManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/resource.resourceSortManage.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/searchWords.HotBrand.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/searchWords.SearchWords.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.MeterSize.Add.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.MeterSize.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.Model.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.ProPhoto.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.ShootRequire.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.TryInfo.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.TryInfo.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shootMeter.TryModel.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Administrator.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Decoration.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.DecorationBLK.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.DecorationList.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.Info.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Batch.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/shop.ShopCategory.Info.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/supplier.Edit.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/supplier.Index.js
#	dist/yohobuy-portal-fe/5.0.2/jquery/supplier.Info.js
#	server/controllers/common.select.js
#	server/controllers/goods.basegoods.js
#	server/controllers/goods.netsale.js
#	server/controllers/marketing.QueryCoupon.js
#	server/controllers/operations.generateLinks.js
#	server/index.js
#	server/interfaces/common.select.js
#	server/interfaces/common.yohosearch.js
#	server/interfaces/goods.audio.js
#	server/interfaces/goods.basegoods.js
#	server/interfaces/goods.netsale.js
#	server/interfaces/marketing.CouponList.js
#	server/interfaces/marketing.QueryCoupon.js
#	server/interfaces/operations.activitytemplate.js
#	server/interfaces/operations.payment.js
#	server/interfaces/operations.webshare.js
#	server/views/goods/basegoods/Batch.html
#	server/views/goods/basegoods/Edit.html
#	server/views/goods/basegoods/Index.html
#	server/views/goods/basegoods/Info.html
#	server/views/goods/netsale/Batch.html
#	server/views/goods/netsale/Index.html
#	server/views/goods/netsale/__partail/add_info.html
#	server/views/goods/netsale/__partail/basic_info.html
#	server/views/goods/netsale/__partail/goods_sort.html
#	server/views/marketing/CouponList/AddOrUpdate.html
#	server/views/marketing/CouponList/Index.html
#	server/views/operations/activitytemplate/Product.html
#	server/views/operations/generateLinks/Index.html
#	server/views/operations/icon/Index.html
#	server/views/operations/payment/Index.html
#	server/views/operations/webshare/Edit.html
#	server/views/resource/__partail/weiqingting.html

@@ -94,7 +94,8 @@
                             <label>店铺简介:</label>
                         </div>
                         <div class="col-sm-7">
-                            <textarea class="form-control" form="storeForm" rows="10" name="shopIntro" id="shopIntro"><%data.shopIntro%></textarea>
+                            <script id="edit-shop-intro" type="text/plain" style="width:100%;height:500px;"></script>
+                            <input id="shopIntro" type="hidden" placeholder="店铺简介" value="<%data.shopIntro%>">
                         </div>
                     </div>
                     <div class="form-group">

@@ -45,7 +45,10 @@
 			</div>
 			<div class="row show-grid">
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">店铺简介：</div>
-				<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8"><%data.shopIntro%></div>
+				<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
+					<script id="edit-shop-intro" type="text/plain" style="width:100%;height:500px;"></script>
+					<input id="shopIntro" type="hidden" placeholder="店铺简介" value="<%data.shopIntro%>">
+                </div>
 			</div>
 			<div class="row show-grid">
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">店铺状态：</div>

@@ -2,8 +2,15 @@
 'use strict';
 var $ = require('jquery'),
     common=require('../../common/common');
+
+require('../../common/umeditor.config');
+require('../../common/umeditor');
+require('../../common/zh-cn');
+
 var e=new common.edit("#storeForm",{bucket:"yhb-img01"});
 
+window.UMshopintro = UM.getEditor('edit-shop-intro');
+
 var Bll={
     toast:function(content,url,id){
         common.dialog.confirm("温馨提示",content,function(){
@@ -92,6 +99,11 @@ e.on("render",function(){
         // Array.prototype.push.apply(g2.__rows, a);
         g2.init(g2.__rows);
     }
+
+    var shopIntroContent = $('#shopIntro').val();
+    if(shopIntroContent) {
+        UMshopintro.setContent(shopIntroContent);
+    }
 });
 
 e.on("bind",function(){
@@ -263,6 +275,7 @@ e.init();
 var submit=function(callback){
     e.submit($("#storeForm").attr("action"),function(option){
         option.data=$.extend({},option.data,_arr);
+        option.data.shopIntro = UMshopintro.getContent();
         console.log(option.data);
         option.success=function(res){
             if(res.code=="200"){

@@ -4,6 +4,10 @@
 var $ = require('jquery'),
     common=require('../../common/common');
 
+require('../../common/umeditor.config');
+require('../../common/umeditor');
+require('../../common/zh-cn');
+
 var ENUM={
     shopNature:{1:'旗舰店',2:'专卖店'},
     shopsType:{1:'单品店',2:'多品店'},
@@ -64,3 +68,10 @@ if($("#shopRelationList").val()){
     var a=JSON.parse($("#shopRelationList").val());
     g2.init(a);
 }
+
+window.UMshopintro = UM.getEditor('edit-shop-intro');
+window.UMshopintro.setDisabled('fullscreen');
+var shopIntroContent = $('#shopIntro').val();
+if(shopIntroContent) {
+    UMshopintro.setContent(shopIntroContent);
+}
\ No newline at end of file