云仓2.5-暂存

src/api/module/entry.js

 import request from '@/utils/request';
+// 获取用户详细信息
+export function getInfo(param) {
+  return request({
+    url: '/system/index/getInfo',
+    method: 'get',
+    params: param
+  })
+}
 
 // 获取主体信息
 export function getMainInf(query) {
@@ -69,14 +77,6 @@ export function upLoadImg (data) {
   });
 }
 
-// old
-// export function upLoadImg (data) {
-//   return request({
-//     url: '/system/goods/uploadImg',
-//     method: 'post',
-//     data: data
-//   });
-// }
 // 获取商品类目
 export function getGoodsType(query) {
   return request({
@@ -85,3 +85,30 @@ export function getGoodsType(query) {
     params: query
   });
 }
+
+// 营业执照 图片识别信息
+export function getLicenseImgInfoData(query) {
+  return request({
+    url: '/local/check/businessLicense',
+    method: 'get',
+    params: query
+  });
+}
+
+// 身份证 正/反 图片识别信息
+export function getIdcardImgInfoData(query) {
+  return request({
+    url: '/local/check/idCard',
+    method: 'get',
+    params: query
+  });
+}
+
+// 查询 入驻类目资质
+export function getUploadQualificationListData(query) {
+  return request({
+    url: '/local/qualification/list',
+    method: 'get',
+    params: query
+  });
+}

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-未提交信息；
+    // 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/reviewFail.vue

@@ -6,9 +6,8 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix steps">
         <el-steps :active="3" align-center finish-status="success" process-status="error">
-<!--          <el-step title="签署入驻协议"></el-step>-->
+          <el-step title="注册账号"></el-step>
           <el-step title="填写主体信息"></el-step>
-          <el-step title="填写品牌信息"></el-step>
           <el-step title="填写店铺信息"></el-step>
           <el-step title="提交入驻审核"></el-step>
         </el-steps>
@@ -33,6 +32,7 @@
 </template>
 
 <script>
+  import { getInfo } from '@/api/module/entry';
   export default {
     name: "ReviewFail",
     data() {
@@ -40,10 +40,32 @@
         msg: '具体原因，请联系售后'
       }
     },
+    created() {
+      getInfo().then(res=> {
+        if (res.code == 1 && res.data.user) {
+          if (res.data.user.state == 1) {
+            this.$router.push({path: '/home/index'});
+          }
+          if (res.data.user.state == 2) {
+            this.$router.push({path: '/reviewing'})
+          }
+          if (res.data.user.state == 3) {
+            this.$router.push({path: '/reviewFail'});
+          }
+        } else {
+          this.$router.push({path: '/reviewFail'});
+        }
+      });
+    },
     mounted() {
       if(this.$route.params.msg) {
         this.msg = this.$route.params.msg;
       }
+      /** 禁止 浏览器 后退 */
+      history.pushState(null,null,document.URL);
+      window.addEventListener('popstate', function () {
+        history.pushState(null, null, document.URL);
+      })
     },
     methods: {
       // 重新提交审核

src/views/entry/reviewing.vue

@@ -6,9 +6,8 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix steps">
         <el-steps :active="3" align-center finish-status="success">
-<!--          <el-step title="签署入驻协议" ></el-step>-->
+          <el-step title="注册账号" ></el-step>
           <el-step title="填写主体信息" ></el-step>
-          <el-step title="填写品牌信息" ></el-step>
           <el-step title="填写店铺信息" ></el-step>
           <el-step title="提交入驻审核" ></el-step>
         </el-steps>
@@ -19,7 +18,7 @@
             <img src="../../../public/images/entry/reviewSuccess.png" alt="">
           </p>
           <p>资料已提交，工作人员审核中。。。</p>
-<!--          <p>感谢您使用云仓！</p>-->
+          <p style="margin-top: 10px;">感谢您使用云仓！</p>
           <p>您的资料已经提交审核，审核周期为1-3个工作日，请您耐心等待审核结果。</p>
           <p>如果您有其它的问题，可以拔打我们的服务电话与我们联系！</p>
 <!--          <p>服务电话：4000-188-199</p>-->
@@ -34,6 +33,25 @@
     name: "ReviewSuccess",
     data() {
       return {}
+    },
+    created() {
+      // 刷新当前页面，如果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'});
+      }
+    },
+    mounted() {
+      /** 禁止 浏览器 后退 */
+      history.pushState(null,null,document.URL);
+      window.addEventListener('popstate', function () {
+        history.pushState(null, null, document.URL);
+      })
     }
   }
 </script>

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

