Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/CommodityMan/goodsListEdit.vue

@@ -113,6 +113,16 @@
                     <a v-if="addMsg.VideoAddress != ''" class="blue noline" :href="addMsg.VideoAddress"
                       target="_blank">视频链接</a>
                   </el-form-item>
+                  <el-form-item label="视频填充方式">
+                    <el-tooltip class="item" effect="dark" content="建议横屏使用默认，竖屏使用填充" placement="top"
+                      style="position: absolute;left: -22px;top:12px">
+                      <i class="el-tooltip el-icon-info"></i>
+                    </el-tooltip>
+                    <el-radio-group v-model="addMsg.VideoType">
+                      <el-radio :label="1">填充</el-radio>
+                      <el-radio :label="0">默认</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
                   <el-form-item label="自定义分享标题">
                     <el-tooltip class="item" effect="dark" content="分享给好友时，作为商品名称" placement="top"
                       style="position: absolute;left: -22px;top:12px">
@@ -155,14 +165,14 @@
                       :inactive-value="2">
                     </el-switch>
                   </el-form-item>
-                  <el-form-item label="自动上架时间"  >
-                    <el-date-picker size="small" v-model="addMsg.ShelvesDate" default-time="12:00:00" value-format="yyyy-MM-dd HH:mm:ss"
-                      type="datetime" placeholder="选择日期时间">
+                  <el-form-item label="自动上架时间">
+                    <el-date-picker size="small" v-model="addMsg.ShelvesDate" default-time="12:00:00"
+                      value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期时间">
                     </el-date-picker>
                   </el-form-item>
-                  <el-form-item label="自动下架时间"  >
-                    <el-date-picker size="small" v-model="addMsg.DownDate" default-time="12:00:00" value-format="yyyy-MM-dd HH:mm:ss"
-                      type="datetime" placeholder="选择日期时间">
+                  <el-form-item label="自动下架时间">
+                    <el-date-picker size="small" v-model="addMsg.DownDate" default-time="12:00:00"
+                      value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期时间">
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
@@ -404,8 +414,7 @@
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="发货仓库">
-                    <el-input v-model="addMsg.SendArea" size="small" placeholder="请输入内容"
-                              class="input-with-select">
+                    <el-input v-model="addMsg.SendArea" size="small" placeholder="请输入内容" class="input-with-select">
                     </el-input>
                   </el-form-item>
                   <el-form-item label="商品服务">
@@ -1162,7 +1171,8 @@
           },
           ShelvesDate: '', //自动上架时间
           DownDate: '', //自动下架时间
-          SendArea:'',//发货仓库
+          SendArea: '', //发货仓库
+          VideoType: 1 //视频填充方式(0默认，1-填充)
         },
         predefineColors: [
           '#000000',
@@ -1526,7 +1536,8 @@
         let obj = {
           Name: "",
           SpecificationValueList: [],
-          Sort:that.SpecificationList.length>0? that.SpecificationList[that.SpecificationList.length-1].Sort + 1: that.SpecificationList.length + 1,
+          Sort: that.SpecificationList.length > 0 ? that.SpecificationList[that.SpecificationList.length - 1].Sort +
+            1 : that.SpecificationList.length + 1,
           Id: 0,
           EnabledImage: 2
         };
@@ -1539,7 +1550,8 @@
           Image: "",
           Name: "",
           // Sort: item.SpecificationValueList.length + 1
-          Sort: item.SpecificationValueList.length>0 ? item.SpecificationValueList[item.SpecificationValueList.length-1].Sort + 1:item.SpecificationValueList.length + 1
+          Sort: item.SpecificationValueList.length > 0 ? item.SpecificationValueList[item.SpecificationValueList
+            .length - 1].Sort + 1 : item.SpecificationValueList.length + 1
         };
         this.SpecificationList[index].SpecificationValueList.push(obj);
       },
@@ -1567,12 +1579,12 @@
             arr.push(item);
           }
         });
-        arr.forEach(x=>{
-          x.Id=0;
-          x.NewSpecList.forEach(j=>{
+        arr.forEach(x => {
+          x.Id = 0;
+          x.NewSpecList.forEach(j => {
             j.Id = 0
           });
-          x.SpecificationValueList.forEach(j=>{
+          x.SpecificationValueList.forEach(j => {
             j.Id = 0
           })
         });

src/plug/index.js

@@ -57,22 +57,22 @@ export default {
         let domainUrl = '';
         let javaUrl = 'http://192.168.2.65:8018';
 
-        domainUrl = "http://192.168.0.116:8200";
+        domainUrl = "http://192.168.1.27:8200";
         //domainUrl = "https://localhost:5001";
-        let vtUploadUrl = "http://192.168.2.214:8120";
-        let vtViewUrl = "http://192.168.2.214:8130";
+        let vtUploadUrl = "http://192.168.1.214:8120";
+        let vtViewUrl = "http://192.168.1.214:8130";
 
         let locationName = window.location.hostname;
         if (locationName.indexOf('testmall.oytour') !== -1) {
           domainUrl = "https://mallapi.oytour.com";
           javaUrl = "http://property.oytour.com";
           vtUploadUrl = "http://upload.oytour.com";
-          vtViewUrl = "http://imgfile.oytour.com";
+          vtViewUrl = "https://imgfile.oytour.com";
         } else if (locationName.indexOf('oytour') !== -1) {
           domainUrl = "https://mallapi.oytour.com";
           javaUrl = "http://property.oytour.com";
           vtUploadUrl = "http://upload.oytour.com";
-          vtViewUrl = "http://imgfile.oytour.com";
+          vtViewUrl = "https://imgfile.oytour.com";
         }
         var obj = {
           //主地址npm