Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/orderCommon/productOrderList.vue

@@ -874,7 +874,7 @@
               </el-tooltip>
               <!--关内团后不能在报名 hk 2022-07-13去掉 && item.IsB2B === 1 修改为可报名 -->
               <el-tooltip class="item" effect="dark" :content="$t('salesModule.LJXD')" placement="top-start"
-                v-if="item.IsPayOrder !== 1 ">
+                v-if="item.IsPayOrder !== 1 && item.IsB2B !== 0 ">
                 <el-button type="primary" style="background-color: #f16c3c !important; border-color: #f16c3c !important"
                   v-if="!TCIDList" icon="iconfont icon-fukuan1" @click="goBuy(item)"></el-button>
               </el-tooltip>

src/plug/index.js

@@ -227,6 +227,7 @@ export default {
       //警告提示
       Vue.prototype.Warning = function (msg) {
         this.$message({
+
           message: msg,
           duration: 2000,
           type: "warning"
@@ -1162,10 +1163,22 @@ export default {
           co(function* () {
             for (let index = 0; index < files.length; index++) {
               let fileName = nameList[index]
-              fileName = path + fileName + "." + files[index].name.split('.').pop()
+              fileName = path + fileName + "." + files[index].name.split('.').pop();
+              var newPath = "";
+              if (!that.isOnline()) {
+                newPath = "/2024Test" + path;
+              } else {
+                newPath = path;
+              }
               var formData = new FormData();
-              var uploadUrl = that.domainManager().UploadUrl + "/Upload/UploadToALiOSS?filePath=" + path;
+              var uploadUrl = that.domainManager().UploadUrl + "/Upload/UploadToALiOSS?filePath=" + newPath;
               formData.append("myfile", files[index]);
+              // var parms = {
+              //   isppt:"1",
+              //   uid: "Bm++E7WftLk=",
+              //   gid: "1"
+              // }
+              // formData.append("parms", JSON.stringify(parms));
               that.$http.post(uploadUrl, formData, {})
                 .then(res => {
                   successCall(res);
@@ -1176,7 +1189,9 @@ export default {
                 });
             }
           }).catch(function (err) {
-            that.$refs['my-upload'].clearFiles();
+            if (that.$refs['my-upload']) {
+              that.$refs['my-upload'].clearFiles();
+            }
             that.$message.error('上传失败！');
           });
         }