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

src/components/CommodityMan/goodsListEdit.vue

@@ -105,7 +105,7 @@
                   </el-form-item>
                   <el-form-item label="上架状态">
                     <el-switch v-model="addMsg.GoodsStatus" active-color="#409EFF" :active-value="1"
-                      :inactive-value="0">
+                      :inactive-value="2">
                     </el-switch>
                   </el-form-item>
                 </el-col>
@@ -1176,8 +1176,8 @@
         
       },
       butionType(val) {
-        this.skuList = [];
-        this.getSkuData([], 0, this.SpecificationList);
+        // this.skuList = [];
+        // this.getSkuData([], 0, this.SpecificationList);
       },
       // 删除规格模板
       DeleteggModule(item, index) {

src/components/StoreDesign/wexinappconfig.vue

@@ -68,12 +68,13 @@
 
               <el-upload
                 class="upload-demo"
-                action=""
-                :http-request="UploadImage"
-                :file-list="fileList"
                 accept='doc,.docx,.xlsx,.xls,.pdf,.pem,.p12'
-                :on-change="handleChange"
+                :action="importFileUrl"
+                :multiple="false"
+                :on-success="successUpload"
+                :file-list="fileList"
                 :on-remove="handleRemove"
+
               >
                 <el-button size="small" type="primary">点击上传</el-button>
 
@@ -108,8 +109,11 @@
           WeChatPayCertificate: "", //微信支付证书
           WeChatPayPrivateKey: "", //微信支付私钥
           WeChatPayCertificateUrl:'',//微信支付证书
+
         },
         fileList:[],
+        importFileUrl: this.domainManager().UploadBlob,
+
         rules: {
           MiniAppId: [{
             required: true,
@@ -158,11 +162,14 @@
             this.appConfig.WeChatApiSecret = res.data.data.WeChatApiSecret;
             this.appConfig.WeChatPayCertificate = res.data.data.WeChatPayCertificate;
             this.appConfig.WeChatPayPrivateKey = res.data.data.WeChatPayPrivateKey;
+            if(res.data.data.WeChatPayCertificateUrl!=null){
               this.appConfig.WeChatPayCertificateUrl = res.data.data.WeChatPayCertificateUrl;
               this.fileList.push({
-              name:res.data.data.WeChatPayCertificateUrl.split('com')[1],
+                name:res.data.data.WeChatPayCertificateUrl,
                 url:res.data.data.WeChatPayCertificateUrl,
               })
+            }
+
           } else {
             this.Info(res.data.message);
           }
@@ -189,21 +196,14 @@
           }
         })
       },
-
-      UploadImage(file){
-        this.UploadFileToTencent(this.FileType().GoodsImg, file.file, res => {
-          if (res.resultCode == 1) {
-            this.appConfig.WeChatPayCertificateUrl = res.FileUrl;
-              this.fileList.push({
-                name:res.FileName,
-                url:res.FileUrl,
-              })
-
-          }
+      successUpload(file){
+        let list = [];
+        list.push({
+          name:file.data.Path.split('WeChatApp')[1].replace(/[\\]/g, ''),
+          url:file.data.Path.split('WeChatApp')[1].replace(/[\\]/g, ''),
         })
-      },
-      handleChange(file, fileList) {
-        this.fileList = this.fileList.slice(1);
+        this.fileList = list;
+        this.appConfig.WeChatPayCertificateUrl = file.data.Path.split('WeChatApp')[1].replace(/[\\]/g, '')
       },
       handleRemove(file, fileList) {
         this.fileList = fileList;

src/components/UserMan/setDistributorLevel.vue

@@ -7,7 +7,11 @@
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px">
         <el-form-item label="分销商等级选择" prop="Grade">
           <el-select style="width:500px;" size="small" v-model="addMsg.Grade" placeholder="请选择">
-            <el-option v-for="(item,index) in 10" :key="index" :label="`等级${index+1}`" :value="index+1">
+            <el-option v-for="(item,index) in numList" 
+            :key="index" :label="`等级${index+1}`" 
+            :value="item.Id"
+            :disabled="item.dis"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -88,7 +92,7 @@
     data() {
       return {
         addMsg: {
-          Id: '',
+          Id: 0,
           Grade: 1,
           Name: '',
           IsAutoUpGrade: 1,
@@ -147,13 +151,23 @@
         loading: false,
         tierInfo: {},
         gradeList: [],
-
+        disList:[],
+        numList:[],
       };
     },
     created() {
+      this.numList=[]
+      for(let i=1;i<101;i++){
+        let obj={
+          Id:i,
+          dis:false,
+        }
+        this.numList.push(obj)
+      }
       if (this.$route.query.UserId) {
         this.GradeId = this.$route.query.UserId;
         this.getData()
+        this.getDisList();
 
       }
       this.GetTierInfo();
@@ -205,6 +219,18 @@
           this.gradeList = res.data.data;
         })
       },
+      getDisList() {
+        this.apipost("/api/user/GetDistributorGradeDropdownList", {}, res => {
+          this.disList = res.data.data;
+          this.numList.forEach(item=>{
+              this.disList.forEach(val=>{
+                if(item.Id==val.Grade){
+                  item.dis=true;
+                }
+              })
+            })
+        })
+      },
 
     },
     mounted() {

src/plug/index.js

@@ -54,7 +54,8 @@ export default {
       //域名管理对象
       Vue.prototype.domainManager = function () {
         let domainUrl = '';
-        //domainUrl = "http://192.168.2.214:8200";
+        //domainUrl = "http://192.168.2.214:8200"
+        // domainUrl = "http://192.168.2.65";
         // domainUrl = "https://localhost:5001";
         domainUrl = "http://mallapi.oytour.com";
 
@@ -70,7 +71,9 @@ export default {
           //常用提交数据URL
           PostUrl: domainUrl + "/api/common/post",
           ImageUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com',
-          UploadFileUrl:domainUrl + '/api/File/LocalFileUploadImport'
+          UploadFileUrl:domainUrl + '/api/File/LocalFileUploadImport',
+          UploadBlob:domainUrl + '/api/File/UploadBlob',
+
         };
         return obj;
       },