Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/bigSceneEdit_java

# Conflicts:
#	js/edit.js

edit.html

@@ -992,7 +992,7 @@
                                     </div>
                                 </li>
                                 <li class="photo">
-                                    <div class="itemTitle" data-size="<2M">
+                                    <div class="itemTitle" data-size="<9M">
                                         <span>图片</span>
                                     </div>
                                     <div class="list edit-fun-images clearfix"></div>
@@ -1435,7 +1435,7 @@
         var ceshi = 'http://47.107.252.54:8105';
          /*
         //大场景: 
-        var ceshi = 'http://47.107.252.54:8105';
+        var ceshi = '';
         var token = window.localStorage.dcj_token 
         if (!token) {
            window.location.href = '../list/index.html'

eforclient.html

@@ -1418,7 +1418,7 @@
             
         }
         var ceshi = ''//'http://47.107.252.54:8105';
-        var token = window.localStorage.dcj_token 
+        var token = ''
         //if (!token) {
          //  window.location.href = '../list/index.html'
         //}