Merge branch 'lanmao'

manager/src/views/goods/goods-manage/category.vue

@@ -244,6 +244,7 @@ export default {
     //弹出品牌关联框
     brandOperation(v) {
       getCategoryBrandListData(v.id).then((res) => {
+        console.warn(res)
         this.categoryId = v.id;
         this.modalBrandTitle = "品牌关联";
         this.brandForm.categoryBrands = res.result.map((item) => item.id);

manager/src/views/goods/goods-manage/parameter.vue

@@ -31,9 +31,7 @@
           </p>
           <template v-if="group.params && group.params.length > 0">
             <div v-for="param in group.params" :key="param.param_id" class="params">
-              <span>{{ param.paramName }} 【{{
+              <span>{{ param.paramName }}</span>
-                  param.paramType | paramTypeFilter
-                }}】</span>
 
               <span>
                 <i-button type="text" @click="handleEditParams(group, param)">编辑</i-button>
@@ -56,19 +54,30 @@
           <FormItem label="参数名称" prop="paramName">
             <Input v-model="paramForm.paramName" style="width: 100%" />
           </FormItem>
-          <FormItem label="参数类型" prop="paramType">
+          <FormItem label="可选值" prop="options">
-            <Select :loading="userLoading" v-model="paramForm.paramType">
+            <Select
-              <Option :value="1" :key="1">输入项</Option>
+              v-model="paramForm.options"
-              <Option :value="2" :key="2">选择项</Option>
+              placeholder="输入后回车添加"
+              multiple
+              filterable
+              allow-create
+              :popper-append-to-body="false"
+              popper-class="spec-values-popper"
+              style="width: 100%; text-align: left; margin-right: 10px"
+            >
+              <Option
+                v-for="item in ops"
+                :value="item"
+                :key="item"
+                :label="item"
+              >
+                {{item}}
+              </Option>
             </Select>
           </FormItem>
-          <FormItem label="可选值" prop="options">
-            <i-input v-model="paramForm.options" type="textarea" :rows="3" placeholder="请输入可选值,选择项实用逗号分隔"></i-input>
-          </FormItem>
-
           <FormItem label="选项" prop="specName3">
-            <Checkbox :value="Number" v-model="paramForm.required">必填</Checkbox>
+            <Checkbox label=1 v-model="paramForm.required">必填</Checkbox>
-            <Checkbox v-model="paramForm.isIndex">可索引</Checkbox>
+            <Checkbox label=1 v-model="paramForm.isIndex">可索引</Checkbox>
           </FormItem>
         </Form>
 
@@ -127,6 +136,10 @@ export default {
       paramId: "",
       //参数表单
       paramForm: {},
+      /** 参数值 **/
+      ops:{
+        options: []
+      },
       paramGroupForm: {},
       /** 添加、编辑参数 规格 */
       formValidate: {
@@ -170,14 +183,15 @@ export default {
     handleEditParams(group, param) {
       this.paramForm = {
         paramName: param.paramName,
-        paramType: param.paramType,
+        options:  param.options.split(","),
-        options: param.options,
+        required: param.required==1?true:false,
-        required: param.required,
+        isIndex: param.isIndex==1?true:false,
-        isIndex: param.isIndex,
         groupId: group.groupId,
         categoryId: this.categoryId,
         id: param.id,
       };
+      console.warn(this.paramForm.options)
+      this.ops = this.paramForm.options
       this.modalType = 1;
       this.modalTitle = "修改参数";
       this.dialogParamsVisible = true;
@@ -194,7 +208,14 @@ export default {
       this.dialogParamsGroupVisible = true;
     },
     handleAddParamsGroup() {
+      this.paramGroupForm = {
+
+      };
+      this.ops = {
+
+      };
       (this.paramGroupForm.categoryId = this.categoryId), (this.modalType = 0);
+
       this.modalTitle = "添加参数组";
       this.dialogParamsGroupVisible = true;
     },
@@ -212,6 +233,7 @@ export default {
               }
             });
           } else {
+            console.warn(this.paramGroupForm)
             updateParamsGroup(this.paramGroupForm).then((res) => {
               this.submitLoading = false;
               if (res.success) {
@@ -242,6 +264,7 @@ export default {
               }
             });
           } else {
+            console.warn(this.paramForm.isIndex)
             this.paramForm.isIndex = Number(this.paramForm.isIndex);
             this.paramForm.required = Number(this.paramForm.required);
             updateGoodsParams(this.paramForm).then((res) => {

seller/src/config/index.js

@@ -18,14 +18,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    common: 'https://common-api.pickmall.cn',
+    //common: 'https://common-api.pickmall.cn',
     buyer: 'https://buyer-api.pickmall.cn',
-    seller: 'https://store-api.pickmall.cn',
+    //seller: 'https://store-api.pickmall.cn',
-    manager: 'https://admin-api.pickmall.cn'
+    //manager: 'https://admin-api.pickmall.cn'
-    // common: 'http://192.168.0.100:8890',
+     common: 'http://192.168.0.103:8890',
     // buyer: 'http://192.168.0.100:8888',
-    // seller: 'http://192.168.0.100:8889',
+     seller: 'http://192.168.0.103:8889',
-    // manager: 'http://192.168.0.100:8887'
+    manager: 'http://192.168.0.103:8887'
   },
   api_prod: {
     common: 'https://common-api.pickmall.cn',

seller/src/views/goods/goods-seller/goodsOperation.vue

@@ -576,13 +576,13 @@
           </div>
           <div class="form-item-view-bottom">
             <Collapse
-              active-key="1"
+              v-model="show"
               v-for="paramsgroup in goodsParams"
               :title="paramsgroup.groupName"
               style="text-align: left"
               :key="paramsgroup.groupName"
             >
-              <Panel key="1">
+              <Panel key="1" name="1">
                 {{ paramsgroup.groupName }}
                 <p slot="content">
                   <FormItem
@@ -592,25 +592,15 @@
                     :key="index"
                     :label="`${goodsParamsList.paramName}：`"
                   >
-                    <Input
-                      v-if="goodsParamsList.paramType === 1"
-                      type="text"
-                      v-model="goodsParamsList.paramValue"
-                      placeholder="长度为最多50个字符"
-                      maxlength="50"
-                      clearable
-                      style="width: 260px"
-                    />
                     <Select
                       v-model="goodsParamsList.paramValue"
-                      v-if="goodsParamsList.paramType === 2"
                       placeholder="请选择"
                       style="width: 200px"
                       clearable
                     >
                       <Option
                         v-for="option in goodsParamsList.optionList"
-                        :key="option"
+                        :key="option.paramValue"
                         :label="option"
                         :value="option"
                       ></Option>
@@ -772,6 +762,7 @@ export default {
     };
 
     return {
+      show: '1',
       //提交状态
       submitLoading: false,
       //上传图片路径
@@ -1370,18 +1361,14 @@ export default {
                     (ij) => ij.paramName === elem.paramName
                   )
                 ) {
-                  if (elem.paramType === 2) {
+                  elem.optionList = elem.options.split(",");
-                    elem.optionList = elem.options.split(",");
-                  }
                   this.baseInfoForm.goodsParamsList.push(elem);
                 }
                 if (this.$route.query.id || this.draftId) {
                   this.baseInfoForm.goodsParamsList = this.baseInfoForm.goodsParamsList.map(
                     (i) => {
                       if (i.paramId === elem.id || i.id === elem.id) {
-                        if (elem.paramType === 2) {
+                        elem.optionList = elem.options.split(",");
-                          elem.optionList = elem.options.split(",");
-                        }
                         i = {
                           ...i,
                           ...elem,
@@ -1839,19 +1826,24 @@ export default {
             this.$Message.error("请上传商品图片");
             return;
           }
-          // if (
+          let flag = false;
-          //   !this.baseInfoForm.storeCategoryPath ||
+          let paramValue = "";
-          //   !this.baseInfoForm.storeCategoryPath.length
+          this.baseInfoForm.goodsParamsList.forEach((e)=> {
-          // ) {
+            if(e.required === 1 && e.paramValue === null || e.paramValue === undefined){
-          //   this.submitLoading = false;
+              flag = true
-          //   this.$Message.error("请选择店内分类");
+              paramValue = e.paramName
-          //   return;
+            }
-          // }
+          });
+          if(flag){
+            this.$Message.error(paramValue +" 参数值不能为空");
+            this.submitLoading = false;
+            return;
+          }
           //如果选择的是卖家承担运费 则运费模板重置为0
           if (this.baseInfoForm.freightPayer !== "BUYER") {
             this.baseInfoForm.templateId = 0;
           }
-          
+
           this.baseInfoForm.skuList = this.skuTableData.map((sku) => {
             delete sku._index;
             delete sku._rowKey;
@@ -1865,6 +1857,12 @@ export default {
               (i) => i.url
             );
           }
+          /** 参数校验 **/
+         /* Object.keys(this.baseInfoForm.goodsParamsList).forEach((item) => {
+            console.warn(item.paramName)
+          });*/
+
+
 
           if (this.goodsId) {
             API_GOODS.editGoods(this.goodsId, this.baseInfoForm).then((res) => {