Página Principal Explorar Ajuda
Iniciar Sessão
tenggouwa
/
agent
1
0
Fork 0
Ficheiros Problemas 0 Pull Requests 0 Wiki
Ver Fonte

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

# Conflicts:
#	src/views/home/home.vue
Va há 7 anos atrás
pai
eb6a64593a 6aa0957734
commit
04958a9813
7 ficheiros alterados com 27 adições e 28 exclusões
Visão Dividida Mostrar Estatísticas Diff
  1. 3 1
      .gitignore
  2. 1 1
      config/index.js
  3. 1 0
      index.html
  4. 12 16
      src/config/api-config.js
  5. 1 1
      src/views/agent/applyAgent.vue
  6. 8 8
      src/views/home/home.vue
  7. 1 1
      src/views/home/login.vue

+ 3 - 1
.gitignore
Ver Ficheiro 

@@ -1 +1,3 @@
 
-node_modules
 
+node_modules/
 
+/dist/
 
+

+ 1 - 1
config/index.js
Ver Ficheiro 

@@ -23,7 +23,7 @@ module.exports = {
 
   },
 
   dev: {
 
     env: require('./dev.env'),
 
-    port: 8080,
 
+    port: 8088,
 
     autoOpenBrowser: true,
 
     assetsSubDirectory: 'static',
 
     assetsPublicPath: '/',

+ 1 - 0
index.html
Ver Ficheiro 

@@ -6,6 +6,7 @@
 
     <!-- <link rel="stylesheet" href="//at.alicdn.com/t/font_407855_jeeqd33yfnefjemi.css"> -->
 
     <link rel="stylesheet" href="//at.alicdn.com/t/font_438855_ofee4hcmy90jxlxr.css">
 
     <link rel="stylesheet" type="text/css" href="static/css/inputemail.css">
 
+    <link rel="stylesheet" href="//at.alicdn.com/t/font_407855_vlnrdmhjgj0s5rk9.css"> 
   </head>
 
   <body>
 
     <div id="app"></div>

+ 12 - 16
src/config/api-config.js
Ver Ficheiro 

@@ -6,35 +6,33 @@ var apiUrl = {
 
     basehostUrl: 'https://dev407.33.cn',
 
     // basehostUrl: 'https://kdata.fxee.com',
 
     uploadUrl:"https://oss.33.cn",
 
+    
+    baseNewUrl:"https://dev407.33.cn",
 
 }
 
 export default {
 
+/*
 
+ *代理商接口
 
+ *（新版）
 
+ */
 
+   applyToAgent: apiUrl.baseNewUrl+'/agency/member/apply',//申请成为经纪人
 
 
+   applyStatus: apiUrl.baseNewUrl+'/agency/member/apply',//申请状态查询
 
+/*
 
+ *代理商接口
 
+ *（老版）
 
+ */
 
    userLogin:apiUrl.basehostUrl+'/api/member/login',//用户登录
 
 
-   // getToken:apiUrl.basehostUrl+'/api/member/login',//用户登录
 
-
 
    userLoginUp:apiUrl.basehostUrl+'/api/member/reg',//用户注册
 
 
-   // userReg:apiUrl.basehostUrl+'/api/member/reg',//用户注册
 
-
 
-   // getMoneyInfo:apiUrl.basehostUrl + '/api/Account/Asset',//获取资产信息
 
-
 
    userAssetlist:apiUrl.basehostUrl+'/api/Account/Asset',//用户资产列表
 
 
    userAssethist:apiUrl.basehostUrl+'/api/Pay/CoinRecord',//我的资产历史记录
 
 
    usertradeList:apiUrl.basehostUrl+'/api/data/market',////获取行情
 
 
-   // tradecoin:apiUrl.basehostUrl+'/api/trade/place',//买卖币
 
-
 
-   // tradeOrder:apiUrl.basehostUrl+'/api/trade/OrderList',//交易明细
 
-   
-   // indexticker:apiUrl.basehostUrl+'/api/data/Ticker',//首页ticker数据
 
-
 
    getcoindata:apiUrl.basehostUrl+'/api/data/Ticker',//首页ticker数据
 
 
-   // getBtcMarketData:apiUrl.basehostUrl+"/api/data/market",//获取行情
 
-
 
    sendEmail: apiUrl.basehostUrl + '/api/send/mail', //发送邮件通知
 
 
    getUserInfo: apiUrl.basehostUrl + "/api/member/info",//获取用户信息
 
@@ -65,8 +63,6 @@ export default {
 
 
    getState:apiUrl.basehostUrl+'/api/certification/states',//验证状态
 
 
-   // emailSend:apiUrl.basehostUrl+'/api/send/mail',//发送邮件
 
-
 
    emailCommit:apiUrl.basehostUrl+'/api/certification/email',//邮件验证
 
 
    uploadImg:apiUrl.uploadUrl+'/upload/certificate',//上传图片

+ 1 - 1
src/views/agent/applyAgent.vue
Ver Ficheiro 

@@ -6,7 +6,7 @@
 
         <img src="../../assets/img/apply/banner.png" alt="">
 
       </div>
 
       <div class="indextab">
 
-        <el-steps :active="2" :align-center="true">
 
+        <el-steps :active="3" :align-center="true">
 
           <el-step title="填写申请信息"></el-step>
 
           <el-step title="审核中"></el-step>
 
           <el-step title="申请通过"></el-step>

+ 8 - 8
src/views/home/home.vue
Ver Ficheiro 

@@ -101,19 +101,19 @@ export default{
 
           {
 
             name:"比特币",
 
             coinname:"BTC",
 
-            coin:"icon-BTC1",
 
+            coin:"icon-BTC3",
 
             state:0,
 
           },
 
           {
 
             name:"比特元",
 
             coinname:"BTY",
 
-            coin:"icon-bty1",
 
+            coin:"icon-BTY3",
 
             state:0,
 
           },   
           {
 
             name:"以太坊经典",
 
             coinname:"ETC",
 
-            coin:"icon-ETC1",
 
+            coin:"icon-ETC3",
 
             state:0,
 
           },
 
           /*{
 
@@ -131,19 +131,19 @@ export default{
 
           {
 
             name:"USDT",
 
             coinname:"USDT",
 
-            coin:"icon-meiyuan",
 
+            coin:"icon-USDT3",
 
             state:0,
 
           },
 
           {
 
             name:"以太坊",
 
             coinname:"ETH",
 
-            coin:"icon-ETH1",
 
+            coin:"icon-ETH3",
 
             state:0,
 
           },
 
           {
 
             name:"莱特币",
 
             coinname:"LTC",
 
-            coin:"icon-ltc",
 
+            coin:"icon-LTC3",
 
             state:0,
 
           },
 
           /*{
 
@@ -155,7 +155,7 @@ export default{
 
           {
 
             name:"比特现金",
 
             coinname:"BCC",
 
-            coin:"icon-BCC1",
 
+            coin:"icon-BCC3",
 
             state:0,
 
           },  
           
@@ -168,7 +168,7 @@ export default{
 
           {
 
             name:"零币",
 
             coinname:"ZEC",
 
-            coin:"icon-ZEC1",
 
+            coin:"icon-ZEC3",
 
             state:0,
 
           },
 
           /*{

+ 1 - 1
src/views/home/login.vue
Ver Ficheiro 

@@ -641,7 +641,7 @@ export default{
 
       sublogion(this,'index',param,(data)=>{
 
         this.buttonLoad=false;
 
         if(data.code==200){         
-          this.$router.push("/tradecenter/entrustment");
 
+          this.$router.push("/index");
 
         }  
       });
 
     },