Merge branch 'master' into oem-51

# Conflicts:
#	dist/index.html
#	dist/static/css/chunk-5139a94e.77012854.css

dist/static/css/chunk-2810acda.6485bf58.css

+.fill-brand-inf[data-v-44c1b794]{width:100%;height:100%;overflow-x:hidden;overflow-y:scroll}.fill-brand-inf .box-card[data-v-44c1b794]{width:80%;margin:30px auto 30px;height:calc(100% - 120px)}.fill-brand-inf .box-card[data-v-44c1b794] .el-card__body{height:calc(100% - 120px);overflow-x:hidden;overflow-y:scroll}.fill-brand-inf .logo-bg[data-v-44c1b794]{height:60px;background:#1890ff}.fill-brand-inf .logo-bg img[data-v-44c1b794]{height:44px;margin:8px 0 8px 20px}.fill-brand-inf .spe-brand-text[data-v-44c1b794]{width:100%;height:50px;line-height:50px;margin:15px 0 15px 30px;font-size:18px;font-family:Microsoft YaHei;font-weight:700;color:#333;background-color:#fafafa}.steps[data-v-44c1b794]{height:70px;width:60%;margin:20px auto}.steps[data-v-44c1b794] .el-step__title{font-size:16px;line-height:18px;padding-top:20px}.el-step[data-v-44c1b794] .el-step__head.is-process{color:#1890ff;border-color:#1890ff}.el-step[data-v-44c1b794] .el-step__head.is-process .el-step__icon.is-text{background-color:#1890ff}.el-step[data-v-44c1b794] .el-step__head.is-process .el-step__icon.is-text .el-step__icon-inner{color:#fff}.el-step[data-v-44c1b794] .el-step__title.is-process{color:#000;font-weight:400}.el-step[data-v-44c1b794] .el-step__head.is-success{color:#1890ff;border-color:#1890ff}.el-step[data-v-44c1b794] .el-step__head.is-success .el-step__line{background-color:#1890ff}.el-step[data-v-44c1b794] .el-step__title.is-success{color:#000}.main-con[data-v-44c1b794]{width:70%;margin:30px auto 50px;overflow-x:hidden;overflow-y:scroll}.main-con .tips-text[data-v-44c1b794]{font-size:14px;color:#c9c9c9;word-break:break-all}.main-con .h-warning[data-v-44c1b794]:before{color:#e3c300}.main-con .no-brand[data-v-44c1b794]{padding-left:60px}.main-con .no-brand p[data-v-44c1b794]{color:#333;font-size:14px;line-height:20px;padding:10px 80px 0}.main-con .no-brand .no-brand-btn[data-v-44c1b794]{padding-left:84px;padding-top:30px}.main-con .uploadData[data-v-44c1b794]{display:inline-block}.main-con .uploadData[data-v-44c1b794] .el-upload--picture-card{width:100px;height:100px}.main-con .uploadData[data-v-44c1b794] .el-upload,.main-con .uploadData[data-v-44c1b794] .el-upload-list--picture-card .el-upload-list__item,.main-con .uploadData[data-v-44c1b794] .el-upload-list--picture-card .el-upload-list__item-thumbnail{width:100px;height:100px;line-height:100px}.main-con .uploadData[data-v-44c1b794] .avatar{width:100px;height:100px}.main-con .download-Template-btn[data-v-44c1b794]{width:145px;height:38px;line-height:38px;text-align:center;color:#1890ff;font-size:14px;border:1px solid #1890ff;border-radius:3px;cursor:pointer}.main-con .download-Template-btn[data-v-44c1b794]:hover{color:#fff;border:1px solid #1890ff;background-color:#1890ff}
\ No newline at end of file

dist/static/css/chunk-41dc9244.d0adca96.css

+.fill-store-inf[data-v-5118f63e]{width:100%;height:100%;overflow-x:hidden;overflow-y:scroll}.fill-store-inf .box-card[data-v-5118f63e]{width:80%;margin:30px auto 30px;height:calc(100% - 140px)}.fill-store-inf .box-card[data-v-5118f63e] .el-card__body{height:calc(100% - 140px);overflow-x:hidden;overflow-y:scroll}.logo-bg[data-v-5118f63e]{height:60px;background:#1890ff}.logo-bg img[data-v-5118f63e]{height:44px;margin:8px 0 8px 20px}.steps[data-v-5118f63e]{height:70px;width:60%;margin:20px auto}.steps[data-v-5118f63e] .el-step__title{font-size:16px;line-height:18px;padding-top:20px}.el-step[data-v-5118f63e] .el-step__head.is-process{color:#1890ff;border-color:#1890ff}.el-step[data-v-5118f63e] .el-step__head.is-process .el-step__icon.is-text{background-color:#1890ff}.el-step[data-v-5118f63e] .el-step__head.is-process .el-step__icon.is-text .el-step__icon-inner{color:#fff}.el-step[data-v-5118f63e] .el-step__title.is-process{color:#000;font-weight:400}.el-step[data-v-5118f63e] .el-step__head.is-success{color:#1890ff;border-color:#1890ff}.el-step[data-v-5118f63e] .el-step__head.is-success .el-step__line{background-color:#1890ff}.el-step[data-v-5118f63e] .el-step__title.is-success{color:#000}.main-con[data-v-5118f63e]{width:70%;margin:30px auto;overflow-y:scroll}.main-con .tips-text[data-v-5118f63e]{font-size:14px;color:#c9c9c9;word-break:break-all}.main-con .h-warning[data-v-5118f63e]:before{color:#e3c300}.main-con .uploadData[data-v-5118f63e]{display:inline-block}.main-con .uploadData[data-v-5118f63e] .el-upload--picture-card{width:100px;height:100px}.main-con .uploadData[data-v-5118f63e] .el-upload,.main-con .uploadData[data-v-5118f63e] .el-upload-list--picture-card .el-upload-list__item,.main-con .uploadData[data-v-5118f63e] .el-upload-list--picture-card .el-upload-list__item-thumbnail{width:100px;height:100px;line-height:100px}.main-con .uploadData[data-v-5118f63e] .avatar{width:100px;height:100px}.hiden-dom[data-v-5118f63e] .el-upload--picture-card{display:none!important}.idcard-tips-con[data-v-5118f63e]{display:flex;flex-direction:row;justify-content:normal;justify-items:center}.idcard-tips-con>p[data-v-5118f63e]{margin:0;padding:0 15px}.main-form-con[data-v-5118f63e]{margin-left:100px}.main-form-title[data-v-5118f63e]{color:#666;font-size:18px;font-weight:600;padding:0;margin:10px 0 10px -180px}.main-form-tips[data-v-5118f63e]{color:#aaa;font-size:14px;font-weight:400;padding:0}.confirm-btn[data-v-5118f63e]{width:50%;margin:40px auto 0}.confirm-btn p[data-v-5118f63e]{text-align:center}.read-fail-dialog[data-v-5118f63e] .el-dialog>.el-dialog__body>p{text-align:center;font-size:16px}.read-fail-dialog[data-v-5118f63e] .read-time-m{color:#f56c6c;font-size:18px;padding:0 5px}
\ No newline at end of file

dist/static/css/chunk-4899b686.3c74399b.css

-.fill-store-inf[data-v-5a25e0c2]{width:100%;height:100%;overflow-x:hidden;overflow-y:scroll}.fill-store-inf .box-card[data-v-5a25e0c2]{width:80%;margin:30px auto 30px;height:calc(100% - 140px)}.fill-store-inf .box-card[data-v-5a25e0c2] .el-card__body{height:calc(100% - 140px);overflow-x:hidden;overflow-y:scroll}.logo-bg[data-v-5a25e0c2]{height:60px;background:#1890ff}.logo-bg img[data-v-5a25e0c2]{height:44px;margin:8px 0 8px 20px}.steps[data-v-5a25e0c2]{height:70px;width:60%;margin:20px auto}.steps[data-v-5a25e0c2] .el-step__title{font-size:16px;line-height:18px;padding-top:20px}.el-step[data-v-5a25e0c2] .el-step__head.is-process{color:#1890ff;border-color:#1890ff}.el-step[data-v-5a25e0c2] .el-step__head.is-process .el-step__icon.is-text{background-color:#1890ff}.el-step[data-v-5a25e0c2] .el-step__head.is-process .el-step__icon.is-text .el-step__icon-inner{color:#fff}.el-step[data-v-5a25e0c2] .el-step__title.is-process{color:#000;font-weight:400}.el-step[data-v-5a25e0c2] .el-step__head.is-success{color:#1890ff;border-color:#1890ff}.el-step[data-v-5a25e0c2] .el-step__head.is-success .el-step__line{background-color:#1890ff}.el-step[data-v-5a25e0c2] .el-step__title.is-success{color:#000}.main-con[data-v-5a25e0c2]{width:70%;margin:30px auto;overflow-y:scroll}.main-con .tips-text[data-v-5a25e0c2]{font-size:14px;color:#c9c9c9;word-break:break-all}.main-con .h-warning[data-v-5a25e0c2]:before{color:#e3c300}.main-con .uploadData[data-v-5a25e0c2]{display:inline-block}.main-con .uploadData[data-v-5a25e0c2] .el-upload--picture-card{width:100px;height:100px}.main-con .uploadData[data-v-5a25e0c2] .el-upload,.main-con .uploadData[data-v-5a25e0c2] .el-upload-list--picture-card .el-upload-list__item,.main-con .uploadData[data-v-5a25e0c2] .el-upload-list--picture-card .el-upload-list__item-thumbnail{width:100px;height:100px;line-height:100px}.main-con .uploadData[data-v-5a25e0c2] .avatar{width:100px;height:100px}.hiden-dom[data-v-5a25e0c2] .el-upload--picture-card{display:none!important}.idcard-tips-con[data-v-5a25e0c2]{display:flex;flex-direction:row;justify-content:normal;justify-items:center}.idcard-tips-con>p[data-v-5a25e0c2]{margin:0;padding:0 15px}.main-form-con[data-v-5a25e0c2]{margin-left:100px}.main-form-title[data-v-5a25e0c2]{color:#666;font-size:18px;font-weight:600;padding:0;margin:10px 0 10px -180px}.main-form-tips[data-v-5a25e0c2]{color:#aaa;font-size:14px;font-weight:400;padding:0}.confirm-btn[data-v-5a25e0c2]{width:50%;margin:40px auto 0}.confirm-btn p[data-v-5a25e0c2]{text-align:center}.read-fail-dialog[data-v-5a25e0c2] .el-dialog>.el-dialog__body>p{text-align:center;font-size:16px}.read-fail-dialog[data-v-5a25e0c2] .read-time-m{color:#f56c6c;font-size:18px;padding:0 5px}
\ No newline at end of file

dist/static/css/chunk-c6fd9a34.ea684fe8.css → dist/static/css/chunk-fbeba9ea.a3da7543.css

-.fill-store-inf[data-v-1069075c]{width:100%;height:100%;overflow-x:hidden;overflow-y:scroll}.fill-store-inf .box-card[data-v-1069075c]{width:80%;margin:30px auto 30px;height:calc(100% - 140px)}.fill-store-inf .box-card[data-v-1069075c] .el-card__body{height:calc(100% - 180px);overflow-x:hidden;overflow-y:scroll}.logo-bg[data-v-1069075c]{height:60px;background:#1890ff}.logo-bg img[data-v-1069075c]{height:44px;margin:8px 0 8px 20px}.steps[data-v-1069075c]{height:70px;width:60%;margin:20px auto}.steps[data-v-1069075c] .el-step__title{font-size:16px;line-height:18px;padding-top:20px}.el-step[data-v-1069075c] .el-step__head.is-process{color:#1890ff;border-color:#1890ff}.el-step[data-v-1069075c] .el-step__head.is-process .el-step__icon.is-text{background-color:#1890ff}.el-step[data-v-1069075c] .el-step__head.is-process .el-step__icon.is-text .el-step__icon-inner{color:#fff}.el-step[data-v-1069075c] .el-step__title.is-process{color:#000;font-weight:400}.el-step[data-v-1069075c] .el-step__head.is-success{color:#1890ff;border-color:#1890ff}.el-step[data-v-1069075c] .el-step__head.is-success .el-step__line{background-color:#1890ff}.el-step[data-v-1069075c] .el-step__title.is-success{color:#000}.main-con[data-v-1069075c]{width:70%;height:100%;margin:20px auto 0}.main-con .tips-text[data-v-1069075c]{font-size:14px;color:#c9c9c9;word-break:break-all}.main-con .h-warning[data-v-1069075c]:before{color:#e3c300}.main-con .uploadData[data-v-1069075c]{display:inline-block}.main-con .uploadData[data-v-1069075c] .el-upload--picture-card{width:100px;height:100px}.main-con .uploadData[data-v-1069075c] .el-upload,.main-con .uploadData[data-v-1069075c] .el-upload-list--picture-card .el-upload-list__item,.main-con .uploadData[data-v-1069075c] .el-upload-list--picture-card .el-upload-list__item-thumbnail{width:100px;height:100px;line-height:100px}.main-con .uploadData[data-v-1069075c] .avatar{width:100px;height:100px}.main-con .hiden-dom[data-v-1069075c] .el-upload--picture-card{display:none!important}.main-con .auth-con[data-v-1069075c]{width:100%;height:100%;display:flex;flex-direction:row;justify-content:normal;flex-wrap:wrap}.main-con .single-upload-con[data-v-1069075c]{width:160px;height:140px;text-align:center;overflow:hidden}.main-con .single-auth-img[data-v-1069075c]{width:98px;height:98px;border-radius:6px;border:1px dashed #eee;margin:5px auto;cursor:pointer;color:#8c939d;line-height:98px;font-size:28px}.main-con .single-auth-img-con[data-v-1069075c]{margin:0;padding:0;display:inline-block;width:98px;height:98px;position:relative;cursor:pointer;border-radius:6px;border:1px solid #c0ccda}.main-con .auth-spec-img[data-v-1069075c]{width:100%;height:100%;border-radius:6px;cursor:pointer;position:relative;border:none}.main-con .span-img-del-loading[data-v-1069075c]{display:none;position:absolute;width:98px;height:98px;top:0;left:0;border-radius:5px;z-index:66;background-color:rgba(0,0,0,.5);opacity:.75;transition:opacity .3s}.main-con .span-img-del-loading>.del-span-block[data-v-1069075c],.main-con .span-img-del-loading>.zoom-span-block[data-v-1069075c]{color:#fff;font-size:20px;font-weight:500;margin:41px 4px 0;z-index:70}.main-con .single-auth-img-con:hover>.span-img-del-loading[data-v-1069075c]{display:block}.main-con .single-title[data-v-1069075c]{font-size:12px;color:#666;text-align:center}.main-con .confirm-btn[data-v-1069075c]{width:50%;margin:40px auto 20px}.img-dialog-con[data-v-1069075c] .el-dialog__body,.main-con .confirm-btn>div[data-v-1069075c]{text-align:center}.img-spe[data-v-1069075c]{margin:0 auto}
+.fill-store-inf[data-v-03e54cd7]{width:100%;height:100%;overflow-x:hidden;overflow-y:scroll}.fill-store-inf .box-card[data-v-03e54cd7]{width:80%;margin:30px auto 30px;height:calc(100% - 140px)}.fill-store-inf .box-card[data-v-03e54cd7] .el-card__body{height:calc(100% - 180px);overflow-x:hidden;overflow-y:scroll}.logo-bg[data-v-03e54cd7]{height:60px;background:#1890ff}.logo-bg img[data-v-03e54cd7]{height:44px;margin:8px 0 8px 20px}.steps[data-v-03e54cd7]{height:70px;width:60%;margin:20px auto}.steps[data-v-03e54cd7] .el-step__title{font-size:16px;line-height:18px;padding-top:20px}.el-step[data-v-03e54cd7] .el-step__head.is-process{color:#1890ff;border-color:#1890ff}.el-step[data-v-03e54cd7] .el-step__head.is-process .el-step__icon.is-text{background-color:#1890ff}.el-step[data-v-03e54cd7] .el-step__head.is-process .el-step__icon.is-text .el-step__icon-inner{color:#fff}.el-step[data-v-03e54cd7] .el-step__title.is-process{color:#000;font-weight:400}.el-step[data-v-03e54cd7] .el-step__head.is-success{color:#1890ff;border-color:#1890ff}.el-step[data-v-03e54cd7] .el-step__head.is-success .el-step__line{background-color:#1890ff}.el-step[data-v-03e54cd7] .el-step__title.is-success{color:#000}.main-con[data-v-03e54cd7]{width:70%;height:100%;margin:20px auto 0}.main-con .tips-text[data-v-03e54cd7]{font-size:14px;color:#c9c9c9;word-break:break-all}.main-con .h-warning[data-v-03e54cd7]:before{color:#e3c300}.main-con .uploadData[data-v-03e54cd7]{display:inline-block}.main-con .uploadData[data-v-03e54cd7] .el-upload--picture-card{width:100px;height:100px}.main-con .uploadData[data-v-03e54cd7] .el-upload,.main-con .uploadData[data-v-03e54cd7] .el-upload-list--picture-card .el-upload-list__item,.main-con .uploadData[data-v-03e54cd7] .el-upload-list--picture-card .el-upload-list__item-thumbnail{width:100px;height:100px;line-height:100px}.main-con .uploadData[data-v-03e54cd7] .avatar{width:100px;height:100px}.main-con .hiden-dom[data-v-03e54cd7] .el-upload--picture-card{display:none!important}.main-con .auth-con[data-v-03e54cd7]{width:100%;height:100%;display:flex;flex-direction:row;justify-content:normal;flex-wrap:wrap}.main-con .single-upload-con[data-v-03e54cd7]{width:160px;height:140px;text-align:center;overflow:hidden}.main-con .single-auth-img[data-v-03e54cd7]{width:98px;height:98px;border-radius:6px;border:1px dashed #eee;margin:5px auto;cursor:pointer;color:#8c939d;line-height:98px;font-size:28px}.main-con .single-auth-img-con[data-v-03e54cd7]{margin:0;padding:0;display:inline-block;width:98px;height:98px;position:relative;cursor:pointer;border-radius:6px;border:1px solid #c0ccda}.main-con .auth-spec-img[data-v-03e54cd7]{width:100%;height:100%;border-radius:6px;cursor:pointer;position:relative;border:none}.main-con .span-img-del-loading[data-v-03e54cd7]{display:none;position:absolute;width:98px;height:98px;top:0;left:0;border-radius:5px;z-index:66;background-color:rgba(0,0,0,.5);opacity:.75;transition:opacity .3s}.main-con .span-img-del-loading>.del-span-block[data-v-03e54cd7],.main-con .span-img-del-loading>.zoom-span-block[data-v-03e54cd7]{color:#fff;font-size:20px;font-weight:500;margin:41px 4px 0;z-index:70}.main-con .single-auth-img-con:hover>.span-img-del-loading[data-v-03e54cd7]{display:block}.main-con .single-title[data-v-03e54cd7]{font-size:12px;color:#666;text-align:center}.main-con .confirm-btn[data-v-03e54cd7]{width:50%;margin:40px auto 20px}.img-dialog-con[data-v-03e54cd7] .el-dialog__body,.main-con .confirm-btn>div[data-v-03e54cd7]{text-align:center}.img-spe[data-v-03e54cd7]{margin:0 auto}
\ No newline at end of file

src/views/entry/fillBrandInf.vue

@@ -290,6 +290,7 @@
       // }
     },
     created() {
+      // console.log('品牌页面',this.$store.state.user.applyState)
       this.getBrands();
     },
     mounted() {
@@ -491,7 +492,7 @@
       getBrands() {
         // 初始化
         getBrandsInf().then(res => {
-          if(res.code === 1 && res.data) {
+          if(res.code == 1) {
             this.brandForm = res.data[0];
             // 商标logo图片处理
             let brandList = {};
@@ -634,7 +635,7 @@
                 if(res.code == 1) {
                   this.$router.push("/fillShopInf");
                 }else {
-                  this.$message({type: 'error',message: res.message ? res.message : '操作失败'});
+                  this.$message({type: 'error',message: res.message ? res.message : '保存失败'});
                 }
               });
             }else {
@@ -642,7 +643,7 @@
                 if(res.code == 1) {
                   this.$router.push("/fillShopInf");
                 }else {
-                  this.$message({type: 'error',message: res.message ? res.message : '操作失败'});
+                  this.$message({type: 'error',message: res.message ? res.message : '保存失败'});
                 }
               });
             }

src/views/entry/fillMainInf.vue

@@ -79,6 +79,11 @@
             <span class="tips-text"><i class="el-icon-warning h-warning"></i>具体时间和长期，二者必填一个</span>
           </el-form-item>
 
+          <el-form-item label="企业地址：" prop="organization_address" inline-message="true">
+            <el-input v-model="mainForm.organization_address" style="width: 400px;"></el-input>
+            <span class="tips-text"><i class="el-icon-warning h-warning"></i>请按照营业执照上登记的完整地址填写</span>
+          </el-form-item>
+
           <el-form-item>
             <p class="main-form-tips">请核对营业执照信息，若信息不符合，可手动修改</p>
           </el-form-item>
@@ -182,7 +187,6 @@
 
         </el-form>
       </div>
-
     </el-card>
     <!-- 图片识别 对话框 -->
     <el-dialog title="提示" :visible.sync="isReadFailVisible" class="read-fail-dialog" width="600px" center
@@ -271,6 +275,7 @@
           license: '',
           organization_name: '',
           license_number: '',
+          organization_address: '',
           // 法人信息
           idcard_front: '',
           idcard_back: '',
@@ -287,7 +292,7 @@
           license: [{required: true, message: '请上传营业执照电子版',validator: licenseValidator}],
           organization_name: [{required: true, message: '企业名称不能为空', trigger: 'blur'}],
           license_number: [{required: true, message: '统一社会代码不能为空', trigger: 'blur'}],
-          // idcard_type: [{required: true, message: '证件类型不能为空', trigger: 'change'}],
+          organization_address: [{required: true, message: '企业地址不能为空', trigger: 'blur'}],
           real_name: [{required: true, message: '法人姓名不能为空', trigger: 'blur'}],
           idcard_number: [
             {required: true, message: '法人证件号不能为空', trigger: 'blur'},
@@ -412,6 +417,7 @@
           if (res.code == 1 ) {
             this.mainForm.organization_name = res.data.words_result['单位名称'].words ? res.data.words_result['单位名称'].words : '';
             this.mainForm.license_number = res.data.words_result['社会信用代码'].words ? res.data.words_result['社会信用代码'].words : '';
+            this.mainForm.organization_address = res.data.words_result['地址'].words ? res.data.words_result['地址'].words : '';
             // 营业期限处理
             if (res.data.words_result['有效期'].words == '长期' || res.data.words_result['有效期'].words == '年月日') {
               this.periodConcreteTime = [];
@@ -597,7 +603,6 @@
       // 获取主体信息接口
       getMain() {
         getMainInf().then(res => {
-          // debugger
           if(res.code == 1) {
             this.resetForm('mainForm');
             this.mainForm = res.data;
@@ -780,7 +785,7 @@
               if(res.code == 1) {
                 this.$router.push("/fillShopInf");
               }else {
-                this.$message({type:'error',message:res.message ? res.message : '操作失败'});
+                this.$message({type:'error',message:res.message ? res.message : '保存失败'});
               }
             });
           }

src/views/entry/fillShopInf.vue

@@ -197,6 +197,7 @@
       }
     },
     created() {
+      // console.log('店铺页面',this.$store.state.user.applyState)
       // 获取经营一级类目
       getGoodsType().then(res => {
         if(res.code == 1) {
@@ -298,10 +299,7 @@
             this.qualificationList = this.storeForm.qualification;
 
           }else {
-            this.$message({
-              message: res.message ? res.message : '操作失败' ,
-              type: 'error'
-            });
+            this.$message({type: 'error', message: res.message ? res.message : ''});
           }
         });
       },
@@ -433,7 +431,7 @@
               if(res.code == 1){
                 this.$router.push("/reviewing");
               }else {
-                this.$message({type: 'error',message: res.message ? res.message : '操作失败'});
+                this.$message({type: 'error',message: res.message ? res.message : '保存失败'});
                 // 处理 scope数据格式冲突
                 if(this.storeForm.scope === '') {
                   this.storeForm.scope = [];

src/views/system/asset/myAsset/index.vue

@@ -160,7 +160,7 @@
       /** 我的资产 所有数据 */
       this.getMyAssetList()
       /** 获取 银行卡列表 */
-      this.getBankcardList()
+      // this.getBankcardList()
       /** 获取主体信息 */
       this.getOrganization();
     },
@@ -203,6 +203,9 @@
       editBankcard(id) {
         this.bankcardTitle = '编辑账户'
         this.indexId = id;
+        /** 获取 银行卡列表 */
+        this.bankOptions = [];
+        this.getBankcardList()
         getBankDetailsData({ id: id }).then(res=> {
           if(res.code == 1 && res.data) {
             this.addBankcardInfoDialog = true;
@@ -243,6 +246,9 @@
         this.bankcardTitle = '添加账户'
         this.addBankcardInfoDialog = true;
         this.indexId = 0;
+        /** 获取 银行卡列表 */
+        this.bankOptions = [];
+        this.getBankcardList()
       },
 
       /** 提交 添加银行卡信息 */

src/views/system/goods/add/components/goodsimg.vue

@@ -44,12 +44,10 @@
         loading: false,
         goodsDeForm: {
           description: '',
-
         },
         // goodsDeRules: {
         //   description:[{required: true, message: '请上传商品详情图片', validator: checkImg}]
         // },
-
         goodsDetailsImgFileList: [],
         editorOption: {
           placeholder: '',
@@ -69,7 +67,7 @@
                 }
               }
             },
-            // // 禁止粘贴图片
+            // 禁止粘贴图片
             clipboard: {
               matchers: [[Node.ELEMENT_NODE, this.handleCustomMatcher]]
             }
@@ -108,11 +106,9 @@
               insert: ''
             })
             Delta.ops = ops;
-            // console.log('我是粘贴的');
           }
         })
         //
-        //console.log(113,Delta);
         return Delta
       },
 
@@ -126,7 +122,6 @@
         const list = this.$refs.file.files;
         this.indexall = list.length
         this.uploadImgs()
-        //debugger
       },
       // 向后台 传输 base64的图片数据
       uploadImgs() {
@@ -134,8 +129,6 @@
           let result = res.split(",");
           this.Base64img = result[1];
           let data = {"img_data": this.Base64img}
-          //debugger
-         // this.loading = true;
           UploadImg(data).then(res => {
             //debugger
             if (res && res.code === 1) {
@@ -150,6 +143,7 @@
               // 调整光标到最后
               quill.setSelection(length + 1)
               if(this.index < this.indexall){
+                debugger
                 this.uploadImgs()
               }else{
                 this.index = 0
@@ -164,18 +158,12 @@
       //
       onEditorChange({editor, html, text}) {
         this.goodsDeForm.description = html;
-        // console.log( 100,this.$refs.file.files );
-        // console.log( 200,this.goodsDeForm.description );
-        // console.log( 300,this.goodsDetailsImgFileList );
         // if( this.goodsDeForm.description.indexOf('img') < -1 ) {
         //   this.goodsDetailsImgFileList = [];
         // }
       },
-
-      onEditorBlur(){//失去焦点事件
-
-      },
-
+      //失去焦点事件
+      onEditorBlur(){},
       // 商品详情 子组件 form表单校验, 在父组件中被调用
       // validateGoodsDeImgForm() {
       //   let flag = null

src/views/system/shop/index.vue

@@ -52,6 +52,10 @@
                 <el-input v-model="mainForm.organization_name" :disabled="isMainItem" style="width: 400px;"></el-input>
               </el-form-item>
 
+            <el-form-item label="企业地址：" prop="organization_address" inline-message="true">
+              <el-input v-model="mainForm.organization_address" :disabled="isMainItem" style="width: 400px;"></el-input>
+            </el-form-item>
+
               <el-form-item label="统一社会代码：" prop="license_number" inline-message="true">
                 <el-input v-model="mainForm.license_number" :disabled="isMainItem" style="width: 400px;"></el-input>
               </el-form-item>
@@ -486,7 +490,6 @@
         getMainInf().then(res => {
           if (res.code == 1) {
             this.mainForm = res.data;
-
             // 营业执照电子图片处理
             let licenseImgArr = [];
             let licenseImgUrl = {};