商户代码

main
fengxinyhyl 1 year ago
parent e112cb9a74
commit bbb7357e9a
  1. 1
      app/common/repositories/store/order/StoreOrderCreateRepository.php
  2. 10
      app/common/repositories/store/order/StoreOrderRepository.php
  3. 2
      app/controller/admin/system/merchant/Merchant.php
  4. 4
      app/controller/merchant/store/order/Order.php
  5. 3
      app/controller/merchant/system/Merchant.php
  6. 2
      public/mer.html
  7. 2
      view/admin/src/views/order/list/index.vue
  8. 2
      view/admin/src/views/order/list/orderDetails.vue
  9. 133
      view/mer/src/views/order/index.vue
  10. 4
      view/mer/src/views/order/orderCancellate/index.vue
  11. 60
      view/mer/src/views/order/orderDetails.vue
  12. 3
      view/mer/src/views/product/addProduct/index.vue
  13. 222
      view/mer/src/views/systemForm/setSystem/modifyStoreInfo.vue

@ -1040,7 +1040,6 @@ class StoreOrderCreateRepository extends StoreOrderRepository
if($merchantCart['order']['total_integral']){
$pay_type = 7;
}
$pay_type = 7;
//整理订单数据
$_order = [
'cartInfo' => $merchantCart,

@ -847,16 +847,6 @@ class StoreOrderRepository extends BaseRepository
'title' => '核销订单',
'order_type' => 1,
],
[
'count' => $this->dao->search($where)->where('is_virtual', 1)->count(),
'title' => '虚拟商品订单',
'order_type' => 2,
],
[
'count' => $this->dao->search(array_merge($where,['order_type' => 3]))->count(),
'title' => '卡密商品订单',
'order_type' => 3,
],
];
}

@ -282,7 +282,7 @@ class Merchant extends BaseController
'token' => $tokenInfo['token'],
'exp' => $tokenInfo['out'],
'admin' => $admin,
'url' => '/' . config('admin.merchant_prefix')
'url' => '/' . config('admin.merchant_prefix').'/product/list'
];
return app('json')->success($data);

