chenzhiguang 4 years ago
parent
commit
522483ae0f

+ 2 - 2
backstage/src/pages/content/Dynamic.vue

@@ -345,8 +345,8 @@ export default {
       this.form = result.data;
     },
 
-    goto(item) {
-      window.open(`/web/#/?m=${item.sceneCode}`, "_blank");
+    goto() {
+      window.open(`/`, "_blank");
     },
 
     gotoEdit(item) {

+ 3 - 1
edit-backstage/js/myShow.js

@@ -1,7 +1,9 @@
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-var g_Prefix="https://super.4dage.com/";
+// var g_Prefix="https://super.4dage.com/";
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
 var s = window.location.href.split('/');
+var g_Prefix=window.location.origin+'/';
+
 s.pop();
 //var g_Prefix = s.join('/');
 var g_index=null;

+ 1 - 4
web/package.json

@@ -8,13 +8,10 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "axios": "^0.21.1",
     "core-js": "^3.6.5",
     "swiper": "^5.3.8",
     "vue": "^2.6.11",
-    "vue-awesome-swiper": "^4.1.1",
-    "vue-router": "^3.2.0",
-    "vue-worker": "^1.2.1"
+    "vue-awesome-swiper": "^4.1.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.0",

File diff suppressed because it is too large
+ 500 - 497
web/public/static/js/main_2020_show.js


+ 1 - 1
web/public/static/js/myShow.js

@@ -1,5 +1,5 @@
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-// var g_Prefix="http://8.135.106.227:8009/";
+// var g_Prefix="http://192.168.1.101/";
 // https://super.4dage.com/
 var g_Prefix=window.location.origin+'/';
 

+ 7 - 2
web/src/App.vue

@@ -1,12 +1,17 @@
 <template>
-    <router-view/>
+    <Home/>
 </template>
 
 <script>
+import Home from '@/pages/Home.vue'
+
 import '@/assets/style/reset.less'
 import '@/assets/style/public.less'
+
 export default {
-    
+    components:{
+        Home
+    }
 }
 </script>
 <style lang="less">

BIN
web/src/assets/images/thumbimg.jpg


BIN
web/src/assets/video/welcome.mp4


BIN
web/src/assets/video/welcome.webm


+ 21 - 21
web/src/components/welcome/index.vue

@@ -6,9 +6,9 @@
       <span v-if="!isVideo" class="btn" @click="showVideo">开始预览</span>
     </template>
 
-    <video ref="welcome" :style="{opacity:isVideo?1:0}" >
-      <source :src="require('@/assets/video/welcome.webm')" type="video/webm">
+    <video ref="welcome" >
       <source :src="require('@/assets/video/welcome.mp4')" type="video/mp4">
+      <source :src="require('@/assets/video/welcome.webm')" type="video/webm">
     </video> 
 
     <span v-if="isVideo" class="btn jump" @click="$bus.$emit('toggleWelcome', false)">跳过</span>
@@ -23,38 +23,38 @@ export default {
   data(){
     return {
       isVideo: false,
-      loading:true
+      loading:false
     }
   },
   methods:{
-    autoplay(){
-      this.$nextTick(()=> {
-        setTimeout(() => {
-          this.$refs.welcome.play();
-        });
-      })
-    },
     showVideo(){
       this.isVideo=true
-      this.autoplay()
+      this.$refs.welcome.play();
     }
   },
   mounted(){
 
      this.$nextTick(()=> {
-        this.$refs.welcome && this.$refs.welcome.addEventListener('ended',()=>{
-          this.$bus.$emit('toggleWelcome', false)
-        })
+       if (this.$refs.welcome) {
+            this.$refs.welcome.addEventListener("ended", ()=>{
+                this.$bus.$emit('toggleWelcome', false)
+            });
 
-        this.$refs.welcome.addEventListener('canplaythrough',()=>{
-          setTimeout(() => {
-            this.loading = false
-          }, 3000);
-        })
+            // this.$refs.welcome.addEventListener("progress", (e)=>{
+            //     // console.log('progress',e);
+            //     let progress = 0
+            //     if (this.$refs.welcome.buffered!=0) {
+            //       progress = this.$refs.welcome.buffered.end(0)
+            //     }
+               
+            //     // console.log(this.$refs.welcome.buffered);
+            // });
+            this.$refs.welcome.addEventListener("canplaythrough",()=>{
+                this.loading = false
+            })
+        }
 
       })
-    
-    // this.autoplay()
   }
 }
 </script>

+ 2 - 5
web/src/main.js

@@ -1,12 +1,10 @@
 import Vue from 'vue'
 import App from './App.vue'
 import '@/mixins'
-import router from './router'
-import {axios, serverLocation} from './utils/http'
+
 
 Vue.config.productionTip = false
-Vue.prototype.$http = axios
-Vue.prototype.$serverName = serverLocation
+Vue.prototype.$serverName = process.env.NODE_ENV === 'production' ? '' : 'http://8.135.106.227:8009/'
 
 Vue.prototype.$type = {
   model:'实物模型',
@@ -16,6 +14,5 @@ Vue.prototype.$type = {
 
 
 new Vue({
-  router,
   render: h => h(App)
 }).$mount('#app')

+ 61 - 23
web/src/pages/Home.vue

@@ -100,9 +100,16 @@
             <v-guide v-show="showPull"/>
         </transition>
     </div>
-    <keep-alive>
-        <welcome v-if="showWelcome"/>
-    </keep-alive>
+    <welcome v-if="showWelcome"/>
+
+
+   <transition name="fade">
+      <div class="thumbimg" v-if="showthumb">
+        <img class="real" :src="require('@/assets/images/thumbimg.jpg')" alt="">
+        <img class="blur" :src="require('@/assets/images/thumbimg.jpg')" alt="">
+      </div>
+  </transition>
+   
 
     <div class="loading" v-if="loading">
       <span>加载中...</span>
@@ -190,12 +197,8 @@ export default {
           this.showWelcome = data
         }
         if (!data) {
-            firstIn = false
-            manage.switchBgmState(true);
-            this.showTips = true
-            setTimeout(() => {
-              this.showTips = false
-            }, 5000);
+            window.startLoadAfterVideo()
+           
             // window.player.tloadOverlays()
         }
     })
@@ -221,10 +224,19 @@ export default {
     })
     window.addEventListener('loadfinish',  ()=> {
         this.showMenu = true
+        this.showthumb=false
         window.player.on("loadLongVideo", ()=> {
             this.showLoingVideo = true
         })
         this.loading = false
+        setTimeout(() => {
+          firstIn = false
+          manage.switchBgmState(true);
+          this.showTips = true
+          setTimeout(() => {
+            this.showTips = false
+          }, 5000); 
+        },1000);
     })
     
   },
