Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product

pages/account/login/index.vue

 <template>
   <div class="account">
     <Carousel v-model="value1" autoplay :autoplay-speed="5000" loop class="zmd">
-      <CarouselItem>
+      <!-- <CarouselItem>
         <div class="bg bg0">1</div>
-      </CarouselItem>
+      </CarouselItem> -->
       <CarouselItem>
         <div class="bg bg1">1</div>
       </CarouselItem>

pages/implement/components/productReport.vue

@@ -482,10 +482,11 @@ export default {
                 
 
       let datalist = []
+        let userInfo =this.$store.state.admin.user.info;
       for (let i = 0; i < this.data1.length; i++) {
         let obj = this.data1[i]
         if (obj.productstatus1 == 0 && obj.productstatus != 0) {
-          obj.report_user_name = localStorage.getItem('userName')
+          obj.report_user_name =userInfo.name
           datalist.push(obj)
         }
       }

pages/implement/components/sendCheck.vue

@@ -227,9 +227,9 @@ export default {
     },
     getCurrentUser(e) {
       if (e) {
-        let userInfo = this.$store.admin.user.info;
+        let userInfo =this.$store.state.admin.user.info;
         this.user.cardno = userInfo.login_id
-        this.user.user_name =userInfo.userName
+        this.user.user_name =userInfo.name
         this.user.user_id = userInfo.userId
       } else {
         this.user.cardno = ''

pages/implement/components/usercard.vue

@@ -238,8 +238,8 @@ export default {
     },
     getCurrentUser(e) {
       if (e) {
-        let userInfo = this.$store.state.userInfo;
-       console.log(userInfo);
+        let userInfo = this.$store.state.admin.user.info;
+      
         this.user.cardno = userInfo.login_id
         this.user.user_name = userInfo.name
         this.user.user_id = userInfo.userId