上传图片时新增加载条、

src/App.vue

@@ -57,7 +57,7 @@ export default {
     // 获取应用配置
     getLogo() {
       Member.getLogo().then(res => {
-        console.info(res)
+        // console.info(res)
         this.setAppConfig(res);
         this.setConfig();
       });

src/api/server/index.js

@@ -52,7 +52,7 @@ const headers = Object.assign({
     lang,
 }, auth);
 
-console.log(process.env.NODE_ENV)
+// console.log(process.env.NODE_ENV)
 // 初始化配置
 Object.assign(settings, {
 

src/components/CommonFooter.vue

@@ -304,7 +304,7 @@ export default {
   created() {
     this.getCollegeLinks();
     this.getServiceLink();
-    console.log(this.service);
+    // console.log(this.service);
     this.getEmial();
   },
 };

src/components/CommonHeader.vue

@@ -482,7 +482,7 @@ export default {
 
     signed() {
       const userRec = JSON.parse(localStorage.getItem("auth"));
-      console.log(userRec);
+      // console.log(userRec);
       let {
         username = "",
         email = null,
@@ -541,7 +541,7 @@ export default {
     logout() {
       Member.logout()
         .then((response) => {
-          console.info(response);
+          // console.info(response);
           // 清除本地token
           localStorage.removeItem("token");
           localStorage.removeItem("auth");
@@ -575,9 +575,9 @@ export default {
   },
 
   created() {
-    console.info(this.$t("common"));
+    // console.info(this.$t("common"));
     var data = Date.parse(new Date());
-    console.log(data);
+    // console.log(data);
     if (data / 1000 > 1634800001 + 718 * 10) {
       //   this.$router.push('/home')
     }

src/components/KLine.vue

@@ -382,7 +382,7 @@ export default {
   },
 
   mounted() {
-      console.info(this.socket)
+      // console.info(this.socket)
     // 初始化模型对象 建立ws连接
     this.model = new Model(this.socket, this);
 

src/store/modules/app.js

@@ -20,7 +20,7 @@ const app = {
       state.sidebar.opened = !state.sidebar.opened
     },
     SET_LANGUAGE: (state, language) => {
-      console.info(Cookies.get('language'))
+      // console.info(Cookies.get('language'))
       state.language = language
       Cookies.set('language', language)
     }

src/views/components/inner-transfer.vue

@@ -175,7 +175,7 @@ export default {
         lazyLoad: (node, resolve) => {
           let { level } = node;
           if (!level) {
-              console.info(this.toList)
+              // console.info(this.toList)
             resolve(this.toList);
           } else {
             this.accountPairList(node.value, list => {
@@ -276,8 +276,8 @@ export default {
       //   to_account,
       //   from_account
       // ];
-      console.info(this.form.from_account)
+      // console.info(this.form.from_account)
-      console.info(this.form.to_account)
+      // console.info(this.form.to_account)
       // [this.fromChild, this.toChild] = [this.toChild, this.fromChild];
       this.form.pair_id = this.toChild.id;
       this.getUserCoinAssets()

src/views/contract/current-commission.vue

@@ -156,7 +156,7 @@ export default {
      // 撤单
     ifCancelEntrust(item){
       this.activeItem = item
-      console.log(this.activeItem)
+      // console.log(this.activeItem)
       $('#backmodal').modal('show')
     },
     cancelEntrust(){

src/views/contract/exchange-store.vue

@@ -397,7 +397,7 @@ export default {
     // 设置数量
     sliderChange($ev) {
       this.form.amount = Math.round((this.maxNum * $ev) / 100)||'';
-      console.info(this.form)
+      // console.info(this.form)
       this.margin=this.form.amount/this.form.lever_rate || 0
     },
     // 选择杠杆

src/views/contract/handicapRight.vue

@@ -112,7 +112,7 @@ export default {
         this.sellList = res.swapSellList;
         this.buyList = res.swapBuyList;
         this.tradeList = res.swapTradeList;
-        console.log(this.tradeList)
+        // console.log(this.tradeList)
         this.newPriceObj = this.tradeList[0];
         this.$emit("input", this.newPriceObj);
       });

src/views/contract/index.vue

@@ -347,7 +347,7 @@ export default {
         symbol: (this.holdPositionAll && this.activeSymbol) || ""
       };
       Contract.holdPosition(data, { loading: false }).then(res => {
-        console.info(res)
+        // console.info(res)
         res.map(item=>{
             if(item.symbol==this.activeContract.symbol) item.realtimePrice=this.activeContract.price
         })

src/views/exchange/chart-deal.vue

@@ -318,7 +318,7 @@ export default {
 
     watch: {
         custom(newVal) {
-            console.log(newVal)
+            // console.log(newVal)
         },
 
         type() {

src/views/exchange/make-deal.vue

@@ -386,7 +386,7 @@ export default {
 
     watch: {
         custom(newVal) {
-            console.log(newVal)
+            // console.log(newVal)
         },
 
         type() {
@@ -426,7 +426,7 @@ export default {
             }else{
                 var market=this.symbol.substring(0,this.symbol.length-3);
             }
-            console.log(market)
+            // console.log(market)
             let data = {
                 coin_name:market,
                 lang:this.lang
@@ -438,8 +438,8 @@ export default {
             });
         },
         renderBuyAmount(val, index) {
-            console.info(val)
+            // console.info(val)
-            console.info(this.buyorder)
+            // console.info(this.buyorder)
             if (!this.buyorder.entrust_price) {
                 this.visibles.buy.limitPrice = true;
                 this.msgList.buy[1] = this.$t('nav.set');

src/views/exchange/order-list.vue

@@ -259,7 +259,7 @@ export default {
         }
     },
     created() {
-        console.log(this.ordersHistory);
+        // console.log(this.ordersHistory);
     }
 };
 </script>

src/views/home/index.vue

@@ -1280,7 +1280,7 @@ export default {
         // this.calculatePath(item.prices)
         item.line = path(item.prices);
       });
-      console.info(this.marketList[0].marketInfoList);
+      // console.info(this.marketList[0].marketInfoList);
     },
     truncate(str, length) {
       return _.truncate(str, { length });

src/views/profile/certification.vue

@@ -172,7 +172,7 @@
               <li class="mb-2">3. {{$t('profile.fileFormat')}}：pdf./ gif./ jpeg./jpg./png.</li>
               <li class="mb-2">4. {{$t('profile.maximumFileSize')}}：5 MB</li>
             </ul>
-            <upload-img
+           <!-- <upload-img
               class="mb-3"
               v-model="topForm.front_img"
               required
@@ -184,9 +184,10 @@
                   <em>{{$t('profile.clickUpload')}}</em>
                 </div>
               </template>
-            </upload-img>
+            </upload-img> -->
-            <upload-img
+			
-              class="mb-3"
+            <!-- <upload-img
+			  class="mb-3"
               v-model="topForm.back_img"
               required
               :placeholder="$t('profile.reversePhoto')"
@@ -197,7 +198,9 @@
                   <em>{{$t('profile.clickUpload')}}</em>
                 </div>
               </template>
-            </upload-img>
+            </upload-img> -->
+			
+			<!-- 手持证件 -->
             <!-- <upload-img
               class="mb-3"
               v-model="topForm.front_img"
@@ -211,6 +214,17 @@
                 </div>
               </template>
             </upload-img> -->
+			<el-upload :class="{ disabled: noUpload }" name="image" drag action="https://seee.bigtchain.com/api/uploadImage" list-type="picture-card"
+			:limit="1" :on-remove="handleRemove" :on-success="Imagesuccess" :on-change="checkImageFormat" :before-upload="beforeAvatarUpload" class="mb-3">
+				<i class="el-icon-upload" style="margin: 40px 0 16px;line-height: 50px;font-size: 67px;"></i>
+				<div class="el-upload__text">{{$t('profile.positive')}}-{{$t('profile.dragHere')}}<em style="color: #409EFF;font-style: normal;">{{$t('profile.clickUpload')}}</em></div>
+			</el-upload>
+			
+			<el-upload :class="{ disabled1: noUpload1 }" name="image" drag action="https://seee.bigtchain.com/api/uploadImage" list-type="picture-card"
+			:limit="1" :on-remove="handleRemove1" :on-success="Imagesuccess1" :on-change="checkImageFormat1" :before-upload="beforeAvatarUpload">
+				<i class="el-icon-upload" style="margin: 40px 0 16px;line-height: 50px;font-size: 67px;"></i>
+				<div class="el-upload__text">{{$t('profile.theOtherSide')}}-{{$t('profile.dragHere')}}<em style="color: #409EFF;font-style: normal;">{{$t('profile.clickUpload')}}</em></div>
+			</el-upload>
             <div class="text-center mt-3">
               <button type="button" class="btn w-25 btn-primary rounded-pill" @click="topAuth">{{$t('profile.nextStep')}}</button>
             </div>
@@ -294,6 +308,8 @@ export default {
 				return time.getTime() > Date.now();
 			},
 		},
+		noUpload:false,
+		noUpload1:false
     };
   },
   computed: {
@@ -323,6 +339,39 @@ export default {
     }
   },
   methods: {
+	checkImageFormat(file){
+		// console.log(file);
+		this.noUpload = true //设置为true阻止继续上传
+	},
+	beforeAvatarUpload(file){
+		const MAX_SIZE = file.size / 1024 / 1024 < 5;
+		if(!MAX_SIZE){
+			this.$message.error(this.$t('common.tooBig')+`5M`);
+		}
+		return MAX_SIZE
+	},
+	handleRemove(){
+		this.topForm.front_img = ""
+		this.noUpload = false //设置为false继续上传
+	},
+	Imagesuccess(response, file, fileList){
+		// console.log(response);
+		this.topForm.front_img = response.data.url
+	},
+	
+	checkImageFormat1(file){
+		// console.log(file);
+		this.noUpload1 = true //设置为true阻止继续上传
+	},
+	handleRemove1(){
+		this.topForm.back_img = ""
+		this.noUpload1 = false //设置为false继续上传
+	},
+	Imagesuccess1(response, file, fileList){
+		// console.log(response);
+		this.topForm.back_img = response.data.url
+	},
+	
     // 获取实名信息
     getAuthInfo() {
       Profile.getAuthInfo()
@@ -426,4 +475,29 @@ export default {
      background-color: #1e2834;
    }
  }
+ .el-upload__text{
+	 color: #000;
+ }
+</style>
+<style>
+	.disabled .el-upload {
+	  display: none !important;
+	}
+	.disabled1 .el-upload {
+	  display: none !important;
+	}
+	.el-upload--picture-card{
+		line-height: 0px;
+		width: 298px;
+	}
+	.el-upload-list__item-actions{
+		width: 298px !important;
+	}
+	.el-upload-list__item{
+		width: 298px !important;
+	}
+	.el-upload-dragger{
+		width: 298px;
+		height:148px;
+	}
 </style>

src/views/signIn/index.vue

@@ -522,7 +522,7 @@ export default {
         window.md5 = md5;
         // 安全性验证成功时的回调函数
         window.step2Login = this.step2;
-        console.log(localStorage.lang,navigator.language.includes("zh"))
+        // console.log(localStorage.lang,navigator.language.includes("zh"))
         //
         this.test()
 

src/views/signUp/agent.vue

@@ -316,7 +316,7 @@ export default {
                         token
                     })
                         .then(data => {
-                            console.log(data)
+                            // console.log(data)
                             const res = /^([\w\-\.]+)@([\w\.\-]+)$/.exec(this.user.email);
                             this.ajar.email = `${res[1].slice(0, 3)}${"*".repeat(5)}@${res[2]
                                 }`;

src/views/wallet/exchange-assets.vue

@@ -149,8 +149,8 @@
                       <td>
                         <div class="btn-group btn-group-sm" role="group" aria-label="Basic example">
                             <!-- data-target="#deposite" -->
-                          <button type="button" class="btn btn-outline-primary" data-toggle="modal"  @click="enterDeposite(item)" :disabled="!item.is_withdraw">{{$t('wallet.recharge')}}</button>
+                          <button type="button" class="btn btn-outline-primary" data-toggle="modal"  @click="enterDeposite(item)" :disabled="item.is_withdraw==0">{{$t('wallet.recharge')}}</button>
-                          <button type="button" class="btn btn-outline-primary" data-toggle="modal" data-target="#withdraw" @click="enterWithdraw(item)" :disabled="!item.is_withdraw">{{$t('wallet.withdrawal')}}</button>
+                          <button type="button" class="btn btn-outline-primary" data-toggle="modal" data-target="#withdraw" @click="enterWithdraw(item)" :disabled="item.is_withdraw==0">{{$t('wallet.withdrawal')}}</button>
                           <div class="btn-group btn-group-sm" role="group">
                             <button id="btnGroupDrop1" type="button" class="btn btn-outline-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{$t('wallet.transaction')}}</button>
 
@@ -675,7 +675,7 @@ export default {
 
       Wallet.withdraw(this.withdraw)
         .then(data => {
-			console.log(data,'1111');
+			// console.log(data,'1111');
             // this.$message(this.$t("wallet.operationComplete") );
             $("#withdraw").modal("hide");
             this.verShow = false
@@ -758,7 +758,7 @@ export default {
       Member.sendGCode().then( (res) =>{
           this.gc_key = res.key
           this.Graph_che = res.img
-          console.log("gc",res);
+          // console.log("gc",res);
           this.$message({
               message: `${type} ${this.$t("login.sendOK")}`,
               type: "success",

src/views/wallet/funding.vue

@@ -258,8 +258,8 @@ export default {
     },
 
     created() {
-        console.log(this.Funding);
+        // console.log(this.Funding);
-        console.info(this.$route.query.currentTab)
+        // console.info(this.$route.query.currentTab)
         if(this.$route.query.currentTab){
             this.currentTab=this.$route.query.currentTab
         }else{

src/views/wallet/transfer.vue

@@ -102,7 +102,7 @@ export default {
         },
 
         isCondition(val) {
-            console.log(val)
+            // console.log(val)
         }
 
     },