@@ -233,18 +245,21 @@ export default {
           this.$showMap({})
       },
       async handleShowFile(){
-        let result = await this.$http({
-            method: 'get',
-            url: '/api/web/material/getCode'
-        })
-        if (result.code != 0) {
-            return this.$showAlert({
-                tips:'无法获取史料收件箱标识码'
-            })
-        }
-        this.isShowFile = true
-        this.fileCode = result.data
-      }
+        $.ajax({
+          url: '/api/web/material/getCode',
+          type: "get",
+          dataType: 'json',
+          contentType: 'application/json',
+          success: (result) => {
+            if (result.code != 0) {
+                return this.$showAlert({
+                    tips:'无法获取史料收件箱标识码'
+                })
+            }
+            this.isShowFile = true
+            this.fileCode = result.data
+        }})
+    }
   },
   data(){
       return {
@@ -257,8 +272,9 @@ export default {
         showWelcome:true,
         showLoingVideo: false,
         fileCode:'',
-        loading:true,
-        showTips:false
+        loading:false,
+        showTips:false,
+        showthumb:true
       }
   }
 }
@@ -358,6 +374,28 @@ export default {
     background: rgba(0, 0, 0, 0.6);
 }
 
+.thumbimg{
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 99;
+    .real{
+      width: 100%;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%,-50%);
+      z-index: 111;
+    }
+    .blur{
+      width: 100%;
+      height: 100%;
+      filter:blur(8px);
+    }
+}
+
 .loading{
     position: fixed;
     left: 0;

+ 31 - 24
web/src/views/collection/pc.vue

@@ -97,17 +97,20 @@ export default {
   },
   methods:{
     async getTypeLi(){
-      let result = await this.$http({
-        method: 'get',
-        url: '/api/web/zoneList'
-      })
-      if (result.code != 0) {
-        return this.$showAlert({
-                    tips:'获取展区列表失败'
-                })
-      }
-      this.typeLi = result.data
-      this.getCollection()
+      $.ajax({
+        url: '/api/web/zoneList',
+        type: "get",
+        dataType: 'json',
+        contentType: 'application/json',
+        success: (result) => {
+           if (result.code != 0) {
+              return this.$showAlert({
+                          tips:'获取展区列表失败'
+                      })
+            }
+            this.typeLi = result.data
+            this.getCollection()
+      }})
     },
     async getCollection() {
       let params = {
@@ -117,19 +120,23 @@ export default {
           zoneId:this.typeActive&&this.typeActive.id
       }
 
-      let result = await this.$http({
-        method: 'post',
-        data: params,
-        url: '/api/web/goodsList'
-      })
-      if (result.code != 0) {
-        return this.$showAlert({
-                    tips:'获取文物列表失败'
-                })
-      }
-      this.list = result.data.list
-      this.paging.total = result.data.total
-      this.hasLoad = true
+       $.ajax({
+        url: '/api/web/goodsList',
+        type: "post",
+        data: JSON.stringify(params),
+        dataType: 'json',
+        contentType: 'application/json',
+        success: (result)=> {
+          if (result.code != 0) {
+            return this.$showAlert({
+                tips:'获取文物列表失败'
+            })
+          }
+          this.list = result.data.list
+          this.paging.total = result.data.total
+          this.hasLoad = true
+        }})
+   
     },
     handleToggle(data){
       this.isShow = data

+ 0 - 3
web/src/views/gui/newguide.vue

@@ -146,7 +146,6 @@ export default {
     },
     hoverHandle(item,i){
       this.hoverIdx = item.toIdx;
-      console.log(item);
       player.model.emit('tourThumbImgHover',item.toIdx)
     },
     hoverOutHandle(item,i){ 
@@ -162,7 +161,6 @@ export default {
     this.$nextTick(() => {
       window.addEventListener("loadfinish", () => {
         this.guide = window.player.model.images;
-        console.log(this.guide);
         let fixArr = [{
           idx:0,
           name:'序厅',
@@ -204,7 +202,6 @@ export default {
             })
           }
         })
-        console.log(this.mapData);
          //监听导览状态
           window.player.on('onplayStatus', (data)=>{
             this.guideActive = data.destinationItem && data.destinationItem[0]

+ 3 - 3
web/src/views/popup/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="popup">
-        <div class="popup-content"></div>
-        <div id="closepop">close</div>
-    </div>
+      <div class="popup-content"></div>
+      <div id="closepop">close</div>
+  </div>
 </template>
 
 <script>

+ 185 - 153
web/src/views/uploadflie/index.vue

@@ -1,54 +1,85 @@
 <template>
   <div>
     <div class="collection" v-if="fileCode">
-      <img class="bg" :src="require('@/assets/images/collect_bg.png')">
-      <img class="close" @click="$bus.$emit('toggleUploadFile',false)" :src="require('@/assets/images/icon/close.png')">
+      <img class="bg" :src="require('@/assets/images/collect_bg.png')" />
+      <img
+        class="close"
+        @click="$bus.$emit('toggleUploadFile', false)"
+        :src="require('@/assets/images/icon/close.png')"
+      />
       <div class="con">
         <div class="title">史料收件箱</div>
         <div class="con-body">
-          <p>欢迎使用史料收件箱,您可在此分享史料信息,传递知识!感谢您对信息工程大学的支持!</p>
+          <p>
+            欢迎使用史料收件箱,您可在此分享史料信息,传递知识!感谢您对信息工程大学的支持!
+          </p>
           <div class="line"></div>
           <div class="item">
             <span>*史料说明</span>
-            <textarea maxlength="200" v-model="desc" placeholder="不超过200个字" cols="30" rows="5"></textarea>
+            <textarea
+              maxlength="200"
+              v-model="desc"
+              placeholder="不超过200个字"
+              cols="30"
+              rows="5"
+            ></textarea>
           </div>
           <div class="line"></div>
           <div class="item">
             <span>上传史料</span>
-            <span class="desc">支持上传图片 /视频 /压缩包,上传文件数量不超过5个</span>
+            <span class="desc"
+              >支持上传图片 /视频 /压缩包,上传文件数量不超过5个</span
+            >
           </div>
           <div class="item uploaditem">
             <span>上传内容</span>
             <ul>
               <li class="plus" @click="$refs.uploadFile.click()">
-                <img :src="require('@/assets/images/uploadplus.png')" alt="">
+                <img :src="require('@/assets/images/uploadplus.png')" alt="" />
                 <upload
                   ref="uploadFile"
                   :limit="11200"
-                  :mediaType="['application','image','video']"
+                  :mediaType="['application', 'image', 'video']"
                   @file-change="onFileChange"
                 ></upload>
               </li>
 
-              <li v-for="(item,i) in fileList" :key="i">
-                <img v-if="item.type=='application'" :src="require('@/assets/images/uploadfile/zip.png')" alt="">
-                <img v-else-if="item.type=='video'" :src="require('@/assets/images/uploadfile/video.png')" alt="">
+              <li v-for="(item, i) in fileList" :key="i">
+                <img
+                  v-if="item.type == 'application'"
+                  :src="require('@/assets/images/uploadfile/zip.png')"
+                  alt=""
+                />
+                <img
+                  v-else-if="item.type == 'video'"
+                  :src="require('@/assets/images/uploadfile/video.png')"
+                  alt=""
+                />
 
                 <div v-else class="img">
-                  <img :src="item.img" alt="">
+                  <img :src="item.img" alt="" />
                 </div>
 
-                <div class="close" @click="del(item,i)">
-                  <img :src="require('@/assets/images/uploadfile/close.png')" alt="">
+                <div class="close" @click="del(item, i)">
+                  <img
+                    :src="require('@/assets/images/uploadfile/close.png')"
+                    alt=""
+                  />
                 </div>
-                <span :title="item.name">{{item.name}}</span>
+                <span :title="item.name">{{ item.name }}</span>
               </li>
             </ul>
           </div>
           <div class="line"></div>
           <div class="item">
             <span>联系方式</span>
-            <textarea v-model="contact" maxlength="50" placeholder="不超过50个字" cols="30" rows="2"></textarea>
+            <textarea
+              v-model="contact"
+              maxlength="50"
+              placeholder="不超过50个字"
+              cols="30"
+              rows="2"
+            ></textarea>
           </div>
         </div>
         <div class="submit">
@@ -57,10 +88,10 @@
       </div>
     </div>
 
-    <div class="showloading" v-if="progress&&progress!='100%'">
+    <div class="showloading" v-if="progress && progress != '100%'">
       <div class="loadingcon">
         <div class="line">
-          <div class="progress" :style="{width:progress}"></div>
+          <div class="progress" :style="{ width: progress }"></div>
         </div>
         <span>文件上传中</span>
       </div>
@@ -70,133 +101,136 @@
 
 <script>
 import Upload from "@/components/uploader";
-import { http } from '@/utils/request'
+import { http } from "@/utils/request";
 
-let TYPE = {
-
-}
+let TYPE = {};
 
 export default {
-  data(){
+  data() {
     return {
-      hasLoad:false,
-      fileList:[],
-      progress:0,
-      desc:'',
-      contact:''
-    }
+      hasLoad: false,
+      fileList: [],
+      progress: 0,
+      desc: "",
+      contact: "",
+    };
   },
-  props:{
-    fileCode:String
+  props: {
+    fileCode: String,
   },
-  components:{
-    Upload
+  components: {
+    Upload,
   },
-  computed:{
-    
-  },
-  watch:{
-    
-  },
-  methods:{
-    async save(){
+  computed: {},
+  watch: {},
+  methods: {
+    async save() {
       if (!String(this.desc).trim()) {
         return this.$showAlert({
-            tips:'请填写史料说明'
-        })
+          tips: "请填写史料说明",
+        });
       }
       let params = {
-          "code": this.fileList.length>0?this.fileCode:'',
-          "description": String(this.desc).trim(),
-          "phone": this.contact.trim()
-      }
+        code: this.fileList.length > 0 ? this.fileCode : "",
+        description: String(this.desc).trim(),
+        phone: this.contact.trim(),
+      };
 
-      let result = await this.$http({
-        method: 'post',
-        data: params,
-        url: '/api/web/material/save'
-      })
-
-      if (result.code === 0) {
-        this.$showAlert({
-            tips:'提交成功'
-        })
-        this.$bus.$emit('toggleUploadFile',false)
-      }
+      $.ajax({
+        url: "/api/web/material/save",
+        type: "post",
+        data: JSON.stringify(params),
+        dataType: "json",
+        contentType: "application/json",
+        success: (result) => {
+          if (result.code === 0) {
+            this.$showAlert({
+              tips: "提交成功",
+            });
+            this.$bus.$emit("toggleUploadFile", false);
+          }
+        },
+      });
     },
-    async del(item,i){
-      let result = await this.$http({
-        method: 'post',
-        data: {path:item.path},
-        url: '/api/web/material/delete'
-      })
-      if (!result.code === 0) {
-        this.$showAlert({
-            tips:'删除失败,请稍后再试'
-        })
-        this.$bus.$emit('toggleUploadFile',false)
-      }
-      this.fileList.splice(i,1);
-
+    async del(item, i) {
+      $.ajax({
+        url: "/api/web/material/delete",
+        type: "post",
+        data: JSON.stringify({ path: item.path }),
+        dataType: "json",
+        contentType: "application/json",
+        success: (result) => {
+          if (!result.code === 0) {
+            this.$showAlert({
+              tips: "删除失败,请稍后再试",
+            });
+            this.$bus.$emit("toggleUploadFile", false);
+          }
+          this.fileList.splice(i, 1);
+        },
+      });
     },
     onFileChange(data) {
-      if (this.fileList.length>4) {
+      if (this.fileList.length > 4) {
         return this.$showAlert({
-            tips:'上传文件数量不超过5个'
-        })
+          tips: "上传文件数量不超过5个",
+        });
       }
 
       console.log(data.files);
-      let type = ''
-      if (data.files[0].name.indexOf('.rar')>-1) {
-        type = 'application'
+      let type = "";
+      if (data.files[0].name.indexOf(".rar") > -1) {
+        type = "application";
       }
       let tmp = {
-        id:'_' + this.$randomWord(false,8,8),
-        file:data.files[0],
-        type:type || data.files[0].type.split('/')[0],
-        name:data.files[0].name,
-        img:window.URL.createObjectURL(data.files[0])
-      }
+        id: "_" + this.$randomWord(false, 8, 8),
+        file: data.files[0],
+        type: type || data.files[0].type.split("/")[0],
+        name: data.files[0].name,
+        img: window.URL.createObjectURL(data.files[0]),
+      };
+
+      let flag = this.fileList.findIndex((item) => {
+        return data.files[0].name == item.name;
+      });
 
-      let flag = this.fileList.findIndex(item=>{
-        return data.files[0].name == item.name
-      })
-      
-      if (flag>-1) {
+      if (flag > -1) {
         return this.$showAlert({
-            tips:'无法上传同名文件,请重新选择'
-        })
+          tips: "无法上传同名文件,请重新选择",
+        });
       }
 
-      http.uploadFile(`${this.$serverName}/api/web/material/upload/${this.fileCode}`, tmp, (res)=>{
-        tmp.path = res.data.path
-        this.fileList.push(tmp)
-      }, err=>{
-        console.log(err);
-      },progress=>{
-        this.progress = progress
-      })
-
-    }
-    
+      http.uploadFile(
+        `${this.$serverName}/api/web/material/upload/${this.fileCode}`,
+        tmp,
+        (res) => {
+          tmp.path = res.data.path;
+          this.fileList.push(tmp);
+        },
+        (err) => {
+          console.log(err);
+        },
+        (progress) => {
+          this.progress = progress;
+        }
+      );
+    },
   },
-  mounted(){
-  }
-}
+  mounted() {},
+};
 </script>
 
 <style lang="less" scoped>
-.collection{
+.collection {
   margin: 0 auto;
   width: 80%;
-  transform: translate(-50%,-50%);
+  transform: translate(-50%, -50%);
   top: 50%;
   left: 50%;
   min-height: 87vh;
   padding: 0;
   position: fixed;
-  .bg{
+  .bg {
     width: 100%;
     height: 100%;
     position: absolute;
@@ -204,7 +238,7 @@ export default {
     left: 0;
     z-index: -1;
   }
-  .close{
+  .close {
     position: absolute;
     bottom: 50px;
     right: 50px;
@@ -212,44 +246,44 @@ export default {
     cursor: pointer;
     z-index: 9999;
   }
- 
-  .con{
+
+  .con {
     width: 100%;
     margin-top: 45px;
     overflow-y: auto;
-    .title{
+    .title {
       text-align: center;
       width: 100%;
       text-shadow: 0px 3px 6px rgba(0, 0, 0, 0.59);
       font-size: 18px;
       font-weight: bold;
       margin: 0 auto;
-      color: #FCD67B;
+      color: #fcd67b;
       letter-spacing: 2px;
     }
-    .con-body{
+    .con-body {
       font-size: 16px;
       letter-spacing: 1px;
       width: 80%;
       max-width: 900px;
       margin: 44px auto 0;
 
-      .line{
+      .line {
         width: 100%;
         height: 1px;
-        background: #FFFFFF;
+        background: #ffffff;
         opacity: 0.3;
         margin: 16px 0;
       }
 
-      .item{
+      .item {
         display: flex;
-        >span{
+        > span {
           min-width: 100px;
           display: inline-block;
           margin-top: 20px;
         }
-        >textarea{
+        > textarea {
           width: 100%;
           background: rgba(255, 255, 255, 0.8);
           color: #000000;
@@ -258,36 +292,36 @@ export default {
           border-radius: 4px;
           letter-spacing: 1px;
         }
-        .desc{
+        .desc {
           font-size: 14px;
           color: rgba(255, 255, 255, 0.59);
         }
       }
 
-      .uploaditem{
+      .uploaditem {
         align-items: center;
         margin-top: 60px;
         margin-bottom: 40px;
-        >span{
+        > span {
           margin-top: 0;
         }
-        >ul{
+        > ul {
           display: flex;
-          >li{
+          > li {
             background: rgba(255, 255, 255, 0.8);
             width: 86px;
             height: 80px;
             position: relative;
             border-radius: 4px;
             margin-right: 15px;
-            >img{
+            > img {
               width: 30px;
               position: absolute;
               top: 50%;
               left: 50%;
-              transform: translate(-50%,-50%);
+              transform: translate(-50%, -50%);
             }
-            >span{
+            > span {
               position: absolute;
               width: 100%;
               bottom: -25px;
@@ -295,23 +329,23 @@ export default {
               text-align: center;
               display: inline-block;
               font-size: 14px;
-               white-space: nowrap;
+              white-space: nowrap;
               text-overflow: ellipsis;
               overflow: hidden;
               word-break: break-all;
             }
-            .img{
+            .img {
               width: 100%;
               height: 100%;
               position: absolute;
               top: 0;
               left: 0;
-              img{
+              img {
                 width: 100%;
                 height: 100%;
               }
             }
-            .close{
+            .close {
               display: none;
               position: absolute;
               left: 0;
@@ -320,24 +354,24 @@ export default {
               height: 100%;
               background: rgba(0, 0, 0, 0.6);
               cursor: auto;
-              >img{
+              > img {
                 position: absolute;
                 top: 50%;
                 left: 50%;
-                transform: translate(-50%,-50%);
+                transform: translate(-50%, -50%);
                 cursor: pointer;
                 width: 40px;
               }
             }
-            &:hover{
-              .close{
+            &:hover {
+              .close {
                 display: block;
               }
             }
           }
-          .plus{
+          .plus {
             cursor: pointer;
-            >img{
+            > img {
               width: 20px;
               position: absolute;
             }
@@ -345,16 +379,16 @@ export default {
         }
       }
     }
-    .submit{
+    .submit {
       font-size: 18px;
       font-weight: bold;
       line-height: 20px;
-      color: #FFFFFF;
+      color: #ffffff;
       width: 100%;
       text-align: center;
       margin-top: 40px;
-      >span{
-        background: #A01C26;
+      > span {
+        background: #a01c26;
         margin: 0 auto;
         display: inline-block;
         line-height: 47px;
@@ -365,40 +399,39 @@ export default {
       }
     }
   }
-  
 }
 
-.showloading{
+.showloading {
   position: fixed;
   width: 100%;
   height: 100%;
   background: rgba(0, 0, 0, 0.6);
   top: 0;
   left: 0;
-  .loadingcon{
+  .loadingcon {
     width: 47%;
     height: 182px;
-    background: #FFFFFF;
+    background: #ffffff;
     border: 1px solid #707070;
     border-radius: 4px;
     position: absolute;
     top: 50%;
-    transform: translate(-50%,-50%);
+    transform: translate(-50%, -50%);
     left: 50%;
-    .line{
+    .line {
       width: 80%;
       height: 25px;
-      background: #DCDCDC;
+      background: #dcdcdc;
       margin: 60px auto 0;
       border-radius: 4px;
       overflow: hidden;
-      .progress{
+      .progress {
         width: 100%;
         height: 100%;
-        background: #A01C26;
+        background: #a01c26;
       }
     }
-    >span{
+    > span {
       color: #000;
       display: inline-block;
       width: 100%;
@@ -407,5 +440,4 @@ export default {
     }
   }
 }
-
-</style>
+</style>