|
@@ -55,6 +55,12 @@
|
|
|
/>
|
|
/>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
+ <el-form-item label="商城类型" prop="mimiType">
|
|
|
|
|
+ <el-select v-model="queryParams.mimiType" clearable placeholder="请选择商城类型" size="small">
|
|
|
|
|
+ <el-option key="1" label="制单小程序" :value="1"/>
|
|
|
|
|
+ <el-option key="2" label="公域小程序" :value="2"/>
|
|
|
|
|
+ </el-select>
|
|
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
<el-form-item>
|
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
@@ -169,11 +175,8 @@
|
|
|
<el-table-column label="配置绑定Id" align="center" prop="merchantConfigId" />
|
|
<el-table-column label="配置绑定Id" align="center" prop="merchantConfigId" />
|
|
|
<el-table-column label="小程序类型" align="center" prop="mimiType" width="100px">
|
|
<el-table-column label="小程序类型" align="center" prop="mimiType" width="100px">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
- <el-tag
|
|
|
|
|
- :type="scope.row.mimiType === 2 ? 'success' : scope.row.mimiType === 1 ? 'warning' : 'danger'"
|
|
|
|
|
- >
|
|
|
|
|
- {{ getStatusLabel(scope.row.status) }}
|
|
|
|
|
- </el-tag>
|
|
|
|
|
|
|
+ <el-tag v-if="scope.row.mimiType==1">制单小程序</el-tag>
|
|
|
|
|
+ <el-tag v-else-if="scope.row.mimiType==2" type="success">公域小程序</el-tag>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column label="创建时间" align="center" prop="createTime" />
|
|
<el-table-column label="创建时间" align="center" prop="createTime" />
|
|
@@ -298,6 +301,17 @@
|
|
|
:value="item.dictValue"
|
|
:value="item.dictValue"
|
|
|
/>
|
|
/>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ <el-form-item label="商城类型" prop="mimiType">
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ v-model="form.mimiType"
|
|
|
|
|
+ style="width: 220px"
|
|
|
|
|
+ clearable
|
|
|
|
|
+ size="small"
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option key="1" label="制单小程序" :value="1"/>
|
|
|
|
|
+ <el-option key="2" label="公域小程序" :value="2"/>
|
|
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="状态" prop="status">
|
|
<el-form-item label="状态" prop="status">
|
|
|
<el-select
|
|
<el-select
|
|
@@ -467,7 +481,8 @@ export default {
|
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
|
name: null,
|
|
name: null,
|
|
|
appid: null,
|
|
appid: null,
|
|
|
- status: null
|
|
|
|
|
|
|
+ status: null,
|
|
|
|
|
+ mimiType: null
|
|
|
},
|
|
},
|
|
|
// 协议配置相关
|
|
// 协议配置相关
|
|
|
agreementDialogVisible: false,
|
|
agreementDialogVisible: false,
|
|
@@ -912,7 +927,8 @@ export default {
|
|
|
aesKey: 'HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E',
|
|
aesKey: 'HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E',
|
|
|
msgDataFormat: 'JSON',
|
|
msgDataFormat: 'JSON',
|
|
|
type: '1',
|
|
type: '1',
|
|
|
- status: 0
|
|
|
|
|
|
|
+ status: 0,
|
|
|
|
|
+ mimiType: null
|
|
|
}
|
|
}
|
|
|
this.resetForm("form");
|
|
this.resetForm("form");
|
|
|
},
|
|
},
|