Merge branch 'dev-market-20200813' of...

Merge branch 'dev-market-20200813' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-market-20200813

src/views/goods/create-good.vue

 <template>
   <div class="create-shop-wrapper">
-    <bread-crumb :curmbFirst="curmbFirst"></bread-crumb>
+    <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :curmbThird="curmbThird" :jumPathThird="jumPathThird"></bread-crumb>
     <div class="create-shop-content screenSet" id="screenSet">
       <el-row class="step-content">
         <el-col :span="20">
@@ -382,7 +382,7 @@
                     <span class="sp sp-c">{{formData.goodsStock}}</span>
                     <span class="sp sp-r" @click="changeStock(2)"><i class="el-icon-plus"></i></span>
                   </div>
-                 <!-- <p class="upload-message" v-if="!isgoodStock">请上传商品头图</p> -->
+                 <p class="error-message" v-if="!isgoodStock">库存不能为0</p>
                  <!-- <el-input
                       size="small"
                       v-model="formData.name"
@@ -485,6 +485,9 @@
           }],
         stockDio:false,
         curmbFirst: '云鹊店铺',
+        curmbSecond: '商品管理',
+        curmbThird: '编辑商品',// /live-manage?id=
+        jumPathThird: '',
         isgoodsImages:true,
         isSpecification_url:true,
         title:'',
@@ -634,7 +637,10 @@
       vm = this;
 
       const {id, storeId} = this.$route.query
+      this.jumPathThird = '/goods-manage?storeId='+storeId
+      //this.jumPathThird = '/create-good?id=add&storeId=46'
       this.title = id == 'add' ? '新增商品' : '编辑商品'
+      this.curmbThird = this.title
       this.formData.storeId = Number(storeId) || 0;
       this.getLever(0,1)
       dosageAll().then((res)=>{
@@ -682,6 +688,7 @@
           this.fileGoodsList = this.getImges(goodsList[0].goodsImgList,1)
           this.fileIntrList = this.getImges(goodsList[0].medicImgList,2)
           this.isMedic = this.formData.goodsType == 5 ? true : false
+          this.formData.stock = this.formData.goodsStock
           if(this.isMedic){
             this.getLever(5,2)
           }
@@ -847,6 +854,7 @@
         this.formData.categoryId = this.formData.goodsType
         this.formData.otc = this.formData.otc1 == 1 ? true : false
         this.isgoodStock = this.formData.goodsStock > 0 ? true : false
+        console.log(this.isgoodStock)
         if(this.isMedic){
           if(!this.isgoodsImages){
             return;
@@ -855,6 +863,9 @@
             return;
           }
         }
+        if(!this.isgoodStock){
+          return;
+        }
 
         this.$refs[formName].validate((valid) => {
           if (valid) {
@@ -1102,7 +1113,10 @@
       top: 11px;
       color: #f56c6c;
     }
-
+    .error-message{
+      font-size: 12px;
+      color: #f56c6c;
+    }
     .upload-message {
       position: absolute;
       left: 0;