Merge branch 'dev' into 'master'

Dev

See merge request !35

src/utils/loadBMap.js

@@ -21,10 +21,8 @@ export default function loadBMap(ak) {
       }
       let script = document.createElement('script')
       script.type = 'text/javascript'
-      script.src =
-        'http://api.map.baidu.com/api?v=3.0&ak=' + ak + '&callback=onBMapCallback'
+      script.src = document.location.protocol + '//api.map.baidu.com/api?v=3.0&ak=' + ak + '&callback=onBMapCallback'
       script.onerror = reject
       document.head.appendChild(script)
     })
   }
-  
\ No newline at end of file

src/views/orderManagement/orderList/index.vue

@@ -443,7 +443,7 @@
       getList() {
         let _this = this
         this.listLoading = true;
-        if(this.times.length>0){
+        if(this.times && this.times.length>0){
           this.listQuery.startTime = this.times[0]
           this.listQuery.endTime = this.times[1]
         }

src/views/webSiteManagement/aboutUs/index.vue

@@ -142,7 +142,6 @@
           </div>
         </el-form-item>
         <el-form-item>
-          <el-button>取消</el-button>
           <el-button type="primary" @click="onSubmit">确定</el-button>
         </el-form-item>
       </el-form>