111

src/libs/settingMer.js

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 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 login_title = Cookies.get('MerInfo') ? JSON.parse(Cookies.get('MerInfo')).login_title : ''
 const SettingMer = {

src/views/product/addProduct/index.vue

@@ -86,10 +86,11 @@
             </el-form-item>
           </el-col>
           <el-col v-if="labelList.length" :span="24">
+
             <el-form-item label="商品标签：">
               <el-select
                 v-model="formValidate.mer_labels"
-                multiple
+
                 placeholder="请选择"
                 class="selWidth"
               >
@@ -451,7 +452,7 @@
                       <el-input
                         v-if="formThead[iii].title === '付费会员价'"
                         v-model="scope.row[iii]"
-           
+
                         :disabled="formValidate.svip_price_type == 1"
                         class="priceBox"
                         controls-position="right"
@@ -1083,7 +1084,7 @@
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
-                  
+
                 />
               </el-select>
             </el-form-item>

src/views/product/productList/index.vue

@@ -85,12 +85,12 @@
         <el-button size="mini" :disabled="multipleSelection.length == 0" @click="batchCommision">批量设置佣金</el-button>
         <el-button v-if="open_svip == 1" size="mini" :disabled="multipleSelection.length == 0" @click="batchSvip">批量设置会员价</el-button>
       </div>
-      <el-table 
+      <el-table
-        v-loading="listLoading" 
+        v-loading="listLoading"
-        :data="tableData.data" 
+        :data="tableData.data"
-        style="width: 100%" 
+        style="width: 100%"
-        size="mini" 
+        size="mini"
-        :row-class-name="tableRowClassName" 
+        :row-class-name="tableRowClassName"
         :row-key="(row) => { return row.product_id }"
         @selection-change="handleSelectionChange"
         @rowclick.stop="closeEdit">
@@ -173,7 +173,7 @@
         </el-table-column>
         <el-table-column prop="create_time" label="创建时间" min-width="150" />
         <el-table-column label="操作" min-width="150" fixed="right">
-          <template slot-scope="scope"> 
+          <template slot-scope="scope">
             <router-link v-if="tableFrom.type != 5" :to="{path: roterPre + '/product/list/addProduct/' + scope.row.product_id}">
               <el-button type="text" size="small" class="mr10">编辑</el-button>
             </router-link>
@@ -212,7 +212,7 @@
     >
       <el-form ref="labelForm" :model="labelForm" @submit.native.prevent>
         <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
               v-for="item in labelList"
               :key="item.id"