修改

src/components/CommonFooter.vue

@@ -45,7 +45,15 @@
                 {{ $t("common.service") }}
               </p>
               <p class="foot_p" >
-                <router-link :to="service[0].url">{{
+				 <span class="serviceText" @click="Jump(service[0].url)">{{service[0].label}}</span>
+			  </p>
+			  <p class="foot_p" >
+				  <span class="serviceText" @click="Jump(service[1].url)">{{service[1].label}}</span>
+			  </p>
+			  <p class="foot_p" >
+				  <span class="serviceText" @click="Jump(service[2].url)">{{service[2].label}}</span>
+			  </p>
+                <!-- <router-link :to="service[0].url">{{
                   service[0].label
                 }}</router-link>
               </p>
@@ -57,7 +65,7 @@
               <p class="foot_p" >
                 <router-link :to="service[2].url">{{
                   service[2].label
-                }}</router-link>
+                }}</router-link> -->
 
                 <!-- <router-link :to="service[3].url">{{ service[3].label }}</router-link> -->
               </p>
@@ -83,6 +91,18 @@
                 {{ $t("common.college") }}
               </p>
 			  <p class="foot_p">
+			  	<span class="serviceText" @click="Jump(college[0].url)">{{college[0].label}}</span>
+			  </p>
+			  <p class="foot_p">
+			  	<span class="serviceText" @click="Jump(college[1].url)">{{college[1].label}}</span>
+			  </p>
+			  <p class="foot_p">
+			  	<span class="serviceText" @click="Jump(college[2].url)">{{college[2].label}}</span>
+			  </p>
+			  <p class="foot_p">
+			  	<span class="serviceText" @click="Jump(college[3].url)">{{college[3].label}}</span>
+			  </p>
+              <!-- <p class="foot_p" >
                 <router-link :to="college[0].url">{{
                   college[0].label
                 }}</router-link>
@@ -101,7 +121,7 @@
                 <router-link :to="college[3].url">{{
                   college[3].label
                 }}</router-link>
-              </p>
+              </p> -->
             </div>
           </div>
 
