.env

@@ -4,6 +4,11 @@
# VUE_APP_API_BASE_URL=http://www.jqydl.com:8091/
# VUE_APP_API_BASE_URL= https://api.dfddgj346.xyz/
# VUE_APP_API_BASE_URL=https://www.rksv.store:8091/
<<<<<<< HEAD
VUE_APP_API_BASE_URL=https://api.ambaracapital.net/
#  VUE_APP_API_BASE_URL=http://192.168.10.7:8091/
=======
 VUE_APP_API_BASE_URL=https://api.pentagon-member.com/
# VUE_APP_API_BASE_URL=http://192.168.10.5:8091/
>>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
# VUE_APP_API_BASE_URL=https://api.guosen.org/

 .env.development

@@ -5,7 +5,12 @@
# VUE_APP_API_BASE_URL=https://api.marwadi.online/
# VUE_APP_API_BASE_URL=https://www.rksv.store:8091/
# VUE_APP_API_BASE_URL=https://api.dfddgj346.xyz/
<<<<<<< HEAD
VUE_APP_API_BASE_URL=http://192.168.10.7:8091/
# VUE_APP_API_BASE_URL=https://api.ambaracapital.net/
=======
# VUE_APP_API_BASE_URL=http://192.168.10.5:8091/
VUE_APP_API_BASE_URL=https://api.pentagon-member.com/
>>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
# VUE_APP_API_BASE_URL= https://www.prudentcapitals.net/
# VUE_APP_API_BASE_URL=https://api.guosen.org/

 .env.preview

@@ -2,6 +2,12 @@

VUE_APP_PREVIEW=true

<<<<<<< HEAD
# VUE_APP_API_BASE_URL=https://api.ambaracapital.net/

VUE_APP_API_BASE_URL=http://192.168.10.7:8091/
=======
VUE_APP_API_BASE_URL=https://api.pentagon-member.com/

# VUE_APP_API_BASE_URL=http://192.168.10.5:8091/
# VUE_APP_API_BASE_URL=http://192.168.10.5:8091/
>>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0

 6.29admin.rar

Binary files differ

 dist.rar

Binary files differ

 src/api/home.js

@@ -22,7 +22,7 @@
  deyeb: '/admin/deleteEcho.do', // 删除利息宝列表
  yeblist: '/admin/querYEBOrder.do', // 利息宝列表
  addyeb: '/admin/addEcho.do', // 添加利息宝列表

  moneyCount:'/admin/moneyCount.do',//获取首页数据
  nextagent: '/admin/agent/list.do', // 代理列表
  onedklist: '/admin/queryDk.do', // 贷款列表
  dklist: '/admin/queryDkjg.do', // 机构列表
@@ -50,7 +50,13 @@
 * @param parameter
 * @returns {*}
 */

