.env

@@ -4,11 +4,10 @@
# 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=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=https://api.amcfcxn.org/
# VUE_APP_API_BASE_URL=http://192.168.10.5:8091/
>>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
# VUE_APP_API_BASE_URL=https://api.guosen.org/
# VUE_APP_API_BASE_URL=https://api.guosen.org/
#  VUE_APP_API_BASE_URL=https://api.ispentagon-institution.com
 VUE_APP_API_BASE_URL=https://api.durocaspitall.com

 .env.development

@@ -5,12 +5,8 @@
# 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://api.ispentagon-institution.com/
# VUE_APP_API_BASE_URL= https://www.prudentcapitals.net/
# VUE_APP_API_BASE_URL=https://api.guosen.org/
# VUE_APP_API_BASE_URL=https://api.guosen.org/
VUE_APP_API_BASE_URL = https://api.durocaspitall.com/

 .env.preview

@@ -2,12 +2,9 @@

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=https://api.ispentagon-institution.com/

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


 6.29admin.rar

Binary files differ

 admin.rar

Binary files differ

 admin.zip

Binary files differ

 src/views/newshares/newsharesrecord.vue

@@ -10,6 +10,22 @@
              </a-form-item>
            </a-col>
            <a-col :md="12" :lg="6" :sm="24">
              <a-form-item label="新股名称">
                <a-input v-model="queryParam.name" style="width: 100%" placeholder="请输入新股名称" />
              </a-form-item>
            </a-col>
            <a-col :md="12" :lg="6" :sm="24">
              <a-form-item label="状态">
                <a-select v-model="queryParam.status" placeholder="请选择状态" style="display: block;">
                  <a-select-option :value="1">已申购</a-select-option>
                  <a-select-option :value="2">未中签</a-select-option>
                  <a-select-option :value="3">已中签</a-select-option>
                  <a-select-option :value="4">已缴纳</a-select-option>
                  <a-select-option :value="5">已转持仓</a-select-option>
                </a-select>
              </a-form-item>
            </a-col>
            <a-col :md="12" :lg="6" :sm="24">
              <a-form-item>
                <span class="table-page-search-submitButtons">
                  <a-button @click="getqueryParam" icon="redo"> 重置</a-button>
@@ -258,7 +274,9 @@
      queryParam: {
        pageNum: 1,
        pageSize: 10,
        keyword: '',
        keyword: undefined,
        name:undefined,
        status:undefined,
      },
      datalist: [],
      labelCol: {
@@ -366,6 +384,8 @@
        pageNum: 1,
        pageSize: 10,
        keyword: '',
        name:'',
        status:'',
      }
    },
    getinit() {

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

@@ -3,7 +3,7 @@
    <a-card :bordered="false">
      <div class="table-page-search-wrapper">
        <a-form layout="inline">
          <a-row :gutter="48">
          <!-- <a-row :gutter="48">
            <a-col :md="12" :lg="6" :sm="24">
              <a-form-item label="持仓类型">
                <a-select v-model="queryParam.positionType" placeholder="请选择持仓类型">
@@ -12,7 +12,7 @@
                  <a-select-option :value="1">模拟持仓</a-select-option>
                </a-select>
              </a-form-item>
            </a-col>
            </a-col> -->
            <a-col :md="12" :lg="6" :sm="24">
              <a-form-item label="下级代理">
                <a-select
@@ -92,7 +92,7 @@
          </div>
        </template>
      </span>
      <span slot="positionType" slot-scope="text, record">
      <!-- <span slot="positionType" slot-scope="text, record">
        <template>
          <div>
            <a-tag :color="record.positionType == 1 ? 'blue' : 'green'">
@@ -100,7 +100,7 @@
            </a-tag>
          </div>
        </template>
      </span>
      </span> -->
      <span slot="orderDirection" slot-scope="text, record">
        <template>
          <div>
@@ -160,6 +160,8 @@
        <a slot="action" href="javascript:;" @click="getLockopen(record.id)" v-else>解锁</a>
        <a-divider type="vertical" />
        <a slot="action" href="javascript:;" @click="getCompulsoryclosing(record.positionSn)">强制平仓</a>
        <a-divider type="vertical" />
        <a slot="action" href="javascript:;" @click="deletekopen(record.id)">删除</a>
      </template>
    </a-table>
    <a-modal
@@ -182,7 +184,7 @@
  </div>
</template>
<script>
import { positionlist, positionlock, positionsell } from '@/api/position'
import { positionlist, positionlock, positionsell,positiondel } from '@/api/position'
import { nextagent } from '@/api/home'
import moment from 'moment'
export default {
@@ -197,12 +199,12 @@
          width: 180,
          scopedSlots: { customRender: 'stockName' },
        },
        {
          title: '账户类型',
          dataIndex: 'positionType',
          align: 'center',
          scopedSlots: { customRender: 'positionType' },
        },
        // {
        //   title: '账户类型',
        //   dataIndex: 'positionType',
        //   align: 'center',
        //   scopedSlots: { customRender: 'positionType' },
        // },
        {
          title: '用户名称（ID）',
          dataIndex: 'nickName',
@@ -360,6 +362,33 @@
    this.getlist()
  },
  methods: {
    deletekopen(id){
      var that = this
      this.$confirm({
        title: '提示',
        content: '确认要删除吗?',
        onOk() {
          var data = {
            positionId: id,
          }
          positiondel(data)
            .then((res) => {
              if (res.status == 0) {
                that.$message.success(res.msg)
                that.getlist()
              } else {
                that.$message.error({ content: '删除失败' })
              }
            })
            .catch((error) => {
              that.$message.error({ content: '删除失败' })
            })
        },
        onCancel() {
          console.log('Cancel')
        },
      })
    },
    getCompulsoryclosing(val) {
      var that = this
      this.$confirm({

 src/views/userlist/agentcomponents/addagentdialog.vue

@@ -14,7 +14,7 @@
            placeholder="请选择上级代理"
            v-decorator="['parentId', { rules: [{ required: true, message: '请选择上级代理' }] }]"
          >
           

            <a-select-option :value="item.id" v-for="(item, index) in parentIdList" :key="index">{{
              item.agentName
            }}</a-select-option>
@@ -53,14 +53,8 @@
        <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>
@@ -97,14 +91,7 @@
    }
  },
  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) {
@@ -123,7 +110,6 @@
        callback(new Error('请输入6位数字'))
      } else {
        callback()
>>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
      }
    },
    // 新增用户取消弹窗

 src/views/userlist/components/editCapitaluserdialog.vue

@@ -110,7 +110,10 @@
    },
    OkeditUserdialog() {
      const form = this.$refs.editUserform.form
      console.log(form)
      console.log(this.activeArr);
      form.validateFields((errors, values) => {
        console.log('Errors', errors)
        console.log(values, 'from', !errors)
        const arr = this.activeArr.filter((item) => item.accectType === values.accectType)
        const amt = values.amt