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

src/components/PersonalInfoSet.vue

@@ -643,6 +643,11 @@
           <i class="iconfont icon-Edit"></i>&nbsp;&nbsp;{{$t('objFill.xiugaitouxiang')}}</span>
           <input type="file" id="change" accept="image" @change="change">
         </a>
+        <!-- <el-upload accept="*.*" style="display:inline-block;" class="EducationvideoListupload" drag
+          :http-request="UploadFileToAli" :multiple="false" :show-file-list="false" action="">
+          <i class="el-icon-plus avatar-uploader-icon"></i>
+          <div class="el-upload__text">{{$t("active.ld_djscwj")}}</div>
+        </el-upload> -->
       </div>
       <div class="Person_Header">
         <img v-if="dataList.EmPhoto" :src="dataList.EmPhoto" :onerror="defaultHeadImg" alt />
@@ -749,10 +754,12 @@
               </div>
             </el-form-item>
             <el-form-item :label="$t('objFill.yanzhengma')" prop="code">
-              <el-input v-model="phoneMsg.code" class="w150" :placeholder="$t('objFill.siweiyzm')" maxlength="4"></el-input>
+              <el-input v-model="phoneMsg.code" class="w150" :placeholder="$t('objFill.siweiyzm')" maxlength="4">
+              </el-input>
             </el-form-item>
           </el-form>
-          <button class="normalBtn" style="margin:30px 0 0 100px;" @click="submitForm1('phoneMsg')">{{$t('pub.sureBtn')}}</button>
+          <button class="normalBtn" style="margin:30px 0 0 100px;"
+            @click="submitForm1('phoneMsg')">{{$t('pub.sureBtn')}}</button>
         </div>
       </div>
       <!-- 修改密码 -->
@@ -762,29 +769,32 @@
           <el-form :model="passWordMsg" ref="passWordMsg" label-position="right" :rules="rules2" label-width="100px">
             <el-form-item v-if="sureOldPwd" :label="$t('objFill.jiumima')" prop="OldPwd" style="margin-bottom:30px;">
               <el-input type="password" class="w400" v-model="passWordMsg.OldPwd" maxlength="15">
-                <i slot="suffix" :title="$t('objFill.xianshimima')" @click="changePassOld('show')" style="cursor:pointer;"
-                  class="el-input__icon iconfont icon-yincang"></i>
+                <i slot="suffix" :title="$t('objFill.xianshimima')" @click="changePassOld('show')"
+                  style="cursor:pointer;" class="el-input__icon iconfont icon-yincang"></i>
               </el-input>
             </el-form-item>
             <el-form-item v-else :label="$t('objFill.jiumima')" prop="OldPwd" style="margin-bottom:30px;">
               <el-input type="text" class="w400" v-model="passWordMsg.OldPwd" maxlength="15">
-                <i slot="suffix" :title="$t('objFill.yinchangmima')" @click="changePassOld('hide')" style="cursor:pointer;"
-                  class="el-input__icon iconfont icon-xianshi"></i>
+                <i slot="suffix" :title="$t('objFill.yinchangmima')" @click="changePassOld('hide')"
+                  style="cursor:pointer;" class="el-input__icon iconfont icon-xianshi"></i>
               </el-input>
             </el-form-item>
             <el-form-item v-if="visible" :label="$t('objFill.xinmima')" style="margin-bottom:30px;" prop="Pwd">
-              <el-input type="password" class="w400" v-model="passWordMsg.Pwd" maxlength="15" :placeholder="$t('objFill.mimageshi')">
+              <el-input type="password" class="w400" v-model="passWordMsg.Pwd" maxlength="15"
+                :placeholder="$t('objFill.mimageshi')">
                 <i slot="suffix" :title="$t('objFill.xianshimima')" @click="changePass('show')" style="cursor:pointer;"
                   class="el-input__icon iconfont icon-yincang"></i>
               </el-input>
             </el-form-item>
             <el-form-item v-else :label="$t('objFill.xinmima')" style="margin-bottom:30px;" prop="Pwd">
-              <el-input type="text" class="w400" v-model="passWordMsg.Pwd" maxlength="15" :placeholder="$t('objFill.mimageshi')">
+              <el-input type="text" class="w400" v-model="passWordMsg.Pwd" maxlength="15"
+                :placeholder="$t('objFill.mimageshi')">
                 <i slot="suffix" :title="$t('objFill.yinchangmima')" @click="changePass('hide')" style="cursor:pointer;"
                   class="el-input__icon iconfont icon-xianshi"></i>
               </el-input>
             </el-form-item>
-            <el-form-item v-if="SureVisible" :label="$t('objFill.querenmima')" style="margin-bottom:30px;" prop="surePassword">
+            <el-form-item v-if="SureVisible" :label="$t('objFill.querenmima')" style="margin-bottom:30px;"
+              prop="surePassword">
               <el-input type="password" class="w400" v-model="passWordMsg.surePassword" maxlength="15"
                 :placeholder="$t('objFill.mimageshi')">
                 <i slot="suffix" :title="$t('objFill.xianshimima')" @click="changePass2('show')" style="cursor:pointer;"
