Merge branch 'master_1105_fixbug' into test

src/layout/components/Navbar.vue

@@ -136,14 +136,14 @@ export default {
                 })
   },
     async logout() {
-      this.$confirm('确定注销并退出系统吗？', '提示', {
+      this.$confirm('确定退出系统吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          var ssa = window.location.host
-           var ht = document.location.protocol
+          let ssa = window.location.host
+          let ht = document.location.protocol
           if(ssa =='localhost:1024'){
             window.location.href=ht+'//'+this.ssourl +'/logout?redirect='+ht+'//'+ssa+'/login'
           }else{

src/store/modules/user.js

@@ -10,7 +10,13 @@ const user = {
     sellerid:0,
     roles: [],
     permissions: [],
-    ssourl:''
+    ssourl:'',
+    // 客户信息中的，入驻审核状态：0 是默认值
+    // 0-未提交未审核
+    // 1-审核成功
+    // 2-审核中
+    // 3-审核失败
+    applyState: -1,
   },
 
   mutations: {
@@ -34,6 +40,9 @@ const user = {
     },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
+    },
+    SET_APPLYSTATE: (state, applyState) => {
+      state.applyState = applyState
     }
   },
 
@@ -98,6 +107,7 @@ const user = {
           }
           commit('SET_NAME', user.Username)
           commit('SET_SELLERID', user.SellerId)
+          commit('SET_APPLYSTATE', user.state) // 商户入驻后的审核状态
           commit('SET_AVATAR', avatar)
           resolve(res)
         }).catch(error => {

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

@@ -156,10 +156,7 @@
 
         </el-form>
       </div>
-
     </el-card>
-
-
   </div>
 </template>
 
@@ -278,11 +275,10 @@
       }
     },
     created() {
+      // console.log('主体页面',this.$store.state.user.applyState)
       this.getMain();
     },
-    mounted() {
-
-    },
+    mounted() {},
     methods: {
       periodConcrete() {
         if (this.periodConcreteTime) {
@@ -381,8 +377,7 @@
       // 获取主体信息接口
       getMain() {
         getMainInf().then(res => {
-          //console.log("获取主体数据：",res);
-          if(res.code === 1) {
+          if(res.code == 1) {
             this.resetForm('mainForm');
             this.mainForm = res.data;
             this.mainForm.idcardback = "jzwsfm";
@@ -404,7 +399,6 @@
               this.licenseImgFileList.push(licenseList);
             }
 
-
             // 处理法人证件照
             let idcardList = {};
             let idcardArr = [];
@@ -421,21 +415,17 @@
               this.idcardImgFileList.push(idcardList);
             }
 
-
             if(this.mainForm.idcard_expires_time === 0) {
               this.validityLongTermVal = true;
             }else {
               this.validityConcreteTime = this.toStandTime(this.mainForm.idcard_expires_time);
             }
 
-            //
             if(this.mainForm.license_expires_time === 0) {
               this.periodLongTermVal = true;
             }else {
               this.periodConcreteTime = this.toStandTime(this.mainForm.license_expires_time);
             }
-
-
           } else {
             this.$message({type:'error',message:res.message ? res.message : ''});
           }
@@ -526,7 +516,7 @@
               if(res.code == 1) {
                 this.$router.push("/fillBrandInf");
               }else {
-                this.$message({type:'error',message:res.message ? res.message : '操作失败'});
+                this.$message({type:'error',message:res.message ? res.message : '保存失败'});
               }
             });
           }

src/views/entry/fillShopInf.vue

@@ -186,6 +186,7 @@
       }
     },
     created() {
+      // console.log('店铺页面',this.$store.state.user.applyState)
       // 获取经营一级类目
       getGoodsType().then(res => {
         if(res.code == 1) {
@@ -197,9 +198,7 @@
       // 获取店铺信息
       this.getShop();
     },
-    mounted() {
-
-    },
+    mounted() {},
     methods: {
       showTip1(files,fileList){
         this.$message({message: '最多上传1张图片', type: 'warning'});
@@ -246,7 +245,7 @@
       // 获取 店铺信息
       getShop() {
         getShopInf().then(res => {
-          if(res.code == 1 && res.data){
+          if (res.code == 1){
             // 处理  select 下拉回显数据格式
             this.storeForm.scope = [];
             if(res.data.scope === '') {
@@ -296,10 +295,7 @@
               this.businessImgFileList = [];
             }
           }else {
-            this.$message({
-              message: res.message ? res.message : '操作失败' ,
-              type: 'error'
-            });
+            this.$message({type: 'error', message: res.message ? res.message : ''});
           }
         });
       },
@@ -413,7 +409,6 @@
           }
         }
 
-        //console.log("新增/修改的店铺信息：",this.storeForm);
         //formName
         this.$refs[formName].validate((valid) => {
           if(valid) {
@@ -421,7 +416,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/entry/reviewFail.vue

@@ -24,11 +24,8 @@
 <!--          <p>服务电话：4000-188-199</p>-->
           <p style="padding-top: 40px;"><el-button type="primary" @click="reSubmit">重新提交</el-button></p>
         </div>
-
       </div>
     </el-card>
-
-
   </div>
 </template>
 
@@ -40,10 +37,21 @@
         msg: '具体原因，请联系售后'
       }
     },
-    mounted() {
+    created() {
+      // console.log(555,this.$store.state.user.applyState)
       if(this.$route.params.msg) {
         this.msg = this.$route.params.msg;
       }
+      // 刷新当前页面，如果sys操作，审核通过，那么这个applyState状态值会变为 1，代表审核通过，可以直接跳转登录页面,审核拒绝，则 为3，跳转到失败页面
+      if (this.$store.state.user.applyState == 1) {
+        this.$router.push({path: '/home/index'});
+      }
+      if (this.$store.state.user.applyState == 2) {
+        this.$router.push({path: '/reviewing'});
+      }
+      if (this.$store.state.user.applyState == 3) {
+        this.$router.push({path: '/reviewFail'});
+      }
     },
     methods: {
       // 重新提交审核

src/views/entry/reviewing.vue

@@ -34,6 +34,19 @@
     name: "ReviewSuccess",
     data() {
       return {}
+    },
+    created() {
+      console.log(444,this.$store.state.user.applyState)
+      // 刷新当前页面，如果sys操作，审核通过，那么这个applyState状态值会变为 1，代表审核通过，可以直接跳转登录页面,审核拒绝，则 为3，跳转到失败页面
+      if (this.$store.state.user.applyState == 1) {
+        this.$router.push({path: '/home/index'});
+      }
+      if (this.$store.state.user.applyState == 2) {
+        this.$router.push({path: '/reviewing'});
+      }
+      if (this.$store.state.user.applyState == 3) {
+        this.$router.push({path: '/reviewFail'});
+      }
     }
   }
 </script>

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: '',
@@ -61,6 +59,7 @@
                 'image': function (value) {
                   if (value) {
                     // 触发input框选择图片文件
+                    document.querySelector('#file').value = '' // 清空是为了解决，联系上传同一张图片时，后续上传失效问题
                     document.querySelector('#file').click()
                   } else {
                     this.quill.format('image', false);
@@ -68,7 +67,7 @@
                 }
               }
             },
-            // // 禁止粘贴图片
+            // 禁止粘贴图片
             clipboard: {
               matchers: [[Node.ELEMENT_NODE, this.handleCustomMatcher]]
             }
@@ -107,11 +106,9 @@
               insert: ''
             })
             Delta.ops = ops;
-            // console.log('我是粘贴的');
           }
         })
         //
-        //console.log(113,Delta);
         return Delta
       },
 
@@ -125,7 +122,6 @@
         const list = this.$refs.file.files;
         this.indexall = list.length
         this.uploadImgs()
-        //debugger
       },
       // 向后台 传输 base64的图片数据
       uploadImgs() {
@@ -133,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) {
@@ -149,6 +143,7 @@
               // 调整光标到最后
               quill.setSelection(length + 1)
               if(this.index < this.indexall){
+                debugger
                 this.uploadImgs()
               }else{
                 this.index = 0
@@ -163,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