1748153932 11 months ago
parent c103cded86
commit a7b3b4eb84
  1. BIN
      merdist.rar
  2. 2
      src/libs/settingMer.js
  3. 3
      src/views/product/addProduct/index.vue
  4. 2
      src/views/product/productList/index.vue

Binary file not shown.

@ -9,7 +9,7 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
import Cookies from "js-cookie"; import Cookies from "js-cookie";
// 请求接口地址 如果没有配置自动获取当前网址路径 // 请求接口地址 如果没有配置自动获取当前网址路径
const VUE_APP_API_URL = process.env.VUE_APP_BASE_API || `${location.origin}` const VUE_APP_API_URL = 'https://b2b2c.njrenzhou.cn'
const VUE_APP_WS_URL = process.env.VUE_APP_WS_URL || (location.protocol === 'https:' ? 'wss' : 'ws') + ':' + location.hostname const VUE_APP_WS_URL = process.env.VUE_APP_WS_URL || (location.protocol === 'https:' ? 'wss' : 'ws') + ':' + location.hostname
const login_title = Cookies.get('MerInfo') ? JSON.parse(Cookies.get('MerInfo')).login_title : '' const login_title = Cookies.get('MerInfo') ? JSON.parse(Cookies.get('MerInfo')).login_title : ''
const SettingMer = { const SettingMer = {

@ -86,10 +86,11 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="labelList.length" :span="24"> <el-col v-if="labelList.length" :span="24">
<el-form-item label="商品标签:"> <el-form-item label="商品标签:">
<el-select <el-select
v-model="formValidate.mer_labels" v-model="formValidate.mer_labels"
multiple
placeholder="请选择" placeholder="请选择"
class="selWidth" class="selWidth"
> >

@ -212,7 +212,7 @@
> >
<el-form ref="labelForm" :model="labelForm" @submit.native.prevent> <el-form ref="labelForm" :model="labelForm" @submit.native.prevent>
<el-form-item> <el-form-item>
<el-select v-model="labelForm.mer_labels" clearable multiple placeholder="请选择" class="selWidth"> <el-select v-model="labelForm.mer_labels" clearable placeholder="请选择" class="selWidth">
<el-option <el-option
v-for="item in labelList" v-for="item in labelList"
:key="item.id" :key="item.id"

Loading…
Cancel
Save