修改

src/components/CommodityMan/materialMan.vue

@@ -138,7 +138,7 @@
                     <div class="material-item material-upload">
                       <div class="app-upload" flex="main:center cross:center" style="width: 140px; height: 140px;">
                         <el-upload class="avatar-uploader" action=""
-                          accept="video/mp4,video/ogg,video/webm" :show-file-list="false" :http-request="UploadpdfFile"
+                          accept=".pdf,.PDF,.ppt,.PPT,.doc,.docx" :show-file-list="false" :http-request="UploadpdfFile"
                           multiple>
                           <i class="el-icon-upload"></i>
                         </el-upload>
@@ -522,7 +522,7 @@
           this.Error('请上传word ppt pdf文件');
           return;
         }
-        this.UploadSelfFile(this.FileType().GoodsImg, file.file, res => {
+        this.UploadFileToTencent(this.FileType().GoodsImg, file.file, res => {
           if (res.resultCode == 1) {
             that.addpageMsg.Image = res.VideoCoverImg;
             that.addpageMsg.Path = res.FileUrl;

src/components/education/educationEdit.vue

@@ -14,7 +14,7 @@
               </div>
               <el-row>
                 <el-col :span="12">
-                  <el-form-item label="上架版面">
+                  <el-form-item label="上架版面" style="display:none;">
                     <el-radio-group v-model="addMsg.GoodsPageType" @change="getGoodType(addMsg.GoodsPageType)">
                       <el-radio v-for="(item,index) in My_cateList" :key="index" :label="item.Id">{{item.Name}}
                       </el-radio>
@@ -138,15 +138,6 @@
                       <span class="point" @click="imgDig = true">查看图例</span>
                     </p>
                   </el-form-item>
-                  <el-form-item label="关联讲师">
-                    <template v-if="addMsg.TeacherList.length>0">
-                      <el-tag v-for="(item,index) in addMsg.TeacherList" closable size="small"
-                        @close="yichuTeacher(index)" style="margin-right:5px;" :key="index">
-                        {{item.Name}}
-                      </el-tag>
-                    </template>
-                    <el-button @click="choosejsDig=true" size="mini">选择教师</el-button>
-                  </el-form-item>
                   <el-form-item label="直播商品">
                     <el-switch v-model="addMsg.IsLiveGoods" active-color="#409EFF" :active-value="1"
                       :inactive-value="2">
@@ -161,6 +152,64 @@
                 </el-col>
               </el-row>
             </el-card>
+            <el-card style="margin-top:20px" shadow="never">
+              <div slot="header" class="clearfix">
+                <span>售价与讲师</span>
+              </div>
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item>
+                    <label slot="label">排序
+                      <el-tooltip class="item" effect="dark" content="排序值越小排序越靠前" placement="top">
+                        <i class="el-icon-info"></i>
+                      </el-tooltip>
+                    </label>
+                    <el-input v-model="addMsg.Sort" type="number" min="1" size="small" placeholder="请输入内容"
+                      class="input-with-select"></el-input>
+                  </el-form-item>
+                  <el-form-item label="售价" prop="SellingPrice">
+                    <el-input v-model="addMsg.SellingPrice" type="number" min="1" size="small" placeholder="请输入内容"
+                      class="input-with-select">
+                      <el-button slot="append">元</el-button>
+                    </el-input>
+                  </el-form-item>
+                  <el-form-item label="原价" prop="OriginalPrice">
+                    <el-input v-model="addMsg.OriginalPrice" type="number" min="1" size="small" placeholder="请输入内容"
+                      class="input-with-select">
+                      <el-button slot="append">元</el-button>
+                    </el-input>
+                  </el-form-item>
+
+                  <el-form-item label="成本价">
+                    <el-input @change="getSuggestPrice" v-model="addMsg.CostPrice" type="number" min="1" size="small"
+                      placeholder="请输入内容" class="input-with-select">
+                      <el-button slot="append">元</el-button>
+                    </el-input>
+                    <span v-if="
+                        SuggestPriceInfo.Status && SuggestPriceInfo.Status == 1
+                      " class="cred" style="position: absolute;width: 400px;margin-left: 15px;">
+                      建议零售价：￥{{ SuggestPriceInfo.MPrice }}
+                    </span>
+                  </el-form-item>
+                  <!-- 判断是开启了粉象返佣 -->
+                  <el-form-item label="返佣总金额" prop="Commission" v-if="FxState==1">
+                    <el-input v-model="addMsg.Commission" @keyup.native="checkPrice(addMsg,'Commission')" size="small"
+                      placeholder="请输入内容" class="input-with-select">
+                      <el-button slot="append">元</el-button>
+                    </el-input>
+                  </el-form-item>
+                  <el-form-item label="关联讲师">
+                    <template v-if="addMsg.TeacherList.length>0">
+                      <el-tag v-for="(item,index) in addMsg.TeacherList" closable size="small"
+                        @close="yichuTeacher(index)" style="margin-right:5px;" :key="index">
+                        {{item.Name}}
+                      </el-tag>
+                    </template>
+                    <el-button @click="choosejsDig=true" size="mini">选择教师</el-button>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-card>
             <el-card style="margin-top:20px" shadow="never">
               <div slot="header" class="clearfix" style="display:flex;justify-content:space-between;align-items:center;">
                 <span>课程信息</span>
@@ -226,55 +275,6 @@
                 </el-col>
               </el-row>
             </el-card>
-            <el-card style="margin-top:20px" shadow="never">
-              <div slot="header" class="clearfix">
-                <span>价格库存</span>
-              </div>
-              <el-row>
-                <el-col :span="12">
-                  <el-form-item>
-                    <label slot="label">排序
-                      <el-tooltip class="item" effect="dark" content="排序值越小排序越靠前" placement="top">
-                        <i class="el-icon-info"></i>
-                      </el-tooltip>
-                    </label>
-                    <el-input v-model="addMsg.Sort" type="number" min="1" size="small" placeholder="请输入内容"
-                      class="input-with-select"></el-input>
-                  </el-form-item>
-                  <el-form-item label="售价" prop="SellingPrice">
-                    <el-input v-model="addMsg.SellingPrice" type="number" min="1" size="small" placeholder="请输入内容"
-                      class="input-with-select">
-                      <el-button slot="append">元</el-button>
-                    </el-input>
-                  </el-form-item>
-                  <el-form-item label="原价" prop="OriginalPrice">
-                    <el-input v-model="addMsg.OriginalPrice" type="number" min="1" size="small" placeholder="请输入内容"
-                      class="input-with-select">
-                      <el-button slot="append">元</el-button>
-                    </el-input>
-                  </el-form-item>
-
-                  <el-form-item label="成本价">
-                    <el-input @change="getSuggestPrice" v-model="addMsg.CostPrice" type="number" min="1" size="small"
-                      placeholder="请输入内容" class="input-with-select">
-                      <el-button slot="append">元</el-button>
-                    </el-input>
-                    <span v-if="
-                        SuggestPriceInfo.Status && SuggestPriceInfo.Status == 1
-                      " class="cred" style="position: absolute;width: 400px;margin-left: 15px;">
-                      建议零售价：￥{{ SuggestPriceInfo.MPrice }}
-                    </span>
-                  </el-form-item>
-                  <!-- 判断是开启了粉象返佣 -->
-                  <el-form-item label="返佣总金额" prop="Commission" v-if="FxState==1">
-                    <el-input v-model="addMsg.Commission" @keyup.native="checkPrice(addMsg,'Commission')" size="small"
-                      placeholder="请输入内容" class="input-with-select">
-                      <el-button slot="append">元</el-button>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-card>
             <el-card style="margin-top:20px" shadow="never">
               <div slot="header" class="clearfix">
                 <span>营销设置</span>
@@ -319,7 +319,7 @@
                       </el-button>
                     </el-input>
                   </el-form-item>
-                  <el-form-item label-width="200px">
+                  <el-form-item label-width="200px" style="display:none;">
                     <el-checkbox v-model="addMsg.IsMultipleDeduction" :true-label="1" :false-label="2">允许多件抵扣
                     </el-checkbox>
                   </el-form-item>
@@ -363,14 +363,12 @@
                       <img style="width:80px;height:80px" :src="addMsg.MarketingLogo.ico" alt="" />
                     </div>
                   </el-form-item>
-
-
                 </el-col>
               </el-row>
             </el-card>
             <el-card style="margin-top:20px" shadow="never">
               <div slot="header" class="clearfix">
-                <span>商品详情</span>
+                <span>课程详情</span>
               </div>
               <el-row>
                 <el-col :span="242">
@@ -596,7 +594,7 @@
     </el-dialog>
     <!-- 选择图片 -->
     <el-dialog title="选择图片" :visible.sync="changeState" width="1240px">
-      <ChooseImg @SelectId="SelectId" :IsMultiple="true"></ChooseImg>
+      <ChooseImg @SelectId="SelectId"></ChooseImg>
     </el-dialog>
     <!-- 选择视频 -->
     <el-dialog title="选择视频" :visible.sync="changeState1" width="1240px">
@@ -738,6 +736,7 @@
         flDig: false,
         addMsg: {
           Id: 0,
+          GoodsPageType:1,//上架版面
           CategoryList: [], //分类列表
           Name: "", //商品名称
           CarouselImageList: [], //轮播图
@@ -1245,28 +1244,26 @@
       //选择图片
       SelectId(msg) {
         let that = this;
-        if (msg && msg.length > 0) {
+        if (msg) {
           if (this.imgType == 1) {
-            msg.forEach(item => {
               let obj = {
-                Id: item.selectId,
-                Path: that.getIconLink(item.url),
+                Id: msg.selectId,
+                Path: that.getIconLink(msg.url),
               };
               this.addMsg.CarouselImageList.push(obj);
-            })
           }
           if (this.imgType == 2) {
-            this.addMsg.CustomShareImage = that.getIconLink(msg[0].url);
+            this.addMsg.CustomShareImage = that.getIconLink(msg.url);
           }
           if (this.imgType == 3) {
             let imgListIndex1 = this.imgListIndex1;
             let imgListIndex2 = this.imgListIndex2;
             this.SpecificationList[imgListIndex1].SpecificationValueList[
               imgListIndex2
-            ].Image = that.getIconLink(msg[0].url);
+            ].Image = that.getIconLink(msg.url);
           }
           if (this.imgType == 4) {
-            that.addMsg.MarketingLogo.ico = that.getIconLink(msg[0].url)
+            that.addMsg.MarketingLogo.ico = that.getIconLink(msg.url)
           }
         }
         this.changeState = false;

src/components/global/ChooseFile.vue

@@ -41,7 +41,7 @@
         </div>
         <div class="basefix app-attachment-list">
           <div class="app-attachment-item app-attachment-upload">
-            <el-upload class="avatar-uploader" action="" accept="image/jpeg,image/gif,image/png,image/bmp"
+            <el-upload class="avatar-uploader" action="" accept=".pdf,.PDF,.ppt,.PPT,.doc,.docx"
               :show-file-list="false" :http-request="UploadpdfFile" multiple>
               <div class="app-upload" flex="main:center cross:center" style="width: 100px; height: 100px;">
                 <i class="el-icon-upload"></i>
@@ -225,7 +225,7 @@
           this.Error('请上传word ppt pdf文件');
           return;
         }
-        this.UploadSelfFile(this.FileType().GoodsImg, file.file, res => {
+        this.UploadFileToTencent(this.FileType().GoodsImg, file.file, res => {
           if (res.resultCode == 1) {
             that.addpageMsg.Image = res.VideoCoverImg;
             that.addpageMsg.Path = res.FileUrl;

src/plug/index.js

@@ -206,6 +206,8 @@ export default {
             }).always(function () {
               //不管成功或失败，都会执行
             })
+        }else{
+          this.uploadStart(path, fileObj, callback)
         }
       },
       Vue.prototype.uploadStart = function (path, fileObj, callback) {