build project

@@ -170,6 +170,7 @@ webpackJsonp([34],[
 	        display: 'skn',
 	        name: 'productSkn',
 	        render: function (item) {
+	            pageSkn.push(item.productSkn);
 	            return '<a target="_blank" href="/goods/netsale/info/' + item.productSkn + editPostion + '">' + item.productSkn + '</a>'
 	        }
 	    }, {
@@ -432,7 +433,7 @@ webpackJsonp([34],[
 	    //  }
 	    // }
 
-	    g.selected.forEach(function (item) {
+	    batchOperateShelve.forEach(function (item) {
 	        if (item.isAdvance === 'N') {
 	            $('#advanceBeginTime, #advanceEndTime, #buyTime').prop('disabled', true);
 	            $('#advanceBeginTime').parents('.form-group').find('.btn').addClass('disabled');

-webpackJsonp([79],[
-/* 0 */
+webpackJsonp([79],{
+
+/***/ 0:
 /***/ function(module, exports, __webpack_require__) {
 
 	/**
@@ -9,7 +10,7 @@ webpackJsonp([79],[
 
 	var $ = __webpack_require__(1);
 	common = __webpack_require__(2);
-	var activity = __webpack_require__(!(function webpackMissingModule() { var e = new Error("Cannot find module \"./../partials/activity\""); e.code = 'MODULE_NOT_FOUND'; throw e; }()));
+	var activity = __webpack_require__(42);
 	var startTimeObj;
 	var endTimeObj;
 
@@ -107,5 +108,35 @@ webpackJsonp([79],[
 	});
 
 
+/***/ },
+
+/***/ 42:
+/***/ function(module, exports) {
+
+	/**
+	 * Created by jiangmin  on 2016/5/27.
+	 */
+	var activity = {
+	    actName: "",
+	    activityType: 0,
+	    actUrl: "",
+	    startTime: "",
+	    endTime: "",
+	    bgImageUrl: "",
+	    shareTitle: "",
+	    shareDescribe: "",
+	    sharePic: "",
+	    shareUrl: "",
+	    isVerify: "N",
+	    instructions: "",
+	    isNewUser: 0,
+	    couponId: "",
+	    couponIds:[{"id":""}]
+
+	};
+
+	module.exports = activity;
+
 /***/ }
-]);
\ No newline at end of file
+
+});
\ No newline at end of file

@@ -5,10 +5,10 @@ webpackJsonp([108],{
 
 	var $ = __webpack_require__(1),
 	    common = __webpack_require__(2);
-	var Button = __webpack_require__(42);
-	var resourceObj = __webpack_require__(43);
-	var Validate = __webpack_require__(44);
-	var addObj = __webpack_require__(45);
+	var Button = __webpack_require__(43);
+	var resourceObj = __webpack_require__(44);
+	var Validate = __webpack_require__(45);
+	var addObj = __webpack_require__(46);
 	__webpack_require__(9);
 
 	/*获取数据*/
@@ -1348,7 +1348,7 @@ webpackJsonp([108],{
 
 /***/ },
 
-/***/ 42:
+/***/ 43:
 /***/ function(module, exports) {
 
 	var Button = [
@@ -2449,7 +2449,7 @@ webpackJsonp([108],{
 
 /***/ },
 
-/***/ 43:
+/***/ 44:
 /***/ function(module, exports) {
 
 	/**
@@ -2484,7 +2484,7 @@ webpackJsonp([108],{
 
 /***/ },
 
-/***/ 44:
+/***/ 45:
 /***/ function(module, exports, __webpack_require__) {
 
 	/**
@@ -2527,7 +2527,7 @@ webpackJsonp([108],{
 
 /***/ },
 
-/***/ 45:
+/***/ 46:
 /***/ function(module, exports) {
 
 	/**

@@ -16,7 +16,7 @@
                     <td>说明：</td>
                     <td colspan="2">
                         1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
-                        2、第一行标题栏：<span style="color: #67D267;">tab名称、店铺名称、店铺ID、店铺banner、店铺logo图片地址、  店铺推荐短语、基础收藏人数</span><br>
+                        2、第一行标题栏：<span style="color: #67D267;">tab名称、店铺名称、店铺ID、店铺banner、店铺logo图片地址、  店铺推荐短语、基础收藏人数、店铺模板类型 [1 基础模板  2 经典模板]</span><br>
                         3、<a href="/ajax/link/shopsPromoteBatchImport">下载样例</a>
                     </td>
                 </tr>