云仓2.5打包

dist/static/js/chunk-2f2393fa.52eaad38.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2f2393fa"],{"47af":function(t,s){t.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDYuMC1jMDAyIDc5LjE2NDQ4OCwgMjAyMC8wNy8xMC0yMjowNjo1MyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIyLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjM4MTU5MkY0OTFFQjExRUJBQkE3REQ0N0VCRUQzQzM1IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjM4MTU5MkY1OTFFQjExRUJBQkE3REQ0N0VCRUQzQzM1Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MzgxNTkyRjI5MUVCMTFFQkFCQTdERDQ3RUJFRDNDMzUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MzgxNTkyRjM5MUVCMTFFQkFCQTdERDQ3RUJFRDNDMzUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz7L2yVbAAAGLklEQVR42tRba2wU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"},"83f1":function(t,s,i){"use strict";i.r(s);var c=function(){var t=this,s=t.$createElement,c=t._self._c||s;return c("div",{staticClass:"to-review"},[c("div",{staticClass:"logo-bg"},[t._e()]),t._v(" "),c("el-card",{staticClass:"box-card"},[c("div",{staticClass:"clearfix steps",attrs:{slot:"header"},slot:"header"},[c("el-steps",{attrs:{active:3,"align-center":"","finish-status":"success","process-status":"error"}},[c("el-step",{attrs:{title:"填写主体信息"}}),t._v(" "),c("el-step",{attrs:{title:"填写品牌信息"}}),t._v(" "),c("el-step",{attrs:{title:"填写店铺信息"}}),t._v(" "),c("el-step",{attrs:{title:"提交入驻审核"}})],1)],1),t._v(" "),c("div",{staticClass:"main"},[c("div",{staticClass:"main-con"},[c("p",[c("img",{attrs:{src:i("47af"),alt:""}})]),t._v(" "),c("p",[t._v("非常抱歉，您的资料审核不通过！")]),t._v(" "),c("p",[t._v("不通过原因："+t._s(t.msg)+"！请您重新提交认证资料！")]),t._v(" "),c("p",[t._v("如果您有其它的问题，可以拔打我们的服务电话与我们联系")]),t._v(" "),c("p",{staticStyle:{"padding-top":"40px"}},[c("el-button",{attrs:{type:"primary"},on:{click:t.reSubmit}},[t._v("重新提交")])],1)])])])],1)},e=[],a={name:"ReviewFail",data:function(){return{msg:"具体原因，请联系售后"}},mounted:function(){this.$route.params.msg&&(this.msg=this.$route.params.msg)},methods:{reSubmit:function(){this.$router.push({path:"/process"})}}},A=a,n=(i("f037"),i("2877")),l=Object(n["a"])(A,c,e,!1,null,"038cd2fa",null);s["default"]=l.exports},b423:function(t,s,i){},f037:function(t,s,i){"use strict";i("b423")}}]);
\ No newline at end of file

