Merge branch '6-29印度股票' of http://124.156.157.155:8060/r/dg/dabao_admin int...

jhzh

2024-09-28 451674dd4dd784fa0725b4ba052d94449d892712

Merge branch '6-29印度股票' of http://124.156.157.155:8060/r/dg/dabao_admin into 6-29印度股票

# Conflicts:
#	.env
#	.env.development
#	.env.preview
#	admin.zip
#	src/views/userlist/agentcomponents/EditAgentinfodialog.vue
#	src/views/userlist/agentcomponents/addagentdialog.vue

 .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=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

 admin.zip

Binary files differ

 src/api/home.js

@@ -33,6 +33,7 @@
  agentdelAgent: '/admin/agent/delAgent.do', // 删除代理
  agentupdate: '/admin/agent/update.do', // 修改代理信息
  agentadd: '/admin/agent/add.do', // 添加下级代理
  getParensAgent: '/admin/agent/getParensAgent.do', // 上级代理列表
  stockgetMarket: '/api/stock/getMarket.do', // 获取大盘指数行情
  adminsetSiteStyle: '/api/admin/setSiteStyle.do', // 设置网站风格
  admingetSiteStyle: '/api/admin/getSiteStyle.do', // 获取网站风格
@@ -293,6 +294,14 @@
  })
}

export function getParensAgent(parameter) {
  return request({
    url: userApi.getParensAgent,
    method: 'get',
    params: parameter
  })
}

export function stockgetMarket(parameter) {
  return request({
    url: userApi.stockgetMarket,

 src/views/userlist/agentcomponents/addagentdialog.vue

@@ -14,7 +14,10 @@
            placeholder="请选择上级代理"
            v-decorator="['parentId', { rules: [{ required: true, message: '请选择上级代理' }] }]"
          >
            <a-select-option value="0">总代理</a-select-option>
           
            <a-select-option :value="item.id" v-for="(item, index) in parentIdList" :key="index">{{
              item.agentName
            }}</a-select-option>
          </a-select>
        </a-form-item>
        <a-form-item label="代理名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -50,7 +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>
@@ -58,7 +68,7 @@
  </div>
</template>
<script>
import { agentadd } from '@/api/home'
import { agentadd, getParensAgent } from '@/api/home'
export default {
  components: {},
  props: {
@@ -83,15 +93,37 @@
      addUserform: this.$form.createForm(this),
      addUserdialog: false,
      addUserDialogloading: false,
      parentIdList: [],
    }
  },
  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) {
          this.parentIdList = [{
             id: 0,
             agentName: '总代理'
          },...res.data]
        } else {
          this.$message.error(res.msg)
        }
      })
    },
    checkSixDigitNumber(rule, value, callback) {
      const num = parseInt(value)
      if (isNaN(num) || value.length !== 6) {
        callback(new Error('请输入6位数字'))
      } else {
        callback()
>>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
      }
    },
    // 新增用户取消弹窗
@@ -107,6 +139,7 @@
        if (!errors) {
          this.addUserDialogloading = true
          agentadd(values).then((res) => {
            if(values.parentId == 0) values.parentId = null
            if (res.status == 0) {
              this.addUserdialog = false
              this.$message.success(res.msg)

 src/views/userlist/agentlist.vue

@@ -48,7 +48,7 @@
        </a-form>
      </div>
      <div class="table-operator">
        <a-button type="primary" icon="plus" @click="$refs.addagentdialog.addUserdialog = true">添加下级代理</a-button>
        <a-button type="primary" icon="plus" @click="$refs.addagentdialog.addUserdialog = true, $refs.addagentdialog.initGetParensAgent()">添加下级代理</a-button>
      </div>
    </a-card>

@@ -150,6 +150,11 @@
          },
        },
        {
          title: '代理等级',
          dataIndex: 'agentLevel',
          align: 'center',
        },
        {
          title: '代理状态',
          dataIndex: 'isLock',
          align: 'center',