1、入驻，获取品牌信息接口更换；2、运费模块bug修改

src/api/module/entry.js

@@ -20,7 +20,7 @@ export function addMain(data) {
 // 获取品牌信息
 export function getBrandsInf(query) {
   return request({
-    url: '/local/brands',
+    url: '/local/shopbrand',
     method: 'get',
     params: query
   });

src/views/entry/fillBrandInf.vue

@@ -486,9 +486,9 @@
         // 初始化
         //this.resetForm();
         getBrandsInf().then(res => {
-          console.log("获取品牌：",res);
-          if(res.code === 1 && res.data.data) {
-            this.brandForm = res.data.data[0];
+          console.log("获取品牌：",res.data);
+          if(res.code === 1 && res.data) {
+            this.brandForm = res.data[0];
             // 商标logo图片处理
             let brandList = {};
             let brandArr = [];

src/views/system/freight/freight_list/indexbtn.vue

@@ -207,13 +207,7 @@ export default {
         IsDefault: 0,
         ChargeType: 0,
         Dispatching: [
-          {
-            a: "全国",
-            f: 500,
-            fp: 10,
-            n: 100,
-            np: 5,
-          }
+          { a: "全国", f: 500, fp: 10, n: 100, np: 5 }
         ],
         Disdispatching: "",
         Publish: 0,
@@ -226,9 +220,13 @@ export default {
   },
   methods: {
     btndisabled(){
-      console.log(this.checkList , this.btnindex)
+      let checkListString = '';
       if(this.btnindex == 99){
-        this.goodsDate.Disdispatching = this.checkList.join()
+        checkListString = this.checkList.join();
+        if(checkListString.substr(0,1) === ',') {
+          checkListString = checkListString.slice(1);
+        }
+        this.goodsDate.Disdispatching = checkListString;
       }else{
          this.goodsDate.Dispatching[this.btnindex].a = this.checkList.join()
       }
@@ -241,6 +239,7 @@ export default {
 
     },
     opendias(type, i, index) {
+
       this.goodsDate.Dispatching.forEach((element) => {
         let arrd = element.a.split(',')
         for(let i=0;i<arrd.length;i++){
@@ -268,9 +267,13 @@ export default {
       this.dialogVisible = true;
     },
     handleinfomationclick() {//提交
-      this.goodsDate.Disdispatching.forEach(item=>{
+      //debugger;
+
+      this.goodsDate.Dispatching.forEach(item=>{
         item.np = Number(item.np*100).toFixed()
       })
+
+      //console.log("提交前的数据：",this.goodsDate);
       addFreight(this.goodsDate).then(response => {
         console.log(296,response);
         if(response.data.code === 1) {

src/views/system/goods/add/index.vue

@@ -3,50 +3,49 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span>{{title}}</span>
-        <el-button style="float: right; " icon="el-icon-check" size="mini" type="primary" @click="submitForm">提 交</el-button>
+        <el-button style="float: right; " icon="el-icon-check" size="mini" type="primary" @click="submitForm">提 交
+        </el-button>
       </div>
       <el-tabs type="border-card">
         <el-tab-pane label="商品信息">
-        <Goodsinfomation  :infomationdatas='infomationdata' @infomationclick='infomationclick' />
+          <Goodsinfomation :infomationdatas='infomationdata' @infomationclick='infomationclick'/>
         </el-tab-pane>
         <el-tab-pane label="商品图片">
-        <Goodsimg :imgdata='imgdate' @imgclicks='imgclick' />
+          <Goodsimg :imgdata='imgdate' @imgclicks='imgclick'/>
         </el-tab-pane>
         <el-tab-pane label="商品规格">
-        <Guide  :guidedata='guidedate' @guideclicks='guideclick' />
+          <Guide :guidedata='guidedate' @guideclicks='guideclick'/>
         </el-tab-pane>
         <el-tab-pane label="商品参数">
-    <Goodsparameter :parameterdata='parameterdata' @parameterclicks='parameterclick' />
+          <Goodsparameter :parameterdata='parameterdata' @parameterclicks='parameterclick'/>
         </el-tab-pane>
-</el-tabs>
-</el-card>
+      </el-tabs>
+    </el-card>
   </div>
 </template>
 
 <script>
-import { getGoods } from '@/api/module/goods'
-import descartes from "@/utils/dikaerjs.js";
-import Guide from './components/guide'
-import Goodsinfomation from './components/goodsinfomation'
-import Goodsimg from './components/goodsimg'
-import Goodsparameter from './components/goodsparameter'
-import { addGoods } from '@/api/module/goods'
-export default {
+  import {getGoods} from '@/api/module/goods'
+  import descartes from "@/utils/dikaerjs.js";
+  import Guide from './components/guide'
+  import Goodsinfomation from './components/goodsinfomation'
+  import Goodsimg from './components/goodsimg'
+  import Goodsparameter from './components/goodsparameter'
+  import {addGoods} from '@/api/module/goods'
+  export default {
     name: 'goods',
     data() {
       return {
-     goodsOnsale:0,
+        goodsOnsale: 0,
         loading: false,
-     title:"添加新商品",
-     imgdate:[],
-     guidedate:{},
-     parameterdate:{},
-     params:{}
-
+        title: "添加新商品",
+        imgdate: [],
+        guidedate: {},
+        parameterdate: {},
+        params: {}
       }
-
     },
-    components:{
+    components: {
       Guide,
       Goodsinfomation,
       Goodsimg,
@@ -56,9 +55,9 @@ export default {
       this.getParams()
     },
     methods: {
-    getParams(){
+      getParams() {
         var goodsId = this.$route.query.goodsId
-      if(goodsId>0){
+        if (goodsId > 0) {
           this.title = "编辑商品信息"
           this.genGoodsInfo(goodsId)
         }
@@ -70,41 +69,40 @@ export default {
       genGoodsInfo(goodsId) {
         const goods_id = goodsId
         getGoods(goods_id).then(response => {
-        console.log("商品详情",response.data.data)
-        this.goodsOnsale=response.data.data.isOnsale,
+          console.log("商品详情", response.data.data)
+          this.goodsOnsale = response.data.data.isOnsale;
             this.infomationdata = {
-           goodsId:response.data.data.goodsId,
-           goodsName:response.data.data.goodsName,
-           categoryId:response.data.data.categoryId ,
-           scPrice:response.data.data.scPrice/100,
-           price:response.data.data.price/100,
-           jsPrice:response.data.data.jsPrice/100,
-           goodsNowStock:response.data.data.goodsNowStock,
-           producingArea:response.data.data.producingArea,
-           weight:response.data.data.weight,
-           unit:response.data.data.unit,
-           goodsBrand:response.data.data.goodsBrand,
-           wlPrice:response.data.data.wlPrice,
-           Delayompensate:response.data.data.Delayompensate,
-           aftersaleTime:response.data.data.aftersaleTime,
-           mark:response.data.data.mark,
-           servicetagsTags:response.data.data.ServiceagsTags.split(','),
-           goodsNowStock:response.data.data.goodsNowStock,
-           description:response.data.data.description,
-           freightId:response.data.data.freightId,
-           outGoodsId:response.data.data.outGoodsId,
+              goodsId: response.data.data.goodsId,
+              goodsName: response.data.data.goodsName,
+              categoryId: response.data.data.categoryId,
+              scPrice: response.data.data.scPrice / 100,
+              price: response.data.data.price / 100,
+              jsPrice: response.data.data.jsPrice / 100,
+              goodsNowStock: response.data.data.goodsNowStock,
+              producingArea: response.data.data.producingArea,
+              weight: response.data.data.weight,
+              unit: response.data.data.unit,
+              goodsBrand: response.data.data.goodsBrand,
+              wlPrice: response.data.data.wlPrice,
+              Delayompensate: response.data.data.Delayompensate,
+              aftersaleTime: response.data.data.aftersaleTime,
+              mark: response.data.data.mark,
+              servicetagsTags: response.data.data.ServiceagsTags.split(','),
+              description: response.data.data.description,
+              freightId: response.data.data.freightId,
+              outGoodsId: response.data.data.outGoodsId,
             };
           this.guidedate = response.data.data.goodsSpecs
           this.guidedate["goodsSpec"] = response.data.data.goodsSpec
           this.parameterdata = response.data.data.Params
           this.imgdate = {
-           "ruleFormdialogImageUrl":response.data.data.image,
-            "ruleFormdialogImageUrlplus":response.data.data.defaultImage
+            "ruleFormdialogImageUrl": response.data.data.image,
+            "ruleFormdialogImageUrlplus": response.data.data.defaultImage
           }
 
         });
       },
-    info(){
+      info() {
         addgoods(this.listQuery).then(response => {
           this.list = response.data.items
           this.total = response.data.total
@@ -112,125 +110,143 @@ export default {
         })
       },
       //商品信息
-    infomationclick(type){
-      // this.Goodsinfomation = type
+      infomationclick(type) {
         Object.assign(this.params, type);
-      console.log(111111)
-      // console.log(this.params,9999)
       },
       //商品图片
-    imgclick(type){
+      imgclick(type) {
         type.ruleFormdialogImageUrlplus //主图
         type.ruleFormdialogImageUrl //多图
         let img = []
-      type.ruleFormdialogImageUrl.forEach((res,index)=>{
+        type.ruleFormdialogImageUrl.forEach((res, index) => {
           img.push(res.url)
         })
         this.params["imgs"] = img
         this.params["defaultImg"] = type.ruleFormdialogImageUrlplus[0].url
       },
       //规格
-    guideclick(type,specsGroup){
+      guideclick(type, specsGroup) {
         this.params["specs"] = type
         this.params["specsGroup"] = specsGroup
-      console.log(333333)
-       console.log("type",type)
-       console.log("specsGroup",specsGroup)
       },
       //参数
-    parameterclick(type){
+      parameterclick(type) {
         this.params["goodsPram"] = type
-      console.log(44444)
-       console.log(type)
       },
 
       /** 确定按钮 */
       submitForm() {
-      this.loading=true
+        this.loading = true;
+        //-------------------------
+        if (this.goodsOnsale) {
+          var redUrl = '/system/goods/onsale'
+        } else {
+          var redUrl = '/system/goods/offsale'
+        }
+        this.$router.push({
+          path: redUrl
+        });
+
+        this.loading = false;
+        return;
+
+
+        //------------------------
         addGoods(this.params).then(response => {
-       this.loading=false
-       if(response.data.code == 1){
+          if (response.data.code == 1) {
             this.$message({
               message: response.data.msg,
               type: 'success'
             });
-         if(this.goodsOnsale){
+            if (this.goodsOnsale) {
               var redUrl = '/system/goods/onsale'
-         }else{
+            } else {
               var redUrl = '/system/goods/offsale'
             }
             this.$router.push({
               path: redUrl
-
             });
-       }else{
+          } else {
             this.$message.error(response.data.msg);
-
           }
-
+          this.loading = false;
         });
 
       },
     }
-}
+  }
 </script>
 <style scoped>
-.el-tabs {
-  height:calc(100% - 60px);
-}
-ul,li{
+  .el-tabs {
+    height: calc(100% - 60px);
+  }
+
+  ul, li {
     list-style: none;
     margin: 0;
-  padding:0;
-}
-.ullist{
+    padding: 0;
+  }
+
+  .ullist {
     border: 1px solid #e7eaec;
     padding: 10px;
     margin-bottom: 10px;
-}
-.el-input-group{
-  width:calc(100% - 60px);
-}
-.addbtn{
+  }
+
+  .el-input-group {
+    width: calc(100% - 60px);
+  }
+
+  .addbtn {
     background-color: #5bc0de !important;
     color: #fff !important;
-  border-radius:0 4px 4px 0;
-
-}
-.app-container{
-  height:100%;
-}
-.box-card{
-  height:100% ;
-}
-.box-card /deep/ .el-card__body{
-  height:100%;
+    border-radius: 0 4px 4px 0;
+
+  }
+
+  .app-container {
+    height: 100%;
+  }
+
+  .box-card {
+    height: 100%;
+  }
+
+  .box-card /deep/ .el-card__body {
+    height: 100%;
     overflow-x: hidden;
     overflow-y: scroll;
-}
-.el-tabs{
-  height:calc(100% - 35px);
-}
-.el-tabs /deep/ .el-tabs__content{
- height:calc(100% - 39px);
+  }
+
+  .el-tabs {
+    height: calc(100% - 35px);
+  }
+
+  .el-tabs /deep/ .el-tabs__content {
+    height: calc(100% - 39px);
     overflow-y: scroll;
-}
-.eldelbtn{
-  height:30px;
-  padding:5px 20px !important;
+  }
+
+  .eldelbtn {
+    height: 30px;
+    padding: 5px 20px !important;
     margin-left: -3px;
-}
-.childlist{
+  }
+
+  .childlist {
     margin-top: 10px;
-}
-.el-button--medium {
+  }
+
+  .el-button--medium {
     padding: 10px 12px;
   }
-  .dfbtn{
+
+  .dfbtn {
     position: relative;
   }
-.goods .el-tabs__content{
-    height:100%;
+
+  .goods .el-tabs__content {
+    height: 100%;
     overflow-y: scroll;
   }
 </style>