dist/static/js/chunk-792fc926.c82f674a.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-792fc926"],{a07f:function(t,e,i){},e4dd:function(t,e,i){"use strict";i.r(e);var A=function(){var t=this,e=t.$createElement,A=t._self._c||e;return A("div",{staticClass:"to-review"},[A("div",{staticClass:"logo-bg"},[t._e()]),t._v(" "),A("el-card",{staticClass:"box-card"},[A("div",{staticClass:"clearfix steps",attrs:{slot:"header"},slot:"header"},[A("el-steps",{attrs:{active:3,"align-center":"","finish-status":"success"}},[A("el-step",{attrs:{title:"填写主体信息"}}),t._v(" "),A("el-step",{attrs:{title:"填写品牌信息"}}),t._v(" "),A("el-step",{attrs:{title:"填写店铺信息"}}),t._v(" "),A("el-step",{attrs:{title:"提交入驻审核"}})],1)],1),t._v(" "),A("div",{staticClass:"main"},[A("div",{staticClass:"fuck"},[A("p",[A("img",{attrs:{src:i("e9f2"),alt:""}})]),t._v(" "),A("p",[t._v("资料已提交，工作人员审核中。。。")]),t._v(" "),A("p",[t._v("您的资料已经提交审核，审核周期为1-3个工作日，请您耐心等待审核结果。")]),t._v(" "),A("p",[t._v("如果您有其它的问题，可以拔打我们的服务电话与我们联系！")])])])])],1)},c=[],l={name:"ReviewSuccess",data:function(){return{}}},a=l,s=(i("fc37"),i("2877")),n=Object(s["a"])(a,A,c,!1,null,"61915260",null);e["default"]=n.exports},e9f2:function(t,e){t.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDYuMC1jMDAyIDc5LjE2NDQ4OCwgMjAyMC8wNy8xMC0yMjowNjo1MyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIyLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJBRDQ3NzE4OTFFQjExRUJBN0JEQjU3QzUxQ0Q3QkQzIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJBRDQ3NzE5OTFFQjExRUJBN0JEQjU3QzUxQ0Q3QkQzIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkFENDc3MTY5MUVCMTFFQkE3QkRCNTdDNTFDRDdCRDMiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkFENDc3MTc5MUVCMTFFQkE3QkRCNTdDNTFDRDdCRDMiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4rxvAYAAAE5UlEQVR42tybe2wUVRTGL0tRIA2KFChS/kABaQRaEggEhSYIgiKgtShYJBKqBAhKRINA9Z8uAlEeTWxV5BGFNghIwUYqEkhBjBFNCNhYHoqChmoiqKFNaGwJ38meqePd2e487p2d4Ut+SXc6c3e+nTtzzzn3Tof843cLjeoDBoIsMIg/pzOkRnAN/A7OgN/AT6BB1wmlaWiTjOWDB8AIkOnweDL/HTgO9oLzKk+ug6IrfDuYB54EeaCjovNrBbVgJ/gQ/Ou1wYgCo6+AOlAGxis0K7ith8AH4HuwFHRKleGnwWnwFhgg9Os+8DY4xT3JN8P9wH7uZoOE/8oGe/j+7qPb8FTwDZgmUq8n+Fwm6TL8IvjUza+qUdTbPgcLVBuOglIRXJWDlaoMR+02lmLReRZ7NbwkJGYNlfCt58rwRLBBhE+lPHY7MpzJw05YRefey4nh7eCuEBvOAFvtGn4WTBDh1xRQkMxwFw7fbhVtlGNv2fDLifp+SNUXLE5kOJ0zn6DrOlgNLtjcfzn33DjDc8GdATdbA3LBCvAM58t2HmCFVoYLA26WcuFHwVn+nOvg2DjD94ORATVKJZ4xYL1p2zvgPQfFhgdFrLbWZjhfQfVDhygTGgW+Nm37CCxy2E4ap5NtJvMCaJau4iPgL9O23RwnuNE4w3BmALvzq/JwImJFvAIPbY4GPehS54BuATJbBLZI294Eczy22wNkk+H+ATJLT9NKadt8HktV6F7q0vcE2OxEfhqrUn8y3DsAZudYmKV61T7F35NJhjun2OxiTkdlVYCuir8rnQx3T6HZ13n4kUWx8lgN33dHREHAsZMDl18cHkf3ZtRiO8UEr2n6gVvI7BUPDXwGZoEqDv9qbB53QFjXkml43KWxRzVGON1ya/Yx0+cGDu6jSY47x5mOlco05+NNEeFu8nm7ZFa+Lyn8a7L4H013Pg7+sfgf/VizNT8zGsjwzy4OrE7y/x380KmTtj8H6i32pwR9kw8PyYsRB5UDIWUsLyTZ5ySb3sOfN1uMtYZKuByjPdVM46vQKP5bd2FHNHa/z/Hp6nb2+xvM4MCiKsE+uZzc69ZVcMa4h0+4bISC+lKbPeJaO2mgH6Kc+ooxBh/10BDN5Xzicjw3Fr/4oS/NBQCa0W/10Fg+/2g9HRzTVfg3BdsiYnPbbYZp3cS3HhulutExB+kmRVNZPl7deiF1w0oFDQ/me2W4jWR8qfBPFcYfZsPbwJ8KGqd08yvBNaQEWqYhE0qkyxwXxBmmoWmdoi+hQOKQ4EqhpAyuYviltaDZyjBpg1C3zvE2EVtaVCRtf0n4V0O7BN41b5ANN/MJqRStojMvm1joc3Hhf8sVrRaXUu33C/Cwwi+mDOqGiM0U+DXRXm0MRckMk6ig9oPDcdVOVOaX/hAJyrqJoiN6Wj8lwqsZHMfbNkyqFfHV/zBokRFGOjVsBPYlITJLD8fy9nawE/C/AVaFwGyxnedExEFjSwJsdqHdi+IkpaPMZprQ+AKGC/0KJsvBhSrDxtg2ymp8S4Gq+FwOOjko4vJXnQ5miljJ1W9RmlfAObjj3uZl1uFjMEzEJq9/9MEoLWahZVU5XGFxJa/TLBR708q9ITz+HfFYObGqVBwGz4OhnM15epVH1YtazTz+EYF+UUvHm2l0X6/hvwP3Kt5NAQYA/pvkv1BL/nsAAAAASUVORK5CYII="},fc37:function(t,e,i){"use strict";i("a07f")}}]);
\ No newline at end of file