@@ -363,6 +383,9 @@ export default {
     },
   },
   methods: {
+	Jump(vle){
+		this.$router.push(vle);
+	},
     toggleMenu(e, type){
       e.stopPropagation();
       if(type===2){
@@ -559,20 +582,31 @@ export default {
 
 }
 
-
+.serviceText{
+	color: #797979;
+	text-decoration: none;
+	display: inline-block;
+	-webkit-transition: .4s ease-in;
+	transition: .4s ease-in;
+}
+.serviceText:hover{
+	color: #b5b5b5;
+	cursor: pointer;
+}
 
 .foot_p {
   color: #b5b5b5;
   font-size: 16px;
   margin: 0;
   
-  a:hover {
-    color: #b5b5b5;
-  }
 	
-  a:visited {
+  // a:hover {
-    color: #b5b5b5;
+  //   color: #b5b5b5;
-  }
+  // }
+
+  // a:visited {
+  //   color: #b5b5b5;
+  // }
 }
 
 .icon_foot {

src/components/CommonHeader.vue

@@ -679,6 +679,7 @@ color: #fff !important;
 }
 .nav-item_icon:hover {
   color: #000;
+  cursor: pointer;
 }
 
 .img {

src/i18n/cn.json

@@ -667,6 +667,7 @@
         "clickUpload": "点击上传",
         "uploadPhoto": "请上传证件正面照",
         "reversePhoto": "请上传证件反面照",
+		"dateofbirth":"请选择出生日期",
         "uploadIDCard": "请上传手持证件照",
         "nextStep": "下一步",
         "inSubmit": "您的验证申请已提交！我们将在获得结果的第一时间通知您",

src/i18n/de.json

@@ -678,6 +678,7 @@
         "clickUpload":"Klicken Sie auf Hochladen",
         "uploadPhoto":"Bitte laden Sie das Foto Ihrer Personalausweise hoch",
         "reversePhoto":"Bitte laden Sie das Foto auf der Rückseite des Zertifikats hoch",
+		"dateofbirth":"Bitte Geburtsdatum auswählen",
         "uploadIDCard":"Bitte laden Sie Ihr Handgerät hoch",
         "nextStep":"nächster Schritt",
         "inSubmit":"Ihr Bestätigungsantrag wurde eingereicht!Wir informieren Sie, sobald wir das Ergebnis erhalten",

src/i18n/en.json

@@ -777,6 +777,7 @@
         "clickUpload": "Click to upload",
         "uploadPhoto": "Please upload the front photo of your ID",
         "reversePhoto": "Please upload the reverse photo of your ID",
+		"dateofbirth":"Please select date of birth",
         "uploadIDCard": "Please upload a hand-held ID photo",
         "nextStep": "Next",
         "inSubmit": "Your verification application has been submitted! We will notify you as soon as the result is obtained",

src/i18n/fra.json

@@ -678,6 +678,7 @@
         "clickUpload":"Cliquez pour télécharger",
         "uploadPhoto":"Veuillez télécharger la photo de face du certificat",
         "reversePhoto":"Veuillez télécharger la photo inversée du certificat",
+		"dateofbirth":"Veuillez sélectionner la date de naissance",
         "uploadIDCard":"S'il vous plaît télécharger la photo d'identification manuelle",
         "nextStep":"Prochaines étapes",
         "inSubmit":"Votre demande de validation a été soumise!Nous vous informerons des résultats dès qu'ils seront disponibles.",

src/i18n/it.json

@@ -678,6 +678,7 @@
         "clickUpload":"Fare clic su upload",
         "uploadPhoto":"Si prega di caricare la foto anteriore della carta d'identità",
         "reversePhoto":"Si prega di caricare la foto sul retro del certificato",
+		"dateofbirth":"Seleziona la data di nascita",
         "uploadIDCard":"Per favore carica la tua foto identificativa tenuta a mano",
         "nextStep":"passo successivo",
         "inSubmit":"La vostra domanda di verifica è stata presentata!Vi informeremo non appena avremo il risultato",

src/i18n/jp.json

@@ -684,6 +684,7 @@
         "clickUpload":"クリックしてアップロード",
         "uploadPhoto":"証明書の正面写真をアップロードしてください。",
         "reversePhoto":"証明書の裏写真をアップロードしてください。",
+		"dateofbirth":"生年月日を選択してください",
         "uploadIDCard":"手に持っている証明書の写真をアップロードしてください。",
         "nextStep":"次のステップ",
         "inSubmit":"あなたの検証申請はすでに提出されました。結果を得た最初の時間にお知らせします。",

src/i18n/kor.json

@@ -683,6 +683,7 @@
         "clickUpload":"클릭 하여 업로드",
         "uploadPhoto":"증명 서 를 정면 사진 으로 올 려 주세요.",
         "reversePhoto":"증명 서 를 뒷면 사진 으로 올 려 주세요.",
+		"dateofbirth":"생년월일을 선택해주세요",
         "uploadIDCard":"신분증 사진 을 올 려 주세요.",
         "nextStep":"다음 단계",
         "inSubmit":"당신 의 인증 신청 이 제출 되 었 습 니 다!우 리 는 결 과 를 얻 는 첫 번 째 시간 에 당신 에 게 통지 할 것 입 니 다.",

src/i18n/pt.json

@@ -678,6 +678,7 @@
         "clickUpload":"Clique em upload",
         "uploadPhoto":"Por favor, envie uma foto de identificação",
         "reversePhoto":"Por favor, possua a foto do reverso da sua identificação",
+		"dateofbirth":"Por favor selecione a data de nascimento",
         "uploadIDCard":"Por favor, possua uma foto de identificação",
         "nextStep":"O próximo passo",
         "inSubmit":"O seu pedido de validação foi apresentado! Informaremos você logo que os resultados estejam disponíveis",

src/i18n/spa.json

@@ -671,6 +671,7 @@
         "clickUpload":"Haga clic en cargar",
         "uploadPhoto":"Por favor, suba la foto frontal del documento.",
         "reversePhoto":"Por favor, suba la foto de identificación.",
+		"dateofbirth":"Por favor seleccione fecha de nacimiento",
         "uploadIDCard":"Por favor, suba su foto de identificación",
         "nextStep":"Siguiente paso",
         "inSubmit":"¡Su solicitud de verificación ha sido presentada!Le informaremos de los resultados en el primer momento",

src/i18n/tr.json

@@ -679,7 +679,8 @@
         "dragHere":"Buraya sürükleyin veya",
         "clickUpload":"Yükle'yi tıklayın",
         "uploadPhoto":"Lütfen kimliğinizin ön fotoğrafını yükleyin",
-        "reversePhoto":"Lütfen kimliğinizin negatif bir fotoğrafını yükleyin",
+        "reversePhoto":"Lütfen doğum tarihinizi seçin",
+		"dateofbirth":"Por favor seleccione fecha de nacimiento",
         "uploadIDCard":"Lütfen elde taşınan bir kimlik fotoğrafı yükleyin",
         "nextStep":"Sonraki adım",
         "inSubmit":"Doğrulama isteğiniz gönderildi! ",

src/i18n/tw.json

@@ -719,6 +719,7 @@
         "clickUpload": "點擊上傳",
         "uploadPhoto": "請上傳證件正面照",
         "reversePhoto": "請上傳證件反面照",
+		"dateofbirth":"請選擇出生日期",
         "uploadIDCard": "請上傳手持證件照",
         "nextStep": "下一步",
         "inSubmit": "您的驗證申請已提交！我們將在獲得結果的第一時間通知您",

src/views/contract/exchange-store.vue

@@ -105,9 +105,11 @@
           </div> -->
         </div>
         <div class="px-2" v-if="this.tab == 1">
+					<!-- :value="activeStepBuy"
+					@input="sliderChangeBuy" -->
           <el-slider
-              :value="activeStepBuy"
+			  v-model="activeStepBuy"
-              @input="sliderChangeBuy"
+              @change="sliderChangeBuy"
               :format-tooltip="tooltip"
               :marks="marks"
               :step="25"
@@ -226,9 +228,11 @@
           </div> -->
         </div>
         <div class="px-2" v-if="this.tab == 1">
+			<!-- :value="activeStepSell"
+			@input="sliderChangeSell" -->
           <el-slider
-              :value="activeStepSell"
+			  v-model="activeStepSell"
-              @input="sliderChangeSell"
+			  @change="sliderChangeSell"
               :format-tooltip="tooltip"
               :marks="marks"
               :step="25"
@@ -383,7 +387,9 @@ export default {
         marginBuy:0,
         marginSell:0,
         checkboxBuy: false,
-        checkboxSell: false
+        checkboxSell: false,
+		activeStepBuy:0,
+		activeStepSell:0
     };
   },
   props: {
@@ -483,16 +489,16 @@ export default {
       if (!item) return 0;
       return item.avail_position;
     },
-    activeStepBuy() {
+    // activeStepBuy() {
-      if (!this.buyform.amount || !this.maxNum) return 0;
+    //   if (!this.buyform.amount || !this.maxNum) return 0;
-      let num = (this.buyform.amount / this.maxNum) * 100;
+    //   let num = (this.buyform.amount / this.maxNum) * 100;
-      return num;
+    //   return num;
-    },
+    // },
-    activeStepSell() {
+    // activeStepSell() {
-      if (!this.sellform.amount || !this.maxNum) return 0;
+    //   if (!this.sellform.amount || !this.maxNum) return 0;
-      let num = (this.sellform.amount / this.maxNum) * 100;
+    //   let num = (this.sellform.amount / this.maxNum) * 100;
-      return num;
+    //   return num;
-    },
+    // },
     // 保证金
     // margin() {
     //     if (!this.form.lever_rate) return '';

src/views/forgotPwd/index.vue

@@ -65,7 +65,6 @@
 
 <script>
 import Member from "@/api/member";
-
 export default {
     data() {
         return {
@@ -88,13 +87,18 @@ export default {
 
     methods: {
         step1() {
+			sessionStorage.setItem('account', this.user.account);
+			const account = sessionStorage.getItem("account")
             Member.forgetPasswordAttempt({
-                account: this.user.account
+                account: account
             }).then(data => {
                 // 将用户信息 写入user对象中
+				console.log(data,1111);
                 Object.assign(this.user, data);
                 // 进入第二步验证
+				
                 this.step = 2;
+				sessionStorage.setItem('step', this.step);
             }).catch(err => {
                 // this.$message({});
             })
@@ -103,6 +107,8 @@ export default {
         step2() {
             if (utils.validate(".chk-body")) {
                 Member.forgetPwdSumit(Object.assign(this.user, this.codes)).then(dta => {
+					sessionStorage.removeItem("step");
+					sessionStorage.removeItem("account");
                     // console.log(dta, '121323')
                     this.$message({
                         type : "success",
@@ -137,6 +143,14 @@ export default {
     mounted(){
         // bind get gc code
         this.gett_gc_code();
+		const step = sessionStorage.getItem("step")
+		const account = sessionStorage.getItem("account")
+		if(step==2){
+			this.step = 2
+			this.user.account = account
+			this.step1()
+		}
+		
     }
 }
 </script>

src/views/profile/certification.vue

@@ -36,6 +36,7 @@
                   v-model="form.birthday"
                   type="date"
                   :placeholder="$t('profile.selectDate')"
+				  :picker-options="pickerOptions"
                 ></el-date-picker>
               </div>
             </div>
@@ -287,7 +288,12 @@ export default {
             front_img: "",
             back_img: "",
             hand_img: ""
-        }
+        },
+		pickerOptions:{
+			disabledDate(time) {
+				return time.getTime() > Date.now();
+			},
+		},
     };
   },
   computed: {
@@ -353,6 +359,10 @@ export default {
         let data = this.form;
         data.country_code = this.country.country_code;
         if (utils.validate("#auth")) {
+					if(!data.birthday){
+						this.$message.error(this.$t("profile.dateofbirth"));
+						return;
+					}
             Profile.primaryAuth(data)
             .then(res => {
                 this.$message.success(this.$t("profile.preliminary"));

src/views/signIn/index.vue

@@ -214,6 +214,8 @@ export default {
     methods: {
 		Jump(vle){
 			this.$router.push(vle);
+			sessionStorage.removeItem("step");
+			sessionStorage.removeItem("account");
 		},
         touchstart() {
 

src/views/signUp/index.vue

@@ -135,7 +135,8 @@
                     </template>
                     <h2 style="color: #999;">
                     {{$t('login.hasAccount')}}?
-                    <router-link to="sign-in">{{$t('login.toLogin')}}</router-link>
+					<div style="display: inline-block;" class="rightText" @click="loginTo">{{$t('login.toLogin')}}</div>
+                    <!-- <router-link to="sign-in">{{$t('login.toLogin')}}</router-link> -->
                 </h2>
                 </form>
 
@@ -255,6 +256,9 @@ export default {
     },
 
     methods: {
+		loginTo(){
+			this.$router.push('sign-in');
+		},
         showType(type) {
             this[type] = this[type] == "text" ? "password" : "text";
         },
@@ -793,4 +797,16 @@ div.verify-code {
     background-image: none;
     height: 60px;
 }
+.rightText{
+	color: #797979;
+	font-weight:bold;
+	text-decoration: none;
+	display: inline-block;
+	-webkit-transition: .4s ease-in;
+	transition: .4s ease-in;
+}
+.rightText:hover{
+	color: #007bff;
+	cursor: pointer;
+}
 </style>

src/views/wallet/exchange-assets.vue

@@ -5,7 +5,7 @@
     <div class="user">
       <div class="container" style="margin: 0px auto 50px;padding:60px 0px;">
         <div class="d-flex fn-28 align-items-center mb-4 px-3" style="height: 90px;font-weight:bold;">
-          <img src="../../assets/img/home/login.png" alt="" style="width: 90px;height: 90px;margin-right:20px;">
+          <img src="@/assets/img/home/login.png" alt="" style="width: 90px;height: 90px;margin-right:20px;">
           <div>{{ userInfo.email }}</div>
         </div>
         <div class="d-flex px-5 mb-2 fn-16" style="color:#7A7A7A;">
@@ -15,7 +15,7 @@
           <div class="w-6/24">{{$t('wallet.countryRegion')}}</div>
         </div>
         <div class="d-flex px-5 fn-16">
-          <div class="w-6/24">{{ userInfo.phone }}13366667777</div>
+          <div class="w-6/24">{{ phoneNumbe }}</div>
           <div class="w-5/24">{{ userInfo.email }}</div>
           <div class="w-6/24">{{ userInfo.user_auth_level_text }}</div>
           <div class="w-6/24">{{ userInfo.country_code }}</div>
@@ -512,7 +512,7 @@ export default {
         },
         getEmailCodeLock: false,
         JStime: 0,
-        tiemr: null,
+        tiemr: null
         // Graph_che: '',
     };
   },
@@ -537,6 +537,9 @@ export default {
   computed : {
     daojishi(){
 			return '('+this.JStime + 's' + ')';
+		},
+	phoneNumbe() {
+		return this.userInfo.phone.replace(/\d(?=\d{4})/g, "*")||""
 	}
   },
   methods: {
@@ -710,6 +713,7 @@ export default {
     // 获取个人信息
     getUserInfo() {
         Profile.getUserInfo({}).then(res => {
+			console.log(res,222);
             this.userInfo = res
         });
     },