faiz
/
hy-shop-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
faiz 2024-04-11 10:18:11 +08:00
parent 09b106fec5 ca3d25d7a4
commit 3f05cab06f
3 changed files with 35 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -3,11 +3,11 @@ ENV = 'development'
# http://192.168.1.43:8324/admin # http://192.168.1.43:8324/admin
# http://mer.crmeb.net/admin # http://mer.crmeb.net/admin
# base api # base api
VUE_APP_BASE_API = 'http://192.168.1.199:8080' VUE_APP_BASE_API = 'http://192.168.1.224:8324'
# VUE_APP_BASE_API = 'https://plus.hwms.shop' # VUE_APP_BASE_API = 'https://plus.hwms.shop'
# socket 连接地址 # socket 连接地址
VUE_APP_WS_URL = 'ws://192.168.1.199:8080' VUE_APP_WS_URL = 'ws://192.168.1.224:8324'
# VUE_APP_WS_URL = 'ws://plus.hwms.shop' # VUE_APP_WS_URL = 'ws://plus.hwms.shop'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

76
src/views/merchant/application/merInfo.vue
View File

@ -1,7 +1,8 @@
<template> <template>
<div> <div>
<el-tabs type="border-card" v-model="activeName"> <el-tabs type="border-card" v-model="activeName">
<!-- <el-tab-pane label="基本信息" name="detail"> <el-tab-pane label="企业信息" name="business">
<div class="section"> <div class="section">
<div class="title">基础信息</div> <div class="title">基础信息</div>
<ul class="list"> <ul class="list">
@ -11,100 +12,77 @@
{{merData.mer_name}} {{merData.mer_name}}
</div> </div>
</li> </li>
<li class="item">
<div>商户分类：</div>
<div class="value">
{{merData.category_name}}
</div>
</li>
<li class="item"> <li class="item">
<div>店铺类型：</div> <div>店铺类型：</div>
<div class="value">{{merData.type_name}}</div> <div class="value">{{merData.type_name}}</div>
</li> </li>
<li class="item">
<div>商户状态：</div>
<div class="value">{{merData.status == 1 ? "开启" : "关闭"}}</div>
</li>
<li class="item"> <li class="item">
<div>更新时间：</div> <div>更新时间：</div>
<div class="value">{{merData.update_time}}</div> <div class="value">{{merData.update_time}}</div>
</li> </li>
<li class="item">
<div>备注：</div>
<div class="value">{{merData.mark}}</div>
</li>
</ul> </ul>
</div> </div>
</el-tab-pane> -->
<el-tab-pane label="企业信息" name="business">
<div class="section"> <div class="section">
<ul class="list"> <ul class="list">
<li class="item"> <li class="item">
<div>店铺名称：</div> <div>企业名称</div>
<div class="value"> <div class="value">
{{merData.mer_name}} {{merData.com.name}}
</div> </div>
</li> </li>
<li class="item"> <li class="item">
<div>店铺类型：</div> <div>企业类型</div>
<div class="value">{{merData.type_name}}</div>
</li>
<li class="item">
<div>企业名称：</div>
<div class="value"> <div class="value">
<!-- {{merData.com.name}} --> {{merData.com.type}}
</div> </div>
</li> </li>
<li class="item"> <li class="item">
<div>企业类型：</div> <div>客服电话:</div>
<div class="value"> <div class="value">
{{merData.com&&merData.com.type}} {{ merData.com.service}}
</div> </div>
</li> </li>
<li class="item">
<div>更新时间：</div>
<div class="value">{{merData.update_time}}</div>
</li>
<li class="item"> <li class="item">
<div>企业对接人姓名：</div> <div>企业对接人姓名：</div>
<div class="value"> <div class="value">
{{ merData.com&&merData.com.contact}} {{ merData.com.contact}}
</div> </div>
</li> </li>
<li class="item"> <li class="item">
<div>企业对接人联系电话：</div> <div>企业对接人联系电话：</div>
<div class="value"> <div class="value">
{{ merData.com&&merData.com.mobile}} {{ merData.com.mobile}}
</div> </div>
</li> </li>
<li class="item"> <li class="item">
<div>企业对接人编号:</div> <div>企业对接人编号:</div>
<div class="value"> <div class="value">
{{ merData.com&&merData.com.number}} {{ merData.com.number}}
</div> </div>
</li> </li>
<li class="item"> <li class="item">
<div>发起人:</div> <div>发起人:</div>
<div class="value"> <div class="value">
{{ merData.com&&merData.com.initiator}} {{ merData.com.initiator}}
</div> </div>
</li> </li>
<li class="item"> <li class="item">
<div>发起人电话:</div> <div>发起人电话:</div>
<div class="value"> <div class="value">
{{ merData.com&&merData.com.inti_mobile}} {{ merData.com.inti_mobile}}
</div> </div>
</li> </li>
<li class="item item100"> <li class="item item100">
<div>发起人编号:</div> <div>发起人编号:</div>
<div class="value"> <div class="value">
{{ merData.com&&merData.com.inti_number}} {{ merData.com.inti_number}}
</div> </div>
</li> </li>
<li class="item item100"> <li class="item item100">
<div>发起人手持介绍信照片:</div> <div>发起人手持介绍信照片:</div>
<div class="value"> <div class="value">
<el-image v-for="(url,i) in merData.com&&merData.com.init_image" <el-image v-for="(url,i) in merData.com.init_image"
:key="i" :key="i"
style="width: 100px; height: 100px" style="width: 100px; height: 100px"
:src="url" :src="url"
@ -115,13 +93,13 @@
<li class="item item100"> <li class="item item100">
<div>是否惠美乡村店铺:</div> <div>是否惠美乡村店铺:</div>
<div class="value"> <div class="value">
{{ merData.com&&merData.com.is_huimei? '是': '否'}} {{ merData.com.is_huimei? '是': '否'}}
</div> </div>
</li> </li>
<li class="item item100"> <li class="item item100">
<div>惠美乡村红头文件:</div> <div>惠美乡村红头文件:</div>
<div class="value"> <div class="value">
<el-image v-for="(url,i) in merData.com&&merData.com.image_huimei" <el-image v-for="(url,i) in merData.com.image_huimei"
:key="i" :key="i"
style="width: 100px; height: 100px" style="width: 100px; height: 100px"
:src="url" :src="url"
@ -132,13 +110,13 @@
<li class="item item100"> <li class="item item100">
<div>是否退伍军人:</div> <div>是否退伍军人:</div>
<div class="value"> <div class="value">
{{ merData.com&&merData.com.is_soldier? '是': '否'}} {{ merData.com.is_soldier? '是': '否'}}
</div> </div>
</li> </li>
<li class="item item100"> <li class="item item100">
<div>退伍军人证件照:</div> <div>退伍军人证件照:</div>
<div class="value"> <div class="value">
<el-image v-for="(url,i) in merData.com&&merData.com.image_soldier" <el-image v-for="(url,i) in merData.com.image_soldier"
:key="i" :key="i"
style="width: 100px; height: 100px" style="width: 100px; height: 100px"
:src="url" :src="url"
@ -228,10 +206,8 @@
<div class="value">{{merData.biz.address_true}}</div> <div class="value">{{merData.biz.address_true}}</div>
</li> </li>
<li class="item"> <li class="item">
<div>经营范围：</div> <div>实际经营范围：</div>
<div class="value"> <div class="value">{{merData.biz.businessScope}}</div>
{{merData.bank.bankCardUserName}}
</div>
</li> </li>
</ul> </ul>
</div> </div>
@ -259,7 +235,7 @@
<div class="value">{{merData.bank.bankBranchName}}</div> <div class="value">{{merData.bank.bankBranchName}}</div>
</li> </li>
<li class="item"> <li class="item">
<div>开户许可证(或基本存款信息)：</div> <div>银行卡照片：</div>
<div class="value"> <div class="value">
<el-image v-for="(url,i) in merData.bank.bankCardImg" <el-image v-for="(url,i) in merData.bank.bankCardImg"
:key="i" :key="i"
@ -269,10 +245,6 @@
</el-image> </el-image>
</div> </div>
</li> </li>
<li class="item">
<div>联行号：</div>
<div class="value">{{merData.bank.bankBranchName}}</div>
</li>
</ul> </ul>
</div> </div>
</el-tab-pane> </el-tab-pane>
@ -305,7 +277,7 @@ export default {
loading: true, loading: true,
merId: '', merId: '',
direction: 'rtl', direction: 'rtl',
activeName: 'business', activeName: 'detail',
timeVal: [], timeVal: [],
tableDataLog: { tableDataLog: {
data: [], data: [],

14
vue.config.js
View File

@ -38,13 +38,13 @@ module.exports = {
errors: true errors: true
}, },
before: require('./mock/mock-server.js') before: require('./mock/mock-server.js')
// proxy: { proxy: {
// '/api': { //接口地址 以 api开头的都走下面的配置 '/api': { //接口地址 以 api开头的都走下面的配置
// target: 'http://192.168.1.224:8324', //代理目标地址为后端服务器地址 target: 'http://192.168.1.224:8324', //代理目标地址为后端服务器地址
// ws: true, //是否支持 websocket 请求 支持 ws: true, //是否支持 websocket 请求 支持
// changeOrigin: true, //是否启用跨域 changeOrigin: true, //是否启用跨域
// } }
// } }
}, },
configureWebpack: { configureWebpack: {
// provide the app's title in webpack's name field, so that // provide the app's title in webpack's name field, so that