@ -43,7 +43,7 @@ class Order extends BaseController
$where = $this->request->params(['status', 'date', 'order_sn', 'username', 'order_type', 'keywords', 'order_id', 'activity_type','filter_delivery','filter_product','delivery_id']);
$where['mer_id'] = $this->request->merId();
$pay_type = $this->request->param('pay_type','');
if ($pay_type != '') $where['pay_type'] = $this->repository::PAY_TYPE_FILTEER[$pay_type];
if ($pay_type != '') $where['pay_type'] = $pay_type;
return app('json')->success($this->repository->getStat($where, $where['status']));
}
/**
@ -57,7 +57,7 @@ class Order extends BaseController
$where = $this->request->params(['status', 'date', 'order_sn', 'username', 'order_type', 'keywords', 'order_id', 'activity_type', 'group_order_sn', 'store_name','filter_delivery','filter_product','delivery_id']);
$where['mer_id'] = $this->request->merId();
$pay_type = $this->request->param('pay_type','');
if ($pay_type != '') $where['pay_type'] = $this->repository::PAY_TYPE_FILTEER[$pay_type];
if ($pay_type != '') $where['pay_type'] = $pay_type;
return app('json')->success($this->repository->merchantGetList($where, $page, $limit));
}

@ -17,6 +17,7 @@ namespace app\controller\merchant\system;
use app\common\repositories\store\MerchantTakeRepository;
use app\common\repositories\store\product\ProductRepository;
use app\common\repositories\system\config\ConfigValueRepository;
use app\common\repositories\system\merchant\FinancialRecordRepository;
use app\common\repositories\system\operate\OperateLogRepository;
use app\common\repositories\system\serve\ServeOrderRepository;
use app\common\repositories\user\UserBillRepository;
@ -164,6 +165,8 @@ class Merchant extends BaseController
$data['mer_account'] = $adminInfo['account'];
$data['assets'] = \app(FinancialRecordRepository::class)->getMerchantStatistics(array('mer_id' => $merchant->mer_id));
return app('json')->success($data);
}

File diff suppressed because one or more lines are too long

@ -78,7 +78,7 @@
class="selWidth"
@change="getList(1),getCardList()"
>
<el-option label="微信" value="1" />
<el-option label="微信" value="2" />
<el-option label="积分" value="7" />
</el-select>
</el-form-item>

@ -41,7 +41,7 @@
</li>
<li class="item">
<div class="title">支付方式</div>
<div>{{ orderDetailList.pay_type | payTypeFilter }}</div>
<div>{{ orderDetailList.pay_type == 2 ? '微信' : '积分' }}</div>
</li>
<li class="item">
<div class="title">支付时间</div>

@ -17,60 +17,29 @@
<el-form-item label="时间选择:">
<el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" format="yyyy/MM/dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 280px;" :picker-options="pickerOptions" @change="onchangeTime" />
</el-form-item>
<el-form-item label="发货方式:" prop="filter_delivery">
<el-select
v-model="tableFrom.filter_delivery"
placeholder="请选择"
class="filter-item selWidth"
clearable
@change="getList(1),getCardList()"
>
<el-option
v-for="item in dliveryWayList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="发货方式:" prop="filter_delivery">-->
<!-- <el-select-->
<!-- v-model="tableFrom.filter_delivery"-->
<!-- placeholder="请选择"-->
<!-- class="filter-item selWidth"-->
<!-- clearable-->
<!-- @change="getList(1),getCardList()"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in dliveryWayList"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="商品名称:" prop="store_name">
<el-input v-model="tableFrom.store_name" placeholder="请输入商品名称" class="selWidth" clearable @keyup.enter.native="getList(1),getCardList()" />
</el-form-item>
<el-form-item label="总单单号:" prop="group_order_sn">
<el-input v-model="tableFrom.group_order_sn" placeholder="请输入总单订单号" class="selWidth" clearable @keyup.enter.native="getList(1),getCardList()" />
</el-form-item>
<el-form-item label="商品类型:" prop="filter_product">
<el-select
v-model="tableFrom.filter_product"
placeholder="请选择"
class="selWidth"
clearable
@change="getList(1),getCardList()"
>
<el-option
v-for="item in productTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="活动类型:" prop="activity_type">
<el-select
v-model="tableFrom.activity_type"
placeholder="请选择"
class="selWidth"
clearable
@change="getList(1),getCardList()"
>
<el-option
v-for="item in activityList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="支付方式:" prop="pay_type">
<el-select
v-model="tableFrom.pay_type"
@ -79,55 +48,31 @@
class="selWidth"
@change="getList(1),getCardList()"
>
<el-option label="余额" value="0" />
<el-option label="微信" value="1" />
<el-option label="支付宝" value="2" />
<el-option label="微信" value="2" />
<el-option label="积分" value="7" />
</el-select>
</el-form-item>
<el-form-item label="关键字:" prop="keywords">
<el-input v-model="tableFrom.keywords" placeholder="请输入订单号/收货人/联系方式" class="selWidth" clearable @keyup.enter.native="getList(1),getCardList()" />
</el-form-item>
<el-form-item label="用户信息:" prop="username">
<el-input v-model="tableFrom.username" placeholder="请输入用户昵称/手机号" class="selWidth" clearable @keyup.enter.native="getList(1),getCardList()" />
</el-form-item>
<el-form-item label="快递单号:" prop="delivery_id">
<el-input v-model="tableFrom.delivery_id" placeholder="请输入快递单号" class="selWidth" clearable @keyup.enter.native="getList(1),getCardList()" />
</el-form-item>
<!-- <el-form-item label="用户信息:" prop="username">-->
<!-- <el-input v-model="tableFrom.username" placeholder="请输入用户昵称/手机号" class="selWidth" clearable @keyup.enter.native="getList(1),getCardList()" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="快递单号:" prop="delivery_id">-->
<!-- <el-input v-model="tableFrom.delivery_id" placeholder="请输入快递单号" class="selWidth" clearable @keyup.enter.native="getList(1),getCardList()" />-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" size="small" @click="getList(1),getCardList()">搜索</el-button>
<el-button size="small" @click="searchReset()">重置</el-button>
<el-button size="small" @click="searchReset()">重置</el-button>
</el-form-item>
</el-form>
</div>
<cards-data v-if="cardLists.length>0" :card-lists="cardLists" />
<el-card class="dataBox">
<el-tabs v-if="headeNum.length > 0" v-model="tableFrom.order_type" @tab-click="getList(1),getCardList(),getHeaderList()">
<el-tab-pane v-for="(item,index) in headeNum" :key="index" :name="item.order_type.toString()" :label="item.title +'('+item.count +')' " />
</el-tabs>
<div class="mt5">
<el-button size="small" type="primary" class="mr14" @click="orderCancellation('')">订单核销</el-button>
<el-dropdown class="dropdown" @command="exports">
<span class="el-dropdown-link">
导出列表<i class="el-icon-arrow-down el-icon--right" />
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="1">导出订单</el-dropdown-item>
<el-dropdown-item command="2">导出发货单</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-upload
style="display:inline-block;"
size="small"
class="mr14 ml5"
:headers="myHeaders"
:action="fileUrl"
:on-success="handleSuccess"
:show-file-list="false"
>
<el-button size="small">导入批量发货</el-button>
</el-upload>
<el-button size="small" @click="getDeliveryList">批量发货记录</el-button>
<el-button size="small" @click="batchSend">批量发送货</el-button>
</div>
<el-table v-loading="listLoading" :data="tableData.data" size="small" class="table mt20" highlight-current-row :cell-class-name="addTdClass">
<el-table-column type="expand">
@ -168,7 +113,7 @@
<span v-show="scope.row.is_del > 0" style="color: #ED4014;display: block;">用户已删除</span>
</template>
</el-table-column>
<el-table-column prop="real_name" label="收货人/订购人" min-width="130" />
<el-table-column label="商品信息" min-width="330">
<template slot-scope="scope">
@ -192,10 +137,10 @@
<p v-if="scope.row.finalOrder">尾款{{ scope.row.finalOrder.pay_price }}</p>
</template>
</el-table-column>
<el-table-column prop="integral" label="积分" min-width="130" />
<el-table-column label="支付类型" min-width="80">
<template slot-scope="scope">
<span v-if="scope.row.paid === 1">{{ scope.row.pay_type | orderPayType }}</span>
<span v-else>--</span>
<span>{{ scope.row.pay_type == 2 ? '微信' : '积分' }}</span>
</template>
</el-table-column>
<el-table-column label="支付状态" min-width="80">
@ -220,10 +165,10 @@
<template slot-scope="scope">
<el-button type="text" size="small" @click="onOrderDetails(scope.row.order_id)">详情</el-button>
<el-button v-if="orderFilter(scope.row)" type="text" size="small" @click="onRefundDetail(scope.row.order_sn)">查看退款单</el-button>
<el-button v-if="scope.row.paid === 0 && scope.row.is_del===0 && scope.row.activity_type != 2" type="text" size="small" @click="edit(scope.row.order_id)">编辑</el-button>
<!-- <el-button v-if="scope.row.paid === 0 && scope.row.is_del===0 && scope.row.activity_type != 2" type="text" size="small" @click="edit(scope.row.order_id)">编辑</el-button>-->
<el-button v-if="(scope.row.order_type == 0 || scope.row.order_type == 2) && scope.row.status === 0 && scope.row.paid === 1" type="text" size="small" @click="send(scope.row,scope.row.order_id)">发送货</el-button>
<el-button v-if="scope.row.is_del !== 0" type="text" size="small" @click.native="handleDelete(scope.row, scope.$index)">删除</el-button>
<el-button v-if="scope.row.order_type == 1 && scope.row.status === 0 && scope.row.paid === 1" type="text" size="small" @click.native="orderCancellation(scope.row.verify_code)">去核销</el-button>
<el-button v-if="scope.row.order_type == 1 && scope.row.status === 0 && scope.row.paid === 1" type="text" size="small" @click.native="orderCancellation(scope.row.verify_code)">去核销</el-button>
</template>
</el-table-column>
</el-table>
@ -401,7 +346,7 @@
<template slot-scope="scope">
<span class="priceBox">{{scope.row.stock_num}}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="待发数量" align="center" min-width="120">
<template slot-scope="scope">
<el-input
@ -412,7 +357,7 @@
size="small"
class="priceBox"
@blur="limitCount(scope.row)"
/>
/>
</template>
</el-table-column>
</el-table>
@ -813,7 +758,7 @@ export default {
this.shipment.where = this.tableFrom
}else{
this.shipment.order_id = this.checkedIds
}
}
}
},
handleClose() {
@ -914,7 +859,7 @@ export default {
},
// 退
onOrderRefund(id){
this.$refs.orderRefund.getOrderDetails(id)
this.$refs.orderRefund.getOrderDetails(id)
},
// 退
refundSuccess(){
@ -944,7 +889,7 @@ export default {
async exports(value) {
let excelData = JSON.parse(JSON.stringify(this.tableFrom)), data = []
excelData.page = 1
excelData.ids = this.checkedIds.toString()
excelData.ids = this.checkedIds.toString()
let pageCount = 1
let lebData = {};
for (let i = 0; i < pageCount; i++) {
@ -953,7 +898,7 @@ export default {
if (lebData.export.length) {
data = data.concat(lebData.export)
excelData.page++
}
}
}
createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename);
return
@ -1115,7 +1060,7 @@ export default {
total_price: res.data.total_price,
integral_price: res.data.integral_price,
coupon_price: (Number(res.data.coupon_price) + Number(res.data.svip_discount)).toFixed(2) ,
pay_price: (Number(res.data.total_price) + Number(res.data.pay_postage) - Number(res.data.coupon_price) - Number(res.data.svip_discount)).toFixed(2)
pay_price: (Number(res.data.total_price) + Number(res.data.pay_postage) - Number(res.data.coupon_price) - Number(res.data.svip_discount)).toFixed(2)
}
this.loading = false
}).catch(({ message }) => {
@ -1190,7 +1135,7 @@ export default {
this.shipment.delivery_name = this.shipment.to_name
this.shipment.delivery_id = this.shipment.to_phone
}
if(this.shipment.is_split != '0' && this.shipment.is_split && this.orderType != 2){
if(this.shipment.is_split != '0' && this.shipment.is_split && this.orderType != 2){
if (!this.multipleSelection.length) {
return this.$message.warning('请选择拆单商品!')
}

@ -36,11 +36,11 @@
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
<el-button size="small" @click="searchReset()">重置</el-button>
<el-button size="small" @click="searchReset()">重置</el-button>
</el-form-item>
</el-form>
</div>
<cards-data v-if="cardLists.length>0" :card-lists="cardLists" />
<!-- <cards-data v-if="cardLists.length>0" :card-lists="cardLists" />-->
<el-card>
<el-table
v-loading="listLoading"

@ -26,7 +26,7 @@
>订单核销</el-button
>
<el-button
v-if="(orderDetailList.order_type == 0 || orderDetailList.order_type == 2) && orderDetailList.status === 0 && orderDetailList.paid === 1"
v-if="(orderDetailList.order_type == 0 || orderDetailList.order_type == 2) && orderDetailList.status === 0 && orderDetailList.paid === 1"
type="primary"
size="small"
@click="send"
@ -43,8 +43,8 @@
<el-button icon="el-icon-more" size="small"></el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="mark">订单备注</el-dropdown-item>
<el-dropdown-item v-if="orderDetailList.order_type == 0 && orderDetailList.status === 1 && orderDetailList.paid === 1" command="modify">修改发货信息</el-dropdown-item>
<el-dropdown-item v-if="orderDetailList.status!=-1&&orderDetailList.paid==1&&orderDetailList.status<9" command="refund">退款</el-dropdown-item>
<el-dropdown-item v-if="orderDetailList.order_type == 0 && orderDetailList.status === 1 && orderDetailList.paid === 1" command="modify">修改发货信息</el-dropdown-item>
<el-dropdown-item v-if="orderDetailList.status!=-1&&orderDetailList.paid==1&&orderDetailList.status<9" command="refund">退款</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@ -69,9 +69,13 @@
<span v-if="orderDetailList.finalOrder&&orderDetailList.finalOrder.pay_price&&orderDetailList.finalOrder.paid==1">尾款¥{{orderDetailList.finalOrder.pay_price}}</span>
</div>
</li>
<li class="item">
<div class="title">支付积分</div>
<div>{{ orderDetailList.integral }}</div>
</li>
<li class="item">
<div class="title">支付方式</div>
<div>{{ orderDetailList.pay_type | payTypeFilter }}</div>
<div>{{ orderDetailList.pay_type == 2 ? '微信' : '积分' }}</div>
</li>
<li class="item">
<div class="title">{{ orderDetailList.pay_time ? '支付时间' : '下单时间'}}</div>
@ -100,7 +104,7 @@
<div>绑定电话</div>
<div class="value">{{ orderDetailList.user.phone ? orderDetailList.user.phone : '-' }}</div>
</li>
</ul>
</div>
<div class="section">
@ -120,7 +124,7 @@
</li>
</ul>
</div>
<div class="section">
<div class="title">订单信息</div>
<ul class="list">
@ -139,22 +143,16 @@
<span v-if="orderDetailList.finalOrder&&orderDetailList.finalOrder.pay_price&&orderDetailList.finalOrder.paid==1">尾款¥{{orderDetailList.finalOrder.pay_price}}</span>
</div>
</li>
<li class="item">
<div>优惠券金额</div>
<div class="value">{{ orderDetailList.coupon_price ? orderDetailList.coupon_price : '-' }}</div>
</li>
<li v-if="orderDetailList.integral" class="item">
<div>积分抵扣</div>
<div v-if="orderDetailList.integral && orderDetailList.integral != 0" class="value">使用了{{ orderDetailList.integral }}个积分抵扣了{{ orderDetailList.integral_price }}</div>
<li class="item">
<div>积分支付</div>
<div class="value">{{ orderDetailList.integral }}</div>
</li>
<li class="item">
<div>商品总价</div>
<div class="value">{{ orderDetailList.total_price ? orderDetailList.total_price : '-' }}</div>
</li>
<li class="item" v-if="orderDetailList.svip_discount">
<div>会员商品优惠</div>
<div class="value">{{ orderDetailList.svip_discount }}</div>
</li>
<li class="item">
<div>支付运费</div>
<div class="value">{{ orderDetailList.pay_postage }}</div>
@ -167,24 +165,7 @@
<div>上级推广人</div>
<div class="value">{{ orderDetailList.TopSpread.nickname }}</div>
</li>
<li v-if="!orderDetailList.activity_type" class="item">
<div>一级佣金</div>
<div class="value">
{{ parseFloat(orderDetailList.extension_one) + parseFloat(orderDetailList.refund_extension_one) }}
<em v-if="orderDetailList.refund_extension_one > 0" style="color: red;font-style: normal;">(-{{ orderDetailList.refund_extension_one }})</em>
</div>
</li>
<li v-if="!orderDetailList.activity_type" class="item">
<div>二级佣金</div>
<div class="value">
{{ parseFloat(orderDetailList.extension_two) + parseFloat(orderDetailList.refund_extension_two) }}
<em v-if="orderDetailList.refund_extension_two > 0" style="color: red;font-style: normal;">(-{{ orderDetailList.refund_extension_two }})</em>
</div>
</li>
<li class="item">
<div>赠送积分</div>
<div class="value">{{orderDetailList.give_integral || '-'}}</div>
</li>
<li class="item">
<div>发货方式</div>
<div v-if="orderDetailList.order_type == 1" class="value">核销</div>
@ -194,10 +175,7 @@
<div>商品类型</div>
<div class="value">{{ orderDetailList.is_virtual==1 ? '虚拟商品' : orderDetailList.is_virtual==2 ? '卡密商品' : '普通商品' }}</div>
</li>
<li class="item">
<div>活动类型</div>
<div class="value">{{ orderDetailList.activity_type == 1 ? '秒杀' : orderDetailList.activity_type == 2 ? '预售' : orderDetailList.activity_type == 3 ? '助力' : orderDetailList.activity_type == 4 ? '拼团' : '普通' }}</div>
</li>
</ul>
</div>
<div class="section" v-if="orderDetailList.order_extend">
@ -244,7 +222,7 @@
</li>
</ul>
</div>
</el-tab-pane>
<el-tab-pane label="商品信息" name="goods">
<el-table :data="orderDetailList.orderProduct" size="small">
@ -413,7 +391,7 @@
</span>
</div>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="实际支付" min-width="80" align="center">
<template slot-scope="scope">
<span>{{ scope.row.pay_price }}</span>

@ -1604,8 +1604,7 @@ export default {
{ title: '商品信息', name: '1' },
{ title: '规格设置', name: '2' },
{ title: '商品详情', name: '3' },
{ title: '营销设置', name: '4' },
{ title: '其他设置', name: '5' }
{ title: '其他设置', name: '4' }
],
type: 0,
modals: false,

@ -51,132 +51,8 @@
<span class="trip">开启店铺即可展示在移动端</span>
</div>
</div>
<div class="basic-information">
<div v-if="merData.is_margin != 0">
<!--未支付-->
<div v-if="merData.is_margin == 1">
<span class="basic-label">店铺保证金</span>
<span class="font_red">{{merData.margin}}</span>
<div class="margin_count" @mouseenter="getCode()">
<el-button type="text" size="small" class="mr10 pay_btn">去支付保证金</el-button>
<!--支付二维码-->
<div class="erweima">
<div class="pay_title">支付保证金</div>
<div>
<vue-qr class="bicode" :text="qrCode" :size="310" />
<div class="pay_type" >请使用微信扫码支付</div>
<div class="pay_price" >{{marginPrice}}</div>
<div class="pay_time">支付码过期时间 {{qrEndTime}}</div>
</div>
</div>
</div>
</div>
<!--已支付-->
<div class="margin_main" v-if="merData.is_margin == 10 ">
<span class="basic-label">店铺保证金</span>
<span class="margin_price">{{merData.margin}}</span>
<div class="margin_count">
<span class="mr10 spanBtn" @click="viewRecords">查看保证金记录</span>
<!--保证金弹窗-->
<div class="margin_modal" @mouseleave="supplyPay=false">
<div>
<img src="@/assets/images/margin03.png"/>
<div class="alic">
<span class="text_g">剩余保证金{{merData.margin}}</span>
<el-button v-if="merData.margin>0" type="primary" size="small" @click="applyReturn">申请退回保证金</el-button>
</div>
</div>
</div>
</div>
<div v-if="merData.marginStatus" style="display: inline-block;">
<div class="margin_count" @mouseenter="getCode()">
<el-button type="text" size="small" class="mr10 pay_btn">去补缴保证金</el-button>
<!--支付二维码-->
<div class="erweima">
<div class="pay_title">支付保证金</div>
<div>
<vue-qr class="bicode" :text="qrCode" :size="310" />
<div class="pay_type" >请使用微信扫码支付</div>
<div class="pay_price" >{{marginPrice}}</div>
<div class="pay_time">支付码过期时间 {{qrEndTime}}</div>
</div>
</div>
</div>
</div>
</div>
<div class="margin_main" v-if="merData.is_margin == -10 || merData.is_margin == -1">
<span class="basic-label">店铺保证金</span>
<span class="margin_price">{{merData.margin}}</span>
<div class="margin_count">
<span class="mr10 spanBtn" @click="viewRecords">查看保证金记录</span>
<!--保证金弹窗-->
<div class="margin_modal" @mouseleave="goPay=false">
<div>
<img v-if="merData.is_margin == -10" src="@/assets/images/margin01.png"/>
<img v-if="merData.is_margin == -1" src="@/assets/images/margin02.png"/>
<img v-if="merData.is_margin == 10" src="@/assets/images/margin03.png"/>
<div class="alic" v-if="merData.is_margin == 10">
<span class="text_g">剩余保证金{{merData.margin}}</span>
<el-button v-if="merData.margin>0" type="primary" size="small" @click="applyReturn">申请退回保证金</el-button>
</div>
<div class="alic" v-if="merData.is_margin == -1">
<span class="text_b b01"> 审核中</span>
<div class="margin_refused">您申请退回保证金正在审核中</div>
</div>
<div class="alic" v-if="merData.is_margin == -10">
<span class="text_b b02">审核未通过</span>
<div class="margin_refused">未通过原因<span>{{merData.refundMarginOrder.refusal}}</span></div>
<el-button type="primary" size="small" @click="applyReturn">再次申请</el-button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!--申请退回保障金银行信息弹窗-->
<el-dialog
v-if="modalBank"
v-model="modalBank"
:visible.sync="modalBank"
title="申请退回保证金"
width="600px"
close-on-click-modal
custom-class="dialog-scustom"
>
<div class="bank-container">
<div class="item">说明 <span class="red">申请退回保证金则视为关闭店铺请谨慎操作</span></div>
<div class="item">
<div v-if="online > 0">线上支付的保证金 <span class="red">{{online}}</span>会原路返回</div>
<div v-if="offline > 0">
线下支付的保证金<span class="red">{{offline}}</span>会通过下方账号信息返回请务必确认下方您的收款信息真实有效以确保资金可顺利退回感谢配合
</div>
</div>
<div class="title">账号信息</div>
<el-form ref="bankValidate" :model="bankValidate" :rules="bankRules" label-width="100px" @submit.native.prevent>
<el-form-item label="真实姓名:" prop="name">
<el-input v-model="bankValidate.name" type="text" placeholder="请输入真实姓名" />
</el-form-item>
<el-form-item label="开户银行:" prop="code">
<el-input v-model="bankValidate.code" type="text" placeholder="请输入开户银行" />
</el-form-item>
<el-form-item v-if="bankValidate.type == 1" label="银行卡号:" prop="pic">
<el-input v-model="bankValidate.pic" type="number" placeholder="请输入银行卡号" />
</el-form-item>
<el-form-item v-if="bankValidate.type == 2" label="收款二维码:">
<img v-if="bankValidate.pic" :src="bankValidate.pic" style="width: 120px;height: 120px;">
<div v-else class="red">
请前往财务-收款方式页面填写收款信息
</div>
</el-form-item>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" size="small" @click="bankConfirm('bankValidate')">确定</el-button>
</span>
</el-dialog>
<div v-if="infoType == '2'" class="business-msg">
<div class="form-data">
<el-form ref="ruleForm" :model="merData" :rules="rules" label-width="150px" class="demo-ruleForm">
@ -210,8 +86,8 @@
<div v-else class="upLoad">
<i class="el-icon-camera cameraIconfont" />
</div>
<div class="trip">建议尺寸710*134px或710*460px(请根据平台要求选择尺寸此图如未上传默认展示店铺背景图)</div>
</div>
<div class="trip">建议尺寸710*134px或710*460px(请根据平台要求选择尺寸此图如未上传默认展示店铺背景图)</div>
</div>
</el-form-item>
<el-form-item class="form-item" label="店铺资质:" :prop="merData.sys_bases_status == 1 ? 'uploadedqualifications' : ''">
<div class="upLoadPicBox_qualification">
@ -352,25 +228,46 @@
</div>
</div>
<div v-if="infoType == '3'" class="user-msg">
<!-- <div class="basic-information">-->
<!-- <span class="basic-label"> 商户手续费</span>-->
<!-- {{ Number(merData.commission_rate) > 0 ? (parseFloat(merData.commission_rate)).toFixed(2) : (parseFloat(merData.merchantCategory.commission_rate * 100)).toFixed(2)}}%-->
<!-- </div>-->
<!-- <div class="basic-information">-->
<!-- <span class="basic-label"> 添加商品</span>-->
<!-- {{ merData.is_audit ? "需平台审核" : "平台免审核" }}-->
<!-- </div>-->
<!-- <div class="basic-information">-->
<!-- <span class="basic-label"> 开启直播间</span>-->
<!-- {{ merData.is_bro_room ? "需平台审核" : "平台免审核" }}-->
<!-- </div>-->
<!-- <div class="basic-information">-->
<!-- <span class="basic-label"> 添加直播商品</span>-->
<!-- {{ merData.is_bro_goods ? "需平台审核" : "平台免审核" }}-->
<!-- </div>-->
<!-- <div class="basic-information">-->
<!-- <span class="basic-label"> 平台首页推荐商户</span>-->
<!-- {{ merData.is_best ? "是" : "否" }}-->
<!-- </div>-->
<div class="basic-information">
<span class="basic-label"> 商户手续费</span>
{{ Number(merData.commission_rate) > 0 ? (parseFloat(merData.commission_rate)).toFixed(2) : (parseFloat(merData.merchantCategory.commission_rate * 100)).toFixed(2)}}%
<span class="basic-label"> 商户收入</span>
{{merData.assets.total}}
</div>
<div class="basic-information">
<span class="basic-label"> 添加商品</span>
{{ merData.is_audit ? "需平台审核" : "平台免审核" }}
<span class="basic-label"> 商户余额</span>
{{merData.assets.mer_money}}
</div>
<div class="basic-information">
<span class="basic-label"> 开启直播间</span>
{{ merData.is_bro_room ? "需平台审核" : "平台免审核" }}
<span class="basic-label"> 商户冻结金额</span>
{{merData.assets.frozen_money}}
</div>
<div class="basic-information">
<span class="basic-label"> 添加直播商品</span>
{{ merData.is_bro_goods ? "需平台审核" : "平台免审核" }}
<span class="basic-label"> 商户可提现总金额</span>
{{merData.assets.available_money}}
</div>
<div class="basic-information">
<span class="basic-label"> 平台首页推荐商户</span>
{{ merData.is_best ? "是" : "否" }}
<span class="basic-label"> 商户退款金额</span>
{{merData.assets.refund_money}}
</div>
</div>
<div v-if="infoType != 3" class="submit-button">
@ -476,39 +373,6 @@ export default {
}
}
// const checkPhone= (rule, value, callback) =>{
// const phoneExp = /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/;
// setTimeout(()=>{
// if(value !== undefined && value !==''){
// if ((!phoneExp.test(value)) && value !== '') {
// callback(new Error(''));
// } else {
// callback();
// }
// }else{
// callback()
// }
// },100)
// }
// var checkPhone = (rule, value, callback) => {
// if (value === '') {
// callback(new Error(''))
// }
// if (value.length !== 11) {
// callback(new Error(''))
// }
// if (value.length !== 11) {
// callback(new Error(''))
// }
// // ? ?
// var ab = /^[1][3,4,5,7,8][0-9]{9}$/
// if (ab.test(value) === false) {
// callback(new Error(''))
// }
// callback()
// }
const validatePhone = (rule, value, callback) => {
if (!value) {
return callback(new Error('请填写手机号'))
@ -607,7 +471,7 @@ export default {
tabList: [
{value: '1',title: '基本信息'},
{value: '2',title: '店铺信息'},
{value: '3',title: '功能信息'}
{value: '3',title: '商家账户信息'}
]
}
},
@ -628,7 +492,7 @@ export default {
},
created() {
this.getMapInfo()
},
mounted: function() {
@ -707,7 +571,7 @@ export default {
})
} else {
that.uploadedQualifications = []
}
}
if(that.merData.is_margin == 1)(this.getCode())
})
},
@ -780,7 +644,7 @@ export default {
this.submitLoading = false
this.$message.error(rej.data.message)
})
}
}
},
//
getCode() {
@ -817,7 +681,7 @@ export default {
getRecordList(){
let that = this
that.loading = true;
marginRecordLst(that.tableFrom).then(async (res) => {
marginRecordLst(that.tableFrom).then(async (res) => {
that.tableData.data = res.data.list;
that.tableData.total = res.data.count;
that.loading = false;
@ -845,7 +709,7 @@ export default {
marginRefund()
.then((res) => {
that.bankValidate = res.data.info
that.offline = res.data.offline
that.offline = res.data.offline
that.online = res.data.online
if(Number(res.data.offline) <= 0){
marginRefundApply(this.bankValidate)
@ -1023,7 +887,7 @@ export default {
margin-top: 10px;
color: #282828;
font-size: 13px;
line-height: 26px;
line-height: 26px;
}
.red{
color:rgb(237, 64, 20);;
@ -1133,7 +997,7 @@ export default {
border-radius: 8px;
padding: 10px;
box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
img{
width: 160px;
height: 160px;
@ -1143,7 +1007,7 @@ export default {
font-size: 16px;
color: #303133;
font-weight: normal;
}
.pay_price{
font-size: 18px;
@ -1158,7 +1022,7 @@ export default {
.pay_time{
font-size: 12px;
color: #6D7278;
}
}

Loading…
Cancel
Save