Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/zygoods/modules/ZyGoodsForm.vue

@@ -56,6 +56,7 @@
           <a-col :span="24">
             <a-form-model-item label="商品视频" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsVideo">
               <j-upload v-model="model.goodsVideo"   ></j-upload>
+              <video v-if="model.goodsVideo" :src="video" style="border:1px solid #d9d9d9;width:100%;" :autoplay="autoplay"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -127,6 +128,7 @@
         lx:'zy_cloths_type ,type_name,id',
         ks:'zy_cloths_style,style_names,id',
         xh:'zy_style_model,model_number,id',
+        autoplay:true,
         model:{
             customized:0,
             recommend:0,
@@ -191,6 +193,9 @@
       formDisabled(){
         return this.disabled
       },
+      video(){
+        return `${window._CONFIG['domianURL']}/sys/common/static/${this.model.goodsVideo}`
+      },
     },
     created () {
        //备份model原始值