@@ -61,6 +61,7 @@
                 'image': function (value) {
                   if (value) {
                     // 触发input框选择图片文件
+                    document.querySelector('#file').value = ''; // 清空是为了解决，连续上传同一张图片时，后续图片上传失效问题
                     document.querySelector('#file').click()
                   } else {
                     this.quill.format('image', false);

src/views/system/shop/brand.vue

@@ -46,28 +46,31 @@
         </el-form>
       </div>
       <el-table v-loading="loading" :data="brandList" :height="tableHeight">
-<!--        <el-table-column type="selection" width="45" align="center"/>-->
-        <el-table-column label="序号" prop="id" align="center"></el-table-column>
         <el-table-column label="品牌名称" prop="brand_cn" align="center"></el-table-column>
         <el-table-column label="品牌经营类型" prop="brand_type" align="center">
           <template slot-scope="scope">
             {{ scope.row.brand_type === 1 ? '自有品牌' : '品牌厂商授权' }}
           </template>
         </el-table-column>
-        <el-table-column label="品牌类型" prop="brand_range" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.brand_range === 1 ? '国内' : '国外' }}
-          </template>
-        </el-table-column>
         <el-table-column label="品牌商标注册号" prop="brand_number" align="center"></el-table-column>
         <el-table-column label="品牌状态" prop="status" align="center">
           <template slot-scope="scope">
             {{ scope.row.status === 0 ? '未审核' : scope.row.status === 1 ? '已通过' : '已拒绝'}}
           </template>
         </el-table-column>
+        <el-table-column label="授权期限" align="center">
+          <template slot-scope="scope">
+<!--            <span>{{ timeFormatter(scope.row.send_time) }}</span>-->
+            <span>--</span>
+<!--            <span>{{ timeFormatter(scope.row.send_time) }}</span>-->
+          </template>
+        </el-table-column>
+        <el-table-column label="审核说明" prop="sm" align="center"></el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            <el-button type="text" @click="handleDetails(scope.row)" :disabled="(scope.row.id === 1)">详情</el-button>
+            <el-button type="text" size="small" @click="handleDetails(scope.row)" :disabled="(scope.row.id === 1)">编辑</el-button>
+            <el-divider direction="vertical"></el-divider>
+            <el-button type="text" size="small" @click="deleteBrand(scope.row)" :disabled="(scope.row.id === 1)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -312,7 +315,7 @@
 
 <script>
   import {getBrandsInf, getDetails, addBrand, upBrand, upLoadImg} from '@/api/module/brand/brand'
-
+  import { dateFormat } from '@/utils'
   export default {
     name: "Brand",
     data() {
@@ -667,7 +670,7 @@
           this.$message({ type: 'warning', message: '目前暂时只支持维护20个品牌数据！'});
         }
       },
-      // 详情
+      /** 详情  */
       handleDetails(row) {
         this.isOpen = true;
         this.brandTitle = '品牌信息详情';
@@ -851,6 +854,10 @@
         })
       },
 
+      /** 删除 品牌 */
+      deleteBrand(row) {
+
+      },
       // 修改
       edit(param) {
         upBrand(param).then(res => {
@@ -930,6 +937,10 @@
           };
         });
       },
+      /** 时间格式化 */
+      timeFormatter(timeVal) {
+        return dateFormat(timeVal *1000, 'Y-m-d')
+      },
       // 时间戳转换为 标准时间格式
       toStandTime(val) {
         let date = new Date(val * 1000)