This commit is contained in:
faiz 2024-05-18 19:35:50 +08:00
parent 9b78b8842f
commit 10ce6008c1
9 changed files with 34 additions and 30 deletions

View File

@ -15,8 +15,8 @@
<el-form-item label="上传方式:" prop="type"> <el-form-item label="上传方式:" prop="type">
<el-radio-group v-model="ruleForm.type" @change="radioChange(ruleForm.type)"> <el-radio-group v-model="ruleForm.type" @change="radioChange(ruleForm.type)">
<el-radio :label="0">本地上传</el-radio> <el-radio :label="0">本地上传</el-radio>
<el-radio :label="1">网络上传</el-radio> <!-- <el-radio :label="1">网络上传</el-radio>
<el-radio :label="2">扫码上传</el-radio> <el-radio :label="2">扫码上传</el-radio> -->
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="上传至分组:" prop="region" v-show="ruleForm.type == 0 || ruleForm.type == 1"> <el-form-item label="上传至分组:" prop="region" v-show="ruleForm.type == 0 || ruleForm.type == 1">

View File

@ -40,7 +40,7 @@ export function paidFilter(status) {
*/ */
export function payTypeFilter(status) { export function payTypeFilter(status) {
const statusMap = { const statusMap = {
'0': '余额', '0': '抵扣券',
'1': '微信', '1': '微信',
'2': '微信', '2': '微信',
'3': '微信', '3': '微信',
@ -96,7 +96,7 @@ export function cancelOrderStatusFilter(status) {
export function orderPayType(type) { export function orderPayType(type) {
const typeMap = { const typeMap = {
'0': '余额支付', '0': '抵扣券支付',
'1': '微信支付', '1': '微信支付',
'2': '小程序', '2': '小程序',
'3': '微信支付', '3': '微信支付',

View File

@ -1,11 +1,10 @@
{ {
"id": "993865", "id": "993865",
"name": "CRMEB 商城图标", "name": "铸源优品 商城图标",
"font_family": "iconfont", "font_family": "iconfont",
"css_prefix_text": "icon-", "css_prefix_text": "icon-",
"description": "外包项目图标添加", "description": "外包项目图标添加",
"glyphs": [ "glyphs": [{
{
"icon_id": "5387812", "icon_id": "5387812",
"name": "购物_o", "name": "购物_o",
"font_class": "gouwu_o", "font_class": "gouwu_o",

View File

@ -17,7 +17,7 @@
<el-form-item label="时间选择:"> <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-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>
<el-form-item label="发货方式:" prop="filter_delivery"> <!-- <el-form-item label="发货方式:" prop="filter_delivery">
<el-select <el-select
v-model="tableFrom.filter_delivery" v-model="tableFrom.filter_delivery"
placeholder="请选择" placeholder="请选择"
@ -32,14 +32,14 @@
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="商品名称:" prop="store_name"> <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-input v-model="tableFrom.store_name" placeholder="请输入商品名称" class="selWidth" clearable @keyup.enter.native="getList(1),getCardList()" />
</el-form-item> </el-form-item>
<el-form-item label="总单单号:" prop="group_order_sn"> <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-input v-model="tableFrom.group_order_sn" placeholder="请输入总单订单号" class="selWidth" clearable @keyup.enter.native="getList(1),getCardList()" />
</el-form-item> </el-form-item>
<el-form-item label="商品类型:" prop="filter_product"> <!-- <el-form-item label="商品类型:" prop="filter_product">
<el-select <el-select
v-model="tableFrom.filter_product" v-model="tableFrom.filter_product"
placeholder="请选择" placeholder="请选择"
@ -54,8 +54,8 @@
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="活动类型:" prop="activity_type"> <!-- <el-form-item label="活动类型:" prop="activity_type">
<el-select <el-select
v-model="tableFrom.activity_type" v-model="tableFrom.activity_type"
placeholder="请选择" placeholder="请选择"
@ -70,7 +70,7 @@
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="支付方式:" prop="pay_type"> <el-form-item label="支付方式:" prop="pay_type">
<el-select <el-select
v-model="tableFrom.pay_type" v-model="tableFrom.pay_type"
@ -79,7 +79,7 @@
class="selWidth" class="selWidth"
@change="getList(1),getCardList()" @change="getList(1),getCardList()"
> >
<el-option label="余额" value="0" /> <el-option label="抵扣券" value="0" />
<el-option label="微信" value="1" /> <el-option label="微信" value="1" />
<el-option label="支付宝" value="2" /> <el-option label="支付宝" value="2" />
<el-option label="铸源星" value="7" /> <el-option label="铸源星" value="7" />

View File

@ -113,7 +113,7 @@
class="selWidth" class="selWidth"
@change="getList(1)" @change="getList(1)"
> >
<el-option label="余额" value="0" /> <el-option label="抵扣卷" value="0" />
<el-option label="微信" value="1" /> <el-option label="微信" value="1" />
<el-option label="支付宝" value="2" /> <el-option label="支付宝" value="2" />
<el-option label="铸源星" value="7" /> <el-option label="铸源星" value="7" />
@ -341,7 +341,7 @@ export default {
refundUserList: [ refundUserList: [
{ value: 1, label: '用户' }, { value: 1, label: '用户' },
{ value: 3, label: '商户' }, { value: 3, label: '商户' },
{ value: 4, label: '客服' } { value: 4, label: '平台' }
], ],
listLoading: true, listLoading: true,
roterPre: roterPre, roterPre: roterPre,

View File

@ -2169,7 +2169,7 @@ const objTitle = {
title: '占比' title: '占比'
}, },
coupon:{ coupon:{
title:'抵扣' title:'抵扣'
}, },
stock: { stock: {
title: '库存' title: '库存'
@ -2700,7 +2700,7 @@ export default {
return this.virStatus&&arr.includes(this.formThead[iii].title) return this.virStatus&&arr.includes(this.formThead[iii].title)
}, },
isForbidden(iii){ isForbidden(iii){
let arr = ['成本价','抵扣','成长值'] let arr = ['成本价','抵扣','成长值']
let forbidden = ['库存','重量KG','体积(m³)'] let forbidden = ['库存','重量KG','体积(m³)']
return arr.includes(this.formThead[iii].title) || (this.virStatus&&forbidden.includes(this.formThead[iii].title)) return arr.includes(this.formThead[iii].title) || (this.virStatus&&forbidden.includes(this.formThead[iii].title))
}, },

View File

@ -82,11 +82,11 @@
<el-form-item label="关键字:" prop="keyword"> <el-form-item label="关键字:" prop="keyword">
<el-input v-model="tableFrom.keyword" placeholder="请输入商品名称ID号" class="selWidth" clearable @keyup.enter.native="getList(1)" /> <el-input v-model="tableFrom.keyword" placeholder="请输入商品名称ID号" class="selWidth" clearable @keyup.enter.native="getList(1)" />
</el-form-item> </el-form-item>
<el-form-item label="商品类型:" prop="is_ficti"> <!-- <el-form-item label="商品类型:" prop="is_ficti">
<el-select v-model="tableFrom.is_ficti" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)"> <el-select v-model="tableFrom.is_ficti" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
<el-option v-for="item in productTypeList" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in productTypeList" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="创建时间:" prop="create_time"> <el-form-item label="创建时间:" prop="create_time">
<el-date-picker <el-date-picker
v-model="timeVal" v-model="timeVal"

View File

@ -131,14 +131,14 @@
<el-tab-pane label="规格与价格" name="goods"> <el-tab-pane label="规格与价格" name="goods">
<div class="section"> <div class="section">
<ul class="list"> <ul class="list">
<li class="item"> <!-- <li class="item">
<div class="item-title">佣金设置</div> <div class="item-title">佣金设置</div>
<div class="value">{{productData.extension_type==1?"单独设置":"默认设置"}}</div> <div class="value">{{productData.extension_type==1?"单独设置":"默认设置"}}</div>
</li> </li>
<li v-if="productData.mer_svip_status" class="item"> <li v-if="productData.mer_svip_status" class="item">
<div class="item-title">付费会员价</div> <div class="item-title">付费会员价</div>
<div class="value">{{productData.svip_price_type==0 ? '不设置会员价' : productData.svip_price_type==1 ? '默认设置会员价' : '自定义设置会员价'}}</div> <div class="value">{{productData.svip_price_type==0 ? '不设置会员价' : productData.svip_price_type==1 ? '默认设置会员价' : '自定义设置会员价'}}</div>
</li> </li> -->
<li class="item"> <li class="item">
<div class="item-title">规格</div> <div class="item-title">规格</div>
<div class="value">{{productData.spec_type == 1 ? "多规格" : "单规格"}}</div> <div class="value">{{productData.spec_type == 1 ? "多规格" : "单规格"}}</div>
@ -261,10 +261,10 @@
</div> </div>
<div v-else class="value-item"></div> <div v-else class="value-item"></div>
</li> </li>
<li class="item"> <!-- <li class="item">
<div class="item-title">分销礼包</div> <div class="item-title">分销礼包</div>
<div class="value">{{productData.is_gift_bag ? '是' : '否'}}</div> <div class="value">{{productData.is_gift_bag ? '是' : '否'}}</div>
</li> </li> -->
<li v-if="productData.star" class="item"> <li v-if="productData.star" class="item">
<div class="item-title">平台推荐星级</div> <div class="item-title">平台推荐星级</div>
<div class="value"> <div class="value">
@ -775,7 +775,7 @@ const objTitle = {
title: '占比' title: '占比'
}, },
coupon:{ coupon:{
title:'抵扣' title:'抵扣'
}, },
bar_code: { bar_code: {
title: '商品编号' title: '商品编号'

View File

@ -48,7 +48,7 @@
<el-switch v-model="merData.mer_state" disabled :width="55" active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" /> <el-switch v-model="merData.mer_state" disabled :width="55" active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" />
</el-tooltip> </el-tooltip>
<el-switch v-else v-model="merData.mer_state" active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" :width="55" /> <el-switch v-else v-model="merData.mer_state" active-text="开启" inactive-text="关闭" :active-value="1" :inactive-value="0" :width="55" />
<span class="trip">开启店铺即可展示在移动端</span> <span class="trip">请先支付店铺费用!</span>
</div> </div>
</div> </div>
<div class="basic-information"> <div class="basic-information">
@ -191,11 +191,12 @@
<span class="basic-label"> 申请记录</span> <span class="basic-label"> 申请记录</span>
<span class="mr10 spanBtn" @click="viewOffRecords">查看记录</span> <span class="mr10 spanBtn" @click="viewOffRecords">查看记录</span>
</div> </div>
</div> <!-- <div class="basic-information">
<div class="basic-information">
<span class="basic-label"> 签署电子合同</span> <span class="basic-label"> 签署电子合同</span>
<span class="mr10 spanBtn" @click="handleSign">去签署</span> <span class="mr10 spanBtn" @click="handleSign">去签署</span>
</div> -->
</div> </div>
<!--申请退回保障金银行信息弹窗--> <!--申请退回保障金银行信息弹窗-->
<el-dialog <el-dialog
v-if="modalBank" v-if="modalBank"
@ -798,8 +799,12 @@ export default {
// //
handleSign(){ handleSign(){
contactApi().then((res)=>{ contactApi().then((res)=>{
if(res.status == 200){
window.open(res.message) window.open(res.message)
}
// console.log(res.message); // console.log(res.message);
}).catch((res) => {
this.$message.error(res.message)
}) })
}, },
handleShow(){ handleShow(){