export function moneyCount (parameter) {
  return request({
    url: userApi.moneyCount,
    method: 'post',
    data: qs.stringify(parameter)
  })
}
export function queryApplyLever(parameter) {
  return request({
    url: userApi.queryApplyLever,

 src/views/dashboard/Workplace.vue

@@ -31,20 +31,20 @@
    <div>
      <a-row :gutter="24">
        <a-col :xl="16" :lg="24" :md="24" :sm="24" :xs="24">
<!--          <a-card
          <a-card
            class="project-list"
            :loading="loading"
            style="margin-bottom: 24px;"
            :bordered="false"
            title="大盘指数"
            :body-style="{ padding: 0 }">
            &lt;!&ndash; <a slot="extra">全部项目</a> &ndash;&gt;
            <!-- <a slot="extra">全部项目</a> -->
            <div>
              <a-card-grid class="project-card-grid" :key="i" v-for="(item, i) in market">
                <a-card v-if="i < 6" :bordered="false" :body-style="{ padding: 0 }">
                  <a-card-meta>
                    <div slot="title" class="card-title">
                      &lt;!&ndash; <a-avatar size="small" :src="item.cover" /> &ndash;&gt;
                      <!-- <a-avatar size="small" :src="item.cover" /> -->
                      <a
                        :style="'background:' + color16()"
                        style="color:#fff;font-size:14px;border-radius:50%;padding:6px;line-height: 1;">
@@ -77,14 +77,14 @@
                    <a href="/#/" :class="item.increase < 0 ? 'greens' : 'reds'">{{ item.increase }}</a>
                    <span class="datetime" :class="item.increase < 0 ? 'greens' : 'reds'">{{ item.increaseRate
                    }}%</span>
                    &lt;!&ndash; <a-tag :color="item.increase < 0 ? '#87d068' : '#f50'" style="margin-right:0">
                    <!-- <a-tag :color="item.increase < 0 ? '#87d068' : '#f50'" style="margin-right:0">
                      {{item.increaseRate}}%
                    </a-tag> &ndash;&gt;
                    </a-tag> -->
                  </div>
                </a-card>
              </a-card-grid>
            </div>
          </a-card>-->
          </a-card>

          <a-card :loading="loading" title="持仓动态" :bordered="false">
            <a-list>
@@ -144,35 +144,56 @@
              </v-chart>
            </div>
          </a-card>
          <a-card :loading="loading" title="充值提现统计" :bordered="false">
          <div style="display:flex;align-items: center;justify-content: space-between;background-color: #fff;border-bottom: 1px solid #e8e8e8;">
            <div style="display:flex;align-items: center;">
              <a-card
                title="充值提现统计"
                :loading="radarLoading"
                :bordered="false"
                :body-style="{ padding: 0 }">

              </a-card>
            </div>

            <div>
              <a-date-picker
                show-time
                style="width: 100%"
                @change="getstartTime"
                v-decorator="['startTime', { rules: [{ required: true, message: '请填写开始时间' }] }]"
                format="YYYY-MM-DD"
              >
              </a-date-picker>
            </div>
          </div>
          <a-card :loading="loading"  :bordered="false">

            <div class="members">
              <a-row>
                <a-col :span="12">
                  <a>
                    <span>今日充值</span>
                    <span class="member">{{ infodetail.charge_today_sum_amt ? infodetail.charge_today_sum_amt : 0
                    <span class="member">{{ infodata.todayRechargeAmount
                    }}</span>
                  </a>
                </a-col>
                <a-col :span="12">
                  <a>
                    <span>总充值</span>
                    <span class="member">{{ infodetail.charge_sum_amt ? infodetail.charge_sum_amt : 0 }}</span>
                    <span class="member">{{ infodata.rechargeTotalAmount  }}</span>
                  </a>
                </a-col>
                <a-col :span="12">
                  <a>
                    <span>今日提现</span>
                    <span class="member">{{ infodetail.sp_withdraw_sum_today_amt_success ?
                      infodetail.sp_withdraw_sum_today_amt_success : 0
                    <span class="member">{{ infodata.todayWithdrawAmount
                    }}</span>
                  </a>
                </a-col>
                <a-col :span="12">
                  <a>
                    <span>总提现</span>
                    <span class="member">{{ infodetail.sp_withdraw_sum_amt_success ?
                      infodetail.sp_withdraw_sum_amt_success : 0
                    <span class="member">{{ infodata.withdrawalTotalAmount
                    }}</span>
                  </a>
                </a-col>
@@ -180,13 +201,12 @@
                <a-col :span="12">
                  <a>
                    <span>当日注册人数</span>
                    <span class="member">{{ infodetail.toDayRegCount ?
                      infodetail.toDayRegCount : 0
                    <span class="member">{{ infodata.todayRegister
                    }}</span>
                  </a>
                </a-col>

                <a-col :span="12">
                <!-- <a-col :span="12">
                  <a>
                    <span>当日首充人数</span>
                    <span class="member">{{ infodetail.toDayFristRechargeCount ?
@@ -202,13 +222,13 @@
                      infodetail.toDayFristRechargeMoney : 0
                    }}</span>
                  </a>
                </a-col>
                </a-col> -->

                <a-col :span="12">
                  <a>
                    <span>当日充值总人数</span>
                    <span class="member">{{ infodetail.toDayRechargeCount ?
                      infodetail.toDayRechargeCount : 0
                    <span class="member">{{ infodata.todayWithdraw  ?
                      infodata.todayWithdraw  : 0
                    }}</span>
                  </a>
                </a-col>
@@ -227,7 +247,7 @@
import { PageHeaderWrapper } from '@ant-design-vue/pro-layout'
import { Radar } from '@/components'
import { getRoleList, getServiceList } from '@/api/manage'
import { stockgetMarket, countdata } from '@/api/home'
import { stockgetMarket, countdata,moneyCount } from '@/api/home'
import { positionlist } from '@/api/position'
import { adminlist } from '@/api/managesettings'
import axios from 'axios'
@@ -300,9 +320,11 @@

      market: [],
      infodetail: {},
      infodata:{},
      rongzilist: [],
      userdetails: '',
      lizhidetail: ''
      lizhidetail: '',
      startTime:'',
    }
  },
  computed: {
@@ -340,13 +362,27 @@
    this.getrongzilist()
    this.getnowuser()
    this.getlizhi()
    this.getinfodata()
  },
  methods: {
    getstartTime (date, dateString) {
      this.startTime = dateString
      this.getinfodata()
    },
    getinfodata(){
      var data = {
        startTime:this.startTime,
      }
      moneyCount(data).then(res => {
        this.infodata = res.data
      })
    },
    getlizhi () {
      axios.get('https://saying.api.azwcl.com/saying/get').then(res => {
        this.lizhidetail = res.data.data
      })
    },

    getnowuser () {
      adminlist().then(res => {
        if (window.localStorage.getItem('phones')) {

 src/views/position/components/financing-flat.vue

@@ -354,6 +354,20 @@
          dataIndex: 'orderNum',
          align: 'center',
        },

        {
          title: '账号',
          dataIndex: 'phone',
          align: 'center',
        },
        {
          title: '所属代理（ID）',
          dataIndex: 'agentName_Id',
          align: 'center',
          customRender: (text, row, index) => {
            return `${row.agentName}（${row.agentId}）`
          },
        },
        {
          title: '总市值',
          dataIndex: 'orderTotalPrice',

 src/views/position/components/financing-hold.vue

@@ -257,6 +257,19 @@
          align: 'center',
        },
        {
          title: '账号',
          dataIndex: 'phone',
          align: 'center',
        },
        {
          title: '所属代理（ID）',
          dataIndex: 'agentName_Id',
          align: 'center',
          customRender: (text, row, index) => {
            return `${row.agentName}（${row.agentId}）`
          },
        },
        {
          title: '总市值',
          dataIndex: 'orderTotalPrice',
          align: 'center',

 src/views/userlist/agentcomponents/EditAgentinfodialog.vue

@@ -39,7 +39,7 @@
        <a-form-item label="代理编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
          <a-input
            placeholder="请输入代理编码"
            v-decorator="['agentCode', { rules: [{ validator: checkSixDigitNumber,required: true, message: '请输入六位数字' }] }]"
            v-decorator="['agentCode', { rules: [{ validator: checkSixDigitNumber, message: '请输入六位数字' }] }]"
          />
        </a-form-item>
        <a-form-item label="杠杆倍数" :labelCol="labelCol" :wrapperCol="wrapperCol">

 src/views/userlist/agentcomponents/addagentdialog.vue

@@ -53,10 +53,14 @@
        <a-form-item label="代理编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
          <a-input
            placeholder="请输入代理编码"
<<<<<<< HEAD
            v-decorator="['agentCode', { rules: [{ validator: checkSixDigitNumber, message: '请输入六位数字' }] }]"
=======
            v-decorator="[
              'agentCode',
              { rules: [{ required: true, validator: checkSixDigitNumber, message: '请输入六位数字' }] },
            ]"
>>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
          />
        </a-form-item>
      </a-form>
@@ -93,6 +97,14 @@
    }
  },
  methods: {
<<<<<<< HEAD
    checkSixDigitNumber(rule, value, callback) {
      const num = parseInt(value);
      if (isNaN(num) || value.length !== 6) {
        callback(new Error('请输入6位数字'));
      } else {
        callback();
=======
    initGetParensAgent() {
      getParensAgent().then((res) => {
        if (res.status == 0) {
@@ -111,6 +123,7 @@
        callback(new Error('请输入6位数字'))
      } else {
        callback()
>>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
      }
    },
    // 新增用户取消弹窗

 src/views/userlist/components/editCapitaluserdialog.vue

@@ -31,7 +31,6 @@
        </a-form-item>
        <a-form-item label="账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
          <a-select
            disabled
            placeholder="请选择账户"
            v-decorator="['accectType', { rules: [{ required: true, message: '请选择账户' }] }]"
          >
@@ -51,20 +50,21 @@
  components: {},
  filters: {
    formatDate(value) {
      // switch (value.accectType) {
      //   case 'US':
      //     return `美元(${value.symbol} ${value.availableBalance})`
      //   case 'MAS':
      //     return `马来西亚(${value.symbol} ${value.availableBalance})`
      //   case 'HK':
      //     return `香港(${value.symbol} ${value.availableBalance})`
      //   case 'IN':
      //     return `印度(${value.symbol} ${value.availableBalance})`

      //   default:
      //     break
      // }
      return `印度(${value.symbol} ${value.availableBalance})`
      switch (value.accectType) {
        case 'US':
          return `美元(${value.symbol} ${value.availableBalance})`
        case 'MAS':
          return `马来西亚(${value.symbol} ${value.availableBalance})`
        case 'HK':
          return `香港(${value.symbol} ${value.availableBalance})`
        case 'IN':
          return `印度(${value.symbol} ${value.availableBalance})`
        case 'SGP':
          return `新加坡(${value.symbol} ${value.availableBalance})`
        default:
          break
      }
      // return `印度(${value.symbol} ${value.availableBalance})`
    },
  },
  props: {