Merge remote-tracking branch 'origin/master'

assets/js/onchainpay.js

@@ -73,7 +73,8 @@ function parseParams(str) {
     amount: params.get('amount'),
     blockchainEnName: params.get('blockchainEnName'),
     blockchainName: params.get('blockchainName'),
-    currency: params.get('currency')
+    currency: params.get('currency'),
+    language: params.get('language'),
   };
 }
 
@@ -398,6 +399,8 @@ let vm = new Vue({
     try {
       const searchParams = new URLSearchParams(window.location.search);
       let params = searchParams.get('params');
+      this.language = searchParams.get('language');
+      sessionStorage.setItem("lang", this.language);
       this.isShow = false
       if (params) {
         const str = parseParams(safeDecrypt(params));

pay/onchainpay.html

@@ -88,7 +88,8 @@
     .th2 {
       margin-bottom: 20px;
     }
-    .addtext{
+
+    .addtext {
       padding: 0 20px;
       word-break: break-all;
       white-space: pre-wrap;
@@ -110,22 +111,7 @@
         </div>
         <div class="navbar-form navbar-right">
           <div style="display: flex; justify-content: flex-end">
-            <div class="menu-logo chooseLang">
-              <img v-if="langList[language] == 'ENGLISH'" style="width: 17px; height: 12px; margin: 0 4px"
-                src="../img/EN.jpg" alt="" />
-              <img v-if="langList[language] == '中文简体'" style="width: 17px; height: 12px; margin: 0 4px"
-                src="../img/CN.jpg" alt="" />
-              <el-dropdown trigger="click" @command="chooseLang">
-                <span class="menu">
-                  {{langList[language]}}
-                  <i class="el-icon-arrow-down el-icon--right"></i>
-                </span>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="en">English</el-dropdown-item>
-                  <el-dropdown-item command="cn">中文简体</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-            </div>
+
           </div>
         </div>
       </div>
@@ -138,7 +124,7 @@
             {{lang.item12}} {{name}}
           </h3>
           <div class="row">
-            <div class="col-xs-12 col-sm-4 col-lg-3 text-center">
+            <div class="col-xs-12 col-sm-12 col-lg-12 text-center">
               <p class=""> {{amount}} {{currency}}</p>
               <div id="qrcode" style="width: 250px; height: 220px;margin: auto;"></div>
               <div class="form-inline">
@@ -148,9 +134,8 @@
                   </p>
                 </div>
               </div>
-            </div>
-            <div class="col-xs-12 col-sm-8 col-lg-9">
-              <div class="row">
+
+              <!-- <div class="row">
                 <div class="col-xs-12 col-sm-12">
                   <ol>
                     <li>
@@ -163,8 +148,8 @@
                     <li>{{lang.item4}}{{amount}} {{currency}} {{lang.item5}}</li>
                   </ol>
                 </div>
-              </div>
-              <div class="alert alert-warning">{{lang.item6}}</div>
+              </div> -->
+              <!-- <div class="alert alert-warning">{{lang.item6}}</div> -->
 
               <div class="clearfix"><br /></div>
               <p class="return-block" style="">