src/api/module/brand/brand.js

@@ -9,7 +9,7 @@ export function getBrandsInf(query) {
 }
 
 // 新增品牌
-export function addBrand(data) {
+export function addBrandData(data) {
   return request({
     url: '/local/brands',
     method: 'post',
@@ -17,12 +17,29 @@ export function addBrand(data) {
   });
 }
 
+// 删除 品牌
+export function delBrandData(data) {
+  return request({
+    url: '/local/brand/deleteBrand',
+    method: 'post',
+    data: data
+  });
+}
+
 // 获取品牌详情
-export function getDetails (id) {
+// export function  (id) {
+//   return request({
+//     url: '?id='+id,
+//     method: 'get'
+//   })
+// }
+
+export function getDetails(query) {
   return request({
-    url: '/local/brandsInfo?id='+id,
-    method: 'get'
-  })
+    url: '/local/brandsInfo',
+    method: 'get',
+    params: query
+  });
 }
 
 // 修改品牌信息

src/api/module/entry.js

 import request from '@/utils/request';
+// 获取用户详细信息
+export function getInfo(param) {
+  return request({
+    url: '/system/index/getInfo',
+    method: 'get',
+    params: param
+  })
+}
 
 // 获取主体信息
 export function getMainInf(query) {
@@ -69,14 +77,6 @@ export function upLoadImg (data) {
   });
 }
 
