Merge branch 'master' of https://dev.33.cn/tenggouwa/agent

src/config/api-config.js

@@ -4,12 +4,12 @@
  */
 var apiUrl = {
     // basehostUrl: 'https://dev407.33.cn',
-    basehostUrl: 'https://test33.cn',
+    baseNewUrl: 'http://test.33.cn',
     uploadUrl:"https://oss.33.cn",
     
     // baseNewUrl:"https://dev407.33.cn",
 
-    baseNewUrl:'https://dev407.33.cn'
+    // baseNewUrl:'https://dev407.33.cn'
 }
 export default {
 /*
@@ -29,70 +29,70 @@ export default {
  *代理商接口
  *（老版）
  */
-   userLogin:apiUrl.basehostUrl+'/api/member/login',//用户登录
+   userLogin:apiUrl.baseNewUrl+'/api/member/login',//用户登录
 
-   userLoginUp:apiUrl.basehostUrl+'/api/member/reg',//用户注册
+   userLoginUp:apiUrl.baseNewUrl+'/api/member/reg',//用户注册
 
-   userAssetlist:apiUrl.basehostUrl+'/api/Account/Asset',//用户资产列表
+   userAssetlist:apiUrl.baseNewUrl+'/api/Account/Asset',//用户资产列表
 
-   userAssethist:apiUrl.basehostUrl+'/api/Pay/CoinRecord',//我的资产历史记录
+   userAssethist:apiUrl.baseNewUrl+'/api/Pay/CoinRecord',//我的资产历史记录
 
-   usertradeList:apiUrl.basehostUrl+'/api/data/market',////获取行情
+   usertradeList:apiUrl.baseNewUrl+'/api/data/market',////获取行情
 
-   getcoindata:apiUrl.basehostUrl+'/api/data/Ticker',//首页ticker数据
+   getcoindata:apiUrl.baseNewUrl+'/api/data/Ticker',//首页ticker数据
 
-   sendEmail: apiUrl.basehostUrl + '/api/send/mail', //发送邮件通知
+   sendEmail: apiUrl.baseNewUrl + '/api/send/mail', //发送邮件通知
 
-   getUserInfo: apiUrl.basehostUrl + "/api/member/info",//获取用户信息
+   getUserInfo: apiUrl.baseNewUrl + "/api/member/info",//获取用户信息
 
-   loginout: apiUrl.basehostUrl + '/api/member/loginout',//账户退出
+   loginout: apiUrl.baseNewUrl + '/api/member/loginout',//账户退出
 
-   Cancel: apiUrl.basehostUrl+'/api/trade/cancel',//撤单接口
+   Cancel: apiUrl.baseNewUrl+'/api/trade/cancel',//撤单接口
 
-   hisorder: apiUrl.basehostUrl + "/api/trade/OrderList",//交易历史
+   hisorder: apiUrl.baseNewUrl + "/api/trade/OrderList",//交易历史
 
-   place: apiUrl.basehostUrl+'/api/trade/place',//交易接口
+   place: apiUrl.baseNewUrl+'/api/trade/place',//交易接口
 
-   changePassword: apiUrl.basehostUrl+'/api/member/editpassword',//修改密码
+   changePassword: apiUrl.baseNewUrl+'/api/member/editpassword',//修改密码
 
-   loginrecord: apiUrl.basehostUrl+'/api/account/loginrecord',//登陆日志
+   loginrecord: apiUrl.baseNewUrl+'/api/account/loginrecord',//登陆日志
 
-   chargecoin: apiUrl.basehostUrl+'/api/account/myaddress',//充币
+   chargecoin: apiUrl.baseNewUrl+'/api/account/myaddress',//充币
 
-   adressList: apiUrl.basehostUrl+'/api/account/addresslist',//地址列表
+   adressList: apiUrl.baseNewUrl+'/api/account/addresslist',//地址列表
 
-   mancoinmon: apiUrl.basehostUrl+'/api/data/fees',//提币手续费
+   mancoinmon: apiUrl.baseNewUrl+'/api/data/fees',//提币手续费
 
-   phoneCountry: apiUrl.basehostUrl+'/api/data/country',//国家信息
+   phoneCountry: apiUrl.baseNewUrl+'/api/data/country',//国家信息
 
-   phoneCheckedNum: apiUrl.basehostUrl+'/api/send/sms',//手机验证码
+   phoneCheckedNum: apiUrl.baseNewUrl+'/api/send/sms',//手机验证码
 
-   phoneCommit:apiUrl.basehostUrl+'/api/certification/mobile',//手机验证提交
+   phoneCommit:apiUrl.baseNewUrl+'/api/certification/mobile',//手机验证提交
 
-   getState:apiUrl.basehostUrl+'/api/certification/states',//验证状态
+   getState:apiUrl.baseNewUrl+'/api/certification/states',//验证状态
 
-   emailCommit:apiUrl.basehostUrl+'/api/certification/email',//邮件验证
+   emailCommit:apiUrl.baseNewUrl+'/api/certification/email',//邮件验证
 
    uploadImg:apiUrl.uploadUrl+'/upload/certificate',//上传图片
 
-   getImgToken:apiUrl.basehostUrl + "/api/certification/UploadToken",//获取图片上传token
+   getImgToken:apiUrl.baseNewUrl + "/api/certification/UploadToken",//获取图片上传token
 
-   cardType:apiUrl.basehostUrl + '/api/data/cardtypes', //获取证件类型
+   cardType:apiUrl.baseNewUrl + '/api/data/cardtypes', //获取证件类型
 
-   ocr:apiUrl.basehostUrl + '/api/Certification/Ocr', //证件OCR
+   ocr:apiUrl.baseNewUrl + '/api/Certification/Ocr', //证件OCR
 
-   Certification: apiUrl.basehostUrl + '/api/certification/identity', //提交认证信息
+   Certification: apiUrl.baseNewUrl + '/api/certification/identity', //提交认证信息
 
-   resetPwd:apiUrl.basehostUrl + '/api/member/resetpassword', //重置密码
+   resetPwd:apiUrl.baseNewUrl + '/api/member/resetpassword', //重置密码
 
-   pwdSend:apiUrl.basehostUrl + '/api/send/reset', // 密码找回（邮件短信）发送
+   pwdSend:apiUrl.baseNewUrl + '/api/send/reset', // 密码找回（邮件短信）发送
 
-   txFees:apiUrl.basehostUrl + '/api/data/txfees',//提币手续费
+   txFees:apiUrl.baseNewUrl + '/api/data/txfees',//提币手续费
 
-   getFaceAmount:apiUrl.basehostUrl + '/api/data/faceamount',//获取人脸额度
+   getFaceAmount:apiUrl.baseNewUrl + '/api/data/faceamount',//获取人脸额度
 
-   getOutCin:apiUrl.basehostUrl + '/api/pay/Withdrawcoin',//提币接口
+   getOutCin:apiUrl.baseNewUrl + '/api/pay/Withdrawcoin',//提币接口
 
-   addAdress:apiUrl.basehostUrl + '/Applications/account/ManageAdress',//新增地址
+   addAdress:apiUrl.baseNewUrl + '/Applications/account/ManageAdress',//新增地址
 
 }

src/views/agent/applyAgent.vue

@@ -119,6 +119,7 @@
           <button @click="jumptologin">立即登陆</button>
         </el-dialog>
       </div>
+      <contactUs></contactUs>
     </div>
   </div>
 </template>
@@ -127,6 +128,7 @@
 import indexHeader from "../../components/header.vue"
 // import indexFooter from "../../components/footer.vue"
 import location from "../../components/location.vue"
+import contactUs from "../../components/contantWe.vue"
 import {ajax} from "../../assets/js/common.js"
 export default{
   data(){
@@ -208,6 +210,7 @@ export default{
   },
   components:{
     indexHeader,
+    contactUs,
     // indexFooter,
     location
   },
@@ -320,7 +323,7 @@ export default{
     align-items: center;
     justify-content: space-between;
     h3{
-      font-size: 35px;
+      font-size: 25px;
       font-weight: bold;
       line-height: 1;
     }
@@ -332,7 +335,7 @@ export default{
     }
   }
   .sub-title{
-    font-size: 20px;
+    font-size: 16px;
     color: #999;
     margin-top: 12px;
   }