@@ -792,13 +802,15 @@
               </el-input>
             </el-form-item>
             <el-form-item v-else :label="$t('objFill.querenmima')" style="margin-bottom:30px;" prop="surePassword">
-              <el-input type="text" class="w400" v-model="passWordMsg.surePassword" maxlength="15" :placeholder="$t('objFill.mimageshi')">
-                <i slot="suffix" :title="$t('objFill.yinchangmima')" @click="changePass2('hide')" style="cursor:pointer;"
-                  class="el-input__icon iconfont icon-xianshi"></i>
+              <el-input type="text" class="w400" v-model="passWordMsg.surePassword" maxlength="15"
+                :placeholder="$t('objFill.mimageshi')">
+                <i slot="suffix" :title="$t('objFill.yinchangmima')" @click="changePass2('hide')"
+                  style="cursor:pointer;" class="el-input__icon iconfont icon-xianshi"></i>
               </el-input>
             </el-form-item>
           </el-form>
-          <button class="normalBtn" style="margin:30px 0 0 100px;" @click="submitForm2('passWordMsg')">{{$t('pub.sureBtn')}}</button>
+          <button class="normalBtn" style="margin:30px 0 0 100px;"
+            @click="submitForm2('passWordMsg')">{{$t('pub.sureBtn')}}</button>
         </div>
       </div>
       <!-- 银行账户 -->
@@ -814,8 +826,10 @@
                 <span class="AC_bankName">{{item.BankName}}</span><span>{{getBankNum(item.CardNum)}}</span>
               </td>
               <td class="AC_jeibang">
-                <span style="cursor:pointer;color:#007EFF;" v-if='item.Status==0' @click="deleteData(item.ID)">{{$t('pub.fressSel')}}</span>
-                <span style="cursor:pointer;color:#007EFF;" v-if='item.Status==1' @click="deleteData(item.ID)">{{$t('fnc.qiyong')}}</span>
+                <span style="cursor:pointer;color:#007EFF;" v-if='item.Status==0'
+                  @click="deleteData(item.ID)">{{$t('pub.fressSel')}}</span>
+                <span style="cursor:pointer;color:#007EFF;" v-if='item.Status==1'
+                  @click="deleteData(item.ID)">{{$t('fnc.qiyong')}}</span>
               </td>
             </tr>
           </table>
@@ -825,16 +839,19 @@
           <el-form :model="addAccountMsg" ref="addAccountMsg" label-position="right" :rules="rules3"
             label-width="100px">
             <el-form-item :label="$t('fnc.zhfenlei')" prop="oldPassword" style="margin-bottom:30px;">
-              <el-select v-model='addAccountMsg.AccountClassify' class="w400" :placeholder="$t('pub.pleaseSel')" @change='changeTitle'>
+              <el-select v-model='addAccountMsg.AccountClassify' class="w400" :placeholder="$t('pub.pleaseSel')"
+                @change='changeTitle'>
                 <el-option :label="$t('fnc.yinhang')" value='2' key='2'></el-option>
                 <el-option :label="$t('objFill.xulizhanghu')" value='3' key='3'></el-option>
               </el-select>
             </el-form-item>
             <el-form-item v-if="addAccountMsg.AccountClassify==2" :label="$t('objFill.suoshujigou')" prop="BankName">
-              <el-input type="text" class="w400" v-model="addAccountMsg.BankName" :placeholder="$t('objFill.liruzgjh')"></el-input>
+              <el-input type="text" class="w400" v-model="addAccountMsg.BankName" :placeholder="$t('objFill.liruzgjh')">
+              </el-input>
             </el-form-item>
             <el-form-item v-if='addAccountMsg.AccountClassify!=3' :label="nameA" prop="OpenBankName">
-              <el-input type="text" class="w400" v-model="addAccountMsg.OpenBankName" :placeholder="$t('objFill.lirujjzh')"></el-input>
+              <el-input type="text" class="w400" v-model="addAccountMsg.OpenBankName"
+                :placeholder="$t('objFill.lirujjzh')"></el-input>
             </el-form-item>
             <el-form-item v-if='addAccountMsg.AccountClassify!=3' :label="nameB" prop="AccountHolder">
               <el-input type="text" class="w400" v-model="addAccountMsg.AccountHolder"></el-input>
@@ -847,7 +864,8 @@
               <el-input type="text" class="w400" v-model="addAccountMsg.AccountAlias"></el-input>
             </el-form-item>
           </el-form>
-          <button class="normalBtn" style="margin:30px 0 0 100px;" @click="submitForm3('addAccountMsg')">{{$t('pub.sureBtn')}}</button>
+          <button class="normalBtn" style="margin:30px 0 0 100px;"
+            @click="submitForm3('addAccountMsg')">{{$t('pub.sureBtn')}}</button>
         </div>
       </div>
       <!-- 页面切换方式 -->