-// old
-// export function upLoadImg (data) {
-//   return request({
-//     url: '/system/goods/uploadImg',
-//     method: 'post',
-//     data: data
-//   });
-// }
 // 获取商品类目
 export function getGoodsType(query) {
   return request({
@@ -85,3 +85,30 @@ export function getGoodsType(query) {
     params: query
   });
 }
+
+// 营业执照 图片识别信息
+export function getLicenseImgInfoData(query) {
+  return request({
+    url: '/local/check/businessLicense',
+    method: 'get',
+    params: query
+  });
+}
+
+// 身份证 正/反 图片识别信息
+export function getIdcardImgInfoData(query) {
+  return request({
+    url: '/local/check/idCard',
+    method: 'get',
+    params: query
+  });
+}
+
+// 查询 入驻类目资质
+export function getUploadQualificationListData(query) {
+  return request({
+    url: '/local/qualification/list',
+    method: 'get',
+    params: query
+  });
+}

src/store/modules/user.js

@@ -11,11 +11,11 @@ const user = {
     roles: [],
     permissions: [],
     ssourl:'',
-    // 客户信息中的，入驻审核状态：0 是默认值
-    // 0-未提交未审核
-    // 1-审核成功
-    // 2-审核中
-    // 3-审核失败
+    // 客户信息中，入驻审核状态
+    // 0-未提交信息；
+    // 1-审核成；
+    // 2-审核中；
+    // 3-审核拒绝；
     applyState: -1,
   },
 
@@ -107,7 +107,7 @@ const user = {
           }
           commit('SET_NAME', user.Username)
           commit('SET_SELLERID', user.SellerId)
-          commit('SET_APPLYSTATE', user.state) // 商户入驻后的审核状态
+          commit('SET_APPLYSTATE', user.state) // 记录 商户入驻后的审核状态
           commit('SET_AVATAR', avatar)
           resolve(res)
         }).catch(error => {

src/views/entry/newyuncang.vue

@@ -801,59 +801,6 @@
 </script>
 
 <style lang="scss" type="text/stylus" scoped>
-  /* 手机竖屏时，可视区域的最大宽度为 480 */
-  //@media screen and (max-width: 480px) and (orientation: portrait) {
-  //  .pc-content {
-  //    display: none!important;
-  //  }
-  //  .mobile-show {
-  //    display: none!important;
-  //  }
-  //}
-
-  /* 手机横屏和pc最小宽度为 812px */
-  /* 手机横屏 812px 为iphoneX 横屏的设备独立像素*/
-  //@media screen and (max-width: 961px) and (orientation: landscape) {
-  //  .pc-content {
-  //    display: none !important;
-  //  }
-  //
-  //  .mobile-content {
-  //    display: block!important;
-  //    font-size: 0.16rem;
-  //  }
-  //}
-
-  @media screen and (min-width: 750px) {
-    html {
-      font-size: 100px;
-    }
-  }
-
-  @media screen and (min-width: 640px) and (max-width: 749) {
-    html {
-      font-size: 85.333px;
-    }
-  }
-
-  @media screen and (min-width: 414px) and (max-width: 639) {
-    html {
-      font-size: 61.333px;
-    }
-  }
-
-  @media screen and (min-width: 375px) and (max-width: 413) {
-    html {
-      font-size: 50px;
-    }
-  }
-
-  @media screen and (min-width: 320px) and (max-width: 374) {
-    html {
-      font-size: 42.6667px;
-    }
-  }
-
   @media screen and (max-width: 961px) {
     .pc-content {
       display: none !important;

src/views/entry/reviewFail.vue

@@ -6,9 +6,8 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix steps">
         <el-steps :active="3" align-center finish-status="success" process-status="error">
-<!--          <el-step title="签署入驻协议"></el-step>-->
+          <el-step title="注册账号"></el-step>
           <el-step title="填写主体信息"></el-step>
-          <el-step title="填写品牌信息"></el-step>
           <el-step title="填写店铺信息"></el-step>
           <el-step title="提交入驻审核"></el-step>
         </el-steps>
@@ -30,6 +29,7 @@
 </template>
 
 <script>
+  import { getInfo } from '@/api/module/entry';
   export default {
     name: "ReviewFail",
     data() {
@@ -38,20 +38,31 @@
       }
     },
     created() {
-      // console.log(555,this.$store.state.user.applyState)
+      getInfo().then(res=> {
+        if (res.code == 1 && res.data.user) {
+          if (res.data.user.state == 1) {
+            this.$router.push({path: '/home/index'});
+          }
+          if (res.data.user.state == 2) {
+            this.$router.push({path: '/reviewing'})
+          }
+          if (res.data.user.state == 3) {
+            this.$router.push({path: '/reviewFail'});
+          }
+        } else {
+          this.$router.push({path: '/reviewFail'});
+        }
+      });
+    },
+    mounted() {
       if(this.$route.params.msg) {
         this.msg = this.$route.params.msg;
       }
-      // 刷新当前页面，如果sys操作，审核通过，那么这个applyState状态值会变为 1，代表审核通过，可以直接跳转登录页面,审核拒绝，则 为3，跳转到失败页面
-      if (this.$store.state.user.applyState == 1) {
-        this.$router.push({path: '/home/index'});
-      }
-      if (this.$store.state.user.applyState == 2) {
-        this.$router.push({path: '/reviewing'});
-      }
-      if (this.$store.state.user.applyState == 3) {
-        this.$router.push({path: '/reviewFail'});
-      }
+      /** 禁止 浏览器 后退 */
+      history.pushState(null,null,document.URL);
+      window.addEventListener('popstate', function () {
+        history.pushState(null, null, document.URL);
+      })
     },
     methods: {
       // 重新提交审核

src/views/entry/reviewing.vue

@@ -6,9 +6,8 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix steps">
         <el-steps :active="3" align-center finish-status="success">
-<!--          <el-step title="签署入驻协议" ></el-step>-->
+          <el-step title="注册账号" ></el-step>
           <el-step title="填写主体信息" ></el-step>
-          <el-step title="填写品牌信息" ></el-step>
           <el-step title="填写店铺信息" ></el-step>
           <el-step title="提交入驻审核" ></el-step>
         </el-steps>
@@ -19,7 +18,7 @@
             <img src="../../../public/images/entry/reviewSuccess.png" alt="">
           </p>
           <p>资料已提交，工作人员审核中。。。</p>
-<!--          <p>感谢您使用云仓！</p>-->
+          <p style="margin-top: 10px;">感谢您使用云仓！</p>
           <p>您的资料已经提交审核，审核周期为1-3个工作日，请您耐心等待审核结果。</p>
           <p>如果您有其它的问题，可以拔打我们的服务电话与我们联系！</p>
 <!--          <p>服务电话：4000-188-199</p>-->
@@ -36,7 +35,6 @@
       return {}
     },
     created() {
-      console.log(444,this.$store.state.user.applyState)
       // 刷新当前页面，如果sys操作，审核通过，那么这个applyState状态值会变为 1，代表审核通过，可以直接跳转登录页面,审核拒绝，则 为3，跳转到失败页面
       if (this.$store.state.user.applyState == 1) {
         this.$router.push({path: '/home/index'});
@@ -47,6 +45,13 @@
       if (this.$store.state.user.applyState == 3) {
         this.$router.push({path: '/reviewFail'});
       }
+    },
+    mounted() {
+      /** 禁止 浏览器 后退 */
+      history.pushState(null,null,document.URL);
+      window.addEventListener('popstate', function () {
+        history.pushState(null, null, document.URL);
+      })
     }
   }
 </script>

src/views/system/goods/add/components/goodsimg.vue

@@ -59,7 +59,7 @@
                 'image': function (value) {
                   if (value) {
                     // 触发input框选择图片文件
-                    document.querySelector('#file').value = '' // 清空是为了解决，联系上传同一张图片时，后续上传失效问题
+                    document.querySelector('#file').value = ''; // 清空是为了解决，连续上传同一张图片时，后续图片上传失效问题
                     document.querySelector('#file').click()
                   } else {
                     this.quill.format('image', false);

src/views/system/goods/add/components/goodsinfomation.vue

@@ -44,8 +44,8 @@
 <!--        <span class="tip-span ml20">关键词之间用逗号分开，最多可以添加5个</span>-->
       </el-form-item>
 
-      <el-form-item label="所属品牌：" prop="goods_brand">
-        <el-select v-model="goodsInfoForm.goods_brand" placeholder="请选择商品品牌" style="width: 420px;">
+      <el-form-item label="所属品牌：" prop="brand_id">
+        <el-select v-model="goodsInfoForm.brand_id" placeholder="请选择商品品牌" style="width: 420px;">
           <el-option
             v-for="item in brandOptions"
             :key="item.id"
@@ -169,6 +169,7 @@
           deliver_area: '',     // 发货地
           unit: '',             // 单位
           goods_brand: '',      // 品牌
+          brand_id: 0,          // 品牌id
           web_url: '',          // 外部链接
           out_goods_id: '',     // 商品编码
           imgs: []              // 商品图片
@@ -262,25 +263,16 @@
       },
       // 获取 商品品牌
       getBrands() {
-        getBrandsInf().then( res => {
-          if(res.data) {
-            this.brandOptions = res.data.data;
+        // 增加入参
+        let data = {
+          status: 1
+        }
+        getBrandsInf(data).then( res => {
+          if(res.code == 1 ) {
+            this.brandOptions = res.data.data ? res.data.data : [];
           }else {
             this.brandOptions = [];
           }
-
-          // let num_goods_brand = Number(this.goodsInfoForm.goods_brand);
-          //
-          // if( this.goodsInfoForm.goods_brand !== '') {
-          //   let result = this.brandOptions.find( item => {
-          //     return item.id === num_goods_brand;
-          //   });
-          //   //console.log(315,result)
-          //   if( result == undefined) {
-          //     this.goodsInfoForm.goods_brand = '';
-          //   }
-          // }
-
         });
       },
       /* 修改 商品分类 类目 */

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

@@ -178,13 +178,12 @@
               deliver_area: res.data.deliver_area,     // 发货地
               unit: res.data.unit,             // 单位
               goods_brand: res.data.goods_brand,      // 品牌
+              brand_id: res.data.brand_id,      // 品牌
               web_url: res.data.web_url,          // 外部链接
               out_goods_id: (res.data.out_goods_id == 0) ? '' : res.data.out_goods_id ,     // 商品编码
               imgs: res.data.imgs              // 商品图片
             }
             this.goodsinfodata.categoryStr = res.data.category_first_name + '/' + res.data.category_first_name + '/' + res.data.category_three_name;
-            // 发货地 需要 处理
-            // this.goodsinfodata.deliver_area = this.goodsinfodata.deliver_area === 0 ? '' : this.goodsinfodata.deliver_area;
 
             let arr = [];
             arr[0] = res.data.category_first_id;
@@ -505,13 +504,18 @@
         let spxxData = this.$refs.goodsInfo.goodsInfoForm;
         // 品牌处理  goods_brand
         let brandOptions = this.$refs.goodsInfo.brandOptions;
-        for(let bi = 0; bi < brandOptions.length; bi++) {
-          if( Number(spxxData.goods_brand) === Number(brandOptions[bi].id) ) {
-            spxxData.goods_brand = brandOptions[bi].brand_cn;
-            break;
+        debugger
+        // goods_brand
+        if (Array.isArray(brandOptions) && brandOptions.length > 0) {
+          for(let bi = 0; bi < brandOptions.length; bi++) {
+            if( Number(spxxData.goods_id) === Number(brandOptions[bi].id) ) {
+              spxxData.goods_brand = brandOptions[bi].brand_cn;
+              break;
+            }
           }
         }
 
+
         // 产地数据处理
         let areaOptions = this.$refs.goodsInfo.areaOptions;
         for(let ai = 0; ai < areaOptions.length; ai++) {