页面修改

src/components/offlineService/osOrderDetails.vue

@@ -664,7 +664,6 @@
         }, res => {
           this.dataInfo = res.data.data;
           let data = res.data.data;
-          console.log("data:",data)
           // 未付款
           if (data.PaymentTime == '' && data.DeliveryTime == '') {
             this.activeStep = 1;

src/components/offlineService/serviceProductList.vue

@@ -2,7 +2,7 @@
   <div class="serviceProduct">
     <div class="head-title">
       商品列表
-      <el-button @click="Export" style="float:right;margin-top: -5px;margin-left:20px;" size="small" type="primary">商品导出
+      <el-button @click="Export" style="float:right;margin-top: -5px;margin-left:20px;display:none;" size="small" type="primary">商品导出
       </el-button>
       <el-button @click="CommonJump('serviceProductEdit',{hpState:hpState,FxState:FxState})"
         style="float:right;margin-top: -5px;margin-left:20px;" size="small" type="primary">添加商品</el-button>

src/plug/index.js

@@ -56,12 +56,8 @@ export default {
       Vue.prototype.domainManager = function () {
         let domainUrl = '';
         let javaUrl = 'http://192.168.2.65:8018';
-
-        // domainUrl = "http://192.168.1.27:8200";
-        //domainUrl = "http://192.168.1.13:8088";
         domainUrl = "http://192.168.1.27:8200";
 
-        domainUrl = "https://localhost:5001";
         let vtUploadUrl = "http://192.168.1.214:8120";
         let vtViewUrl = "http://192.168.1.214:8130";
 
@@ -152,10 +148,9 @@ export default {
       Vue.prototype.UploadSelfFile = function (path, file, callback) {
         var that = this;
         that.Info('上传中...')
-
         var newPath = '/Upload/' + path + "/";
         var formData = new FormData();
-        var uploadUrl = that.domainManager().VTUploadUrl + "/Upload?filePath=" + newPath+"&isCreateCover=1";
+        var uploadUrl = that.domainManager().VTUploadUrl + "/Upload?filePath=" + newPath + "&isCreateCover=1";
         formData.append("myfile", file);
         that.$http.post(uploadUrl, formData, {})
           .then(res => {
@@ -164,7 +159,7 @@ export default {
                 resultCode: 1,
                 FileName: file.name,
                 FileUrl: that.domainManager().VTViewUrl + res.data.FilePath,
-                VideoCoverImg:that.domainManager().VTViewUrl + res.data.VideoCoverImg
+                VideoCoverImg: that.domainManager().VTViewUrl + res.data.VideoCoverImg
               }
               if (callback) {
                 callback(uploadResult);
@@ -201,39 +196,39 @@ export default {
               var newFile = new File([u8arr], fileObj.name, {
                 type: mime
               });
-              if(upInfo&&upInfo.IsDefault==1){
-                if(upInfo.StoreType==1){
+              if (upInfo && upInfo.IsDefault == 1) {
+                if (upInfo.StoreType == 1) {
                   that.uploadStart(path, newFile, callback)
                 }
-                if(upInfo.StoreType==2){
+                if (upInfo.StoreType == 2) {
                   that.uploadToAli(path, newFile, callback)
                 }
-              }else{
+              } else {
                 that.Error('请先配置上传');
               }
             }).catch(function (error) {
-              if(upInfo&&upInfo.IsDefault==1){
-                if(upInfo.StoreType==1){
+              if (upInfo && upInfo.IsDefault == 1) {
+                if (upInfo.StoreType == 1) {
                   that.uploadStart(path, fileObj, callback)
                 }
-                if(upInfo.StoreType==2){
+                if (upInfo.StoreType == 2) {
                   that.uploadToAli(path, fileObj, callback)
                 }
-              }else{
+              } else {
                 that.Error('请先配置上传');
               }
             }).always(function () {
               //不管成功或失败，都会执行
             })
-        }else{
-          if(upInfo&&upInfo.IsDefault==1){
-            if(upInfo.StoreType==1){
+        } else {
+          if (upInfo && upInfo.IsDefault == 1) {
+            if (upInfo.StoreType == 1) {
               this.uploadStart(path, fileObj, callback)
             }
-            if(upInfo.StoreType==2){
+            if (upInfo.StoreType == 2) {
               this.uploadToAli(path, fileObj, callback)
             }
-          }else{
+          } else {
             this.Error('请先配置上传');
           }
         }
@@ -250,13 +245,6 @@ export default {
           str = "/Test"
         }
         var newFileName = str + '/Upload/' + path + "/" + timestamp1 + "" + suffix;
-        // var uploadMsg = {
-        //   Bucket: "viitto-1301420277",
-        //   Region: "ap-chengdu",
-        //   /* 存储桶所在地域，必须字段 */
-        //   SecretId: "AKIDDPnbIzi8C1eqEOPP8dw6MNAg9H9ldDKd",
-        //   SecretKey: "PdcLtOjslUzNFYdU4OSI1fKtdHpFT2Ob",
-        // };
         var uploadMsg = {
           Bucket: upInfo.Bucket,
           Region: upInfo.Region,
@@ -268,7 +256,6 @@ export default {
           SecretId: uploadMsg.SecretId,
           SecretKey: uploadMsg.SecretKey,
         });
-
         cos.putObject({
           Bucket: uploadMsg.Bucket,
           Region: uploadMsg.Region, //存储桶所在地域，必须字段
@@ -301,15 +288,7 @@ export default {
           accessKeyId: upInfo.SecretId,
           accessKeySecret: upInfo.SecretKey,
           bucket: upInfo.Bucket
-            // region: 'oss-cn-chengdu',
-            // accessKeyId: 'LTAIwE7l9dImZSa3',
-            // accessKeySecret: 'j47Ajn0d0WzUCIX8Biyj3P2r8QDltI',
-            // bucket: 'vt-im-bucket'
         })
-          let that = this;
-          let checkpoint = null;
-          let percentage = 0;
-
         //获取文件扩展名
         var filename = fileObj.name;
         var index = filename.lastIndexOf(".");
@@ -320,14 +299,13 @@ export default {
           str = "/Test"
         }
         var newFileName = str + '/Upload/' + path + "/" + timestamp1 + "" + suffix;
-          // fileName = "/New" + '/' +path+ '/' + fileName + "." + files.name.split('.').pop()
         var result = oss.multipartUpload(newFileName, fileObj, {
           progress: function* (p) {}
-          }).then(res=>{
+        }).then(res => {
           var uploadResult = {
             resultCode: 1,
             FileName: fileObj.name,
-              FileUrl: res.res.requestUrls[0].replace('http','https')
+            FileUrl: res.res.requestUrls[0].replace('http', 'https')
           }
           successCall(uploadResult);
         })
@@ -514,9 +492,6 @@ export default {
           ERPGroupId: ERPGroupId,
           ERPEmpId: ERPEmpId,
           ERPBranchId: ERPBranchId,
-          // MiniAppId:"wxacd9f8cc3480d29e",
-          // OpenId:"ow_7I5ZQKhAB66yvOTGI35Xk-Kmg",
-          // UserId:19992,
         }
         return postData
       },