Merge branch 'dev6.0.1' into test6.0.1

Conflicts:
	code/apps/resource/views/__partail/weiqingting.html

@@ -1120,6 +1120,10 @@
                 <label class="col-sm-2 control-label">高度:</label>
                 <input type="text" placeholder="图片高度" class="observe  number" data-field="imageHeight" value="[[contentData.data.imageHeight]]" style="width:100px;" >
             </div>
+            <div class="col-sm-8">
+                <label class="col-sm-2 control-label">楼层名称:</label>
+                <input type="text" placeholder="楼层名称" class="observe" data-field="title" value="[[contentData.data.title]]" style="width:100px;" >
+            </div>
         </div>
     </div>
     <div class="rows">
@@ -1382,6 +1386,8 @@
                 <option value="1">是</option>
                 <option value="0">否</option>
             </select>
+                <label class="col-sm-2 control-label">楼层名称:</label>
+                <input type="text" placeholder="楼层名称" class="observe" data-field="title" value="[[contentData.data.title]]" style="width:100px;" >
             </div>
         </div>
     </div>
@@ -1406,6 +1412,11 @@
                                 <input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" data-field="list.[[index]].url.url"/>
                             </div>
                         </div>
+                        <div class="form-group">
+                            <div class="col-sm-10">
+                                <input type="text" placeholder="图片描述" value="[[item.alt]]" class="observe form-control" data-field="list.[[index]].alt"/>
+                            </div>
+                        </div>
                     </td>
                 </tr>
                 </tbody>

@@ -77,6 +77,7 @@ var Bll = {
                                 data: Bll.module
                             }, function (res) {
                                 if (res.code == '200') {
+                                    common.util.__tip("添加成功", 'success');
                                     g.reload();
                                     d.close();
                                 }else{
@@ -131,5 +132,3 @@ $(document).on('click', '.info-delete', function() {
     var item=g.rows[$(this).data("index")];
     Bll.deleteAction("确定删除该优惠券店铺吗？",item.shopsId);
 });
-
-console.log("xxxx");
\ No newline at end of file

@@ -1622,6 +1622,7 @@ var Button = [
         data: {
             "imageHeight":"",
             "imageWidth":"",
+            "title":"",
             "list":[],
         },
         "isNewFloor":"1"
@@ -1680,14 +1681,16 @@ var Button = [
                 {
                     "url": {
                         "action": "",
-                        "url": ""
+                        "url": "",
+                        "alt": ""
                     },
                     "src": ""
                 },
                 {
                     "url": {
                         "action": "",
-                        "url": ""
+                        "url": "",
+                        "alt": ""
                     },
                     "src": ""
                 }
@@ -1695,6 +1698,7 @@ var Button = [
             "showSplitLine":"",
             "imageHeight":"330",
             "imageWidth":"330",
+            "title":""
         },
         "isNewFloor":"1"
     },