@@ -860,14 +878,16 @@
             <span style="font-weight:bold;" v-else>{{$t('objFill.duoyemiandbqms')}}</span>
           </div>
           <div class="PI_qiehuan" style="margin-bottom:50px;">
-            <el-radio v-model="radio" :label="1">{{$t('objFill.danyeduobqms')}}<span class="PI_comMoshi">{{$t('objFill.danyemmianmszs')}}</span>
+            <el-radio v-model="radio" :label="1">{{$t('objFill.danyeduobqms')}}<span
+                class="PI_comMoshi">{{$t('objFill.danyemmianmszs')}}</span>
               <div class="PI_QiehuanImg" :class="{'ckedQieImg':radio==1}" @click="radio=1">
                 <img src='../assets/img/chosen_one.png' />
               </div>
             </el-radio>
           </div>
           <div class="PI_qiehuan">
-            <el-radio v-model="radio" :label="2">{{$t('objFill.duoyemiandbqms')}}<span class="PI_comMoshi">{{$t('objFill.duoyemmianmszs')}}</span>
+            <el-radio v-model="radio" :label="2">{{$t('objFill.duoyemiandbqms')}}<span
+                class="PI_comMoshi">{{$t('objFill.duoyemmianmszs')}}</span>
               <div class="PI_QiehuanImg" :class="{'ckedQieImg':radio==2}" @click="radio=2">
                 <img src='../assets/img/chosen_two.png' />
               </div>
@@ -881,12 +901,15 @@
         <div class="Shouji_Top">{{$t('objFill.zhanyangscwxbd')}}</div>
         <div class="Shouji_Conteng">
           <el-form label-position="right" label-width="100px">
-            <el-form-item :label="$t('objFill.yibangdin')" style="margin-bottom:30px;" v-if="dataList.WeChatName&&dataList.WeChatName!=''">
+            <el-form-item :label="$t('objFill.yibangdin')" style="margin-bottom:30px;"
+              v-if="dataList.WeChatName&&dataList.WeChatName!=''">
               <el-input :disabled="true" class="w210" v-model="dataList.WeChatName"></el-input>
             </el-form-item>
-            <el-form-item :label="dataList.WeChatName&&dataList.WeChatName!=''?$t('objFill.chongxingbdwx'):$t('objFill.bangdinwx')" style="margin-bottom:30px;" size="small">
-              <el-select v-model="mallUserId" class="w210" filterable remote reserve-keyword :placeholder="$t('objFill.qingshuruwxnc')"
-                :remote-method="getWechatData" @change="weChatChange">
+            <el-form-item
+              :label="dataList.WeChatName&&dataList.WeChatName!=''?$t('objFill.chongxingbdwx'):$t('objFill.bangdinwx')"
+              style="margin-bottom:30px;" size="small">
+              <el-select v-model="mallUserId" class="w210" filterable remote reserve-keyword
+                :placeholder="$t('objFill.qingshuruwxnc')" :remote-method="getWechatData" @change="weChatChange">
                 <el-option v-for="wItem in weChatData" :key="wItem.Id" :label="wItem.Name" :value="wItem.Id">
                   <span style="float: left">{{ wItem.Name }}
                     <template v-if="wItem.ShopId>0">
@@ -1054,12 +1077,21 @@
         weChatMsg: {
           MallUserId: 0, //赞羊商城用户Id
           MallSmallShopsId: 0, //赞羊用户商城Id
-          WeChatName:"",//微信昵称
+          WeChatName: "", //微信昵称
         },
         weChatData: [],
       };
     },
     methods: {
+      //测试文件上传
+      UploadFileToAli(file) {
+        let newArr = [];
+        newArr.push(file.file);
+        let path = "/Sale/Uploadvideo/";
+        this.UploadFileToAli2024(path, newArr, x => {
+          console.log("UploadFileToAli2024", x)
+        });
+      },
       //绑定手机
       submitForm1(formName) {
         this.$refs[formName].validate((valid) => {
@@ -1351,7 +1383,7 @@
         newArr.push(blob);
         var fileName = `${that.uuid(10,10)}.png`;
         var path = `/Upload/Temporary`;
-        that.uploadSelfBlob(path, newArr,'', x => {
+        that.uploadSelfBlob(path, newArr, '', x => {
           let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
           this.postImg(allPath)
         })
@@ -1444,7 +1476,7 @@
         if (obj) {
           this.weChatMsg.MallUserId = obj.Id;
           this.weChatMsg.MallSmallShopsId = obj.ShopId;
-          this.weChatMsg.WeChatName=obj.Name;
+          this.weChatMsg.WeChatName = obj.Name;
         }
       },
       //保存微信

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('上传失败！');
           });
         }